@module-federation/vite 1.23.6 → 1.23.8

package/lib/{pluginDts-rZMRTCTz.js → pluginDts-DvTJxjaE.js}

@@ -1,5 +1,5 @@
 import { l as isHttpUrl, n as mfError, t as createModuleFederationError, u as normalizePathForImport } from "./logger-D67aJYOe.js";
-import { p as hasPackageDependency, r as watchFileEvents, y as resolveImportPath } from "./dtsConstants-CDuC8Bb7.js";
+import { b as resolveImportPath, m as hasPackageDependency, r as watchFileEvents } from "./dtsConstants-286VtFnC.js";
 import fs from "fs";
 import * as path$1 from "node:path";
 import { normalizeOptions } from "@module-federation/sdk";

package/lib/{ssrEntryLoader-Bh2Tq1cZ.js → ssrEntryLoader-DKpOrW8D.js}

@@ -193,9 +193,62 @@ function getRunnerCacheKey(remoteOrigin, resolvedShared, fetchTimeoutMs, fetchMa
 		getSortedRecordEntries(resolvedShared)
 	]);
 }
-async function resolveSharedExternal(id, resolvedShared) {
+function findResolvedSharedKey(id, resolvedShared) {
+	if (resolvedShared[id]) return id;
+	let matchedKey;
+	for (const key of Object.keys(resolvedShared)) {
+		if (!key.endsWith("/")) continue;
+		const base = key.slice(0, -1);
+		if (id !== base && !id.startsWith(`${base}/`)) continue;
+		if (!matchedKey || key.length > matchedKey.length) matchedKey = key;
+	}
+	return matchedKey;
+}
+function getEsmExportTarget(target) {
+	if (typeof target === "string") return target;
+	if (!target || typeof target !== "object" || Array.isArray(target)) return void 0;
+	for (const [condition, value] of Object.entries(target)) {
+		if (condition !== "node" && condition !== "import" && condition !== "default") continue;
+		const resolved = getEsmExportTarget(value);
+		if (resolved) return resolved;
+	}
+}
+async function resolveEsmSubpath(id, base) {
+	const { dirname, join } = await _path();
+	const { existsSync, readFileSync } = await _fs();
+	const segments = id.split("/");
+	const nameLength = id.startsWith("@") ? 2 : 1;
+	const name = segments.slice(0, nameLength).join("/");
+	const subpath = [".", ...segments.slice(nameLength)].join("/");
+	for (let dir = dirname(base); dirname(dir) !== dir; dir = dirname(dir)) {
+		const packageJson = join(dir, "node_modules", name, "package.json");
+		if (!existsSync(packageJson)) continue;
+		const { exports } = JSON.parse(readFileSync(packageJson, "utf8"));
+		const target = getEsmExportTarget(exports?.[subpath]);
+		return target && join(dirname(packageJson), target);
+	}
+}
+/**
+* Resolve a shared request from the exact or wildcard build-time map.
+* Wildcard entries point at the package entry, so concrete subpaths need a
+* second Node resolution step to preserve package exports and conditions.
+*/
+async function resolveSharedPath(id, resolvedShared) {
 	if (typeof id !== "string") return null;
-	const resolved = resolvedShared[id];
+	const matchedKey = findResolvedSharedKey(id, resolvedShared);
+	if (!matchedKey) return null;
+	const resolved = resolvedShared[matchedKey];
+	if (!resolved) return null;
+	if (matchedKey === id || EXTERNAL_URL_RE.test(resolved)) return resolved;
+	const { createRequire } = await _module();
+	const { join } = await _path();
+	for (const base of [resolved, join(process.cwd(), "noop.js")]) try {
+		return await resolveEsmSubpath(id, base).catch(() => void 0) ?? createRequire(base).resolve(id);
+	} catch {}
+	return null;
+}
+async function resolveSharedExternal(id, resolvedShared) {
+	const resolved = await resolveSharedPath(id, resolvedShared);
 	if (!resolved) return null;
 	if (EXTERNAL_URL_RE.test(resolved)) return {
 		externalize: resolved,
@@ -752,6 +805,15 @@ function transformSsrCode(code, base, specifiers, sharedPkgMap, requireShimUrl,
 	}
 	return neutralizeBrowserPreloadHelpers(rewriter.toString());
 }
+async function materializeSharedSubpaths(specifiers, sharedPkgMap) {
+	const uniqueSpecifiers = new Set(specifiers.map(({ value }) => value));
+	const resolvedShared = Object.fromEntries(sharedPkgMap);
+	for (const specifier of uniqueSpecifiers) {
+		if (sharedPkgMap.has(specifier)) continue;
+		const resolved = await resolveSharedPath(specifier, resolvedShared);
+		if (resolved) sharedPkgMap.set(specifier, resolved);
+	}
+}
 function isVitePreloadHelperSpecifier(specifier) {
 	return specifier.includes("preload-helper");
 }
@@ -808,6 +870,7 @@ async function fetchEsmToTempFile(url, graph) {
 			const tmpPath = await fetchEsmToTempFile(u, graph);
 			subMap.set(u, getTempFileImportUrl(tmpPath, versionKey));
 		}));
