webpack 1.13.3 → 1.14.0

package/lib/optimize/UglifyJsPlugin.js

@@ -1,146 +1,146 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-var SourceMapConsumer = require("webpack-core/lib/source-map").SourceMapConsumer;
-var SourceMapSource = require("webpack-core/lib/SourceMapSource");
-var RawSource = require("webpack-core/lib/RawSource");
-var RequestShortener = require("../RequestShortener");
-var ModuleFilenameHelpers = require("../ModuleFilenameHelpers");
-var uglify = require("uglify-js");
-
-function UglifyJsPlugin(options) {
-	if(typeof options !== "object") options = {};
-	if(typeof options.compressor !== "undefined") {
-		options.compress = options.compressor;
-	}
-	this.options = options;
-}
-module.exports = UglifyJsPlugin;
-
-UglifyJsPlugin.prototype.apply = function(compiler) {
-	var options = this.options;
-	options.test = options.test || /\.js($|\?)/i;
-
-	var requestShortener = new RequestShortener(compiler.context);
-	compiler.plugin("compilation", function(compilation) {
-		if(options.sourceMap !== false) {
-			compilation.plugin("build-module", function(module) {
-				// to get detailed location info about errors
-				module.useSourceMap = true;
-			});
-		}
-		compilation.plugin("optimize-chunk-assets", function(chunks, callback) {
-			var files = [];
-			chunks.forEach(function(chunk) {
-				chunk.files.forEach(function(file) {
-					files.push(file);
-				});
-			});
-			compilation.additionalChunkAssets.forEach(function(file) {
-				files.push(file);
-			});
-			files = files.filter(ModuleFilenameHelpers.matchObject.bind(undefined, options));
-			files.forEach(function(file) {
-				var oldWarnFunction = uglify.AST_Node.warn_function;
-				var warnings = [];
-				try {
-					var asset = compilation.assets[file];
-					if(asset.__UglifyJsPlugin) {
-						compilation.assets[file] = asset.__UglifyJsPlugin;
-						return;
-					}
-					if(options.sourceMap !== false) {
-						if(asset.sourceAndMap) {
-							var sourceAndMap = asset.sourceAndMap();
-							var inputSourceMap = sourceAndMap.map;
-							var input = sourceAndMap.source;
-						} else {
-							var inputSourceMap = asset.map();
-							var input = asset.source();
-						}
-						var sourceMap = new SourceMapConsumer(inputSourceMap);
-						uglify.AST_Node.warn_function = function(warning) { // eslint-disable-line camelcase
-							var match = /\[.+:([0-9]+),([0-9]+)\]/.exec(warning);
-							var line = +match[1];
-							var column = +match[2];
-							var original = sourceMap.originalPositionFor({
-								line: line,
-								column: column
-							});
-							if(!original || !original.source || original.source === file) return;
-							warnings.push(warning.replace(/\[.+:([0-9]+),([0-9]+)\]/, "") +
-								"[" + requestShortener.shorten(original.source) + ":" + original.line + "," + original.column + "]");
-						};
-					} else {
-						var input = asset.source();
-						uglify.AST_Node.warn_function = function(warning) { // eslint-disable-line camelcase
-							warnings.push(warning);
-						};
-					}
-					uglify.base54.reset();
-					var ast = uglify.parse(input, {
-						filename: file
-					});
-					if(options.compress !== false) {
-						ast.figure_out_scope();
-						var compress = uglify.Compressor(options.compress); // eslint-disable-line new-cap
-						ast = ast.transform(compress);
-					}
-					if(options.mangle !== false) {
-						ast.figure_out_scope();
-						ast.compute_char_frequency(options.mangle || {});
-						ast.mangle_names(options.mangle || {});
-						if(options.mangle && options.mangle.props) {
-							uglify.mangle_properties(ast, options.mangle.props);
-						}
-					}
-					var output = {};
-					output.comments = Object.prototype.hasOwnProperty.call(options, "comments") ? options.comments : /^\**!|@preserve|@license/;
-					output.beautify = options.beautify;
-					for(var k in options.output) {
-						output[k] = options.output[k];
-					}
-					if(options.sourceMap !== false) {
-						var map = uglify.SourceMap({ // eslint-disable-line new-cap
-							file: file,
-							root: ""
-						});
-						output.source_map = map; // eslint-disable-line camelcase
-					}
-					var stream = uglify.OutputStream(output); // eslint-disable-line new-cap
-					ast.print(stream);
-					if(map) map = map + "";
-					stream = stream + "";
-					asset.__UglifyJsPlugin = compilation.assets[file] = (map ?
-						new SourceMapSource(stream, file, JSON.parse(map), input, inputSourceMap) :
-						new RawSource(stream));
-					if(warnings.length > 0) {
-						compilation.warnings.push(new Error(file + " from UglifyJs\n" + warnings.join("\n")));
-					}
-				} catch(err) {
-					if(err.line) {
-						var original = sourceMap && sourceMap.originalPositionFor({
-							line: err.line,
-							column: err.col
-						});
-						if(original && original.source) {
-							compilation.errors.push(new Error(file + " from UglifyJs\n" + err.message + " [" + requestShortener.shorten(original.source) + ":" + original.line + "," + original.column + "]"));
-						} else {
-							compilation.errors.push(new Error(file + " from UglifyJs\n" + err.message + " [" + file + ":" + err.line + "," + err.col + "]"));
-						}
-					} else if(err.msg) {
-						compilation.errors.push(new Error(file + " from UglifyJs\n" + err.msg));
-					} else
-						compilation.errors.push(new Error(file + " from UglifyJs\n" + err.stack));
-				} finally {
-					uglify.AST_Node.warn_function = oldWarnFunction; // eslint-disable-line camelcase
-				}
-			});
-			callback();
-		});
-		compilation.plugin("normal-module-loader", function(context) {
-			context.minimize = true;
-		});
-	});
-};
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+var SourceMapConsumer = require("webpack-core/lib/source-map").SourceMapConsumer;
+var SourceMapSource = require("webpack-core/lib/SourceMapSource");
+var RawSource = require("webpack-core/lib/RawSource");
+var RequestShortener = require("../RequestShortener");
+var ModuleFilenameHelpers = require("../ModuleFilenameHelpers");
+var uglify = require("uglify-js");
+
+function UglifyJsPlugin(options) {
+	if(typeof options !== "object") options = {};
+	if(typeof options.compressor !== "undefined") {
+		options.compress = options.compressor;
+	}
+	this.options = options;
+}
+module.exports = UglifyJsPlugin;
+
+UglifyJsPlugin.prototype.apply = function(compiler) {
+	var options = this.options;
+	options.test = options.test || /\.js($|\?)/i;
+
+	var requestShortener = new RequestShortener(compiler.context);
+	compiler.plugin("compilation", function(compilation) {
+		if(options.sourceMap !== false) {
+			compilation.plugin("build-module", function(module) {
+				// to get detailed location info about errors
+				module.useSourceMap = true;
+			});
+		}
+		compilation.plugin("optimize-chunk-assets", function(chunks, callback) {
+			var files = [];
+			chunks.forEach(function(chunk) {
+				chunk.files.forEach(function(file) {
+					files.push(file);
+				});
+			});
+			compilation.additionalChunkAssets.forEach(function(file) {
+				files.push(file);
+			});
+			files = files.filter(ModuleFilenameHelpers.matchObject.bind(undefined, options));
+			files.forEach(function(file) {
+				var oldWarnFunction = uglify.AST_Node.warn_function;
+				var warnings = [];
+				try {
+					var asset = compilation.assets[file];
+					if(asset.__UglifyJsPlugin) {
+						compilation.assets[file] = asset.__UglifyJsPlugin;
+						return;
+					}
+					if(options.sourceMap !== false) {
+						if(asset.sourceAndMap) {
+							var sourceAndMap = asset.sourceAndMap();
+							var inputSourceMap = sourceAndMap.map;
+							var input = sourceAndMap.source;
+						} else {
+							var inputSourceMap = asset.map();
+							var input = asset.source();
+						}
+						var sourceMap = new SourceMapConsumer(inputSourceMap);
+						uglify.AST_Node.warn_function = function(warning) { // eslint-disable-line camelcase
+							var match = /\[.+:([0-9]+),([0-9]+)\]/.exec(warning);
+							var line = +match[1];
+							var column = +match[2];
+							var original = sourceMap.originalPositionFor({
+								line: line,
+								column: column
+							});
+							if(!original || !original.source || original.source === file) return;
+							warnings.push(warning.replace(/\[.+:([0-9]+),([0-9]+)\]/, "") +
+								"[" + requestShortener.shorten(original.source) + ":" + original.line + "," + original.column + "]");
+						};
+					} else {
+						var input = asset.source();
+						uglify.AST_Node.warn_function = function(warning) { // eslint-disable-line camelcase
+							warnings.push(warning);
+						};
+					}
+					uglify.base54.reset();
+					var ast = uglify.parse(input, {
+						filename: file
+					});
+					if(options.compress !== false) {
+						ast.figure_out_scope();
+						var compress = uglify.Compressor(options.compress); // eslint-disable-line new-cap
+						ast = ast.transform(compress);
+					}
+					if(options.mangle !== false) {
+						ast.figure_out_scope();
+						ast.compute_char_frequency(options.mangle || {});
+						ast.mangle_names(options.mangle || {});
+						if(options.mangle && options.mangle.props) {
+							uglify.mangle_properties(ast, options.mangle.props);
+						}
+					}
+					var output = {};
+					output.comments = Object.prototype.hasOwnProperty.call(options, "comments") ? options.comments : /^\**!|@preserve|@license/;
+					output.beautify = options.beautify;
+					for(var k in options.output) {
+						output[k] = options.output[k];
+					}
+					if(options.sourceMap !== false) {
+						var map = uglify.SourceMap({ // eslint-disable-line new-cap
+							file: file,
+							root: ""
+						});
+						output.source_map = map; // eslint-disable-line camelcase
+					}
+					var stream = uglify.OutputStream(output); // eslint-disable-line new-cap
+					ast.print(stream);
+					if(map) map = map + "";
+					stream = stream + "";
+					asset.__UglifyJsPlugin = compilation.assets[file] = (map ?
+						new SourceMapSource(stream, file, JSON.parse(map), input, inputSourceMap) :
+						new RawSource(stream));
+					if(warnings.length > 0) {
+						compilation.warnings.push(new Error(file + " from UglifyJs\n" + warnings.join("\n")));
+					}
+				} catch(err) {
+					if(err.line) {
+						var original = sourceMap && sourceMap.originalPositionFor({
+							line: err.line,
+							column: err.col
+						});
+						if(original && original.source) {
+							compilation.errors.push(new Error(file + " from UglifyJs\n" + err.message + " [" + requestShortener.shorten(original.source) + ":" + original.line + "," + original.column + "]"));
+						} else {
+							compilation.errors.push(new Error(file + " from UglifyJs\n" + err.message + " [" + file + ":" + err.line + "," + err.col + "]"));
+						}
+					} else if(err.msg) {
+						compilation.errors.push(new Error(file + " from UglifyJs\n" + err.msg));
+					} else
+						compilation.errors.push(new Error(file + " from UglifyJs\n" + err.stack));
+				} finally {
+					uglify.AST_Node.warn_function = oldWarnFunction; // eslint-disable-line camelcase
+				}
+			});
+			callback();
+		});
+		compilation.plugin("normal-module-loader", function(context) {
+			context.minimize = true;
+		});
+	});
+};

