webpack 5.107.1 → 5.108.0

package/lib/json/JsonModule.js

@@ -0,0 +1,40 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+*/
+
+"use strict";
+
+const NormalModule = require("../NormalModule");
+const makeSerializable = require("../util/makeSerializable");
+
+/** @typedef {import("../NormalModule").NormalModuleBuildInfo} NormalModuleBuildInfo */
+/** @typedef {import("../NormalModule").NormalModuleCreateData} NormalModuleCreateData */
+/** @typedef {import("./JsonData")} JsonData */
+
+/**
+ * Defines the build info properties specific to json modules.
+ * @typedef {object} KnownJsonModuleBuildInfo
+ * @property {JsonData=} jsonData
+ */
+
+/** @typedef {NormalModuleBuildInfo & KnownJsonModuleBuildInfo} JsonModuleBuildInfo */
+
+/**
+ * Module class for `json` modules. JSON-specific properties should live here instead of `NormalModule`.
+ */
+class JsonModule extends NormalModule {
+	/**
+	 * @param {NormalModuleCreateData} options options object
+	 */
+	constructor(options) {
+		super(options);
+
+		// Redeclared with the json specific shape
+		/** @type {JsonModuleBuildInfo | undefined} */
+		this.buildInfo = undefined;
+	}
+}
+
+makeSerializable(JsonModule, "webpack/lib/json/JsonModule");
+
+module.exports = JsonModule;

package/lib/json/JsonModulesPlugin.js

@@ -7,6 +7,7 @@
 
 const { JSON_MODULE_TYPE } = require("../ModuleTypeConstants");
 const JsonGenerator = require("./JsonGenerator");
+const JsonModule = require("./JsonModule");
 const JsonParser = require("./JsonParser");
 
 /** @typedef {import("../Compiler")} Compiler */
