@module-federation/vite 1.21.2 → 1.21.4

package/lib/{pluginDts-sJeW2nss.js → pluginDts-BhONN9dR.js}

@@ -1,5 +1,5 @@
 import { n as normalizePathForImport } from "./buildPaths-BkaQHrd2.js";
-import { _ as mfError, g as createModuleFederationError, l as hasPackageDependency, p as resolveImportPath } from "./dtsConstants-DyJrx8ah.js";
+import { _ as mfError, g as createModuleFederationError, l as hasPackageDependency, p as resolveImportPath } from "./dtsConstants-BsaLBaaK.js";
 import fs from "fs";
 import * as path$1 from "node:path";
 import os from "os";

package/lib/sharedKeyMatcher-DiUzRVH1.js

@@ -0,0 +1,198 @@
+//#region src/utils/pathNormalization.ts
+const COMMON_SHARED_SUBPATHS = {
+	react: [
+		"react/jsx-runtime",
+		"react/jsx-dev-runtime",
+		"react/compiler-runtime"
+	],
+	"react-dom": ["react-dom/client", "react-dom/profiling"],
+	"solid-js": [
+		"solid-js/web",
+		"solid-js/store",
+		"solid-js/html",
+		"solid-js/h",
+		"solid-js/jsx-runtime",
+		"solid-js/jsx-dev-runtime"
+	],
+	zustand: [
+		"zustand/vanilla",
+		"zustand/react",
+		"zustand/middleware",
+		"zustand/shallow"
+	]
+};
+const VITE_DEFAULT_ASSET_TYPES = [
+	"apng",
+	"bmp",
+	"png",
+	"jpe?g",
+	"jfif",
+	"pjpeg",
+	"pjp",
+	"gif",
+	"svg",
+	"ico",
+	"webp",
+	"avif",
+	"cur",
+	"jxl",
+	"mp4",
+	"webm",
+	"ogg",
+	"mp3",
+	"wav",
+	"flac",
+	"aac",
+	"opus",
+	"mov",
+	"m4a",
+	"vtt",
+	"woff2?",
+	"eot",
+	"ttf",
+	"otf",
+	"webmanifest",
+	"pdf",
+	"txt"
+];
+const ASSET_LIKE_IMPORT_RE = new RegExp(`\\.(${[...[
+	"css",
+	"scss",
+	"sass",
+	"less",
+	"styl",
+	"stylus"
+], ...VITE_DEFAULT_ASSET_TYPES].join("|")})(?:[?#].*)?$`, "i");
+function isAssetLikeImport(source) {
+	return ASSET_LIKE_IMPORT_RE.test(source);
+}
+const VITE_OPTIMIZABLE_ENTRY_RE = /\.[cm]?[jt]s$/;
+function isViteOptimizableEntry(resolvedPath) {
+	return VITE_OPTIMIZABLE_ENTRY_RE.test(resolvedPath);
+}
+function removeTrailingSlash(value) {
+	return value.endsWith("/") ? value.slice(0, -1) : value;
+}
+function ensureTrailingSlash(value) {
+	return `${removeTrailingSlash(value)}/`;
+}
+function getBasePath(base) {
+	return removeTrailingSlash(base || "/");
+}
+function isNuxtClientBase(base) {
+	return getBasePath(base).endsWith("/_nuxt");
+}
+function normalizeNodeModulePath(source) {
+	const queryIndex = source.indexOf("?");
+	return (queryIndex === -1 ? source : source.slice(0, queryIndex)).replace(/\\/g, "/");
+}
+function isNodeModulePath(source) {
+	return source.includes("/node_modules/") || source.includes("\\node_modules\\");
+}
+function filterId(id) {
+	return typeof id === "string" && !id.includes("\0");
+}
+const NODE_MODULE_FILE_EXT_RE = /^\.[cm]?[jt]sx?$/i;
+function matchesNodeModuleCandidate(normalized, candidate) {
+	const marker = `/node_modules/${candidate}`;
+	let from = 0;
+	while (from < normalized.length) {
+		const index = normalized.indexOf(marker, from);
+		if (index === -1) return false;
+		const after = normalized.slice(index + marker.length);
+		const boundary = after.search(/[?#]/);
+		const afterPath = boundary === -1 ? after : after.slice(0, boundary);
+		if (afterPath === "" || afterPath.startsWith("/") || NODE_MODULE_FILE_EXT_RE.test(afterPath)) return true;
+		from = index + 1;
+	}
+	return false;
+}
+function getMatchingNodeModuleSubpath(source, candidates) {
+	const normalized = normalizeNodeModulePath(source);
+	return [...candidates].sort((a, b) => b.length - a.length).find((candidate) => matchesNodeModuleCandidate(normalized, candidate));
+}
+function getCommonSharedSubpaths(sharedKey) {
+	return COMMON_SHARED_SUBPATHS[removeTrailingSlash(sharedKey)] || [];
+}
+function getCommonSharedSubpathFromNodeModulePath(source, sharedKey) {
+	return getMatchingNodeModuleSubpath(source, getCommonSharedSubpaths(removeTrailingSlash(sharedKey)));
+}
+/**
+* Resolves the public path for remote entries
+* @param options - Module Federation options
+* @param viteBase - Vite's base config value
+* @param originalBase - Original base config before any transformations
+* @returns The resolved public path
+*/
+function resolvePublicPath(options, viteBase, originalBase) {
+	if (options.publicPath && options.publicPath !== "auto") return options.publicPath;
+	if (!originalBase) return "auto";
+	if (viteBase) {
+		if (viteBase === "./") return "auto";
+		return ensureTrailingSlash(viteBase);
+	}
+	return "auto";
+}
+//#endregion
+//#region src/utils/sharedKeyMatcher.ts
+function matchesSharedSource(source, key) {
+	const keyBase = key.endsWith("/") ? key.slice(0, -1) : key;
+	if (keyBase === "vue" && (source === "vue/dist/vue.esm-bundler.js" || source === "vue/dist/vue.runtime.esm-bundler.js")) return true;
+	if (key.endsWith("/")) return source === keyBase || source.startsWith(`${keyBase}/`);
+	if (getCommonSharedSubpaths(keyBase).includes(source)) return true;
+	return source === keyBase;
+}
+const emptySharedKeyMatcher = { find: () => void 0 };
+const sharedKeyMatcherCache = /* @__PURE__ */ new WeakMap();
+function invalidateSharedKeyMatcher(shared) {
+	sharedKeyMatcherCache.delete(shared);
+}
+function findSharedKey(source, shared) {
+	return getSharedKeyMatcher(shared).find(source);
+}
+function pickLongestWildcardKey(wildcardKeys, source) {
+	let best;
+	for (const wildcard of wildcardKeys) {
+		if (source !== wildcard.base && !source.startsWith(`${wildcard.base}/`)) continue;
+		if (!best || wildcard.base.length > best.base.length || wildcard.base.length === best.base.length && wildcard.key.length > best.key.length) best = wildcard;
+	}
+	return best?.key;
+}
+function getSharedKeyMatcher(shared) {
+	if (!shared) return emptySharedKeyMatcher;
+	const cached = sharedKeyMatcherCache.get(shared);
+	if (cached) return cached;
+	const keys = Object.keys(shared);
+	const exactKeys = new Set(keys);
+	const commonSubpathKeys = /* @__PURE__ */ new Map();
+	const wildcardKeys = [];
+	let vueKey;
+	for (const key of keys) {
+		const keyBase = key.endsWith("/") ? key.slice(0, -1) : key;
+		const shareItem = shared[key];
+		if (!vueKey && keyBase === "vue") vueKey = key;
+		if (key.endsWith("/")) wildcardKeys.push({
+			key,
+			base: keyBase
+		});
+		if (shareItem?.shareConfig?.import !== false) {
+			for (const subpath of getCommonSharedSubpaths(keyBase)) if (!commonSubpathKeys.has(subpath)) commonSubpathKeys.set(subpath, key);
+		}
+	}
+	const sourceCache = /* @__PURE__ */ new Map();
+	const matcher = { find(source) {
+		if (sourceCache.has(source)) return sourceCache.get(source);
+		let result = exactKeys.has(source) ? source : void 0;
+		if (!result && vueKey) {
+			if (source === "vue/dist/vue.esm-bundler.js" || source === "vue/dist/vue.runtime.esm-bundler.js") result = vueKey;
+		}
+		if (!result) result = commonSubpathKeys.get(source);
+		if (!result) result = pickLongestWildcardKey(wildcardKeys, source);
+		sourceCache.set(source, result);
+		return result;
+	} };
+	sharedKeyMatcherCache.set(shared, matcher);
+	return matcher;
+}
+//#endregion
+export { filterId as a, getCommonSharedSubpaths as c, isNodeModulePath as d, isNuxtClientBase as f, resolvePublicPath as h, ensureTrailingSlash as i, getMatchingNodeModuleSubpath as l, normalizeNodeModulePath as m, invalidateSharedKeyMatcher as n, getBasePath as o, isViteOptimizableEntry as p, matchesSharedSource as r, getCommonSharedSubpathFromNodeModulePath as s, findSharedKey as t, isAssetLikeImport as u };

package/lib/{ssrEntryLoader-BMtjS_Vl.js → ssrEntryLoader-CqtaiDUp.js}

@@ -203,7 +203,7 @@ async function getOrCreateRunner(remoteOrigin, resolvedShared, fetchTimeoutMs, f
 						headers: { "Content-Type": "application/json" },
 						body: JSON.stringify(payload)
 					}, fetchTimeoutMs), fetchMaxBytes, runnerEndpoint);