package/lib/removeAndDo.js

@@ -1,13 +1,13 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-module.exports = function removeAndDo(collection, thing, action) {
-	var idx = this[collection].indexOf(thing);
-	if(idx >= 0) {
-		this[collection].splice(idx, 1);
-		thing[action](this);
-		return true;
-	}
-	return false;
-};
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+module.exports = function removeAndDo(collection, thing, action) {
+	var idx = this[collection].indexOf(thing);
+	if(idx >= 0) {
+		this[collection].splice(idx, 1);
+		thing[action](this);
+		return true;
+	}
+	return false;
+};

package/lib/web/WebEnvironmentPlugin.js

@@ -1,16 +1,16 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-function WebEnvironmentPlugin(inputFileSystem, outputFileSystem) {
-	this.inputFileSystem = inputFileSystem;
-	this.outputFileSystem = outputFileSystem;
-}
-module.exports = WebEnvironmentPlugin;
-WebEnvironmentPlugin.prototype.apply = function(compiler) {
-	var inputFileSystem = compiler.inputFileSystem = this.inputFileSystem;
-	compiler.resolvers.normal.fileSystem = inputFileSystem;
-	compiler.resolvers.context.fileSystem = inputFileSystem;
-	compiler.resolvers.loader.fileSystem = inputFileSystem;
-	compiler.outputFileSystem = this.outputFileSystem;
-};
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+function WebEnvironmentPlugin(inputFileSystem, outputFileSystem) {
+	this.inputFileSystem = inputFileSystem;
+	this.outputFileSystem = outputFileSystem;
+}
+module.exports = WebEnvironmentPlugin;
+WebEnvironmentPlugin.prototype.apply = function(compiler) {
+	var inputFileSystem = compiler.inputFileSystem = this.inputFileSystem;
+	compiler.resolvers.normal.fileSystem = inputFileSystem;
+	compiler.resolvers.context.fileSystem = inputFileSystem;
+	compiler.resolvers.loader.fileSystem = inputFileSystem;
+	compiler.outputFileSystem = this.outputFileSystem;
+};

