@depup/webpack 5.111.1-depup.1 → 5.112.0-depup.0

package/lib/dependencies/{HarmonyExportHeaderDependency.js → esm/ESMExportHeaderDependency.js}

@@ -5,19 +5,19 @@
 
 "use strict";
 
-const makeSerializable = require("../util/makeSerializable");
-const NullDependency = require("./NullDependency");
+const makeSerializable = require("../../util/makeSerializable");
+const NullDependency = require("../core/NullDependency");
 
 /** @import { ReplaceSource } from "webpack-sources" */
-/** @import Dependency from "../Dependency" */
-/** @import { DependencyTemplateContext } from "../DependencyTemplate" */
-/** @import { Range } from "../javascript/JavascriptParser" */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[Range | undefined | null, Range]>} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[Range | undefined | null, Range]>} ObjectSerializerContext */
+/** @import Dependency from "../../graph/Dependency" */
+/** @import { DependencyTemplateContext } from "../../template/DependencyTemplate" */
+/** @import { Range } from "../../javascript/JavascriptParser" */
+/** @typedef {import("../../serialization/ObjectMiddleware").ObjectDeserializerContext<[Range | undefined | null, Range]>} ObjectDeserializerContext */
+/** @typedef {import("../../serialization/ObjectMiddleware").ObjectSerializerContext<[Range | undefined | null, Range]>} ObjectSerializerContext */
 
-class HarmonyExportHeaderDependency extends NullDependency {
+class ESMExportHeaderDependency extends NullDependency {
 	/**
-	 * Creates an instance of HarmonyExportHeaderDependency.
+	 * Creates an instance of ESMExportHeaderDependency.
 	 * @param {Range | undefined | null} range range
 	 * @param {Range} rangeStatement range statement
 	 */
@@ -52,12 +52,14 @@ class HarmonyExportHeaderDependency extends NullDependency {
 	}
 }
 
-makeSerializable(
-	HarmonyExportHeaderDependency,
+makeSerializable(ESMExportHeaderDependency, [
+	"webpack/lib/dependencies/esm/ESMExportHeaderDependency",
+	// TODO in the next major release: remove, it restores the packs written
+	// under the name the file had before the ESM rename
 	"webpack/lib/dependencies/HarmonyExportHeaderDependency"
-);
+]);
 
-HarmonyExportHeaderDependency.Template = class HarmonyExportDependencyTemplate extends (
+ESMExportHeaderDependency.Template = class ESMExportDependencyTemplate extends (
 	NullDependency.Template
 ) {
 	/**
@@ -68,7 +70,7 @@ HarmonyExportHeaderDependency.Template = class HarmonyExportDependencyTemplate e
 	 * @returns {void}
 	 */
 	apply(dependency, source, templateContext) {
-		const dep = /** @type {HarmonyExportHeaderDependency} */ (dependency);
+		const dep = /** @type {ESMExportHeaderDependency} */ (dependency);
 		const content = "";
 		const replaceUntil = dep.range
 			? dep.range[0] - 1
@@ -77,4 +79,4 @@ HarmonyExportHeaderDependency.Template = class HarmonyExportDependencyTemplate e
 	}
 };
 
-module.exports = HarmonyExportHeaderDependency;
+module.exports = ESMExportHeaderDependency;

package/lib/dependencies/esm/ESMExportImportedSideEffectDependency.js

@@ -0,0 +1,37 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Haijie Xie @hai-x
+*/
+
+"use strict";
+
+const Dependency = require("../../graph/Dependency");
+const makeSerializable = require("../../util/makeSerializable");
+const ESMImportSideEffectDependency = require("./ESMImportSideEffectDependency");
+
+/** @import { LazyRole } from "../../graph/Dependency" */
+
+/**
+ * The evaluation of an `export … from "..."` statement's module. It is a separate
+ * class rather than a flag so a lazy barrel defers it with the re-export, while an
+ * import declaration's evaluation stays tied to the barrel's own code.
+ */
+class ESMExportImportedSideEffectDependency extends ESMImportSideEffectDependency {
+	/**
+	 * Returns how this dependency may be deferred when its parent module is side-effect-free (lazy barrel optimization).
+	 * @returns {LazyRole | null} lazy classification, null when it must be processed eagerly
+	 */
+	get lazyRole() {
+		return Dependency.LAZY_REEXPORT_SIDE_EFFECT;
+	}
+}
+
+makeSerializable(
+	ESMExportImportedSideEffectDependency,
+	"webpack/lib/dependencies/esm/ESMExportImportedSideEffectDependency"
+);
+
+ESMExportImportedSideEffectDependency.Template =
+	ESMImportSideEffectDependency.Template;
+
+module.exports = ESMExportImportedSideEffectDependency;

package/lib/dependencies/{HarmonyExportImportedSpecifierDependency.js → esm/ESMExportImportedSpecifierDependency.js}

@@ -5,96 +5,96 @@
 
 "use strict";
 
-const ConditionalInitFragment = require("../ConditionalInitFragment");
-const Dependency = require("../Dependency");
-const { UsageState } = require("../ExportsInfo");
-const InitFragment = require("../InitFragment");
-const RuntimeGlobals = require("../RuntimeGlobals");
-const Template = require("../Template");
+const ESMLinkingError = require("../../errors/ESMLinkingError");
+const Dependency = require("../../graph/Dependency");
+const { UsageState } = require("../../graph/ExportsInfo");
 const {
-	InlinedUsedName,
 	isExportInlined,
 	isInlineEnabled,
-	isInlineExportsEnabled
-} = require("../optimize/InlineExports");
+	isInlineExportsEnabled,
+	isInlinedUsedName
+} = require("../../optimize/InlineExports");
 const {
 	getKnownExportNames,
 	getMakeDeferredNamespaceModeFromExportsType
-} = require("../runtime/MakeDeferredNamespaceObjectRuntime");
-const { countIterable } = require("../util/IterableHelpers");
-const { combine, first } = require("../util/SetHelpers");
-const makeSerializable = require("../util/makeSerializable");
-const { propertyAccess, propertyName } = require("../util/property");
+} = require("../../runtime/MakeDeferredNamespaceObjectRuntime");
+const RuntimeGlobals = require("../../runtime/RuntimeGlobals");
+const ConditionalInitFragment = require("../../template/ConditionalInitFragment");
+const InitFragment = require("../../template/InitFragment");
+const Template = require("../../template/Template");
+const { countIterable } = require("../../util/IterableHelpers");
+const { combine, first } = require("../../util/SetHelpers");
+const makeSerializable = require("../../util/makeSerializable");
+const { propertyAccess, propertyName } = require("../../util/property");
 const {
 	filterRuntime,
 	getRuntimeKey,
 	keyToRuntime
-} = require("../util/runtime");
-const HarmonyExportInitFragment = require("./HarmonyExportInitFragment");
+} = require("../../util/runtime");
+const { ImportPhaseUtils } = require("../core/ImportPhase");
+const processExportInfo = require("../helpers/processExportInfo");
+const ESMExportInitFragment = require("./ESMExportInitFragment");
+const ESMImportDependency = require("./ESMImportDependency");
 
