webpack 5.91.0 → 5.92.1

package/lib/dependencies/CssUrlDependency.js

@@ -126,6 +126,7 @@ CssUrlDependency.Template = class CssUrlDependencyTemplate extends (
 		{ moduleGraph, runtimeTemplate, codeGenerationResults }
 	) {
 		const dep = /** @type {CssUrlDependency} */ (dependency);
+		const module = /** @type {Module} */ (moduleGraph.getModule(dep));
 
 		/** @type {string | undefined} */
 		let newValue;
@@ -134,8 +135,7 @@ CssUrlDependency.Template = class CssUrlDependencyTemplate extends (
 			case "string":
 				newValue = cssEscapeString(
 					runtimeTemplate.assetUrl({
-						publicPath: "",
-						module: /** @type {Module} */ (moduleGraph.getModule(dep)),
+						module,
 						codeGenerationResults
 					})
 				);
@@ -143,8 +143,7 @@ CssUrlDependency.Template = class CssUrlDependencyTemplate extends (
 			case "url":
 				newValue = `url(${cssEscapeString(
 					runtimeTemplate.assetUrl({
-						publicPath: "",
-						module: /** @type {Module} */ (moduleGraph.getModule(dep)),
+						module,
 						codeGenerationResults
 					})
 				)})`;
@@ -161,4 +160,6 @@ CssUrlDependency.Template = class CssUrlDependencyTemplate extends (
 
 makeSerializable(CssUrlDependency, "webpack/lib/dependencies/CssUrlDependency");
 
+CssUrlDependency.PUBLIC_PATH_AUTO = "__WEBPACK_CSS_PUBLIC_PATH_AUTO__";
+
 module.exports = CssUrlDependency;

package/lib/dependencies/ExportsInfoDependency.js

@@ -52,7 +52,7 @@ const getProperty = (moduleGraph, module, _exportName, property, runtime) => {
 	switch (property) {
 		case "canMangle": {
 			const exportsInfo = moduleGraph.getExportsInfo(module);
-			const exportInfo = exportsInfo.getExportInfo(exportName[0]);
+			const exportInfo = exportsInfo.getReadOnlyExportInfoRecursive(exportName);
 			if (exportInfo) return exportInfo.canMangle;
 			return exportsInfo.otherExportsInfo.canMangle;
 		}

package/lib/dependencies/ExternalModuleDependency.js

@@ -92,11 +92,13 @@ ExternalModuleDependency.Template = class ExternalModuleDependencyTemplate exten
 	apply(dependency, source, templateContext) {
 		super.apply(dependency, source, templateContext);
 		const dep = /** @type {ExternalModuleDependency} */ (dependency);
-		const { chunkInitFragments } = templateContext;
+		const { chunkInitFragments, runtimeTemplate } = templateContext;
 
 		chunkInitFragments.push(
 			new ExternalModuleInitFragment(
-				dep.importedModule,
+				`${runtimeTemplate.supportNodePrefixForCoreModules() ? "node:" : ""}${
+					dep.importedModule
+				}`,
 				dep.specifiers,
 				dep.default
 			)

package/lib/dependencies/HarmonyEvaluatedImportSpecifierDependency.js

@@ -14,7 +14,7 @@ const HarmonyImportSpecifierDependency = require("./HarmonyImportSpecifierDepend
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
 /** @typedef {import("../Module").BuildMeta} BuildMeta */
 /** @typedef {import("../ModuleGraphConnection")} ModuleGraphConnection */
-/** @typedef {import("../javascript/JavascriptParser").Attributes} Attributes */
+/** @typedef {import("../javascript/JavascriptParser").ImportAttributes} ImportAttributes */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
@@ -33,7 +33,7 @@ class HarmonyEvaluatedImportSpecifierDependency extends HarmonyImportSpecifierDe
 	 * @param {TODO} ids ids
 	 * @param {TODO} name name
 	 * @param {Range} range location in source code
-	 * @param {Attributes} attributes assertions
+	 * @param {ImportAttributes} attributes import assertions
 	 * @param {string} operator operator
 	 */
 	constructor(request, sourceOrder, ids, name, range, attributes, operator) {

package/lib/dependencies/HarmonyExportImportedSpecifierDependency.js

@@ -40,7 +40,7 @@ const processExportInfo = require("./processExportInfo");
 /** @typedef {import("../ModuleGraphConnection").ConnectionState} ConnectionState */
 /** @typedef {import("../RuntimeTemplate")} RuntimeTemplate */
 /** @typedef {import("../WebpackError")} WebpackError */
-/** @typedef {import("../javascript/JavascriptParser").Attributes} Attributes */
+/** @typedef {import("../javascript/JavascriptParser").ImportAttributes} ImportAttributes */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
 /** @typedef {import("../util/Hash")} Hash */
@@ -337,7 +337,7 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 	 * @param {ReadonlyArray<HarmonyExportImportedSpecifierDependency> | Iterable<HarmonyExportImportedSpecifierDependency> | null} otherStarExports other star exports in the module before this import
 	 * @param {number} exportPresenceMode mode of checking export names
 	 * @param {HarmonyStarExportsList | null} allStarExports all star exports in the module
-	 * @param {Attributes=} attributes import assertions
+	 * @param {ImportAttributes=} attributes import attributes
 	 */
 	constructor(
 		request,

package/lib/dependencies/HarmonyImportDependency.js

@@ -26,7 +26,7 @@ const ModuleDependency = require("./ModuleDependency");
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
 /** @typedef {import("../RuntimeTemplate")} RuntimeTemplate */
 /** @typedef {import("../WebpackError")} WebpackError */
-/** @typedef {import("../javascript/JavascriptParser").Attributes} Attributes */
+/** @typedef {import("../javascript/JavascriptParser").ImportAttributes} ImportAttributes */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
 /** @typedef {import("../util/Hash")} Hash */
@@ -62,7 +62,7 @@ class HarmonyImportDependency extends ModuleDependency {
 	 *
 	 * @param {string} request request string
 	 * @param {number} sourceOrder source order
-	 * @param {Attributes=} attributes import assertions
+	 * @param {ImportAttributes=} attributes import attributes
 	 */
 	constructor(request, sourceOrder, attributes) {
 		super(request);

package/lib/dependencies/HarmonyImportDependencyParserPlugin.js

@@ -29,6 +29,8 @@ const HarmonyImportSpecifierDependency = require("./HarmonyImportSpecifierDepend
 /** @typedef {import("../Dependency").DependencyLocation} DependencyLocation */
 /** @typedef {import("../javascript/BasicEvaluatedExpression")} BasicEvaluatedExpression */
 /** @typedef {import("../javascript/JavascriptParser")} JavascriptParser */
+/** @typedef {import("../javascript/JavascriptParser").DestructuringAssignmentProperty} DestructuringAssignmentProperty */
+/** @typedef {import("../javascript/JavascriptParser").ImportAttributes} ImportAttributes */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
 /** @typedef {import("../optimize/InnerGraph").InnerGraph} InnerGraph */
 /** @typedef {import("../optimize/InnerGraph").TopLevelSymbol} TopLevelSymbol */
@@ -37,7 +39,7 @@ const HarmonyImportSpecifierDependency = require("./HarmonyImportSpecifierDepend
 const harmonySpecifierTag = Symbol("harmony import");
 
 /**
- * @typedef {Object} HarmonySettings
+ * @typedef {object} HarmonySettings
  * @property {string[]} ids
  * @property {string} source
  * @property {number} sourceOrder
@@ -48,7 +50,7 @@ const harmonySpecifierTag = Symbol("harmony import");
 
 /**
  * @param {ImportDeclaration | ExportNamedDeclaration | ExportAllDeclaration | (ImportExpression & { arguments?: ObjectExpression[] })} node node with assertions
- * @returns {Record<string, any> | undefined} assertions
+ * @returns {ImportAttributes} import attributes
  */
 function getAttributes(node) {
 	if (
@@ -61,33 +63,54 @@ function getAttributes(node) {
 		node.arguments[0].properties[0].value.type === "ObjectExpression" &&
 		node.arguments[0].properties[0].value.properties
 	) {
-		const properties = /** @type {Property[]} */ (
-			node.arguments[0].properties[0].value.properties
-		);
-		const result = {};
+		const properties =
+			/** @type {Property[]} */
+			(node.arguments[0].properties[0].value.properties);
+		const result = /** @type {ImportAttributes} */ ({});
 		for (const property of properties) {
 			const key =
-				property.key.type === "Identifier"
-					? property.key.name
-					: /** @type {Literal} */ (property.key).value;
-			result[key] = /** @type {Literal} */ (property.value).value;
+				/** @type {string} */
+				(
+					property.key.type === "Identifier"
+						? property.key.name
+						: /** @type {Literal} */ (property.key).value
+				);
+			result[key] =
+				/** @type {string} */
+				(/** @type {Literal} */ (property.value).value);
+		}
+		const key =
+			node.arguments[0].properties[0].key.type === "Identifier"
+				? node.arguments[0].properties[0].key.name
+				: /** @type {Literal} */ (node.arguments[0].properties[0].key).value;
+		if (key === "assert") {
+			result._isLegacyAssert = true;
 		}
 		return result;
 	}
 	// TODO remove cast when @types/estree has been updated to import assertions
-	const attributes =
-		/** @type {{ assertions?: ImportAttributeNode[] }} */
-		(node).assertions;
+	const isImportAssertion =
+		/** @type {{ assertions?: ImportAttributeNode[] }} */ (node).assertions !==
+		undefined;
+	const attributes = isImportAssertion
+		? /** @type {{ assertions?: ImportAttributeNode[] }} */ (node).assertions
+		: /** @type {{ attributes?: ImportAttributeNode[] }} */ (node).attributes;
 	if (attributes === undefined) {
 		return undefined;
 	}
-	const result = {};
+	const result = /** @type {ImportAttributes} */ ({});
 	for (const attribute of attributes) {
 		const key =
-			attribute.key.type === "Identifier"
-				? attribute.key.name
-				: attribute.key.value;
-		result[key] = attribute.value.value;
+			/** @type {string} */
+			(
+				attribute.key.type === "Identifier"
+					? attribute.key.name
+					: attribute.key.value
+			);
+		result[key] = /** @type {string} */ (attribute.value.value);
+	}
+	if (isImportAssertion) {
+		result._isLegacyAssert = true;
 	}
 	return result;
 }

package/lib/dependencies/HarmonyImportSideEffectDependency.js

@@ -16,7 +16,7 @@ const HarmonyImportDependency = require("./HarmonyImportDependency");
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
 /** @typedef {import("../ModuleGraphConnection")} ModuleGraphConnection */
 /** @typedef {import("../ModuleGraphConnection").ConnectionState} ConnectionState */
-/** @typedef {import("../javascript/JavascriptParser").Attributes} Attributes */
+/** @typedef {import("../javascript/JavascriptParser").ImportAttributes} ImportAttributes */
 /** @typedef {import("../util/Hash")} Hash */
 /** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
 
@@ -24,7 +24,7 @@ class HarmonyImportSideEffectDependency extends HarmonyImportDependency {
 	/**
 	 * @param {string} request the request string
 	 * @param {number} sourceOrder source order
-	 * @param {Attributes=} attributes assertions
+	 * @param {ImportAttributes=} attributes import attributes
 	 */
 	constructor(request, sourceOrder, attributes) {
 		super(request, sourceOrder, attributes);

package/lib/dependencies/HarmonyImportSpecifierDependency.js

@@ -6,6 +6,7 @@
 "use strict";
 
 const Dependency = require("../Dependency");
+const Template = require("../Template");
 const {
 	getDependencyUsedByExportsCondition
 } = require("../optimize/InnerGraph");
@@ -27,7 +28,8 @@ const HarmonyImportDependency = require("./HarmonyImportDependency");
 /** @typedef {import("../ModuleGraphConnection")} ModuleGraphConnection */
 /** @typedef {import("../ModuleGraphConnection").ConnectionState} ConnectionState */
 /** @typedef {import("../WebpackError")} WebpackError */
-/** @typedef {import("../javascript/JavascriptParser").Attributes} Attributes */
+/** @typedef {import("../javascript/JavascriptParser").DestructuringAssignmentProperty} DestructuringAssignmentProperty */
+/** @typedef {import("../javascript/JavascriptParser").ImportAttributes} ImportAttributes */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
@@ -46,8 +48,8 @@ class HarmonyImportSpecifierDependency extends HarmonyImportDependency {
 	 * @param {string} name name
 	 * @param {Range} range range
 	 * @param {TODO} exportPresenceMode export presence mode
-	 * @param {Attributes=} attributes assertions
-	 * @param {Range[]=} idRanges ranges for members of ids; the two arrays are right-aligned
+	 * @param {ImportAttributes | undefined} attributes import attributes
+	 * @param {Range[] | undefined} idRanges ranges for members of ids; the two arrays are right-aligned
 	 */
 	constructor(
 		request,
@@ -73,7 +75,7 @@ class HarmonyImportSpecifierDependency extends HarmonyImportDependency {
 		this.asiSafe = undefined;
 		/** @type {Set<string> | boolean | undefined} */
 		this.usedByExports = undefined;
-		/** @type {Set<string> | undefined} */
+		/** @type {Set<DestructuringAssignmentProperty> | undefined} */
 		this.referencedPropertiesInDestructuring = undefined;
 	}
 
@@ -144,8 +146,7 @@ class HarmonyImportSpecifierDependency extends HarmonyImportDependency {
 	 */
 	getReferencedExports(moduleGraph, runtime) {
 		let ids = this.getIds(moduleGraph);
-		if (ids.length === 0)
-			return this._getReferencedExportsInDestructuring(moduleGraph);
+		if (ids.length === 0) return this._getReferencedExportsInDestructuring();
 		let namespaceObjectAsContext = this.namespaceObjectAsContext;
 		if (ids[0] === "default") {
 			const selfModule = moduleGraph.getParentModule(this);
@@ -162,7 +163,7 @@ class HarmonyImportSpecifierDependency extends HarmonyImportDependency {
 				case "default-only":
 				case "default-with-named":
 					if (ids.length === 1)
-						return this._getReferencedExportsInDestructuring(moduleGraph);
+						return this._getReferencedExportsInDestructuring();
 					ids = ids.slice(1);
 					namespaceObjectAsContext = true;
 					break;
@@ -180,31 +181,19 @@ class HarmonyImportSpecifierDependency extends HarmonyImportDependency {
 			ids = ids.slice(0, -1);
 		}
 
-		return this._getReferencedExportsInDestructuring(moduleGraph, ids);
+		return this._getReferencedExportsInDestructuring(ids);
 	}
 
 	/**
-	 * @param {ModuleGraph} moduleGraph module graph
 	 * @param {string[]=} ids ids
-	 * @returns {(string[] | ReferencedExport)[]} referenced exports
+	 * @returns {string[][]} referenced exports
 	 */
-	_getReferencedExportsInDestructuring(moduleGraph, ids) {
+	_getReferencedExportsInDestructuring(ids) {
 		if (this.referencedPropertiesInDestructuring) {
-			/** @type {ReferencedExport[]} */
+			/** @type {string[][]} */
 			const refs = [];
-			const importedModule = moduleGraph.getModule(this);
-			const canMangle =
-				Array.isArray(ids) &&
-				ids.length > 0 &&
-				!moduleGraph
-					.getExportsInfo(importedModule)
-					.getExportInfo(ids[0])
-					.isReexport();
-			for (const key of this.referencedPropertiesInDestructuring) {
-				refs.push({
-					name: ids ? ids.concat([key]) : [key],
-					canMangle
-				});
+			for (const { id } of this.referencedPropertiesInDestructuring) {
+				refs.push(ids ? ids.concat([id]) : [id]);
 			}
 			return refs;
 		} else {
@@ -336,16 +325,11 @@ HarmonyImportSpecifierDependency.Template = class HarmonyImportSpecifierDependen
 		// Skip rendering depending when dependency is conditional
 		if (connection && !connection.isTargetActive(runtime)) return;
 
+		const ids = dep.getIds(moduleGraph);
 		const {
 			trimmedRange: [trimmedRangeStart, trimmedRangeEnd],
 			trimmedIds
-		} = getTrimmedIdsAndRange(
-			dep.getIds(moduleGraph),
-			dep.range,
-			dep.idRanges,
-			moduleGraph,
-			dep
-		);
+		} = getTrimmedIdsAndRange(ids, dep.range, dep.idRanges, moduleGraph, dep);
 
 		const exportExpr = this._getCodeForIds(
 			dep,
@@ -358,6 +342,33 @@ HarmonyImportSpecifierDependency.Template = class HarmonyImportSpecifierDependen
 		} else {
 			source.replace(trimmedRangeStart, trimmedRangeEnd - 1, exportExpr);
 		}
+
+		if (dep.referencedPropertiesInDestructuring) {
+			for (let {
+				id,
+				shorthand,
+				range
+			} of dep.referencedPropertiesInDestructuring) {
+				const concatedIds = ids.concat([id]);
+				if (concatedIds[0] === "default") concatedIds.shift();
+				const module = moduleGraph.getModule(dep);
+				const used = moduleGraph
+					.getExportsInfo(module)
+					.getUsedName(concatedIds, runtime);
+				if (!used) return;
+				const newName = used[used.length - 1];
+				const name = concatedIds[concatedIds.length - 1];
+				if (newName === name) continue;
+
+				const comment = Template.toNormalComment(name) + " ";
+				const key = comment + JSON.stringify(newName);
+				source.replace(
+					range[0],
+					range[1] - 1,
+					shorthand ? `${key}: ${name}` : `${key}`
+				);
+			}
+		}
 	}
 
 	/**

package/lib/dependencies/ImportDependency.js

@@ -16,7 +16,7 @@ const ModuleDependency = require("./ModuleDependency");
 /** @typedef {import("../Module")} Module */
 /** @typedef {import("../Module").BuildMeta} BuildMeta */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
-/** @typedef {import("../javascript/JavascriptParser").Attributes} Attributes */
+/** @typedef {import("../javascript/JavascriptParser").ImportAttributes} ImportAttributes */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
@@ -27,7 +27,7 @@ class ImportDependency extends ModuleDependency {
 	 * @param {string} request the request
 	 * @param {Range} range expression range
 	 * @param {(string[][] | null)=} referencedExports list of referenced exports
-	 * @param {Attributes=} attributes assertions
+	 * @param {ImportAttributes=} attributes import attributes
 	 */
 	constructor(request, range, referencedExports, attributes) {
 		super(request);

package/lib/dependencies/ImportEagerDependency.js

@@ -15,7 +15,7 @@ const ImportDependency = require("./ImportDependency");
 /** @typedef {import("../Module")} Module */
 /** @typedef {import("../Module").BuildMeta} BuildMeta */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
-/** @typedef {import("../javascript/JavascriptParser").Attributes} Attributes */
+/** @typedef {import("../javascript/JavascriptParser").ImportAttributes} ImportAttributes */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
 
 class ImportEagerDependency extends ImportDependency {
@@ -23,7 +23,7 @@ class ImportEagerDependency extends ImportDependency {
 	 * @param {string} request the request
 	 * @param {Range} range expression range
 	 * @param {(string[][] | null)=} referencedExports list of referenced exports
-	 * @param {Attributes=} attributes assertions
+	 * @param {ImportAttributes=} attributes import attributes
 	 */
 	constructor(request, range, referencedExports, attributes) {
 		super(request, range, referencedExports, attributes);

package/lib/dependencies/ImportMetaPlugin.js

@@ -131,7 +131,7 @@ class ImportMetaPlugin {
 							}
 
 							let str = "";
-							for (const prop of referencedPropertiesInDestructuring) {
+							for (const { id: prop } of referencedPropertiesInDestructuring) {
 								switch (prop) {
 									case "url":
 										str += `url: ${importMetaUrl()},`;

package/lib/dependencies/ImportParserPlugin.js

@@ -256,7 +256,9 @@ class ImportParserPlugin {
 						)
 					);
 				}
-				exports = exportsFromEnumerable(referencedPropertiesInDestructuring);
+				exports = exportsFromEnumerable(
+					[...referencedPropertiesInDestructuring].map(({ id }) => id)
+				);
 			}
 
 			if (param.isString()) {

package/lib/dependencies/ImportWeakDependency.js

@@ -15,7 +15,7 @@ const ImportDependency = require("./ImportDependency");
 /** @typedef {import("../Module")} Module */
 /** @typedef {import("../Module").BuildMeta} BuildMeta */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
-/** @typedef {import("../javascript/JavascriptParser").Attributes} Attributes */
+/** @typedef {import("../javascript/JavascriptParser").ImportAttributes} ImportAttributes */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
 
 class ImportWeakDependency extends ImportDependency {
@@ -23,7 +23,7 @@ class ImportWeakDependency extends ImportDependency {
 	 * @param {string} request the request
 	 * @param {Range} range expression range
 	 * @param {(string[][] | null)=} referencedExports list of referenced exports
-	 * @param {Attributes=} attributes assertions
+	 * @param {ImportAttributes=} attributes import attributes
 	 */
 	constructor(request, range, referencedExports, attributes) {
 		super(request, range, referencedExports, attributes);

package/lib/dependencies/LoaderPlugin.js

@@ -29,7 +29,7 @@ const LoaderImportDependency = require("./LoaderImportDependency");
  */
 
 /**
- * @typedef {Object} ImportModuleOptions
+ * @typedef {object} ImportModuleOptions
  * @property {string=} layer the target layer
  * @property {string=} publicPath the target public path
  * @property {string=} baseUri target base uri
@@ -37,7 +37,7 @@ const LoaderImportDependency = require("./LoaderImportDependency");
 
 class LoaderPlugin {
 	/**
-	 * @param {Object} options options
+	 * @param {object} options options
 	 */
 	constructor(options = {}) {}
 

package/lib/dependencies/ModuleDependency.js

@@ -11,7 +11,7 @@ const RawModule = require("../RawModule");
 
 /** @typedef {import("../Dependency").TRANSITIVE} TRANSITIVE */
 /** @typedef {import("../Module")} Module */
-/** @typedef {import("../javascript/JavascriptParser").Attributes} Attributes */
+/** @typedef {import("../javascript/JavascriptParser").ImportAttributes} ImportAttributes */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
 
@@ -26,7 +26,7 @@ class ModuleDependency extends Dependency {
 		this.range = undefined;
 		// TODO move it to subclasses and rename
 		// assertions must be serialized by subclasses that use it
-		/** @type {Attributes | undefined} */
+		/** @type {ImportAttributes | undefined} */
 		this.assertions = undefined;
 		this._context = undefined;
 	}

package/lib/dependencies/PureExpressionDependency.js

@@ -7,12 +7,13 @@
 
 const { UsageState } = require("../ExportsInfo");
 const makeSerializable = require("../util/makeSerializable");
-const { filterRuntime, deepMergeRuntime } = require("../util/runtime");
+const { filterRuntime, runtimeToString } = require("../util/runtime");
 const NullDependency = require("./NullDependency");
 
 /** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
 /** @typedef {import("../ChunkGraph")} ChunkGraph */
 /** @typedef {import("../Dependency")} Dependency */
+/** @typedef {import("../Dependency").RuntimeSpec} RuntimeSpec */
 /** @typedef {import("../Dependency").UpdateHashContext} UpdateHashContext */
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
 /** @typedef {import("../Module")} Module */
@@ -32,7 +33,31 @@ class PureExpressionDependency extends NullDependency {
 		this.range = range;
 		/** @type {Set<string> | false} */
 		this.usedByExports = false;
-		this._hashUpdate = undefined;
+	}
+
+	/**
+	 * @param {ModuleGraph} moduleGraph module graph
+	 * @param {RuntimeSpec} runtime current runtimes
+	 * @returns {boolean | RuntimeSpec} runtime condition
+	 */
+	_getRuntimeCondition(moduleGraph, runtime) {
+		const usedByExports = this.usedByExports;
+		if (usedByExports !== false) {
+			const selfModule =
+				/** @type {Module} */
+				(moduleGraph.getParentModule(this));
+			const exportsInfo = moduleGraph.getExportsInfo(selfModule);
+			const runtimeCondition = filterRuntime(runtime, runtime => {
+				for (const exportName of usedByExports) {
+					if (exportsInfo.getUsed(exportName, runtime) !== UsageState.Unused) {
+						return true;
+					}
+				}
+				return false;
+			});
+			return runtimeCondition;
+		}
+		return false;
 	}
 
 	/**
@@ -42,10 +67,22 @@ class PureExpressionDependency extends NullDependency {
 	 * @returns {void}
 	 */
 	updateHash(hash, context) {
-		if (this._hashUpdate === undefined) {
-			this._hashUpdate = this.range + "";
+		const runtimeCondition = this._getRuntimeCondition(
+			context.chunkGraph.moduleGraph,
+			context.runtime
+		);
+		if (runtimeCondition === true) {
+			return;
+		} else if (runtimeCondition === false) {
+			hash.update("null");
+		} else {
+			hash.update(
+				runtimeToString(runtimeCondition) +
+					"|" +
+					runtimeToString(context.runtime)
+			);
 		}
-		hash.update(this._hashUpdate);
+		hash.update(this.range + "");
 	}
 
 	/**
@@ -94,54 +131,31 @@ PureExpressionDependency.Template = class PureExpressionDependencyTemplate exten
 	apply(
 		dependency,
 		source,
-		{
-			chunkGraph,
-			moduleGraph,
-			runtime,
-			runtimes,
-			runtimeTemplate,
-			runtimeRequirements
-		}
+		{ chunkGraph, moduleGraph, runtime, runtimeTemplate, runtimeRequirements }
 	) {
 		const dep = /** @type {PureExpressionDependency} */ (dependency);
-
-		const usedByExports = dep.usedByExports;
-		if (usedByExports !== false) {
-			const selfModule =
-				/** @type {Module} */
-				(moduleGraph.getParentModule(dep));
-			const exportsInfo = moduleGraph.getExportsInfo(selfModule);
-			const merged = deepMergeRuntime(runtimes, runtime);
-			const runtimeCondition = filterRuntime(merged, runtime => {
-				for (const exportName of usedByExports) {
-					if (exportsInfo.getUsed(exportName, runtime) !== UsageState.Unused) {
-						return true;
-					}
-				}
-				return false;
+		const runtimeCondition = dep._getRuntimeCondition(moduleGraph, runtime);
+		if (runtimeCondition === true) {
+			return;
+		} else if (runtimeCondition === false) {
+			source.insert(
+				dep.range[0],
+				`(/* unused pure expression or super */ null && (`
+			);
+			source.insert(dep.range[1], "))");
+		} else {
+			const condition = runtimeTemplate.runtimeConditionExpression({
+				chunkGraph,
+				runtime,
+				runtimeCondition,
+				runtimeRequirements
 			});
-			if (runtimeCondition === true) return;
-			if (runtimeCondition !== false) {
-				const condition = runtimeTemplate.runtimeConditionExpression({
-					chunkGraph,
-					runtime: merged,
-					runtimeCondition,
-					runtimeRequirements
-				});
-				source.insert(
-					dep.range[0],
-					`(/* runtime-dependent pure expression or super */ ${condition} ? (`
-				);
-				source.insert(dep.range[1], ") : null)");
-				return;
-			}
+			source.insert(
+				dep.range[0],
+				`(/* runtime-dependent pure expression or super */ ${condition} ? (`
+			);
+			source.insert(dep.range[1], ") : null)");
 		}
-
-		source.insert(
-			dep.range[0],
-			`(/* unused pure expression or super */ null && (`
-		);
-		source.insert(dep.range[1], "))");
 	}
 };
 

package/lib/dependencies/WorkerDependency.js

@@ -28,7 +28,7 @@ class WorkerDependency extends ModuleDependency {
 	/**
 	 * @param {string} request request
 	 * @param {Range} range range
-	 * @param {Object} workerDependencyOptions options
+	 * @param {object} workerDependencyOptions options
 	 * @param {string=} workerDependencyOptions.publicPath public path for the worker
 	 */
 	constructor(request, range, workerDependencyOptions) {