webpack 5.88.2 → 5.90.0

package/lib/sharing/ConsumeSharedRuntimeModule.js

@@ -179,7 +179,7 @@ class ConsumeSharedRuntimeModule extends RuntimeModule {
 					? runtimeTemplate.basicFunction("", "")
 					: runtimeTemplate.basicFunction("msg", [
 							'if (typeof console !== "undefined" && console.warn) console.warn(msg);'
-					  ])
+						])
 			};`,
 			`var warnInvalidVersion = ${runtimeTemplate.basicFunction(
 				"scope, scopeName, key, requiredVersion",
@@ -312,7 +312,7 @@ class ConsumeSharedRuntimeModule extends RuntimeModule {
 								`module.exports = factory();`
 							])}`
 						])});`
-				  ])
+					])
 				: "// no consumes in initial chunks",
 			this._runtimeRequirements.has(RuntimeGlobals.ensureChunkHandlers)
 				? Template.asString([
@@ -321,6 +321,7 @@ class ConsumeSharedRuntimeModule extends RuntimeModule {
 							null,
 							"\t"
 						)};`,
+						"var startedInstallModules = {};",
 						`${
 							RuntimeGlobals.ensureChunkHandlers
 						}.consumes = ${runtimeTemplate.basicFunction("chunkId, promises", [
@@ -330,6 +331,7 @@ class ConsumeSharedRuntimeModule extends RuntimeModule {
 									"id",
 									[
 										`if(${RuntimeGlobals.hasOwnProperty}(installedModules, id)) return promises.push(installedModules[id]);`,
+										"if(!startedInstallModules[id]) {",
 										`var onFactory = ${runtimeTemplate.basicFunction(
 											"factory",
 											[
@@ -342,6 +344,7 @@ class ConsumeSharedRuntimeModule extends RuntimeModule {
 												])}`
 											]
 										)};`,
+										"startedInstallModules[id] = true;",
 										`var onError = ${runtimeTemplate.basicFunction("error", [
 											"delete installedModules[id];",
 											`${
@@ -360,13 +363,14 @@ class ConsumeSharedRuntimeModule extends RuntimeModule {
 											),
 											"} else onFactory(promise);"
 										]),
-										"} catch(e) { onError(e); }"
+										"} catch(e) { onError(e); }",
+										"}"
 									]
 								)});`
 							]),
 							"}"
 						])}`
-				  ])
+					])
 				: "// no chunk loading of consumes"
 		]);
 	}

package/lib/sharing/ProvideSharedModule.js

@@ -141,13 +141,13 @@ class ProvideSharedModule extends Module {
 						chunkGraph,
 						request: this._request,
 						runtimeRequirements
-				  })
+					})
 				: runtimeTemplate.asyncModuleFactory({
 						block: this.blocks[0],
 						chunkGraph,
 						request: this._request,
 						runtimeRequirements
-				  })
+					})
 		}${this._eager ? ", 1" : ""});`;
 		const sources = new Map();
 		const data = new Map();

package/lib/sharing/SharePlugin.js

@@ -34,11 +34,11 @@ class SharePlugin {
 					item === key || !isRequiredVersion(item)
 						? {
 								import: item
-						  }
+							}
 						: {
 								import: key,
 								requiredVersion: item
-						  };
+							};
 				return config;
 			},
 			item => item

package/lib/sharing/ShareRuntimeModule.js

