@module-federation/vite 1.16.9 → 1.16.11

package/lib/index.js

@@ -797,6 +797,19 @@ globalThis[__mfCacheGlobalKey] ||= { share: {}, remote: {} };
 globalThis[__mfCacheGlobalKey].share ||= {};
 globalThis[__mfCacheGlobalKey].remote ||= {};
 const __mfModuleCache = globalThis[__mfCacheGlobalKey];
+for (const __mfShareKey of Object.keys(__mfModuleCache.share)) {
+  if (__mfShareKey.startsWith("default:")) {
+    const __mfLegacyShareKey = __mfShareKey.slice("default:".length);
+    if (__mfModuleCache.share[__mfLegacyShareKey] === undefined) {
+      __mfModuleCache.share[__mfLegacyShareKey] = __mfModuleCache.share[__mfShareKey];
+    }
+  } else if (!__mfShareKey.includes(":")) {
+    const __mfDefaultShareKey = "default:" + __mfShareKey;
+    if (__mfModuleCache.share[__mfDefaultShareKey] === undefined) {
+      __mfModuleCache.share[__mfDefaultShareKey] = __mfModuleCache.share[__mfShareKey];
+    }
+  }
+}
 `;
 }
 function getRuntimeInitPromiseBootstrapCode(enableSsrInit = false) {
@@ -1489,6 +1502,7 @@ function generateLocalSharedImportMap() {
             shareConfig: {
               singleton: ${shareItem.shareConfig.singleton},
               requiredVersion: ${JSON.stringify(shareItem.shareConfig.requiredVersion)},
+              strictVersion: ${shareItem.shareConfig.strictVersion},
               ${shareItem.shareConfig.import === false ? "import: false," : ""}
             }
           }
@@ -1526,6 +1540,7 @@ function generateUsedSharedPreloadConfig() {
             shareConfig: {
               singleton: ${shareItem.shareConfig.singleton},
               requiredVersion: ${JSON.stringify(shareItem.shareConfig.requiredVersion)},
+              strictVersion: ${shareItem.shareConfig.strictVersion},
               ${shareItem.shareConfig.import === false ? "import: false," : ""}
             }
           }`;
@@ -1610,6 +1625,40 @@ const normalizeRuntimeShareCode = `const __mfNormalizeRuntimeShare = (mod) => {
             }
             return current;
           };`;
