webpack 2.3.1 → 2.4.1

package/lib/ModuleFilenameHelpers.js

@@ -2,7 +2,9 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
-var ModuleFilenameHelpers = exports;
+"use strict";
+
+const ModuleFilenameHelpers = exports;
 
 ModuleFilenameHelpers.ALL_LOADERS_RESOURCE = "[all-loaders][resource]";
 ModuleFilenameHelpers.REGEXP_ALL_LOADERS_RESOURCE = /\[all-?loaders\]\[resource\]/gi;
@@ -26,17 +28,17 @@ ModuleFilenameHelpers.HASH = "[hash]";
 ModuleFilenameHelpers.REGEXP_HASH = /\[hash\]/gi;
 
 function getAfter(str, token) {
-	var idx = str.indexOf(token);
+	const idx = str.indexOf(token);
 	return idx < 0 ? "" : str.substr(idx);
 }
 
 function getBefore(str, token) {
-	var idx = str.lastIndexOf(token);
+	const idx = str.lastIndexOf(token);
 	return idx < 0 ? "" : str.substr(0, idx);
 }
 
 function getHash(str) {
-	var hash = require("crypto").createHash("md5");
+	const hash = require("crypto").createHash("md5");
 	hash.update(str);
 	return hash.digest("hex").substr(0, 4);
 }
