webpack 5.99.7 → 5.99.9

package/README.md

@@ -9,7 +9,6 @@
 
 [![node][node]][node-url]
 [![builds1][builds1]][builds1-url]
-[![builds2][builds2]][builds2-url]
 [![dependency-review][dependency-review]][dependency-review-url]
 [![coverage][cover]][cover-url]
 [![PR's welcome][prs]][prs-url]
@@ -672,8 +671,6 @@ Before we started using OpenCollective, donations were made anonymously. Now tha
 [prs-url]: https://webpack.js.org/contribute/
 [builds1]: https://github.com/webpack/webpack/actions/workflows/test.yml/badge.svg
 [builds1-url]: https://github.com/webpack/webpack/actions/workflows/test.yml
-[builds2]: https://dev.azure.com/webpack/webpack/_apis/build/status%2Fwebpack.webpack?branchName=main
-[builds2-url]: https://dev.azure.com/webpack/webpack/_build/latest?definitionId=3&branchName=main
 [dependency-review-url]: https://github.com/webpack/webpack/actions/workflows/dependency-review.yml
 [dependency-review]: https://github.com/webpack/webpack/actions/workflows/dependency-review.yml/badge.svg
 [cover]: https://codecov.io/gh/webpack/webpack/graph/badge.svg?token=mDP3mQJNnn

package/lib/CacheFacade.js

@@ -38,8 +38,9 @@ class MultiItemCache {
 	 */
 	constructor(items) {
 		this._items = items;
+		// @ts-expect-error expected - returns the single ItemCacheFacade when passed an array of length 1
 		// eslint-disable-next-line no-constructor-return
-		if (items.length === 1) return /** @type {TODO} */ (items[0]);
+		if (items.length === 1) return /** @type {ItemCacheFacade} */ (items[0]);
 	}
 
 	/**

package/lib/ChunkGraph.js

@@ -668,7 +668,6 @@ class ChunkGraph {
 			if (st === undefined) return;
 			if (!sourceTypes) {
 				sourceTypes = st;
-				continue;
 			} else if (!newSet) {
 				for (const type of st) {
 					if (!newSet) {

package/lib/ChunkGroup.js

@@ -115,16 +115,23 @@ class ChunkGroup {
 	 */
 	addOptions(options) {
 		for (const _key of Object.keys(options)) {
-			const key = /** @type {keyof ChunkGroupOptions} */ (_key);
+			const key =
+				/** @type {keyof ChunkGroupOptions} */
+				(_key);
 			if (this.options[key] === undefined) {
-				/** @type {TODO} */
+				/** @type {EXPECTED_ANY} */
 				(this.options)[key] = options[key];
 			} else if (this.options[key] !== options[key]) {
 				if (key.endsWith("Order")) {
-					/** @type {TODO} */
-					(this.options)[key] = Math.max(
-						/** @type {number} */ (this.options[key]),
-						/** @type {number} */ (options[key])
+					const orderKey =
+						/** @type {Exclude<keyof ChunkGroupOptions, "name" | "fetchPriority">} */
+						(key);
+
+					this.options[orderKey] = Math.max(
+						/** @type {number} */
+						(this.options[orderKey]),
+						/** @type {number} */
+						(options[orderKey])
 					);
 				} else {
 					throw new Error(

package/lib/Compilation.js

@@ -130,7 +130,7 @@ const { isSourceEqual } = require("./util/source");
 /** @typedef {import("./stats/DefaultStatsFactoryPlugin").StatsModule} StatsModule */
 /** @typedef {import("./TemplatedPathPlugin").TemplatePath} TemplatePath */
 /** @typedef {import("./util/Hash")} Hash */
-/** @typedef {import("./util/createHash").Algorithm} Algorithm */
+/** @typedef {import("../declarations/WebpackOptions").HashFunction} HashFunction */
 /**
  * @template T
  * @typedef {import("./util/deprecation").FakeHook<T>} FakeHook<T>
@@ -1520,7 +1520,8 @@ BREAKING CHANGE: Asset processing hooks in Compilation has been merged into a si
 					this.options,
 					this,
 					this.resolverFactory.get("normal", module.resolveOptions),
-					/** @type {InputFileSystem} */ (this.inputFileSystem),
+					/** @type {InputFileSystem} */
+					(this.inputFileSystem),
 					err => {
 						if (currentProfile !== undefined) {
 							currentProfile.markBuildingEnd();
@@ -2020,8 +2021,7 @@ BREAKING CHANGE: Asset processing hooks in Compilation has been merged into a si
 						const unsafeCacheableModule =
 							/** @type {ModuleWithRestoreFromUnsafeCache} */
 							(module);
-						for (let i = 0; i < dependencies.length; i++) {
-							const dependency = dependencies[i];
+						for (const dependency of dependencies) {
 							moduleGraph.setResolvedModule(
 								connectOrigin ? originModule : null,
 								dependency,
@@ -2037,8 +2037,7 @@ BREAKING CHANGE: Asset processing hooks in Compilation has been merged into a si
 						}
 					} else {
 						applyFactoryResultDependencies();
-						for (let i = 0; i < dependencies.length; i++) {
-							const dependency = dependencies[i];
+						for (const dependency of dependencies) {
 							moduleGraph.setResolvedModule(
 								connectOrigin ? originModule : null,
 								dependency,
@@ -2355,6 +2354,7 @@ BREAKING CHANGE: Asset processing hooks in Compilation has been merged into a si
 	 */
 	_addEntryItem(context, entry, target, options, callback) {
 		const { name } = options;
+		/** @type {EntryData | undefined} */
 		let entryData =
 			name !== undefined ? this.entries.get(name) : this.globalEntry;
 		if (entryData === undefined) {
@@ -3434,18 +3434,13 @@ Or do you want to use the entrypoints '${name}' and '${runtime}' independently o
 	 */
 	reportDependencyErrorsAndWarnings(module, blocks) {
 		let hasProblems = false;
-		for (let indexBlock = 0; indexBlock < blocks.length; indexBlock++) {
-			const block = blocks[indexBlock];
+		for (const block of blocks) {
 			const dependencies = block.dependencies;
 
-			for (let indexDep = 0; indexDep < dependencies.length; indexDep++) {
-				const d = dependencies[indexDep];
-
+			for (const d of dependencies) {
 				const warnings = d.getWarnings(this.moduleGraph);
 				if (warnings) {
-					for (let indexWar = 0; indexWar < warnings.length; indexWar++) {
-						const w = warnings[indexWar];
-
+					for (const w of warnings) {
 						const warning = new ModuleDependencyWarning(module, w, d.loc);
 						this.warnings.push(warning);
 						hasProblems = true;
@@ -3453,9 +3448,7 @@ Or do you want to use the entrypoints '${name}' and '${runtime}' independently o
 				}
 				const errors = d.getErrors(this.moduleGraph);
 				if (errors) {
-					for (let indexErr = 0; indexErr < errors.length; indexErr++) {
-						const e = errors[indexErr];
-
+					for (const e of errors) {
 						const error = new ModuleDependencyError(module, e, d.loc);
 						this.errors.push(error);
 						hasProblems = true;
@@ -4160,16 +4153,14 @@ Or do you want to use the entrypoints '${name}' and '${runtime}' independently o
 		};
 
 		const blocks = block.blocks;
-		for (let indexBlock = 0; indexBlock < blocks.length; indexBlock++) {
-			const asyncBlock = blocks[indexBlock];
+		for (const asyncBlock of blocks) {
 			const chunkGroup =
 				/** @type {ChunkGroup} */
 				(this.chunkGraph.getBlockChunkGroup(asyncBlock));
 			// Grab all chunks from the first Block's AsyncDepBlock
 			const chunks = chunkGroup.chunks;
 			// For each chunk in chunkGroup
-			for (let indexChunk = 0; indexChunk < chunks.length; indexChunk++) {
-				const iteratedChunk = chunks[indexChunk];
+			for (const iteratedChunk of chunks) {
 				chunkGroup.removeChunk(iteratedChunk);
 				// Recurse
 				this.removeChunkFromDependencies(block, iteratedChunk);
@@ -4210,13 +4201,7 @@ Or do you want to use the entrypoints '${name}' and '${runtime}' independently o
 	}
 
 	summarizeDependencies() {
-		for (
-			let indexChildren = 0;
-			indexChildren < this.children.length;
-			indexChildren++
-		) {
-			const child = this.children[indexChildren];
-
+		for (const child of this.children) {
 			this.fileDependencies.addAll(child.fileDependencies);
 			this.contextDependencies.addAll(child.contextDependencies);
 			this.missingDependencies.addAll(child.missingDependencies);
@@ -4313,7 +4298,7 @@ Or do you want to use the entrypoints '${name}' and '${runtime}' independently o
 	) {
 		let moduleHashDigest;
 		try {
-			const moduleHash = createHash(/** @type {Algorithm} */ (hashFunction));
+			const moduleHash = createHash(/** @type {HashFunction} */ (hashFunction));
 			module.updateHash(moduleHash, {
 				chunkGraph,
 				runtime,
@@ -4341,7 +4326,7 @@ Or do you want to use the entrypoints '${name}' and '${runtime}' independently o
 		const hashFunction = outputOptions.hashFunction;
 		const hashDigest = outputOptions.hashDigest;
 		const hashDigestLength = outputOptions.hashDigestLength;
-		const hash = createHash(/** @type {Algorithm} */ (hashFunction));
+		const hash = createHash(/** @type {HashFunction} */ (hashFunction));
 		if (outputOptions.hashSalt) {
 			hash.update(outputOptions.hashSalt);
 		}
@@ -4524,7 +4509,9 @@ This prevents using hashes of each other and should be avoided.`);
 			this.logger.timeAggregate("hashing: hash runtime modules");
 			try {
 				this.logger.time("hashing: hash chunks");
-				const chunkHash = createHash(/** @type {Algorithm} */ (hashFunction));
+				const chunkHash = createHash(
+					/** @type {HashFunction} */ (hashFunction)
+				);
 				if (outputOptions.hashSalt) {
 					chunkHash.update(outputOptions.hashSalt);
 				}
@@ -4577,7 +4564,9 @@ This prevents using hashes of each other and should be avoided.`);
 			for (const module of /** @type {Iterable<RuntimeModule>} */ (
 				chunkGraph.getChunkFullHashModulesIterable(chunk)
 			)) {
-				const moduleHash = createHash(/** @type {Algorithm} */ (hashFunction));
+				const moduleHash = createHash(
+					/** @type {HashFunction} */ (hashFunction)
+				);
 				module.updateHash(moduleHash, {
 					chunkGraph,
 					runtime: chunk.runtime,
@@ -4599,7 +4588,7 @@ This prevents using hashes of each other and should be avoided.`);
 					(codeGenerationJobsMap.get(oldHash)).get(module)
 				).hash = moduleHashDigest;
 			}
-			const chunkHash = createHash(/** @type {Algorithm} */ (hashFunction));
+			const chunkHash = createHash(/** @type {HashFunction} */ (hashFunction));
 			chunkHash.update(chunk.hash);
 			chunkHash.update(this.hash);
 			const chunkHashDigest =

package/lib/ConstPlugin.js

@@ -179,53 +179,21 @@ class ConstPlugin {
 								? statement.alternate
 								: statement.consequent;
 							if (branchToRemove) {
-								// Before removing the dead branch, the hoisted declarations
-								// must be collected.
-								//
-								// Given the following code:
-								//
-								//     if (true) f() else g()
-								//     if (false) {
-								//       function f() {}
-								//       const g = function g() {}
-								//       if (someTest) {
-								//         let a = 1
-								//         var x, {y, z} = obj
-								//       }
-								//     } else {
-								//       …
-								//     }
-								//
-								// the generated code is:
-								//
-								//     if (true) f() else {}
-								//     if (false) {
-								//       var f, x, y, z;   (in loose mode)
-								//       var x, y, z;      (in strict mode)
-								//     } else {
-								//       …
-								//     }
-								//
-								// NOTE: When code runs in strict mode, `var` declarations
-								// are hoisted but `function` declarations don't.
-								//
-								const declarations = parser.scope.isStrict
-									? getHoistedDeclarations(branchToRemove, false)
-									: getHoistedDeclarations(branchToRemove, true);
-								const replacement =
-									declarations.length > 0
-										? `{ var ${declarations.join(", ")}; }`
-										: "{}";
-								const dep = new ConstDependency(
-									replacement,
-									/** @type {Range} */ (branchToRemove.range)
-								);
-								dep.loc = /** @type {SourceLocation} */ (branchToRemove.loc);
-								parser.state.module.addPresentationalDependency(dep);
+								this.eliminateUnusedStatement(parser, branchToRemove);
 							}
 							return bool;
 						}
 					});
+					parser.hooks.unusedStatement.tap(PLUGIN_NAME, statement => {
+						if (
+							parser.scope.isAsmJs ||
+							// Check top level scope here again
+							parser.scope.topLevelScope === true
+						)
+							return;
+						this.eliminateUnusedStatement(parser, statement);
+						return true;
+					});
 					parser.hooks.expressionConditionalOperator.tap(
 						PLUGIN_NAME,
 						expression => {
@@ -534,6 +502,56 @@ class ConstPlugin {
 			}
 		);
 	}
+
+	/**
+	 * Eliminate an unused statement.
+	 * @param {JavascriptParser} parser the parser
+	 * @param {Statement} statement the statement to remove
+	 * @returns {void}
+	 */
+	eliminateUnusedStatement(parser, statement) {
+		// Before removing the unused branch, the hoisted declarations
+		// must be collected.
+		//
+		// Given the following code:
+		//
+		//     if (true) f() else g()
+		//     if (false) {
+		//       function f() {}
+		//       const g = function g() {}
+		//       if (someTest) {
+		//         let a = 1
+		//         var x, {y, z} = obj
+		//       }
+		//     } else {
+		//       …
+		//     }
+		//
+		// the generated code is:
+		//
+		//     if (true) f() else {}
+		//     if (false) {
+		//       var f, x, y, z;   (in loose mode)
+		//       var x, y, z;      (in strict mode)
+		//     } else {
+		//       …
+		//     }
+		//
+		// NOTE: When code runs in strict mode, `var` declarations
+		// are hoisted but `function` declarations don't.
+		//
+		const declarations = parser.scope.isStrict
+			? getHoistedDeclarations(statement, false)
+			: getHoistedDeclarations(statement, true);
+		const replacement =
+			declarations.length > 0 ? `{ var ${declarations.join(", ")}; }` : "{}";
+		const dep = new ConstDependency(
+			`// removed by dead control flow\n${replacement}`,
+			/** @type {Range} */ (statement.range)
+		);
+		dep.loc = /** @type {SourceLocation} */ (statement.loc);
+		parser.state.module.addPresentationalDependency(dep);
+	}
 }
 
 module.exports = ConstPlugin;

package/lib/ContextModule.js

@@ -81,7 +81,7 @@ const makeSerializable = require("./util/makeSerializable");
 
 /**
  * @typedef {object} ContextModuleOptionsExtras
- * @property {false|string|string[]} resource
+ * @property {false | string | string[]} resource
  * @property {string=} resourceQuery
  * @property {string=} resourceFragment
  * @property {ResolveOptions=} resolveOptions

package/lib/ContextModuleFactory.js

@@ -397,8 +397,7 @@ module.exports = class ContextModuleFactory extends ModuleFactory {
 															/** @type {string} */
 															(category),
 															referencedExports,
-															/** @type {TODO} */
-															(obj.context),
+															obj.context,
 															attributes
 														);
 														dep.optional = true;

package/lib/ContextReplacementPlugin.js

@@ -190,7 +190,8 @@ const createResolveDependenciesFromContextMap =
 						map[key] + options.resourceQuery + options.resourceFragment,
 						key,
 						options.typePrefix,
-						/** @type {string} */ (options.category),
+						/** @type {string} */
+						(options.category),
 						options.referencedExports
 					)
 			);

package/lib/CssModule.js

@@ -158,7 +158,6 @@ class CssModule extends NormalModule {
 
 	/**
 	 * @param {ObjectDeserializerContext} context context
-	 * @returns {TODO} Module
 	 */
 	deserialize(context) {
 		const { read } = context;

package/lib/DefinePlugin.js

@@ -22,6 +22,7 @@ const {
 const createHash = require("./util/createHash");
 
 /** @typedef {import("estree").Expression} Expression */
+/** @typedef {import("../declarations/WebpackOptions").HashFunction} HashFunction */
 /** @typedef {import("./Compiler")} Compiler */
 /** @typedef {import("./Module").BuildInfo} BuildInfo */
 /** @typedef {import("./Module").ValueCacheVersions} ValueCacheVersions */
@@ -31,7 +32,6 @@ const createHash = require("./util/createHash");
 /** @typedef {import("./javascript/JavascriptParser").DestructuringAssignmentProperty} DestructuringAssignmentProperty */
 /** @typedef {import("./javascript/JavascriptParser").Range} Range */
 /** @typedef {import("./logging/Logger").Logger} Logger */
-/** @typedef {import("./util/createHash").Algorithm} Algorithm */
 
 /** @typedef {null | undefined | RegExp | EXPECTED_FUNCTION | string | number | boolean | bigint | undefined} CodeValuePrimitive */
 /** @typedef {RecursiveArrayOrRecord<CodeValuePrimitive | RuntimeValue>} CodeValue */
@@ -367,7 +367,7 @@ class DefinePlugin {
 				const { runtimeTemplate } = compilation;
 
 				const mainHash = createHash(
-					/** @type {Algorithm} */
+					/** @type {HashFunction} */
 					(compilation.outputOptions.hashFunction)
 				);
 				mainHash.update(

package/lib/DelegatedModule.js

@@ -16,6 +16,7 @@ const makeSerializable = require("./util/makeSerializable");
 
 /** @typedef {import("webpack-sources").Source} Source */
 /** @typedef {import("../declarations/WebpackOptions").WebpackOptionsNormalized} WebpackOptions */
+/** @typedef {import("../declarations/plugins/DllReferencePlugin").DllReferencePluginOptions} DllReferencePluginOptions */
 /** @typedef {import("./ChunkGraph")} ChunkGraph */
 /** @typedef {import("./Compilation")} Compilation */
 /** @typedef {import("./Dependency").UpdateHashContext} UpdateHashContext */
@@ -23,6 +24,7 @@ const makeSerializable = require("./util/makeSerializable");
 /** @typedef {import("./Generator").SourceTypes} SourceTypes */
 /** @typedef {import("./LibManifestPlugin").ManifestModuleData} ManifestModuleData */
 /** @typedef {import("./Module").BuildCallback} BuildCallback */
+/** @typedef {import("./Module").BuildMeta} BuildMeta */
 /** @typedef {import("./Module").CodeGenerationContext} CodeGenerationContext */
 /** @typedef {import("./Module").CodeGenerationResult} CodeGenerationResult */
 /** @typedef {import("./Module").LibIdentOptions} LibIdentOptions */
@@ -39,9 +41,16 @@ const makeSerializable = require("./util/makeSerializable");
 /** @typedef {import("./util/Hash")} Hash */
 /** @typedef {import("./util/fs").InputFileSystem} InputFileSystem */
 
-/** @typedef {string} SourceRequest */
-/** @typedef {"require" | "object"} Type */
-/** @typedef {TODO} Data */
+/** @typedef {string} DelegatedModuleSourceRequest */
+
+/** @typedef {NonNullable<DllReferencePluginOptions["type"]>} DelegatedModuleType */
+
+/**
+ * @typedef {object} DelegatedModuleData
+ * @property {BuildMeta=} buildMeta build meta
+ * @property {true | string[]=} exports exports
+ * @property {number | string} id module id
+ */
 
 const RUNTIME_REQUIREMENTS = new Set([
 	RuntimeGlobals.module,
@@ -50,9 +59,9 @@ const RUNTIME_REQUIREMENTS = new Set([
 
 class DelegatedModule extends Module {
 	/**
-	 * @param {SourceRequest} sourceRequest source request
-	 * @param {Data} data data
-	 * @param {Type} type type
+	 * @param {DelegatedModuleSourceRequest} sourceRequest source request
+	 * @param {DelegatedModuleData} data data
+	 * @param {DelegatedModuleType} type type
 	 * @param {string} userRequest user request
 	 * @param {string | Module} originalRequest original request
 	 */
@@ -65,7 +74,6 @@ class DelegatedModule extends Module {
 		this.delegationType = type;
 		this.userRequest = userRequest;
 		this.originalRequest = originalRequest;
-		/** @type {ManifestModuleData | undefined} */
 		this.delegateData = data;
 
 		// Build info
@@ -255,7 +263,9 @@ class DelegatedModule extends Module {
 	 */
 	cleanupForCache() {
 		super.cleanupForCache();
-		this.delegateData = undefined;
+		this.delegateData =
+			/** @type {EXPECTED_ANY} */
+			(undefined);
 	}
 }
 

package/lib/DelegatedModuleFactoryPlugin.js

@@ -9,15 +9,14 @@ const DelegatedModule = require("./DelegatedModule");
 
 /** @typedef {import("../declarations/plugins/DllReferencePlugin").DllReferencePluginOptions} DllReferencePluginOptions */
 /** @typedef {import("../declarations/plugins/DllReferencePlugin").DllReferencePluginOptionsContent} DllReferencePluginOptionsContent */
-/** @typedef {import("./DelegatedModule").Data} Data */
-/** @typedef {import("./DelegatedModule").SourceRequest} SourceRequest */
-/** @typedef {import("./DelegatedModule").Type} Type */
+/** @typedef {import("./DelegatedModule").DelegatedModuleSourceRequest} DelegatedModuleSourceRequest */
+/** @typedef {import("./DelegatedModule").DelegatedModuleType} DelegatedModuleType */
 /** @typedef {import("./NormalModuleFactory")} NormalModuleFactory */
 /** @typedef {import("./util/identifier").AssociatedObjectForCache} AssociatedObjectForCache */
 
 /**
  * @typedef {object} Options
- * @property {SourceRequest} source source
+ * @property {DelegatedModuleSourceRequest} source source
  * @property {NonNullable<DllReferencePluginOptions["context"]>} context absolute context path to which lib ident is relative to
  * @property {DllReferencePluginOptionsContent} content content
  * @property {DllReferencePluginOptions["type"]} type type
@@ -58,7 +57,8 @@ class DelegatedModuleFactoryPlugin {
 								new DelegatedModule(
 									this.options.source,
 									resolved,
-									/** @type {Type} */ (this.options.type),
+									/** @type {DelegatedModuleType} */
+									(this.options.type),
 									innerRequest,
 									request
 								)
@@ -77,7 +77,8 @@ class DelegatedModuleFactoryPlugin {
 									new DelegatedModule(
 										this.options.source,
 										resolved,
-										/** @type {Type} */ (this.options.type),
+										/** @type {DelegatedModuleType} */
+										(this.options.type),
 										requestPlusExt,
 										request + extension
 									)
@@ -98,7 +99,8 @@ class DelegatedModuleFactoryPlugin {
 						return new DelegatedModule(
 							this.options.source,
 							resolved,
-							/** @type {Type} */ (this.options.type),
+							/** @type {DelegatedModuleType} */
+							(this.options.type),
 							request,
 							module
 						);

package/lib/Dependency.js

@@ -131,23 +131,22 @@ class Dependency {
 	 */
 	get loc() {
 		if (this._loc !== undefined) return this._loc;
+
 		/** @type {SyntheticDependencyLocation & RealDependencyLocation} */
-		const loc = {
-			start: { line: 0, column: 0 },
-			end: { line: 0, column: 0 },
-			name: "",
-			index: -1
-		};
+		const loc = {};
+
 		if (this._locSL > 0) {
 			loc.start = { line: this._locSL, column: this._locSC };
 		}
 		if (this._locEL > 0) {
 			loc.end = { line: this._locEL, column: this._locEC };
 		}
-
-		loc.name = this._locN;
-
-		loc.index = this._locI;
+		if (this._locN !== undefined) {
+			loc.name = this._locN;
+		}
+		if (this._locI !== undefined) {
+			loc.index = this._locI;
+		}
 
 		return (this._loc = loc);
 	}
@@ -292,7 +291,7 @@ class Dependency {
 
 	/**
 	 * @param {string} context context directory
-	 * @returns {Module | null} a module
+	 * @returns {Module} ignored module
 	 */
 	createIgnoredModule(context) {
 		return getIgnoredModule();

package/lib/EvalSourceMapDevToolPlugin.js

@@ -39,7 +39,7 @@ const PLUGIN_NAME = "EvalSourceMapDevToolPlugin";
 
 class EvalSourceMapDevToolPlugin {
 	/**
-	 * @param {SourceMapDevToolPluginOptions|string} inputOptions Options object
+	 * @param {SourceMapDevToolPluginOptions | string} inputOptions Options object
 	 */
 	constructor(inputOptions) {
 		/** @type {SourceMapDevToolPluginOptions} */