@module-federation/vite 1.23.9 → 1.23.10

package/lib/index.js

@@ -3004,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.
@@ -3174,7 +3179,7 @@ function writeLoadShareModule(pkg, shareItem, command, options, exportConditions
 	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";
@@ -4026,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];
@@ -4049,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) => {
@@ -4471,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 ||
@@ -4543,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 () => {
@@ -4564,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);
       }));
     };
@@ -4944,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) => {
@@ -5820,9 +5847,14 @@ 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()
@@ -5926,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];
@@ -5936,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 &&
@@ -5984,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 (
@@ -6006,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
@@ -6549,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) {
@@ -6558,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;
@@ -6567,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);
@@ -6758,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) {
@@ -7138,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;
@@ -7167,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];
@@ -8391,7 +8462,7 @@ function ${helperName}(names) {
 }
 //#endregion
 //#region package.json
-var version$1 = "1.23.9";
+var version$1 = "1.23.10";
 //#endregion
 //#region src/virtualModules/virtualExposesSSR.ts
 /**
@@ -10388,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) {
@@ -10520,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 });
 			}
 		},
 		{
@@ -12240,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;
@@ -12256,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",
@@ -12284,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);
@@ -12479,6 +12553,9 @@ export default __mfShared.default ?? __mfShared;`
 				}
 			}
 		},
+		buildStart() {
+			scanBuildEntryImports?.();
+		},
 		configResolved(config) {
 			if (hasClientJsxSource) {
 				const automaticJsxRuntime = getAutomaticJsxRuntime(config);

package/package.json

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