@@ -27,6 +28,12 @@ class JsonModulesPlugin {
 		compiler.hooks.compilation.tap(
 			PLUGIN_NAME,
 			(compilation, { normalModuleFactory }) => {
+				normalModuleFactory.hooks.createModuleClass
+					.for(JSON_MODULE_TYPE)
+					.tap(
+						PLUGIN_NAME,
+						(createData, _resolveData) => new JsonModule(createData)
+					);
 				normalModuleFactory.hooks.createParser
 					.for(JSON_MODULE_TYPE)
 					.tap(PLUGIN_NAME, (parserOptions) => {

package/lib/json/JsonParser.js

@@ -11,7 +11,7 @@ const parseJson = require("../util/parseJson");
 const JsonData = require("./JsonData");
 
 /** @typedef {import("../../declarations/WebpackOptions").JsonParserOptions} JsonParserOptions */
-/** @typedef {import("../Module").BuildInfo} BuildInfo */
+/** @typedef {import("./JsonModule").JsonModuleBuildInfo} JsonModuleBuildInfo */
 /** @typedef {import("../Module").BuildMeta} BuildMeta */
 /** @typedef {import("../Parser").ParserState} ParserState */
 /** @typedef {import("../Parser").PreparsedAst} PreparsedAst */
@@ -55,7 +55,9 @@ class JsonParser extends Parser {
 				? source
 				: parseFn(source[0] === "\uFEFF" ? source.slice(1) : source);
 		const jsonData = new JsonData(/** @type {Buffer | JsonValue} */ (data));
-		const buildInfo = /** @type {BuildInfo} */ (state.module.buildInfo);
+		const buildInfo = /** @type {JsonModuleBuildInfo} */ (
+			state.module.buildInfo
+		);
 		buildInfo.jsonData = jsonData;
 		buildInfo.strict = true;
 		const buildMeta = /** @type {BuildMeta} */ (state.module.buildMeta);

package/lib/library/AssignLibraryPlugin.js

@@ -189,6 +189,7 @@ class AssignLibraryPlugin extends AbstractLibraryPlugin {
 			);
 			exportsInfo.setUsed(UsageState.Used, runtime);
 			exportsInfo.canMangleUse = false;
+			exportsInfo.canInlineUse = false;
 		} else {
 			const exportsInfo = moduleGraph.getExportsInfo(module);
 			exportsInfo.setUsedInUnknownWay(runtime);
@@ -331,6 +332,7 @@ class AssignLibraryPlugin extends AbstractLibraryPlugin {
 					Array.isArray(options.export) ? options.export : [options.export]
 				)
 			: "";
+		const cst = compilation.runtimeTemplate.renderConst();
 		const result = new ConcatSource(source);
 		if (staticExports) {
 			const exportsInfo = moduleGraph.getExportsInfo(module);
@@ -360,7 +362,7 @@ class AssignLibraryPlugin extends AbstractLibraryPlugin {
 			let exports = RuntimeGlobals.exports;
 			if (exportAccess) {
 				result.add(
-					`var __webpack_exports_export__ = ${RuntimeGlobals.exports}${exportAccess};\n`
+					`${cst} __webpack_exports_export__ = ${RuntimeGlobals.exports}${exportAccess};\n`
 				);
 
 				exports = "__webpack_exports_export__";
@@ -386,7 +388,7 @@ class AssignLibraryPlugin extends AbstractLibraryPlugin {
 			);
 		} else if (options.name ? this.named === "copy" : this.unnamed === "copy") {
 			result.add(
-				`var __webpack_export_target__ = ${accessWithInit(
+				`${cst} __webpack_export_target__ = ${accessWithInit(
 					fullNameResolved,
 					this._getPrefix(compilation).length,
 					true
@@ -396,7 +398,7 @@ class AssignLibraryPlugin extends AbstractLibraryPlugin {
 			let exports = RuntimeGlobals.exports;
 			if (exportAccess) {
 				result.add(
-					`var __webpack_exports_export__ = ${RuntimeGlobals.exports}${exportAccess};\n`
+					`${cst} __webpack_exports_export__ = ${RuntimeGlobals.exports}${exportAccess};\n`
 				);
 
 				exports = "__webpack_exports_export__";

package/lib/library/ExportPropertyLibraryPlugin.js

@@ -85,6 +85,7 @@ class ExportPropertyLibraryPlugin extends AbstractLibraryPlugin {
 			);
 			exportsInfo.setUsed(UsageState.Used, runtime);
 			exportsInfo.canMangleUse = false;
+			exportsInfo.canInlineUse = false;
 		} else {
 			const exportsInfo = moduleGraph.getExportsInfo(module);
 			exportsInfo.setUsedInUnknownWay(runtime);

package/lib/library/FalseIIFEUmdWarning.js

@@ -12,6 +12,7 @@ class FalseIIFEUmdWarning extends WebpackError {
 		super();
 		/** @type {string} */
 		this.name = "FalseIIFEUmdWarning";
+		/** @type {string} */
 		this.message =
 			"Configuration:\nSetting 'output.iife' to 'false' is incompatible with 'output.library.type' set to 'umd'. This configuration may cause unexpected behavior, as UMD libraries are expected to use an IIFE (Immediately Invoked Function Expression) to support various module formats. Consider setting 'output.iife' to 'true' or choosing a different 'library.type' to ensure compatibility.\nLearn more: https://webpack.js.org/configuration/output/";
 	}

package/lib/library/ModuleLibraryPlugin.js

@@ -13,6 +13,7 @@ const Template = require("../Template");
 const HarmonyExportImportedSpecifierDependency = require("../dependencies/HarmonyExportImportedSpecifierDependency");
 const JavascriptModulesPlugin = require("../javascript/JavascriptModulesPlugin");
 const ConcatenatedModule = require("../optimize/ConcatenatedModule");
+const { InlinedUsedName } = require("../optimize/InlineExports");
 const { propertyAccess } = require("../util/property");
 const { getEntryRuntime, getRuntimeKey } = require("../util/runtime");
 const AbstractLibraryPlugin = require("./AbstractLibraryPlugin");
@@ -31,6 +32,7 @@ const AbstractLibraryPlugin = require("./AbstractLibraryPlugin");
 /** @typedef {import("../javascript/JavascriptModulesPlugin").ModuleRenderContext} ModuleRenderContext */
 /** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
 /** @typedef {import("../RuntimeTemplate")} RuntimeTemplate */
+/** @typedef {import("../javascript/JavascriptModule").JavascriptModuleBuildMeta} JavascriptModuleBuildMeta */
 
 /**
  * Defines the shared type used by this module.
@@ -111,24 +113,15 @@ class ModuleLibraryPlugin extends AbstractLibraryPlugin {
 
 			// `ModuleLibraryPlugin` stashes the on-demand exports source via
 			// `onDemandExportsGeneration` and only re-emits it when the
-			// module is wrapped in an IIFE/factory. When a single concatenated
-			// entry is inlined directly, the stashed source — and the
+			// module is wrapped in an IIFE/factory. When the entry is
+			// inlined directly, the stashed source — and the
 			// `definePropertyGetters` / `requireScope` runtime helpers it
 			// pulled in — never make it into the output. Drop those helpers
-			// from the chunk's set in that simple shape so the bundle stays
-			// clean.
+			// from the chunk's set so the bundle stays clean.
 			compilation.hooks.additionalChunkRuntimeRequirements.tap(
 				PLUGIN_NAME,
 				(chunk, set, { chunkGraph, codeGenerationResults }) => {
 					if (!set.has(RuntimeGlobals.definePropertyGetters)) return;
-
-					// Only handle the simple "single concatenated entry"
-					// shape. Anything else (additional modules, multiple
-					// entries, sibling runtime chunks, or chunk-level
-					// requirements that disable inline startup) forces the
-					// module through factory/IIFE rendering, which re-emits
-					// the source.
-					if (chunkGraph.getNumberOfChunkModules(chunk) !== 1) return;
 					if (chunkGraph.getNumberOfEntryModules(chunk) !== 1) return;
 					if (chunkGraph.hasChunkEntryDependentChunks(chunk)) return;
 					if (
@@ -140,8 +133,6 @@ class ModuleLibraryPlugin extends AbstractLibraryPlugin {
 					) {
 						return;
 					}
-					// Anyone tapping `inlineInRuntimeBailout` may force factory
-					// rendering at render time, so conservatively bail out.
 					if (javascriptHooks.inlineInRuntimeBailout.isUsed()) return;
 
 					const [module] = chunkGraph.getChunkEntryModulesIterable(chunk);
@@ -153,14 +144,6 @@ class ModuleLibraryPlugin extends AbstractLibraryPlugin {
 					) {
 						return;
 					}
-					// If the generated source references any
-					// `__webpack_require__.<helper>` (the on-demand `.d(...)`
-					// is stashed, but `.r(__webpack_exports__)` from the ESM
-					// compat flag, namespace objects, deferred externals, ...
-					// stay in the result) the helpers and the require scope
-					// they live in are still needed. The dot in the substring
-					// avoids matching the bare `"__webpack_require__"` string
-					// literals that some test fixtures include.
 					const codeGenResult = codeGenerationResults.get(
 						module,
 						chunk.runtime
@@ -174,9 +157,34 @@ class ModuleLibraryPlugin extends AbstractLibraryPlugin {
 						return;
 					}
 
+					// Check whether any other module in the chunk still needs
+					// the helpers we want to remove.
+					let otherNeedsDefine = false;
+					let otherNeedsExports = false;
+					let otherNeedsRequireScope = false;
+					for (const m of chunkGraph.getChunkModulesIterable(chunk)) {
+						if (m === module) continue;
+						const requirements = chunkGraph.getModuleRuntimeRequirements(
+							m,
+							chunk.runtime
+						);
+						if (!requirements) continue;
+						if (requirements.has(RuntimeGlobals.definePropertyGetters)) {
+							otherNeedsDefine = true;
+						}
+						if (requirements.has(RuntimeGlobals.exports)) {
+							otherNeedsExports = true;
+						}
+						if (requirements.has(RuntimeGlobals.requireScope)) {
+							otherNeedsRequireScope = true;
+						}
+						if (otherNeedsDefine) break;
+					}
+
+					if (otherNeedsDefine) return;
 					set.delete(RuntimeGlobals.definePropertyGetters);
-					set.delete(RuntimeGlobals.exports);
-					set.delete(RuntimeGlobals.requireScope);
+					if (!otherNeedsExports) set.delete(RuntimeGlobals.exports);
+					if (!otherNeedsRequireScope) set.delete(RuntimeGlobals.requireScope);
 				}
 			);
 		});
@@ -202,18 +210,24 @@ class ModuleLibraryPlugin extends AbstractLibraryPlugin {
 			);
 			exportsInfo.setUsed(UsageState.Used, runtime);
 			exportsInfo.canMangleUse = false;
+			exportsInfo.canInlineUse = false;
 		} else {
 			const exportsInfo = moduleGraph.getExportsInfo(module);
 
 			if (
 				// If the entry module is commonjs, its exports cannot be mangled
-				(module.buildMeta && module.buildMeta.treatAsCommonJs) ||
+				(module.buildMeta &&
+					/** @type {JavascriptModuleBuildMeta} */ (module.buildMeta)
+						.treatAsCommonJs) ||
 				// The entry module provides unknown exports
 				exportsInfo._otherExportsInfo.provided === null
 			) {
 				exportsInfo.setUsedInUnknownWay(runtime);
 			} else {
 				exportsInfo.setAllKnownExportsUsed(runtime);
+				for (const exportInfo of exportsInfo.ownedExports) {
+					exportInfo.canInlineUse = false;
+				}
 			}
 		}
 		moduleGraph.addExtraReason(module, "used as library export");
@@ -259,7 +273,7 @@ class ModuleLibraryPlugin extends AbstractLibraryPlugin {
 		const result = new ConcatSource(source);
 		/** @type {Set<string>} */
 		const moduleRequests = new Set();
-		/** @type {Map<string, string>} */
+		/** @type {Map<string, string | InlinedUsedName>} */
 		const unknownProvidedExports = new Map();
 
 		/**
@@ -301,7 +315,9 @@ class ModuleLibraryPlugin extends AbstractLibraryPlugin {
 								continue;
 							}
 							const originalName = exportInfo.name;
-							const usedName = exportInfo.getUsedName(originalName, runtime);
+							const usedName =
+								/** @type {string | InlinedUsedName | false} */
+								(exportInfo.getUsedName(originalName, runtime));
 
 							if (!alreadyRenderedExports.has(originalName) && usedName) {
 								unknownProvidedExports.set(originalName, usedName);
@@ -321,7 +337,13 @@ class ModuleLibraryPlugin extends AbstractLibraryPlugin {
 		for (const [origin, used] of unknownProvidedExports) {
 			exports.push([
 				origin,
-				`${RuntimeGlobals.exports}${propertyAccess([used])}`
+				used instanceof InlinedUsedName
+					? used.render(
+							Template.toNormalComment(
+								`inlined export ${propertyAccess([origin])}`
+							)
+						)
+					: `${RuntimeGlobals.exports}${propertyAccess([used])}`
 			]);
 		}
 
@@ -379,7 +401,9 @@ class ModuleLibraryPlugin extends AbstractLibraryPlugin {
 		const isAsync = moduleGraph.isAsync(module);
 
 		const treatAsCommonJs =
-			module.buildMeta && module.buildMeta.treatAsCommonJs;
+			module.buildMeta &&
+			/** @type {JavascriptModuleBuildMeta} */ (module.buildMeta)
+				.treatAsCommonJs;
 		const skipRenderDefaultExport = Boolean(treatAsCommonJs);
 
 		const moduleExportsInfo = moduleGraph.getExportsInfo(module);
@@ -424,6 +448,7 @@ class ModuleLibraryPlugin extends AbstractLibraryPlugin {
 				}
 			}
 
+			// The exports of entry module are never inlined
 			const usedName =
 				/** @type {string} */
 				(exportInfo.getUsedName(originalName, chunk.runtime));

package/lib/library/SystemLibraryPlugin.js

@@ -141,9 +141,9 @@ class SystemLibraryPlugin extends AbstractLibraryPlugin {
 									/** @type {ExportInfoName[]} */
 									const handledNames = [];
 									for (const exportInfo of exportsInfo.orderedExports) {
-										const used = exportInfo.getUsedName(
-											undefined,
-											chunk.runtime
+										// The exports of `ExternalModule` are never inlined
+										const used = /** @type {string | false} */ (
+											exportInfo.getUsedName(undefined, chunk.runtime)
 										);
 										if (used) {
 											if (otherUnused || used !== exportInfo.name) {

package/lib/node/NodeTargetPlugin.js

@@ -101,3 +101,4 @@ class NodeTargetPlugin {
 }
 
 module.exports = NodeTargetPlugin;
+module.exports.builtins = builtins;

package/lib/node/NodeWatchFileSystem.js

@@ -8,6 +8,7 @@
 const util = require("util");
 const Watchpack = require("watchpack");
 
+/** @typedef {InstanceType<import("watchpack")>} Watchpack */
 /** @typedef {import("watchpack").TimeInfoEntries} TimeInfoEntries */
 /** @typedef {import("watchpack").WatchOptions} WatchOptions */
 /** @typedef {import("../util/fs").InputFileSystem} InputFileSystem */
@@ -82,6 +83,41 @@ class NodeWatchFileSystem {
 			}
 			return { fileTimeInfoEntries, contextTimeInfoEntries };
 		};
+		const directoriesSet =
+			directories instanceof Set ? directories : new Set(directories);
+
+		// Watchpack reports a watched directory (a context dependency) in
+		// `changes` whenever its contents change, alongside the individual
+		// file events. The default `fs.purge(dir)` matches cache keys by
+		// prefix, so it would wipe the stat cache of every file inside the
+		// directory even though only file-level events actually invalidate
+		// file stats. For directories we explicitly watch, purge only the
+		// directory's own entry (`{ exact: true }`, enhanced-resolve >=
+		// 5.22.0); file-level events in the same aggregated batch still
+		// handle file stats and the parent readdir invalidation.
+		/**
+		 * @param {Changes | null | undefined} changes changes set
+		 * @param {Removals | null | undefined} removals removals set
+		 */
+		const purgeChanges = (changes, removals) => {
+			const fs = this.inputFileSystem;
+			if (!fs || !fs.purge) return;
+			if (changes) {
+				for (const item of changes) {
+					if (directoriesSet.has(item)) {
+						fs.purge(item, { exact: true });
+					} else {
+						fs.purge(item);
+					}
+				}
+			}
+			if (removals) {
+				for (const item of removals) {
+					fs.purge(item);
+				}
+			}
+		};
+
 		this.watcher.once(
 			"aggregated",
 			/**
@@ -94,15 +130,7 @@ class NodeWatchFileSystem {
 				/** @type {Watchpack} */
 				(this.watcher).pause();
 
-				const fs = this.inputFileSystem;
-				if (fs && fs.purge) {
-					for (const item of changes) {
-						fs.purge(item);
-					}
-					for (const item of removals) {
-						fs.purge(item);
-					}
-				}
+				purgeChanges(changes, removals);
 				const { fileTimeInfoEntries, contextTimeInfoEntries } = fetchTimeInfo();
 				callback(
 					null,
@@ -172,19 +200,7 @@ class NodeWatchFileSystem {
 			getInfo: () => {
 				const removals = this.watcher && this.watcher.aggregatedRemovals;
 				const changes = this.watcher && this.watcher.aggregatedChanges;
-				const fs = this.inputFileSystem;
-				if (fs && fs.purge) {
-					if (removals) {
-						for (const item of removals) {
-							fs.purge(item);
-						}
-					}
-					if (changes) {
-						for (const item of changes) {
-							fs.purge(item);
-						}
-					}
-				}
+				purgeChanges(changes, removals);
 				const { fileTimeInfoEntries, contextTimeInfoEntries } = fetchTimeInfo();
 				return {
 					changes,

package/lib/node/ReadFileChunkLoadingRuntimeModule.js

@@ -102,6 +102,11 @@ class ReadFileChunkLoadingRuntimeModule extends RuntimeModule {
 		const stateExpression = withHmr
 			? `${RuntimeGlobals.hmrRuntimeStatePrefix}_readFileVm`
 			: undefined;
+		const installedChunksObject = `{\n${Template.indent(
+			Array.from(initialChunkIds, (id) => `${JSON.stringify(id)}: 0`).join(
+				",\n"
+			)
+		)}\n}`;
 
 		return Template.asString([
 			withBaseURI
@@ -111,14 +116,10 @@ class ReadFileChunkLoadingRuntimeModule extends RuntimeModule {
 			"// object to store loaded chunks",
 			'// "0" means "already loaded", Promise means loading',
 			`var installedChunks = ${
-				stateExpression ? `${stateExpression} = ${stateExpression} || ` : ""
-			}{`,
-			Template.indent(
-				Array.from(initialChunkIds, (id) => `${JSON.stringify(id)}: 0`).join(
-					",\n"
-				)
-			),
-			"};",
+				stateExpression
+					? runtimeTemplate.assignOr(stateExpression, installedChunksObject)
+					: installedChunksObject
+			};`,
 			"",
 			withOnChunkLoad
 				? `${
@@ -237,7 +238,7 @@ class ReadFileChunkLoadingRuntimeModule extends RuntimeModule {
 										`if(${RuntimeGlobals.hasOwnProperty}(updatedModules, moduleId)) {`,
 										Template.indent([
 											"currentUpdate[moduleId] = updatedModules[moduleId];",
-											"if(updatedModulesList) updatedModulesList.push(moduleId);"
+											`${runtimeTemplate.optionalChaining("updatedModulesList", "push(moduleId)")};`
 										]),
 										"}"
 									]),

package/lib/node/RequireChunkLoadingRuntimeModule.js

@@ -103,6 +103,12 @@ class RequireChunkLoadingRuntimeModule extends RuntimeModule {
 			? `${RuntimeGlobals.hmrRuntimeStatePrefix}_require`
 			: undefined;
 
+		const cst = runtimeTemplate.renderConst();
+		const installedChunksObject = `{\n${Template.indent(
+			Array.from(initialChunkIds, (id) => `${JSON.stringify(id)}: 1`).join(
+				",\n"
+			)
+		)}\n}`;
 		return Template.asString([
 			withBaseURI
 				? this._generateBaseUri(chunk, rootOutputDir, runtimeTemplate)
@@ -110,15 +116,11 @@ class RequireChunkLoadingRuntimeModule extends RuntimeModule {
 			"",
 			"// object to store loaded chunks",
 			'// "1" means "loaded", otherwise not loaded yet',
-			`var installedChunks = ${
-				stateExpression ? `${stateExpression} = ${stateExpression} || ` : ""
-			}{`,
-			Template.indent(
-				Array.from(initialChunkIds, (id) => `${JSON.stringify(id)}: 1`).join(
-					",\n"
-				)
-			),
-			"};",
+			`${cst} installedChunks = ${
+				stateExpression
+					? runtimeTemplate.assignOr(stateExpression, installedChunksObject)
+					: installedChunksObject
+			};`,
 			"",
 			withOnChunkLoad
 				? `${
@@ -130,8 +132,8 @@ class RequireChunkLoadingRuntimeModule extends RuntimeModule {
 				: "// no on chunks loaded",
 			"",
 			withLoading || withExternalInstallChunk
-				? `var installChunk = ${runtimeTemplate.basicFunction("chunk", [
-						"var moreModules = chunk.modules, chunkIds = chunk.ids, runtime = chunk.runtime;",
+				? `${cst} installChunk = ${runtimeTemplate.basicFunction("chunk", [
+						`${cst} moreModules = chunk.modules, chunkIds = chunk.ids, runtime = chunk.runtime;`,
 						"for(var moduleId in moreModules) {",
 						Template.indent([
 							`if(${RuntimeGlobals.hasOwnProperty}(moreModules, moduleId)) {`,
@@ -164,7 +166,7 @@ class RequireChunkLoadingRuntimeModule extends RuntimeModule {
 											Template.indent([
 												// The require function loads and runs a chunk. When the chunk is being run,
 												// it can call __webpack_require__.C to directly complete installed.
-												`var installedChunk = require(${JSON.stringify(
+												`${cst} installedChunk = require(${JSON.stringify(
 													rootOutputDir
 												)} + ${
 													RuntimeGlobals.getChunkScriptFilename
@@ -194,17 +196,17 @@ class RequireChunkLoadingRuntimeModule extends RuntimeModule {
 				? Template.asString([
 						"function loadUpdateChunk(chunkId, updatedModulesList) {",
 						Template.indent([
-							`var update = require(${JSON.stringify(rootOutputDir)} + ${
+							`${cst} update = require(${JSON.stringify(rootOutputDir)} + ${
 								RuntimeGlobals.getChunkUpdateScriptFilename
 							}(chunkId));`,
-							"var updatedModules = update.modules;",
-							"var runtime = update.runtime;",
+							`${cst} updatedModules = update.modules;`,
+							`${cst} runtime = update.runtime;`,
 							"for(var moduleId in updatedModules) {",
 							Template.indent([
 								`if(${RuntimeGlobals.hasOwnProperty}(updatedModules, moduleId)) {`,
 								Template.indent([
 									"currentUpdate[moduleId] = updatedModules[moduleId];",
-									"if(updatedModulesList) updatedModulesList.push(moduleId);"
+									`${runtimeTemplate.optionalChaining("updatedModulesList", "push(moduleId)")};`
 								]),
 								"}"
 							]),