@module-federation/vite 1.16.10 → 1.16.11

package/lib/index.js

@@ -2221,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;
 }
@@ -2444,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();
 			});
@@ -3349,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
@@ -3699,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;
 				}
@@ -4482,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";
 }
@@ -4679,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;
@@ -4715,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;
@@ -4729,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",
@@ -4739,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",
@@ -4749,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\\");
@@ -4775,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);
 		}
@@ -5180,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__"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@module-federation/vite",
-  "version": "1.16.10",
+  "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"
   }
 }