webpack 5.107.1 → 5.108.0

package/lib/Compiler.js

@@ -28,7 +28,10 @@ const ConcurrentCompilationError = require("./errors/ConcurrentCompilationError"
 const WebpackError = require("./errors/WebpackError");
 const { Logger } = require("./logging/Logger");
 const { dirname, join, mkdirp } = require("./util/fs");
-const { makePathsRelative } = require("./util/identifier");
+const {
+	WINDOWS_ABS_PATH_REGEXP,
+	makePathsRelative
+} = require("./util/identifier");
 const memoize = require("./util/memoize");
 const parseJson = require("./util/parseJson");
 const { isSourceEqual } = require("./util/source");
@@ -312,21 +315,28 @@ class Compiler {
 			browser: null,
 			webworker: null,
 			node: null,
+			deno: null,
+			bun: null,
 			nwjs: null,
-			electron: null
+			electron: null,
+			universal: null
 		};
 
 		this.options = options;
 
+		/** @type {string} */
 		this.context = context;
 
+		/** @type {RequestShortener} */
 		this.requestShortener = new RequestShortener(context, this.root);
 
+		/** @type {Cache} */
 		this.cache = new Cache();
 
 		/** @type {Map<Module, ModuleMemCachesItem> | undefined} */
 		this.moduleMemCaches = undefined;
 
+		/** @type {string} */
 		this.compilerPath = "";
 
 		/** @type {boolean} */
@@ -338,6 +348,7 @@ class Compiler {
 		/** @type {boolean} */
 		this.watchMode = false;
 
+		/** @type {boolean} */
 		this._backCompat = this.options.experiments.backCompat !== false;
 
 		/** @type {Compilation | undefined} */
@@ -491,6 +502,25 @@ class Compiler {
 		}
 	}
 
+	/**
+	 * Release fields on a finished compilation that nothing reads after emit,
+	 * so the heap can shrink while user code still holds the Stats reference.
+	 * Recurses into child compilations. Stats output is preserved — only
+	 * codeGen byproducts are dropped.
+	 * @param {Compilation} compilation finished compilation to slim down
+	 * @returns {void}
+	 */
+	_releaseUnusedCompilationData(compilation) {
+		for (const child of compilation.children) {
+			this._releaseUnusedCompilationData(child);
+		}
+		// Rendered source per (module × runtime) — used only during seal/emit,
+		// never read by Stats, and not serialized to the persistent cache.
+		if (compilation.codeGenerationResults !== undefined) {
+			compilation.codeGenerationResults.map.clear();
+		}
+	}
+
 	/**
 	 * Returns a compiler watcher.
 	 * @param {WatchOptions} watchOptions the watcher's options
@@ -759,6 +789,14 @@ class Compiler {
 								includesHash(targetFile, info.fullhash));
 					}
 
+					const fs = /** @type {OutputFileSystem} */ (this.outputFileSystem);
+					// A Windows drive-absolute targetFile is written as-is; joining it onto
+					// outputPath would produce an invalid path (e.g. C:\out\D:\file). A
+					// leading "/" stays relative to outputPath (e.g. entry name "/dir/x").
+					const targetPath = WINDOWS_ABS_PATH_REGEXP.test(targetFile)
+						? targetFile
+						: join(fs, outputPath, targetFile);
+
 					/**
 					 * Processes the provided err.
 					 * @param {Error=} err error
@@ -766,12 +804,6 @@ class Compiler {
 					 */
 					const writeOut = (err) => {
 						if (err) return callback(err);
-						const targetPath = join(
-							/** @type {OutputFileSystem} */
-							(this.outputFileSystem),
-							outputPath,
-							targetFile
-						);
 						allTargetPaths.add(targetPath);
 
 						// check if the target file has already been written by this Compiler
@@ -1037,8 +1069,7 @@ ${other}`);
 					};
 
 					if (/\/|\\/.test(targetFile)) {
-						const fs = /** @type {OutputFileSystem} */ (this.outputFileSystem);
-						const dir = dirname(fs, join(fs, outputPath, targetFile));
+						const dir = dirname(fs, targetPath);
 						mkdirp(fs, dir, writeOut);
 					} else {
 						writeOut();
@@ -1206,7 +1237,9 @@ ${other}`);
 					} catch (parseErr) {
 						return callback(
 							new Error(
-								`Cannot parse records: ${/** @type {Error} */ (parseErr).message}`
+								`Cannot parse records: ${
+									/** @type {Error} */ (parseErr).message
+								}`
 							)
 						);
 					}
