create-better-t-stack 2.33.7 → 2.33.8-canary.70c2a51a

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-better-t-stack",
-  "version": "2.33.7",
+  "version": "2.33.8-canary.70c2a51a",
   "description": "A modern CLI tool for scaffolding end-to-end type-safe TypeScript projects with best practices and customizable configurations",
   "type": "module",
   "license": "MIT",
@@ -52,7 +52,8 @@
     "dev": "tsdown --watch",
     "check-types": "tsc --noEmit",
     "check": "biome check --write .",
-    "test": "bun run build && vitest --ui",
+    "test": "bun run build && vitest run",
+    "test:ui": "bun run build && vitest --ui",
     "test:with-build": "bun run build && WITH_BUILD=1 vitest --ui",
     "prepublishOnly": "npm run build"
   },
@@ -63,22 +64,24 @@
     }
   },
   "dependencies": {
+    "@biomejs/js-api": "^3.0.0",
+    "@biomejs/wasm-nodejs": "^2.2.0",
     "@clack/prompts": "^0.11.0",
     "consola": "^3.4.2",
     "execa": "^9.6.0",
     "fs-extra": "^11.3.1",
-    "globby": "^14.1.0",
     "gradient-string": "^3.0.0",
     "handlebars": "^4.7.8",
     "jsonc-parser": "^3.3.1",
     "picocolors": "^1.1.1",
+    "tinyglobby": "^0.2.14",
     "trpc-cli": "^0.10.2",
     "ts-morph": "^26.0.0",
     "zod": "^4.0.17"
   },
   "devDependencies": {
     "@types/fs-extra": "^11.0.4",
-    "@types/node": "^24.2.1",
+    "@types/node": "^24.3.0",
     "@vitest/ui": "^3.2.4",
     "tsdown": "^0.14.1",
     "typescript": "^5.9.2",

package/templates/addons/biome/biome.json.hbs

@@ -21,6 +21,7 @@
 			"!bts.jsonc",
 			"!**/.expo",
 			"!**/.wrangler",
+			"!**/.alchemy",
 			"!**/wrangler.jsonc",
 			"!**/.source"
 		]

package/templates/addons/ruler/.ruler/mcp.json.hbs

@@ -4,7 +4,7 @@
       "type": "stdio",
       "command": "npx",
       "args": ["-y", "@upstash/context7-mcp"]
