@module-federation/vite 1.23.7 → 1.23.8

package/lib/{dtsConstants-CDuC8Bb7.js → dtsConstants-286VtFnC.js}

@@ -279,35 +279,17 @@ function getPackageNameFromNodeModulePath(source) {
 	if (parts[0].startsWith("@")) return parts[1] ? `${parts[0]}/${parts[1]}` : void 0;
 	return parts[0];
 }
-function getSharedCacheKeyParts(input) {
-	const scope = (Array.isArray(input.scope) ? input.scope[0] : input.scope) || "default";
-	const id = input.singleton || !input.version ? input.pkg : `${input.pkg}@${input.version}`;
-	return {
-		scope,
-		id,
-		key: `${scope}:${id}`
-	};
+function createSharedCacheDescriptor(pkg, singleton, version, scope) {
+	const scopeName = (Array.isArray(scope) ? scope[0] : scope) || "default";
+	const id = singleton || !version ? pkg : pkg + "@" + version;
+	const descriptor = { canonical: scopeName + ":" + id };
+	if (scopeName === "default") descriptor.aliases = [id];
+	return descriptor;
 }
 function getSharedCacheDescriptor(pkg, shareItem) {
-	const parts = getSharedCacheKeyParts({
-		pkg: shareItem.shareConfig.request !== void 0 || shareItem.shareConfig.shareKey !== void 0 ? getSharedRuntimeKey(pkg, shareItem) : pkg,
-		singleton: shareItem.shareConfig.singleton,
-		version: shareItem.version,
-		scope: shareItem.scope
-	});
-	return {
-		canonical: parts.key,
-		...parts.scope === "default" ? { aliases: [parts.id] } : {}
-	};
+	return createSharedCacheDescriptor(shareItem.shareConfig.request !== void 0 || shareItem.shareConfig.shareKey !== void 0 ? getSharedRuntimeKey(pkg, shareItem) : pkg, shareItem.shareConfig.singleton, shareItem.version, shareItem.scope);
 }
-const sharedCacheHelperCode = `const __mfGetSharedCacheDescriptor = (pkg, singleton, version, scope) => {
-            const normalizedScope = Array.isArray(scope) ? scope[0] : scope;
-            const scopeName = normalizedScope || "default";
-            const id = singleton || !version ? pkg : pkg + "@" + version;
-            const descriptor = { canonical: scopeName + ":" + id };
-            if (scopeName === "default") descriptor.aliases = [id];
-            return descriptor;
-          };
+const sharedCacheHelperCode = `const __mfGetSharedCacheDescriptor = ${createSharedCacheDescriptor.toString()};
           const __mfReadSharedCache = (cache, descriptor) => {
             const value = cache[descriptor.canonical];
             if (value !== undefined) return value;
@@ -530,7 +512,7 @@ function resolveInstalledPackageJson(pkg, cwd, packageName, opts) {
 		const directCandidate = tryReadPackageJson(path$1.join(dir, "node_modules", packageName, "package.json"), packageName);
 		if (directCandidate) return directCandidate;
 	}
-	return findPackageInDependents(packageName, cwd) ?? findPackageInPnpmStore(packageName, cwd);
+	return findPackageInDependents(packageName, cwd)?.copy ?? findPackageInPnpmStore(packageName, cwd);
 }
 function readDirEntries(dir) {
 	try {
@@ -605,12 +587,13 @@ function walkDependents(packageName, cwd, reachedNames) {
 	for (const rootDependencies of rootDependencyGroups) {
 		let level = rootDependencies.map((name) => ({
 			name,
-			fromDir: cwd
+			fromDir: cwd,
+			chain: [name]
 		}));
 		while (level.length) {
 			const candidates = [];
 			const nextLevel = [];
-			for (const { name, fromDir } of level) {
+			for (const { name, fromDir, chain } of level) {
 				if (name === packageName) continue;
 				const dependent = findPackageFrom(name, fromDir);
 				if (!dependent || visited.has(dependent.dir)) continue;
@@ -621,17 +604,20 @@ function walkDependents(packageName, cwd, reachedNames) {
 					const copy = findPackageFrom(packageName, dependent.dir);
 					if (copy) candidates.push({
 						copy,
-						via: name
+						via: name,
+						dependentDir: dependent.dir,
+						chain
 					});
 				}
 				for (const dependency of dependencies) nextLevel.push({
 					name: dependency,
-					fromDir: dependent.dir
+					fromDir: dependent.dir,
+					chain: [...chain, dependency]
 				});
 			}
 			if (candidates.length) {
 				warnOnAmbiguousDependents(packageName, candidates);
-				return candidates[0].copy;
+				return candidates[0];
 			}
 			level = nextLevel;
 		}
@@ -804,4 +790,4 @@ function watchFileEvents(watcher, listener) {
 //#region src/utils/dtsConstants.ts
 const DEFAULT_PUBLIC_TYPES_FOLDER = "@mf-types";
 //#endregion
-export { supportsCodeSplittingGroupDebugName as C, isReactCoreShare as E, sharedCacheHelperCode as S, REACT_DOM_CLIENT_SHARE as T, packageNameDecode as _, getInstalledPackageEntry as a, resolveModulePath as b, getPackageDetectionCwd as c, getPackageNameFromNodeModulePath as d, getSharedCacheDescriptor as f, isPackageInstalled as g, isPackageExportAvailable as h, getDependencyNames as i, getPackageExportSpecifiersForFile as l, isNuxtProjectRoot as m, formatDevServerHostForOrigin as n, getInstalledPackageJson as o, hasPackageDependency as p, watchFileEvents as r, getIsRolldown as s, DEFAULT_PUBLIC_TYPES_FOLDER as t, getPackageName as u, packageNameEncode as v, REACT_CLIENT_INTERNALS_KEY as w, setPackageDetectionCwd as x, resolveImportPath as y };
+export { sharedCacheHelperCode as C, isReactCoreShare as D, REACT_DOM_CLIENT_SHARE as E, setPackageDetectionCwd as S, REACT_CLIENT_INTERNALS_KEY as T, isPackageInstalled as _, getDependencyNames as a, resolveImportPath as b, getIsRolldown as c, getPackageName as d, getPackageNameFromNodeModulePath as f, isPackageExportAvailable as g, isNuxtProjectRoot as h, findPackageInDependents as i, getPackageDetectionCwd as l, hasPackageDependency as m, formatDevServerHostForOrigin as n, getInstalledPackageEntry as o, getSharedCacheDescriptor as p, watchFileEvents as r, getInstalledPackageJson as s, DEFAULT_PUBLIC_TYPES_FOLDER as t, getPackageExportSpecifiersForFile as u, packageNameDecode as v, supportsCodeSplittingGroupDebugName as w, resolveModulePath as x, packageNameEncode as y };

package/lib/index.js

@@ -1,6 +1,6 @@
 import { a as CodeRewriter, c as isAbsoluteUrl, d as rebaseImport, f as resolveHashPlaceholderFileName, i as createCodePositionMap, l as isHttpUrl, o as createSourceMap, r as mfWarn, t as createModuleFederationError, u as normalizePathForImport } from "./logger-D67aJYOe.js";
 import { _ as removeTrailingSlash, a as matchesSharedSource, b as stripViteFsPrefix, c as filterId, d as getNodeModulesSuffix, f as isAssetLikeImport, g as normalizeNodeModulePath, h as isViteOptimizableEntry, i as invalidateSharedKeyMatcher, l as getBasePath$1, m as isNuxtClientBase, n as getSharedRequest, p as isNodeModulePath, r as getSharedRuntimeKey, s as ensureTrailingSlash, t as findSharedKey, u as getCommonSharedSubpaths, v as resolvePublicPath, x as toRelativeImport, y as stripQueryAndHash } from "./sharedKeyMatcher-C04bVN1q.js";
-import { C as supportsCodeSplittingGroupDebugName, E as isReactCoreShare, S as sharedCacheHelperCode, T as REACT_DOM_CLIENT_SHARE, _ as packageNameDecode, a as getInstalledPackageEntry, b as resolveModulePath, c as getPackageDetectionCwd, d as getPackageNameFromNodeModulePath, f as getSharedCacheDescriptor, g as isPackageInstalled, h as isPackageExportAvailable, i as getDependencyNames, l as getPackageExportSpecifiersForFile, m as isNuxtProjectRoot, n as formatDevServerHostForOrigin, o as getInstalledPackageJson, p as hasPackageDependency, r as watchFileEvents, s as getIsRolldown, u as getPackageName, v as packageNameEncode, w as REACT_CLIENT_INTERNALS_KEY, x as setPackageDetectionCwd, y as resolveImportPath } from "./dtsConstants-CDuC8Bb7.js";
+import { C as sharedCacheHelperCode, D as isReactCoreShare, E as REACT_DOM_CLIENT_SHARE, S as setPackageDetectionCwd, T as REACT_CLIENT_INTERNALS_KEY, _ as isPackageInstalled, a as getDependencyNames, b as resolveImportPath, c as getIsRolldown, d as getPackageName, f as getPackageNameFromNodeModulePath, g as isPackageExportAvailable, h as isNuxtProjectRoot, i as findPackageInDependents, l as getPackageDetectionCwd, m as hasPackageDependency, n as formatDevServerHostForOrigin, o as getInstalledPackageEntry, p as getSharedCacheDescriptor, r as watchFileEvents, s as getInstalledPackageJson, u as getPackageExportSpecifiersForFile, v as packageNameDecode, w as supportsCodeSplittingGroupDebugName, x as resolveModulePath, y as packageNameEncode } from "./dtsConstants-286VtFnC.js";
 import { createRequire } from "node:module";
 import * as fs$2 from "fs";
 import { existsSync, readFileSync, readdirSync, realpathSync, statSync, writeFileSync } from "fs";
@@ -1669,10 +1669,13 @@ function getRuntimeRemoteAlias(alias, options) {
 	return `${getFederationScopeKey(options)}__${alias}`;
 }
 function getSsrRuntimeRemotes(remotes, options) {
-	return Object.entries(remotes).map(([name, item]) => ({
-		name: getRuntimeRemoteAlias(name, options),
+	return Object.entries(remotes).map(([alias, item]) => ({
+		alias,
+		entryGlobalName: item.entryGlobalName,
+		name: getRuntimeRemoteAlias(alias, options),
 		entry: item.entry,
-		type: item.type ?? "module"
+		type: item.type ?? "module",
+		shareScope: item.shareScope ?? "default"
 	}));
 }
 function getRuntimeInitGlobalKey(ownerImportId) {
@@ -8372,7 +8375,7 @@ function ${helperName}(names) {
 }
 //#endregion
 //#region package.json
-var version$1 = "1.23.7";
+var version$1 = "1.23.8";
 //#endregion
 //#region src/virtualModules/virtualExposesSSR.ts
 /**
@@ -10313,6 +10316,8 @@ function proxySharedModule(options) {
 	let devServer;
 	const materializedLoadShareSources = /* @__PURE__ */ new Set();
 	const emittedTreeShakingProviders = /* @__PURE__ */ new Set();
+	const concreteShareSources = /* @__PURE__ */ new Map();
+	let concreteShareSourcesSize = -1;
 	const hasAnalyzableShares = Object.values(shared).some((share) => shouldAnalyzeSharedExports(share));
 	const getEnvironmentConfig = (context) => context.environment?.config;
 	const getEnvironmentConditions = (context) => getEnvironmentConfig(context)?.resolve?.conditions;
@@ -10550,6 +10555,23 @@ function proxySharedModule(options) {
 			name: "proxyPreBuildShared:resolve-prebuild",
 			enforce: "pre",
 			async resolveId(source, importer) {
+				if (_command === "serve" && path$1.isAbsolute(source)) {
+					const usedShares = getUsedShares(federationOptions);
+					if (concreteShareSourcesSize !== usedShares.size) {
+						concreteShareSourcesSize = usedShares.size;
+						concreteShareSources.clear();
+						for (const used of usedShares) {
+							const concrete = getConcreteSharedImportSource(used);
+							if (concrete) concreteShareSources.set(concrete.replaceAll("\\", "/"), used);
+						}
+					}
+					const share = concreteShareSources.get(source.replaceAll("\\", "/"));
+					if (!share) return;
+					const dependent = findPackageInDependents(getPackageName(share), getPackageDetectionCwd());
+					if (!dependent) return;
+					const dependentPackageJson = path$1.join(dependent.dependentDir, "package.json");
+					return resolveInternally(this, share, dependentPackageJson);
+				}
 				if (!source.includes("__prebuild__")) return;
 				if (source.startsWith(".")) return;
 				const pkgName = assertModuleFound(PREBUILD_TAG, source).name;
@@ -11455,6 +11477,7 @@ function pluginSsrRuntimeInit(options) {
 			if (isOwnedHostAutoInitId(id, options)) {
 				const pluginImports = options.runtimePlugins.map((plugin, index) => `import plugin${index} from ${toSafeJsLiteral(getRuntimePluginSpecifier(plugin))};`).join("\n");
 				const plugins = options.runtimePlugins.map((plugin, index) => `plugin${index}(${Array.isArray(plugin) ? serializeRuntimeOptions(plugin[1]) : ""})`).join(",");
+				const fallbackRemotes = toSafeJsLiteral(getSsrRuntimeRemotes(options.remotes, options));
 				return {
 					code: `
             import { init } from ${toSafeJsLiteral(options.implementation)};
@@ -11466,7 +11489,8 @@ function pluginSsrRuntimeInit(options) {
             // names aliased to their configured names, and the runtime resolves an id
             // against the first remote whose name or alias matches. Drop the alias once the
             // application registers a remote under that name or alias, so its entry wins.
-            const bootstrapRemoteNames = new Set(usedRemotes.map((remote) => remote.name));
+            const bootstrapRemotes = Array.isArray(usedRemotes) ? usedRemotes : ${fallbackRemotes};
+            const bootstrapRemoteNames = new Set(bootstrapRemotes.map((remote) => remote.name));
             const applicationRemotePlugin = {
               name: 'vite-ssr-application-remote-plugin',
               beforeRegisterRemote(args) {
@@ -11485,7 +11509,7 @@ function pluginSsrRuntimeInit(options) {
             };
             const runtime = init({
               name: ${toSafeJsLiteral(options.name)},
-              remotes: usedRemotes,
+              remotes: bootstrapRemotes,
               shared: usedShared,
               plugins: [applicationRemotePlugin, ${plugins}],
               shareStrategy: ${toSafeJsLiteral(options.shareStrategy)},
@@ -12027,6 +12051,11 @@ function canResolveSharedSubpath(subpath, projectRoot) {
 		return false;
 	}
 }
+function getSharedIncludeEntry(subpath, projectRoot) {
+	if (canResolveSharedSubpath(subpath, projectRoot)) return subpath;
+	const dependent = findPackageInDependents(getPackageName(subpath), projectRoot);
+	if (dependent && canResolveSharedSubpath(subpath, dependent.dependentDir)) return [...dependent.chain, subpath].join(" > ");
+}
 const VITE_DEV_IMPORT_CONDITIONS = /* @__PURE__ */ new Set([
 	"browser",
 	"development",
@@ -12373,7 +12402,8 @@ export default __mfShared.default ?? __mfShared;`
 							optimizeDeps.exclude ??= [];
 							for (const subpath of getCommonSharedSubpaths(request)) {
 								writePreBuildLibPath(subpath, shareItem, options);
-								if (canResolveSharedSubpath(subpath, root)) optimizeDeps.include.push(subpath);
+								const includeEntry = getSharedIncludeEntry(subpath, root);
+								if (includeEntry) optimizeDeps.include.push(includeEntry);
 								else optimizeDeps.exclude.push(subpath);
 							}
 						}
@@ -12391,18 +12421,18 @@ export default __mfShared.default ?? __mfShared;`
 						const optimizeDeps = config.optimizeDeps ??= {};
 						optimizeDeps.include ??= [];
 						optimizeDeps.exclude ??= [];
-						const shouldBypassOptimizeDep = isLitShare(runtimeKey) || !canResolveSharedSubpath(runtimeKey, root);
+						const includeEntry = isLitShare(runtimeKey) ? void 0 : getSharedIncludeEntry(runtimeKey, root);
 						if (optimizeDeps.include.includes(runtimeKey)) optimizeDeps.exclude = optimizeDeps.exclude.filter((dep) => dep !== runtimeKey);
-						else if (shouldBypassOptimizeDep || optimizeDeps.exclude.includes(runtimeKey)) optimizeDeps.exclude.push(runtimeKey);
-						else optimizeDeps.include.push(runtimeKey);
+						else if (!includeEntry || optimizeDeps.exclude.includes(runtimeKey)) optimizeDeps.exclude.push(runtimeKey);
+						else optimizeDeps.include.push(includeEntry);
 						const commonSubpaths = shareItem.shareConfig.request === void 0 && shareItem.shareConfig.shareKey === void 0 ? getCommonSharedSubpaths(runtimeKey) : [];
 						for (const subpath of commonSubpaths) {
-							const canResolveSubpath = canResolveSharedSubpath(subpath, root);
+							const subpathIncludeEntry = getSharedIncludeEntry(subpath, root);
 							if ([
 								"react/compiler-runtime",
 								"react-dom/client",
 								"react-dom/profiling"
-							].includes(subpath) && !canResolveSubpath) {
+							].includes(subpath) && !subpathIncludeEntry) {
 								optimizeDeps.exclude.push(subpath);
 								continue;
 							}
@@ -12410,9 +12440,9 @@ export default __mfShared.default ?? __mfShared;`
 							writeLoadShareModule(subpath, shareItem, _command, options);
 							writePreBuildLibPath(subpath, shareItem, options);
 							addConfiguredShare(subpath, options);
-							if (canResolveSubpath) {
-								optimizeDeps.include.push(subpath);
-								if (runtimeKey === "react-dom") optimizeDeps.include.push(`${runtimeKey} > ${subpath}`);
+							if (subpathIncludeEntry) {
+								optimizeDeps.include.push(subpathIncludeEntry);
+								if (runtimeKey === "react-dom" && includeEntry) optimizeDeps.include.push(`${includeEntry} > ${subpath}`);
 							} else optimizeDeps.exclude.push(subpath);
 						}
 					}
@@ -12500,7 +12530,7 @@ function withoutDynamicRemoteTypeHints(options) {
 }
 function loadPluginDts(options) {
 	if (options.dts === false) return [];
-	return [import("./pluginDts-rZMRTCTz.js").then(({ default: pluginDts }) => pluginDts(options))];
+	return [import("./pluginDts-DvTJxjaE.js").then(({ default: pluginDts }) => pluginDts(options))];
 }
 const INJECT_EXTERNAL_RUNTIME_CORE_PLUGIN = "@module-federation/vite/injectExternalRuntimeCorePlugin";
 function isInjectExternalRuntimeCorePlugin(specifier) {

package/lib/{pluginDts-rZMRTCTz.js → pluginDts-DvTJxjaE.js}

@@ -1,5 +1,5 @@
 import { l as isHttpUrl, n as mfError, t as createModuleFederationError, u as normalizePathForImport } from "./logger-D67aJYOe.js";
-import { p as hasPackageDependency, r as watchFileEvents, y as resolveImportPath } from "./dtsConstants-CDuC8Bb7.js";
+import { b as resolveImportPath, m as hasPackageDependency, r as watchFileEvents } from "./dtsConstants-286VtFnC.js";
 import fs from "fs";
 import * as path$1 from "node:path";
 import { normalizeOptions } from "@module-federation/sdk";

package/package.json

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