@@ -89,7 +89,7 @@ class ShareRuntimeModule extends RuntimeModule {
 							? runtimeTemplate.basicFunction("", "")
 							: runtimeTemplate.basicFunction("msg", [
 									'if (typeof console !== "undefined" && console.warn) console.warn(msg);'
-							  ])
+								])
 					};`,
 					`var uniqueName = ${JSON.stringify(uniqueName || undefined)};`,
 					`var register = ${runtimeTemplate.basicFunction(

package/lib/sharing/utils.js

@@ -371,33 +371,29 @@ const getDescriptionFile = (fs, directory, descriptionFiles, callback) => {
 };
 exports.getDescriptionFile = getDescriptionFile;
 
-exports.getRequiredVersionFromDescriptionFile = (data, packageName) => {
-	if (
-		data.optionalDependencies &&
-		typeof data.optionalDependencies === "object" &&
-		packageName in data.optionalDependencies
-	) {
-		return normalizeVersion(data.optionalDependencies[packageName]);
-	}
-	if (
-		data.dependencies &&
-		typeof data.dependencies === "object" &&
-		packageName in data.dependencies
-	) {
-		return normalizeVersion(data.dependencies[packageName]);
-	}
-	if (
-		data.peerDependencies &&
-		typeof data.peerDependencies === "object" &&
-		packageName in data.peerDependencies
-	) {
-		return normalizeVersion(data.peerDependencies[packageName]);
-	}
-	if (
-		data.devDependencies &&
-		typeof data.devDependencies === "object" &&
-		packageName in data.devDependencies
-	) {
-		return normalizeVersion(data.devDependencies[packageName]);
+/**
+ *
+ * @param {object} data description file data i.e.: package.json
+ * @param {string} packageName name of the dependency
+ * @returns {string} normalized version
+ */
+const getRequiredVersionFromDescriptionFile = (data, packageName) => {
+	const dependencyTypes = [
+		"optionalDependencies",
+		"dependencies",
+		"peerDependencies",
+		"devDependencies"
+	];
+
+	for (const dependencyType of dependencyTypes) {
+		if (
+			data[dependencyType] &&
+			typeof data[dependencyType] === "object" &&
+			packageName in data[dependencyType]
+		) {
+			return normalizeVersion(data[dependencyType][packageName]);
+		}
 	}
 };
+exports.getRequiredVersionFromDescriptionFile =
+	getRequiredVersionFromDescriptionFile;

package/lib/stats/DefaultStatsFactoryPlugin.js

@@ -1068,7 +1068,7 @@ const SIMPLE_EXTRACTORS = {
 
 								return childStatsChunkGroup;
 							})
-					  )
+						)
 					: undefined,
 				childAssets: children
 					? mapObject(children, groups => {
@@ -1082,7 +1082,7 @@ const SIMPLE_EXTRACTORS = {
 								}
 							}
 							return Array.from(set);
-					  })
+						})
 					: undefined
 			};
 			Object.assign(object, statsChunkGroup);
@@ -1379,8 +1379,8 @@ const SIMPLE_EXTRACTORS = {
 					chunk.runtime === undefined
 						? undefined
 						: typeof chunk.runtime === "string"
-						? [makePathsRelative(chunk.runtime)]
-						: Array.from(chunk.runtime.sort(), makePathsRelative),
+							? [makePathsRelative(chunk.runtime)]
+							: Array.from(chunk.runtime.sort(), makePathsRelative),
 				files: Array.from(chunk.files),
 				auxiliaryFiles: Array.from(chunk.auxiliaryFiles).sort(compareIds),
 				hash: chunk.renderedHash,
@@ -1633,8 +1633,8 @@ const getItemSize = item => {
 	return !item.children
 		? 1
 		: item.filteredChildren
-		? 2 + getTotalSize(item.children)
-		: 1 + getTotalSize(item.children);
+			? 2 + getTotalSize(item.children)
+			: 1 + getTotalSize(item.children);
 };
 
 const getTotalSize = children => {
@@ -1912,13 +1912,13 @@ const ASSETS_GROUPERS = {
 								[name]: !!key,
 								filteredChildren: assets.length,
 								...assetGroup(children, assets)
-						  }
+							}
 						: {
 								type: "assets by status",
 								[name]: !!key,
 								children,
 								...assetGroup(children, assets)
-						  };
+							};
 				}
 			});
 		};
