@module-federation/vite 1.16.13 → 1.16.14

package/lib/index.js

@@ -380,7 +380,9 @@ function normalizeShared(shared) {
 	if (Array.isArray(shared)) shared.forEach((key) => {
 		if (isModuleFederationRuntimePackage(key)) return;
 		const normalizedKey = normalizeSharedKey(key);
+		const hadConfiguredPackageSubpath = (result[normalizedKey]?.shareConfig)?.__mfConfiguredPackageSubpath === true;
 		result[normalizedKey] = normalizeShareItem(normalizedKey, normalizedKey);
+		if (key.endsWith("/") || hadConfiguredPackageSubpath) result[normalizedKey].shareConfig.__mfConfiguredPackageSubpath = true;
 		explicitSharedKeys.add(normalizedKey);
 		sourceEntries.push([normalizedKey, normalizedKey]);
 	});
@@ -388,7 +390,9 @@ function normalizeShared(shared) {
 		if (isModuleFederationRuntimePackage(key)) return;
 		const normalizedKey = normalizeSharedKey(key);
 		const value = shared[key];
+		const hadConfiguredPackageSubpath = (result[normalizedKey]?.shareConfig)?.__mfConfiguredPackageSubpath === true;
 		result[normalizedKey] = normalizeShareItem(normalizedKey, value);
+		if (key.endsWith("/") || hadConfiguredPackageSubpath) result[normalizedKey].shareConfig.__mfConfiguredPackageSubpath = true;
 		explicitSharedKeys.add(normalizedKey);
 		sourceEntries.push([normalizedKey, value]);
 	});
@@ -1142,6 +1146,15 @@ function getWorkspacePackageJson(pkg) {
 		fromResolvedEntry: resolved
 	})?.packageJson;
 }
+function getSharedDependencyGraphPackageJson(pkg) {
+	const installedPackageJson = getInstalledPackageJson(pkg, { packageName: getPackageName(pkg) })?.packageJson;
+	if (installedPackageJson) return installedPackageJson;
+	try {
+		const packageJsonPath = createRequire$1(pathToFileURL(path$1.join(getPackageDetectionCwd(), "package.json"))).resolve(`${getPackageName(pkg)}/package.json`);
+		return JSON.parse(readFileSync(packageJsonPath, "utf-8"));
+	} catch {}
+	return getWorkspacePackageJson(pkg);
+}
 function getDependencyNames(packageJson) {
 	if (!packageJson) return [];
 	const names = /* @__PURE__ */ new Set();
@@ -1156,7 +1169,7 @@ function getDependencyNames(packageJson) {
 	}
 	return Array.from(names);
 }
