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

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.1";
 //#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`;
@@ -253,13 +255,24 @@ function serializeDocumentSet(entries, generator) {
 	});
 }
 const EXISTENCE_BATCH_SIZE = 64;
+async function inBatches(items, run) {
+	const results = [];
+	for (let i = 0; i < items.length; i += EXISTENCE_BATCH_SIZE) results.push(...await Promise.all(items.slice(i, i + EXISTENCE_BATCH_SIZE).map(run)));
+	return results;
+}
 async function whichExist(paths, access) {
-	const exists = [];
-	for (let i = 0; i < paths.length; i += EXISTENCE_BATCH_SIZE) {
-		const batch = paths.slice(i, i + EXISTENCE_BATCH_SIZE).map((path) => access(path).then(() => true, () => false));
-		exists.push(...await Promise.all(batch));
-	}
-	return exists;
+	return inBatches(paths, (path) => access(path).then(() => true, () => false));
+}
+async function whichMatch(pairs, readFile) {
+	const read = (path) => readFile(path).catch((error) => {
+		if (error.code !== "ENOENT") logWarning(`Could not read ${path} while checking prerender collisions: ${String(error)}`);
+	});
+	return inBatches(pairs, ([left, right]) => Promise.all([read(left), read(right)]).then(([a, b]) => a !== void 0 && b !== void 0 && a.equals(b)));
+}
+/** 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);
@@ -268,6 +281,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,11 +293,12 @@ 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",
 			async handler() {
-				const { access, mkdir, rm, writeFile } = await import("node:fs/promises");
+				const { access, mkdir, readFile, rm, writeFile } = await import("node:fs/promises");
 				const nodePath = await import("node:path");
 				const artifact = nodePath.join(root, PUBLISH_OUTPUT_DIR, DOCUMENT_SET_DIR, DOCUMENT_SET_FILE);
 				await rm(artifact, { force: true }).catch((error) => {
@@ -291,6 +306,29 @@ function createDocumentSet(routerBasePath) {
 				});
 				if (documents.size === 0) return;
 				const clientDir = nodePath.resolve(root, clientOutputDir);
+				const label = publicDirLabel(root, publicDir, nodePath);
+				const collisions = [];
+				if (publicDir !== "") {
+					const candidates = [...documents].map(([route, file]) => ({
+						route,
+						file
+					}));
+					const committed = await whichExist(candidates.map(({ file }) => nodePath.join(publicDir, file)), access);
+					const suspects = candidates.filter((_candidate, index) => committed[index]);
+					const survived = await whichMatch(suspects.map(({ file }) => [nodePath.join(publicDir, file), nodePath.resolve(clientDir, file)]), readFile);
+					for (const [index, suspect] of suspects.entries()) {
+						if (!survived[index]) {
+							collisions.push(suspect);
+							continue;
+						}
+						documents.delete(suspect.route);
+						logWarning(`Not publishing prerendered route ${suspect.route}: it would serve the committed ${label}/${suspect.file}, which the prerender pass left untouched.`);
+					}
+				}
+				if (collisions.length > 0) {
+					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 entries = [...documents].map(([route, file]) => ({
 					route,
 					file

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.1";
 //#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`;
@@ -229,13 +231,24 @@ function serializeDocumentSet(entries, generator) {
 	});
 }
 const EXISTENCE_BATCH_SIZE = 64;
+async function inBatches(items, run) {
+	const results = [];
+	for (let i = 0; i < items.length; i += EXISTENCE_BATCH_SIZE) results.push(...await Promise.all(items.slice(i, i + EXISTENCE_BATCH_SIZE).map(run)));
+	return results;
+}
 async function whichExist(paths, access) {
-	const exists = [];
-	for (let i = 0; i < paths.length; i += EXISTENCE_BATCH_SIZE) {
-		const batch = paths.slice(i, i + EXISTENCE_BATCH_SIZE).map((path) => access(path).then(() => true, () => false));
-		exists.push(...await Promise.all(batch));
-	}
-	return exists;
+	return inBatches(paths, (path) => access(path).then(() => true, () => false));
+}
+async function whichMatch(pairs, readFile) {
+	const read = (path) => readFile(path).catch((error) => {
+		if (error.code !== "ENOENT") logWarning(`Could not read ${path} while checking prerender collisions: ${String(error)}`);
+	});
+	return inBatches(pairs, ([left, right]) => Promise.all([read(left), read(right)]).then(([a, b]) => a !== void 0 && b !== void 0 && a.equals(b)));
+}
+/** 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);
@@ -244,6 +257,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,11 +269,12 @@ 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",
 			async handler() {
-				const { access, mkdir, rm, writeFile } = await import("node:fs/promises");
+				const { access, mkdir, readFile, rm, writeFile } = await import("node:fs/promises");
 				const nodePath = await import("node:path");
 				const artifact = nodePath.join(root, PUBLISH_OUTPUT_DIR, DOCUMENT_SET_DIR, DOCUMENT_SET_FILE);
 				await rm(artifact, { force: true }).catch((error) => {
@@ -267,6 +282,29 @@ function createDocumentSet(routerBasePath) {
 				});
 				if (documents.size === 0) return;
 				const clientDir = nodePath.resolve(root, clientOutputDir);
+				const label = publicDirLabel(root, publicDir, nodePath);
+				const collisions = [];
+				if (publicDir !== "") {
+					const candidates = [...documents].map(([route, file]) => ({
+						route,
+						file
+					}));
+					const committed = await whichExist(candidates.map(({ file }) => nodePath.join(publicDir, file)), access);
+					const suspects = candidates.filter((_candidate, index) => committed[index]);
+					const survived = await whichMatch(suspects.map(({ file }) => [nodePath.join(publicDir, file), nodePath.resolve(clientDir, file)]), readFile);
+					for (const [index, suspect] of suspects.entries()) {
+						if (!survived[index]) {
+							collisions.push(suspect);
+							continue;
+						}
+						documents.delete(suspect.route);
+						logWarning(`Not publishing prerendered route ${suspect.route}: it would serve the committed ${label}/${suspect.file}, which the prerender pass left untouched.`);
+					}
+				}
+				if (collisions.length > 0) {
+					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 entries = [...documents].map(([route, file]) => ({
 					route,
 					file

package/package.json

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