package/lib/webpack.js

@@ -1,113 +1,113 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-var Compiler = require("./Compiler");
-var MultiCompiler = require("./MultiCompiler");
-var NodeEnvironmentPlugin = require("./node/NodeEnvironmentPlugin");
-var WebpackOptionsApply = require("./WebpackOptionsApply");
-var WebpackOptionsDefaulter = require("./WebpackOptionsDefaulter");
-
-function webpack(options, callback) {
-	var compiler;
-	if(Array.isArray(options)) {
-		compiler = new MultiCompiler(options.map(function(options) {
-			return webpack(options);
-		}));
-	} else if(typeof options === "object") {
-		new WebpackOptionsDefaulter().process(options);
-
-		compiler = new Compiler();
-		compiler.options = options;
-		compiler.options = new WebpackOptionsApply().process(options, compiler);
-		new NodeEnvironmentPlugin().apply(compiler);
-		compiler.applyPlugins("environment");
-		compiler.applyPlugins("after-environment");
-	} else {
-		throw new Error("Invalid argument: options");
-	}
-	if(callback) {
-		if(typeof callback !== "function") throw new Error("Invalid argument: callback");
-		if(options.watch === true || (Array.isArray(options) &&
-				options.some(function(o) {
-					return o.watch;
-				}))) {
-			var watchOptions = (!Array.isArray(options) ? options : options[0]).watchOptions || {};
-			// TODO remove this in next major version
-			var watchDelay = (!Array.isArray(options) ? options : options[0]).watchDelay;
-			if(watchDelay) {
-				console.warn("options.watchDelay is deprecated: Use 'options.watchOptions.aggregateTimeout' instead");
-				watchOptions.aggregateTimeout = watchDelay;
-			}
-			return compiler.watch(watchOptions, callback);
-		}
-		compiler.run(callback);
-	}
-	return compiler;
-}
-exports = module.exports = webpack;
-
-webpack.WebpackOptionsDefaulter = WebpackOptionsDefaulter;
-webpack.WebpackOptionsApply = WebpackOptionsApply;
-webpack.Compiler = Compiler;
-webpack.MultiCompiler = MultiCompiler;
-webpack.NodeEnvironmentPlugin = NodeEnvironmentPlugin;
-
-function exportPlugins(exports, path, plugins) {
-	plugins.forEach(function(name) {
-		Object.defineProperty(exports, name, {
-			configurable: false,
-			enumerable: true,
-			get: function() {
-				return require(path + "/" + name);
-			}
-		});
-	});
-}
-
-exportPlugins(exports, ".", [
-	"DefinePlugin",
-	"NormalModuleReplacementPlugin",
-	"ContextReplacementPlugin",
-	"IgnorePlugin",
-	"WatchIgnorePlugin",
-	"BannerPlugin",
-	"PrefetchPlugin",
-	"AutomaticPrefetchPlugin",
-	"ProvidePlugin",
-	"HotModuleReplacementPlugin",
-	"ResolverPlugin",
-	"SourceMapDevToolPlugin",
-	"EvalSourceMapDevToolPlugin",
-	"EvalDevToolModulePlugin",
-	"CachePlugin",
-	"ExtendedAPIPlugin",
-	"ExternalsPlugin",
-	"JsonpTemplatePlugin",
-	"LibraryTemplatePlugin",
-	"LoaderTargetPlugin",
-	"MemoryOutputFileSystem",
-	"ProgressPlugin",
-	"SetVarMainTemplatePlugin",
-	"UmdMainTemplatePlugin",
-	"NoErrorsPlugin",
-	"NewWatchingPlugin",
-	"OldWatchingPlugin",
-	"EnvironmentPlugin",
-	"DllPlugin",
-	"DllReferencePlugin",
-	"NamedModulesPlugin"
-]);
-exportPlugins(exports.optimize = {}, "./optimize", [
-	"AggressiveMergingPlugin",
-	"CommonsChunkPlugin",
-	"DedupePlugin",
-	"LimitChunkCountPlugin",
-	"MinChunkSizePlugin",
-	"OccurenceOrderPlugin",
-	"OccurrenceOrderPlugin",
-	"UglifyJsPlugin"
-]);
-exportPlugins(exports.dependencies = {}, "./dependencies", [
-	"LabeledModulesPlugin"
-]);
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+var Compiler = require("./Compiler");
+var MultiCompiler = require("./MultiCompiler");
+var NodeEnvironmentPlugin = require("./node/NodeEnvironmentPlugin");
+var WebpackOptionsApply = require("./WebpackOptionsApply");
+var WebpackOptionsDefaulter = require("./WebpackOptionsDefaulter");
+
+function webpack(options, callback) {
+	var compiler;
+	if(Array.isArray(options)) {
+		compiler = new MultiCompiler(options.map(function(options) {
+			return webpack(options);
+		}));
+	} else if(typeof options === "object") {
+		new WebpackOptionsDefaulter().process(options);
+
+		compiler = new Compiler();
+		compiler.options = options;
+		compiler.options = new WebpackOptionsApply().process(options, compiler);
+		new NodeEnvironmentPlugin().apply(compiler);
+		compiler.applyPlugins("environment");
+		compiler.applyPlugins("after-environment");
+	} else {
+		throw new Error("Invalid argument: options");
+	}
+	if(callback) {
+		if(typeof callback !== "function") throw new Error("Invalid argument: callback");
+		if(options.watch === true || (Array.isArray(options) &&
+				options.some(function(o) {
+					return o.watch;
+				}))) {
+			var watchOptions = (!Array.isArray(options) ? options : options[0]).watchOptions || {};
+			// TODO remove this in next major version
+			var watchDelay = (!Array.isArray(options) ? options : options[0]).watchDelay;
+			if(watchDelay) {
+				console.warn("options.watchDelay is deprecated: Use 'options.watchOptions.aggregateTimeout' instead");
+				watchOptions.aggregateTimeout = watchDelay;
+			}
+			return compiler.watch(watchOptions, callback);
+		}
+		compiler.run(callback);
+	}
+	return compiler;
+}
+exports = module.exports = webpack;
+
+webpack.WebpackOptionsDefaulter = WebpackOptionsDefaulter;
+webpack.WebpackOptionsApply = WebpackOptionsApply;
+webpack.Compiler = Compiler;
+webpack.MultiCompiler = MultiCompiler;
+webpack.NodeEnvironmentPlugin = NodeEnvironmentPlugin;
+
+function exportPlugins(exports, path, plugins) {
+	plugins.forEach(function(name) {
+		Object.defineProperty(exports, name, {
+			configurable: false,
+			enumerable: true,
+			get: function() {
+				return require(path + "/" + name);
+			}
+		});
+	});
+}
+
+exportPlugins(exports, ".", [
+	"DefinePlugin",
+	"NormalModuleReplacementPlugin",
+	"ContextReplacementPlugin",
+	"IgnorePlugin",
+	"WatchIgnorePlugin",
+	"BannerPlugin",
+	"PrefetchPlugin",
+	"AutomaticPrefetchPlugin",
+	"ProvidePlugin",
+	"HotModuleReplacementPlugin",
+	"ResolverPlugin",
+	"SourceMapDevToolPlugin",
+	"EvalSourceMapDevToolPlugin",
+	"EvalDevToolModulePlugin",
+	"CachePlugin",
+	"ExtendedAPIPlugin",
+	"ExternalsPlugin",
+	"JsonpTemplatePlugin",
+	"LibraryTemplatePlugin",
+	"LoaderTargetPlugin",
+	"MemoryOutputFileSystem",
+	"ProgressPlugin",
+	"SetVarMainTemplatePlugin",
+	"UmdMainTemplatePlugin",
+	"NoErrorsPlugin",
+	"NewWatchingPlugin",
+	"OldWatchingPlugin",
+	"EnvironmentPlugin",
+	"DllPlugin",
+	"DllReferencePlugin",
+	"NamedModulesPlugin"
+]);
+exportPlugins(exports.optimize = {}, "./optimize", [
+	"AggressiveMergingPlugin",
+	"CommonsChunkPlugin",
+	"DedupePlugin",
+	"LimitChunkCountPlugin",
+	"MinChunkSizePlugin",
+	"OccurenceOrderPlugin",
+	"OccurrenceOrderPlugin",
+	"UglifyJsPlugin"
+]);
+exportPlugins(exports.dependencies = {}, "./dependencies", [
+	"LabeledModulesPlugin"
+]);

