@better-t-stack/template-generator 3.27.0 → 3.27.1

package/dist/index.d.mts

@@ -87,7 +87,7 @@ declare const dependencyVersionMap: {
   readonly "@clerk/nextjs": "^7.0.5";
   readonly "@clerk/react": "^6.1.1";
   readonly "@clerk/react-router": "^3.0.5";
-  readonly "@clerk/tanstack-react-start": "^1.0.5";
+  readonly "@clerk/tanstack-react-start": "^1.1.3";
   readonly "@clerk/expo": "^3.1.3";
   readonly "drizzle-orm": "^0.45.1";
   readonly "drizzle-kit": "^0.31.8";
@@ -100,18 +100,18 @@ declare const dependencyVersionMap: {
   readonly "@types/ws": "^8.18.1";
   readonly ws: "^8.18.3";
   readonly mysql2: "^3.14.0";
-  readonly "@prisma/client": "^7.2.0";
-  readonly prisma: "^7.2.0";
-  readonly "@prisma/adapter-d1": "^7.2.0";
-  readonly "@prisma/adapter-neon": "^7.2.0";
-  readonly "@prisma/adapter-mariadb": "^7.2.0";
-  readonly "@prisma/adapter-libsql": "^7.2.0";
-  readonly "@prisma/adapter-better-sqlite3": "^7.2.0";
-  readonly "@prisma/adapter-pg": "^7.2.0";
-  readonly "@prisma/adapter-planetscale": "^7.2.0";
+  readonly "@prisma/client": "^7.7.0";
+  readonly prisma: "^7.7.0";
+  readonly "@prisma/adapter-d1": "^7.7.0";
+  readonly "@prisma/adapter-neon": "^7.7.0";
+  readonly "@prisma/adapter-mariadb": "^7.7.0";
+  readonly "@prisma/adapter-libsql": "^7.7.0";
+  readonly "@prisma/adapter-better-sqlite3": "^7.7.0";
+  readonly "@prisma/adapter-pg": "^7.7.0";
+  readonly "@prisma/adapter-planetscale": "^7.7.0";
   readonly mongoose: "^8.14.0";
-  readonly "vite-plugin-pwa": "^1.0.1";
-  readonly "@vite-pwa/assets-generator": "^1.0.0";
+  readonly "vite-plugin-pwa": "^1.2.0";
+  readonly "@vite-pwa/assets-generator": "^1.0.2";
   readonly "@tauri-apps/cli": "^2.4.0";
   readonly "@biomejs/biome": "^2.2.0";
   readonly oxlint: "^1.41.0";
@@ -145,14 +145,14 @@ declare const dependencyVersionMap: {
   readonly "@ai-sdk/devtools": "^0.0.2";
   readonly streamdown: "^1.6.10";
   readonly shiki: "^3.20.0";
-  readonly "@orpc/server": "^1.12.2";
-  readonly "@orpc/client": "^1.12.2";
-  readonly "@orpc/openapi": "^1.12.2";
-  readonly "@orpc/zod": "^1.12.2";
-  readonly "@orpc/tanstack-query": "^1.13.6";
-  readonly "@trpc/tanstack-react-query": "^11.13.4";
-  readonly "@trpc/server": "^11.13.4";
-  readonly "@trpc/client": "^11.13.4";
+  readonly "@orpc/server": "^1.13.14";
+  readonly "@orpc/client": "^1.13.14";
+  readonly "@orpc/openapi": "^1.13.14";
+  readonly "@orpc/zod": "^1.13.14";
+  readonly "@orpc/tanstack-query": "^1.13.14";
+  readonly "@trpc/tanstack-react-query": "^11.16.0";
+  readonly "@trpc/server": "^11.16.0";
+  readonly "@trpc/client": "^11.16.0";
   readonly next: "^16.2.0";
   readonly convex: "^1.33.1";
   readonly "@convex-dev/react-query": "^0.1.0";
@@ -160,7 +160,7 @@ declare const dependencyVersionMap: {
   readonly "convex-svelte": "^0.0.12";
   readonly "convex-nuxt": "0.1.5";
   readonly "convex-vue": "^0.1.5";
-  readonly "@convex-dev/better-auth": "^0.11.3";
+  readonly "@convex-dev/better-auth": "^0.11.4";
   readonly "@tanstack/svelte-query": "^5.85.3";
   readonly "@tanstack/svelte-query-devtools": "^5.85.3";
   readonly "@tanstack/vue-query-devtools": "^6.1.5";
@@ -168,21 +168,21 @@ declare const dependencyVersionMap: {
   readonly "@tanstack/react-query-devtools": "^5.91.1";
   readonly "@tanstack/react-query": "^5.90.12";
   readonly "@tanstack/react-form": "^1.28.0";
-  readonly "@tanstack/react-router-ssr-query": "^1.142.7";
+  readonly "@tanstack/react-router-ssr-query": "^1.166.11";
   readonly "@tanstack/solid-form": "^1.28.0";
   readonly "@tanstack/svelte-form": "^1.28.0";
-  readonly "@tanstack/solid-query": "^5.87.4";
-  readonly "@tanstack/solid-query-devtools": "^5.87.4";
-  readonly "@tanstack/solid-router-devtools": "^1.131.44";
+  readonly "@tanstack/solid-query": "^5.99.1";
+  readonly "@tanstack/solid-query-devtools": "^5.99.1";
+  readonly "@tanstack/solid-router-devtools": "^1.166.13";
   readonly wrangler: "^4.77.0";
   readonly "@cloudflare/vite-plugin": "^1.17.1";
   readonly "@opennextjs/cloudflare": "^1.17.3";
   readonly "nitro-cloudflare-dev": "^0.2.2";
-  readonly "@sveltejs/adapter-cloudflare": "^7.2.4";
+  readonly "@sveltejs/adapter-cloudflare": "^7.2.8";
   readonly "@cloudflare/workers-types": "^4.20251213.0";
   readonly "@astrojs/cloudflare": "^13.0.1";
   readonly "@astrojs/node": "^10.0.0-beta.9";
-  readonly alchemy: "^0.90.0";
+  readonly alchemy: "^0.91.2";
   readonly dotenv: "^17.2.2";
   readonly tsdown: "^0.16.5";
   readonly zod: "^4.1.13";

package/dist/index.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.mts","names":[],"sources":["../src/core/virtual-fs.ts","../src/core/template-processor.ts","../src/template-handlers/utils.ts","../src/template-handlers/addons.ts","../src/generator.ts","../src/processors/addons-deps.ts","../src/bts-config.ts","../src/templates.generated.ts","../src/utils/add-deps.ts","../src/utils/reproducible-command.ts"],"sourcesContent":[],"mappings":";;;;;;;cAOa,iBAAA;;;;;;EAAA,QAAA,CAAA,QAAA,EAAA,MAAiB,CAAA,EAAA,MAAA,GAAA,SAAA;EA6Ea,MAAA,CAAA,IAAA,EAAA,MAAA,CAAA,EAAA,OAAA;EAkCX,UAAA,CAAA,QAAA,EAAA,MAAA,CAAA,EAAA,OAAA;EAAgB,eAcrC,CAAA,OAAA,EAAA,MAAA,CAAA,EAAA,OAAA;EAAA,KAGJ,CAAA,OAAA,EAAA,MAAA,CAAA,EAAA,IAAA;EAAA,UAAA,CAAA,QAAA,EAAA,MAAA,CAAA,EAAA,OAAA;;2CAnDoC;;EC1E3B,WAAA,CAAA,CAAA,EAAA,MAAA,EAAA;EAIA,iBAAY,CAAA,CAAA,EAAA,MAAA,EAAA;EAIZ,YAAA,CAAA,CAAA,EAAA,MAAiB;EAUjB,iBAAA,CAAA,CAAA,EAAkB,MAAA;6BD0FF;;eAAgB,MAAA,CAcrC;EE/HC,KAAA,CAAA,CAAA,EF+HD,MAAA,CAGJ,GElIoB;;;;ECAL,QAAA,aAAA;;;;iBFKN,qBAAA,2BAAgD;iBAIhD,YAAA;iBAIA,iBAAA;iBAUA,kBAAA,6CAGL;;;KC1BC,YAAA,GAAe;;;iBCAL,qBAAA,MACf,8BACM,sBACH,gBACP;;;;;AHFH;;;;;;;;;ACGA;AAIA;AAIgB,iBG+BM,QAAA,CH/BW,OAAA,EGgCtB,gBHhCsB,CAAA,EGiC9B,OHjC8B,CGiCtB,MHjCsB,CGiCf,eHjCe,EGiCE,cHjCF,CAAA,CAAA;;;iBIJjB,iBAAA,MAAuB,2BAA2B;;;;;;;iBCJlD,mBAAA,MACT,kCACU;;;cCTJ,oBAAoB;cAq75BpB,cAAA;;;cC365BA;;;ERNA,SAAA,mBAAiB,EAAA,OAAA;EA6Ea,SAAA,gBAAA,EAAA,QAAA;EAkCX,SAAA,gBAAA,EAAA,QAAA;EAAgB,SAcrC,gBAAA,EAAA,QAAA;EAAA,SAGJ,eAAA,EAAA,QAAA;EAAA,SAAA,cAAA,EAAA,QAAA;;;;EC7HS,SAAA,aAAA,EAAqB,SAAA;EAIrB,SAAA,aAAY,EAAA,SAAA;EAIZ,SAAA,uBAAiB,EAAA,SAAA;EAUjB,SAAA,gBAAkB,EAAA,SAGvB;;;;EC1BC,SAAA,WAAY,EAAA,SAAM;;;;ECAR,SAAA,gBAAqB,EAAA,QAAA;EACpC,SAAA,MAAA,EAAA,QAAA;EACM,SAAA,oBAAA,EAAA,QAAA;EACH,SAAA,sBAAA,EAAA,QAAA;EACP,SAAA,yBAAA,EAAA,QAAA;EAAO,SAAA,wBAAA,EAAA,QAAA;;;;ECwCY,SAAA,QAAQ,EAAA,SAAA;EACnB,SAAA,iBAAA,EAAA,QAAA;EACO,SAAA,4BAAA,EAAA,QAAA;EAAiB,SAAA,iBAAA,EAAA,QAAA;EAAxB,SAAA,gBAAA,EAAA,QAAA;EAAR,SAAA,MAAA,EAAA,SAAA;EAAO,SAAA,KAAA,EAAA,SAAA;;;;ECrCM,SAAA,GAAA,EAAA,SAAiB;;;;ECJjB,SAAA,gBAAmB,EAAA,QAC5B;;;;ECRM,SAAA,mBAm75BX,EAAA,QAn75BkC;EAq75BvB,SAAA,IAAA,EAAA,QAAc;;;;EC365Bd,SAAA,aAAA,EAoJH,SAAA;EAEE,SAAA,OAAA,EAAA,QAAqB;;;;ECxIjB,SAAA,EAAA,EAAA,QAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KDwIJ,qBAAA,gBAAqC;;;iBCxIjC,2BAAA,SAAoC"}
+{"version":3,"file":"index.d.mts","names":[],"sources":["../src/core/virtual-fs.ts","../src/core/template-processor.ts","../src/template-handlers/utils.ts","../src/template-handlers/addons.ts","../src/generator.ts","../src/processors/addons-deps.ts","../src/bts-config.ts","../src/templates.generated.ts","../src/utils/add-deps.ts","../src/utils/reproducible-command.ts"],"sourcesContent":[],"mappings":";;;;;;;cAOa,iBAAA;;;;;;EAAA,QAAA,CAAA,QAAA,EAAA,MAAiB,CAAA,EAAA,MAAA,GAAA,SAAA;EA6Ea,MAAA,CAAA,IAAA,EAAA,MAAA,CAAA,EAAA,OAAA;EAkCX,UAAA,CAAA,QAAA,EAAA,MAAA,CAAA,EAAA,OAAA;EAAgB,eAcrC,CAAA,OAAA,EAAA,MAAA,CAAA,EAAA,OAAA;EAAA,KAGJ,CAAA,OAAA,EAAA,MAAA,CAAA,EAAA,IAAA;EAAA,UAAA,CAAA,QAAA,EAAA,MAAA,CAAA,EAAA,OAAA;;2CAnDoC;;EC1E3B,WAAA,CAAA,CAAA,EAAA,MAAA,EAAA;EAIA,iBAAY,CAAA,CAAA,EAAA,MAAA,EAAA;EAIZ,YAAA,CAAA,CAAA,EAAA,MAAiB;EAUjB,iBAAA,CAAA,CAAA,EAAkB,MAAA;6BD0FF;;eAAgB,MAAA,CAcrC;EE/HC,KAAA,CAAA,CAAA,EF+HD,MAAA,CAGJ,GElIoB;;;;ECAL,QAAA,aAAA;;;;iBFKN,qBAAA,2BAAgD;iBAIhD,YAAA;iBAIA,iBAAA;iBAUA,kBAAA,6CAGL;;;KC1BC,YAAA,GAAe;;;iBCAL,qBAAA,MACf,8BACM,sBACH,gBACP;;;;;AHFH;;;;;;;;;ACGA;AAIA;AAIgB,iBG+BM,QAAA,CH/BW,OAAA,EGgCtB,gBHhCsB,CAAA,EGiC9B,OHjC8B,CGiCtB,MHjCsB,CGiCf,eHjCe,EGiCE,cHjCF,CAAA,CAAA;;;iBIJjB,iBAAA,MAAuB,2BAA2B;;;;;;;iBCJlD,mBAAA,MACT,kCACU;;;cCTJ,oBAAoB;cAk75BpB,cAAA;;;cCx65BA;;;ERNA,SAAA,mBAAiB,EAAA,OAAA;EA6Ea,SAAA,gBAAA,EAAA,QAAA;EAkCX,SAAA,gBAAA,EAAA,QAAA;EAAgB,SAcrC,gBAAA,EAAA,QAAA;EAAA,SAGJ,eAAA,EAAA,QAAA;EAAA,SAAA,cAAA,EAAA,QAAA;;;;EC7HS,SAAA,aAAA,EAAqB,SAAA;EAIrB,SAAA,aAAY,EAAA,SAAA;EAIZ,SAAA,uBAAiB,EAAA,SAAA;EAUjB,SAAA,gBAAkB,EAAA,SAGvB;;;;EC1BC,SAAA,WAAY,EAAA,SAAM;;;;ECAR,SAAA,gBAAqB,EAAA,QAAA;EACpC,SAAA,MAAA,EAAA,QAAA;EACM,SAAA,oBAAA,EAAA,QAAA;EACH,SAAA,sBAAA,EAAA,QAAA;EACP,SAAA,yBAAA,EAAA,QAAA;EAAO,SAAA,wBAAA,EAAA,QAAA;;;;ECwCY,SAAA,QAAQ,EAAA,SAAA;EACnB,SAAA,iBAAA,EAAA,QAAA;EACO,SAAA,4BAAA,EAAA,QAAA;EAAiB,SAAA,iBAAA,EAAA,QAAA;EAAxB,SAAA,gBAAA,EAAA,QAAA;EAAR,SAAA,MAAA,EAAA,SAAA;EAAO,SAAA,KAAA,EAAA,SAAA;;;;ECrCM,SAAA,GAAA,EAAA,SAAiB;;;;ECJjB,SAAA,gBAAmB,EAAA,QAC5B;;;;ECRM,SAAA,mBAg75BX,EAAA,QAh75BkC;EAk75BvB,SAAA,IAAA,EAAA,QAAc;;;;ECx65Bd,SAAA,aAAA,EAoJH,SAAA;EAEE,SAAA,OAAA,EAAA,QAAqB;;;;ECxIjB,SAAA,EAAA,EAAA,QAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KDwIJ,qBAAA,gBAAqC;;;iBCxIjC,2BAAA,SAAoC"}

package/dist/index.mjs

@@ -713,7 +713,7 @@ const dependencyVersionMap = {
 	"@clerk/nextjs": "^7.0.5",
 	"@clerk/react": "^6.1.1",
 	"@clerk/react-router": "^3.0.5",
-	"@clerk/tanstack-react-start": "^1.0.5",
+	"@clerk/tanstack-react-start": "^1.1.3",
 	"@clerk/expo": "^3.1.3",
 	"drizzle-orm": "^0.45.1",
 	"drizzle-kit": "^0.31.8",
@@ -726,18 +726,18 @@ const dependencyVersionMap = {
 	"@types/ws": "^8.18.1",
 	ws: "^8.18.3",
 	mysql2: "^3.14.0",
-	"@prisma/client": "^7.2.0",
-	prisma: "^7.2.0",
-	"@prisma/adapter-d1": "^7.2.0",
-	"@prisma/adapter-neon": "^7.2.0",
-	"@prisma/adapter-mariadb": "^7.2.0",
-	"@prisma/adapter-libsql": "^7.2.0",
-	"@prisma/adapter-better-sqlite3": "^7.2.0",
-	"@prisma/adapter-pg": "^7.2.0",
-	"@prisma/adapter-planetscale": "^7.2.0",
+	"@prisma/client": "^7.7.0",
+	prisma: "^7.7.0",
+	"@prisma/adapter-d1": "^7.7.0",
+	"@prisma/adapter-neon": "^7.7.0",
+	"@prisma/adapter-mariadb": "^7.7.0",
+	"@prisma/adapter-libsql": "^7.7.0",
+	"@prisma/adapter-better-sqlite3": "^7.7.0",
+	"@prisma/adapter-pg": "^7.7.0",
+	"@prisma/adapter-planetscale": "^7.7.0",
 	mongoose: "^8.14.0",
-	"vite-plugin-pwa": "^1.0.1",
-	"@vite-pwa/assets-generator": "^1.0.0",
+	"vite-plugin-pwa": "^1.2.0",
+	"@vite-pwa/assets-generator": "^1.0.2",
 	"@tauri-apps/cli": "^2.4.0",
 	"@biomejs/biome": "^2.2.0",
 	oxlint: "^1.41.0",
@@ -771,14 +771,14 @@ const dependencyVersionMap = {
 	"@ai-sdk/devtools": "^0.0.2",
 	streamdown: "^1.6.10",
 	shiki: "^3.20.0",
-	"@orpc/server": "^1.12.2",
-	"@orpc/client": "^1.12.2",
-	"@orpc/openapi": "^1.12.2",
-	"@orpc/zod": "^1.12.2",
-	"@orpc/tanstack-query": "^1.13.6",
-	"@trpc/tanstack-react-query": "^11.13.4",
-	"@trpc/server": "^11.13.4",
-	"@trpc/client": "^11.13.4",
+	"@orpc/server": "^1.13.14",
+	"@orpc/client": "^1.13.14",
+	"@orpc/openapi": "^1.13.14",
+	"@orpc/zod": "^1.13.14",
+	"@orpc/tanstack-query": "^1.13.14",
+	"@trpc/tanstack-react-query": "^11.16.0",
+	"@trpc/server": "^11.16.0",
+	"@trpc/client": "^11.16.0",
 	next: "^16.2.0",
 	convex: "^1.33.1",
 	"@convex-dev/react-query": "^0.1.0",
@@ -786,7 +786,7 @@ const dependencyVersionMap = {
 	"convex-svelte": "^0.0.12",
 	"convex-nuxt": "0.1.5",
 	"convex-vue": "^0.1.5",
-	"@convex-dev/better-auth": "^0.11.3",
+	"@convex-dev/better-auth": "^0.11.4",
 	"@tanstack/svelte-query": "^5.85.3",
 	"@tanstack/svelte-query-devtools": "^5.85.3",
 	"@tanstack/vue-query-devtools": "^6.1.5",
@@ -794,21 +794,21 @@ const dependencyVersionMap = {
 	"@tanstack/react-query-devtools": "^5.91.1",
 	"@tanstack/react-query": "^5.90.12",
 	"@tanstack/react-form": "^1.28.0",
-	"@tanstack/react-router-ssr-query": "^1.142.7",
+	"@tanstack/react-router-ssr-query": "^1.166.11",
 	"@tanstack/solid-form": "^1.28.0",
 	"@tanstack/svelte-form": "^1.28.0",
-	"@tanstack/solid-query": "^5.87.4",
-	"@tanstack/solid-query-devtools": "^5.87.4",
-	"@tanstack/solid-router-devtools": "^1.131.44",
+	"@tanstack/solid-query": "^5.99.1",
+	"@tanstack/solid-query-devtools": "^5.99.1",
+	"@tanstack/solid-router-devtools": "^1.166.13",
 	wrangler: "^4.77.0",
 	"@cloudflare/vite-plugin": "^1.17.1",
 	"@opennextjs/cloudflare": "^1.17.3",
 	"nitro-cloudflare-dev": "^0.2.2",
-	"@sveltejs/adapter-cloudflare": "^7.2.4",
+	"@sveltejs/adapter-cloudflare": "^7.2.8",
 	"@cloudflare/workers-types": "^4.20251213.0",
 	"@astrojs/cloudflare": "^13.0.1",
 	"@astrojs/node": "^10.0.0-beta.9",
-	alchemy: "^0.90.0",
+	alchemy: "^0.91.2",
 	dotenv: "^17.2.2",
 	tsdown: "^0.16.5",
 	zod: "^4.1.13",
@@ -1121,7 +1121,7 @@ function processApiDeps(vfs, config) {
 	addApiPackageDeps(vfs, api, backend, frontend, auth);
 	addServerDeps(vfs, api, backend);
 	addSelfBackendWebDeps(vfs, api, backend, frontendType);
-	addWebClientDeps(vfs, api, backend, frontendType);
+	addWebClientDeps(vfs, api, backend, frontend, frontendType);
 	if (frontendType.hasNative) addNativeDeps(vfs, api, backend);
 	addQueryDeps(vfs, frontend, backend);
 }
@@ -1209,28 +1209,34 @@ function addSelfBackendWebDeps(vfs, api, backend, _frontendType) {
 		]
 	});
 }
-function addWebClientDeps(vfs, api, backend, frontendType) {
+function addWebClientDeps(vfs, api, backend, frontend, frontendType) {
 	const webPath = "apps/web/package.json";
 	if (!vfs.exists(webPath) || backend === "convex") return;
-	if (api === "trpc" && frontendType.hasReactWeb) addPackageDependency({
-		vfs,
-		packagePath: webPath,
-		dependencies: [
+	if (api === "trpc" && frontendType.hasReactWeb) {
+		const deps = [
 			"@trpc/tanstack-react-query",
 			"@trpc/client",
 			"@trpc/server"
-		]
-	});
-	else if (api === "orpc" && frontendType.hasReactWeb) addPackageDependency({
-		vfs,
-		packagePath: webPath,
-		dependencies: [
+		];
+		if (frontend.includes("tanstack-start")) deps.push("@tanstack/react-router-ssr-query");
+		addPackageDependency({
+			vfs,
+			packagePath: webPath,
+			dependencies: deps
+		});
+	} else if (api === "orpc" && frontendType.hasReactWeb) {
+		const deps = [
 			"@orpc/tanstack-query",
 			"@orpc/client",
 			"@orpc/server"
-		]
-	});
-	else if (api === "orpc" && frontendType.hasNuxtWeb) addPackageDependency({
+		];
+		if (frontend.includes("tanstack-start")) deps.push("@tanstack/react-router-ssr-query");
+		addPackageDependency({
+			vfs,
+			packagePath: webPath,
+			dependencies: deps
+		});
+	} else if (api === "orpc" && frontendType.hasNuxtWeb) addPackageDependency({
 		vfs,
 		packagePath: webPath,
 		dependencies: [
@@ -2062,7 +2068,7 @@ function buildConvexBackendVars(frontend, auth, examples) {
 	const hasNextJs = frontend.includes("next");
 	const hasNative = frontend.includes("native-bare") || frontend.includes("native-uniwind") || frontend.includes("native-unistyles");
 	const hasWeb = frontend.includes("react-router") || frontend.includes("tanstack-router") || frontend.includes("tanstack-start") || hasNextJs || frontend.includes("nuxt") || frontend.includes("solid") || frontend.includes("svelte") || frontend.includes("astro");
-	const defaultSiteUrl = hasNative && !hasWeb ? "http://localhost:8081" : frontend.includes("react-router") || frontend.includes("tanstack-router") || frontend.includes("svelte") ? "http://localhost:5173" : frontend.includes("astro") ? "http://localhost:4321" : "http://localhost:3001";
+	const defaultSiteUrl = hasNative && !hasWeb ? "http://localhost:8081" : frontend.includes("react-router") || frontend.includes("svelte") ? "http://localhost:5173" : frontend.includes("astro") ? "http://localhost:4321" : "http://localhost:3001";
 	const vars = [];
 	if (examples?.includes("ai")) vars.push({
 		key: "GOOGLE_GENERATIVE_AI_API_KEY",
@@ -2100,7 +2106,7 @@ function buildConvexBackendVars(frontend, auth, examples) {
 function buildConvexCommentBlocks(frontend, auth, examples) {
 	const hasNative = frontend.includes("native-bare") || frontend.includes("native-uniwind") || frontend.includes("native-unistyles");
 	const hasWeb = frontend.includes("react-router") || frontend.includes("tanstack-router") || frontend.includes("tanstack-start") || frontend.includes("next") || frontend.includes("nuxt") || frontend.includes("solid") || frontend.includes("svelte") || frontend.includes("astro");
-	const defaultSiteUrl = hasNative && !hasWeb ? "http://localhost:8081" : frontend.includes("react-router") || frontend.includes("tanstack-router") || frontend.includes("svelte") ? "http://localhost:5173" : frontend.includes("astro") ? "http://localhost:4321" : "http://localhost:3001";
+	const defaultSiteUrl = hasNative && !hasWeb ? "http://localhost:8081" : frontend.includes("react-router") || frontend.includes("svelte") ? "http://localhost:5173" : frontend.includes("astro") ? "http://localhost:4321" : "http://localhost:3001";
 	let commentBlocks = "";
 	if (examples?.includes("ai")) commentBlocks += `# Set Google AI API key for AI agent
 # npx convex env set GOOGLE_GENERATIVE_AI_API_KEY=your_google_api_key
@@ -2113,13 +2119,11 @@ ${hasWeb || hasNative ? `# npx convex env set SITE_URL ${defaultSiteUrl}\n` : ""
 }
 function buildServerVars(backend, frontend, auth, api, database, dbSetup, runtime, webDeploy, serverDeploy, payments, examples) {
 	const hasReactRouter = frontend.includes("react-router");
-	const hasTanStackRouter = frontend.includes("tanstack-router");
 	const hasSvelte = frontend.includes("svelte");
 	const hasAstro = frontend.includes("astro");
 	let corsOrigin = "http://localhost:3001";
 	if (hasAstro) corsOrigin = "http://localhost:4321";
-	else if (hasReactRouter || hasTanStackRouter || hasSvelte) corsOrigin = "http://localhost:5173";
-	else if (backend === "self") corsOrigin = "http://localhost:3001";
+	else if (hasReactRouter || hasSvelte) corsOrigin = "http://localhost:5173";
 	let databaseUrl = null;
 	if (database !== "none" && dbSetup === "none") switch (database) {
 		case "postgres":
@@ -29449,28 +29453,28 @@ export function ThemeProvider({
   },
   "dependencies": {
     "@{{projectName}}/ui": "{{#if (eq packageManager "npm")}}*{{else}}workspace:*{{/if}}",
-    "@react-router/fs-routes": "^7.10.1",
-    "@react-router/node": "^7.10.1",
-    "@react-router/serve": "^7.10.1",
-    "isbot": "^5.1.28",
-    "lucide-react": "^0.546.0",
+    "@react-router/fs-routes": "^7.14.1",
+    "@react-router/node": "^7.14.1",
+    "@react-router/serve": "^7.14.1",
+    "isbot": "^5.1.39",
+    "lucide-react": "^1.8.0",
     "next-themes": "^0.4.6",
-    "react": "^19.2.3",
-    "react-dom": "^19.2.3",
-    "react-router": "^7.10.1",
-    "sonner": "^2.0.5"
+    "react": "^19.2.5",
+    "react-dom": "^19.2.5",
+    "react-router": "^7.14.1",
+    "sonner": "^2.0.7"
   },
   "devDependencies": {
-    "@react-router/dev": "^7.10.1",
-    "@tailwindcss/vite": "^4.1.18",
+    "@react-router/dev": "^7.14.1",
+    "@tailwindcss/vite": "^4.2.2",
     "@types/node": "^20",
-    "@types/react": "^19.2.10",
+    "@types/react": "^19.2.14",
     "@types/react-dom": "^19.2.3",
     "react-router-devtools": "^1.1.0",
-    "tailwindcss": "^4.1.18",
+    "tailwindcss": "^4.2.2",
     "typescript": "^5.8.3",
-    "vite": "^7.2.7",
-    "vite-tsconfig-paths": "^5.1.4"
+    "vite": "^8.0.8",
+    "vite-tsconfig-paths": "^6.1.1"
   }
 }
 `],
@@ -29994,26 +29998,26 @@ export default defineConfig({
 		"check-types": "vite build && tsc --noEmit"
 	},
 	"dependencies": {
-        "@hookform/resolvers": "^5.1.1",
+        "@hookform/resolvers": "^5.2.2",
         "@{{projectName}}/ui": "{{#if (eq packageManager "npm")}}*{{else}}workspace:*{{/if}}",
-		"@tailwindcss/vite": "^4.1.18",
-		"@tanstack/react-router": "^1.141.1",
-		"lucide-react": "^0.546.0",
+		"@tailwindcss/vite": "^4.2.2",
+		"@tanstack/react-router": "^1.168.22",
+		"lucide-react": "^1.8.0",
         "next-themes": "^0.4.6",
-		"react": "^19.2.3",
-		"react-dom": "^19.2.3",
-        "sonner": "^2.0.5"
+		"react": "^19.2.5",
+		"react-dom": "^19.2.5",
+        "sonner": "^2.0.7"
 	},
 	"devDependencies": {
-		"@tanstack/react-router-devtools": "^1.141.1",
-		"@tanstack/router-plugin": "^1.141.1",
+		"@tanstack/react-router-devtools": "^1.166.13",
+		"@tanstack/router-plugin": "^1.167.22",
 		"@types/node": "^22.13.14",
-		"@types/react": "^19.2.10",
+		"@types/react": "^19.2.14",
 		"@types/react-dom": "^19.2.3",
-		"@vitejs/plugin-react": "^4.3.4",
-		"postcss": "^8.5.3",
-		"tailwindcss": "^4.1.18",
-		"vite": "^6.2.2"
+		"@vitejs/plugin-react": "^6.0.1",
+		"postcss": "^8.5.10",
+		"tailwindcss": "^4.2.2",
+		"vite": "^8.0.8"
 	}
 }
 `],
@@ -30120,6 +30124,7 @@ function ClerkApiAuthBridge() {
 const router = createRouter({
   routeTree,
   defaultPreload: "intent",
+  scrollRestoration: true,
   defaultPendingComponent: () => <Loader />,
   {{#if (eq api "orpc")}}
   context: { orpc, queryClient },
@@ -30401,7 +30406,6 @@ function HomeComponent() {
     "target": "ESNext",
     "module": "ESNext",
     "moduleResolution": "Bundler",
-    "verbatimModuleSyntax": true,
     "skipLibCheck": true,
     "types": ["vite/client"],
     "rootDirs": ["."],
@@ -30416,24 +30420,25 @@ function HomeComponent() {
 	["frontend/react/tanstack-router/vite.config.ts.hbs", `import tailwindcss from "@tailwindcss/vite";
 import { tanstackRouter } from "@tanstack/router-plugin/vite";
 import react from "@vitejs/plugin-react";
-import path from "node:path";
 import { defineConfig } from "vite";
 
 export default defineConfig({
+  server: {
+    port: 3001,
+  },
+  resolve: {
+    tsconfigPaths: true,
+  },
   plugins: [
     tailwindcss(),
-    tanstackRouter({}),
+    tanstackRouter({
+      target: "react",
+      autoCodeSplitting: true,
+    }),
     react(),
   ],
-  resolve: {
-    alias: {
-      "@": path.resolve(__dirname, "./src"),
-    },
-  },
-  server: {
-    port: 3001,
-  },
-});`],
+});
+`],
 	["frontend/react/tanstack-start/package.json.hbs", `{
   "name": "web",
   "private": true,
@@ -30445,30 +30450,27 @@ export default defineConfig({
   },
   "dependencies": {
     "@{{projectName}}/ui": "{{#if (eq packageManager "npm")}}*{{else}}workspace:*{{/if}}",
-    "@tailwindcss/vite": "^4.1.18",
-    "@tanstack/react-query": "^5.80.6",
-    "@tanstack/react-router": "^1.141.1",
-    "@tanstack/react-router-with-query": "^1.130.17",
-    "@tanstack/react-start": "^1.141.1",
-    "@tanstack/router-plugin": "^1.141.1",
-    "lucide-react": "^0.546.0",
+    "@tailwindcss/vite": "^4.2.2",
+    "@tanstack/react-query": "^5.99.0",
+    "@tanstack/react-router": "^1.168.22",
+    "@tanstack/react-start": "^1.167.41",
+    "lucide-react": "^1.8.0",
     "next-themes": "^0.4.6",
-    "react": "^19.2.3",
-    "react-dom": "^19.2.3",
-    "sonner": "^2.0.5",
-    "tailwindcss": "^4.1.18",
-    "vite-tsconfig-paths": "^5.1.4"
+    "react": "^19.2.5",
+    "react-dom": "^19.2.5",
+    "sonner": "^2.0.7",
+    "tailwindcss": "^4.2.2"
   },
   "devDependencies": {
-    "@tanstack/react-router-devtools": "^1.141.1",
-    "@testing-library/dom": "^10.4.0",
-    "@testing-library/react": "^16.2.0",
-    "@types/react": "^19.2.10",
+    "@tanstack/react-router-devtools": "^1.166.13",
+    "@testing-library/dom": "^10.4.1",
+    "@testing-library/react": "^16.3.2",
+    "@types/react": "^19.2.14",
     "@types/react-dom": "^19.2.3",
-    "@vitejs/plugin-react": "^5.0.4",
-    "jsdom": "^26.0.0",
-    "vite": "^7.0.2",
-    "web-vitals": "^5.0.3"
+    "@vitejs/plugin-react": "^6.0.1",
+    "jsdom": "^29.0.2",
+    "vite": "^8.0.8",
+    "web-vitals": "^5.2.0"
   }
 }
 `],
@@ -30491,7 +30493,8 @@ import Loader from "./components/loader";
 import "./index.css";
 import { routeTree } from "./routeTree.gen";
 {{#if (eq api "trpc")}}
-import { QueryCache, QueryClient, QueryClientProvider } from "@tanstack/react-query";
+import { QueryCache, QueryClient } from "@tanstack/react-query";
+import { setupRouterSsrQueryIntegration } from "@tanstack/react-router-ssr-query";
 import { createTRPCClient, httpBatchLink } from "@trpc/client";
 import { createTRPCOptionsProxy } from "@trpc/tanstack-react-query";
 import { toast } from "sonner";
@@ -30504,7 +30507,7 @@ import { env } from "@{{projectName}}/env/web";
 import { getClerkAuthToken } from "@/utils/clerk-auth";
 {{/if}}
 {{else if (eq api "orpc")}}
-import { QueryClientProvider } from "@tanstack/react-query";
+import { setupRouterSsrQueryIntegration } from "@tanstack/react-router-ssr-query";
 import { orpc, queryClient } from "./utils/orpc";
 {{/if}}
 {{/if}}
@@ -30604,22 +30607,20 @@ export const getRouter = () => {
 		defaultNotFoundComponent: () => <div>Not Found</div>,
 {{#if (eq api "trpc")}}
 		Wrap: ({ children }) => (
-			<QueryClientProvider client={queryClient}>
-				<TRPCProvider trpcClient={trpcClient} queryClient={queryClient}>
-					{children}
-				</TRPCProvider>
-			</QueryClientProvider>
-		),
-{{else if (eq api "orpc")}}
-		Wrap: ({ children }) => (
-			<QueryClientProvider client={queryClient}>
+			<TRPCProvider trpcClient={trpcClient} queryClient={queryClient}>
 				{children}
-			</QueryClientProvider>
+			</TRPCProvider>
 		),
-{{else}}
-		Wrap: ({ children }) => <>{children}</>,
 {{/if}}
 	});
+{{#if (or (eq api "trpc") (eq api "orpc"))}}
+
+	setupRouterSsrQueryIntegration({
+		router,
+		queryClient,
+	});
+{{/if}}
+
 	return router;
 };
 {{/if}}
@@ -30984,7 +30985,6 @@ function HomeComponent() {
     /* Bundler mode */
     "moduleResolution": "bundler",
     "allowImportingTsExtensions": true,
-    "verbatimModuleSyntax": true,
     "noEmit": true,
 
     /* Linting */
@@ -31003,21 +31003,22 @@ function HomeComponent() {
 }
 `],
 	["frontend/react/tanstack-start/vite.config.ts.hbs", `import { defineConfig } from "vite";
-import tsconfigPaths from "vite-tsconfig-paths";
 import { tanstackStart } from "@tanstack/react-start/plugin/vite";
 import tailwindcss from "@tailwindcss/vite";
 import viteReact from "@vitejs/plugin-react";
 
 export default defineConfig({
+  server: {
+    port: 3001,
+  },
+  resolve: {
+    tsconfigPaths: true,
+  },
   plugins: [
-    tsconfigPaths(),
     tailwindcss(),
     tanstackStart(),
     viteReact(),
   ],
-  server: {
-    port: 3001,
-  },
 {{#if (and (eq backend "convex") (eq auth "better-auth"))}}
   ssr: {
     noExternal: ["@convex-dev/better-auth"],
@@ -31241,16 +31242,16 @@ dist-ssr
     "test": "vitest run"
   },
   "dependencies": {
-    "@tailwindcss/vite": "^4.1.13",
-    "@tanstack/router-plugin": "^1.131.44",
-    "@tanstack/solid-router": "^1.131.44",
-    "lucide-solid": "^0.544.0",
-    "solid-js": "^1.9.9",
-    "tailwindcss": "^4.1.13"
+    "@tailwindcss/vite": "^4.2.2",
+    "@tanstack/router-plugin": "^1.167.22",
+    "@tanstack/solid-router": "^1.168.20",
+    "lucide-solid": "^1.8.0",
+    "solid-js": "^1.9.12",
+    "tailwindcss": "^4.2.2"
   },
   "devDependencies": {
-    "vite": "^7.1.5",
-    "vite-plugin-solid": "^2.11.8"
+    "vite": "^8.0.8",
+    "vite-plugin-solid": "^2.11.12"
   }
 }
 `],
@@ -31555,14 +31556,14 @@ vite.config.ts.timestamp-*
 		"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch"
 	},
 	"devDependencies": {
-		"@sveltejs/adapter-auto": "^6.1.0",
-		"@sveltejs/kit": "^2.31.1",
-		"@sveltejs/vite-plugin-svelte": "^6.1.2",
-		"@tailwindcss/vite": "^4.1.12",
-		"svelte": "^5.38.1",
-		"svelte-check": "^4.3.1",
-		"tailwindcss": "^4.1.12",
-		"vite": "^7.1.2"
+		"@sveltejs/adapter-auto": "^7.0.1",
+		"@sveltejs/kit": "^2.57.1",
+		"@sveltejs/vite-plugin-svelte": "^7.0.0",
+		"@tailwindcss/vite": "^4.2.2",
+		"svelte": "^5.55.4",
+		"svelte-check": "^4.4.6",
+		"tailwindcss": "^4.2.2",
+		"vite": "^8.0.8"
 	},
 	"dependencies": {}
 }