@module-federation/vite 1.23.8 → 1.23.9

package/lib/{dtsConstants-286VtFnC.js → dtsConstants-DIcz34LN.js}

@@ -1,5 +1,5 @@
-import { r as mfWarn, t as createModuleFederationError, u as normalizePathForImport } from "./logger-D67aJYOe.js";
-import { d as getNodeModulesSuffix, r as getSharedRuntimeKey } from "./sharedKeyMatcher-C04bVN1q.js";
+import { p as normalizePathForImport, r as mfWarn, t as createModuleFederationError } from "./logger-Ckj1FMRH.js";
+import { d as getNodeModulesSuffix, r as getSharedRuntimeKey } from "./sharedKeyMatcher-B5VKsEVQ.js";
 import { existsSync, readFileSync, readdirSync, realpathSync } from "fs";
 import { createRequire } from "module";
 import * as path$1 from "node:path";
@@ -28,6 +28,14 @@ const REACT_DOM_CLIENT_SHARE = "react-dom/client";
 function isReactCoreShare(pkg) {
 	return pkg === "react" || pkg.startsWith("react/");
 }
+/**
+* React and its renderer, including subpath exports. Their wrappers bind
+* synchronously and carry the mixed-mode guard, so the generic deferral of a
+* negotiated singleton's local copy does not apply to them.
+*/
+function isReactFamilyShare(pkg) {
+	return isReactCoreShare(pkg) || pkg === "react-dom" || pkg.startsWith("react-dom/");
+}
 //#endregion
 //#region src/utils/packageUtils.ts
 const dependencyPresenceCache = /* @__PURE__ */ new Map();
