webpack 5.108.4 → 5.109.1

package/lib/library/ModuleLibraryPlugin.js

@@ -11,6 +11,7 @@ const ExternalModule = require("../ExternalModule");
 const RuntimeGlobals = require("../RuntimeGlobals");
 const Template = require("../Template");
 const HarmonyExportImportedSpecifierDependency = require("../dependencies/HarmonyExportImportedSpecifierDependency");
+const HarmonyExportSpecifierDependency = require("../dependencies/HarmonyExportSpecifierDependency");
 const JavascriptModulesPlugin = require("../javascript/JavascriptModulesPlugin");
 const ConcatenatedModule = require("../optimize/ConcatenatedModule");
 const { InlinedUsedName } = require("../optimize/InlineExports");
@@ -406,6 +407,33 @@ class ModuleLibraryPlugin extends AbstractLibraryPlugin {
 				.treatAsCommonJs;
 		const skipRenderDefaultExport = Boolean(treatAsCommonJs);
 
+		// A single (non-concatenated) inlined entry is rendered at the top
+		// level, so its own declarations are top-level bindings we can export
+		// directly — keeping ESM live bindings instead of snapshotting
+		// `__webpack_exports__.x` into a `const`. Concatenated entries already
+		// get direct bindings via `definitions` above.
+		/** @type {Map<string, string> | undefined} */
+		let directBindings;
+		if (isInlinedEntryWithoutIIFE && !treatAsCommonJs) {
+			const { data } = codeGenerationResults.get(module, chunk.runtime);
+			const topLevelDeclarations =
+				(data && data.get("topLevelDeclarations")) ||
+				(module.buildInfo && module.buildInfo.topLevelDeclarations);
+			if (topLevelDeclarations) {
+				for (const dep of module.dependencies) {
+					if (
+						dep instanceof HarmonyExportSpecifierDependency &&
+						topLevelDeclarations.has(dep.id)
+					) {
+						(directBindings || (directBindings = new Map())).set(
+							dep.name,
+							dep.id
+						);
+					}
+				}
+			}
+		}
+
 		const moduleExportsInfo = moduleGraph.getExportsInfo(module);
 
 		// Define ESM compatibility flag will rely on `__webpack_exports__`
@@ -455,10 +483,19 @@ class ModuleLibraryPlugin extends AbstractLibraryPlugin {
 			/** @type {string | undefined} */
 			const definition = definitions[usedName];
 			/** @type {string | undefined} */
+			const directLocal =
+				definition === undefined && directBindings
+					? directBindings.get(originalName)
+					: undefined;
+			/** @type {string | undefined} */
 			let finalName;
 
 			if (definition) {
 				finalName = definition;
+			} else if (directLocal !== undefined) {
+				// Live binding to the inlined entry's own top-level declaration
+				finalName = directLocal;
+				needExportsDeclaration = true;
 			} else {
 				// Fallback to `__webpack_exports__` property access
 				// when no direct export binding was found
@@ -498,7 +535,7 @@ class ModuleLibraryPlugin extends AbstractLibraryPlugin {
 				}
 			} else {
 				shortHandedExports.push(
-					definition && finalName === originalName
+					finalName === originalName
 						? finalName
 						: `${finalName} as ${originalName}`
 				);