package/lib/webpack.web.js

@@ -1,27 +1,27 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-var Compiler = require("./Compiler");
-var WebEnvironmentPlugin = require("./web/WebEnvironmentPlugin");
-var WebpackOptionsApply = require("./WebpackOptionsApply");
-var WebpackOptionsDefaulter = require("./WebpackOptionsDefaulter");
-
-function webpack(options, callback) {
-	new WebpackOptionsDefaulter().process(options);
-
-	var compiler = new Compiler();
-	compiler.options = options;
-	compiler.options = new WebpackOptionsApply().process(options, compiler);
-	new WebEnvironmentPlugin(options.inputFileSystem, options.outputFileSystem).apply(compiler);
-	if(callback) {
-		compiler.run(callback);
-	}
-	return compiler;
-}
-module.exports = webpack;
-
-webpack.WebpackOptionsDefaulter = WebpackOptionsDefaulter;
-webpack.WebpackOptionsApply = WebpackOptionsApply;
-webpack.Compiler = Compiler;
-webpack.WebEnvironmentPlugin = WebEnvironmentPlugin;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+var Compiler = require("./Compiler");
+var WebEnvironmentPlugin = require("./web/WebEnvironmentPlugin");
+var WebpackOptionsApply = require("./WebpackOptionsApply");
+var WebpackOptionsDefaulter = require("./WebpackOptionsDefaulter");
+
+function webpack(options, callback) {
+	new WebpackOptionsDefaulter().process(options);
+
+	var compiler = new Compiler();
+	compiler.options = options;
+	compiler.options = new WebpackOptionsApply().process(options, compiler);
+	new WebEnvironmentPlugin(options.inputFileSystem, options.outputFileSystem).apply(compiler);
+	if(callback) {
+		compiler.run(callback);
+	}
+	return compiler;
+}
+module.exports = webpack;
+
+webpack.WebpackOptionsDefaulter = WebpackOptionsDefaulter;
+webpack.WebpackOptionsApply = WebpackOptionsApply;
+webpack.Compiler = Compiler;
+webpack.WebEnvironmentPlugin = WebEnvironmentPlugin;