@module-federation/vite 1.13.6 → 1.13.7

package/README.md

@@ -19,6 +19,7 @@ Examples live in [`gioboa/module-federation-vite-examples`](https://github.com/g
 | [Angular](https://github.com/gioboa/module-federation-vite-examples/tree/main/angular)   | `angular-host`  | `angular-remote`  | Angular                     |
 | [Lit](https://github.com/gioboa/module-federation-vite-examples/tree/main/lit)           | `lit-host`      | `lit-remote`      | Lit                         |
 | [Nuxt](https://github.com/gioboa/module-federation-vite-examples/tree/main/nuxt)         | `nuxt-host`     | `nuxt-remote`     | Nuxt 4                      |
+| [Preact](https://github.com/gioboa/module-federation-vite-examples/tree/main/preact)     | `preact-host`   | `preact-remote`   | Preact 10                   |
 | [React](https://github.com/gioboa/module-federation-vite-examples/tree/main/react)       | `react-host`    | `react-remote`    | React 19                    |
 | [Solid](https://github.com/gioboa/module-federation-vite-examples/tree/main/solid)       | `solid-host`    | `solid-remote`    | Solid                       |
 | [Svelte](https://github.com/gioboa/module-federation-vite-examples/tree/main/svelte)     | `svelte-host`   | `svelte-remote`   | Svelte 5                    |

package/lib/index.cjs

@@ -28,6 +28,7 @@ fs = __toESM(fs);
 let module$1 = require("module");
 let pathe = require("pathe");
 pathe = __toESM(pathe);
+let vite = require("vite");
 let magic_string = require("magic-string");
 magic_string = __toESM(magic_string);
 let _rollup_pluginutils = require("@rollup/pluginutils");
@@ -227,17 +228,21 @@ const addEntry = ({ entryName, entryPath, fileName, inject = "entry" }) => {
 				next();
 			});
 		},
-		transformIndexHtml(c) {
-			if (!injectHtml()) return;
-			clientInjected = true;
-			const html = rewriteEntryScripts(c, (originalSrc) => {
-				const query = new URLSearchParams({
-					init: sanitizeDevEntryPath(devEntryPath),
-					entry: originalSrc
-				}).toString();
-				return `${viteConfig.base}@id/${DEV_HTML_PROXY_PREFIX}${query}`;
-			});
-			return html === c ? injectEntryScript(c, devEntryPath) : html;
+		transformIndexHtml: {
+			order: "pre",
+			handler(c) {
+				if (!injectHtml()) return;
+				clientInjected = true;
+				const base = viteConfig.base.replace(/\/$/, "");
+				const stripBase = (p) => base && p.startsWith(base) ? p.slice(base.length) : p;
+				const html = rewriteEntryScripts(c, (originalSrc) => {
+					return `/@id/${DEV_HTML_PROXY_PREFIX}${new URLSearchParams({
+						init: sanitizeDevEntryPath(stripBase(devEntryPath)),
+						entry: originalSrc
+					}).toString()}`;
+				});
+				return html === c ? injectEntryScript(c, stripBase(devEntryPath)) : html;
+			}
 		},
 		resolveId(id) {
 			if (id.startsWith(DEV_HTML_PROXY_PREFIX)) return id;
@@ -1236,6 +1241,10 @@ function escapeGeneratedStringLiteral(value) {
 function isValidJsIdentifier(name) {
 	return /^[$_\p{ID_Start}][$_\u200C\u200D\p{ID_Continue}]*$/u.test(name);
 }
+function isValidEsmExportName(name) {
+	return !!name && name !== "default" && name !== "__esModule" && isValidJsIdentifier(name);
+}
+const JS_IDENTIFIER_PATTERN = `[\$_\\p{ID_Start}][\$_\\u200C\\u200D\\p{ID_Continue}]*`;
 const localRequire = (0, module$1.createRequire)(require("url").pathToFileURL(__filename).href);
 function resolvePackageEntryFromProjectRoot(pkg) {
 	try {
@@ -1313,21 +1322,51 @@ function getPackageEsmEntryPath(pkg) {
 	}
 }
 function getEsmNamedExports(pkg) {
+	let source = "";
 	try {
 		const entryPath = getPackageEsmEntryPath(pkg);
 		if (!entryPath) return [];
 		const { initSync, parse } = localRequire("es-module-lexer");
 		initSync();
-		const [, exports] = parse((0, fs.readFileSync)(entryPath, "utf-8"), entryPath);
-		return exports.map((item) => item.n).filter((name) => !!name && name !== "default" && name !== "__esModule" && isValidJsIdentifier(name));
+		source = (0, fs.readFileSync)(entryPath, "utf-8");
+		const [, exports] = parse(source, entryPath);
+		const names = exports.map((item) => item.n).filter((name) => isValidEsmExportName(name));
+		const regexNames = getNamedExportsViaRegex(source);
+		const filteredNames = names.filter((name) => name !== "type" || regexNames.includes(name));
+		if (filteredNames.length > 0) return [...new Set([...filteredNames, ...regexNames])];
+		return regexNames;
 	} catch {
-		return [];
+		return source ? getNamedExportsViaRegex(source) : [];
 	}
 }
+function getNamedExportsViaRegex(source) {
+	const names = /* @__PURE__ */ new Set();
+	const declRegex = new RegExp(`export\\s+(?:async\\s+)?(?:function(?:\\*\\s*|\\s+\\*?\\s*)|const\\s+|let\\s+|var\\s+|class\\s+)(${JS_IDENTIFIER_PATTERN})`, "gu");
+	let match;
+	while ((match = declRegex.exec(source)) !== null) {
+		const name = match[1];
+		if (isValidEsmExportName(name)) names.add(name);
+	}
+	const listRegex = /export\s*\{([^}]+)\}/g;
+	const typeOnlySpecifierRegex = new RegExp(`^type\\s+${JS_IDENTIFIER_PATTERN}(?:\\s+as\\s+${JS_IDENTIFIER_PATTERN})?$`, "u");
+	const exportSpecifierRegex = new RegExp(`(?:\\S+\\s+as\\s+)?(${JS_IDENTIFIER_PATTERN})$`, "u");
+	while ((match = listRegex.exec(source)) !== null) {
+		const specifiers = match[1].split(",");
+		for (const specifier of specifiers) {
+			const trimmed = specifier.trim();
+			if (typeOnlySpecifierRegex.test(trimmed)) continue;
+			const asMatch = trimmed.match(exportSpecifierRegex);
+			if (!asMatch) continue;
+			const name = asMatch[1];
+			if (isValidEsmExportName(name)) names.add(name);
+		}
+	}
+	return [...names];
+}
 function getPackageNamedExports(pkg) {
 	try {
 		const mod = (0, module$1.createRequire)(new URL(`file://${pathe.default.join(getPackageDetectionCwd(), "package.json")}`))(pkg);
-		return Object.keys(mod).filter((k) => k !== "default" && k !== "__esModule" && isValidJsIdentifier(k));
+		return Object.keys(mod).filter((k) => isValidEsmExportName(k));
 	} catch {
 		return getEsmNamedExports(pkg);
 	}
@@ -1335,11 +1374,14 @@ function getPackageNamedExports(pkg) {
 function getLocalProviderImportPath(pkg) {
 	try {
 		const resolved = (0, module$1.createRequire)(new URL(`file://${pathe.default.join(getPackageDetectionCwd(), "package.json")}`)).resolve(pkg);
-		return resolved.includes("/node_modules/") || resolved.includes("\\node_modules\\") ? void 0 : resolved;
+		return isWorkspaceFilePath(resolved) ? resolved : void 0;
 	} catch {
 		return;
 	}
 }
+function isWorkspaceFilePath(resolved) {
+	return !!resolved && !resolved.includes("/node_modules/") && !resolved.includes("\\node_modules\\");
+}
 function tryResolveImportFromPackageRoot(pkg, root) {
 	try {
 		return (0, module$1.createRequire)(new URL(`file://${pathe.default.join(root, "package.json")}`)).resolve(pkg);
@@ -1422,7 +1464,9 @@ function writeLoadShareModule(pkg, shareItem, command, isRolldown) {
 	const concreteSharedImportSource = getConcreteSharedImportSource(pkg, shareItem);
 	const sharedImportSource = concreteSharedImportSource || getPreBuildLibImportId(pkg);
 	const devImportSource = concreteSharedImportSource || pkg;
-	const providerImportId = getLocalProviderImportPath(pkg) || concreteSharedImportSource || sharedImportSource;
+	const localProviderPath = getLocalProviderImportPath(pkg);
+	const isWorkspacePackage = isWorkspaceFilePath(localProviderPath) || isWorkspaceFilePath(concreteSharedImportSource);
+	const providerImportId = localProviderPath || concreteSharedImportSource || sharedImportSource;
 	const namedExports = getPackageNamedExports(pkg);
 	let exportLine;
 	if (namedExports.length > 0) {
@@ -1430,9 +1474,11 @@ function writeLoadShareModule(pkg, shareItem, command, isRolldown) {
 		const namedExportLine = `export { ${namedExports.map((name, i) => `__mf_${i} as ${name}`).join(", ")} };`;
 		exportLine = useESM ? `export default exportModule.default ?? exportModule;\n    ${destructure}\n    ${namedExportLine}` : `module.exports = exportModule;\n    ${destructure}\n    Object.assign(module.exports, { ${namedExports.map((name, i) => `"${name}": __mf_${i}`).join(", ")} });`;
 	} else exportLine = useESM ? `export default exportModule.default ?? exportModule\n    export * from ${escapeGeneratedStringLiteral(sharedImportSource)}` : "module.exports = exportModule";
+	const prebuildImportLine = isWorkspacePackage && command !== "build" ? "" : `import ${escapeGeneratedStringLiteral(sharedImportSource)};`;
+	const devDynamicImportLine = isWorkspacePackage ? "" : command !== "build" ? `;() => import(${escapeGeneratedStringLiteral(devImportSource)}).catch(() => {});` : "";
 	loadShareCacheMap[pkg].writeSync(`
-    import ${escapeGeneratedStringLiteral(sharedImportSource)};
-    ${command !== "build" ? `;() => import(${escapeGeneratedStringLiteral(devImportSource)}).catch(() => {});` : ""}
+    ${prebuildImportLine}
+    ${devDynamicImportLine}
     ${importLine}
     ${useSsrProviderFallback ? `const providerModulePromise = typeof window === "undefined"
       ? import(${escapeGeneratedStringLiteral(providerImportId)})
@@ -2991,6 +3037,7 @@ function federation(mfUserOptions) {
 	const remoteEntryId = getRemoteEntryId(options);
 	const virtualExposesId = getVirtualExposesId(options);
 	let command;
+	let depsDir = "/node_modules/.vite/deps/";
 	return [
 		createEarlyVirtualModulesPlugin(options),
 		...isVinext ? [{
@@ -3018,6 +3065,11 @@ function federation(mfUserOptions) {
 			},
 			configResolved(config) {
 				VirtualModule.setRoot(config.root);
+				const cacheDir = config.cacheDir;
+				if (cacheDir) {
+					const resolved = pathe.default.isAbsolute(cacheDir) ? cacheDir : pathe.default.resolve(config.root, cacheDir);
+					depsDir = (0, vite.normalizePath)(pathe.default.join(resolved, "deps")) + "/";
+				} else depsDir = (0, vite.normalizePath)(pathe.default.join(config.root, "node_modules", ".vite", "deps")) + "/";
 				VirtualModule.ensureVirtualPackageExists();
 				initVirtualModules(command, remoteEntryId);
 			}
@@ -3282,7 +3334,7 @@ function federation(mfUserOptions) {
 			apply: "serve",
 			enforce: "post",
 			transform(code, id) {
-				if (!id.includes(".vite/deps/")) return;
+				if (!(0, vite.normalizePath)(id).split("?")[0].startsWith(depsDir)) return;
 				const initPattern = /\b(init_\w+__loadShare__\w+)\b/g;
 				const initFns = /* @__PURE__ */ new Set();
 				let match;

package/lib/index.d.mts

@@ -1,5 +1,5 @@
-import { sharePlugin } from "@module-federation/sdk";
 import { Plugin } from "vite";
+import { sharePlugin } from "@module-federation/sdk";
 import { ShareStrategy } from "@module-federation/runtime/types";
 
 //#region src/utils/normalizeModuleFederationOptions.d.ts

package/lib/index.mjs

@@ -5,6 +5,7 @@ import { existsSync, mkdirSync, readFileSync, writeFile, writeFileSync } from "f
 import { createRequire as createRequire$1 } from "module";
 import * as path$1 from "pathe";
 import path, { basename, dirname, join, parse, resolve } from "pathe";
+import { normalizePath } from "vite";
 import MagicString from "magic-string";
 import { createFilter } from "@rollup/pluginutils";
 import { normalizeOptions } from "@module-federation/sdk";
@@ -205,17 +206,21 @@ const addEntry = ({ entryName, entryPath, fileName, inject = "entry" }) => {
 				next();
 			});
 		},
-		transformIndexHtml(c) {
-			if (!injectHtml()) return;
-			clientInjected = true;
-			const html = rewriteEntryScripts(c, (originalSrc) => {
-				const query = new URLSearchParams({
-					init: sanitizeDevEntryPath(devEntryPath),
-					entry: originalSrc
-				}).toString();
-				return `${viteConfig.base}@id/${DEV_HTML_PROXY_PREFIX}${query}`;
-			});
-			return html === c ? injectEntryScript(c, devEntryPath) : html;
+		transformIndexHtml: {
+			order: "pre",
+			handler(c) {
+				if (!injectHtml()) return;
+				clientInjected = true;
+				const base = viteConfig.base.replace(/\/$/, "");
+				const stripBase = (p) => base && p.startsWith(base) ? p.slice(base.length) : p;
+				const html = rewriteEntryScripts(c, (originalSrc) => {
+					return `/@id/${DEV_HTML_PROXY_PREFIX}${new URLSearchParams({
+						init: sanitizeDevEntryPath(stripBase(devEntryPath)),
+						entry: originalSrc
+					}).toString()}`;
+				});
+				return html === c ? injectEntryScript(c, stripBase(devEntryPath)) : html;
+			}
 		},
 		resolveId(id) {
 			if (id.startsWith(DEV_HTML_PROXY_PREFIX)) return id;
@@ -1213,6 +1218,10 @@ function escapeGeneratedStringLiteral(value) {
 function isValidJsIdentifier(name) {
 	return /^[$_\p{ID_Start}][$_\u200C\u200D\p{ID_Continue}]*$/u.test(name);
 }
+function isValidEsmExportName(name) {
+	return !!name && name !== "default" && name !== "__esModule" && isValidJsIdentifier(name);
+}
+const JS_IDENTIFIER_PATTERN = `[\$_\\p{ID_Start}][\$_\\u200C\\u200D\\p{ID_Continue}]*`;
 const localRequire = createRequire$1(import.meta.url);
 function resolvePackageEntryFromProjectRoot(pkg) {
 	try {
@@ -1290,21 +1299,51 @@ function getPackageEsmEntryPath(pkg) {
 	}
 }
 function getEsmNamedExports(pkg) {
+	let source = "";
 	try {
 		const entryPath = getPackageEsmEntryPath(pkg);
 		if (!entryPath) return [];
 		const { initSync, parse } = localRequire("es-module-lexer");
 		initSync();
-		const [, exports] = parse(readFileSync(entryPath, "utf-8"), entryPath);
-		return exports.map((item) => item.n).filter((name) => !!name && name !== "default" && name !== "__esModule" && isValidJsIdentifier(name));
+		source = readFileSync(entryPath, "utf-8");
+		const [, exports] = parse(source, entryPath);
+		const names = exports.map((item) => item.n).filter((name) => isValidEsmExportName(name));
+		const regexNames = getNamedExportsViaRegex(source);
+		const filteredNames = names.filter((name) => name !== "type" || regexNames.includes(name));
+		if (filteredNames.length > 0) return [...new Set([...filteredNames, ...regexNames])];
+		return regexNames;
 	} catch {
-		return [];
+		return source ? getNamedExportsViaRegex(source) : [];
 	}
 }
+function getNamedExportsViaRegex(source) {
+	const names = /* @__PURE__ */ new Set();
+	const declRegex = new RegExp(`export\\s+(?:async\\s+)?(?:function(?:\\*\\s*|\\s+\\*?\\s*)|const\\s+|let\\s+|var\\s+|class\\s+)(${JS_IDENTIFIER_PATTERN})`, "gu");
+	let match;
+	while ((match = declRegex.exec(source)) !== null) {
+		const name = match[1];
+		if (isValidEsmExportName(name)) names.add(name);
+	}
+	const listRegex = /export\s*\{([^}]+)\}/g;
+	const typeOnlySpecifierRegex = new RegExp(`^type\\s+${JS_IDENTIFIER_PATTERN}(?:\\s+as\\s+${JS_IDENTIFIER_PATTERN})?$`, "u");
+	const exportSpecifierRegex = new RegExp(`(?:\\S+\\s+as\\s+)?(${JS_IDENTIFIER_PATTERN})$`, "u");
+	while ((match = listRegex.exec(source)) !== null) {
+		const specifiers = match[1].split(",");
+		for (const specifier of specifiers) {
+			const trimmed = specifier.trim();
+			if (typeOnlySpecifierRegex.test(trimmed)) continue;
+			const asMatch = trimmed.match(exportSpecifierRegex);
+			if (!asMatch) continue;
+			const name = asMatch[1];
+			if (isValidEsmExportName(name)) names.add(name);
+		}
+	}
+	return [...names];
+}
 function getPackageNamedExports(pkg) {
 	try {
 		const mod = createRequire$1(new URL(`file://${path.join(getPackageDetectionCwd(), "package.json")}`))(pkg);
-		return Object.keys(mod).filter((k) => k !== "default" && k !== "__esModule" && isValidJsIdentifier(k));
+		return Object.keys(mod).filter((k) => isValidEsmExportName(k));
 	} catch {
 		return getEsmNamedExports(pkg);
 	}
@@ -1312,11 +1351,14 @@ function getPackageNamedExports(pkg) {
 function getLocalProviderImportPath(pkg) {
 	try {
 		const resolved = createRequire$1(new URL(`file://${path.join(getPackageDetectionCwd(), "package.json")}`)).resolve(pkg);
-		return resolved.includes("/node_modules/") || resolved.includes("\\node_modules\\") ? void 0 : resolved;
+		return isWorkspaceFilePath(resolved) ? resolved : void 0;
 	} catch {
 		return;
 	}
 }
+function isWorkspaceFilePath(resolved) {
+	return !!resolved && !resolved.includes("/node_modules/") && !resolved.includes("\\node_modules\\");
+}
 function tryResolveImportFromPackageRoot(pkg, root) {
 	try {
 		return createRequire$1(new URL(`file://${path.join(root, "package.json")}`)).resolve(pkg);
@@ -1399,7 +1441,9 @@ function writeLoadShareModule(pkg, shareItem, command, isRolldown) {
 	const concreteSharedImportSource = getConcreteSharedImportSource(pkg, shareItem);
 	const sharedImportSource = concreteSharedImportSource || getPreBuildLibImportId(pkg);
 	const devImportSource = concreteSharedImportSource || pkg;
-	const providerImportId = getLocalProviderImportPath(pkg) || concreteSharedImportSource || sharedImportSource;
+	const localProviderPath = getLocalProviderImportPath(pkg);
+	const isWorkspacePackage = isWorkspaceFilePath(localProviderPath) || isWorkspaceFilePath(concreteSharedImportSource);
+	const providerImportId = localProviderPath || concreteSharedImportSource || sharedImportSource;
 	const namedExports = getPackageNamedExports(pkg);
 	let exportLine;
 	if (namedExports.length > 0) {
@@ -1407,9 +1451,11 @@ function writeLoadShareModule(pkg, shareItem, command, isRolldown) {
 		const namedExportLine = `export { ${namedExports.map((name, i) => `__mf_${i} as ${name}`).join(", ")} };`;
 		exportLine = useESM ? `export default exportModule.default ?? exportModule;\n    ${destructure}\n    ${namedExportLine}` : `module.exports = exportModule;\n    ${destructure}\n    Object.assign(module.exports, { ${namedExports.map((name, i) => `"${name}": __mf_${i}`).join(", ")} });`;
 	} else exportLine = useESM ? `export default exportModule.default ?? exportModule\n    export * from ${escapeGeneratedStringLiteral(sharedImportSource)}` : "module.exports = exportModule";
+	const prebuildImportLine = isWorkspacePackage && command !== "build" ? "" : `import ${escapeGeneratedStringLiteral(sharedImportSource)};`;
+	const devDynamicImportLine = isWorkspacePackage ? "" : command !== "build" ? `;() => import(${escapeGeneratedStringLiteral(devImportSource)}).catch(() => {});` : "";
 	loadShareCacheMap[pkg].writeSync(`
-    import ${escapeGeneratedStringLiteral(sharedImportSource)};
-    ${command !== "build" ? `;() => import(${escapeGeneratedStringLiteral(devImportSource)}).catch(() => {});` : ""}
+    ${prebuildImportLine}
+    ${devDynamicImportLine}
     ${importLine}
     ${useSsrProviderFallback ? `const providerModulePromise = typeof window === "undefined"
       ? import(${escapeGeneratedStringLiteral(providerImportId)})
@@ -2968,6 +3014,7 @@ function federation(mfUserOptions) {
 	const remoteEntryId = getRemoteEntryId(options);
 	const virtualExposesId = getVirtualExposesId(options);
 	let command;
+	let depsDir = "/node_modules/.vite/deps/";
 	return [
 		createEarlyVirtualModulesPlugin(options),
 		...isVinext ? [{
@@ -2995,6 +3042,11 @@ function federation(mfUserOptions) {
 			},
 			configResolved(config) {
 				VirtualModule.setRoot(config.root);
+				const cacheDir = config.cacheDir;
+				if (cacheDir) {
+					const resolved = path.isAbsolute(cacheDir) ? cacheDir : path.resolve(config.root, cacheDir);
+					depsDir = normalizePath(path.join(resolved, "deps")) + "/";
+				} else depsDir = normalizePath(path.join(config.root, "node_modules", ".vite", "deps")) + "/";
 				VirtualModule.ensureVirtualPackageExists();
 				initVirtualModules(command, remoteEntryId);
 			}
@@ -3259,7 +3311,7 @@ function federation(mfUserOptions) {
 			apply: "serve",
 			enforce: "post",
 			transform(code, id) {
-				if (!id.includes(".vite/deps/")) return;
+				if (!normalizePath(id).split("?")[0].startsWith(depsDir)) return;
 				const initPattern = /\b(init_\w+__loadShare__\w+)\b/g;
 				const initFns = /* @__PURE__ */ new Set();
 				let match;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@module-federation/vite",
-  "version": "1.13.6",
+  "version": "1.13.7",
   "description": "Vite plugin for Module Federation",
   "type": "module",
   "main": "./lib/index.cjs",
@@ -70,9 +70,9 @@
     "vite": "^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0"
   },
   "dependencies": {
-    "@module-federation/dts-plugin": "2.3.0",
-    "@module-federation/runtime": "2.3.0",
-    "@module-federation/sdk": "2.3.0",
+    "@module-federation/dts-plugin": "2.3.1",
+    "@module-federation/runtime": "2.3.1",
+    "@module-federation/sdk": "2.3.1",
     "@rollup/pluginutils": "^5.3.0",
     "defu": "^6.1.4",
     "es-module-lexer": "^2.0.0",