webpack 5.99.9 → 5.100.1

package/lib/hmr/JavascriptHotModuleReplacementHelper.js

@@ -0,0 +1,37 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Haijie Xie @hai-x
+*/
+
+"use strict";
+
+const RuntimeGlobals = require("../RuntimeGlobals");
+
+const Template = require("../Template");
+
+/**
+ * @param {string} type unique identifier used for HMR runtime properties
+ * @returns {string} HMR runtime code
+ */
+const generateJavascriptHMR = type =>
+	Template.getFunctionContent(
+		require("../hmr/JavascriptHotModuleReplacement.runtime")
+	)
+		.replace(/\$key\$/g, type)
+		.replace(/\$installedChunks\$/g, "installedChunks")
+		.replace(/\$loadUpdateChunk\$/g, "loadUpdateChunk")
+		.replace(/\$moduleCache\$/g, RuntimeGlobals.moduleCache)
+		.replace(/\$moduleFactories\$/g, RuntimeGlobals.moduleFactories)
+		.replace(/\$ensureChunkHandlers\$/g, RuntimeGlobals.ensureChunkHandlers)
+		.replace(/\$hasOwnProperty\$/g, RuntimeGlobals.hasOwnProperty)
+		.replace(/\$hmrModuleData\$/g, RuntimeGlobals.hmrModuleData)
+		.replace(
+			/\$hmrDownloadUpdateHandlers\$/g,
+			RuntimeGlobals.hmrDownloadUpdateHandlers
+		)
+		.replace(
+			/\$hmrInvalidateModuleHandlers\$/g,
+			RuntimeGlobals.hmrInvalidateModuleHandlers
+		);
+
+module.exports.generateJavascriptHMR = generateJavascriptHMR;

package/lib/hmr/LazyCompilationPlugin.js

@@ -424,15 +424,17 @@ class LazyCompilationPlugin {
 											dep.type === "import() context element")) ||
 									(this.entries && dep.type === "entry")
 							)
-						)
+						) {
 							return module;
+						}
 						if (
 							/webpack[/\\]hot[/\\]|webpack-dev-server[/\\]client|webpack-hot-middleware[/\\]client/.test(
 								resolveData.request
 							) ||
 							!checkTest(this.test, module)
-						)
+						) {
 							return module;
+						}
 						const moduleInfo = backend.module(module);
 						if (!moduleInfo) return module;
 						const { client, data, active } = moduleInfo;

package/lib/hmr/lazyCompilationBackend.js

@@ -49,8 +49,9 @@ module.exports = options => (compiler, callback) => {
 			? options.listen
 			: server => {
 					let listen = options.listen;
-					if (typeof listen === "object" && !("port" in listen))
+					if (typeof listen === "object" && !("port" in listen)) {
 						listen = { ...listen, port: undefined };
+					}
 					server.listen(listen);
 				};
 
@@ -119,8 +120,9 @@ module.exports = options => (compiler, callback) => {
 		err => {
 			if (err) return callback(err);
 			const _addr = server.address();
-			if (typeof _addr === "string")
+			if (typeof _addr === "string") {
 				throw new Error("addr must not be a string");
+			}
 			const addr = /** @type {AddressInfo} */ (_addr);
 			const urlBase =
 				addr.address === "::" || addr.address === "0.0.0.0"

package/lib/ids/ChunkModuleIdRangePlugin.js

@@ -7,11 +7,12 @@
 
 const { find } = require("../util/SetHelpers");
 const {
-	compareModulesByPreOrderIndexOrIdentifier,
-	compareModulesByPostOrderIndexOrIdentifier
+	compareModulesByPostOrderIndexOrIdentifier,
+	compareModulesByPreOrderIndexOrIdentifier
 } = require("../util/comparators");
 
 /** @typedef {import("../Compiler")} Compiler */
+/** @typedef {import("../Module")} Module */
 
 /**
  * @typedef {object} ChunkModuleIdRangePluginOptions
@@ -52,6 +53,7 @@ class ChunkModuleIdRangePlugin {
 					);
 				}
 
+				/** @type {Module[]} */
 				let chunkModules;
 				if (options.order) {
 					let cmpFn;
@@ -69,7 +71,7 @@ class ChunkModuleIdRangePlugin {
 					}
 					chunkModules = chunkGraph.getOrderedChunkModules(chunk, cmpFn);
 				} else {
-					chunkModules = Array.from(modules)
+					chunkModules = [...modules]
 						.filter(m => chunkGraph.isModuleInChunk(m, chunk))
 						.sort(compareModulesByPreOrderIndexOrIdentifier(moduleGraph));
 				}
@@ -86,4 +88,5 @@ class ChunkModuleIdRangePlugin {
 		});
 	}
 }