@@ -1439,9 +1472,14 @@ ${other}`);
 		}
 		this.hooks.shutdown.callAsync((err) => {
 			if (err) return callback(err);
-			// Get rid of reference to last compilation to avoid leaking memory
-			// We can't run this._cleanupLastCompilation() as the Stats to this compilation
-			// might be still in use. We try to get rid of the reference to the cache instead.
+			// Defer a microtask so a close() made inside the run callback can't
+			// release codeGenerationResults before afterDone fires on the same stack.
+			const lastCompilation = this._lastCompilation;
+			if (lastCompilation !== undefined) {
+				Promise.resolve().then(() => {
+					this._releaseUnusedCompilationData(lastCompilation);
+				});
+			}
 			this._lastCompilation = undefined;
 			this._lastNormalModuleFactory = undefined;
 			this.cache.shutdown(callback);

package/lib/ConcatenationScope.js

@@ -17,7 +17,7 @@ const {
 /** @typedef {import("./optimize/ConcatenatedModule").ExportName} Ids */
 
 const MODULE_REFERENCE_REGEXP =
-	/^__WEBPACK_MODULE_REFERENCE__(\d+)_([\da-f]+|ns)(_call)?(_directImport)?(_deferredImport)?(?:_asiSafe(\d))?__$/;
+	/^__WEBPACK_MODULE_REFERENCE__(\d+)_([\da-f]+|ns)(_call)?(_directImport)?(_deferredImport)?(_mangleableNs)?(?:_asiSafe(\d))?__$/;
 
 /**
  * Encodes how a concatenated module reference should be interpreted when it is
@@ -27,6 +27,7 @@ const MODULE_REFERENCE_REGEXP =
  * @property {boolean} call true, when this referenced export is called
  * @property {boolean} directImport true, when this referenced export is directly imported (not via property access)
  * @property {boolean} deferredImport true, when this referenced export is deferred
+ * @property {boolean} mangleableNamespace true, when a whole-namespace reference may use a decoupled namespace object that keeps the original export names
  * @property {boolean | undefined} asiSafe if the position is ASI safe or unknown
  */
 
@@ -43,6 +44,7 @@ class ConcatenationScope {
 	 * @param {Set<string>} usedNames all used names
 	 */
 	constructor(modulesMap, currentModule, usedNames) {
+		/** @type {ConcatenatedModuleInfo} */
 		this._currentModule = currentModule;
 		if (Array.isArray(modulesMap)) {
 			/** @type {Map<Module, ConcatenatedModuleInfo>} */
@@ -52,7 +54,9 @@ class ConcatenationScope {
 			}
 			modulesMap = map;
 		}
+		/** @type {Set<string>} */
 		this.usedNames = usedNames;
+		/** @type {Map<Module, ModuleInfo>} */
 		this._modulesMap = modulesMap;
 	}
 
@@ -144,6 +148,7 @@ class ConcatenationScope {
 			call = false,
 			directImport = false,
 			deferredImport = false,
+			mangleableNamespace = false,
 			asiSafe = false
 		}
 	) {
@@ -151,6 +156,7 @@ class ConcatenationScope {
 		const callFlag = call ? "_call" : "";
 		const directImportFlag = directImport ? "_directImport" : "";
 		const deferredImportFlag = deferredImport ? "_deferredImport" : "";
+		const mangleableNamespaceFlag = mangleableNamespace ? "_mangleableNs" : "";
 		const asiSafeFlag = asiSafe
 			? "_asiSafe1"
 			: asiSafe === false
@@ -160,7 +166,7 @@ class ConcatenationScope {
 			? Buffer.from(JSON.stringify(ids), "utf8").toString("hex")
 			: "ns";
 		// a "._" is appended to allow "delete ...", which would cause a SyntaxError in strict mode
-		return `__WEBPACK_MODULE_REFERENCE__${info.index}_${exportData}${callFlag}${directImportFlag}${deferredImportFlag}${asiSafeFlag}__._`;
+		return `__WEBPACK_MODULE_REFERENCE__${info.index}_${exportData}${callFlag}${directImportFlag}${deferredImportFlag}${mangleableNamespaceFlag}${asiSafeFlag}__._`;
 	}
 
 	/**
@@ -183,7 +189,7 @@ class ConcatenationScope {
 		const match = MODULE_REFERENCE_REGEXP.exec(name);
 		if (!match) return null;
 		const index = Number(match[1]);
-		const asiSafe = match[6];
+		const asiSafe = match[7];
 		return {
 			index,
 			ids:
@@ -193,6 +199,7 @@ class ConcatenationScope {
 			call: Boolean(match[3]),
 			directImport: Boolean(match[4]),
 			deferredImport: Boolean(match[5]),
+			mangleableNamespace: Boolean(match[6]),
 			asiSafe: asiSafe ? asiSafe === "1" : undefined
 		};
 	}

package/lib/ContextExclusionPlugin.js

@@ -14,6 +14,7 @@ class ContextExclusionPlugin {
 	 * @param {RegExp} negativeMatcher Matcher regular expression
 	 */
 	constructor(negativeMatcher) {
+		/** @type {RegExp} */
 		this.negativeMatcher = negativeMatcher;
 	}
 

package/lib/ContextModule.js

@@ -48,6 +48,7 @@ const makeSerializable = require("./util/makeSerializable");
 /** @typedef {import("./Dependency")} Dependency */
 /** @typedef {import("./Dependency").RawReferencedExports} RawReferencedExports */
 /** @typedef {import("./Generator").SourceTypes} SourceTypes */
+/** @typedef {import("./FileSystemInfo").Snapshot} Snapshot */
 /** @typedef {import("./Module").BuildCallback} BuildCallback */
 /** @typedef {import("./Module").BuildInfo} BuildInfo */
 /** @typedef {import("./Module").FileSystemDependencies} FileSystemDependencies */
@@ -65,8 +66,8 @@ const makeSerializable = require("./util/makeSerializable");
 /** @typedef {import("./RuntimeTemplate")} RuntimeTemplate */
 /** @typedef {import("./dependencies/ContextElementDependency")} ContextElementDependency */
 /** @typedef {import("./javascript/JavascriptParser").ImportAttributes} ImportAttributes */
-/** @typedef {import("./serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("./serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
+/** @typedef {import("./serialization/ObjectMiddleware").ObjectDeserializerContext<[string, boolean]>} ObjectDeserializerContext */
+/** @typedef {import("./serialization/ObjectMiddleware").ObjectSerializerContext<[string, boolean]>} ObjectSerializerContext */
 /** @typedef {import("./util/fs").InputFileSystem} InputFileSystem */
 /** @typedef {import("./dependencies/ImportPhase").ImportPhaseType} ImportPhaseType */
 
@@ -121,6 +122,14 @@ const makeSerializable = require("./util/makeSerializable");
 /** @typedef {Record<string, ModuleId>} UserRequestMap */
 /** @typedef {Record<ModuleId, ModuleId[]>} UserRequestsMap */
 
+/**
+ * Defines the build info properties specific to context modules.
+ * @typedef {object} KnownContextModuleBuildInfo
+ * @property {(Snapshot | null)=} snapshot
+ */
+
+/** @typedef {BuildInfo & KnownContextModuleBuildInfo} ContextModuleBuildInfo */
+
 class ContextModule extends Module {
 	/**
 	 * @param {ResolveDependencies} resolveDependencies function to get dependencies in this context
@@ -156,10 +165,15 @@ class ContextModule extends Module {
 			};
 		}
 
+		// Redeclared with the context module specific shape
+		/** @type {ContextModuleBuildInfo | undefined} */
+		this.buildInfo = undefined;
+
 		// Info from Factory
 		/** @type {ResolveDependencies | undefined} */
 		this.resolveDependencies = resolveDependencies;
 		if (options && options.resolveOptions !== undefined) {
+			/** @type {ResolveOptions | undefined} */
 			this.resolveOptions = options.resolveOptions;
 		}
 
@@ -167,7 +181,9 @@ class ContextModule extends Module {
 			throw new Error("options.mode is a required option");
 		}
 
+		/** @type {string} */
 		this._identifier = this._createIdentifier();
+		/** @type {boolean} */
 		this._forceBuild = true;
 	}
 
@@ -436,7 +452,7 @@ class ContextModule extends Module {
 		// build if enforced
 		if (this._forceBuild) return callback(null, true);
 
-		const buildInfo = /** @type {BuildInfo} */ (this.buildInfo);
+		const buildInfo = /** @type {ContextModuleBuildInfo} */ (this.buildInfo);
 
 		// always build when we have no snapshot and context
 		if (!buildInfo.snapshot) {
@@ -464,9 +480,18 @@ class ContextModule extends Module {
 			exportsType: "default",
 			defaultObject: "redirect-warn"
 		};
+
+		// Respect the global module parser `overrideStrict` option
+		const overrideStrict =
+			options.module.parser &&
+			options.module.parser.javascript &&
+			options.module.parser.javascript.overrideStrict;
+
 		this.buildInfo = {
+			strict: overrideStrict ? overrideStrict === "strict" : undefined,
 			snapshot: undefined
 		};
+
 		this.dependencies.length = 0;
 		this.blocks.length = 0;
 		const startTime = Date.now();
@@ -709,11 +734,13 @@ class ContextModule extends Module {
 
 	/**
 	 * @param {FakeMap | FakeMapType} fakeMap fake map
+	 * @param {RuntimeTemplate=} runtimeTemplate the runtime template
 	 * @returns {string} fake map init statement
 	 */
-	getFakeMapInitStatement(fakeMap) {
+	getFakeMapInitStatement(fakeMap, runtimeTemplate) {
+		const decl = runtimeTemplate ? runtimeTemplate.renderConst() : "var";
 		return typeof fakeMap === "object"
-			? `var fakeMap = ${JSON.stringify(fakeMap, null, "\t")};`
+			? `${decl} fakeMap = ${JSON.stringify(fakeMap, null, "\t")};`
 			: "";
 	}
 
@@ -751,11 +778,13 @@ class ContextModule extends Module {
 
 	/**
 	 * @param {false | UserRequestsMap} asyncDepsMap fake map
+	 * @param {RuntimeTemplate=} runtimeTemplate the runtime template
 	 * @returns {string} async deps map init statement
 	 */
-	getModuleDeferredAsyncDepsMapInitStatement(asyncDepsMap) {
+	getModuleDeferredAsyncDepsMapInitStatement(asyncDepsMap, runtimeTemplate) {
+		const decl = runtimeTemplate ? runtimeTemplate.renderConst() : "var";
 		return typeof asyncDepsMap === "object"
-			? `var asyncDepsMap = ${JSON.stringify(asyncDepsMap, null, "\t")};`
+			? `${decl} asyncDepsMap = ${JSON.stringify(asyncDepsMap, null, "\t")};`
 			: "";
 	}
 
@@ -805,23 +834,25 @@ class ContextModule extends Module {
 	 * @param {Dependency[]} dependencies dependencies
 	 * @param {ModuleId} id module id
 	 * @param {ChunkGraph} chunkGraph the chunk graph
+	 * @param {RuntimeTemplate=} runtimeTemplate the runtime template
 	 * @returns {string} source code
 	 */
-	getSyncSource(dependencies, id, chunkGraph) {
+	getSyncSource(dependencies, id, chunkGraph, runtimeTemplate) {
 		const map = this.getUserRequestMap(dependencies, chunkGraph);
 		const fakeMap = this.getFakeMap(dependencies, chunkGraph);
 		const returnModuleObject = this.getReturnModuleObjectSource(fakeMap);
+		const cst = runtimeTemplate ? runtimeTemplate.renderConst() : "var";
 
-		return `var map = ${JSON.stringify(map, null, "\t")};
-${this.getFakeMapInitStatement(fakeMap)}
+		return `${cst} map = ${JSON.stringify(map, null, "\t")};
+${this.getFakeMapInitStatement(fakeMap, runtimeTemplate)}
 
 function webpackContext(req) {
-	var id = webpackContextResolve(req);
+	${cst} id = webpackContextResolve(req);
 	return ${returnModuleObject};
 }
 function webpackContextResolve(req) {
 	if(!${RuntimeGlobals.hasOwnProperty}(map, req)) {
-		var e = new Error("Cannot find module '" + req + "'");
+		${cst} e = new Error("Cannot find module '" + req + "'");
 		e.code = 'MODULE_NOT_FOUND';
 		throw e;
 	}
@@ -839,20 +870,22 @@ webpackContext.id = ${JSON.stringify(id)};`;
 	 * @param {Dependency[]} dependencies dependencies
 	 * @param {ModuleId} id module id
 	 * @param {ChunkGraph} chunkGraph the chunk graph
