create-better-t-stack 2.49.1 → 2.50.0-canary.5b25d7db

package/templates/auth/better-auth/web/react/base/src/lib/auth-client.ts.hbs

@@ -4,12 +4,14 @@ import { polarClient } from "@polar-sh/better-auth";
 {{/if}}
 
 export const authClient = createAuthClient({
+  {{#unless (eq backend "self")}}
   baseURL:
     {{#if (includes frontend "next")}}
       process.env.NEXT_PUBLIC_SERVER_URL,
     {{else}}
       import.meta.env.VITE_SERVER_URL,
     {{/if}}
+  {{/unless}}
 {{#if (eq payments "polar")}}
   plugins: [polarClient()]
 {{/if}}

package/templates/auth/better-auth/web/react/next/src/app/dashboard/page.tsx.hbs

@@ -1,3 +1,33 @@
+{{#if (eq backend "self")}}
+import { redirect } from "next/navigation";
+import Dashboard from "./dashboard";
+import { headers } from "next/headers";
+import { auth } from "@{{projectName}}/auth";
+
+export default async function DashboardPage() {
+	const session = await auth.api.getSession({
+		headers: await headers(),
+	});
+
+	if (!session?.user) {
+		redirect("/login");
+	}
+
+	{{#if (eq payments "polar")}}
+	const { data: customerState } = await auth.api.customer.state({
+		headers: await headers(),
+	});
+	{{/if}}
+
+	return (
+		<div>
+			<h1>Dashboard</h1>
+			<p>Welcome {session.user.name}</p>
+			<Dashboard session={session} {{#if (eq payments "polar")}}customerState={customerState}{{/if}} />
+		</div>
+	);
+}
+{{else}}
 import { authClient } from "@/lib/auth-client";
 import { redirect } from "next/navigation";
 import Dashboard from "./dashboard";
@@ -35,3 +65,4 @@ export default async function DashboardPage() {
 		</div>
 	);
 }
+{{/if}}

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/{server-base → base}/package.json.hbs

@@ -17,7 +17,6 @@
     ],
     {{/if}}
 	"devDependencies": {
-		"tsdown": "^0.15.1",
 		"typescript": "^5.8.2"
 	}
 }

package/templates/backend/server/{server-base → base}/tsconfig.json.hbs

@@ -1,17 +1,13 @@
 {
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
-    "target": "ESNext",
-    "module": "ESNext",
-    "moduleResolution": "bundler",
-    "verbatimModuleSyntax": true,
-    "strict": true,
-    "skipLibCheck": true,
-    "baseUrl": "./",
+    "composite": true,
+		"outDir": "dist",
+		"baseUrl": ".",
     "paths": {
       "@/*": ["./src/*"]{{#if (eq orm "prisma")}},
       "prisma": ["node_modules/prisma"]{{/if}}
     },
-    "outDir": "./dist",
     "types": [
       {{#if (eq runtime "node")}}
         "node"
@@ -24,8 +20,7 @@
         "bun"
       {{/if}}{{#if (eq serverDeploy "alchemy")}},
       "@cloudflare/workers-types"{{/if}}
-    ]{{#unless (or (eq backend "convex") (eq backend "none"))}},
-    "composite": true{{/unless}},
+    ],
     "jsx": "react-jsx"{{#if (eq backend "hono")}},
     "jsxImportSource": "hono/jsx"{{/if}}
   }

package/templates/backend/server/base/tsdown.config.ts.hbs

@@ -0,0 +1,14 @@
+import { defineConfig } from 'tsdown';
+
+export default defineConfig({
+    entry: './src/index.ts',
+    format: 'esm',
+    outDir: './dist',
+    clean: true,
+    noExternal: [/@{{projectName}}\/.*/],
+    {{#if (and (eq orm "drizzle") (eq database "sqlite") (or (eq dbSetup "turso") (eq dbSetup "none")))}}
+    external: [
+		/^@libsql\/(linux|darwin|win32).*/
+	]
+	{{/if}}
+});

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

@@ -9,8 +9,8 @@ import { google } from "@ai-sdk/google";
 import { convertToModelMessages, streamText } from "ai";
 {{/if}}
 {{#if (eq api "trpc")}}
-import { createContext } from "./lib/context";
-import { appRouter } from "./routers/index";
+import { createContext } from "@{{projectName}}/api/context";
+import { appRouter } from "@{{projectName}}/api/routers/index";
 import { fetchRequestHandler } from "@trpc/server/adapters/fetch";
 {{/if}}
 {{#if (eq api "orpc")}}
@@ -19,11 +19,11 @@ import { OpenAPIReferencePlugin } from "@orpc/openapi/plugins";
 import { ZodToJsonSchemaConverter } from "@orpc/zod/zod4";
 import { RPCHandler } from "@orpc/server/fetch";
 import { onError } from "@orpc/server";
-import { appRouter } from "./routers";
-import { createContext } from "./lib/context";
+import { appRouter } from "@{{projectName}}/api/routers/index";
+import { createContext } from "@{{projectName}}/api/context";
 {{/if}}
 {{#if (eq auth "better-auth")}}
-import { auth } from "./lib/auth";
+import { auth } from "@{{projectName}}/auth";
 {{/if}}
 
 {{#if (eq api "orpc")}}
@@ -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

@@ -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,17 @@
 import { defineConfig } from "drizzle-kit";
+import dotenv from "dotenv";
+
+dotenv.config({
+    {{#if (eq backend "self")}}
+    path: "../../apps/web/.env",
+    {{else}}
+    path: "../../apps/server/.env",
+    {{/if}}
+});
 
 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,17 @@
 import { defineConfig } from "drizzle-kit";
+import dotenv from "dotenv";
+
+dotenv.config({
+    {{#if (eq backend "self")}}
+    path: "../../apps/web/.env",
+    {{else}}
+    path: "../../apps/server/.env",
+    {{/if}}
+});
 
 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,17 @@
 import { defineConfig } from "drizzle-kit";
+import dotenv from "dotenv";
+
+dotenv.config({
+    {{#if (eq backend "self")}}
+    path: "../../apps/web/.env",
+    {{else}}
+    path: "../../apps/server/.env",
+    {{/if}}
+});
 
 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,14 @@
-import "dotenv/config";
 import path from "node:path";
 import type { PrismaConfig } from "prisma";
+import dotenv from "dotenv";
+
+dotenv.config({
+    {{#if (eq backend "self")}}
+    path: "../../apps/web/.env",
+    {{else}}
+    path: "../../apps/server/.env",
+    {{/if}}
+});
 
 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,14 @@
-import "dotenv/config";
 import path from "node:path";
 import type { PrismaConfig } from "prisma";
+import dotenv from "dotenv";
+
+dotenv.config({
+    {{#if (eq backend "self")}}
+    path: "../../apps/web/.env",
+    {{else}}
+    path: "../../apps/server/.env",
+    {{/if}}
+});
 
 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,16 @@
-{{#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({
+    {{#if (eq backend "self")}}
+    path: "../../apps/web/.env",
+    {{else}}
+    path: "../../apps/server/.env",
+    {{/if}}
+});
+{{/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,14 @@
-import "dotenv/config";
 import path from "node:path";
 import type { PrismaConfig } from "prisma";
+import dotenv from "dotenv";
+
+dotenv.config({
+    {{#if (eq backend "self")}}
+    path: "../../apps/web/.env",
+    {{else}}
+    path: "../../apps/server/.env",
+    {{/if}}
+});
 
 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": {