+
 module.exports = ChunkModuleIdRangePlugin;

package/lib/ids/DeterministicChunkIdsPlugin.js

@@ -7,9 +7,9 @@
 
 const { compareChunksNatural } = require("../util/comparators");
 const {
+	assignDeterministicIds,
 	getFullChunkName,
-	getUsedChunkIds,
-	assignDeterministicIds
+	getUsedChunkIds
 } = require("./IdHelpers");
 
 /** @typedef {import("../Compiler")} Compiler */
@@ -21,6 +21,8 @@ const {
  * @property {number=} maxLength maximum length of ids
  */
 
+const PLUGIN_NAME = "DeterministicChunkIdsPlugin";
+
 class DeterministicChunkIdsPlugin {
 	/**
 	 * @param {DeterministicChunkIdsPluginOptions=} options options
@@ -35,42 +37,35 @@ class DeterministicChunkIdsPlugin {
 	 * @returns {void}
 	 */
 	apply(compiler) {
-		compiler.hooks.compilation.tap(
-			"DeterministicChunkIdsPlugin",
-			compilation => {
-				compilation.hooks.chunkIds.tap(
-					"DeterministicChunkIdsPlugin",
-					chunks => {
-						const chunkGraph = compilation.chunkGraph;
-						const context = this.options.context
-							? this.options.context
-							: compiler.context;
-						const maxLength = this.options.maxLength || 3;
+		compiler.hooks.compilation.tap(PLUGIN_NAME, compilation => {
+			compilation.hooks.chunkIds.tap(PLUGIN_NAME, chunks => {
+				const chunkGraph = compilation.chunkGraph;
+				const context = this.options.context
+					? this.options.context
+					: compiler.context;
+				const maxLength = this.options.maxLength || 3;
 
-						const compareNatural = compareChunksNatural(chunkGraph);
+				const compareNatural = compareChunksNatural(chunkGraph);
 
-						const usedIds = getUsedChunkIds(compilation);
-						assignDeterministicIds(
-							Array.from(chunks).filter(chunk => chunk.id === null),
-							chunk =>
-								getFullChunkName(chunk, chunkGraph, context, compiler.root),
-							compareNatural,
-							(chunk, id) => {
-								const size = usedIds.size;
-								usedIds.add(`${id}`);
-								if (size === usedIds.size) return false;
-								chunk.id = id;
-								chunk.ids = [id];
-								return true;
-							},
-							[10 ** maxLength],
-							10,
-							usedIds.size
-						);
-					}
+				const usedIds = getUsedChunkIds(compilation);
+				assignDeterministicIds(
+					[...chunks].filter(chunk => chunk.id === null),
+					chunk => getFullChunkName(chunk, chunkGraph, context, compiler.root),
+					compareNatural,
+					(chunk, id) => {
+						const size = usedIds.size;
+						usedIds.add(`${id}`);
+						if (size === usedIds.size) return false;
+						chunk.id = id;
+						chunk.ids = [id];
+						return true;
+					},
+					[10 ** maxLength],
+					10,
+					usedIds.size
 				);
-			}
-		);
+			});
+		});
 	}
 }
 

package/lib/ids/DeterministicModuleIdsPlugin.js

@@ -9,9 +9,9 @@ const {
 	compareModulesByPreOrderIndexOrIdentifier
 } = require("../util/comparators");
 const {
-	getUsedModuleIdsAndModules,
+	assignDeterministicIds,
 	getFullModuleName,
-	assignDeterministicIds
+	getUsedModuleIdsAndModules
 } = require("./IdHelpers");
 
 /** @typedef {import("../Compiler")} Compiler */
@@ -82,12 +82,13 @@ class DeterministicModuleIdsPlugin {
 					usedIds.size,
 					salt
 				);
-				if (failOnConflict && conflicts)
+				if (failOnConflict && conflicts) {
 					throw new Error(
 						`Assigning deterministic module ids has lead to ${conflicts} conflict${
 							conflicts > 1 ? "s" : ""
 						}.\nIncrease the 'maxLength' to increase the id space and make conflicts less likely (recommended when there are many conflicts or application is expected to grow), or add an 'salt' number to try another hash starting value in the same id space (recommended when there is only a single conflict).`
 					);
+				}
 			});
 		});
 	}