@@ -2169,8 +2169,8 @@ const MODULES_GROUPERS = type => ({
 						type: isDataUrl
 							? "modules by mime type"
 							: groupModulesByPath
-							? "modules by path"
-							: "modules by extension",
+								? "modules by path"
+								: "modules by extension",
 						name: isDataUrl ? key.slice(/* 'data:'.length */ 5) : key,
 						children,
 						...moduleGroup(children, modules)

package/lib/stats/DefaultStatsPresetPlugin.js

@@ -197,8 +197,8 @@ const DEFAULTS = {
 		runtime !== undefined
 			? runtime
 			: forToString
-			? all === true
-			: all !== false,
+				? all === true
+				: all !== false,
 	cachedModules: ({ all, cached }, { forToString }) =>
 		cached !== undefined ? cached : forToString ? all === true : all !== false,
 	moduleAssets: OFF_FOR_TO_STRING,
@@ -238,11 +238,7 @@ const DEFAULTS = {
 const normalizeFilter = item => {
 	if (typeof item === "string") {
 		const regExp = new RegExp(
-			`[\\\\/]${item.replace(
-				// eslint-disable-next-line no-useless-escape
-				/[-[\]{}()*+?.\\^$|]/g,
-				"\\$&"
-			)}([\\\\/]|$|!|\\?)`
+			`[\\\\/]${item.replace(/[-[\]{}()*+?.\\^$|]/g, "\\$&")}([\\\\/]|$|!|\\?)`
 		);
 		return ident => regExp.test(ident);
 	}

package/lib/stats/DefaultStatsPrinterPlugin.js

@@ -128,7 +128,7 @@ const SIMPLE_PRINTERS = {
 			warningsCount > 0
 				? yellow(
 						`${warningsCount} ${plural(warningsCount, "warning", "warnings")}`
-				  )
+					)
 				: "";
 		const errorsMessage =
 			errorsCount > 0
@@ -143,10 +143,10 @@ const SIMPLE_PRINTERS = {
 			root && name
 				? bold(name)
 				: name
-				? `Child ${bold(name)}`
-				: root
-				? ""
-				: "Child";
+					? `Child ${bold(name)}`
+					: root
+						? ""
+						: "Child";
 		const subjectMessage =
 			nameMessage && versionMessage
 				? `${nameMessage} (${versionMessage})`
@@ -180,7 +180,7 @@ const SIMPLE_PRINTERS = {
 					count,
 					"warning has",
 					"warnings have"
-			  )} detailed information that is not shown.\nUse 'stats.errorDetails: true' resp. '--stats-error-details' to show it.`
+				)} detailed information that is not shown.\nUse 'stats.errorDetails: true' resp. '--stats-error-details' to show it.`
 			: undefined,
 	"compilation.filteredErrorDetailsCount": (count, { yellow }) =>
 		count
@@ -190,7 +190,7 @@ const SIMPLE_PRINTERS = {
 						"error has",
 						"errors have"
 					)} detailed information that is not shown.\nUse 'stats.errorDetails: true' resp. '--stats-error-details' to show it.`
-			  )
+				)
 			: undefined,
 	"compilation.env": (env, { bold }) =>
 		env
@@ -204,7 +204,7 @@ const SIMPLE_PRINTERS = {
 			: printer.print(context.type, Object.values(entrypoints), {
 					...context,
 					chunkGroupKind: "Entrypoint"
-			  }),
+				}),
 	"compilation.namedChunkGroups": (namedChunkGroups, context, printer) => {
 		if (!Array.isArray(namedChunkGroups)) {
 			const {
@@ -234,15 +234,18 @@ const SIMPLE_PRINTERS = {
 					filteredModules,
 					"module",
 					"modules"
-			  )}`
+				)}`
 			: undefined,
-	"compilation.filteredAssets": (filteredAssets, { compilation: { assets } }) =>
+	"compilation.filteredAssets": (
+		filteredAssets,
+		{ compilation: { assets } }
+	) =>
 		filteredAssets > 0
 			? `${moreCount(assets, filteredAssets)} ${plural(
 					filteredAssets,
 					"asset",
 					"assets"
-			  )}`
+				)}`
 			: undefined,
 	"compilation.logging": (logging, context, printer) =>
 		Array.isArray(logging)
@@ -251,7 +254,7 @@ const SIMPLE_PRINTERS = {
 					context.type,
 					Object.entries(logging).map(([name, value]) => ({ ...value, name })),
 					context
-			  ),
+				),
 	"compilation.warningsInChildren!": (_, { yellow, compilation }) => {
 		if (
 			!compilation.children &&
@@ -324,7 +327,7 @@ const SIMPLE_PRINTERS = {
 					sourceFilename === true
 						? "from source file"
 						: `from: ${sourceFilename}`
-			  )
+				)
 			: undefined,
 	"asset.info.development": (development, { green, formatFlag }) =>
 		development ? green(formatFlag("dev")) : undefined,
@@ -339,7 +342,7 @@ const SIMPLE_PRINTERS = {
 					filteredRelated,
 					"asset",
 					"assets"
-			  )}`
+				)}`
 			: undefined,
 	"asset.filteredChildren": (filteredChildren, { asset: { children } }) =>
 		filteredChildren > 0
@@ -347,7 +350,7 @@ const SIMPLE_PRINTERS = {
 					filteredChildren,
 					"asset",
 					"assets"
-			  )}`
+				)}`
 			: undefined,
 
 	assetChunk: (id, { formatChunkId }) => formatChunkId(id),
