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

package/lib/dependencies/{HarmonyEvaluatedImportSpecifierDependency.js → esm/ESMEvaluatedImportSpecifierDependency.js}

@@ -5,25 +5,25 @@
 
 "use strict";
 
-const { InlinedUsedName } = require("../optimize/InlineExports");
+const { isInlinedUsedName } = require("../../optimize/InlineExports");
 const {
 	getDependencyUsedByExportsCondition
-} = require("../optimize/InnerGraph");
-const makeSerializable = require("../util/makeSerializable");
-const { ExportPresenceModes } = require("./HarmonyImportDependency");
-const HarmonyImportSpecifierDependency = require("./HarmonyImportSpecifierDependency");
-const { ImportPhase } = require("./ImportPhase");
+} = require("../../optimize/InnerGraph");
+const makeSerializable = require("../../util/makeSerializable");
+const { ImportPhase } = require("../core/ImportPhase");
+const { ExportPresenceModes } = require("./ESMImportDependency");
+const ESMImportSpecifierDependency = require("./ESMImportSpecifierDependency");
 
 /** @import { ReplaceSource } from "webpack-sources" */
-/** @import Dependency, { GetConditionFn } from "../Dependency" */
-/** @import { DependencyTemplateContext } from "../DependencyTemplate" */
-/** @import { BuildMeta } from "../Module" */
-/** @import ModuleGraph from "../ModuleGraph" */
-/** @import ModuleGraphConnection from "../ModuleGraphConnection" */
-/** @import { ImportAttributes, Range } from "../javascript/JavascriptParser" */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<string[]>} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<string[]>} ObjectSerializerContext */
-/** @import { Ids } from "./HarmonyImportDependency" */
+/** @import Dependency, { GetConditionFn, DependencyKinds } from "../../graph/Dependency" */
+/** @import { DependencyTemplateContext } from "../../template/DependencyTemplate" */
+/** @import { BuildMeta } from "../../module/Module" */
+/** @import ModuleGraph from "../../graph/ModuleGraph" */
+/** @import ModuleGraphConnection from "../../graph/ModuleGraphConnection" */
+/** @import { ImportAttributes, Range } from "../../javascript/JavascriptParser" */
+/** @typedef {import("../../serialization/ObjectMiddleware").ObjectDeserializerContext<string[]>} ObjectDeserializerContext */
+/** @typedef {import("../../serialization/ObjectMiddleware").ObjectSerializerContext<string[]>} ObjectSerializerContext */
+/** @import { Ids } from "./ESMImportDependency" */
 
 /**
  * Dependency for static evaluating import specifier. e.g.
@@ -32,14 +32,9 @@ const { ImportPhase } = require("./ImportPhase");
  * "x" in a;
  * a.x !== undefined; // if x value statically analyzable
  */
