npm - @module-federation/vite - Versions diffs - 1.16.8 → 1.16.9 - Mend

@module-federation/vite 1.16.8 → 1.16.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/README.md +8 -2
package/lib/index.js +286 -115
package/lib/{pluginDts-Cpmdbbr0.js → pluginDts-CrSsDUnT.js} +2 -1
package/lib/utils/ssrEntryLoader.js +89 -37
package/package.json +1 -1

package/README.md CHANGED Viewed

@@ -2,6 +2,10 @@
 [![npm](https://img.shields.io/npm/v/@module-federation/vite.svg)](https://www.npmjs.com/package/@module-federation/vite)
+## Vite and VoidZero recommend this plugin
+[Read the announcement](https://www.linkedin.com/posts/voidzero_github-module-federationvite-vite-plugin-activity-7449452398202241024-JyAL).
 ## Reason why 🤔
 [Microservices](https://martinfowler.com/articles/microservices.html) nowadays is a well-known concept and maybe you are using it in your current company.
@@ -47,7 +51,7 @@ pnpm run multi-example
 ## Getting started 🚀
-[https://module-federation.io/guide/build-plugins/plugins-vite.html](https://module-federation.io/guide/build-plugins/plugins-vite.html)
+[https://module-federation.io/integrations/build-tool/vite](https://module-federation.io/integrations/build-tool/vite)
 With **@module-federation/vite**, the process becomes delightfully simple, you will only find the differences from a normal Vite configuration.
@@ -143,7 +147,9 @@ export default defineConfig({
       // Optional parameter that controls where the host initialization script is injected.
       // By default, it is injected into the index.html file.
       // You can set this to "entry" to inject it into the entry script instead.
-      // Useful if your application does not load from index.html.
+      // Recommended for SSR hosts without index.html (Nitro, TanStack Start) so
+      // initHost() completes before hydrateRoot and @module-federation/bridge-react
+      // remotes render on first paint.
       hostInitInjectLocation: "html", // or "entry"
       // Controls whether all CSS assets from the bundle should be added to every exposed module.
       // When false (default), the plugin will not process any CSS assets.

package/lib/index.js CHANGED Viewed

@@ -1,4 +1,4 @@
-import { _ as mfWarn, a as getIsRolldown, c as getPackageNameFromNodeModulePath, d as isNuxtProjectRoot, f as packageNameDecode, g as createModuleFederationError, h as setPackageDetectionCwd, i as getInstalledPackageJson, l as getSharedCacheKey, m as resolveImportPath, o as getPackageDetectionCwd, p as packageNameEncode, r as getInstalledPackageEntry, s as getPackageName, u as hasPackageDependency, v as normalizePathForImport, y as rebaseImport } from "./pluginDts-Cpmdbbr0.js";
+import { _ as mfWarn, a as getIsRolldown, c as getPackageNameFromNodeModulePath, d as isNuxtProjectRoot, f as packageNameDecode, g as createModuleFederationError, h as setPackageDetectionCwd, i as getInstalledPackageJson, l as getSharedCacheKey, m as resolveImportPath, o as getPackageDetectionCwd, p as packageNameEncode, r as getInstalledPackageEntry, s as getPackageName, u as hasPackageDependency, v as normalizePathForImport, y as rebaseImport } from "./pluginDts-CrSsDUnT.js";
 import { createRequire } from "node:module";
 import * as fs$1 from "fs";
 import { existsSync, readFileSync, realpathSync, statSync, writeFileSync } from "fs";
@@ -171,6 +171,71 @@ function injectEntryScript(html, initSrc) {
 	return html.replace("<head>", `<head><script type="module" src=${JSON.stringify(src)}><\/script>`);
 }
 //#endregion
+//#region src/utils/pathNormalization.ts
+const COMMON_SHARED_SUBPATHS = {
+	react: [
+		"react/jsx-runtime",
+		"react/jsx-dev-runtime",
+		"react/compiler-runtime"
+	],
+	"react-dom": [
+		"react-dom/client",
+		"react-dom/server",
+		"react-dom/server.browser"
+	],
+	"solid-js": [
+		"solid-js/web",
+		"solid-js/store",
+		"solid-js/html",
+		"solid-js/h"
+	],
+	zustand: ["zustand/vanilla", "zustand/react"]
+};
+function removeTrailingSlash(value) {
+	return value.endsWith("/") ? value.slice(0, -1) : value;
+}
+function ensureTrailingSlash(value) {
+	return `${removeTrailingSlash(value)}/`;
+}
+function getBasePath$1(base) {
+	return removeTrailingSlash(base || "/");
+}
+function isNuxtClientBase(base) {
+	return getBasePath$1(base).endsWith("/_nuxt");
+}
+function normalizeNodeModulePath(source) {
+	return source.replace(/\\/g, "/").replace(/\?.*$/, "");
+}
+function isNodeModulePath(source) {
+	return source.includes("/node_modules/") || source.includes("\\node_modules\\");
+}
+function filterId(id) {
+	return typeof id === "string" && !id.includes("\0");
+}
+function getMatchingNodeModuleSubpath(source, candidates) {
+	const normalized = normalizeNodeModulePath(source);
+	return [...candidates].sort((a, b) => b.length - a.length).find((candidate) => normalized.includes(`/node_modules/${candidate}/`) || normalized.includes(`/node_modules/${candidate}.`));
+}
+function getCommonSharedSubpaths(sharedKey) {
+	return COMMON_SHARED_SUBPATHS[removeTrailingSlash(sharedKey)] || [];
+}
+function getCommonSharedSubpathFromNodeModulePath(source, sharedKey) {
+	return getMatchingNodeModuleSubpath(source, getCommonSharedSubpaths(removeTrailingSlash(sharedKey)));
+}
+/**
+* Resolves the public path for remote entries
+* @param options - Module Federation options
+* @param viteBase - Vite's base config value
+* @param originalBase - Original base config before any transformations
+* @returns The resolved public path
+*/
+function resolvePublicPath(options, viteBase, originalBase) {
+	if (options.publicPath && options.publicPath !== "auto") return options.publicPath;
+	if (!originalBase) return "auto";
+	if (viteBase) return ensureTrailingSlash(viteBase);
+	return "auto";
+}
+//#endregion
 //#region src/utils/normalizeModuleFederationOptions.ts
 const INTERNAL_NAME_PREFIX = "__mfe_internal__";
 function toInternalModuleFederationName(name) {
@@ -257,7 +322,9 @@ function getLitExportSubpathShares(sharedName) {
 }
 function normalizeShareItem(key, shareItem) {
 	const isImportFalse = typeof shareItem === "object" && shareItem.import === false;
-	const version = (typeof shareItem === "object" ? shareItem.version || inferVersionFromRequiredVersion(shareItem.requiredVersion) : void 0) || searchPackageVersion(key);
+	const explicitVersion = typeof shareItem === "object" ? shareItem.version : void 0;
+	const inferredVersion = typeof shareItem === "object" ? inferVersionFromRequiredVersion(shareItem.requiredVersion) : void 0;
+	const version = explicitVersion || searchPackageVersion(key) || inferredVersion;
 	if (typeof shareItem === "string") return {
 		name: shareItem,
 		version,
@@ -282,6 +349,11 @@ function normalizeShareItem(key, shareItem) {
 		}
 	};
 }
+function normalizeSharedKey(key) {
+	if (!key.endsWith("/")) return key;
+	const baseKey = key.slice(0, -1);
+	return getCommonSharedSubpaths(baseKey).length > 0 ? baseKey : key;
+}
 function normalizeShared(shared) {
 	explicitSharedKeys = /* @__PURE__ */ new Set();
 	if (!shared) {
@@ -306,16 +378,18 @@ function normalizeShared(shared) {
 	const sourceEntries = [];
 	if (Array.isArray(shared)) shared.forEach((key) => {
 		if (isModuleFederationRuntimePackage(key)) return;
-		result[key] = normalizeShareItem(key, key);
-		explicitSharedKeys.add(key);
-		sourceEntries.push([key, key]);
+		const normalizedKey = normalizeSharedKey(key);
+		result[normalizedKey] = normalizeShareItem(normalizedKey, normalizedKey);
+		explicitSharedKeys.add(normalizedKey);
+		sourceEntries.push([normalizedKey, normalizedKey]);
 	});
 	else if (typeof shared === "object") Object.keys(shared).forEach((key) => {
 		if (isModuleFederationRuntimePackage(key)) return;
+		const normalizedKey = normalizeSharedKey(key);
 		const value = shared[key];
-		result[key] = normalizeShareItem(key, value);
-		explicitSharedKeys.add(key);
-		sourceEntries.push([key, value]);
+		result[normalizedKey] = normalizeShareItem(normalizedKey, value);
+		explicitSharedKeys.add(normalizedKey);
+		sourceEntries.push([normalizedKey, value]);
 	});
 	sourceEntries.forEach(([key, value]) => {
 		for (const subpathShare of getLitExportSubpathShares(key)) {
@@ -985,6 +1059,49 @@ function isWorkspacePackageEntry(pkg, resolved) {
 		fromResolvedEntry: resolved
 	});
 }
+function getWorkspacePackageJson(pkg) {
+	const resolved = getLocalProviderImportPath(pkg) || getProjectResolvedImportPath(pkg);
+	if (!isWorkspacePackageEntry(pkg, resolved)) return;
+	return getInstalledPackageJson(pkg, {
+		packageName: getPackageName(pkg),
+		fromResolvedEntry: resolved
+	})?.packageJson;
+}
+function getDependencyNames(packageJson) {
+	if (!packageJson) return [];
+	const names = /* @__PURE__ */ new Set();
+	for (const field of [
+		"dependencies",
+		"peerDependencies",
+		"optionalDependencies"
+	]) {
+		const deps = packageJson[field];
+		if (!deps || typeof deps !== "object") continue;
+		for (const dep of Object.keys(deps)) names.add(dep);
+	}
+	return Array.from(names);
+}
+function isWorkspaceSingletonConsumedByPeer(pkg) {
+	const shared = getNormalizeModuleFederationOptions()?.shared || {};
+	const sharedKeyByPackageName = /* @__PURE__ */ new Map();
+	Object.entries(shared).filter(([, item]) => item.shareConfig.singleton === true).forEach(([key]) => {
+		const packageName = getPackageName(key);
+		if (!sharedKeyByPackageName.get(packageName) || key === packageName) sharedKeyByPackageName.set(packageName, key);
+	});
+	const reachesPkg = (current, seen) => {
+		const packageJson = getWorkspacePackageJson(current);
+		for (const dependency of getDependencyNames(packageJson)) {
+			const sharedDependency = sharedKeyByPackageName.get(dependency);
+			if (!sharedDependency) continue;
+			if (sharedDependency === pkg) return true;
+			if (seen.has(sharedDependency)) continue;
+			seen.add(sharedDependency);
+			if (reachesPkg(sharedDependency, seen)) return true;
+		}
+		return false;
+	};
+	return Array.from(sharedKeyByPackageName.values()).some((sharedPkg) => sharedPkg !== pkg && reachesPkg(sharedPkg, new Set([sharedPkg])));
+}
 function tryResolveImportFromPackageRoot(pkg, root) {
 	try {
 		return createRequire$1(pathToFileURL(path$1.join(root, "package.json"))).resolve(pkg);
@@ -1114,26 +1231,46 @@ function materializeCachedLoadShareModule(options) {
 	options.addUsedShares(pkg);
 	options.writeLocalSharedImportMap();
 }
+function generateEagerWorkspaceSingletonExports(namedExports, importSource, cacheKey) {
+	const namedExportLine = namedExports.length > 0 ? `\n    export { ${namedExports.join(", ")} } from ${escapeGeneratedStringLiteral(importSource)};` : "";
+	return `import * as __mfLocalShare from ${escapeGeneratedStringLiteral(importSource)};
+    let exportModule = __mfModuleCache.share[${escapeGeneratedStringLiteral(cacheKey)}];
+    if (exportModule === undefined) {
+      Promise.resolve().then(() => {
+        if (__mfModuleCache.share[${escapeGeneratedStringLiteral(cacheKey)}] === undefined) {
+          __mfModuleCache.share[${escapeGeneratedStringLiteral(cacheKey)}] = __mfNormalizeShareModule(__mfLocalShare);
+        }
+      });
+      exportModule = __mfLocalShare;
+    }
+    const __mf_default = exportModule.default ?? exportModule;
+    export { __mf_default as default };${namedExportLine}`;
+}
 function generateLazyWorkspaceSingletonExports(namedExports, importSource, cacheKey, eagerLocalFallback) {
 	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);
+      __mfModuleCache.share[${escapeGeneratedStringLiteral(cacheKey)}] = exportModule;
+      __mfApplyLazyShareExports(exportModule);`;
 	const body = `${declarations}
     const __mfApplyLazyShareExports = (mod) => {
       ${assignments}
     };
     let exportModule = __mfModuleCache.share[${escapeGeneratedStringLiteral(cacheKey)}];
     if (exportModule === undefined) {
-      ${eagerLocalFallback ? `exportModule = __mfNormalizeShareModule(__mfLocalShare);
-      __mfModuleCache.share[${escapeGeneratedStringLiteral(cacheKey)}] = exportModule;
-      __mfApplyLazyShareExports(exportModule);` : `initPromise.then(() =>
-        import(${escapeGeneratedStringLiteral(importSource)}).then((mod) => {
-          exportModule = __mfNormalizeShareModule(mod);
-          __mfModuleCache.share[${escapeGeneratedStringLiteral(cacheKey)}] = exportModule;
-          __mfApplyLazyShareExports(exportModule);
-        })
-      );`}
+      ${eagerLocalFallback ? applyLocalFallback : `if (import.meta.env.SSR) {
+        ${applyLocalFallback}
+      } else {
+        initPromise.then(() =>
+          import(${escapeGeneratedStringLiteral(importSource)}).then((mod) => {
+            exportModule = __mfNormalizeShareModule(mod);
+            __mfModuleCache.share[${escapeGeneratedStringLiteral(cacheKey)}] = exportModule;
+            __mfApplyLazyShareExports(exportModule);
+          })
+        );
+      }`}
     } else {
       __mfApplyLazyShareExports(exportModule);
     }
@@ -1141,6 +1278,16 @@ function generateLazyWorkspaceSingletonExports(namedExports, importSource, cache
 	return eagerLocalFallback ? `import * as __mfLocalShare from ${escapeGeneratedStringLiteral(importSource)};
     ${body}` : body;
 }
+const WORKSPACE_SINGLETON_SSR_LOCAL_SHARE = "__mfNormalizeShareModule(__mfLocalShare)";
+function prependWorkspaceSingletonSsrImport(code) {
+	if (!code.includes("if (import.meta.env.SSR)")) return code;
+	if (!code.includes(WORKSPACE_SINGLETON_SSR_LOCAL_SHARE)) return code;
+	if (code.includes("import * as __mfLocalShare")) return code;
+	const importMatch = code.match(/initPromise\.then\(\(\)\s*=>\s*\n\s*import\((["'])(.+?)\1\)\.then\(\(mod\)\s*=>\s*\{[\s\S]*?__mfApplyLazyShareExports/);
+	if (!importMatch) return code;
+	const quote = importMatch[1];
+	return `import * as __mfLocalShare from ${quote}${importMatch[2]}${quote};\n${code}`;
+}
 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    ");
@@ -1207,11 +1354,13 @@ function writeLoadShareModule(pkg, shareItem, command, _isRolldown) {
 	const isWorkspacePackage = isWorkspacePackageEntry(pkg, localProviderPath) || isWorkspacePackageEntry(pkg, concreteSharedImportSource);
 	const lazyLocalFallbackSource = concreteSharedImportSource || localProviderPath || sharedImportSource;
 	const skipServePrebuildWarmup = command !== "build" && (pkg === "lit" || pkg.startsWith("lit/"));
-	const usesLazyLocalFallback = isWorkspacePackage && shareItem.shareConfig.singleton === true;
+	const isWorkspaceSingleton = isWorkspacePackage && shareItem.shareConfig.singleton === true;
+	const usesEagerWorkspaceFallback = isWorkspaceSingleton && isWorkspaceSingletonConsumedByPeer(pkg);
 	const namedExports = getSharedNamedExports(pkg, shareItem);
 	let exportLine;
 	let initBlock = "";
-	if (usesLazyLocalFallback) {
+	if (usesEagerWorkspaceFallback) exportLine = generateEagerWorkspaceSingletonExports(namedExports, lazyLocalFallbackSource, cacheKey);
+	else if (isWorkspaceSingleton) {
 		importLine = `${getRuntimeInitPromiseBootstrapCode()}\n    ${importLine}`;
 		exportLine = generateLazyWorkspaceSingletonExports(namedExports, lazyLocalFallbackSource, cacheKey, command !== "build");
 	} else if (namedExports.length > 0) {
@@ -1234,9 +1383,9 @@ function writeLoadShareModule(pkg, shareItem, command, _isRolldown) {
 		initBlock = `exportModule = __mfNormalizeShareModule(__mfLocalShare);
       __mfModuleCache.share[${escapeGeneratedStringLiteral(cacheKey)}] = exportModule;`;
 	}
-	const prebuildImportLine = usesLazyLocalFallback || isWorkspacePackage && command !== "build" ? "" : `import * as __mfLocalShare from ${escapeGeneratedStringLiteral(skipServePrebuildWarmup ? devImportSource : sharedImportSource)};`;
+	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 = usesLazyLocalFallback ? `
+	const moduleBody = isWorkspaceSingleton ? `
     ${prebuildImportLine}
     ${devDynamicImportLine}
     ${importLine}
@@ -1372,6 +1521,8 @@ function generateUsedSharedPreloadConfig() {
 		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)},
@@ -1394,7 +1545,11 @@ function getOrderedUsedShares() {
 	}));
 }
 function orderSharedDependenciesFirst(sharedPackages) {
-	const sharedKeyByPackageName = new Map(sharedPackages.map((pkg) => [getPackageName(pkg), pkg]));
+	const sharedKeyByPackageName = /* @__PURE__ */ new Map();
+	sharedPackages.forEach((pkg) => {
+		const packageName = getPackageName(pkg);
+		if (!sharedKeyByPackageName.get(packageName) || pkg === packageName) sharedKeyByPackageName.set(packageName, pkg);
+	});
 	const visiting = /* @__PURE__ */ new Set();
 	const visited = /* @__PURE__ */ new Set();
 	const ordered = [];
@@ -1439,6 +1594,11 @@ function generateSharedCacheSeedItem(pkg, shareItem, importPath) {
         __mfModuleCache.share[${JSON.stringify(cacheKey)}] = exportModule;
       }`;
 }
+const sharedCacheKeyHelperCode = `const __mfGetSharedCacheKey = (pkg, singleton, version, scope) => {
+            const normalizedScope = Array.isArray(scope) ? scope[0] : scope;
+            const prefix = (normalizedScope || "default") + ":";
+            return singleton || !version ? prefix + pkg : prefix + pkg + "@" + version;
+          };`;
 const normalizeRuntimeShareCode = `const __mfNormalizeRuntimeShare = (mod) => {
             let current = mod;
             for (let i = 0; i < 5; i++) {
@@ -1555,6 +1715,7 @@ function generateRemoteEntry(options, virtualExposesId = getVirtualExposesId(opt
   }
   async function init(shared = {}, initScope = []) {
+    ${sharedCacheKeyHelperCode}
     const {usedShared, usedRemotes} = await getLocalSharedImportMap()
     try {
       const allInstances = globalThis.__FEDERATION__?.__SHARE__;
@@ -1566,11 +1727,19 @@ function generateRemoteEntry(options, virtualExposesId = getVirtualExposesId(opt
           for (const [pkg, versionMap] of Object.entries(scopeShare)) {
             for (const [version, provider] of Object.entries(versionMap)) {
               if (!provider.lib) continue;
-              const cacheKey = provider.shareConfig?.singleton ? pkg : \`\${pkg}@\${version}\`;
+              const cacheKey = __mfGetSharedCacheKey(pkg, provider.shareConfig?.singleton, version, ${JSON.stringify(options.shareScope)});
               if (__mfModuleCache.share[cacheKey] !== undefined) continue;
               const mod = typeof provider.lib === "function" ? provider.lib() : provider.lib;
               const resolved = await Promise.resolve(mod);
-              __mfModuleCache.share[cacheKey] = __mfNormalizeRuntimeShare(resolved);
+              const normalized = __mfNormalizeRuntimeShare(resolved);
+              __mfModuleCache.share[cacheKey] = normalized;
+              const usedShare = usedShared?.[pkg];
+              if (provider.shareConfig?.singleton && usedShare) {
+                const usedCacheKey = __mfGetSharedCacheKey(pkg, usedShare.shareConfig?.singleton, usedShare.version, usedShare.scope);
+                if (__mfModuleCache.share[usedCacheKey] === undefined) {
+                  __mfModuleCache.share[usedCacheKey] = normalized;
+                }
+              }
             }
           }
         }
@@ -1578,6 +1747,14 @@ function generateRemoteEntry(options, virtualExposesId = getVirtualExposesId(opt
     } catch (e) {
       console.error('[Module Federation] Failed to bridge external shared modules', e)
     }
+    for (const [pkg, share] of Object.entries(usedShared)) {
+      const cacheKey = __mfGetSharedCacheKey(pkg, share.shareConfig?.singleton, share.version, share.scope);
+      if (__mfModuleCache.share[cacheKey] !== undefined) continue;
+      const singletonCacheKey = __mfGetSharedCacheKey(pkg, true, share.version, share.scope);
+      if (__mfModuleCache.share[singletonCacheKey] !== undefined) {
+        __mfModuleCache.share[cacheKey] = __mfModuleCache.share[singletonCacheKey];
+      }
+    }
     ${generateDirectSharedCacheSeedCode(command)}
     const __browserPlugins = [${pluginImportNames.filter((item) => !isSsrOnlyPlugin(item[1])).map((item) => `${item[0]}(${item[2]})`).join(", ")}];
     const __ssrPlugins = typeof globalThis.window === 'undefined'
@@ -1614,7 +1791,7 @@ function generateRemoteEntry(options, virtualExposesId = getVirtualExposesId(opt
       console.error('[Module Federation]', e)
     }
     for (const [pkg, share] of Object.entries(usedShared)) {
-      const cacheKey = share.shareConfig?.singleton || !share.version ? pkg : \`\${pkg}@\${share.version}\`;
+      const cacheKey = __mfGetSharedCacheKey(pkg, share.shareConfig?.singleton, share.version, share.scope);
       if (share.shareConfig?.import !== false || __mfModuleCache.share[cacheKey] !== undefined) continue;
       ${normalizeRuntimeShareCode}
       const versions = shared?.[pkg];
@@ -1654,10 +1831,11 @@ function generateHostAutoInitCode(remoteEntryImport, _command = "build") {
           const remoteEntry = await import(${remoteEntryImport});
           const runtime = await remoteEntry.init();
           const usedShared = ${generateUsedSharedPreloadConfig()};
+          ${sharedCacheKeyHelperCode}
           ${normalizeRuntimeShareCode}
           ${shouldPreloadShares ? `
           for (const [pkg, share] of Object.entries(usedShared)) {
-            const cacheKey = share.shareConfig?.singleton || !share.version ? pkg : \`\${pkg}@\${share.version}\`;
+            const cacheKey = __mfGetSharedCacheKey(pkg, share.shareConfig?.singleton, share.version, share.scope);
             if (__mfModuleCache.share[cacheKey] !== undefined) {
               continue;
             }
@@ -1866,7 +2044,7 @@ function getRemoteExportBlock(command, deferRemoteLoad, consumer) {
 	if (command !== "serve" && command !== "build") return `__mfSyncDefaultExport();
 export { __mfDefaultExport as default };`;
 	return `__mfSyncDefaultExport();
-__mfRemotePending?.then(__mfSyncDefaultExport);
+__mfRemotePending?.then(__mfSyncDefaultExport, () => {});
 export { exportModule as __moduleExports };
 ${deferRemoteLoad ? getLazyRemotePendingExport() : getEagerRemotePendingExport()}
 ${command === "serve" && consumer === "server" ? getServerThenExport() : ""}
@@ -1897,8 +2075,9 @@ function generateRemotes(id, command, enableSsrInit = false, consumer = "unified
 	const remoteLoadFailureHandler = command === "build" ? `.catch((error) => {
             delete __mfModuleCache.remote[pendingKey];
             throw error;
-          })` : `.catch(() => {
+          })` : `.catch((error) => {
             delete __mfModuleCache.remote[pendingKey];
+            throw error;
           })`;
 	const remoteLoadCode = `
     function __mfStartRemoteLoad() {
@@ -2024,9 +2203,11 @@ const addEntry = ({ entryName, entryPath, fileName, inject = "entry", forceClien
 	let _command;
 	let emitFileId;
 	let viteConfig;
-	let clientInjected = forceClientInjected ?? false;
+	let skipHtmlDevFallback = forceClientInjected ?? false;
+	let clientInjected = false;
 	let emittedFileName;
 	let skipTransformIds = /* @__PURE__ */ new Set();
+	let injectedTransformIds = /* @__PURE__ */ new Set();
 	let bootstrapDir = "";
 	function skipSvelteKitSsrBuild() {
 		return (_command === "build" || viteConfig?.command === "build") && viteConfig?.build?.ssr && hasPackageDependency("@sveltejs/kit");
@@ -2148,6 +2329,10 @@ const addEntry = ({ entryName, entryPath, fileName, inject = "entry", forceClien
 		if (id.startsWith("\0") || id.startsWith("virtual:")) return normalizeModuleId(id);
 		return normalizeModuleId(path$1.isAbsolute(id) ? id : path$1.resolve(viteConfig.root, id));
 	}
+	function isFederationInternalVirtualId(id) {
+		const normalized = decodeViteId(id).replace(/^\0+/, "");
+		return normalized.includes("virtual:mf:") || /__(?:loadShare|prebuild|loadRemote)__/.test(normalized);
+	}
 	function addEntryFile(file) {
 		const normalized = normalizeModuleId(file);
 		if (!entryFiles.includes(normalized)) entryFiles.push(normalized);
@@ -2255,9 +2440,9 @@ const addEntry = ({ entryName, entryPath, fileName, inject = "entry", forceClien
 			if (envName?.name && envName.name !== "client") return;
 			const inputOptions = getBuildInput(config);
 			if (!inputOptions) htmlFilePath = path$1.resolve(config.root, "index.html");
-			else if (typeof inputOptions === "string") entryFiles = [normalizeModuleId(inputOptions)];
-			else if (Array.isArray(inputOptions)) entryFiles = inputOptions.map(normalizeModuleId);
-			else if (typeof inputOptions === "object") entryFiles = Object.values(inputOptions).map((input) => normalizeModuleId(String(input)));
+			else if (typeof inputOptions === "string") entryFiles = [resolveProjectId(inputOptions)];
+			else if (Array.isArray(inputOptions)) entryFiles = inputOptions.map(resolveProjectId);
+			else if (typeof inputOptions === "object") entryFiles = Object.values(inputOptions).map((input) => resolveProjectId(String(input)));
 			if (entryFiles.length > 0) htmlFilePath = getFirstHtmlEntryFile(entryFiles);
 			if (htmlFilePath) addHtmlScriptEntries(htmlFilePath);
 		},
@@ -2357,7 +2542,8 @@ const addEntry = ({ entryName, entryPath, fileName, inject = "entry", forceClien
 			if (isSvelteKitServerModule(id)) return;
 			if (hasEntryBootstrapParam(id)) return;
 			if (normalizeModuleId(id).endsWith(".html")) return;
-			if (skipTransformIds.has(resolveProjectId(id))) return;
+			const projectId = resolveProjectId(id);
+			if (skipTransformIds.has(projectId)) return;
 			const transformCtx = this;
 			const transformEnv = transformCtx != null && typeof transformCtx === "object" ? transformCtx["environment"] : void 0;
 			if (transformEnv?.name && transformEnv.name !== "client") return;
@@ -2382,12 +2568,13 @@ const addEntry = ({ entryName, entryPath, fileName, inject = "entry", forceClien
 				const injection = `await import(${JSON.stringify(getEntryPath())}).then(({ initHost }) => initHost());\n      `;
 				return mapCodeToCodeWithSourcemap(code.replace("vueApp.mount(vueAppRootContainer);", `${injection}vueApp.mount(vueAppRootContainer);`));
 			}
-			const isHydrationEntryFallback = inject === "entry" && entryFiles.length === 0 && (!htmlFilePath || !fs$1.existsSync(htmlFilePath)) && !clientInjected && !id.includes("node_modules") && (id.startsWith("\0") || /\.(js|ts|mjs|vue|jsx|tsx)(\?|$)/.test(id)) && /hydrateRoot|createRoot|ReactDOM\.render/.test(code);
+			const isHydrationEntryFallback = inject === "entry" && entryFiles.length === 0 && (!htmlFilePath || !fs$1.existsSync(htmlFilePath)) && !clientInjected && !isFederationInternalVirtualId(id) && !id.includes("node_modules") && (id.startsWith("\0") || /\.(js|ts|mjs|vue|jsx|tsx)(\?|$)/.test(id)) && (/hydrateRoot|createRoot|ReactDOM\.render/.test(code) || /\.mount\s*\(\s*['"#]/.test(code) || /\.mount\s*\(/.test(code) && /createSSRApp|createApp/.test(code));
 			const isNuxtEntryAsyncModule = /(?:^|\/)nuxt\/dist\/app\/entry\.async\.js(?:\?|$)/.test(id) && code.includes("entry();");
-			const isNuxtClientEntryFallback = _command === "serve" && inject === "entry" && (!htmlFilePath || !fs$1.existsSync(htmlFilePath)) && !clientInjected && !hasEntryBootstrapParam(id) && !id.includes("node_modules/.vite") && isNuxtEntryAsyncModule && !entryFiles.some((file) => resolveProjectId(id) === file);
-			if (!(_command === "serve" && isNuxtEntryAsyncModule) && (injectEntry() && entryFiles.some((file) => resolveProjectId(id) === file) || _command === "serve" && inject === "html" && !isVinext && !clientInjected && !id.startsWith("\0") && !id.includes("node_modules") && /\.(js|ts|mjs|vue|jsx|tsx)(\?|$)/.test(id) || isHydrationEntryFallback || isNuxtClientEntryFallback)) {
+			const isNuxtClientEntryFallback = _command === "serve" && inject === "entry" && (!htmlFilePath || !fs$1.existsSync(htmlFilePath)) && !clientInjected && !hasEntryBootstrapParam(id) && !id.includes("node_modules/.vite") && isNuxtEntryAsyncModule && !entryFiles.some((file) => projectId === file);
+			if (!(_command === "serve" && isNuxtEntryAsyncModule) && (injectedTransformIds.has(projectId) || injectEntry() && entryFiles.some((file) => projectId === file) || _command === "serve" && inject === "html" && !isVinext && !clientInjected && !skipHtmlDevFallback && !id.startsWith("\0") && !id.includes("node_modules") && /\.(js|ts|mjs|vue|jsx|tsx)(\?|$)/.test(id) || isHydrationEntryFallback || isNuxtClientEntryFallback)) {
 				clientInjected = true;
-				if (!waitsForInit || _command === "serve" && inject === "entry" && isHydrationEntryFallback) return mapCodeToCodeWithSourcemap(`import ${JSON.stringify(getEntryPath())};\n` + code);
+				injectedTransformIds.add(projectId);
+				if (!waitsForInit) return mapCodeToCodeWithSourcemap(`import ${JSON.stringify(getEntryPath())};\n` + code);
 				const entrySrc = id.includes("?") ? `${id}&${ENTRY_BOOTSTRAP_QUERY.slice(1)}` : `${id}${ENTRY_BOOTSTRAP_QUERY}`;
 				return mapCodeToCodeWithSourcemap(getBootstrapSource(getEntryPath(), entrySrc, false, { skipRemotePreload: _command === "serve" && isNuxtEntryAsyncModule }));
 			}
@@ -2592,7 +2779,7 @@ const REMOTE_HMR_ENDPOINT = "__mf_hmr";
 const REMOTE_HMR_EVENT = "mf:remote-update";
 const REMOTE_HMR_CONNECT_RETRY_DELAY_MS = 1e3;
 const REMOTE_HMR_CONNECT_MAX_RETRIES = 10;
-function getBasePath$1(base) {
+function getBasePath(base) {
 	if (!base) return "/";
 	if (base.startsWith("http://") || base.startsWith("https://")) try {
 		return new URL(base).pathname || "/";
@@ -2602,11 +2789,11 @@ function getBasePath$1(base) {
 	return base;
 }
 function getRemoteHmrPath(base) {
-	return `${getBasePath$1(base).replace(/\/?$/, "/")}${REMOTE_HMR_ENDPOINT}`.replace(/\/{2,}/g, "/");
+	return `${getBasePath(base).replace(/\/?$/, "/")}${REMOTE_HMR_ENDPOINT}`.replace(/\/{2,}/g, "/");
 }
 function getHmrWsPath(base, hmrPath) {
-	const normalizedBase = getBasePath$1(base);
-	const normalizedPath = getBasePath$1(hmrPath || "");
+	const normalizedBase = getBasePath(base);
+	const normalizedPath = getBasePath(hmrPath || "");
 	if (!normalizedPath || normalizedPath === "/") return normalizedBase;
 	return `${normalizedBase.endsWith("/") ? normalizedBase.slice(0, -1) : normalizedBase}/${normalizedPath.startsWith("/") ? normalizedPath.slice(1) : normalizedPath}`;
 }
@@ -3255,70 +3442,6 @@ const buildFileToShareKeyMap = async (shareKeys, resolveFn) => {
 	return fileToShareKey;
 };
 //#endregion
-//#region src/utils/pathNormalization.ts
-const COMMON_SHARED_SUBPATHS = {
-	react: [
-		"react/jsx-runtime",
-		"react/jsx-dev-runtime",
-		"react/compiler-runtime"
-	],
-	"react-dom": [
-		"react-dom/client",
-		"react-dom/server",
-		"react-dom/server.browser"
-	],
-	"solid-js": [
-		"solid-js/web",
-		"solid-js/store",
-		"solid-js/html",
-		"solid-js/h"
-	]
-};
-function removeTrailingSlash(value) {
-	return value.endsWith("/") ? value.slice(0, -1) : value;
-}
-function ensureTrailingSlash(value) {
-	return `${removeTrailingSlash(value)}/`;
-}
-function getBasePath(base) {
-	return removeTrailingSlash(base || "/");
-}
-function isNuxtClientBase(base) {
-	return getBasePath(base).endsWith("/_nuxt");
-}
-function normalizeNodeModulePath(source) {
-	return source.replace(/\\/g, "/").replace(/\?.*$/, "");
-}
-function isNodeModulePath(source) {
-	return source.includes("/node_modules/") || source.includes("\\node_modules\\");
-}
-function filterId(id) {
-	return typeof id === "string" && !id.includes("\0");
-}
-function getMatchingNodeModuleSubpath(source, candidates) {
-	const normalized = normalizeNodeModulePath(source);
-	return [...candidates].sort((a, b) => b.length - a.length).find((candidate) => normalized.includes(`/node_modules/${candidate}/`) || normalized.includes(`/node_modules/${candidate}.`));
-}
-function getCommonSharedSubpaths(sharedKey) {
-	return COMMON_SHARED_SUBPATHS[removeTrailingSlash(sharedKey)] || [];
-}
-function getCommonSharedSubpathFromNodeModulePath(source, sharedKey) {
-	return getMatchingNodeModuleSubpath(source, getCommonSharedSubpaths(removeTrailingSlash(sharedKey)));
-}
-/**
-* Resolves the public path for remote entries
-* @param options - Module Federation options
-* @param viteBase - Vite's base config value
-* @param originalBase - Original base config before any transformations
-* @returns The resolved public path
-*/
-function resolvePublicPath(options, viteBase, originalBase) {
-	if (options.publicPath && options.publicPath !== "auto") return options.publicPath;
-	if (!originalBase) return "auto";
-	if (viteBase) return ensureTrailingSlash(viteBase);
-	return "auto";
-}
-//#endregion
 //#region src/virtualModules/virtualExposesSSR.ts
 /**
 * Virtual module ID for the SSR exposes map.
@@ -3471,6 +3594,24 @@ function resolveTypesMeta(dts) {
 		api: `${typesFolder}.d.ts`
 	};
 }
+function resolveDevRemoteEntryFileName(fileName) {
+	if (!fileName.includes("[hash")) return fileName;
+	const normalized = fileName.replace(/(?:[._-]?\[hash(?::\d+)?\])/g, "");
+	const baseName = path$1.basename(normalized);
+	return path$1.extname(baseName) ? normalized : `${normalized}.js`;
+}
+function createRemoteEntryAssetMap(fileName) {
+	return {
+		js: {
+			async: [],
+			sync: [fileName]
+		},
+		css: {
+			async: [],
+			sync: []
+		}
+	};
+}
 const Manifest = () => {
 	const mfOptions = getNormalizeModuleFederationOptions();
 	const { name, filename, getPublicPath, manifest: manifestOptions, varFilename } = mfOptions;
@@ -3504,6 +3645,12 @@ const Manifest = () => {
 					next();
 					return;
 				}
+				const devRemoteEntryFile = resolveDevRemoteEntryFileName(filename);
+				if (devRemoteEntryFile !== filename && req.url?.startsWith((viteConfig.base + devRemoteEntryFile).replace(/^\/?/, "/"))) {
+					req.url = req.url.replace(devRemoteEntryFile, filename);
+					next();
+					return;
+				}
 				if (req.url?.replace(/\?.*/, "") === (viteConfig.base + mfManifestName).replace(/^\/?/, "/")) {
 					res.setHeader("Content-Type", "application/json");
 					res.setHeader("Access-Control-Allow-Origin", "*");
@@ -3520,12 +3667,12 @@ const Manifest = () => {
 									buildName: name
 								},
 								remoteEntry: {
-									name: filename,
+									name: devRemoteEntryFile,
 									path: "",
 									type: "module"
 								},
 								ssrRemoteEntry: {
-									name: getSsrRemoteEntryFileName(filename),
+									name: getSsrRemoteEntryFileName(devRemoteEntryFile),
 									path: "/__mf_ssr__/",
 									type: "module"
 								},
@@ -3566,10 +3713,10 @@ const Manifest = () => {
 			if (!mfManifestName) return;
 			let filesMap = {};
 			const foundRemoteEntryFile = findRemoteEntryFile(mfOptions.filename, bundle);
-			const expectedSsrRemoteEntryFile = getSsrRemoteEntryFileName(mfOptions.filename);
+			const expectedSsrRemoteEntryFile = getSsrRemoteEntryFileName(foundRemoteEntryFile || mfOptions.filename);
 			const foundSsrRemoteEntryFile = Object.values(bundle).find((file) => file.fileName === expectedSsrRemoteEntryFile)?.fileName;
 			if (foundRemoteEntryFile) remoteEntryFile = foundRemoteEntryFile;
-			ssrRemoteEntryFile = foundSsrRemoteEntryFile || expectedSsrRemoteEntryFile;
+			ssrRemoteEntryFile = foundSsrRemoteEntryFile || (_command === "serve" ? getSsrRemoteEntryFileName(resolveDevRemoteEntryFileName(mfOptions.filename)) : expectedSsrRemoteEntryFile);
 			const allCssAssets = mfOptions.bundleAllCSS && !disableAssetsAnalyze ? collectCssAssets(bundle) : /* @__PURE__ */ new Set();
 			if (!disableAssetsAnalyze) {
 				const exposesModules = Object.keys(mfOptions.exposes).map((item) => mfOptions.exposes[item].import);
@@ -3610,13 +3757,14 @@ const Manifest = () => {
 	function generateMFManifest(preloadMap, disableAssetsAnalyze = false) {
 		const options = getNormalizeModuleFederationOptions();
 		const { name, varFilename } = options;
+		const resolvedRemoteEntryFile = _command === "serve" ? remoteEntryFile || resolveDevRemoteEntryFileName(filename) : remoteEntryFile;
 		const remoteEntry = {
-			name: remoteEntryFile,
+			name: resolvedRemoteEntryFile,
 			path: "",
 			type: "module"
 		};
 		const ssrRemoteEntry = {
-			name: ssrRemoteEntryFile || getSsrRemoteEntryFileName(filename),
+			name: ssrRemoteEntryFile || getSsrRemoteEntryFileName(_command === "serve" ? resolveDevRemoteEntryFileName(filename) : filename),
 			path: _command === "serve" ? "/__mf_ssr__/" : "",
 			type: "module"
 		};
@@ -3634,7 +3782,7 @@ const Manifest = () => {
 		const shared = Array.from(getUsedShares()).flatMap((shareKey) => {
 			const shareItem = getNormalizeShareItem(shareKey);
 			if (!shareItem) return [];
-			const assets = preloadMap[shareKey] || createEmptyAssetMap();
+			const assets = preloadMap[shareKey] || (_command === "serve" && resolvedRemoteEntryFile ? createRemoteEntryAssetMap(resolvedRemoteEntryFile) : createEmptyAssetMap());
 			return [{
 				id: `${name}:${shareKey}`,
 				name: shareKey,
@@ -3655,7 +3803,7 @@ const Manifest = () => {
 		});
 		const exposes = Object.entries(options.exposes).map(([key, value]) => {
 			const formatKey = key.replace("./", "");
-			const assets = preloadMap[value.import] || createEmptyAssetMap();
+			const assets = preloadMap[value.import] || (_command === "serve" && resolvedRemoteEntryFile ? createRemoteEntryAssetMap(resolvedRemoteEntryFile) : createEmptyAssetMap());
 			return {
 				id: `${name}:${formatKey}`,
 				name: formatKey,
@@ -4651,7 +4799,7 @@ function pluginSSRRemoteEntry(options) {
 		},
 		configureServer(server) {
 			const base = "/__mf_ssr__";
-			const basePath = getBasePath(viteConfig?.base);
+			const basePath = getBasePath$1(viteConfig?.base);
 			const ssrEntryFileName = getSsrRemoteEntryFileName(options.filename);
 			if (isNuxtProject || isNuxtClientBase(basePath)) server.middlewares.use((req, _res, next) => {
 				if (req.url?.replace(/\?.*/, "") === `${basePath}/${ssrEntryFileName}`) req.url = `${basePath}/__mf_ssr__/${ssrEntryFileName}`;
@@ -4955,6 +5103,13 @@ var normalizeOptimizeDeps_default = {
 		if (!optimizeDeps.include) optimizeDeps.include = [];
 		if (!optimizeDeps.exclude) optimizeDeps.exclude = [];
 		if (!optimizeDeps.needsInterop) optimizeDeps.needsInterop = [];
+	},
+	configResolved: (config) => {
+		const include = config.optimizeDeps?.include;
+		const exclude = config.optimizeDeps?.exclude;
+		if (!include?.length || !exclude?.length) return;
+		const included = new Set(include);
+		config.optimizeDeps.exclude = exclude.filter((dep) => !included.has(dep));
 	}
 };
 //#endregion
@@ -5108,6 +5263,7 @@ function createEarlyVirtualModulesPlugin(options) {
 									external: true
 								}));
 								build.onResolve({ filter: /.*/ }, (args) => {
+									if (args.kind === "entry-point") return;
 									if (!args.importer || args.namespace === "mf-shared") return;
 									if (isSharedResolverInternalImporter(args.importer)) return;
 									if (!findSharedKey(args.path, shared) || args.path.endsWith(".css")) return;
@@ -5221,7 +5377,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-Cpmdbbr0.js").then((n) => n.n).then(({ default: pluginDts }) => pluginDts(options))];
+	return [import("./pluginDts-CrSsDUnT.js").then((n) => n.n).then(({ default: pluginDts }) => pluginDts(options))];
 }
 function federation(mfUserOptions) {
 	if (isTestEnv()) return [];
@@ -5233,6 +5389,7 @@ function federation(mfUserOptions) {
 	const virtualExposesId = getVirtualExposesId(options);
 	let command;
 	let desiredRolldownOutput;
+	let isSsrBuild = false;
 	return [
 		{
 			name: "vite:module-federation-virtual-modules",
@@ -5344,6 +5501,7 @@ function federation(mfUserOptions) {
 			enforce: "pre",
 			apply: "build",
 			config(config) {
+				isSsrBuild = config.build?.ssr === true;
 				const runtimeInitId = virtualRuntimeInitStatus.getImportId();
 				config.build = config.build || {};
 				if (config.build.modulePreload !== false) {
@@ -5465,6 +5623,8 @@ function federation(mfUserOptions) {
 			load(id) {
 				if (id.includes("__loadShare__") || id.includes("__loadRemote__")) {
 					let code = VirtualModule.findById(id)?.code ?? readFileSync(id, "utf-8");
+					const environmentName = this.environment?.name;
+					if (environmentName && environmentName !== "client" || !environmentName && isSsrBuild) code = prependWorkspaceSingletonSsrImport(code);
 					code = code.replace(/import\s+["'][^"']*__prebuild__[^"']*["']\s*;?/g, "");
 					code = code.replace(/export\s+\*\s+from\s+["'][^"']*__prebuild__[^"']*["']\s*;?/g, "");
 					if (!(/\b(?:var|let|const)\s+__moduleExports\b/.test(code) || /\bexport\s+const\s+__moduleExports\b/.test(code) || /\bexport\s*\{[^}]*__moduleExports/.test(code))) {
@@ -5526,6 +5686,7 @@ function federation(mfUserOptions) {
 			_options: options,
 			config(config, { command: _command }) {
 				const isRolldown = getIsRolldown(this);
+				isSsrBuild = _command === "build" && config.build?.ssr === true;
 				appendResolveAlias(config, {
 					find: "@module-federation/runtime",
 					replacement: options.implementation
@@ -5550,7 +5711,17 @@ function federation(mfUserOptions) {
 				const envTargetDefineValue = !options.target && isAstro ? "undefined" : JSON.stringify(resolvedTarget);
 				if (!config.define) config.define = {};
 				if (!("ENV_TARGET" in config.define)) config.define["ENV_TARGET"] = envTargetDefineValue;
+				if (resolvedTarget === "node" && !("FEDERATION_OPTIMIZE_NO_SNAPSHOT_PLUGIN" in config.define)) config.define["FEDERATION_OPTIMIZE_NO_SNAPSHOT_PLUGIN"] = "true";
 				if (options.target && "ENV_TARGET" in config.define && config.define["ENV_TARGET"] !== JSON.stringify(options.target)) mfWarn(`ENV_TARGET define (${config.define["ENV_TARGET"]}) differs from target option ("${options.target}"). ENV_TARGET will not be overridden.`);
+			},
+			configEnvironment(name, config) {
+				if (!(config.consumer === "server" || name === "ssr" || name === "server" || config.build?.ssr === true)) return;
+				const isAstro = hasPackageDependency("astro");
+				const envTargetDefineValue = !options.target && isAstro ? "undefined" : JSON.stringify(options.target ?? "node");
+				config.define = { ...config.define ?? {} };
+				if (!("ENV_TARGET" in config.define)) config.define["ENV_TARGET"] = envTargetDefineValue;
+				if (!("FEDERATION_OPTIMIZE_NO_SNAPSHOT_PLUGIN" in config.define)) config.define["FEDERATION_OPTIMIZE_NO_SNAPSHOT_PLUGIN"] = "true";
+				if (options.target && config.define["ENV_TARGET"] !== JSON.stringify(options.target)) mfWarn(`ENV_TARGET define (${config.define["ENV_TARGET"]}) differs from target option ("${options.target}"). ENV_TARGET will not be overridden.`);
 			}
 		},
 		...Manifest(),

package/lib/{pluginDts-Cpmdbbr0.js → pluginDts-CrSsDUnT.js} RENAMED Viewed

@@ -194,7 +194,8 @@ function getPackageNameFromNodeModulePath(source) {
 	return parts[0];
 }
 function getSharedCacheKey(pkg, shareItem) {
-	return shareItem.shareConfig.singleton || !shareItem.version ? pkg : `${pkg}@${shareItem.version}`;
+	const prefix = `${shareItem.scope || "default"}:`;
+	return shareItem.shareConfig.singleton || !shareItem.version ? `${prefix}${pkg}` : `${prefix}${pkg}@${shareItem.version}`;
 }
 function getInstalledPackageJson(pkg, opts) {
 	const cwd = opts?.cwd || getPackageDetectionCwd();

package/lib/utils/ssrEntryLoader.js CHANGED Viewed

@@ -87,7 +87,8 @@ const _path = () => nodeImport("path");
 const _fs = () => nodeImport("fs");
 const _crypto = () => nodeImport("crypto");
 const _module = () => nodeImport("module");
-const manifestCache = /* @__PURE__ */ new Map();
+const ssrEntryCache = /* @__PURE__ */ new Map();
+const manifestFetchCache = /* @__PURE__ */ new Map();
 async function fetchManifest(manifestUrl) {
 	try {
 		const res = await fetch(manifestUrl);
@@ -97,9 +98,33 @@ async function fetchManifest(manifestUrl) {
 		return null;
 	}
 }
+async function fetchManifestCached(manifestUrl) {
+	if (!manifestFetchCache.has(manifestUrl)) manifestFetchCache.set(manifestUrl, fetchManifest(manifestUrl));
+	return manifestFetchCache.get(manifestUrl);
+}
+/** True when the host configured a manifest URL as the remote entry (any .json name). */
+function isManifestEntry(remoteEntryUrl) {
+	try {
+		const { pathname } = new URL(remoteEntryUrl);
+		return /\.json$/i.test(pathname);
+	} catch {
+		return /\.json(?:[?#]|$)/i.test(remoteEntryUrl);
+	}
+}
+function isSsrEntry(remoteEntryUrl) {
+	return /\.ssr\.js(?:[?#].*)?$/.test(remoteEntryUrl);
+}
 function getManifestUrl(remoteEntryUrl) {
+	if (isManifestEntry(remoteEntryUrl)) return remoteEntryUrl;
 	return remoteEntryUrl.replace(/\/[^/]+$/, "/mf-manifest.json");
 }
+function getEntryFilename(entryUrl) {
+	return entryUrl.split("/").pop()?.replace(/[?#].*$/, "").replace(/\.[^.]+$/, "") ?? "remoteEntry";
+}
+function resolveEntryAssetUrl(entry, manifestUrl) {
+	const base = manifestUrl.replace(/\/[^/]+$/, "/");
+	return new URL(`${entry.path || ""}${entry.name}`, base).href;
+}
 function resolveSSREntryUrl(manifest, manifestUrl) {
 	const meta = manifest?.metaData;
 	if (!meta?.ssrRemoteEntry?.name) return null;
@@ -124,48 +149,72 @@ async function headCheckSsrEntry(candidate) {
 	} catch {}
 	return null;
 }
-async function getSSREntryByConvention(remoteEntryUrl, options = {}) {
-	const base = remoteEntryUrl.replace(/\.[^.]+$/, "");
-	const remoteOrigin = remoteEntryUrl.replace(/\/[^/]+$/, "");
-	const filename = remoteEntryUrl.split("/").pop()?.replace(/\.[^.]+$/, "") ?? "remoteEntry";
-	const candidates = [
-		...options.skipServerBuild ? [] : [{
-			url: `${remoteOrigin}/__mf_server__/${filename}.ssr.js`,
-			type: "module"
-		}],
-		{
-			url: `${base}.ssr.js`,
-			type: "module"
-		},
-		{
-			url: `${remoteOrigin}/__mf_ssr__/${filename}.ssr.js`,
-			type: "module"
-		}
-	];
+function resolveAssetBaseUrl(entryUrl, manifest, manifestUrl) {
+	const remoteEntry = manifest?.metaData?.remoteEntry;
+	if (remoteEntry?.name) return resolveEntryAssetUrl(remoteEntry, manifestUrl);
+	if (!isManifestEntry(entryUrl)) return entryUrl;
+	return new URL("remoteEntry.js", manifestUrl.replace(/\/[^/]+$/, "/")).href;
+}
+async function buildEntryContext(entryUrl) {
+	const manifestUrl = getManifestUrl(entryUrl);
+	const manifest = await fetchManifestCached(manifestUrl);
+	const assetBaseUrl = resolveAssetBaseUrl(entryUrl, manifest, manifestUrl);
+	return {
+		entryUrl,
+		manifestUrl,
+		manifest,
+		assetBaseUrl,
+		filename: getEntryFilename(assetBaseUrl),
+		remoteOrigin: assetBaseUrl.replace(/\/[^/]+$/, "")
+	};
+}
+function buildSsrEntryCandidates(ctx, options = {}) {
+	const { assetBaseUrl, filename, remoteOrigin } = ctx;
+	const base = assetBaseUrl.replace(/\.[^.]+$/, "");
+	const candidates = [];
+	if (!options.skipServerBuild) candidates.push({
+		url: `${remoteOrigin}/__mf_server__/${filename}.ssr.js`,
+		type: "module"
+	});
+	candidates.push({
+		url: `${base}.ssr.js`,
+		type: "module"
+	}, {
+		url: `${remoteOrigin}/__mf_ssr__/${filename}.ssr.js`,
+		type: "module"
+	});
+	return candidates;
+}
+async function resolveFirstReachableCandidate(candidates) {
 	for (const candidate of candidates) {
 		const hit = await headCheckSsrEntry(candidate);
 		if (hit) return hit;
 	}
 	return null;
 }
-async function getSSREntry(remoteEntryUrl) {
-	const remoteOrigin = remoteEntryUrl.replace(/\/[^/]+$/, "");
-	const filename = remoteEntryUrl.split("/").pop()?.replace(/\.[^.]+$/, "") ?? "remoteEntry";
-	const manifestUrl = getManifestUrl(remoteEntryUrl);
-	if (!manifestCache.has(manifestUrl)) manifestCache.set(manifestUrl, (async () => {
+async function resolveSSREntryImpl(remoteEntryUrl) {
+	if (isSsrEntry(remoteEntryUrl)) return {
+		url: remoteEntryUrl,
+		type: "module"
+	};
+	if (!isManifestEntry(remoteEntryUrl)) {
+		const filename = getEntryFilename(remoteEntryUrl);
 		const fromServerBuild = await headCheckSsrEntry({
-			url: `${remoteOrigin}/__mf_server__/${filename}.ssr.js`,
+			url: `${remoteEntryUrl.replace(/\/[^/]+$/, "")}/__mf_server__/${filename}.ssr.js`,
 			type: "module"
 		});
 		if (fromServerBuild) return fromServerBuild;
-		const manifest = await fetchManifest(manifestUrl);
-		if (manifest) {
-			const fromManifest = resolveSSREntryUrl(manifest, manifestUrl);
-			if (fromManifest) return fromManifest;
-		}
-		return getSSREntryByConvention(remoteEntryUrl, { skipServerBuild: true });
-	})());
-	return manifestCache.get(manifestUrl);
+	}
+	const ctx = await buildEntryContext(remoteEntryUrl);
+	if (ctx.manifest) {
+		const fromManifest = resolveSSREntryUrl(ctx.manifest, ctx.manifestUrl);
+		if (fromManifest) return fromManifest;
+	}
+	return resolveFirstReachableCandidate(buildSsrEntryCandidates(ctx, { skipServerBuild: !isManifestEntry(remoteEntryUrl) }));
+}
+async function getSSREntry(remoteEntryUrl) {
+	if (!ssrEntryCache.has(remoteEntryUrl)) ssrEntryCache.set(remoteEntryUrl, resolveSSREntryImpl(remoteEntryUrl));
+	return ssrEntryCache.get(remoteEntryUrl);
 }
 const tempFileCache = /* @__PURE__ */ new Map();
 let ssrCacheDirPromise;
@@ -257,11 +306,14 @@ async function loadSSRRemoteEntry(ssrEntry, resolvedShared = {}) {
 		if (urlObj.pathname.includes("/__mf_ssr__/")) {
 			const remoteOrigin = urlObj.origin;
 			const runner = await getOrCreateRunner(remoteOrigin);
-			if (!runner) return null;
-			try {
-				return await runner.import(urlObj.pathname);
+			if (!runner) {
+				if (process.env.NODE_ENV !== "production") return null;
+			} else try {
+				const mod = await runner.import(urlObj.pathname);
+				if (mod && typeof mod === "object" && "init" in mod) return mod;
+				if (process.env.NODE_ENV !== "production") return null;
 			} catch {
-				return null;
+				if (process.env.NODE_ENV !== "production") return null;
 			}
 		}
 		const { mkdirSync } = await _fs();

package/package.json CHANGED Viewed

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