@depup/webpack 5.109.0-depup.0 → 5.110.1-depup.0

package/lib/dependencies/HarmonyExportImportedSpecifierDependency.js

@@ -34,41 +34,53 @@ const HarmonyLinkingError = require("./HarmonyLinkingError");
 const { ImportPhaseUtils } = require("./ImportPhase");
 const processExportInfo = require("./processExportInfo");
 
-/** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
-/** @typedef {import("../ChunkGraph")} ChunkGraph */
-/** @typedef {import("../Dependency").ExportsSpec} ExportsSpec */
-/** @typedef {import("../Dependency").GetConditionFn} GetConditionFn */
-/** @typedef {import("../Dependency").LazyUntil} LazyUntil */
-/** @typedef {import("../Dependency").RawReferencedExports} RawReferencedExports */
-/** @typedef {import("../Dependency").ReferencedExports} ReferencedExports */
-/** @typedef {import("../Dependency").TRANSITIVE} TRANSITIVE */
-/** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
-/** @typedef {import("../ExportsInfo")} ExportsInfo */
-/** @typedef {import("../ExportsInfo").ExportInfo} ExportInfo */
-/** @typedef {import("../ExportsInfo").ExportInfoName} ExportInfoName */
-/** @typedef {import("../ExportsInfo").UsedName} UsedName */
-/** @typedef {import("../Generator").GenerateContext} GenerateContext */
-/** @typedef {import("../Module")} Module */
-/** @typedef {import("../Module").BuildMeta} BuildMeta */
-/** @typedef {import("../Module").RuntimeRequirements} RuntimeRequirements */
-/** @typedef {import("../Module").ExportsType} ExportsType */
-/** @typedef {import("../ModuleGraph")} ModuleGraph */
-/** @typedef {import("../ModuleGraphConnection")} ModuleGraphConnection */
-/** @typedef {import("../ModuleGraphConnection").ConnectionState} ConnectionState */
-/** @typedef {import("../RuntimeTemplate")} RuntimeTemplate */
-/** @typedef {import("../errors/WebpackError")} WebpackError */
-/** @typedef {import("../javascript/JavascriptParser").ImportAttributes} ImportAttributes */
+/** @import { ReplaceSource } from "webpack-sources" */
+/** @import ChunkGraph from "../ChunkGraph" */
+/**
+ * @import {
+ * 	ExportsSpec,
+ * 	GetConditionFn,
+ * 	LazyUntil,
+ * 	RawReferencedExports,
+ * 	ReferencedExports,
+ * 	TRANSITIVE,
+ * 	ExportInfoName
+ * } from "../Dependency"
+ */
+/** @import { DependencyTemplateContext } from "../DependencyTemplate" */
+/** @import ExportsInfo, { ExportInfo, UsedName } from "../ExportsInfo" */
+/** @import { GenerateContext } from "../Generator" */
+/**
+ * @import Module, {
+ * 	BuildMeta,
+ * 	RuntimeRequirements,
+ * 	ExportsType
+ * } from "../Module"
+ */
+/** @import ModuleGraph from "../ModuleGraph" */
+/**
+ * @import ModuleGraphConnection, {
+ * 	ConnectionState
+ * } from "../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 */
-/** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
-/** @typedef {import("./HarmonyImportDependency").Ids} Ids */
-/** @typedef {import("./HarmonyImportDependency").ExportPresenceMode} ExportPresenceMode */
-/** @typedef {import("./HarmonyExportInitFragment").ExportMap} ExportMap */
-/** @typedef {import("../dependencies/ImportPhase").ImportPhaseType} ImportPhaseType */
-/** @typedef {import("../javascript/JavascriptModule").JavascriptModuleBuildMeta} JavascriptModuleBuildMeta */
+/** @import { RuntimeSpec } from "../util/runtime" */
+/** @import { Ids, ExportPresenceMode } from "./HarmonyImportDependency" */
+/** @import { ExportMap } from "./HarmonyExportInitFragment" */
+/** @import { ImportPhaseType } from "../dependencies/ImportPhase" */
+/**
+ * @import {
+ * 	JavascriptModuleBuildMeta
+ * } from "../javascript/JavascriptModule"
+ */
+/** @import ConcatenationScope from "../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 */
 