+	 * @param {RuntimeTemplate=} runtimeTemplate the runtime template
 	 * @returns {string} source code
 	 */
-	getWeakSyncSource(dependencies, id, chunkGraph) {
+	getWeakSyncSource(dependencies, id, chunkGraph, runtimeTemplate) {
 		const map = this.getUserRequestMap(dependencies, chunkGraph);
 		const fakeMap = this.getFakeMap(dependencies, chunkGraph);
 		const returnModuleObject = this.getReturnModuleObjectSource(fakeMap);
+		const cst = runtimeTemplate ? runtimeTemplate.renderConst() : "var";
 
-		return `var map = ${JSON.stringify(map, null, "\t")};
-${this.getFakeMapInitStatement(fakeMap)}
+		return `${cst} map = ${JSON.stringify(map, null, "\t")};
+${this.getFakeMapInitStatement(fakeMap, runtimeTemplate)}
 
 function webpackContext(req) {
-	var id = webpackContextResolve(req);
+	${cst} id = webpackContextResolve(req);
 	if(!${RuntimeGlobals.moduleFactories}[id]) {
-		var e = new Error("Module '" + req + "' ('" + id + "') is not available (weak dependency)");
+		${cst} e = new Error("Module '" + req + "' ('" + id + "') is not available (weak dependency)");
 		e.code = 'MODULE_NOT_FOUND';
 		throw e;
 	}
@@ -860,7 +893,7 @@ function webpackContext(req) {
 }
 function webpackContextResolve(req) {
 	if(!${RuntimeGlobals.hasOwnProperty}(map, req)) {
-		var e = new Error("Cannot find module '" + req + "'");
+		${cst} e = new Error("Cannot find module '" + req + "'");
 		e.code = 'MODULE_NOT_FOUND';
 		throw e;
 	}
@@ -894,10 +927,11 @@ module.exports = webpackContext;`;
 			true,
 			asyncDepsMap ? "asyncDepsMap[id]" : undefined
 		);
+		const cst = runtimeTemplate.renderConst();
 
-		return `var map = ${JSON.stringify(map, null, "\t")};
-${this.getFakeMapInitStatement(fakeMap)}
-${this.getModuleDeferredAsyncDepsMapInitStatement(asyncDepsMap)}
+		return `${cst} map = ${JSON.stringify(map, null, "\t")};
+${this.getFakeMapInitStatement(fakeMap, runtimeTemplate)}
+${this.getModuleDeferredAsyncDepsMapInitStatement(asyncDepsMap, runtimeTemplate)}
 
 function webpackAsyncContext(req) {
 	return webpackAsyncContextResolve(req).then(${runtimeTemplate.basicFunction(
@@ -905,7 +939,7 @@ function webpackAsyncContext(req) {
 		[
 			`if(!${RuntimeGlobals.moduleFactories}[id]) {`,
 			Template.indent([
-				'var e = new Error("Module \'" + req + "\' (\'" + id + "\') is not available (weak dependency)");',
+				`${cst} e = new Error("Module '" + req + "' ('" + id + "') is not available (weak dependency)");`,
 				"e.code = 'MODULE_NOT_FOUND';",
 				"throw e;"
 			]),
@@ -920,7 +954,7 @@ function webpackAsyncContextResolve(req) {
 	return Promise.resolve().then(${runtimeTemplate.basicFunction("", [
 		`if(!${RuntimeGlobals.hasOwnProperty}(map, req)) {`,
 		Template.indent([
-			'var e = new Error("Cannot find module \'" + req + "\'");',
+			`${cst} e = new Error("Cannot find module '" + req + "'");`,
 			"e.code = 'MODULE_NOT_FOUND';",
 			"throw e;"
 		]),
@@ -960,9 +994,10 @@ module.exports = webpackAsyncContext;`;
 			"id"
 		);
 
-		return `var map = ${JSON.stringify(map, null, "\t")};
-${this.getFakeMapInitStatement(fakeMap)}
-${this.getModuleDeferredAsyncDepsMapInitStatement(asyncDepsMap)}
+		const cst = runtimeTemplate.renderConst();
+		return `${cst} map = ${JSON.stringify(map, null, "\t")};
+${this.getFakeMapInitStatement(fakeMap, runtimeTemplate)}
+${this.getModuleDeferredAsyncDepsMapInitStatement(asyncDepsMap, runtimeTemplate)}
 
 function webpackAsyncContext(req) {
 	return webpackAsyncContextResolve(req).then(${thenFunction});
@@ -973,7 +1008,7 @@ function webpackAsyncContextResolve(req) {
 	return Promise.resolve().then(${runtimeTemplate.basicFunction("", [
 		`if(!${RuntimeGlobals.hasOwnProperty}(map, req)) {`,
 		Template.indent([
-			'var e = new Error("Cannot find module \'" + req + "\'");',
+			`${cst} e = new Error("Cannot find module '" + req + "'");`,
 			"e.code = 'MODULE_NOT_FOUND';",
 			"throw e;"
 		]),
@@ -1027,9 +1062,10 @@ module.exports = webpackAsyncContext;`;
 			"id"
 		);
 
-		return `var map = ${JSON.stringify(map, null, "\t")};
-${this.getFakeMapInitStatement(fakeMap)}
-${this.getModuleDeferredAsyncDepsMapInitStatement(asyncDepsMap)}
+		const cst = runtimeTemplate.renderConst();
+		return `${cst} map = ${JSON.stringify(map, null, "\t")};
+${this.getFakeMapInitStatement(fakeMap, runtimeTemplate)}
+${this.getModuleDeferredAsyncDepsMapInitStatement(asyncDepsMap, runtimeTemplate)}
 
 function webpackAsyncContext(req) {
 	return webpackAsyncContextResolve(req).then(${thenFunction});
@@ -1038,7 +1074,7 @@ function webpackAsyncContextResolve(req) {
 	return ${promise}.then(${runtimeTemplate.basicFunction("", [
 		`if(!${RuntimeGlobals.hasOwnProperty}(map, req)) {`,
 		Template.indent([
-			'var e = new Error("Cannot find module \'" + req + "\'");',
+			`${cst} e = new Error("Cannot find module '" + req + "'");`,
 			"e.code = 'MODULE_NOT_FOUND';",
 			"throw e;"
 		]),
@@ -1161,6 +1197,7 @@ module.exports = webpackAsyncContext;`;
 			shortMode ? "invalid" : "ids[1]"
 		);
 
+		const cst = runtimeTemplate.renderConst();
 		const webpackAsyncContext =
 			requestPrefix === "Promise.resolve()"
 				? `
@@ -1168,12 +1205,12 @@ function webpackAsyncContext(req) {
 	return Promise.resolve().then(${runtimeTemplate.basicFunction("", [
 		`if(!${RuntimeGlobals.hasOwnProperty}(map, req)) {`,
 		Template.indent([
-			'var e = new Error("Cannot find module \'" + req + "\'");',
+			`${cst} e = new Error("Cannot find module '" + req + "'");`,
 			"e.code = 'MODULE_NOT_FOUND';",
 			"throw e;"
 		]),
 		"}",
-		shortMode ? "var id = map[req];" : "var ids = map[req], id = ids[0];",
+		shortMode ? `${cst} id = map[req];` : `${cst} ids = map[req], id = ids[0];`,
 		`return ${returnModuleObject};`
 	])});
 }`
@@ -1181,7 +1218,7 @@ function webpackAsyncContext(req) {
 	try {
 		if(!${RuntimeGlobals.hasOwnProperty}(map, req)) {
 			return Promise.resolve().then(${runtimeTemplate.basicFunction("", [
-				'var e = new Error("Cannot find module \'" + req + "\'");',
+				`${cst} e = new Error("Cannot find module '" + req + "'");`,
 				"e.code = 'MODULE_NOT_FOUND';",
 				"throw e;"
 			])});
@@ -1190,11 +1227,11 @@ function webpackAsyncContext(req) {
 		return Promise.reject(err);
 	}
 
-	var ids = map[req], id = ids[0];
+	${cst} ids = map[req], id = ids[0];
 	return ${requestPrefix}.then(${runtimeTemplate.returningFunction(returnModuleObject)});
 }`;
 
-		return `var map = ${JSON.stringify(map, null, "\t")};
+		return `${cst} map = ${JSON.stringify(map, null, "\t")};
 ${webpackAsyncContext}
 webpackAsyncContext.keys = ${runtimeTemplate.returningFunction(
 			"Object.keys(map)"
@@ -1210,7 +1247,7 @@ module.exports = webpackAsyncContext;`;
 	 */
 	getSourceForEmptyContext(id, runtimeTemplate) {
 		return `function webpackEmptyContext(req) {
-	var e = new Error("Cannot find module '" + req + "'");
+	${runtimeTemplate.renderConst()} e = new Error("Cannot find module '" + req + "'");
 	e.code = 'MODULE_NOT_FOUND';
 	throw e;
 }
@@ -1230,7 +1267,7 @@ module.exports = webpackEmptyContext;`;
 	// Here Promise.resolve().then() is used instead of new Promise() to prevent
 	// uncaught exception popping up in devtools
 	return Promise.resolve().then(${runtimeTemplate.basicFunction("", [
-		'var e = new Error("Cannot find module \'" + req + "\'");',
+		`${runtimeTemplate.renderConst()} e = new Error("Cannot find module '" + req + "'");`,
 		"e.code = 'MODULE_NOT_FOUND';",
 		"throw e;"
 	])});
@@ -1291,10 +1328,20 @@ module.exports = webpackEmptyAsyncContext;`;
 			this.dependencies &&
 			this.dependencies.length > 0
 		) {
-			return this.getWeakSyncSource(this.dependencies, id, chunkGraph);
+			return this.getWeakSyncSource(
+				this.dependencies,
+				id,
+				chunkGraph,
+				runtimeTemplate
+			);
 		}
 		if (this.dependencies && this.dependencies.length > 0) {
-			return this.getSyncSource(this.dependencies, id, chunkGraph);
+			return this.getSyncSource(
+				this.dependencies,
+				id,
+				chunkGraph,
+				runtimeTemplate
+			);
 		}
 		return this.getSourceForEmptyContext(id, runtimeTemplate);
 	}
@@ -1400,9 +1447,7 @@ module.exports = webpackEmptyAsyncContext;`;
 	 * @param {ObjectSerializerContext} context context
 	 */
 	serialize(context) {
-		const { write } = context;
-		write(this._identifier);
-		write(this._forceBuild);
+		context.write(this._identifier).write(this._forceBuild);
 		super.serialize(context);
 	}
 
@@ -1411,10 +1456,10 @@ module.exports = webpackEmptyAsyncContext;`;
 	 * @param {ObjectDeserializerContext} context context
 	 */
 	deserialize(context) {
-		const { read } = context;
-		this._identifier = read();
-		this._forceBuild = read();
-		super.deserialize(context);
+		this._identifier = context.read();
+		const c1 = context.rest;
+		this._forceBuild = c1.read();
+		super.deserialize(c1.rest);
 	}
 }