@@ -393,22 +396,22 @@ const SIMPLE_PRINTERS = {
 					formatFlag(
 						`${assets.length} ${plural(assets.length, "asset", "assets")}`
 					)
-			  )
+				)
 			: undefined,
 	"module.warnings": (warnings, { formatFlag, yellow }) =>
 		warnings === true
 			? yellow(formatFlag("warnings"))
 			: warnings
-			? yellow(
-					formatFlag(`${warnings} ${plural(warnings, "warning", "warnings")}`)
-			  )
-			: undefined,
+				? yellow(
+						formatFlag(`${warnings} ${plural(warnings, "warning", "warnings")}`)
+					)
+				: undefined,
 	"module.errors": (errors, { formatFlag, red }) =>
 		errors === true
 			? red(formatFlag("errors"))
 			: errors
-			? red(formatFlag(`${errors} ${plural(errors, "error", "errors")}`))
-			: undefined,
+				? red(formatFlag(`${errors} ${plural(errors, "error", "errors")}`))
+				: undefined,
 	"module.providedExports": (providedExports, { formatFlag, cyan }) => {
 		if (Array.isArray(providedExports)) {
 			if (providedExports.length === 0) return cyan(formatFlag("no exports"));
@@ -449,7 +452,7 @@ const SIMPLE_PRINTERS = {
 					filteredModules,
 					"module",
 					"modules"
-			  )}`
+				)}`
 			: undefined,
 	"module.filteredReasons": (filteredReasons, { module: { reasons } }) =>
 		filteredReasons > 0
@@ -457,7 +460,7 @@ const SIMPLE_PRINTERS = {
 					filteredReasons,
 					"reason",
 					"reasons"
-			  )}`
+				)}`
 			: undefined,
 	"module.filteredChildren": (filteredChildren, { module: { children } }) =>
 		filteredChildren > 0
@@ -465,7 +468,7 @@ const SIMPLE_PRINTERS = {
 					filteredChildren,
 					"module",
 					"modules"
-			  )}`
+				)}`
 			: undefined,
 	"module.separator!": () => "\n",
 
@@ -492,7 +495,7 @@ const SIMPLE_PRINTERS = {
 					filteredChildren,
 					"reason",
 					"reasons"
-			  )}`
+				)}`
 			: undefined,
 
 	"module.profile.total": (value, { formatTime }) => formatTime(value),
@@ -533,7 +536,7 @@ const SIMPLE_PRINTERS = {
 					n,
 					"asset",
 					"assets"
-			  )}`
+				)}`
 			: undefined,
 	"chunkGroup.is!": () => "=",
 	"chunkGroupAsset.name": (asset, { green }) => green(asset),
@@ -552,7 +555,7 @@ const SIMPLE_PRINTERS = {
 						children: children[key]
 					})),
 					context
-			  ),
+				),
 	"chunkGroupChildGroup.type": type => `${type}:`,
 	"chunkGroupChild.assets[]": (file, { formatFilename }) =>
 		formatFilename(file),
@@ -581,7 +584,7 @@ const SIMPLE_PRINTERS = {
 						children: childrenByOrder[key]
 					})),
 					context
-			  ),
+				),
 	"chunk.childrenByOrder[].type": type => `${type}:`,
 	"chunk.childrenByOrder[].children[]": (id, { formatChunkId }) =>
 		isValidId(id) ? formatChunkId(id) : undefined,