@@ -83,7 +95,7 @@ class NormalReexportItem {
 	 * Creates an instance of NormalReexportItem.
 	 * @param {string} name export name
 	 * @param {Ids} ids reexported ids from other module
-	 * @param {ExportInfo} exportInfo export info from other module
+	 * @param {InstanceType<ExportInfo>} exportInfo export info from other module
 	 * @param {boolean} checked true, if it should be checked at runtime if this export exists
 	 * @param {boolean} hidden true, if it is hidden behind another active export in the same module
 	 */
@@ -92,7 +104,7 @@ class NormalReexportItem {
 		this.name = name;
 		/** @type {Ids} */
 		this.ids = ids;
-		/** @type {ExportInfo} */
+		/** @type {InstanceType<ExportInfo>} */
 		this.exportInfo = exportInfo;
 		/** @type {boolean} */
 		this.checked = checked;
@@ -120,7 +132,7 @@ class ExportMode {
 		// for "reexport-named-default" | "reexport-fake-namespace-object" | "reexport-namespace-object"
 		/** @type {string | null} */
 		this.name = null;
-		/** @type {ExportInfo | null} */
+		/** @type {InstanceType<ExportInfo> | null} */
 		this.partialNamespaceExportInfo = null;
 
 		// for "dynamic-reexport":
@@ -163,7 +175,7 @@ const RETURNS_TRUE = () => true;
  * unrelated cycles in the graph that would otherwise loop forever inside
  * `_findTarget`.
  * @param {ModuleGraph} moduleGraph the module graph
- * @param {ExportInfo} exportInfo export info on the imported module
+ * @param {InstanceType<ExportInfo>} exportInfo export info on the imported module
  * @param {Module} parentModule the module that contains the star reexport
  * @returns {boolean} true when this export reexports back to the parent module under the same name
  */
@@ -191,8 +203,11 @@ const isStarReexportBackToParent = (moduleGraph, exportInfo, parentModule) => {
 	let current = moduleGraph
 		.getExportsInfo(firstTarget.module)
 		.getReadOnlyExportInfo(firstTarget.export[0]);
-	/** @type {Set<ExportInfo>} */
-	const visited = new Set([exportInfo, current]);
+	// Allocated lazily: a single-extra-hop chain that terminates (the common
+	// `barrel -> leaf local binding` case) returns before `next` is ever
+	// computed, so the visited set is pure waste there.
+	/** @type {Set<InstanceType<ExportInfo>> | undefined} */
+	let visited;
 	for (;;) {
 		const target = current.findTarget(moduleGraph, RETURNS_TRUE);
 		if (!target || typeof target !== "object") return false;
@@ -210,6 +225,7 @@ const isStarReexportBackToParent = (moduleGraph, exportInfo, parentModule) => {
 		const next = moduleGraph
 			.getExportsInfo(target.module)
 			.getReadOnlyExportInfo(target.export[0]);
+		if (visited === undefined) visited = new Set([exportInfo, current]);
 		if (visited.has(next)) return false;
 		visited.add(next);
 		current = next;
@@ -635,7 +651,8 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 			exportsInfo.otherExportsInfo.getUsed(runtime) === UsageState.Unused;
 
 		/** @type {IgnoredExports} */
-		const ignoredExports = new Set(["default", ...this.activeExports]);
+		const ignoredExports = new Set(this.activeExports);
+		ignoredExports.add("default");
 
 		/** @type {Hidden | undefined} */
 		let hiddenExports;
@@ -793,7 +810,9 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 					runtime,
 					referencedExports,
 					[],
-					/** @type {ExportInfo} */ (mode.partialNamespaceExportInfo)
+					/** @type {InstanceType<ExportInfo>} */ (
+						mode.partialNamespaceExportInfo
+					)
 				);
 				return referencedExports;
 			}
@@ -809,7 +828,9 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 					runtime,
 					referencedExports,
 					[],
-					/** @type {ExportInfo} */ (mode.partialNamespaceExportInfo),
+					/** @type {InstanceType<ExportInfo>} */ (
+						mode.partialNamespaceExportInfo
+					),
 					mode.type === "reexport-fake-namespace-object"
 				);
 				return referencedExports;
@@ -1207,7 +1228,8 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 
 		const mode = dep.getMode(moduleGraph, runtime);
 
-		if (concatenationScope) {
+		// a wrapped module has no shared-scope symbols to redirect reexports to
+		if (concatenationScope && !concatenationScope.isWrapped()) {
 			switch (mode.type) {
 				case "reexport-undefined":
 					concatenationScope.registerRawExport(
@@ -1219,7 +1241,15 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 		}
 
 		if (mode.type !== "unused" && mode.type !== "empty-star") {
-			super.apply(dependency, source, templateContext);
+			const importedModule = moduleGraph.getModule(dep);
+			// an in-scope target has no standalone module left to import from
+			if (
+				concatenationScope === undefined ||
+				importedModule === null ||
+				!concatenationScope.isModuleInScope(importedModule)
+			) {
+				super.apply(dependency, source, templateContext);
+			}
 
 			this._addExportFragments(
 				templateContext.initFragments,
@@ -1230,7 +1260,8 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 				templateContext.chunkGraph,
 				runtime,
 				templateContext.runtimeTemplate,
-				templateContext.runtimeRequirements
+				templateContext.runtimeRequirements,
+				concatenationScope
 			);
 		}
 	}
@@ -1246,6 +1277,7 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 	 * @param {RuntimeSpec} runtime the runtime
 	 * @param {RuntimeTemplate} runtimeTemplate the runtime template
 	 * @param {RuntimeRequirements} runtimeRequirements runtime requirements
+	 * @param {ConcatenationScope=} concatenationScope concatenation scope of a wrapped module
 	 * @returns {void}
 	 */
 	_addExportFragments(
@@ -1257,10 +1289,28 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 		chunkGraph,
 		runtime,
 		runtimeTemplate,
-		runtimeRequirements
+		runtimeRequirements,
+		concatenationScope
 	) {
 		const importedModule = /** @type {Module} */ (moduleGraph.getModule(dep));
-		const importVar = dep.getImportVar(moduleGraph);
+		// an in-scope target has no import statement, read it through a reference
+		const inScope =
+			concatenationScope !== undefined &&
+			concatenationScope.isModuleInScope(importedModule);
+		const importVar = inScope
+			? /** @type {ConcatenationScope} */ (
+					concatenationScope
+				).createModuleReference(importedModule, { asiSafe: true })
+			: dep.getImportVar(moduleGraph);
+		// whole-namespace modes need the original export names, not mangled ones
+		const namespaceImportVar = inScope
+			? /** @type {ConcatenationScope} */ (
+					concatenationScope
+				).createModuleReference(importedModule, {
+					asiSafe: true,
+					mangleableNamespace: true
+				})
+			: importVar;
 		const isDeferred =
 			ImportPhaseUtils.isDefer(dep.phase) &&
 			!(/** @type {BuildMeta} */ (importedModule.buildMeta).async);
@@ -1277,7 +1327,7 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 					moduleGraph
 						.getExportsInfo(module)
 						.getUsedName(mode.name ? mode.name : [], runtime),
-					importVar,
+					namespaceImportVar,
 					importedModule.getExportsType(
 						moduleGraph,
 						module.buildMeta &&
@@ -1313,7 +1363,18 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 				);
 				break;
 
-			case "reexport-dynamic-default":
+			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,
@@ -1321,25 +1382,47 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 						moduleGraph
 							.getExportsInfo(module)
 							.getUsedName(/** @type {string} */ (mode.name), runtime),
-						importVar,
-						null,
+						defaultAccess,
+						inScope ? "" : null,
 						runtimeRequirements
 					)
 				);
 				break;
+			}
 
 			case "reexport-fake-namespace-object":
-				initFragments.push(
-					...this.getReexportFakeNamespaceObjectFragments(
-						module,
-						moduleGraph
-							.getExportsInfo(module)
-							.getUsedName(/** @type {string} */ (mode.name), runtime),
-						importVar,
-						mode.fakeType,
-						runtimeRequirements
-					)
-				);
+				// `${name}_namespace_cache` needs an identifier to suffix, but an
+				// in-scope target is an expression. The concatenation already builds
+				// the same object, memoized: its interop namespace picks the mode from
+				// the exports type, which is what `fakeType` mirrors.
+				if (inScope) {
+					initFragments.push(
+						this.getReexportFragment(
+							module,
+							"reexport fake namespace object from non-harmony",
+							moduleGraph
+								.getExportsInfo(module)
+								.getUsedName(/** @type {string} */ (mode.name), runtime),
+							/** @type {ConcatenationScope} */ (
+								concatenationScope
+							).createModuleReference(importedModule, { asiSafe: true }),
+							"",
+							runtimeRequirements
+						)
+					);
+				} else {
+					initFragments.push(
+						...this.getReexportFakeNamespaceObjectFragments(
+							module,
+							moduleGraph
+								.getExportsInfo(module)
+								.getUsedName(/** @type {string} */ (mode.name), runtime),
+							namespaceImportVar,
+							mode.fakeType,
+							runtimeRequirements
+						)
+					);
+				}
 				break;
 
 			case "reexport-undefined":
@@ -1380,14 +1463,19 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 						moduleGraph
 							.getExportsInfo(module)
 							.getUsedName(/** @type {string} */ (mode.name), runtime),
-						importVar,
+						namespaceImportVar,
 						"",
 						runtimeRequirements
 					)
 				);
 				break;
 
-			case "normal-reexport":
+			case "normal-reexport": {
+				// loop-invariants hoisted out of the per-item loop below (a barrel
+				// re-exporting N names otherwise repeats these lookups N times)
+				const connection = moduleGraph.getConnection(dep);
+				const selfExportsInfo = moduleGraph.getExportsInfo(module);
+				const importedExportsInfo = moduleGraph.getExportsInfo(importedModule);
 				for (const {
 					name,
 					ids,
@@ -1396,7 +1484,6 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 				} of /** @type {NormalReexportItem[]} */ (mode.items)) {
 					if (hidden) continue;
 					if (checked) {
-						const connection = moduleGraph.getConnection(dep);
 						const key = `harmony reexport (checked) ${importVar} ${name}`;
 						const runtimeCondition = dep.weak
 							? false
@@ -1425,11 +1512,9 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 							this.getReexportFragment(
 								module,
 								"reexport safe",
-								moduleGraph.getExportsInfo(module).getUsedName(name, runtime),
+								selfExportsInfo.getUsedName(name, runtime),
 								importVar,
-								moduleGraph
-									.getExportsInfo(importedModule)
-									.getUsedName(ids, runtime),
+								importedExportsInfo.getUsedName(ids, runtime),
 								runtimeRequirements,
 								ids
 							)
@@ -1437,6 +1522,7 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 					}
 				}
 				break;
+			}
 
 			case "dynamic-reexport": {
 				const ignored = mode.hidden
@@ -1448,7 +1534,7 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 					: /** @type {ExportModeIgnored} */ (mode.ignored);
 				let content =
 					"/* harmony reexport (unknown) */ var __WEBPACK_REEXPORT_OBJECT__ = {};\n" +
-					`/* harmony reexport (unknown) */ for(${runtimeTemplate.renderConst()} __WEBPACK_IMPORT_KEY__ in ${importVar}) `;
+					`/* harmony reexport (unknown) */ for(${runtimeTemplate.renderConst()} __WEBPACK_IMPORT_KEY__ in ${namespaceImportVar}) `;
 
 				// Filter out exports which are defined by other exports
 				// and filter out default export because it cannot be reexported with *
@@ -1466,8 +1552,8 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 				content +=
 					runtimeTemplate.supportsArrowFunction() &&
 					runtimeTemplate.supportsConst()
-						? `() => ${importVar}[__WEBPACK_IMPORT_KEY__]`
-						: `function(key) { return ${importVar}[key]; }.bind(0, __WEBPACK_IMPORT_KEY__)`;
+						? `() => ${namespaceImportVar}[__WEBPACK_IMPORT_KEY__]`
+						: `function(key) { return ${namespaceImportVar}[key]; }.bind(0, __WEBPACK_IMPORT_KEY__)`;
 
 				runtimeRequirements.add(RuntimeGlobals.exports);
 				runtimeRequirements.add(RuntimeGlobals.definePropertyGetters);
@@ -1715,6 +1801,8 @@ makeSerializable(
 	"HarmonyStarExportsList"
 );
 
+HarmonyExportImportedSpecifierDependency.HarmonyStarExportsList =
+	HarmonyStarExportsList;
+HarmonyExportImportedSpecifierDependency.idsSymbol = idsSymbol;
+
 module.exports = HarmonyExportImportedSpecifierDependency;
-module.exports.HarmonyStarExportsList = HarmonyStarExportsList;
-module.exports.idsSymbol = idsSymbol;

package/lib/dependencies/HarmonyExportInitFragment.js

@@ -10,9 +10,9 @@ const RuntimeGlobals = require("../RuntimeGlobals");
 const { first } = require("../util/SetHelpers");
 const { propertyName } = require("../util/property");
 
-/** @typedef {import("webpack-sources").Source} Source */
-/** @typedef {import("../Generator").GenerateContext} GenerateContext */
-/** @typedef {import("../ExportsInfo").UsedName} UsedName */
+/** @import { Source } from "webpack-sources" */
+/** @import { GenerateContext } from "../Generator" */
+/** @import { UsedName } from "../ExportsInfo" */
 
 /**
  * Join iterable with comma.
@@ -37,6 +37,7 @@ const joinIterableWithComma = (iterable) => {
 
 /** @typedef {Map<UsedName, string>} ExportMap */
 /** @typedef {Set<string>} UnusedExports */
+/** @import { OnDemandGeneration } from "./ExportBindingInitFragment" */
 
 /** @type {ExportMap} */
 const EMPTY_MAP = new Map();
@@ -53,11 +54,13 @@ class HarmonyExportInitFragment extends InitFragment {
 	 * @param {string} exportsArgument the exports identifier
 	 * @param {ExportMap} exportMap mapping from used name to exposed variable name
 	 * @param {UnusedExports} unusedExports list of unused export names
+	 * @param {OnDemandGeneration=} onDemand offered the call instead of emitting it
 	 */
 	constructor(
 		exportsArgument,
 		exportMap = EMPTY_MAP,
-		unusedExports = EMPTY_SET
+		unusedExports = EMPTY_SET,
+		onDemand = undefined
 	) {
 		super(undefined, InitFragment.STAGE_HARMONY_EXPORTS, 1, "harmony-exports");
 		/** @type {string} */
@@ -66,6 +69,8 @@ class HarmonyExportInitFragment extends InitFragment {
 		this.exportMap = exportMap;
 		/** @type {UnusedExports} */
 		this.unusedExports = unusedExports;
+		/** @type {OnDemandGeneration | undefined} */
+		this.onDemand = onDemand;
 	}
 
 	/**
@@ -114,7 +119,8 @@ class HarmonyExportInitFragment extends InitFragment {
 		return new HarmonyExportInitFragment(
 			this.exportsArgument,
 			exportMap,
-			unusedExports
+			unusedExports,
+			this.onDemand
 		);
 	}
 
@@ -151,7 +157,8 @@ class HarmonyExportInitFragment extends InitFragment {
 		return new HarmonyExportInitFragment(
 			this.exportsArgument,
 			exportMap,
-			unusedExports
+			unusedExports,
+			this.onDemand || other.onDemand
 		);
 	}
 
@@ -184,6 +191,8 @@ class HarmonyExportInitFragment extends InitFragment {
 					)}: ${runtimeTemplate.returningFunction(value)}`
 				);
 			}
+			// Requested even when the call is taken over below: whoever took it may still
+			// emit it, and by then the requirement set is closed.
 			runtimeRequirements.add(RuntimeGlobals.exports);
 			runtimeRequirements.add(RuntimeGlobals.definePropertyGetters);
 			definePart = `/* harmony export */ ${
@@ -191,6 +200,9 @@ class HarmonyExportInitFragment extends InitFragment {
 			}(${this.exportsArgument}, {${definitions.join(
 				","
 			)}\n/* harmony export */ });\n`;
+			if (this.onDemand !== undefined && this.onDemand(definePart, false)) {
+				definePart = "";
+			}
 		}
 		return `${definePart}${unusedPart}`;
 	}

package/lib/dependencies/HarmonyExportSpecifierDependency.js

@@ -8,22 +8,30 @@
 const Dependency = require("../Dependency");
 const { InlinedUsedName } = require("../optimize/InlineExports");
 const makeSerializable = require("../util/makeSerializable");
+const memoize = require("../util/memoize");
 const ExportBindingInitFragment = require("./ExportBindingInitFragment");
 const HarmonyExportInitFragment = require("./HarmonyExportInitFragment");
 const NullDependency = require("./NullDependency");
 
-/** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
-/** @typedef {import("../Dependency").ExportsSpec} ExportsSpec */
-/** @typedef {import("../Dependency").LazyUntil} LazyUntil */
-/** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
-/** @typedef {import("../ModuleGraph")} ModuleGraph */
-/** @typedef {import("../ModuleGraphConnection").ConnectionState} ConnectionState */
-/** @typedef {import("../optimize/InlineExports").InlinedValue} InlinedValue */
+/** @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" */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[string, string, InlinedValue | null | undefined]>} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[string, string, InlinedValue | null | undefined]>} ObjectSerializerContext */
-/** @typedef {import("./HarmonyExportInitFragment").UnusedExports} UnusedExports */
-/** @typedef {import("./HarmonyExportInitFragment").ExportMap} ExportMap */
-/** @typedef {import("../javascript/JavascriptModule").JavascriptModuleBuildInfo} JavascriptModuleBuildInfo */
+/** @import { UnusedExports, ExportMap } from "./HarmonyExportInitFragment" */
+/**
+ * @import {
+ * 	JavascriptModuleBuildInfo
+ * } from "../javascript/JavascriptModule"
+ */
+
+// Required here rather than at the top: the plugin reaches back into the dependencies.
+const getJavascriptModulesPlugin = memoize(() =>
+	require("../javascript/JavascriptModulesPlugin")
+);
 
 class HarmonyExportSpecifierDependency extends NullDependency {
 	/**
@@ -139,10 +147,18 @@ HarmonyExportSpecifierDependency.Template = class HarmonyExportSpecifierDependen
 	apply(
 		dependency,
 		source,
-		{ module, moduleGraph, initFragments, runtime, concatenationScope }
+		{
+			module,
+			moduleGraph,
+			initFragments,
+			runtime,
+			runtimeTemplate,
+			concatenationScope
+		}
 	) {
 		const dep = /** @type {HarmonyExportSpecifierDependency} */ (dependency);
-		if (concatenationScope) {
+		// a wrapped module's bindings stay inside the wrapper, not in the shared scope
+		if (concatenationScope && !concatenationScope.isWrapped()) {
 			concatenationScope.registerExport(dep.name, dep.id);
 			return;
 		}
@@ -169,6 +185,21 @@ HarmonyExportSpecifierDependency.Template = class HarmonyExportSpecifierDependen
 			/** @type {import("../Module").BuildInfo} */ (module.buildInfo)
 				.isCircular === false;
 
+		// A library exporting the same bindings natively reads none of them back off the
+		// exports object, so it takes the call over and emits it only where wrapped.
+		const hooks = getJavascriptModulesPlugin().getCompilationHooks(
+			runtimeTemplate.compilation
+		);
+		const onDemand = hooks.onDemandExportsGeneration.isUsed()
+			? (/** @type {string} */ definition, /** @type {boolean} */ placeAtEnd) =>
+					hooks.onDemandExportsGeneration.call(
+						module,
+						runtime,
+						definition,
+						placeAtEnd
+					) === true
+			: undefined;
+
 		if (canUseValueBinding) {
 			initFragments.push(
 				new ExportBindingInitFragment(
@@ -180,7 +211,8 @@ HarmonyExportSpecifierDependency.Template = class HarmonyExportSpecifierDependen
 							bindingType: "value"
 						}
 					],
-					true
+					true,
+					onDemand
 				)
 			);
 		} else {
@@ -188,7 +220,12 @@ HarmonyExportSpecifierDependency.Template = class HarmonyExportSpecifierDependen
 			const map = new Map();
 			map.set(used, `/* binding */ ${dep.id}`);
 			initFragments.push(
-				new HarmonyExportInitFragment(module.exportsArgument, map, undefined)
+				new HarmonyExportInitFragment(
+					module.exportsArgument,
+					map,
+					undefined,
+					onDemand
+				)
 			);
 		}
 	}

package/lib/dependencies/HarmonyExports.js

@@ -7,10 +7,13 @@
 
 const RuntimeGlobals = require("../RuntimeGlobals");
 
-/** @typedef {import("../Module").BuildInfo} BuildInfo */
-/** @typedef {import("../Module").BuildMeta} BuildMeta */
-/** @typedef {import("../javascript/JavascriptModule").JavascriptModuleBuildMeta} JavascriptModuleBuildMeta */
-/** @typedef {import("../javascript/JavascriptParser").JavascriptParserState} JavascriptParserState */
+/** @import { BuildInfo } from "../Module" */
+/**
+ * @import {
+ * 	JavascriptModuleBuildMeta
+ * } from "../javascript/JavascriptModule"
+ */
+/** @import { JavascriptParserState } from "../javascript/JavascriptParser" */
 
 /** @type {WeakMap<JavascriptParserState, boolean>} */
 const parserStateExportsState = new WeakMap();