@@ -2,4 +2,4 @@
 "webpack": patch
 ---
 
-Fix loss of export definitions in the module library under cache.
+Fix module library exports lost under cache or missing behind a re-export.
@@ -1671,7 +1671,9 @@ class ExportInfo {
 	}
 
 	/**
-	 * Returns the target, undefined when there is no target, false when no target is valid.
+	 * Walks the reexport chain and returns the first target whose module passes
+	 * `validTargetModuleFilter`. Returns undefined when there is no target, false
+	 * when the chain ends without a valid module.
 	 * @param {ModuleGraph} moduleGraph the module graph
 	 * @param {ValidTargetModuleFilter} validTargetModuleFilter a valid target module
 	 * @returns {TargetItemWithoutConnection | null | undefined | false} the target, undefined when there is no target, false when no target is valid
@@ -1736,7 +1738,9 @@ class ExportInfo {
 	}
 
 	/**
-	 * Returns the target.
+	 * Resolves the reexport chain as far as `resolveTargetFilter` allows and
+	 * returns where it ends. Returns undefined when there is no target, the
+	 * targets disagree, or the chain is circular.
 	 * @param {ModuleGraph} moduleGraph the module graph
 	 * @param {ResolveTargetFilter} resolveTargetFilter filter function to further resolve target
 	 * @returns {TargetItemWithConnection | undefined} the target
 
@@ -651,48 +651,45 @@ class ModuleLibraryPlugin extends AbstractLibraryPlugin {
 		}
 
 		// Try to find all known exports of the entry module
-		outer: for (const exportInfo of exportInfos) {
+		for (const exportInfo of exportInfos) {
 			if (!exportInfo.provided) continue;
 
 			const originalName = exportInfo.name;
 			// Skip rendering the default export in some cases
 			if (skipRenderDefaultExport && originalName === "default") continue;
 
 			// Try to find all exports from the reexported modules
-			const target = exportInfo.findTarget(moduleGraph, (_m) => true);
-			// A namespace object target (`export * as ns from "./module"`) has no
-			// export name, so there is nothing that could be missing
-			if (target && target.export) {
-				const targetExport = target.export[0];
-				const reexportsInfo = moduleGraph.getExportsInfo(target.module);
-				for (const reexportInfo of reexportsInfo.orderedExports) {
-					if (
-						reexportInfo.provided === false &&
-						reexportInfo.name !== "default" &&
-						reexportInfo.name === targetExport
-					) {
-						continue outer;
-					}
-				}
+			const target = exportInfo.getTarget(moduleGraph);
+
+			// A re-export is provided even when its target lacks the export, and
+			// the path can end in a property access, so every name is looked up.
+			if (
+				target &&
+				target.export &&
+				target.export[target.export.length - 1] !== "default" &&
+				moduleGraph
+					.getExportsInfo(target.module)
+					.isExportProvided(target.export) === false
+			) {
+				continue;
 			}
 
-			const externalTarget = exportInfo.getTarget(moduleGraph);
 			if (
-				externalTarget &&
-				externalTarget.module instanceof ExternalModule &&
-				externalTarget.export &&
-				externalTarget.export.length === 1 &&
-				codeGenerationResults.has(externalTarget.module, chunk.runtime)
+				target &&
+				target.module instanceof ExternalModule &&
+				target.export &&
+				target.export.length === 1 &&
+				codeGenerationResults.has(target.module, chunk.runtime)
 			) {
 				const reexport = codeGenerationResults.getData(
-					externalTarget.module,
+					target.module,
 					chunk.runtime,
 					"externalReexport"
 				);
 				if (reexport) {
 					if (!bindingsTakenOver) needExportsDeclaration = true;
 					result.add(
-						`export { ${toExportName(externalTarget.export[0])} as ${toExportName(originalName)} } ${reexport};\n`
+						`export { ${toExportName(target.export[0])} as ${toExportName(originalName)} } ${reexport};\n`
 					);
 					alreadyRenderedExports.add(originalName);
 					continue;
 
@@ -0,0 +1,5 @@
+{
+	"outer": {
+		"present": 1
+	}
+}
@@ -0,0 +1,7 @@
+import { present } from "./mid";
+
+export { present, missing } from "./mid";
+
+it("should not reexport a name missing behind a property path", () => {
+	expect(present).toBe(1);
+});
@@ -0,0 +1,2 @@
+exports.present = require("./data.json").outer.present;
+exports.missing = require("./data.json").outer.missing;
@@ -0,0 +1,36 @@
+"use strict";
+
+/** @import { Compilation } from "../../../../" */
+
+/** @type {import("../../../../").Configuration} */
+module.exports = {
+	mode: "none",
+	entry: { main: "./index.js" },
+	output: {
+		module: true,
+		library: {
+			type: "module"
+		},
+		chunkFormat: "module"
+	},
+	optimization: {
+		concatenateModules: true
+	},
+	plugins: [
+		function apply() {
+			/**
+			 * @param {Compilation} compilation compilation
+			 */
+			const handler = (compilation) => {
+				compilation.hooks.afterProcessAssets.tap("testcase", (assets) => {
+					const source = assets["bundle0.mjs"].source();
+					expect(source).toMatch(/export \{[^}]*\bas present\b/);
+					// `missing` sits behind a property path into a provided export,
+					// so only the last name of the path says it is not there
+					expect(source).not.toMatch(/export \{[^}]*\bas missing\b/);
+				});
+			};
+			this.hooks.compilation.tap("testcase", handler);
+		}
+	]
+};
@@ -1,9 +1,10 @@
 import { value, T } from './re-export'
+import { NamedT } from './re-export-named'
 import logo from './file.png';
 
 type MyType = string;
 
-export { logo, value, T, MyType }
+export { logo, value, T, NamedT, MyType }
 
 it("should not reexport type", function () {
 	expect(value).toBe(1)
 
@@ -0,0 +1 @@
+export { T as NamedT } from './export'
@@ -9,8 +9,8 @@ module.exports = {
 	ignoreWarnings: [
 		(warning) => {
 			// when using swc-loader or `transpileOnly: true` with ts-loader, the warning is expected
-			expect(warning.message).toContain(
-				"export 'T' (reexported as 'T') was not found in './re-export' (possible exports: value)"
+			expect(warning.message).toMatch(
+				/export 'T' \(reexported as '(T|NamedT)'\) was not found in '\.\/(re-export|export)' \(possible exports: value\)/
 			);
 			return true;
 		}
@@ -54,6 +54,9 @@ module.exports = {
 					expect(source).toContain(
 						"export { file_namespaceObject as logo, value };"
 					);
+					// `NamedT` crosses a named re-export, which is marked provided itself:
+					// only the end of the chain says the erased type is missing
+					expect(source).not.toMatch(/^export .*\b(T|NamedT)\b/m);
 				});
 			};
 			this.hooks.compilation.tap("testcase", handler);
-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +{
 +	"outer": {
 +		"present": 1
 +	}
 +}
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+exports.present = require("./data.json").outer.present;`
	`2`	`+exports.missing = require("./data.json").outer.missing;`