@module-federation/vite 1.22.0 → 1.23.0

package/lib/{pluginDts-D7Faa4NJ.js → pluginDts-VSLhAx6d.js}

@@ -1,5 +1,5 @@
 import { n as normalizePathForImport } from "./buildPaths-BoaQTkxt.js";
-import { _ as mfError, g as createModuleFederationError, l as hasPackageDependency, p as resolveImportPath } from "./dtsConstants-BEGrtvcw.js";
+import { T as mfError, g as resolveImportPath, u as hasPackageDependency, w as createModuleFederationError } from "./dtsConstants-DEMpRfBz.js";
 import fs from "fs";
 import * as path$1 from "node:path";
 import os from "os";

package/lib/{sharedKeyMatcher-DiUzRVH1.js → sharedKeyMatcher-Od_nYxJA.js}

@@ -82,9 +82,25 @@ function getBasePath(base) {
 function isNuxtClientBase(base) {
 	return getBasePath(base).endsWith("/_nuxt");
 }
+const VITE_FS_PREFIX = "/@fs/";
+function stripQueryAndHash(id) {
+	const queryIndex = id.indexOf("?");
+	const hashIndex = id.indexOf("#");
+	const endIndex = queryIndex === -1 ? hashIndex : hashIndex === -1 ? queryIndex : Math.min(queryIndex, hashIndex);
+	return endIndex === -1 ? id : id.slice(0, endIndex);
+}
+function stripViteFsPrefix(id) {
+	if (!id.startsWith("/@fs/")) return id;
+	const file = id.slice(5);
+	return file.startsWith("/") || /^[a-z]:\//i.test(file) ? file : `/${file}`;
+}
 function normalizeNodeModulePath(source) {
-	const queryIndex = source.indexOf("?");
-	return (queryIndex === -1 ? source : source.slice(0, queryIndex)).replace(/\\/g, "/");
+	return stripQueryAndHash(source).replace(/\\/g, "/");
+}
+function getNodeModulesSuffix(source) {
+	const normalized = normalizeNodeModulePath(source);
+	const index = normalized.lastIndexOf("/node_modules/");
+	return index === -1 ? void 0 : normalized.slice(index + 14);
 }
 function isNodeModulePath(source) {
 	return source.includes("/node_modules/") || source.includes("\\node_modules\\");
@@ -92,31 +108,9 @@ function isNodeModulePath(source) {
 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
@@ -135,11 +129,38 @@ function resolvePublicPath(options, viteBase, originalBase) {
 }
 //#endregion
 //#region src/utils/sharedKeyMatcher.ts
-function matchesSharedSource(source, key) {
-	const keyBase = key.endsWith("/") ? key.slice(0, -1) : key;
+function getSharedRequest(key, shareItem) {
+	const request = shareItem?.shareConfig?.request;
+	return typeof request === "string" ? request : key;
+}
+/** `prefix` ends with `/` and `source` is its base or a subpath under it. */
+function isUnderPrefix(prefix, source) {
+	return prefix.endsWith("/") && (source === prefix.slice(0, -1) || source.startsWith(prefix));
+}
+/**
+* Resolve the runtime share-scope key for a concrete request. The configured
+* property name is the default runtime key; `shareKey` only changes it when
+* explicitly provided. Prefix requests carry their concrete suffix to the
+* runtime key as required by the Module Federation shared contract.
+*/
+function getSharedRuntimeKey(source, shareItem) {
+	const name = typeof shareItem?.name === "string" ? shareItem.name : void 0;
+	const request = getSharedRequest(name ?? source, shareItem);
+	const configuredShareKey = shareItem?.shareConfig?.shareKey;
+	const sourceMatchesRequest = source === request || isUnderPrefix(request, source);
+	const shareKey = typeof configuredShareKey === "string" ? configuredShareKey : name !== void 0 && sourceMatchesRequest ? name : source;
+	if (!request.endsWith("/")) return shareKey;
+	const requestBase = request.slice(0, -1);
+	if (source === requestBase) return shareKey.endsWith("/") ? shareKey.slice(0, -1) : shareKey;
+	if (source.startsWith(`${requestBase}/`)) return shareKey + source.slice(request.length);
+	return isUnderPrefix(shareKey, source) ? source : shareKey;
+}
+function matchesSharedSource(source, key, shareItem) {
+	const request = getSharedRequest(key, shareItem);
+	const keyBase = request.endsWith("/") ? request.slice(0, -1) : request;
 	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;
+	if (request.endsWith("/")) return source === keyBase || source.startsWith(`${keyBase}/`);
+	if (shareItem?.shareConfig?.request === void 0 && shareItem?.shareConfig?.shareKey === void 0 && getCommonSharedSubpaths(keyBase).includes(source)) return true;
 	return source === keyBase;
 }
 const emptySharedKeyMatcher = { find: () => void 0 };
@@ -163,26 +184,28 @@ function getSharedKeyMatcher(shared) {
 	const cached = sharedKeyMatcherCache.get(shared);
 	if (cached) return cached;
 	const keys = Object.keys(shared);
-	const exactKeys = new Set(keys);
+	const exactKeys = /* @__PURE__ */ new Map();
 	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];
+		const request = getSharedRequest(key, shareItem);
+		const keyBase = request.endsWith("/") ? request.slice(0, -1) : request;
+		if (!exactKeys.has(request) || request === key) exactKeys.set(request, key);
 		if (!vueKey && keyBase === "vue") vueKey = key;
-		if (key.endsWith("/")) wildcardKeys.push({
+		if (request.endsWith("/")) wildcardKeys.push({
 			key,
 			base: keyBase
 		});
-		if (shareItem?.shareConfig?.import !== false) {
+		if (shareItem?.shareConfig?.import !== false && shareItem?.shareConfig?.request === void 0 && shareItem?.shareConfig?.shareKey === void 0) {
 			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;
+		let result = exactKeys.get(source);
 		if (!result && vueKey) {
 			if (source === "vue/dist/vue.esm-bundler.js" || source === "vue/dist/vue.runtime.esm-bundler.js") result = vueKey;
 		}
@@ -195,4 +218,4 @@ function getSharedKeyMatcher(shared) {
 	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 };
+export { resolvePublicPath as _, matchesSharedSource as a, filterId as c, getNodeModulesSuffix as d, isAssetLikeImport as f, normalizeNodeModulePath as g, isViteOptimizableEntry as h, invalidateSharedKeyMatcher as i, getBasePath as l, isNuxtClientBase as m, getSharedRequest as n, VITE_FS_PREFIX as o, isNodeModulePath as p, getSharedRuntimeKey as r, ensureTrailingSlash as s, findSharedKey as t, getCommonSharedSubpaths as u, stripQueryAndHash as v, stripViteFsPrefix as y };

package/lib/{ssrEntryLoader-CMVCDSsG.js → ssrEntryLoader-BvAkpCyi.js}

@@ -666,7 +666,7 @@ async function importTempModule(filePath, versionKey) {
 }
 let warnedVmUnavailable = false;
 async function tryVmStrategy(ssrEntry, options) {
-	const { loadViaVmStrategy, isVmStrategyAvailable } = await import("./ssrVmStrategy-Cx9WlTsx.js");
+	const { loadViaVmStrategy, isVmStrategyAvailable } = await import("./ssrVmStrategy-CDbcwMnf.js");
 	if (!await isVmStrategyAvailable()) {
 		if (!warnedVmUnavailable) {
 			warnedVmUnavailable = true;

package/lib/{ssrVmStrategy-Cx9WlTsx.js → ssrVmStrategy-CDbcwMnf.js}

@@ -1,5 +1,5 @@
-import { t as findSharedKey } from "./sharedKeyMatcher-DiUzRVH1.js";
-import { c as readResponseTextBounded, n as neutralizeBrowserPreloadHelpers, s as fetchWithTimeout, t as SsrEntryHttpError } from "./ssrEntryLoader-CMVCDSsG.js";
+import { t as findSharedKey } from "./sharedKeyMatcher-Od_nYxJA.js";
+import { c as readResponseTextBounded, n as neutralizeBrowserPreloadHelpers, s as fetchWithTimeout, t as SsrEntryHttpError } from "./ssrEntryLoader-BvAkpCyi.js";
 //#region src/utils/ssrVmStrategy.ts
 /**
 * vm.SourceTextModule strategy for loading remote SSR entries.

package/lib/utils/ssrEntryLoader.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@module-federation/vite",
-  "version": "1.22.0",
+  "version": "1.23.0",
   "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.9.0",
-    "@module-federation/runtime": "2.9.0",
-    "@module-federation/sdk": "2.9.0"
+    "@module-federation/dts-plugin": "2.9.1",
+    "@module-federation/runtime": "2.9.1",
+    "@module-federation/sdk": "2.9.1"
   },
   "devDependencies": {
     "@playwright/test": "1.62.0",