webpack 4.16.1 → 4.16.2

package/lib/Chunk.js

@@ -8,6 +8,7 @@ const util = require("util");
 const SortableSet = require("./util/SortableSet");
 const intersect = require("./util/SetHelpers").intersect;
 const GraphHelpers = require("./GraphHelpers");
+const Entrypoint = require("./Entrypoint");
 let debugId = 1000;
 const ERR_CHUNK_ENTRY = "Chunk.entry was removed. Use hasRuntime()";
 const ERR_CHUNK_INITIAL =
@@ -123,9 +124,6 @@ class Chunk {
 		this._modules = new SortableSet(undefined, sortByIdentifier);
 		/** @type {string?} */
 		this.filenameTemplate = undefined;
-
-		/** @private */
-		this._groups = new SortableSet(undefined, sortChunkGroupById);
 		/** @private @type {SortableSet<ChunkGroup>} */
 		this._groups = new SortableSet(undefined, sortChunkGroupById);
 		/** @type {string[]} */
@@ -185,7 +183,11 @@ class Chunk {
 	hasRuntime() {
 		for (const chunkGroup of this._groups) {
 			// We only need to check the first one
-			return chunkGroup.isInitial() && chunkGroup.getRuntimeChunk() === this;
+			return (
+				chunkGroup.isInitial() &&
+				chunkGroup instanceof Entrypoint &&
+				chunkGroup.getRuntimeChunk() === this
+			);
 		}
 		return false;
 	}
@@ -749,17 +751,37 @@ class Chunk {
 // TODO remove in webpack 5
 Object.defineProperty(Chunk.prototype, "forEachModule", {
 	configurable: false,
-	value: util.deprecate(function(fn) {
-		this._modules.forEach(fn);
-	}, "Chunk.forEachModule: Use for(const module of chunk.modulesIterable) instead")
+	value: util.deprecate(
+		/**
+		 * @deprecated
+		 * @this {Chunk}
+		 * @typedef {function(any, any, Set<any>): void} ForEachModuleCallback
+		 * @param {ForEachModuleCallback} fn Callback function
+		 * @returns {void}
+		 */
+		function(fn) {
+			this._modules.forEach(fn);
+		},
+		"Chunk.forEachModule: Use for(const module of chunk.modulesIterable) instead"
+	)
 });
 
 // TODO remove in webpack 5
 Object.defineProperty(Chunk.prototype, "mapModules", {
 	configurable: false,
-	value: util.deprecate(function(fn) {
-		return Array.from(this._modules, fn);
-	}, "Chunk.mapModules: Use Array.from(chunk.modulesIterable, fn) instead")
+	value: util.deprecate(
+		/**
+		 * @deprecated
+		 * @this {Chunk}
+		 * @typedef {function(any, number): any} MapModulesCallback
+		 * @param {MapModulesCallback} fn Callback function
+		 * @returns {TODO[]} result of mapped modules
+		 */
+		function(fn) {
+			return Array.from(this._modules, fn);
+		},
+		"Chunk.mapModules: Use Array.from(chunk.modulesIterable, fn) instead"
+	)
 });
 
 // TODO remove in webpack 5

package/lib/ChunkGroup.js

@@ -11,7 +11,6 @@ const compareLocations = require("./compareLocations");
 /** @typedef {import("./Module")} Module */
 /** @typedef {import("./ModuleReason")} ModuleReason */
 
-/** @typedef {{id: number}} HasId */
 /** @typedef {{module: Module, loc: TODO, request: string}} OriginRecord */
 /** @typedef {string|{name: string}} ChunkGroupOptions */
 
@@ -26,8 +25,8 @@ const getArray = set => Array.from(set);
 
 /**
  * A convenience method used to sort chunks based on their id's
- * @param {HasId} a first sorting comparator
- * @param {HasId} b second sorting comparator
+ * @param {ChunkGroup} a first sorting comparator
+ * @param {ChunkGroup} b second sorting comparator
  * @returns {1|0|-1} a sorting index to determine order
  */
 const sortById = (a, b) => {
@@ -63,6 +62,7 @@ class ChunkGroup {
 		/** @type {number} */
 		this.groupDebugId = debugId++;
 		this.options = options;
+		/** @type {SortableSet<ChunkGroup>} */
 		this._children = new SortableSet(undefined, sortById);
 		this._parents = new SortableSet(undefined, sortById);
 		this._blocks = new SortableSet();

package/lib/Compilation.js

@@ -2442,21 +2442,48 @@ class Compilation extends Tapable {
 }
 
 // TODO remove in webpack 5
-Compilation.prototype.applyPlugins = util.deprecate(function(name, ...args) {
-	this.hooks[
-		name.replace(/[- ]([a-z])/g, match => match[1].toUpperCase())
-	].call(...args);
-}, "Compilation.applyPlugins is deprecated. Use new API on `.hooks` instead");
+Compilation.prototype.applyPlugins = util.deprecate(
+	/**
+	 * @deprecated
+	 * @param {string} name Name
+	 * @param {any[]} args Other arguments
+	 * @returns {void}
+	 * @this {Compilation}
+	 */
+	function(name, ...args) {
+		this.hooks[
+			name.replace(/[- ]([a-z])/g, match => match[1].toUpperCase())
+		].call(...args);
+	},
+	"Compilation.applyPlugins is deprecated. Use new API on `.hooks` instead"
+);
 
 // TODO remove in webpack 5
 Object.defineProperty(Compilation.prototype, "moduleTemplate", {
 	configurable: false,
-	get: util.deprecate(function() {
-		return this.moduleTemplates.javascript;
-	}, "Compilation.moduleTemplate: Use Compilation.moduleTemplates.javascript instead"),
-	set: util.deprecate(function(value) {
-		this.moduleTemplates.javascript = value;
-	}, "Compilation.moduleTemplate: Use Compilation.moduleTemplates.javascript instead.")
+	get: util.deprecate(
+		/**
+		 * @deprecated
+		 * @this {Compilation}
+		 * @returns {TODO} module template
+		 */
+		function() {
+			return this.moduleTemplates.javascript;
+		},
+		"Compilation.moduleTemplate: Use Compilation.moduleTemplates.javascript instead"
+	),
+	set: util.deprecate(
+		/**
+		 * @deprecated
+		 * @param {ModuleTemplate} value Template value
+		 * @this {Compilation}
+		 * @returns {void}
+		 */
+		function(value) {
+			this.moduleTemplates.javascript = value;
+		},
+		"Compilation.moduleTemplate: Use Compilation.moduleTemplates.javascript instead."
+	)
 });
 
 module.exports = Compilation;

package/lib/ContextExclusionPlugin.js

@@ -1,10 +1,21 @@
 "use strict";
 
+/** @typedef {import("./Compiler")} Compiler */
+/** @typedef {import("./ContextModuleFactory")} ContextModuleFactory */
+
 class ContextExclusionPlugin {
+	/**
+	 * @param {RegExp} negativeMatcher Matcher regular expression
+	 */
 	constructor(negativeMatcher) {
 		this.negativeMatcher = negativeMatcher;
 	}
 
+	/**
+	 * Apply the plugin
+	 * @param {Compiler} compiler Webpack Compiler
+	 * @returns {void}
+	 */
 	apply(compiler) {
 		compiler.hooks.contextModuleFactory.tap("ContextExclusionPlugin", cmf => {
 			cmf.hooks.contextModuleFiles.tap("ContextExclusionPlugin", files => {

package/lib/ContextModule.js

@@ -10,6 +10,7 @@ const AsyncDependenciesBlock = require("./AsyncDependenciesBlock");
 const Template = require("./Template");
 const contextify = require("./util/identifier").contextify;
 
+/** @typedef {"sync" | "eager" | "weak" | "async-weak" | "lazy" | "lazy-once"} ContextMode Context mode */
 /** @typedef {import("./dependencies/ContextElementDependency")} ContextElementDependency */
 
 /**
@@ -703,56 +704,141 @@ webpackEmptyAsyncContext.id = ${JSON.stringify(id)};`;
 // TODO remove in webpack 5
 Object.defineProperty(ContextModule.prototype, "recursive", {
 	configurable: false,
-	get: util.deprecate(function() {
-		return this.options.recursive;
-	}, "ContextModule.recursive has been moved to ContextModule.options.recursive"),
-	set: util.deprecate(function(value) {
-		this.options.recursive = value;
-	}, "ContextModule.recursive has been moved to ContextModule.options.recursive")
+	get: util.deprecate(
+		/**
+		 * @deprecated
+		 * @this {ContextModule}
+		 * @returns {boolean} is recursive
+		 */
+		function() {
+			return this.options.recursive;
+		},
+		"ContextModule.recursive has been moved to ContextModule.options.recursive"
+	),
+	set: util.deprecate(
+		/**
+		 * @deprecated
+		 * @this {ContextModule}
+		 * @param {boolean} value is recursive
+		 * @returns {void}
+		 */
+		function(value) {
+			this.options.recursive = value;
+		},
+		"ContextModule.recursive has been moved to ContextModule.options.recursive"
+	)
 });
 
 // TODO remove in webpack 5
 Object.defineProperty(ContextModule.prototype, "regExp", {
 	configurable: false,
-	get: util.deprecate(function() {
-		return this.options.regExp;
-	}, "ContextModule.regExp has been moved to ContextModule.options.regExp"),
-	set: util.deprecate(function(value) {
-		this.options.regExp = value;
-	}, "ContextModule.regExp has been moved to ContextModule.options.regExp")
+	get: util.deprecate(
+		/**
+		 * @deprecated
+		 * @this {ContextModule}
+		 * @returns {RegExp} regular expression
+		 */
+		function() {
+			return this.options.regExp;
+		},
+		"ContextModule.regExp has been moved to ContextModule.options.regExp"
+	),
+	set: util.deprecate(
+		/**
+		 * @deprecated
+		 * @this {ContextModule}
+		 * @param {RegExp} value Regular expression
+		 * @returns {void}
+		 */
+		function(value) {
+			this.options.regExp = value;
+		},
+		"ContextModule.regExp has been moved to ContextModule.options.regExp"
+	)
 });
 
 // TODO remove in webpack 5
 Object.defineProperty(ContextModule.prototype, "addon", {
 	configurable: false,
-	get: util.deprecate(function() {
-		return this.options.addon;
-	}, "ContextModule.addon has been moved to ContextModule.options.addon"),
-	set: util.deprecate(function(value) {
-		this.options.addon = value;
-	}, "ContextModule.addon has been moved to ContextModule.options.addon")
+	get: util.deprecate(
+		/**
+		 * @deprecated
+		 * @this {ContextModule}
+		 * @returns {string} addon
+		 */
+		function() {
+			return this.options.addon;
+		},
+		"ContextModule.addon has been moved to ContextModule.options.addon"
+	),
+	set: util.deprecate(
+		/**
+		 * @deprecated
+		 * @this {ContextModule}
+		 * @param {string} value addon
+		 * @returns {void}
+		 */
+		function(value) {
+			this.options.addon = value;
+		},
+		"ContextModule.addon has been moved to ContextModule.options.addon"
+	)
 });
 
 // TODO remove in webpack 5
 Object.defineProperty(ContextModule.prototype, "async", {
 	configurable: false,
-	get: util.deprecate(function() {
-		return this.options.mode;
-	}, "ContextModule.async has been moved to ContextModule.options.mode"),
-	set: util.deprecate(function(value) {
-		this.options.mode = value;
-	}, "ContextModule.async has been moved to ContextModule.options.mode")
+	get: util.deprecate(
+		/**
+		 * @deprecated
+		 * @this {ContextModule}
+		 * @returns {boolean} is async
+		 */
+		function() {
+			return this.options.mode;
+		},
+		"ContextModule.async has been moved to ContextModule.options.mode"
+	),
+	set: util.deprecate(
+		/**
+		 * @deprecated
+		 * @this {ContextModule}
+		 * @param {ContextMode} value Context mode
+		 * @returns {void}
+		 */
+		function(value) {
+			this.options.mode = value;
+		},
+		"ContextModule.async has been moved to ContextModule.options.mode"
+	)
 });
 
 // TODO remove in webpack 5
 Object.defineProperty(ContextModule.prototype, "chunkName", {
 	configurable: false,
-	get: util.deprecate(function() {
-		return this.options.chunkName;
-	}, "ContextModule.chunkName has been moved to ContextModule.options.chunkName"),
-	set: util.deprecate(function(value) {
-		this.options.chunkName = value;
-	}, "ContextModule.chunkName has been moved to ContextModule.options.chunkName")
+	get: util.deprecate(
+		/**
+		 * @deprecated
+		 * @this {ContextModule}
+		 * @returns {string} chunk name
+		 */
+		function() {
+			return this.options.chunkName;
+		},
+		"ContextModule.chunkName has been moved to ContextModule.options.chunkName"
+	),
+	set: util.deprecate(
+		/**
+		 * @deprecated
+		 * @this {ContextModule}
+		 * @param {string} value chunk name
+		 * @returns {void}
+		 */
+		function(value) {
+			this.options.chunkName = value;
+		},
+		"ContextModule.chunkName has been moved to ContextModule.options.chunkName"
+	)
 });
 
 module.exports = ContextModule;

package/lib/ContextModuleFactory.js

@@ -15,15 +15,21 @@ const {
 const ContextModule = require("./ContextModule");
 const ContextElementDependency = require("./dependencies/ContextElementDependency");
 
+/** @typedef {import("./Module")} Module */
+
 const EMPTY_RESOLVE_OPTIONS = {};
 
 module.exports = class ContextModuleFactory extends Tapable {
 	constructor(resolverFactory) {
 		super();
 		this.hooks = {
+			/** @type {AsyncSeriesWaterfallHook<TODO>} */
 			beforeResolve: new AsyncSeriesWaterfallHook(["data"]),
+			/** @type {AsyncSeriesWaterfallHook<TODO>} */
 			afterResolve: new AsyncSeriesWaterfallHook(["data"]),
+			/** @type {SyncWaterfallHook<string[]>} */
 			contextModuleFiles: new SyncWaterfallHook(["files"]),
+			/** @type {SyncWaterfallHook<TODO[]>} */
 			alternatives: new AsyncSeriesWaterfallHook(["modules"])
 		};
 		this._pluginCompat.tap("ContextModuleFactory", options => {

package/lib/DelegatedModule.js

@@ -12,6 +12,7 @@ const DelegatedSourceDependency = require("./dependencies/DelegatedSourceDepende
 const DelegatedExportsDependency = require("./dependencies/DelegatedExportsDependency");
 
 /** @typedef {import("./dependencies/ModuleDependency")} ModuleDependency */
+/** @typedef {import("./util/createHash").Hash} Hash */
 
 class DelegatedModule extends Module {
 	constructor(sourceRequest, data, type, userRequest, originalRequest) {
@@ -99,6 +100,10 @@ class DelegatedModule extends Module {
 		return 42;
 	}
 
+	/**
+	 * @param {Hash} hash the hash used to track dependencies
+	 * @returns {void}
+	 */
 	updateHash(hash) {
 		hash.update(this.type);
 		hash.update(JSON.stringify(this.request));

package/lib/DependenciesBlock.js

@@ -73,7 +73,7 @@ class DependenciesBlock {
 	}
 
 	/**
-	 * @param {Hash} hash the hash used to track dependencies, from "crypto" module
+	 * @param {Hash} hash the hash used to track dependencies
 	 * @returns {void}
 	 */
 	updateHash(hash) {

package/lib/DllModule.js

@@ -7,6 +7,8 @@
 const { RawSource } = require("webpack-sources");
 const Module = require("./Module");
 
+/** @typedef {import("./util/createHash").Hash} Hash */
+
 class DllModule extends Module {
 	constructor(context, dependencies, name, type) {
 		super("javascript/dynamic", context);
@@ -44,6 +46,10 @@ class DllModule extends Module {
 		return 12;
 	}
 
+	/**
+	 * @param {Hash} hash the hash used to track dependencies
+	 * @returns {void}
+	 */
 	updateHash(hash) {
 		hash.update("dll module");
 		hash.update(this.name || "");

package/lib/DllReferencePlugin.js

@@ -10,6 +10,8 @@ const DelegatedModuleFactoryPlugin = require("./DelegatedModuleFactoryPlugin");
 const ExternalModuleFactoryPlugin = require("./ExternalModuleFactoryPlugin");
 const DelegatedExportsDependency = require("./dependencies/DelegatedExportsDependency");
 const NullFactory = require("./NullFactory");
+const makePathsRelative = require("./util/identifier").makePathsRelative;
+const WebpackError = require("./WebpackError");
 
 const validateOptions = require("schema-utils");
 const schema = require("../schemas/plugins/DllReferencePlugin.json");
@@ -43,9 +45,23 @@ class DllReferencePlugin {
 					params.compilationDependencies.add(manifest);
 					compiler.inputFileSystem.readFile(manifest, (err, result) => {
 						if (err) return callback(err);
-						params["dll reference " + manifest] = parseJson(
-							result.toString("utf-8")
-						);
+						// Catch errors parsing the manifest so that blank
+						// or malformed manifest files don't kill the process.
+						try {
+							params["dll reference " + manifest] = parseJson(
+								result.toString("utf-8")
+							);
+						} catch (e) {
+							// Store the error in the params so that it can
+							// be added as a compilation error later on.
+							const manifestPath = makePathsRelative(
+								compiler.options.context,
+								manifest
+							);
+							params[
+								"dll reference parse error " + manifest
+							] = new DllManifestError(manifestPath, e.message);
+						}
 						return callback();
 					});
 				} else {
@@ -57,6 +73,12 @@ class DllReferencePlugin {
 		compiler.hooks.compile.tap("DllReferencePlugin", params => {
 			let manifest = this.options.manifest;
 			if (typeof manifest === "string") {
+				// If there was an error parsing the manifest
+				// file, exit now because the error will be added
+				// as a compilation error in the "compilation" hook.
+				if (params["dll reference parse error " + manifest]) {
+					return;
+				}
 				manifest = params["dll reference " + manifest];
 			}
 			const name = this.options.name || manifest.name;
@@ -78,6 +100,32 @@ class DllReferencePlugin {
 				extensions: this.options.extensions
 			}).apply(normalModuleFactory);
 		});
+
+		compiler.hooks.compilation.tap(
+			"DllReferencePlugin",
+			(compilation, params) => {
+				let manifest = this.options.manifest;
+				if (typeof manifest === "string") {
+					// If there was an error parsing the manifest file, add the
+					// error as a compilation error to make the compilation fail.
+					let e = params["dll reference parse error " + manifest];
+					if (e) {
+						compilation.errors.push(e);
+					}
+				}
+			}
+		);
+	}
+}
+
+class DllManifestError extends WebpackError {
+	constructor(filename, message) {
+		super();
+
+		this.name = "DllManifestError";
+		this.message = `Dll manifest ${filename}\n${message}`;
+
+		Error.captureStackTrace(this, this.constructor);
 	}
 }
 

package/lib/ExternalModule.js

@@ -9,6 +9,8 @@ const Module = require("./Module");
 const WebpackMissingModule = require("./dependencies/WebpackMissingModule");
 const Template = require("./Template");
 
+/** @typedef {import("./util/createHash").Hash} Hash */
+
 class ExternalModule extends Module {
 	constructor(request, type, userRequest) {
 		super("javascript/dynamic", null);
@@ -148,6 +150,10 @@ class ExternalModule extends Module {
 		return 42;
 	}
 
+	/**
+	 * @param {Hash} hash the hash used to track dependencies
+	 * @returns {void}
+	 */
 	updateHash(hash) {
 		hash.update(this.externalType);
 		hash.update(JSON.stringify(this.request));

package/lib/Generator.js

@@ -4,9 +4,10 @@
 */
 "use strict";
 
-/** @typedef {import("./Module")} Module */
+/** @typedef {import("./NormalModule")} NormalModule */
 /** @typedef {import("./RuntimeTemplate")} RuntimeTemplate */
 /** @typedef {import("webpack-sources").Source} Source */
+/** @typedef {import("./Dependency").DependencyTemplate} DependencyTemplate */
 
 /**
  *
@@ -18,8 +19,8 @@ class Generator {
 
 	/**
 	 * @abstract
-	 * @param {Module} module module for which the code should be generated
-	 * @param {Map<Function, TODO>} dependencyTemplates mapping from dependencies to templates
+	 * @param {NormalModule} module module for which the code should be generated
+	 * @param {Map<Function, DependencyTemplate>} dependencyTemplates mapping from dependencies to templates
 	 * @param {RuntimeTemplate} runtimeTemplate the runtime template
 	 * @param {string} type which kind of code should be generated
 	 * @returns {Source} generated code
@@ -35,6 +36,13 @@ class ByTypeGenerator extends Generator {
 		this.map = map;
 	}
 
+	/**
+	 * @param {NormalModule} module module for which the code should be generated
+	 * @param {Map<Function, DependencyTemplate>} dependencyTemplates mapping from dependencies to templates
+	 * @param {RuntimeTemplate} runtimeTemplate the runtime template
+	 * @param {string} type which kind of code should be generated
+	 * @returns {Source} generated code
+	 */
 	generate(module, dependencyTemplates, runtimeTemplate, type) {
 		const generator = this.map[type];
 		if (!generator) {

package/lib/Module.js

@@ -14,6 +14,7 @@ const Template = require("./Template");
 /** @typedef {import("./Chunk")} Chunk */
 /** @typedef {import("./RequestShortener")} RequestShortener */
 /** @typedef {import("./WebpackError")} WebpackError */
+/** @typedef {import("./util/createHash").Hash} Hash */
 
 const EMPTY_RESOLVE_OPTIONS = {};
 
@@ -298,6 +299,10 @@ class Module extends DependenciesBlock {
 		return true;
 	}
 
+	/**
+	 * @param {Hash} hash the hash used to track dependencies
+	 * @returns {void}
+	 */
 	updateHash(hash) {
 		hash.update(`${this.id}`);
 		hash.update(JSON.stringify(this.usedExports));
@@ -339,17 +344,35 @@ class Module extends DependenciesBlock {
 // TODO remove in webpack 5
 Object.defineProperty(Module.prototype, "forEachChunk", {
 	configurable: false,
-	value: util.deprecate(function(fn) {
-		this._chunks.forEach(fn);
-	}, "Module.forEachChunk: Use for(const chunk of module.chunksIterable) instead")
+	value: util.deprecate(
+		/**
+		 * @deprecated
+		 * @param {function(any, any, Set<any>): void} fn callback function
+		 * @returns {void}
+		 * @this {Module}
+		 */
+		function(fn) {
+			this._chunks.forEach(fn);
+		},
+		"Module.forEachChunk: Use for(const chunk of module.chunksIterable) instead"
+	)
 });
 
 // TODO remove in webpack 5
 Object.defineProperty(Module.prototype, "mapChunks", {
 	configurable: false,
-	value: util.deprecate(function(fn) {
-		return Array.from(this._chunks, fn);
-	}, "Module.mapChunks: Use Array.from(module.chunksIterable, fn) instead")
+	value: util.deprecate(
+		/**
+		 * @deprecated
+		 * @param {function(any, any): void} fn Mapper function
+		 * @returns {Array<TODO>} Array of chunks mapped
+		 * @this {Module}
+		 */
+		function(fn) {
+			return Array.from(this._chunks, fn);
+		},
+		"Module.mapChunks: Use Array.from(module.chunksIterable, fn) instead"
+	)
 });
 
 // TODO remove in webpack 5
@@ -366,12 +389,29 @@ Object.defineProperty(Module.prototype, "entry", {
 // TODO remove in webpack 5
 Object.defineProperty(Module.prototype, "meta", {
 	configurable: false,
-	get: util.deprecate(function() {
-		return this.buildMeta;
-	}, "Module.meta was renamed to Module.buildMeta"),
-	set: util.deprecate(function(value) {
-		this.buildMeta = value;
-	}, "Module.meta was renamed to Module.buildMeta")
+	get: util.deprecate(
+		/**
+		 * @deprecated
+		 * @returns {void}
+		 * @this {Module}
+		 */
+		function() {
+			return this.buildMeta;
+		},
+		"Module.meta was renamed to Module.buildMeta"
+	),
+	set: util.deprecate(
+		/**
+		 * @deprecated
+		 * @param {TODO} value Value
+		 * @returns {void}
+		 * @this {Module}
+		 */
+		function(value) {
+			this.buildMeta = value;
+		},
+		"Module.meta was renamed to Module.buildMeta"
+	)
 });
 
 /** @type {function(): string} */

package/lib/MultiModule.js

@@ -8,6 +8,8 @@ const Module = require("./Module");
 const Template = require("./Template");
 const { RawSource } = require("webpack-sources");
 
+/** @typedef {import("./util/createHash").Hash} Hash */
+
 class MultiModule extends Module {
 	constructor(context, dependencies, name) {
 		super("javascript/dynamic", context);
@@ -45,6 +47,10 @@ class MultiModule extends Module {
 		return 16 + this.dependencies.length * 12;
 	}
 
+	/**
+	 * @param {Hash} hash the hash used to track dependencies
+	 * @returns {void}
+	 */
 	updateHash(hash) {
 		hash.update("multi module");
 		hash.update(this.name || "");

package/lib/NodeStuffPlugin.js

@@ -108,6 +108,24 @@ class NodeStuffPlugin {
 								"require.extensions is not supported by webpack. Use a loader instead."
 							)
 						);
+					parser.hooks.expression
+						.for("require.main.require")
+						.tap(
+							"NodeStuffPlugin",
+							ParserHelpers.expressionIsUnsupported(
+								parser,
+								"require.main.require is not supported by webpack."
+							)
+						);
+					parser.hooks.expression
+						.for("module.parent.require")
+						.tap(
+							"NodeStuffPlugin",
+							ParserHelpers.expressionIsUnsupported(
+								parser,
+								"module.parent.require is not supported by webpack."
+							)
+						);
 					parser.hooks.expression
 						.for("module.loaded")
 						.tap("NodeStuffPlugin", expr => {

package/lib/NormalModule.js

@@ -24,6 +24,8 @@ const ModuleWarning = require("./ModuleWarning");
 const createHash = require("./util/createHash");
 const contextify = require("./util/identifier").contextify;
 
+/** @typedef {import("./util/createHash").Hash} Hash */
+
 const asString = buf => {
 	if (Buffer.isBuffer(buf)) {
 		return buf.toString("utf-8");
@@ -527,6 +529,10 @@ class NormalModule extends Module {
 		return this._source ? this._source.size() : -1;
 	}
 
+	/**
+	 * @param {Hash} hash the hash used to track dependencies
+	 * @returns {void}
+	 */
 	updateHash(hash) {
 		hash.update(this._buildHash);
 		super.updateHash(hash);

package/lib/Parser.js

@@ -2185,9 +2185,18 @@ class Parser extends Tapable {
 // TODO remove in webpack 5
 Object.defineProperty(Parser.prototype, "getCommentOptions", {
 	configurable: false,
-	value: util.deprecate(function(range) {
-		return this.parseCommentOptions(range).options;
-	}, "Parser.getCommentOptions: Use Parser.parseCommentOptions(range) instead")
+	value: util.deprecate(
+		/**
+		 * @deprecated
+		 * @param {TODO} range Range
+		 * @returns {void}
+		 * @this {Parser}
+		 */
+		function(range) {
+			return this.parseCommentOptions(range).options;
+		},
+		"Parser.getCommentOptions: Use Parser.parseCommentOptions(range) instead"
+	)
 });
 
 module.exports = Parser;

package/lib/RuntimeTemplate.js

@@ -6,6 +6,8 @@
 
 const Template = require("./Template");
 
+/** @typedef {import("./Module")} Module */
+
 module.exports = class RuntimeTemplate {
 	constructor(outputOptions, requestShortener) {
 		this.outputOptions = outputOptions || {};
@@ -188,6 +190,16 @@ module.exports = class RuntimeTemplate {
 		return `${promise || "Promise.resolve()"}.then(${getModuleFunction})`;
 	}
 
+	/**
+	 *
+	 * @param {Object} options options object
+	 * @param {boolean=} options.update whether a new variable should be created or the existing one updated
+	 * @param {Module} options.module the module
+	 * @param {string} options.request the request that should be printed as comment
+	 * @param {string} options.importVar name of the import variable
+	 * @param {Module} options.originModule module in which the statement is emitted
+	 * @returns {string} the import statement
+	 */
 	importStatement({ update, module, request, importVar, originModule }) {
 		if (!module) {
 			return this.missingModuleStatement({

package/lib/Stats.js

@@ -8,6 +8,7 @@ const RequestShortener = require("./RequestShortener");
 const SizeFormatHelpers = require("./SizeFormatHelpers");
 const formatLocation = require("./formatLocation");
 const identifierUtils = require("./util/identifier");
+const compareLocations = require("./compareLocations");
 
 const optionsOrFallback = (...args) => {
 	let optionValues = [];
@@ -523,6 +524,23 @@ class Stats {
 			}
 			if (showReasons) {
 				obj.reasons = module.reasons
+					.sort((a, b) => {
+						if (a.module && !b.module) return -1;
+						if (!a.module && b.module) return 1;
+						if (a.module && b.module) {
+							const cmp = compareId(a.module.id, b.module.id);
+							if (cmp) return cmp;
+						}
+						if (a.dependency && !b.dependency) return -1;
+						if (!a.dependency && b.dependency) return 1;
+						if (a.dependency && b.dependency) {
+							const cmp = compareLocations(a.dependency.loc, b.dependency.loc);
+							if (cmp) return cmp;
+							if (a.dependency.type < b.dependency.type) return -1;
+							if (a.dependency.type > b.dependency.type) return 1;
+						}
+						return 0;
+					})
 					.map(reason => {
 						const obj = {
 							moduleId: reason.module ? reason.module.id : null,
@@ -548,8 +566,7 @@ class Stats {
 							}
 						}
 						return obj;
-					})
-					.sort(compareId);
+					});
 			}
 			if (showUsedExports) {
 				if (module.used === true) {

package/lib/dependencies/CommonJsRequireDependencyParserPlugin.js

@@ -125,6 +125,12 @@ class CommonJsRequireDependencyParserPlugin {
 		parser.hooks.new
 			.for("require")
 			.tap("CommonJsRequireDependencyParserPlugin", createHandler(true));
+		parser.hooks.call
+			.for("module.require")
+			.tap("CommonJsRequireDependencyParserPlugin", createHandler(false));
+		parser.hooks.new
+			.for("module.require")
+			.tap("CommonJsRequireDependencyParserPlugin", createHandler(true));
 	}
 }
 module.exports = CommonJsRequireDependencyParserPlugin;

package/lib/optimize/ConcatenatedModule.js

@@ -21,6 +21,7 @@ const createHash = require("../util/createHash");
 
 /** @typedef {import("../Dependency")} Dependency */
 /** @typedef {import("../Compilation")} Compilation */
+/** @typedef {import("../util/createHash").Hash} Hash */
 
 /**
  * @typedef {Object} ConcatenationEntry
@@ -1180,6 +1181,10 @@ class ConcatenatedModule extends Module {
 		return nameWithNumber;
 	}
 
+	/**
+	 * @param {Hash} hash the hash used to track dependencies
+	 * @returns {void}
+	 */
 	updateHash(hash) {
 		for (const info of this._orderedConcatenationList) {
 			switch (info.type) {

package/lib/util/SortableSet.js

@@ -3,6 +3,7 @@
 /**
  * A subset of Set that offers sorting functionality
  * @template T item type in set
+ * @extends {Set<T>}
  */
 class SortableSet extends Set {
 	/**

package/lib/util/StackedSetMap.js

@@ -128,8 +128,17 @@ class StackedSetMap {
 }
 
 // TODO remove in webpack 5
-StackedSetMap.prototype.push = util.deprecate(function(item) {
-	this.add(item);
-}, "This is no longer an Array: Use add instead.");
+StackedSetMap.prototype.push = util.deprecate(
+	/**
+	 * @deprecated
+	 * @this {StackedSetMap}
+	 * @param {any} item Item to add
+	 * @returns {void}
+	 */
+	function(item) {
+		this.add(item);
+	},
+	"This is no longer an Array: Use add instead."
+);
 
 module.exports = StackedSetMap;

package/lib/wasm/WebAssemblyGenerator.js

@@ -21,6 +21,10 @@ const WebAssemblyExportImportedDependency = require("../dependencies/WebAssembly
 
 /** @typedef {import("../Module")} Module */
 /** @typedef {import("./WebAssemblyUtils").UsedWasmDependency} UsedWasmDependency */
+/** @typedef {import("../NormalModule")} NormalModule */
+/** @typedef {import("../RuntimeTemplate")} RuntimeTemplate */
+/** @typedef {import("webpack-sources").Source} Source */
+/** @typedef {import("../Dependency").DependencyTemplate} DependencyTemplate */
 
 /**
  * @typedef {(ArrayBuffer) => ArrayBuffer} ArrayBufferTransform
@@ -366,7 +370,14 @@ class WebAssemblyGenerator extends Generator {
 		this.options = options;
 	}
 
-	generate(module) {
+	/**
+	 * @param {NormalModule} module module for which the code should be generated
+	 * @param {Map<Function, DependencyTemplate>} dependencyTemplates mapping from dependencies to templates
+	 * @param {RuntimeTemplate} runtimeTemplate the runtime template
+	 * @param {string} type which kind of code should be generated
+	 * @returns {Source} generated code
+	 */
+	generate(module, dependencyTemplates, runtimeTemplate, type) {
 		let bin = module.originalSource().source();
 		bin = preprocess(bin);
 
@@ -398,7 +409,10 @@ class WebAssemblyGenerator extends Generator {
 		const externalExports = new Set(
 			module.dependencies
 				.filter(d => d instanceof WebAssemblyExportImportedDependency)
-				.map(d => d.exportName)
+				.map(d => {
+					const wasmDep = /** @type {WebAssemblyExportImportedDependency} */ (d);
+					return wasmDep.exportName;
+				})
 		);
 
 		/** @type {t.Instruction[]} */

package/lib/wasm/WebAssemblyJavascriptGenerator.js

@@ -10,8 +10,20 @@ const { RawSource } = require("webpack-sources");
 const WebAssemblyImportDependency = require("../dependencies/WebAssemblyImportDependency");
 const WebAssemblyExportImportedDependency = require("../dependencies/WebAssemblyExportImportedDependency");
 
+/** @typedef {import("../NormalModule")} NormalModule */
+/** @typedef {import("../RuntimeTemplate")} RuntimeTemplate */
+/** @typedef {import("webpack-sources").Source} Source */
+/** @typedef {import("../Dependency").DependencyTemplate} DependencyTemplate */
+
 class WebAssemblyJavascriptGenerator extends Generator {
-	generate(module, dependencyTemplates, runtimeTemplate) {
+	/**
+	 * @param {NormalModule} module module for which the code should be generated
+	 * @param {Map<Function, DependencyTemplate>} dependencyTemplates mapping from dependencies to templates
+	 * @param {RuntimeTemplate} runtimeTemplate the runtime template
+	 * @param {string} type which kind of code should be generated
+	 * @returns {Source} generated code
+	 */
+	generate(module, dependencyTemplates, runtimeTemplate, type) {
 		const initIdentifer = Array.isArray(module.usedExports)
 			? Template.numberToIdentifer(module.usedExports.length)
 			: "__webpack_init__";
@@ -21,6 +33,7 @@ class WebAssemblyJavascriptGenerator extends Generator {
 		const initParams = [];
 		let index = 0;
 		for (const dep of module.dependencies) {
+			const depAsAny = /** @type {any} */ (dep);
 			if (dep.module) {
 				let importData = importedModules.get(dep.module);
 				if (importData === undefined) {
@@ -29,7 +42,8 @@ class WebAssemblyJavascriptGenerator extends Generator {
 						(importData = {
 							importVar: `m${index}`,
 							index,
-							request: dep.userRequest,
+							request:
+								"userRequest" in depAsAny ? depAsAny.userRequest : undefined,
 							names: new Set(),
 							reexports: []
 						})

package/lib/webpack.js

@@ -69,6 +69,7 @@ webpack.WebpackOptionsApply = WebpackOptionsApply;
 webpack.Compiler = Compiler;
 webpack.MultiCompiler = MultiCompiler;
 webpack.NodeEnvironmentPlugin = NodeEnvironmentPlugin;
+// @ts-ignore Global @this directive is not supported
 webpack.validate = validateSchema.bind(this, webpackOptionsSchema);
 webpack.validateSchema = validateSchema;
 webpack.WebpackOptionsValidationError = WebpackOptionsValidationError;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack",
-  "version": "4.16.1",
+  "version": "4.16.2",
   "author": "Tobias Koppers @sokra",
   "description": "Packs CommonJs/AMD modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jsx, es7, css, less, ... and your custom stuff.",
   "license": "MIT",
@@ -128,10 +128,10 @@
     "pretest": "yarn lint",
     "prelint": "yarn setup",
     "lint": "yarn code-lint && yarn schema-lint && yarn type-lint",
-    "code-lint": "eslint --cache setup lib bin hot buildin benchmark \"test/*.js\" \"test/**/webpack.config.js\" \"examples/**/webpack.config.js\" \"schemas/**/*.js\"",
+    "code-lint": "eslint --cache setup lib bin hot buildin benchmark tooling \"test/*.js\" \"test/**/webpack.config.js\" \"examples/**/webpack.config.js\" \"schemas/**/*.js\"",
     "type-lint": "tsc --pretty",
     "fix": "yarn code-lint --fix",
-    "pretty": "prettier --write \"setup/**/*.js\" \"lib/**/*.js\" \"bin/*.js\" \"hot/*.js\" \"buildin/*.js\" \"benchmark/**/*.js\" \"test/*.js\" \"test/**/webpack.config.js\" \"examples/**/webpack.config.js\" \"schemas/**/*.js\" \"declarations.d.ts\" \"tsconfig.json\"",
+    "pretty": "prettier --write \"setup/**/*.js\" \"lib/**/*.js\" \"bin/*.js\" \"hot/*.js\" \"buildin/*.js\" \"benchmark/**/*.js\" \"tooling/*.js\" \"test/*.js\" \"test/**/webpack.config.js\" \"examples/**/webpack.config.js\" \"schemas/**/*.js\" \"declarations.d.ts\" \"tsconfig.json\"",
     "schema-lint": "node --max-old-space-size=4096 node_modules/jest-cli/bin/jest --testMatch \"<rootDir>/test/*.lint.js\" --no-verbose",
     "benchmark": "node --max-old-space-size=4096 --trace-deprecation node_modules/jest-cli/bin/jest --testMatch \"<rootDir>/test/*.benchmark.js\" --runInBand",
     "cover": "yarn cover:init && yarn cover:all && yarn cover:report",