-    }{{#if (or (eq runtime "workers") (eq webDeploy "workers"))}},
+    }{{#if (or (eq runtime "workers") (eq webDeploy "wrangler"))}},
     "cloudflare": {
 			"command": "npx",
 			"args": ["mcp-remote", "https://docs.mcp.cloudflare.com/sse"]

package/templates/addons/ultracite/biome.json.hbs

@@ -16,6 +16,7 @@
 			"!bts.jsonc",
 			"!**/.expo",
 			"!**/.wrangler",
+			"!**/.alchemy",
 			"!**/wrangler.jsonc",
 			"!**/.source"
 		]

package/templates/api/orpc/native/utils/orpc.ts.hbs

@@ -1,9 +1,8 @@
 import { createORPCClient } from "@orpc/client";
 import { RPCLink } from "@orpc/client/fetch";
 import { createTanstackQueryUtils } from "@orpc/tanstack-query";
-import type { RouterClient } from "@orpc/server";
 import { QueryCache, QueryClient } from "@tanstack/react-query";
-import type { appRouter } from "../../server/src/routers";
+import type { AppRouterClient } from "../../server/src/routers";
 {{#if auth}}
 import { authClient } from "@/lib/auth-client";
 {{/if}}
@@ -30,6 +29,6 @@ export const link = new RPCLink({
   {{/if}}
 });
 
-export const client: RouterClient<typeof appRouter> = createORPCClient(link);
+export const client: AppRouterClient = createORPCClient(link);
 
 export const orpc = createTanstackQueryUtils(client);

package/templates/api/orpc/web/nuxt/app/plugins/orpc.ts.hbs

@@ -1,6 +1,5 @@
 import { defineNuxtPlugin, useRuntimeConfig } from '#app'
-import type { RouterClient } from '@orpc/server'
-import type { appRouter } from "../../../server/src/routers/index";
+import type { AppRouterClient } from "../../../server/src/routers/index";
 import { createORPCClient } from '@orpc/client'
 import { RPCLink } from '@orpc/client/fetch'
 import { createTanstackQueryUtils } from "@orpc/tanstack-query";
@@ -24,7 +23,7 @@ export default defineNuxtPlugin(() => {
   })
 
 
-  const client: RouterClient<typeof appRouter> = createORPCClient(rpcLink)
+  const client: AppRouterClient = createORPCClient(rpcLink)
   const orpcUtils = createTanstackQueryUtils(client)
 
   return {

package/templates/api/orpc/web/react/base/src/utils/orpc.ts.hbs

@@ -3,8 +3,7 @@ import { RPCLink } from "@orpc/client/fetch";
 import { createTanstackQueryUtils } from "@orpc/tanstack-query";
 import { QueryCache, QueryClient } from "@tanstack/react-query";
 import { toast } from "sonner";
-import type { appRouter } from "../../../server/src/routers/index";
-import type { RouterClient } from "@orpc/server";
+import type { AppRouterClient } from "../../../server/src/routers/index";
 
 export const queryClient = new QueryClient({
   queryCache: new QueryCache({
@@ -37,6 +36,6 @@ export const link = new RPCLink({
   {{/if}}
 });
 
-export const client: RouterClient<typeof appRouter> = createORPCClient(link)
+export const client: AppRouterClient = createORPCClient(link)
 
 export const orpc = createTanstackQueryUtils(client)

package/templates/api/orpc/web/solid/src/utils/orpc.ts.hbs

@@ -2,8 +2,7 @@ import { createORPCClient } from "@orpc/client";
 import { RPCLink } from "@orpc/client/fetch";
 import { createTanstackQueryUtils } from "@orpc/tanstack-query";
 import { QueryCache, QueryClient } from "@tanstack/solid-query";
-import type { appRouter } from "../../../server/src/routers/index";
-import type { RouterClient } from "@orpc/server";
+import type { AppRouterClient } from "../../../server/src/routers/index";
 
 export const queryClient = new QueryClient({
   queryCache: new QueryCache({
@@ -25,6 +24,6 @@ export const link = new RPCLink({
   {{/if}}
 });
 
-export const client: RouterClient<typeof appRouter> = createORPCClient(link);
+export const client: AppRouterClient = createORPCClient(link);
 
 export const orpc = createTanstackQueryUtils(client);

package/templates/api/orpc/web/svelte/src/lib/orpc.ts.hbs

@@ -1,10 +1,9 @@
 import { PUBLIC_SERVER_URL } from "$env/static/public";
 import { createORPCClient } from "@orpc/client";
 import { RPCLink } from "@orpc/client/fetch";
-import type { RouterClient } from "@orpc/server";
 import { createTanstackQueryUtils } from "@orpc/tanstack-query";
 import { QueryCache, QueryClient } from "@tanstack/svelte-query";
-import type { appRouter } from "../../../server/src/routers/index";
+import type { AppRouterClient } from "../../../server/src/routers/index";
 
 export const queryClient = new QueryClient({
 	queryCache: new QueryCache({
@@ -26,6 +25,6 @@ export const link = new RPCLink({
 	{{/if}}
 });
 
-export const client: RouterClient<typeof appRouter> = createORPCClient(link);
+export const client: AppRouterClient = createORPCClient(link);
 
 export const orpc = createTanstackQueryUtils(client);

package/templates/auth/server/base/src/lib/auth.ts.hbs

@@ -21,6 +21,13 @@ export const auth = betterAuth({
   ],
   emailAndPassword: {
     enabled: true,
+  },
+  advanced: {
+    defaultCookieAttributes: {
+      sameSite: "none",
+      secure: true,
+      httpOnly: true,
+    },
   }
   {{#if (or (includes frontend "native-nativewind") (includes frontend "native-unistyles"))}}
   , plugins: [expo()]
@@ -54,8 +61,13 @@ export const auth = betterAuth({
   emailAndPassword: {
     enabled: true,
   },
-  secret: process.env.BETTER_AUTH_SECRET,
-  baseURL: process.env.BETTER_AUTH_URL,
+  advanced: {
+    defaultCookieAttributes: {
+      sameSite: "none",
+      secure: true,
+      httpOnly: true,
+    },
+  },
   {{#if (or (includes frontend "native-nativewind") (includes frontend "native-unistyles"))}}
   plugins: [expo()],
   {{/if}}
@@ -73,7 +85,7 @@ import * as schema from "../db/schema/auth";
 import { env } from "cloudflare:workers";
 
 export const auth = betterAuth({
-   database: drizzleAdapter(db, {
+  database: drizzleAdapter(db, {
     {{#if (eq database "postgres")}}provider: "pg",{{/if}}
     {{#if (eq database "sqlite")}}provider: "sqlite",{{/if}}
     {{#if (eq database "mysql")}}provider: "mysql",{{/if}}
@@ -85,6 +97,13 @@ export const auth = betterAuth({
   },
   secret: env.BETTER_AUTH_SECRET,
   baseURL: env.BETTER_AUTH_URL,
+  advanced: {
+    defaultCookieAttributes: {
+      sameSite: "none",
+      secure: true,
+      httpOnly: true,
+    },
+  },
   {{#if (or (includes frontend "native-nativewind") (includes frontend "native-unistyles"))}}
   plugins: [expo()],
   {{/if}}
@@ -110,6 +129,13 @@ export const auth = betterAuth({
   ],
   emailAndPassword: {
     enabled: true,
+  },
+  advanced: {
+    defaultCookieAttributes: {
+      sameSite: "none",
+      secure: true,
+      httpOnly: true,
+    },
   }
   {{#if (or (includes frontend "native-nativewind") (includes frontend "native-unistyles"))}}
   , plugins: [expo()]
@@ -133,9 +159,16 @@ export const auth = betterAuth({
   ],
   emailAndPassword: {
     enabled: true,
+  },
+  advanced: {
+    defaultCookieAttributes: {
+      sameSite: "none",
+      secure: true,
+      httpOnly: true,
+    },
   }
   {{#if (or (includes frontend "native-nativewind") (includes frontend "native-unistyles"))}}
   , plugins: [expo()]
   {{/if}}
 });
-{{/if}}
+{{/if}}

package/templates/backend/server/server-base/_gitignore

@@ -16,6 +16,7 @@ dist/
 .idea/usage.statistics.xml
 .idea/shelf
 .wrangler
+.alchemy
 /.next/
 .vercel
 

package/templates/backend/server/server-base/src/routers/index.ts.hbs

@@ -1,5 +1,6 @@
 {{#if (eq api "orpc")}}
 import { {{#if auth}}protectedProcedure, {{/if}}publicProcedure } from "../lib/orpc";
+import type { RouterClient } from "@orpc/server";
 {{#if (includes examples "todo")}}
 import { todoRouter } from "./todo";
 {{/if}}
@@ -21,6 +22,7 @@ export const appRouter = {
   {{/if}}
 };
 export type AppRouter = typeof appRouter;
+export type AppRouterClient = RouterClient<typeof appRouter>;
 {{else if (eq api "trpc")}}
 import {
   {{#if auth}}protectedProcedure, {{/if}}publicProcedure,

package/templates/backend/server/server-base/tsconfig.json.hbs

@@ -20,7 +20,7 @@
       {{else if (eq runtime "bun")}}
       "bun"
       {{else if (eq runtime "workers")}}
-      "./worker-configuration",
+      "@cloudflare/workers-types",
       "node"
       {{else}}
       "node",

package/templates/base/_gitignore

@@ -1,2 +1,4 @@
 node_modules
 .turbo
+.alchemy
+.env

package/templates/deploy/alchemy/alchemy.run.ts.hbs

@@ -0,0 +1,200 @@
+import alchemy from "alchemy";
+{{#if (eq webDeploy "alchemy")}}
+{{#if (includes frontend "next")}}
+import { Next } from "alchemy/cloudflare";
+{{else if (includes frontend "nuxt")}}
+import { Nuxt } from "alchemy/cloudflare";
+{{else if (includes frontend "svelte")}}
+import { SvelteKit } from "alchemy/cloudflare";
+{{else if (includes frontend "tanstack-start")}}
+import { TanStackStart } from "alchemy/cloudflare";
+{{else if (includes frontend "tanstack-router")}}
+import { Vite } from "alchemy/cloudflare";
+{{else if (includes frontend "react-router")}}
+import { ReactRouter } from "alchemy/cloudflare";
+{{else if (includes frontend "solid")}}
+import { Vite } from "alchemy/cloudflare";
+{{/if}}
+{{/if}}
+{{#if (eq serverDeploy "alchemy")}}
+import { Worker, WranglerJson } from "alchemy/cloudflare";
+{{#if (eq dbSetup "d1")}}
+import { D1Database } from "alchemy/cloudflare";
+{{/if}}
+{{/if}}
+import { config } from "dotenv";
+
+{{#if (and (eq webDeploy "alchemy") (eq serverDeploy "alchemy"))}}
+config({ path: "./.env" });
+config({ path: "./apps/web/.env" });
+config({ path: "./apps/server/.env" });
+{{else if (or (eq webDeploy "alchemy") (eq serverDeploy "alchemy"))}}
+config({ path: "./.env" });
+{{/if}}
+
+const app = await alchemy("{{projectName}}");
+
+{{#if (and (eq serverDeploy "alchemy") (eq dbSetup "d1"))}}
+const db = await D1Database("database", {
+	name: `${app.name}-${app.stage}-db`,
+	migrationsDir: "apps/server/src/db/migrations",
+});
+{{/if}}
+
+{{#if (eq webDeploy "alchemy")}}
+{{#if (includes frontend "next")}}
+export const web = await Next("web", {
+  {{#if (eq serverDeploy "alchemy")}}cwd: "apps/web",{{/if}}
+  name: `${app.name}-${app.stage}-web`,
+  bindings: {
+    {{#if (eq backend "convex")}}
+    NEXT_PUBLIC_CONVEX_URL: process.env.NEXT_PUBLIC_CONVEX_URL || "",
+    {{else}}
+    NEXT_PUBLIC_SERVER_URL: process.env.NEXT_PUBLIC_SERVER_URL || "",
+    {{/if}}
+  },
+  dev: {
+    command: "{{packageManager}} run dev"
+  }
+});
+{{else if (includes frontend "nuxt")}}
+export const web = await Nuxt("web", {
+  {{#if (eq serverDeploy "alchemy")}}cwd: "apps/web",{{/if}}
+  name: `${app.name}-${app.stage}-web`,
+  bindings: {
+    {{#if (eq backend "convex")}}
+    NUXT_PUBLIC_CONVEX_URL: process.env.NUXT_PUBLIC_CONVEX_URL || "",
+    {{else}}
+    NUXT_PUBLIC_SERVER_URL: process.env.NUXT_PUBLIC_SERVER_URL || "",
+    {{/if}}
+  },
+  dev: {
+    command: "{{packageManager}} run dev"
+  }
+});
+{{else if (includes frontend "svelte")}}
+export const web = await SvelteKit("web", {
+  {{#if (eq serverDeploy "alchemy")}}cwd: "apps/web",{{/if}}
+  name: `${app.name}-${app.stage}-web`,
+  bindings: {
+    {{#if (eq backend "convex")}}
+    PUBLIC_CONVEX_URL: process.env.PUBLIC_CONVEX_URL || "",
+    {{else}}
+    PUBLIC_SERVER_URL: process.env.PUBLIC_SERVER_URL || "",
+    {{/if}}
+  },
+  dev: {
+    command: "{{packageManager}} run dev"
+  }
+});
+{{else if (includes frontend "tanstack-start")}}
+export const web = await TanStackStart("web", {
+  {{#if (eq serverDeploy "alchemy")}}cwd: "apps/web",{{/if}}
+  name: `${app.name}-${app.stage}-web`,
+  bindings: {
+    {{#if (eq backend "convex")}}
+    VITE_CONVEX_URL: process.env.VITE_CONVEX_URL || "",
+    {{else}}
+    VITE_SERVER_URL: process.env.VITE_SERVER_URL || "",
+    {{/if}}
+  },
+  dev: {
+    command: "{{packageManager}} run dev"
+  }
+});
+{{else if (includes frontend "tanstack-router")}}
+export const web = await Vite("web", {
+  {{#if (eq serverDeploy "alchemy")}}cwd: "apps/web",{{/if}}
+  name: `${app.name}-${app.stage}-web`,
+  assets: "dist",
+  bindings: {
+    {{#if (eq backend "convex")}}
+    VITE_CONVEX_URL: process.env.VITE_CONVEX_URL || "",
+    {{else}}
+    VITE_SERVER_URL: process.env.VITE_SERVER_URL || "",
+    {{/if}}
+  },
+  dev: {
+    command: "{{packageManager}} run dev"
+  }
+});
+{{else if (includes frontend "react-router")}}
+export const web = await ReactRouter("web", {
+  {{#if (eq serverDeploy "alchemy")}}cwd: "apps/web",{{/if}}
+  name: `${app.name}-${app.stage}-web`,
+  bindings: {
+    {{#if (eq backend "convex")}}
+    VITE_CONVEX_URL: process.env.VITE_CONVEX_URL || "",
+    {{else}}
+    VITE_SERVER_URL: process.env.VITE_SERVER_URL || "",
+    {{/if}}
+  },
+  dev: {
+    command: "{{packageManager}} run dev"
+  }
+});
+{{else if (includes frontend "solid")}}
+export const web = await Vite("web", {
+  {{#if (eq serverDeploy "alchemy")}}cwd: "apps/web",{{/if}}
+  name: `${app.name}-${app.stage}-web`,
+  assets: "dist",
+  bindings: {
+    {{#if (eq backend "convex")}}
+    VITE_CONVEX_URL: process.env.VITE_CONVEX_URL || "",
+    {{else}}
+    VITE_SERVER_URL: process.env.VITE_SERVER_URL || "",
+    {{/if}}
+  },
+  dev: {
+    command: "{{packageManager}} run dev"
+  }
+});
+{{/if}}
+{{/if}}
+
+{{#if (eq serverDeploy "alchemy")}}
+export const server = await Worker("server", {
+  {{#if (eq webDeploy "alchemy")}}cwd: "apps/server",{{/if}}
+  name: `${app.name}-${app.stage}`,
+  entrypoint: "src/index.ts",
+  compatibility: "node",
+  bindings: {
+    {{#if (eq dbSetup "d1")}}
+    DB: db,
+    {{else if (and (ne database "none") (ne dbSetup "none"))}}
+    DATABASE_URL: alchemy.secret(process.env.DATABASE_URL),
+    {{/if}}
+    CORS_ORIGIN: process.env.CORS_ORIGIN || "",
+    {{#if auth}}
+    BETTER_AUTH_SECRET: alchemy.secret(process.env.BETTER_AUTH_SECRET),
+    BETTER_AUTH_URL: process.env.BETTER_AUTH_URL || "",
+    {{/if}}
+    {{#if (includes examples "ai")}}
+    GOOGLE_GENERATIVE_AI_API_KEY: alchemy.secret(process.env.GOOGLE_GENERATIVE_AI_API_KEY),
+    {{/if}}
+    {{#if (eq dbSetup "turso")}}
+    DATABASE_AUTH_TOKEN: alchemy.secret(process.env.DATABASE_AUTH_TOKEN),
+    {{/if}}
+  },
+  dev: {
+		port: 3000,
+	},
+});
+
+await WranglerJson("wrangler", {
+	worker: server,
+});
+{{/if}}
+
+
+
+{{#if (and (eq webDeploy "alchemy") (eq serverDeploy "alchemy"))}}
+console.log(`Web    -> ${web.url}`);
+console.log(`Server -> ${server.url}`);
+{{else if (eq webDeploy "alchemy")}}
+console.log(`Web    -> ${web.url}`);
+{{else if (eq serverDeploy "alchemy")}}
+console.log(`Server -> ${server.url}`);
+{{/if}}
+
+await app.finalize();

package/templates/deploy/alchemy/env.d.ts.hbs

@@ -0,0 +1,20 @@
+// This file infers types for the cloudflare:workers environment from your Alchemy Worker.
+// @see https://alchemy.run/concepts/bindings/#type-safe-bindings
+
+{{#if (eq webDeploy "alchemy")}}
+import type { server } from "../../alchemy.run";
+{{else}}
+import type { server } from "./alchemy.run";
+{{/if}}
+
+export type CloudflareEnv = typeof server.Env;
+
+declare global {
+	type Env = CloudflareEnv;
+}
+
+declare module "cloudflare:workers" {
+	namespace Cloudflare {
+		export interface Env extends CloudflareEnv {}
+	}
+}

package/templates/deploy/{web → wrangler/web}/nuxt/wrangler.jsonc.hbs

@@ -3,7 +3,7 @@
  * https://developers.cloudflare.com/workers/wrangler/configuration/
  */
 {
-	"$schema": "../../node_modules/wrangler/config-schema.json",
+	"$schema": "./node_modules/wrangler/config-schema.json",
 	"name": "{{projectName}}",
 	"main": "./.output/server/index.mjs",
 	"compatibility_date": "2025-07-01",

package/templates/deploy/{web → wrangler/web}/react/next/wrangler.jsonc.hbs

@@ -1,5 +1,5 @@
 {
-	"$schema": "../../node_modules/wrangler/config-schema.json",
+	"$schema": "./node_modules/wrangler/config-schema.json",
 	"main": ".open-next/worker.js",
 	"name": "{{projectName}}",
 	"compatibility_date": "2025-07-05",

package/templates/deploy/{web → wrangler/web}/react/react-router/wrangler.jsonc.hbs

@@ -1,5 +1,5 @@
 {
-  "$schema": "../../node_modules/wrangler/config-schema.json",
+  "$schema": "./node_modules/wrangler/config-schema.json",
   "name": "{{projectName}}",
   "compatibility_date": "2025-04-03",
   "assets": {

package/templates/deploy/{web → wrangler/web}/react/tanstack-router/wrangler.jsonc.hbs

@@ -1,5 +1,5 @@
 {
-  "$schema": "../../node_modules/wrangler/config-schema.json",
+  "$schema": "./node_modules/wrangler/config-schema.json",
   "name": "{{projectName}}",
   "compatibility_date": "2025-04-03",
   "assets": {

package/templates/deploy/{web → wrangler/web}/react/tanstack-start/wrangler.jsonc.hbs

@@ -1,5 +1,5 @@
 {
-    "$schema": "../../node_modules/wrangler/config-schema.json",
+    "$schema": "./node_modules/wrangler/config-schema.json",
     "name": "{{projectName}}",
     "main": ".output/server/index.mjs",
     "compatibility_date": "2025-07-05",

package/templates/deploy/{web → wrangler/web}/solid/wrangler.jsonc.hbs

@@ -1,5 +1,5 @@
 {
-  "$schema": "../../node_modules/wrangler/config-schema.json",
+  "$schema": "./node_modules/wrangler/config-schema.json",
   "name": "{{projectName}}",
   "compatibility_date": "2025-04-03",
   "assets": {

package/templates/deploy/{web → wrangler/web}/svelte/wrangler.jsonc.hbs

@@ -3,7 +3,7 @@
  * https://developers.cloudflare.com/workers/wrangler/configuration/
  */
 {
-	"$schema": "../../node_modules/wrangler/config-schema.json",
+	"$schema": "./node_modules/wrangler/config-schema.json",
 	"name": "{{projectName}}",
 	"main": ".svelte-kit/cloudflare/_worker.js",
 	"compatibility_date": "2025-07-05",

package/templates/frontend/nuxt/_gitignore

@@ -5,6 +5,8 @@
 .nitro
 .cache
 dist
+.wrangler
+.alchemy
 
 # Node dependencies
 node_modules
@@ -22,3 +24,4 @@ logs
 .env
 .env.*
 !.env.example
+

package/templates/frontend/nuxt/tsconfig.json.hbs

@@ -12,12 +12,12 @@
     },
     {
       "path": "./.nuxt/tsconfig.node.json"
-    }
-  {{#unless (or (eq backend "convex") (eq backend "none"))}}
-    ,
+    }{{#unless (or (eq backend "convex") (eq backend "none"))}},
     {
         "path": "../server"
     }
   {{/unless}}
-  ]
+  ]{{#if (eq webDeploy "alchemy")}},
+  "include": ["alchemy.run.ts"]
+  {{/if}}
 }

package/templates/frontend/react/tanstack-router/src/routes/__root.tsx.hbs

@@ -7,9 +7,8 @@ import { link, orpc } from "@/utils/orpc";
 import type { QueryClient } from "@tanstack/react-query";
 import { ReactQueryDevtools } from "@tanstack/react-query-devtools";
 import { useState } from "react";
-import type { RouterClient } from "@orpc/server";
 import { createTanstackQueryUtils } from "@orpc/tanstack-query";
-import type { appRouter } from "../../../server/src/routers";
+import type { AppRouterClient } from "../../../server/src/routers";
 import { createORPCClient } from "@orpc/client";
 {{/if}}
 {{#if (eq api "trpc")}}
@@ -67,7 +66,7 @@ function RootComponent() {
   });
 
   {{#if (eq api "orpc")}}
-  const [client] = useState<RouterClient<typeof appRouter>>(() => createORPCClient(link));
+  const [client] = useState<AppRouterClient>(() => createORPCClient(link));
   const [orpcUtils] = useState(() => createTanstackQueryUtils(client));
   {{/if}}
 

package/templates/frontend/react/web-base/_gitignore

@@ -26,6 +26,7 @@
 .vercel
 .netlify
 .wrangler
+.alchemy
 
 # Environment & local files
 .env*

package/templates/frontend/react/web-base/src/components/header.tsx.hbs

@@ -6,7 +6,6 @@ import { NavLink } from "react-router";
 {{else if (or (includes frontend "tanstack-router") (includes frontend "tanstack-start"))}}
 import { Link } from "@tanstack/react-router";
 {{/if}}
-
 {{#unless (includes frontend "tanstack-start")}}
 import { ModeToggle } from "./mode-toggle";
 {{/unless}}

package/templates/frontend/solid/_gitignore

@@ -7,4 +7,5 @@ dist-ssr
 .env.*
 
 .wrangler
+.alchemy
 .dev.vars*

package/templates/frontend/solid/package.json.hbs

@@ -13,7 +13,6 @@
     "@tanstack/router-plugin": "^1.109.2",
     "@tanstack/solid-form": "^1.9.0",
     "@tanstack/solid-router": "^1.110.0",
-    "@tanstack/solid-router-devtools": "^1.109.2",
     "lucide-solid": "^0.507.0",
     "solid-js": "^1.9.4",
     "tailwindcss": "^4.0.6",