webpack 5.107.1 → 5.108.0

package/lib/config/target.js

@@ -28,8 +28,11 @@ const getDefaultTarget = (context) => {
  * @property {boolean | null=} browser browser platform, running in a normal web browser
  * @property {boolean | null=} webworker (Web)Worker platform, running in a web/shared/service worker
  * @property {boolean | null=} node node platform, require of node built-in modules is available
+ * @property {boolean | null=} deno deno platform, node built-in modules (via the `node:` specifier) and web APIs are available
+ * @property {boolean | null=} bun bun platform, bun and node built-in modules are available
  * @property {boolean | null=} nwjs nwjs platform, require of legacy nw.gui is available
  * @property {boolean | null=} electron electron platform, require of some electron built-in modules is available
+ * @property {boolean | null=} universal universal ESM target spanning both web and node (target `"universal"` or `["web", "node"]`)
  */
 
 /**
@@ -46,6 +49,7 @@ const getDefaultTarget = (context) => {
  * @property {boolean | null} require has require function available
  * @property {boolean | null} nodeBuiltins has node.js built-in modules available
  * @property {boolean | null} nodePrefixForCoreModules node.js allows to use `node:` prefix for core modules
+ * @property {boolean | null} nodeBuiltinModuleGetter node.js exposes `process.getBuiltinModule()` to synchronously load core modules
  * @property {boolean | null} importMetaDirnameAndFilename node.js allows to use `import.meta.dirname` and `import.meta.filename`
  * @property {boolean | null} document has document available (allows script tags)
  * @property {boolean | null} importScripts has importScripts available
@@ -58,8 +62,12 @@ const getDefaultTarget = (context) => {
  * Defines the ecma target properties type used by this module.
  * @typedef {object} EcmaTargetProperties
  * @property {boolean | null} globalThis has globalThis variable available
+ * @property {boolean | null} symbol `Symbol` is available
+ * @property {boolean | null} hasOwn `Object.hasOwn` is available
  * @property {boolean | null} bigIntLiteral big int literal syntax is available
- * @property {boolean | null} const const and let variable declarations are available
+ * @property {boolean | null} const const variable declarations are available
+ * @property {boolean | null} let let variable declarations are available
+ * @property {boolean | null} logicalAssignment logical assignment operators (`||=`, `&&=`, `??=`) are available
  * @property {boolean | null} methodShorthand object method shorthand is available
  * @property {boolean | null} arrowFunction arrow functions are available
  * @property {boolean | null} forOf for of iteration is available
@@ -68,6 +76,7 @@ const getDefaultTarget = (context) => {
  * @property {boolean | null} dynamicImportInWorker async import() is available when creating a worker
  * @property {boolean | null} module ESM syntax is available (when in module)
  * @property {boolean | null} optionalChaining optional chaining is available
+ * @property {boolean | null} spread spread and rest in array/object literals and calls is available
  * @property {boolean | null} templateLiteral template literal is available
  * @property {boolean | null} asyncFunction async functions and await are available
  */
@@ -133,6 +142,8 @@ You can also more options via the 'target' option: 'browserslist' / 'browserslis
 		/^web$/,
 		() => ({
 			node: false,
+			deno: false,
+			bun: false,
 			web: true,
 			webworker: null,
 			browser: true,
@@ -154,6 +165,8 @@ You can also more options via the 'target' option: 'browserslist' / 'browserslis
 		/^webworker$/,
 		() => ({
 			node: false,
+			deno: false,
+			bun: false,
 			web: true,
 			webworker: true,
 			browser: true,
@@ -169,6 +182,39 @@ You can also more options via the 'target' option: 'browserslist' / 'browserslis
 			global: false
 		})
 	],
+	[
+		"universal",
+		"Universal target running in browser, web worker, Node.js, Electron and NW.js. Output is always ECMAScript modules.",
+		/^universal$/,
+		// merged web + webworker + node + electron + nwjs properties; output is
+		// always ESM, so `require` (sync CommonJS) is never available
+		() => ({
+			node: null,
+			deno: null,
+			bun: null,
+			web: null,
+			webworker: null,
+			browser: null,
+			electron: null,
+			nwjs: null,
+
+			electronMain: null,
+			electronPreload: null,
+			electronRenderer: null,
+
+			document: null,
+			importScriptsInWorker: null,
+			fetchWasm: null,
+			nodeBuiltins: null,
+			importScripts: null,
+			require: false,
+			global: null,
+
+			module: true,
+			dynamicImport: true,
+			dynamicImportInWorker: true
+		})
+	],
 	[
 		"[async-]node[X[.Y]]",
 		"Node.js in version X.Y. The 'async-' prefix will load chunks asynchronously via 'fs' and 'vm' instead of 'require()'. Examples: node14.5, async-node10.",
@@ -178,6 +224,8 @@ You can also more options via the 'target' option: 'browserslist' / 'browserslis
 			// see https://node.green/
 			return {
 				node: true,
+				deno: false,
+				bun: false,
 				web: false,
 				webworker: false,
 				browser: false,
@@ -188,6 +236,8 @@ You can also more options via the 'target' option: 'browserslist' / 'browserslis
 				nodeBuiltins: true,
 				// v16.0.0, v14.18.0
 				nodePrefixForCoreModules: Number(major) < 15 ? v(14, 18) : v(16),
+				// v22.3.0, backported to v20.16.0; use the conservative single threshold
+				nodeBuiltinModuleGetter: v(22, 3),
 				// Added in: v21.2.0, v20.11.0, but Node.js will output experimental warning, we don't want it
 				// v24.0.0, v22.16.0 - This property is no longer experimental.
 				importMetaDirnameAndFilename: v(22, 16),
@@ -198,9 +248,14 @@ You can also more options via the 'target' option: 'browserslist' / 'browserslis
 				importScriptsInWorker: false,
 
 				globalThis: v(12),
+				symbol: v(0, 12),
+				hasOwn: v(16, 9),
 				const: v(6),
+				let: v(6),
+				logicalAssignment: v(15),
 				templateLiteral: v(4),
 				optionalChaining: v(14),
+				spread: v(8, 3),
 				methodShorthand: v(4),
 				arrowFunction: v(6),
 				asyncFunction: v(7, 6),
@@ -213,6 +268,108 @@ You can also more options via the 'target' option: 'browserslist' / 'browserslis
 			};
 		}
 	],
+	[
+		"deno[X[.Y]]",
+		"Deno in version X.Y. Emits ESM output; node.js built-ins are available via the required 'node:' specifier and web APIs (fetch, WebAssembly, ...) are available too. Examples: deno2, deno1.40.",
+		/^deno((\d+)(?:\.(\d+))?)?$/,
+		(_, major, minor) => {
+			const v = versionDependent(major, minor);
+			// Deno ships a modern V8, so syntax features are available since 1.0.
+			return {
+				node: true,
+				deno: true,
+				web: true,
+				webworker: false,
+				browser: false,
+				electron: false,
+				nwjs: false,
+
+				require: false,
+				nodeBuiltins: true,
+				// Deno only resolves node.js core modules through the `node:` specifier
+				nodePrefixForCoreModules: true,
+				// process.getBuiltinModule() - v2.1.0
+				nodeBuiltinModuleGetter: v(2, 1),
+				// import.meta.dirname / import.meta.filename - v1.40.0
+				importMetaDirnameAndFilename: v(1, 40),
+				global: false,
+				document: false,
+				fetchWasm: true,
+				importScripts: false,
+				importScriptsInWorker: false,
+
+				globalThis: true,
+				symbol: true,
+				hasOwn: true,
+				bigIntLiteral: true,
+				const: true,
+				let: true,
+				logicalAssignment: true,
+				methodShorthand: true,
+				arrowFunction: true,
+				forOf: true,
+				destructuring: true,
+				dynamicImport: true,
+				dynamicImportInWorker: true,
+				module: true,
+				optionalChaining: true,
+				spread: true,
+				templateLiteral: true,
+				asyncFunction: true
+			};
+		}
+	],
+	[
+		"bun[X[.Y]]",
+		"Bun in version X.Y. Output is always ECMAScript modules. Examples: bun, bun1.1.",
+		/^bun((\d+)(?:\.(\d+))?)?$/,
+		() => ({
+			// Bun is a modern, Node.js-compatible runtime; every released version
+			// supports the full modern ECMAScript feature set, so the version is
+			// accepted but does not gate any feature. Output is always ESM, so sync
+			// CommonJS `require` is never available.
+			node: true,
+			bun: true,
+			web: false,
+			webworker: false,
+			browser: false,
+			electron: false,
+			nwjs: false,
+
+			require: false,
+			nodeBuiltins: true,
+			nodePrefixForCoreModules: true,
+			nodeBuiltinModuleGetter: true,
+			importMetaDirnameAndFilename: true,
+			// Bun implements web-standard globals; use `globalThis` and load wasm
+			// via `fetch()` (Bun's fetch resolves `file:` URLs) like the deno target,
+			// instead of proprietary `Bun.*` runtime APIs.
+			global: false,
+			document: false,
+			fetchWasm: true,
+			importScripts: false,
+			importScriptsInWorker: false,
+
+			globalThis: true,
+			symbol: true,
+			hasOwn: true,
+			const: true,
+			let: true,
+			logicalAssignment: true,
+			templateLiteral: true,
+			optionalChaining: true,
+			spread: true,
+			methodShorthand: true,
+			arrowFunction: true,
+			asyncFunction: true,
+			forOf: true,
+			destructuring: true,
+			bigIntLiteral: true,
+			dynamicImport: true,
+			dynamicImportInWorker: true,
+			module: true
+		})
+	],
 	[
 		"electron[X[.Y]]-main/preload/renderer",
 		"Electron in version X.Y. Script is running in main, preload resp. renderer context.",
@@ -222,6 +379,8 @@ You can also more options via the 'target' option: 'browserslist' / 'browserslis
 			// see https://node.green/ + https://github.com/electron/releases
 			return {
 				node: true,
+				deno: false,
+				bun: false,
 				web: context !== "main",
 				webworker: false,
 				browser: false,
@@ -247,9 +406,15 @@ You can also more options via the 'target' option: 'browserslist' / 'browserslis
 				importScriptsInWorker: true,
 
 				globalThis: v(5),
+				symbol: v(0, 24),
+				hasOwn: v(16),
 				const: v(1, 1),
+				let: v(1, 1),
+				// 10.0.0 - Chromium 85
+				logicalAssignment: v(10),
 				templateLiteral: v(1, 1),
 				optionalChaining: v(8),
+				spread: v(2),
 				methodShorthand: v(1, 1),
 				arrowFunction: v(1, 1),
 				asyncFunction: v(1, 7),
@@ -258,7 +423,8 @@ You can also more options via the 'target' option: 'browserslist' / 'browserslis
 				bigIntLiteral: v(4),
 				dynamicImport: v(11),
 				dynamicImportInWorker: v(11),
-				module: v(11)
+				// 28.0.0 - ESM support was added
+				module: v(28)
 			};
 		}
 	],
