create-better-t-stack 2.40.3 → 2.40.4-canary.f07be855

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-better-t-stack",
-  "version": "2.40.3",
+  "version": "2.40.4-canary.f07be855",
   "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/api/orpc/server/next/src/app/rpc/[...all]/route.ts.hbs

@@ -2,18 +2,47 @@
 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 handler = new RPCHandler(appRouter)
+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 { response } = await handler.handle(req, {
+  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
 
-  return response ?? new Response('Not found', { status: 404 })
+  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

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

@@ -4,7 +4,7 @@ import { prismaAdapter } from "better-auth/adapters/prisma";
 {{#if (or (includes frontend "native-nativewind") (includes frontend "native-unistyles"))}}
 import { expo } from "@better-auth/expo";
 {{/if}}
-import prisma from "../../prisma";
+import prisma from "@/db";
 
 export const auth = betterAuth({
   database: prismaAdapter(prisma, {

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

@@ -10,7 +10,11 @@ import { appRouter } from "./routers/index";
 import { fetchRequestHandler } from "@trpc/server/adapters/fetch";
 {{/if}}
 {{#if (eq api "orpc")}}
+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 { appRouter } from "./routers";
 import { createContext } from "./lib/context";
 {{/if}}
@@ -19,7 +23,25 @@ import { auth } from "./lib/auth";
 {{/if}}
 
 {{#if (eq api "orpc")}}
-const handler = new RPCHandler(appRouter);
+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);
+    }),
+  ],
+});
 {{/if}}
 
 {{#if (eq runtime "node")}}
@@ -48,12 +70,19 @@ const app = new Elysia()
   {{/if}}
 {{#if (eq api "orpc")}}
   .all('/rpc*', async (context) => {
-    const { response } = await handler.handle(context.request, {
+    const { response } = await rpcHandler.handle(context.request, {
       prefix: '/rpc',
       context: await createContext({ context })
     })
     return response ?? new Response('Not Found', { status: 404 })
   })
+  .all('/api*', async (context) => {
+    const { response } = await apiHandler.handle(context.request, {
+      prefix: '/api',
+      context: await createContext({ context })
+    })
+    return response ?? new Response('Not Found', { status: 404 })
+  })
 {{/if}}
 {{#if (eq api "trpc")}}
   .all("/trpc/*", async (context) => {

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

@@ -5,7 +5,11 @@ import { createContext } from "./lib/context";
 import { appRouter } from "./routers/index";
 {{/if}}
 {{#if (eq api "orpc")}}
+import { OpenAPIHandler } from "@orpc/openapi/node";
+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";
 {{#if (eq auth "better-auth")}}
 import { createContext } from "./lib/context";
@@ -50,9 +54,28 @@ app.use(
 {{/if}}
 
 {{#if (eq api "orpc")}}
-const handler = new RPCHandler(appRouter);
-app.use("/rpc{*path}", async (req, res, next) => {
-  const { matched } = await handler.handle(req, res, {
+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);
+    }),
+  ],
+});
+
+app.use(async (req, res, next) => {
+  const rpcResult = await rpcHandler.handle(req, res, {
     prefix: "/rpc",
     {{#if (eq auth "better-auth")}}
     context: await createContext({ req }),
@@ -60,7 +83,18 @@ app.use("/rpc{*path}", async (req, res, next) => {
     context: {},
     {{/if}}
   });
-  if (matched) return;
+  if (rpcResult.matched) return;
+
+  const apiResult = await apiHandler.handle(req, res, {
+    prefix: "/api",
+    {{#if (eq auth "better-auth")}}
+    context: await createContext({ req }),
+    {{else}}
+    context: {},
+    {{/if}}
+  });
+  if (apiResult.matched) return;
+
   next();
 });
 {{/if}}

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

@@ -9,8 +9,12 @@ import { appRouter, type AppRouter } from "./routers/index";
 {{/if}}
 
 {{#if (eq api "orpc")}}
+import { OpenAPIHandler } from "@orpc/openapi/node";
+import { OpenAPIReferencePlugin } from "@orpc/openapi/plugins";
+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 { createServer } from "node:http";
 {{#if (eq auth "better-auth")}}
@@ -40,7 +44,7 @@ const baseCorsConfig = {
 };
 
 {{#if (eq api "orpc")}}
-const handler = new RPCHandler(appRouter, {
+const rpcHandler = new RPCHandler(appRouter, {
   plugins: [
     new CORSPlugin({
       origin: process.env.CORS_ORIGIN,
@@ -48,13 +52,31 @@ const handler = new RPCHandler(appRouter, {
       allowHeaders: ["Content-Type", "Authorization"],
     }),
   ],
+  interceptors: [
+    onError((error) => {
+      console.error(error);
+    }),
+  ],
+});
+
+const apiHandler = new OpenAPIHandler(appRouter, {
+  plugins: [
+    new OpenAPIReferencePlugin({
+      schemaConverters: [new ZodToJsonSchemaConverter()],
+    }),
+  ],
+  interceptors: [
+    onError((error) => {
+      console.error(error);
+    }),
+  ],
 });
 
 const fastify = Fastify({
   logger: true,
   serverFactory: (fastifyHandler) => {
     const server = createServer(async (req, res) => {
-      const { matched } = await handler.handle(req, res, {
+      const { matched } = await rpcHandler.handle(req, res, {
         context: await createContext(req.headers),
         prefix: "/rpc",
       });
@@ -63,6 +85,15 @@ const fastify = Fastify({
         return;
       }
 
+      const apiResult = await apiHandler.handle(req, res, {
+        context: await createContext(req.headers),
+        prefix: "/api",
+      });
+
+      if (apiResult.matched) {
+        return;
+      }
+
       fastifyHandler(req, res);
     });
 

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

@@ -5,7 +5,11 @@ import "dotenv/config";
 import { env } from "cloudflare:workers";
 {{/if}}
 {{#if (eq api "orpc")}}
+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 { createContext } from "./lib/context";
 import { appRouter } from "./routers/index";
 {{/if}}
@@ -54,17 +58,48 @@ app.on(["POST", "GET"], "/api/auth/**", (c) => auth.handler(c.req.raw));
 {{/if}}
 
 {{#if (eq api "orpc")}}
-const handler = new RPCHandler(appRouter);
-app.use("/rpc/*", async (c, next) => {
+export const apiHandler = new OpenAPIHandler(appRouter, {
+  plugins: [
+    new OpenAPIReferencePlugin({
+      schemaConverters: [new ZodToJsonSchemaConverter()],
+    }),
+  ],
+  interceptors: [
+    onError((error) => {
+      console.error(error);
+    }),
+  ],
+});
+
+export const rpcHandler = new RPCHandler(appRouter, {
+  interceptors: [
+    onError((error) => {
+      console.error(error);
+    }),
+  ],
+});
+
+app.use("/*", async (c, next) => {
   const context = await createContext({ context: c });
-  const { matched, response } = await handler.handle(c.req.raw, {
+
+  const rpcResult = await rpcHandler.handle(c.req.raw, {
     prefix: "/rpc",
     context: context,
   });
 
-  if (matched) {
-    return c.newResponse(response.body, response);
+  if (rpcResult.matched) {
+    return c.newResponse(rpcResult.response.body, rpcResult.response);
   }
+
+  const apiResult = await apiHandler.handle(c.req.raw, {
+    prefix: "/api",
+    context: context,
+  });
+
+  if (apiResult.matched) {
+    return c.newResponse(apiResult.response.body, apiResult.response);
+  }
+
   await next();
 });
 {{/if}}

package/templates/db/drizzle/mysql/src/db/index.ts.hbs

@@ -1,4 +1,15 @@
 {{#if (or (eq runtime "bun") (eq runtime "node"))}}
+{{#if (eq dbSetup "planetscale")}}
+import { drizzle } from "drizzle-orm/planetscale-serverless";
+
+export const db = drizzle({
+  connection: {
+    host: process.env.DATABASE_HOST,
+    username: process.env.DATABASE_USERNAME,
+    password: process.env.DATABASE_PASSWORD,
+  },
+});
+{{else}}
 import { drizzle } from "drizzle-orm/mysql2";
 
 export const db = drizzle({
@@ -7,8 +18,21 @@ export const db = drizzle({
   },
 });
 {{/if}}
+{{/if}}
 
 {{#if (eq runtime "workers")}}
+{{#if (eq dbSetup "planetscale")}}
+import { drizzle } from "drizzle-orm/planetscale-serverless";
+import { env } from "cloudflare:workers";
+
+export const db = drizzle({
+  connection: {
+    host: env.DATABASE_HOST,
+    username: env.DATABASE_USERNAME,
+    password: env.DATABASE_PASSWORD,
+  },
+});
+{{else}}
 import { drizzle } from "drizzle-orm/mysql2";
 import { env } from "cloudflare:workers";
 
@@ -18,3 +42,4 @@ export const db = drizzle({
   },
 });
 {{/if}}
+{{/if}}

package/templates/db/prisma/mongodb/src/db/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/schema/schema.prisma.hbs

@@ -11,9 +11,15 @@ generator client {
   {{#if (eq runtime "workers")}}
   runtime = "workerd"
   {{/if}}
+  {{#if (eq dbSetup "planetscale")}}
+  previewFeatures = ["driverAdapters"]
+  {{/if}}
 }
 
 datasource db {
   provider = "mysql"
   url      = env("DATABASE_URL")
+  {{#if (eq dbSetup "planetscale")}}
+  relationMode = "prisma"
+  {{/if}}
 }

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

@@ -0,0 +1,12 @@
+import { PrismaClient } from "../../prisma/generated/client";
+{{#if (eq dbSetup "planetscale")}}
+import { PrismaPlanetScale } from '@prisma/adapter-planetscale'
+import { fetch as undiciFetch } from 'undici'
+
+const adapter = new PrismaPlanetScale({ url: process.env.DATABASE_URL, fetch: undiciFetch })
+const prisma = new PrismaClient({adapter});
+{{else}}
+const prisma = new PrismaClient();
+{{/if}}
+
+export default prisma;

package/templates/db/prisma/postgres/prisma/schema/schema.prisma.hbs

@@ -19,4 +19,7 @@ datasource db {
   {{#if (eq dbSetup "supabase")}}
   directUrl = env("DIRECT_URL")
   {{/if}}
+  {{#if (eq dbSetup "planetscale")}}
+  relationMode = "prisma"
+  {{/if}}
 }

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

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

package/templates/db/prisma/sqlite/prisma/schema/schema.prisma.hbs

@@ -10,10 +10,20 @@ generator client {
   {{/if}}
   {{#if (eq runtime "workers")}}
   runtime = "workerd"
+  {{#if (eq dbSetup "d1")}}
+  previewFeatures = ["driverAdapters"]
+  {{/if}}
+  {{/if}}
+  {{#if (eq dbSetup "turso")}}
+  previewFeatures = ["driverAdapters"]
   {{/if}}
 }
 
 datasource db {
   provider = "sqlite"
+  {{#if (eq dbSetup "turso")}}
+  url      = "file:./local.db"
+  {{else}}
   url      = env("DATABASE_URL")
+  {{/if}}
 }

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

@@ -1,10 +1,38 @@
 import "dotenv/config";
 import path from "node:path";
 import type { PrismaConfig } from "prisma";
+{{#if (eq dbSetup "d1")}}
+import { PrismaD1 } from "@prisma/adapter-d1";
+{{/if}}
+{{#if (eq dbSetup "turso")}}
+import { PrismaLibSQL } from "@prisma/adapter-libsql";
+{{/if}}
 
 export default {
+  {{#if (or (eq dbSetup "d1") (eq dbSetup "turso"))}}
+  experimental: {
+    adapter: true
+  },
+  {{/if}}
   schema: path.join("prisma", "schema"),
   migrations: {
     path: path.join("prisma", "migrations"),
-  }
+  },
+  {{#if (eq dbSetup "d1")}}
+  async adapter() {
+			return new PrismaD1({
+				CLOUDFLARE_D1_TOKEN: process.env.CLOUDFLARE_D1_TOKEN!,
+				CLOUDFLARE_ACCOUNT_ID: process.env.CLOUDFLARE_ACCOUNT_ID!,
+				CLOUDFLARE_DATABASE_ID: process.env.CLOUDFLARE_DATABASE_ID!,
+			});
+		},
+  {{/if}}
+  {{#if (eq dbSetup "turso")}}
+  async adapter() {
+		return new PrismaLibSQL({
+			url: process.env.DATABASE_URL || "",
+			authToken: process.env.DATABASE_AUTH_TOKEN,
+		});
+	},
+  {{/if}}
 } satisfies PrismaConfig;

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

@@ -0,0 +1,28 @@
+{{#if (eq dbSetup "d1")}}
+import { env } from "cloudflare:workers";
+import { PrismaD1 } from "@prisma/adapter-d1";
+import { PrismaClient } from "../../prisma/generated/client";
+
+const adapter = new PrismaD1(env.DB);
+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";
+
+const adapter = new PrismaLibSQL({
+	url: process.env.DATABASE_URL || "",
+	authToken: process.env.DATABASE_AUTH_TOKEN,
+});
+
+const prisma = new PrismaClient({ adapter });
+
+export default prisma;
+{{else}}
+import { PrismaClient } from "../../prisma/generated/client";
+
+const prisma = new PrismaClient();
+
+export default prisma;
+{{/if}}

package/templates/deploy/alchemy/alchemy.run.ts.hbs

@@ -1,7 +1,7 @@
 import alchemy from "alchemy";
 {{#if (eq webDeploy "alchemy")}}
 {{#if (includes frontend "next")}}
-import { Next } from "alchemy/cloudflare";
+import { Nextjs } from "alchemy/cloudflare";
 {{else if (includes frontend "nuxt")}}
 import { Nuxt } from "alchemy/cloudflare";
 {{else if (includes frontend "svelte")}}
@@ -44,13 +44,17 @@ await Exec("db-generate", {
 });
 
 const db = await D1Database("database", {
+	{{#if (eq orm "prisma")}}
+	migrationsDir: "apps/server/prisma/migrations",
+	{{else if (eq orm "drizzle")}}
 	migrationsDir: "apps/server/src/db/migrations",
+	{{/if}}
 });
 {{/if}}
 
 {{#if (eq webDeploy "alchemy")}}
 {{#if (includes frontend "next")}}
-export const web = await Next("web", {
+export const web = await Nextjs("web", {
   {{#if (eq serverDeploy "alchemy")}}cwd: "apps/web",{{/if}}
   bindings: {
     {{#if (eq backend "convex")}}

package/templates/deploy/wrangler/server/wrangler.jsonc.hbs

@@ -27,7 +27,12 @@
       "database_name": "YOUR_DB_NAME",
       "database_id": "YOUR_DB_ID",
       "preview_database_id": "local-test-db",
+      {{#if (eq orm "drizzle")}}
       "migrations_dir": "./src/db/migrations"
+      {{/if}}
+      {{#if (eq orm "prisma")}}
+      "migrations_dir": "./prisma/migrations"
+      {{/if}}
     }
   ]
   {{/if}}

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

@@ -1,6 +1,6 @@
 {{#if (eq api "orpc")}}
 import z from "zod";
-import prisma from "../../prisma";
+import prisma from "@/db";
 import { publicProcedure } from "../lib/orpc";
 
 export const todoRouter = {
@@ -52,7 +52,7 @@ export const todoRouter = {
 {{#if (eq api "trpc")}}
 import { TRPCError } from "@trpc/server";
 import z from "zod";
-import prisma from "../../prisma";
+import prisma from "@/db";
 import { publicProcedure, router } from "../lib/trpc";
 
 export const todoRouter = router({

package/templates/extras/bunfig.toml.hbs

@@ -1,7 +1,2 @@
 [install]
-{{#if (or (or (includes frontend "nuxt") (includes frontend "native-nativewind")) (includes frontend
-"native-unistyles"))}}
 # linker = "isolated"
-{{else}}
-linker = "isolated"
-{{/if}}

package/templates/frontend/react/next/next.config.ts.hbs

@@ -1,3 +1,6 @@
+{{#if (or (eq webDeploy "alchemy") (eq webDeploy "wrangler"))}}
+import { initOpenNextCloudflareForDev } from "@opennextjs/cloudflare";
+{{/if}}
 import type { NextConfig } from "next";
 
 const nextConfig: NextConfig = {
@@ -5,3 +8,7 @@ const nextConfig: NextConfig = {
 };
 
 export default nextConfig;
+
+{{#if (or (eq webDeploy "alchemy") (eq webDeploy "wrangler"))}}
+initOpenNextCloudflareForDev();
+{{/if}}

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

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

package/templates/db/prisma/mysql/prisma/index.ts

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

package/templates/db/prisma/postgres/prisma/index.ts

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

package/templates/db/prisma/sqlite/prisma/index.ts

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