webpack 4.8.2 → 4.9.2

package/lib/Module.js

@@ -11,8 +11,8 @@ const ModuleReason = require("./ModuleReason");
 const SortableSet = require("./util/SortableSet");
 const Template = require("./Template");
 
-/** @typedef {typeof import("./Chunk")} Chunk */
-/** @typedef {typeof import("./RequestShortener")} RequestShortener */
+/** @typedef {import("./Chunk")} Chunk */
+/** @typedef {import("./RequestShortener")} RequestShortener */
 
 const EMPTY_RESOLVE_OPTIONS = {};
 
@@ -69,7 +69,7 @@ class Module extends DependenciesBlock {
 		this._chunks = new SortableSet(undefined, sortById);
 
 		// Info from Compilation (per Compilation)
-		/** @type {number | string} */
+		/** @type {number|string} */
 		this.id = null;
 		/** @type {number} */
 		this.index = null;

package/lib/ModuleDependencyError.js

@@ -7,7 +7,15 @@
 const WebpackError = require("./WebpackError");
 const formatLocation = require("./formatLocation");
 
-module.exports = class ModuleDependencyError extends WebpackError {
+/** @typedef {import("./Module")} Module */
+
+class ModuleDependencyError extends WebpackError {
+	/**
+	 * Creates an instance of ModuleDependencyError.
+	 * @param {Module} module module tied to dependency
+	 * @param {Error} err error thrown
+	 * @param {TODO} loc location of dependency
+	 */
 	constructor(module, err, loc) {
 		super();
 
@@ -22,4 +30,6 @@ module.exports = class ModuleDependencyError extends WebpackError {
 
 		Error.captureStackTrace(this, this.constructor);
 	}
-};
+}
+
+module.exports = ModuleDependencyError;

package/lib/NormalModuleFactory.js

@@ -46,6 +46,8 @@ const identToLoaderRequest = resultString => {
 	}
 };
 
+const dependencyCache = new WeakMap();
+
 class NormalModuleFactory extends Tapable {
 	constructor(context, resolverFactory, options) {
 		super();
@@ -329,7 +331,7 @@ class NormalModuleFactory extends Tapable {
 
 	create(data, callback) {
 		const dependencies = data.dependencies;
-		const cacheEntry = dependencies[0].__NormalModuleFactoryCache;
+		const cacheEntry = dependencyCache.get(dependencies[0]);
 		if (cacheEntry) return callback(null, cacheEntry);
 		const context = data.context || this.context;
 		const resolveOptions = data.resolveOptions || EMPTY_RESOLVE_OPTIONS;
@@ -359,7 +361,7 @@ class NormalModuleFactory extends Tapable {
 
 					if (module && this.cachePredicate(module)) {
 						for (const d of dependencies) {
-							d.__NormalModuleFactoryCache = module;
+							dependencyCache.set(d, module);
 						}
 					}
 
@@ -399,7 +401,7 @@ class NormalModuleFactory extends Tapable {
 											`                 You need to specify '${
 												item.loader
 											}-loader' instead of '${item.loader}',\n` +
-											"                 see https://webpack.js.org/guides/migrating/#automatic-loader-module-name-extension-removed";
+											"                 see https://webpack.js.org/migrate/3/#automatic-loader-module-name-extension-removed";
 									}
 									callback(err);
 								}

package/lib/Parser.js

@@ -1030,23 +1030,28 @@ class Parser extends Tapable {
 	}
 
 	walkForInStatement(statement) {
-		if (statement.left.type === "VariableDeclaration")
+		if (statement.left.type === "VariableDeclaration") {
 			this.walkVariableDeclaration(statement.left);
-		else this.walkPattern(statement.left);
+		} else {
+			this.walkPattern(statement.left);
+		}
 		this.walkExpression(statement.right);
 		this.walkStatement(statement.body);
 	}
 
 	prewalkForOfStatement(statement) {
-		if (statement.left.type === "VariableDeclaration")
+		if (statement.left.type === "VariableDeclaration") {
 			this.prewalkVariableDeclaration(statement.left);
+		}
 		this.prewalkStatement(statement.body);
 	}
 
 	walkForOfStatement(statement) {
-		if (statement.left.type === "VariableDeclaration")
+		if (statement.left.type === "VariableDeclaration") {
 			this.walkVariableDeclaration(statement.left);
-		else this.walkPattern(statement.left);
+		} else {
+			this.walkPattern(statement.left);
+		}
 		this.walkExpression(statement.right);
 		this.walkStatement(statement.body);
 	}
@@ -1062,8 +1067,10 @@ class Parser extends Tapable {
 	walkFunctionDeclaration(statement) {
 		const wasTopLevel = this.scope.topLevelScope;
 		this.scope.topLevelScope = false;
-		for (const param of statement.params) this.walkPattern(param);
 		this.inScope(statement.params, () => {
+			for (const param of statement.params) {
+				this.walkPattern(param);
+			}
 			if (statement.body.type === "BlockStatement") {
 				this.detectStrictMode(statement.body.body);
 				this.prewalkStatement(statement.body);
@@ -1355,13 +1362,10 @@ class Parser extends Tapable {
 	}
 
 	walkExpressions(expressions) {
-		for (
-			let expressionsIndex = 0, len = expressions.length;
-			expressionsIndex < len;
-			expressionsIndex++
-		) {
-			const expression = expressions[expressionsIndex];
-			if (expression) this.walkExpression(expression);
+		for (const expression of expressions) {
+			if (expression) {
+				this.walkExpression(expression);
+			}
 		}
 	}
 
@@ -1469,8 +1473,10 @@ class Parser extends Tapable {
 	walkFunctionExpression(expression) {
 		const wasTopLevel = this.scope.topLevelScope;
 		this.scope.topLevelScope = false;
-		for (const param of expression.params) this.walkPattern(param);
 		this.inScope(expression.params, () => {
+			for (const param of expression.params) {
+				this.walkPattern(param);
+			}
 			if (expression.body.type === "BlockStatement") {
 				this.detectStrictMode(expression.body.body);
 				this.prewalkStatement(expression.body);
@@ -1483,8 +1489,10 @@ class Parser extends Tapable {
 	}
 
 	walkArrowFunctionExpression(expression) {
-		for (const param of expression.params) this.walkPattern(param);
 		this.inScope(expression.params, () => {
+			for (const param of expression.params) {
+				this.walkPattern(param);
+			}
 			if (expression.body.type === "BlockStatement") {
 				this.detectStrictMode(expression.body.body);
 				this.prewalkStatement(expression.body);
@@ -1640,7 +1648,9 @@ class Parser extends Tapable {
 			if (functionExpression.body.type === "BlockStatement") {
 				this.prewalkStatement(functionExpression.body);
 				this.walkStatement(functionExpression.body);
-			} else this.walkExpression(functionExpression.body);
+			} else {
+				this.walkExpression(functionExpression.body);
+			}
 		});
 		this.scope.topLevelScope = wasTopLevel;
 	}
@@ -1743,13 +1753,7 @@ class Parser extends Tapable {
 
 		this.scope.renames.set("this", null);
 
-		for (
-			let paramIndex = 0, len = params.length;
-			paramIndex < len;
-			paramIndex++
-		) {
-			const param = params[paramIndex];
-
+		for (const param of params) {
 			if (typeof param !== "string") {
 				this.enterPattern(param, param => {
 					this.scope.renames.set(param, null);

package/lib/ProgressPlugin.js

@@ -83,7 +83,7 @@ class ProgressPlugin {
 			const states = new Array(compiler.compilers.length);
 			compiler.compilers.forEach((compiler, idx) => {
 				new ProgressPlugin((p, msg, ...args) => {
-					states[idx] = args;
+					states[idx] = [p, msg, ...args];
 					handler(
 						states
 							.map(state => (state && state[0]) || 0)

package/lib/RecordIdsPlugin.js

@@ -21,6 +21,7 @@ class RecordIdsPlugin {
 					if (!records.modules.byIdentifier) records.modules.byIdentifier = {};
 					if (!records.modules.usedIds) records.modules.usedIds = {};
 					for (const module of modules) {
+						if (typeof module.id !== "number") continue;
 						const identifier = portableIds
 							? identifierUtils.makePathsRelative(
 									compiler.context,
@@ -110,6 +111,7 @@ class RecordIdsPlugin {
 					if (!records.chunks.bySource) records.chunks.bySource = {};
 					const usedIds = new Set();
 					for (const chunk of chunks) {
+						if (typeof chunk.id !== "number") continue;
 						const name = chunk.name;
 						if (name) records.chunks.byName[name] = chunk.id;
 						const sources = getChunkSources(chunk);
@@ -118,7 +120,7 @@ class RecordIdsPlugin {
 						}
 						usedIds.add(chunk.id);
 					}
-					records.chunks.usedIds = Array.from(usedIds);
+					records.chunks.usedIds = Array.from(usedIds).sort();
 				}
 			);
 			compilation.hooks.reviveChunks.tap(

package/lib/RuntimeTemplate.js

@@ -44,7 +44,7 @@ module.exports = class RuntimeTemplate {
 	}
 
 	throwMissingModuleErrorFunction({ request }) {
-		const err = `Cannot find module "${request}"`;
+		const err = `Cannot find module '${request}'`;
 		return `function webpackMissingModule() { var e = new Error(${JSON.stringify(
 			err
 		)}); e.code = 'MODULE_NOT_FOUND'; throw e; }`;

package/lib/SetVarMainTemplatePlugin.js

@@ -6,12 +6,24 @@
 
 const { ConcatSource } = require("webpack-sources");
 
+/** @typedef {import("./Compilation")} Compilation */
+
 class SetVarMainTemplatePlugin {
+	/**
+	 * @param {string} varExpression the accessor where the library is exported
+	 * @param {boolean} copyObject specify copying the exports
+	 */
 	constructor(varExpression, copyObject) {
+		/** @type {string} */
 		this.varExpression = varExpression;
+		/** @type {boolean} */
 		this.copyObject = copyObject;
 	}
 
+	/**
+	 * @param {Compilation} compilation the compilation instance
+	 * @returns {void}
+	 */
 	apply(compilation) {
 		const { mainTemplate, chunkTemplate } = compilation;
 

package/lib/SourceMapDevToolPlugin.js

@@ -18,12 +18,14 @@ const basename = name => {
 	return name.substr(name.lastIndexOf("/") + 1);
 };
 
+const assetsCache = new WeakMap();
+
 const getTaskForFile = (file, chunk, options, compilation) => {
 	const asset = compilation.assets[file];
-	if (asset.__SourceMapDevToolFile === file && asset.__SourceMapDevToolData) {
-		const data = asset.__SourceMapDevToolData;
-		for (const cachedFile in data) {
-			compilation.assets[cachedFile] = data[cachedFile];
+	const cache = assetsCache.get(asset);
+	if (cache && cache.file === file) {
+		for (const cachedFile in cache.assets) {
+			compilation.assets[cachedFile] = cache.assets[cachedFile];
 			if (cachedFile !== file) chunk.files.push(cachedFile);
 		}
 		return;
@@ -207,6 +209,7 @@ class SourceMapDevToolPlugin {
 							task.file,
 							"attach SourceMap"
 						);
+						const assets = Object.create(null);
 						const chunk = task.chunk;
 						const file = task.file;
 						const asset = task.asset;
@@ -222,8 +225,7 @@ class SourceMapDevToolPlugin {
 						}
 						sourceMap.sourceRoot = options.sourceRoot || "";
 						sourceMap.file = file;
-						asset.__SourceMapDevToolFile = file;
-						asset.__SourceMapDevToolData = {};
+						assetsCache.set(asset, { file, assets });
 						let currentSourceMappingURLComment = sourceMappingURLComment;
 						if (
 							currentSourceMappingURLComment !== false &&
@@ -260,9 +262,7 @@ class SourceMapDevToolPlugin {
 										.relative(path.dirname(file), sourceMapFile)
 										.replace(/\\/g, "/");
 							if (currentSourceMappingURLComment !== false) {
-								asset.__SourceMapDevToolData[file] = compilation.assets[
-									file
-								] = new ConcatSource(
+								assets[file] = compilation.assets[file] = new ConcatSource(
 									new RawSource(source),
 									currentSourceMappingURLComment.replace(
 										/\[url\]/g,
@@ -270,14 +270,12 @@ class SourceMapDevToolPlugin {
 									)
 								);
 							}
-							asset.__SourceMapDevToolData[sourceMapFile] = compilation.assets[
+							assets[sourceMapFile] = compilation.assets[
 								sourceMapFile
 							] = new RawSource(sourceMapString);
 							chunk.files.push(sourceMapFile);
 						} else {
-							asset.__SourceMapDevToolData[file] = compilation.assets[
-								file
-							] = new ConcatSource(
+							assets[file] = compilation.assets[file] = new ConcatSource(
 								new RawSource(source),
 								currentSourceMappingURLComment
 									.replace(/\[map\]/g, () => sourceMapString)