webpack 5.107.2 → 5.108.0

package/lib/wasm-async/AsyncWebAssemblyModulesPlugin.js

@@ -9,12 +9,11 @@ const { SyncWaterfallHook } = require("tapable");
 const Compilation = require("../Compilation");
 const Generator = require("../Generator");
 const { WEBASSEMBLY_MODULE_TYPE_ASYNC } = require("../ModuleTypeConstants");
-const NormalModule = require("../NormalModule");
 const WebAssemblyImportDependency = require("../dependencies/WebAssemblyImportDependency");
 const { tryRunOrWebpackError } = require("../errors/HookWebpackError");
 const { compareModulesByFullName } = require("../util/comparators");
-const makeSerializable = require("../util/makeSerializable");
 const memoize = require("../util/memoize");
+const AsyncWasmModule = require("./AsyncWasmModule");
 
 /** @typedef {import("webpack-sources").Source} Source */
 /** @typedef {import("../Chunk")} Chunk */
@@ -23,13 +22,9 @@ const memoize = require("../util/memoize");
 /** @typedef {import("../Compiler")} Compiler */
 /** @typedef {import("../DependencyTemplates")} DependencyTemplates */
 /** @typedef {import("../Module")} Module */
-/** @typedef {import("../dependencies/ImportPhase").ImportPhaseName} ImportPhaseName */
-/** @typedef {import("../NormalModule").NormalModuleCreateData} NormalModuleCreateData */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
 /** @typedef {import("../RuntimeTemplate")} RuntimeTemplate */
 /** @typedef {import("../errors/WebpackError")} WebpackError */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
 
 const getAsyncWebAssemblyGenerator = memoize(() =>
 	require("./AsyncWebAssemblyGenerator")
@@ -41,96 +36,6 @@ const getAsyncWebAssemblyParser = memoize(() =>
 	require("./AsyncWebAssemblyParser")
 );
 
-/** @typedef {NormalModule & { phase: ImportPhaseName | undefined }} AsyncWasmModuleClass */
-
-class AsyncWasmModule extends NormalModule {
-	/**
-	 * @param {NormalModuleCreateData & { phase: ImportPhaseName | undefined }} options options object
-	 */
-	constructor(options) {
-		super(options);
-		this.phase = options.phase;
-	}
-
-	/**
-	 * Returns the unique identifier used to reference this module.
-	 * @returns {string} a unique identifier of the module
-	 */
-	identifier() {
-		let str = super.identifier();
-
-		if (this.phase) {
-			str = `${str}|${this.phase}`;
-		}
-
-		return str;
-	}
-
-	/**
-	 * Assuming this module is in the cache. Update the (cached) module with
-	 * the fresh module from the factory. Usually updates internal references
-	 * and properties.
-	 * @param {Module} module fresh module
-	 * @returns {void}
-	 */
-	updateCacheModule(module) {
-		super.updateCacheModule(module);
-		const m = /** @type {AsyncWasmModule} */ (module);
-		this.phase = m.phase;
-	}
-
-	/**
-	 * Serializes this instance into the provided serializer context.
-	 * @param {ObjectSerializerContext} context context
-	 */
-	serialize(context) {
-		const { write } = context;
-		write(this.phase);
-		super.serialize(context);
-	}
-
-	/**
-	 * @param {ObjectDeserializerContext} context context
-	 * @returns {AsyncWasmModule} the deserialized object
-	 */
-	static deserialize(context) {
-		const obj = new AsyncWasmModule({
-			// will be deserialized by Module
-			layer: /** @type {EXPECTED_ANY} */ (null),
-			type: "",
-			// will be filled by updateCacheModule
-			resource: "",
-			context: "",
-			request: /** @type {EXPECTED_ANY} */ (null),
-			userRequest: /** @type {EXPECTED_ANY} */ (null),
-			rawRequest: /** @type {EXPECTED_ANY} */ (null),
-			loaders: /** @type {EXPECTED_ANY} */ (null),
-			matchResource: /** @type {EXPECTED_ANY} */ (null),
-			parser: /** @type {EXPECTED_ANY} */ (null),
-			parserOptions: /** @type {EXPECTED_ANY} */ (null),
-			generator: /** @type {EXPECTED_ANY} */ (null),
-			generatorOptions: /** @type {EXPECTED_ANY} */ (null),
-			resolveOptions: /** @type {EXPECTED_ANY} */ (null),
-			extractSourceMap: /** @type {EXPECTED_ANY} */ (null),
-			phase: /** @type {EXPECTED_ANY} */ (null)
-		});
-		obj.deserialize(context);
-		return obj;
-	}
-
-	/**
-	 * Restores this instance from the provided deserializer context.
-	 * @param {ObjectDeserializerContext} context context
-	 */
-	deserialize(context) {
-		const { read } = context;
-		this.phase = read();
-		super.deserialize(context);
-	}
-}
-
-makeSerializable(AsyncWasmModule, "webpack/lib/wasm-async/AsyncWasmModule");
-
 /**
  * Defines the web assembly render context type used by this module.
  * @typedef {object} WebAssemblyRenderContext

package/lib/wasm-async/AsyncWebAssemblyParser.js

@@ -12,7 +12,7 @@ const StaticExportsDependency = require("../dependencies/StaticExportsDependency
 const WebAssemblyImportDependency = require("../dependencies/WebAssemblyImportDependency");
 const EnvironmentNotSupportAsyncWarning = require("../errors/EnvironmentNotSupportAsyncWarning");
 
-/** @typedef {import("./AsyncWebAssemblyModulesPlugin").AsyncWasmModuleClass} AsyncWasmModule */
+/** @typedef {import("./AsyncWasmModule")} AsyncWasmModule */
 /** @typedef {import("../Module").BuildInfo} BuildInfo */
 /** @typedef {import("../Module").BuildMeta} BuildMeta */
 /** @typedef {import("../NormalModule")} NormalModule */

package/lib/wasm-async/UniversalCompileAsyncWasmPlugin.js

@@ -58,7 +58,7 @@ class UniversalCompileAsyncWasmPlugin {
 			 */
 			const generateBeforeLoadBinaryCode = (path) =>
 				Template.asString([
-					"var useFetch = typeof document !== 'undefined' || typeof self !== 'undefined';",
+					`var useFetch = ${compilation.runtimeTemplate.isWebLikePlatformExpression()};`,
 					`var wasmUrl = ${path};`
 				]);
 			/**

package/lib/wasm-sync/SyncWasmModule.js

@@ -0,0 +1,39 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+*/
+
+"use strict";
+
+const NormalModule = require("../NormalModule");
+const makeSerializable = require("../util/makeSerializable");
+
+/** @typedef {import("../Module").BuildMeta} BuildMeta */
+/** @typedef {import("../NormalModule").NormalModuleCreateData} NormalModuleCreateData */
+
+/**
+ * Defines the build meta properties specific to sync wasm modules.
+ * @typedef {object} KnownSyncWasmModuleBuildMeta
+ * @property {Record<string, string>=} jsIncompatibleExports
+ */
+
+/** @typedef {BuildMeta & KnownSyncWasmModuleBuildMeta} SyncWasmModuleBuildMeta */
+
+/**
+ * Module class for `webassembly/sync` modules. Wasm-specific properties should live here instead of `NormalModule`.
+ */
+class SyncWasmModule extends NormalModule {
+	/**
+	 * @param {NormalModuleCreateData} options options object
+	 */
+	constructor(options) {
+		super(options);
+
+		// Redeclared with the sync wasm specific shape
+		/** @type {SyncWasmModuleBuildMeta | undefined} */
+		this.buildMeta = undefined;
+	}
+}
+
+makeSerializable(SyncWasmModule, "webpack/lib/wasm-sync/SyncWasmModule");
+
+module.exports = SyncWasmModule;

package/lib/wasm-sync/UnsupportedWebAssemblyFeatureError.js

@@ -16,6 +16,7 @@ class UnsupportedWebAssemblyFeatureError extends WebpackError {
 
 		/** @type {string} */
 		this.name = "UnsupportedWebAssemblyFeatureError";
+		/** @type {boolean} */
 		this.hideStack = true;
 	}
 }

package/lib/wasm-sync/WasmChunkLoadingRuntimeModule.js

@@ -239,8 +239,11 @@ class WasmChunkLoadingRuntimeModule extends RuntimeModule {
 	}) {
 		super("wasm chunk loading", RuntimeModule.STAGE_ATTACH);
 		this.generateLoadBinaryCode = generateLoadBinaryCode;
+		/** @type {boolean | undefined} */
 		this.supportsStreaming = supportsStreaming;
+		/** @type {boolean | undefined} */
 		this.mangleImports = mangleImports;
+		/** @type {ReadOnlyRuntimeRequirements} */
 		this._runtimeRequirements = runtimeRequirements;
 	}
 