@@ -271,6 +437,8 @@ You can also more options via the 'target' option: 'browserslist' / 'browserslis
 			// see https://node.green/ + https://github.com/nwjs/nw.js/blob/nw48/CHANGELOG.md
 			return {
 				node: true,
+				deno: false,
+				bun: false,
 				web: true,
 				webworker: null,
 				browser: false,
@@ -286,9 +454,15 @@ You can also more options via the 'target' option: 'browserslist' / 'browserslis
 				require: false,
 
 				globalThis: v(0, 43),
+				symbol: v(0, 12),
+				hasOwn: v(0, 58),
 				const: v(0, 15),
+				let: v(0, 15),
+				// 0.48.0 - Chromium 85
+				logicalAssignment: v(0, 48),
 				templateLiteral: v(0, 13),
 				optionalChaining: v(0, 44),
+				spread: v(0, 23),
 				methodShorthand: v(0, 15),
 				arrowFunction: v(0, 15),
 				asyncFunction: v(0, 21),
@@ -310,8 +484,11 @@ You can also more options via the 'target' option: 'browserslist' / 'browserslis
 			if (v < 1000) v += 2009;
 			return {
 				const: v >= 2015,
+				let: v >= 2015,
+				logicalAssignment: v >= 2021,
 				templateLiteral: v >= 2015,
 				optionalChaining: v >= 2020,
+				spread: v >= 2018,
 				methodShorthand: v >= 2015,
 				arrowFunction: v >= 2015,
 				forOf: v >= 2015,
@@ -319,6 +496,8 @@ You can also more options via the 'target' option: 'browserslist' / 'browserslis
 				module: v >= 2015,
 				asyncFunction: v >= 2017,
 				globalThis: v >= 2020,
+				symbol: v >= 2015,
+				hasOwn: v >= 2022,
 				bigIntLiteral: v >= 2020,
 				dynamicImport: v >= 2020,
 				dynamicImportInWorker: v >= 2020

package/lib/container/ContainerEntryModule.js

@@ -32,8 +32,8 @@ const ContainerExposedDependency = require("./ContainerExposedDependency");
 /** @typedef {import("../Module").SourceTypes} SourceTypes */
 /** @typedef {import("../RequestShortener")} RequestShortener */
 /** @typedef {import("../ResolverFactory").ResolverWithOptions} ResolverWithOptions */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[string, ExposesList, string]>} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[string, ExposesList, string]>} ObjectSerializerContext */
 /** @typedef {import("../util/fs").InputFileSystem} InputFileSystem */
 
 /**
@@ -220,11 +220,12 @@ class ContainerEntryModule extends Module {
 			);
 		}
 
+		const cst = runtimeTemplate.renderConst();
 		const source = Template.asString([
-			"var moduleMap = {",
+			`${cst} moduleMap = {`,
 			Template.indent(getters.join(",\n")),
 			"};",
-			`var get = ${runtimeTemplate.basicFunction("module, getScope", [
+			`${cst} get = ${runtimeTemplate.basicFunction("module, getScope", [
 				`${RuntimeGlobals.currentRemoteGetScope} = getScope;`,
 				// reusing the getScope variable to avoid creating a new var (and module is also used later)
 				"getScope = (",
@@ -242,10 +243,10 @@ class ContainerEntryModule extends Module {
 				`${RuntimeGlobals.currentRemoteGetScope} = undefined;`,
 				"return getScope;"
 			])};`,
-			`var init = ${runtimeTemplate.basicFunction("shareScope, initScope", [
+			`${cst} init = ${runtimeTemplate.basicFunction("shareScope, initScope", [
 				`if (!${RuntimeGlobals.shareScopeMap}) return;`,
-				`var name = ${JSON.stringify(this._shareScope)}`,
-				`var oldScope = ${RuntimeGlobals.shareScopeMap}[name];`,
+				`${cst} name = ${JSON.stringify(this._shareScope)}`,
+				`${cst} oldScope = ${RuntimeGlobals.shareScopeMap}[name];`,
 				'if(oldScope && oldScope !== shareScope) throw new Error("Container initialization failed as it has already been initialized with a different share scope");',
 				`${RuntimeGlobals.shareScopeMap}[name] = shareScope;`,
 				`return ${RuntimeGlobals.initializeSharing}(name, initScope);`
@@ -287,10 +288,7 @@ class ContainerEntryModule extends Module {
 	 * @param {ObjectSerializerContext} context context
 	 */
 	serialize(context) {
-		const { write } = context;
-		write(this._name);
-		write(this._exposes);
-		write(this._shareScope);
+		context.write(this._name).write(this._exposes).write(this._shareScope);
 		super.serialize(context);
 	}
 
