@lovable.dev/vite-tanstack-config 2.18.0 → 2.19.0

package/dist/index.cjs

@@ -152,7 +152,7 @@ function bundledDevCssUrlShim() {
 //#endregion
 //#region package.json
 var name = "@lovable.dev/vite-tanstack-config";
-var version = "2.18.0";
+var version = "2.19.0";
 //#endregion
 //#region src/logging.ts
 const PACKAGE_NAME = "@lovable.dev/vite-tanstack-config";
@@ -198,15 +198,17 @@ function normalizeBasePath(raw) {
 	return trimmed.startsWith("/") ? trimmed : `/${trimmed}`;
 }
 function withoutBasePath(route, basePath) {
-	if (route === basePath) return "/";
 	if (basePath === "") return route;
-	return route.startsWith(`${basePath}/`) ? route.slice(basePath.length) : route;
+	if (route === basePath) return "/";
+	if (route.startsWith(`${basePath}/`)) return route.slice(basePath.length);
+	return route.startsWith(basePath) ? void 0 : route;
 }
 function documentEntryForPage(page, basePath = "") {
 	if (typeof page.prerender?.outputPath === "string") return void 0;
 	const pagePath = normalizeRoute(page.path);
 	if (pagePath === void 0) return void 0;
 	const inner = withoutBasePath(pagePath, basePath);
+	if (inner === void 0) return void 0;
 	const route = normalizeRoute(`${basePath}${inner}`);
 	if (route === void 0) return void 0;
 	const file = inner === "/" ? "index.html" : `${inner.slice(1)}/index.html`;
@@ -261,6 +263,11 @@ async function whichExist(paths, access) {
 	}
 	return exists;
 }
+/** How the error names the public dir, which vite lets a project point anywhere. */
+function publicDirLabel(root, publicDir, nodePath) {
+	const relative = nodePath.relative(root, publicDir);
+	return relative !== "" && !relative.startsWith("..") ? relative.split(nodePath.sep).join("/") : publicDir;
+}
 function createDocumentSet(routerBasePath) {
 	const basePath = normalizeBasePath(routerBasePath);
 	const basePathServable = basePath === "" || normalizeRoute(basePath) === basePath;
@@ -268,6 +275,7 @@ function createDocumentSet(routerBasePath) {
 	const documents = /* @__PURE__ */ new Map();
 	let root = process.cwd();
 	let clientOutputDir = CLIENT_OUTPUT_DIR;
+	let publicDir = "";
 	const plugin = {
 		name: DOCUMENT_SET_PLUGIN_NAME,
 		apply: "build",
@@ -279,6 +287,7 @@ function createDocumentSet(routerBasePath) {
 			const ours = names.indexOf(DOCUMENT_SET_PLUGIN_NAME);
 			if (theirs !== -1 && ours !== -1 && ours < theirs) logWarning(`Prerendered routes will fall back to SSR: ${DOCUMENT_SET_PLUGIN_NAME} is registered before ${TANSTACK_POST_BUILD_PLUGIN}, so the document set is written before the prerender pass runs.`);
 			clientOutputDir = config.environments?.client?.build?.outDir ?? CLIENT_OUTPUT_DIR;
+			publicDir = (config.environments?.client?.build?.copyPublicDir ?? config.build?.copyPublicDir) !== false && typeof config.publicDir === "string" ? config.publicDir : "";
 		},
 		buildApp: {
 			order: "post",
@@ -290,6 +299,20 @@ function createDocumentSet(routerBasePath) {
 					logWarning(`Could not remove a previous build's document set: ${String(error)}`);
 				});
 				if (documents.size === 0) return;
+				const collisions = [];
+				if (publicDir !== "") {
+					const candidates = [...documents].map(([route, file]) => ({
+						route,
+						file
+					}));
+					const committed = await whichExist(candidates.map(({ file }) => nodePath.join(publicDir, file)), access);
+					for (const [index, candidate] of candidates.entries()) if (committed[index]) collisions.push(candidate);
+				}
+				if (collisions.length > 0) {
+					const label = publicDirLabel(root, publicDir, nodePath);
+					const pairs = collisions.sort(compareRoutes).map(({ route, file }) => `  ${route} overwrites ${label}/${file}`);
+					throw new Error(`[${PACKAGE_NAME}] Prerendering would overwrite ${collisions.length} committed file(s) under ${label}/:\n${pairs.join("\n")}\nEach route's prerendered HTML is written into the client build after vite copies ${label}/, so every committed file above is replaced by its rendered route and never ships.\nFix each line above in one of two ways: delete or rename the ${label}/ file, or stop prerendering the route (drop it from \`pages\` in vite.config, or return false for it from \`prerender.filter\`).`);
+				}
 				const clientDir = nodePath.resolve(root, clientOutputDir);
 				const entries = [...documents].map(([route, file]) => ({
 					route,

package/dist/index.js

@@ -128,7 +128,7 @@ function bundledDevCssUrlShim() {
 //#endregion
 //#region package.json
 var name = "@lovable.dev/vite-tanstack-config";
-var version = "2.18.0";
+var version = "2.19.0";
 //#endregion
 //#region src/logging.ts
 const PACKAGE_NAME = "@lovable.dev/vite-tanstack-config";
@@ -174,15 +174,17 @@ function normalizeBasePath(raw) {
 	return trimmed.startsWith("/") ? trimmed : `/${trimmed}`;
 }
 function withoutBasePath(route, basePath) {
-	if (route === basePath) return "/";
 	if (basePath === "") return route;
-	return route.startsWith(`${basePath}/`) ? route.slice(basePath.length) : route;
+	if (route === basePath) return "/";
+	if (route.startsWith(`${basePath}/`)) return route.slice(basePath.length);
+	return route.startsWith(basePath) ? void 0 : route;
 }
 function documentEntryForPage(page, basePath = "") {
 	if (typeof page.prerender?.outputPath === "string") return void 0;
 	const pagePath = normalizeRoute(page.path);
 	if (pagePath === void 0) return void 0;
 	const inner = withoutBasePath(pagePath, basePath);
+	if (inner === void 0) return void 0;
 	const route = normalizeRoute(`${basePath}${inner}`);
 	if (route === void 0) return void 0;
 	const file = inner === "/" ? "index.html" : `${inner.slice(1)}/index.html`;
@@ -237,6 +239,11 @@ async function whichExist(paths, access) {
 	}
 	return exists;
 }
+/** How the error names the public dir, which vite lets a project point anywhere. */
+function publicDirLabel(root, publicDir, nodePath) {
+	const relative = nodePath.relative(root, publicDir);
+	return relative !== "" && !relative.startsWith("..") ? relative.split(nodePath.sep).join("/") : publicDir;
+}
 function createDocumentSet(routerBasePath) {
 	const basePath = normalizeBasePath(routerBasePath);
 	const basePathServable = basePath === "" || normalizeRoute(basePath) === basePath;
@@ -244,6 +251,7 @@ function createDocumentSet(routerBasePath) {
 	const documents = /* @__PURE__ */ new Map();
 	let root = process.cwd();
 	let clientOutputDir = CLIENT_OUTPUT_DIR;
+	let publicDir = "";
 	const plugin = {
 		name: DOCUMENT_SET_PLUGIN_NAME,
 		apply: "build",
@@ -255,6 +263,7 @@ function createDocumentSet(routerBasePath) {
 			const ours = names.indexOf(DOCUMENT_SET_PLUGIN_NAME);
 			if (theirs !== -1 && ours !== -1 && ours < theirs) logWarning(`Prerendered routes will fall back to SSR: ${DOCUMENT_SET_PLUGIN_NAME} is registered before ${TANSTACK_POST_BUILD_PLUGIN}, so the document set is written before the prerender pass runs.`);
 			clientOutputDir = config.environments?.client?.build?.outDir ?? CLIENT_OUTPUT_DIR;
+			publicDir = (config.environments?.client?.build?.copyPublicDir ?? config.build?.copyPublicDir) !== false && typeof config.publicDir === "string" ? config.publicDir : "";
 		},
 		buildApp: {
 			order: "post",
@@ -266,6 +275,20 @@ function createDocumentSet(routerBasePath) {
 					logWarning(`Could not remove a previous build's document set: ${String(error)}`);
 				});
 				if (documents.size === 0) return;
+				const collisions = [];
+				if (publicDir !== "") {
+					const candidates = [...documents].map(([route, file]) => ({
+						route,
+						file
+					}));
+					const committed = await whichExist(candidates.map(({ file }) => nodePath.join(publicDir, file)), access);
+					for (const [index, candidate] of candidates.entries()) if (committed[index]) collisions.push(candidate);
+				}
+				if (collisions.length > 0) {
+					const label = publicDirLabel(root, publicDir, nodePath);
+					const pairs = collisions.sort(compareRoutes).map(({ route, file }) => `  ${route} overwrites ${label}/${file}`);
+					throw new Error(`[${PACKAGE_NAME}] Prerendering would overwrite ${collisions.length} committed file(s) under ${label}/:\n${pairs.join("\n")}\nEach route's prerendered HTML is written into the client build after vite copies ${label}/, so every committed file above is replaced by its rendered route and never ships.\nFix each line above in one of two ways: delete or rename the ${label}/ file, or stop prerendering the route (drop it from \`pages\` in vite.config, or return false for it from \`prerender.filter\`).`);
+				}
 				const clientDir = nodePath.resolve(root, clientOutputDir);
 				const entries = [...documents].map(([route, file]) => ({
 					route,

package/package.json

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