@@ -254,7 +257,7 @@ class WasmChunkLoadingRuntimeModule extends RuntimeModule {
 			RuntimeGlobals.hmrDownloadUpdateHandlers
 		);
 		const compilation = /** @type {Compilation} */ (this.compilation);
-		const { moduleGraph, outputOptions } = compilation;
+		const { moduleGraph, outputOptions, runtimeTemplate } = compilation;
 		const chunkGraph = /** @type {ChunkGraph} */ (this.chunkGraph);
 		const chunk = /** @type {Chunk} */ (this.chunk);
 		const wasmModules = getAllWasmModules(moduleGraph, chunkGraph, chunk);
@@ -315,8 +318,8 @@ class WasmChunkLoadingRuntimeModule extends RuntimeModule {
 		return Template.asString([
 			"// object to store loaded and loading wasm modules",
 			`var installedWasmModules = ${
-				stateExpression ? `${stateExpression} = ${stateExpression} || ` : ""
-			}{};`,
+				stateExpression ? runtimeTemplate.assignOr(stateExpression, "{}") : "{}"
+			};`,
 			"",
 			// This function is used to delay reading the installed wasm module promises
 			// by a microtask. Sorting them doesn't help because there are edge cases where

package/lib/wasm-sync/WasmFinalizeExportsPlugin.js

@@ -12,6 +12,7 @@ const UnsupportedWebAssemblyFeatureError = require("./UnsupportedWebAssemblyFeat
 /** @typedef {import("../Dependency")} Dependency */
 /** @typedef {import("../Module")} Module */
 /** @typedef {import("../Module").BuildMeta} BuildMeta */
+/** @typedef {import("./SyncWasmModule").SyncWasmModuleBuildMeta} SyncWasmModuleBuildMeta */
 
 const PLUGIN_NAME = "WasmFinalizeExportsPlugin";
 
@@ -28,7 +29,7 @@ class WasmFinalizeExportsPlugin {
 					// 1. if a WebAssembly module
 					if (module.type.startsWith("webassembly") === true) {
 						const jsIncompatibleExports =
-							/** @type {BuildMeta} */
+							/** @type {SyncWasmModuleBuildMeta} */
 							(module.buildMeta).jsIncompatibleExports;
 
 						if (jsIncompatibleExports === undefined) {

package/lib/wasm-sync/WebAssemblyGenerator.js

@@ -426,6 +426,7 @@ class WebAssemblyGenerator extends Generator {
 	 */
 	constructor(options) {
 		super();
+		/** @type {WebAssemblyGeneratorOptions} */
 		this.options = options;
 	}
 

package/lib/wasm-sync/WebAssemblyInInitialChunkError.js

@@ -107,7 +107,9 @@ ${moduleChains.map((s) => `* ${s}`).join("\n")}`;
 
 		/** @type {string} */
 		this.name = "WebAssemblyInInitialChunkError";
+		/** @type {boolean} */
 		this.hideStack = true;
+		/** @type {Module} */
 		this.module = module;
 	}
 }

