create-better-t-stack 2.50.1 → 3.0.1

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/alchemy/alchemy.run.ts.hbs

@@ -39,15 +39,15 @@ const app = await alchemy("{{projectName}}");
 
 {{#if (and (eq serverDeploy "alchemy") (eq dbSetup "d1"))}}
 await Exec("db-generate", {
-	{{#if (and (eq webDeploy "alchemy") (eq serverDeploy "alchemy"))}}cwd: "apps/server",{{/if}}
+	{{#if (and (eq webDeploy "alchemy") (eq serverDeploy "alchemy"))}}cwd: "packages/db",{{/if}}
 	command: "{{packageManager}} run db:generate",
 });
 
 const db = await D1Database("database", {
 	{{#if (eq orm "prisma")}}
-	migrationsDir: "apps/server/prisma/migrations",
+	migrationsDir: "packages/db/prisma/migrations",
 	{{else if (eq orm "drizzle")}}
-	migrationsDir: "apps/server/src/db/migrations",
+	migrationsDir: "packages/db/src/migrations",
 	{{/if}}
 });
 {{/if}}

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

@@ -1,9 +1,9 @@
 {{#if (eq api "orpc")}}
 import { eq } from "drizzle-orm";
 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 { todo } from "../db/schema/todo";
+import { router, publicProcedure } from "../index";
+import { todo } from "@{{projectName}}/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/extras/bunfig.toml.hbs

@@ -1,6 +1,6 @@
 [install]
-{{#if (includes frontend "nuxt")}}
-# linker = "isolated"  # Commented out for Nuxt compatibility
+{{#if (or (includes frontend "nuxt") (includes frontend "native-nativewind") (includes frontend "native-unistyles"))}}
+# linker = "isolated"  # having issues with Nuxt and NativeWind/Unistyles
 {{else}}
 linker = "isolated"
 {{/if}}

package/templates/frontend/native/nativewind/tsconfig.json.hbs

@@ -14,10 +14,5 @@
     ".expo/types/**/*.ts",
     "expo-env.d.ts",
     "nativewind-env.d.ts"
-  ],
-  {{#unless (or (eq backend "convex") (eq backend "none"))}}
-  "references": [{
-    "path": "../server"
-  }]
-  {{/unless}}
+  ]
 }

package/templates/frontend/native/unistyles/tsconfig.json.hbs

@@ -8,10 +8,5 @@
       "@/*": ["*"]
     }
   },
-  "include": ["**/*.ts", "**/*.tsx", ".expo/types/**/*.ts", "expo-env.d.ts"],
-  {{#unless (or (eq backend "convex") (eq backend "none"))}}
-  "references": [{
-    "path": "../server"
-  }]
-  {{/unless}}
+  "include": ["**/*.ts", "**/*.tsx", ".expo/types/**/*.ts", "expo-env.d.ts"]
 }

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

@@ -13,10 +13,6 @@
     },
     {
       "path": "./.nuxt/tsconfig.node.json"
-    }{{#unless (or (eq backend "convex") (eq backend "none"))}},
-    {
-        "path": "../server"
     }
-  {{/unless}}
   ]
 }

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/next/tsconfig.json.hbs

@@ -40,12 +40,5 @@
   ],
   "exclude": [
     "./node_modules"
-  ],
-  {{#unless (or (eq backend "convex") (eq backend "none"))}}
-  "references": [
-    {
-      "path": "../server"
-    }
   ]
-  {{/unless}}
 }

package/templates/frontend/react/react-router/tsconfig.json.hbs

@@ -23,10 +23,5 @@
     "resolveJsonModule": true,
     "skipLibCheck": true,
     "strict": true
-  },
-  {{#unless (or (eq backend "convex") (eq backend "none"))}}
-  "references": [{
-    "path": "../server"
-  }]
-  {{/unless}}
+  }
 }

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/routers/index";
 import { createORPCClient } from "@orpc/client";
 {{/if}}
 {{#if (eq api "trpc")}}

package/templates/frontend/react/tanstack-router/tsconfig.json.hbs

@@ -14,10 +14,5 @@
     "paths": {
       "@/*": ["./src/*"]
     }
-  },
-  {{#unless (or (eq backend "convex") (eq backend "none"))}}
-  "references": [{
-    "path": "../server"
-  }]
-  {{/unless}}
+  }
 }

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

@@ -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/routers/index";
 export interface RouterAppContext {
   trpc: TRPCOptionsProxy<AppRouter>;
   queryClient: QueryClient;

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

@@ -24,10 +24,5 @@
     "paths": {
       "@/*": ["./src/*"]
     }
-  },
-  {{#unless (or (eq backend "convex") (eq backend "none"))}}
-  "references": [{
-    "path": "../server"
-  }]
-  {{/unless}}
+  }
 }

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

@@ -25,10 +25,5 @@
     "paths": {
       "@/*": ["./src/*"]
     }
-  },
-  {{#unless (or (eq backend "convex") (eq backend "none"))}}
-  "references": [{
-    "path": "../server"
-  }]
-  {{/unless}}
+  }
 }

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

@@ -10,12 +10,7 @@
 		"sourceMap": true,
 		"strict": true,
 		"moduleResolution": "bundler"
-	},
-      {{#unless (or (eq backend "convex") (eq backend "none"))}}
-  "references": [{
-    "path": "../server"
-  }]
-  {{/unless}}
+	}
 	// Path aliases are handled by https://svelte.dev/docs/kit/configuration#alias
 	// except $lib which is handled by https://svelte.dev/docs/kit/configuration#files
 	//

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/db/prisma/mongodb/src/db/index.ts.hbs

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

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