+		if (sharedPkgMap) await materializeSharedSubpaths(specifiers, sharedPkgMap);
 		const requireShimUrl = sharedPkgMap?.size && specifiers.some(({ value }) => isNodeModuleSpecifier(value)) ? await getRequireShimUrl(tmpDir, sharedPkgMap, contextKey) : void 0;
 		code = transformSsrCode(code, base, specifiers, sharedPkgMap, requireShimUrl, subMap);
 		const { writeFileSync } = await _fs();
@@ -853,7 +916,7 @@ async function importTempModule(filePath, versionKey) {
 }
 let warnedVmUnavailable = false;
 function getVmStrategyModule() {
-	if (!loaderState.vmStrategyModulePromise) loaderState.vmStrategyModulePromise = import("./ssrVmStrategy-BCaiSEbA.js");
+	if (!loaderState.vmStrategyModulePromise) loaderState.vmStrategyModulePromise = import("./ssrVmStrategy-D1cSKUV-.js");
 	return loaderState.vmStrategyModulePromise;
 }
 /**
@@ -980,8 +1043,9 @@ async function rebaseResolvedShared(resolvedShared) {
 	const rebased = {};
 	for (const [specifier, buildPath] of Object.entries(resolvedShared)) {
 		rebased[specifier] = buildPath;
+		const resolutionSpecifier = specifier.endsWith("/") ? specifier.slice(0, -1) : specifier;
 		for (const require of requires) try {
-			rebased[specifier] = require.resolve(specifier);
+			rebased[specifier] = require.resolve(resolutionSpecifier);
 			break;
 		} catch {}
 	}
@@ -1025,4 +1089,4 @@ function ssrEntryLoaderPlugin(options = {}) {
 	};
 }
 //#endregion
-export { ssrEntryLoaderPlugin as a, fetchWithTimeout as c, revalidate as i, getBodyPreview as l, SsrEntryHttpError as n, DEFAULT_SSR_FETCH_MAX_BYTES as o, neutralizeBrowserPreloadHelpers as r, DEFAULT_SSR_FETCH_TIMEOUT_MS as s, SSR_ENTRY_LOADER_STATE_KEY as t, readResponseTextBounded as u };
+export { revalidate as a, DEFAULT_SSR_FETCH_TIMEOUT_MS as c, readResponseTextBounded as d, resolveSharedPath as i, fetchWithTimeout as l, SsrEntryHttpError as n, ssrEntryLoaderPlugin as o, neutralizeBrowserPreloadHelpers as r, DEFAULT_SSR_FETCH_MAX_BYTES as s, SSR_ENTRY_LOADER_STATE_KEY as t, getBodyPreview as u };

package/lib/{ssrVmStrategy-BCaiSEbA.js → ssrVmStrategy-D1cSKUV-.js}

@@ -1,6 +1,6 @@
-import { l as isHttpUrl } from "./logger-D67aJYOe.js";
+import { l as isHttpUrl, s as EXTERNAL_URL_RE } from "./logger-D67aJYOe.js";
 import { t as findSharedKey } from "./sharedKeyMatcher-C04bVN1q.js";
-import { c as fetchWithTimeout, l as getBodyPreview, n as SsrEntryHttpError, r as neutralizeBrowserPreloadHelpers, u as readResponseTextBounded } from "./ssrEntryLoader-Bh2Tq1cZ.js";
+import { d as readResponseTextBounded, i as resolveSharedPath, l as fetchWithTimeout, n as SsrEntryHttpError, r as neutralizeBrowserPreloadHelpers, u as getBodyPreview } from "./ssrEntryLoader-DKpOrW8D.js";
 //#region src/utils/ssrVmStrategy.ts
 /**
 * vm.SourceTextModule strategy for loading remote SSR entries.
@@ -69,11 +69,8 @@ async function loadBareModule(specifier, options) {
 			}
 		} catch {}
 	}
-	const resolvedPath = options.resolvedShared[specifier];
-	if (resolvedPath) return import(
-		/* @vite-ignore */
-		`file://${resolvedPath}`
-);
+	const resolvedPath = await resolveSharedPath(specifier, options.resolvedShared);
+	if (resolvedPath) return EXTERNAL_URL_RE.test(resolvedPath) ? import(resolvedPath) : import(`file://${resolvedPath}`);
 	const namespace = await import(
 		/* @vite-ignore */
 		specifier

package/lib/utils/ssrEntryLoader.d.ts

@@ -1,6 +1,12 @@
 import { i as SsrEntryLoaderConfig } from "../normalizeModuleFederationOptions-DNUlv-AL.js";
 //#region src/utils/ssrEntryLoader.d.ts
 declare const SSR_ENTRY_LOADER_STATE_KEY: unique symbol;
+/**
+ * Resolve a shared request from the exact or wildcard build-time map.
+ * Wildcard entries point at the package entry, so concrete subpaths need a
+ * second Node resolution step to preserve package exports and conditions.
+ */
+declare function resolveSharedPath(id: unknown, resolvedShared: Record<string, string>): Promise<string | null>;
 interface RemoteInfo {
   name: string;
   entry: string;
@@ -65,4 +71,4 @@ declare function ssrEntryLoaderPlugin(options?: SsrEntryLoaderOptions): {
   } | undefined>;
 };
 //#endregion
-export { SSR_ENTRY_LOADER_STATE_KEY, SsrEntryHttpError, ssrEntryLoaderPlugin as default, neutralizeBrowserPreloadHelpers, revalidate };
+export { SSR_ENTRY_LOADER_STATE_KEY, SsrEntryHttpError, ssrEntryLoaderPlugin as default, neutralizeBrowserPreloadHelpers, resolveSharedPath, revalidate };

package/lib/utils/ssrEntryLoader.js

@@ -1,2 +1,2 @@
-import { a as ssrEntryLoaderPlugin, i as revalidate, n as SsrEntryHttpError, r as neutralizeBrowserPreloadHelpers, t as SSR_ENTRY_LOADER_STATE_KEY } from "../ssrEntryLoader-Bh2Tq1cZ.js";
-export { SSR_ENTRY_LOADER_STATE_KEY, SsrEntryHttpError, ssrEntryLoaderPlugin as default, neutralizeBrowserPreloadHelpers, revalidate };
+import { a as revalidate, i as resolveSharedPath, n as SsrEntryHttpError, o as ssrEntryLoaderPlugin, r as neutralizeBrowserPreloadHelpers, t as SSR_ENTRY_LOADER_STATE_KEY } from "../ssrEntryLoader-DKpOrW8D.js";
+export { SSR_ENTRY_LOADER_STATE_KEY, SsrEntryHttpError, ssrEntryLoaderPlugin as default, neutralizeBrowserPreloadHelpers, resolveSharedPath, revalidate };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@module-federation/vite",
-  "version": "1.23.6",
+  "version": "1.23.8",
   "description": "Vite plugin for Module Federation",
   "type": "module",
   "main": "./lib/index.js",