@@ -600,7 +603,7 @@ const SIMPLE_PRINTERS = {
 					filteredModules,
 					"module",
 					"modules"
-			  )}`
+				)}`
 			: undefined,
 	"chunk.separator!": () => "\n",
 
@@ -1354,7 +1357,7 @@ class DefaultStatsPrinterPlugin {
 												? str.replace(
 														/((\u001b\[39m|\u001b\[22m|\u001b\[0m)+)/g,
 														`$1${start}`
-												  )
+													)
 												: str
 										}\u001b[39m\u001b[22m`;
 								} else {

package/lib/util/chainedImports.js

@@ -0,0 +1,96 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+
+"use strict";
+
+/** @typedef {import("../Dependency")} Dependency */
+/** @typedef {import("../ModuleGraph")} ModuleGraph */
+/** @typedef {import("../javascript/JavascriptParser").Range} Range */
+
+/**
+ * @summary Get the subset of ids and their corresponding range in an id chain that should be re-rendered by webpack.
+ * Only those in the chain that are actually referring to namespaces or imports should be re-rendered.
+ * Deeper member accessors on the imported object should not be re-rendered.  If deeper member accessors are re-rendered,
+ * there is a potential loss of meaning with rendering a quoted accessor as an unquoted accessor, or vice versa,
+ * because minifiers treat quoted accessors differently.  e.g. import { a } from "./module"; a["b"] vs a.b
+ * @param {string[]} untrimmedIds chained ids
+ * @param {Range} untrimmedRange range encompassing allIds
+ * @param {Range[]} ranges cumulative range of ids for each of allIds
+ * @param {ModuleGraph} moduleGraph moduleGraph
+ * @param {Dependency} dependency dependency
+ * @returns {{trimmedIds: string[], trimmedRange: Range}} computed trimmed ids and cumulative range of those ids
+ */
+exports.getTrimmedIdsAndRange = (
+	untrimmedIds,
+	untrimmedRange,
+	ranges,
+	moduleGraph,
+	dependency
+) => {
+	let trimmedIds = trimIdsToThoseImported(
+		untrimmedIds,
+		moduleGraph,
+		dependency
+	);
+	let trimmedRange = untrimmedRange;
+	if (trimmedIds.length !== untrimmedIds.length) {
+		// The array returned from dep.idRanges is right-aligned with the array returned from dep.names.
+		// Meaning, the two arrays may not always have the same number of elements, but the last element of
+		// dep.idRanges corresponds to [the expression fragment to the left of] the last element of dep.names.
+		// Use this to find the correct replacement range based on the number of ids that were trimmed.
+		const idx =
+			ranges === undefined
+				? -1 /* trigger failure case below */
+				: ranges.length + (trimmedIds.length - untrimmedIds.length);
+		if (idx < 0 || idx >= ranges.length) {
+			// cspell:ignore minifiers
+			// Should not happen but we can't throw an error here because of backward compatibility with
+			// external plugins in wp5.  Instead, we just disable trimming for now.  This may break some minifiers.
+			trimmedIds = untrimmedIds;
+			// TODO webpack 6 remove the "trimmedIds = ids" above and uncomment the following line instead.
+			// throw new Error("Missing range starts data for id replacement trimming.");
+		} else {
+			trimmedRange = ranges[idx];
+		}
+	}
+
+	return { trimmedIds, trimmedRange };
+};
+
+/**
+ * @summary Determine which IDs in the id chain are actually referring to namespaces or imports,
+ * and which are deeper member accessors on the imported object.
+ * @param {string[]} ids untrimmed ids
+ * @param {ModuleGraph} moduleGraph moduleGraph
+ * @param {Dependency} dependency dependency
+ * @returns {string[]} trimmed ids
+ */
+function trimIdsToThoseImported(ids, moduleGraph, dependency) {
+	let trimmedIds = [];
+	const exportsInfo = moduleGraph.getExportsInfo(
+		moduleGraph.getModule(dependency)
+	);
+	let currentExportsInfo = /** @type {ExportsInfo=} */ exportsInfo;
+	for (let i = 0; i < ids.length; i++) {
+		if (i === 0 && ids[i] === "default") {
+			continue; // ExportInfo for the next level under default is still at the root ExportsInfo, so don't advance currentExportsInfo
+		}
+		const exportInfo = currentExportsInfo.getExportInfo(ids[i]);
+		if (exportInfo.provided === false) {
+			// json imports have nested ExportInfo for elements that things that are not actually exported, so check .provided
+			trimmedIds = ids.slice(0, i);
+			break;
+		}
+		const nestedInfo = exportInfo.getNestedExportsInfo();
+		if (!nestedInfo) {
+			// once all nested exports are traversed, the next item is the actual import so stop there
+			trimmedIds = ids.slice(0, i + 1);
+			break;
+		}
+		currentExportsInfo = nestedInfo;
+	}
+	// Never trim to nothing.  This can happen for invalid imports (e.g. import { notThere } from "./module", or import { anything } from "./missingModule")
+	return trimmedIds.length ? trimmedIds : ids;
+}

package/lib/util/cleverMerge.js

@@ -457,8 +457,8 @@ const mergeSingleValue = (a, b, internalCaching) => {
 			return aType !== VALUE_TYPE_OBJECT
 				? b
 				: internalCaching
-				? cachedCleverMerge(a, b)
-				: cleverMerge(a, b);
+					? cachedCleverMerge(a, b)
+					: cleverMerge(a, b);
 		}
 		case VALUE_TYPE_UNDEFINED:
 			return a;
@@ -467,8 +467,8 @@ const mergeSingleValue = (a, b, internalCaching) => {
 				aType !== VALUE_TYPE_ATOM
 					? aType
 					: Array.isArray(a)
-					? VALUE_TYPE_ARRAY_EXTEND
-					: VALUE_TYPE_OBJECT
+						? VALUE_TYPE_ARRAY_EXTEND
+						: VALUE_TYPE_OBJECT
 			) {
 				case VALUE_TYPE_UNDEFINED:
 					return b;

package/lib/util/hash/xxhash64.js

@@ -10,8 +10,8 @@ const create = require("./wasm-hash");
 //#region wasm code: xxhash64 (../../../assembly/hash/xxhash64.asm.ts) --initialMemory 1
 const xxhash64 = new WebAssembly.Module(
 	Buffer.from(
-		// 1170 bytes
-		"AGFzbQEAAAABCAJgAX8AYAAAAwQDAQAABQMBAAEGGgV+AUIAC34BQgALfgFCAAt+AUIAC34BQgALByIEBGluaXQAAAZ1cGRhdGUAAQVmaW5hbAACBm1lbW9yeQIACrIIAzAAQtbrgu7q/Yn14AAkAELP1tO+0ser2UIkAUIAJAJC+erQ0OfJoeThACQDQgAkBAvUAQIBfwR+IABFBEAPCyMEIACtfCQEIwAhAiMBIQMjAiEEIwMhBQNAIAIgASkDAELP1tO+0ser2UJ+fEIfiUKHla+vmLbem55/fiECIAMgASkDCELP1tO+0ser2UJ+fEIfiUKHla+vmLbem55/fiEDIAQgASkDEELP1tO+0ser2UJ+fEIfiUKHla+vmLbem55/fiEEIAUgASkDGELP1tO+0ser2UJ+fEIfiUKHla+vmLbem55/fiEFIAFBIGoiASAASQ0ACyACJAAgAyQBIAQkAiAFJAMLqAYCAX8EfiMEQgBSBH4jACICQgGJIwEiA0IHiXwjAiIEQgyJfCMDIgVCEol8IAJCz9bTvtLHq9lCfkIfiUKHla+vmLbem55/foVCh5Wvr5i23puef35CnaO16oOxjYr6AH0gA0LP1tO+0ser2UJ+Qh+JQoeVr6+Ytt6bnn9+hUKHla+vmLbem55/fkKdo7Xqg7GNivoAfSAEQs/W077Sx6vZQn5CH4lCh5Wvr5i23puef36FQoeVr6+Ytt6bnn9+Qp2jteqDsY2K+gB9IAVCz9bTvtLHq9lCfkIfiUKHla+vmLbem55/foVCh5Wvr5i23puef35CnaO16oOxjYr6AH0FQsXP2bLx5brqJwsjBCAArXx8IQIDQCABQQhqIABNBEAgAiABKQMAQs/W077Sx6vZQn5CH4lCh5Wvr5i23puef36FQhuJQoeVr6+Ytt6bnn9+Qp2jteqDsY2K+gB9IQIgAUEIaiEBDAELCyABQQRqIABNBEAgAiABNQIAQoeVr6+Ytt6bnn9+hUIXiULP1tO+0ser2UJ+Qvnz3fGZ9pmrFnwhAiABQQRqIQELA0AgACABRwRAIAIgATEAAELFz9my8eW66id+hUILiUKHla+vmLbem55/fiECIAFBAWohAQwBCwtBACACIAJCIYiFQs/W077Sx6vZQn4iAkIdiCAChUL5893xmfaZqxZ+IgJCIIggAoUiAkIgiCIDQv//A4NCIIYgA0KAgPz/D4NCEIiEIgNC/4GAgPAfg0IQhiADQoD+g4CA4D+DQgiIhCIDQo+AvIDwgcAHg0IIhiADQvCBwIeAnoD4AINCBIiEIgNChoyYsODAgYMGfEIEiEKBgoSIkKDAgAGDQid+IANCsODAgYOGjJgwhHw3AwBBCCACQv////8PgyICQv//A4NCIIYgAkKAgPz/D4NCEIiEIgJC/4GAgPAfg0IQhiACQoD+g4CA4D+DQgiIhCICQo+AvIDwgcAHg0IIhiACQvCBwIeAnoD4AINCBIiEIgJChoyYsODAgYMGfEIEiEKBgoSIkKDAgAGDQid+IAJCsODAgYOGjJgwhHw3AwAL",
+		// 1168 bytes
+		"AGFzbQEAAAABCAJgAX8AYAAAAwQDAQAABQMBAAEGGgV+AUIAC34BQgALfgFCAAt+AUIAC34BQgALByIEBGluaXQAAAZ1cGRhdGUAAQVmaW5hbAACBm1lbW9yeQIACrAIAzAAQtbrgu7q/Yn14AAkAELP1tO+0ser2UIkAUIAJAJC+erQ0OfJoeThACQDQgAkBAvUAQIBfwR+IABFBEAPCyMEIACtfCQEIwAhAiMBIQMjAiEEIwMhBQNAIAIgASkDAELP1tO+0ser2UJ+fEIfiUKHla+vmLbem55/fiECIAMgASkDCELP1tO+0ser2UJ+fEIfiUKHla+vmLbem55/fiEDIAQgASkDEELP1tO+0ser2UJ+fEIfiUKHla+vmLbem55/fiEEIAUgASkDGELP1tO+0ser2UJ+fEIfiUKHla+vmLbem55/fiEFIAFBIGoiASAASQ0ACyACJAAgAyQBIAQkAiAFJAMLpgYCAn8EfiMEQgBSBH4jACIDQgGJIwEiBEIHiXwjAiIFQgyJfCMDIgZCEol8IANCz9bTvtLHq9lCfkIfiUKHla+vmLbem55/foVCh5Wvr5i23puef35CnaO16oOxjYr6AH0gBELP1tO+0ser2UJ+Qh+JQoeVr6+Ytt6bnn9+hUKHla+vmLbem55/fkKdo7Xqg7GNivoAfSAFQs/W077Sx6vZQn5CH4lCh5Wvr5i23puef36FQoeVr6+Ytt6bnn9+Qp2jteqDsY2K+gB9IAZCz9bTvtLHq9lCfkIfiUKHla+vmLbem55/foVCh5Wvr5i23puef35CnaO16oOxjYr6AH0FQsXP2bLx5brqJwsjBCAArXx8IQMDQCABQQhqIgIgAE0EQCADIAEpAwBCz9bTvtLHq9lCfkIfiUKHla+vmLbem55/foVCG4lCh5Wvr5i23puef35CnaO16oOxjYr6AH0hAyACIQEMAQsLIAFBBGoiAiAATQRAIAMgATUCAEKHla+vmLbem55/foVCF4lCz9bTvtLHq9lCfkL5893xmfaZqxZ8IQMgAiEBCwNAIAAgAUcEQCADIAExAABCxc/ZsvHluuonfoVCC4lCh5Wvr5i23puef34hAyABQQFqIQEMAQsLQQAgAyADQiGIhULP1tO+0ser2UJ+IgNCHYggA4VC+fPd8Zn2masWfiIDQiCIIAOFIgNCIIgiBEL//wODQiCGIARCgID8/w+DQhCIhCIEQv+BgIDwH4NCEIYgBEKA/oOAgOA/g0IIiIQiBEKPgLyA8IHAB4NCCIYgBELwgcCHgJ6A+ACDQgSIhCIEQoaMmLDgwIGDBnxCBIhCgYKEiJCgwIABg0InfiAEQrDgwIGDhoyYMIR8NwMAQQggA0L/////D4MiA0L//wODQiCGIANCgID8/w+DQhCIhCIDQv+BgIDwH4NCEIYgA0KA/oOAgOA/g0IIiIQiA0KPgLyA8IHAB4NCCIYgA0LwgcCHgJ6A+ACDQgSIhCIDQoaMmLDgwIGDBnxCBIhCgYKEiJCgwIABg0InfiADQrDgwIGDhoyYMIR8NwMACw==",
 		"base64"
 	)
 );

package/lib/util/identifier.js

@@ -376,6 +376,6 @@ exports.getUndoPath = (filename, outputPath, enforceRelative) => {
 	return depth > 0
 		? `${"../".repeat(depth)}${append}`
 		: enforceRelative
-		? `./${append}`
-		: append;
+			? `./${append}`
+			: append;
 };

package/lib/util/internalSerializables.js

@@ -45,6 +45,10 @@ module.exports = {
 		require("../dependencies/AMDRequireItemDependency"),
 	"dependencies/CachedConstDependency": () =>
 		require("../dependencies/CachedConstDependency"),
+	"dependencies/ExternalModuleDependency": () =>
+		require("../dependencies/ExternalModuleDependency"),
+	"dependencies/ExternalModuleInitFragment": () =>
+		require("../dependencies/ExternalModuleInitFragment"),
 	"dependencies/CreateScriptUrlDependency": () =>
 		require("../dependencies/CreateScriptUrlDependency"),
 	"dependencies/CommonJsRequireContextDependency": () =>
@@ -206,6 +210,8 @@ module.exports = {
 	"util/LazySet": () => require("../util/LazySet"),
 	UnhandledSchemeError: () => require("../UnhandledSchemeError"),
 	NodeStuffInWebError: () => require("../NodeStuffInWebError"),
+	EnvironmentNotSupportAsyncWarning: () =>
+		require("../EnvironmentNotSupportAsyncWarning"),
 	WebpackError: () => require("../WebpackError"),
 
 	"util/registerExternalSerializer": () => {

package/lib/util/runtime.js

@@ -57,7 +57,7 @@ exports.getEntryRuntime = (compilation, name, options) => {
  * @param {boolean} deterministicOrder enforce a deterministic order
  * @returns {void}
  */
-exports.forEachRuntime = (runtime, fn, deterministicOrder = false) => {
+const forEachRuntime = (runtime, fn, deterministicOrder = false) => {
 	if (runtime === undefined) {
 		fn(undefined);
 	} else if (typeof runtime === "string") {
@@ -69,6 +69,7 @@ exports.forEachRuntime = (runtime, fn, deterministicOrder = false) => {
 		}
 	}
 };
+exports.forEachRuntime = forEachRuntime;
 
 /**
  * @template T
@@ -228,6 +229,22 @@ const mergeRuntime = (a, b) => {
 };
 exports.mergeRuntime = mergeRuntime;
 
+/**
+ * @param {RuntimeSpec[]} runtimes first
+ * @param {RuntimeSpec} runtime second
+ * @returns {RuntimeSpec} merged
+ */
+exports.deepMergeRuntime = (runtimes, runtime) => {
+	if (!Array.isArray(runtimes)) {
+		return runtime;
+	}
+	let merged = runtime;
+	for (const r of runtimes) {
+		merged = mergeRuntime(runtime, r);
+	}
+	return merged;
+};
+
 /**
  * @param {RuntimeCondition} a first
  * @param {RuntimeCondition} b second