node_modules

4 files changed, 260 insertions, 210 deletions

diff --git a/node_modules/webpack/bin/config-optimist.js b/node_modules/webpack/bin/config-optimist.js
index 5ea07ee14..6ec4d62c8 100644
--- a/node_modules/webpack/bin/config-optimist.js
+++ b/node_modules/webpack/bin/config-optimist.js
@@ -2,6 +2,7 @@ module.exports = function(optimist) {
 	optimist
 		.boolean("help").alias("help", "h").alias("help", "?").describe("help")
 		.string("config").describe("config", "Path to the config file")
+		.string("config-name").describe("config-name", "Name of the config to use")
 		.string("env").describe("env", "Environment passed to the config, when it is a function")
 		.string("context").describe("context", "The root directory for resolving entry point and stats")
 		.string("entry").describe("entry", "The entry point")
diff --git a/node_modules/webpack/bin/config-yargs.js b/node_modules/webpack/bin/config-yargs.js
index a3f7e0c3e..e7c166671 100644
--- a/node_modules/webpack/bin/config-yargs.js
+++ b/node_modules/webpack/bin/config-yargs.js
@@ -9,7 +9,7 @@ var OPTIMIZE_GROUP = "Optimizing options:";
 module.exports = function(yargs) {
 	yargs
 		.help("help")
-		.alias("help", "h", "?")
+		.alias("help", "h")
 		.version()
 		.alias("version", "v")
 		.options({
@@ -20,6 +20,12 @@ module.exports = function(yargs) {
 				defaultDescription: "webpack.config.js or webpackfile.js",
 				requiresArg: true
 			},
+			"config-name": {
+				type: "string",
+				describe: "Name of the config to use",
+				group: CONFIG_GROUP,
+				requiresArg: true
+			},
 			"env": {
 				describe: "Environment passed to the config, when it is a function",
 				group: CONFIG_GROUP
@@ -194,7 +200,7 @@ module.exports = function(yargs) {
 			},
 			"resolve-extensions": {
 				"type": "array",
-				describe: "Setup extensions that should be used to resolve modules (Example: --resolve-extensions .es6 .js)",
+				describe: "Setup extensions that should be used to resolve modules (Example: --resolve-extensions .es6,.js)",
 				group: RESOLVE_GROUP,
 				requiresArg: true
 			},
@@ -245,12 +251,14 @@ module.exports = function(yargs) {
 			"bail": {
 				type: "boolean",
 				describe: "Abort the compilation on first error",
-				group: ADVANCED_GROUP
+				group: ADVANCED_GROUP,
+				default: null
 			},
 			"profile": {
 				type: "boolean",
 				describe: "Profile the compilation and include information in stats",
-				group: ADVANCED_GROUP
+				group: ADVANCED_GROUP,
+				default: null
 			},
 			"d": {
 				type: "boolean",
diff --git a/node_modules/webpack/bin/convert-argv.js b/node_modules/webpack/bin/convert-argv.js
index ab0ba3343..043ea2abb 100644
--- a/node_modules/webpack/bin/convert-argv.js
+++ b/node_modules/webpack/bin/convert-argv.js
@@ -2,6 +2,7 @@ var path = require("path");
 var fs = require("fs");
 fs.existsSync = fs.existsSync || path.existsSync;
 var interpret = require("interpret");
+var prepareOptions = require("../lib/prepareOptions");
 
 module.exports = function(yargs, argv, convertOptions) {
 
@@ -94,13 +95,7 @@ module.exports = function(yargs, argv, convertOptions) {
 
 		var requireConfig = function requireConfig(configPath) {
 			var options = require(configPath);
-			var isES6DefaultExportedFunc = (
-				typeof options === "object" && options !== null && typeof options.default === "function"
-			);
-			if(typeof options === "function" || isES6DefaultExportedFunc) {
-				options = isES6DefaultExportedFunc ? options.default : options;
-				options = options(argv.env, argv);
-			}
+			options = prepareOptions(options, argv);
 			return options;
 		};
 
@@ -135,6 +130,20 @@ module.exports = function(yargs, argv, convertOptions) {
 			return processConfiguredOptions(options.default);
 		}
 
+		// filter multi-config by name
+		if(Array.isArray(options) && argv["config-name"]) {
+			var namedOptions = options.filter(function(opt) {
+				return opt.name === argv["config-name"];
+			});
+			if(namedOptions.length === 0) {
+				console.error("Configuration with name '" + argv["config-name"] + "' was not found.");
+				process.exit(-1); // eslint-disable-line
+			} else if(namedOptions.length === 1) {
+				return processConfiguredOptions(namedOptions[0]);
+			}
+			options = namedOptions;
+		}
+
 		if(Array.isArray(options)) {
 			options.forEach(processOptions);
 		} else {
@@ -284,24 +293,30 @@ module.exports = function(yargs, argv, convertOptions) {
 			ensureObject(options, "entry");
 		});
 
-		function bindLoaders(arg, collection) {
+		function bindRules(arg) {
 			ifArgPair(arg, function(name, binding) {
 				if(name === null) {
 					name = binding;
 					binding += "-loader";
 				}
-				options.module[collection].push({
-					test: new RegExp("\\." + name.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&") + "$"),
+				var rule = {
+					test: new RegExp("\\." + name.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&") + "$"), // eslint-disable-line no-useless-escape
 					loader: binding
-				});
+				};
+				if(arg === "module-bind-pre") {
+					rule.enforce = "pre";
+				} else if(arg === "module-bind-post") {
+					rule.enforce = "post";
+				}
+				options.module.rules.push(rule);
 			}, function() {
 				ensureObject(options, "module");
-				ensureArray(options.module, collection);
+				ensureArray(options.module, "rules");
 			});
 		}
-		bindLoaders("module-bind", "loaders");
-		bindLoaders("module-bind-pre", "preLoaders");
-		bindLoaders("module-bind-post", "postLoaders");
+		bindRules("module-bind");
+		bindRules("module-bind-pre");
+		bindRules("module-bind-post");
 
 		var defineObject;
 		ifArgPair("define", function(name, value) {
diff --git a/node_modules/webpack/bin/webpack.js b/node_modules/webpack/bin/webpack.js
index 37125533c..d61288841 100755
--- a/node_modules/webpack/bin/webpack.js
+++ b/node_modules/webpack/bin/webpack.js
@@ -124,11 +124,21 @@ yargs.options({
 		group: DISPLAY_GROUP,
 		describe: "Display information about exports provided from modules"
 	},
+	"display-optimization-bailout": {
+		type: "boolean",
+		group: DISPLAY_GROUP,
+		describe: "Display information about why optimization bailed out for modules"
+	},
 	"display-error-details": {
 		type: "boolean",
 		group: DISPLAY_GROUP,
 		describe: "Display details about errors"
 	},
+	"display": {
+		type: "string",
+		group: DISPLAY_GROUP,
+		describe: "Select display preset (verbose, detailed, normal, minimal, errors-only, none)"
+	},
 	"verbose": {
 		type: "boolean",
 		group: DISPLAY_GROUP,
@@ -136,228 +146,244 @@ yargs.options({
 	}
 });
 
-var argv = yargs.argv;
-
-if(argv.verbose) {
-	argv["display-reasons"] = true;
-	argv["display-depth"] = true;
-	argv["display-entrypoints"] = true;
-	argv["display-used-exports"] = true;
-	argv["display-provided-exports"] = true;
-	argv["display-error-details"] = true;
-	argv["display-modules"] = true;
-	argv["display-cached"] = true;
-	argv["display-cached-assets"] = true;
-}
-
-var options = require("./convert-argv")(yargs, argv);
-
-function ifArg(name, fn, init) {
-	if(Array.isArray(argv[name])) {
-		if(init) init();
-		argv[name].forEach(fn);
-	} else if(typeof argv[name] !== "undefined") {
-		if(init) init();
-		fn(argv[name], -1);
-	}
-}
-
-function processOptions(options) {
-	// process Promise
-	if(typeof options.then === "function") {
-		options.then(processOptions).catch(function(err) {
-			console.error(err.stack || err);
-			process.exit(1); // eslint-disable-line
-		});
+// yargs will terminate the process early when the user uses help or version.
+// This causes large help outputs to be cut short (https://github.com/nodejs/node/wiki/API-changes-between-v0.10-and-v4#process).
+// To prevent this we use the yargs.parse API and exit the process normally
+yargs.parse(process.argv.slice(2), (err, argv, output) => {
+
+	// arguments validation failed
+	if(err && output) {
+		console.error(output);
+		process.exitCode = 1;
 		return;
 	}
 
-	var firstOptions = [].concat(options)[0];
-	var statsPresetToOptions = require("../lib/Stats.js").presetToOptions;
+	// help or version info
+	if(output) {
+		console.log(output);
+		return;
+	}
 
-	var outputOptions = options.stats;
-	if(typeof outputOptions === "boolean" || typeof outputOptions === "string") {
-		outputOptions = statsPresetToOptions(outputOptions);
-	} else if(!outputOptions) {
-		outputOptions = {};
+	if(argv.verbose) {
+		argv["display"] = "verbose";
 	}
-	outputOptions = Object.create(outputOptions);
-	if(Array.isArray(options) && !outputOptions.children) {
-		outputOptions.children = options.map(o => o.stats);
+
+	var options = require("./convert-argv")(yargs, argv);
+
+	function ifArg(name, fn, init) {
+		if(Array.isArray(argv[name])) {
+			if(init) init();
+			argv[name].forEach(fn);
+		} else if(typeof argv[name] !== "undefined") {
+			if(init) init();
+			fn(argv[name], -1);
+		}
 	}
-	if(typeof outputOptions.context === "undefined")
-		outputOptions.context = firstOptions.context;
-
-	ifArg("json", function(bool) {
-		if(bool)
-			outputOptions.json = bool;
-	});
-
-	if(typeof outputOptions.colors === "undefined")
-		outputOptions.colors = require("supports-color");
-
-	ifArg("sort-modules-by", function(value) {
-		outputOptions.modulesSort = value;
-	});
-
-	ifArg("sort-chunks-by", function(value) {
-		outputOptions.chunksSort = value;
-	});
-
-	ifArg("sort-assets-by", function(value) {
-		outputOptions.assetsSort = value;
-	});
-
-	ifArg("display-exclude", function(value) {
-		outputOptions.exclude = value;
-	});
-
-	if(!outputOptions.json) {
-		if(typeof outputOptions.cached === "undefined")
-			outputOptions.cached = false;
-		if(typeof outputOptions.cachedAssets === "undefined")
-			outputOptions.cachedAssets = false;
-
-		ifArg("display-chunks", function(bool) {
-			outputOptions.modules = !bool;
-			outputOptions.chunks = bool;
-		});
 
-		ifArg("display-entrypoints", function(bool) {
-			outputOptions.entrypoints = bool;
-		});
+	function processOptions(options) {
+		// process Promise
+		if(typeof options.then === "function") {
+			options.then(processOptions).catch(function(err) {
+				console.error(err.stack || err);
+				process.exit(1); // eslint-disable-line
+			});
+			return;
+		}
 
-		ifArg("display-reasons", function(bool) {
-			outputOptions.reasons = bool;
-		});
+		var firstOptions = [].concat(options)[0];
+		var statsPresetToOptions = require("../lib/Stats.js").presetToOptions;
 
-		ifArg("display-depth", function(bool) {
-			outputOptions.depth = bool;
-		});
+		var outputOptions = options.stats;
+		if(typeof outputOptions === "boolean" || typeof outputOptions === "string") {
+			outputOptions = statsPresetToOptions(outputOptions);
+		} else if(!outputOptions) {
+			outputOptions = {};
+		}
 
-		ifArg("display-used-exports", function(bool) {
-			outputOptions.usedExports = bool;
+		ifArg("display", function(preset) {
+			outputOptions = statsPresetToOptions(preset);
 		});
 
-		ifArg("display-provided-exports", function(bool) {
-			outputOptions.providedExports = bool;
-		});
+		outputOptions = Object.create(outputOptions);
+		if(Array.isArray(options) && !outputOptions.children) {
+			outputOptions.children = options.map(o => o.stats);
+		}
+		if(typeof outputOptions.context === "undefined")
+			outputOptions.context = firstOptions.context;
 
-		ifArg("display-error-details", function(bool) {
-			outputOptions.errorDetails = bool;
+		ifArg("json", function(bool) {
+			if(bool)
+				outputOptions.json = bool;
 		});
 
-		ifArg("display-origins", function(bool) {
-			outputOptions.chunkOrigins = bool;
+		if(typeof outputOptions.colors === "undefined")
+			outputOptions.colors = require("supports-color");
+
+		ifArg("sort-modules-by", function(value) {
+			outputOptions.modulesSort = value;
 		});
 
-		ifArg("display-max-modules", function(value) {
-			outputOptions.maxModules = value;
+		ifArg("sort-chunks-by", function(value) {
+			outputOptions.chunksSort = value;
 		});
 
-		ifArg("display-cached", function(bool) {
-			if(bool)
-				outputOptions.cached = true;
+		ifArg("sort-assets-by", function(value) {
+			outputOptions.assetsSort = value;
 		});
 
-		ifArg("display-cached-assets", function(bool) {
-			if(bool)
-				outputOptions.cachedAssets = true;
+		ifArg("display-exclude", function(value) {
+			outputOptions.exclude = value;
 		});
 
-		if(!outputOptions.exclude)
-			outputOptions.exclude = ["node_modules", "bower_components", "components"];
+		if(!outputOptions.json) {
+			if(typeof outputOptions.cached === "undefined")
+				outputOptions.cached = false;
+			if(typeof outputOptions.cachedAssets === "undefined")
+				outputOptions.cachedAssets = false;
+
+			ifArg("display-chunks", function(bool) {
+				if(bool) {
+					outputOptions.modules = false;
+					outputOptions.chunks = true;
+					outputOptions.chunkModules = true;
+				}
+			});
 
-		if(argv["display-modules"]) {
-			outputOptions.maxModules = Infinity;
-			outputOptions.exclude = undefined;
-		}
-	} else {
-		if(typeof outputOptions.chunks === "undefined")
-			outputOptions.chunks = true;
-		if(typeof outputOptions.entrypoints === "undefined")
-			outputOptions.entrypoints = true;
-		if(typeof outputOptions.modules === "undefined")
-			outputOptions.modules = true;
-		if(typeof outputOptions.chunkModules === "undefined")
-			outputOptions.chunkModules = true;
-		if(typeof outputOptions.reasons === "undefined")
-			outputOptions.reasons = true;
-		if(typeof outputOptions.cached === "undefined")
-			outputOptions.cached = true;
-		if(typeof outputOptions.cachedAssets === "undefined")
-			outputOptions.cachedAssets = true;
-	}
+			ifArg("display-entrypoints", function(bool) {
+				if(bool)
+					outputOptions.entrypoints = true;
+			});
 
-	ifArg("hide-modules", function(bool) {
-		if(bool) {
-			outputOptions.modules = false;
-			outputOptions.chunkModules = false;
-		}
-	});
-
-	var webpack = require("../lib/webpack.js");
-
-	Error.stackTraceLimit = 30;
-	var lastHash = null;
-	var compiler;
-	try {
-		compiler = webpack(options);
-	} catch(e) {
-		var WebpackOptionsValidationError = require("../lib/WebpackOptionsValidationError");
-		if(e instanceof WebpackOptionsValidationError) {
-			if(argv.color)
-				console.error("\u001b[1m\u001b[31m" + e.message + "\u001b[39m\u001b[22m");
-			else
-				console.error(e.message);
-			process.exit(1); // eslint-disable-line no-process-exit
-		}
-		throw e;
-	}
+			ifArg("display-reasons", function(bool) {
+				if(bool)
+					outputOptions.reasons = true;
+			});
 
-	if(argv.progress) {
-		var ProgressPlugin = require("../lib/ProgressPlugin");
-		compiler.apply(new ProgressPlugin({
-			profile: argv.profile
-		}));
-	}
+			ifArg("display-depth", function(bool) {
+				if(bool)
+					outputOptions.depth = true;
+			});
+
+			ifArg("display-used-exports", function(bool) {
+				if(bool)
+					outputOptions.usedExports = true;
+			});
+
+			ifArg("display-provided-exports", function(bool) {
+				if(bool)
+					outputOptions.providedExports = true;
+			});
+
+			ifArg("display-optimization-bailout", function(bool) {
+				if(bool)
+					outputOptions.optimizationBailout = bool;
+			});
+
+			ifArg("display-error-details", function(bool) {
+				if(bool)
+					outputOptions.errorDetails = true;
+			});
+
+			ifArg("display-origins", function(bool) {
+				if(bool)
+					outputOptions.chunkOrigins = true;
+			});
+
+			ifArg("display-max-modules", function(value) {
+				outputOptions.maxModules = +value;
+			});
+
+			ifArg("display-cached", function(bool) {
+				if(bool)
+					outputOptions.cached = true;
+			});
+
+			ifArg("display-cached-assets", function(bool) {
+				if(bool)
+					outputOptions.cachedAssets = true;
+			});
+
+			if(!outputOptions.exclude)
+				outputOptions.exclude = ["node_modules", "bower_components", "components"];
 
-	function compilerCallback(err, stats) {
-		if(!options.watch || err) {
-			// Do not keep cache anymore
-			compiler.purgeInputFileSystem();
+			if(argv["display-modules"]) {
+				outputOptions.maxModules = Infinity;
+				outputOptions.exclude = undefined;
+				outputOptions.modules = true;
+			}
 		}
-		if(err) {
-			lastHash = null;
-			console.error(err.stack || err);
-			if(err.details) console.error(err.details);
-			process.exit(1); // eslint-disable-line
+
+		ifArg("hide-modules", function(bool) {
+			if(bool) {
+				outputOptions.modules = false;
+				outputOptions.chunkModules = false;
+			}
+		});
+
+		var webpack = require("../lib/webpack.js");
+
+		Error.stackTraceLimit = 30;
+		var lastHash = null;
+		var compiler;
+		try {
+			compiler = webpack(options);
+		} catch(e) {
+			var WebpackOptionsValidationError = require("../lib/WebpackOptionsValidationError");
+			if(e instanceof WebpackOptionsValidationError) {
+				if(argv.color)
+					console.error("\u001b[1m\u001b[31m" + e.message + "\u001b[39m\u001b[22m");
+				else
+					console.error(e.message);
+				process.exit(1); // eslint-disable-line no-process-exit
+			}
+			throw e;
 		}
-		if(outputOptions.json) {
-			process.stdout.write(JSON.stringify(stats.toJson(outputOptions), null, 2) + "\n");
-		} else if(stats.hash !== lastHash) {
-			lastHash = stats.hash;
-			process.stdout.write(stats.toString(outputOptions) + "\n");
+
+		if(argv.progress) {
+			var ProgressPlugin = require("../lib/ProgressPlugin");
+			compiler.apply(new ProgressPlugin({
+				profile: argv.profile
+			}));
 		}
-		if(!options.watch && stats.hasErrors()) {
-			process.on("exit", function() {
-				process.exit(2); // eslint-disable-line
-			});
+
+		function compilerCallback(err, stats) {
+			if(!options.watch || err) {
+				// Do not keep cache anymore
+				compiler.purgeInputFileSystem();
+			}
+			if(err) {
+				lastHash = null;
+				console.error(err.stack || err);
+				if(err.details) console.error(err.details);
+				process.exit(1); // eslint-disable-line
+			}
+			if(outputOptions.json) {
+				process.stdout.write(JSON.stringify(stats.toJson(outputOptions), null, 2) + "\n");
+			} else if(stats.hash !== lastHash) {
+				lastHash = stats.hash;
+				var statsString = stats.toString(outputOptions);
+				if(statsString)
+					process.stdout.write(statsString + "\n");
+			}
+			if(!options.watch && stats.hasErrors()) {
+				process.exitCode = 2;
+			}
 		}
+		if(firstOptions.watch || options.watch) {
+			var watchOptions = firstOptions.watchOptions || firstOptions.watch || options.watch || {};
+			if(watchOptions.stdin) {
+				process.stdin.on("end", function() {
+					process.exit(); // eslint-disable-line
+				});
+				process.stdin.resume();
+			}
+			compiler.watch(watchOptions, compilerCallback);
+			console.log("\nWebpack is watching the files…\n");
+		} else
+			compiler.run(compilerCallback);
+
 	}
-	if(firstOptions.watch || options.watch) {
-		var watchOptions = firstOptions.watchOptions || firstOptions.watch || options.watch || {};
-		if(watchOptions.stdin) {
-			process.stdin.on("end", function() {
-				process.exit(0); // eslint-disable-line
-			});
-			process.stdin.resume();
-		}
-		compiler.watch(watchOptions, compilerCallback);
-		console.log("\nWebpack is watching the files…\n");
-	} else
-		compiler.run(compilerCallback);
 
-}
+	processOptions(options);
 
-processOptions(options);
+});