webpack 5.86.0 → 5.87.0

package/lib/prefetch/ChunkPrefetchPreloadPlugin.js

@@ -11,6 +11,8 @@ const ChunkPrefetchStartupRuntimeModule = require("./ChunkPrefetchStartupRuntime
 const ChunkPrefetchTriggerRuntimeModule = require("./ChunkPrefetchTriggerRuntimeModule");
 const ChunkPreloadTriggerRuntimeModule = require("./ChunkPreloadTriggerRuntimeModule");
 
+/** @typedef {import("../Chunk")} Chunk */
+/** @typedef {import("../ChunkGroup").RawChunkGroupOptions} RawChunkGroupOptions */
 /** @typedef {import("../Compiler")} Compiler */
 
 class ChunkPrefetchPreloadPlugin {
@@ -43,7 +45,7 @@ class ChunkPrefetchPreloadPlugin {
 				compilation.hooks.additionalTreeRuntimeRequirements.tap(
 					"ChunkPrefetchPreloadPlugin",
 					(chunk, set, { chunkGraph }) => {
-						const chunkMap = chunk.getChildIdsByOrdersMap(chunkGraph, false);
+						const chunkMap = chunk.getChildIdsByOrdersMap(chunkGraph);
 
 						if (chunkMap.prefetch) {
 							set.add(RuntimeGlobals.prefetchChunk);

package/lib/prefetch/ChunkPrefetchStartupRuntimeModule.js

@@ -9,6 +9,7 @@ const RuntimeModule = require("../RuntimeModule");
 const Template = require("../Template");
 
 /** @typedef {import("../Chunk")} Chunk */
+/** @typedef {import("../Compilation")} Compilation */
 /** @typedef {import("../RuntimeTemplate")} RuntimeTemplate */
 
 class ChunkPrefetchStartupRuntimeModule extends RuntimeModule {
@@ -24,8 +25,10 @@ class ChunkPrefetchStartupRuntimeModule extends RuntimeModule {
 	 * @returns {string} runtime code
 	 */
 	generate() {
-		const { startupChunks, chunk } = this;
-		const { runtimeTemplate } = this.compilation;
+		const { startupChunks } = this;
+		const compilation = /** @type {Compilation} */ (this.compilation);
+		const chunk = /** @type {Chunk} */ (this.chunk);
+		const { runtimeTemplate } = compilation;
 		return Template.asString(
 			startupChunks.map(
 				({ onChunks, chunks }) =>

package/lib/prefetch/ChunkPrefetchTriggerRuntimeModule.js

@@ -8,6 +8,7 @@ const RuntimeGlobals = require("../RuntimeGlobals");
 const RuntimeModule = require("../RuntimeModule");
 const Template = require("../Template");
 
+/** @typedef {import("../Compilation")} Compilation */
 /** @typedef {import("../RuntimeTemplate")} RuntimeTemplate */
 
 class ChunkPrefetchTriggerRuntimeModule extends RuntimeModule {
@@ -24,7 +25,8 @@ class ChunkPrefetchTriggerRuntimeModule extends RuntimeModule {
 	 */
 	generate() {
 		const { chunkMap } = this;
-		const { runtimeTemplate } = this.compilation;
+		const compilation = /** @type {Compilation} */ (this.compilation);
+		const { runtimeTemplate } = compilation;
 		const body = [
 			"var chunks = chunkToChildrenMap[chunkId];",
 			`Array.isArray(chunks) && chunks.map(${RuntimeGlobals.prefetchChunk});`

package/lib/prefetch/ChunkPreloadTriggerRuntimeModule.js

@@ -8,6 +8,7 @@ const RuntimeGlobals = require("../RuntimeGlobals");
 const RuntimeModule = require("../RuntimeModule");
 const Template = require("../Template");
 
+/** @typedef {import("../Compilation")} Compilation */
 /** @typedef {import("../RuntimeTemplate")} RuntimeTemplate */
 
 class ChunkPreloadTriggerRuntimeModule extends RuntimeModule {
@@ -24,7 +25,8 @@ class ChunkPreloadTriggerRuntimeModule extends RuntimeModule {
 	 */
 	generate() {
 		const { chunkMap } = this;
-		const { runtimeTemplate } = this.compilation;
+		const compilation = /** @type {Compilation} */ (this.compilation);
+		const { runtimeTemplate } = compilation;
 		const body = [
 			"var chunks = chunkToChildrenMap[chunkId];",
 			`Array.isArray(chunks) && chunks.map(${RuntimeGlobals.preloadChunk});`

package/lib/rules/BasicEffectRulePlugin.js

@@ -8,6 +8,10 @@
 /** @typedef {import("./RuleSetCompiler")} RuleSetCompiler */
 
 class BasicEffectRulePlugin {
+	/**
+	 * @param {string} ruleProperty the rule property
+	 * @param {string=} effectType the effect type
+	 */
 	constructor(ruleProperty, effectType) {
 		this.ruleProperty = ruleProperty;
 		this.effectType = effectType || ruleProperty;

package/lib/rules/BasicMatcherRulePlugin.js

@@ -9,6 +9,11 @@
 /** @typedef {import("./RuleSetCompiler").RuleCondition} RuleCondition */
 
 class BasicMatcherRulePlugin {
+	/**
+	 * @param {string} ruleProperty the rule property
+	 * @param {string=} dataProperty the data property
+	 * @param {boolean=} invert if true, inverts the condition
+	 */
 	constructor(ruleProperty, dataProperty, invert) {
 		this.ruleProperty = ruleProperty;
 		this.dataProperty = dataProperty || ruleProperty;

package/lib/rules/RuleSetCompiler.js

@@ -150,9 +150,9 @@ class RuleSetCompiler {
 	 * @returns {CompiledRule[]} rules
 	 */
 	compileRules(path, rules, refs) {
-		return rules.map((rule, i) =>
-			this.compileRule(`${path}[${i}]`, rule, refs)
-		);
+		return rules
+			.filter(Boolean)
+			.map((rule, i) => this.compileRule(`${path}[${i}]`, rule, refs));
 	}
 
 	/**

package/lib/rules/UseEffectRulePlugin.js

@@ -106,9 +106,11 @@ class UseEffectRulePlugin {
 					 */
 					const useToEffectsWithoutIdent = (path, items) => {
 						if (Array.isArray(items)) {
-							return items.map((item, idx) =>
-								useToEffectRaw(`${path}[${idx}]`, "[[missing ident]]", item)
-							);
+							return items
+								.filter(Boolean)
+								.map((item, idx) =>
+									useToEffectRaw(`${path}[${idx}]`, "[[missing ident]]", item)
+								);
 						}
 						return [useToEffectRaw(path, "[[missing ident]]", items)];
 					};
@@ -120,7 +122,7 @@ class UseEffectRulePlugin {
 					 */
 					const useToEffects = (path, items) => {
 						if (Array.isArray(items)) {
-							return items.map((item, idx) => {
+							return items.filter(Boolean).map((item, idx) => {
 								const subPath = `${path}[${idx}]`;
 								return useToEffect(subPath, subPath, item);
 							});

package/lib/runtime/AsyncModuleRuntimeModule.js

@@ -8,6 +8,8 @@ const RuntimeGlobals = require("../RuntimeGlobals");
 const Template = require("../Template");
 const HelperRuntimeModule = require("./HelperRuntimeModule");
 
+/** @typedef {import("../Compilation")} Compilation */
+
 class AsyncModuleRuntimeModule extends HelperRuntimeModule {
 	constructor() {
 		super("async module");
@@ -17,7 +19,8 @@ class AsyncModuleRuntimeModule extends HelperRuntimeModule {
 	 * @returns {string} runtime code
 	 */
 	generate() {
-		const { runtimeTemplate } = this.compilation;
+		const compilation = /** @type {Compilation} */ (this.compilation);
+		const { runtimeTemplate } = compilation;
 		const fn = RuntimeGlobals.asyncModule;
 		return Template.asString([
 			'var webpackQueues = typeof Symbol === "function" ? Symbol("webpack queues") : "__webpack_queues__";',

package/lib/runtime/AutoPublicPathRuntimeModule.js

@@ -10,6 +10,8 @@ const Template = require("../Template");
 const JavascriptModulesPlugin = require("../javascript/JavascriptModulesPlugin");
 const { getUndoPath } = require("../util/identifier");
 
+/** @typedef {import("../Compilation")} Compilation */
+
 class AutoPublicPathRuntimeModule extends RuntimeModule {
 	constructor() {
 		super("publicPath", RuntimeModule.STAGE_BASIC);
@@ -19,7 +21,7 @@ class AutoPublicPathRuntimeModule extends RuntimeModule {
 	 * @returns {string} runtime code
 	 */
 	generate() {
-		const { compilation } = this;
+		const compilation = /** @type {Compilation} */ (this.compilation);
 		const { scriptType, importMetaName, path } = compilation.outputOptions;
 		const chunkName = compilation.getPath(
 			JavascriptModulesPlugin.getChunkFilenameTemplate(

package/lib/runtime/BaseUriRuntimeModule.js

@@ -9,6 +9,7 @@ const RuntimeGlobals = require("../RuntimeGlobals");
 const RuntimeModule = require("../RuntimeModule");
 
 /** @typedef {import("../../declarations/WebpackOptions").EntryDescriptionNormalized} EntryDescriptionNormalized */
+/** @typedef {import("../Chunk")} Chunk */
 
 class BaseUriRuntimeModule extends RuntimeModule {
 	constructor() {
@@ -19,8 +20,7 @@ class BaseUriRuntimeModule extends RuntimeModule {
 	 * @returns {string} runtime code
 	 */
 	generate() {
-		const { chunk } = this;
-
+		const chunk = /** @type {Chunk} */ (this.chunk);
 		const options =
 			/** @type {EntryDescriptionNormalized} */
 			(chunk.getEntryOptions());

package/lib/runtime/CompatGetDefaultExportRuntimeModule.js

@@ -8,6 +8,8 @@ const RuntimeGlobals = require("../RuntimeGlobals");
 const Template = require("../Template");
 const HelperRuntimeModule = require("./HelperRuntimeModule");
 
+/** @typedef {import("../Compilation")} Compilation */
+
 class CompatGetDefaultExportRuntimeModule extends HelperRuntimeModule {
 	constructor() {
 		super("compat get default export");
@@ -17,7 +19,8 @@ class CompatGetDefaultExportRuntimeModule extends HelperRuntimeModule {
 	 * @returns {string} runtime code
 	 */
 	generate() {
-		const { runtimeTemplate } = this.compilation;
+		const compilation = /** @type {Compilation} */ (this.compilation);
+		const { runtimeTemplate } = compilation;
 		const fn = RuntimeGlobals.compatGetDefaultExport;
 		return Template.asString([
 			"// getDefaultExport function for compatibility with non-harmony modules",

package/lib/runtime/CompatRuntimeModule.js

@@ -7,6 +7,9 @@
 const RuntimeGlobals = require("../RuntimeGlobals");
 const RuntimeModule = require("../RuntimeModule");
 
+/** @typedef {import("../Chunk")} Chunk */
+/** @typedef {import("../ChunkGraph")} ChunkGraph */
+/** @typedef {import("../Compilation")} Compilation */
 /** @typedef {import("../MainTemplate")} MainTemplate */
 
 class CompatRuntimeModule extends RuntimeModule {
@@ -19,7 +22,9 @@ class CompatRuntimeModule extends RuntimeModule {
 	 * @returns {string} runtime code
 	 */
 	generate() {
-		const { chunkGraph, chunk, compilation } = this;
+		const compilation = /** @type {Compilation} */ (this.compilation);
+		const chunkGraph = /** @type {ChunkGraph} */ (this.chunkGraph);
+		const chunk = /** @type {Chunk} */ (this.chunk);
 		const {
 			runtimeTemplate,
 			mainTemplate,

package/lib/runtime/CreateFakeNamespaceObjectRuntimeModule.js

@@ -8,6 +8,8 @@ const RuntimeGlobals = require("../RuntimeGlobals");
 const Template = require("../Template");
 const HelperRuntimeModule = require("./HelperRuntimeModule");
 
+/** @typedef {import("../Compilation")} Compilation */
+
 class CreateFakeNamespaceObjectRuntimeModule extends HelperRuntimeModule {
 	constructor() {
 		super("create fake namespace object");
@@ -17,7 +19,8 @@ class CreateFakeNamespaceObjectRuntimeModule extends HelperRuntimeModule {
 	 * @returns {string} runtime code
 	 */
 	generate() {
-		const { runtimeTemplate } = this.compilation;
+		const compilation = /** @type {Compilation} */ (this.compilation);
+		const { runtimeTemplate } = compilation;
 		const fn = RuntimeGlobals.createFakeNamespaceObject;
 		return Template.asString([
 			`var getProto = Object.getPrototypeOf ? ${runtimeTemplate.returningFunction(

package/lib/runtime/CreateScriptRuntimeModule.js

@@ -8,6 +8,8 @@ const RuntimeGlobals = require("../RuntimeGlobals");
 const Template = require("../Template");
 const HelperRuntimeModule = require("./HelperRuntimeModule");
 
+/** @typedef {import("../Compilation")} Compilation */
+
 class CreateScriptRuntimeModule extends HelperRuntimeModule {
 	constructor() {
 		super("trusted types script");
@@ -17,7 +19,7 @@ class CreateScriptRuntimeModule extends HelperRuntimeModule {
 	 * @returns {string} runtime code
 	 */
 	generate() {
-		const { compilation } = this;
+		const compilation = /** @type {Compilation} */ (this.compilation);
 		const { runtimeTemplate, outputOptions } = compilation;
 		const { trustedTypes } = outputOptions;
 		const fn = RuntimeGlobals.createScript;

package/lib/runtime/CreateScriptUrlRuntimeModule.js

@@ -8,6 +8,8 @@ const RuntimeGlobals = require("../RuntimeGlobals");
 const Template = require("../Template");
 const HelperRuntimeModule = require("./HelperRuntimeModule");
 
+/** @typedef {import("../Compilation")} Compilation */
+
 class CreateScriptUrlRuntimeModule extends HelperRuntimeModule {
 	constructor() {
 		super("trusted types script url");
@@ -17,7 +19,7 @@ class CreateScriptUrlRuntimeModule extends HelperRuntimeModule {
 	 * @returns {string} runtime code
 	 */
 	generate() {
-		const { compilation } = this;
+		const compilation = /** @type {Compilation} */ (this.compilation);
 		const { runtimeTemplate, outputOptions } = compilation;
 		const { trustedTypes } = outputOptions;
 		const fn = RuntimeGlobals.createScriptUrl;

package/lib/runtime/DefinePropertyGettersRuntimeModule.js

@@ -8,6 +8,8 @@ const RuntimeGlobals = require("../RuntimeGlobals");
 const Template = require("../Template");
 const HelperRuntimeModule = require("./HelperRuntimeModule");
 
+/** @typedef {import("../Compilation")} Compilation */
+
 class DefinePropertyGettersRuntimeModule extends HelperRuntimeModule {
 	constructor() {
 		super("define property getters");
@@ -17,7 +19,8 @@ class DefinePropertyGettersRuntimeModule extends HelperRuntimeModule {
 	 * @returns {string} runtime code
 	 */
 	generate() {
-		const { runtimeTemplate } = this.compilation;
+		const compilation = /** @type {Compilation} */ (this.compilation);
+		const { runtimeTemplate } = compilation;
 		const fn = RuntimeGlobals.definePropertyGetters;
 		return Template.asString([
 			"// define getter functions for harmony exports",

package/lib/runtime/EnsureChunkRuntimeModule.js

@@ -8,6 +8,8 @@ const RuntimeGlobals = require("../RuntimeGlobals");
 const RuntimeModule = require("../RuntimeModule");
 const Template = require("../Template");
 
+/** @typedef {import("../Compilation")} Compilation */
+
 class EnsureChunkRuntimeModule extends RuntimeModule {
 	/**
 	 * @param {ReadonlySet<string>} runtimeRequirements runtime requirements
@@ -21,20 +23,29 @@ class EnsureChunkRuntimeModule extends RuntimeModule {
 	 * @returns {string} runtime code
 	 */
 	generate() {
-		const { runtimeTemplate } = this.compilation;
+		const compilation = /** @type {Compilation} */ (this.compilation);
+		const { runtimeTemplate } = compilation;
 		// Check if there are non initial chunks which need to be imported using require-ensure
 		if (this.runtimeRequirements.has(RuntimeGlobals.ensureChunkHandlers)) {
+			const withFetchPriority = this.runtimeRequirements.has(
+				RuntimeGlobals.hasFetchPriority
+			);
 			const handlers = RuntimeGlobals.ensureChunkHandlers;
 			return Template.asString([
 				`${handlers} = {};`,
 				"// This file contains only the entry chunk.",
 				"// The chunk loading function for additional chunks",
 				`${RuntimeGlobals.ensureChunk} = ${runtimeTemplate.basicFunction(
-					"chunkId",
+					`chunkId${withFetchPriority ? ", fetchPriority" : ""}`,
 					[
 						`return Promise.all(Object.keys(${handlers}).reduce(${runtimeTemplate.basicFunction(
 							"promises, key",
-							[`${handlers}[key](chunkId, promises);`, "return promises;"]
+							[
+								`${handlers}[key](chunkId, promises${
+									withFetchPriority ? ", fetchPriority" : ""
+								});`,
+								"return promises;"
+							]
 						)}, []));`
 					]
 				)};`

package/lib/runtime/GetChunkFilenameRuntimeModule.js

@@ -10,6 +10,7 @@ const Template = require("../Template");
 const { first } = require("../util/SetHelpers");
 
 /** @typedef {import("../Chunk")} Chunk */
+/** @typedef {import("../ChunkGraph")} ChunkGraph */
 /** @typedef {import("../Compilation")} Compilation */
 /** @typedef {import("../Compilation").AssetInfo} AssetInfo */
 /** @typedef {import("../Compilation").PathData} PathData */
@@ -37,15 +38,10 @@ class GetChunkFilenameRuntimeModule extends RuntimeModule {
 	 * @returns {string} runtime code
 	 */
 	generate() {
-		const {
-			global,
-			chunk,
-			chunkGraph,
-			contentType,
-			getFilenameForChunk,
-			allChunks,
-			compilation
-		} = this;
+		const { global, contentType, getFilenameForChunk, allChunks } = this;
+		const compilation = /** @type {Compilation} */ (this.compilation);
+		const chunkGraph = /** @type {ChunkGraph} */ (this.chunkGraph);
+		const chunk = /** @type {Chunk} */ (this.chunk);
 		const { runtimeTemplate } = compilation;
 
 		/** @type {Map<string | FilenameFunction, Set<Chunk>>} */

package/lib/runtime/GetFullHashRuntimeModule.js

@@ -19,9 +19,10 @@ class GetFullHashRuntimeModule extends RuntimeModule {
 	 * @returns {string} runtime code
 	 */
 	generate() {
-		const { runtimeTemplate } = this.compilation;
+		const compilation = /** @type {Compilation} */ (this.compilation);
+		const { runtimeTemplate } = compilation;
 		return `${RuntimeGlobals.getFullHash} = ${runtimeTemplate.returningFunction(
-			JSON.stringify(this.compilation.hash || "XXXX")
+			JSON.stringify(compilation.hash || "XXXX")
 		)}`;
 	}
 }

package/lib/runtime/GetMainFilenameRuntimeModule.js

@@ -8,6 +8,7 @@ const RuntimeGlobals = require("../RuntimeGlobals");
 const RuntimeModule = require("../RuntimeModule");
 const Template = require("../Template");
 
+/** @typedef {import("../Chunk")} Chunk */
 /** @typedef {import("../Compilation")} Compilation */
 
 class GetMainFilenameRuntimeModule extends RuntimeModule {
@@ -26,7 +27,9 @@ class GetMainFilenameRuntimeModule extends RuntimeModule {
 	 * @returns {string} runtime code
 	 */
 	generate() {
-		const { global, filename, compilation, chunk } = this;
+		const { global, filename } = this;
+		const compilation = /** @type {Compilation} */ (this.compilation);
+		const chunk = /** @type {Chunk} */ (this.chunk);
 		const { runtimeTemplate } = compilation;
 		const url = compilation.getPath(JSON.stringify(filename), {
 			hash: `" + ${RuntimeGlobals.getFullHash}() + "`,

package/lib/runtime/GetTrustedTypesPolicyRuntimeModule.js

@@ -8,6 +8,8 @@ const RuntimeGlobals = require("../RuntimeGlobals");
 const Template = require("../Template");
 const HelperRuntimeModule = require("./HelperRuntimeModule");
 
+/** @typedef {import("../Compilation")} Compilation */
+
 class GetTrustedTypesPolicyRuntimeModule extends HelperRuntimeModule {
 	/**
 	 * @param {ReadonlySet<string>} runtimeRequirements runtime requirements
@@ -21,7 +23,7 @@ class GetTrustedTypesPolicyRuntimeModule extends HelperRuntimeModule {
 	 * @returns {string} runtime code
 	 */
 	generate() {
-		const { compilation } = this;
+		const compilation = /** @type {Compilation} */ (this.compilation);
 		const { runtimeTemplate, outputOptions } = compilation;
 		const { trustedTypes } = outputOptions;
 		const fn = RuntimeGlobals.getTrustedTypesPolicy;

package/lib/runtime/HasOwnPropertyRuntimeModule.js

@@ -9,6 +9,8 @@ const RuntimeGlobals = require("../RuntimeGlobals");
 const RuntimeModule = require("../RuntimeModule");
 const Template = require("../Template");
 
+/** @typedef {import("../Compilation")} Compilation */
+
 class HasOwnPropertyRuntimeModule extends RuntimeModule {
 	constructor() {
 		super("hasOwnProperty shorthand");
@@ -18,7 +20,8 @@ class HasOwnPropertyRuntimeModule extends RuntimeModule {
 	 * @returns {string} runtime code
 	 */
 	generate() {
-		const { runtimeTemplate } = this.compilation;
+		const compilation = /** @type {Compilation} */ (this.compilation);
+		const { runtimeTemplate } = compilation;
 
 		return Template.asString([
 			`${RuntimeGlobals.hasOwnProperty} = ${runtimeTemplate.returningFunction(

package/lib/runtime/LoadScriptRuntimeModule.js

@@ -44,17 +44,19 @@ class LoadScriptRuntimeModule extends HelperRuntimeModule {
 
 	/**
 	 * @param {boolean=} withCreateScriptUrl use create script url for trusted types
+	 * @param {boolean=} withFetchPriority use `fetchPriority` attribute
 	 */
-	constructor(withCreateScriptUrl) {
+	constructor(withCreateScriptUrl, withFetchPriority) {
 		super("load script");
 		this._withCreateScriptUrl = withCreateScriptUrl;
+		this._withFetchPriority = withFetchPriority;
 	}
 
 	/**
 	 * @returns {string} runtime code
 	 */
 	generate() {
-		const { compilation } = this;
+		const compilation = /** @type {Compilation} */ (this.compilation);
 		const { runtimeTemplate, outputOptions } = compilation;
 		const {
 			scriptType,
@@ -81,6 +83,15 @@ class LoadScriptRuntimeModule extends HelperRuntimeModule {
 			uniqueName
 				? 'script.setAttribute("data-webpack", dataWebpackPrefix + key);'
 				: "",
+			this._withFetchPriority
+				? Template.asString([
+						"if(fetchPriority) {",
+						Template.indent(
+							'script.setAttribute("fetchpriority", fetchPriority);'
+						),
+						"}"
+				  ])
+				: "",
 			`script.src = ${
 				this._withCreateScriptUrl
 					? `${RuntimeGlobals.createScriptUrl}(url)`
@@ -105,53 +116,58 @@ class LoadScriptRuntimeModule extends HelperRuntimeModule {
 				? `var dataWebpackPrefix = ${JSON.stringify(uniqueName + ":")};`
 				: "// data-webpack is not used as build has no uniqueName",
 			"// loadScript function to load a script via script tag",
-			`${fn} = ${runtimeTemplate.basicFunction("url, done, key, chunkId", [
-				"if(inProgress[url]) { inProgress[url].push(done); return; }",
-				"var script, needAttach;",
-				"if(key !== undefined) {",
-				Template.indent([
-					'var scripts = document.getElementsByTagName("script");',
-					"for(var i = 0; i < scripts.length; i++) {",
+			`${fn} = ${runtimeTemplate.basicFunction(
+				`url, done, key, chunkId${
+					this._withFetchPriority ? ", fetchPriority" : ""
+				}`,
+				[
+					"if(inProgress[url]) { inProgress[url].push(done); return; }",
+					"var script, needAttach;",
+					"if(key !== undefined) {",
+					Template.indent([
+						'var scripts = document.getElementsByTagName("script");',
+						"for(var i = 0; i < scripts.length; i++) {",
+						Template.indent([
+							"var s = scripts[i];",
+							`if(s.getAttribute("src") == url${
+								uniqueName
+									? ' || s.getAttribute("data-webpack") == dataWebpackPrefix + key'
+									: ""
+							}) { script = s; break; }`
+						]),
+						"}"
+					]),
+					"}",
+					"if(!script) {",
 					Template.indent([
-						"var s = scripts[i];",
-						`if(s.getAttribute("src") == url${
-							uniqueName
-								? ' || s.getAttribute("data-webpack") == dataWebpackPrefix + key'
-								: ""
-						}) { script = s; break; }`
+						"needAttach = true;",
+						createScript.call(code, /** @type {Chunk} */ (this.chunk))
 					]),
-					"}"
-				]),
-				"}",
-				"if(!script) {",
-				Template.indent([
-					"needAttach = true;",
-					createScript.call(code, this.chunk)
-				]),
-				"}",
-				"inProgress[url] = [done];",
-				"var onScriptComplete = " +
-					runtimeTemplate.basicFunction(
-						"prev, event",
-						Template.asString([
-							"// avoid mem leaks in IE.",
-							"script.onerror = script.onload = null;",
-							"clearTimeout(timeout);",
-							"var doneFns = inProgress[url];",
-							"delete inProgress[url];",
-							"script.parentNode && script.parentNode.removeChild(script);",
-							`doneFns && doneFns.forEach(${runtimeTemplate.returningFunction(
-								"fn(event)",
-								"fn"
-							)});`,
-							"if(prev) return prev(event);"
-						])
-					),
-				`var timeout = setTimeout(onScriptComplete.bind(null, undefined, { type: 'timeout', target: script }), ${loadTimeout});`,
-				"script.onerror = onScriptComplete.bind(null, script.onerror);",
-				"script.onload = onScriptComplete.bind(null, script.onload);",
-				"needAttach && document.head.appendChild(script);"
-			])};`
+					"}",
+					"inProgress[url] = [done];",
+					"var onScriptComplete = " +
+						runtimeTemplate.basicFunction(
+							"prev, event",
+							Template.asString([
+								"// avoid mem leaks in IE.",
+								"script.onerror = script.onload = null;",
+								"clearTimeout(timeout);",
+								"var doneFns = inProgress[url];",
+								"delete inProgress[url];",
+								"script.parentNode && script.parentNode.removeChild(script);",
+								`doneFns && doneFns.forEach(${runtimeTemplate.returningFunction(
+									"fn(event)",
+									"fn"
+								)});`,
+								"if(prev) return prev(event);"
+							])
+						),
+					`var timeout = setTimeout(onScriptComplete.bind(null, undefined, { type: 'timeout', target: script }), ${loadTimeout});`,
+					"script.onerror = onScriptComplete.bind(null, script.onerror);",
+					"script.onload = onScriptComplete.bind(null, script.onload);",
+					"needAttach && document.head.appendChild(script);"
+				]
+			)};`
 		]);
 	}
 }

package/lib/runtime/MakeNamespaceObjectRuntimeModule.js

@@ -8,6 +8,8 @@ const RuntimeGlobals = require("../RuntimeGlobals");
 const Template = require("../Template");
 const HelperRuntimeModule = require("./HelperRuntimeModule");
 
+/** @typedef {import("../Compilation")} Compilation */
+
 class MakeNamespaceObjectRuntimeModule extends HelperRuntimeModule {
 	constructor() {
 		super("make namespace object");
@@ -17,7 +19,8 @@ class MakeNamespaceObjectRuntimeModule extends HelperRuntimeModule {
 	 * @returns {string} runtime code
 	 */
 	generate() {
-		const { runtimeTemplate } = this.compilation;
+		const compilation = /** @type {Compilation} */ (this.compilation);
+		const { runtimeTemplate } = compilation;
 		const fn = RuntimeGlobals.makeNamespaceObject;
 		return Template.asString([
 			"// define __esModule on exports",

package/lib/runtime/OnChunksLoadedRuntimeModule.js

@@ -8,6 +8,8 @@ const RuntimeGlobals = require("../RuntimeGlobals");
 const RuntimeModule = require("../RuntimeModule");
 const Template = require("../Template");
 
+/** @typedef {import("../Compilation")} Compilation */
+
 class OnChunksLoadedRuntimeModule extends RuntimeModule {
 	constructor() {
 		super("chunk loaded");
@@ -17,7 +19,7 @@ class OnChunksLoadedRuntimeModule extends RuntimeModule {
 	 * @returns {string} runtime code
 	 */
 	generate() {
-		const { compilation } = this;
+		const compilation = /** @type {Compilation} */ (this.compilation);
 		const { runtimeTemplate } = compilation;
 		return Template.asString([
 			"var deferred = [];",