@module-federation/vite 1.16.1 → 1.16.2

package/lib/index.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_packageUtils = require("./packageUtils-CbbnJvKu.cjs");
+const require_packageUtils = require("./packageUtils-se-UDhCa.cjs");
 let fs = require("fs");
 fs = require_packageUtils.__toESM(fs);
 let module$1 = require("module");
@@ -970,7 +970,7 @@ function getLoadShareModulePath(pkg, isRolldown) {
 	if (!loadShareCacheMap[pkg]) getLoadShareImportId(pkg, isRolldown);
 	return loadShareCacheMap[pkg].getImportId();
 }
-function generateDeferredHostProvidedExports(namedExports, pkg) {
+function generateDeferredHostProvidedExports(namedExports, pkg, cacheKey) {
 	const namedExportVars = namedExports.map((_name, i) => `__mf_${i}`);
 	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      ");
@@ -979,10 +979,10 @@ function generateDeferredHostProvidedExports(namedExports, pkg) {
     const __mfApplyHostProvidedExports = (exportModule) => {
       ${assignments}
     };
-    let exportModule = __mfModuleCache.share[${escapeGeneratedStringLiteral(pkg)}];
+    let exportModule = __mfModuleCache.share[${escapeGeneratedStringLiteral(cacheKey)}];
     if (exportModule === undefined) {
       initPromise.then(() => {
-        exportModule = __mfModuleCache.share[${escapeGeneratedStringLiteral(pkg)}];
+        exportModule = __mfModuleCache.share[${escapeGeneratedStringLiteral(cacheKey)}];
         if (exportModule === undefined) {
           throw new Error("[Module Federation] Shared module ${pkg} was imported before federation bootstrap finished.");
         }
@@ -1013,13 +1013,14 @@ const normalizeLocalShareModuleCode = `const __mfNormalizeShareModule = (mod) =>
 function writeLoadShareModule(pkg, shareItem, command, _isRolldown) {
 	if (!loadShareCacheMap[pkg]) loadShareCacheMap[pkg] = new VirtualModule(pkg, LOAD_SHARE_TAG, ".mjs");
 	const importLine = getRuntimeModuleCacheBootstrapCode();
+	const cacheKey = require_packageUtils.getSharedCacheKey(pkg, shareItem);
 	if (shareItem.shareConfig.import === false) {
 		const namedExports = getPackageNamedExports(pkg);
 		let exportLine;
-		if (namedExports.length > 0) exportLine = generateDeferredHostProvidedExports(namedExports, pkg);
+		if (namedExports.length > 0) exportLine = generateDeferredHostProvidedExports(namedExports, pkg, cacheKey);
 		else {
 			require_packageUtils.mfWarn(`Shared dependency "${pkg}" has import: false but is not installed locally.\n  Named imports (e.g. import { ... } from '${pkg}') will not work in production builds.\n  Install it as a devDependency to enable named export detection.`);
-			exportLine = generateDeferredHostProvidedExports([], pkg);
+			exportLine = generateDeferredHostProvidedExports([], pkg, cacheKey);
 		}
 		loadShareCacheMap[pkg].writeSync(`
     ${getRuntimeInitPromiseBootstrapCode()}
@@ -1060,11 +1061,11 @@ function writeLoadShareModule(pkg, shareItem, command, _isRolldown) {
     ${devDynamicImportLine}
     ${importLine}
     ${normalizeLocalShareModuleCode}
-    let exportModule = __mfModuleCache.share[${escapeGeneratedStringLiteral(pkg)}]
+    let exportModule = __mfModuleCache.share[${escapeGeneratedStringLiteral(cacheKey)}]
     if (exportModule === undefined) {
       ${usesLazyLocalFallback ? `exportModule = __mfNormalizeShareModule(await import(${escapeGeneratedStringLiteral(lazyLocalFallbackSource)}));
-      __mfModuleCache.share[${escapeGeneratedStringLiteral(pkg)}] = exportModule;` : `exportModule = __mfNormalizeShareModule(__mfLocalShare);
-      __mfModuleCache.share[${escapeGeneratedStringLiteral(pkg)}] = exportModule;`}
+      __mfModuleCache.share[${escapeGeneratedStringLiteral(cacheKey)}] = exportModule;` : `exportModule = __mfNormalizeShareModule(__mfLocalShare);
+      __mfModuleCache.share[${escapeGeneratedStringLiteral(cacheKey)}] = exportModule;`}
     }
     ${exportLine}
   `, true);
@@ -1218,8 +1219,9 @@ function getShareItemForPreload(pkg) {
 	if (isExplicitSharedKey(pkg)) return shared[pkg];
 	if (isExplicitSharedKey(wildcardKey)) return shared[wildcardKey];
 }
-function generateSharedCacheSeedItem(pkg, importPath) {
-	return `if (__mfModuleCache.share[${JSON.stringify(pkg)}] === undefined) {
+function generateSharedCacheSeedItem(pkg, shareItem, importPath) {
+	const cacheKey = require_packageUtils.getSharedCacheKey(pkg, shareItem);
+	return `if (__mfModuleCache.share[${JSON.stringify(cacheKey)}] === undefined) {
         const mod = await import(${JSON.stringify(importPath)});
         ${normalizeRuntimeShareCode}
         const normalizedModule = __mfNormalizeRuntimeShare(mod);
@@ -1228,7 +1230,7 @@ function generateSharedCacheSeedItem(pkg, importPath) {
           value: true,
           enumerable: false
         });
-        __mfModuleCache.share[${JSON.stringify(pkg)}] = exportModule;
+        __mfModuleCache.share[${JSON.stringify(cacheKey)}] = exportModule;
       }`;
 }
 const normalizeRuntimeShareCode = `const __mfNormalizeRuntimeShare = (mod) => {
@@ -1246,7 +1248,7 @@ function generateDirectSharedCacheSeedCode(command = "build") {
 	return getOrderedUsedShares().map((pkg) => {
 		const shareItem = getShareItemForPreload(pkg);
 		if (!shareItem || shareItem.shareConfig.import === false) return null;
-		return generateSharedCacheSeedItem(pkg, command === "serve" ? getLocalSharedPackagePath(pkg, shareItem) : getDirectSharedCacheSeedImportPath(pkg, shareItem));
+		return generateSharedCacheSeedItem(pkg, shareItem, command === "serve" ? getLocalSharedPackagePath(pkg, shareItem) : getDirectSharedCacheSeedImportPath(pkg, shareItem));
 	}).filter((item) => item !== null).join("\n");
 }
 function getBrowserImportPath(importPath) {
@@ -1268,7 +1270,7 @@ function generateHostAutoInitSharedCacheSeedCode(command = "build") {
 	if (command === "build") return "";
 	return getHostAutoInitSharedSeedItems().map(({ pkg, shareItem }) => {
 		if (!shareItem) return null;
-		return generateSharedCacheSeedItem(pkg, getBrowserImportPath(getDirectSharedCacheSeedImportPath(pkg, shareItem)));
+		return generateSharedCacheSeedItem(pkg, shareItem, getBrowserImportPath(getDirectSharedCacheSeedImportPath(pkg, shareItem)));
 	}).filter((item) => item !== null).join("\n");
 }
 const REMOTE_ENTRY_ID = "virtual:mf-REMOTE_ENTRY_ID";
@@ -1384,7 +1386,8 @@ function generateRemoteEntry(options, virtualExposesId = getVirtualExposesId(opt
       console.error('[Module Federation]', e)
     }
     for (const [pkg, share] of Object.entries(usedShared)) {
-      if (share.shareConfig?.import !== false || __mfModuleCache.share[pkg] !== undefined) continue;
+      const cacheKey = share.shareConfig?.singleton || !share.version ? pkg : \`\${pkg}@\${share.version}\`;
+      if (share.shareConfig?.import !== false || __mfModuleCache.share[cacheKey] !== undefined) continue;
       ${normalizeRuntimeShareCode}
       const versions = shared?.[pkg];
       const provider = versions && versions[Object.keys(versions)[0]];
@@ -1392,7 +1395,7 @@ function generateRemoteEntry(options, virtualExposesId = getVirtualExposesId(opt
       const factory = provider.lib || (provider.loading ? await provider.loading : await provider.get?.());
       const mod = typeof factory === "function" ? factory() : factory;
       const resolved = await Promise.resolve(mod);
-      __mfModuleCache.share[pkg] = __mfNormalizeRuntimeShare(resolved);
+      __mfModuleCache.share[cacheKey] = __mfNormalizeRuntimeShare(resolved);
     }
     return initRes
   }
@@ -1426,7 +1429,8 @@ function generateHostAutoInitCode(remoteEntryImport, _command = "build") {
           ${normalizeRuntimeShareCode}
           ${shouldPreloadShares ? `
           for (const [pkg, share] of Object.entries(usedShared)) {
-            if (__mfModuleCache.share[pkg] !== undefined) {
+            const cacheKey = share.shareConfig?.singleton || !share.version ? pkg : \`\${pkg}@\${share.version}\`;
+            if (__mfModuleCache.share[cacheKey] !== undefined) {
               continue;
             }
             await runtime.loadShare(pkg, {
@@ -1434,7 +1438,7 @@ function generateHostAutoInitCode(remoteEntryImport, _command = "build") {
             }).then((factory) => {
               const mod = typeof factory === "function" ? factory() : factory;
               return Promise.resolve(mod).then((resolved) => {
-                __mfModuleCache.share[pkg] = __mfNormalizeRuntimeShare(resolved);
+                __mfModuleCache.share[cacheKey] = __mfNormalizeRuntimeShare(resolved);
               });
             });
           }
@@ -2929,7 +2933,7 @@ function getCommonSharedSubpathFromNodeModulePath(source, sharedKey) {
 */
 function resolvePublicPath(options, viteBase, originalBase) {
 	if (options.publicPath && options.publicPath !== "auto") return options.publicPath;
-	if (originalBase === "") return "auto";
+	if (!originalBase) return "auto";
 	if (viteBase) return ensureTrailingSlash(viteBase);
 	return "auto";
 }
@@ -3431,7 +3435,8 @@ function pluginProxyRemoteEntry_default({ options, remoteEntryId, virtualExposes
 				if (id.includes(getHostAutoInitPath())) {
 					if (_command === "serve") {
 						const host = typeof viteConfig.server?.host === "string" && viteConfig.server.host !== "0.0.0.0" ? viteConfig.server.host : "localhost";
-						const publicPath = JSON.stringify(resolvePublicPath(options, viteConfig.base) + options.filename);
+						const resolvedPublicPath = resolvePublicPath(options, viteConfig.base);
+						const publicPath = JSON.stringify((resolvedPublicPath === "auto" ? "/" : resolvedPublicPath) + options.filename);
 						const fallbackOrigin = `//${host}:${viteConfig.server?.port}`;
 						const ssrRemoteEntry = "data:text/javascript," + encodeURIComponent("export async function init(){return {loadRemote:async()=>({}),loadShare:async()=>({})}}");
 						return `
@@ -3595,6 +3600,7 @@ function isBuildConfigImporter(importer) {
 }
 function matchesSharedSource(source, key) {
 	const keyBase = key.endsWith("/") ? key.slice(0, -1) : key;
+	if (keyBase === "vue" && (source === "vue/dist/vue.esm-bundler.js" || source === "vue/dist/vue.runtime.esm-bundler.js")) return true;
 	if (key.endsWith("/")) return source === keyBase || source.startsWith(`${keyBase}/`);
 	if (getCommonSharedSubpaths(keyBase).includes(source)) return true;
 	return source === keyBase;
@@ -3709,6 +3715,12 @@ function proxySharedModule(options) {
 			name: "proxyPreBuildShared:resolve-shared-loadShare",
 			enforce: "pre",
 			async resolveId(source, importer) {
+				function shouldSkipTaggedImporterProxy(sharedKey, tag) {
+					if (!importer?.includes(tag)) return false;
+					const taggedModule = VirtualModule.findModule(tag, importer);
+					if (!taggedModule) return true;
+					return taggedModule.name === sharedKey || matchesSharedSource(source, taggedModule.name);
+				}
 				const key = findSharedKeyForSource(source, shared);
 				if (!key) return;
 				if (useDirectReactImport && key === "react") return;
@@ -3717,9 +3729,9 @@ function proxySharedModule(options) {
 				if (useDirectReactImport && source === "react") return;
 				if (importer && importer.includes("localSharedImportMap")) return;
 				if (importer && (importer.includes("hostAutoInit") || importer.includes("__H_A_I__"))) return;
-				if (importer && importer.includes("__loadShare__")) return;
-				if (importer && importer.includes("__prebuild__")) return;
-				const shareSource = isNodeModulePath(source) ? getCommonSharedSubpathFromNodeModulePath(source, key) || key : source;
+				if (shouldSkipTaggedImporterProxy(key, "__loadShare__")) return;
+				if (shouldSkipTaggedImporterProxy(key, "__prebuild__")) return;
+				const shareSource = key === "vue" && source.startsWith("vue/dist/") ? key : isNodeModulePath(source) ? getCommonSharedSubpathFromNodeModulePath(source, key) || key : source;
 				const loadSharePath = getLoadShareModulePath(shareSource, useRolldown);
 				writeLoadShareModule(shareSource, shared[key], _command, useRolldown);
 				if (shared[key].shareConfig.import !== false) writePreBuildLibPath(shareSource, shared[key]);
@@ -3806,19 +3818,8 @@ function applyRewrites(code, imports, id) {
 	const ms = new CodeRewriter(code);
 	let changed = false;
 	let counter = 0;
-	for (const imp of imports) switch (imp.kind) {
-		case "static": {
-			const src = JSON.stringify(imp.source);
-			if (imp.namespaceLocal && !imp.defaultLocal && imp.named.length === 0) ms.overwrite(imp.start, imp.end, `import { __moduleExports as ${imp.namespaceLocal} } from ${src};`);
-			else {
-				const nsId = `__mf_ns_${counter++}`;
-				const importParts = [];
-				if (imp.defaultLocal) importParts.push(`default as ${imp.defaultLocal}`);
-				importParts.push(`__moduleExports as ${nsId}`);
-				let rewrite = `import { ${importParts.join(", ")} } from ${src};`;
-				if (imp.named.length > 0) {
-					const isProxyId = `__mf_is_proxy_${counter++}`;
-					const namedProxyHelper = `function __mfCreateNamedRemoteProxy(ns, key) {
+	let namedProxyHelperDeclared = false;
+	const namedProxyHelper = `function __mfCreateNamedRemoteProxy(ns, key) {
   const target = function (...args) {
     const value = ns[key];
     return typeof value === "function" ? value.apply(this, args) : value;
@@ -3836,13 +3837,29 @@ function applyRewrites(code, imports, id) {
     }
   });
 }`;
+	for (const imp of imports) switch (imp.kind) {
+		case "static": {
+			const src = JSON.stringify(imp.source);
+			if (imp.namespaceLocal && !imp.defaultLocal && imp.named.length === 0) ms.overwrite(imp.start, imp.end, `import { __moduleExports as ${imp.namespaceLocal} } from ${src};`);
+			else {
+				const nsId = `__mf_ns_${counter++}`;
+				const importParts = [];
+				if (imp.defaultLocal) importParts.push(`default as ${imp.defaultLocal}`);
+				importParts.push(`__moduleExports as ${nsId}`);
+				let rewrite = `import { ${importParts.join(", ")} } from ${src};`;
+				if (imp.named.length > 0) {
+					const isProxyId = `__mf_is_proxy_${counter++}`;
 					const tempNames = imp.named.map((_s) => `__mf_named_${counter++}`);
 					const destructParts = imp.named.map((s, index) => `${s.imported}: ${tempNames[index]}`);
 					const bindingLines = imp.named.map((s, index) => {
 						const temp = tempNames[index];
 						return `const ${s.local} = ${isProxyId} ? __mfCreateNamedRemoteProxy(${nsId}, ${JSON.stringify(s.imported)}) : ${temp};`;
 					});
-					rewrite += `\n${namedProxyHelper}\nconst ${isProxyId} = ${nsId} && ${nsId}.__mf_is_remote_proxy;`;
+					if (!namedProxyHelperDeclared) {
+						rewrite += `\n${namedProxyHelper}`;
+						namedProxyHelperDeclared = true;
+					}
+					rewrite += `\nconst ${isProxyId} = ${nsId} && ${nsId}.__mf_is_remote_proxy;`;
 					rewrite += `\nconst { ${destructParts.join(", ")} } = ${isProxyId} ? {} : ${nsId};`;
 					rewrite += `\n${bindingLines.join("\n")}`;
 				}
@@ -4744,7 +4761,7 @@ export default __mfShared.default ?? __mfShared;`
 const SSR_ONLY_PLUGINS = new Set(["@module-federation/vite/ssrEntryLoader"]);
 function loadPluginDts(options) {
 	if (options.dts === false) return [];
-	return [Promise.resolve().then(() => require("./pluginDts-BEOKyKQ-.cjs")).then(({ default: pluginDts }) => pluginDts(options))];
+	return [Promise.resolve().then(() => require("./pluginDts-7EoFboCu.cjs")).then(({ default: pluginDts }) => pluginDts(options))];
 }
 function federation(mfUserOptions) {
 	if (isTestEnv()) return [];

package/lib/index.mjs

@@ -1,4 +1,4 @@
-import { a as getPackageName, c as isNuxtProjectRoot, d as setPackageDetectionCwd, f as createModuleFederationError, h as __require, i as getPackageDetectionCwd, l as packageNameDecode, m as mfWarn, n as getInstalledPackageJson, o as getPackageNameFromNodeModulePath, r as getIsRolldown, s as hasPackageDependency, t as getInstalledPackageEntry, u as packageNameEncode } from "./packageUtils-DOekOsFz.mjs";
+import { a as getPackageName, c as hasPackageDependency, d as packageNameEncode, f as setPackageDetectionCwd, g as __require, h as mfWarn, i as getPackageDetectionCwd, l as isNuxtProjectRoot, n as getInstalledPackageJson, o as getPackageNameFromNodeModulePath, p as createModuleFederationError, r as getIsRolldown, s as getSharedCacheKey, t as getInstalledPackageEntry, u as packageNameDecode } from "./packageUtils-Bbc6r6__.mjs";
 import * as fs$1 from "fs";
 import { existsSync, readFileSync, realpathSync, statSync, writeFileSync } from "fs";
 import { createRequire } from "module";
@@ -969,7 +969,7 @@ function getLoadShareModulePath(pkg, isRolldown) {
 	if (!loadShareCacheMap[pkg]) getLoadShareImportId(pkg, isRolldown);
 	return loadShareCacheMap[pkg].getImportId();
 }
-function generateDeferredHostProvidedExports(namedExports, pkg) {
+function generateDeferredHostProvidedExports(namedExports, pkg, cacheKey) {
 	const namedExportVars = namedExports.map((_name, i) => `__mf_${i}`);
 	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      ");
@@ -978,10 +978,10 @@ function generateDeferredHostProvidedExports(namedExports, pkg) {
     const __mfApplyHostProvidedExports = (exportModule) => {
       ${assignments}
     };
-    let exportModule = __mfModuleCache.share[${escapeGeneratedStringLiteral(pkg)}];
+    let exportModule = __mfModuleCache.share[${escapeGeneratedStringLiteral(cacheKey)}];
     if (exportModule === undefined) {
       initPromise.then(() => {
-        exportModule = __mfModuleCache.share[${escapeGeneratedStringLiteral(pkg)}];
+        exportModule = __mfModuleCache.share[${escapeGeneratedStringLiteral(cacheKey)}];
         if (exportModule === undefined) {
           throw new Error("[Module Federation] Shared module ${pkg} was imported before federation bootstrap finished.");
         }
@@ -1012,13 +1012,14 @@ const normalizeLocalShareModuleCode = `const __mfNormalizeShareModule = (mod) =>
 function writeLoadShareModule(pkg, shareItem, command, _isRolldown) {
 	if (!loadShareCacheMap[pkg]) loadShareCacheMap[pkg] = new VirtualModule(pkg, LOAD_SHARE_TAG, ".mjs");
 	const importLine = getRuntimeModuleCacheBootstrapCode();
+	const cacheKey = getSharedCacheKey(pkg, shareItem);
 	if (shareItem.shareConfig.import === false) {
 		const namedExports = getPackageNamedExports(pkg);
 		let exportLine;
-		if (namedExports.length > 0) exportLine = generateDeferredHostProvidedExports(namedExports, pkg);
+		if (namedExports.length > 0) exportLine = generateDeferredHostProvidedExports(namedExports, pkg, cacheKey);
 		else {
 			mfWarn(`Shared dependency "${pkg}" has import: false but is not installed locally.\n  Named imports (e.g. import { ... } from '${pkg}') will not work in production builds.\n  Install it as a devDependency to enable named export detection.`);
-			exportLine = generateDeferredHostProvidedExports([], pkg);
+			exportLine = generateDeferredHostProvidedExports([], pkg, cacheKey);
 		}
 		loadShareCacheMap[pkg].writeSync(`
     ${getRuntimeInitPromiseBootstrapCode()}
@@ -1059,11 +1060,11 @@ function writeLoadShareModule(pkg, shareItem, command, _isRolldown) {
     ${devDynamicImportLine}
     ${importLine}
     ${normalizeLocalShareModuleCode}
-    let exportModule = __mfModuleCache.share[${escapeGeneratedStringLiteral(pkg)}]
+    let exportModule = __mfModuleCache.share[${escapeGeneratedStringLiteral(cacheKey)}]
     if (exportModule === undefined) {
       ${usesLazyLocalFallback ? `exportModule = __mfNormalizeShareModule(await import(${escapeGeneratedStringLiteral(lazyLocalFallbackSource)}));
-      __mfModuleCache.share[${escapeGeneratedStringLiteral(pkg)}] = exportModule;` : `exportModule = __mfNormalizeShareModule(__mfLocalShare);
-      __mfModuleCache.share[${escapeGeneratedStringLiteral(pkg)}] = exportModule;`}
+      __mfModuleCache.share[${escapeGeneratedStringLiteral(cacheKey)}] = exportModule;` : `exportModule = __mfNormalizeShareModule(__mfLocalShare);
+      __mfModuleCache.share[${escapeGeneratedStringLiteral(cacheKey)}] = exportModule;`}
     }
     ${exportLine}
   `, true);
@@ -1217,8 +1218,9 @@ function getShareItemForPreload(pkg) {
 	if (isExplicitSharedKey(pkg)) return shared[pkg];
 	if (isExplicitSharedKey(wildcardKey)) return shared[wildcardKey];
 }
-function generateSharedCacheSeedItem(pkg, importPath) {
-	return `if (__mfModuleCache.share[${JSON.stringify(pkg)}] === undefined) {
+function generateSharedCacheSeedItem(pkg, shareItem, importPath) {
+	const cacheKey = getSharedCacheKey(pkg, shareItem);
+	return `if (__mfModuleCache.share[${JSON.stringify(cacheKey)}] === undefined) {
         const mod = await import(${JSON.stringify(importPath)});
         ${normalizeRuntimeShareCode}
         const normalizedModule = __mfNormalizeRuntimeShare(mod);
@@ -1227,7 +1229,7 @@ function generateSharedCacheSeedItem(pkg, importPath) {
           value: true,
           enumerable: false
         });
-        __mfModuleCache.share[${JSON.stringify(pkg)}] = exportModule;
+        __mfModuleCache.share[${JSON.stringify(cacheKey)}] = exportModule;
       }`;
 }
 const normalizeRuntimeShareCode = `const __mfNormalizeRuntimeShare = (mod) => {
@@ -1245,7 +1247,7 @@ function generateDirectSharedCacheSeedCode(command = "build") {
 	return getOrderedUsedShares().map((pkg) => {
 		const shareItem = getShareItemForPreload(pkg);
 		if (!shareItem || shareItem.shareConfig.import === false) return null;
-		return generateSharedCacheSeedItem(pkg, command === "serve" ? getLocalSharedPackagePath(pkg, shareItem) : getDirectSharedCacheSeedImportPath(pkg, shareItem));
+		return generateSharedCacheSeedItem(pkg, shareItem, command === "serve" ? getLocalSharedPackagePath(pkg, shareItem) : getDirectSharedCacheSeedImportPath(pkg, shareItem));
 	}).filter((item) => item !== null).join("\n");
 }
 function getBrowserImportPath(importPath) {
@@ -1267,7 +1269,7 @@ function generateHostAutoInitSharedCacheSeedCode(command = "build") {
 	if (command === "build") return "";
 	return getHostAutoInitSharedSeedItems().map(({ pkg, shareItem }) => {
 		if (!shareItem) return null;
-		return generateSharedCacheSeedItem(pkg, getBrowserImportPath(getDirectSharedCacheSeedImportPath(pkg, shareItem)));
+		return generateSharedCacheSeedItem(pkg, shareItem, getBrowserImportPath(getDirectSharedCacheSeedImportPath(pkg, shareItem)));
 	}).filter((item) => item !== null).join("\n");
 }
 const REMOTE_ENTRY_ID = "virtual:mf-REMOTE_ENTRY_ID";
@@ -1383,7 +1385,8 @@ function generateRemoteEntry(options, virtualExposesId = getVirtualExposesId(opt
       console.error('[Module Federation]', e)
     }
     for (const [pkg, share] of Object.entries(usedShared)) {
-      if (share.shareConfig?.import !== false || __mfModuleCache.share[pkg] !== undefined) continue;
+      const cacheKey = share.shareConfig?.singleton || !share.version ? pkg : \`\${pkg}@\${share.version}\`;
+      if (share.shareConfig?.import !== false || __mfModuleCache.share[cacheKey] !== undefined) continue;
       ${normalizeRuntimeShareCode}
       const versions = shared?.[pkg];
       const provider = versions && versions[Object.keys(versions)[0]];
@@ -1391,7 +1394,7 @@ function generateRemoteEntry(options, virtualExposesId = getVirtualExposesId(opt
       const factory = provider.lib || (provider.loading ? await provider.loading : await provider.get?.());
       const mod = typeof factory === "function" ? factory() : factory;
       const resolved = await Promise.resolve(mod);
-      __mfModuleCache.share[pkg] = __mfNormalizeRuntimeShare(resolved);
+      __mfModuleCache.share[cacheKey] = __mfNormalizeRuntimeShare(resolved);
     }
     return initRes
   }
@@ -1425,7 +1428,8 @@ function generateHostAutoInitCode(remoteEntryImport, _command = "build") {
           ${normalizeRuntimeShareCode}
           ${shouldPreloadShares ? `
           for (const [pkg, share] of Object.entries(usedShared)) {
-            if (__mfModuleCache.share[pkg] !== undefined) {
+            const cacheKey = share.shareConfig?.singleton || !share.version ? pkg : \`\${pkg}@\${share.version}\`;
+            if (__mfModuleCache.share[cacheKey] !== undefined) {
               continue;
             }
             await runtime.loadShare(pkg, {
@@ -1433,7 +1437,7 @@ function generateHostAutoInitCode(remoteEntryImport, _command = "build") {
             }).then((factory) => {
               const mod = typeof factory === "function" ? factory() : factory;
               return Promise.resolve(mod).then((resolved) => {
-                __mfModuleCache.share[pkg] = __mfNormalizeRuntimeShare(resolved);
+                __mfModuleCache.share[cacheKey] = __mfNormalizeRuntimeShare(resolved);
               });
             });
           }
@@ -2928,7 +2932,7 @@ function getCommonSharedSubpathFromNodeModulePath(source, sharedKey) {
 */
 function resolvePublicPath(options, viteBase, originalBase) {
 	if (options.publicPath && options.publicPath !== "auto") return options.publicPath;
-	if (originalBase === "") return "auto";
+	if (!originalBase) return "auto";
 	if (viteBase) return ensureTrailingSlash(viteBase);
 	return "auto";
 }
@@ -3430,7 +3434,8 @@ function pluginProxyRemoteEntry_default({ options, remoteEntryId, virtualExposes
 				if (id.includes(getHostAutoInitPath())) {
 					if (_command === "serve") {
 						const host = typeof viteConfig.server?.host === "string" && viteConfig.server.host !== "0.0.0.0" ? viteConfig.server.host : "localhost";
-						const publicPath = JSON.stringify(resolvePublicPath(options, viteConfig.base) + options.filename);
+						const resolvedPublicPath = resolvePublicPath(options, viteConfig.base);
+						const publicPath = JSON.stringify((resolvedPublicPath === "auto" ? "/" : resolvedPublicPath) + options.filename);
 						const fallbackOrigin = `//${host}:${viteConfig.server?.port}`;
 						const ssrRemoteEntry = "data:text/javascript," + encodeURIComponent("export async function init(){return {loadRemote:async()=>({}),loadShare:async()=>({})}}");
 						return `
@@ -3594,6 +3599,7 @@ function isBuildConfigImporter(importer) {
 }
 function matchesSharedSource(source, key) {
 	const keyBase = key.endsWith("/") ? key.slice(0, -1) : key;
+	if (keyBase === "vue" && (source === "vue/dist/vue.esm-bundler.js" || source === "vue/dist/vue.runtime.esm-bundler.js")) return true;
 	if (key.endsWith("/")) return source === keyBase || source.startsWith(`${keyBase}/`);
 	if (getCommonSharedSubpaths(keyBase).includes(source)) return true;
 	return source === keyBase;
@@ -3708,6 +3714,12 @@ function proxySharedModule(options) {
 			name: "proxyPreBuildShared:resolve-shared-loadShare",
 			enforce: "pre",
 			async resolveId(source, importer) {
+				function shouldSkipTaggedImporterProxy(sharedKey, tag) {
+					if (!importer?.includes(tag)) return false;
+					const taggedModule = VirtualModule.findModule(tag, importer);
+					if (!taggedModule) return true;
+					return taggedModule.name === sharedKey || matchesSharedSource(source, taggedModule.name);
+				}
 				const key = findSharedKeyForSource(source, shared);
 				if (!key) return;
 				if (useDirectReactImport && key === "react") return;
@@ -3716,9 +3728,9 @@ function proxySharedModule(options) {
 				if (useDirectReactImport && source === "react") return;
 				if (importer && importer.includes("localSharedImportMap")) return;
 				if (importer && (importer.includes("hostAutoInit") || importer.includes("__H_A_I__"))) return;
-				if (importer && importer.includes("__loadShare__")) return;
-				if (importer && importer.includes("__prebuild__")) return;
-				const shareSource = isNodeModulePath(source) ? getCommonSharedSubpathFromNodeModulePath(source, key) || key : source;
+				if (shouldSkipTaggedImporterProxy(key, "__loadShare__")) return;
+				if (shouldSkipTaggedImporterProxy(key, "__prebuild__")) return;
+				const shareSource = key === "vue" && source.startsWith("vue/dist/") ? key : isNodeModulePath(source) ? getCommonSharedSubpathFromNodeModulePath(source, key) || key : source;
 				const loadSharePath = getLoadShareModulePath(shareSource, useRolldown);
 				writeLoadShareModule(shareSource, shared[key], _command, useRolldown);
 				if (shared[key].shareConfig.import !== false) writePreBuildLibPath(shareSource, shared[key]);
@@ -3805,19 +3817,8 @@ function applyRewrites(code, imports, id) {
 	const ms = new CodeRewriter(code);
 	let changed = false;
 	let counter = 0;
-	for (const imp of imports) switch (imp.kind) {
-		case "static": {
-			const src = JSON.stringify(imp.source);
-			if (imp.namespaceLocal && !imp.defaultLocal && imp.named.length === 0) ms.overwrite(imp.start, imp.end, `import { __moduleExports as ${imp.namespaceLocal} } from ${src};`);
-			else {
-				const nsId = `__mf_ns_${counter++}`;
-				const importParts = [];
-				if (imp.defaultLocal) importParts.push(`default as ${imp.defaultLocal}`);
-				importParts.push(`__moduleExports as ${nsId}`);
-				let rewrite = `import { ${importParts.join(", ")} } from ${src};`;
-				if (imp.named.length > 0) {
-					const isProxyId = `__mf_is_proxy_${counter++}`;
-					const namedProxyHelper = `function __mfCreateNamedRemoteProxy(ns, key) {
+	let namedProxyHelperDeclared = false;
+	const namedProxyHelper = `function __mfCreateNamedRemoteProxy(ns, key) {
   const target = function (...args) {
     const value = ns[key];
     return typeof value === "function" ? value.apply(this, args) : value;
@@ -3835,13 +3836,29 @@ function applyRewrites(code, imports, id) {
     }
   });
 }`;
+	for (const imp of imports) switch (imp.kind) {
+		case "static": {
+			const src = JSON.stringify(imp.source);
+			if (imp.namespaceLocal && !imp.defaultLocal && imp.named.length === 0) ms.overwrite(imp.start, imp.end, `import { __moduleExports as ${imp.namespaceLocal} } from ${src};`);
+			else {
+				const nsId = `__mf_ns_${counter++}`;
+				const importParts = [];
+				if (imp.defaultLocal) importParts.push(`default as ${imp.defaultLocal}`);
+				importParts.push(`__moduleExports as ${nsId}`);
+				let rewrite = `import { ${importParts.join(", ")} } from ${src};`;
+				if (imp.named.length > 0) {
+					const isProxyId = `__mf_is_proxy_${counter++}`;
 					const tempNames = imp.named.map((_s) => `__mf_named_${counter++}`);
 					const destructParts = imp.named.map((s, index) => `${s.imported}: ${tempNames[index]}`);
 					const bindingLines = imp.named.map((s, index) => {
 						const temp = tempNames[index];
 						return `const ${s.local} = ${isProxyId} ? __mfCreateNamedRemoteProxy(${nsId}, ${JSON.stringify(s.imported)}) : ${temp};`;
 					});
-					rewrite += `\n${namedProxyHelper}\nconst ${isProxyId} = ${nsId} && ${nsId}.__mf_is_remote_proxy;`;
+					if (!namedProxyHelperDeclared) {
+						rewrite += `\n${namedProxyHelper}`;
+						namedProxyHelperDeclared = true;
+					}
+					rewrite += `\nconst ${isProxyId} = ${nsId} && ${nsId}.__mf_is_remote_proxy;`;
 					rewrite += `\nconst { ${destructParts.join(", ")} } = ${isProxyId} ? {} : ${nsId};`;
 					rewrite += `\n${bindingLines.join("\n")}`;
 				}
@@ -4743,7 +4760,7 @@ export default __mfShared.default ?? __mfShared;`
 const SSR_ONLY_PLUGINS = new Set(["@module-federation/vite/ssrEntryLoader"]);
 function loadPluginDts(options) {
 	if (options.dts === false) return [];
-	return [import("./pluginDts-B5pcUmam.mjs").then(({ default: pluginDts }) => pluginDts(options))];
+	return [import("./pluginDts-DDx4TPN8.mjs").then(({ default: pluginDts }) => pluginDts(options))];
 }
 function federation(mfUserOptions) {
 	if (isTestEnv()) return [];

package/lib/{packageUtils-DOekOsFz.mjs → packageUtils-Bbc6r6__.mjs}

@@ -123,6 +123,9 @@ function getPackageNameFromNodeModulePath(source) {
 	if (parts[0].startsWith("@")) return parts[1] ? `${parts[0]}/${parts[1]}` : void 0;
 	return parts[0];
 }
+function getSharedCacheKey(pkg, shareItem) {
+	return shareItem.shareConfig.singleton || !shareItem.version ? pkg : `${pkg}@${shareItem.version}`;
+}
 function getInstalledPackageJson(pkg, opts) {
 	const cwd = opts?.cwd || getPackageDetectionCwd();
 	const packageName = opts?.packageName || getPackageName(pkg);
@@ -247,4 +250,4 @@ function hasPackageDependency(dependencyName, cwd = packageDetectionCwd || proce
 	}
 }
 //#endregion
-export { getPackageName as a, isNuxtProjectRoot as c, setPackageDetectionCwd as d, createModuleFederationError as f, __require as h, getPackageDetectionCwd as i, packageNameDecode as l, mfWarn as m, getInstalledPackageJson as n, getPackageNameFromNodeModulePath as o, mfError as p, getIsRolldown as r, hasPackageDependency as s, getInstalledPackageEntry as t, packageNameEncode as u };
+export { getPackageName as a, hasPackageDependency as c, packageNameEncode as d, setPackageDetectionCwd as f, __require as g, mfWarn as h, getPackageDetectionCwd as i, isNuxtProjectRoot as l, mfError as m, getInstalledPackageJson as n, getPackageNameFromNodeModulePath as o, createModuleFederationError as p, getIsRolldown as r, getSharedCacheKey as s, getInstalledPackageEntry as t, packageNameDecode as u };

package/lib/{packageUtils-CbbnJvKu.cjs → packageUtils-se-UDhCa.cjs}

@@ -142,6 +142,9 @@ function getPackageNameFromNodeModulePath(source) {
 	if (parts[0].startsWith("@")) return parts[1] ? `${parts[0]}/${parts[1]}` : void 0;
 	return parts[0];
 }
+function getSharedCacheKey(pkg, shareItem) {
+	return shareItem.shareConfig.singleton || !shareItem.version ? pkg : `${pkg}@${shareItem.version}`;
+}
 function getInstalledPackageJson(pkg, opts) {
 	const cwd = opts?.cwd || getPackageDetectionCwd();
 	const packageName = opts?.packageName || getPackageName(pkg);
@@ -314,6 +317,12 @@ Object.defineProperty(exports, "getPackageNameFromNodeModulePath", {
 		return getPackageNameFromNodeModulePath;
 	}
 });
+Object.defineProperty(exports, "getSharedCacheKey", {
+	enumerable: true,
+	get: function() {
+		return getSharedCacheKey;
+	}
+});
 Object.defineProperty(exports, "hasPackageDependency", {
 	enumerable: true,
 	get: function() {

package/lib/{pluginDts-BEOKyKQ-.cjs → pluginDts-7EoFboCu.cjs}

@@ -1,4 +1,4 @@
-const require_packageUtils = require("./packageUtils-CbbnJvKu.cjs");
+const require_packageUtils = require("./packageUtils-se-UDhCa.cjs");
 let fs = require("fs");
 fs = require_packageUtils.__toESM(fs);
 let pathe = require("pathe");

package/lib/{pluginDts-B5pcUmam.mjs → pluginDts-DDx4TPN8.mjs}

@@ -1,4 +1,4 @@
-import { f as createModuleFederationError, h as __require, p as mfError, s as hasPackageDependency } from "./packageUtils-DOekOsFz.mjs";
+import { c as hasPackageDependency, g as __require, m as mfError, p as createModuleFederationError } from "./packageUtils-Bbc6r6__.mjs";
 import fs from "fs";
 import * as path$1 from "pathe";
 import { normalizeOptions } from "@module-federation/sdk";

package/package.json

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