@module-federation/vite 1.20.8 → 1.20.9

package/lib/index.js

@@ -5378,7 +5378,7 @@ function generateRemotes(id, command, enableSsrInit = false, consumer = "unified
     }`;
 	const realRemoteInit = `__mfRemotePending = __mfStartRemoteLoad().then(__mfAssignRemoteModule);`;
 	const deferredClientInit = `exportModule = __mfCreateDeferredRemoteProxy();`;
-	const eagerLoadClientRemote = shouldEagerLoadClientRemoteInDev(command, enableSsrInit);
+	const eagerLoadClientRemote = id === remoteRegistration?.alias || shouldEagerLoadClientRemoteInDev(command, enableSsrInit);
 	const eagerClientInit = eagerLoadClientRemote ? getEagerDeferredClientInit() : deferredClientInit;
 	const loadedFirstClientInit = eagerLoadClientRemote ? getEagerDeferredClientInit() : deferredClientInit;
 	const environmentSplitInit = (clientInit, serverInit) => consumer === "client" ? clientInit : consumer === "server" ? serverInit : `if (${SERVER_ENV_GUARD}) {
@@ -5515,20 +5515,25 @@ function resolveDevHashEntryFileName$1(fileName) {
 function getBuildInput(config) {
 	return config.build?.rollupOptions?.input ?? config.build?.rolldownOptions?.input;
 }
-function patchHashEntryFileName(output, entryName, fileName) {
-	const originalEntryFileNames = output.entryFileNames;
-	output.entryFileNames = (chunkInfo, ...args) => {
-		if (chunkInfo?.name === entryName) return fileName;
-		if (typeof originalEntryFileNames === "function") return originalEntryFileNames(chunkInfo, ...args);
-		return originalEntryFileNames || "assets/[name]-[hash].js";
-	};
+function patchHashEntryFileName(output, entryName, fileName, defaultFileNames) {
+	for (const option of ["entryFileNames", "chunkFileNames"]) {
+		const originalFileNames = output[option];
+		output[option] = (chunkInfo, ...args) => {
+			if (chunkInfo?.name === entryName) return fileName;
+			if (typeof originalFileNames === "function") return originalFileNames(chunkInfo, ...args);
+			return originalFileNames || defaultFileNames;
+		};
+	}
 }
 function patchHashEntryFileNames(config, entryName, fileName) {
 	if (!fileName?.includes?.("[hash")) return;
+	fileName = fileName.replace(/(\[hash(?::\d+)?\])$/, "$1.js");
 	config.build ??= {};
 	config.build.rollupOptions ??= {};
 	config.build.rolldownOptions ??= {};
-	const patchOutput = (output) => patchHashEntryFileName(output, entryName, fileName);
+	const assetsDir = config.build.assetsDir ?? "assets";
+	const defaultFileNames = `${assetsDir ? `${assetsDir}/` : ""}[name]-[hash].js`;
+	const patchOutput = (output) => patchHashEntryFileName(output, entryName, fileName, defaultFileNames);
 	const patchBundlerOutput = (bundlerOptions) => {
 		const output = bundlerOptions.output;
 		if (Array.isArray(output)) {
@@ -5539,6 +5544,7 @@ function patchHashEntryFileNames(config, entryName, fileName) {
 	};
 	patchBundlerOutput(config.build.rollupOptions);
 	patchBundlerOutput(config.build.rolldownOptions);
+	Object.values(config.environments ?? {}).forEach((environment) => patchHashEntryFileNames(environment, entryName, fileName));
 }
 const addEntry = ({ entryName, entryPath, fileName, inject = "entry", forceClientInjected, skipTransformFor = [], federationOptions }) => {
 	const DEV_HTML_PROXY_PREFIX = "virtual:mf-html-entry-proxy?";
@@ -6099,6 +6105,7 @@ const REACT_REFRESH_PROXY_MODULE = [
 	`const __rt = await import(__target);`,
 	`export const injectIntoGlobalHook = __rt.injectIntoGlobalHook;`,
 	`export const register = __rt.register;`,
+	`export const getRefreshReg = __rt.getRefreshReg;`,
 	`export const createSignatureFunctionForTransform = __rt.createSignatureFunctionForTransform;`,
 	`export const registerExportsForReactRefresh = __rt.registerExportsForReactRefresh;`,
 	`export const validateRefreshBoundaryAndEnqueueUpdate = __rt.validateRefreshBoundaryAndEnqueueUpdate;`,
@@ -7742,12 +7749,18 @@ function pluginProxyRemoteEntry_default({ options, remoteEntryId, virtualExposes
 		return Object.keys(options.remotes).some((name) => source === name || source.startsWith(name + "/"));
 	}
 	function collectImportSources(code) {
-		const sources = /* @__PURE__ */ new Set();
+		const sources = /* @__PURE__ */ new Map();
 		for (const match of code.matchAll(/(?:^|[;\n\r])\s*import\s+(?:[\s\S]*?\s+from\s+)?["']([^"']+)["']|import\(\s*["']([^"']+)["']\s*\)/g)) {
 			const source = match[1] || match[2];
-			if (source) sources.add(source);
+			if (source) {
+				const dynamic = !match[1];
+				sources.set(source, (sources.get(source) ?? true) && dynamic);
+			}
 		}
-		return Array.from(sources).sort();
+		return Array.from(sources, ([source, dynamic]) => ({
+			source,
+			dynamic
+		})).sort((a, b) => a.source.localeCompare(b.source));
 	}
 	function shouldScanResolvedImport(id) {
 		if (!id || id.includes("\0")) return false;
@@ -7764,9 +7777,9 @@ function pluginProxyRemoteEntry_default({ options, remoteEntryId, virtualExposes
 			return [];
 		}
 		const dependencies = /* @__PURE__ */ new Set();
-		for (const source of collectImportSources(code)) {
+		for (const { source, dynamic } of collectImportSources(code)) {
 			if (isRemoteImport(source)) {
-				dependencies.add(source);
+				if (!dynamic) dependencies.add(source);
 				continue;
 			}
 			const resolved = await ctx.resolve(source, id);
@@ -8430,8 +8443,10 @@ function applyRewrites(code, imports, id) {
 				importParts.push(`__mf_remote_pending as ${pendingId}`);
 				let rewrite = `import { ${importParts.join(", ")} } from ${src};`;
 				if (imp.named.length > 0) {
-					const destructParts = imp.named.map((s) => `${s.imported}: ${s.local}`);
-					rewrite += `\nconst { ${destructParts.join(", ")} } = ${nsId};`;
+					const declarations = imp.named.map((s) => `let ${s.local};`).join("\n");
+					const initializers = imp.named.map((s) => `if (${JSON.stringify(s.imported)} in ${nsId}) {\n${s.local} = ${nsId}[${JSON.stringify(s.imported)}];\n}`).join("\n");
+					const assignments = imp.named.map((s) => `${s.local} = ${nsId}[${JSON.stringify(s.imported)}];`).join("\n");
+					rewrite += `\n${declarations}\n${initializers}\n${pendingId}.then(() => {\n${assignments}\n});`;
 				}
 				ms.overwrite(imp.start, imp.end, rewrite);
 			}
@@ -8451,10 +8466,11 @@ function applyRewrites(code, imports, id) {
 				};
 			});
 			const importLine = `import { __moduleExports as ${nsId}, __mf_remote_pending as ${pendingId} } from ${src};`;
-			const varLines = vars.map((v) => `let ${v.tmp} = ${nsId}[${JSON.stringify(v.local)}];`).join("\n");
+			const varLines = vars.map((v) => `let ${v.tmp};`).join("\n");
+			const initializers = vars.map((v) => `if (${JSON.stringify(v.local)} in ${nsId}) {\n${v.tmp} = ${nsId}[${JSON.stringify(v.local)}];\n}`).join("\n");
 			const syncLine = `${pendingId}.then(() => {\n${vars.map((v) => `${v.tmp} = ${nsId}[${JSON.stringify(v.local)}];`).join("\n")}\n});`;
 			const exportLine = `export { ${vars.map((v) => `${v.tmp} as ${v.exported}`).join(", ")} };`;
-			ms.overwrite(imp.start, imp.end, `${importLine}\n${varLines}\n${syncLine}\n${exportLine}`);
+			ms.overwrite(imp.start, imp.end, `${importLine}\n${varLines}\n${initializers}\n${syncLine}\n${exportLine}`);
 			changed = true;
 			break;
 		}
@@ -9422,6 +9438,14 @@ function includeLinkedSharedEntries(optimizeDeps, shared, projectRoot, exposes,
 	]);
 	for (const [packageName, share] of Object.entries(shared ?? {})) {
 		if (share?.shareConfig?.import === false) continue;
+		const configuredImport = share?.shareConfig?.import;
+		if (typeof configuredImport === "string") {
+			const entry = path$1.isAbsolute(configuredImport) ? configuredImport : path$1.resolve(projectRoot, configuredImport);
+			if (existsSync(entry) && !entry.replaceAll("\\", "/").includes("/node_modules/")) {
+				additions.add(entry);
+				continue;
+			}
+		}
 		const installed = getInstalledPackageJson(packageName, { cwd: projectRoot });
 		if (!installed || installed.dir.replaceAll("\\", "/").includes("/node_modules/")) continue;
 		const entry = getInstalledPackageEntry(packageName, { cwd: projectRoot });
@@ -9604,9 +9628,20 @@ function createEarlyVirtualModulesPlugin(options) {
 									if (args.kind === "entry-point") return;
 									if (!args.importer || args.namespace === "mf-shared") return;
 									if (isSharedResolverInternalImporter(args.importer)) return;
-									if (!findSharedKey(args.path, shared) || isAssetLikeImport(args.path)) return;
+									const key = findSharedKey(args.path, shared);
+									if (!key || isAssetLikeImport(args.path)) return;
 									if (getPackageNameFromNodeModulePath(args.importer) === getPackageName(args.path) && !isReactDomSelfReference(args.path, args.importer)) return;
 									addUsedShares(args.path, options);
+									if (args.kind === "import-statement" || args.kind === "dynamic-import") {
+										const shareItem = shared[key];
+										const loadSharePath = getLoadShareModulePath(args.path, isRolldown, options);
+										writeLoadShareModule(args.path, shareItem, _command, isRolldown, options);
+										if (shareItem.shareConfig?.import !== false) writePreBuildLibPath(args.path, shareItem, options);
+										return {
+											path: loadSharePath,
+											external: true
+										};
+									}
 									return {
 										path: args.path,
 										namespace: "mf-shared"
@@ -9663,7 +9698,7 @@ export default __mfShared.default ?? __mfShared;`
 						optimizeDeps.exclude ??= [];
 						const shouldBypassOptimizeDep = isLitShare(key) || !canResolveSharedSubpath(key, root);
 						if (optimizeDeps.include.includes(key)) optimizeDeps.exclude = optimizeDeps.exclude.filter((dep) => dep !== key);
-						else if (shouldBypassOptimizeDep) optimizeDeps.exclude.push(key);
+						else if (shouldBypassOptimizeDep || optimizeDeps.exclude.includes(key)) optimizeDeps.exclude.push(key);
 						else optimizeDeps.include.push(key);
 						for (const subpath of getCommonSharedSubpaths(key)) {
 							const canResolveSubpath = canResolveSharedSubpath(subpath, root);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@module-federation/vite",
-  "version": "1.20.8",
+  "version": "1.20.9",
   "description": "Vite plugin for Module Federation",
   "type": "module",
   "main": "./lib/index.js",
@@ -77,9 +77,9 @@
     "vite": "^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0"
   },
   "dependencies": {
-    "@module-federation/dts-plugin": "2.8.2",
-    "@module-federation/runtime": "2.8.2",
-    "@module-federation/sdk": "2.8.2"
+    "@module-federation/dts-plugin": "2.9.0",
+    "@module-federation/runtime": "2.9.0",
+    "@module-federation/sdk": "2.9.0"
   },
   "devDependencies": {
     "@playwright/test": "1.62.0",
@@ -93,4 +93,4 @@
     "vite": "8.2.0",
     "vitest": "4.1.10"
   }
-}
+}