@lovable.dev/vite-tanstack-config 2.19.2 → 2.19.4

package/dist/dev-server-bridge.cjs

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-let node_fs_promises = require("node:fs/promises");
 let node_path = require("node:path");
+let node_fs_promises = require("node:fs/promises");
 //#region src/dev-server-bridge/error-collector.ts
 const DEFAULT_ENDPOINT = "/__lovable/error-collector";
 const DEFAULT_OUTPUT_FILE = "/tmp/runtime-errors.log";

package/dist/dev-server-bridge.js

@@ -1,5 +1,5 @@
-import { appendFile, mkdir, writeFile } from "node:fs/promises";
 import { dirname, resolve } from "node:path";
+import { appendFile, mkdir, writeFile } from "node:fs/promises";
 //#region src/dev-server-bridge/error-collector.ts
 const DEFAULT_ENDPOINT = "/__lovable/error-collector";
 const DEFAULT_OUTPUT_FILE = "/tmp/runtime-errors.log";

package/dist/index.cjs

@@ -21,6 +21,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 	enumerable: true
 }) : target, mod));
 //#endregion
+let node_path = require("node:path");
 let node_url = require("node:url");
 let vite = require("vite");
 let node_https = require("node:https");
@@ -152,7 +153,7 @@ function bundledDevCssUrlShim() {
 //#endregion
 //#region package.json
 var name = "@lovable.dev/vite-tanstack-config";
-var version = "2.19.2";
+var version = "2.19.4";
 //#endregion
 //#region src/logging.ts
 const PACKAGE_NAME = "@lovable.dev/vite-tanstack-config";
@@ -745,7 +746,7 @@ function stripRedundantNodejsCompatFlag() {
 			order: "post",
 			handler: async () => {
 				const { readFile, writeFile } = await import("node:fs/promises");
-				const configPath = (await import("node:path")).join(root, SANDBOX_WRANGLER_CONFIG_PATH);
+				const configPath = (0, node_path.join)(root, SANDBOX_WRANGLER_CONFIG_PATH);
 				let parsed;
 				try {
 					parsed = JSON.parse(await readFile(configPath, "utf8"));
@@ -768,14 +769,16 @@ function stripRedundantNodejsCompatFlag() {
 	};
 }
 const NITRO_SERVER_ENTRY = "index.mjs";
+const NITRO_DEFAULT_OUTPUT_DIR = ".output";
+const VITE_DEFAULT_OUTPUT_DIR = "dist";
 const NITRO_WRANGLER_CONFIG = "wrangler.json";
 const DEFAULT_SERVER_ENTRY_NAME = "server";
 const PRERENDER_PREVIEW_HOST = "127.0.0.1";
 const TSS_PRERENDERING_ENV = "TSS_PRERENDERING";
 const SHIM_MARKER = "// Generated by @lovable.dev/vite-tanstack-config for the prerender preview server.";
-function prerenderShimSource(vars) {
+function prerenderShimSource(vars, entrySpecifier) {
 	return `${SHIM_MARKER}
-import server from "./${NITRO_SERVER_ENTRY}";
+import server from "${entrySpecifier}";
 
 const env = ${JSON.stringify(vars)};
 const ctx = { waitUntil() {}, passThroughOnException() {}, props: {} };
@@ -790,16 +793,54 @@ export default {
 };
 `;
 }
-function prerenderPreviewShim(state) {
+function captureNitroServerDir(nitroOpts) {
+	const output = {};
+	const hooks = nitroOpts.hooks ?? {};
+	const userCompiled = hooks.compiled;
+	nitroOpts.hooks = {
+		...hooks,
+		compiled: async (nitro) => {
+			const serverDir = nitro?.options?.output?.serverDir;
+			if (typeof serverDir === "string") output.serverDir = serverDir;
+			if (typeof userCompiled === "function") await userCompiled(nitro);
+		}
+	};
+	return output;
+}
+function previewServerOutputDir(viteConfig) {
+	const ssrOutDir = viteConfig?.environments?.ssr?.build?.outDir;
+	if (typeof ssrOutDir === "string") return ssrOutDir;
+	const rootOutDir = viteConfig?.build?.outDir;
+	return (0, node_path.join)(typeof rootOutDir === "string" ? rootOutDir : VITE_DEFAULT_OUTPUT_DIR, "server");
+}
+function pinnedNitroServerDir(nitroOpts) {
+	const output = nitroOpts.output;
+	const dir = typeof output?.dir === "string" ? output.dir : void 0;
+	const serverDir = typeof output?.serverDir === "string" ? output.serverDir : void 0;
+	const resolved = serverDir ? serverDir.replace(/\{\{\s*output\.dir\s*\}\}/g, dir ?? NITRO_DEFAULT_OUTPUT_DIR) : dir && (0, node_path.join)(dir, "server");
+	return resolved && !resolved.includes("{{") ? resolved : void 0;
+}
+function prerenderShimDirs(viteConfig, nitroOpts) {
+	const shimDir = previewServerOutputDir(viteConfig);
+	const candidates = [
+		pinnedNitroServerDir(nitroOpts),
+		(0, node_path.join)(NITRO_DEFAULT_OUTPUT_DIR, "server"),
+		shimDir
+	];
+	return {
+		shimDir,
+		entryDirs: [...new Set(candidates.filter((dir) => !!dir))],
+		nitroOutput: captureNitroServerDir(nitroOpts)
+	};
+}
+function prerenderPreviewShim(state, dirs) {
 	let root = process.cwd();
-	let serverOutDir = SERVER_OUTPUT_DIR;
 	let serverEntryName = DEFAULT_SERVER_ENTRY_NAME;
 	return {
 		name: "lovable-prerender-preview-shim",
 		apply: "build",
 		config(userConfig) {
 			const ssrBuild = userConfig.environments?.ssr?.build;
-			if (ssrBuild?.outDir) serverOutDir = ssrBuild.outDir;
 			const input = ssrBuild?.rolldownOptions?.input ?? ssrBuild?.rollupOptions?.input;
 			if (typeof input === "string") serverEntryName = input;
 		},
@@ -809,8 +850,7 @@ function prerenderPreviewShim(state) {
 		buildApp: {
 			order: "post",
 			handler: async () => {
-				const { access, readFile, writeFile } = await import("node:fs/promises");
-				const nodePath = await import("node:path");
+				const { access, mkdir, readFile, writeFile } = await import("node:fs/promises");
 				const exists = async (candidate) => {
 					try {
 						await access(candidate);
@@ -819,25 +859,41 @@ function prerenderPreviewShim(state) {
 						return false;
 					}
 				};
-				const outDir = nodePath.resolve(root, serverOutDir);
-				if (!await exists(nodePath.join(outDir, NITRO_SERVER_ENTRY))) return;
-				const basename = nodePath.basename(serverEntryName, nodePath.extname(serverEntryName));
-				if (!basename || basename === "index") {
-					logWarning(`Cannot prerender: the server entry "${serverEntryName}" would need a shim at ${SERVER_OUTPUT_DIR}/index.js, which outranks nitro's own entry when publishing. Rename the entry to anything but \`index\`.`);
+				const found = [dirs.nitroOutput.serverDir, ...dirs.entryDirs].filter((dir) => !!dir);
+				const candidates = [...new Set(found)];
+				let entryDir;
+				for (const candidate of candidates) {
+					const resolved = (0, node_path.resolve)(root, candidate);
+					if (await exists((0, node_path.join)(resolved, NITRO_SERVER_ENTRY))) {
+						entryDir = resolved;
+						break;
+					}
+				}
+				if (!entryDir) {
+					logWarning(`Cannot prerender: nitro's ${NITRO_SERVER_ENTRY} is in none of ${candidates.join(", ")}, so the preview shim was not written and every prerendered route will fall back to SSR.`);
+					return;
+				}
+				const entryName = (0, node_path.basename)(serverEntryName, (0, node_path.extname)(serverEntryName));
+				const wouldOutrankNitroEntry = entryName === "index" && dirs.shimDir === SERVER_OUTPUT_DIR;
+				if (!entryName || wouldOutrankNitroEntry) {
+					logWarning(`Cannot prerender: the server entry "${serverEntryName}" would need a shim at ${dirs.shimDir}/index.js, which outranks nitro's own entry when publishing. Rename the entry to anything but \`index\`.`);
 					return;
 				}
-				const target = nodePath.join(outDir, `${basename}.js`);
+				const shimDir = (0, node_path.resolve)(root, dirs.shimDir);
+				const target = (0, node_path.join)(shimDir, `${entryName}.js`);
 				const occupant = await readFile(target, "utf8").catch(() => void 0);
 				if (occupant !== void 0 && !occupant.startsWith(SHIM_MARKER)) {
-					logWarning(`Cannot prerender: ${basename}.js already exists in ${serverOutDir} and was not written by this plugin.`);
+					logWarning(`Cannot prerender: ${entryName}.js already exists in ${dirs.shimDir} and was not written by this plugin.`);
 					return;
 				}
 				let vars = {};
 				try {
-					const candidate = JSON.parse(await readFile(nodePath.join(outDir, NITRO_WRANGLER_CONFIG), "utf8"))?.vars;
+					const candidate = JSON.parse(await readFile((0, node_path.join)(entryDir, NITRO_WRANGLER_CONFIG), "utf8"))?.vars;
 					if (candidate && typeof candidate === "object" && !Array.isArray(candidate)) vars = candidate;
 				} catch {}
-				await writeFile(target, prerenderShimSource(vars));
+				const specifier = (0, node_path.relative)(shimDir, (0, node_path.join)(entryDir, NITRO_SERVER_ENTRY)).split(node_path.sep).join("/");
+				await mkdir(shimDir, { recursive: true });
+				await writeFile(target, prerenderShimSource(vars, specifier.startsWith(".") ? specifier : `./${specifier}`));
 				state.file = target;
 			}
 		}
@@ -1098,10 +1154,11 @@ function defineConfig(configOrOptions = {}) {
 						};
 					}
 				} else if (!nitroOpts.preset && !await nitroSupportsDefaultPreset()) logWarning("The installed `nitro` predates the `defaultPreset` option (3.0.260603-beta), so the Cloudflare fallback is ignored and a zero-config build may target Node instead. Upgrade nitro to >=3.0.260603-beta, or set an explicit `nitro: { preset: \"cloudflare-module\" }`.");
+				const shimDirs = prerenderEnabled ? prerenderShimDirs(options.vite, nitroOpts) : void 0;
 				internalPlugins.push(nitro(nitroOpts));
-				if (prerenderEnabled) {
+				if (shimDirs) {
 					const shimState = {};
-					internalPlugins.push(prerenderPreviewShim(shimState), prerenderPreviewShimCleanup(shimState));
+					internalPlugins.push(prerenderPreviewShim(shimState, shimDirs), prerenderPreviewShimCleanup(shimState));
 				}
 				if (isSandbox) internalPlugins.push(stripRedundantNodejsCompatFlag());
 			}

package/dist/index.js

@@ -1,3 +1,4 @@
+import { basename, extname, join, relative, resolve, sep } from "node:path";
 import { fileURLToPath } from "node:url";
 import { loadEnv, mergeConfig } from "vite";
 import https from "node:https";
@@ -128,7 +129,7 @@ function bundledDevCssUrlShim() {
 //#endregion
 //#region package.json
 var name = "@lovable.dev/vite-tanstack-config";
-var version = "2.19.2";
+var version = "2.19.4";
 //#endregion
 //#region src/logging.ts
 const PACKAGE_NAME = "@lovable.dev/vite-tanstack-config";
@@ -721,7 +722,7 @@ function stripRedundantNodejsCompatFlag() {
 			order: "post",
 			handler: async () => {
 				const { readFile, writeFile } = await import("node:fs/promises");
-				const configPath = (await import("node:path")).join(root, SANDBOX_WRANGLER_CONFIG_PATH);
+				const configPath = join(root, SANDBOX_WRANGLER_CONFIG_PATH);
 				let parsed;
 				try {
 					parsed = JSON.parse(await readFile(configPath, "utf8"));
@@ -744,14 +745,16 @@ function stripRedundantNodejsCompatFlag() {
 	};
 }
 const NITRO_SERVER_ENTRY = "index.mjs";
+const NITRO_DEFAULT_OUTPUT_DIR = ".output";
+const VITE_DEFAULT_OUTPUT_DIR = "dist";
 const NITRO_WRANGLER_CONFIG = "wrangler.json";
 const DEFAULT_SERVER_ENTRY_NAME = "server";
 const PRERENDER_PREVIEW_HOST = "127.0.0.1";
 const TSS_PRERENDERING_ENV = "TSS_PRERENDERING";
 const SHIM_MARKER = "// Generated by @lovable.dev/vite-tanstack-config for the prerender preview server.";
-function prerenderShimSource(vars) {
+function prerenderShimSource(vars, entrySpecifier) {
 	return `${SHIM_MARKER}
-import server from "./${NITRO_SERVER_ENTRY}";
+import server from "${entrySpecifier}";
 
 const env = ${JSON.stringify(vars)};
 const ctx = { waitUntil() {}, passThroughOnException() {}, props: {} };
@@ -766,16 +769,54 @@ export default {
 };
 `;
 }
-function prerenderPreviewShim(state) {
+function captureNitroServerDir(nitroOpts) {
+	const output = {};
+	const hooks = nitroOpts.hooks ?? {};
+	const userCompiled = hooks.compiled;
+	nitroOpts.hooks = {
+		...hooks,
+		compiled: async (nitro) => {
+			const serverDir = nitro?.options?.output?.serverDir;
+			if (typeof serverDir === "string") output.serverDir = serverDir;
+			if (typeof userCompiled === "function") await userCompiled(nitro);
+		}
+	};
+	return output;
+}
+function previewServerOutputDir(viteConfig) {
+	const ssrOutDir = viteConfig?.environments?.ssr?.build?.outDir;
+	if (typeof ssrOutDir === "string") return ssrOutDir;
+	const rootOutDir = viteConfig?.build?.outDir;
+	return join(typeof rootOutDir === "string" ? rootOutDir : VITE_DEFAULT_OUTPUT_DIR, "server");
+}
+function pinnedNitroServerDir(nitroOpts) {
+	const output = nitroOpts.output;
+	const dir = typeof output?.dir === "string" ? output.dir : void 0;
+	const serverDir = typeof output?.serverDir === "string" ? output.serverDir : void 0;
+	const resolved = serverDir ? serverDir.replace(/\{\{\s*output\.dir\s*\}\}/g, dir ?? NITRO_DEFAULT_OUTPUT_DIR) : dir && join(dir, "server");
+	return resolved && !resolved.includes("{{") ? resolved : void 0;
+}
+function prerenderShimDirs(viteConfig, nitroOpts) {
+	const shimDir = previewServerOutputDir(viteConfig);
+	const candidates = [
+		pinnedNitroServerDir(nitroOpts),
+		join(NITRO_DEFAULT_OUTPUT_DIR, "server"),
+		shimDir
+	];
+	return {
+		shimDir,
+		entryDirs: [...new Set(candidates.filter((dir) => !!dir))],
+		nitroOutput: captureNitroServerDir(nitroOpts)
+	};
+}
+function prerenderPreviewShim(state, dirs) {
 	let root = process.cwd();
-	let serverOutDir = SERVER_OUTPUT_DIR;
 	let serverEntryName = DEFAULT_SERVER_ENTRY_NAME;
 	return {
 		name: "lovable-prerender-preview-shim",
 		apply: "build",
 		config(userConfig) {
 			const ssrBuild = userConfig.environments?.ssr?.build;
-			if (ssrBuild?.outDir) serverOutDir = ssrBuild.outDir;
 			const input = ssrBuild?.rolldownOptions?.input ?? ssrBuild?.rollupOptions?.input;
 			if (typeof input === "string") serverEntryName = input;
 		},
@@ -785,8 +826,7 @@ function prerenderPreviewShim(state) {
 		buildApp: {
 			order: "post",
 			handler: async () => {
-				const { access, readFile, writeFile } = await import("node:fs/promises");
-				const nodePath = await import("node:path");
+				const { access, mkdir, readFile, writeFile } = await import("node:fs/promises");
 				const exists = async (candidate) => {
 					try {
 						await access(candidate);
@@ -795,25 +835,41 @@ function prerenderPreviewShim(state) {
 						return false;
 					}
 				};
-				const outDir = nodePath.resolve(root, serverOutDir);
-				if (!await exists(nodePath.join(outDir, NITRO_SERVER_ENTRY))) return;
-				const basename = nodePath.basename(serverEntryName, nodePath.extname(serverEntryName));
-				if (!basename || basename === "index") {
-					logWarning(`Cannot prerender: the server entry "${serverEntryName}" would need a shim at ${SERVER_OUTPUT_DIR}/index.js, which outranks nitro's own entry when publishing. Rename the entry to anything but \`index\`.`);
+				const found = [dirs.nitroOutput.serverDir, ...dirs.entryDirs].filter((dir) => !!dir);
+				const candidates = [...new Set(found)];
+				let entryDir;
+				for (const candidate of candidates) {
+					const resolved = resolve(root, candidate);
+					if (await exists(join(resolved, NITRO_SERVER_ENTRY))) {
+						entryDir = resolved;
+						break;
+					}
+				}
+				if (!entryDir) {
+					logWarning(`Cannot prerender: nitro's ${NITRO_SERVER_ENTRY} is in none of ${candidates.join(", ")}, so the preview shim was not written and every prerendered route will fall back to SSR.`);
+					return;
+				}
+				const entryName = basename(serverEntryName, extname(serverEntryName));
+				const wouldOutrankNitroEntry = entryName === "index" && dirs.shimDir === SERVER_OUTPUT_DIR;
+				if (!entryName || wouldOutrankNitroEntry) {
+					logWarning(`Cannot prerender: the server entry "${serverEntryName}" would need a shim at ${dirs.shimDir}/index.js, which outranks nitro's own entry when publishing. Rename the entry to anything but \`index\`.`);
 					return;
 				}
-				const target = nodePath.join(outDir, `${basename}.js`);
+				const shimDir = resolve(root, dirs.shimDir);
+				const target = join(shimDir, `${entryName}.js`);
 				const occupant = await readFile(target, "utf8").catch(() => void 0);
 				if (occupant !== void 0 && !occupant.startsWith(SHIM_MARKER)) {
-					logWarning(`Cannot prerender: ${basename}.js already exists in ${serverOutDir} and was not written by this plugin.`);
+					logWarning(`Cannot prerender: ${entryName}.js already exists in ${dirs.shimDir} and was not written by this plugin.`);
 					return;
 				}
 				let vars = {};
 				try {
-					const candidate = JSON.parse(await readFile(nodePath.join(outDir, NITRO_WRANGLER_CONFIG), "utf8"))?.vars;
+					const candidate = JSON.parse(await readFile(join(entryDir, NITRO_WRANGLER_CONFIG), "utf8"))?.vars;
 					if (candidate && typeof candidate === "object" && !Array.isArray(candidate)) vars = candidate;
 				} catch {}
-				await writeFile(target, prerenderShimSource(vars));
+				const specifier = relative(shimDir, join(entryDir, NITRO_SERVER_ENTRY)).split(sep).join("/");
+				await mkdir(shimDir, { recursive: true });
+				await writeFile(target, prerenderShimSource(vars, specifier.startsWith(".") ? specifier : `./${specifier}`));
 				state.file = target;
 			}
 		}
@@ -1074,10 +1130,11 @@ function defineConfig(configOrOptions = {}) {
 						};
 					}
 				} else if (!nitroOpts.preset && !await nitroSupportsDefaultPreset()) logWarning("The installed `nitro` predates the `defaultPreset` option (3.0.260603-beta), so the Cloudflare fallback is ignored and a zero-config build may target Node instead. Upgrade nitro to >=3.0.260603-beta, or set an explicit `nitro: { preset: \"cloudflare-module\" }`.");
+				const shimDirs = prerenderEnabled ? prerenderShimDirs(options.vite, nitroOpts) : void 0;
 				internalPlugins.push(nitro(nitroOpts));
-				if (prerenderEnabled) {
+				if (shimDirs) {
 					const shimState = {};
-					internalPlugins.push(prerenderPreviewShim(shimState), prerenderPreviewShimCleanup(shimState));
+					internalPlugins.push(prerenderPreviewShim(shimState, shimDirs), prerenderPreviewShimCleanup(shimState));
 				}
 				if (isSandbox) internalPlugins.push(stripRedundantNodejsCompatFlag());
 			}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lovable.dev/vite-tanstack-config",
-  "version": "2.19.2",
+  "version": "2.19.4",
   "description": "Vite config wrapper for Lovable TanStack Start projects",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",