@module-federation/vite 1.23.8 → 1.23.10

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;
@@ -3003,13 +3004,18 @@ function generateDeferredHostProvidedExports(namedExports, pkg, cacheDescriptor,
 	const declarations = ["let __mf_default;", ...namedExportVars.map((name) => `let ${name};`)].join("\n    ");
 	const assignments = [...namedExports.map((name, i) => `${namedExportVars[i]} = exportModule[${escapeGeneratedStringLiteral(name)}];`), "__mf_default = exportModule.default ?? exportModule;"].join("\n      ");
 	const namedExportLine = namedExports.length > 0 ? `\n    export { ${namedExports.map((name, i) => `${namedExportVars[i]} as ${name}`).join(", ")} };` : "";
+	const subscribeToLateShare = treeShakingConsumer ? "" : `__mfSubscribeSharedCache(__mfModuleCache.share, ${cacheDescriptor}, (mod) => {
+        exportModule = mod;
+        __mfApplyHostProvidedExports(mod);
+      });
+      `;
 	return `${declarations}
     const __mfApplyHostProvidedExports = (exportModule) => {
       ${assignments}
     };
     let exportModule = ${getSharedCacheReadExpression(cacheDescriptor, treeShakingConsumer)};
     if (exportModule === undefined) {
-      __mfTrackPendingShareLoad(initPromise.then(() => {
+      ${subscribeToLateShare}__mfTrackPendingShareLoad(initPromise.then(() => {
         exportModule = ${getSharedCacheReadExpression(cacheDescriptor, treeShakingConsumer)};
         // A share init() left to its dynamic import is normally bridged before that import runs;
         // bridge it here when this wrapper is reached another way.
@@ -3168,11 +3174,12 @@ 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);
-	const usesDeferredEntryInjectedSingletonFallback = usesEntryInjectedRemoteFallback && !isReactCoreShare(pkg) && (pkg === "react-dom/client" || shareItem.shareConfig.eager !== true && !isSharedSingletonConsumedByPeer(pkg, options, true));
+	const usesDeferredEntryInjectedSingletonFallback = command === "build" && hasCompleteExportCoverage && isSingleton && pkg === "react-dom/client" && !isWorkspaceSingleton && options.hostInitInjectLocation === "entry" && hasRemotes(options) && !hasPackageDependency("vinext") || usesEntryInjectedRemoteFallback && !isReactCoreShare(pkg) && (pkg === "react-dom/client" || shareItem.shareConfig.eager !== true && !isSharedSingletonConsumedByPeer(pkg, options, true));
 	const usesEagerWorkspaceFallback = hasCompleteExportCoverage && isWorkspaceSingleton && !servesRemoteSingletonFallback && (isConsumedByPeerSingleton || shareItem.shareConfig.eager === true);
 	const usesDeferredTreeShakingFallback = hasCompleteExportCoverage && Boolean(treeShakingConsumer);
 	const rebindsSharedExports = isSingleton || options.shareStrategy === "version-first";
@@ -4024,11 +4031,13 @@ function getMaterializedShares(options) {
 		if (request.endsWith("/")) for (const concrete of expandSharedPrefixKey(request, usedForEager)) shares.add(concrete);
 		else shares.add(pkg);
 	}
-	const configured = /* @__PURE__ */ new Map();
+	const sharedKeysByPackage = /* @__PURE__ */ new Map();
 	const orderedUsed = getOrderedUsedShares(options);
 	for (const pkg of orderedUsed) {
 		const packageName = getPackageName(pkg);
-		if (!configured.has(packageName) || pkg === packageName) configured.set(packageName, pkg);
+		const keys = sharedKeysByPackage.get(packageName);
+		if (keys) keys.push(pkg);
+		else sharedKeysByPackage.set(packageName, [pkg]);
 	}
 	const localImports = getLocalShareImports(orderedUsed, options);
 	const pending = [...shares];
@@ -4047,13 +4056,11 @@ function getMaterializedShares(options) {
 			...packageJson?.optionalDependencies || {},
 			...packageJson?.peerDependenciesMeta || {}
 		};
-		for (const dependency of Object.keys(dependencies)) {
-			const sharedDependency = configured.get(dependency);
-			const dependencyShare = sharedDependency ? getNormalizeShareItem(sharedDependency, options) : void 0;
-			if (sharedDependency && !shares.has(sharedDependency) && dependencyShare?.scope === share?.scope) {
-				shares.add(sharedDependency);
-				pending.push(sharedDependency);
-			}
+		for (const dependency of Object.keys(dependencies)) for (const sharedDependency of sharedKeysByPackage.get(dependency) ?? []) {
+			if (shares.has(sharedDependency)) continue;
+			if (getNormalizeShareItem(sharedDependency, options)?.scope !== share?.scope) continue;
+			shares.add(sharedDependency);
+			pending.push(sharedDependency);
 		}
 	}
 	const sorted = [...shares].sort((a, b) => {
@@ -4446,8 +4453,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)};
@@ -4467,8 +4476,16 @@ function generateRuntimeSharedCacheSeedCode(shareStrategy, options, command = "b
     };
     var __mfSeedLocalShared = async (seedKeys) => {
       const requested = new Set(seedKeys);
+      // A dependent of a share left to the late bridge would evaluate against an empty
+      // wrapper (#1541); leave it to its wrapper's own fallback load instead.
+      const skipped = new Set();
       for (const batch of __mfSeedBatches) await Promise.all(batch.filter((pkg) => requested.has(pkg)).map(async (pkg) => {
         const share = usedShared[pkg];
+        const seedIndex = __mfSeedIndex.get(pkg);
+        if ((__mfSeedPrerequisites[seedIndex] || []).some((dependency) => skipped.has(dependency))) {
+          skipped.add(seedIndex);
+          return;
+        }
         const cacheDescriptor = __mfGetSharedCacheDescriptor(pkg, share.shareConfig?.singleton, share.version, share.scope);
         if (
           share.shareConfig?.import === false ||
@@ -4539,7 +4556,10 @@ function generateRuntimeSharedCacheSeedCode(shareStrategy, options, command = "b
             isWebpackProvider(externalProvider) &&
             (share.shareConfig?.singleton ||
               __mfFindSharedProviderEntry(initialShared[pkg], externalProvider)?.version === share.version)
-          ) return;
+          ) {
+            skipped.add(seedIndex);
+            return;
+          }
         }
         const providerKey = cacheDescriptor.canonical;
         const resolved = await __mfInitializeProviderOnce(providerKey, async () => {
@@ -4560,6 +4580,10 @@ function generateRuntimeSharedCacheSeedCode(shareStrategy, options, command = "b
           value: true,
           enumerable: false
         });
+        // The init map is page-wide: another container may have run this provider
+        // init and seeded the result under its own name. Keep that owner, or this
+        // container would later treat a sibling's copy as its own provisional seed.
+        if (__mfReadSharedCache(__mfModuleCache.share, cacheDescriptor) !== undefined) return;
         __mfWriteSharedCache(__mfModuleCache.share, cacheDescriptor, exportModule, mfName);
       }));
     };
@@ -4602,6 +4626,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],
@@ -4933,7 +4964,14 @@ function generateRemoteEntry(options, virtualExposesId = getVirtualExposesId(opt
     return __mfExposesMap
   }
 
+  // Hosts that call get() without awaiting init() must still see the shares that
+  // init binds asynchronously: get() waits until no init() call is in flight.
+  let __mfInitsInFlight = 0;
+  let __mfInitsSettled = Promise.resolve();
+  let __mfSettleInits = () => {};
   async function init(shared = {}, initScope = [], remoteEntryInitOptions = {}) {
+    if (__mfInitsInFlight++ === 0) __mfInitsSettled = new Promise((resolve) => (__mfSettleInits = resolve));
+    try {
     ${sharedCacheHelperCode}
     const getShareScope = (scopeName) => remoteEntryInitOptions.shareScopeMap?.[scopeName] ?? (${hasMultipleShareScopes} ? (shared?.[scopeName] || {}) : shared);
     const getShareScopeNames = (share) => {
@@ -5809,16 +5847,26 @@ function generateRemoteEntry(options, virtualExposesId = getVirtualExposesId(opt
     };` : ""}
     initResolve(initRes)
     return initRes
