webpack 2.3.3 → 2.5.1

package/lib/EntryModuleNotFoundError.js

@@ -2,15 +2,21 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
-function EntryModuleNotFoundError(err) {
-	Error.call(this);
-	this.name = "EntryModuleNotFoundError";
-	this.message = "Entry module not found: " + err;
-	this.details = err.details;
-	this.error = err;
-	Error.captureStackTrace(this, EntryModuleNotFoundError);
+"use strict";
+
+const WebpackError = require("./WebpackError");
+
+class EntryModuleNotFoundError extends WebpackError {
+	constructor(err) {
+		super();
+
+		this.name = "EntryModuleNotFoundError";
+		this.message = "Entry module not found: " + err;
+		this.details = err.details;
+		this.error = err;
+
+		Error.captureStackTrace(this, this.constructor);
+	}
 }
-module.exports = EntryModuleNotFoundError;
 
-EntryModuleNotFoundError.prototype = Object.create(Error.prototype);
-EntryModuleNotFoundError.prototype.constructor = EntryModuleNotFoundError;
+module.exports = EntryModuleNotFoundError;

package/lib/ExtendedAPIPlugin.js

@@ -9,10 +9,12 @@ const ParserHelpers = require("./ParserHelpers");
 const NullFactory = require("./NullFactory");
 
 const REPLACEMENTS = {
-	__webpack_hash__: "__webpack_require__.h" // eslint-disable-line camelcase
+	__webpack_hash__: "__webpack_require__.h", // eslint-disable-line camelcase
+	__webpack_chunkname__: "__webpack_require__.cn" // eslint-disable-line camelcase
 };
 const REPLACEMENT_TYPES = {
-	__webpack_hash__: "string" // eslint-disable-line camelcase
+	__webpack_hash__: "string", // eslint-disable-line camelcase
+	__webpack_chunkname__: "string" // eslint-disable-line camelcase
 };
 
 class ExtendedAPIPlugin {
@@ -25,6 +27,9 @@ class ExtendedAPIPlugin {
 				buf.push("");
 				buf.push("// __webpack_hash__");
 				buf.push(`${this.requireFn}.h = ${JSON.stringify(hash)};`);
+				buf.push("");
+				buf.push("// __webpack_chunkname__");
+				buf.push(`${this.requireFn}.cn = ${JSON.stringify(chunk.name)};`);
 				return this.asString(buf);
 			});
 			compilation.mainTemplate.plugin("global-hash", () => true);

package/lib/ExternalModule.js

@@ -35,7 +35,7 @@ class ExternalModule extends Module {
 	}
 
 	build(options, compilation, resolver, fs, callback) {
-		this.builtTime = new Date().getTime();
+		this.builtTime = Date.now();
 		callback();
 	}
 

package/lib/ExternalModuleFactoryPlugin.js

@@ -2,20 +2,21 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
-var ExternalModule = require("./ExternalModule");
+"use strict";
 
-function ExternalModuleFactoryPlugin(type, externals) {
-	this.type = type;
-	this.externals = externals;
-}
-module.exports = ExternalModuleFactoryPlugin;
+const ExternalModule = require("./ExternalModule");
+
+class ExternalModuleFactoryPlugin {
+	constructor(type, externals) {
+		this.type = type;
+		this.externals = externals;
+	}
 
-ExternalModuleFactoryPlugin.prototype.apply = function(normalModuleFactory) {
-	var globalType = this.type;
-	normalModuleFactory.plugin("factory", function(factory) {
-		return function(data, callback) {
-			var context = data.context;
-			var dependency = data.dependencies[0];
+	apply(normalModuleFactory) {
+		const globalType = this.type;
+		normalModuleFactory.plugin("factory", factory => (data, callback) => {
+			const context = data.context;
+			const dependency = data.dependencies[0];
 
 			function handleExternal(value, type, callback) {
 				if(typeof type === "function") {
@@ -25,7 +26,7 @@ ExternalModuleFactoryPlugin.prototype.apply = function(normalModuleFactory) {
 				if(value === false) return factory(data, callback);
 				if(value === true) value = dependency.request;
 				if(typeof type === "undefined" && /^[a-z0-9]+ /.test(value)) {
-					var idx = value.indexOf(" ");
+					const idx = value.indexOf(" ");
 					type = value.substr(0, idx);
 					value = value.substr(idx + 1);
 				}
@@ -38,13 +39,14 @@ ExternalModuleFactoryPlugin.prototype.apply = function(normalModuleFactory) {
 						return handleExternal(dependency.request, callback);
 					}
 				} else if(Array.isArray(externals)) {
-					var i = 0;
+					let i = 0;
 					(function next() {
-						var handleExternalsAndCallback = function handleExternalsAndCallback(err, module) {
+						let asyncFlag;
+						const handleExternalsAndCallback = function handleExternalsAndCallback(err, module) {
 							if(err) return callback(err);
 							if(!module) {
-								if(async) {
-									async = false;
+								if(asyncFlag) {
+									asyncFlag = false;
 									return;
 								}
 								return next();
@@ -53,11 +55,11 @@ ExternalModuleFactoryPlugin.prototype.apply = function(normalModuleFactory) {
 						};
 
 						do {
-							var async = true;
+							asyncFlag = true;
 							if(i >= externals.length) return callback();
 							handleExternals(externals[i++], handleExternalsAndCallback);
-						} while (!async); // eslint-disable-line keyword-spacing
-						async = false;
+						} while (!asyncFlag); // eslint-disable-line keyword-spacing
+						asyncFlag = false;
 					}());
 					return;
 				} else if(externals instanceof RegExp) {
@@ -83,6 +85,7 @@ ExternalModuleFactoryPlugin.prototype.apply = function(normalModuleFactory) {
 				if(!module) return handleExternal(false, callback);
 				return callback(null, module);
 			}));
-		}.bind(this);
-	}.bind(this));
-};
+		});
+	}
+}
+module.exports = ExternalModuleFactoryPlugin;

package/lib/FlagDependencyUsagePlugin.js

@@ -2,92 +2,80 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
-function FlagDependencyUsagePlugin() {
+"use strict";
 
-}
-module.exports = FlagDependencyUsagePlugin;
+class FlagDependencyUsagePlugin {
+	apply(compiler) {
+		compiler.plugin("compilation", compilation => {
+			compilation.plugin("optimize-modules-advanced", modules => {
 
-FlagDependencyUsagePlugin.prototype.apply = function(compiler) {
-	compiler.plugin("compilation", function(compilation) {
-		compilation.plugin("optimize-modules-advanced", function(modules) {
+				modules.forEach(module => module.used = false);
 
-			modules.forEach(function(module) {
-				module.used = false;
-			});
+				const queue = [];
+				compilation.chunks.forEach(chunk => {
+					if(chunk.entryModule) {
+						processModule(chunk.entryModule, true);
+					}
+				});
 
-			var queue = [];
-			compilation.chunks.forEach(function(chunk) {
-				if(chunk.entryModule) {
-					processModule(chunk.entryModule, true);
+				while(queue.length) {
+					const queueItem = queue.pop();
+					processDependenciesBlock(queueItem[0], queueItem[1]);
 				}
-			});
-
-			while(queue.length) {
-				var queueItem = queue.pop();
-				processDependenciesBlock(queueItem[0], queueItem[1]);
-			}
 
-			function processModule(module, usedExports) {
-				module.used = true;
-				if(module.usedExports === true)
-					return;
-				else if(usedExports === true)
-					module.usedExports = true;
-				else if(Array.isArray(usedExports)) {
-					var old = module.usedExports ? module.usedExports.length : -1;
-					module.usedExports = addToSet(module.usedExports || [], usedExports);
-					if(module.usedExports.length === old)
+				function processModule(module, usedExports) {
+					module.used = true;
+					if(module.usedExports === true)
 						return;
-				} else if(Array.isArray(module.usedExports))
-					return;
-				else
-					module.usedExports = false;
-
-				queue.push([module, module.usedExports]);
-			}
+					else if(usedExports === true)
+						module.usedExports = true;
+					else if(Array.isArray(usedExports)) {
+						var old = module.usedExports ? module.usedExports.length : -1;
+						module.usedExports = addToSet(module.usedExports || [], usedExports);
+						if(module.usedExports.length === old)
+							return;
+					} else if(Array.isArray(module.usedExports))
+						return;
+					else
+						module.usedExports = false;
 
-			function processDependenciesBlock(depBlock, usedExports) {
-				depBlock.dependencies.forEach(function(dep) {
-					processDependency(dep, usedExports);
-				});
-				depBlock.variables.forEach(function(variable) {
-					variable.dependencies.forEach(function(dep) {
-						processDependency(dep, usedExports);
-					});
-				});
-				depBlock.blocks.forEach(function(block) {
-					queue.push([block, usedExports]);
-				});
-			}
+					queue.push([module, module.usedExports]);
+				}
 
-			function processDependency(dep, usedExports) {
-				var reference = dep.getReference && dep.getReference();
-				if(!reference) return;
-				var module = reference.module;
-				var importedNames = reference.importedNames;
-				var oldUsed = module.used;
-				var oldUsedExports = module.usedExports;
-				if(!oldUsed || (importedNames && (!oldUsedExports || !isSubset(oldUsedExports, importedNames)))) {
-					processModule(module, importedNames);
+				function processDependenciesBlock(depBlock, usedExports) {
+					depBlock.dependencies.forEach(dep => processDependency(dep));
+					depBlock.variables.forEach(variable => variable.dependencies.forEach(dep => processDependency(dep)));
+					depBlock.blocks.forEach(block => queue.push([block, usedExports]));
 				}
-			}
 
-		});
+				function processDependency(dep) {
+					const reference = dep.getReference && dep.getReference();
+					if(!reference) return;
+					const module = reference.module;
+					const importedNames = reference.importedNames;
+					const oldUsed = module.used;
+					const oldUsedExports = module.usedExports;
+					if(!oldUsed || (importedNames && (!oldUsedExports || !isSubset(oldUsedExports, importedNames)))) {
+						processModule(module, importedNames);
+					}
+				}
 
-		function addToSet(a, b) {
-			b.forEach(function(item) {
-				if(a.indexOf(item) < 0)
-					a.push(item);
 			});
-			return a;
-		}
 
-		function isSubset(biggerSet, subset) {
-			if(biggerSet === true) return true;
-			if(subset === true) return false;
-			return subset.every(function(item) {
-				return biggerSet.indexOf(item) >= 0;
-			});
-		}
-	});
-};
+			function addToSet(a, b) {
+				b.forEach(item => {
+					if(a.indexOf(item) < 0)
+						a.push(item);
+				});
+				return a;
+			}
+
+			function isSubset(biggerSet, subset) {
+				if(biggerSet === true) return true;
+				if(subset === true) return false;
+				return subset.every(item => biggerSet.indexOf(item) >= 0);
+			}
+		});
+	}
+}
+module.exports = FlagDependencyUsagePlugin;

package/lib/HotModuleReplacement.runtime.js

@@ -8,7 +8,7 @@ module.exports = function() {
 	var hotApplyOnUpdate = true;
 	var hotCurrentHash = $hash$; // eslint-disable-line no-unused-vars
 	var hotCurrentModuleData = {};
-	var hotMainModule = true; // eslint-disable-line no-unused-vars
+	var hotCurrentChildModule; // eslint-disable-line no-unused-vars
 	var hotCurrentParents = []; // eslint-disable-line no-unused-vars
 	var hotCurrentParentsTemp = []; // eslint-disable-line no-unused-vars
 
@@ -20,14 +20,16 @@ module.exports = function() {
 				if(installedModules[request]) {
 					if(installedModules[request].parents.indexOf(moduleId) < 0)
 						installedModules[request].parents.push(moduleId);
-				} else hotCurrentParents = [moduleId];
+				} else {
+					hotCurrentParents = [moduleId];
+					hotCurrentChildModule = request;
+				}
 				if(me.children.indexOf(request) < 0)
 					me.children.push(request);
 			} else {
 				console.warn("[HMR] unexpected require(" + request + ") from disposed module " + moduleId);
 				hotCurrentParents = [];
 			}
-			hotMainModule = false;
 			return $require$(request);
 		};
 		var ObjectFactory = function ObjectFactory(name) {
@@ -43,34 +45,31 @@ module.exports = function() {
 			};
 		};
 		for(var name in $require$) {
-			if(Object.prototype.hasOwnProperty.call($require$, name)) {
+			if(Object.prototype.hasOwnProperty.call($require$, name) && name !== "e") {
 				Object.defineProperty(fn, name, ObjectFactory(name));
 			}
 		}
-		Object.defineProperty(fn, "e", {
-			enumerable: true,
-			value: function(chunkId) {
-				if(hotStatus === "ready")
-					hotSetStatus("prepare");
-				hotChunksLoading++;
-				return $require$.e(chunkId).then(finishChunkLoading, function(err) {
-					finishChunkLoading();
-					throw err;
-				});
+		fn.e = function(chunkId) {
+			if(hotStatus === "ready")
+				hotSetStatus("prepare");
+			hotChunksLoading++;
+			return $require$.e(chunkId).then(finishChunkLoading, function(err) {
+				finishChunkLoading();
+				throw err;
+			});
 
-				function finishChunkLoading() {
-					hotChunksLoading--;
-					if(hotStatus === "prepare") {
-						if(!hotWaitingFilesMap[chunkId]) {
-							hotEnsureUpdateChunk(chunkId);
-						}
-						if(hotChunksLoading === 0 && hotWaitingFiles === 0) {
-							hotUpdateDownloaded();
-						}
+			function finishChunkLoading() {
+				hotChunksLoading--;
+				if(hotStatus === "prepare") {
+					if(!hotWaitingFilesMap[chunkId]) {
+						hotEnsureUpdateChunk(chunkId);
+					}
+					if(hotChunksLoading === 0 && hotWaitingFiles === 0) {
+						hotUpdateDownloaded();
 					}
 				}
 			}
-		});
+		};
 		return fn;
 	}
 
@@ -82,7 +81,7 @@ module.exports = function() {
 			_selfAccepted: false,
 			_selfDeclined: false,
 			_disposeHandlers: [],
-			_main: hotMainModule,
+			_main: hotCurrentChildModule !== moduleId,
 
 			// Module API
 			active: true,
@@ -135,7 +134,7 @@ module.exports = function() {
 			//inherit from previous dispose call
 			data: hotCurrentModuleData[moduleId]
 		};
-		hotMainModule = true;
+		hotCurrentChildModule = undefined;
 		return hot;
 	}
 
@@ -173,7 +172,6 @@ module.exports = function() {
 				hotSetStatus("idle");
 				return null;
 			}
-
 			hotRequestedFilesMap = {};
 			hotWaitingFilesMap = {};
 			hotAvailableFilesMap = update.c;

package/lib/HotModuleReplacementPlugin.js

@@ -109,10 +109,8 @@ HotModuleReplacementPlugin.prototype.apply = function(compiler) {
 				c: {}
 			};
 			Object.keys(records.chunkHashs).forEach(function(chunkId) {
-				chunkId = +chunkId;
-				var currentChunk = this.chunks.filter(function(chunk) {
-					return chunk.id === chunkId;
-				})[0];
+				chunkId = isNaN(+chunkId) ? chunkId : +chunkId;
+				var currentChunk = this.chunks.find(chunk => chunk.id === chunkId);
 				if(currentChunk) {
 					var newModules = currentChunk.modules.filter(function(module) {
 						return module.hotUpdate;
@@ -171,7 +169,7 @@ HotModuleReplacementPlugin.prototype.apply = function(compiler) {
 				hotInitCode
 				.replace(/\$require\$/g, this.requireFn)
 				.replace(/\$hash\$/g, JSON.stringify(hash))
-				.replace(/\/\*foreachInstalledChunks\*\//g, chunk.chunks.length > 0 ? "for(var chunkId in installedChunks)" : "var chunkId = " + chunk.id + ";")
+				.replace(/\/\*foreachInstalledChunks\*\//g, chunk.chunks.length > 0 ? "for(var chunkId in installedChunks)" : "var chunkId = " + JSON.stringify(chunk.id) + ";")
 			]);
 		});
 

package/lib/IgnorePlugin.js

@@ -8,29 +8,60 @@ class IgnorePlugin {
 	constructor(resourceRegExp, contextRegExp) {
 		this.resourceRegExp = resourceRegExp;
 		this.contextRegExp = contextRegExp;
+
+		this.checkIgnore = this.checkIgnore.bind(this);
+	}
+
+	/*
+	 * Only returns true if a "resourceRegExp" exists
+	 * and the resource given matches the regexp.
+	 */
+	checkResource(resource) {
+		if(!this.resourceRegExp) {
+			return false;
+		}
+		return this.resourceRegExp.test(resource);
+	}
+
+	/*
+	 * Returns true if contextRegExp does not exist
+	 * or if context matches the given regexp.
+	 */
+	checkContext(context) {
+		if(!this.contextRegExp) {
+			return true;
+		}
+		return this.contextRegExp.test(context);
+	}
+
+	/*
+	 * Returns true if result should be ignored.
+	 * false if it shouldn't.
+	 *
+	 * Not that if "contextRegExp" is given, both the "resourceRegExp"
+	 * and "contextRegExp" have to match.
+	 */
+	checkResult(result) {
+		if(!result) {
+			return true;
+		}
+		return this.checkResource(result.request) && this.checkContext(result.context);
+	}
+
+	checkIgnore(result, callback) {
+		// check if result is ignored
+		if(this.checkResult(result)) {
+			return callback();
+		}
+		return callback(null, result);
 	}
 
 	apply(compiler) {
-		const resourceRegExp = this.resourceRegExp;
-		const contextRegExp = this.contextRegExp;
 		compiler.plugin("normal-module-factory", (nmf) => {
-			nmf.plugin("before-resolve", (result, callback) => {
-				if(!result) return callback();
-				if(resourceRegExp.test(result.request) &&
-					(!contextRegExp || contextRegExp.test(result.context))) {
-					return callback();
-				}
-				return callback(null, result);
-			});
+			nmf.plugin("before-resolve", this.checkIgnore);
 		});
 		compiler.plugin("context-module-factory", (cmf) => {
-			cmf.plugin("before-resolve", (result, callback) => {
-				if(!result) return callback();
-				if(resourceRegExp.test(result.request)) {
-					return callback();
-				}
-				return callback(null, result);
-			});
+			cmf.plugin("before-resolve", this.checkIgnore);
 		});
 	}
 }

package/lib/JsonpChunkTemplatePlugin.js

@@ -2,30 +2,30 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
-var ConcatSource = require("webpack-sources").ConcatSource;
+"use strict";
 
-function JsonpChunkTemplatePlugin() {}
-module.exports = JsonpChunkTemplatePlugin;
+const ConcatSource = require("webpack-sources").ConcatSource;
 
-JsonpChunkTemplatePlugin.prototype.apply = function(chunkTemplate) {
-	chunkTemplate.plugin("render", function(modules, chunk) {
-		var jsonpFunction = this.outputOptions.jsonpFunction;
-		var source = new ConcatSource();
-		source.add(jsonpFunction + "(" + JSON.stringify(chunk.ids) + ",");
-		source.add(modules);
-		var entries = [chunk.entryModule].filter(Boolean).map(function(m) {
-			return m.id;
+class JsonpChunkTemplatePlugin {
+	apply(chunkTemplate) {
+		chunkTemplate.plugin("render", function(modules, chunk) {
+			const jsonpFunction = this.outputOptions.jsonpFunction;
+			const source = new ConcatSource();
+			source.add(`${jsonpFunction}(${JSON.stringify(chunk.ids)},`);
+			source.add(modules);
+			const entries = [chunk.entryModule].filter(Boolean).map(m => m.id);
+			if(entries.length > 0) {
+				source.add(`,${JSON.stringify(entries)}`);
+			}
+			source.add(")");
+			return source;
+		});
+		chunkTemplate.plugin("hash", function(hash) {
+			hash.update("JsonpChunkTemplatePlugin");
+			hash.update("3");
+			hash.update(`${this.outputOptions.jsonpFunction}`);
+			hash.update(`${this.outputOptions.library}`);
 		});
-		if(entries.length > 0) {
-			source.add("," + JSON.stringify(entries));
-		}
-		source.add(")");
-		return source;
-	});
-	chunkTemplate.plugin("hash", function(hash) {
-		hash.update("JsonpChunkTemplatePlugin");
-		hash.update("3");
-		hash.update(this.outputOptions.jsonpFunction + "");
-		hash.update(this.outputOptions.library + "");
-	});
-};
+	}
+}
+module.exports = JsonpChunkTemplatePlugin;