webpack 2.1.0-beta.24 → 2.1.0-beta.25

package/bin/config-yargs.js

@@ -190,11 +190,6 @@ module.exports = function(yargs) {
 				group: BASIC_GROUP,
 				requiresArg: true
 			},
-			"progress": {
-				type: "boolean",
-				describe: "Print compilation progress in percentage",
-				group: BASIC_GROUP
-			},
 			"resolve-alias": {
 				type: "string",
 				describe: "Setup a module alias for resolving (Example: jquery-plugin=jquery.plugin)",

package/bin/webpack.js

@@ -21,6 +21,7 @@ var yargs = require("yargs")
 require("./config-yargs")(yargs);
 
 var DISPLAY_GROUP = "Stats options:";
+var BASIC_GROUP = "Basic options:";
 
 yargs.options({
 	"json": {
@@ -28,6 +29,11 @@ yargs.options({
 		alias: "j",
 		describe: "Prints the result as JSON."
 	},
+	"progress": {
+		type: "boolean",
+		describe: "Print compilation progress in percentage",
+		group: BASIC_GROUP
+	},
 	"color": {
 		type: "boolean",
 		alias: "colors",

package/lib/AbstractPlugin.js

@@ -1,22 +1,22 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-function AbstractPlugin(plugins) {
-	this._plugins = plugins || {};
-}
-module.exports = AbstractPlugin;
-
-AbstractPlugin.create = function(plugins) {
-	function Plugin() {
-		AbstractPlugin.call(this, plugins);
-	}
-	Plugin.prototype = Object.create(AbstractPlugin.prototype);
-	return Plugin;
-};
-
-AbstractPlugin.prototype.apply = function(object) {
-	for(var name in this._plugins) {
-		object.plugin(name, this._plugins[name]);
-	}
-};
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+function AbstractPlugin(plugins) {
+	this._plugins = plugins || {};
+}
+module.exports = AbstractPlugin;
+
+AbstractPlugin.create = function(plugins) {
+	function Plugin() {
+		AbstractPlugin.call(this, plugins);
+	}
+	Plugin.prototype = Object.create(AbstractPlugin.prototype);
+	return Plugin;
+};
+
+AbstractPlugin.prototype.apply = function(object) {
+	for(var name in this._plugins) {
+		object.plugin(name, this._plugins[name]);
+	}
+};

package/lib/ArrayMap.js

@@ -1,50 +1,50 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-function ArrayMap() {
-	this.keys = [];
-	this.values = [];
-}
-module.exports = ArrayMap;
-
-ArrayMap.prototype.get = function(key) {
-	for(var i = 0; i < this.keys.length; i++) {
-		if(this.keys[i] === key) {
-			return this.values[i];
-		}
-	}
-	return;
-};
-
-ArrayMap.prototype.set = function(key, value) {
-	for(var i = 0; i < this.keys.length; i++) {
-		if(this.keys[i] === key) {
-			this.values[i] = value;
-			return this;
-		}
-	}
-	this.keys.push(key);
-	this.values.push(value);
-	return this;
-};
-
-ArrayMap.prototype.remove = function(key) {
-	for(var i = 0; i < this.keys.length; i++) {
-		if(this.keys[i] === key) {
-			this.keys.splice(i, 1);
-			this.values.splice(i, 1);
-			return true;
-		}
-	}
-	return false;
-};
-
-ArrayMap.prototype.clone = function() {
-	var newMap = new ArrayMap();
-	for(var i = 0; i < this.keys.length; i++) {
-		newMap.keys.push(this.keys[i]);
-		newMap.values.push(this.values[i]);
-	}
-	return newMap;
-};
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+function ArrayMap() {
+	this.keys = [];
+	this.values = [];
+}
+module.exports = ArrayMap;
+
+ArrayMap.prototype.get = function(key) {
+	for(var i = 0; i < this.keys.length; i++) {
+		if(this.keys[i] === key) {
+			return this.values[i];
+		}
+	}
+	return;
+};
+
+ArrayMap.prototype.set = function(key, value) {
+	for(var i = 0; i < this.keys.length; i++) {
+		if(this.keys[i] === key) {
+			this.values[i] = value;
+			return this;
+		}
+	}
+	this.keys.push(key);
+	this.values.push(value);
+	return this;
+};
+
+ArrayMap.prototype.remove = function(key) {
+	for(var i = 0; i < this.keys.length; i++) {
+		if(this.keys[i] === key) {
+			this.keys.splice(i, 1);
+			this.values.splice(i, 1);
+			return true;
+		}
+	}
+	return false;
+};
+
+ArrayMap.prototype.clone = function() {
+	var newMap = new ArrayMap();
+	for(var i = 0; i < this.keys.length; i++) {
+		newMap.keys.push(this.keys[i]);
+		newMap.values.push(this.values[i]);
+	}
+	return newMap;
+};

package/lib/DelegatedModuleFactoryPlugin.js

@@ -1,51 +1,51 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-var DelegatedModule = require("./DelegatedModule");
-
-// options.source
-// options.type
-// options.context
-// options.scope
-// options.content
-function DelegatedModuleFactoryPlugin(options) {
-	this.options = options;
-	options.type = options.type || "require";
-	options.extensions = options.extensions || ["", ".js"];
-}
-module.exports = DelegatedModuleFactoryPlugin;
-
-DelegatedModuleFactoryPlugin.prototype.apply = function(normalModuleFactory) {
-	var scope = this.options.scope;
-	if(scope) {
-		normalModuleFactory.plugin("factory", function(factory) {
-			return function(data, callback) {
-				var dependency = data.dependencies[0];
-				var request = dependency.request;
-				if(request && request.indexOf(scope + "/") === 0) {
-					var innerRequest = "." + request.substr(scope.length);
-					for(var i = 0; i < this.options.extensions.length; i++) {
-						var requestPlusExt = innerRequest + this.options.extensions[i];
-						if(requestPlusExt in this.options.content) {
-							var resolved = this.options.content[requestPlusExt];
-							return callback(null, new DelegatedModule(this.options.source, resolved, this.options.type, requestPlusExt));
-						}
-					}
-				}
-				return factory(data, callback);
-			}.bind(this);
-		}.bind(this));
-	} else {
-		normalModuleFactory.plugin("module", function(module) {
-			if(module.libIdent) {
-				var request = module.libIdent(this.options);
-				if(request && request in this.options.content) {
-					var resolved = this.options.content[request];
-					return new DelegatedModule(this.options.source, resolved, this.options.type, request);
-				}
-			}
-			return module;
-		}.bind(this));
-	}
-};
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+var DelegatedModule = require("./DelegatedModule");
+
+// options.source
+// options.type
+// options.context
+// options.scope
+// options.content
+function DelegatedModuleFactoryPlugin(options) {
+	this.options = options;
+	options.type = options.type || "require";
+	options.extensions = options.extensions || ["", ".js"];
+}
+module.exports = DelegatedModuleFactoryPlugin;
+
+DelegatedModuleFactoryPlugin.prototype.apply = function(normalModuleFactory) {
+	var scope = this.options.scope;
+	if(scope) {
+		normalModuleFactory.plugin("factory", function(factory) {
+			return function(data, callback) {
+				var dependency = data.dependencies[0];
+				var request = dependency.request;
+				if(request && request.indexOf(scope + "/") === 0) {
+					var innerRequest = "." + request.substr(scope.length);
+					for(var i = 0; i < this.options.extensions.length; i++) {
+						var requestPlusExt = innerRequest + this.options.extensions[i];
+						if(requestPlusExt in this.options.content) {
+							var resolved = this.options.content[requestPlusExt];
+							return callback(null, new DelegatedModule(this.options.source, resolved, this.options.type, requestPlusExt));
+						}
+					}
+				}
+				return factory(data, callback);
+			}.bind(this);
+		}.bind(this));
+	} else {
+		normalModuleFactory.plugin("module", function(module) {
+			if(module.libIdent) {
+				var request = module.libIdent(this.options);
+				if(request && request in this.options.content) {
+					var resolved = this.options.content[request];
+					return new DelegatedModule(this.options.source, resolved, this.options.type, request);
+				}
+			}
+			return module;
+		}.bind(this));
+	}
+};

package/lib/EntryOptionPlugin.js

@@ -1,28 +1,28 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-var SingleEntryPlugin = require("./SingleEntryPlugin");
-var MultiEntryPlugin = require("./MultiEntryPlugin");
-
-function EntryOptionPlugin() {}
-module.exports = EntryOptionPlugin;
-
-EntryOptionPlugin.prototype.apply = function(compiler) {
-	compiler.plugin("entry-option", function(context, entry) {
-		function itemToPlugin(item, name) {
-			if(Array.isArray(item))
-				return new MultiEntryPlugin(context, item, name);
-			else
-				return new SingleEntryPlugin(context, item, name);
-		}
-		if(typeof entry === "string" || Array.isArray(entry)) {
-			compiler.apply(itemToPlugin(entry, "main"));
-		} else if(typeof entry === "object") {
-			Object.keys(entry).forEach(function(name) {
-				compiler.apply(itemToPlugin(entry[name], name));
-			});
-		}
-		return true;
-	});
-};
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+var SingleEntryPlugin = require("./SingleEntryPlugin");
+var MultiEntryPlugin = require("./MultiEntryPlugin");
+
+function EntryOptionPlugin() {}
+module.exports = EntryOptionPlugin;
+
+EntryOptionPlugin.prototype.apply = function(compiler) {
+	compiler.plugin("entry-option", function(context, entry) {
+		function itemToPlugin(item, name) {
+			if(Array.isArray(item))
+				return new MultiEntryPlugin(context, item, name);
+			else
+				return new SingleEntryPlugin(context, item, name);
+		}
+		if(typeof entry === "string" || Array.isArray(entry)) {
+			compiler.apply(itemToPlugin(entry, "main"));
+		} else if(typeof entry === "object") {
+			Object.keys(entry).forEach(function(name) {
+				compiler.apply(itemToPlugin(entry[name], name));
+			});
+		}
+		return true;
+	});
+};

package/lib/ModuleParserHelpers.js

@@ -1,21 +1,21 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-var ModuleParserHelpers = exports;
-
-ModuleParserHelpers.addParsedVariable = function(parser, name, expression) {
-	if(!parser.state.current.addVariable) return false;
-	var deps = [];
-	parser.parse(expression, {
-		current: {
-			addDependency: function(dep) {
-				dep.userRequest = name;
-				deps.push(dep);
-			}
-		},
-		module: parser.state.module
-	});
-	parser.state.current.addVariable(name, expression, deps);
-	return true;
-};
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+var ModuleParserHelpers = exports;
+
+ModuleParserHelpers.addParsedVariable = function(parser, name, expression) {
+	if(!parser.state.current.addVariable) return false;
+	var deps = [];
+	parser.parse(expression, {
+		current: {
+			addDependency: function(dep) {
+				dep.userRequest = name;
+				deps.push(dep);
+			}
+		},
+		module: parser.state.module
+	});
+	parser.state.current.addVariable(name, expression, deps);
+	return true;
+};

package/lib/NamedModulesPlugin.js

@@ -1,21 +1,21 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-function NamedModulesPlugin(options) {
-	this.options = options || {};
-}
-module.exports = NamedModulesPlugin;
-NamedModulesPlugin.prototype.apply = function(compiler) {
-	compiler.plugin("compilation", function(compilation) {
-		compilation.plugin("before-module-ids", function(modules) {
-			modules.forEach(function(module) {
-				if(module.id === null && module.libIdent) {
-					module.id = module.libIdent({
-						context: this.options.context || compiler.options.context
-					});
-				}
-			}, this);
-		}.bind(this));
-	}.bind(this));
-};
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+function NamedModulesPlugin(options) {
+	this.options = options || {};
+}
+module.exports = NamedModulesPlugin;
+NamedModulesPlugin.prototype.apply = function(compiler) {
+	compiler.plugin("compilation", function(compilation) {
+		compilation.plugin("before-module-ids", function(modules) {
+			modules.forEach(function(module) {
+				if(module.id === null && module.libIdent) {
+					module.id = module.libIdent({
+						context: this.options.context || compiler.options.context
+					});
+				}
+			}, this);
+		}.bind(this));
+	}.bind(this));
+};