@@ -300,9 +298,12 @@ class ContainerEntryModule extends Module {
 	 * @returns {ContainerEntryModule} deserialized container entry module
 	 */
 	static deserialize(context) {
-		const { read } = context;
-		const obj = new ContainerEntryModule(read(), read(), read());
-		obj.deserialize(context);
+		const name = context.read();
+		const c1 = context.rest;
+		const exposes = c1.read();
+		const c2 = c1.rest;
+		const obj = new ContainerEntryModule(name, exposes, c2.read());
+		obj.deserialize(c2.rest);
 		return obj;
 	}
 }

package/lib/container/ContainerExposedDependency.js

@@ -8,8 +8,8 @@
 const ModuleDependency = require("../dependencies/ModuleDependency");
 const makeSerializable = require("../util/makeSerializable");
 
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[string]>} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[string]>} ObjectSerializerContext */
 
 class ContainerExposedDependency extends ModuleDependency {
 	/**

package/lib/container/ContainerReferencePlugin.js

@@ -28,7 +28,7 @@ class ContainerReferencePlugin {
 	 * @param {ContainerReferencePluginOptions} options options
 	 */
 	constructor(options) {
-		/** @typedef {ContainerReferencePluginOptions} */
+		/** @type {ContainerReferencePluginOptions} */
 		this.options = options;
 	}
 

package/lib/container/FallbackDependency.js

@@ -9,8 +9,8 @@ const Dependency = require("../Dependency");
 const makeSerializable = require("../util/makeSerializable");
 
 /** @typedef {import("./RemoteModule").ExternalRequests} ExternalRequests */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[ExternalRequests]>} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[ExternalRequests]>} ObjectSerializerContext */
 
 class FallbackDependency extends Dependency {
 	/**
@@ -44,8 +44,7 @@ class FallbackDependency extends Dependency {
 	 * @param {ObjectSerializerContext} context context
 	 */
 	serialize(context) {
-		const { write } = context;
-		write(this.requests);
+		context.write(this.requests);
 		super.serialize(context);
 	}
 
@@ -55,9 +54,8 @@ class FallbackDependency extends Dependency {
 	 * @returns {FallbackDependency} deserialize fallback dependency
 	 */
 	static deserialize(context) {
-		const { read } = context;
-		const obj = new FallbackDependency(read());
-		obj.deserialize(context);
+		const obj = new FallbackDependency(context.read());
+		obj.deserialize(context.rest);
 		return obj;
 	}
 }

package/lib/container/FallbackModule.js

@@ -32,8 +32,8 @@ const FallbackItemDependency = require("./FallbackItemDependency");
 /** @typedef {import("../Module").SourceTypes} SourceTypes */
 /** @typedef {import("../RequestShortener")} RequestShortener */
 /** @typedef {import("../ResolverFactory").ResolverWithOptions} ResolverWithOptions */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[ExternalRequests]>} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[ExternalRequests]>} ObjectSerializerContext */
 /** @typedef {import("../util/fs").InputFileSystem} InputFileSystem */
 /** @typedef {import("./RemoteModule").ExternalRequests} ExternalRequests */
 
