create-better-t-stack 2.50.0-canary.dd7000f2 → 2.50.1-canary.58bbe5f6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-better-t-stack",
-  "version": "2.50.0-canary.dd7000f2",
+  "version": "2.50.1-canary.58bbe5f6",
   "description": "A modern CLI tool for scaffolding end-to-end type-safe TypeScript projects with best practices and customizable configurations",
   "type": "module",
   "license": "MIT",

package/templates/addons/ruler/.ruler/bts.md.hbs

@@ -8,14 +8,14 @@ This is a monorepo with the following structure:
 
 {{#if (or (includes frontend "tanstack-router") (includes frontend "react-router") (includes frontend "tanstack-start")
 (includes frontend "next") (includes frontend "nuxt") (includes frontend "svelte") (includes frontend "solid"))}}
-- **`apps/web/`** - Frontend application{{#if (includes frontend "tanstack-router")}} (React with TanStack Router){{else
+- **`apps/web/`** - {{#if (eq backend "self")}}Fullstack application{{else}}Frontend application{{/if}}{{#if (includes frontend "tanstack-router")}} (React with TanStack Router){{else
 if (includes frontend "react-router")}} (React with React Router){{else if (includes frontend "next")}} (Next.js){{else
 if (includes frontend "nuxt")}} (Nuxt.js){{else if (includes frontend "svelte")}} (SvelteKit){{else if (includes
 frontend "solid")}} (SolidStart){{/if}}
 {{/if}}
 
 {{#if (ne backend "convex")}}
-{{#if (ne backend "none")}}
+{{#if (and (ne backend "none") (ne backend "self"))}}
 - **`apps/server/`** - Backend server{{#if (eq backend "hono")}} (Hono){{else if (eq backend "express")}}
 (Express){{else if (eq backend "fastify")}} (Fastify){{else if (eq backend "elysia")}} (Elysia){{else if (eq backend
 "next")}} (Next.js API){{/if}}
@@ -24,6 +24,18 @@ frontend "solid")}} (SolidStart){{/if}}
 - **`packages/backend/`** - Convex backend functions
 {{/if}}
 
+{{#if (or (ne backend "none") (ne backend "convex"))}}
+{{#if (ne api "none")}}
+- **`packages/api/`** - Shared API logic and types
+{{/if}}
+{{#if (and (ne auth "none") (ne backend "convex"))}}
+- **`packages/auth/`** - Authentication logic and utilities
+{{/if}}
+{{#if (and (ne database "none") (ne orm "none") (ne backend "convex"))}}
+- **`packages/db/`** - Database schema and utilities
+{{/if}}
+{{/if}}
+
 {{#if (or (includes frontend "native-nativewind") (includes frontend "native-unistyles"))}}
 - **`apps/native/`** - React Native mobile app{{#if (includes frontend "native-nativewind")}} (with NativeWind){{else if
 (includes frontend "native-unistyles")}} (with Unistyles){{/if}}
@@ -32,15 +44,13 @@ frontend "solid")}} (SolidStart){{/if}}
 ## Available Scripts
 
 - `{{packageManager}} run dev` - Start all apps in development mode
-{{#if (or (includes frontend "tanstack-router") (includes frontend "react-router") (includes frontend "tanstack-start")
-(includes frontend "next") (includes frontend "nuxt") (includes frontend "svelte") (includes frontend "solid"))}}
+{{#if (and (or (includes frontend "tanstack-router") (includes frontend "react-router") (includes frontend "tanstack-start")
+(includes frontend "next") (includes frontend "nuxt") (includes frontend "svelte") (includes frontend "solid")) (ne backend "self"))}}
 - `{{packageManager}} run dev:web` - Start only the web app
 {{/if}}
-{{#if (ne backend "none")}}
-{{#if (ne backend "convex")}}
+{{#if (and (ne backend "none") (ne backend "convex") (ne backend "self"))}}
 - `{{packageManager}} run dev:server` - Start only the server
 {{/if}}
-{{/if}}
 {{#if (or (includes frontend "native-nativewind") (includes frontend "native-unistyles"))}}
 - `{{packageManager}} run dev:native` - Start only the native app
 {{/if}}
@@ -48,7 +58,7 @@ frontend "solid")}} (SolidStart){{/if}}
 {{#if (and (ne database "none") (ne orm "none") (ne backend "convex"))}}
 ## Database Commands
 
-All database operations should be run from the server workspace:
+All database operations should be run from the {{#if (eq backend "self")}}web{{else}}server{{/if}} workspace:
 
 - `{{packageManager}} run db:push` - Push schema changes to database
 - `{{packageManager}} run db:studio` - Open database studio
@@ -57,11 +67,11 @@ All database operations should be run from the server workspace:
 - `{{packageManager}} run db:migrate` - Run database migrations
 
 {{#if (eq orm "drizzle")}}
-Database schema files are located in `apps/server/src/db/schema/`
+Database schema files are located in {{#if (eq backend "self")}}`apps/web/src/db/schema/`{{else}}`apps/server/src/db/schema/`{{/if}}
 {{else if (eq orm "prisma")}}
-Database schema is located in `apps/server/prisma/schema.prisma`
+Database schema is located in {{#if (eq backend "self")}}`apps/web/prisma/schema.prisma`{{else}}`apps/server/prisma/schema.prisma`{{/if}}
 {{else if (eq orm "mongoose")}}
-Database models are located in `apps/server/src/db/models/`
+Database models are located in {{#if (eq backend "self")}}`apps/web/src/db/models/`{{else}}`apps/server/src/db/models/`{{/if}}
 {{/if}}
 {{/if}}
 
@@ -69,10 +79,10 @@ Database models are located in `apps/server/src/db/models/`
 ## API Structure
 
 {{#if (eq api "trpc")}}
-- tRPC routers are in `apps/server/src/routers/`
+- tRPC routers are in {{#if (eq backend "self")}}`packages/api/src/routers/`{{else}}`apps/server/src/routers/`{{/if}}
 - Client-side tRPC utils are in `apps/web/src/utils/trpc.ts`
 {{else if (eq api "orpc")}}
-- oRPC endpoints are in `apps/server/src/api/`
+- oRPC endpoints are in {{#if (eq backend "self")}}`packages/api/src/api/`{{else}}`apps/server/src/api/`{{/if}}
 - Client-side API utils are in `apps/web/src/utils/api.ts`
 {{/if}}
 {{/if}}
@@ -82,7 +92,7 @@ Database models are located in `apps/server/src/db/models/`
 
 Authentication is enabled in this project:
 {{#if (ne backend "convex")}}
-- Server auth logic is in `apps/server/src/lib/auth.ts`
+- Server auth logic is in {{#if (eq backend "self")}}`packages/auth/src/lib/auth.ts`{{else}}`apps/server/src/lib/auth.ts`{{/if}}
 {{#if (or (includes frontend "tanstack-router") (includes frontend "react-router") (includes frontend "tanstack-start")
 (includes frontend "next") (includes frontend "nuxt") (includes frontend "svelte") (includes frontend "solid"))}}
 - Web app auth client is in `apps/web/src/lib/auth-client.ts`

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

@@ -0,0 +1,50 @@
+import { createContext } from "@{{projectName}}/api/context";
+import { appRouter } from "@{{projectName}}/api/routers/index";
+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: "/api/rpc",
+		context: await createContext(req),
+	});
+	if (rpcResult.response) return rpcResult.response;
+
+	const apiResult = await apiHandler.handle(req, {
+		prefix: "/api/rpc/api",
+		context: await createContext(req),
+	});
+	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/orpc/server/package.json.hbs

@@ -14,9 +14,7 @@
   "scripts": {
     "build": "tsdown"
   },
-  "devDependencies": {
-    "@types/bun": "latest"
-  },
+  "devDependencies": {},
   "peerDependencies": {
     "typescript": "^5"
   },

package/templates/api/orpc/server/tsconfig.json.hbs

@@ -1,10 +1,10 @@
 {
-	"compilerOptions": {
-		"target": "ESNext",
-		"module": "ESNext",
-		"moduleResolution": "bundler",
-		"types": [
-			"bun"
-		],
-	}
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "declaration": true,
+    "declarationMap": true,
+    "sourceMap": true,
+    "outDir": "dist",
+    "composite": true
+  }
 }

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

@@ -1,5 +1,5 @@
 import { defineNuxtPlugin, useRuntimeConfig } from '#app'
-import type { AppRouterClient } from "@{{projectName}}/api/src/routers/index";
+import type { AppRouterClient } from "@{{projectName}}/api/routers/index";
 import { createORPCClient } from '@orpc/client'
 import { RPCLink } from '@orpc/client/fetch'
 import { createTanstackQueryUtils } from "@orpc/tanstack-query";

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

@@ -3,7 +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 { AppRouterClient } from "@{{projectName}}/api/src/routers/index";
+import type { AppRouterClient } from "@{{projectName}}/api/routers/index";
 
 export const queryClient = new QueryClient({
   queryCache: new QueryCache({
@@ -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: `${typeof window !== "undefined" ? window.location.origin : "http://localhost:3001"}/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/orpc/web/solid/src/utils/orpc.ts.hbs

@@ -2,7 +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 { AppRouterClient } from "@{{projectName}}/api/src/routers/index";
+import type { AppRouterClient } from "@{{projectName}}/api/routers/index";
 
 export const queryClient = new QueryClient({
   queryCache: new QueryCache({

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

@@ -3,7 +3,7 @@ import { createORPCClient } from "@orpc/client";
 import { RPCLink } from "@orpc/client/fetch";
 import { createTanstackQueryUtils } from "@orpc/tanstack-query";
 import { QueryCache, QueryClient } from "@tanstack/svelte-query";
-import type { AppRouterClient } from "@{{projectName}}/api/src/routers/index";
+import type { AppRouterClient } from "@{{projectName}}/api/routers/index";
 
 export const queryClient = new QueryClient({
 	queryCache: new QueryCache({

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

@@ -14,9 +14,7 @@
   "scripts": {
     "build": "tsdown"
   },
-  "devDependencies": {
-    "@types/bun": "latest"
-  },
+  "devDependencies": {},
   "peerDependencies": {
     "typescript": "^5"
   }

package/templates/api/trpc/server/tsconfig.json.hbs

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

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`,
@@ -47,13 +49,13 @@ export const trpc = createTRPCOptionsProxy<AppRouter>({
 
 {{else if (includes frontend 'tanstack-start')}}
 import { createTRPCContext } from "@trpc/tanstack-react-query";
-import type { AppRouter } from "@{{projectName}}/api/src/routers/index";
+import type { AppRouter } from "@{{projectName}}/api/routers/index";
 
 export const { TRPCProvider, useTRPC, useTRPCClient } =
   createTRPCContext<AppRouter>();
 
 {{else}}
-import type { AppRouter } from "@{{projectName}}/api/src/routers/index";
+import type { AppRouter } from "@{{projectName}}/api/routers/index";
 import { QueryCache, QueryClient } from "@tanstack/react-query";
 import { createTRPCClient, httpBatchLink } from "@trpc/client";
 import { createTRPCOptionsProxy } from "@trpc/tanstack-react-query";

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

@@ -0,0 +1,4 @@
+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/package.json.hbs

@@ -14,10 +14,7 @@
   "scripts": {
     "build": "tsdown"
   },
-  "devDependencies": {
-    "@types/bun": "latest",
-    "@types/node": "^24.5.2"
-  },
+  "devDependencies": {},
   "peerDependencies": {
     "typescript": "^5"
   }

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

@@ -6,7 +6,7 @@ import { expo } from "@better-auth/expo";
 {{/if}}
 {{#if (eq payments "polar")}}
 import { polar, checkout, portal } from "@polar-sh/better-auth";
-import { polarClient } from "./payments";
+import { polarClient } from "./lib/payments";
 {{/if}}
 import prisma from "@{{projectName}}/db";
 
@@ -74,7 +74,7 @@ import { expo } from "@better-auth/expo";
 {{/if}}
 {{#if (eq payments "polar")}}
 import { polar, checkout, portal } from "@polar-sh/better-auth";
-import { polarClient } from "./payments";
+import { polarClient } from "./lib/payments";
 {{/if}}
 import { db } from "@{{projectName}}/db";
 import * as schema from "@{{projectName}}/db/schema/auth";
@@ -142,7 +142,7 @@ import { expo } from "@better-auth/expo";
 {{/if}}
 {{#if (eq payments "polar")}}
 import { polar, checkout, portal } from "@polar-sh/better-auth";
-import { polarClient } from "./payments";
+import { polarClient } from "./lib/payments";
 {{/if}}
 import { db } from "@{{projectName}}/db";
 import * as schema from "@{{projectName}}/db/schema/auth";
@@ -224,7 +224,7 @@ import { expo } from "@better-auth/expo";
 {{/if}}
 {{#if (eq payments "polar")}}
 import { polar, checkout, portal } from "@polar-sh/better-auth";
-import { polarClient } from "./payments";
+import { polarClient } from "./lib/payments";
 {{/if}}
 import { client } from "@{{projectName}}/db";
 
@@ -285,7 +285,7 @@ import { expo } from "@better-auth/expo";
 {{/if}}
 {{#if (eq payments "polar")}}
 import { polar, checkout, portal } from "@polar-sh/better-auth";
-import { polarClient } from "./payments";
+import { polarClient } from "./lib/payments";
 {{/if}}
 
 export const auth = betterAuth<BetterAuthOptions>({

package/templates/auth/better-auth/server/base/tsconfig.json.hbs

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

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/backend/server/base/package.json.hbs

@@ -7,10 +7,7 @@
 		"check-types": "tsc -b",
 		"compile": "bun build --compile --minify --sourcemap --bytecode ./src/index.ts --outfile server"
 	},
-	"dependencies": {
-		"dotenv": "^17.2.1",
-		"zod": "^4.0.2"
-	},
+	"dependencies": {},
 	{{#if (eq dbSetup 'supabase')}}
 	"trustedDependencies": [
         "supabase"

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

@@ -5,22 +5,8 @@
 		"outDir": "dist",
 		"baseUrl": ".",
     "paths": {
-      "@/*": ["./src/*"]{{#if (eq orm "prisma")}},
-      "prisma": ["node_modules/prisma"]{{/if}}
+      "@/*": ["./src/*"]
     },
-    "types": [
-      {{#if (eq runtime "node")}}
-        "node"
-      {{else if (eq runtime "bun")}}
-        "bun"
-      {{else if (eq runtime "workers")}}
-        "node"
-      {{else}}
-        "node",
-        "bun"
-      {{/if}}{{#if (eq serverDeploy "alchemy")}},
-      "@cloudflare/workers-types"{{/if}}
-    ],
     "jsx": "react-jsx"{{#if (eq backend "hono")}},
     "jsxImportSource": "hono/jsx"{{/if}}
   }

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

@@ -5,10 +5,5 @@ export default defineConfig({
     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}}
+    noExternal: [/@{{projectName}}\/.*/]
 });

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

@@ -0,0 +1,34 @@
+{
+  "$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,
+    "types": [
+      {{#if (eq runtime "node")}}
+        "node"
+      {{else if (eq runtime "bun")}}
+        "bun"
+      {{else if (eq runtime "workers")}}
+        "node"
+      {{else}}
+        "node",
+        "bun"
+      {{/if}}{{#if (eq serverDeploy "alchemy")}},
+      "@cloudflare/workers-types"{{/if}}
+    ]
+  }
+}

package/templates/base/tsconfig.json.hbs

@@ -0,0 +1,3 @@
+{
+  "extends": "./tsconfig.base.json"
+}

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

@@ -14,9 +14,7 @@
   "scripts": {
     "build": "tsdown"
   },
-  "devDependencies": {
-    "@types/node": "^24.5.2"
-  },
+  "devDependencies": {},
   "peerDependencies": {
     "typescript": "^5"
   }

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

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

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

@@ -2,7 +2,11 @@ import { defineConfig } from "drizzle-kit";
 import dotenv from "dotenv";
 
 dotenv.config({
-	path: "../../apps/server/.env",
+    {{#if (eq backend "self")}}
+    path: "../../apps/web/.env",
+    {{else}}
+    path: "../../apps/server/.env",
+    {{/if}}
 });
 
 export default defineConfig({

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

@@ -2,7 +2,11 @@ import { defineConfig } from "drizzle-kit";
 import dotenv from "dotenv";
 
 dotenv.config({
-	path: "../../apps/server/.env",
+    {{#if (eq backend "self")}}
+    path: "../../apps/web/.env",
+    {{else}}
+    path: "../../apps/server/.env",
+    {{/if}}
 });
 
 export default defineConfig({

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

@@ -2,7 +2,11 @@ import { defineConfig } from "drizzle-kit";
 import dotenv from "dotenv";
 
 dotenv.config({
-	path: "../../apps/server/.env",
+    {{#if (eq backend "self")}}
+    path: "../../apps/web/.env",
+    {{else}}
+    path: "../../apps/server/.env",
+    {{/if}}
 });
 
 export default defineConfig({

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

@@ -3,7 +3,11 @@ import type { PrismaConfig } from "prisma";
 import dotenv from "dotenv";
 
 dotenv.config({
-	path: "../../apps/server/.env",
+    {{#if (eq backend "self")}}
+    path: "../../apps/web/.env",
+    {{else}}
+    path: "../../apps/server/.env",
+    {{/if}}
 });
 
 export default {