package/lib/ids/HashedModuleIdsPlugin.js

@@ -12,15 +12,15 @@ const {
 const createSchemaValidation = require("../util/create-schema-validation");
 const createHash = require("../util/createHash");
 const {
-	getUsedModuleIdsAndModules,
-	getFullModuleName
+	getFullModuleName,
+	getUsedModuleIdsAndModules
 } = require("./IdHelpers");
 
 /** @typedef {import("../../declarations/plugins/HashedModuleIdsPlugin").HashedModuleIdsPluginOptions} HashedModuleIdsPluginOptions */
 /** @typedef {import("../Compiler")} Compiler */
 
 const validate = createSchemaValidation(
-	require("../../schemas/plugins/HashedModuleIdsPlugin.check.js"),
+	require("../../schemas/plugins/HashedModuleIdsPlugin.check"),
 	() => require("../../schemas/plugins/HashedModuleIdsPlugin.json"),
 	{
 		name: "Hashed Module Ids Plugin",
@@ -77,8 +77,9 @@ class HashedModuleIdsPlugin {
 						hash.digest(options.hashDigest)
 					);
 					let len = options.hashDigestLength;
-					while (usedIds.has(hashId.slice(0, len)))
+					while (usedIds.has(hashId.slice(0, len))) {
 						/** @type {number} */ (len)++;
+					}
 					const moduleId = hashId.slice(0, len);
 					chunkGraph.setModuleId(module, moduleId);
 					usedIds.add(moduleId);

package/lib/ids/IdHelpers.js

@@ -56,7 +56,6 @@ const avoidNumber = str => {
  */
 const requestToId = request =>
 	request.replace(/^(\.\.?\/)+/, "").replace(/(^[.-]|[^a-zA-Z0-9_-])+/g, "_");
-module.exports.requestToId = requestToId;
 
 /**
  * @param {string} string the string
@@ -83,13 +82,13 @@ const getShortModuleName = (module, context, associatedObjectForCache) => {
 	const libIdent = module.libIdent({ context, associatedObjectForCache });
 	if (libIdent) return avoidNumber(libIdent);
 	const nameForCondition = module.nameForCondition();
-	if (nameForCondition)
+	if (nameForCondition) {
 		return avoidNumber(
 			makePathsRelative(context, nameForCondition, associatedObjectForCache)
 		);
+	}
 	return "";
 };
-module.exports.getShortModuleName = getShortModuleName;
 
 /**
  * @param {string} shortName the short name
@@ -109,7 +108,6 @@ const getLongModuleName = (
 	const fullName = getFullModuleName(module, context, associatedObjectForCache);
 	return `${shortName}?${getHash(fullName, 4, hashFunction)}`;
 };
-module.exports.getLongModuleName = getLongModuleName;
 
 /**
  * @param {Module} module the module
@@ -119,7 +117,6 @@ module.exports.getLongModuleName = getLongModuleName;
  */
 const getFullModuleName = (module, context, associatedObjectForCache) =>
 	makePathsRelative(context, module.identifier(), associatedObjectForCache);
-module.exports.getFullModuleName = getFullModuleName;
 
 /**
  * @param {Chunk} chunk the chunk
@@ -143,13 +140,11 @@ const getShortChunkName = (
 		requestToId(getShortModuleName(m, context, associatedObjectForCache))
 	);
 	chunk.idNameHints.sort();
-	const chunkName = Array.from(chunk.idNameHints)
-		.concat(shortModuleNames)
+	const chunkName = [...chunk.idNameHints, ...shortModuleNames]
 		.filter(Boolean)
 		.join(delimiter);
 	return shortenLongString(chunkName, delimiter, hashFunction);
 };
-module.exports.getShortChunkName = getShortChunkName;
 
 /**
  * @param {Chunk} chunk the chunk
@@ -178,13 +173,15 @@ const getLongChunkName = (
 		)
 	);
 	chunk.idNameHints.sort();
-	const chunkName = Array.from(chunk.idNameHints)
-		.concat(shortModuleNames, longModuleNames)
+	const chunkName = [
+		...chunk.idNameHints,
+		...shortModuleNames,
+		...longModuleNames
+	]
 		.filter(Boolean)
 		.join(delimiter);
 	return shortenLongString(chunkName, delimiter, hashFunction);
 };
-module.exports.getLongChunkName = getLongChunkName;
 
 /**
  * @param {Chunk} chunk the chunk
@@ -206,7 +203,6 @@ const getFullChunkName = (
 	);
 	return fullModuleNames.join();
 };
-module.exports.getFullChunkName = getFullChunkName;
 
 /**
  * @template K
@@ -258,7 +254,6 @@ const getUsedModuleIdsAndModules = (compilation, filter) => {
 
 	return [usedIds, modules];
 };
-module.exports.getUsedModuleIdsAndModules = getUsedModuleIdsAndModules;
 
 /**
  * @param {Compilation} compilation the compilation
@@ -282,7 +277,6 @@ const getUsedChunkIds = compilation => {
 
 	return usedIds;
 };
-module.exports.getUsedChunkIds = getUsedChunkIds;
 
 /**
  * @template T
@@ -350,7 +344,6 @@ const assignNames = (
 	unnamedItems.sort(comparator);
 	return unnamedItems;
 };
-module.exports.assignNames = assignNames;
 
 /**
  * @template T
@@ -404,7 +397,6 @@ const assignDeterministicIds = (
 		} while (!assignId(item, id));
 	}
 };
-module.exports.assignDeterministicIds = assignDeterministicIds;
 
 /**
  * @param {Set<string>} usedIds used ids
@@ -441,7 +433,6 @@ const assignAscendingModuleIds = (usedIds, modules, compilation) => {
 		assignId(module);
 	}
 };
-module.exports.assignAscendingModuleIds = assignAscendingModuleIds;
 
 /**
  * @param {Iterable<Chunk>} chunks the chunks
@@ -471,4 +462,17 @@ const assignAscendingChunkIds = (chunks, compilation) => {
 		}
 	}
 };
+
 module.exports.assignAscendingChunkIds = assignAscendingChunkIds;
+module.exports.assignAscendingModuleIds = assignAscendingModuleIds;
+module.exports.assignDeterministicIds = assignDeterministicIds;
+module.exports.assignNames = assignNames;
+module.exports.getFullChunkName = getFullChunkName;
+module.exports.getFullModuleName = getFullModuleName;
+module.exports.getLongChunkName = getLongChunkName;
+module.exports.getLongModuleName = getLongModuleName;
+module.exports.getShortChunkName = getShortChunkName;
+module.exports.getShortModuleName = getShortModuleName;
+module.exports.getUsedChunkIds = getUsedChunkIds;
+module.exports.getUsedModuleIdsAndModules = getUsedModuleIdsAndModules;
+module.exports.requestToId = requestToId;

package/lib/ids/NamedChunkIdsPlugin.js

@@ -7,11 +7,11 @@
 
 const { compareChunksNatural } = require("../util/comparators");
 const {
-	getShortChunkName,
-	getLongChunkName,
+	assignAscendingChunkIds,
 	assignNames,
-	getUsedChunkIds,
-	assignAscendingChunkIds
+	getLongChunkName,
+	getShortChunkName,
+	getUsedChunkIds
 } = require("./IdHelpers");
 
 /** @typedef {import("../../declarations/WebpackOptions").OutputNormalized} Output */
@@ -52,7 +52,7 @@ class NamedChunkIdsPlugin {
 				const delimiter = this.delimiter;
 
 				const unnamedChunks = assignNames(
-					Array.from(chunks).filter(chunk => {
+					[...chunks].filter(chunk => {
 						if (chunk.name) {
 							chunk.id = chunk.name;
 							chunk.ids = [chunk.name];

package/lib/ids/NamedModuleIdsPlugin.js

@@ -7,11 +7,11 @@
 
 const { compareModulesByIdentifier } = require("../util/comparators");
 const {
-	getShortModuleName,
-	getLongModuleName,
+	assignAscendingModuleIds,
 	assignNames,
-	getUsedModuleIdsAndModules,
-	assignAscendingModuleIds
+	getLongModuleName,
+	getShortModuleName,
+	getUsedModuleIdsAndModules
 } = require("./IdHelpers");
 
 /** @typedef {import("../../declarations/WebpackOptions").OutputNormalized} Output */

package/lib/ids/NaturalChunkIdsPlugin.js

@@ -25,7 +25,8 @@ class NaturalChunkIdsPlugin {
 			compilation.hooks.chunkIds.tap(PLUGIN_NAME, chunks => {
 				const chunkGraph = compilation.chunkGraph;
 				const compareNatural = compareChunksNatural(chunkGraph);
-				const chunksInNaturalOrder = Array.from(chunks).sort(compareNatural);
+				/** @type {Chunk[]} */
+				const chunksInNaturalOrder = [...chunks].sort(compareNatural);
 				assignAscendingChunkIds(chunksInNaturalOrder, compilation);
 			});
 		});

package/lib/ids/NaturalModuleIdsPlugin.js

@@ -26,7 +26,7 @@ class NaturalModuleIdsPlugin {
 	 */
 	apply(compiler) {
 		compiler.hooks.compilation.tap(PLUGIN_NAME, compilation => {
-			compilation.hooks.moduleIds.tap(PLUGIN_NAME, modules => {
+			compilation.hooks.moduleIds.tap(PLUGIN_NAME, () => {
 				const [usedIds, modulesInNaturalOrder] =
 					getUsedModuleIdsAndModules(compilation);
 				modulesInNaturalOrder.sort(

package/lib/ids/OccurrenceChunkIdsPlugin.js

@@ -15,7 +15,7 @@ const { assignAscendingChunkIds } = require("./IdHelpers");
 /** @typedef {import("../Module")} Module */
 
 const validate = createSchemaValidation(
-	require("../../schemas/plugins/ids/OccurrenceChunkIdsPlugin.check.js"),
+	require("../../schemas/plugins/ids/OccurrenceChunkIdsPlugin.check"),
 	() => require("../../schemas/plugins/ids/OccurrenceChunkIdsPlugin.json"),
 	{
 		name: "Occurrence Order Chunk Ids Plugin",
@@ -60,7 +60,8 @@ class OccurrenceChunkIdsPlugin {
 					occursInInitialChunksMap.set(c, occurs);
 				}
 
-				const chunksInOccurrenceOrder = Array.from(chunks).sort((a, b) => {
+				/** @type {Chunk[]} */
+				const chunksInOccurrenceOrder = [...chunks].sort((a, b) => {
 					if (prioritiseInitial) {
 						const aEntryOccurs =
 							/** @type {number} */

package/lib/ids/OccurrenceModuleIdsPlugin.js

@@ -20,7 +20,7 @@ const {
 /** @typedef {import("../ModuleGraphConnection")} ModuleGraphConnection */
 
 const validate = createSchemaValidation(
-	require("../../schemas/plugins/ids/OccurrenceModuleIdsPlugin.check.js"),
+	require("../../schemas/plugins/ids/OccurrenceModuleIdsPlugin.check"),
 	() => require("../../schemas/plugins/ids/OccurrenceModuleIdsPlugin.json"),
 	{
 		name: "Occurrence Order Module Ids Plugin",

package/lib/ids/SyncModuleIdsPlugin.js

@@ -72,7 +72,7 @@ class SyncModuleIdsPlugin {
 				if (!data || !dataChanged) return callback();
 				/** @type {{[key: string]: string | number}} */
 				const json = {};
-				const sorted = Array.from(data).sort(([a], [b]) => (a < b ? -1 : 1));
+				const sorted = [...data].sort(([a], [b]) => (a < b ? -1 : 1));
 				for (const [key, value] of sorted) {
 					json[key] = value;
 				}

package/lib/index.js

@@ -126,6 +126,7 @@ const mergeExports = (obj, exports) => {
 };
 
 const fn = lazyFunction(() => require("./webpack"));
+
 module.exports = mergeExports(fn, {
 	get webpack() {
 		return require("./webpack");
@@ -134,7 +135,10 @@ module.exports = mergeExports(fn, {
 	 * @returns {(configuration: Configuration | Configuration[]) => void} validate fn
 	 */
 	get validate() {
-		const webpackOptionsSchemaCheck = require("../schemas/WebpackOptions.check.js");
+		const webpackOptionsSchemaCheck =
+			/** @type {(configuration: Configuration | Configuration[]) => boolean} */
+			(require("../schemas/WebpackOptions.check"));
+
 		const getRealValidate = memoize(
 			/**
 			 * @returns {(configuration: Configuration | Configuration[]) => void} validate fn
@@ -142,16 +146,19 @@ module.exports = mergeExports(fn, {
 			() => {
 				const validateSchema = require("./validateSchema");
 				const webpackOptionsSchema = require("../schemas/WebpackOptions.json");
+
 				return options => validateSchema(webpackOptionsSchema, options);
 			}
 		);
 		return options => {
-			if (!webpackOptionsSchemaCheck(/** @type {TODO} */ (options)))
+			if (!webpackOptionsSchemaCheck(options)) {
 				getRealValidate()(options);
+			}
 		};
 	},
 	get validateSchema() {
 		const validateSchema = require("./validateSchema");
+
 		return validateSchema;
 	},
 	get version() {
@@ -455,7 +462,7 @@ module.exports = mergeExports(fn, {
 			return require("./optimize/LimitChunkCountPlugin");
 		},
 		get MergeDuplicateChunksPlugin() {
-			return require("./optimize/MergeDuplicateChunksPlugin.js");
+			return require("./optimize/MergeDuplicateChunksPlugin");
 		},
 		get MinChunkSizePlugin() {
 			return require("./optimize/MinChunkSizePlugin");
@@ -641,6 +648,9 @@ module.exports = mergeExports(fn, {
 		schemes: {
 			get HttpUriPlugin() {
 				return require("./schemes/HttpUriPlugin");
+			},
+			get VirtualUrlPlugin() {
+				return require("./schemes/VirtualUrlPlugin");
 			}
 		},
 		ids: {