+const sharedProviderSelectionHelperCode = `const __mfOriginalProviderKey = Symbol("mf.originalSharedProvider");
+          const __mfResolveShareHook = { emit: (params) => params };
+          const __mfCreateProviderSelectionVersions = (versions, strategy) => {
+            if (strategy !== "version-first") return versions;
+            const selectionVersions = {};
+            for (const [version, provider] of Object.entries(versions)) {
+              selectionVersions[version] = Object.assign({}, provider, {
+                loaded: false,
+                loading: undefined,
+                lib: undefined,
+                [__mfOriginalProviderKey]: provider
+              });
+            }
+            return selectionVersions;
+          };
+          const __mfSelectSharedProvider = (versions, pkg, share, strategy) => {
+            if (!versions || !share) return undefined;
+            const scopes = Array.isArray(share.scope) ? share.scope : [share.scope || "default"];
+            const selectionVersions = __mfCreateProviderSelectionVersions(versions, strategy);
+            const shareScopeMap = {};
+            for (const scope of scopes) {
+              shareScopeMap[scope || "default"] = { [pkg]: selectionVersions };
+            }
+            const selected = runtimeShare.getRegisteredShare(
+              shareScopeMap,
+              pkg,
+              { ...share, scope: scopes, strategy },
+              __mfResolveShareHook
+            )?.shared;
+            return selected?.[__mfOriginalProviderKey] || selected;
+          };`;
+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);
@@ -1647,6 +1696,7 @@ const SSR_ONLY_PLUGIN_SPECIFIERS = new Set(["@module-federation/vite/ssrEntryLoa
 const isSsrOnlyPlugin = (importStatement) => [...SSR_ONLY_PLUGIN_SPECIFIERS].some((s) => importStatement.includes(s));
 const getSsrOnlyPluginSpecifier = (importStatement) => [...SSR_ONLY_PLUGIN_SPECIFIERS].find((s) => importStatement.includes(s));
 function generateRemoteEntry(options, virtualExposesId = getVirtualExposesId(options), command = "build") {
+	const needsSharedProviderSelectionHelper = hasImportFalseShared$1(options);
 	const pluginImportNames = options.runtimePlugins.map((p, i) => {
 		if (typeof p === "string") return [
 			`$runtimePlugin_${i}`,
@@ -1669,6 +1719,7 @@ function generateRemoteEntry(options, virtualExposesId = getVirtualExposesId(opt
     globalThis.__VUE_HMR_RUNTIME__ = { createRecord() {}, rerender() {}, reload() {} };
   }
   import {init as runtimeInit, loadRemote} from "@module-federation/runtime";
+  ${needsSharedProviderSelectionHelper ? "import {share as runtimeShare} from \"@module-federation/runtime/helpers\";" : ""}
   ${pluginImportNames.filter((item) => !isSsrOnlyPlugin(item[1])).map((item) => item[1]).join("\n")}
   ${command === "build" ? getRuntimeInitResolveBootstrapCode() : getRuntimeInitBootstrapCode() + "\n  const { initResolve } = globalThis[globalKey];"}
   ${getRuntimeModuleCacheBootstrapCode()}
@@ -1696,6 +1747,7 @@ function generateRemoteEntry(options, virtualExposesId = getVirtualExposesId(opt
       }
     }
   }
+  ${needsSharedProviderSelectionHelper ? sharedProviderSelectionHelperCode : ""}
 
   async function getLocalSharedImportMap() {
     if (!localSharedImportMapPromise) {
@@ -1725,7 +1777,14 @@ function generateRemoteEntry(options, virtualExposesId = getVirtualExposesId(opt
           const scopeShare = scopes?.['${options.shareScope}'];
           if (!scopeShare) continue;
           for (const [pkg, versionMap] of Object.entries(scopeShare)) {
-            for (const [version, provider] of Object.entries(versionMap)) {
+            const usedShare = usedShared?.[pkg];
+            const selectedProvider = usedShare?.shareConfig?.import === false
+              ? __mfSelectSharedProvider(versionMap, pkg, usedShare, '${options.shareStrategy}')
+              : undefined;
+            const providerEntries = usedShare?.shareConfig?.import === false
+              ? Object.entries(versionMap).filter(([, provider]) => provider === selectedProvider)
+              : Object.entries(versionMap);
+            for (const [version, provider] of providerEntries) {
               if (!provider.lib) continue;
               const cacheKey = __mfGetSharedCacheKey(pkg, provider.shareConfig?.singleton, version, ${JSON.stringify(options.shareScope)});
               if (__mfModuleCache.share[cacheKey] !== undefined) continue;
@@ -1733,7 +1792,6 @@ function generateRemoteEntry(options, virtualExposesId = getVirtualExposesId(opt
               const resolved = await Promise.resolve(mod);
               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) {
@@ -1795,7 +1853,7 @@ function generateRemoteEntry(options, virtualExposesId = getVirtualExposesId(opt
       if (share.shareConfig?.import !== false || __mfModuleCache.share[cacheKey] !== undefined) continue;
       ${normalizeRuntimeShareCode}
       const versions = shared?.[pkg];
-      const provider = versions && versions[Object.keys(versions)[0]];
+      const provider = __mfSelectSharedProvider(versions, pkg, share, '${options.shareStrategy}');
       if (!provider) continue;
       const factory = provider.lib || (provider.loading ? await provider.loading : await provider.get?.());
       const mod = typeof factory === "function" ? factory() : factory;
@@ -2163,6 +2221,12 @@ function getFirstHtmlEntryFile(entryFiles) {
 function stripQueryAndHash(file) {
 	return file.split(/[?#]/)[0];
 }
+function resolveDevHashEntryFileName(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 getBuildInput(config) {
 	return config.build?.rollupOptions?.input ?? config.build?.rolldownOptions?.input;
 }
@@ -2386,6 +2450,8 @@ const addEntry = ({ entryName, entryPath, fileName, inject = "entry", forceClien
 					next();
 					return;
 				}
+				const devFileName = resolveDevHashEntryFileName(fileName);
+				if (devFileName !== fileName && req.url?.startsWith((viteConfig.base + devFileName).replace(/^\/?/, "/"))) req.url = req.url.replace(devFileName, fileName);
 				if (req.url && req.url.startsWith((viteConfig.base + fileName).replace(/^\/?/, "/"))) req.url = devEntryPath;
 				next();
 			});
@@ -3291,7 +3357,13 @@ function rewriteSystemProxyConsumers(code, systemProxyInfo) {
 	return nextCode;
 }
 function findRemoteEntryFile(filename, bundle) {
-	for (const [_, fileData] of Object.entries(bundle)) if (filename.replace(/[\[\]]/g, "_").replace(/\.[^/.]+$/, "") === fileData.name || fileData.name === "remoteEntry") return fileData.fileName;
+	const strippedName = filename.replace(/[\[\]]/g, "_").replace(/\.[^/.]+$/, "");
+	let fallback;
+	for (const fileData of Object.values(bundle)) {
+		if (fileData.fileName === filename) return fileData.fileName;
+		if (fallback === void 0 && (strippedName === fileData.name || fileData.name === "remoteEntry")) fallback = fileData.fileName;
+	}
+	return fallback;
 }
 //#endregion
 //#region src/utils/cssModuleHelpers.ts
@@ -3641,13 +3713,13 @@ const Manifest = () => {
 		},
 		configureServer(server) {
 			server.middlewares.use((req, res, next) => {
-				if (!mfManifestName) {
+				const devRemoteEntryFile = resolveDevRemoteEntryFileName(filename);
+				if (devRemoteEntryFile !== filename && Object.keys(mfOptions.exposes).length > 0 && req.url?.startsWith((viteConfig.base + devRemoteEntryFile).replace(/^\/?/, "/"))) {
+					req.url = req.url.replace(devRemoteEntryFile, filename);
 					next();
 					return;
 				}
-				const devRemoteEntryFile = resolveDevRemoteEntryFileName(filename);
-				if (devRemoteEntryFile !== filename && req.url?.startsWith((viteConfig.base + devRemoteEntryFile).replace(/^\/?/, "/"))) {
-					req.url = req.url.replace(devRemoteEntryFile, filename);
+				if (!mfManifestName) {
 					next();
 					return;
 				}
@@ -4424,7 +4496,6 @@ function proxySharedModule(options) {
 //#endregion
 //#region src/plugins/pluginRemoteNamedExports.ts
 const JS_EXTENSIONS_RE = /\.(?:[mc]?[jt]sx?|vue|svelte)(?:\?|$)/;
-const REGEX_FALLBACK_EXTENSIONS_RE = /\.(?:[mc]?[jt]sx?)(?:\?|$)/;
 function isAstNode(value) {
 	return !!value && typeof value === "object" && typeof value.type === "string";
 }
@@ -4621,10 +4692,12 @@ async function collectFromAST(ast, code, isRemoteImport) {
 }
 function collectFromRegex(code, isRemoteImport) {
 	const result = [];
+	const codePositions = createCodePositionMap(code);
 	const importAttributes = String.raw`(?:\s+(?:with|assert)\s+\{[^;]*\})?`;
 	const staticRe = new RegExp(String.raw`^\s*import\s+([\s\S]*?)\s+from\s+(['"])([^'"]+)\2${importAttributes}\s*;?`, "gm");
 	for (const match of code.matchAll(staticRe)) {
 		const [full, specifiersPartRaw, , source] = match;
+		if (!codePositions[match.index]) continue;
 		if (!isRemoteImport(source)) continue;
 		const specifiersPart = specifiersPartRaw.trim();
 		if (/^type\s/.test(specifiersPart)) continue;
@@ -4657,6 +4730,7 @@ function collectFromRegex(code, isRemoteImport) {
 	const reexportRe = new RegExp(String.raw`^\s*export\s+\{([\s\S]*?)\}\s+from\s+(['"])([^'"]+)\2${importAttributes}\s*;?`, "gm");
 	for (const match of code.matchAll(reexportRe)) {
 		const [full, specifiersRaw, , source] = match;
+		if (!codePositions[match.index]) continue;
 		if (!isRemoteImport(source)) continue;
 		const specifiers = parseNamedSpecifiers(specifiersRaw, "export");
 		if (specifiers.length === 0) continue;
@@ -4671,6 +4745,7 @@ function collectFromRegex(code, isRemoteImport) {
 	const exportAllRe = new RegExp(String.raw`^\s*export\s+\*\s+from\s+(['"])([^'"]+)\1${importAttributes}\s*;?`, "gm");
 	for (const match of code.matchAll(exportAllRe)) {
 		const [full, , source] = match;
+		if (!codePositions[match.index]) continue;
 		if (!isRemoteImport(source)) continue;
 		result.push({
 			kind: "export-all",
@@ -4681,6 +4756,7 @@ function collectFromRegex(code, isRemoteImport) {
 	}
 	for (const match of code.matchAll(/import\(\s*(?:\/\*[\s\S]*?\*\/\s*)?(['"])([^'"]+)\1\s*\)/g)) {
 		const [full, , source] = match;
+		if (!codePositions[match.index]) continue;
 		if (!isRemoteImport(source)) continue;
 		result.push({
 			kind: "dynamic",
@@ -4691,6 +4767,50 @@ function collectFromRegex(code, isRemoteImport) {
 	}
 	return result.length > 0 ? result : void 0;
 }
+function createCodePositionMap(code) {
+	const positions = Array(code.length).fill(true);
+	function mask(start, end) {
+		for (let i = start; i < end; i++) positions[i] = false;
+	}
+	for (let i = 0; i < code.length;) {
+		const char = code[i];
+		const next = code[i + 1];
+		if (char === "/" && next === "/") {
+			const start = i;
+			i += 2;
+			while (i < code.length && code[i] !== "\n" && code[i] !== "\r") i++;
+			mask(start, i);
+			continue;
+		}
+		if (char === "/" && next === "*") {
+			const start = i;
+			i += 2;
+			while (i < code.length && !(code[i] === "*" && code[i + 1] === "/")) i++;
+			i = Math.min(code.length, i + 2);
+			mask(start, i);
+			continue;
+		}
+		if (char === "\"" || char === "'" || char === "`") {
+			const quote = char;
+			const start = i++;
+			while (i < code.length) {
+				if (code[i] === "\\") {
+					i += 2;
+					continue;
+				}
+				if (code[i] === quote) {
+					i++;
+					break;
+				}
+				i++;
+			}
+			mask(start, i);
+			continue;
+		}
+		i++;
+	}
+	return positions;
+}
 function pluginRemoteNamedExports(options) {
 	const remoteNames = Object.keys(options.remotes);
 	const isNodeModulesId = (id) => id.includes("/node_modules/") || id.includes("\\node_modules\\");
@@ -4717,7 +4837,6 @@ function pluginRemoteNamedExports(options) {
 				if ((id.includes(".vue") || id.includes(".svelte")) && /^\s*</.test(code)) return;
 				imports = collectFromRegex(code, matchesRemoteImport);
 			}
-			if ((!imports || imports.length === 0) && REGEX_FALLBACK_EXTENSIONS_RE.test(id)) imports = collectFromRegex(code, matchesRemoteImport);
 			if (!imports) return;
 			return applyRewrites(code, imports, id);
 		}
@@ -5122,18 +5241,21 @@ function normalizeVinextRscPreloadHints(code) {
 }
 function ignoreFederationGeneratedFiles(config, options) {
 	config.server ??= {};
-	config.server.watch ??= {};
+	const watch = config.server.watch;
+	if (watch === false || watch === null) return;
+	const watchOptions = watch === true || watch === void 0 ? {} : watch;
+	config.server.watch = watchOptions;
 	const federationIgnore = (file) => shouldIgnoreFile(file, options);
-	const ignored = config.server.watch.ignored;
+	const ignored = watchOptions.ignored;
 	if (!ignored) {
-		config.server.watch.ignored = federationIgnore;
+		watchOptions.ignored = federationIgnore;
 		return;
 	}
 	if (Array.isArray(ignored)) {
 		ignored.push(federationIgnore);
 		return;
 	}
-	config.server.watch.ignored = [ignored, federationIgnore];
+	watchOptions.ignored = [ignored, federationIgnore];
 }
 function isSharedResolverInternalImporter(importer) {
 	return !!importer && (importer.includes("__loadShare__") || importer.includes("__prebuild__"));
@@ -5160,6 +5282,17 @@ function appendResolveAlias(config, alias) {
 		replacement
 	})), alias];
 }
+function hasImportFalseShared(options) {
+	return Object.values(options.shared ?? {}).some((share) => share?.shareConfig?.import === false);
+}
+function getRuntimeHelpersImplementation(runtimeImplementation) {
+	const indexEntryMatch = runtimeImplementation.match(/^(.*[\\/])index(\.[cm]?js)$/);
+	if (indexEntryMatch) return `${indexEntryMatch[1]}helpers${indexEntryMatch[2]}`;
+	const extension = path$1.extname(runtimeImplementation);
+	if (extension) return path$1.join(path$1.dirname(runtimeImplementation), `helpers${extension}`);
+	if (path$1.isAbsolute(runtimeImplementation) || runtimeImplementation.startsWith(".")) return path$1.join(runtimeImplementation, "helpers");
+	return `${runtimeImplementation.replace(/\/$/, "")}/helpers`;
+}
 const UNSAFE_JS_SOURCE_CHAR_MAP = {
 	"<": "\\u003C",
 	">": "\\u003E",
@@ -5687,8 +5820,13 @@ function federation(mfUserOptions) {
 			config(config, { command: _command }) {
 				const isRolldown = getIsRolldown(this);
 				isSsrBuild = _command === "build" && config.build?.ssr === true;
+				const needsSharedProviderSelectionHelper = hasImportFalseShared(options);
+				if (needsSharedProviderSelectionHelper) appendResolveAlias(config, {
+					find: /^@module-federation\/runtime\/helpers$/,
+					replacement: getRuntimeHelpersImplementation(options.implementation)
+				});
 				appendResolveAlias(config, {
-					find: "@module-federation/runtime",
+					find: /^@module-federation\/runtime$/,
 					replacement: options.implementation
 				});
 				config.build ||= {};
@@ -5697,6 +5835,7 @@ function federation(mfUserOptions) {
 				config.optimizeDeps ||= {};
 				config.optimizeDeps.include ||= [];
 				config.optimizeDeps.include.push("@module-federation/runtime");
+				if (needsSharedProviderSelectionHelper) config.optimizeDeps.include.push("@module-federation/runtime/helpers");
 				options.runtimePlugins.forEach((p) => {
 					const pluginPath = typeof p === "string" ? p : p[0];
 					if (SSR_ONLY_PLUGINS.has(pluginPath)) return;

package/lib/utils/ssrEntryLoader.js

@@ -89,6 +89,22 @@ const _crypto = () => nodeImport("crypto");
 const _module = () => nodeImport("module");
 const ssrEntryCache = /* @__PURE__ */ new Map();
 const manifestFetchCache = /* @__PURE__ */ new Map();
+var SsrEntryHttpError = class extends Error {
+	constructor(url, status, statusText, bodyPreview) {
+		super(`Failed to fetch SSR module "${url}": ${status} ${statusText}` + (bodyPreview ? `\npreview: ${bodyPreview}` : ""));
+		this.url = url;
+		this.status = status;
+		this.statusText = statusText;
+		this.bodyPreview = bodyPreview;
+		this.name = "SsrEntryHttpError";
+	}
+};
+function getBodyPreview(body) {
+	return body.slice(0, 240).replace(/\s+/g, " ").trim();
+}
+function isSsrEntryHttpError(error) {
+	return error instanceof SsrEntryHttpError;
+}
 async function fetchManifest(manifestUrl) {
 	try {
 		const res = await fetch(manifestUrl);
@@ -253,6 +269,9 @@ function transformSsrCode(code, base, sharedPkgMap) {
 	code = code.replace(/\b([A-Za-z_$][\w$]*)\s*\(\s*\(\s*\)\s*=>\s*import\(([^)]*)\)\s*,\s*\[\]\s*\)/g, "import($2)");
 	return code;
 }
+function isVitePreloadHelperSpecifier(specifier) {
+	return specifier.includes("preload-helper");
+}
 /**
 * Fetch an HTTP ESM module, transform it, write it to a temp .js file and
 * return the file path. Recursively does the same for HTTP transitive imports
@@ -262,12 +281,14 @@ async function fetchEsmToTempFile(url, tmpDir, visited, sharedPkgMap) {
 	if (visited.has(url)) return visited.get(url);
 	if (tempFileCache.has(url)) return tempFileCache.get(url);
 	const promise = (async () => {
-		let code = await (await fetch(url)).text();
+		const res = await fetch(url);
+		let code = await res.text();
+		if (!res.ok) throw new SsrEntryHttpError(url, res.status, res.statusText, getBodyPreview(code));
 		const base = url.replace(/\/[^/]*$/, "/");
 		const relImports = [];
 		const relRegex = /(?:from|export\s*\*\s*from|import\s*(?:\(|\s))\s*["'`]([^"'`\s]+)["'`]/g;
 		let m;
-		while ((m = relRegex.exec(code)) !== null) if (m[1].startsWith("./") || m[1].startsWith("../")) relImports.push(new URL(m[1], base).href);
+		while ((m = relRegex.exec(code)) !== null) if ((m[1].startsWith("./") || m[1].startsWith("../")) && !isVitePreloadHelperSpecifier(m[1])) relImports.push(new URL(m[1], base).href);
 		const subMap = /* @__PURE__ */ new Map();
 		await Promise.all([...new Set(relImports)].filter((u) => u.startsWith("http://") || u.startsWith("https://")).map(async (u) => {
 			const tmpPath = await fetchEsmToTempFile(u, tmpDir, visited, sharedPkgMap);
@@ -322,7 +343,8 @@ async function loadSSRRemoteEntry(ssrEntry, resolvedShared = {}) {
 		const sharedPkgMap = new Map(Object.entries(resolvedShared));
 		try {
 			return await importTempModule(await fetchEsmToTempFile(url, cacheDir, /* @__PURE__ */ new Map(), sharedPkgMap));
-		} catch {
+		} catch (error) {
+			if (isSsrEntryHttpError(error)) throw error;
 			return null;
 		}
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@module-federation/vite",
-  "version": "1.16.9",
+  "version": "1.16.11",
   "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.5.1",
-    "@module-federation/runtime": "2.5.1",
-    "@module-federation/sdk": "2.5.1"
+    "@module-federation/dts-plugin": "2.6.0",
+    "@module-federation/runtime": "2.6.0",
+    "@module-federation/sdk": "2.6.0"
   },
   "devDependencies": {
     "@playwright/test": "1.58.2",
@@ -83,7 +83,7 @@
     "rollup": "4.47.1",
     "tsdown": "0.21.0",
     "typescript": "5.9.3",
-    "vite": "8.0.10",
+    "vite": "8.1.0",
     "vitest": "4.0.18"
   }
 }