-const { ExportBindingType } = HarmonyExportInitFragment;
-
-const HarmonyImportDependency = require("./HarmonyImportDependency");
-const HarmonyLinkingError = require("./HarmonyLinkingError");
-const { ImportPhaseUtils } = require("./ImportPhase");
-const processExportInfo = require("./processExportInfo");
+const { ExportBindingType } = ESMExportInitFragment;
 
 /** @import { ReplaceSource } from "webpack-sources" */
-/** @import ChunkGraph from "../ChunkGraph" */
+/** @import ChunkGraph from "../../graph/ChunkGraph" */
 /**
  * @import {
  * 	ExportsSpec,
  * 	GetConditionFn,
- * 	LazyUntil,
+ * 	LazyRole,
  * 	RawReferencedExports,
  * 	ReferencedExports,
  * 	TRANSITIVE,
  * 	ExportInfoName,
- * 	UpdateHashContext
- * } from "../Dependency"
+ * 	UpdateHashContext,
+ * 	DependencyKinds
+ * } from "../../graph/Dependency"
  */
-/** @import { DependencyTemplateContext } from "../DependencyTemplate" */
-/** @import ExportsInfo, { ExportInfo, UsedName } from "../ExportsInfo" */
-/** @import { GenerateContext } from "../Generator" */
+/** @import { DependencyTemplateContext } from "../../template/DependencyTemplate" */
+/** @import ExportsInfo, { ExportInfo, UsedName } from "../../graph/ExportsInfo" */
+/** @import { GenerateContext } from "../../module/Generator" */
 /**
  * @import Module, {
  * 	BuildMeta,
  * 	RuntimeRequirements,
  * 	ExportsType
- * } from "../Module"
+ * } from "../../module/Module"
  */
