@module-federation/vite 1.13.0 → 1.13.1

package/lib/index.cjs

@@ -206,6 +206,12 @@ const addEntry = ({ entryName, entryPath, fileName, inject = "entry" }) => {
 			else if (Array.isArray(inputOptions)) entryFiles = inputOptions;
 			else if (typeof inputOptions === "object") entryFiles = Object.values(inputOptions);
 			if (entryFiles && entryFiles.length > 0) htmlFilePath = getFirstHtmlEntryFile(entryFiles);
+			if (_command === "serve" && htmlFilePath && fs.existsSync(htmlFilePath)) {
+				const htmlContent = fs.readFileSync(htmlFilePath, "utf-8");
+				const scriptRegex = /<script\s+[^>]*src=["']([^"']+)["'][^>]*>/gi;
+				let match;
+				while ((match = scriptRegex.exec(htmlContent)) !== null) entryFiles.push(match[1]);
+			}
 		},
 		buildStart() {
 			if (_command === "serve") return;
@@ -674,6 +680,10 @@ function searchPackageVersion(sharedName) {
 		}
 	} catch (_) {}
 }
+function inferVersionFromRequiredVersion(requiredVersion) {
+	if (!requiredVersion) return void 0;
+	return requiredVersion.match(/\d+\.\d+\.\d+(?:[-+][0-9A-Za-z.-]+)?/)?.[0];
+}
 function normalizeShareItem(key, shareItem) {
 	let version;
 	try {
@@ -705,7 +715,7 @@ function normalizeShareItem(key, shareItem) {
 	return {
 		name: key,
 		from: "",
-		version: shareItem.version || version,
+		version: shareItem.version || inferVersionFromRequiredVersion(shareItem.requiredVersion) || version,
 		scope: shareItem.shareScope || "default",
 		shareConfig: {
 			import: typeof shareItem === "object" ? shareItem.import : void 0,
@@ -972,12 +982,12 @@ function generateExposes(options) {
 //#endregion
 //#region src/virtualModules/virtualRuntimeInitStatus.ts
 const virtualRuntimeInitStatus = new VirtualModule("runtimeInit");
-function writeRuntimeInitStatus(command) {
-	const globalKey = `__mf_init__${virtualRuntimeInitStatus.getImportId()}__`;
-	const exportStatement = command === "build" ? `const { initPromise, initResolve, initReject } = globalThis[globalKey];
-export { initPromise, initResolve, initReject };` : `module.exports = globalThis[globalKey];`;
-	virtualRuntimeInitStatus.writeSync(`
-const globalKey = ${JSON.stringify(globalKey)};
+function getRuntimeInitGlobalKey() {
+	return `__mf_init__${virtualRuntimeInitStatus.getImportId()}__`;
+}
+function getRuntimeInitBootstrapCode() {
+	return `
+const globalKey = ${JSON.stringify(getRuntimeInitGlobalKey())};
 if (!globalThis[globalKey]) {
   let initResolve, initReject;
   const initPromise = new Promise((re, rj) => {
@@ -989,8 +999,6 @@ if (!globalThis[globalKey]) {
     initResolve,
     initReject,
   };
-  // In SSR (no window), resolve immediately with a stub runtime
-  // so modules don't hang waiting for browser-only init
   if (typeof window === 'undefined') {
     initResolve({
       loadRemote: function() { return Promise.resolve(undefined); },
@@ -998,6 +1006,64 @@ if (!globalThis[globalKey]) {
     });
   }
 }
+`;
+}
+function getRuntimeInitPromiseBootstrapCode() {
+	return `
+const __mfPromiseGlobalKey = ${JSON.stringify(getRuntimeInitGlobalKey())};
+let __mfPromiseState = globalThis[__mfPromiseGlobalKey];
+if (!__mfPromiseState) {
+  let initResolve, initReject;
+  const initPromise = new Promise((re, rj) => {
+    initResolve = re;
+    initReject = rj;
+  });
+  __mfPromiseState = globalThis[__mfPromiseGlobalKey] = {
+    initPromise,
+    initResolve,
+    initReject,
+  };
+  if (typeof window === 'undefined') {
+    initResolve({
+      loadRemote: function() { return Promise.resolve(undefined); },
+      loadShare: function() { return Promise.resolve(undefined); },
+    });
+  }
+}
+const initPromise = __mfPromiseState.initPromise;
+`;
+}
+function getRuntimeInitResolveBootstrapCode() {
+	return `
+const __mfResolveGlobalKey = ${JSON.stringify(getRuntimeInitGlobalKey())};
+let __mfResolveState = globalThis[__mfResolveGlobalKey];
+if (!__mfResolveState) {
+  let initResolve, initReject;
+  const initPromise = new Promise((re, rj) => {
+    initResolve = re;
+    initReject = rj;
+  });
+  __mfResolveState = globalThis[__mfResolveGlobalKey] = {
+    initPromise,
+    initResolve,
+    initReject,
+  };
+  if (typeof window === 'undefined') {
+    initResolve({
+      loadRemote: function() { return Promise.resolve(undefined); },
+      loadShare: function() { return Promise.resolve(undefined); },
+    });
+  }
+}
+const initResolve = __mfResolveState.initResolve;
+`;
+}
+function writeRuntimeInitStatus(command) {
+	getRuntimeInitGlobalKey();
+	const exportStatement = command === "build" ? `const { initPromise, initResolve, initReject } = globalThis[globalKey];
+export { initPromise, initResolve, initReject };` : `module.exports = globalThis[globalKey];`;
+	virtualRuntimeInitStatus.writeSync(`
+${getRuntimeInitBootstrapCode()}
 ${exportStatement}
 `);
 }
@@ -1022,7 +1088,8 @@ function getUsedRemotesMap() {
 }
 function generateRemotes(id, command, isRolldown) {
 	const useESM = command === "build" || isRolldown;
-	const importLine = useESM ? `import { initPromise } from "${virtualRuntimeInitStatus.getImportId()}"` : `const {initPromise} = require("${virtualRuntimeInitStatus.getImportId()}")`;
+	const importLine = command === "build" ? getRuntimeInitPromiseBootstrapCode() : useESM ? `${getRuntimeInitBootstrapCode()}
+    const { initPromise } = globalThis[globalKey];` : `const {initPromise} = require("${virtualRuntimeInitStatus.getImportId()}")`;
 	const awaitOrPlaceholder = useESM ? "await " : "/*mf top-level-await placeholder replacement mf*/";
 	const exportLine = command === "serve" && useESM ? "export default exportModule.default ?? exportModule" : useESM ? "export default exportModule" : "module.exports = exportModule";
 	return `
@@ -1079,7 +1146,8 @@ function getLoadShareModulePath(pkg, isRolldown, command) {
 function writeLoadShareModule(pkg, shareItem, command, isRolldown) {
 	if (!loadShareCacheMap[pkg]) loadShareCacheMap[pkg] = new VirtualModule(pkg, LOAD_SHARE_TAG, isRolldown || command === "build" ? ".mjs" : ".js");
 	const useESM = command === "build" || isRolldown;
-	const importLine = useESM ? `import { initPromise } from "${virtualRuntimeInitStatus.getImportId()}"` : `const {initPromise} = require("${virtualRuntimeInitStatus.getImportId()}")`;
+	const importLine = command === "build" ? getRuntimeInitPromiseBootstrapCode() : useESM ? `${getRuntimeInitBootstrapCode()}
+    const { initPromise } = globalThis[globalKey];` : `const {initPromise} = require("${virtualRuntimeInitStatus.getImportId()}")`;
 	const awaitOrPlaceholder = useESM ? "await " : "/*mf top-level-await placeholder replacement mf*/";
 	const useSsrProviderFallback = hasPackageDependency("vinext") && command === "build" && pkg === "react";
 	const providerImportId = getLocalProviderImportPath(pkg) || getPreBuildLibImportId(pkg);
@@ -1123,12 +1191,12 @@ new VirtualModule("localSharedImportMap");
 function getLocalSharedImportMapPath() {
 	return getLocalSharedImportMapPath_temp();
 }
-let prevSharedCount;
+let prevLocalSharedImportMapContent;
 function writeLocalSharedImportMap() {
-	const sharedCount = getUsedShares().size;
-	if (prevSharedCount !== sharedCount) {
-		prevSharedCount = sharedCount;
-		writeLocalSharedImportMap_temp(generateLocalSharedImportMap());
+	const nextContent = generateLocalSharedImportMap();
+	if (prevLocalSharedImportMapContent !== nextContent) {
+		prevLocalSharedImportMapContent = nextContent;
+		writeLocalSharedImportMap_temp(nextContent);
 	}
 }
 function generateLocalSharedImportMap() {
@@ -1211,7 +1279,7 @@ const REMOTE_ENTRY_ID = "virtual:mf-REMOTE_ENTRY_ID";
 function getRemoteEntryId(options) {
 	return `${REMOTE_ENTRY_ID}:${`${options.name}__${options.filename}`.replace(/[^a-zA-Z0-9_-]/g, "_")}`;
 }
-function generateRemoteEntry(options, virtualExposesId = getVirtualExposesId(options)) {
+function generateRemoteEntry(options, virtualExposesId = getVirtualExposesId(options), command = "build") {
 	const pluginImportNames = options.runtimePlugins.map((p, i) => {
 		if (typeof p === "string") return [
 			`$runtimePlugin_${i}`,
@@ -1227,15 +1295,25 @@ function generateRemoteEntry(options, virtualExposesId = getVirtualExposesId(opt
 	return `
   import {init as runtimeInit, loadRemote} from "@module-federation/runtime";
   ${pluginImportNames.map((item) => item[1]).join("\n")}
-  import exposesMap from "${virtualExposesId}"
-  import {usedShared, usedRemotes} from "${getLocalSharedImportMapPath()}"
-  import {
-    initResolve
-  } from "${virtualRuntimeInitStatus.getImportId()}"
+  ${command === "build" ? getRuntimeInitResolveBootstrapCode() : getRuntimeInitBootstrapCode() + "\n  const { initResolve } = globalThis[globalKey];"}
   const initTokens = {}
   const shareScopeName = ${JSON.stringify(options.shareScope)}
   const mfName = ${JSON.stringify(options.name)}
+  let localSharedImportMapPromise
+  let exposesMapPromise
+
+  async function getLocalSharedImportMap() {
+    localSharedImportMapPromise ??= import("${getLocalSharedImportMapPath()}")
+    return localSharedImportMapPromise
+  }
+
+  async function getExposesMap() {
+    exposesMapPromise ??= import("${virtualExposesId}").then((mod) => mod.default ?? mod)
+    return exposesMapPromise
+  }
+
   async function init(shared = {}, initScope = []) {
+    const {usedShared, usedRemotes} = await getLocalSharedImportMap()
     const initRes = runtimeInit({
       name: mfName,
       remotes: usedRemotes,
@@ -1263,7 +1341,8 @@ function generateRemoteEntry(options, virtualExposesId = getVirtualExposesId(opt
     return initRes
   }
 
-  function getExposes(moduleName) {
+  async function getExposes(moduleName) {
+    const exposesMap = await getExposesMap()
     if (!(moduleName in exposesMap)) throw new Error(\`Module \${moduleName} does not exist in container.\`)
     return (exposesMap[moduleName])().then(res => () => res)
   }
@@ -1276,13 +1355,8 @@ function generateRemoteEntry(options, virtualExposesId = getVirtualExposesId(opt
 const hostAutoInitModule = new VirtualModule("hostAutoInit", "__H_A_I__");
 function writeHostAutoInit(remoteEntryId = REMOTE_ENTRY_ID) {
 	hostAutoInitModule.writeSync(`
-    const remoteEntryPromise = import("${remoteEntryId}")
-    Promise.resolve(remoteEntryPromise)
-      .then(remoteEntry => {
-        return Promise.resolve(remoteEntry.__tla)
-          .then(remoteEntry.init)
-          .catch(remoteEntry.init)
-      })
+    const remoteEntry = await import("${remoteEntryId}");
+    await remoteEntry.init();
     `);
 }
 function getHostAutoInitImportId() {
@@ -1305,13 +1379,21 @@ function initVirtualModules(command, remoteEntryId) {
 * If Rollup's deconflict renamed the alias but didn't update references
 * in the code body, fall back to proxyLocal so they stay in sync.
 */
-function resolveProxyAlias(binding, proxyLocal, code, fullImport) {
+function resolveProxyAlias(binding, proxyLocal, code, fullImport, claimedLocals = /* @__PURE__ */ new Set()) {
 	const codeWithoutImport = code.replace(fullImport, "");
 	const escapedLocal = binding.local.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 	const localUsedInCode = new RegExp(`\\b${escapedLocal}\\b`).test(codeWithoutImport);
+	const claimedImportLocals = /* @__PURE__ */ new Set();
+	const importRe = /import\s*\{([^}]+)\}\s*from\s*["'][^"']+["']\s*;?/g;
+	let match;
+	while ((match = importRe.exec(codeWithoutImport)) !== null) for (const spec of match[1].split(",")) {
+		const parts = spec.trim().split(/\s+as\s+/);
+		claimedImportLocals.add((parts[1] || parts[0]).trim());
+	}
+	const local = !localUsedInCode && !claimedLocals.has(proxyLocal) && !claimedImportLocals.has(proxyLocal) ? proxyLocal : binding.local;
 	return {
 		imported: binding.imported,
-		local: localUsedInCode ? binding.local : proxyLocal
+		local
 	};
 }
 function findRemoteEntryFile(filename, bundle) {
@@ -1766,14 +1848,14 @@ function pluginProxyRemoteEntry_default({ options, remoteEntryId, virtualExposes
 			}
 		},
 		load(id) {
-			if (id === remoteEntryId) return parsePromise.then((_) => generateRemoteEntry(options, virtualExposesId));
+			if (id === remoteEntryId) return parsePromise.then((_) => generateRemoteEntry(options, virtualExposesId, _command));
 			if (id === virtualExposesId) return generateExposes(options);
 			if (_command === "serve" && id.includes(getHostAutoInitPath())) return id;
 		},
 		transform(code, id) {
 			return mapCodeToCodeWithSourcemap((() => {
 				if (!filter(id)) return;
-				if (id.includes(remoteEntryId)) return parsePromise.then((_) => generateRemoteEntry(options, virtualExposesId));
+				if (id.includes(remoteEntryId)) return parsePromise.then((_) => generateRemoteEntry(options, virtualExposesId, _command));
 				if (id === virtualExposesId) return generateExposes(options);
 				if (id.includes(getHostAutoInitPath())) {
 					if (_command === "serve") {
@@ -2032,6 +2114,58 @@ var aliasToArrayPlugin_default = {
 	}
 };
 //#endregion
+//#region src/utils/controlChunkSanitizer.ts
+const FEDERATION_CONTROL_CHUNK_HINTS = [
+	"hostInit",
+	"virtualExposes",
+	"localSharedImportMap"
+];
+function stripEmptyPreloadCalls(code) {
+	const helperImportRegex = /import\s*\{\s*_\s*as\s*(\w+)\s*\}\s*from\s*["'][^"']+["']\s*;?/g;
+	const helperAliases = [...code.matchAll(helperImportRegex)].map((match) => match[1]);
+	let nextCode = code;
+	for (const alias of helperAliases) {
+		const marker = `${alias}(()=>`;
+		let start = nextCode.indexOf(marker);
+		while (start !== -1) {
+			const exprStart = start + marker.length;
+			let depth = 0;
+			let cursor = exprStart;
+			let replacementEnd = -1;
+			while (cursor < nextCode.length) {
+				const char = nextCode[cursor];
+				if (char === "(") depth++;
+				else if (char === ")") depth--;
+				else if (depth === 0 && nextCode.startsWith(",[],import.meta.url)", cursor)) {
+					replacementEnd = cursor;
+					break;
+				}
+				cursor++;
+			}
+			if (replacementEnd === -1) break;
+			const expression = nextCode.slice(exprStart, replacementEnd);
+			nextCode = nextCode.slice(0, start) + expression + nextCode.slice(replacementEnd + 20);
+			start = nextCode.indexOf(marker, start + expression.length);
+		}
+	}
+	nextCode = nextCode.replace(/import\s*["'][^"']*__loadShare__[^"']*["']\s*;?/g, "");
+	nextCode = nextCode.replace(helperImportRegex, (statement, local) => {
+		return new RegExp(`\\b${local}\\s*\\(`).test(nextCode.replace(statement, "")) ? statement : "";
+	});
+	return nextCode;
+}
+function isFederationControlChunk(fileName, filename) {
+	return fileName.includes(filename) || FEDERATION_CONTROL_CHUNK_HINTS.some((hint) => fileName.includes(hint));
+}
+function sanitizeFederationControlChunk(code, fileName, filename) {
+	let nextCode = stripEmptyPreloadCalls(code);
+	if (fileName.includes("localSharedImportMap")) {
+		const remoteEntryImportRegex = new RegExp(`import\\s*["'][^"']*${filename.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}["']\\s*;?`, "g");
+		nextCode = nextCode.replace(remoteEntryImportRegex, "");
+	}
+	return nextCode;
+}
+//#endregion
 //#region src/utils/normalizeOptimizeDeps.ts
 var normalizeOptimizeDeps_default = {
 	name: "normalizeOptimizeDeps",
@@ -2169,9 +2303,19 @@ function federation(mfUserOptions) {
 			config(config) {
 				const runtimeInitId = virtualRuntimeInitStatus.getImportId();
 				config.build = config.build || {};
-				config.build.rollupOptions = config.build.rollupOptions || {};
-				if (!Array.isArray(config.build.rollupOptions.output)) {
-					const output = config.build.rollupOptions.output ||= {};
+				if (config.build.modulePreload !== false) {
+					const currentModulePreload = config.build.modulePreload && typeof config.build.modulePreload === "object" ? config.build.modulePreload : {};
+					const existingResolveDependencies = currentModulePreload.resolveDependencies;
+					config.build.modulePreload = {
+						...currentModulePreload,
+						resolveDependencies(filename, deps, context) {
+							const resolvedDeps = existingResolveDependencies ? existingResolveDependencies(filename, deps, context) : deps;
+							const hostFile = pathe.default.basename(context.hostId);
+							return context.hostType === "js" && (hostFile === options.filename || hostFile.includes("hostInit") || hostFile.includes("virtualExposes") || hostFile.includes("localSharedImportMap")) ? [] : resolvedDeps;
+						}
+					};
+				}
+				const applyManualChunks = (output) => {
 					const existingManualChunks = output.manualChunks;
 					output.manualChunks = function(id) {
 						if (id.includes(runtimeInitId)) return "runtimeInit";
@@ -2184,7 +2328,12 @@ function federation(mfUserOptions) {
 							for (const [key, ids] of Object.entries(existingManualChunks)) if (Array.isArray(ids) && ids.some((v) => id.includes(v))) return key;
 						}
 					};
-				}
+				};
+				config.build.rollupOptions = config.build.rollupOptions || {};
+				if (!Array.isArray(config.build.rollupOptions.output)) applyManualChunks(config.build.rollupOptions.output ||= {});
+				const buildWithRolldown = config.build;
+				buildWithRolldown.rolldownOptions = buildWithRolldown.rolldownOptions || {};
+				if (!Array.isArray(buildWithRolldown.rolldownOptions.output)) applyManualChunks(buildWithRolldown.rolldownOptions.output ||= {});
 			},
 			load(id) {
 				if (id.startsWith("\0")) return;
@@ -2216,6 +2365,11 @@ function federation(mfUserOptions) {
 				}
 			},
 			generateBundle(_, bundle) {
+				for (const [fileName, chunk] of Object.entries(bundle)) {
+					if (chunk.type !== "chunk") continue;
+					if (!isFederationControlChunk(fileName, filename)) continue;
+					chunk.code = sanitizeFederationControlChunk(chunk.code, fileName, filename);
+				}
 				for (const [fileName, chunk] of Object.entries(bundle)) {
 					if (chunk.type !== "chunk") continue;
 					if (fileName.includes("__loadShare__")) continue;
@@ -2253,12 +2407,12 @@ function federation(mfUserOptions) {
 						fileName
 					});
 				}
-				if (proxyChunks.size === 0) return;
-				for (const [fileName, chunk] of Object.entries(bundle)) {
+				if (proxyChunks.size > 0) for (const [fileName, chunk] of Object.entries(bundle)) {
 					if (chunk.type !== "chunk") continue;
 					if (fileName.includes("__loadShare__")) continue;
 					let code = chunk.code;
 					let modified = false;
+					const claimedLocals = /* @__PURE__ */ new Set();
 					for (const [proxyFileName, proxyInfo] of proxyChunks) {
 						const proxyBaseName = proxyFileName.replace(/^.*\//, "").replace(/\.js$/, "").replace(/-[A-Za-z0-9_-]+$/, "");
 						const importMatch = new RegExp(`import\\s*\\{([^}]+)\\}\\s*from\\s*["']([^"']*${proxyBaseName.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}[^"']*)["']\\s*;?`).exec(code);
@@ -2281,9 +2435,12 @@ function federation(mfUserOptions) {
 						}
 						const inlineable = [];
 						const nonInlineable = [];
+						const pendingLocals = new Set(bindings.map((binding) => binding.local));
 						for (const b of bindings) {
+							pendingLocals.delete(b.local);
 							const proxyLocal = exportMap[b.imported];
 							if (!proxyLocal) {
+								claimedLocals.add(b.local);
 								nonInlineable.push(b);
 								continue;
 							}
@@ -2305,7 +2462,14 @@ function federation(mfUserOptions) {
 									local: b.local,
 									funcBody: renamedFunc
 								});
-							} else nonInlineable.push(resolveProxyAlias(b, proxyLocal, code, fullImport));
+								claimedLocals.add(b.local);
+							} else {
+								const unavailableLocals = new Set(claimedLocals);
+								pendingLocals.forEach((local) => unavailableLocals.add(local));
+								const resolvedBinding = resolveProxyAlias(b, proxyLocal, code, fullImport, unavailableLocals);
+								claimedLocals.add(resolvedBinding.local);
+								nonInlineable.push(resolvedBinding);
+							}
 						}
 						const hasRenamedAlias = nonInlineable.some((b) => bindings.find((ob) => ob.imported === b.imported)?.local !== b.local);
 						if (inlineable.length === 0 && !hasRenamedAlias) continue;
@@ -2319,6 +2483,28 @@ function federation(mfUserOptions) {
 				}
 			}
 		},
+		{
+			name: "module-federation-strip-empty-preload-helper",
+			enforce: "post",
+			apply: "build",
+			renderChunk(code, chunk) {
+				if (!isFederationControlChunk(chunk.fileName, filename)) return;
+				const nextCode = sanitizeFederationControlChunk(code, chunk.fileName, filename);
+				return nextCode === code ? null : {
+					code: nextCode,
+					map: null
+				};
+			},
+			writeBundle(outputOptions, bundle) {
+				if (!outputOptions.dir) return;
+				for (const chunk of Object.values(bundle)) {
+					if (chunk.type !== "chunk") continue;
+					if (!isFederationControlChunk(chunk.fileName, filename)) continue;
+					const outputPath = pathe.default.join(outputOptions.dir, chunk.fileName);
+					(0, fs.writeFileSync)(outputPath, sanitizeFederationControlChunk((0, fs.readFileSync)(outputPath, "utf-8"), chunk.fileName, filename));
+				}
+			}
+		},
 		{
 			name: "module-federation-dev-await-shared-init",
 			apply: "serve",
@@ -2353,7 +2539,7 @@ function federation(mfUserOptions) {
 			config(config, { command: _command }) {
 				const isRolldown = !!this?.meta?.rolldownVersion;
 				let implementation = options.implementation;
-				if (isRolldown) implementation = implementation.replace(/\.cjs\.cjs$/, ".esm.js");
+				if (isRolldown) implementation = implementation.replace(/\.cjs(\.js)?$/, ".js");
 				config.resolve.alias.push({
 					find: "@module-federation/runtime",
 					replacement: implementation

package/lib/index.mjs

@@ -184,6 +184,12 @@ const addEntry = ({ entryName, entryPath, fileName, inject = "entry" }) => {
 			else if (Array.isArray(inputOptions)) entryFiles = inputOptions;
 			else if (typeof inputOptions === "object") entryFiles = Object.values(inputOptions);
 			if (entryFiles && entryFiles.length > 0) htmlFilePath = getFirstHtmlEntryFile(entryFiles);
+			if (_command === "serve" && htmlFilePath && fs.existsSync(htmlFilePath)) {
+				const htmlContent = fs.readFileSync(htmlFilePath, "utf-8");
+				const scriptRegex = /<script\s+[^>]*src=["']([^"']+)["'][^>]*>/gi;
+				let match;
+				while ((match = scriptRegex.exec(htmlContent)) !== null) entryFiles.push(match[1]);
+			}
 		},
 		buildStart() {
 			if (_command === "serve") return;
@@ -652,6 +658,10 @@ function searchPackageVersion(sharedName) {
 		}
 	} catch (_) {}
 }
+function inferVersionFromRequiredVersion(requiredVersion) {
+	if (!requiredVersion) return void 0;
+	return requiredVersion.match(/\d+\.\d+\.\d+(?:[-+][0-9A-Za-z.-]+)?/)?.[0];
+}
 function normalizeShareItem(key, shareItem) {
 	let version;
 	try {
@@ -682,7 +692,7 @@ function normalizeShareItem(key, shareItem) {
 	return {
 		name: key,
 		from: "",
-		version: shareItem.version || version,
+		version: shareItem.version || inferVersionFromRequiredVersion(shareItem.requiredVersion) || version,
 		scope: shareItem.shareScope || "default",
 		shareConfig: {
 			import: typeof shareItem === "object" ? shareItem.import : void 0,
@@ -949,12 +959,12 @@ function generateExposes(options) {
 //#endregion
 //#region src/virtualModules/virtualRuntimeInitStatus.ts
 const virtualRuntimeInitStatus = new VirtualModule("runtimeInit");
-function writeRuntimeInitStatus(command) {
-	const globalKey = `__mf_init__${virtualRuntimeInitStatus.getImportId()}__`;
-	const exportStatement = command === "build" ? `const { initPromise, initResolve, initReject } = globalThis[globalKey];
-export { initPromise, initResolve, initReject };` : `module.exports = globalThis[globalKey];`;
-	virtualRuntimeInitStatus.writeSync(`
-const globalKey = ${JSON.stringify(globalKey)};
+function getRuntimeInitGlobalKey() {
+	return `__mf_init__${virtualRuntimeInitStatus.getImportId()}__`;
+}
+function getRuntimeInitBootstrapCode() {
+	return `
+const globalKey = ${JSON.stringify(getRuntimeInitGlobalKey())};
 if (!globalThis[globalKey]) {
   let initResolve, initReject;
   const initPromise = new Promise((re, rj) => {
@@ -966,8 +976,6 @@ if (!globalThis[globalKey]) {
     initResolve,
     initReject,
   };
-  // In SSR (no window), resolve immediately with a stub runtime
-  // so modules don't hang waiting for browser-only init
   if (typeof window === 'undefined') {
     initResolve({
       loadRemote: function() { return Promise.resolve(undefined); },
@@ -975,6 +983,64 @@ if (!globalThis[globalKey]) {
     });
   }
 }
+`;
+}
+function getRuntimeInitPromiseBootstrapCode() {
+	return `
+const __mfPromiseGlobalKey = ${JSON.stringify(getRuntimeInitGlobalKey())};
+let __mfPromiseState = globalThis[__mfPromiseGlobalKey];
+if (!__mfPromiseState) {
+  let initResolve, initReject;
+  const initPromise = new Promise((re, rj) => {
+    initResolve = re;
+    initReject = rj;
+  });
+  __mfPromiseState = globalThis[__mfPromiseGlobalKey] = {
+    initPromise,
+    initResolve,
+    initReject,
+  };
+  if (typeof window === 'undefined') {
+    initResolve({
+      loadRemote: function() { return Promise.resolve(undefined); },
+      loadShare: function() { return Promise.resolve(undefined); },
+    });
+  }
+}
+const initPromise = __mfPromiseState.initPromise;
+`;
+}
+function getRuntimeInitResolveBootstrapCode() {
+	return `
+const __mfResolveGlobalKey = ${JSON.stringify(getRuntimeInitGlobalKey())};
+let __mfResolveState = globalThis[__mfResolveGlobalKey];
+if (!__mfResolveState) {
+  let initResolve, initReject;
+  const initPromise = new Promise((re, rj) => {
+    initResolve = re;
+    initReject = rj;
+  });
+  __mfResolveState = globalThis[__mfResolveGlobalKey] = {
+    initPromise,
+    initResolve,
+    initReject,
+  };
+  if (typeof window === 'undefined') {
+    initResolve({
+      loadRemote: function() { return Promise.resolve(undefined); },
+      loadShare: function() { return Promise.resolve(undefined); },
+    });
+  }
+}
+const initResolve = __mfResolveState.initResolve;
+`;
+}
+function writeRuntimeInitStatus(command) {
+	getRuntimeInitGlobalKey();
+	const exportStatement = command === "build" ? `const { initPromise, initResolve, initReject } = globalThis[globalKey];
+export { initPromise, initResolve, initReject };` : `module.exports = globalThis[globalKey];`;
+	virtualRuntimeInitStatus.writeSync(`
+${getRuntimeInitBootstrapCode()}
 ${exportStatement}
 `);
 }
@@ -999,7 +1065,8 @@ function getUsedRemotesMap() {
 }
 function generateRemotes(id, command, isRolldown) {
 	const useESM = command === "build" || isRolldown;
-	const importLine = useESM ? `import { initPromise } from "${virtualRuntimeInitStatus.getImportId()}"` : `const {initPromise} = require("${virtualRuntimeInitStatus.getImportId()}")`;
+	const importLine = command === "build" ? getRuntimeInitPromiseBootstrapCode() : useESM ? `${getRuntimeInitBootstrapCode()}
+    const { initPromise } = globalThis[globalKey];` : `const {initPromise} = require("${virtualRuntimeInitStatus.getImportId()}")`;
 	const awaitOrPlaceholder = useESM ? "await " : "/*mf top-level-await placeholder replacement mf*/";
 	const exportLine = command === "serve" && useESM ? "export default exportModule.default ?? exportModule" : useESM ? "export default exportModule" : "module.exports = exportModule";
 	return `
@@ -1056,7 +1123,8 @@ function getLoadShareModulePath(pkg, isRolldown, command) {
 function writeLoadShareModule(pkg, shareItem, command, isRolldown) {
 	if (!loadShareCacheMap[pkg]) loadShareCacheMap[pkg] = new VirtualModule(pkg, LOAD_SHARE_TAG, isRolldown || command === "build" ? ".mjs" : ".js");
 	const useESM = command === "build" || isRolldown;
-	const importLine = useESM ? `import { initPromise } from "${virtualRuntimeInitStatus.getImportId()}"` : `const {initPromise} = require("${virtualRuntimeInitStatus.getImportId()}")`;
+	const importLine = command === "build" ? getRuntimeInitPromiseBootstrapCode() : useESM ? `${getRuntimeInitBootstrapCode()}
+    const { initPromise } = globalThis[globalKey];` : `const {initPromise} = require("${virtualRuntimeInitStatus.getImportId()}")`;
 	const awaitOrPlaceholder = useESM ? "await " : "/*mf top-level-await placeholder replacement mf*/";
 	const useSsrProviderFallback = hasPackageDependency("vinext") && command === "build" && pkg === "react";
 	const providerImportId = getLocalProviderImportPath(pkg) || getPreBuildLibImportId(pkg);
@@ -1100,12 +1168,12 @@ new VirtualModule("localSharedImportMap");
 function getLocalSharedImportMapPath() {
 	return getLocalSharedImportMapPath_temp();
 }
-let prevSharedCount;
+let prevLocalSharedImportMapContent;
 function writeLocalSharedImportMap() {
-	const sharedCount = getUsedShares().size;
-	if (prevSharedCount !== sharedCount) {
-		prevSharedCount = sharedCount;
-		writeLocalSharedImportMap_temp(generateLocalSharedImportMap());
+	const nextContent = generateLocalSharedImportMap();
+	if (prevLocalSharedImportMapContent !== nextContent) {
+		prevLocalSharedImportMapContent = nextContent;
+		writeLocalSharedImportMap_temp(nextContent);
 	}
 }
 function generateLocalSharedImportMap() {
@@ -1188,7 +1256,7 @@ const REMOTE_ENTRY_ID = "virtual:mf-REMOTE_ENTRY_ID";
 function getRemoteEntryId(options) {
 	return `${REMOTE_ENTRY_ID}:${`${options.name}__${options.filename}`.replace(/[^a-zA-Z0-9_-]/g, "_")}`;
 }
-function generateRemoteEntry(options, virtualExposesId = getVirtualExposesId(options)) {
+function generateRemoteEntry(options, virtualExposesId = getVirtualExposesId(options), command = "build") {
 	const pluginImportNames = options.runtimePlugins.map((p, i) => {
 		if (typeof p === "string") return [
 			`$runtimePlugin_${i}`,
@@ -1204,15 +1272,25 @@ function generateRemoteEntry(options, virtualExposesId = getVirtualExposesId(opt
 	return `
   import {init as runtimeInit, loadRemote} from "@module-federation/runtime";
   ${pluginImportNames.map((item) => item[1]).join("\n")}
-  import exposesMap from "${virtualExposesId}"
-  import {usedShared, usedRemotes} from "${getLocalSharedImportMapPath()}"
-  import {
-    initResolve
-  } from "${virtualRuntimeInitStatus.getImportId()}"
+  ${command === "build" ? getRuntimeInitResolveBootstrapCode() : getRuntimeInitBootstrapCode() + "\n  const { initResolve } = globalThis[globalKey];"}
   const initTokens = {}
   const shareScopeName = ${JSON.stringify(options.shareScope)}
   const mfName = ${JSON.stringify(options.name)}
+  let localSharedImportMapPromise
+  let exposesMapPromise
+
+  async function getLocalSharedImportMap() {
+    localSharedImportMapPromise ??= import("${getLocalSharedImportMapPath()}")
+    return localSharedImportMapPromise
+  }
+
+  async function getExposesMap() {
+    exposesMapPromise ??= import("${virtualExposesId}").then((mod) => mod.default ?? mod)
+    return exposesMapPromise
+  }
+
   async function init(shared = {}, initScope = []) {
+    const {usedShared, usedRemotes} = await getLocalSharedImportMap()
     const initRes = runtimeInit({
       name: mfName,
       remotes: usedRemotes,
@@ -1240,7 +1318,8 @@ function generateRemoteEntry(options, virtualExposesId = getVirtualExposesId(opt
     return initRes
   }
 
-  function getExposes(moduleName) {
+  async function getExposes(moduleName) {
+    const exposesMap = await getExposesMap()
     if (!(moduleName in exposesMap)) throw new Error(\`Module \${moduleName} does not exist in container.\`)
     return (exposesMap[moduleName])().then(res => () => res)
   }
@@ -1253,13 +1332,8 @@ function generateRemoteEntry(options, virtualExposesId = getVirtualExposesId(opt
 const hostAutoInitModule = new VirtualModule("hostAutoInit", "__H_A_I__");
 function writeHostAutoInit(remoteEntryId = REMOTE_ENTRY_ID) {
 	hostAutoInitModule.writeSync(`
-    const remoteEntryPromise = import("${remoteEntryId}")
-    Promise.resolve(remoteEntryPromise)
-      .then(remoteEntry => {
-        return Promise.resolve(remoteEntry.__tla)
-          .then(remoteEntry.init)
-          .catch(remoteEntry.init)
-      })
+    const remoteEntry = await import("${remoteEntryId}");
+    await remoteEntry.init();
     `);
 }
 function getHostAutoInitImportId() {
@@ -1282,13 +1356,21 @@ function initVirtualModules(command, remoteEntryId) {
 * If Rollup's deconflict renamed the alias but didn't update references
 * in the code body, fall back to proxyLocal so they stay in sync.
 */
-function resolveProxyAlias(binding, proxyLocal, code, fullImport) {
+function resolveProxyAlias(binding, proxyLocal, code, fullImport, claimedLocals = /* @__PURE__ */ new Set()) {
 	const codeWithoutImport = code.replace(fullImport, "");
 	const escapedLocal = binding.local.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 	const localUsedInCode = new RegExp(`\\b${escapedLocal}\\b`).test(codeWithoutImport);
+	const claimedImportLocals = /* @__PURE__ */ new Set();
+	const importRe = /import\s*\{([^}]+)\}\s*from\s*["'][^"']+["']\s*;?/g;
+	let match;
+	while ((match = importRe.exec(codeWithoutImport)) !== null) for (const spec of match[1].split(",")) {
+		const parts = spec.trim().split(/\s+as\s+/);
+		claimedImportLocals.add((parts[1] || parts[0]).trim());
+	}
+	const local = !localUsedInCode && !claimedLocals.has(proxyLocal) && !claimedImportLocals.has(proxyLocal) ? proxyLocal : binding.local;
 	return {
 		imported: binding.imported,
-		local: localUsedInCode ? binding.local : proxyLocal
+		local
 	};
 }
 function findRemoteEntryFile(filename, bundle) {
@@ -1743,14 +1825,14 @@ function pluginProxyRemoteEntry_default({ options, remoteEntryId, virtualExposes
 			}
 		},
 		load(id) {
-			if (id === remoteEntryId) return parsePromise.then((_) => generateRemoteEntry(options, virtualExposesId));
+			if (id === remoteEntryId) return parsePromise.then((_) => generateRemoteEntry(options, virtualExposesId, _command));
 			if (id === virtualExposesId) return generateExposes(options);
 			if (_command === "serve" && id.includes(getHostAutoInitPath())) return id;
 		},
 		transform(code, id) {
 			return mapCodeToCodeWithSourcemap((() => {
 				if (!filter(id)) return;
-				if (id.includes(remoteEntryId)) return parsePromise.then((_) => generateRemoteEntry(options, virtualExposesId));
+				if (id.includes(remoteEntryId)) return parsePromise.then((_) => generateRemoteEntry(options, virtualExposesId, _command));
 				if (id === virtualExposesId) return generateExposes(options);
 				if (id.includes(getHostAutoInitPath())) {
 					if (_command === "serve") {
@@ -2009,6 +2091,58 @@ var aliasToArrayPlugin_default = {
 	}
 };
 //#endregion
+//#region src/utils/controlChunkSanitizer.ts
+const FEDERATION_CONTROL_CHUNK_HINTS = [
+	"hostInit",
+	"virtualExposes",
+	"localSharedImportMap"
+];
+function stripEmptyPreloadCalls(code) {
+	const helperImportRegex = /import\s*\{\s*_\s*as\s*(\w+)\s*\}\s*from\s*["'][^"']+["']\s*;?/g;
+	const helperAliases = [...code.matchAll(helperImportRegex)].map((match) => match[1]);
+	let nextCode = code;
+	for (const alias of helperAliases) {
+		const marker = `${alias}(()=>`;
+		let start = nextCode.indexOf(marker);
+		while (start !== -1) {
+			const exprStart = start + marker.length;
+			let depth = 0;
+			let cursor = exprStart;
+			let replacementEnd = -1;
+			while (cursor < nextCode.length) {
+				const char = nextCode[cursor];
+				if (char === "(") depth++;
+				else if (char === ")") depth--;
+				else if (depth === 0 && nextCode.startsWith(",[],import.meta.url)", cursor)) {
+					replacementEnd = cursor;
+					break;
+				}
+				cursor++;
+			}
+			if (replacementEnd === -1) break;
+			const expression = nextCode.slice(exprStart, replacementEnd);
+			nextCode = nextCode.slice(0, start) + expression + nextCode.slice(replacementEnd + 20);
+			start = nextCode.indexOf(marker, start + expression.length);
+		}
+	}
+	nextCode = nextCode.replace(/import\s*["'][^"']*__loadShare__[^"']*["']\s*;?/g, "");
+	nextCode = nextCode.replace(helperImportRegex, (statement, local) => {
+		return new RegExp(`\\b${local}\\s*\\(`).test(nextCode.replace(statement, "")) ? statement : "";
+	});
+	return nextCode;
+}
+function isFederationControlChunk(fileName, filename) {
+	return fileName.includes(filename) || FEDERATION_CONTROL_CHUNK_HINTS.some((hint) => fileName.includes(hint));
+}
+function sanitizeFederationControlChunk(code, fileName, filename) {
+	let nextCode = stripEmptyPreloadCalls(code);
+	if (fileName.includes("localSharedImportMap")) {
+		const remoteEntryImportRegex = new RegExp(`import\\s*["'][^"']*${filename.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}["']\\s*;?`, "g");
+		nextCode = nextCode.replace(remoteEntryImportRegex, "");
+	}
+	return nextCode;
+}
+//#endregion
 //#region src/utils/normalizeOptimizeDeps.ts
 var normalizeOptimizeDeps_default = {
 	name: "normalizeOptimizeDeps",
@@ -2146,9 +2280,19 @@ function federation(mfUserOptions) {
 			config(config) {
 				const runtimeInitId = virtualRuntimeInitStatus.getImportId();
 				config.build = config.build || {};
-				config.build.rollupOptions = config.build.rollupOptions || {};
-				if (!Array.isArray(config.build.rollupOptions.output)) {
-					const output = config.build.rollupOptions.output ||= {};
+				if (config.build.modulePreload !== false) {
+					const currentModulePreload = config.build.modulePreload && typeof config.build.modulePreload === "object" ? config.build.modulePreload : {};
+					const existingResolveDependencies = currentModulePreload.resolveDependencies;
+					config.build.modulePreload = {
+						...currentModulePreload,
+						resolveDependencies(filename, deps, context) {
+							const resolvedDeps = existingResolveDependencies ? existingResolveDependencies(filename, deps, context) : deps;
+							const hostFile = path.basename(context.hostId);
+							return context.hostType === "js" && (hostFile === options.filename || hostFile.includes("hostInit") || hostFile.includes("virtualExposes") || hostFile.includes("localSharedImportMap")) ? [] : resolvedDeps;
+						}
+					};
+				}
+				const applyManualChunks = (output) => {
 					const existingManualChunks = output.manualChunks;
 					output.manualChunks = function(id) {
 						if (id.includes(runtimeInitId)) return "runtimeInit";
@@ -2161,7 +2305,12 @@ function federation(mfUserOptions) {
 							for (const [key, ids] of Object.entries(existingManualChunks)) if (Array.isArray(ids) && ids.some((v) => id.includes(v))) return key;
 						}
 					};
-				}
+				};
+				config.build.rollupOptions = config.build.rollupOptions || {};
+				if (!Array.isArray(config.build.rollupOptions.output)) applyManualChunks(config.build.rollupOptions.output ||= {});
+				const buildWithRolldown = config.build;
+				buildWithRolldown.rolldownOptions = buildWithRolldown.rolldownOptions || {};
+				if (!Array.isArray(buildWithRolldown.rolldownOptions.output)) applyManualChunks(buildWithRolldown.rolldownOptions.output ||= {});
 			},
 			load(id) {
 				if (id.startsWith("\0")) return;
@@ -2193,6 +2342,11 @@ function federation(mfUserOptions) {
 				}
 			},
 			generateBundle(_, bundle) {
+				for (const [fileName, chunk] of Object.entries(bundle)) {
+					if (chunk.type !== "chunk") continue;
+					if (!isFederationControlChunk(fileName, filename)) continue;
+					chunk.code = sanitizeFederationControlChunk(chunk.code, fileName, filename);
+				}
 				for (const [fileName, chunk] of Object.entries(bundle)) {
 					if (chunk.type !== "chunk") continue;
 					if (fileName.includes("__loadShare__")) continue;
@@ -2230,12 +2384,12 @@ function federation(mfUserOptions) {
 						fileName
 					});
 				}
-				if (proxyChunks.size === 0) return;
-				for (const [fileName, chunk] of Object.entries(bundle)) {
+				if (proxyChunks.size > 0) for (const [fileName, chunk] of Object.entries(bundle)) {
 					if (chunk.type !== "chunk") continue;
 					if (fileName.includes("__loadShare__")) continue;
 					let code = chunk.code;
 					let modified = false;
+					const claimedLocals = /* @__PURE__ */ new Set();
 					for (const [proxyFileName, proxyInfo] of proxyChunks) {
 						const proxyBaseName = proxyFileName.replace(/^.*\//, "").replace(/\.js$/, "").replace(/-[A-Za-z0-9_-]+$/, "");
 						const importMatch = new RegExp(`import\\s*\\{([^}]+)\\}\\s*from\\s*["']([^"']*${proxyBaseName.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}[^"']*)["']\\s*;?`).exec(code);
@@ -2258,9 +2412,12 @@ function federation(mfUserOptions) {
 						}
 						const inlineable = [];
 						const nonInlineable = [];
+						const pendingLocals = new Set(bindings.map((binding) => binding.local));
 						for (const b of bindings) {
+							pendingLocals.delete(b.local);
 							const proxyLocal = exportMap[b.imported];
 							if (!proxyLocal) {
+								claimedLocals.add(b.local);
 								nonInlineable.push(b);
 								continue;
 							}
@@ -2282,7 +2439,14 @@ function federation(mfUserOptions) {
 									local: b.local,
 									funcBody: renamedFunc
 								});
-							} else nonInlineable.push(resolveProxyAlias(b, proxyLocal, code, fullImport));
+								claimedLocals.add(b.local);
+							} else {
+								const unavailableLocals = new Set(claimedLocals);
+								pendingLocals.forEach((local) => unavailableLocals.add(local));
+								const resolvedBinding = resolveProxyAlias(b, proxyLocal, code, fullImport, unavailableLocals);
+								claimedLocals.add(resolvedBinding.local);
+								nonInlineable.push(resolvedBinding);
+							}
 						}
 						const hasRenamedAlias = nonInlineable.some((b) => bindings.find((ob) => ob.imported === b.imported)?.local !== b.local);
 						if (inlineable.length === 0 && !hasRenamedAlias) continue;
@@ -2296,6 +2460,28 @@ function federation(mfUserOptions) {
 				}
 			}
 		},
+		{
+			name: "module-federation-strip-empty-preload-helper",
+			enforce: "post",
+			apply: "build",
+			renderChunk(code, chunk) {
+				if (!isFederationControlChunk(chunk.fileName, filename)) return;
+				const nextCode = sanitizeFederationControlChunk(code, chunk.fileName, filename);
+				return nextCode === code ? null : {
+					code: nextCode,
+					map: null
+				};
+			},
+			writeBundle(outputOptions, bundle) {
+				if (!outputOptions.dir) return;
+				for (const chunk of Object.values(bundle)) {
+					if (chunk.type !== "chunk") continue;
+					if (!isFederationControlChunk(chunk.fileName, filename)) continue;
+					const outputPath = path.join(outputOptions.dir, chunk.fileName);
+					writeFileSync(outputPath, sanitizeFederationControlChunk(readFileSync(outputPath, "utf-8"), chunk.fileName, filename));
+				}
+			}
+		},
 		{
 			name: "module-federation-dev-await-shared-init",
 			apply: "serve",
@@ -2330,7 +2516,7 @@ function federation(mfUserOptions) {
 			config(config, { command: _command }) {
 				const isRolldown = !!this?.meta?.rolldownVersion;
 				let implementation = options.implementation;
-				if (isRolldown) implementation = implementation.replace(/\.cjs\.cjs$/, ".esm.js");
+				if (isRolldown) implementation = implementation.replace(/\.cjs(\.js)?$/, ".js");
 				config.resolve.alias.push({
 					find: "@module-federation/runtime",
 					replacement: implementation

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@module-federation/vite",
-  "version": "1.13.0",
+  "version": "1.13.1",
   "description": "Vite plugin for Module Federation",
   "type": "module",
   "main": "./lib/index.cjs",
@@ -66,9 +66,9 @@
     "vite": "^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0"
   },
   "dependencies": {
-    "@module-federation/dts-plugin": "2.2.0",
-    "@module-federation/runtime": "2.0.1",
-    "@module-federation/sdk": "2.0.1",
+    "@module-federation/dts-plugin": "2.2.2",
+    "@module-federation/runtime": "2.2.2",
+    "@module-federation/sdk": "2.2.2",
     "@rollup/pluginutils": "^5.3.0",
     "defu": "^6.1.4",
     "estree-walker": "^3.0.3",
@@ -85,7 +85,7 @@
     "oxfmt": "^0.36.0",
     "rollup": "^4.47.1",
     "tsdown": "^0.21.0",
-    "vite": "^7.3.1",
+    "vite": "^8.0.0",
     "vitest": "^4.0.18"
   }
 }