create-better-t-stack 2.49.1 → 2.50.0-canary.dd7000f2

package/templates/backend/server/express/src/index.ts.hbs

@@ -1,8 +1,8 @@
 import "dotenv/config";
 {{#if (eq api "trpc")}}
 import { createExpressMiddleware } from "@trpc/server/adapters/express";
-import { createContext } from "./lib/context";
-import { appRouter } from "./routers/index";
+import { createContext } from "@{{projectName}}/api/context";
+import { appRouter } from "@{{projectName}}/api/routers/index";
 {{/if}}
 {{#if (eq api "orpc")}}
 import { OpenAPIHandler } from "@orpc/openapi/node";
@@ -10,9 +10,9 @@ import { OpenAPIReferencePlugin } from "@orpc/openapi/plugins";
 import { ZodToJsonSchemaConverter } from "@orpc/zod/zod4";
 import { RPCHandler } from "@orpc/server/node";
 import { onError } from "@orpc/server";
-import { appRouter } from "./routers";
+import { appRouter } from "@{{projectName}}/api/routers/index";
 {{#if (eq auth "better-auth")}}
-import { createContext } from "./lib/context";
+import { createContext } from "@{{projectName}}/api/context";
 {{/if}}
 {{/if}}
 import cors from "cors";
@@ -22,7 +22,7 @@ import { streamText, type UIMessage, convertToModelMessages } from "ai";
 import { google } from "@ai-sdk/google";
 {{/if}}
 {{#if (eq auth "better-auth")}}
-import { auth } from "./lib/auth";
+import { auth } from "@{{projectName}}/auth";
 import { toNodeHandler } from "better-auth/node";
 {{/if}}
 
@@ -105,7 +105,7 @@ app.use(express.json());
 app.post("/ai", async (req, res) => {
   const { messages = [] } = (req.body || {}) as { messages: UIMessage[] };
   const result = streamText({
-    model: google("gemini-1.5-flash"),
+    model: google("gemini-2.5-flash"),
     messages: convertToModelMessages(messages),
   });
   result.pipeUIMessageStreamToResponse(res);

package/templates/backend/server/fastify/src/index.ts.hbs

@@ -4,8 +4,8 @@ import fastifyCors from "@fastify/cors";
 
 {{#if (eq api "trpc")}}
 import { fastifyTRPCPlugin, type FastifyTRPCPluginOptions } from "@trpc/server/adapters/fastify";
-import { createContext } from "./lib/context";
-import { appRouter, type AppRouter } from "./routers/index";
+import { createContext } from "@{{projectName}}/api/context";
+import { appRouter, type AppRouter } from "@{{projectName}}/api/routers/index";
 {{/if}}
 
 {{#if (eq api "orpc")}}
@@ -15,10 +15,10 @@ import { ZodToJsonSchemaConverter } from "@orpc/zod/zod4";
 import { RPCHandler } from "@orpc/server/node";
 import { CORSPlugin } from "@orpc/server/plugins";
 import { onError } from "@orpc/server";
-import { appRouter } from "./routers/index";
+import { appRouter } from "@{{projectName}}/api/routers/index";
 import { createServer } from "node:http";
 {{#if (eq auth "better-auth")}}
-import { createContext } from "./lib/context";
+import { createContext } from "@{{projectName}}/api/context";
 {{/if}}
 {{/if}}
 
@@ -28,7 +28,7 @@ import { google } from "@ai-sdk/google";
 {{/if}}
 
 {{#if (eq auth "better-auth")}}
-import { auth } from "./lib/auth";
+import { auth } from "@{{projectName}}/auth";
 {{/if}}
 
 const baseCorsConfig = {
@@ -161,7 +161,7 @@ interface AiRequestBody {
 fastify.post('/ai', async function (request) {
   const { messages } = request.body as AiRequestBody;
   const result = streamText({
-    model: google('gemini-1.5-flash'),
+    model: google('gemini-2.5-flash'),
     messages: convertToModelMessages(messages),
   });
 

package/templates/backend/server/hono/src/index.ts.hbs

@@ -10,16 +10,16 @@ import { OpenAPIReferencePlugin } from "@orpc/openapi/plugins";
 import { ZodToJsonSchemaConverter } from "@orpc/zod/zod4";
 import { RPCHandler } from "@orpc/server/fetch";
 import { onError } from "@orpc/server";
-import { createContext } from "./lib/context";
-import { appRouter } from "./routers/index";
+import { createContext } from "@{{projectName}}/api/context";
+import { appRouter } from "@{{projectName}}/api/routers/index";
 {{/if}}
 {{#if (eq api "trpc")}}
 import { trpcServer } from "@hono/trpc-server";
-import { createContext } from "./lib/context";
-import { appRouter } from "./routers/index";
+import { createContext } from "@{{projectName}}/api/context";
+import { appRouter } from "@{{projectName}}/api/routers/index";
 {{/if}}
 {{#if (eq auth "better-auth")}}
-import { auth } from "./lib/auth";
+import { auth } from "@{{projectName}}/auth";
 {{/if}}
 import { Hono } from "hono";
 import { cors } from "hono/cors";
@@ -121,7 +121,7 @@ app.post("/ai", async (c) => {
   const body = await c.req.json();
   const uiMessages = body.messages || [];
   const result = streamText({
-    model: google("gemini-1.5-flash"),
+    model: google("gemini-2.5-flash"),
     messages: convertToModelMessages(uiMessages),
   });
 
@@ -137,7 +137,7 @@ app.post("/ai", async (c) => {
     apiKey: env.GOOGLE_GENERATIVE_AI_API_KEY,
   });
   const result = streamText({
-    model: google("gemini-1.5-flash"),
+    model: google("gemini-2.5-flash"),
     messages: convertToModelMessages(uiMessages),
   });
 

package/templates/base/_gitignore

@@ -1,4 +1,50 @@
+# Dependencies
 node_modules
+.pnp
+.pnp.js
+
+# Build outputs
+dist
+build
+*.tsbuildinfo
+
+# Environment variables
+.env
+.env*.local
+
+# IDEs and editors
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+.idea
+*.swp
+*.swo
+*~
+.DS_Store
+
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+lerna-debug.log*
+.pnpm-debug.log*
+
+# Turbo
 .turbo
+
+# Better-T-Stack
 .alchemy
-.env
+
+# Testing
+coverage
+.nyc_output
+
+# Misc
+*.tgz
+.cache
+tmp
+temp

package/templates/base/package.json.hbs

@@ -6,7 +6,5 @@
     "apps/*",
     "packages/*"
   ],
-  "scripts": {
-
-  }
+  "scripts": {}
 }

package/templates/base/tsconfig.base.json

@@ -0,0 +1,23 @@
+{
+    "$schema": "https://json.schemastore.org/tsconfig",
+    "compilerOptions": {
+        "target": "ESNext",
+        "module": "ESNext",
+        "moduleResolution": "bundler",
+        "lib": [
+            "ESNext"
+        ],
+        "verbatimModuleSyntax": true,
+        "strict": true,
+        "skipLibCheck": true,
+        "resolveJsonModule": true,
+        "allowSyntheticDefaultImports": true,
+        "esModuleInterop": true,
+        "forceConsistentCasingInFileNames": true,
+        "isolatedModules": true,
+        "noUncheckedIndexedAccess": true,
+        "noUnusedLocals": true,
+        "noUnusedParameters": true,
+        "noFallthroughCasesInSwitch": true
+    }
+}

package/templates/db/base/_gitignore

@@ -0,0 +1,34 @@
+# dependencies (bun install)
+node_modules
+
+# output
+out
+dist
+*.tgz
+
+# code coverage
+coverage
+*.lcov
+
+# logs
+logs
+_.log
+report.[0-9]_.[0-9]_.[0-9]_.[0-9]_.json
+
+# dotenv environment variable files
+.env
+.env.development.local
+.env.test.local
+.env.production.local
+.env.local
+
+# caches
+.eslintcache
+.cache
+*.tsbuildinfo
+
+# IntelliJ based IDEs
+.idea
+
+# Finder (MacOS) folder config
+.DS_Store

package/templates/db/base/package.json.hbs

@@ -0,0 +1,23 @@
+{
+  "name": "@{{projectName}}/db",
+  "type": "module",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "default": "./src/index.ts"
+    },
+    "./*": {
+      "types": "./dist/*.d.ts",
+      "default": "./src/*.ts"
+    }
+  },
+  "scripts": {
+    "build": "tsdown"
+  },
+  "devDependencies": {
+    "@types/node": "^24.5.2"
+  },
+  "peerDependencies": {
+    "typescript": "^5"
+  }
+}

package/templates/db/base/tsconfig.json.hbs

@@ -0,0 +1,13 @@
+{
+	"extends": "../../tsconfig.base.json",
+	"compilerOptions": {
+		"declaration": true,
+		"declarationMap": true,
+		"sourceMap": true,
+		"outDir": "dist",
+		"composite": true,
+		"types": [
+			"bun"
+		]
+	}
+}

package/templates/db/base/tsdown.config.ts.hbs

@@ -0,0 +1,7 @@
+import { defineConfig } from "tsdown";
+
+export default defineConfig({
+    entry: 'src/**/*.ts',
+    sourcemap: true,
+    dts: true,
+});

package/templates/db/drizzle/mysql/drizzle.config.ts.hbs

@@ -1,8 +1,13 @@
 import { defineConfig } from "drizzle-kit";
+import dotenv from "dotenv";
+
+dotenv.config({
+	path: "../../apps/server/.env",
+});
 
 export default defineConfig({
-  schema: "./src/db/schema",
-  out: "./src/db/migrations",
+  schema: "./src/schema",
+  out: "./src/migrations",
   dialect: "mysql",
   dbCredentials: {
     url: process.env.DATABASE_URL || "",

package/templates/db/drizzle/mysql/src/{db/index.ts.hbs → index.ts.hbs}

@@ -1,4 +1,4 @@
-{{#if (or (eq runtime "bun") (eq runtime "node"))}}
+{{#if (or (eq runtime "bun") (eq runtime "node") (eq runtime "none"))}}
 {{#if (eq dbSetup "planetscale")}}
 import { drizzle } from "drizzle-orm/planetscale-serverless";
 

package/templates/db/drizzle/postgres/drizzle.config.ts.hbs

@@ -1,8 +1,13 @@
 import { defineConfig } from "drizzle-kit";
+import dotenv from "dotenv";
+
+dotenv.config({
+	path: "../../apps/server/.env",
+});
 
 export default defineConfig({
-  schema: "./src/db/schema",
-  out: "./src/db/migrations",
+  schema: "./src/schema",
+  out: "./src/migrations",
   dialect: "postgresql",
   dbCredentials: {
     url: process.env.DATABASE_URL || "",

package/templates/db/drizzle/postgres/src/{db/index.ts.hbs → index.ts.hbs}

@@ -1,4 +1,4 @@
-{{#if (or (eq runtime "bun") (eq runtime "node"))}}
+{{#if (or (eq runtime "bun") (eq runtime "node") (eq runtime "none"))}}
 {{#if (eq dbSetup "neon")}}
 import { neon, neonConfig } from '@neondatabase/serverless';
 import { drizzle } from 'drizzle-orm/neon-http';

package/templates/db/drizzle/sqlite/drizzle.config.ts.hbs

@@ -1,8 +1,13 @@
 import { defineConfig } from "drizzle-kit";
+import dotenv from "dotenv";
+
+dotenv.config({
+	path: "../../apps/server/.env",
+});
 
 export default defineConfig({
-  schema: "./src/db/schema",
-  out: "./src/db/migrations",
+  schema: "./src/schema",
+  out: "./src/migrations",
   {{#if (eq dbSetup "d1")}}
   // DOCS: https://orm.drizzle.team/docs/guides/d1-http-with-drizzle-kit
   dialect: "sqlite",

package/templates/db/drizzle/sqlite/src/{db/index.ts.hbs → index.ts.hbs}

@@ -1,4 +1,4 @@
-{{#if (or (eq runtime "bun") (eq runtime "node"))}}
+{{#if (or (eq runtime "bun") (eq runtime "node") (eq runtime "none"))}}
 import { drizzle } from "drizzle-orm/libsql";
 import { createClient } from "@libsql/client";
 

package/templates/db/prisma/mongodb/prisma.config.ts.hbs

@@ -1,6 +1,10 @@
-import "dotenv/config";
 import path from "node:path";
 import type { PrismaConfig } from "prisma";
+import dotenv from "dotenv";
+
+dotenv.config({
+	path: "../../apps/server/.env",
+});
 
 export default {
   schema: path.join("prisma", "schema"),

package/templates/db/prisma/mongodb/src/index.ts.hbs

@@ -0,0 +1,5 @@
+import { PrismaClient } from "../prisma/generated/client";
+
+const prisma = new PrismaClient();
+
+export default prisma;

package/templates/db/prisma/mysql/prisma.config.ts.hbs

@@ -1,6 +1,10 @@
-import "dotenv/config";
 import path from "node:path";
 import type { PrismaConfig } from "prisma";
+import dotenv from "dotenv";
+
+dotenv.config({
+	path: "../../apps/server/.env",
+});
 
 export default {
   schema: path.join("prisma", "schema"),

package/templates/db/prisma/mysql/src/{db/index.ts.hbs → index.ts.hbs}

@@ -1,4 +1,4 @@
-import { PrismaClient } from "../../prisma/generated/client";
+import { PrismaClient } from "../prisma/generated/client";
 {{#if (eq dbSetup "planetscale")}}
 import { PrismaPlanetScale } from '@prisma/adapter-planetscale'
 

package/templates/db/prisma/postgres/prisma.config.ts.hbs

@@ -1,8 +1,12 @@
-{{#unless (eq dbSetup "prisma-postgres")}}
-import "dotenv/config";
-{{/unless}}
 import path from "node:path";
 import type { PrismaConfig } from "prisma";
+{{#unless (eq dbSetup "prisma-postgres")}}
+import dotenv from "dotenv";
+
+dotenv.config({
+	path: "../../apps/server/.env",
+});
+{{/unless}}
 
 export default {
   schema: path.join("prisma", "schema"),

package/templates/db/prisma/postgres/src/{db/index.ts.hbs → index.ts.hbs}

@@ -1,4 +1,4 @@
-import { PrismaClient } from "../../prisma/generated/client";
+import { PrismaClient } from "../prisma/generated/client";
 {{#if (and (eq dbSetup "prisma-postgres") (eq orm "prisma"))}}
 import { withAccelerate } from "@prisma/extension-accelerate";
 

package/templates/db/prisma/sqlite/prisma.config.ts.hbs

@@ -1,6 +1,10 @@
-import "dotenv/config";
 import path from "node:path";
 import type { PrismaConfig } from "prisma";
+import dotenv from "dotenv";
+
+dotenv.config({
+	path: "../../apps/server/.env",
+});
 
 export default {
   schema: path.join("prisma", "schema"),

package/templates/db/prisma/sqlite/src/{db/index.ts.hbs → index.ts.hbs}

@@ -1,7 +1,7 @@
 {{#if (eq dbSetup "d1")}}
 import { env } from "cloudflare:workers";
 import { PrismaD1 } from "@prisma/adapter-d1";
-import { PrismaClient } from "../../prisma/generated/client";
+import { PrismaClient } from "../prisma/generated/client";
 
 const adapter = new PrismaD1(env.DB);
 const prisma = new PrismaClient({ adapter });
@@ -9,7 +9,7 @@ const prisma = new PrismaClient({ adapter });
 export default prisma;
 {{else if (eq dbSetup "turso")}}
 import { PrismaLibSQL } from "@prisma/adapter-libsql";
-import { PrismaClient } from "../../prisma/generated/client";
+import { PrismaClient } from "../prisma/generated/client";
 
 const adapter = new PrismaLibSQL({
 	url: process.env.DATABASE_URL || "",
@@ -20,7 +20,7 @@ const prisma = new PrismaClient({ adapter });
 
 export default prisma;
 {{else}}
-import { PrismaClient } from "../../prisma/generated/client";
+import { PrismaClient } from "../prisma/generated/client";
 
 const prisma = new PrismaClient();
 

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

@@ -1,7 +1,7 @@
 {
     "$schema": "./node_modules/wrangler/config-schema.json",
     "name": "{{projectName}}",
-    "main": ".output/server/index.mjs",
+    "main": "@tanstack/react-start/server-entry",
     "compatibility_date": "2025-07-05",
     "compatibility_flags": ["nodejs_compat"],
     "assets": {

package/templates/examples/todo/server/drizzle/base/src/routers/todo.ts.hbs

@@ -1,9 +1,9 @@
 {{#if (eq api "orpc")}}
-import { eq } from "drizzle-orm";
+import { eq } from "@{{projectName}}/db";
 import z from "zod";
-import { db } from "../db";
-import { todo } from "../db/schema/todo";
-import { publicProcedure } from "../lib/orpc";
+import { db } from "@{{projectName}}/db";
+import { todo } from "@{{projectName}}/db/schema/todo";
+import { publicProcedure } from "../index";
 
 export const todoRouter = {
   getAll: publicProcedure.handler(async () => {
@@ -39,10 +39,10 @@ export const todoRouter = {
 
 {{#if (eq api "trpc")}}
 import z from "zod";
-import { router, publicProcedure } from "../lib/trpc";
+import { router, publicProcedure } from "../index";
 import { todo } from "../db/schema/todo";
 import { eq } from "drizzle-orm";
-import { db } from "../db";
+import { db } from "@{{projectName}}/db";
 
 export const todoRouter = router({
   getAll: publicProcedure.query(async () => {

package/templates/examples/todo/server/mongoose/base/src/routers/todo.ts.hbs

@@ -1,7 +1,7 @@
 {{#if (eq api "orpc")}}
 import z from "zod";
-import { publicProcedure } from "../lib/orpc";
-import { Todo } from "../db/models/todo.model";
+import { publicProcedure } from "../index";
+import { Todo } from "@{{projectName}}/db/models/todo.model";
 
 export const todoRouter = {
     getAll: publicProcedure.handler(async () => {
@@ -34,8 +34,8 @@ export const todoRouter = {
 
 {{#if (eq api "trpc")}}
 import z from "zod";
-import { router, publicProcedure } from "../lib/trpc";
-import { Todo } from "../db/models/todo.model";
+import { router, publicProcedure } from "../index";
+import { Todo } from "@{{projectName}}/db/models/todo.model";
 
 export const todoRouter = router({
     getAll: publicProcedure.query(async () => {

package/templates/examples/todo/server/prisma/base/src/routers/todo.ts.hbs

@@ -1,7 +1,7 @@
 {{#if (eq api "orpc")}}
 import z from "zod";
-import prisma from "../db";
-import { publicProcedure } from "../lib/orpc";
+import prisma from "@{{projectName}}/db";
+import { publicProcedure } from "../index";
 
 export const todoRouter = {
   getAll: publicProcedure.handler(async () => {
@@ -52,8 +52,8 @@ export const todoRouter = {
 {{#if (eq api "trpc")}}
 import { TRPCError } from "@trpc/server";
 import z from "zod";
-import prisma from "../db";
-import { publicProcedure, router } from "../lib/trpc";
+import prisma from "@{{projectName}}/db";
+import { publicProcedure, router } from "../index";
 
 export const todoRouter = router({
   getAll: publicProcedure.query(async () => {

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

@@ -8,7 +8,7 @@ import type { QueryClient } from "@tanstack/react-query";
 import { ReactQueryDevtools } from "@tanstack/react-query-devtools";
 import { useState } from "react";
 import { createTanstackQueryUtils } from "@orpc/tanstack-query";
-import type { AppRouterClient } from "../../../server/src/routers";
+import type { AppRouterClient } from "@{{projectName}}/api/src/routers/index";
 import { createORPCClient } from "@orpc/client";
 {{/if}}
 {{#if (eq api "trpc")}}

package/templates/frontend/react/tanstack-start/package.json.hbs

@@ -9,13 +9,13 @@
   },
   "dependencies": {
     "radix-ui": "^1.4.2",
-    "@tanstack/react-form": "^1.0.5",
+    "@tanstack/react-form": "^1.23.5",
     "@tailwindcss/vite": "^4.1.8",
     "@tanstack/react-query": "^5.80.6",
-    "@tanstack/react-router": "^1.121.0-alpha.27",
-    "@tanstack/react-router-with-query": "^1.121.0",
-    "@tanstack/react-start": "^1.121.0-alpha.27",
-    "@tanstack/router-plugin": "^1.121.0",
+    "@tanstack/react-router": "^1.132.31",
+    "@tanstack/react-router-with-query": "^1.130.17",
+    "@tanstack/react-start": "^1.132.31",
+    "@tanstack/router-plugin": "^1.132.31",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "lucide-react": "^0.525.0",
@@ -30,12 +30,12 @@
     "zod": "^4.0.2"
   },
   "devDependencies": {
-    "@tanstack/react-router-devtools": "^1.121.0-alpha.27",
+    "@tanstack/react-router-devtools": "^1.132.31",
     "@testing-library/dom": "^10.4.0",
     "@testing-library/react": "^16.2.0",
     "@types/react": "~19.1.10",
     "@types/react-dom": "^19.0.4",
-    "@vitejs/plugin-react": "^5.0.1",
+    "@vitejs/plugin-react": "^5.0.4",
     "jsdom": "^26.0.0",
     "typescript": "^5.7.2",
     "vite": "^7.0.2",

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

@@ -30,24 +30,24 @@ import Loader from "@/components/loader";
 import { ClerkProvider, useAuth } from "@clerk/tanstack-react-start";
 import { getAuth } from "@clerk/tanstack-react-start/server";
 import { createServerFn } from "@tanstack/react-start";
-import { getWebRequest } from "@tanstack/react-start/server";
+import { getRequest } from "@tanstack/react-start/server";
 import { ConvexProviderWithClerk } from "convex/react-clerk";
 
 const fetchClerkAuth = createServerFn({ method: "GET" }).handler(async () => {
-  const auth = await getAuth(getWebRequest());
+  const auth = await getAuth(getRequest());
   const token = await auth.getToken({ template: "convex" });
   return { userId: auth.userId, token };
 });
 {{else if (and (eq backend "convex") (eq auth "better-auth"))}}
 import { createServerFn } from "@tanstack/react-start";
-import { getWebRequest, getCookie } from "@tanstack/react-start/server";
+import { getRequest, getCookie } from "@tanstack/react-start/server";
 import { ConvexBetterAuthProvider } from "@convex-dev/better-auth/react";
 import { fetchSession, getCookieName } from "@convex-dev/better-auth/react-start";
 import { authClient } from "@/lib/auth-client";
 import { createAuth } from "@{{projectName}}/backend/convex/auth";
 
 const fetchAuth = createServerFn({ method: "GET" }).handler(async () => {
-  const { session } = await fetchSession(getWebRequest());
+  const { session } = await fetchSession(getRequest());
   const sessionCookieName = getCookieName(createAuth);
   const token = getCookie(sessionCookieName);
   return {
@@ -66,7 +66,7 @@ export interface RouterAppContext {
 {{else}}
   {{#if (eq api "trpc")}}
 import type { TRPCOptionsProxy } from "@trpc/tanstack-react-query";
-import type { AppRouter } from "../../../server/src/routers";
+import type { AppRouter } from "@{{projectName}}/api/src/routers/index";
 export interface RouterAppContext {
   trpc: TRPCOptionsProxy<AppRouter>;
   queryClient: QueryClient;

package/templates/frontend/react/tanstack-start/vite.config.ts.hbs

@@ -8,7 +8,7 @@ export default defineConfig({
   plugins: [
     tsconfigPaths(),
     tailwindcss(),
-    tanstackStart({ customViteReactPlugin: true }),
+    tanstackStart(),
     viteReact(),
   ],
 });