-/** @import ModuleGraph from "../ModuleGraph" */
-/** @import Hash from "../util/Hash" */
+/** @import ModuleGraph from "../../graph/ModuleGraph" */
+/** @import Hash from "../../util/Hash" */
 /**
  * @import ModuleGraphConnection, {
  * 	ConnectionState
- * } from "../ModuleGraphConnection"
+ * } from "../../graph/ModuleGraphConnection"
  */
-/** @import RuntimeTemplate from "../RuntimeTemplate" */
-/** @import WebpackError from "../errors/WebpackError" */
-/** @import { ImportAttributes } from "../javascript/JavascriptParser" */
-/** @typedef {[Ids, string | null, Set<string>, ReadonlyArray<HarmonyExportImportedSpecifierDependency> | null, ExportPresenceMode, HarmonyStarExportsList | null]} SerializedData */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<SerializedData>} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<SerializedData>} ObjectSerializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[HarmonyExportImportedSpecifierDependency[]]>} StarListDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[HarmonyExportImportedSpecifierDependency[]]>} StarListSerializerContext */
-/** @import { RuntimeSpec } from "../util/runtime" */
-/** @import { Ids, ExportPresenceMode } from "./HarmonyImportDependency" */
-/** @import { ExportMap } from "./HarmonyExportInitFragment" */
-/** @import { ImportPhaseType } from "../dependencies/ImportPhase" */
+/** @import RuntimeTemplate from "../../template/RuntimeTemplate" */
+/** @import WebpackError from "../../errors/WebpackError" */
+/** @import { ImportAttributes } from "../../javascript/JavascriptParser" */
+/** @typedef {[Ids, string | null, Set<string>, ReadonlyArray<ESMExportImportedSpecifierDependency> | null, ExportPresenceMode, ESMStarExportsList | null]} SerializedData */
+/** @typedef {import("../../serialization/ObjectMiddleware").ObjectDeserializerContext<SerializedData>} ObjectDeserializerContext */
+/** @typedef {import("../../serialization/ObjectMiddleware").ObjectSerializerContext<SerializedData>} ObjectSerializerContext */
+/** @typedef {import("../../serialization/ObjectMiddleware").ObjectDeserializerContext<[ESMExportImportedSpecifierDependency[]]>} StarListDeserializerContext */
+/** @typedef {import("../../serialization/ObjectMiddleware").ObjectSerializerContext<[ESMExportImportedSpecifierDependency[]]>} StarListSerializerContext */
+/** @import { RuntimeSpec } from "../../util/runtime" */
+/** @import { Ids, ExportPresenceMode } from "./ESMImportDependency" */
+/** @import { ExportMap } from "./ESMExportInitFragment" */
+/** @import { ImportPhaseType } from "../core/ImportPhase" */
 /**
  * @import {
  * 	JavascriptModuleBuildMeta
- * } from "../javascript/JavascriptModule"
+ * } from "../../javascript/JavascriptModule"
  */
-/** @import ConcatenationScope from "../ConcatenationScope" */
+/** @import ConcatenationScope from "../../optimize/ConcatenationScope" */
 
 /** @typedef {"missing" | "unused" | "empty-star" | "reexport-dynamic-default" | "reexport-named-default" | "reexport-namespace-object" | "reexport-fake-namespace-object" | "reexport-undefined" | "normal-reexport" | "dynamic-reexport"} ExportModeType */
 