package/lib/wasm-sync/WebAssemblyModulesPlugin.js

@@ -27,6 +27,7 @@ const getWebAssemblyJavascriptGenerator = memoize(() =>
 	require("./WebAssemblyJavascriptGenerator")
 );
 const getWebAssemblyParser = memoize(() => require("./WebAssemblyParser"));
+const getSyncWasmModule = memoize(() => require("./SyncWasmModule"));
 
 const PLUGIN_NAME = "WebAssemblyModulesPlugin";
 
@@ -47,6 +48,7 @@ class WebAssemblyModulesPlugin {
 	 * @param {WebAssemblyModulesPluginOptions} options options
 	 */
 	constructor(options) {
+		/** @type {WebAssemblyModulesPluginOptions} */
 		this.options = options;
 	}
 
@@ -71,6 +73,14 @@ class WebAssemblyModulesPlugin {
 					normalModuleFactory
 				);
 
+				normalModuleFactory.hooks.createModuleClass
+					.for(WEBASSEMBLY_MODULE_TYPE_SYNC)
+					.tap(PLUGIN_NAME, (createData, _resolveData) => {
+						const SyncWasmModule = getSyncWasmModule();
+
+						return new SyncWasmModule(createData);
+					});
+
 				normalModuleFactory.hooks.createParser
 					.for(WEBASSEMBLY_MODULE_TYPE_SYNC)
 					.tap(PLUGIN_NAME, () => {

package/lib/wasm-sync/WebAssemblyParser.js

@@ -16,6 +16,7 @@ const WebAssemblyImportDependency = require("../dependencies/WebAssemblyImportDe
 /** @typedef {import("@webassemblyjs/ast").ModuleImport} ModuleImport */
 /** @typedef {import("../Module").BuildInfo} BuildInfo */
 /** @typedef {import("../Module").BuildMeta} BuildMeta */
+/** @typedef {import("./SyncWasmModule").SyncWasmModuleBuildMeta} SyncWasmModuleBuildMeta */
 /** @typedef {import("../Parser").ParserState} ParserState */
 /** @typedef {import("../Parser").PreparsedAst} PreparsedAst */
 
@@ -39,7 +40,8 @@ const getJsIncompatibleType = (signature) => {
 };
 
 /**
- * TODO why are there two different Signature types?
+ * Same check for the other `@webassemblyjs` signature shape: imports carry the
+ * AST `Signature` node (above), the module context uses plain `FuncSignature`.
  * @param {t.FuncSignature} signature the func signature
  * @returns {null | string} the type incompatible with js types
  */
@@ -90,7 +92,9 @@ class WebAssemblyParser extends Parser {
 		// extract imports and exports
 		/** @type {string[]} */
 		const exports = [];
-		const buildMeta = /** @type {BuildMeta} */ (state.module.buildMeta);
+		const buildMeta = /** @type {SyncWasmModuleBuildMeta} */ (
+			state.module.buildMeta
+		);
 		/** @type {Record<string, string> | undefined} */
 		let jsIncompatibleExports = (buildMeta.jsIncompatibleExports = undefined);
 
@@ -114,7 +118,7 @@ class WebAssemblyParser extends Parser {
 					if (incompatibleType) {
 						if (jsIncompatibleExports === undefined) {
 							jsIncompatibleExports =
-								/** @type {BuildMeta} */
+								/** @type {SyncWasmModuleBuildMeta} */
 								(state.module.buildMeta).jsIncompatibleExports = {};
 						}
 						jsIncompatibleExports[node.name] = incompatibleType;

package/lib/web/JsonpChunkLoadingRuntimeModule.js

@@ -131,21 +131,24 @@ class JsonpChunkLoadingRuntimeModule extends RuntimeModule {
 			? `${RuntimeGlobals.hmrRuntimeStatePrefix}_jsonp`
 			: undefined;
 
+		const cst = runtimeTemplate.renderConst();
+		const lt = runtimeTemplate.renderLet();
+		const installedChunksObject = `{\n${Template.indent(
+			Array.from(initialChunkIds, (id) => `${JSON.stringify(id)}: 0`).join(
+				",\n"
+			)
+		)}\n}`;
 		return Template.asString([
 			withBaseURI ? this._generateBaseUri(chunk) : "// no baseURI",
 			"",
 			"// object to store loaded and loading chunks",
 			"// undefined = chunk not loaded, null = chunk preloaded/prefetched",
 			"// [resolve, reject, Promise] = chunk loading, 0 = chunk loaded",
-			`var installedChunks = ${
-				stateExpression ? `${stateExpression} = ${stateExpression} || ` : ""
-			}{`,
-			Template.indent(
-				Array.from(initialChunkIds, (id) => `${JSON.stringify(id)}: 0`).join(
-					",\n"
-				)
-			),
-			"};",
+			`${cst} installedChunks = ${
+				stateExpression
+					? runtimeTemplate.assignOr(stateExpression, installedChunksObject)
+					: installedChunksObject
+			};`,
 			"",
 			withLoading
 				? Template.asString([
@@ -154,7 +157,7 @@ class JsonpChunkLoadingRuntimeModule extends RuntimeModule {
 							hasJsMatcher !== false
 								? Template.indent([
 										"// JSONP chunk loading for javascript",
-										`var installedChunkData = ${RuntimeGlobals.hasOwnProperty}(installedChunks, chunkId) ? installedChunks[chunkId] : undefined;`,
+										`${lt} installedChunkData = ${RuntimeGlobals.hasOwnProperty}(installedChunks, chunkId) ? installedChunks[chunkId] : undefined;`,
 										'if(installedChunkData !== 0) { // 0 means "already installed".',
 										Template.indent([
 											"",
@@ -170,17 +173,17 @@ class JsonpChunkLoadingRuntimeModule extends RuntimeModule {
 													: `if(${hasJsMatcher("chunkId")}) {`,
 												Template.indent([
 													"// setup Promise in chunk cache",
-													`var promise = new Promise(${runtimeTemplate.expressionFunction(
+													`${cst} promise = new Promise(${runtimeTemplate.expressionFunction(
 														"installedChunkData = installedChunks[chunkId] = [resolve, reject]",
 														"resolve, reject"
 													)});`,
 													"promises.push(installedChunkData[2] = promise);",
 													"",
 													"// start chunk loading",
-													`var url = ${RuntimeGlobals.publicPath} + ${RuntimeGlobals.getChunkScriptFilename}(chunkId);`,
+													`${cst} url = ${RuntimeGlobals.publicPath} + ${RuntimeGlobals.getChunkScriptFilename}(chunkId);`,
 													"// create error before stack unwound to get useful stacktrace later",
-													"var error = new Error();",
-													`var loadingEnded = ${runtimeTemplate.basicFunction(
+													`${cst} error = new Error();`,
+													`${cst} loadingEnded = ${runtimeTemplate.basicFunction(
 														"event",
 														[
 															`if(${RuntimeGlobals.hasOwnProperty}(installedChunks, chunkId)) {`,
@@ -189,8 +192,8 @@ class JsonpChunkLoadingRuntimeModule extends RuntimeModule {
 																"if(installedChunkData !== 0) installedChunks[chunkId] = undefined;",
 																"if(installedChunkData) {",
 																Template.indent([
-																	"var errorType = event && (event.type === 'load' ? 'missing' : event.type);",
-																	"var realSrc = event && event.target && event.target.src;",
+																	`${cst} errorType = event && (event.type === 'load' ? 'missing' : event.type);`,
+																	`${cst} realSrc = event && event.target && event.target.src;`,
 																	"error.message = 'Loading chunk ' + chunkId + ' failed.\\n(' + errorType + ': ' + realSrc + ')';",
 																	"error.name = 'ChunkLoadError';",
 																	"error.type = errorType;",
@@ -234,7 +237,7 @@ class JsonpChunkLoadingRuntimeModule extends RuntimeModule {
 							"installedChunks[chunkId] = null;",
 							linkPrefetch.call(
 								Template.asString([
-									"var link = document.createElement('link');",
+									`${cst} link = document.createElement('link');`,
 									charset ? "link.charset = 'utf-8';" : "",
 									crossOriginLoading
 										? `link.crossOrigin = ${JSON.stringify(
@@ -271,7 +274,7 @@ class JsonpChunkLoadingRuntimeModule extends RuntimeModule {
 							"installedChunks[chunkId] = null;",
 							linkPreload.call(
 								Template.asString([
-									"var link = document.createElement('link');",
+									`${cst} link = document.createElement('link');`,
 									scriptType && scriptType !== "module"
 										? `link.type = ${JSON.stringify(scriptType)};`
 										: "",
@@ -310,8 +313,8 @@ class JsonpChunkLoadingRuntimeModule extends RuntimeModule {
 			"",
 			withHmr
 				? Template.asString([
-						"var currentUpdatedModulesList;",
-						"var waitingUpdateResolves = {};",
+						`${lt} currentUpdatedModulesList;`,
+						`${cst} waitingUpdateResolves = {};`,
 						"function loadUpdateChunk(chunkId, updatedModulesList) {",
 						Template.indent([
 							"currentUpdatedModulesList = updatedModulesList;",
@@ -320,23 +323,26 @@ class JsonpChunkLoadingRuntimeModule extends RuntimeModule {
 								[
 									"waitingUpdateResolves[chunkId] = resolve;",
 									"// start update chunk loading",
-									`var url = ${RuntimeGlobals.publicPath} + ${RuntimeGlobals.getChunkUpdateScriptFilename}(chunkId);`,
+									`${cst} url = ${RuntimeGlobals.publicPath} + ${RuntimeGlobals.getChunkUpdateScriptFilename}(chunkId);`,
 									"// create error before stack unwound to get useful stacktrace later",
-									"var error = new Error();",
-									`var loadingEnded = ${runtimeTemplate.basicFunction("event", [
-										"if(waitingUpdateResolves[chunkId]) {",
-										Template.indent([
-											"waitingUpdateResolves[chunkId] = undefined",
-											"var errorType = event && (event.type === 'load' ? 'missing' : event.type);",
-											"var realSrc = event && event.target && event.target.src;",
-											"error.message = 'Loading hot update chunk ' + chunkId + ' failed.\\n(' + errorType + ': ' + realSrc + ')';",
-											"error.name = 'ChunkLoadError';",
-											"error.type = errorType;",
-											"error.request = realSrc;",
-											"reject(error);"
-										]),
-										"}"
-									])};`,
+									`${cst} error = new Error();`,
+									`${cst} loadingEnded = ${runtimeTemplate.basicFunction(
+										"event",
+										[
+											"if(waitingUpdateResolves[chunkId]) {",
+											Template.indent([
+												"waitingUpdateResolves[chunkId] = undefined",
+												`${cst} errorType = event && (event.type === 'load' ? 'missing' : event.type);`,
+												`${cst} realSrc = event && event.target && event.target.src;`,
+												"error.message = 'Loading hot update chunk ' + chunkId + ' failed.\\n(' + errorType + ': ' + realSrc + ')';",
+												"error.name = 'ChunkLoadError';",
+												"error.type = errorType;",
+												"error.request = realSrc;",
+												"reject(error);"
+											]),
+											"}"
+										]
+									)};`,
 									`${RuntimeGlobals.loadScript}(url, loadingEnded);`
 								]
 							)});`
@@ -353,7 +359,7 @@ class JsonpChunkLoadingRuntimeModule extends RuntimeModule {
 									`if(${RuntimeGlobals.hasOwnProperty}(moreModules, moduleId)) {`,
 									Template.indent([
 										"currentUpdate[moduleId] = moreModules[moduleId];",
-										"if(currentUpdatedModulesList) currentUpdatedModulesList.push(moduleId);"
+										`${runtimeTemplate.optionalChaining("currentUpdatedModulesList", "push(moduleId)")};`
 									]),
 									"}"
 								]),
@@ -401,7 +407,7 @@ class JsonpChunkLoadingRuntimeModule extends RuntimeModule {
 			withCallback || withLoading
 				? Template.asString([
 						"// install a JSONP callback for chunk loading",
-						`var webpackJsonpCallback = ${runtimeTemplate.basicFunction(
+						`${cst} webpackJsonpCallback = ${runtimeTemplate.basicFunction(
 							"parentChunkLoadingFunction, data",
 							[
 								runtimeTemplate.destructureArray(
@@ -444,7 +450,7 @@ class JsonpChunkLoadingRuntimeModule extends RuntimeModule {
 							]
 						)}`,
 						"",
-						`var chunkLoadingGlobal = ${chunkLoadingGlobalExpr} = ${chunkLoadingGlobalExpr} || [];`,
+						`${cst} chunkLoadingGlobal = ${runtimeTemplate.assignOr(chunkLoadingGlobalExpr, "[]")};`,
 						"chunkLoadingGlobal.forEach(webpackJsonpCallback.bind(null, 0));",
 						"chunkLoadingGlobal.push = webpackJsonpCallback.bind(null, chunkLoadingGlobal.push.bind(chunkLoadingGlobal));"
 					])

package/lib/webworker/ImportScriptsChunkLoadingRuntimeModule.js

@@ -100,6 +100,11 @@ class ImportScriptsChunkLoadingRuntimeModule extends RuntimeModule {
 			: undefined;
 		const runtimeTemplate = compilation.runtimeTemplate;
 		const { _withCreateScriptUrl: withCreateScriptUrl } = this;
+		const installedChunksObject = `{\n${Template.indent(
+			Array.from(initialChunkIds, (id) => `${JSON.stringify(id)}: 1`).join(
+				",\n"
+			)
+		)}\n}`;
 
 		return Template.asString([
 			withBaseURI ? this._generateBaseUri(chunk) : "// no baseURI",
@@ -107,14 +112,10 @@ class ImportScriptsChunkLoadingRuntimeModule extends RuntimeModule {
 			"// object to store loaded chunks",
 			'// "1" means "already loaded"',
 			`var installedChunks = ${
-				stateExpression ? `${stateExpression} = ${stateExpression} || ` : ""
-			}{`,
-			Template.indent(
-				Array.from(initialChunkIds, (id) => `${JSON.stringify(id)}: 1`).join(
-					",\n"
-				)
-			),
-			"};",
+				stateExpression
+					? runtimeTemplate.assignOr(stateExpression, installedChunksObject)
+					: installedChunksObject
+			};`,
 			"",
 			withCallback || withLoading
 				? Template.asString([
@@ -168,7 +169,7 @@ class ImportScriptsChunkLoadingRuntimeModule extends RuntimeModule {
 								)};`
 							: "",
 						"",
-						`var chunkLoadingGlobal = ${chunkLoadingGlobalExpr} = ${chunkLoadingGlobalExpr} || [];`,
+						`var chunkLoadingGlobal = ${runtimeTemplate.assignOr(chunkLoadingGlobalExpr, "[]")};`,
 						"var parentChunkLoadingFunction = chunkLoadingGlobal.push.bind(chunkLoadingGlobal);",
 						"chunkLoadingGlobal.push = installChunk;"
 					])
@@ -187,7 +188,7 @@ class ImportScriptsChunkLoadingRuntimeModule extends RuntimeModule {
 									`if(${RuntimeGlobals.hasOwnProperty}(moreModules, moduleId)) {`,
 									Template.indent([
 										"currentUpdate[moduleId] = moreModules[moduleId];",
-										"if(updatedModulesList) updatedModulesList.push(moduleId);"
+										`${runtimeTemplate.optionalChaining("updatedModulesList", "push(moduleId)")};`
 									]),
 									"}"
 								]),