webpack 5.83.1 → 5.85.0

package/lib/javascript/StartupHelpers.js

@@ -19,7 +19,7 @@ const { getAllChunks } = require("./ChunkHelpers");
 /** @typedef {import("../RuntimeTemplate")} RuntimeTemplate */
 /** @typedef {(string|number)[]} EntryItem */
 
-const EXPORT_PREFIX = "var __webpack_exports__ = ";
+const EXPORT_PREFIX = `var ${RuntimeGlobals.exports} = `;
 
 /**
  * @param {ChunkGraph} chunkGraph chunkGraph
@@ -39,7 +39,7 @@ exports.generateEntryStartup = (
 	/** @type {string[]} */
 	const runtime = [
 		`var __webpack_exec__ = ${runtimeTemplate.returningFunction(
-			`__webpack_require__(${RuntimeGlobals.entryModuleId} = moduleId)`,
+			`${RuntimeGlobals.require}(${RuntimeGlobals.entryModuleId} = moduleId)`,
 			"moduleId"
 		)}`
 	];

package/lib/json/JsonGenerator.js

@@ -45,13 +45,14 @@ const createObjectForExportsInfo = (data, exportsInfo, runtime) => {
 	if (exportsInfo.otherExportsInfo.getUsed(runtime) !== UsageState.Unused)
 		return data;
 	const isArray = Array.isArray(data);
+	/** @type {RawJsonData} */
 	const reducedData = isArray ? [] : {};
 	for (const key of Object.keys(data)) {
 		const exportInfo = exportsInfo.getReadOnlyExportInfo(key);
 		const used = exportInfo.getUsed(runtime);
 		if (used === UsageState.Unused) continue;
 
-		/** @type {any} */
+		/** @type {RawJsonData} */
 		let value;
 		if (used === UsageState.OnlyPropertiesUsed && exportInfo.exportsInfo) {
 			value = createObjectForExportsInfo(
@@ -62,8 +63,9 @@ const createObjectForExportsInfo = (data, exportsInfo, runtime) => {
 		} else {
 			value = data[key];
 		}
-		const name = exportInfo.getUsedName(key, runtime);
-		reducedData[name] = value;
+
+		const name = /** @type {string} */ (exportInfo.getUsedName(key, runtime));
+		/** @type {Record<string, RawJsonData>} */ (reducedData)[name] = value;
 	}
 	if (isArray) {
 		let arrayLengthWhenUsed =
@@ -130,7 +132,7 @@ class JsonGenerator extends Generator {
 			module.buildInfo.jsonData &&
 			module.buildInfo.jsonData.get();
 		if (!data) return 0;
-		return stringifySafe(data).length + 10;
+		return /** @type {string} */ (stringifySafe(data)).length + 10;
 	}
 
 	/**
@@ -178,7 +180,7 @@ class JsonGenerator extends Generator {
 				? createObjectForExportsInfo(data, exportsInfo, runtime)
 				: data;
 		// Use JSON because JSON.parse() is much faster than JavaScript evaluation
-		const jsonStr = stringifySafe(finalJson);
+		const jsonStr = /** @type {string} */ (stringifySafe(finalJson));
 		const jsonExpr =
 			jsonStr.length > 20 && typeof finalJson === "object"
 				? `JSON.parse('${jsonStr.replace(/[\\']/g, "\\$&")}')`

package/lib/json/JsonParser.js

@@ -34,7 +34,7 @@ class JsonParser extends Parser {
 			source = source.toString("utf-8");
 		}
 
-		/** @type {JsonModulesPluginParserOptions["parse"]} */
+		/** @type {NonNullable<JsonModulesPluginParserOptions["parse"]>} */
 		const parseFn =
 			typeof this.options.parse === "function" ? this.options.parse : parseJson;
 		/** @type {Buffer | RawJsonData} */

package/lib/library/AbstractLibraryPlugin.js

@@ -87,6 +87,10 @@ class AbstractLibraryPlugin {
 				}
 			);
 
+			/**
+			 * @param {Chunk} chunk chunk
+			 * @returns {TODO} options for the chunk
+			 */
 			const getOptionsForChunk = chunk => {
 				if (compilation.chunkGraph.getNumberOfEntryModules(chunk) === 0)
 					return false;

package/lib/library/AssignLibraryPlugin.js

@@ -7,6 +7,7 @@
 
 const { ConcatSource } = require("webpack-sources");
 const { UsageState } = require("../ExportsInfo");
+const RuntimeGlobals = require("../RuntimeGlobals");
 const Template = require("../Template");
 const propertyAccess = require("../util/propertyAccess");
 const { getEntryRuntime } = require("../util/runtime");
@@ -296,7 +297,7 @@ class AssignLibraryPlugin extends AbstractLibraryPlugin {
 				if (!exportInfo.provided) continue;
 				const nameAccess = propertyAccess([exportInfo.name]);
 				result.add(
-					`${exportTarget}${nameAccess} = __webpack_exports__${exportAccess}${nameAccess};\n`
+					`${exportTarget}${nameAccess} = ${RuntimeGlobals.exports}${exportAccess}${nameAccess};\n`
 				);
 			}
 			result.add(
@@ -310,10 +311,11 @@ class AssignLibraryPlugin extends AbstractLibraryPlugin {
 					true
 				)};\n`
 			);
-			let exports = "__webpack_exports__";
+			/** @type {String} */
+			let exports = RuntimeGlobals.exports;
 			if (exportAccess) {
 				result.add(
-					`var __webpack_exports_export__ = __webpack_exports__${exportAccess};\n`
+					`var __webpack_exports_export__ = ${RuntimeGlobals.exports}${exportAccess};\n`
 				);
 				exports = "__webpack_exports_export__";
 			}
@@ -329,7 +331,7 @@ class AssignLibraryPlugin extends AbstractLibraryPlugin {
 					fullNameResolved,
 					this._getPrefix(compilation).length,
 					false
-				)} = __webpack_exports__${exportAccess};\n`
+				)} = ${RuntimeGlobals.exports}${exportAccess};\n`
 			);
 		}
 		return result;

package/lib/library/ExportPropertyLibraryPlugin.js

@@ -7,6 +7,7 @@
 
 const { ConcatSource } = require("webpack-sources");
 const { UsageState } = require("../ExportsInfo");
+const RuntimeGlobals = require("../RuntimeGlobals");
 const propertyAccess = require("../util/propertyAccess");
 const { getEntryRuntime } = require("../util/runtime");
 const AbstractLibraryPlugin = require("./AbstractLibraryPlugin");
@@ -103,7 +104,9 @@ class ExportPropertyLibraryPlugin extends AbstractLibraryPlugin {
 	 */
 	renderStartup(source, module, renderContext, { options }) {
 		if (!options.export) return source;
-		const postfix = `__webpack_exports__ = __webpack_exports__${propertyAccess(
+		const postfix = `${RuntimeGlobals.exports} = ${
+			RuntimeGlobals.exports
+		}${propertyAccess(
 			Array.isArray(options.export) ? options.export : [options.export]
 		)};\n`;
 		return new ConcatSource(source, postfix);

package/lib/library/ModuleLibraryPlugin.js

@@ -6,6 +6,7 @@
 "use strict";
 
 const { ConcatSource } = require("webpack-sources");
+const RuntimeGlobals = require("../RuntimeGlobals");
 const Template = require("../Template");
 const propertyAccess = require("../util/propertyAccess");
 const AbstractLibraryPlugin = require("./AbstractLibraryPlugin");
@@ -80,15 +81,17 @@ class ModuleLibraryPlugin extends AbstractLibraryPlugin {
 		const exports = [];
 		const isAsync = moduleGraph.isAsync(module);
 		if (isAsync) {
-			result.add(`__webpack_exports__ = await __webpack_exports__;\n`);
+			result.add(
+				`${RuntimeGlobals.exports} = await ${RuntimeGlobals.exports};\n`
+			);
 		}
 		for (const exportInfo of exportsInfo.orderedExports) {
 			if (!exportInfo.provided) continue;
-			const varName = `__webpack_exports__${Template.toIdentifier(
+			const varName = `${RuntimeGlobals.exports}${Template.toIdentifier(
 				exportInfo.name
 			)}`;
 			result.add(
-				`var ${varName} = __webpack_exports__${propertyAccess([
+				`var ${varName} = ${RuntimeGlobals.exports}${propertyAccess([
 					/** @type {string} */
 					(exportInfo.getUsedName(exportInfo.name, chunk.runtime))
 				])};\n`

package/lib/library/SystemLibraryPlugin.js

@@ -106,6 +106,7 @@ class SystemLibraryPlugin extends AbstractLibraryPlugin {
 			.join("\n");
 
 		// Define __esModule flag on all internal variables and helpers
+		/** @type {string[]} */
 		const externalVarInitialization = [];
 
 		// The system.register format requires an array of setter functions for externals.

package/lib/library/UmdLibraryPlugin.js

@@ -208,6 +208,10 @@ class UmdLibraryPlugin extends AbstractLibraryPlugin {
 			);
 		};
 
+		/**
+		 * @param {ExternalModule[]} modules external modules
+		 * @returns {string} arguments
+		 */
 		const externalsArguments = modules => {
 			return modules
 				.map(

package/lib/node/CommonJsChunkLoadingPlugin.js

@@ -8,11 +8,18 @@
 const RuntimeGlobals = require("../RuntimeGlobals");
 const StartupChunkDependenciesPlugin = require("../runtime/StartupChunkDependenciesPlugin");
 
+/** @typedef {import("../Chunk")} Chunk */
 /** @typedef {import("../Compiler")} Compiler */
 
+/** @typedef {Object} CommonJsChunkLoadingPluginOptions
+ * @property {boolean} [asyncChunkLoading] enable async chunk loading
+ */
+
 class CommonJsChunkLoadingPlugin {
-	constructor(options) {
-		options = options || {};
+	/**
+	 * @param {CommonJsChunkLoadingPluginOptions} [options] options
+	 */
+	constructor(options = {}) {
 		this._asyncChunkLoading = options.asyncChunkLoading;
 	}
 
@@ -36,6 +43,10 @@ class CommonJsChunkLoadingPlugin {
 			"CommonJsChunkLoadingPlugin",
 			compilation => {
 				const globalChunkLoading = compilation.outputOptions.chunkLoading;
+				/**
+				 * @param {Chunk} chunk chunk
+				 * @returns {boolean} true, if wasm loading is enabled for the chunk
+				 */
 				const isEnabledForChunk = chunk => {
 					const options = chunk.getEntryOptions();
 					const chunkLoading =
@@ -45,6 +56,10 @@ class CommonJsChunkLoadingPlugin {
 					return chunkLoading === chunkLoadingValue;
 				};
 				const onceForChunkSet = new WeakSet();
+				/**
+				 * @param {Chunk} chunk chunk
+				 * @param {Set<string>} set runtime requirements
+				 */
 				const handler = (chunk, set) => {
 					if (onceForChunkSet.has(chunk)) return;
 					onceForChunkSet.add(chunk);

package/lib/node/NodeTemplatePlugin.js

@@ -10,9 +10,17 @@ const EnableChunkLoadingPlugin = require("../javascript/EnableChunkLoadingPlugin
 
 /** @typedef {import("../Compiler")} Compiler */
 
+/**
+ * @typedef {Object} NodeTemplatePluginOptions
+ * @property {boolean} [asyncChunkLoading] enable async chunk loading
+ */
+
 class NodeTemplatePlugin {
-	constructor(options) {
-		this._options = options || {};
+	/**
+	 * @param {NodeTemplatePluginOptions} [options] options object
+	 */
+	constructor(options = {}) {
+		this._options = options;
 	}
 
 	/**

package/lib/node/NodeWatchFileSystem.js

@@ -29,7 +29,7 @@ class NodeWatchFileSystem {
 	 * @param {Iterable<string>} missing watched exitance entries
 	 * @param {number} startTime timestamp of start time
 	 * @param {WatchOptions} options options object
-	 * @param {function(Error=, Map<string, FileSystemInfoEntry>, Map<string, FileSystemInfoEntry>, Set<string>, Set<string>): void} callback aggregated callback
+	 * @param {function((Error | null)=, Map<string, FileSystemInfoEntry>, Map<string, FileSystemInfoEntry>, Set<string>, Set<string>): void} callback aggregated callback
 	 * @param {function(string, number): void} callbackUndelayed callback when the first change was detected
 	 * @returns {Watcher} a watcher
 	 */

package/lib/node/ReadFileChunkLoadingRuntimeModule.js

@@ -18,6 +18,9 @@ const { getUndoPath } = require("../util/identifier");
 /** @typedef {import("../Chunk")} Chunk */
 
 class ReadFileChunkLoadingRuntimeModule extends RuntimeModule {
+	/**
+	 * @param {ReadonlySet<string>} runtimeRequirements runtime requirements
+	 */
 	constructor(runtimeRequirements) {
 		super("readFile chunk loading", RuntimeModule.STAGE_ATTACH);
 		this.runtimeRequirements = runtimeRequirements;
@@ -78,7 +81,7 @@ class ReadFileChunkLoadingRuntimeModule extends RuntimeModule {
 		);
 		const rootOutputDir = getUndoPath(
 			outputName,
-			this.compilation.outputOptions.path,
+			/** @type {string} */ (this.compilation.outputOptions.path),
 			false
 		);
 
@@ -124,7 +127,7 @@ class ReadFileChunkLoadingRuntimeModule extends RuntimeModule {
 							"}"
 						]),
 						"}",
-						`if(runtime) runtime(__webpack_require__);`,
+						`if(runtime) runtime(${RuntimeGlobals.require});`,
 						"for(var i = 0; i < chunkIds.length; i++) {",
 						Template.indent([
 							"if(installedChunks[chunkIds[i]]) {",
@@ -193,7 +196,7 @@ class ReadFileChunkLoadingRuntimeModule extends RuntimeModule {
 			"",
 			withExternalInstallChunk
 				? Template.asString([
-						"module.exports = __webpack_require__;",
+						`module.exports = ${RuntimeGlobals.require};`,
 						`${RuntimeGlobals.externalInstallChunk} = installChunk;`
 				  ])
 				: "// no external install chunk",

package/lib/node/ReadFileCompileAsyncWasmPlugin.js

@@ -10,6 +10,7 @@ const RuntimeGlobals = require("../RuntimeGlobals");
 const Template = require("../Template");
 const AsyncWasmLoadingRuntimeModule = require("../wasm-async/AsyncWasmLoadingRuntimeModule");
 
+/** @typedef {import("../Chunk")} Chunk */
 /** @typedef {import("../Compiler")} Compiler */
 
 class ReadFileCompileAsyncWasmPlugin {
@@ -27,6 +28,10 @@ class ReadFileCompileAsyncWasmPlugin {
 			"ReadFileCompileAsyncWasmPlugin",
 			compilation => {
 				const globalWasmLoading = compilation.outputOptions.wasmLoading;
+				/**
+				 * @param {Chunk} chunk chunk
+				 * @returns {boolean} true, if wasm loading is enabled for the chunk
+				 */
 				const isEnabledForChunk = chunk => {
 					const options = chunk.getEntryOptions();
 					const wasmLoading =
@@ -35,6 +40,9 @@ class ReadFileCompileAsyncWasmPlugin {
 							: globalWasmLoading;
 					return wasmLoading === this._type;
 				};
+				/**
+				 * @type {(path: string) => string}
+				 */
 				const generateLoadBinaryCode = this._import
 					? path =>
 							Template.asString([

package/lib/node/ReadFileCompileWasmPlugin.js

@@ -10,13 +10,22 @@ const RuntimeGlobals = require("../RuntimeGlobals");
 const Template = require("../Template");
 const WasmChunkLoadingRuntimeModule = require("../wasm-sync/WasmChunkLoadingRuntimeModule");
 
+/** @typedef {import("../Chunk")} Chunk */
 /** @typedef {import("../Compiler")} Compiler */
 
+/**
+ * @typedef {Object} ReadFileCompileWasmPluginOptions
+ * @property {boolean} [mangleImports] mangle imports
+ */
+
 // TODO webpack 6 remove
 
 class ReadFileCompileWasmPlugin {
-	constructor(options) {
-		this.options = options || {};
+	/**
+	 * @param {ReadFileCompileWasmPluginOptions} [options] options object
+	 */
+	constructor(options = {}) {
+		this.options = options;
 	}
 
 	/**
@@ -29,6 +38,10 @@ class ReadFileCompileWasmPlugin {
 			"ReadFileCompileWasmPlugin",
 			compilation => {
 				const globalWasmLoading = compilation.outputOptions.wasmLoading;
+				/**
+				 * @param {Chunk} chunk chunk
+				 * @returns {boolean} true, when wasm loading is enabled for the chunk
+				 */
 				const isEnabledForChunk = chunk => {
 					const options = chunk.getEntryOptions();
 					const wasmLoading =
@@ -37,6 +50,10 @@ class ReadFileCompileWasmPlugin {
 							: globalWasmLoading;
 					return wasmLoading === "async-node";
 				};
+				/**
+				 * @param {string} path path to wasm file
+				 * @returns {string} generated code to load the wasm file
+				 */
 				const generateLoadBinaryCode = path =>
 					Template.asString([
 						"new Promise(function (resolve, reject) {",

package/lib/node/RequireChunkLoadingRuntimeModule.js

@@ -18,6 +18,9 @@ const { getUndoPath } = require("../util/identifier");
 /** @typedef {import("../Chunk")} Chunk */
 
 class RequireChunkLoadingRuntimeModule extends RuntimeModule {
+	/**
+	 * @param {ReadonlySet<string>} runtimeRequirements runtime requirements
+	 */
 	constructor(runtimeRequirements) {
 		super("require chunk loading", RuntimeModule.STAGE_ATTACH);
 		this.runtimeRequirements = runtimeRequirements;
@@ -78,7 +81,7 @@ class RequireChunkLoadingRuntimeModule extends RuntimeModule {
 		);
 		const rootOutputDir = getUndoPath(
 			outputName,
-			this.compilation.outputOptions.path,
+			/** @type {string} */ (this.compilation.outputOptions.path),
 			true
 		);
 
@@ -124,7 +127,7 @@ class RequireChunkLoadingRuntimeModule extends RuntimeModule {
 							"}"
 						]),
 						"}",
-						`if(runtime) runtime(__webpack_require__);`,
+						`if(runtime) runtime(${RuntimeGlobals.require});`,
 						"for(var i = 0; i < chunkIds.length; i++)",
 						Template.indent("installedChunks[chunkIds[i]] = 1;"),
 						withOnChunkLoad ? `${RuntimeGlobals.onChunksLoaded}();` : ""
@@ -163,7 +166,7 @@ class RequireChunkLoadingRuntimeModule extends RuntimeModule {
 			"",
 			withExternalInstallChunk
 				? Template.asString([
-						"module.exports = __webpack_require__;",
+						`module.exports = ${RuntimeGlobals.require};`,
 						`${RuntimeGlobals.externalInstallChunk} = installChunk;`
 				  ])
 				: "// no external install chunk",

package/lib/optimize/ConcatenatedModule.js

@@ -1611,7 +1611,7 @@ ${defineGetters}`
 						result.add(`if (${condition}) {\n`);
 					}
 					result.add(
-						`var ${info.name} = __webpack_require__(${JSON.stringify(
+						`var ${info.name} = ${RuntimeGlobals.require}(${JSON.stringify(
 							chunkGraph.getModuleId(info.module)
 						)});`
 					);

package/lib/optimize/InnerGraphPlugin.js

@@ -120,7 +120,10 @@ class InnerGraphPlugin {
 						if (!InnerGraph.isEnabled(parser.state)) return;
 
 						if (parser.scope.topLevelScope === true) {
-							if (statement.type === "ClassDeclaration") {
+							if (
+								statement.type === "ClassDeclaration" &&
+								parser.isPure(statement, statement.range[0])
+							) {
 								const name = statement.id ? statement.id.name : "*default*";
 								const fn = InnerGraph.tagTopLevelSymbol(parser, name);
 								classWithTopLevelSymbol.set(statement, fn);
@@ -131,8 +134,9 @@ class InnerGraphPlugin {
 								const fn = InnerGraph.tagTopLevelSymbol(parser, name);
 								const decl = statement.declaration;
 								if (
-									decl.type === "ClassExpression" ||
-									decl.type === "ClassDeclaration"
+									(decl.type === "ClassExpression" ||
+										decl.type === "ClassDeclaration") &&
+									parser.isPure(decl, decl.range[0])
 								) {
 									classWithTopLevelSymbol.set(decl, fn);
 								} else if (parser.isPure(decl, statement.range[0])) {
@@ -157,7 +161,10 @@ class InnerGraphPlugin {
 							decl.id.type === "Identifier"
 						) {
 							const name = decl.id.name;
-							if (decl.init.type === "ClassExpression") {
+							if (
+								decl.init.type === "ClassExpression" &&
+								parser.isPure(decl.init, decl.id.range[1])
+							) {
 								const fn = InnerGraph.tagTopLevelSymbol(parser, name);
 								classWithTopLevelSymbol.set(decl.init, fn);
 							} else if (parser.isPure(decl.init, decl.id.range[1])) {

package/lib/runtime/AsyncModuleRuntimeModule.js

@@ -21,7 +21,7 @@ class AsyncModuleRuntimeModule extends HelperRuntimeModule {
 		const fn = RuntimeGlobals.asyncModule;
 		return Template.asString([
 			'var webpackQueues = typeof Symbol === "function" ? Symbol("webpack queues") : "__webpack_queues__";',
-			'var webpackExports = typeof Symbol === "function" ? Symbol("webpack exports") : "__webpack_exports__";',
+			`var webpackExports = typeof Symbol === "function" ? Symbol("webpack exports") : "${RuntimeGlobals.exports}";`,
 			'var webpackError = typeof Symbol === "function" ? Symbol("webpack error") : "__webpack_error__";',
 			`var resolveQueue = ${runtimeTemplate.basicFunction("queue", [
 				"if(queue && !queue.d) {",

package/lib/runtime/AutoPublicPathRuntimeModule.js

@@ -31,7 +31,11 @@ class AutoPublicPathRuntimeModule extends RuntimeModule {
 				contentHashType: "javascript"
 			}
 		);
-		const undoPath = getUndoPath(chunkName, path, false);
+		const undoPath = getUndoPath(
+			chunkName,
+			/** @type {string} */ (path),
+			false
+		);
 
 		return Template.asString([
 			"var scriptUrl;",

package/lib/runtime/BaseUriRuntimeModule.js

@@ -8,6 +8,8 @@
 const RuntimeGlobals = require("../RuntimeGlobals");
 const RuntimeModule = require("../RuntimeModule");
 
+/** @typedef {import("../../declarations/WebpackOptions").EntryDescriptionNormalized} EntryDescriptionNormalized */
+
 class BaseUriRuntimeModule extends RuntimeModule {
 	constructor() {
 		super("base uri", RuntimeModule.STAGE_ATTACH);
@@ -19,7 +21,9 @@ class BaseUriRuntimeModule extends RuntimeModule {
 	generate() {
 		const { chunk } = this;
 
-		const options = chunk.getEntryOptions();
+		const options =
+			/** @type {EntryDescriptionNormalized} */
+			(chunk.getEntryOptions());
 		return `${RuntimeGlobals.baseURI} = ${
 			options.baseUri === undefined
 				? "undefined"

package/lib/runtime/EnsureChunkRuntimeModule.js

@@ -9,6 +9,9 @@ const RuntimeModule = require("../RuntimeModule");
 const Template = require("../Template");
 
 class EnsureChunkRuntimeModule extends RuntimeModule {
+	/**
+	 * @param {ReadonlySet<string>} runtimeRequirements runtime requirements
+	 */
 	constructor(runtimeRequirements) {
 		super("ensure chunk");
 		this.runtimeRequirements = runtimeRequirements;

package/lib/runtime/GetChunkFilenameRuntimeModule.js

@@ -51,7 +51,7 @@ class GetChunkFilenameRuntimeModule extends RuntimeModule {
 		/** @type {Map<string | FilenameFunction, Set<Chunk>>} */
 		const chunkFilenames = new Map();
 		let maxChunks = 0;
-		/** @type {string} */
+		/** @type {string | undefined} */
 		let dynamicFilename;
 
 		/**
@@ -69,9 +69,20 @@ class GetChunkFilenameRuntimeModule extends RuntimeModule {
 				if (typeof chunkFilename === "string") {
 					if (set.size < maxChunks) return;
 					if (set.size === maxChunks) {
-						if (chunkFilename.length < dynamicFilename.length) return;
-						if (chunkFilename.length === dynamicFilename.length) {
-							if (chunkFilename < dynamicFilename) return;
+						if (
+							chunkFilename.length <
+							/** @type {string} */ (dynamicFilename).length
+						) {
+							return;
+						}
+
+						if (
+							chunkFilename.length ===
+							/** @type {string} */ (dynamicFilename).length
+						) {
+							if (chunkFilename < /** @type {string} */ (dynamicFilename)) {
+								return;
+							}
 						}
 					}
 					maxChunks = set.size;
@@ -108,7 +119,7 @@ class GetChunkFilenameRuntimeModule extends RuntimeModule {
 			addChunk(entrypoint.chunks[entrypoint.chunks.length - 1]);
 		}
 
-		/** @type {Map<string, Set<string | number>>} */
+		/** @type {Map<string, Set<string | number | null>>} */
 		const staticUrls = new Map();
 		/** @type {Set<Chunk>} */
 		const dynamicUrlChunks = new Set();
@@ -152,10 +163,14 @@ class GetChunkFilenameRuntimeModule extends RuntimeModule {
 				hashWithLength: length =>
 					`" + ${RuntimeGlobals.getFullHash}().slice(0, ${length}) + "`,
 				chunk: {
-					id: unquotedStringify(c.id),
-					hash: unquotedStringify(c.renderedHash),
-					hashWithLength: unquotedStringifyWithLength(c.renderedHash),
-					name: unquotedStringify(c.name || c.id),
+					id: unquotedStringify(/** @type {number | string} */ (c.id)),
+					hash: unquotedStringify(/** @type {string} */ (c.renderedHash)),
+					hashWithLength: unquotedStringifyWithLength(
+						/** @type {string} */ (c.renderedHash)
+					),
+					name: unquotedStringify(
+						c.name || /** @type {number | string} */ (c.id)
+					),
 					contentHash: {
 						[contentType]: unquotedStringify(c.contentHash[contentType])
 					},
@@ -187,8 +202,10 @@ class GetChunkFilenameRuntimeModule extends RuntimeModule {
 		 * @returns {string} code with static mapping of results of fn
 		 */
 		const createMap = fn => {
+			/** @type {Record<number | string, number | string>} */
 			const obj = {};
 			let useId = false;
+			/** @type {number | string | undefined} */
 			let lastKey;
 			let entries = 0;
 			for (const c of dynamicUrlChunks) {
@@ -196,8 +213,8 @@ class GetChunkFilenameRuntimeModule extends RuntimeModule {
 				if (value === c.id) {
 					useId = true;
 				} else {
-					obj[c.id] = value;
-					lastKey = c.id;
+					obj[/** @type {number | string} */ (c.id)] = value;
+					lastKey = /** @type {number | string} */ (c.id);
 					entries++;
 				}
 			}
@@ -205,9 +222,9 @@ class GetChunkFilenameRuntimeModule extends RuntimeModule {
 			if (entries === 1) {
 				return useId
 					? `(chunkId === ${JSON.stringify(lastKey)} ? ${JSON.stringify(
-							obj[lastKey]
+							obj[/** @type {number | string} */ (lastKey)]
 					  )} : chunkId)`
-					: JSON.stringify(obj[lastKey]);
+					: JSON.stringify(obj[/** @type {number | string} */ (lastKey)]);
 			}
 			return useId
 				? `(${JSON.stringify(obj)}[chunkId] || chunkId)`
@@ -238,9 +255,11 @@ class GetChunkFilenameRuntimeModule extends RuntimeModule {
 					`" + ${RuntimeGlobals.getFullHash}().slice(0, ${length}) + "`,
 				chunk: {
 					id: `" + chunkId + "`,
-					hash: mapExpr(c => c.renderedHash),
-					hashWithLength: mapExprWithLength(c => c.renderedHash),
-					name: mapExpr(c => c.name || c.id),
+					hash: mapExpr(c => /** @type {string} */ (c.renderedHash)),
+					hashWithLength: mapExprWithLength(
+						c => /** @type {string} */ (c.renderedHash)
+					),
+					name: mapExpr(c => c.name || /** @type {number | string} */ (c.id)),
 					contentHash: {
 						[contentType]: mapExpr(c => c.contentHash[contentType])
 					},

package/lib/runtime/GetTrustedTypesPolicyRuntimeModule.js

@@ -10,7 +10,7 @@ const HelperRuntimeModule = require("./HelperRuntimeModule");
 
 class GetTrustedTypesPolicyRuntimeModule extends HelperRuntimeModule {
 	/**
-	 * @param {Set<string>} runtimeRequirements runtime requirements
+	 * @param {ReadonlySet<string>} runtimeRequirements runtime requirements
 	 */
 	constructor(runtimeRequirements) {
 		super("trusted types policy");

package/lib/runtime/LoadScriptRuntimeModule.js

@@ -72,7 +72,7 @@ class LoadScriptRuntimeModule extends HelperRuntimeModule {
 			"script = document.createElement('script');",
 			scriptType ? `script.type = ${JSON.stringify(scriptType)};` : "",
 			charset ? "script.charset = 'utf-8';" : "",
-			`script.timeout = ${loadTimeout / 1000};`,
+			`script.timeout = ${/** @type {number} */ (loadTimeout) / 1000};`,
 			`if (${RuntimeGlobals.scriptNonce}) {`,
 			Template.indent(
 				`script.setAttribute("nonce", ${RuntimeGlobals.scriptNonce});`