@module-federation/vite 1.23.5 → 1.23.6

package/lib/{logger-DOwfTlw5.js → logger-D67aJYOe.js}

@@ -39,6 +39,9 @@ function normalizePathForImport(path) {
 	return path.replace(/\\/g, "/");
 }
 const EXTERNAL_URL_RE = /^(?:[a-z]+:|\/\/)/i;
+function isHttpUrl(value) {
+	return value.startsWith("http://") || value.startsWith("https://");
+}
 function isAbsoluteUrl(src) {
 	if (/^[a-z]:[\\/]/i.test(src)) return false;
 	return EXTERNAL_URL_RE.test(src);
@@ -205,28 +208,91 @@ const REGEX_PREFIX_KEYWORDS = /* @__PURE__ */ new Set([
 	"void",
 	"yield"
 ]);
+const CONTROL_PAREN_KEYWORDS = /* @__PURE__ */ new Set([
+	"if",
+	"while",
+	"for",
+	"with",
+	"switch",
+	"catch"
+]);
+function isWhitespace(char) {
+	if (char === void 0) return false;
+	const code = char.charCodeAt(0);
+	if (code < 128) return code === 32 || code >= 9 && code <= 13;
+	return /\s/.test(char);
+}
+function isAsciiLetter(code) {
+	return code >= 97 && code <= 122 || code >= 65 && code <= 90;
+}
+function isAsciiDigit(code) {
+	return code >= 48 && code <= 57;
+}
+function isIdentifierStart(char) {
+	const code = char.charCodeAt(0);
+	if (code < 128) return isAsciiLetter(code) || code === 36 || code === 95;
+	return /[$_\p{ID_Start}]/u.test(char);
+}
+function isIdentifierPart(char) {
+	if (char === void 0) return false;
+	const code = char.charCodeAt(0);
+	if (code < 128) return isAsciiLetter(code) || isAsciiDigit(code) || code === 36 || code === 95;
+	return /[$_\u200C\u200D\p{ID_Continue}]/u.test(char);
+}
+function isRegexFlag(char) {
+	if (char === void 0) return false;
+	const code = char.charCodeAt(0);
+	if (code < 128) return isAsciiLetter(code) || isAsciiDigit(code) || code === 36 || code === 95;
+	return /[$_\p{ID_Continue}]/u.test(char);
+}
+function isNumberPart(char) {
+	if (char === void 0) return false;
+	const code = char.charCodeAt(0);
+	return isAsciiLetter(code) || isAsciiDigit(code) || code === 95 || code === 46;
+}
 function isJsxClosingTagSlash(code, slashIndex) {
 	if (code[slashIndex - 1] !== "<") return false;
 	let cursor = slashIndex + 1;
-	while (/\s/.test(code[cursor] || "")) cursor++;
+	while (isWhitespace(code[cursor])) cursor++;
 	if (code[cursor] === ">") return true;
 	const tagStart = cursor;
 	while (/[-:.$_\u200C\u200D\p{ID_Continue}]/u.test(code[cursor] || "")) cursor++;
 	if (cursor === tagStart) return false;
-	while (/\s/.test(code[cursor] || "")) cursor++;
+	while (isWhitespace(code[cursor])) cursor++;
 	return code[cursor] === ">";
 }
 /** Mark comments, string/template literals, and regular expressions as non-code. */
 function createCodePositionMap(code, onComment) {
-	const positions = Array(code.length).fill(true);
+	const positions = new Uint8Array(code.length).fill(1);
 	const mask = (start, end) => {
-		for (let index = start; index < end; index++) positions[index] = false;
+		positions.fill(0, start, end);
 	};
 	let canStartRegex = true;
+	let pendingControlParen;
+	const controlParens = [];
+	let templateStart;
+	const templateExpressions = [];
 	for (let index = 0; index < code.length;) {
 		const char = code[index];
 		const next = code[index + 1];
-		if (/\s/.test(char)) {
+		if (templateStart !== void 0) {
+			if (char === "\\") index += 2;
+			else if (char === "`") {
+				mask(templateStart, ++index);
+				templateStart = void 0;
+				canStartRegex = false;
+			} else if (char === "$" && next === "{") {
+				templateExpressions.push({
+					start: templateStart,
+					braceDepth: 0
+				});
+				templateStart = void 0;
+				canStartRegex = true;
+				index += 2;
+			} else index++;
+			continue;
+		}
+		if (isWhitespace(char)) {
 			index++;
 			continue;
 		}
@@ -247,7 +313,13 @@ function createCodePositionMap(code, onComment) {
 			onComment?.(start, index);
 			continue;
 		}
-		if (char === "\"" || char === "'" || char === "`") {
+		const controlKeyword = pendingControlParen;
+		pendingControlParen = void 0;
+		if (char === "`") {
+			templateStart = index++;
+			continue;
+		}
+		if (char === "\"" || char === "'") {
 			const quote = char;
 			const start = index++;
 			while (index < code.length) {
@@ -265,8 +337,7 @@ function createCodePositionMap(code, onComment) {
 			canStartRegex = false;
 			continue;
 		}
-		const closesJsxTag = isJsxClosingTagSlash(code, index);
-		if (char === "/" && canStartRegex && !closesJsxTag) {
+		if (char === "/" && canStartRegex && !isJsxClosingTagSlash(code, index)) {
 			const start = index;
 			let cursor = index + 1;
 			let escaped = false;
@@ -293,7 +364,7 @@ function createCodePositionMap(code, onComment) {
 				}
 				if (regexChar === "/" && !inCharacterClass) {
 					cursor++;
-					while (/[$_\p{ID_Continue}]/u.test(code[cursor] || "")) cursor++;
+					while (isRegexFlag(code[cursor])) cursor++;
 					closed = true;
 					break;
 				}
@@ -305,15 +376,21 @@ function createCodePositionMap(code, onComment) {
 				continue;
 			}
 		}
-		if (/[$_\p{ID_Start}]/u.test(char)) {
+		if (isIdentifierStart(char)) {
 			const start = index++;
-			while (/[$_\u200C\u200D\p{ID_Continue}]/u.test(code[index] || "")) index++;
-			canStartRegex = REGEX_PREFIX_KEYWORDS.has(code.slice(start, index));
+			while (isIdentifierPart(code[index])) index++;
+			const word = code.slice(start, index);
+			if (CONTROL_PAREN_KEYWORDS.has(word)) {
+				let previous = start - 1;
+				while (previous >= 0 && (isWhitespace(code[previous]) || !positions[previous])) previous--;
+				if (code[previous] !== ".") pendingControlParen = word;
+			} else if (word === "await" && controlKeyword === "for") pendingControlParen = controlKeyword;
+			canStartRegex = REGEX_PREFIX_KEYWORDS.has(word);
 			continue;
 		}
-		if (/\d/.test(char)) {
+		if (isAsciiDigit(char.charCodeAt(0))) {
 			index++;
-			while (/[\w.]/.test(code[index] || "")) index++;
+			while (isNumberPart(code[index])) index++;
 			canStartRegex = false;
 			continue;
 		}
@@ -325,10 +402,27 @@ function createCodePositionMap(code, onComment) {
 			index++;
 			continue;
 		}
-		if (char === ")" || char === "]" || char === "}") canStartRegex = false;
+		const expression = templateExpressions.at(-1);
+		if (expression && char === "{") expression.braceDepth++;
+		else if (expression && char === "}") {
+			if (expression.braceDepth === 0) {
+				templateStart = expression.start;
+				templateExpressions.pop();
+				index++;
+				continue;
+			}
+			expression.braceDepth--;
+		}
+		if (char === "(") {
+			controlParens.push(controlKeyword !== void 0);
+			canStartRegex = true;
+		} else if (char === ")") canStartRegex = controlParens.pop() === true;
+		else if (char === "]" || char === "}") canStartRegex = false;
 		else if (char !== ".") canStartRegex = true;
 		index++;
 	}
+	const unfinishedTemplateStart = templateExpressions[0]?.start ?? templateStart;
+	if (unfinishedTemplateStart !== void 0) mask(unfinishedTemplateStart, code.length);
 	return positions;
 }
 //#endregion
@@ -363,4 +457,4 @@ const moduleFederationConsole = {
 const mfWarn = moduleFederationConsole.warn;
 const mfError = moduleFederationConsole.error;
 //#endregion
-export { CodeRewriter as a, isAbsoluteUrl as c, resolveHashPlaceholderFileName as d, createCodePositionMap as i, normalizePathForImport as l, mfError as n, createSourceMap as o, mfWarn as r, EXTERNAL_URL_RE as s, createModuleFederationError as t, rebaseImport as u };
+export { CodeRewriter as a, isAbsoluteUrl as c, rebaseImport as d, resolveHashPlaceholderFileName as f, createCodePositionMap as i, isHttpUrl as l, mfError as n, createSourceMap as o, mfWarn as r, EXTERNAL_URL_RE as s, createModuleFederationError as t, normalizePathForImport as u };

package/lib/{pluginDts-DShMdjzR.js → pluginDts-rZMRTCTz.js}

@@ -1,5 +1,5 @@
-import { l as normalizePathForImport, n as mfError, t as createModuleFederationError } from "./logger-DOwfTlw5.js";
-import { _ as resolveImportPath, d as hasPackageDependency } from "./dtsConstants-BQdFpgKb.js";
+import { l as isHttpUrl, n as mfError, t as createModuleFederationError, u as normalizePathForImport } from "./logger-D67aJYOe.js";
+import { p as hasPackageDependency, r as watchFileEvents, y as resolveImportPath } from "./dtsConstants-CDuC8Bb7.js";
 import fs from "fs";
 import * as path$1 from "node:path";
 import { normalizeOptions } from "@module-federation/sdk";
@@ -113,7 +113,7 @@ const resolveDtsPluginOptions = (dts, options, context) => {
 	};
 };
 const getBasePath = (base) => {
-	if (base.startsWith("http://") || base.startsWith("https://")) return new URL(base).pathname.replace(/\/$/, "") || "/";
+	if (isHttpUrl(base)) return new URL(base).pathname.replace(/\/$/, "") || "/";
 	return base.replace(/\/$/, "") || "/";
 };
 const joinBaseAndAsset = (base, assetFileName) => {
@@ -262,15 +262,11 @@ function pluginDts(options) {
 					clearTimeout(updateTimer);
 					updateTimer = setTimeout(() => devWorker?.update(), UPDATE_DEBOUNCE_MS);
 				};
-				server.watcher.on("change", update);
-				server.watcher.on("add", update);
-				server.watcher.on("unlink", update);
+				const stopWatching = watchFileEvents(server.watcher, update);
 				server.httpServer?.once("close", () => {
 					clearTimeout(updateTimer);
 					devWorker?.exit();
-					server.watcher.off("change", update);
-					server.watcher.off("add", update);
-					server.watcher.off("unlink", update);
+					stopWatching();
 				});
 			};
 			startDevWorker().catch((error) => {

package/lib/{sharedKeyMatcher-CHp4QRNq.js → sharedKeyMatcher-C04bVN1q.js}

@@ -1,3 +1,5 @@
+import { u as normalizePathForImport } from "./logger-D67aJYOe.js";
+import * as path$1 from "node:path";
 //#region src/utils/pathNormalization.ts
 const COMMON_SHARED_SUBPATHS = {
 	react: [
@@ -127,6 +129,11 @@ function resolvePublicPath(options, viteBase, originalBase) {
 	}
 	return "auto";
 }
+/** Relative `./`-prefixed import specifier from `fromFile` to `targetFile`. */
+function toRelativeImport(fromFile, targetFile) {
+	const relative = normalizePathForImport(path$1.relative(path$1.dirname(fromFile), targetFile));
+	return relative.startsWith(".") ? relative : `./${relative}`;
+}
 //#endregion
 //#region src/utils/sharedKeyMatcher.ts
 function getSharedRequest(key, shareItem) {
@@ -218,4 +225,4 @@ function getSharedKeyMatcher(shared) {
 	return matcher;
 }
 //#endregion
-export { removeTrailingSlash as _, matchesSharedSource as a, stripViteFsPrefix as b, 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, resolvePublicPath as v, stripQueryAndHash as y };
+export { removeTrailingSlash as _, matchesSharedSource as a, stripViteFsPrefix as b, 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, resolvePublicPath as v, toRelativeImport as x, stripQueryAndHash as y };

package/lib/{ssrEntryLoader-CHdWk8Yg.js → ssrEntryLoader-Bh2Tq1cZ.js}

@@ -1,4 +1,4 @@
-import { a as CodeRewriter, i as createCodePositionMap, r as mfWarn, s as EXTERNAL_URL_RE } from "./logger-DOwfTlw5.js";
+import { a as CodeRewriter, i as createCodePositionMap, l as isHttpUrl, r as mfWarn, s as EXTERNAL_URL_RE } from "./logger-D67aJYOe.js";
 import { simpleJoinRemoteEntry } from "@module-federation/sdk";
 //#region src/utils/fetchWithTimeout.ts
 const DEFAULT_SSR_FETCH_TIMEOUT_MS = 1e4;
@@ -57,6 +57,10 @@ var SsrFetchBodyTooLargeError = class extends Error {
 function isSsrFetchBodyTooLargeError(error) {
 	return error instanceof SsrFetchBodyTooLargeError;
 }
+/** A short single-line excerpt of a response body for error messages. */
+function getBodyPreview(body) {
+	return body.slice(0, 240).replace(/\s+/g, " ").trim();
+}
 /**
 * Read a response body as text, rejecting when it exceeds `maxBytes`.
 * Set `maxBytes` to 0 (or a non-finite value) to disable the limit.
@@ -99,15 +103,6 @@ async function readResponseTextBounded(res, maxBytes = DEFAULT_SSR_FETCH_MAX_BYT
 	return new TextDecoder().decode(merged);
 }
 //#endregion
-//#region src/utils/url.ts
-function getUrlOrigin(value) {
-	try {
-		return new URL(value).origin;
-	} catch {
-		return;
-	}
-}
-//#endregion
 //#region src/utils/ssrEntryLoader.ts
 /**
 * MF runtime plugin that intercepts the `loadEntry` lifecycle hook on the
@@ -230,8 +225,9 @@ async function getOrCreateRunner(remoteOrigin, resolvedShared, fetchTimeoutMs, f
 						headers: { "Content-Type": "application/json" },
 						body: JSON.stringify(payload)
 					}, fetchTimeoutMs), fetchMaxBytes, runnerEndpoint);
-					const result = parseRunnerInvokeResult(JSON.parse(text));
-					if ("error" in result && payload.data.name === "fetchModule") {
+					const data = JSON.parse(text);
+					const result = parseRunnerInvokeResult(data);
+					if (("error" in result || isPlainObject(data) && data.shared === true) && payload.data.name === "fetchModule") {
 						const sharedExternal = await resolveSharedExternal(payload.data.data[0], resolvedShared);
 						if (sharedExternal) return { result: sharedExternal };
 					}
@@ -326,9 +322,6 @@ var SsrEntryHttpError = class extends Error {
 		this.name = "SsrEntryHttpError";
 	}
 };
-function getBodyPreview(body) {
-	return body.slice(0, 240).replace(/\s+/g, " ").trim();
-}
 function isSsrEntryHttpError(error) {
 	return error instanceof SsrEntryHttpError;
 }
@@ -540,9 +533,10 @@ function scheduleVmCacheCleanup(remoteEntryUrl) {
 */
 async function clearRunnerCaches(remoteEntryUrl) {
 	let remoteOrigin;
-	if (remoteEntryUrl) {
-		remoteOrigin = getUrlOrigin(remoteEntryUrl);
-		if (!remoteOrigin) return;
+	if (remoteEntryUrl) try {
+		remoteOrigin = new URL(remoteEntryUrl).origin;
+	} catch {
+		return;
 	}
 	await Promise.all([...runnerCache.values()].filter((cached) => !remoteOrigin || cached.remoteOrigin === remoteOrigin).map(async (cached) => {
 		try {
@@ -751,7 +745,7 @@ function transformSsrCode(code, base, specifiers, sharedPkgMap, requireShimUrl,
 		}
 		const resolvedShared = sharedPkgMap?.get(value);
 		const relativeUrl = isRelativeSpecifier(value) ? new URL(value, base).href : void 0;
-		const absoluteHttpUrl = value.startsWith("http://") || value.startsWith("https://") ? value : void 0;
+		const absoluteHttpUrl = isHttpUrl(value) ? value : void 0;
 		const httpUrl = relativeUrl ?? absoluteHttpUrl;
 		const replacement = (httpUrl ? tempFileUrlMap?.get(httpUrl) : void 0) ?? relativeUrl ?? (resolvedShared && `file://${resolvedShared}`);
 		if (replacement) rewriter.overwrite(start, end, `"${replacement}"`);
@@ -773,7 +767,8 @@ function getTempFileImportUrl(filePath, versionKey) {
 * a remote redeploy (new manifest → new key) produces new files and bypasses
 * Node's ESM module cache instead of serving the stale build.
 */
-async function fetchEsmToTempFile(url, tmpDir, visited, pending, sharedPkgMap, versionKey = UNVERSIONED, fetchTimeoutMs = DEFAULT_SSR_FETCH_TIMEOUT_MS, contextKey = "default", fetchMaxBytes = DEFAULT_SSR_FETCH_MAX_BYTES, extension = ".mjs", owner) {
+async function fetchEsmToTempFile(url, graph) {
+	const { tmpDir, visited, pending, sharedPkgMap, versionKey, fetchTimeoutMs, contextKey, fetchMaxBytes, extension, owner } = graph;
 	const cacheKey = JSON.stringify([
 		fetchTimeoutMs,
 		fetchMaxBytes,
@@ -795,7 +790,8 @@ async function fetchEsmToTempFile(url, tmpDir, visited, pending, sharedPkgMap, v
 	const tmpFilePromise = (async () => {
 		const { createHash } = await _crypto();
 		const { join } = await _path();
-		return join(tmpDir, `${createHash("sha1").update(cacheKey).digest("hex").slice(0, 12)}${extension}`);
+		const hash = createHash("sha1").update(cacheKey).digest("hex").slice(0, 12);
+		return join(tmpDir, `${hash}${extension}`);
 	})();
 	tempFilePathCache.set(cacheKey, tmpFilePromise);
 	const promise = (async () => {
@@ -808,8 +804,8 @@ async function fetchEsmToTempFile(url, tmpDir, visited, pending, sharedPkgMap, v
 		const specifiers = findSsrModuleSpecifiers(code);
 		const relImports = specifiers.map(({ value }) => value).filter((value) => isRelativeSpecifier(value) && !isVitePreloadHelperSpecifier(value)).map((value) => new URL(value, base).href);
 		const subMap = /* @__PURE__ */ new Map();
-		await Promise.all([...new Set(relImports)].filter((u) => u.startsWith("http://") || u.startsWith("https://")).map(async (u) => {
-			const tmpPath = await fetchEsmToTempFile(u, tmpDir, visited, pending, sharedPkgMap, versionKey, fetchTimeoutMs, contextKey, fetchMaxBytes, extension, owner);
+		await Promise.all([...new Set(relImports)].filter(isHttpUrl).map(async (u) => {
+			const tmpPath = await fetchEsmToTempFile(u, graph);
 			subMap.set(u, getTempFileImportUrl(tmpPath, versionKey));
 		}));
 		const requireShimUrl = sharedPkgMap?.size && specifiers.some(({ value }) => isNodeModuleSpecifier(value)) ? await getRequireShimUrl(tmpDir, sharedPkgMap, contextKey) : void 0;
@@ -834,9 +830,18 @@ async function fetchEsmToTempFile(url, tmpDir, visited, pending, sharedPkgMap, v
 	});
 	return promise;
 }
-async function fetchEsmGraphToTempFile(url, tmpDir, sharedPkgMap, versionKey = UNVERSIONED, fetchTimeoutMs = DEFAULT_SSR_FETCH_TIMEOUT_MS, contextKey = "default", fetchMaxBytes = DEFAULT_SSR_FETCH_MAX_BYTES, extension = ".mjs", owner) {
+async function fetchEsmGraphToTempFile(url, { versionKey = UNVERSIONED, fetchTimeoutMs = DEFAULT_SSR_FETCH_TIMEOUT_MS, contextKey = "default", fetchMaxBytes = DEFAULT_SSR_FETCH_MAX_BYTES, extension = ".mjs", ...rest }) {
 	const pending = /* @__PURE__ */ new Set();
-	const rootFile = await fetchEsmToTempFile(url, tmpDir, /* @__PURE__ */ new Map(), pending, sharedPkgMap, versionKey, fetchTimeoutMs, contextKey, fetchMaxBytes, extension, owner);
+	const rootFile = await fetchEsmToTempFile(url, {
+		...rest,
+		versionKey,
+		fetchTimeoutMs,
+		contextKey,
+		fetchMaxBytes,
+		extension,
+		visited: /* @__PURE__ */ new Map(),
+		pending
+	});
 	await Promise.all(pending);
 	return rootFile;
 }
@@ -848,7 +853,7 @@ async function importTempModule(filePath, versionKey) {
 }
 let warnedVmUnavailable = false;
 function getVmStrategyModule() {
-	if (!loaderState.vmStrategyModulePromise) loaderState.vmStrategyModulePromise = import("./ssrVmStrategy-BkyvcG4s.js");
+	if (!loaderState.vmStrategyModulePromise) loaderState.vmStrategyModulePromise = import("./ssrVmStrategy-BCaiSEbA.js");
 	return loaderState.vmStrategyModulePromise;
 }
 /**
@@ -889,7 +894,7 @@ async function loadSSRRemoteEntry(ssrEntry, options, rootEntryUrl) {
 			return req(url);
 		} catch {}
 	}
-	if (url.startsWith("http://") || url.startsWith("https://")) {
+	if (isHttpUrl(url)) {
 		const urlObj = new URL(url);
 		if (urlObj.pathname.includes("/__mf_ssr__/")) {
 			const remoteOrigin = urlObj.origin;
@@ -919,7 +924,16 @@ async function loadSSRRemoteEntry(ssrEntry, options, rootEntryUrl) {
 		const isCommonJs = type === "commonjs-module" || type === "commonjs";
 		const extension = isCommonJs ? ".cjs" : ".mjs";
 		try {
-			const tmpFile = await fetchEsmGraphToTempFile(url, cacheDir, sharedPkgMap, versionKey, options.fetchTimeoutMs, getSsrTransformContextKey(resolvedShared, options.shareScopeName), options.fetchMaxBytes, extension, rootEntryUrl);
+			const tmpFile = await fetchEsmGraphToTempFile(url, {
+				tmpDir: cacheDir,
+				sharedPkgMap,
+				versionKey,
+				fetchTimeoutMs: options.fetchTimeoutMs,
+				contextKey: getSsrTransformContextKey(resolvedShared, options.shareScopeName),
+				fetchMaxBytes: options.fetchMaxBytes,
+				extension,
+				owner: rootEntryUrl
+			});
 			if (isCommonJs) return (await _module()).createRequire(import.meta.url)(tmpFile);
 			return await importTempModule(tmpFile, versionKey);
 		} catch (error) {
@@ -937,6 +951,42 @@ async function loadSSRRemoteEntry(ssrEntry, options, rootEntryUrl) {
 		return null;
 	}
 }
+/**
+* Build-time `resolvedShared` paths point into the build machine's
+* node_modules. A traced or relocated server output imports shared packages
+* from its own copy, so pinning remotes to the build paths loads a second
+* instance (two Reacts: invalid hook call) or, once the build directory is
+* gone, nothing at all (ERR_MODULE_NOT_FOUND).
+*
+* Each specifier takes the first hit of a fixed order, independent of import
+* order or timing:
+*  1. resolved from the real path of the server entry (`process.argv[1]`),
+*     which is where Node resolves the host's own bare imports from, unless
+*     it is a CLI inside node_modules (e.g. `vite preview`);
+*  2. resolved from `process.cwd()`, for launchers whose `argv[1]` is not the
+*     server entry or is missing;
+*  3. the build-time path.
+*/
+async function rebaseResolvedShared(resolvedShared) {
+	const { createRequire } = await _module();
+	const { realpathSync } = await _fs();
+	const { join } = await _path();
+	const requires = [];
+	try {
+		const entry = process.argv[1] && realpathSync(process.argv[1]);
+		if (entry && !/[\\/]node_modules[\\/]/.test(entry)) requires.push(createRequire(entry));
+	} catch {}
+	requires.push(createRequire(join(process.cwd(), "noop.js")));
+	const rebased = {};
+	for (const [specifier, buildPath] of Object.entries(resolvedShared)) {
+		rebased[specifier] = buildPath;
+		for (const require of requires) try {
+			rebased[specifier] = require.resolve(specifier);
+			break;
+		} catch {}
+	}
+	return rebased;
+}
 function ssrEntryLoaderPlugin(options = {}) {
 	const resolved = {
 		resolvedShared: options.resolvedShared ?? {},
@@ -947,10 +997,17 @@ function ssrEntryLoaderPlugin(options = {}) {
 		fetchMaxBytes: options.fetchMaxBytes ?? 10485760,
 		cacheContext: {}
 	};
+	let rebased;
 	return {
 		name: "mf-vite:ssr-entry-loader",
 		async loadEntry({ remoteInfo, origin }) {
 			if (!isNodeServer()) return;
+			if (options.rebaseSharedAtRuntime) {
+				rebased ??= rebaseResolvedShared(resolved.resolvedShared).then((map) => {
+					resolved.resolvedShared = map;
+				}, () => {});
+				await rebased;
+			}
 			const loadOptions = origin ? {
 				...resolved,
 				cacheContext: origin,
@@ -968,4 +1025,4 @@ function ssrEntryLoaderPlugin(options = {}) {
 	};
 }
 //#endregion
-export { ssrEntryLoaderPlugin as a, fetchWithTimeout as c, revalidate as i, readResponseTextBounded as l, SsrEntryHttpError as n, DEFAULT_SSR_FETCH_MAX_BYTES as o, neutralizeBrowserPreloadHelpers as r, DEFAULT_SSR_FETCH_TIMEOUT_MS as s, SSR_ENTRY_LOADER_STATE_KEY as t };
+export { ssrEntryLoaderPlugin as a, fetchWithTimeout as c, revalidate as i, getBodyPreview as l, SsrEntryHttpError as n, DEFAULT_SSR_FETCH_MAX_BYTES as o, neutralizeBrowserPreloadHelpers as r, DEFAULT_SSR_FETCH_TIMEOUT_MS as s, SSR_ENTRY_LOADER_STATE_KEY as t, readResponseTextBounded as u };

package/lib/{ssrVmStrategy-BkyvcG4s.js → ssrVmStrategy-BCaiSEbA.js}

@@ -1,5 +1,6 @@
-import { t as findSharedKey } from "./sharedKeyMatcher-CHp4QRNq.js";
-import { c as fetchWithTimeout, l as readResponseTextBounded, n as SsrEntryHttpError, r as neutralizeBrowserPreloadHelpers } from "./ssrEntryLoader-CHdWk8Yg.js";
+import { l as isHttpUrl } from "./logger-D67aJYOe.js";
+import { t as findSharedKey } from "./sharedKeyMatcher-C04bVN1q.js";
+import { c as fetchWithTimeout, l as getBodyPreview, n as SsrEntryHttpError, r as neutralizeBrowserPreloadHelpers, u as readResponseTextBounded } from "./ssrEntryLoader-Bh2Tq1cZ.js";
 //#region src/utils/ssrVmStrategy.ts
 /**
 * vm.SourceTextModule strategy for loading remote SSR entries.
@@ -163,18 +164,12 @@ function clearVmStrategyCaches(remoteEntryUrl) {
 	clearOwnedVmCache(httpModuleCache, httpModuleCacheOwners, remoteEntryUrl);
 	clearOwnedVmCache(namespaceCache, namespaceCacheOwners, remoteEntryUrl);
 }
-function getBodyPreview(body) {
-	return body.slice(0, 240).replace(/\s+/g, " ").trim();
-}
 async function fetchModuleSource(url, fetchTimeoutMs, fetchMaxBytes) {
 	const res = await fetchWithTimeout(url, {}, fetchTimeoutMs);
 	const text = await readResponseTextBounded(res, fetchMaxBytes ?? 10485760, url);
 	if (!res.ok) throw new SsrEntryHttpError(url, res.status, res.statusText, getBodyPreview(text));
 	return neutralizeBrowserPreloadHelpers(text);
 }
-function isHttpUrl(value) {
-	return value.startsWith("http://") || value.startsWith("https://");
-}
 /** Resolve a specifier against the referencing module's URL; null for bare specifiers. */
 function resolveSpecifierUrl(specifier, referencerUrl) {
 	if (isHttpUrl(specifier)) return specifier;

package/lib/utils/ssrEntryLoader.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@module-federation/vite",
-  "version": "1.23.5",
+  "version": "1.23.6",
   "description": "Vite plugin for Module Federation",
   "type": "module",
   "main": "./lib/index.js",
@@ -74,7 +74,7 @@
   "homepage": "https://github.com/module-federation/vite#readme",
   "packageManager": "pnpm@10.28.2",
   "peerDependencies": {
-    "vite": "^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0"
+    "vite": "^5.1.0 || ^6.0.0 || ^7.0.0 || ^8.0.0"
   },
   "dependencies": {
     "@module-federation/dts-plugin": "2.9.2",
@@ -90,7 +90,7 @@
     "rollup": "4.62.3",
     "tsdown": "0.22.14",
     "typescript": "7.0.2",
-    "vite": "8.2.0",
-    "vitest": "4.1.11"
+    "vite": "8.2.4",
+    "vitest": "4.1.12"
   }
 }