webpack 5.99.8 → 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

@@ -2021,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,
@@ -2038,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,
@@ -2356,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) {
@@ -3435,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;
@@ -3454,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;
@@ -4161,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);
@@ -4211,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);

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/CssModule.js

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

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/FileSystemInfo.js

@@ -708,7 +708,6 @@ class SnapshotOptimization {
 					};
 				}
 				this._map.set(path, newOptimizationEntry);
-				continue;
 			} else {
 				optimizationEntries.add(optimizationEntry);
 			}
@@ -742,7 +741,6 @@ class SnapshotOptimization {
 							continue optimizationEntriesLabel;
 						}
 						nonSharedFiles.add(path);
-						continue;
 					}
 				}
 				if (nonSharedFiles.size === 0) {

package/lib/NormalModule.js

@@ -81,11 +81,13 @@ const memoize = require("./util/memoize");
 /** @typedef {import("./ModuleTypeConstants").JavaScriptModuleTypes} JavaScriptModuleTypes */
 /** @typedef {import("./NormalModuleFactory")} NormalModuleFactory */
 /** @typedef {import("./NormalModuleFactory").ResourceDataWithData} ResourceDataWithData */
+/** @typedef {import("./NormalModuleFactory").ResourceSchemeData} ResourceSchemeData */
 /** @typedef {import("./Parser")} Parser */
 /** @typedef {import("./Parser").PreparsedAst} PreparsedAst */
 /** @typedef {import("./RequestShortener")} RequestShortener */
 /** @typedef {import("./ResolverFactory").ResolveContext} ResolveContext */
 /** @typedef {import("./ResolverFactory").ResolverWithOptions} ResolverWithOptions */
+/** @typedef {import("./ResolverFactory").ResolveRequest} ResolveRequest */
 /** @typedef {import("./RuntimeTemplate")} RuntimeTemplate */
 /** @typedef {import("./logging/Logger").Logger} WebpackLogger */
 /** @typedef {import("./serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
@@ -250,7 +252,7 @@ makeSerializable(
  * @property {string} rawRequest request without resolving
  * @property {LoaderItem[]} loaders list of loaders
  * @property {string} resource path + query of the real resource
- * @property {TODO=} resourceResolveData resource resolve data
+ * @property {(ResourceSchemeData & Partial<ResolveRequest>)=} resourceResolveData resource resolve data
  * @property {string} context context directory for resolving
  * @property {string=} matchResource path + query of the matched resource (virtual)
  * @property {Parser} parser the parser used
@@ -587,12 +589,14 @@ class NormalModule extends Module {
 	 * @param {Compilation} compilation the compilation
 	 * @param {InputFileSystem} fs file system from reading
 	 * @param {NormalModuleCompilationHooks} hooks the hooks
-	 * @returns {import("../declarations/LoaderContext").NormalModuleLoaderContext<T>} loader context
+	 * @returns {import("../declarations/LoaderContext").LoaderContext<T>} loader context
 	 */
 	_createLoaderContext(resolver, options, compilation, fs, hooks) {
 		const { requestShortener } = compilation.runtimeTemplate;
 		const getCurrentLoaderName = () => {
-			const currentLoader = this.getCurrentLoader(loaderContext);
+			const currentLoader = this.getCurrentLoader(
+				/** @type {LoaderContext<EXPECTED_ANY>} */ (loaderContext)
+			);
 			if (!currentLoader) return "(not in loader scope)";
 			return requestShortener.shorten(currentLoader.loader);
 		};
@@ -601,13 +605,22 @@ class NormalModule extends Module {
 		 */
 		const getResolveContext = () => ({
 			fileDependencies: {
-				add: d => /** @type {TODO} */ (loaderContext).addDependency(d)
+				add: d =>
+					/** @type {LoaderContext<EXPECTED_ANY>} */ (
+						loaderContext
+					).addDependency(d)
 			},
 			contextDependencies: {
-				add: d => /** @type {TODO} */ (loaderContext).addContextDependency(d)
+				add: d =>
+					/** @type {LoaderContext<EXPECTED_ANY>} */ (
+						loaderContext
+					).addContextDependency(d)
 			},
 			missingDependencies: {
-				add: d => /** @type {TODO} */ (loaderContext).addMissingDependency(d)
+				add: d =>
+					/** @type {LoaderContext<EXPECTED_ANY>} */ (
+						loaderContext
+					).addMissingDependency(d)
 			}
 		});
 		const getAbsolutify = memoize(() =>
@@ -668,7 +681,9 @@ class NormalModule extends Module {
 			 * @returns {T} options
 			 */
 			getOptions: schema => {
-				const loader = this.getCurrentLoader(loaderContext);
+				const loader = this.getCurrentLoader(
+					/** @type {LoaderContext<EXPECTED_ANY>} */ (loaderContext)
+				);
 
 				let { options } = /** @type {LoaderItem} */ (loader);
 
@@ -728,7 +743,9 @@ class NormalModule extends Module {
 				);
 			},
 			getLogger: name => {
-				const currentLoader = this.getCurrentLoader(loaderContext);
+				const currentLoader = this.getCurrentLoader(
+					/** @type {LoaderContext<EXPECTED_ANY>} */ (loaderContext)
+				);
 				return compilation.getLogger(() =>
 					[currentLoader && currentLoader.loader, name, this.identifier()]
 						.filter(Boolean)
@@ -816,18 +833,19 @@ class NormalModule extends Module {
 
 		Object.assign(loaderContext, options.loader);
 
+		// After `hooks.loader.call` is called, the loaderContext is typed as LoaderContext<EXPECTED_ANY>
 		hooks.loader.call(
 			/** @type {LoaderContext<EXPECTED_ANY>} */
 			(loaderContext),
 			this
 		);
 
-		return loaderContext;
+		return /** @type {LoaderContext<EXPECTED_ANY>} */ (loaderContext);
 	}
 
 	// TODO remove `loaderContext` in webpack@6
 	/**
-	 * @param {TODO} loaderContext loader context
+	 * @param {LoaderContext<EXPECTED_ANY>} loaderContext loader context
 	 * @param {number} index index
 	 * @returns {LoaderItem | null} loader
 	 */
@@ -998,7 +1016,7 @@ class NormalModule extends Module {
 				loaders: this.loaders,
 				context: loaderContext,
 				/**
-				 * @param {LoaderContext<TODO>} loaderContext the loader context
+				 * @param {LoaderContext<EXPECTED_ANY>} loaderContext the loader context
 				 * @param {string} resourcePath the resource Path
 				 * @param {(err: Error | null, result?: string | Buffer) => void} callback callback
 				 */
@@ -1662,7 +1680,7 @@ class NormalModule extends Module {
 
 	/**
 	 * @param {ObjectDeserializerContext} context context
-	 * @returns {TODO} Module
+	 * @returns {NormalModule} module
 	 */
 	static deserialize(context) {
 		const obj = new NormalModule({

package/lib/NormalModuleFactory.js

@@ -85,7 +85,15 @@ const {
  * @property {string=} context
  */
 
-/** @typedef {ResourceData & { data: Record<string, EXPECTED_ANY> }} ResourceDataWithData */
+/**
+ * @typedef {object} ResourceSchemeData
+ * @property {string=} mimetype mime type of the resource
+ * @property {string=} parameters additional parameters for the resource
+ * @property {"base64" | false=} encoding encoding of the resource
+ * @property {string=} encodedContent encoded content of the resource
+ */
+
+/** @typedef {ResourceData & { data: ResourceSchemeData & Partial<ResolveRequest> }} ResourceDataWithData */
 
 /**
  * @typedef {object} ParsedLoaderRequest
@@ -321,6 +329,7 @@ class NormalModuleFactory extends ModuleFactory {
 		/** @type {Set<Module>} */
 		this._restoredUnsafeCacheEntries = new Set();
 
+		/** @type {(resource: string) => import("./util/identifier").ParsedResource} */
 		const cacheParseResource = parseResource.bindCache(
 			associatedObjectForCache
 		);
@@ -447,21 +456,22 @@ class NormalModuleFactory extends ModuleFactory {
 					const matchResourceMatch = MATCH_RESOURCE_REGEX.exec(request);
 					if (matchResourceMatch) {
 						let matchResource = matchResourceMatch[1];
+						// Check if matchResource starts with ./ or ../
 						if (matchResource.charCodeAt(0) === 46) {
-							// 46 === ".", 47 === "/"
+							// 46 is "."
 							const secondChar = matchResource.charCodeAt(1);
 							if (
-								secondChar === 47 ||
-								(secondChar === 46 && matchResource.charCodeAt(2) === 47)
+								secondChar === 47 || // 47 is "/"
+								(secondChar === 46 && matchResource.charCodeAt(2) === 47) // "../"
 							) {
-								// if matchResources startsWith ../ or ./
+								// Resolve relative path against context
 								matchResource = join(this.fs, context, matchResource);
 							}
 						}
 
 						matchResourceData = {
-							resource: matchResource,
-							.../** @type {TODO} */ (cacheParseResource(matchResource))
+							...cacheParseResource(matchResource),
+							resource: matchResource
 						};
 						requestWithoutMatchResource = request.slice(
 							matchResourceMatch[0].length
@@ -546,11 +556,7 @@ class NormalModuleFactory extends ModuleFactory {
 
 					if (!resourceData) {
 						// ignored
-						return callback(
-							null,
-							/** @type {TODO} */
-							(dependencies[0].createIgnoredModule(context))
-						);
+						return callback(null, dependencies[0].createIgnoredModule(context));
 					}
 
 					const userRequest =
@@ -759,9 +765,9 @@ class NormalModuleFactory extends ModuleFactory {
 				const defaultResolve = context => {
 					if (/^($|\?)/.test(unresolvedResource)) {
 						resourceData = {
+							...cacheParseResource(unresolvedResource),
 							resource: unresolvedResource,
-							data: {},
-							.../** @type {TODO} */ (cacheParseResource(unresolvedResource))
+							data: {}
 						};
 						continueCallback();
 					}
@@ -791,12 +797,11 @@ class NormalModuleFactory extends ModuleFactory {
 										/** @type {string} */
 										(_resolvedResource);
 									resourceData = {
+										...cacheParseResource(resolvedResource),
 										resource: resolvedResource,
 										data:
 											/** @type {ResolveRequest} */
-											(resolvedResourceResolveData),
-										.../** @type {TODO} */
-										(cacheParseResource(resolvedResource))
+											(resolvedResourceResolveData)
 									};
 								}
 								continueCallback();
@@ -1228,7 +1233,7 @@ If changing the source code is not an option there is also a resolve options cal
 					}
 				);
 			},
-			/** @type {Callback<TODO>} */ (callback)
+			/** @type {Callback<(LoaderItem | undefined)[]>} */ (callback)
 		);
 	}
 

package/lib/RuntimePlugin.js

@@ -292,7 +292,7 @@ class RuntimePlugin {
 											? compilation.outputOptions.filename
 											: compilation.outputOptions.chunkFilename)
 								),
-							false
+							set.has(RuntimeGlobals.hmrDownloadUpdateHandlers)
 						)
 					);
 					return true;

package/lib/asset/AssetGenerator.js

@@ -165,7 +165,7 @@ const encodeDataUri = (encoding, source) => {
 };
 
 /**
- * @param {string} encoding encoding
+ * @param {"base64" | false} encoding encoding
  * @param {string} content content
  * @returns {Buffer} decoded content
  */
@@ -475,7 +475,6 @@ class AssetGenerator extends Generator {
 				module
 			});
 		} else {
-			/** @type {"base64" | false | undefined} */
 			let encoding =
 				/** @type {AssetGeneratorDataUrlOptions} */
 				(this.dataUrlOptions).encoding;
@@ -498,12 +497,15 @@ class AssetGenerator extends Generator {
 				module.resourceResolveData.encoding === encoding &&
 				decodeDataUriContent(
 					module.resourceResolveData.encoding,
-					module.resourceResolveData.encodedContent
+					/** @type {string} */ (module.resourceResolveData.encodedContent)
 				).equals(source.buffer())
 			) {
 				encodedContent = module.resourceResolveData.encodedContent;
 			} else {
-				encodedContent = encodeDataUri(encoding, source);
+				encodedContent = encodeDataUri(
+					/** @type {"base64" | false} */ (encoding),
+					source
+				);
 			}
 
 			encodedSource = `data:${mimeType}${
@@ -655,6 +657,7 @@ class AssetGenerator extends Generator {
 	 * @returns {SourceTypes} available types (do not mutate)
 	 */
 	getTypes(module) {
+		/** @type {Set<string>} */
 		const sourceTypes = new Set();
 		const connections = this._moduleGraph.getIncomingConnections(module);
 
@@ -667,27 +670,25 @@ class AssetGenerator extends Generator {
 		}
 
 		if ((module.buildInfo && module.buildInfo.dataUrl) || this.emit === false) {
-			if (sourceTypes) {
+			if (sourceTypes.size > 0) {
 				if (sourceTypes.has("javascript") && sourceTypes.has("css")) {
 					return JS_AND_CSS_URL_TYPES;
-				} else if (sourceTypes.has("javascript")) {
-					return JS_TYPES;
 				} else if (sourceTypes.has("css")) {
 					return CSS_URL_TYPES;
 				}
+				return JS_TYPES;
 			}
 
 			return NO_TYPES;
 		}
 
-		if (sourceTypes) {
+		if (sourceTypes.size > 0) {
 			if (sourceTypes.has("javascript") && sourceTypes.has("css")) {
 				return ASSET_AND_JS_AND_CSS_URL_TYPES;
-			} else if (sourceTypes.has("javascript")) {
-				return ASSET_AND_JS_TYPES;
 			} else if (sourceTypes.has("css")) {
 				return ASSET_AND_CSS_URL_TYPES;
 			}
+			return ASSET_AND_JS_TYPES;
 		}
 
 		return ASSET_TYPES;

package/lib/asset/AssetSourceGenerator.js

@@ -122,6 +122,7 @@ class AssetSourceGenerator extends Generator {
 	 * @returns {SourceTypes} available types (do not mutate)
 	 */
 	getTypes(module) {
+		/** @type {Set<string>} */
 		const sourceTypes = new Set();
 		const connections = this._moduleGraph.getIncomingConnections(module);
 
@@ -133,12 +134,13 @@ class AssetSourceGenerator extends Generator {
 			sourceTypes.add(connection.originModule.type.split("/")[0]);
 		}
 
-		if (sourceTypes.has("javascript") && sourceTypes.has("css")) {
-			return JS_AND_CSS_URL_TYPES;
-		} else if (sourceTypes.has("javascript")) {
+		if (sourceTypes.size > 0) {
+			if (sourceTypes.has("javascript") && sourceTypes.has("css")) {
+				return JS_AND_CSS_URL_TYPES;
+			} else if (sourceTypes.has("css")) {
+				return CSS_URL_TYPES;
+			}
 			return JS_TYPES;
-		} else if (sourceTypes.has("css")) {
-			return CSS_URL_TYPES;
 		}
 
 		return NO_TYPES;

package/lib/dependencies/CssUrlDependency.js

@@ -53,7 +53,7 @@ class CssUrlDependency extends ModuleDependency {
 
 	/**
 	 * @param {string} context context directory
-	 * @returns {Module | null} a module
+	 * @returns {Module} ignored module
 	 */
 	createIgnoredModule(context) {
 		return getIgnoredRawDataUrlModule();

package/lib/dependencies/ModuleDependency.js

@@ -58,7 +58,7 @@ class ModuleDependency extends Dependency {
 
 	/**
 	 * @param {string} context context directory
-	 * @returns {Module | null} a module
+	 * @returns {Module} ignored module
 	 */
 	createIgnoredModule(context) {
 		return new RawModule(

package/lib/dependencies/RequireEnsureDependenciesBlockParserPlugin.js

@@ -109,7 +109,10 @@ module.exports = class RequireEnsureDependenciesBlockParserPlugin {
 						}
 						if (successExpression) {
 							if (successExpression.fn.body.type === "BlockStatement") {
+								// Opt-out of Dead Control Flow detection for this block
+								const oldTerminated = parser.scope.terminated;
 								parser.walkStatement(successExpression.fn.body);
+								parser.scope.terminated = oldTerminated;
 							} else {
 								parser.walkExpression(successExpression.fn.body);
 							}

package/lib/dependencies/URLDependency.js

@@ -72,7 +72,7 @@ class URLDependency extends ModuleDependency {
 
 	/**
 	 * @param {string} context context directory
-	 * @returns {Module | null} a module
+	 * @returns {Module} ignored module
 	 */
 	createIgnoredModule(context) {
 		return getIgnoredRawDataUrlModule();

package/lib/esm/ModuleChunkLoadingRuntimeModule.js

@@ -216,9 +216,9 @@ class ModuleChunkLoadingRuntimeModule extends RuntimeModule {
 													"// setup Promise in chunk cache",
 													`var promise = ${importFunctionName}(${
 														compilation.outputOptions.publicPath === "auto"
-															? ""
-															: `${RuntimeGlobals.publicPath} + `
-													}${JSON.stringify(rootOutputDir)} + ${
+															? JSON.stringify(rootOutputDir)
+															: RuntimeGlobals.publicPath
+													} + ${
 														RuntimeGlobals.getChunkScriptFilename
 													}(chunkId)).then(installChunk, ${runtimeTemplate.basicFunction(
 														"e",

package/lib/javascript/JavascriptParser.js

@@ -578,7 +578,9 @@ class JavascriptParser extends Parser {
 			/** @type {SyncBailHook<[ThrowStatement | ReturnStatement], boolean | void>} */
 			terminate: new SyncBailHook(["statement"]),
 			/** @type {SyncBailHook<[Program, Comment[]], boolean | void>} */
-			finish: new SyncBailHook(["ast", "comments"])
+			finish: new SyncBailHook(["ast", "comments"]),
+			/** @type {SyncBailHook<[Statement], boolean | void>} */
+			unusedStatement: new SyncBailHook(["statement"])
 		});
 		this.sourceType = sourceType;
 		/** @type {ScopeInfo} */
@@ -1939,8 +1941,13 @@ class JavascriptParser extends Parser {
 		for (let index = 0, len = statements.length; index < len; index++) {
 			const statement = statements[index];
 
-			if (onlyFunctionDeclaration && statement.type !== "FunctionDeclaration")
+			if (
+				onlyFunctionDeclaration &&
+				statement.type !== "FunctionDeclaration" &&
+				this.hooks.unusedStatement.call(/** @type {Statement} */ (statement))
+			) {
 				continue;
+			}
 
 			this.walkStatement(statement);
 
@@ -2852,11 +2859,18 @@ class JavascriptParser extends Parser {
 		for (let i = 0; i < properties.length; i++) {
 			const property = properties[i];
 			if (property.type !== "Property") return;
-			if (property.shorthand && property.value.type === "Identifier") {
-				this.scope.inShorthand = property.value.name;
+			if (property.shorthand) {
+				if (property.value.type === "Identifier") {
+					this.scope.inShorthand = property.value.name;
+				} else if (
+					property.value.type === "AssignmentPattern" &&
+					property.value.left.type === "Identifier"
+				) {
+					this.scope.inShorthand = property.value.left.name;
+				}
 			}
 			const key = property.key;
-			if (key.type === "Identifier") {
+			if (key.type === "Identifier" && !property.computed) {
 				props.add({
 					id: key.name,
 					range: key.range,

package/lib/library/ModuleLibraryPlugin.js

@@ -82,7 +82,10 @@ class ModuleLibraryPlugin extends AbstractLibraryPlugin {
 				for (const chunk of compilation.chunkGraph.getModuleChunksIterable(
 					module
 				)) {
-					if (!chunk.hasRuntime()) {
+					if (
+						!chunk.hasRuntime() ||
+						compilation.chunkGraph.getNumberOfEntryModules(chunk) > 1
+					) {
 						return false;
 					}
 				}

package/lib/optimize/SideEffectsFlagPlugin.js

@@ -105,7 +105,9 @@ class SideEffectsFlagPlugin {
 							}
 							const hasSideEffects = SideEffectsFlagPlugin.moduleHasSideEffects(
 								resolveData.relativePath,
-								sideEffects,
+								/** @type {string | boolean | string[] | undefined} */ (
+									sideEffects
+								),
 								/** @type {CacheItem} */ (cache)
 							);
 							module.factoryMeta.sideEffectFree = !hasSideEffects;

package/lib/rules/RuleSetCompiler.js

@@ -40,7 +40,7 @@ const { SyncHook } = require("tapable");
  * @property {ImportAttributes=} assertions
  * @property {string=} mimetype
  * @property {string} dependency
- * @property {Record<string, EXPECTED_ANY>} descriptionData
+ * @property {Record<string, EXPECTED_ANY>=} descriptionData
  * @property {string=} compiler
  * @property {string} issuer
  * @property {string} issuerLayer

package/lib/schemes/DataUriPlugin.js

@@ -56,7 +56,9 @@ class DataUriPlugin {
 						if (match) {
 							resourceData.data.mimetype = match[1] || "";
 							resourceData.data.parameters = match[2] || "";
-							resourceData.data.encoding = match[3] || false;
+							resourceData.data.encoding = /** @type {"base64" | false} */ (
+								match[3] || false
+							);
 							resourceData.data.encodedContent = match[4] || "";
 						}
 					});

package/lib/sharing/ProvideSharedPlugin.js

@@ -141,7 +141,9 @@ class ProvideSharedPlugin {
 							} else if (!descriptionFileData.version) {
 								details = `No version in description file (usually package.json). Add version to description file ${resourceResolveData.descriptionFilePath}, or manually specify version in shared config.`;
 							} else {
-								version = descriptionFileData.version;
+								version = /** @type {string | false | undefined} */ (
+									descriptionFileData.version
+								);
 							}
 						}
 						if (!version) {

package/lib/stats/DefaultStatsPrinterPlugin.js

@@ -1454,7 +1454,12 @@ const AVAILABLE_COLORS = {
 	magenta: "\u001B[1m\u001B[35m"
 };
 
-/** @typedef {Required<{ [Key in keyof KnownStatsPrinterFormatters]: (value: Parameters<NonNullable<KnownStatsPrinterFormatters[Key]>>[0], options: Required<KnownStatsPrinterColorFunctions> & StatsPrinterContext, ...args: TODO[]) => string }>} AvailableFormats */
+/**
+ * @template T
+ * @typedef {T extends [infer Head, ...infer Tail] ? Tail : undefined} Tail
+ */
+
+/** @typedef {Required<{ [Key in keyof KnownStatsPrinterFormatters]: (value: Parameters<NonNullable<KnownStatsPrinterFormatters[Key]>>[0], options: Required<KnownStatsPrinterColorFunctions> & StatsPrinterContextWithExtra, ...args: Tail<Parameters<NonNullable<KnownStatsPrinterFormatters[Key]>>>) => string }>} AvailableFormats */
 
 /** @type {AvailableFormats} */
 const AVAILABLE_FORMATS = {
@@ -1629,21 +1634,16 @@ class DefaultStatsPrinterPlugin {
 								context[color] = str => str;
 							}
 						}
-						for (const format of Object.keys(AVAILABLE_FORMATS)) {
+						for (const _format of Object.keys(AVAILABLE_FORMATS)) {
+							const format =
+								/** @type {keyof KnownStatsPrinterFormatters} */
+								(_format);
+
 							context[format] =
-								/**
-								 * @param {string | number} content content
-								 * @param {...TODO} args args
-								 * @returns {string} result
-								 */
+								/** @type {(content: Parameters<NonNullable<KnownStatsPrinterFormatters[keyof KnownStatsPrinterFormatters]>>[0], ...args: Tail<Parameters<NonNullable<KnownStatsPrinterFormatters[keyof KnownStatsPrinterFormatters]>>>) => string} */
 								(content, ...args) =>
 									/** @type {TODO} */
-									(
-										AVAILABLE_FORMATS[
-											/** @type {keyof AvailableFormats} */
-											(format)
-										]
-									)(
+									(AVAILABLE_FORMATS)[format](
 										content,
 										/** @type {StatsPrinterContext & Required<KnownStatsPrinterColorFunctions>} */
 										(context),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack",
-  "version": "5.99.8",
+  "version": "5.99.9",
   "author": "Tobias Koppers @sokra",
   "description": "Packs ECMAScript/CommonJs/AMD modules for the browser. Allows you to split your codebase into multiple bundles, which can be loaded on demand. Supports loaders to preprocess files, i.e. json, jsx, es7, css, less, ... and your custom stuff.",
   "license": "MIT",
@@ -38,7 +38,7 @@
   "devDependencies": {
     "@babel/core": "^7.27.1",
     "@babel/preset-react": "^7.27.1",
-    "@codspeed/benchmark.js-plugin": "^4.0.1",
+    "@codspeed/tinybench-plugin": "^4.0.1",
     "@eslint/js": "^9.21.0",
     "@stylistic/eslint-plugin": "^4.2.0",
     "@types/glob-to-regexp": "^0.4.4",
@@ -48,12 +48,11 @@
     "@types/xxhashjs": "^0.2.4",
     "assemblyscript": "^0.27.34",
     "babel-loader": "^10.0.0",
-    "benchmark": "^2.1.4",
     "bundle-loader": "^0.5.6",
     "coffee-loader": "^5.0.0",
     "coffeescript": "^2.5.1",
     "core-js": "^3.6.5",
-    "cspell": "^8.8.4",
+    "cspell": "^9.0.1",
     "css-loader": "^7.1.2",
     "date-fns": "^4.0.0",
     "es5-ext": "^0.10.53",
@@ -81,7 +80,7 @@
     "json5": "^2.1.3",
     "less": "^4.0.0",
     "less-loader": "^12.2.0",
-    "lint-staged": "^15.2.5",
+    "lint-staged": "^16.0.0",
     "lodash": "^4.17.19",
     "lodash-es": "^4.17.15",
     "memfs": "^4.14.0",
@@ -105,8 +104,9 @@
     "style-loader": "^4.0.0",
     "terser": "^5.38.1",
     "three": "^0.176.0",
+    "tinybench": "^4.0.1",
     "toml": "^3.0.0",
-    "tooling": "webpack/tooling#v1.23.8",
+    "tooling": "webpack/tooling#v1.23.9",
     "ts-loader": "^9.5.1",
     "typescript": "^5.8.2",
     "url-loader": "^4.1.0",
@@ -170,17 +170,18 @@
     "pretest": "yarn lint",
     "test": "node --expose-gc --max-old-space-size=4096 --experimental-vm-modules --trace-deprecation node_modules/jest-cli/bin/jest --logHeapUsage",
     "test:update-snapshots": "yarn test -u",
-    "test:integration": "node --expose-gc --max-old-space-size=4096 --experimental-vm-modules --trace-deprecation node_modules/jest-cli/bin/jest --logHeapUsage --testMatch \"<rootDir>/test/*.{basictest,longtest,test}.js\"",
-    "test:basic": "node --expose-gc --max-old-space-size=4096 --experimental-vm-modules --trace-deprecation node_modules/jest-cli/bin/jest --logHeapUsage --testMatch \"<rootDir>/test/*.basictest.js\"",
-    "test:unit": "node --max-old-space-size=4096 --experimental-vm-modules --trace-deprecation node_modules/jest-cli/bin/jest --testMatch \"<rootDir>/test/*.unittest.js\"",
+    "test:basic": "yarn test --testMatch \"<rootDir>/test/*.basictest.js\"",
+    "test:unit": "yarn test --testMatch \"<rootDir>/test/*.unittest.js\"",
+    "test:integration": "yarn test --testMatch \"<rootDir>/test/*.{basictest,longtest,test}.js\"",
     "cover": "yarn cover:all && yarn cover:report",
     "cover:clean": "rimraf .nyc_output coverage",
-    "cover:all": "node --expose-gc --max-old-space-size=4096 --experimental-vm-modules node_modules/jest-cli/bin/jest --logHeapUsage --coverage",
-    "cover:basic": "node --expose-gc --max-old-space-size=4096 --experimental-vm-modules node_modules/jest-cli/bin/jest --logHeapUsage --testMatch \"<rootDir>/test/*.basictest.js\" --coverage",
-    "cover:integration": "node --expose-gc --max-old-space-size=4096 --experimental-vm-modules node_modules/jest-cli/bin/jest --logHeapUsage --testMatch \"<rootDir>/test/*.{basictest,longtest,test}.js\" --coverage",
-    "cover:integration:a": "node --expose-gc --max-old-space-size=4096 --experimental-vm-modules node_modules/jest-cli/bin/jest --logHeapUsage --testMatch \"<rootDir>/test/*.{basictest,test}.js\" --coverage",
-    "cover:integration:b": "node --expose-gc --max-old-space-size=4096 --experimental-vm-modules node_modules/jest-cli/bin/jest --logHeapUsage --testMatch \"<rootDir>/test/*.longtest.js\" --coverage",
-    "cover:unit": "node --max-old-space-size=4096 --experimental-vm-modules node_modules/jest-cli/bin/jest --testMatch \"<rootDir>/test/*.unittest.js\" --coverage",
+    "cover:all": "yarn cover:base --coverage",
+    "cover:unit": "yarn cover:base --testMatch \"<rootDir>/test/*.unittest.js\" --coverage",
+    "cover:basic": "yarn cover:base --testMatch \"<rootDir>/test/*.basictest.js\" --coverage",
+    "cover:integration": "yarn cover:base --testMatch \"<rootDir>/test/*.{basictest,longtest,test}.js\" --coverage",
+    "cover:integration:a": "yarn cover:base --testMatch \"<rootDir>/test/*.{basictest,test}.js\" --coverage",
+    "cover:integration:b": "yarn cover:base --testMatch \"<rootDir>/test/*.longtest.js\" --coverage",
+    "cover:base": "node --expose-gc --max-old-space-size=4096 --experimental-vm-modules node_modules/jest-cli/bin/jest --logHeapUsage",
     "cover:types": "node node_modules/tooling/type-coverage",
     "cover:merge": "yarn mkdirp .nyc_output && nyc merge .nyc_output coverage/coverage-nyc.json && rimraf .nyc_output",
     "cover:report": "nyc report --reporter=lcov  --reporter=text -t coverage"

package/types.d.ts

@@ -3526,7 +3526,7 @@ declare class Dependency {
 	getModuleEvaluationSideEffectsState(
 		moduleGraph: ModuleGraph
 	): ConnectionState;
-	createIgnoredModule(context: string): null | Module;
+	createIgnoredModule(context: string): Module;
 	serialize(__0: ObjectSerializerContext): void;
 	deserialize(__0: ObjectDeserializerContext): void;
 	module: any;
@@ -3933,7 +3933,7 @@ declare interface EffectData {
 	assertions?: ImportAttributes;
 	mimetype?: string;
 	dependency: string;
-	descriptionData: Record<string, any>;
+	descriptionData?: Record<string, any>;
 	compiler?: string;
 	issuer: string;
 	issuerLayer: string;
@@ -6501,6 +6501,7 @@ declare class JavascriptParser extends Parser {
 		program: SyncBailHook<[Program, Comment[]], boolean | void>;
 		terminate: SyncBailHook<[ReturnStatement | ThrowStatement], boolean | void>;
 		finish: SyncBailHook<[Program, Comment[]], boolean | void>;
+		unusedStatement: SyncBailHook<[Statement], boolean | void>;
 	}>;
 	sourceType: "module" | "auto" | "script";
 	scope: ScopeInfo;
@@ -10110,7 +10111,7 @@ declare class NormalModule extends Module {
 	generator?: Generator;
 	generatorOptions?: GeneratorOptions;
 	resource: string;
-	resourceResolveData: any;
+	resourceResolveData?: ResourceSchemeData & Partial<ResolveRequest>;
 	matchResource?: string;
 	loaders: LoaderItem[];
 	error: null | WebpackError;
@@ -10129,7 +10130,10 @@ declare class NormalModule extends Module {
 		sourceMap?: string | SourceMap,
 		associatedObjectForCache?: object
 	): Source;
-	getCurrentLoader(loaderContext?: any, index?: number): null | LoaderItem;
+	getCurrentLoader(
+		loaderContext: LoaderContextNormalModule<any>,
+		index?: number
+	): null | LoaderItem;
 	createSource(
 		context: string,
 		content: string | Buffer,
@@ -10150,7 +10154,7 @@ declare class NormalModule extends Module {
 	static getCompilationHooks(
 		compilation: Compilation
 	): NormalModuleCompilationHooks;
-	static deserialize(context: ObjectDeserializerContext): any;
+	static deserialize(context: ObjectDeserializerContext): NormalModule;
 }
 declare interface NormalModuleCompilationHooks {
 	loader: SyncHook<[LoaderContextNormalModule<any>, NormalModule]>;
@@ -10214,7 +10218,7 @@ declare interface NormalModuleCreateData {
 	/**
 	 * resource resolve data
 	 */
-	resourceResolveData?: any;
+	resourceResolveData?: ResourceSchemeData & Partial<ResolveRequest>;
 
 	/**
 	 * context directory for resolving
@@ -13569,7 +13573,28 @@ declare interface ResourceDataWithData {
 	query?: string;
 	fragment?: string;
 	context?: string;
-	data: Record<string, any>;
+	data: ResourceSchemeData & Partial<ResolveRequest>;
+}
+declare interface ResourceSchemeData {
+	/**
+	 * mime type of the resource
+	 */
+	mimetype?: string;
+
+	/**
+	 * additional parameters for the resource
+	 */
+	parameters?: string;
+
+	/**
+	 * encoding of the resource
+	 */
+	encoding?: false | "base64";
+
+	/**
+	 * encoded content of the resource
+	 */
+	encodedContent?: string;
 }
 declare abstract class RestoreProvidedData {
 	exports: RestoreProvidedDataExports[];