+    } finally {
+      if (--__mfInitsInFlight === 0) __mfSettleInits();
+    }
   }
 
   async function getExposes(moduleName) {
+    // init() failures surface from init() itself; get() only waits for it to settle.
+    if (__mfInitsInFlight) await __mfInitsSettled
     const exposesMap = await getExposesMap()
     if (!(moduleName in exposesMap)) throw new Error(\`[Module Federation] Module \${moduleName} does not exist in container.\`)
     if (__mfLateBridgeShared) await __mfLateBridgeShared()
     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) {
@@ -5910,6 +5958,16 @@ function generateHostAutoInitCode(remoteEntryImport, _command = "build", options
             if (lateKeys.length) __mfHostInitShareBatches.push(lateKeys);
           }
           ${hostInitSharedProviderHelperCode}
+          // Hosts on one page share the module cache. Negotiate one host at a time so
+          // none adopts another's half-upgraded set of singletons.
+          const __mfPinnedShareOwners = (__mfModuleCache.pinnedShareOwners ||= new Set());
+          const __mfPreviousHostShareInit = __mfModuleCache.hostShareInit;
+          let __mfReleaseHostShareInit;
+          __mfModuleCache.hostShareInit = new Promise((resolve) => {
+            __mfReleaseHostShareInit = resolve;
+          });
+          await __mfPreviousHostShareInit;
+          try {
           for (const __mfHostInitShareBatch of __mfHostInitShareBatches) {
             await Promise.all(__mfHostInitShareBatch.map(async (pkg) => {
               const share = usedShared[pkg];
@@ -5920,6 +5978,20 @@ function generateHostAutoInitCode(remoteEntryImport, _command = "build", options
               // a generic full-module key here.
               if (share.treeShaking) return;
               const cacheDescriptor = __mfGetSharedCacheDescriptor(pkg, share.shareConfig?.singleton, share.version, share.scope);
+              // Another host on the page may hold this singleton in the module cache. Its
+              // app, e.g. its react-dom, is bound to that copy, so this host adopts it and
+              // pins that host's seeds: re-negotiation may then no longer upgrade them.
+              const __mfKeepsCachedSingleton = () => {
+                if (!share.shareConfig?.singleton) return false;
+                if (__mfReadSharedCache(__mfModuleCache.share, cacheDescriptor) === undefined) return false;
+                const owner = __mfReadSharedCacheOwner(__mfModuleCache.share, cacheDescriptor);
+                if (owner === undefined) return false;
+                if (owner === ${cacheOwner}) return __mfPinnedShareOwners.has(owner);
+                if ((runtime.options?.remotes || []).some((remote) => remote.name === owner)) return false;
+                __mfPinnedShareOwners.add(owner);
+                return true;
+              };
+              if (__mfKeepsCachedSingleton()) return;
               if (
                 __mfReadSharedCache(__mfModuleCache.share, cacheDescriptor) !== undefined &&
                 ${_command === "serve" ? `__mfReadSharedCacheOwner(__mfModuleCache.share, cacheDescriptor) !== undefined &&
@@ -5968,6 +6040,7 @@ function generateHostAutoInitCode(remoteEntryImport, _command = "build", options
                 customShareInfo: { shareConfig: share.shareConfig }
               }).then(async (factory) => {
                 if (factory === false) return;
+                if (__mfKeepsCachedSingleton()) return;
                 const mod = typeof factory === "function" ? factory() : factory;
                 let resolved = __mfNormalizeRuntimeShare(await Promise.resolve(mod));
                 ${preferLocalVinextReact ? `if (
@@ -5990,6 +6063,9 @@ function generateHostAutoInitCode(remoteEntryImport, _command = "build", options
               });
             }));
           }
+          } finally {
+            __mfReleaseHostShareInit();
+          }
           ` : ""}
           // The seed called this container's get() directly, so the Runtime's
           // provider never learned it is in use and a remote could load its own
@@ -6533,7 +6609,7 @@ function escapeHtmlAttr(value) {
 function getExistingHrefSet(html) {
 	return new Set(Array.from(html.matchAll(/\bhref\s*=\s*["']([^"']+)["']/gi), (match) => match[1]));
 }
-function injectHostInitPreloads(html, bundle, resolvePath, externalHrefs = []) {
+function injectHostInitPreloads(html, bundle, resolvePath, externalHrefs = [], isExtraSeed = () => false) {
 	const existingHrefs = getExistingHrefSet(html);
 	const hrefs = [];
 	for (const href of externalHrefs) {
@@ -6542,7 +6618,7 @@ function injectHostInitPreloads(html, bundle, resolvePath, externalHrefs = []) {
 		hrefs.push(href);
 	}
 	const chunksByFileName = getChunksByFileName(bundle);
-	const seeds = Array.from(chunksByFileName.values()).filter(isHostInitPreloadSeed);
+	const seeds = Array.from(chunksByFileName.values()).filter((chunk) => isHostInitPreloadSeed(chunk) || isExtraSeed(chunk));
 	for (const fileName of collectPreloadChunkFiles(chunksByFileName, seeds)) {
 		const href = resolvePath(fileName);
 		if (existingHrefs.has(href)) continue;
@@ -6551,7 +6627,9 @@ function injectHostInitPreloads(html, bundle, resolvePath, externalHrefs = []) {
 	}
 	if (hrefs.length === 0) return html;
 	const tags = hrefs.map((href) => `<link rel="modulepreload" crossorigin href="${escapeHtmlAttr(href)}">`).join("");
-	return html.includes("</head>") ? html.replace("</head>", `${tags}</head>`) : `${tags}${html}`;
+	if (html.includes("</head>")) return html.replace("</head>", `${tags}</head>`);
+	const script = html.search(/<script\b[^>]*\btype=["']module["']/i);
+	return script === -1 ? `${tags}${html}` : html.slice(0, script) + tags + html.slice(script);
 }
 function appendRemoteEntryWarmup(bundle, entryFileName) {
 	const chunksByFileName = getChunksByFileName(bundle);
@@ -6742,7 +6820,7 @@ const __mfCurrentScript = document.currentScript;
 		const remoteSources = isLoadedFirstClientBuild ? Array.from(getPreloadRemotes(normalizedOptions)) : Object.keys(getUsedRemotesMap(normalizedOptions));
 		return Array.from(new Set(remoteSources.flatMap((remote) => {
 			const registration = getRemoteRegistration(remote, normalizedOptions.remotes, federationOptions);
-			return registration && (registration.type === "module" || registration.type === "esm") && /^(?:https?:)?\/\//.test(registration.entry) && !/\.json(?:[?#]|$)/i.test(registration.entry) ? [registration.entry] : [];
+			return registration && (registration.type === "module" || registration.type === "esm") && /^(?:https?:)?\//.test(registration.entry) && !/\.json(?:[?#]|$)/i.test(registration.entry) ? [registration.entry] : [];
 		})));
 	}
 	async function warmupDevEntryGraph(entryUrl) {
@@ -7122,7 +7200,8 @@ for (const __mfRemoteEntryPrefetchUrl of __mfRemoteEntryPrefetchUrls) {
 				const remoteEntryFile = findRemoteEntryFile(fileName, bundle);
 				if (remoteEntryFile) appendRemoteEntryWarmup(bundle, remoteEntryFile);
 			}
-			if (!injectHtml()) return;
+			const preloadsEntryHtml = inject === "entry" && waitsForInit && !viteConfig.build.ssr && viteConfig.build.modulePreload !== false;
+			if (!injectHtml() && !preloadsEntryHtml) return;
 			if (!emitFileId) return;
 			const htmlFileNames = Object.keys(bundle).filter((fileName) => fileName.endsWith(".html"));
 			if (htmlFileNames.length === 0) return;
@@ -7151,6 +7230,14 @@ for (const __mfRemoteEntryPrefetchUrl of __mfRemoteEntryPrefetchUrls) {
 			};
 			const basePrefix = viteConfig.base?.replace(/\/$/, "") ?? "";
 			const stripBase = (p) => basePrefix && p.startsWith(basePrefix + "/") ? p.slice(basePrefix.length) : p;
+			if (!injectHtml()) {
+				for (const fileName of htmlFileNames) {
+					const htmlAsset = bundle[fileName];
+					if (htmlAsset.type === "chunk") continue;
+					htmlAsset.source = injectHostInitPreloads(htmlAsset.source.toString(), bundle, (builtFileName) => resolvePath(builtFileName, fileName), getRemoteEntryPreloadUrls(), (chunk) => !!chunk.facadeModuleId && hasEntryBootstrapParam(chunk.facadeModuleId));
+				}
+				return;
+			}
 			let bootstrapIndex = 0;
 			for (const fileName of htmlFileNames) {
 				let htmlAsset = bundle[fileName];
@@ -8375,7 +8462,7 @@ function ${helperName}(names) {
 }
 //#endregion
 //#region package.json
-var version$1 = "1.23.8";
+var version$1 = "1.23.10";
 //#endregion
 //#region src/virtualModules/virtualExposesSSR.ts
 /**
@@ -9659,9 +9746,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 +9823,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;
@@ -10374,8 +10459,9 @@ function proxySharedModule(options) {
 			configureServer(server) {
 				devServer = server;
 				setLocalSharedImportMapInvalidator(() => {
-					const module = server.moduleGraph.getModuleById(getResolvedLocalSharedImportMapId(federationOptions));
-					if (module) server.moduleGraph.invalidateModule(module);
+					const graph = server.environments?.client?.moduleGraph ?? server.moduleGraph;
+					const module = graph.getModuleById(getResolvedLocalSharedImportMapId(federationOptions));
+					if (module) graph.invalidateModule(module);
 				}, federationOptions);
 			},
 			resolveId(source) {
@@ -10506,49 +10592,52 @@ function proxySharedModule(options) {
 		{
 			name: "proxyPreBuildShared:resolve-shared-loadShare",
 			enforce: "pre",
-			async resolveId(source, importer, resolveOptions) {
-				if (isSharedEntryLookup(source, importer, resolveOptions) || resolveOptions.custom?.__mfTreeShakingGraph) return;
-				const sharedSource = await sharedSourceResolver.resolve(this, source, resolveOptions);
-				if (!sharedSource) return;
-				const key = findSharedKey(sharedSource, shared);
-				if (!key) return;
-				const shouldSkipTaggedImporterProxy = (sharedKey, tag) => {
-					if (!importer?.includes(tag)) return false;
-					const taggedModule = VirtualModule.findModule(tag, importer);
-					if (!taggedModule) return true;
-					return taggedModule.name === sharedKey || matchesSharedSource(sharedSource, taggedModule.name);
-				};
-				const importerPackage = getSharedPackageFromFile(importer, shared);
-				if (importerPackage === getPackageName(key) && keepsOwnPackageEdge(importer, shared)) return;
-				if (importerPackage && shared[key].shareConfig.import !== false) {
-					const importerIsUnsharedWorkspacePackage = !isNodeModulePath(importer) && !Object.keys(shared).some((sharedKey) => getPackageName(sharedKey) === importerPackage);
-					const request = getSharedRequest(key, shared[key]);
-					const runtimeDependencyRequest = request.endsWith("/") && matchesSharedSource(sharedSource, key, shared[key]) ? sharedSource : request;
-					if (importerIsUnsharedWorkspacePackage ? isSharedPackageRuntimeDependency(runtimeDependencyRequest, importerPackage, getRuntimeDependencyConditions(this, resolveOptions)) : isSharedPackageDependency(request, importerPackage)) return;
-				}
-				if (useDirectReactImport && key === "react") return;
-				if (isAssetLikeImport(source)) return;
-				if (isBuildConfigImporter(importer)) return;
-				if (useDirectReactImport && source === "react") return;
-				if (importer && importer.includes("localSharedImportMap")) return;
-				if (importer && (importer.includes("hostAutoInit") || importer.includes("__H_A_I__"))) return;
-				if (shouldSkipTaggedImporterProxy(key, "__loadShare__")) return;
-				if (shouldSkipTaggedImporterProxy(key, "__prebuild__")) return;
-				const shareSource = key === "vue" && sharedSource.startsWith("vue/dist/") ? key : sharedSource;
-				if (shouldKeepSharedImportLocal(shareSource, importer, key, shared, importerPackage, federationOptions)) {
-					const localSource = getPrebuildResolutionSource(shareSource, shared[key]);
-					return tryResolveFromProjectRoot(localSource) || localSource;
-				}
-				const loadSharePath = getLoadShareModulePath(shareSource, federationOptions);
-				if (!materializedLoadShareSources.has(shareSource)) {
-					materializedLoadShareSources.add(shareSource);
-					writeLoadShareModule(shareSource, shared[key], _command, federationOptions);
-					if (shared[key].shareConfig.import !== false) writePreBuildLibPath(shareSource, shared[key], federationOptions);
-					addUsedShares(shareSource, federationOptions);
-					writeLocalSharedImportMap(federationOptions);
-					refreshHostAutoInit(federationOptions);
+			resolveId: {
+				order: "pre",
+				async handler(source, importer, resolveOptions) {
+					if (isSharedEntryLookup(source, importer, resolveOptions) || resolveOptions.custom?.__mfTreeShakingGraph) return;
+					const sharedSource = await sharedSourceResolver.resolve(this, source, resolveOptions);
+					if (!sharedSource) return;
+					const key = findSharedKey(sharedSource, shared);
+					if (!key) return;
+					const shouldSkipTaggedImporterProxy = (sharedKey, tag) => {
+						if (!importer?.includes(tag)) return false;
+						const taggedModule = VirtualModule.findModule(tag, importer);
+						if (!taggedModule) return true;
+						return taggedModule.name === sharedKey || matchesSharedSource(sharedSource, taggedModule.name);
+					};
+					const importerPackage = getSharedPackageFromFile(importer, shared);
+					if (importerPackage === getPackageName(key) && keepsOwnPackageEdge(importer, shared)) return;
+					if (importerPackage && shared[key].shareConfig.import !== false) {
+						const importerIsUnsharedWorkspacePackage = !isNodeModulePath(importer) && !Object.keys(shared).some((sharedKey) => getPackageName(sharedKey) === importerPackage);
+						const request = getSharedRequest(key, shared[key]);
+						const runtimeDependencyRequest = request.endsWith("/") && matchesSharedSource(sharedSource, key, shared[key]) ? sharedSource : request;
+						if (importerIsUnsharedWorkspacePackage ? isSharedPackageRuntimeDependency(runtimeDependencyRequest, importerPackage, getRuntimeDependencyConditions(this, resolveOptions)) : isSharedPackageDependency(request, importerPackage)) return;
+					}
+					if (useDirectReactImport && key === "react") return;
+					if (isAssetLikeImport(source)) return;
+					if (isBuildConfigImporter(importer)) return;
+					if (useDirectReactImport && source === "react") return;
+					if (importer && importer.includes("localSharedImportMap")) return;
+					if (importer && (importer.includes("hostAutoInit") || importer.includes("__H_A_I__"))) return;
+					if (shouldSkipTaggedImporterProxy(key, "__loadShare__")) return;
+					if (shouldSkipTaggedImporterProxy(key, "__prebuild__")) return;
+					const shareSource = key === "vue" && sharedSource.startsWith("vue/dist/") ? key : sharedSource;
+					if (shouldKeepSharedImportLocal(shareSource, importer, key, shared, importerPackage, federationOptions)) {
+						const localSource = getPrebuildResolutionSource(shareSource, shared[key]);
+						return tryResolveFromProjectRoot(localSource) || localSource;
+					}
+					const loadSharePath = getLoadShareModulePath(shareSource, federationOptions);
+					if (!materializedLoadShareSources.has(shareSource)) {
+						materializedLoadShareSources.add(shareSource);
+						writeLoadShareModule(shareSource, shared[key], _command, federationOptions);
+						if (shared[key].shareConfig.import !== false) writePreBuildLibPath(shareSource, shared[key], federationOptions);
+						addUsedShares(shareSource, federationOptions);
+						writeLocalSharedImportMap(federationOptions);
+						refreshHostAutoInit(federationOptions);
+					}
+					return this.resolve(loadSharePath, importer, { skipSelf: true });
 				}
-				return this.resolve(loadSharePath, importer, { skipSelf: true });
 			}
 		},
 		{
@@ -11193,7 +11282,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,
@@ -12226,7 +12315,7 @@ function registerEntryImports(options, projectRoot, recordShared = true, entryFi
 function materializeSharedRequest(options, request) {
 	addUsedShares(request, options);
 	const packageName = getPackageName(request);
-	if (packageName !== request && findSharedKey(packageName, options.shared)) addUsedShares(packageName, options);
+	if (packageName !== request && findSharedKey(packageName, options.shared) && isPackageExportAvailable(packageName)) addUsedShares(packageName, options);
 }
 function materializeAutomaticJsxRuntime(options, runtime) {
 	if (!findSharedKey(runtime, options.shared)) return false;
@@ -12242,6 +12331,7 @@ function createEarlyVirtualModulesPlugin(options) {
 	const { shared, remotes } = options;
 	const isLitShare = (pkg) => pkg === "lit" || pkg.startsWith("lit/");
 	let hasClientJsxSource = false;
+	let scanBuildEntryImports;
 	return {
 		name: "vite:module-federation-early-init",
 		enforce: "pre",
@@ -12270,10 +12360,8 @@ function createEarlyVirtualModulesPlugin(options) {
 					config.optimizeDeps.exclude.push(...Object.keys(remotes || {}));
 				}
 			}
-			if (!config.build?.ssr && (hasShared(options) || hasRemotes(options))) {
-				const hasJsxSource = registerEntryImports(options, root, _command === "serve", resolvedConfiguredEntryFiles);
-				if (_command === "serve") hasClientJsxSource = hasJsxSource;
-			}
+			if (!config.build?.ssr && (hasShared(options) || hasRemotes(options))) if (_command === "serve") hasClientJsxSource = registerEntryImports(options, root, true, resolvedConfiguredEntryFiles);
+			else scanBuildEntryImports = () => registerEntryImports(options, root, false, resolvedConfiguredEntryFiles);
 			if (hasShared(options)) {
 				if (_command === "serve") {
 					excludeSharedSubDependencies(shared);
@@ -12465,6 +12553,9 @@ export default __mfShared.default ?? __mfShared;`
 				}
 			}
 		},
+		buildStart() {
+			scanBuildEntryImports?.();
+		},
 		configResolved(config) {
 			if (hasClientJsxSource) {
 				const automaticJsxRuntime = getAutomaticJsxRuntime(config);
@@ -12530,7 +12621,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.10",
   "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",