create-better-t-stack 2.49.1-canary.80158905 → 2.50.0-canary.08568a05

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-better-t-stack",
-  "version": "2.49.1-canary.80158905",
+  "version": "2.50.0-canary.08568a05",
   "description": "A modern CLI tool for scaffolding end-to-end type-safe TypeScript projects with best practices and customizable configurations",
   "type": "module",
   "license": "MIT",
@@ -77,6 +77,7 @@
     "tinyglobby": "^0.2.15",
     "trpc-cli": "^0.11.0",
     "ts-morph": "^27.0.0",
+    "yaml": "^2.7.0",
     "zod": "^4.1.11"
   },
   "devDependencies": {

package/templates/api/orpc/fullstack/next/src/app/api/rpc/[[...rest]]/route.ts.hbs

@@ -0,0 +1,21 @@
+import { RPCHandler } from '@orpc/server/fetch'
+import { createContext } from '@{{projectName}}/api/context'
+import { appRouter } from '@{{projectName}}/api/routers/index'
+
+const handler = new RPCHandler(appRouter)
+
+async function handleRequest(request: Request) {
+  const { response } = await handler.handle(request, {
+    prefix: '/api/rpc',
+    context: createContext(request)
+  })
+
+  return response ?? new Response('Not found', { status: 404 })
+}
+
+export const HEAD = handleRequest
+export const GET = handleRequest
+export const POST = handleRequest
+export const PUT = handleRequest
+export const PATCH = handleRequest
+export const DELETE = handleRequest

package/templates/api/orpc/server/{rest/src → src}/context.ts.hbs

@@ -1,4 +1,4 @@
-{{#if (eq backend 'next')}}
+{{#if (and (eq backend 'self') (includes frontend "next"))}}
 import type { NextRequest } from "next/server";
 {{#if (eq auth "better-auth")}}
 import { auth } from "@{{projectName}}/auth";

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

@@ -21,7 +21,9 @@ export const queryClient = new QueryClient({
 });
 
 export const link = new RPCLink({
-  {{#if (includes frontend "next")}}
+  {{#if (and (eq backend "self") (includes frontend "next"))}}
+  url: "/api/rpc",
+  {{else if (includes frontend "next")}}
   url: `${process.env.NEXT_PUBLIC_SERVER_URL}/rpc`,
   {{else}}
   url: `${import.meta.env.VITE_SERVER_URL}/rpc`,

package/templates/api/trpc/fullstack/next/src/app/api/trpc/[trpc]/route.ts.hbs

@@ -0,0 +1,14 @@
+import { fetchRequestHandler } from "@trpc/server/adapters/fetch";
+import { appRouter } from "@{{projectName}}/api/routers/index";
+import { createContext } from "@{{projectName}}/api/context";
+import { NextRequest } from "next/server";
+
+function handler(req: NextRequest) {
+	return fetchRequestHandler({
+		endpoint: "/api/trpc",
+		req,
+		router: appRouter,
+		createContext: () => createContext(req),
+	});
+}
+export { handler as GET, handler as POST };

package/templates/api/trpc/server/{rest/src → src}/context.ts.hbs

@@ -1,4 +1,4 @@
-{{#if (eq backend 'next')}}
+{{#if (and (eq backend 'self') (includes frontend "next"))}}
 import type { NextRequest } from "next/server";
 {{#if (eq auth "better-auth")}}
 import { auth } from "@{{projectName}}/auth";

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

@@ -2,7 +2,7 @@
 import { QueryCache, QueryClient } from '@tanstack/react-query';
 import { createTRPCClient, httpBatchLink } from '@trpc/client';
 import { createTRPCOptionsProxy } from '@trpc/tanstack-react-query';
-import type { AppRouter } from '../../../server/src/routers';
+import type { AppRouter } from "@{{projectName}}/api/routers/index";
 import { toast } from 'sonner';
 
 export const queryClient = new QueryClient({
@@ -23,7 +23,9 @@ export const queryClient = new QueryClient({
 const trpcClient = createTRPCClient<AppRouter>({
   links: [
     httpBatchLink({
-      {{#if (includes frontend 'next')}}
+      {{#if (and (eq backend "self") (includes frontend 'next'))}}
+      url: "/api/trpc",
+      {{else if (includes frontend 'next')}}
       url: `${process.env.NEXT_PUBLIC_SERVER_URL}/trpc`,
       {{else}}
       url: `${import.meta.env.VITE_SERVER_URL}/trpc`,

package/templates/auth/better-auth/{server/next/src/app/api/auth/[...all]/route.ts → fullstack/next/src/app/api/auth/[...all]/route.ts.hbs}

@@ -1,4 +1,4 @@
-import { auth } from "@/lib/auth";
+import { auth } from "@{{projectName}}/auth";
 import { toNextJsHandler } from "better-auth/next-js";
 
 export const { GET, POST } = toNextJsHandler(auth.handler);

package/templates/auth/better-auth/server/base/src/index.ts.hbs

@@ -66,7 +66,7 @@ export const auth = betterAuth<BetterAuthOptions>({
 {{/if}}
 
 {{#if (eq orm "drizzle")}}
-{{#if (or (eq runtime "bun") (eq runtime "node"))}}
+{{#if (or (eq runtime "bun") (eq runtime "node") (eq runtime "none"))}}
 import { betterAuth, type BetterAuthOptions } from "better-auth";
 import { drizzleAdapter } from "better-auth/adapters/drizzle";
 {{#if (or (includes frontend "native-nativewind") (includes frontend "native-unistyles"))}}

package/templates/auth/clerk/convex/web/react/tanstack-start/src/server.ts.hbs

@@ -6,6 +6,7 @@ import {
 } from "@tanstack/react-start/server";
 import { createRouter } from "./router";
 
+// this is broken right now, waiting for a fix
 const handlerFactory = createClerkHandler(
 	createStartHandler({
 		createRouter,

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

@@ -104,7 +104,7 @@ const app = new Elysia()
     const body = await context.request.json();
     const uiMessages = body.messages || [];
     const result = streamText({
-      model: google("gemini-2.0-flash"),
+      model: google("gemini-2.5-flash"),
       messages: convertToModelMessages(uiMessages)
     });
 

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

@@ -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

@@ -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

@@ -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/db/drizzle/mysql/src/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/src/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/src/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/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/ai/fullstack/next/src/app/api/ai/route.ts.hbs

@@ -0,0 +1,15 @@
+import { google } from "@ai-sdk/google";
+import { streamText, type UIMessage, convertToModelMessages } from "ai";
+
+export const maxDuration = 30;
+
+export async function POST(req: Request) {
+	const { messages }: { messages: UIMessage[] } = await req.json();
+
+	const result = streamText({
+		model: google("gemini-2.5-flash"),
+		messages: convertToModelMessages(messages),
+	});
+
+	return result.toUIMessageStreamResponse();
+}

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

@@ -40,7 +40,7 @@ export const todoRouter = {
 {{#if (eq api "trpc")}}
 import z from "zod";
 import { router, publicProcedure } from "../index";
-import { todo } from "../db/schema/todo";
+import { todo } from "@{{projectName}}/db/schema/todo";
 import { eq } from "drizzle-orm";
 import { db } from "@{{projectName}}/db";
 

package/templates/frontend/react/next/package.json.hbs

@@ -13,7 +13,7 @@
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "lucide-react": "^0.487.0",
-    "next": "15.5.0",
+    "next": "15.5.4",
     "next-themes": "^0.4.6",
     "react": "19.1.0",
     "react-dom": "19.1.0",

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 {

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(),
   ],
 });

package/templates/api/orpc/server/next/src/app/rpc/[...all]/route.ts.hbs

@@ -1,52 +0,0 @@
-{{#if (eq auth "better-auth")}}
-import { createContext } from '@/lib/context'
-{{/if}}
-import { appRouter } from '@/routers'
-import { OpenAPIHandler } from '@orpc/openapi/fetch'
-import { OpenAPIReferencePlugin } from '@orpc/openapi/plugins'
-import { ZodToJsonSchemaConverter } from '@orpc/zod/zod4'
-import { RPCHandler } from '@orpc/server/fetch'
-import { onError } from '@orpc/server'
-import { NextRequest } from 'next/server'
-
-const rpcHandler = new RPCHandler(appRouter, {
-  interceptors: [
-    onError((error) => {
-      console.error(error)
-    }),
-  ],
-})
-const apiHandler = new OpenAPIHandler(appRouter, {
-  plugins: [
-    new OpenAPIReferencePlugin({
-      schemaConverters: [new ZodToJsonSchemaConverter()],
-    }),
-  ],
-  interceptors: [
-    onError((error) => {
-      console.error(error)
-    }),
-  ],
-})
-
-async function handleRequest(req: NextRequest) {
-  const rpcResult = await rpcHandler.handle(req, {
-    prefix: '/rpc',
-    context: {{#if (eq auth "better-auth")}}await createContext(req){{else}}{}{{/if}},
-  })
-  if (rpcResult.response) return rpcResult.response
-
-  const apiResult = await apiHandler.handle(req, {
-    prefix: '/rpc/api',
-    context: {{#if (eq auth "better-auth")}}await createContext(req){{else}}{}{{/if}},
-  })
-  if (apiResult.response) return apiResult.response
-
-  return new Response('Not found', { status: 404 })
-}
-
-export const GET = handleRequest
-export const POST = handleRequest
-export const PUT = handleRequest
-export const PATCH = handleRequest
-export const DELETE = handleRequest

package/templates/api/trpc/server/next/src/app/trpc/[trpc]/route.ts

@@ -1,14 +0,0 @@
-import { fetchRequestHandler } from '@trpc/server/adapters/fetch';
-import { appRouter } from '@/routers';
-import { createContext } from '@/lib/context';
-import { NextRequest } from 'next/server';
-
-function handler(req: NextRequest) {
-  return fetchRequestHandler({
-    endpoint: '/trpc',
-    req,
-    router: appRouter,
-    createContext: () => createContext(req)
-  });
-}
-export { handler as GET, handler as POST };

package/templates/backend/server/next/next-env.d.ts

@@ -1,5 +0,0 @@
-/// <reference types="next" />
-/// <reference types="next/image-types/global" />
-
-// NOTE: This file should not be edited
-// see https://nextjs.org/docs/app/api-reference/config/typescript for more information.

package/templates/backend/server/next/next.config.ts

@@ -1,7 +0,0 @@
-import type { NextConfig } from "next";
-
-const nextConfig: NextConfig = {
-	typedRoutes: true,
-};
-
-export default nextConfig;

package/templates/backend/server/next/package.json.hbs

@@ -1,27 +0,0 @@
-{
-  "name": "server",
-  "version": "0.1.0",
-  "private": true,
-  "scripts": {
-    "dev": "next dev --turbopack",
-    "build": "next build",
-    "start": "next start"
-  },
-  "dependencies": {
-    "next": "15.5.0",
-    "react": "19.1.0",
-    "react-dom": "19.1.0",
-    "dotenv": "^17.2.1"
-  },
-{{#if (eq dbSetup 'supabase')}}
-  "trustedDependencies": [
-    "supabase"
-   ],
-{{/if}}
-  "devDependencies": {
-    "@types/node": "^20",
-    "@types/react": "~19.1.10",
-    "zod": "^4.0.13",
-    "typescript": "^5"
-  }
-}

package/templates/backend/server/next/src/app/route.ts

@@ -1,5 +0,0 @@
-import { NextResponse } from "next/server";
-
-export async function GET() {
-  return NextResponse.json({ message: "OK" });
-}

package/templates/backend/server/next/src/middleware.ts

@@ -1,19 +0,0 @@
-import { NextResponse } from "next/server";
-
-export function middleware() {
-  const res = NextResponse.next()
-
-  res.headers.append('Access-Control-Allow-Credentials', "true")
-  res.headers.append('Access-Control-Allow-Origin', process.env.CORS_ORIGIN || "")
-  res.headers.append('Access-Control-Allow-Methods', 'GET,POST,OPTIONS')
-  res.headers.append(
-    'Access-Control-Allow-Headers',
-    'Content-Type, Authorization'
-  )
-
-  return res
-}
-
-export const config = {
-  matcher: '/:path*',
-}

package/templates/backend/server/next/tsconfig.json.hbs

@@ -1,33 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "ES2017",
-    "lib": ["dom", "dom.iterable", "esnext"],
-    "allowJs": true,
-    "skipLibCheck": true,
-    "strict": true,
-    "noEmit": true,
-    "esModuleInterop": true,
-    "module": "esnext",
-    "moduleResolution": "bundler",
-    "resolveJsonModule": true,
-    "isolatedModules": true,
-    "jsx": "preserve",
-    {{#unless (or (eq backend "convex") (eq backend "none"))}}
-	  "composite": true,
-	{{/unless}}
-    "incremental": true,
-    "plugins": [
-      {
-        "name": "next"
-      }
-    ],
-	"paths": {
-		"@/*": ["./src/*"]
-		{{#if (eq orm 'prisma')}},
-		"prisma": ["node_modules/prisma"]
-		{{/if}}
-	},
-  },
-  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
-  "exclude": ["node_modules"]
-}

package/templates/examples/ai/server/next/src/app/ai/route.ts.hbs

@@ -1,15 +0,0 @@
-import { google } from '@ai-sdk/google';
-import { streamText, type UIMessage, convertToModelMessages } from 'ai';
-
-export const maxDuration = 30;
-
-export async function POST(req: Request) {
-  const { messages }: { messages: UIMessage[] } = await req.json();
-
-  const result = streamText({
-    model: google('gemini-2.0-flash'),
-    messages: convertToModelMessages(messages),
-  });
-
-  return result.toUIMessageStreamResponse();
-}