-const { ExportPresenceModes } = HarmonyImportDependency;
+const { ExportPresenceModes } = ESMImportDependency;
 
 const idsSymbol = /** @type {symbol} */ (
-	Symbol("HarmonyExportImportedSpecifierDependency.ids")
+	Symbol("ESMExportImportedSpecifierDependency.ids")
 );
 
 class NormalReexportItem {
@@ -263,8 +263,8 @@ const isAmbiguousWith = (moduleGraph, previous, exportInfo) => {
 /**
  * Determine export assignments.
  * @param {ModuleGraph} moduleGraph module graph
- * @param {HarmonyExportImportedSpecifierDependency[]} dependencies dependencies
- * @param {HarmonyExportImportedSpecifierDependency=} additionalDependency additional dependency
+ * @param {ESMExportImportedSpecifierDependency[]} dependencies dependencies
+ * @param {ESMExportImportedSpecifierDependency=} additionalDependency additional dependency
  * @returns {{ names: ExportInfoName[], dependencyIndices: DependencyIndices, conflicting: Set<ExportInfoName> | undefined }} result
  */
 const determineExportAssignments = (
@@ -341,8 +341,8 @@ const determineExportAssignments = (
  * @param {ExportInfoName[]} options.names names
  * @param {DependencyIndices} options.dependencyIndices dependency indices
  * @param {string} name name
- * @param {ReadonlyArray<HarmonyExportImportedSpecifierDependency>} dependencies dependencies
- * @returns {HarmonyExportImportedSpecifierDependency | undefined} found dependency or nothing
+ * @param {ReadonlyArray<ESMExportImportedSpecifierDependency>} dependencies dependencies
+ * @returns {ESMExportImportedSpecifierDependency | undefined} found dependency or nothing
  */
 const findDependencyForName = (
 	{ names, dependencyIndices },
@@ -368,7 +368,7 @@ const findDependencyForName = (
 /**
  * Returns the export mode.
  * @param {ModuleGraph} moduleGraph the module graph
- * @param {HarmonyExportImportedSpecifierDependency} dep the dependency
+ * @param {ESMExportImportedSpecifierDependency} dep the dependency
  * @param {string} runtimeKey the runtime key
  * @returns {ExportMode} the export mode
  */
@@ -547,17 +547,17 @@ const getMode = (moduleGraph, dep, runtimeKey) => {
 /** @typedef {Set<string>} Hidden */
 /** @typedef {Set<string>} IgnoredExports */
 
-class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
+class ESMExportImportedSpecifierDependency extends ESMImportDependency {
 	/**
-	 * Creates an instance of HarmonyExportImportedSpecifierDependency.
+	 * Creates an instance of ESMExportImportedSpecifierDependency.
 	 * @param {string} request the request string
 	 * @param {number} sourceOrder the order in the original source file
 	 * @param {Ids} ids the requested export name of the imported module
 	 * @param {string | null} name the export name of for this module
 	 * @param {Set<string>} activeExports other named exports in the module
-	 * @param {ReadonlyArray<HarmonyExportImportedSpecifierDependency> | null} otherStarExports other star exports in the module before this import
+	 * @param {ReadonlyArray<ESMExportImportedSpecifierDependency> | null} otherStarExports other star exports in the module before this import
 	 * @param {ExportPresenceMode} exportPresenceMode mode of checking export names
-	 * @param {HarmonyStarExportsList | null} allStarExports all star exports in the module
+	 * @param {ESMStarExportsList | null} allStarExports all star exports in the module
 	 * @param {ImportPhaseType} phase import phase
 	 * @param {ImportAttributes=} attributes import attributes
 	 */
@@ -584,7 +584,7 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 		this.otherStarExports = otherStarExports;
 		/** @type {ExportPresenceMode} */
 		this.exportPresenceMode = exportPresenceMode;
-		/** @type {HarmonyStarExportsList | null} */
+		/** @type {ESMStarExportsList | null} */
 		this.allStarExports = allStarExports;
 	}
 
@@ -596,7 +596,7 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 		return Dependency.TRANSITIVE;
 	}
 
-	// TODO webpack 6 remove
+	// TODO in the next major release: remove
 	/**
 	 * Returns id.
 	 * @deprecated
@@ -605,7 +605,7 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 		throw new Error("id was renamed to ids and type changed to string[]");
 	}
 
-	// TODO webpack 6 remove
+	// TODO in the next major release: remove
 	/**
 	 * Returns id.
 	 * @deprecated
@@ -614,7 +614,7 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 		throw new Error("id was renamed to ids and type changed to string[]");
 	}
 
-	// TODO webpack 6 remove
+	// TODO in the next major release: remove
 	/**
 	 * Updates id.
 	 * @deprecated
@@ -631,25 +631,25 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 	 * Returns the export name this dependency requests from its target module (lazy barrel optimization).
 	 * @returns {string | true | null} export name, true for all exports, null for none
 	 */
-	getForwardId() {
+	get forwardId() {
 		return this.ids.length > 0 ? this.ids[0] : true;
 	}
 
 	/**
 	 * Returns how this dependency may be deferred when its parent module is side-effect-free (lazy barrel optimization).
-	 * @returns {LazyUntil | null} lazy classification, null when it must be processed eagerly
+	 * @returns {LazyRole | null} lazy classification, null when it must be processed eagerly
 	 */
-	getLazyUntil() {
+	get lazyRole() {
 		return this.name !== null
-			? Dependency.LAZY_UNTIL_ID
-			: Dependency.LAZY_UNTIL_FALLBACK;
+			? Dependency.LAZY_NAMED_REEXPORT
+			: Dependency.LAZY_STAR_REEXPORT;
 	}
 
 	/**
-	 * Returns the export name for a `LAZY_UNTIL_LOCAL`/`LAZY_UNTIL_ID` classification (lazy barrel optimization).
+	 * Returns the export name for a `LAZY_LOCAL_EXPORT`/`LAZY_NAMED_REEXPORT` classification (lazy barrel optimization).
 	 * @returns {string | null} export name, null when not applicable
 	 */
-	getLazyName() {
+	get lazyName() {
 		return this.name;
 	}
 
@@ -854,7 +854,7 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 		for (const item of /** @type {NormalReexportItem[]} */ (mode.items)) {
 			if (item.hidden || item.checked) continue;
 			const usedName = exportsInfo.getUsedName(item.ids, runtime);
-			if (usedName instanceof InlinedUsedName) {
+			if (isInlinedUsedName(usedName)) {
 				hash.update(`${item.name}:${item.ids.join(".")}:`);
 				usedName.updateHash(hash);
 			}
@@ -992,7 +992,7 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 
 		const { names, dependencyIndices } = moduleGraph.cached(
 			determineExportAssignments,
-			/** @type {HarmonyExportImportedSpecifierDependency[]} */
+			/** @type {ESMExportImportedSpecifierDependency[]} */
 			(this.otherStarExports),
 			this
 		);
@@ -1015,7 +1015,8 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 
 		switch (mode.type) {
 			case "missing":
-				return;
+				// The target may appear on a later build, so this export set cannot be cached.
+				return { exports: [], dependencies: [] };
 			case "dynamic-reexport": {
 				const from =
 					/** @type {ModuleGraphConnection} */
@@ -1203,7 +1204,7 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 			.getReadOnlyExportInfo(this.name);
 		if (!exportInfo.hasCircularTarget(moduleGraph)) return;
 		return [
-			new HarmonyLinkingError(
+			new ESMLinkingError(
 				`export '${ids.join(".")}' (reexported as '${
 					this.name
 				}') is part of a circular reexport chain in '${
@@ -1274,7 +1275,7 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 							this.allStarExports
 								? this.allStarExports.dependencies
 								: [
-										.../** @type {ReadonlyArray<HarmonyExportImportedSpecifierDependency>} */
+										.../** @type {ReadonlyArray<ESMExportImportedSpecifierDependency>} */
 										(this.otherStarExports),
 										this
 									]
@@ -1304,7 +1305,7 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 					for (const [request, exports] of conflicts) {
 						if (!errors) errors = [];
 						errors.push(
-							new HarmonyLinkingError(
+							new ESMLinkingError(
 								`The requested module '${
 									this.request
 								}' contains conflicting star exports for the ${
@@ -1360,13 +1361,15 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 	}
 }
 
-makeSerializable(
-	HarmonyExportImportedSpecifierDependency,
+makeSerializable(ESMExportImportedSpecifierDependency, [
+	"webpack/lib/dependencies/esm/ESMExportImportedSpecifierDependency",
+	// TODO in the next major release: remove, it restores the packs written
+	// under the name the file had before the ESM rename
 	"webpack/lib/dependencies/HarmonyExportImportedSpecifierDependency"
-);
+]);
 
-HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedSpecifierDependencyTemplate extends (
-	HarmonyImportDependency.Template
+ESMExportImportedSpecifierDependency.Template = class ESMExportImportedSpecifierDependencyTemplate extends (
+	ESMImportDependency.Template
 ) {
 	/**
 	 * Applies the plugin by registering its hooks on the compiler.
@@ -1378,7 +1381,7 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 	apply(dependency, source, templateContext) {
 		const { moduleGraph, runtime, concatenationScope } = templateContext;
 
-		const dep = /** @type {HarmonyExportImportedSpecifierDependency} */ (
+		const dep = /** @type {ESMExportImportedSpecifierDependency} */ (
 			dependency
 		);
 
@@ -1425,7 +1428,7 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 	/**
 	 * Add export fragments.
 	 * @param {InitFragment<GenerateContext>[]} initFragments target array for init fragments
-	 * @param {HarmonyExportImportedSpecifierDependency} dep dependency
+	 * @param {ESMExportImportedSpecifierDependency} dep dependency
 	 * @param {ExportMode} mode the export mode
 	 * @param {Module} module the current module
 	 * @param {ModuleGraph} moduleGraph the module graph
@@ -1458,6 +1461,16 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 					concatenationScope
 				).createModuleReference(importedModule, { asiSafe: true })
 			: dep.getImportVar(moduleGraph);
+
+		const defaultImportVar = inScope
+			? /** @type {ConcatenationScope} */ (
+					concatenationScope
+				).createModuleReference(importedModule, {
+					ids: ["default"],
+					asiSafe: true
+				})
+			: dep.getImportVar(moduleGraph);
+
 		// whole-namespace modes need the original export names, not mangled ones
 		const namespaceImportVar = inScope
 			? /** @type {ConcatenationScope} */ (
@@ -1501,7 +1514,7 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 				initFragments.push(
 					new InitFragment(
 						"/* empty/unused harmony star reexport */\n",
-						InitFragment.STAGE_HARMONY_EXPORTS,
+						InitFragment.STAGE_ESM_EXPORTS,
 						1
 					)
 				);
@@ -1513,24 +1526,13 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 						`${Template.toNormalComment(
 							`unused harmony reexport ${mode.name}`
 						)}\n`,
-						InitFragment.STAGE_HARMONY_EXPORTS,
+						InitFragment.STAGE_ESM_EXPORTS,
 						1
 					)
 				);
 				break;
 
 			case "reexport-dynamic-default": {
-				// `${importVar}_default` names the interop variable that the import
-				// statement declares. An in-scope target has no import statement, so
-				// reference its default export and let the concatenation resolve it.
-				const defaultAccess = inScope
-					? /** @type {ConcatenationScope} */ (
-							concatenationScope
-						).createModuleReference(importedModule, {
-							ids: ["default"],
-							asiSafe: true
-						})
-					: importVar;
 				initFragments.push(
 					this.getReexportFragment(
 						module,
@@ -1538,7 +1540,7 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 						moduleGraph
 							.getExportsInfo(module)
 							.getUsedName(/** @type {string} */ (mode.name), runtime),
-						defaultAccess,
+						defaultImportVar,
 						inScope ? "" : null,
 						runtimeRequirements
 					)
@@ -1605,7 +1607,7 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 						moduleGraph
 							.getExportsInfo(module)
 							.getUsedName(/** @type {string} */ (mode.name), runtime),
-						importVar,
+						defaultImportVar,
 						"",
 						runtimeRequirements
 					)
@@ -1670,8 +1672,8 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 									runtimeRequirements
 								)}`,
 								moduleGraph.isAsync(importedModule)
-									? InitFragment.STAGE_ASYNC_HARMONY_IMPORTS
-									: InitFragment.STAGE_HARMONY_IMPORTS,
+									? InitFragment.STAGE_ASYNC_ESM_IMPORTS
+									: InitFragment.STAGE_ESM_IMPORTS,
 								/** @type {number} */ (dep.sourceOrder),
 								key,
 								runtimeCondition
@@ -1733,8 +1735,8 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 					new InitFragment(
 						`${content}\n/* harmony reexport (unknown) */ ${RuntimeGlobals.definePropertyGetters}(${exportsName}, __WEBPACK_REEXPORT_OBJECT__);\n`,
 						moduleGraph.isAsync(importedModule)
-							? InitFragment.STAGE_ASYNC_HARMONY_IMPORTS
-							: InitFragment.STAGE_HARMONY_IMPORTS,
+							? InitFragment.STAGE_ASYNC_ESM_IMPORTS
+							: InitFragment.STAGE_ESM_IMPORTS,
 						/** @type {number} */ (dep.sourceOrder)
 					)
 				);
@@ -1755,7 +1757,7 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 	 * @param {UsedName | null} valueKey value key
 	 * @param {RuntimeRequirements} runtimeRequirements runtime requirements
 	 * @param {string[]=} ids original ids on the imported side (for inline-rendering comment)
-	 * @returns {HarmonyExportInitFragment} harmony export init fragment
+	 * @returns {ESMExportInitFragment} harmony export init fragment
 	 */
 	getReexportFragment(
 		module,
@@ -1778,7 +1780,7 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 			type: ExportBindingType.Getter
 		});
 
-		return new HarmonyExportInitFragment(module.exportsArgument, map);
+		return new ESMExportInitFragment(module.exportsArgument, map);
 	}
 
 	/**
@@ -1788,7 +1790,7 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 	 * @param {string} name name
 	 * @param {number} fakeType fake type
 	 * @param {RuntimeRequirements} runtimeRequirements runtime requirements
-	 * @returns {[InitFragment<GenerateContext>, HarmonyExportInitFragment]} init fragments
+	 * @returns {[InitFragment<GenerateContext>, ESMExportInitFragment]} init fragments
 	 */
 	getReexportFakeNamespaceObjectFragments(
 		module,
@@ -1817,7 +1819,7 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 				-1,
 				`${name}_namespace_cache`
 			),
-			new HarmonyExportInitFragment(module.exportsArgument, map)
+			new ESMExportInitFragment(module.exportsArgument, map)
 		];
 	}
 
@@ -1869,7 +1871,7 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 				-1,
 				`${name}_deferred_namespace_cache`
 			),
-			new HarmonyExportInitFragment(module.exportsArgument, map)
+			new ESMExportInitFragment(module.exportsArgument, map)
 		];
 	}
 
@@ -1912,7 +1914,7 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 	/**
 	 * Returns value.
 	 * @param {string} name name
-	 * @param {null | false | string | string[] | import("../optimize/InlineExports").InlinedUsedName} valueKey value key
+	 * @param {null | false | string | string[] | import("../../optimize/InlineExports").InlinedUsedName} valueKey value key
 	 * @param {string[]=} ids original imported ids (for inline-rendering comment)
 	 * @returns {string | undefined} value
 	 */
@@ -1929,7 +1931,7 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 			return "/* unused export */ undefined";
 		}
 
-		if (valueKey instanceof InlinedUsedName) {
+		if (isInlinedUsedName(valueKey)) {
 			// Re-export forwards the source export's inlined literal as its own runtime value
 			return valueKey.render(
 				Template.toNormalComment(`inlined export ${propertyAccess(ids || [])}`)
@@ -1940,15 +1942,15 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 	}
 };
 
-class HarmonyStarExportsList {
+class ESMStarExportsList {
 	constructor() {
-		/** @type {HarmonyExportImportedSpecifierDependency[]} */
+		/** @type {ESMExportImportedSpecifierDependency[]} */
 		this.dependencies = [];
 	}
 
 	/**
 	 * Processes the provided dep.
-	 * @param {HarmonyExportImportedSpecifierDependency} dep dependency
+	 * @param {ESMExportImportedSpecifierDependency} dep dependency
 	 * @returns {void}
 	 */
 	push(dep) {
@@ -1979,13 +1981,26 @@ class HarmonyStarExportsList {
 }
 
 makeSerializable(
-	HarmonyStarExportsList,
-	"webpack/lib/dependencies/HarmonyExportImportedSpecifierDependency",
-	"HarmonyStarExportsList"
+	ESMStarExportsList,
+	[
+		"webpack/lib/dependencies/esm/ESMExportImportedSpecifierDependency",
+		// TODO in the next major release: remove, it restores the packs written
+		// under the file's and the list's names before the ESM rename
+		[
+			"webpack/lib/dependencies/HarmonyExportImportedSpecifierDependency",
+			"HarmonyStarExportsList"
+		]
+	],
+	"ESMStarExportsList"
 );
 
-HarmonyExportImportedSpecifierDependency.HarmonyStarExportsList =
-	HarmonyStarExportsList;
-HarmonyExportImportedSpecifierDependency.idsSymbol = idsSymbol;
+ESMExportImportedSpecifierDependency.ESMStarExportsList = ESMStarExportsList;
+ESMExportImportedSpecifierDependency.idsSymbol = idsSymbol;
+
+/** @type {Set<keyof DependencyKinds>} */
+ESMExportImportedSpecifierDependency.KINDS = new Set([
+	...ESMImportDependency.KINDS,
+	"esm-reexport"
+]);
 
-module.exports = HarmonyExportImportedSpecifierDependency;
+module.exports = ESMExportImportedSpecifierDependency;