@@ -790,4 +798,4 @@ function watchFileEvents(watcher, listener) {
 //#region src/utils/dtsConstants.ts
 const DEFAULT_PUBLIC_TYPES_FOLDER = "@mf-types";
 //#endregion
-export { sharedCacheHelperCode as C, isReactCoreShare as D, REACT_DOM_CLIENT_SHARE as E, setPackageDetectionCwd as S, REACT_CLIENT_INTERNALS_KEY as T, isPackageInstalled as _, getDependencyNames as a, resolveImportPath as b, getIsRolldown as c, getPackageName as d, getPackageNameFromNodeModulePath as f, isPackageExportAvailable as g, isNuxtProjectRoot as h, findPackageInDependents as i, getPackageDetectionCwd as l, hasPackageDependency as m, formatDevServerHostForOrigin as n, getInstalledPackageEntry as o, getSharedCacheDescriptor as p, watchFileEvents as r, getInstalledPackageJson as s, DEFAULT_PUBLIC_TYPES_FOLDER as t, getPackageExportSpecifiersForFile as u, packageNameDecode as v, supportsCodeSplittingGroupDebugName as w, resolveModulePath as x, packageNameEncode as y };
+export { sharedCacheHelperCode as C, isReactCoreShare as D, REACT_DOM_CLIENT_SHARE as E, isReactFamilyShare as O, setPackageDetectionCwd as S, REACT_CLIENT_INTERNALS_KEY as T, isPackageInstalled as _, getDependencyNames as a, resolveImportPath as b, getIsRolldown as c, getPackageName as d, getPackageNameFromNodeModulePath as f, isPackageExportAvailable as g, isNuxtProjectRoot as h, findPackageInDependents as i, getPackageDetectionCwd as l, hasPackageDependency as m, formatDevServerHostForOrigin as n, getInstalledPackageEntry as o, getSharedCacheDescriptor as p, watchFileEvents as r, getInstalledPackageJson as s, DEFAULT_PUBLIC_TYPES_FOLDER as t, getPackageExportSpecifiersForFile as u, packageNameDecode as v, supportsCodeSplittingGroupDebugName as w, resolveModulePath as x, packageNameEncode as y };

package/lib/index.js

@@ -1,6 +1,6 @@
-import { a as CodeRewriter, c as isAbsoluteUrl, d as rebaseImport, f as resolveHashPlaceholderFileName, i as createCodePositionMap, l as isHttpUrl, o as createSourceMap, r as mfWarn, t as createModuleFederationError, u as normalizePathForImport } from "./logger-D67aJYOe.js";
-import { _ as removeTrailingSlash, a as matchesSharedSource, b as stripViteFsPrefix, c as filterId, d as getNodeModulesSuffix, f as isAssetLikeImport, g as normalizeNodeModulePath, h as isViteOptimizableEntry, i as invalidateSharedKeyMatcher, l as getBasePath$1, m as isNuxtClientBase, n as getSharedRequest, p as isNodeModulePath, r as getSharedRuntimeKey, s as ensureTrailingSlash, t as findSharedKey, u as getCommonSharedSubpaths, v as resolvePublicPath, x as toRelativeImport, y as stripQueryAndHash } from "./sharedKeyMatcher-C04bVN1q.js";
-import { C as sharedCacheHelperCode, D as isReactCoreShare, E as REACT_DOM_CLIENT_SHARE, S as setPackageDetectionCwd, T as REACT_CLIENT_INTERNALS_KEY, _ as isPackageInstalled, a as getDependencyNames, b as resolveImportPath, c as getIsRolldown, d as getPackageName, f as getPackageNameFromNodeModulePath, g as isPackageExportAvailable, h as isNuxtProjectRoot, i as findPackageInDependents, l as getPackageDetectionCwd, m as hasPackageDependency, n as formatDevServerHostForOrigin, o as getInstalledPackageEntry, p as getSharedCacheDescriptor, r as watchFileEvents, s as getInstalledPackageJson, u as getPackageExportSpecifiersForFile, v as packageNameDecode, w as supportsCodeSplittingGroupDebugName, x as resolveModulePath, y as packageNameEncode } from "./dtsConstants-286VtFnC.js";
+import { a as CodeRewriter, c as VITE_ID_PREFIX, d as isAbsoluteUrl, f as isHttpUrl, h as resolveHashPlaceholderFileName, i as createCodePositionMap, l as VITE_NULL_BYTE_PLACEHOLDER, m as rebaseImport, o as createSourceMap, p as normalizePathForImport, r as mfWarn, t as createModuleFederationError, u as decodeViteId } from "./logger-Ckj1FMRH.js";
+import { _ as removeTrailingSlash, a as matchesSharedSource, b as stripViteFsPrefix, c as filterId, d as getNodeModulesSuffix, f as isAssetLikeImport, g as normalizeNodeModulePath, h as isViteOptimizableEntry, i as invalidateSharedKeyMatcher, l as getBasePath$1, m as isNuxtClientBase, n as getSharedRequest, p as isNodeModulePath, r as getSharedRuntimeKey, s as ensureTrailingSlash, t as findSharedKey, u as getCommonSharedSubpaths, v as resolvePublicPath, x as toRelativeImport, y as stripQueryAndHash } from "./sharedKeyMatcher-B5VKsEVQ.js";
+import { C as sharedCacheHelperCode, D as isReactCoreShare, E as REACT_DOM_CLIENT_SHARE, O as isReactFamilyShare, S as setPackageDetectionCwd, T as REACT_CLIENT_INTERNALS_KEY, _ as isPackageInstalled, a as getDependencyNames, b as resolveImportPath, c as getIsRolldown, d as getPackageName, f as getPackageNameFromNodeModulePath, g as isPackageExportAvailable, h as isNuxtProjectRoot, i as findPackageInDependents, l as getPackageDetectionCwd, m as hasPackageDependency, n as formatDevServerHostForOrigin, o as getInstalledPackageEntry, p as getSharedCacheDescriptor, r as watchFileEvents, s as getInstalledPackageJson, u as getPackageExportSpecifiersForFile, v as packageNameDecode, w as supportsCodeSplittingGroupDebugName, x as resolveModulePath, y as packageNameEncode } from "./dtsConstants-DIcz34LN.js";
 import { createRequire } from "node:module";
 import * as fs$2 from "fs";
 import { existsSync, readFileSync, readdirSync, realpathSync, statSync, writeFileSync } from "fs";
@@ -852,8 +852,7 @@ function getSuffix(name) {
 const patternMap = {};
 const cacheMap = {};
 const idCacheMap = {};
-const VITE_ID_PREFIX = "/@id/";
-const VITE_ENCODED_NULL_BYTE_PREFIX = `${VITE_ID_PREFIX}__x00__`;
+const VITE_ENCODED_NULL_BYTE_PREFIX = `${VITE_ID_PREFIX}${VITE_NULL_BYTE_PLACEHOLDER}`;
 const MF_OWNER_INFIX = "__mf_owner__";
 function createViteEncodedIdPrefixRegExp(sourcePrefix = "") {
 	return new RegExp(`^(?:${escapeRegExp(VITE_ENCODED_NULL_BYTE_PREFIX)})?${sourcePrefix}`);
@@ -861,11 +860,6 @@ function createViteEncodedIdPrefixRegExp(sourcePrefix = "") {
 function toViteEncodedId(id) {
 	return `${VITE_ENCODED_NULL_BYTE_PREFIX}${id}`;
 }
-function decodeViteId(id) {
-	if (!id.startsWith("/@id/")) return id;
-	const viteId = id.slice(5);
-	return viteId.startsWith("__x00__") ? `\0${viteId.slice(7)}` : viteId;
-}
 function assertModuleFound(tag, str = "") {
 	const module = VirtualModule.findById(str) ?? VirtualModule.findModule(tag, str);
 	if (!module) throw createModuleFederationError(`Module Federation shared module '${str}' not found. Please ensure it's installed as a dependency in your package.json.`);
@@ -1982,6 +1976,19 @@ function hasCodeMatch(source, regex, codePositions) {
 	while ((match = regex.exec(source)) !== null) if (codePositions[match.index]) return true;
 	return false;
 }
+/** True when the code before `index` is a `.`: member access (`obj.export`), not an identifier. */
+function isMemberName(source, index, codePositions) {
+	let previousCodeIndex = index - 1;
+	while (previousCodeIndex >= 0 && (/\s/.test(source[previousCodeIndex]) || !codePositions[previousCodeIndex])) previousCodeIndex--;
+	return source[previousCodeIndex] === ".";
+}
+/** TypeScript `export = value`; an assignment to a member named `export` (`e.export = 'export'`) is not one. */
+function hasExportAssignment(source, codePositions) {
+	const regex = /\bexport\s*=/g;
+	let match;
+	while ((match = regex.exec(source)) !== null) if (codePositions[match.index] && !isMemberName(source, match.index, codePositions)) return true;
+	return false;
+}
 /**
 * True when the file contains a top-level static `import`/`export` declaration.
 * Local identifiers named `module` or `exports` (webpack/rspack helpers,
@@ -2000,9 +2007,7 @@ function hasEsmModuleSyntax(source, codePositions) {
 		}
 		if (!codePositions[match.index]) continue;
 		if (braceDepth !== 0) continue;
-		let previousCodeIndex = match.index - 1;
-		while (previousCodeIndex >= 0 && (/\s/.test(source[previousCodeIndex]) || !codePositions[previousCodeIndex])) previousCodeIndex--;
-		if (source[previousCodeIndex] === ".") continue;
+		if (isMemberName(source, match.index, codePositions)) continue;
 		let nextCodeIndex = match.index + match[0].length;
 		while (nextCodeIndex < source.length && (/\s/.test(source[nextCodeIndex]) || !codePositions[nextCodeIndex])) nextCodeIndex++;
 		if (source[nextCodeIndex] === "(") continue;
@@ -2018,9 +2023,7 @@ function hasCommonJsExports(source) {
 	let match;
 	while ((match = exportsRegex.exec(source)) !== null) {
 		if (!codePositions[match.index]) continue;
-		let previousCodeIndex = match.index - 1;
-		while (previousCodeIndex >= 0 && (/\s/.test(source[previousCodeIndex]) || !codePositions[previousCodeIndex])) previousCodeIndex--;
-		if (source[previousCodeIndex] === ".") continue;
+		if (isMemberName(source, match.index, codePositions)) continue;
 		return true;
 	}
 	return false;
@@ -2289,7 +2292,7 @@ function getNamedExportsViaRegex(source, filePath, visited, scanState = { comple
 		else for (const name of additionalNames) names.add(name);
 		if (hasUnsupportedBindingPattern(source, exportedVariableDeclarationRegex.lastIndex)) scanState.complete = false;
 	}
-	if (hasCodeMatch(source, /export\s+import\s+/g, codePositions) || hasCodeMatch(source, /export\s*=/g, codePositions)) scanState.complete = false;
+	if (hasCodeMatch(source, /export\s+import\s+/g, codePositions) || hasExportAssignment(source, codePositions)) scanState.complete = false;
 	if (hasCodeMatch(source, /export\s+@/g, codePositions)) scanState.complete = false;
 	const destructureRegex = /export\s+(?:const|let|var)\s+(\{[^}]*\}|\[[^\]]*\])\s*=/g;
 	const bindingNameRegex = new RegExp(`^(${JS_IDENTIFIER_PATTERN})`, "u");
@@ -2373,9 +2376,7 @@ function getNamedExportsViaRegex(source, filePath, visited, scanState = { comple
 	while ((match = exportKeywordRegex.exec(source)) !== null) {
 		if (!codePositions[match.index]) continue;
 		if (recognizedExportStarts.has(match.index)) continue;
-		let previousCodeIndex = match.index - 1;
-		while (previousCodeIndex >= 0 && (/\s/.test(source[previousCodeIndex]) || !codePositions[previousCodeIndex])) previousCodeIndex--;
-		if (source[previousCodeIndex] === ".") continue;
+		if (isMemberName(source, match.index, codePositions)) continue;
 		let nextCodeIndex = match.index + match[0].length;
 		while (nextCodeIndex < source.length && (/\s/.test(source[nextCodeIndex]) || !codePositions[nextCodeIndex])) nextCodeIndex++;
 		if (source[nextCodeIndex] === "(") continue;
@@ -3168,7 +3169,8 @@ function writeLoadShareModule(pkg, shareItem, command, options, exportConditions
 	const hasCompleteExportCoverage = detectedNamedExports !== void 0;
 	const isSingleton = shareItem.shareConfig.singleton === true;
 	const isWorkspaceSingleton = isWorkspacePackage && isSingleton;
-	const usesDeferredSingletonFallback = hasCompleteExportCoverage && shareItem.shareConfig.eager !== true && (isWorkspacePackage || command !== "build" && isRemoteOnlyContainer(options) && isSingleton || command === "build" && isRemoteContainer(options) && !isSharedSingletonConsumedByPeer(pkg, options, true));
+	const negotiatesSingletonWithRemotes = isSingleton && !isReactFamilyShare(pkg) && options.shareStrategy === "version-first" && hasRemotes(options) && pkg !== "solid-js" && !isSharedSingletonConsumedByPeer(pkg, options, true);
+	const usesDeferredSingletonFallback = hasCompleteExportCoverage && shareItem.shareConfig.eager !== true && (isWorkspacePackage || negotiatesSingletonWithRemotes || command !== "build" && isRemoteOnlyContainer(options) && isSingleton || command === "build" && isRemoteContainer(options) && !isSharedSingletonConsumedByPeer(pkg, options, true));
 	const servesRemoteSingletonFallback = command !== "build" && isRemoteOnlyContainer(options) && isSingleton;
 	const isConsumedByPeerSingleton = isSharedSingletonConsumedByPeer(pkg, options);
 	const usesEntryInjectedRemoteFallback = hasCompleteExportCoverage && !isWorkspaceSingleton && isRemoteContainer(options) && isSingleton && options.hostInitInjectLocation === "entry" && (command === "build" || isConsumedByPeerSingleton);
@@ -4446,8 +4448,10 @@ function generateRuntimeSharedCacheSeedCode(shareStrategy, options, command = "b
 	const seedOrder = seedBatches.flat();
 	const seedIndex = new Map(seedOrder.map((pkg, index) => [pkg, index]));
 	const seedPrerequisites = Object.fromEntries(Array.from(getSharePrerequisites(seedOrder, options)).filter(([, prerequisites]) => prerequisites.length > 0).map(([pkg, prerequisites]) => [seedIndex.get(pkg), prerequisites.map((prerequisite) => seedIndex.get(prerequisite))]));
+	const versionFirstDeferredSeeds = shareStrategy === "version-first" && hasRemotes(options) ? seedOrder.filter((pkg) => !isReactFamilyShare(pkg)) : [];
 	return `
     const __mfSeedOrder = ${toSafeJsLiteral(seedOrder)};
+    const __mfVersionFirstDeferredSeeds = new Set(${toSafeJsLiteral(versionFirstDeferredSeeds)});
     const __mfSeedBatches = ${toSafeJsLiteral(seedBatches)};
     const __mfSeedIndex = new Map(__mfSeedOrder.map((pkg, index) => [pkg, index]));
     const __mfSeedPrerequisites = ${toSafeJsLiteral(seedPrerequisites)};
@@ -4602,6 +4606,13 @@ function generateRuntimeSharedCacheSeedCode(shareStrategy, options, command = "b
         : __mfReadSharedCache(__mfModuleCache.share, cacheDescriptor);
       if (cachedShare !== undefined) return false;
       if (share.treeShaking || share.shareConfig?.import === false) return true;
+      // version-first negotiates a singleton against this container's remotes, which only
+      // register during initializeSharing(). Seeding the local copy before that evaluates it
+      // even when a remote's higher version is selected, so a package with top-level side
+      // effects (custom element registration, polyfills) runs twice (#1527). Wait for the
+      // remotes; the deferred pass seeds the local copy only when no remote outranks it.
+      // The React family keeps the eager seed its synchronous wrappers rely on.
+      if (__mfVersionFirstDeferredSeeds.has(pkg) && share.shareConfig?.singleton) return true;
       if (typeof __mfSelectExternalSharedProvider !== 'function') return false;
       return Boolean(__mfSelectExternalSharedProvider(
         initialShared[pkg],
@@ -5818,7 +5829,12 @@ function generateRemoteEntry(options, virtualExposesId = getVirtualExposesId(opt
     if (__mfModuleCache.pendingShareLoads) {
       await Promise.all(__mfModuleCache.pendingShareLoads)
     }
-    return (exposesMap[moduleName])().then(res => () => res)
+    const res = await exposesMap[moduleName]()
+    // Wrappers evaluated by the expose import may queue share loads only now (#1535).
+    if (__mfModuleCache.pendingShareLoads) {
+      await Promise.all(__mfModuleCache.pendingShareLoads)
+    }
+    return () => res
   }
   ${guardHostAutoInit ? `let __mfInitPromise;
   function __mfGuardedInit(shared, initScope, remoteEntryInitOptions) {
@@ -8375,7 +8391,7 @@ function ${helperName}(names) {
 }
 //#endregion
 //#region package.json
-var version$1 = "1.23.8";
+var version$1 = "1.23.9";
 //#endregion
 //#region src/virtualModules/virtualExposesSSR.ts
 /**
@@ -9659,9 +9675,7 @@ function pluginProxyRemoteEntry_default({ options, remoteEntryId, virtualExposes
 	let dependencyInvalidationVersion = 0;
 	let reactIslandExposes = /* @__PURE__ */ new Set();
 	let isTanStackStart = false;
-	const isHostAutoInitId = (id) => {
-		return id.split("?")[0].includes(getHostAutoInitPath(options));
-	};
+	const isHostAutoInitId = (id) => isOwnedHostAutoInitId(id, options);
 	const getEnvironmentConditions = (context) => context.environment?.config?.resolve?.conditions;
 	const isSsrBuild = (context) => isServerBuildContext(context, viteConfig);
 	const loadRemoteEntryCode = (context) => getParsePromise().then((_) => generateRemoteEntry(options, virtualExposesId, _command, getEnvironmentConditions(context), isSsrBuild(context)));
@@ -9738,7 +9752,7 @@ function pluginProxyRemoteEntry_default({ options, remoteEntryId, virtualExposes
 			if (id === remoteEntryId) return remoteEntryId;
 			if (id === virtualExposesId) return virtualExposesId;
 			if (_command === "serve" && isHostAutoInitId(id)) return id;
-			if (importer === remoteEntryId && !id.startsWith(".") && !id.startsWith("/") && !id.startsWith("\0") && !id.startsWith("virtual:")) {
+			if ((importer === remoteEntryId || importer !== void 0 && isHostAutoInitId(importer)) && !id.startsWith(".") && !id.startsWith("/") && !id.startsWith("\0") && !id.startsWith("virtual:")) {
 				const importPath = typeof __filename === "string" ? __filename : fileURLToPath(import.meta.url);
 				const resolved = await this.resolve(id, importPath, { skipSelf: true });
 				if (resolved) return resolved;
@@ -11193,7 +11207,7 @@ function pluginSSRRemoteEntry(options) {
 						} catch {}
 					}
 					const fetchedId = body.data.name === "fetchModule" ? body.data.data[0] : void 0;
-					const shared = typeof fetchedId === "string" && !!findSharedKey(fetchedId, options.shared);
+					const shared = typeof fetchedId === "string" && !!findSharedKey(decodeViteId(fetchedId).replace(/^\0+/, ""), options.shared);
 					res.setHeader("Content-Type", "application/json");
 					res.end(JSON.stringify(shared ? {
 						...result,
@@ -12530,7 +12544,7 @@ function withoutDynamicRemoteTypeHints(options) {
 }
 function loadPluginDts(options) {
 	if (options.dts === false) return [];
-	return [import("./pluginDts-DvTJxjaE.js").then(({ default: pluginDts }) => pluginDts(options))];
+	return [import("./pluginDts-CSCuhD4x.js").then(({ default: pluginDts }) => pluginDts(options))];
 }
 const INJECT_EXTERNAL_RUNTIME_CORE_PLUGIN = "@module-federation/vite/injectExternalRuntimeCorePlugin";
 function isInjectExternalRuntimeCorePlugin(specifier) {

package/lib/{logger-D67aJYOe.js → logger-Ckj1FMRH.js}

@@ -65,6 +65,13 @@ function resolveHashPlaceholderFileName(fileName) {
 	const normalized = fileName.replace(HASH_PLACEHOLDER_RE, "");
 	return hasFileExtension(normalized) ? normalized : `${normalized}.js`;
 }
+const VITE_ID_PREFIX = "/@id/";
+const VITE_NULL_BYTE_PLACEHOLDER = "__x00__";
+function decodeViteId(id) {
+	if (!id.startsWith("/@id/")) return id;
+	const viteId = id.slice(5);
+	return viteId.startsWith("__x00__") ? `\0${viteId.slice(7)}` : viteId;
+}
 //#endregion
 //#region src/utils/codeRewriter.ts
 const BASE64_CHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
@@ -457,4 +464,4 @@ const moduleFederationConsole = {
 const mfWarn = moduleFederationConsole.warn;
 const mfError = moduleFederationConsole.error;
 //#endregion
-export { CodeRewriter as a, isAbsoluteUrl as c, rebaseImport as d, resolveHashPlaceholderFileName as f, createCodePositionMap as i, isHttpUrl as l, mfError as n, createSourceMap as o, mfWarn as r, EXTERNAL_URL_RE as s, createModuleFederationError as t, normalizePathForImport as u };
+export { CodeRewriter as a, VITE_ID_PREFIX as c, isAbsoluteUrl as d, isHttpUrl as f, resolveHashPlaceholderFileName as h, createCodePositionMap as i, VITE_NULL_BYTE_PLACEHOLDER as l, rebaseImport as m, mfError as n, createSourceMap as o, normalizePathForImport as p, mfWarn as r, EXTERNAL_URL_RE as s, createModuleFederationError as t, decodeViteId as u };

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

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

package/lib/{sharedKeyMatcher-C04bVN1q.js → sharedKeyMatcher-B5VKsEVQ.js}

@@ -1,4 +1,4 @@
-import { u as normalizePathForImport } from "./logger-D67aJYOe.js";
+import { p as normalizePathForImport } from "./logger-Ckj1FMRH.js";
 import * as path$1 from "node:path";
 //#region src/utils/pathNormalization.ts
 const COMMON_SHARED_SUBPATHS = {

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

@@ -1,4 +1,4 @@
-import { a as CodeRewriter, i as createCodePositionMap, l as isHttpUrl, r as mfWarn, s as EXTERNAL_URL_RE } from "./logger-D67aJYOe.js";
+import { a as CodeRewriter, f as isHttpUrl, i as createCodePositionMap, r as mfWarn, s as EXTERNAL_URL_RE, u as decodeViteId } from "./logger-Ckj1FMRH.js";
 import { simpleJoinRemoteEntry } from "@module-federation/sdk";
 //#region src/utils/fetchWithTimeout.ts
 const DEFAULT_SSR_FETCH_TIMEOUT_MS = 1e4;
@@ -225,7 +225,8 @@ async function resolveEsmSubpath(id, base) {
 		if (!existsSync(packageJson)) continue;
 		const { exports } = JSON.parse(readFileSync(packageJson, "utf8"));
 		const target = getEsmExportTarget(exports?.[subpath]);
-		return target && join(dirname(packageJson), target);
+		const esmPath = target && join(dirname(packageJson), target);
+		return esmPath && existsSync(esmPath) ? esmPath : void 0;
 	}
 }
 /**
@@ -235,15 +236,17 @@ async function resolveEsmSubpath(id, base) {
 */
 async function resolveSharedPath(id, resolvedShared) {
 	if (typeof id !== "string") return null;
-	const matchedKey = findResolvedSharedKey(id, resolvedShared);
+	const normalizedId = decodeViteId(id);
+	const matchedKey = findResolvedSharedKey(normalizedId, resolvedShared);
 	if (!matchedKey) return null;
 	const resolved = resolvedShared[matchedKey];
 	if (!resolved) return null;
-	if (matchedKey === id || EXTERNAL_URL_RE.test(resolved)) return resolved;
+	if (EXTERNAL_URL_RE.test(resolved)) return resolved;
+	if (matchedKey === normalizedId) return await resolveEsmSubpath(normalizedId, resolved).catch(() => void 0) ?? 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);
+		return await resolveEsmSubpath(normalizedId, base).catch(() => void 0) ?? createRequire(base).resolve(normalizedId);
 	} catch {}
 	return null;
 }
@@ -789,14 +792,14 @@ function findSsrModuleSpecifiers(code) {
 function isNodeModuleSpecifier(specifier) {
 	return specifier === "node:module" || specifier === "module";
 }
-function transformSsrCode(code, base, specifiers, sharedPkgMap, requireShimUrl, tempFileUrlMap) {
+function transformSsrCode(code, base, specifiers, sharedImports, requireShimUrl, tempFileUrlMap) {
 	const rewriter = new CodeRewriter(code);
 	for (const { start, end, value } of specifiers) {
 		if (requireShimUrl && isNodeModuleSpecifier(value)) {
 			rewriter.overwrite(start, end, `"${requireShimUrl}"`);
 			continue;
 		}
-		const resolvedShared = sharedPkgMap?.get(value);
+		const resolvedShared = sharedImports?.get(value);
 		const relativeUrl = isRelativeSpecifier(value) ? new URL(value, base).href : void 0;
 		const absoluteHttpUrl = isHttpUrl(value) ? value : void 0;
 		const httpUrl = relativeUrl ?? absoluteHttpUrl;
@@ -805,14 +808,17 @@ function transformSsrCode(code, base, specifiers, sharedPkgMap, requireShimUrl,
 	}
 	return neutralizeBrowserPreloadHelpers(rewriter.toString());
 }
-async function materializeSharedSubpaths(specifiers, sharedPkgMap) {
+async function resolveSharedImports(specifiers, sharedPkgMap) {
 	const uniqueSpecifiers = new Set(specifiers.map(({ value }) => value));
 	const resolvedShared = Object.fromEntries(sharedPkgMap);
+	const sharedImports = /* @__PURE__ */ new Map();
 	for (const specifier of uniqueSpecifiers) {
-		if (sharedPkgMap.has(specifier)) continue;
 		const resolved = await resolveSharedPath(specifier, resolvedShared);
-		if (resolved) sharedPkgMap.set(specifier, resolved);
+		if (!resolved) continue;
+		sharedImports.set(specifier, resolved);
+		if (!sharedPkgMap.has(specifier)) sharedPkgMap.set(specifier, resolved);
 	}
+	return sharedImports;
 }
 function isVitePreloadHelperSpecifier(specifier) {
 	return specifier.includes("preload-helper");
@@ -870,9 +876,9 @@ async function fetchEsmToTempFile(url, graph) {
 			const tmpPath = await fetchEsmToTempFile(u, graph);
 			subMap.set(u, getTempFileImportUrl(tmpPath, versionKey));
 		}));
-		if (sharedPkgMap) await materializeSharedSubpaths(specifiers, sharedPkgMap);
+		const sharedImports = sharedPkgMap && await resolveSharedImports(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);
+		code = transformSsrCode(code, base, specifiers, sharedImports, requireShimUrl, subMap);
 		const { writeFileSync } = await _fs();
 		writeFileSync(tmpFile, code, "utf8");
 		return tmpFile;
@@ -916,7 +922,7 @@ async function importTempModule(filePath, versionKey) {
 }
 let warnedVmUnavailable = false;
 function getVmStrategyModule() {
-	if (!loaderState.vmStrategyModulePromise) loaderState.vmStrategyModulePromise = import("./ssrVmStrategy-D1cSKUV-.js");
+	if (!loaderState.vmStrategyModulePromise) loaderState.vmStrategyModulePromise = import("./ssrVmStrategy-uJaUmHLS.js");
 	return loaderState.vmStrategyModulePromise;
 }
 /**

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

@@ -1,6 +1,6 @@
-import { l as isHttpUrl, s as EXTERNAL_URL_RE } from "./logger-D67aJYOe.js";
-import { t as findSharedKey } from "./sharedKeyMatcher-C04bVN1q.js";
-import { d as readResponseTextBounded, i as resolveSharedPath, l as fetchWithTimeout, n as SsrEntryHttpError, r as neutralizeBrowserPreloadHelpers, u as getBodyPreview } from "./ssrEntryLoader-DKpOrW8D.js";
+import { f as isHttpUrl, s as EXTERNAL_URL_RE } from "./logger-Ckj1FMRH.js";
+import { t as findSharedKey } from "./sharedKeyMatcher-B5VKsEVQ.js";
+import { d as readResponseTextBounded, i as resolveSharedPath, l as fetchWithTimeout, n as SsrEntryHttpError, r as neutralizeBrowserPreloadHelpers, u as getBodyPreview } from "./ssrEntryLoader--NkahIOF.js";
 //#region src/utils/ssrVmStrategy.ts
 /**
 * vm.SourceTextModule strategy for loading remote SSR entries.

package/lib/utils/ssrEntryLoader.js

@@ -1,2 +1,2 @@
-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";
+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--NkahIOF.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.8",
+  "version": "1.23.9",
   "description": "Vite plugin for Module Federation",
   "type": "module",
   "main": "./lib/index.js",
@@ -77,9 +77,9 @@
     "vite": "^5.1.0 || ^6.0.0 || ^7.0.0 || ^8.0.0"
   },
   "dependencies": {
-    "@module-federation/dts-plugin": "2.9.2",
-    "@module-federation/runtime": "2.9.2",
-    "@module-federation/sdk": "2.9.2"
+    "@module-federation/dts-plugin": "2.9.3",
+    "@module-federation/runtime": "2.9.3",
+    "@module-federation/sdk": "2.9.3"
   },
   "devDependencies": {
     "@playwright/test": "1.62.0",