@module-federation/vite 1.20.4 → 1.20.5

package/lib/index.js

@@ -934,24 +934,7 @@ function normalizeSharedKey(key) {
 }
 function normalizeShared(shared) {
 	explicitSharedKeys = /* @__PURE__ */ new Set();
-	if (!shared) {
-		const result = {};
-		const packageJsonPath = path$1.join(getPackageDetectionCwd(), "package.json");
-		try {
-			const packageJson = JSON.parse(fs$2.readFileSync(packageJsonPath, "utf-8"));
-			if (packageJson.name === "@module-federation/vite") return result;
-			Object.keys(packageJson.dependencies || {}).filter((key) => shouldAutoShareDependency(key)).forEach((key) => {
-				result[key] = normalizeShareItem(key, {
-					name: key,
-					import: void 0,
-					singleton: true
-				});
-			});
-		} catch {
-			return result;
-		}
-		return result;
-	}
+	if (!shared) return {};
 	const result = {};
 	const sourceEntries = [];
 	if (Array.isArray(shared)) shared.forEach((key) => {
@@ -984,20 +967,6 @@ function normalizeShared(shared) {
 function isModuleFederationRuntimePackage(key) {
 	return key === "@module-federation/runtime" || key === "@module-federation/runtime-core";
 }
-function shouldAutoShareDependency(key) {
-	const pkg = getInstalledPackageJson(key)?.packageJson;
-	if (!pkg) return false;
-	if (!pkg.browser && !pkg.exports && typeof pkg.module !== "string") return false;
-	if (key === "@module-federation/vite" || isModuleFederationRuntimePackage(key)) return false;
-	const entry = [
-		pkg.module,
-		pkg.main,
-		typeof pkg.exports === "string" ? pkg.exports : void 0
-	].find((value) => typeof value === "string")?.replace(/\\/g, "/");
-	if (key === "nuxt" || key === "nuxt-nightly") return false;
-	if (key.includes("nuxt") && entry?.endsWith("/dist/module.mjs")) return false;
-	return true;
-}
 function normalizeLibrary(library) {
 	if (!library) return void 0;
 	return library;
@@ -5955,16 +5924,16 @@ const VUE_HMR_RUNTIME_GUARD_SCRIPT = `
 * the remote's bindings, so the render throws and Vue falls back to a full
 * reload required warning.
 *
-* Fix: rewrite the remote's emitted `__hmrId` literal to be prefixed with the
-* federation `name`, so the remote's instances live under a distinct key. The
-* accept callback emitted by plugin-vue reads `_sfc_main.__hmrId` /
-* `updated.__hmrId` at runtime, so rewriting the literal once is enough.
+* Fix: rewrite the remote's emitted HMR id literals to be prefixed with the
+* federation `name`, so the remote's instances live under a distinct key.
+* Main SFC modules assign `.__hmrId`; template submodules pass the same id
+* directly to `__VUE_HMR_RUNTIME__.rerender()`.
 */
-const SFC_HMR_ID_LITERAL_RE = /(\.__hmrId\s*=\s*["'`])([^"'`]+)(["'`])/g;
-function rewriteSfcHmrId(code, federationName) {
+const VUE_HMR_ID_LITERAL_RE = /((?:\.__hmrId\s*=|__VUE_HMR_RUNTIME__\.rerender\()\s*["'`])([^"'`]+)(["'`])/g;
+function rewriteVueHmrIds(code, federationName) {
 	let matched = false;
 	return {
-		code: code.replace(SFC_HMR_ID_LITERAL_RE, (_match, prefix, id, suffix) => {
+		code: code.replace(VUE_HMR_ID_LITERAL_RE, (_match, prefix, id, suffix) => {
 			matched = true;
 			if (id.startsWith(`${federationName}-`)) return `${prefix}${id}${suffix}`;
 			return `${prefix}${federationName}-${id}${suffix}`;
@@ -5976,7 +5945,7 @@ let pluginVueRegressionWarned = false;
 function warnPluginVueRegression() {
 	if (pluginVueRegressionWarned) return;
 	pluginVueRegressionWarned = true;
-	mfWarn("Detected a Vue SFC module that calls `__VUE_HMR_RUNTIME__.createRecord(` but no `.__hmrId = \"...\"` literal could be rewritten. @vitejs/plugin-vue may have changed its output format — without the rewrite, host and remote SFCs that share a path will collide on the shared HMR runtime. Please report this to @module-federation/vite.");
+	mfWarn("Detected a Vue SFC module with HMR calls but no HMR id literal could be rewritten. @vitejs/plugin-vue may have changed its output format — without the rewrite, host and remote SFCs that share a path will collide on the shared HMR runtime. Please report this to @module-federation/vite.");
 }
 const vueAdapter = {
 	name: "vue",
@@ -5989,8 +5958,8 @@ const vueAdapter = {
 		}];
 	} },
 	remote: { transform(code, _id, ctx) {
-		if (!code.includes("__VUE_HMR_RUNTIME__.createRecord(")) return;
-		const { code: rewritten, matched } = rewriteSfcHmrId(code, ctx.options.name);
+		if (!code.includes("__VUE_HMR_RUNTIME__.createRecord(") && !code.includes("__VUE_HMR_RUNTIME__.rerender(")) return;
+		const { code: rewritten, matched } = rewriteVueHmrIds(code, ctx.options.name);
 		if (!matched) {
 			warnPluginVueRegression();
 			return;
@@ -8962,8 +8931,8 @@ function readBoundedRunnerBody(req, res) {
 function pluginSSRRemoteEntry(options) {
 	const remoteEntrySSRId = getRemoteEntrySSRId(options);
 	const virtualExposesSSRId = getVirtualExposesSSRId(options);
-	let isRolldown = false;
-	let ssrOutputFilename = "";
+	let cachedSsrRemoteEntrySource;
+	const ssrOutputFilename = getSsrRemoteEntryFileName(options.filename);
 	let ssrOutputFiles = /* @__PURE__ */ new Set();
 	let ssrOutputDir = "";
 	let clientOutputDir = "";
@@ -8980,6 +8949,16 @@ function pluginSSRRemoteEntry(options) {
 	let viteConfig;
 	let isNuxtProject = false;
 	let reactIslandExposes = /* @__PURE__ */ new Set();
+	const isSsrRemoteEntryBuild = (environment) => {
+		const environmentName = environment?.name;
+		const hasSsrEnvironment = Boolean(viteConfig?.environments?.ssr);
+		const isLegacySsrBuild = Boolean(environment?.config?.build?.ssr ?? viteConfig?.build?.ssr);
+		return Object.keys(options.exposes).length > 0 && !(hasSsrEnvironment && environmentName !== "ssr" || !hasSsrEnvironment && !isLegacySsrBuild);
+	};
+	const getSsrRemoteEntrySource = () => {
+		if (cachedSsrRemoteEntrySource === void 0) cachedSsrRemoteEntrySource = generateRemoteEntrySSR(options);
+		return cachedSsrRemoteEntrySource;
+	};
 	const findNuxtExposesChunk = (bundle) => {
 		const exposeKeys = Object.keys(options.exposes);
 		if (exposeKeys.length === 0) return;
@@ -9106,13 +9085,9 @@ function pluginSSRRemoteEntry(options) {
 		},
 		buildStart() {
 			if (isServe) return;
-			isRolldown = getIsRolldown(this);
-			ssrOutputFilename = getSsrRemoteEntryFileName(options.filename);
-			const environmentName = this.environment?.name;
-			const hasSsrEnvironment = Boolean(viteConfig?.environments?.ssr);
-			const isLegacySsrBuild = Boolean(this.environment?.config?.build?.ssr ?? viteConfig?.build?.ssr);
-			if (hasSsrEnvironment && environmentName !== "ssr" || !hasSsrEnvironment && !isLegacySsrBuild) return;
-			if (Object.keys(options.exposes).length === 0) return;
+			const isRolldown = getIsRolldown(this);
+			const environment = this.environment;
+			if (!isSsrRemoteEntryBuild(environment)) return;
 			if (isRolldown) this.emitFile({
 				type: "chunk",
 				id: remoteEntrySSRId,
@@ -9120,20 +9095,27 @@ function pluginSSRRemoteEntry(options) {
 				fileName: ssrOutputFilename,
 				preserveSignature: "strict"
 			});
-			else this.emitFile({
-				type: "asset",
-				fileName: ssrOutputFilename,
-				source: generateRemoteEntrySSR(options)
-			});
 		},
-		generateBundle(_options, bundle) {
-			const exposesChunk = findNuxtExposesChunk(bundle);
-			const ssrAsset = bundle[ssrOutputFilename];
-			if (exposesChunk && ssrAsset?.type === "asset" && typeof ssrAsset.source === "string") ssrAsset.source = ssrAsset.source.replace(/import\("virtual:mf-exposes-ssr:[^"]+"\)/g, `import("./${exposesChunk}")`);
-			if (this.environment?.name === "ssr") ssrOutputFiles = collectEntryOutputFiles(bundle, ssrOutputFilename);
-			if (!isRolldown) return;
-			const chunk = bundle[ssrOutputFilename];
-			if (!chunk || chunk.type !== "chunk") return;
+		generateBundle: {
+			order: "post",
+			handler(_options, bundle) {
+				const isRolldown = getIsRolldown(this);
+				const environment = this.environment;
+				const exposesChunk = findNuxtExposesChunk(bundle);
+				if (!isRolldown && isSsrRemoteEntryBuild(environment)) {
+					let source = getSsrRemoteEntrySource();
+					if (exposesChunk) source = source.replace(/import\("virtual:mf-exposes-ssr:[^"]+"\)/g, `import("./${exposesChunk}")`);
+					this.emitFile({
+						type: "asset",
+						fileName: ssrOutputFilename,
+						source
+					});
+				}
+				if (this.environment?.name === "ssr") ssrOutputFiles = collectEntryOutputFiles(bundle, ssrOutputFilename);
+				if (!isRolldown) return;
+				const chunk = bundle[ssrOutputFilename];
+				if (!chunk || chunk.type !== "chunk") return;
+			}
 		},
 		writeBundle(outputOptions) {
 			const environmentName = this.environment?.name;
@@ -9976,6 +9958,7 @@ function federation(mfUserOptions) {
 			name: "vite:module-federation-virtual-modules",
 			enforce: "pre",
 			resolveId(id) {
+				if (id === "@module-federation/vite/ssrEntryLoader") return resolveImportPath(id);
 				let virtualModule = VirtualModule.findById(id);
 				if (!virtualModule) {
 					materializeCachedLoadShareModule({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@module-federation/vite",
-  "version": "1.20.4",
+  "version": "1.20.5",
   "description": "Vite plugin for Module Federation",
   "type": "module",
   "main": "./lib/index.js",