@lovable.dev/vite-tanstack-config 2.19.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.19.0";
+var version = "2.19.1";
 //#endregion
 //#region src/logging.ts
 const PACKAGE_NAME = "@lovable.dev/vite-tanstack-config";
@@ -255,13 +255,19 @@ 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) {
@@ -292,13 +298,15 @@ function createDocumentSet(routerBasePath) {
 		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) => {
 					logWarning(`Could not remove a previous build's document set: ${String(error)}`);
 				});
 				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]) => ({
@@ -306,14 +314,21 @@ function createDocumentSet(routerBasePath) {
 						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);
+					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 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,
 					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.19.0";
+var version = "2.19.1";
 //#endregion
 //#region src/logging.ts
 const PACKAGE_NAME = "@lovable.dev/vite-tanstack-config";
@@ -231,13 +231,19 @@ 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) {
@@ -268,13 +274,15 @@ function createDocumentSet(routerBasePath) {
 		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) => {
 					logWarning(`Could not remove a previous build's document set: ${String(error)}`);
 				});
 				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]) => ({
@@ -282,14 +290,21 @@ function createDocumentSet(routerBasePath) {
 						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);
+					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 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,
 					file

package/package.json

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