@@ -149,10 +149,12 @@ class FallbackModule extends Module {
 		const ids = this.dependencies.map((dep) =>
 			chunkGraph.getModuleId(/** @type {Module} */ (moduleGraph.getModule(dep)))
 		);
+		const cst = runtimeTemplate.renderConst();
+		const lt = runtimeTemplate.renderLet();
 		const code = Template.asString([
-			`var ids = ${JSON.stringify(ids)};`,
-			"var error, result, i = 0;",
-			`var loop = ${runtimeTemplate.basicFunction("next", [
+			`${cst} ids = ${JSON.stringify(ids)};`,
+			`${lt} error, result, i = 0;`,
+			`${cst} loop = ${runtimeTemplate.basicFunction("next", [
 				"while(i < ids.length) {",
 				Template.indent([
 					`try { next = ${RuntimeGlobals.require}(ids[i++]); } catch(e) { return handleError(e); }`,
@@ -161,11 +163,11 @@ class FallbackModule extends Module {
 				"}",
 				"if(error) throw error;"
 			])}`,
-			`var handleResult = ${runtimeTemplate.basicFunction("result", [
+			`${cst} handleResult = ${runtimeTemplate.basicFunction("result", [
 				"if(result) return result;",
 				"return loop();"
 			])};`,
-			`var handleError = ${runtimeTemplate.basicFunction("e", [
+			`${cst} handleError = ${runtimeTemplate.basicFunction("e", [
 				"error = e;",
 				"return loop();"
 			])};`,
@@ -182,8 +184,7 @@ class FallbackModule extends Module {
 	 * @param {ObjectSerializerContext} context context
 	 */
 	serialize(context) {
-		const { write } = context;
-		write(this.requests);
+		context.write(this.requests);
 		super.serialize(context);
 	}
 

package/lib/container/RemoteModule.js

@@ -34,8 +34,8 @@ const RemoteToExternalDependency = require("./RemoteToExternalDependency");
 /** @typedef {import("../Module").ExportsType} ExportsType */
 /** @typedef {import("../RequestShortener")} RequestShortener */
 /** @typedef {import("../ResolverFactory").ResolverWithOptions} ResolverWithOptions */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[string, ExternalRequests, string, string]>} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[string, ExternalRequests, string, string]>} ObjectSerializerContext */
 /** @typedef {import("../util/fs").InputFileSystem} InputFileSystem */
 /** @typedef {import("../Module").BasicSourceTypes} BasicSourceTypes */
 
@@ -212,11 +212,11 @@ class RemoteModule extends Module {
 	 * @param {ObjectSerializerContext} context context
 	 */
 	serialize(context) {
-		const { write } = context;
-		write(this.request);
-		write(this.externalRequests);
-		write(this.internalRequest);
-		write(this.shareScope);
+		context
+			.write(this.request)
+			.write(this.externalRequests)
+			.write(this.internalRequest)
+			.write(this.shareScope);
 		super.serialize(context);
 	}
 
@@ -226,9 +226,19 @@ class RemoteModule extends Module {
 	 * @returns {RemoteModule} deserialized module
 	 */
 	static deserialize(context) {
-		const { read } = context;
-		const obj = new RemoteModule(read(), read(), read(), read());
-		obj.deserialize(context);
+		const request = context.read();
+		const c1 = context.rest;
+		const externalRequests = c1.read();
+		const c2 = c1.rest;
+		const internalRequest = c2.read();
+		const c3 = c2.rest;
+		const obj = new RemoteModule(
+			request,
+			externalRequests,
+			internalRequest,
+			c3.read()
+		);
+		obj.deserialize(c3.rest);
 		return obj;
 	}
 }

package/lib/container/RemoteRuntimeModule.js

@@ -60,13 +60,15 @@ class RemoteRuntimeModule extends RuntimeModule {
 				idToExternalAndNameMapping[id] = [shareScope, name, externalModuleId];
 			}
 		}
+		const cst = runtimeTemplate.renderConst();
+		const lt = runtimeTemplate.renderLet();
 		return Template.asString([
-			`var chunkMapping = ${JSON.stringify(
+			`${cst} chunkMapping = ${JSON.stringify(
 				chunkToRemotesMapping,
 				null,
 				"\t"
 			)};`,
-			`var idToExternalAndNameMapping = ${JSON.stringify(
+			`${cst} idToExternalAndNameMapping = ${JSON.stringify(
 				idToExternalAndNameMapping,
 				null,
 				"\t"
@@ -77,13 +79,13 @@ class RemoteRuntimeModule extends RuntimeModule {
 				`if(${RuntimeGlobals.hasOwnProperty}(chunkMapping, chunkId)) {`,
 				Template.indent([
 					`chunkMapping[chunkId].forEach(${runtimeTemplate.basicFunction("id", [
-						`var getScope = ${RuntimeGlobals.currentRemoteGetScope};`,
+						`${lt} getScope = ${RuntimeGlobals.currentRemoteGetScope};`,
 						"if(!getScope) getScope = [];",
-						"var data = idToExternalAndNameMapping[id];",
+						`${cst} data = idToExternalAndNameMapping[id];`,
 						"if(getScope.indexOf(data) >= 0) return;",
 						"getScope.push(data);",
 						"if(data.p) return promises.push(data.p);",
-						`var onError = ${runtimeTemplate.basicFunction("error", [
+						`${cst} onError = ${runtimeTemplate.basicFunction("error", [
 							'if(!error) error = new Error("Container missing");',
 							'if(typeof error.message === "string")',
 							Template.indent(
@@ -94,15 +96,15 @@ class RemoteRuntimeModule extends RuntimeModule {
 							}[id] = ${runtimeTemplate.basicFunction("", ["throw error;"])}`,
 							"data.p = 0;"
 						])};`,
-						`var handleFunction = ${runtimeTemplate.basicFunction(
+						`${cst} handleFunction = ${runtimeTemplate.basicFunction(
 							"fn, arg1, arg2, d, next, first",
 							[
 								"try {",
 								Template.indent([
-									"var promise = fn(arg1, arg2);",
-									"if(promise && promise.then) {",
+									`${cst} promise = fn(arg1, arg2);`,
+									`if(${runtimeTemplate.optionalChaining("promise", "then")}) {`,
 									Template.indent([
-										`var p = promise.then(${runtimeTemplate.returningFunction(
+										`${cst} p = promise.then(${runtimeTemplate.returningFunction(
 											"next(result, d)",
 											"result"
 										)}, onError);`,
@@ -117,15 +119,15 @@ class RemoteRuntimeModule extends RuntimeModule {
 								"}"
 							]
 						)}`,
-						`var onExternal = ${runtimeTemplate.returningFunction(
+						`${cst} onExternal = ${runtimeTemplate.returningFunction(
 							`external ? handleFunction(${RuntimeGlobals.initializeSharing}, data[0], 0, external, onInitialized, first) : onError()`,
 							"external, _, first"
 						)};`,
-						`var onInitialized = ${runtimeTemplate.returningFunction(
+						`${cst} onInitialized = ${runtimeTemplate.returningFunction(
 							"handleFunction(external.get, data[1], getScope, 0, onFactory, first)",
 							"_, external, first"
 						)};`,
-						`var onFactory = ${runtimeTemplate.basicFunction("factory", [
+						`${cst} onFactory = ${runtimeTemplate.basicFunction("factory", [
 							"data.p = 1;",
 							`${
 								RuntimeGlobals.moduleFactories