-function isWorkspaceSingletonConsumedByPeer(pkg) {
+function isSharedSingletonConsumedByPeer(pkg) {
 	const shared = getNormalizeModuleFederationOptions()?.shared || {};
 	const sharedKeyByPackageName = /* @__PURE__ */ new Map();
 	Object.entries(shared).filter(([, item]) => item.shareConfig.singleton === true).forEach(([key]) => {
@@ -1164,7 +1177,7 @@ function isWorkspaceSingletonConsumedByPeer(pkg) {
 		if (!sharedKeyByPackageName.get(packageName) || key === packageName) sharedKeyByPackageName.set(packageName, key);
 	});
 	const reachesPkg = (current, seen) => {
-		const packageJson = getWorkspacePackageJson(current);
+		const packageJson = getSharedDependencyGraphPackageJson(current);
 		for (const dependency of getDependencyNames(packageJson)) {
 			const sharedDependency = sharedKeyByPackageName.get(dependency);
 			if (!sharedDependency) continue;
@@ -1177,6 +1190,10 @@ function isWorkspaceSingletonConsumedByPeer(pkg) {
 	};
 	return Array.from(sharedKeyByPackageName.values()).some((sharedPkg) => sharedPkg !== pkg && reachesPkg(sharedPkg, new Set([sharedPkg])));
 }
+function isRemoteOnlyContainer() {
+	const options = getNormalizeModuleFederationOptions();
+	return Object.keys(options.exposes || {}).length > 0 && Object.keys(options.remotes || {}).length === 0;
+}
 function tryResolveImportFromPackageRoot(pkg, root) {
 	try {
 		return resolveWorkspaceEsmEntry(pkg, createRequire$1(pathToFileURL(path$1.join(root, "package.json"))).resolve(pkg), root);
@@ -1330,22 +1347,21 @@ function generateEagerWorkspaceSingletonExports(namedExports, importSource, cach
     const __mf_default = exportModule.default ?? exportModule;${namedExportAssignments}
     export { __mf_default as default };${namedExportLine}`;
 }
-function generateLazyWorkspaceSingletonExports(namedExports, importSource, cacheDescriptor, eagerLocalFallback) {
+function generateLazyWorkspaceSingletonExports(namedExports, importSource, cacheDescriptor) {
 	const namedExportVars = namedExports.map((_name, i) => `__mf_${i}`);
 	const declarations = namedExports.length > 0 ? ["let __mf_default;", ...namedExportVars.map((name) => `let ${name};`)].join("\n    ") : "let __mf_default;";
 	const assignments = namedExports.length > 0 ? [...namedExports.map((name, i) => `${namedExportVars[i]} = mod[${escapeGeneratedStringLiteral(name)}];`), "__mf_default = mod.default ?? mod;"].join("\n      ") : "__mf_default = mod.default ?? mod;";
 	const namedExportLine = namedExports.length > 0 ? `\n    export { ${namedExports.map((name, i) => `${namedExportVars[i]} as ${name}`).join(", ")} };` : "";
-	const applyLocalFallback = `exportModule = __mfNormalizeShareModule(__mfLocalShare);
-      __mfWriteSharedCache(__mfModuleCache.share, ${cacheDescriptor}, exportModule);
-      __mfApplyLazyShareExports(exportModule);`;
-	const body = `${declarations}
+	return `${declarations}
     const __mfApplyLazyShareExports = (mod) => {
       ${assignments}
     };
     let exportModule = __mfReadSharedCache(__mfModuleCache.share, ${cacheDescriptor});
     if (exportModule === undefined) {
-      ${eagerLocalFallback ? applyLocalFallback : `if (import.meta.env.SSR) {
-        ${applyLocalFallback}
+      if (import.meta.env.SSR) {
+        ${`exportModule = __mfNormalizeShareModule(__mfLocalShare);
+      __mfWriteSharedCache(__mfModuleCache.share, ${cacheDescriptor}, exportModule);
+      __mfApplyLazyShareExports(exportModule);`}
       } else {
         (__mfModuleCache.pendingShareLoads ||= []).push(initPromise.then(() =>
           import(${escapeGeneratedStringLiteral(importSource)}).then((mod) => {
@@ -1354,13 +1370,11 @@ function generateLazyWorkspaceSingletonExports(namedExports, importSource, cache
             __mfApplyLazyShareExports(exportModule);
           })
         ));
-      }`}
+      }
     } else {
       __mfApplyLazyShareExports(exportModule);
     }
     export { __mf_default as default };${namedExportLine}`;
-	return eagerLocalFallback ? `import * as __mfLocalShare from ${escapeGeneratedStringLiteral(importSource)};
-    ${body}` : body;
 }
 const WORKSPACE_SINGLETON_SSR_LOCAL_SHARE = "__mfNormalizeShareModule(__mfLocalShare)";
 function prependWorkspaceSingletonSsrImport(code) {
@@ -1434,17 +1448,21 @@ function writeLoadShareModule(pkg, shareItem, command, _isRolldown) {
 	const devImportSource = concreteSharedImportSource || pkg;
 	const localProviderPath = getLocalProviderImportPath(pkg);
 	const isWorkspacePackage = isWorkspacePackageEntry(pkg, localProviderPath) || isWorkspacePackageEntry(pkg, concreteSharedImportSource);
-	const lazyLocalFallbackSource = concreteSharedImportSource || localProviderPath || sharedImportSource;
+	const lazyLocalFallbackSource = command !== "build" ? concreteSharedImportSource || localProviderPath || devImportSource : concreteSharedImportSource || localProviderPath || sharedImportSource;
 	const skipServePrebuildWarmup = command !== "build" && (pkg === "lit" || pkg.startsWith("lit/"));
 	const isWorkspaceSingleton = isWorkspacePackage && shareItem.shareConfig.singleton === true;
-	const usesEagerWorkspaceFallback = isWorkspaceSingleton && isWorkspaceSingletonConsumedByPeer(pkg);
+	const isDefaultShareScope = shareItem.scope === void 0 || shareItem.scope === "default" || Array.isArray(shareItem.scope) && shareItem.scope[0] === "default";
+	const usesDeferredSingletonFallback = isWorkspaceSingleton || command !== "build" && isRemoteOnlyContainer() && shareItem.shareConfig.singleton === true || command === "build" && isRemoteOnlyContainer() && shareItem.shareConfig.singleton === true && !isDefaultShareScope;
+	const isConsumedByPeerSingleton = isSharedSingletonConsumedByPeer(pkg);
+	const usesEntryInjectedRemoteFallback = command !== "build" && !isWorkspaceSingleton && isRemoteOnlyContainer() && shareItem.shareConfig.singleton === true && getNormalizeModuleFederationOptions().hostInitInjectLocation === "entry" && isConsumedByPeerSingleton;
+	const usesEagerWorkspaceFallback = isWorkspaceSingleton && isConsumedByPeerSingleton;
 	const namedExports = getSharedNamedExports(pkg, shareItem);
 	let exportLine;
 	let initBlock = "";
-	if (usesEagerWorkspaceFallback) exportLine = generateEagerWorkspaceSingletonExports(namedExports, lazyLocalFallbackSource, cacheDescriptor);
-	else if (isWorkspaceSingleton) {
+	if (usesEagerWorkspaceFallback || usesEntryInjectedRemoteFallback) exportLine = generateEagerWorkspaceSingletonExports(namedExports, lazyLocalFallbackSource, cacheDescriptor);
+	else if (usesDeferredSingletonFallback) {
 		importLine = `${getRuntimeInitPromiseBootstrapCode()}\n    ${importLine}`;
-		exportLine = generateLazyWorkspaceSingletonExports(namedExports, lazyLocalFallbackSource, cacheDescriptor, command !== "build");
+		exportLine = generateLazyWorkspaceSingletonExports(namedExports, lazyLocalFallbackSource, cacheDescriptor);
 	} else if (namedExports.length > 0) {
 		const destructure = `const { ${namedExports.map((name, i) => `${name}: __mf_${i}`).join(", ")} } = exportModule;`;
 		const namedExportLine = `export { ${namedExports.map((name, i) => `__mf_${i} as ${name}`).join(", ")} };`;
@@ -1465,9 +1483,9 @@ function writeLoadShareModule(pkg, shareItem, command, _isRolldown) {
 		initBlock = `exportModule = __mfNormalizeShareModule(__mfLocalShare);
       __mfWriteSharedCache(__mfModuleCache.share, ${cacheDescriptor}, exportModule);`;
 	}
-	const prebuildImportLine = isWorkspaceSingleton || isWorkspacePackage && command !== "build" ? "" : `import * as __mfLocalShare from ${escapeGeneratedStringLiteral(skipServePrebuildWarmup ? devImportSource : sharedImportSource)};`;
-	const devDynamicImportLine = isWorkspacePackage ? "" : command !== "build" && !skipServePrebuildWarmup ? `;() => import(${escapeGeneratedStringLiteral(devImportSource)}).catch(() => {});` : "";
-	const moduleBody = isWorkspaceSingleton ? `
+	const prebuildImportLine = usesDeferredSingletonFallback || isWorkspacePackage && command !== "build" ? "" : `import * as __mfLocalShare from ${escapeGeneratedStringLiteral(skipServePrebuildWarmup ? devImportSource : sharedImportSource)};`;
+	const devDynamicImportLine = isWorkspacePackage ? "" : usesDeferredSingletonFallback ? "" : command !== "build" && !skipServePrebuildWarmup ? `;() => import(${escapeGeneratedStringLiteral(devImportSource)}).catch(() => {});` : "";
+	const moduleBody = usesDeferredSingletonFallback ? `
     ${prebuildImportLine}
     ${devDynamicImportLine}
     ${importLine}
@@ -1600,29 +1618,14 @@ function generateLocalSharedImportMap() {
       }
       `;
 }
-function generateUsedSharedPreloadConfig() {
-	return `{
-      ${getOrderedUsedShares().map((pkg) => {
-		const shareItem = getShareItemForPreload(pkg);
-		if (!shareItem) return null;
-		return `${JSON.stringify(pkg)}: {
-            version: ${JSON.stringify(shareItem.version)},
-            scope: ${JSON.stringify(shareItem.scope)},
-            shareConfig: {
-              singleton: ${shareItem.shareConfig.singleton},
-              requiredVersion: ${JSON.stringify(shareItem.shareConfig.requiredVersion)},
-              strictVersion: ${shareItem.shareConfig.strictVersion},
-              ${shareItem.shareConfig.import === false ? "import: false," : ""}
-            }
-          }`;
-	}).filter((item) => item !== null).join(",\n")}
-    }`;
-}
 function getOrderedUsedShares() {
 	const shares = new Set(getUsedShares());
 	try {
 		Object.keys(getNormalizeModuleFederationOptions().shared).forEach((pkg) => {
-			if (!pkg.endsWith("/")) shares.add(pkg);
+			if (!pkg.endsWith("/")) {
+				shares.add(pkg);
+				return;
+			}
 		});
 	} catch {}
 	return orderSharedDependenciesFirst(Array.from(shares).sort((a, b) => {
@@ -1725,12 +1728,31 @@ const sharedProviderSelectionHelperCode = `const __mfOriginalProviderKey = Symbo
 function hasImportFalseShared$1(options) {
 	return Object.values(options.shared ?? {}).some((share) => share?.shareConfig?.import === false);
 }
-function generateDirectSharedCacheSeedCode(command = "build") {
-	return getOrderedUsedShares().map((pkg) => {
-		const shareItem = getShareItemForPreload(pkg);
-		if (!shareItem || shareItem.shareConfig.import === false) return null;
-		return generateSharedCacheSeedItem(pkg, shareItem, command === "serve" ? getLocalSharedPackagePath(pkg, shareItem) : getDirectSharedCacheSeedImportPath(pkg, shareItem));
-	}).filter((item) => item !== null).join("\n");
+function generateRuntimeSharedCacheSeedCode() {
+	return `
+    for (const [pkg, share] of Object.entries(usedShared)) {
+      const cacheDescriptor = __mfGetSharedCacheDescriptor(pkg, share.shareConfig?.singleton, share.version, share.scope);
+      if (share.shareConfig?.import === false || __mfReadSharedCache(__mfModuleCache.share, cacheDescriptor) !== undefined) {
+        continue;
+      }
+      const singletonCacheDescriptor = __mfGetSharedCacheDescriptor(pkg, true, share.version, share.scope);
+      const singletonModule = __mfReadSharedCache(__mfModuleCache.share, singletonCacheDescriptor);
+      if (singletonModule !== undefined) {
+        __mfWriteSharedCache(__mfModuleCache.share, cacheDescriptor, singletonModule);
+        continue;
+      }
+      const factory = await share.get();
+      const mod = typeof factory === "function" ? factory() : factory;
+      const resolved = await Promise.resolve(mod);
+      ${normalizeRuntimeShareCode}
+      const normalizedModule = __mfNormalizeRuntimeShare(resolved);
+      const exportModule = normalizedModule === resolved ? {...resolved} : normalizedModule;
+      Object.defineProperty(exportModule, "__esModule", {
+        value: true,
+        enumerable: false
+      });
+      __mfWriteSharedCache(__mfModuleCache.share, cacheDescriptor, exportModule);
+    }`;
 }
 function getBrowserImportPath(importPath) {
 	if (/^(?:[a-zA-Z]:[\\/]|\/)/.test(importPath) && !importPath.startsWith("/@")) return `/@fs/${importPath}`;
@@ -1880,7 +1902,7 @@ function generateRemoteEntry(options, virtualExposesId = getVirtualExposesId(opt
         __mfWriteSharedCache(__mfModuleCache.share, cacheDescriptor, singletonModule);
       }
     }
-    ${generateDirectSharedCacheSeedCode(command)}
+    ${generateRuntimeSharedCacheSeedCode()}
     const __browserPlugins = [${pluginImportNames.filter((item) => !isSsrOnlyPlugin(item[1])).map((item) => `${item[0]}(${item[2]})`).join(", ")}];
     const __ssrPlugins = typeof globalThis.window === 'undefined'
       ? await Promise.all([${pluginImportNames.filter((item) => isSsrOnlyPlugin(item[1])).map((item) => {
@@ -1956,7 +1978,7 @@ function generateHostAutoInitCode(remoteEntryImport, _command = "build") {
           ${generateHostAutoInitSharedCacheSeedCode(_command)}
           const remoteEntry = await import(${remoteEntryImport});
           const runtime = await remoteEntry.init();
-          const usedShared = ${generateUsedSharedPreloadConfig()};
+          const {usedShared} = await import("${getLocalSharedImportMapPath()}");
           ${normalizeRuntimeShareCode}
           ${shouldPreloadShares ? `
           for (const [pkg, share] of Object.entries(usedShared)) {
@@ -4116,11 +4138,37 @@ function pluginProxyRemoteEntry_default({ options, remoteEntryId, virtualExposes
 	function isRemoteImport(source) {
 		return Object.keys(options.remotes).some((name) => source === name || source.startsWith(name + "/"));
 	}
-	function collectRemoteDependencies(code) {
-		const dependencies = /* @__PURE__ */ new Set();
+	function collectImportSources(code) {
+		const sources = /* @__PURE__ */ new Set();
 		for (const match of code.matchAll(/(?:^|[;\n\r])\s*import\s+(?:[\s\S]*?\s+from\s+)?["']([^"']+)["']|import\(\s*["']([^"']+)["']\s*\)/g)) {
 			const source = match[1] || match[2];
-			if (source && isRemoteImport(source)) dependencies.add(source);
+			if (source) sources.add(source);
+		}
+		return Array.from(sources).sort();
+	}
+	function shouldScanResolvedImport(id) {
+		if (!id || id.includes("\0")) return false;
+		if (id.includes("/node_modules/") || id.includes("\\node_modules\\")) return false;
+		return /\.(?:[cm]?[jt]sx?|vue|svelte)(?:\?|$)/.test(id);
+	}
+	async function collectRemoteDependencies(ctx, id, seen = /* @__PURE__ */ new Set()) {
+		if (seen.has(id) || !shouldScanResolvedImport(id)) return [];
+		seen.add(id);
+		let code;
+		try {
+			code = readFileSync$1(id, "utf8");
+		} catch {
+			return [];
+		}
+		const dependencies = /* @__PURE__ */ new Set();
+		for (const source of collectImportSources(code)) {
+			if (isRemoteImport(source)) {
+				dependencies.add(source);
+				continue;
+			}
+			const resolved = await ctx.resolve(source, id);
+			if (!resolved?.id || !shouldScanResolvedImport(resolved.id)) continue;
+			for (const dependency of await collectRemoteDependencies(ctx, resolved.id, seen)) dependencies.add(dependency);
 		}
 		return Array.from(dependencies).sort();
 	}
@@ -4128,12 +4176,7 @@ function pluginProxyRemoteEntry_default({ options, remoteEntryId, virtualExposes
 		const next = {};
 		for (const [exposeKey, expose] of Object.entries(options.exposes)) {
 			const resolved = await ctx.resolve(expose.import);
-			if (!resolved?.id || resolved.id.includes("\0")) continue;
-			try {
-				next[exposeKey] = collectRemoteDependencies(readFileSync$1(resolved.id, "utf8"));
-			} catch {
-				next[exposeKey] = [];
-			}
+			next[exposeKey] = resolved?.id ? await collectRemoteDependencies(ctx, resolved.id) : [];
 		}
 		exposeRemoteDependencies = next;
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@module-federation/vite",
-  "version": "1.16.13",
+  "version": "1.16.14",
   "description": "Vite plugin for Module Federation",
   "type": "module",
   "main": "./lib/index.js",
@@ -70,9 +70,9 @@
     "vite": "^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0"
   },
   "dependencies": {
-    "@module-federation/dts-plugin": "2.6.0",
-    "@module-federation/runtime": "2.6.0",
-    "@module-federation/sdk": "2.6.0"
+    "@module-federation/dts-plugin": "2.7.0",
+    "@module-federation/runtime": "2.7.0",
+    "@module-federation/sdk": "2.7.0"
   },
   "devDependencies": {
     "@playwright/test": "1.58.2",