@@ -47,12 +49,12 @@ function asRegExp(test) {
 }
 
 ModuleFilenameHelpers.createFilename = function createFilename(module, moduleFilenameTemplate, requestShortener) {
-	var absoluteResourcePath;
-	var hash;
-	var identifier;
-	var moduleId;
-	var shortIdentifier;
-	if(!module) module = "";
+	let absoluteResourcePath;
+	let hash;
+	let identifier;
+	let moduleId;
+	let shortIdentifier;
+	if(module === undefined) module = "";
 	if(typeof module === "string") {
 		shortIdentifier = requestShortener.shorten(module);
 		identifier = shortIdentifier;
@@ -63,14 +65,14 @@ ModuleFilenameHelpers.createFilename = function createFilename(module, moduleFil
 		shortIdentifier = module.readableIdentifier(requestShortener);
 		identifier = requestShortener.shorten(module.identifier());
 		moduleId = module.id;
-		absoluteResourcePath = module.resourcePath || module.identifier().split("!").pop();
+		absoluteResourcePath = module.identifier().split("!").pop();
 		hash = getHash(identifier);
 	}
-	var resource = shortIdentifier.split("!").pop();
-	var loaders = getBefore(shortIdentifier, "!");
-	var allLoaders = getBefore(identifier, "!");
-	var query = getAfter(resource, "?");
-	var resourcePath = resource.substr(0, resource.length - query.length);
+	const resource = shortIdentifier.split("!").pop();
+	const loaders = getBefore(shortIdentifier, "!");
+	const allLoaders = getBefore(identifier, "!");
+	const query = getAfter(resource, "?");
+	const resourcePath = resource.substr(0, resource.length - query.length);
 	if(typeof moduleFilenameTemplate === "function") {
 		return moduleFilenameTemplate({
 			identifier: identifier,
@@ -102,35 +104,33 @@ ModuleFilenameHelpers.createFooter = function createFooter(module, requestShorte
 	if(typeof module === "string") {
 		return [
 			"// WEBPACK FOOTER //",
-			"// " + requestShortener.shorten(module)
+			`// ${requestShortener.shorten(module)}`
 		].join("\n");
 	} else {
 		return [
 			"//////////////////",
 			"// WEBPACK FOOTER",
-			"// " + module.readableIdentifier(requestShortener),
-			"// module id = " + module.id,
-			"// module chunks = " + module.chunks.map(function(c) {
-				return c.id;
-			}).join(" ")
+			`// ${module.readableIdentifier(requestShortener)}`,
+			`// module id = ${module.id}`,
+			`// module chunks = ${module.chunks.map(c => c.id).join(" ")}`
 		].join("\n");
 	}
 };
 
 ModuleFilenameHelpers.replaceDuplicates = function replaceDuplicates(array, fn, comparator) {
-	var countMap = {};
-	var posMap = {};
-	array.forEach(function(item, idx) {
+	const countMap = Object.create(null);
+	const posMap = Object.create(null);
+	array.forEach((item, idx) => {
 		countMap[item] = (countMap[item] || []);
 		countMap[item].push(idx);
 		posMap[item] = 0;
 	});
 	if(comparator) {
-		Object.keys(countMap).forEach(function(item) {
+		Object.keys(countMap).forEach(item => {
 			countMap[item].sort(comparator);
 		});
 	}
-	return array.map(function(item, i) {
+	return array.map((item, i) => {
 		if(countMap[item].length > 1) {
 			if(comparator && countMap[item][0] === i)
 				return item;

package/lib/ModuleNotFoundError.js

@@ -4,7 +4,9 @@
 */
 "use strict";
 
-class ModuleNotFoundError extends Error {
+const WebpackError = require("./WebpackError");
+
+class ModuleNotFoundError extends WebpackError {
 	constructor(module, err, dependencies) {
 		super();
 

package/lib/ModuleParseError.js

@@ -4,9 +4,12 @@
 */
 "use strict";
 
-class ModuleParseError extends Error {
+const WebpackError = require("./WebpackError");
+
+class ModuleParseError extends WebpackError {
 	constructor(module, source, err) {
 		super();
+
 		this.name = "ModuleParseError";
 		this.message = "Module parse failed: " + module.request + " " + err.message;
 		this.message += "\nYou may need an appropriate loader to handle this file type.";
@@ -23,9 +26,8 @@ class ModuleParseError extends Error {
 		}
 		this.module = module;
 		this.error = err;
-		if(Error.hasOwnProperty("captureStackTrace")) {
-			Error.captureStackTrace(this, this.constructor);
-		}
+
+		Error.captureStackTrace(this, this.constructor);
 	}
 }
 

package/lib/ModuleWarning.js

@@ -4,10 +4,10 @@
 */
 "use strict";
 
+const WebpackError = require("./WebpackError");
 const cleanUp = require("./ErrorHelpers").cleanUp;
 
-class ModuleWarning extends Error {
-
+class ModuleWarning extends WebpackError {
 	constructor(module, warning) {
 		super();
 

package/lib/MultiCompiler.js

@@ -3,7 +3,7 @@
 	Author Tobias Koppers @sokra
 */
 var Tapable = require("tapable");
-var async = require("async");
+var asyncLib = require("async");
 var MultiWatching = require("./MultiWatching");
 var MultiStats = require("./MultiStats");
 
@@ -100,7 +100,7 @@ function runWithDependencies(compilers, fn, callback) {
 
 	function runCompilers(callback) {
 		if(remainingCompilers.length === 0) return callback();
-		async.map(getReadyCompilers(), function(compiler, callback) {
+		asyncLib.map(getReadyCompilers(), function(compiler, callback) {
 			fn(compiler, function(err) {
 				if(err) return callback(err);
 				fulfilledNames[compiler.name] = true;
@@ -119,11 +119,10 @@ MultiCompiler.prototype.watch = function(watchOptions, handler) {
 	var compilerStatus = this.compilers.map(function() {
 		return false;
 	});
-
 	runWithDependencies(this.compilers, function(compiler, callback) {
 		var compilerIdx = this.compilers.indexOf(compiler);
 		var firstRun = true;
-		var watching = compiler.watch(watchOptions, function(err, stats) {
+		var watching = compiler.watch(Array.isArray(watchOptions) ? watchOptions[compilerIdx] : watchOptions, function(err, stats) {
 			if(err)
 				handler(err);
 			if(stats) {

package/lib/MultiStats.js

@@ -11,7 +11,7 @@ const optionOrFallback = (optionValue, fallbackValue) => optionValue !== undefin
 class MultiStats {
 	constructor(stats) {
 		this.stats = stats;
-		this.hash = stats.map((stat) => stat.hash).join("");
+		this.hash = stats.map(stat => stat.hash).join("");
 	}
 
 	hasErrors() {
@@ -42,12 +42,12 @@ class MultiStats {
 		});
 		const obj = {
 			errors: jsons.reduce((arr, j) => {
-				return arr.concat(j.errors.map((msg) => {
+				return arr.concat(j.errors.map(msg => {
 					return `(${j.name}) ${msg}`;
 				}));
 			}, []),
 			warnings: jsons.reduce((arr, j) => {
-				return arr.concat(j.warnings.map((msg) => {
+				return arr.concat(j.warnings.map(msg => {
 					return `(${j.name}) ${msg}`;
 				}));
 			}, [])

package/lib/MultiWatching.js

@@ -4,7 +4,7 @@
 */
 "use strict";
 
-const async = require("async");
+const asyncLib = require("async");
 
 class MultiWatching {
 	constructor(watchings, compiler) {
@@ -19,7 +19,7 @@ class MultiWatching {
 	close(callback) {
 		if(callback === undefined) callback = () => { /*do nothing*/ };
 
-		async.forEach(this.watchings, (watching, finishedCallback) => {
+		asyncLib.forEach(this.watchings, (watching, finishedCallback) => {
 			watching.close(finishedCallback);
 		}, err => {
 			this.compiler.applyPlugins("watch-close");

package/lib/NamedChunksPlugin.js

@@ -0,0 +1,30 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+class NamedChunksPlugin {
+
+	static defaultNameResolver(chunk) {
+		return chunk.name || null;
+	}
+
+	constructor(nameResolver) {
+		this.nameResolver = nameResolver || NamedChunksPlugin.defaultNameResolver;
+	}
+
+	apply(compiler) {
+		compiler.plugin("compilation", (compilation) => {
+			compilation.plugin("before-chunk-ids", (chunks) => {
+				chunks.forEach((chunk) => {
+					if(chunk.id === null) {
+						chunk.id = this.nameResolver(chunk);
+					}
+				});
+			});
+		});
+	}
+}
+
+module.exports = NamedChunksPlugin;

package/lib/NodeStuffPlugin.js

@@ -2,95 +2,96 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
-var path = require("path");
-var ParserHelpers = require("./ParserHelpers");
-var ConstDependency = require("./dependencies/ConstDependency");
+"use strict";
 
-var NullFactory = require("./NullFactory");
+const path = require("path");
+const ParserHelpers = require("./ParserHelpers");
+const ConstDependency = require("./dependencies/ConstDependency");
 
-function NodeStuffPlugin(options) {
-	this.options = options;
-}
-module.exports = NodeStuffPlugin;
-NodeStuffPlugin.prototype.apply = function(compiler) {
-	var options = this.options;
-	compiler.plugin("compilation", function(compilation, params) {
-		compilation.dependencyFactories.set(ConstDependency, new NullFactory());
-		compilation.dependencyTemplates.set(ConstDependency, new ConstDependency.Template());
+const NullFactory = require("./NullFactory");
 
-		params.normalModuleFactory.plugin("parser", function(parser, parserOptions) {
+class NodeStuffPlugin {
+	constructor(options) {
+		this.options = options;
+	}
 
-			if(parserOptions.node === false)
-				return;
+	apply(compiler) {
+		const options = this.options;
+		compiler.plugin("compilation", (compilation, params) => {
+			compilation.dependencyFactories.set(ConstDependency, new NullFactory());
+			compilation.dependencyTemplates.set(ConstDependency, new ConstDependency.Template());
 
-			var localOptions = options;
-			if(parserOptions.node)
-				localOptions = Object.assign({}, localOptions, parserOptions.node);
+			params.normalModuleFactory.plugin("parser", (parser, parserOptions) => {
 
-			function setConstant(expressionName, value) {
-				parser.plugin("expression " + expressionName, function() {
-					this.state.current.addVariable(expressionName, JSON.stringify(value));
-					return true;
-				});
-			}
+				if(parserOptions.node === false)
+					return;
+
+				let localOptions = options;
+				if(parserOptions.node)
+					localOptions = Object.assign({}, localOptions, parserOptions.node);
 
-			function setModuleConstant(expressionName, fn) {
-				parser.plugin("expression " + expressionName, function() {
-					this.state.current.addVariable(expressionName, JSON.stringify(fn(this.state.module)));
-					return true;
+				function setConstant(expressionName, value) {
+					parser.plugin(`expression ${expressionName}`, function() {
+						this.state.current.addVariable(expressionName, JSON.stringify(value));
+						return true;
+					});
+				}
+
+				function setModuleConstant(expressionName, fn) {
+					parser.plugin(`expression ${expressionName}`, function() {
+						this.state.current.addVariable(expressionName, JSON.stringify(fn(this.state.module)));
+						return true;
+					});
+				}
+				const context = compiler.context;
+				if(localOptions.__filename === "mock") {
+					setConstant("__filename", "/index.js");
+				} else if(localOptions.__filename) {
+					setModuleConstant("__filename", module => path.relative(context, module.resource));
+				}
+				parser.plugin("evaluate Identifier __filename", function(expr) {
+					if(!this.state.module) return;
+					const resource = this.state.module.resource;
+					const i = resource.indexOf("?");
+					return ParserHelpers.evaluateToString(i < 0 ? resource : resource.substr(0, i))(expr);
 				});
-			}
-			var context = compiler.context;
-			if(localOptions.__filename === "mock") {
-				setConstant("__filename", "/index.js");
-			} else if(localOptions.__filename) {
-				setModuleConstant("__filename", function(module) {
-					return path.relative(context, module.resource);
+				if(localOptions.__dirname === "mock") {
+					setConstant("__dirname", "/");
+				} else if(localOptions.__dirname) {
+					setModuleConstant("__dirname", module => path.relative(context, module.context));
+				}
+				parser.plugin("evaluate Identifier __dirname", function(expr) {
+					if(!this.state.module) return;
+					return ParserHelpers.evaluateToString(this.state.module.context)(expr);
 				});
-			}
-			parser.plugin("evaluate Identifier __filename", function(expr) {
-				if(!this.state.module) return;
-				var resource = this.state.module.resource;
-				var i = resource.indexOf("?");
-				return ParserHelpers.evaluateToString(i < 0 ? resource : resource.substr(0, i))(expr);
-			});
-			if(localOptions.__dirname === "mock") {
-				setConstant("__dirname", "/");
-			} else if(localOptions.__dirname) {
-				setModuleConstant("__dirname", function(module) {
-					return path.relative(context, module.context);
+				parser.plugin("expression require.main", ParserHelpers.toConstantDependency("__webpack_require__.c[__webpack_require__.s]"));
+				parser.plugin(
+					"expression require.extensions",
+					ParserHelpers.expressionIsUnsupported("require.extensions is not supported by webpack. Use a loader instead.")
+				);
+				parser.plugin("expression module.loaded", ParserHelpers.toConstantDependency("module.l"));
+				parser.plugin("expression module.id", ParserHelpers.toConstantDependency("module.i"));
+				parser.plugin("expression module.exports", function() {
+					const module = this.state.module;
+					const isHarmony = module.meta && module.meta.harmonyModule;
+					if(!isHarmony)
+						return true;
 				});
-			}
-			parser.plugin("evaluate Identifier __dirname", function(expr) {
-				if(!this.state.module) return;
-				return ParserHelpers.evaluateToString(this.state.module.context)(expr);
-			});
-			parser.plugin("expression require.main", ParserHelpers.toConstantDependency("__webpack_require__.c[__webpack_require__.s]"));
-			parser.plugin(
-				"expression require.extensions",
-				ParserHelpers.expressionIsUnsupported("require.extensions is not supported by webpack. Use a loader instead.")
-			);
-			parser.plugin("expression module.loaded", ParserHelpers.toConstantDependency("module.l"));
-			parser.plugin("expression module.id", ParserHelpers.toConstantDependency("module.i"));
-			parser.plugin("expression module.exports", function() {
-				var module = this.state.module;
-				var isHarmony = module.meta && module.meta.harmonyModule;
-				if(!isHarmony)
-					return true;
-			});
-			parser.plugin("evaluate Identifier module.hot", ParserHelpers.evaluateToBoolean(false));
-			parser.plugin("expression module", function() {
-				var module = this.state.module;
-				var isHarmony = module.meta && module.meta.harmonyModule;
-				var moduleJsPath = path.join(__dirname, "..", "buildin", isHarmony ? "harmony-module.js" : "module.js");
-				if(module.context) {
-					moduleJsPath = path.relative(this.state.module.context, moduleJsPath);
-					if(!/^[A-Z]:/i.test(moduleJsPath)) {
-						moduleJsPath = "./" + moduleJsPath.replace(/\\/g, "/");
+				parser.plugin("evaluate Identifier module.hot", ParserHelpers.evaluateToBoolean(false));
+				parser.plugin("expression module", function() {
+					const module = this.state.module;
+					const isHarmony = module.meta && module.meta.harmonyModule;
+					let moduleJsPath = path.join(__dirname, "..", "buildin", isHarmony ? "harmony-module.js" : "module.js");
+					if(module.context) {
+						moduleJsPath = path.relative(this.state.module.context, moduleJsPath);
+						if(!/^[A-Z]:/i.test(moduleJsPath)) {
+							moduleJsPath = `./${moduleJsPath.replace(/\\/g, "/")}`;
+						}
 					}
-				}
-				return ParserHelpers.addParsedVariableToModule(this, "module", "require(" + JSON.stringify(moduleJsPath) + ")(module)");
+					return ParserHelpers.addParsedVariableToModule(this, "module", `require(${JSON.stringify(moduleJsPath)})(module)`);
+				});
 			});
 		});
-	});
-};
+	}
+}
+module.exports = NodeStuffPlugin;

package/lib/NormalModule.js

@@ -15,6 +15,7 @@ const ReplaceSource = require("webpack-sources").ReplaceSource;
 const CachedSource = require("webpack-sources").CachedSource;
 const LineToLineMappedSource = require("webpack-sources").LineToLineMappedSource;
 
+const WebpackError = require("./WebpackError");
 const Module = require("./Module");
 const ModuleParseError = require("./ModuleParseError");
 const ModuleBuildError = require("./ModuleBuildError");
@@ -42,8 +43,7 @@ function contextify(context, request) {
 	}).join("!");
 }
 
-class NonErrorEmittedError extends Error {
-
+class NonErrorEmittedError extends WebpackError {
 	constructor(error) {
 		super();
 
@@ -456,6 +456,10 @@ class NormalModule extends Module {
 		return new CachedSource(source);
 	}
 
+	originalSource() {
+		return this._source;
+	}
+
 	getHighestTimestamp(keys, timestampsByKey) {
 		let highestTimestamp = 0;
 		for(let i = 0; i < keys.length; i++) {