-					const result = JSON.parse(text);
+					const result = parseRunnerInvokeResult(JSON.parse(text));
 					if ("error" in result && payload.data.name === "fetchModule") {
 						const sharedExternal = await resolveSharedExternal(payload.data.data[0], resolvedShared);
 						if (sharedExternal) return { result: sharedExternal };
@@ -223,6 +223,31 @@ const _fs = () => nodeImport("fs");
 const _crypto = () => nodeImport("crypto");
 const _module = () => nodeImport("module");
 const _url = () => nodeImport("url");
+function isPlainObject(value) {
+	return !!value && typeof value === "object" && !Array.isArray(value);
+}
+function parseManifestEntry(value) {
+	if (!isPlainObject(value) || typeof value.name !== "string" || value.name.length === 0) return;
+	return {
+		name: value.name,
+		path: typeof value.path === "string" ? value.path : "",
+		type: typeof value.type === "string" ? value.type : "module"
+	};
+}
+/** Network JSON is untyped until parsed. Keep the original object for version hashing. */
+function parseManifest(data) {
+	if (!isPlainObject(data)) return null;
+	return data;
+}
+function parseRunnerInvokeResult(data) {
+	if (!isPlainObject(data)) return { error: { message: "Invalid runner response" } };
+	if ("error" in data) {
+		const error = data.error;
+		return { error: { message: isPlainObject(error) && typeof error.message === "string" ? error.message : "Unknown runner error" } };
+	}
+	if ("result" in data) return { result: data.result };
+	return { result: data };
+}
 /**
 * Version key for a resolved SSR entry. Derived from the remote's manifest
 * content so a redeploy at the same URL produces a different key, which in
@@ -274,7 +299,7 @@ async function fetchManifest(manifestUrl, fetchTimeoutMs, fetchMaxBytes) {
 		const res = await fetchWithTimeout(manifestUrl, {}, fetchTimeoutMs);
 		if (!res.ok) return null;
 		const text = await readResponseTextBounded(res, fetchMaxBytes, manifestUrl);
-		return JSON.parse(text);
+		return parseManifest(JSON.parse(text));
 	} catch (error) {
 		if (isSsrFetchBodyTooLargeError(error)) throw error;
 		return null;
@@ -317,13 +342,13 @@ function resolveEntryAssetUrl(entry, manifestUrl) {
 	return new URL(`${entry.path || ""}${entry.name}`, base).href;
 }
 function resolveSSREntryUrl(manifest, manifestUrl) {
-	const meta = manifest?.metaData;
-	if (!meta?.ssrRemoteEntry?.name) return null;
+	const entry = parseManifestEntry(manifest.metaData?.ssrRemoteEntry);
+	if (!entry) return null;
 	const base = manifestUrl.replace(/\/[^/]+$/, "/");
-	const entryPath = (meta.ssrRemoteEntry.path || "") + meta.ssrRemoteEntry.name;
+	const entryPath = entry.path + entry.name;
 	return {
 		url: new URL(entryPath, base).href,
-		type: meta.ssrRemoteEntry.type || "module",
+		type: entry.type,
 		versionKey: computeManifestVersionKey(manifest)
 	};
 }
@@ -342,8 +367,8 @@ async function headCheckSsrEntry(candidate, fetchTimeoutMs) {
 	return null;
 }
 function resolveAssetBaseUrl(entryUrl, manifest, manifestUrl) {
-	const remoteEntry = manifest?.metaData?.remoteEntry;
-	if (remoteEntry?.name) return resolveEntryAssetUrl(remoteEntry, manifestUrl);
+	const remoteEntry = parseManifestEntry(manifest?.metaData?.remoteEntry);
+	if (remoteEntry) return resolveEntryAssetUrl(remoteEntry, manifestUrl);
 	if (!isManifestEntry(entryUrl)) return entryUrl;
 	return new URL("remoteEntry.js", manifestUrl.replace(/\/[^/]+$/, "/")).href;
 }
@@ -489,7 +514,7 @@ async function getSSRCacheDir() {
 	if (!ssrCacheDirPromise) ssrCacheDirPromise = (async () => {
 		const { join } = await _path();
 		const { rmSync } = await _fs();
-		const dir = join(process.cwd(), "node_modules", ".ssr-cache");
+		const dir = join(process.cwd(), "node_modules", ".ssr-cache", String(process.pid));
 		process.once("exit", () => {
 			try {
 				rmSync(dir, {
@@ -606,7 +631,7 @@ async function importTempModule(filePath, versionKey) {
 }
 let warnedVmUnavailable = false;
 async function tryVmStrategy(ssrEntry, options) {
-	const { loadViaVmStrategy, isVmStrategyAvailable } = await import("./ssrVmStrategy-tpI6we9Q.js");
+	const { loadViaVmStrategy, isVmStrategyAvailable } = await import("./ssrVmStrategy-D4KB-y3H.js");
 	if (!await isVmStrategyAvailable()) {
 		if (!warnedVmUnavailable) {
 			warnedVmUnavailable = true;

package/lib/{ssrVmStrategy-tpI6we9Q.js → ssrVmStrategy-D4KB-y3H.js}

@@ -1,5 +1,5 @@
-import { a as getCommonSharedSubpaths } from "./pathNormalization-CHct3UwV.js";
-import { c as readResponseTextBounded, n as neutralizeBrowserPreloadHelpers, s as fetchWithTimeout, t as SsrEntryHttpError } from "./ssrEntryLoader-BMtjS_Vl.js";
+import { t as findSharedKey } from "./sharedKeyMatcher-DiUzRVH1.js";
+import { c as readResponseTextBounded, n as neutralizeBrowserPreloadHelpers, s as fetchWithTimeout, t as SsrEntryHttpError } from "./ssrEntryLoader-CqtaiDUp.js";
 //#region src/utils/ssrVmStrategy.ts
 /**
 * vm.SourceTextModule strategy for loading remote SSR entries.
@@ -41,20 +41,7 @@ async function isVmStrategyAvailable() {
 	return await getVmApi() !== null;
 }
 function findVmSharedKey(specifier, shared) {
-	if (!shared) return;
-	const keys = Object.keys(shared);
-	if (Object.prototype.hasOwnProperty.call(shared, specifier)) return specifier;
-	const vueKey = keys.find((key) => key.endsWith("/") ? key.slice(0, -1) === "vue" : key === "vue");
-	if (vueKey && (specifier === "vue/dist/vue.esm-bundler.js" || specifier === "vue/dist/vue.runtime.esm-bundler.js")) return vueKey;
-	const commonSubpathKey = keys.find((key) => {
-		return getCommonSharedSubpaths(key.endsWith("/") ? key.slice(0, -1) : key).includes(specifier);
-	});
-	if (commonSubpathKey) return commonSubpathKey;
-	return keys.find((key) => {
-		if (!key.endsWith("/")) return false;
-		const keyBase = key.slice(0, -1);
-		return specifier === keyBase || specifier.startsWith(`${keyBase}/`);
-	});
+	return findSharedKey(specifier, shared);
 }
 function getFederationInstances() {
 	return globalThis.__FEDERATION__?.__INSTANCES__ ?? [];

package/lib/utils/ssrEntryLoader.js

@@ -1,2 +1,2 @@
-import { i as ssrEntryLoaderPlugin, n as neutralizeBrowserPreloadHelpers, r as revalidate, t as SsrEntryHttpError } from "../ssrEntryLoader-BMtjS_Vl.js";
+import { i as ssrEntryLoaderPlugin, n as neutralizeBrowserPreloadHelpers, r as revalidate, t as SsrEntryHttpError } from "../ssrEntryLoader-CqtaiDUp.js";
 export { SsrEntryHttpError, ssrEntryLoaderPlugin as default, neutralizeBrowserPreloadHelpers, revalidate };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@module-federation/vite",
-  "version": "1.21.2",
+  "version": "1.21.4",
   "description": "Vite plugin for Module Federation",
   "type": "module",
   "main": "./lib/index.js",
@@ -28,7 +28,7 @@
     "lib/**/*"
   ],
   "scripts": {
-    "prepare": "husky install",
+    "prepare": "husky",
     "fmt": "oxfmt src",
     "fmt.check": "oxfmt --check src",
     "dev": "tsdown --watch",

package/lib/pathNormalization-CHct3UwV.js

@@ -1,115 +0,0 @@
-//#region src/utils/pathNormalization.ts
-const COMMON_SHARED_SUBPATHS = {
-	react: [
-		"react/jsx-runtime",
-		"react/jsx-dev-runtime",
-		"react/compiler-runtime"
-	],
-	"react-dom": ["react-dom/client", "react-dom/profiling"],
-	"solid-js": [
-		"solid-js/web",
-		"solid-js/store",
-		"solid-js/html",
-		"solid-js/h"
-	],
-	zustand: ["zustand/vanilla", "zustand/react"]
-};
-const VITE_DEFAULT_ASSET_TYPES = [
-	"apng",
-	"bmp",
-	"png",
-	"jpe?g",
-	"jfif",
-	"pjpeg",
-	"pjp",
-	"gif",
-	"svg",
-	"ico",
-	"webp",
-	"avif",
-	"cur",
-	"jxl",
-	"mp4",
-	"webm",
-	"ogg",
-	"mp3",
-	"wav",
-	"flac",
-	"aac",
-	"opus",
-	"mov",
-	"m4a",
-	"vtt",
-	"woff2?",
-	"eot",
-	"ttf",
-	"otf",
-	"webmanifest",
-	"pdf",
-	"txt"
-];
-const ASSET_LIKE_IMPORT_RE = new RegExp(`\\.(${[...[
-	"css",
-	"scss",
-	"sass",
-	"less",
-	"styl",
-	"stylus"
-], ...VITE_DEFAULT_ASSET_TYPES].join("|")})(?:[?#].*)?$`, "i");
-function isAssetLikeImport(source) {
-	return ASSET_LIKE_IMPORT_RE.test(source);
-}
-const VITE_OPTIMIZABLE_ENTRY_RE = /\.[cm]?[jt]s$/;
-function isViteOptimizableEntry(resolvedPath) {
-	return VITE_OPTIMIZABLE_ENTRY_RE.test(resolvedPath);
-}
-function removeTrailingSlash(value) {
-	return value.endsWith("/") ? value.slice(0, -1) : value;
-}
-function ensureTrailingSlash(value) {
-	return `${removeTrailingSlash(value)}/`;
-}
-function getBasePath(base) {
-	return removeTrailingSlash(base || "/");
-}
-function isNuxtClientBase(base) {
-	return getBasePath(base).endsWith("/_nuxt");
-}
-function normalizeNodeModulePath(source) {
-	const queryIndex = source.indexOf("?");
-	return (queryIndex === -1 ? source : source.slice(0, queryIndex)).replace(/\\/g, "/");
-}
-function isNodeModulePath(source) {
-	return source.includes("/node_modules/") || source.includes("\\node_modules\\");
-}
-function filterId(id) {
-	return typeof id === "string" && !id.includes("\0");
-}
-function getMatchingNodeModuleSubpath(source, candidates) {
-	const normalized = normalizeNodeModulePath(source);
-	return [...candidates].sort((a, b) => b.length - a.length).find((candidate) => normalized.includes(`/node_modules/${candidate}/`) || normalized.includes(`/node_modules/${candidate}.`));
-}
-function getCommonSharedSubpaths(sharedKey) {
-	return COMMON_SHARED_SUBPATHS[removeTrailingSlash(sharedKey)] || [];
-}
-function getCommonSharedSubpathFromNodeModulePath(source, sharedKey) {
-	return getMatchingNodeModuleSubpath(source, getCommonSharedSubpaths(removeTrailingSlash(sharedKey)));
-}
-/**
-* Resolves the public path for remote entries
-* @param options - Module Federation options
-* @param viteBase - Vite's base config value
-* @param originalBase - Original base config before any transformations
-* @returns The resolved public path
-*/
-function resolvePublicPath(options, viteBase, originalBase) {
-	if (options.publicPath && options.publicPath !== "auto") return options.publicPath;
-	if (!originalBase) return "auto";
-	if (viteBase) {
-		if (viteBase === "./") return "auto";
-		return ensureTrailingSlash(viteBase);
-	}
-	return "auto";
-}
-//#endregion
-export { getCommonSharedSubpaths as a, isNodeModulePath as c, normalizeNodeModulePath as d, resolvePublicPath as f, getCommonSharedSubpathFromNodeModulePath as i, isNuxtClientBase as l, filterId as n, getMatchingNodeModuleSubpath as o, getBasePath as r, isAssetLikeImport as s, ensureTrailingSlash as t, isViteOptimizableEntry as u };