@module-federation/vite 1.18.0 → 1.18.1

package/lib/index.js

@@ -2184,7 +2184,14 @@ const WORKSPACE_SINGLETON_SSR_LOCAL_SHARE = "__mfNormalizeShareModule(__mfLocalS
 function prependWorkspaceSingletonSsrImport(code) {
 	if (!code.includes("if (import.meta.env.SSR)")) return code;
 	if (!code.includes(WORKSPACE_SINGLETON_SSR_LOCAL_SHARE)) return code;
-	if (code.includes("import * as __mfLocalShare")) return code;
+	const localShareImport = /^[ \t]*import\s+\*\s+as\s+__mfLocalShare\s+from\s+(['"])(.+?)\1\s*;?[ \t]*\r?\n?/gm;
+	let hasLocalShareImport = false;
+	code = code.replace(localShareImport, (statement) => {
+		if (hasLocalShareImport) return "";
+		hasLocalShareImport = true;
+		return statement;
+	});
+	if (hasLocalShareImport) return code;
 	const importMatch = code.match(/initPromise\.then\(\(\)\s*=>\s*\{[\s\S]*?\breturn import\((["'])(.+?)\1\)\.then\(\(mod\)\s*=>\s*\{[\s\S]*?__mfApplyLazyShareExports/) ?? code.match(/initPromise\.then\(\(\)\s*=>\s*\n\s*import\((["'])(.+?)\1\)\.then\(\(mod\)\s*=>\s*\{[\s\S]*?__mfApplyLazyShareExports/) ?? code.match(/import\((["'])(.+?)\1\)/);
 	if (!importMatch) return code;
 	const quote = importMatch[1];
@@ -2347,7 +2354,7 @@ function writeLoadShareModule(pkg, shareItem, command, _isRolldown) {
 		initBlock = `exportModule = __mfNormalizeShareModule(__mfLocalShare);
       __mfWriteSharedCache(__mfModuleCache.share, ${cacheDescriptor}, exportModule, ${cacheOwner});`;
 	}
-	const prebuildImportLine = usesDeferredSingletonFallback || usesDeferredTreeShakingFallback ? servesRemoteSingletonFallback || usesDeferredSingletonFallback && command !== "build" && (isWorkspaceSingleton || isWorkspacePackage) ? `import * as __mfLocalShare from ${escapeGeneratedStringLiteral(lazyLocalFallbackSource)};` : "" : `import * as __mfLocalShare from ${escapeGeneratedStringLiteral(detectedNamedExports === void 0 ? coherentLocalSource : skipServePrebuildWarmup ? devImportSource : sharedImportSource)};`;
+	const prebuildImportLine = usesEagerWorkspaceFallback || usesEntryInjectedRemoteFallback ? "" : usesDeferredSingletonFallback || usesDeferredTreeShakingFallback ? servesRemoteSingletonFallback || usesDeferredSingletonFallback && command !== "build" && (isWorkspaceSingleton || isWorkspacePackage) ? `import * as __mfLocalShare from ${escapeGeneratedStringLiteral(lazyLocalFallbackSource)};` : "" : `import * as __mfLocalShare from ${escapeGeneratedStringLiteral(detectedNamedExports === void 0 ? coherentLocalSource : skipServePrebuildWarmup ? devImportSource : sharedImportSource)};`;
 	const devDynamicImportLine = isWorkspacePackage ? "" : usesDeferredSingletonFallback || usesDeferredTreeShakingFallback ? "" : command !== "build" && !skipServePrebuildWarmup ? `;() => import(${escapeGeneratedStringLiteral(devImportSource)}).catch(() => {});` : "";
 	const moduleBody = usesDeferredSingletonFallback || usesDeferredTreeShakingFallback ? `
     ${prebuildImportLine}
@@ -7025,11 +7032,27 @@ function pluginRemoteNamedExports(options) {
 //#endregion
 //#region src/plugins/pluginSSRRemoteEntry.ts
 const MAX_RUNNER_BODY_BYTES = 1024 * 1024;
+const MAX_RUNNER_START_OFFSET = 1024 * 1024;
 const ALLOWED_RUNNER_INVOKE_NAMES = new Set(["fetchModule", "getBuiltins"]);
 const VITE_FS_PREFIX = "/@fs/";
 function isPlainObject(value) {
 	return !!value && typeof value === "object" && !Array.isArray(value);
 }
+function isSafeRunnerFetchModuleOptions(value) {
+	if (!isPlainObject(value)) return false;
+	const allowedKeys = new Set([
+		"cached",
+		"startOffset",
+		"inlineSourceMap"
+	]);
+	for (const [key, option] of Object.entries(value)) {
+		if (!allowedKeys.has(key)) return false;
+		if (key === "startOffset") {
+			if (typeof option !== "number" || !Number.isSafeInteger(option) || option < 0 || option > MAX_RUNNER_START_OFFSET) return false;
+		} else if (typeof option !== "boolean") return false;
+	}
+	return true;
+}
 function stripQueryAndHash(id) {
 	const queryIndex = id.indexOf("?");
 	const hashIndex = id.indexOf("#");
@@ -7067,9 +7090,8 @@ function isPathWithinAllowedDirectories(filePath, allowedDirectories) {
 }
 function isSafeRunnerFetchModuleId(id, config) {
 	if (typeof id !== "string" || !id) return false;
-	const rawDecoded = decodeViteId(id);
-	const decoded = rawDecoded.replace(/^\0+/, "");
-	if (!decoded || rawDecoded.startsWith("\0") || decoded.startsWith("virtual:")) return !!decoded;
+	const decoded = decodeViteId(id).replace(/^\0+/, "");
+	if (!decoded || decoded.startsWith("virtual:")) return !!decoded;
 	if (decoded.startsWith("file://")) try {
 		const filePath = decodeURIComponent(new URL(decoded).pathname);
 		return path$1.isAbsolute(filePath) && isPathWithinAllowedDirectories(filePath, getRunnerAllowedDirectories(config));
@@ -7101,7 +7123,7 @@ function isRunnerInvokePayload(payload, config) {
 	if (name === "getBuiltins") return args.length === 0;
 	if (args.length < 1 || args.length > 3) return false;
 	const [id, importer, opts] = args;
-	return isSafeRunnerFetchModuleId(id, config) && (importer === void 0 || importer === null || isSafeRunnerFetchModuleId(importer, config)) && (opts === void 0 || isPlainObject(opts));
+	return isSafeRunnerFetchModuleId(id, config) && (importer === void 0 || importer === null || isSafeRunnerFetchModuleId(importer, config)) && (opts === void 0 || isSafeRunnerFetchModuleOptions(opts));
 }
 function readBoundedRunnerBody(req, res) {
 	return new Promise((resolve) => {
@@ -7217,14 +7239,6 @@ function pluginSSRRemoteEntry(options) {
 			const clientEnv = server.environments?.client;
 			const runnerEnv = typeof ssrEnv?.hot?.handleInvoke === "function" ? ssrEnv : typeof clientEnv?.hot?.handleInvoke === "function" ? clientEnv : void 0;
 			if (typeof (ssrEnv?.fetchModule ?? clientEnv?.fetchModule) === "function" && runnerEnv) server.middlewares.use("/__mf_runner__", async (req, res) => {
-				res.setHeader("Access-Control-Allow-Origin", "*");
-				if (req.method === "OPTIONS") {
-					res.setHeader("Access-Control-Allow-Methods", "POST");
-					res.setHeader("Access-Control-Allow-Headers", "Content-Type");
-					res.statusCode = 204;
-					res.end();
-					return;
-				}
 				if (req.method !== "POST") {
 					res.statusCode = 405;
 					res.end("Method not allowed");
@@ -7655,6 +7669,43 @@ function canResolveSharedSubpath(subpath, projectRoot) {
 	}
 }
 /**
+* Vite's dependency scanner cannot see through the virtual loadShare modules
+* generated for shared packages. As a result, dependencies of a linked/shared
+* package may be discovered one request at a time and each discovery starts a
+* new optimizer pass. Seed the optimizer with the complete dependency graph
+* before the first request instead.
+*
+* Vite then resolves the package's own dependency graph using its normal
+* scanner, preserving package and peer-dependency resolution semantics.
+*/
+function includeLinkedSharedEntries(optimizeDeps, shared, projectRoot, exposes, outDir) {
+	const additions = /* @__PURE__ */ new Set();
+	const entries = new Set(Array.isArray(optimizeDeps.entries) ? optimizeDeps.entries : optimizeDeps.entries ? [optimizeDeps.entries] : [
+		"**/*.html",
+		"!**/node_modules/**",
+		`!**/${outDir.replace(/\\/g, "/")}/**`,
+		"!**/__tests__/**",
+		"!**/coverage/**"
+	]);
+	for (const [packageName, share] of Object.entries(shared ?? {})) {
+		if (share?.shareConfig?.import === false) continue;
+		const installed = getInstalledPackageJson(packageName, { cwd: projectRoot });
+		if (!installed || installed.dir.replaceAll("\\", "/").includes("/node_modules/")) continue;
+		const entry = getInstalledPackageEntry(packageName, { cwd: projectRoot });
+		if (entry && existsSync(entry)) additions.add(entry);
+	}
+	for (const expose of Object.values(exposes ?? {})) {
+		const source = expose.import;
+		if (source.startsWith(".") || path$1.isAbsolute(source)) {
+			const entry = path$1.resolve(projectRoot, source);
+			if (existsSync(entry)) additions.add(entry);
+		}
+	}
+	if (additions.size === 0) return;
+	for (const entry of additions) entries.add(entry);
+	optimizeDeps.entries = [...entries];
+}
+/**
 * Plugin that runs FIRST to register generated virtual modules in the config hook.
 * This prevents 504 "Outdated Optimize Dep" errors by ensuring ids are known
 * before Vite's optimization phase.
@@ -7818,6 +7869,10 @@ export default __mfShared.default ?? __mfShared;`
 				}
 				writeLocalSharedImportMap();
 			}
+			if (_command === "serve") {
+				config.optimizeDeps ??= {};
+				includeLinkedSharedEntries(config.optimizeDeps, shared, root, options.exposes, config.build?.outDir ?? "dist");
+			}
 		},
 		configResolved(config) {
 			const viteMajor = parseInt(version, 10);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@module-federation/vite",
-  "version": "1.18.0",
+  "version": "1.18.1",
   "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.7.0",
-    "@module-federation/runtime": "2.7.0",
-    "@module-federation/sdk": "2.7.0"
+    "@module-federation/dts-plugin": "2.8.0",
+    "@module-federation/runtime": "2.8.0",
+    "@module-federation/sdk": "2.8.0"
   },
   "devDependencies": {
     "@playwright/test": "1.58.2",