webpack 5.59.0 → 5.94.0

package/lib/node/NodeWatchFileSystem.js

@@ -5,15 +5,18 @@
 
 "use strict";
 
+const util = require("util");
 const Watchpack = require("watchpack");
 
 /** @typedef {import("../../declarations/WebpackOptions").WatchOptions} WatchOptions */
 /** @typedef {import("../FileSystemInfo").FileSystemInfoEntry} FileSystemInfoEntry */
-/** @typedef {import("../util/fs").WatchFileSystem} WatchFileSystem */
+/** @typedef {import("../util/fs").InputFileSystem} InputFileSystem */
 /** @typedef {import("../util/fs").WatchMethod} WatchMethod */
-/** @typedef {import("../util/fs").Watcher} Watcher */
 
 class NodeWatchFileSystem {
+	/**
+	 * @param {InputFileSystem} inputFileSystem input filesystem
+	 */
 	constructor(inputFileSystem) {
 		this.inputFileSystem = inputFileSystem;
 		this.watcherOptions = {
@@ -22,16 +25,7 @@ class NodeWatchFileSystem {
 		this.watcher = new Watchpack(this.watcherOptions);
 	}
 
-	/**
-	 * @param {Iterable<string>} files watched files
-	 * @param {Iterable<string>} directories watched directories
-	 * @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(string, number): void} callbackUndelayed callback when the first change was detected
-	 * @returns {Watcher} a watcher
-	 */
+	/** @type {WatchMethod} */
 	watch(
 		files,
 		directories,
@@ -68,19 +62,47 @@ class NodeWatchFileSystem {
 		if (callbackUndelayed) {
 			this.watcher.once("change", callbackUndelayed);
 		}
-		this.watcher.once("aggregated", (changes, removals) => {
-			if (this.inputFileSystem && this.inputFileSystem.purge) {
+
+		const fetchTimeInfo = () => {
+			const fileTimeInfoEntries = new Map();
+			const contextTimeInfoEntries = new Map();
+			if (this.watcher) {
+				this.watcher.collectTimeInfoEntries(
+					fileTimeInfoEntries,
+					contextTimeInfoEntries
+				);
+			}
+			return { fileTimeInfoEntries, contextTimeInfoEntries };
+		};
+		this.watcher.once(
+			"aggregated",
+			/**
+			 * @param {Set<string>} changes changes
+			 * @param {Set<string>} removals removals
+			 */
+			(changes, removals) => {
+				// pause emitting events (avoids clearing aggregated changes and removals on timeout)
+				this.watcher.pause();
+
 				const fs = this.inputFileSystem;
-				for (const item of changes) {
-					fs.purge(item);
-				}
-				for (const item of removals) {
-					fs.purge(item);
+				if (fs && fs.purge) {
+					for (const item of changes) {
+						fs.purge(item);
+					}
+					for (const item of removals) {
+						fs.purge(item);
+					}
 				}
+				const { fileTimeInfoEntries, contextTimeInfoEntries } = fetchTimeInfo();
+				callback(
+					null,
+					fileTimeInfoEntries,
+					contextTimeInfoEntries,
+					changes,
+					removals
+				);
 			}
-			const times = this.watcher.getTimeInfoEntries();
-			callback(null, times, times, changes, removals);
-		});
+		);
 
 		this.watcher.watch({ files, directories, missing, startTime });
 
@@ -99,39 +121,67 @@ class NodeWatchFileSystem {
 					this.watcher.pause();
 				}
 			},
-			getAggregatedRemovals: () => {
-				const items = this.watcher && this.watcher.aggregatedRemovals;
-				if (items && this.inputFileSystem && this.inputFileSystem.purge) {
+			getAggregatedRemovals: util.deprecate(
+				() => {
+					const items = this.watcher && this.watcher.aggregatedRemovals;
 					const fs = this.inputFileSystem;
-					for (const item of items) {
-						fs.purge(item);
+					if (items && fs && fs.purge) {
+						for (const item of items) {
+							fs.purge(item);
+						}
 					}
-				}
-				return items;
-			},
-			getAggregatedChanges: () => {
-				const items = this.watcher && this.watcher.aggregatedChanges;
-				if (items && this.inputFileSystem && this.inputFileSystem.purge) {
+					return items;
+				},
+				"Watcher.getAggregatedRemovals is deprecated in favor of Watcher.getInfo since that's more performant.",
+				"DEP_WEBPACK_WATCHER_GET_AGGREGATED_REMOVALS"
+			),
+			getAggregatedChanges: util.deprecate(
+				() => {
+					const items = this.watcher && this.watcher.aggregatedChanges;
 					const fs = this.inputFileSystem;
-					for (const item of items) {
-						fs.purge(item);
+					if (items && fs && fs.purge) {
+						for (const item of items) {
+							fs.purge(item);
+						}
+					}
+					return items;
+				},
+				"Watcher.getAggregatedChanges is deprecated in favor of Watcher.getInfo since that's more performant.",
+				"DEP_WEBPACK_WATCHER_GET_AGGREGATED_CHANGES"
+			),
+			getFileTimeInfoEntries: util.deprecate(
+				() => fetchTimeInfo().fileTimeInfoEntries,
+				"Watcher.getFileTimeInfoEntries is deprecated in favor of Watcher.getInfo since that's more performant.",
+				"DEP_WEBPACK_WATCHER_FILE_TIME_INFO_ENTRIES"
+			),
+			getContextTimeInfoEntries: util.deprecate(
+				() => fetchTimeInfo().contextTimeInfoEntries,
+				"Watcher.getContextTimeInfoEntries is deprecated in favor of Watcher.getInfo since that's more performant.",
+				"DEP_WEBPACK_WATCHER_CONTEXT_TIME_INFO_ENTRIES"
+			),
+			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);
+						}
 					}
 				}
-				return items;
-			},
-			getFileTimeInfoEntries: () => {
-				if (this.watcher) {
-					return this.watcher.getTimeInfoEntries();
-				} else {
-					return new Map();
-				}
-			},
-			getContextTimeInfoEntries: () => {
-				if (this.watcher) {
-					return this.watcher.getTimeInfoEntries();
-				} else {
-					return new Map();
-				}
+				const { fileTimeInfoEntries, contextTimeInfoEntries } = fetchTimeInfo();
+				return {
+					changes,
+					removals,
+					fileTimeInfoEntries,
+					contextTimeInfoEntries
+				};
 			}
 		};
 	}

package/lib/node/ReadFileChunkLoadingRuntimeModule.js

@@ -15,18 +15,47 @@ const { getInitialChunkIds } = require("../javascript/StartupHelpers");
 const compileBooleanMatcher = require("../util/compileBooleanMatcher");
 const { getUndoPath } = require("../util/identifier");
 
+/** @typedef {import("../Chunk")} Chunk */
+/** @typedef {import("../ChunkGraph")} ChunkGraph */
+/** @typedef {import("../Compilation")} Compilation */
+/** @typedef {import("../Module").ReadOnlyRuntimeRequirements} ReadOnlyRuntimeRequirements */
+
 class ReadFileChunkLoadingRuntimeModule extends RuntimeModule {
+	/**
+	 * @param {ReadOnlyRuntimeRequirements} runtimeRequirements runtime requirements
+	 */
 	constructor(runtimeRequirements) {
 		super("readFile chunk loading", RuntimeModule.STAGE_ATTACH);
 		this.runtimeRequirements = runtimeRequirements;
 	}
 
 	/**
-	 * @returns {string} runtime code
+	 * @private
+	 * @param {Chunk} chunk chunk
+	 * @param {string} rootOutputDir root output directory
+	 * @returns {string} generated code
+	 */
+	_generateBaseUri(chunk, rootOutputDir) {
+		const options = chunk.getEntryOptions();
+		if (options && options.baseUri) {
+			return `${RuntimeGlobals.baseURI} = ${JSON.stringify(options.baseUri)};`;
+		}
+
+		return `${RuntimeGlobals.baseURI} = require("url").pathToFileURL(${
+			rootOutputDir
+				? `__dirname + ${JSON.stringify(`/${rootOutputDir}`)}`
+				: "__filename"
+		});`;
+	}
+
+	/**
+	 * @returns {string | null} runtime code
 	 */
 	generate() {
-		const { chunkGraph, chunk } = this;
-		const { runtimeTemplate } = this.compilation;
+		const compilation = /** @type {Compilation} */ (this.compilation);
+		const chunkGraph = /** @type {ChunkGraph} */ (this.chunkGraph);
+		const chunk = /** @type {Chunk} */ (this.chunk);
+		const { runtimeTemplate } = compilation;
 		const fn = RuntimeGlobals.ensureChunkHandlers;
 		const withBaseURI = this.runtimeRequirements.has(RuntimeGlobals.baseURI);
 		const withExternalInstallChunk = this.runtimeRequirements.has(
@@ -46,10 +75,10 @@ class ReadFileChunkLoadingRuntimeModule extends RuntimeModule {
 		);
 		const conditionMap = chunkGraph.getChunkConditionMap(chunk, chunkHasJs);
 		const hasJsMatcher = compileBooleanMatcher(conditionMap);
-		const initialChunkIds = getInitialChunkIds(chunk, chunkGraph);
+		const initialChunkIds = getInitialChunkIds(chunk, chunkGraph, chunkHasJs);
 
-		const outputName = this.compilation.getPath(
-			getChunkFilenameTemplate(chunk, this.compilation.outputOptions),
+		const outputName = compilation.getPath(
+			getChunkFilenameTemplate(chunk, compilation.outputOptions),
 			{
 				chunk,
 				contentHashType: "javascript"
@@ -57,7 +86,7 @@ class ReadFileChunkLoadingRuntimeModule extends RuntimeModule {
 		);
 		const rootOutputDir = getUndoPath(
 			outputName,
-			this.compilation.outputOptions.path,
+			/** @type {string} */ (compilation.outputOptions.path),
 			false
 		);
 
@@ -67,13 +96,7 @@ class ReadFileChunkLoadingRuntimeModule extends RuntimeModule {
 
 		return Template.asString([
 			withBaseURI
-				? Template.asString([
-						`${RuntimeGlobals.baseURI} = require("url").pathToFileURL(${
-							rootOutputDir
-								? `__dirname + ${JSON.stringify("/" + rootOutputDir)}`
-								: "__filename"
-						});`
-				  ])
+				? this._generateBaseUri(chunk, rootOutputDir)
 				: "// no baseURI",
 			"",
 			"// object to store loaded chunks",
@@ -91,10 +114,10 @@ class ReadFileChunkLoadingRuntimeModule extends RuntimeModule {
 			withOnChunkLoad
 				? `${
 						RuntimeGlobals.onChunksLoaded
-				  }.readFileVm = ${runtimeTemplate.returningFunction(
+					}.readFileVm = ${runtimeTemplate.returningFunction(
 						"installedChunks[chunkId] === 0",
 						"chunkId"
-				  )};`
+					)};`
 				: "// no on chunks loaded",
 			"",
 			withLoading || withExternalInstallChunk
@@ -109,7 +132,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]]) {",
@@ -119,7 +142,7 @@ class ReadFileChunkLoadingRuntimeModule extends RuntimeModule {
 						]),
 						"}",
 						withOnChunkLoad ? `${RuntimeGlobals.onChunksLoaded}();` : ""
-				  ])};`
+					])};`
 				: "// no chunk install function needed",
 			"",
 			withLoading
@@ -163,22 +186,24 @@ class ReadFileChunkLoadingRuntimeModule extends RuntimeModule {
 												"});",
 												"promises.push(installedChunkData[2] = promise);"
 											]),
-											"} else installedChunks[chunkId] = 0;"
+											hasJsMatcher === true
+												? "}"
+												: "} else installedChunks[chunkId] = 0;"
 										]),
 										"}"
 									]),
 									"}"
-							  ])
+								])
 							: Template.indent(["installedChunks[chunkId] = 0;"]),
 						"};"
-				  ])
+					])
 				: "// no chunk loading",
 			"",
 			withExternalInstallChunk
 				? Template.asString([
-						"module.exports = __webpack_require__;",
+						`module.exports = ${RuntimeGlobals.require};`,
 						`${RuntimeGlobals.externalInstallChunk} = installChunk;`
-				  ])
+					])
 				: "// no external install chunk",
 			"",
 			withHmr
@@ -202,7 +227,7 @@ class ReadFileChunkLoadingRuntimeModule extends RuntimeModule {
 									Template.indent([
 										`if(${RuntimeGlobals.hasOwnProperty}(updatedModules, moduleId)) {`,
 										Template.indent([
-											`currentUpdate[moduleId] = updatedModules[moduleId];`,
+											"currentUpdate[moduleId] = updatedModules[moduleId];",
 											"if(updatedModulesList) updatedModulesList.push(moduleId);"
 										]),
 										"}"
@@ -239,7 +264,7 @@ class ReadFileChunkLoadingRuntimeModule extends RuntimeModule {
 								/\$hmrInvalidateModuleHandlers\$/g,
 								RuntimeGlobals.hmrInvalidateModuleHandlers
 							)
-				  ])
+					])
 				: "// no HMR",
 			"",
 			withHmrManifest
@@ -267,7 +292,7 @@ class ReadFileChunkLoadingRuntimeModule extends RuntimeModule {
 							"});"
 						]),
 						"}"
-				  ])
+					])
 				: "// no HMR manifest"
 		]);
 	}

package/lib/node/ReadFileCompileAsyncWasmPlugin.js

@@ -5,10 +5,12 @@
 
 "use strict";
 
+const { WEBASSEMBLY_MODULE_TYPE_ASYNC } = require("../ModuleTypeConstants");
 const RuntimeGlobals = require("../RuntimeGlobals");
 const Template = require("../Template");
 const AsyncWasmLoadingRuntimeModule = require("../wasm-async/AsyncWasmLoadingRuntimeModule");
 
+/** @typedef {import("../Chunk")} Chunk */
 /** @typedef {import("../Compiler")} Compiler */
 
 class ReadFileCompileAsyncWasmPlugin {
@@ -16,6 +18,7 @@ class ReadFileCompileAsyncWasmPlugin {
 		this._type = type;
 		this._import = useImport;
 	}
+
 	/**
 	 * Apply the plugin
 	 * @param {Compiler} compiler the compiler instance
@@ -26,6 +29,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 =
@@ -34,12 +41,16 @@ class ReadFileCompileAsyncWasmPlugin {
 							: globalWasmLoading;
 					return wasmLoading === this._type;
 				};
+				const { importMetaName } = compilation.outputOptions;
+				/**
+				 * @type {(path: string) => string}
+				 */
 				const generateLoadBinaryCode = this._import
 					? path =>
 							Template.asString([
 								"Promise.all([import('fs'), import('url')]).then(([{ readFile }, { URL }]) => new Promise((resolve, reject) => {",
 								Template.indent([
-									`readFile(new URL(${path}, import.meta.url), (err, buffer) => {`,
+									`readFile(new URL(${path}, ${importMetaName}.url), (err, buffer) => {`,
 									Template.indent([
 										"if (err) return reject(err);",
 										"",
@@ -85,7 +96,7 @@ class ReadFileCompileAsyncWasmPlugin {
 						if (
 							!chunkGraph.hasModuleInGraph(
 								chunk,
-								m => m.type === "webassembly/async"
+								m => m.type === WEBASSEMBLY_MODULE_TYPE_ASYNC
 							)
 						) {
 							return;

package/lib/node/ReadFileCompileWasmPlugin.js

@@ -5,17 +5,27 @@
 
 "use strict";
 
+const { WEBASSEMBLY_MODULE_TYPE_SYNC } = require("../ModuleTypeConstants");
 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;
 	}
 
 	/**
@@ -28,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 =
@@ -36,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) {",
@@ -69,7 +87,7 @@ class ReadFileCompileWasmPlugin {
 						if (
 							!chunkGraph.hasModuleInGraph(
 								chunk,
-								m => m.type === "webassembly/sync"
+								m => m.type === WEBASSEMBLY_MODULE_TYPE_SYNC
 							)
 						) {
 							return;

package/lib/node/RequireChunkLoadingRuntimeModule.js

@@ -15,18 +15,47 @@ const { getInitialChunkIds } = require("../javascript/StartupHelpers");
 const compileBooleanMatcher = require("../util/compileBooleanMatcher");
 const { getUndoPath } = require("../util/identifier");
 
+/** @typedef {import("../Chunk")} Chunk */
+/** @typedef {import("../ChunkGraph")} ChunkGraph */
+/** @typedef {import("../Compilation")} Compilation */
+/** @typedef {import("../Module").ReadOnlyRuntimeRequirements} ReadOnlyRuntimeRequirements */
+
 class RequireChunkLoadingRuntimeModule extends RuntimeModule {
+	/**
+	 * @param {ReadOnlyRuntimeRequirements} runtimeRequirements runtime requirements
+	 */
 	constructor(runtimeRequirements) {
 		super("require chunk loading", RuntimeModule.STAGE_ATTACH);
 		this.runtimeRequirements = runtimeRequirements;
 	}
 
 	/**
-	 * @returns {string} runtime code
+	 * @private
+	 * @param {Chunk} chunk chunk
+	 * @param {string} rootOutputDir root output directory
+	 * @returns {string} generated code
+	 */
+	_generateBaseUri(chunk, rootOutputDir) {
+		const options = chunk.getEntryOptions();
+		if (options && options.baseUri) {
+			return `${RuntimeGlobals.baseURI} = ${JSON.stringify(options.baseUri)};`;
+		}
+
+		return `${RuntimeGlobals.baseURI} = require("url").pathToFileURL(${
+			rootOutputDir !== "./"
+				? `__dirname + ${JSON.stringify(`/${rootOutputDir}`)}`
+				: "__filename"
+		});`;
+	}
+
+	/**
+	 * @returns {string | null} runtime code
 	 */
 	generate() {
-		const { chunkGraph, chunk } = this;
-		const { runtimeTemplate } = this.compilation;
+		const compilation = /** @type {Compilation} */ (this.compilation);
+		const chunkGraph = /** @type {ChunkGraph} */ (this.chunkGraph);
+		const chunk = /** @type {Chunk} */ (this.chunk);
+		const { runtimeTemplate } = compilation;
 		const fn = RuntimeGlobals.ensureChunkHandlers;
 		const withBaseURI = this.runtimeRequirements.has(RuntimeGlobals.baseURI);
 		const withExternalInstallChunk = this.runtimeRequirements.has(
@@ -46,10 +75,10 @@ class RequireChunkLoadingRuntimeModule extends RuntimeModule {
 		);
 		const conditionMap = chunkGraph.getChunkConditionMap(chunk, chunkHasJs);
 		const hasJsMatcher = compileBooleanMatcher(conditionMap);
-		const initialChunkIds = getInitialChunkIds(chunk, chunkGraph);
+		const initialChunkIds = getInitialChunkIds(chunk, chunkGraph, chunkHasJs);
 
-		const outputName = this.compilation.getPath(
-			getChunkFilenameTemplate(chunk, this.compilation.outputOptions),
+		const outputName = compilation.getPath(
+			getChunkFilenameTemplate(chunk, compilation.outputOptions),
 			{
 				chunk,
 				contentHashType: "javascript"
@@ -57,7 +86,7 @@ class RequireChunkLoadingRuntimeModule extends RuntimeModule {
 		);
 		const rootOutputDir = getUndoPath(
 			outputName,
-			this.compilation.outputOptions.path,
+			/** @type {string} */ (compilation.outputOptions.path),
 			true
 		);
 
@@ -67,13 +96,7 @@ class RequireChunkLoadingRuntimeModule extends RuntimeModule {
 
 		return Template.asString([
 			withBaseURI
-				? Template.asString([
-						`${RuntimeGlobals.baseURI} = require("url").pathToFileURL(${
-							rootOutputDir !== "./"
-								? `__dirname + ${JSON.stringify("/" + rootOutputDir)}`
-								: "__filename"
-						});`
-				  ])
+				? this._generateBaseUri(chunk, rootOutputDir)
 				: "// no baseURI",
 			"",
 			"// object to store loaded chunks",
@@ -91,10 +114,10 @@ class RequireChunkLoadingRuntimeModule extends RuntimeModule {
 			withOnChunkLoad
 				? `${
 						RuntimeGlobals.onChunksLoaded
-				  }.require = ${runtimeTemplate.returningFunction(
+					}.require = ${runtimeTemplate.returningFunction(
 						"installedChunks[chunkId]",
 						"chunkId"
-				  )};`
+					)};`
 				: "// no on chunks loaded",
 			"",
 			withLoading || withExternalInstallChunk
@@ -109,11 +132,11 @@ 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}();` : ""
-				  ])};`
+					])};`
 				: "// no chunk install function needed",
 			"",
 			withLoading
@@ -140,17 +163,17 @@ class RequireChunkLoadingRuntimeModule extends RuntimeModule {
 											""
 										]),
 										"}"
-								  ]
+									]
 								: "installedChunks[chunkId] = 1;"
 						)};`
-				  ])
+					])
 				: "// no chunk loading",
 			"",
 			withExternalInstallChunk
 				? Template.asString([
-						"module.exports = __webpack_require__;",
+						`module.exports = ${RuntimeGlobals.require};`,
 						`${RuntimeGlobals.externalInstallChunk} = installChunk;`
-				  ])
+					])
 				: "// no external install chunk",
 			"",
 			withHmr
@@ -166,7 +189,7 @@ class RequireChunkLoadingRuntimeModule extends RuntimeModule {
 							Template.indent([
 								`if(${RuntimeGlobals.hasOwnProperty}(updatedModules, moduleId)) {`,
 								Template.indent([
-									`currentUpdate[moduleId] = updatedModules[moduleId];`,
+									"currentUpdate[moduleId] = updatedModules[moduleId];",
 									"if(updatedModulesList) updatedModulesList.push(moduleId);"
 								]),
 								"}"
@@ -198,7 +221,7 @@ class RequireChunkLoadingRuntimeModule extends RuntimeModule {
 								/\$hmrInvalidateModuleHandlers\$/g,
 								RuntimeGlobals.hmrInvalidateModuleHandlers
 							)
-				  ])
+					])
 				: "// no HMR",
 			"",
 			withHmrManifest
@@ -211,10 +234,10 @@ class RequireChunkLoadingRuntimeModule extends RuntimeModule {
 									RuntimeGlobals.getUpdateManifestFilename
 								}());`
 							]),
-							'}).catch(function(err) { if(err.code !== "MODULE_NOT_FOUND") throw err; });'
+							"})['catch'](function(err) { if(err.code !== 'MODULE_NOT_FOUND') throw err; });"
 						]),
 						"}"
-				  ])
+					])
 				: "// no HMR manifest"
 		]);
 	}