Skip to content

Commit

Permalink
Revert "Only pass valid webpack options through to webpack."
Browse files Browse the repository at this point in the history
This reverts commit 7d644da.
  • Loading branch information
danez committed Oct 10, 2016
1 parent 99a7a12 commit 889f022
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 14 deletions.
8 changes: 0 additions & 8 deletions lib/validWebpackOptions.js

This file was deleted.

4 changes: 1 addition & 3 deletions tasks/webpack-dev-server.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ module.exports = function(grunt) {
var WebpackDevServer = require("webpack-dev-server");
var ProgressPlugin = require("webpack/lib/ProgressPlugin");

var validWebpackOptions = require("../lib/validWebpackOptions");

grunt.registerMultiTask('webpack-dev-server', 'Start a webpack-dev-server.', function() {
var done = this.async();
var options = mergeWith(
Expand Down Expand Up @@ -69,7 +67,7 @@ module.exports = function(grunt) {
});
}

var compiler = webpack(_.pick(options.webpack, validWebpackOptions));
var compiler = webpack(options.webpack);

if(options.progress) {
var chars = 0;
Expand Down
4 changes: 1 addition & 3 deletions tasks/webpack.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ module.exports = function(grunt) {
var CachePlugin = require("webpack/lib/CachePlugin");
var ProgressPlugin = require("webpack/lib/ProgressPlugin");

var validWebpackOptions = require("../lib/validWebpackOptions");

var targetCachePlugins = {};
var targetDependencies = {};

Expand Down Expand Up @@ -85,7 +83,7 @@ module.exports = function(grunt) {
var statsOptions = firstOptions.stats;
var failOnError = firstOptions.failOnError;
var progress = firstOptions.progress;
var compiler = webpack(_.pick(options, validWebpackOptions));
var compiler = webpack(options);

if(cache) {
var theCachePlugin = targetCachePlugins[target];
Expand Down

0 comments on commit 889f022

Please sign in to comment.