-class HarmonyEvaluatedImportSpecifierDependency extends HarmonyImportSpecifierDependency {
-	// read by `HarmonyImportGuard` in place of `instanceof`, which would cycle
-	get isHarmonyEvaluatedImportSpecifier() {
-		return true;
-	}
-
+class ESMEvaluatedImportSpecifierDependency extends ESMImportSpecifierDependency {
 	/**
-	 * Creates an instance of HarmonyEvaluatedImportSpecifierDependency.
+	 * Creates an instance of ESMEvaluatedImportSpecifierDependency.
 	 * @param {string} request the request string
 	 * @param {number} sourceOrder source order
 	 * @param {Ids} ids ids
@@ -100,13 +95,15 @@ class HarmonyEvaluatedImportSpecifierDependency extends HarmonyImportSpecifierDe
 	}
 }
 
-makeSerializable(
-	HarmonyEvaluatedImportSpecifierDependency,
+makeSerializable(ESMEvaluatedImportSpecifierDependency, [
+	"webpack/lib/dependencies/esm/ESMEvaluatedImportSpecifierDependency",
+	// 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/HarmonyEvaluatedImportSpecifierDependency"
-);
+]);
 
-HarmonyEvaluatedImportSpecifierDependency.Template = class HarmonyEvaluatedImportSpecifierDependencyTemplate extends (
-	HarmonyImportSpecifierDependency.Template
+ESMEvaluatedImportSpecifierDependency.Template = class ESMEvaluatedImportSpecifierDependencyTemplate extends (
+	ESMImportSpecifierDependency.Template
 ) {
 	/**
 	 * Applies the plugin by registering its hooks on the compiler.
@@ -117,7 +114,7 @@ HarmonyEvaluatedImportSpecifierDependency.Template = class HarmonyEvaluatedImpor
 	 */
 	apply(dependency, source, templateContext) {
 		const dep =
-			/** @type {HarmonyEvaluatedImportSpecifierDependency} */
+			/** @type {ESMEvaluatedImportSpecifierDependency} */
 			(dependency);
 		const { module, moduleGraph, runtime } = templateContext;
 		const connection = moduleGraph.getConnection(dep);
@@ -176,7 +173,7 @@ HarmonyEvaluatedImportSpecifierDependency.Template = class HarmonyEvaluatedImpor
 		} else {
 			const usedName = exportsInfo.getUsedName(ids, runtime);
 
-			if (usedName instanceof InlinedUsedName) {
+			if (isInlinedUsedName(usedName)) {
 				// Inlined exports only work with ESM export dependency
 				// which only existed in modules with `namespace` exportsType.
 				throw new Error(
@@ -202,4 +199,10 @@ HarmonyEvaluatedImportSpecifierDependency.Template = class HarmonyEvaluatedImpor
 	}
 };
 
-module.exports = HarmonyEvaluatedImportSpecifierDependency;
+/** @type {Set<keyof DependencyKinds>} */
+ESMEvaluatedImportSpecifierDependency.KINDS = new Set([
+	...ESMImportSpecifierDependency.KINDS,
+	"esm-evaluated-import-specifier"
+]);
+
+module.exports = ESMEvaluatedImportSpecifierDependency;

package/lib/dependencies/{HarmonyExportDependencyParserPlugin.js → esm/ESMExportDependencyParserPlugin.js}

@@ -5,23 +5,24 @@
 
 "use strict";
 
-const CompatibilityPlugin = require("../CompatibilityPlugin");
-const WebpackError = require("../errors/WebpackError");
-const { getImportAttributes } = require("../javascript/JavascriptParser");
-const { CONST_BINDING_TAG } = require("../optimize/ConstExportsPlugin");
-const { toInlinedValue } = require("../optimize/InlineExports");
-const { getInnerGraphUtils } = require("../optimize/InnerGraph");
-const ConstDependency = require("./ConstDependency");
-const HarmonyExportExpressionDependency = require("./HarmonyExportExpressionDependency");
-const HarmonyExportHeaderDependency = require("./HarmonyExportHeaderDependency");
-const HarmonyExportImportedSpecifierDependency = require("./HarmonyExportImportedSpecifierDependency");
-const HarmonyExportSpecifierDependency = require("./HarmonyExportSpecifierDependency");
-const { ExportPresenceModes } = require("./HarmonyImportDependency");
+const WebpackError = require("../../errors/WebpackError");
+const CompatibilityPlugin = require("../../javascript/CompatibilityPlugin");
+const { getImportAttributes } = require("../../javascript/JavascriptParser");
+const { CONST_BINDING_TAG } = require("../../optimize/ConstExportsPlugin");
+const { toInlinedValue } = require("../../optimize/InlineExports");
+const { getInnerGraphUtils } = require("../../optimize/InnerGraph");
+const ConstDependency = require("../core/ConstDependency");
 const {
-	harmonySpecifierTag
-} = require("./HarmonyImportDependencyParserPlugin");
-const HarmonyImportSideEffectDependency = require("./HarmonyImportSideEffectDependency");
-const { ImportPhaseUtils, createGetImportPhase } = require("./ImportPhase");
+	ImportPhaseUtils,
+	createGetImportPhase
+} = require("../core/ImportPhase");
+const ESMExportExpressionDependency = require("./ESMExportExpressionDependency");
+const ESMExportHeaderDependency = require("./ESMExportHeaderDependency");
+const ESMExportImportedSideEffectDependency = require("./ESMExportImportedSideEffectDependency");
+const ESMExportImportedSpecifierDependency = require("./ESMExportImportedSpecifierDependency");
+const ESMExportSpecifierDependency = require("./ESMExportSpecifierDependency");
+const { ExportPresenceModes } = require("./ESMImportDependency");
+const { harmonySpecifierTag } = require("./ESMImportDependencyParserPlugin");
 
 /**
  * @import {
@@ -33,19 +34,19 @@ const { ImportPhaseUtils, createGetImportPhase } = require("./ImportPhase");
 /**
  * @import {
  * 	JavascriptParserOptions
- * } from "../../declarations/WebpackOptions"
+ * } from "../../../declarations/WebpackOptions"
  */
-/** @import JavascriptParser, { Range } from "../javascript/JavascriptParser" */
-/** @import { HarmonySettings } from "./HarmonyImportDependencyParserPlugin" */
-/** @import { CompatibilitySettings } from "../CompatibilityPlugin" */
+/** @import JavascriptParser, { Range } from "../../javascript/JavascriptParser" */
+/** @import { ESMSettings } from "./ESMImportDependencyParserPlugin" */
+/** @import { CompatibilitySettings } from "../../javascript/CompatibilityPlugin" */
 
-const { HarmonyStarExportsList } = HarmonyExportImportedSpecifierDependency;
+const { ESMStarExportsList } = ESMExportImportedSpecifierDependency;
 
-const PLUGIN_NAME = "HarmonyExportDependencyParserPlugin";
+const PLUGIN_NAME = "ESMExportDependencyParserPlugin";
 
-module.exports = class HarmonyExportDependencyParserPlugin {
+module.exports = class ESMExportDependencyParserPlugin {
 	/**
-	 * Creates an instance of HarmonyExportDependencyParserPlugin.
+	 * Creates an instance of ESMExportDependencyParserPlugin.
 	 * @param {JavascriptParserOptions} options options
 	 */
 	constructor(options) {
@@ -70,7 +71,7 @@ module.exports = class HarmonyExportDependencyParserPlugin {
 		);
 
 		parser.hooks.export.tap(PLUGIN_NAME, (statement) => {
-			const dep = new HarmonyExportHeaderDependency(
+			const dep = new ESMExportHeaderDependency(
 				statement.declaration && statement.declaration.range,
 				/** @type {Range} */ (statement.range)
 			);
@@ -79,8 +80,8 @@ module.exports = class HarmonyExportDependencyParserPlugin {
 			return true;
 		});
 		parser.hooks.exportImport.tap(PLUGIN_NAME, (statement, source) => {
-			parser.state.lastHarmonyImportOrder =
-				(parser.state.lastHarmonyImportOrder || 0) + 1;
+			parser.state.lastESMImportOrder =
+				(parser.state.lastESMImportOrder || 0) + 1;
 			const clearDep = new ConstDependency(
 				"",
 				/** @type {Range} */ (statement.range)
@@ -96,18 +97,13 @@ module.exports = class HarmonyExportDependencyParserPlugin {
 				error.loc = parser.getLocation(statement) || undefined;
 				parser.state.current.addError(error);
 			}
-			const sideEffectDep = new HarmonyImportSideEffectDependency(
+			const sideEffectDep = new ESMExportImportedSideEffectDependency(
 				/** @type {string} */ (source),
-				parser.state.lastHarmonyImportOrder,
+				parser.state.lastESMImportOrder,
 				phase,
 				getImportAttributes(statement)
 			);
 			sideEffectDep.setLocWithIndex(parser.getLocation(statement), -1);
-			// lazy barrel: defer at parse time when the importing module is side-effect-free
-			const moduleFactoryMeta = parser.state.module.factoryMeta;
-			if (moduleFactoryMeta !== undefined && moduleFactoryMeta.sideEffectFree) {
-				sideEffectDep.setLazy(true);
-			}
 			parser.state.current.addDependency(sideEffectDep);
 			return true;
 		});
@@ -125,25 +121,25 @@ module.exports = class HarmonyExportDependencyParserPlugin {
 				}
 				const name = statement.declaration.name;
 				const settings =
-					/** @type {HarmonySettings | undefined} */
+					/** @type {ESMSettings | undefined} */
 					(parser.getTagData(name, harmonySpecifierTag));
 				if (!settings || settings.ids.length !== 0) return;
 				settings.used = true;
 				if (ImportPhaseUtils.isDefer(settings.phase)) return;
-				const harmonyNamedExports = (parser.state.harmonyNamedExports =
-					parser.state.harmonyNamedExports || new Set());
-				harmonyNamedExports.add("default");
+				const esmNamedExports = (parser.state.esmNamedExports =
+					parser.state.esmNamedExports || new Set());
+				esmNamedExports.add("default");
 				getInnerGraphUtils(parser.state.compilation).addVariableUsage(
 					parser,
 					name,
 					"default"
 				);
-				const dep = new HarmonyExportImportedSpecifierDependency(
+				const dep = new ESMExportImportedSpecifierDependency(
 					settings.source,
 					settings.sourceOrder,
 					settings.ids,
 					"default",
-					harmonyNamedExports,
+					esmNamedExports,
 					null,
 					exportPresenceMode,
 					null,
@@ -151,19 +147,11 @@ module.exports = class HarmonyExportDependencyParserPlugin {
 					settings.attributes
 				);
 
-				// lazy barrel: defer the re-export at parse time when the importing module is side-effect-free
-				const moduleFactoryMeta = parser.state.module.factoryMeta;
-				if (
-					moduleFactoryMeta !== undefined &&
-					moduleFactoryMeta.sideEffectFree
-				) {
-					dep.setLazy(true);
-				}
 				dep.setLocWithIndex(parser.getLocation(statement), -1);
 				parser.state.current.addDependency(dep);
 
 				// no range erases the whole statement, as for `export { ns as default }`
-				const headerDep = new HarmonyExportHeaderDependency(
+				const headerDep = new ESMExportHeaderDependency(
 					undefined,
 					/** @type {Range} */ (statement.range)
 				);
@@ -182,7 +170,7 @@ module.exports = class HarmonyExportDependencyParserPlugin {
 				: toInlinedValue(
 						parser.evaluateExpression(/** @type {Expression} */ (node))
 					);
-			const dep = new HarmonyExportExpressionDependency(
+			const dep = new ESMExportExpressionDependency(
 				exprRange,
 				statementRange,
 				comments
@@ -257,12 +245,12 @@ module.exports = class HarmonyExportDependencyParserPlugin {
 				}
 
 				const settings =
-					/** @type {HarmonySettings} */
+					/** @type {ESMSettings} */
 					(parser.getTagData(id, harmonySpecifierTag));
 				if (settings) settings.used = true;
-				const harmonyNamedExports = (parser.state.harmonyNamedExports =
-					parser.state.harmonyNamedExports || new Set());
-				harmonyNamedExports.add(name);
+				const esmNamedExports = (parser.state.esmNamedExports =
+					parser.state.esmNamedExports || new Set());
+				esmNamedExports.add(name);
 				getInnerGraphUtils(parser.state.compilation).addVariableUsage(
 					parser,
 					id,
@@ -270,35 +258,26 @@ module.exports = class HarmonyExportDependencyParserPlugin {
 				);
 				const tagData = settings
 					? undefined
-					: /** @type {{ value?: import("../optimize/InlineExports").InlinedValue } | undefined} */
+					: /** @type {{ value?: import("../../optimize/InlineExports").InlinedValue } | undefined} */
 						(parser.getTagData(id, CONST_BINDING_TAG));
 				const dep = settings
-					? new HarmonyExportImportedSpecifierDependency(
+					? new ESMExportImportedSpecifierDependency(
 							settings.source,
 							settings.sourceOrder,
 							settings.ids,
 							name,
-							harmonyNamedExports,
+							esmNamedExports,
 							null,
 							exportPresenceMode,
 							null,
 							settings.phase,
 							settings.attributes
 						)
-					: new HarmonyExportSpecifierDependency(
+					: new ESMExportSpecifierDependency(
 							id,
 							name,
 							tagData ? tagData.value || null : undefined
 						);
-				// lazy barrel: defer the re-export at parse time when the importing module is side-effect-free
-				const moduleFactoryMeta = parser.state.module.factoryMeta;
-				if (
-					settings &&
-					moduleFactoryMeta !== undefined &&
-					moduleFactoryMeta.sideEffectFree
-				) {
-					dep.setLazy(true);
-				}
 				dep.setLocWithIndex(
 					parser.getLocation(statement),
 					/** @type {number} */ (idx)
@@ -317,42 +296,34 @@ module.exports = class HarmonyExportDependencyParserPlugin {
 		parser.hooks.exportImportSpecifier.tap(
 			PLUGIN_NAME,
 			(statement, source, id, name, idx) => {
-				const harmonyNamedExports = (parser.state.harmonyNamedExports =
-					parser.state.harmonyNamedExports || new Set());
-				/** @type {InstanceType<HarmonyStarExportsList> | null} */
-				let harmonyStarExports = null;
+				const esmNamedExports = (parser.state.esmNamedExports =
+					parser.state.esmNamedExports || new Set());
+				/** @type {InstanceType<ESMStarExportsList> | null} */
+				let esmStarExports = null;
 				if (name) {
-					harmonyNamedExports.add(name);
+					esmNamedExports.add(name);
 				} else {
-					harmonyStarExports = parser.state.harmonyStarExports =
-						parser.state.harmonyStarExports || new HarmonyStarExportsList();
+					esmStarExports = parser.state.esmStarExports =
+						parser.state.esmStarExports || new ESMStarExportsList();
 				}
 				const attributes = getImportAttributes(statement);
-				const dep = new HarmonyExportImportedSpecifierDependency(
+				const dep = new ESMExportImportedSpecifierDependency(
 					/** @type {string} */
 					(source),
 					/** @type {number} */
-					(parser.state.lastHarmonyImportOrder),
+					(parser.state.lastESMImportOrder),
 					id ? [id] : [],
 					name,
-					harmonyNamedExports,
+					esmNamedExports,
 					// eslint-disable-next-line unicorn/prefer-spread
-					harmonyStarExports && harmonyStarExports.slice(),
+					esmStarExports && esmStarExports.slice(),
 					exportPresenceMode,
-					harmonyStarExports,
+					esmStarExports,
 					getImportPhase(parser, statement),
 					attributes
 				);
-				if (harmonyStarExports) {
-					harmonyStarExports.push(dep);
-				}
-				// lazy barrel: defer the re-export at parse time when the importing module is side-effect-free
-				const moduleFactoryMeta = parser.state.module.factoryMeta;
-				if (
-					moduleFactoryMeta !== undefined &&
-					moduleFactoryMeta.sideEffectFree
-				) {
-					dep.setLazy(true);
+				if (esmStarExports) {
+					esmStarExports.push(dep);
 				}
 				dep.setLocWithIndex(
 					parser.getLocation(statement),

package/lib/dependencies/{HarmonyExportExpressionDependency.js → esm/ESMExportExpressionDependency.js}

@@ -5,42 +5,43 @@
 
 "use strict";
 
-const ConcatenationScope = require("../ConcatenationScope");
-const Dependency = require("../Dependency");
-const InitFragment = require("../InitFragment");
-const RuntimeGlobals = require("../RuntimeGlobals");
-const { InlinedUsedName } = require("../optimize/InlineExports");
-const makeSerializable = require("../util/makeSerializable");
-const { propertyAccess } = require("../util/property");
+const Dependency = require("../../graph/Dependency");
+const ConcatenationScope = require("../../optimize/ConcatenationScope");
+const { isInlinedUsedName } = require("../../optimize/InlineExports");
+const RuntimeGlobals = require("../../runtime/RuntimeGlobals");
+const InitFragment = require("../../template/InitFragment");
+const makeSerializable = require("../../util/makeSerializable");
+const { propertyAccess } = require("../../util/property");
 
-const HarmonyExportInitFragment = require("./HarmonyExportInitFragment");
+const NullDependency = require("../core/NullDependency");
+const ESMExportInitFragment = require("./ESMExportInitFragment");
 
-const { ExportBindingType } = HarmonyExportInitFragment;
-
-const NullDependency = require("./NullDependency");
+const { ExportBindingType } = ESMExportInitFragment;
 
 const DEFAULT_EXPORT_NAME = "default";
 
 /** @import { ReplaceSource } from "webpack-sources" */
-/** @import { ExportsSpec, LazyUntil } from "../Dependency" */
-/** @import { DependencyTemplateContext } from "../DependencyTemplate" */
-/** @import ModuleGraph from "../ModuleGraph" */
-/** @import { ConnectionState } from "../ModuleGraphConnection" */
-/** @import { InlinedValue } from "../optimize/InlineExports" */
-/** @import { Range } from "../javascript/JavascriptParser" */
+/** @import { ExportsSpec, LazyRole, UpdateHashContext } from "../../graph/Dependency" */
+/** @import Module, { BuildInfo } from "../../module/Module" */
+/** @import Hash from "../../util/Hash" */
+/** @import { DependencyTemplateContext } from "../../template/DependencyTemplate" */
+/** @import ModuleGraph from "../../graph/ModuleGraph" */
+/** @import { ConnectionState } from "../../graph/ModuleGraphConnection" */
+/** @import { InlinedValue } from "../../optimize/InlineExports" */
+/** @import { Range } from "../../javascript/JavascriptParser" */
 /** @typedef {string | { id?: string | undefined, range: Range, prefix: string, suffix: string }} DeclarationId */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[Range, Range, string, DeclarationId | undefined, boolean, boolean]>} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[Range, Range, string, DeclarationId | undefined, boolean, boolean]>} ObjectSerializerContext */
-/** @import { ExportMap } from "./HarmonyExportInitFragment" */
+/** @typedef {import("../../serialization/ObjectMiddleware").ObjectDeserializerContext<[Range, Range, string, DeclarationId | undefined, boolean, boolean]>} ObjectDeserializerContext */
+/** @typedef {import("../../serialization/ObjectMiddleware").ObjectSerializerContext<[Range, Range, string, DeclarationId | undefined, boolean, boolean]>} ObjectSerializerContext */
+/** @import { ExportMap } from "./ESMExportInitFragment" */
 /**
  * @import {
  * 	JavascriptModuleBuildInfo
- * } from "../javascript/JavascriptModule"
+ * } from "../../javascript/JavascriptModule"
  */
 
-class HarmonyExportExpressionDependency extends NullDependency {
+class ESMExportExpressionDependency extends NullDependency {
 	/**
-	 * Creates an instance of HarmonyExportExpressionDependency.
+	 * Creates an instance of ESMExportExpressionDependency.
 	 * @param {Range} range range
 	 * @param {Range} rangeStatement range statement
 	 * @param {string} prefix prefix
@@ -67,17 +68,17 @@ class HarmonyExportExpressionDependency extends NullDependency {
 
 	/**
 	 * 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() {
-		return Dependency.LAZY_UNTIL_LOCAL;
+	get lazyRole() {
+		return Dependency.LAZY_LOCAL_EXPORT;
 	}
 
 	/**
-	 * 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 DEFAULT_EXPORT_NAME;
 	}
 
@@ -120,6 +121,24 @@ class HarmonyExportExpressionDependency extends NullDependency {
 		return false;
 	}
 
+	/**
+	 * Updates the hash with the data contributed by this instance.
+	 * @param {Hash} hash hash to be updated
+	 * @param {UpdateHashContext} context context
+	 * @returns {void}
+	 */
+	updateHash(hash, context) {
+		// the module's cycles, known only after it is built, pick value or getter
+		const module = /** @type {Module} */ (
+			context.chunkGraph.moduleGraph.getParentModule(this)
+		);
+		hash.update(
+			/** @type {BuildInfo} */ (module.buildInfo).isCircular === false
+				? "value"
+				: "getter"
+		);
+	}
+
 	/**
 	 * Serializes this instance into the provided serializer context.
 	 * @param {ObjectSerializerContext} context context
@@ -158,12 +177,14 @@ class HarmonyExportExpressionDependency extends NullDependency {
 	}
 }
 
-makeSerializable(
-	HarmonyExportExpressionDependency,
+makeSerializable(ESMExportExpressionDependency, [
+	"webpack/lib/dependencies/esm/ESMExportExpressionDependency",
+	// 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/HarmonyExportExpressionDependency"
-);
+]);
 
-HarmonyExportExpressionDependency.Template = class HarmonyExportDependencyTemplate extends (
+ESMExportExpressionDependency.Template = class ESMExportDependencyTemplate extends (
 	NullDependency.Template
 ) {
 	/**
@@ -188,9 +209,16 @@ HarmonyExportExpressionDependency.Template = class HarmonyExportDependencyTempla
 			!templateContext.concatenationScope.isWrapped()
 				? templateContext.concatenationScope
 				: undefined;
-		const dep = /** @type {HarmonyExportExpressionDependency} */ (dependency);
+		const dep = /** @type {ESMExportExpressionDependency} */ (dependency);
 		const { declarationId } = dep;
 		const exportsName = module.exportsArgument;
+		const meta = moduleGraph.getMetaIfExisting(module);
+
+		const onDemand =
+			!concatenationScope &&
+			meta !== undefined &&
+			meta.onDemandExports === true;
+
 		if (declarationId) {
 			/** @type {string} */
 			let name;
@@ -218,9 +246,12 @@ HarmonyExportExpressionDependency.Template = class HarmonyExportDependencyTempla
 				const map = new Map();
 				map.set(used, {
 					value: `/* export default binding */ ${name}`,
-					type: ExportBindingType.Getter
+					type: ExportBindingType.Getter,
+					finalName: name
 				});
-				initFragments.push(new HarmonyExportInitFragment(exportsName, map));
+				initFragments.push(
+					new ESMExportInitFragment(exportsName, map, undefined, onDemand)
+				);
 			}
 
 			source.replace(
@@ -235,12 +266,12 @@ HarmonyExportExpressionDependency.Template = class HarmonyExportDependencyTempla
 				(concatenationScope || used)
 			) {
 				// Fix .name for anonymous default export function declarations
-				// see test/test262-cases/test/language/module-code/instn-named-bndng-dflt-fun-anon.js cspell:disable-line
+				// see test/external/test262-cases/test/language/module-code/instn-named-bndng-dflt-fun-anon.js cspell:disable-line
 				runtimeRequirements.add(RuntimeGlobals.setAnonymousDefaultName);
 				initFragments.push(
 					new InitFragment(
 						`${RuntimeGlobals.setAnonymousDefaultName}(${name});\n`,
-						InitFragment.STAGE_HARMONY_EXPORTS,
+						InitFragment.STAGE_ESM_EXPORTS,
 						2
 					)
 				);
@@ -258,15 +289,16 @@ HarmonyExportExpressionDependency.Template = class HarmonyExportDependencyTempla
 					const used = moduleGraph
 						.getExportsInfo(module)
 						.getUsedName(DEFAULT_EXPORT_NAME, runtime);
-					if (used instanceof InlinedUsedName) {
+					if (isInlinedUsedName(used)) {
 						content = `/* inlined harmony default export */ const ${name} = `;
 					} else if (used) {
 						defaultIsUsed = true;
 						runtimeRequirements.add(RuntimeGlobals.exports);
 						// `export default <expr>` binds an immutable const declaration
 						const valueFormat =
-							/** @type {import("../Module").BuildInfo} */ (module.buildInfo)
-								.isCircular === false;
+							/** @type {import("../../module/Module").BuildInfo} */ (
+								module.buildInfo
+							).isCircular === false;
 
 						/** @type {ExportMap} */
 						const map = new Map();
@@ -274,9 +306,12 @@ HarmonyExportExpressionDependency.Template = class HarmonyExportDependencyTempla
 							value: name,
 							type: valueFormat
 								? ExportBindingType.Value
-								: ExportBindingType.Getter
+								: ExportBindingType.Getter,
+							finalName: name
 						});
-						initFragments.push(new HarmonyExportInitFragment(exportsName, map));
+						initFragments.push(
+							new ESMExportInitFragment(exportsName, map, undefined, onDemand)
+						);
 					} else {
 						content = `/* unused harmony default export */ var ${name} = `;
 					}
@@ -288,7 +323,7 @@ HarmonyExportExpressionDependency.Template = class HarmonyExportDependencyTempla
 				const used = moduleGraph
 					.getExportsInfo(module)
 					.getUsedName(DEFAULT_EXPORT_NAME, runtime);
-				if (used instanceof InlinedUsedName) {
+				if (isInlinedUsedName(used)) {
 					content = `/* inlined harmony default export */ var ${name} = `;
 				} else if (used) {
 					defaultIsUsed = true;
@@ -329,7 +364,7 @@ HarmonyExportExpressionDependency.Template = class HarmonyExportDependencyTempla
 				);
 				if (dep.isAnonymousDefault && defaultIsUsed) {
 					// Fix .name for anonymous default export expressions
-					// see test/test262-cases/test/language/module-code/eval-export-dflt-cls-anon.js cspell:disable-line
+					// see test/external/test262-cases/test/language/module-code/eval-export-dflt-cls-anon.js cspell:disable-line
 					runtimeRequirements.add(RuntimeGlobals.setAnonymousDefaultName);
 					source.replace(
 						dep.range[1],
@@ -347,4 +382,4 @@ HarmonyExportExpressionDependency.Template = class HarmonyExportDependencyTempla
 	}
 };
 
-module.exports = HarmonyExportExpressionDependency;
+module.exports = ESMExportExpressionDependency;