create-better-t-stack 2.40.3-canary.0e4f85b3 → 2.40.3-canary.34eb1c18

package/dist/cli.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { createBtsCli } from "./src-D59j3XG5.js";
+import { createBtsCli } from "./src-5v1dq5ez.js";
 
 //#region src/cli.ts
 createBtsCli().run();

package/dist/index.js

@@ -1,4 +1,4 @@
 #!/usr/bin/env node
-import { builder, createBtsCli, docs, init, router, sponsors } from "./src-D59j3XG5.js";
+import { builder, createBtsCli, docs, init, router, sponsors } from "./src-5v1dq5ez.js";
 
 export { builder, createBtsCli, docs, init, router, sponsors };

package/dist/{src-D59j3XG5.js → src-5v1dq5ez.js}

@@ -110,6 +110,8 @@ const dependencyVersionMap = {
 	streamdown: "^1.1.6",
 	"@orpc/server": "^1.8.6",
 	"@orpc/client": "^1.8.6",
+	"@orpc/openapi": "^1.8.6",
+	"@orpc/zod": "^1.8.6",
 	"@orpc/tanstack-query": "^1.8.6",
 	"@trpc/tanstack-react-query": "^11.5.0",
 	"@trpc/server": "^11.5.0",
@@ -496,6 +498,8 @@ function ensureSingleWebAndNative(frontends) {
 function validateWorkersCompatibility(providedFlags, options, config) {
 	if (providedFlags.has("runtime") && options.runtime === "workers" && config.backend && config.backend !== "hono") exitWithError(`Cloudflare Workers runtime (--runtime workers) is only supported with Hono backend (--backend hono). Current backend: ${config.backend}. Please use '--backend hono' or choose a different runtime.`);
 	if (providedFlags.has("backend") && config.backend && config.backend !== "hono" && config.runtime === "workers") exitWithError(`Backend '${config.backend}' is not compatible with Cloudflare Workers runtime. Cloudflare Workers runtime is only supported with Hono backend. Please use '--backend hono' or choose a different runtime.`);
+	if (providedFlags.has("runtime") && options.runtime === "workers" && config.orm && config.orm !== "drizzle" && config.orm !== "none") exitWithError(`Cloudflare Workers runtime (--runtime workers) is only supported with Drizzle ORM (--orm drizzle) or no ORM (--orm none). Current ORM: ${config.orm}. Please use '--orm drizzle', '--orm none', or choose a different runtime.`);
+	if (providedFlags.has("orm") && config.orm && config.orm !== "drizzle" && config.orm !== "none" && config.runtime === "workers") exitWithError(`ORM '${config.orm}' is not compatible with Cloudflare Workers runtime. Cloudflare Workers runtime is only supported with Drizzle ORM or no ORM. Please use '--orm drizzle', '--orm none', or choose a different runtime.`);
 	if (providedFlags.has("runtime") && options.runtime === "workers" && config.database === "mongodb") exitWithError("Cloudflare Workers runtime (--runtime workers) is not compatible with MongoDB database. MongoDB requires Prisma or Mongoose ORM, but Workers runtime only supports Drizzle ORM. Please use a different database or runtime.");
 	if (providedFlags.has("runtime") && options.runtime === "workers" && config.dbSetup === "docker") exitWithError("Cloudflare Workers runtime (--runtime workers) is not compatible with Docker setup. Workers runtime uses serverless databases (D1) and doesn't support local Docker containers. Please use '--db-setup d1' for SQLite or choose a different runtime.");
 	if (providedFlags.has("database") && config.database === "mongodb" && config.runtime === "workers") exitWithError("MongoDB database is not compatible with Cloudflare Workers runtime. MongoDB requires Prisma or Mongoose ORM, but Workers runtime only supports Drizzle ORM. Please use a different database or runtime.");
@@ -993,11 +997,12 @@ async function getORMChoice(orm, hasDatabase, database, backend, runtime) {
 	if (backend === "convex") return "none";
 	if (!hasDatabase) return "none";
 	if (orm !== void 0) return orm;
+	if (runtime === "workers") return "drizzle";
 	const options = [...database === "mongodb" ? [ormOptions.prisma, ormOptions.mongoose] : [ormOptions.drizzle, ormOptions.prisma]];
 	const response = await select({
 		message: "Select ORM",
 		options,
-		initialValue: database === "mongodb" ? "prisma" : runtime === "workers" ? "drizzle" : DEFAULT_CONFIG.orm
+		initialValue: database === "mongodb" ? "prisma" : DEFAULT_CONFIG.orm
 	});
 	if (isCancel(response)) return exitCancelled("Operation cancelled");
 	return response;
@@ -3093,8 +3098,7 @@ async function setupNextAlchemyDeploy(projectDir, _packageManager, options) {
 		if (!options?.skipAppScripts) pkg.scripts = {
 			...pkg.scripts,
 			deploy: "alchemy deploy",
-			destroy: "alchemy destroy",
-			dev: "alchemy dev"
+			destroy: "alchemy destroy"
 		};
 		await fs.writeJson(pkgPath, pkg, { spaces: 2 });
 	}
@@ -3119,8 +3123,7 @@ async function setupNuxtAlchemyDeploy(projectDir, _packageManager, options) {
 		if (!options?.skipAppScripts) pkg.scripts = {
 			...pkg.scripts,
 			deploy: "alchemy deploy",
-			destroy: "alchemy destroy",
-			dev: "alchemy dev"
+			destroy: "alchemy destroy"
 		};
 		await fs.writeJson(pkgPath, pkg, { spaces: 2 });
 	}
@@ -3183,8 +3186,7 @@ async function setupReactRouterAlchemyDeploy(projectDir, _packageManager, option
 		if (!options?.skipAppScripts) pkg.scripts = {
 			...pkg.scripts,
 			deploy: "alchemy deploy",
-			destroy: "alchemy destroy",
-			dev: "alchemy dev"
+			destroy: "alchemy destroy"
 		};
 		await fs.writeJson(pkgPath, pkg, { spaces: 2 });
 	}
@@ -3205,8 +3207,7 @@ async function setupSolidAlchemyDeploy(projectDir, _packageManager, options) {
 		if (!options?.skipAppScripts) pkg.scripts = {
 			...pkg.scripts,
 			deploy: "alchemy deploy",
-			destroy: "alchemy destroy",
-			dev: "alchemy dev"
+			destroy: "alchemy destroy"
 		};
 		await fs.writeJson(pkgPath, pkg, { spaces: 2 });
 	}
@@ -3231,8 +3232,7 @@ async function setupSvelteAlchemyDeploy(projectDir, _packageManager, options) {
 		if (!options?.skipAppScripts) pkg.scripts = {
 			...pkg.scripts,
 			deploy: "alchemy deploy",
-			destroy: "alchemy destroy",
-			dev: "alchemy dev"
+			destroy: "alchemy destroy"
 		};
 		await fs.writeJson(pkgPath, pkg, { spaces: 2 });
 	}
@@ -3298,8 +3298,7 @@ async function setupTanStackRouterAlchemyDeploy(projectDir, _packageManager, opt
 		if (!options?.skipAppScripts) pkg.scripts = {
 			...pkg.scripts,
 			deploy: "alchemy deploy",
-			destroy: "alchemy destroy",
-			dev: "alchemy dev"
+			destroy: "alchemy destroy"
 		};
 		await fs.writeJson(pkgPath, pkg, { spaces: 2 });
 	}
@@ -3324,8 +3323,7 @@ async function setupTanStackStartAlchemyDeploy(projectDir, _packageManager, opti
 		if (!options?.skipAppScripts) pkg.scripts = {
 			...pkg.scripts,
 			deploy: "alchemy deploy",
-			destroy: "alchemy destroy",
-			dev: "alchemy dev"
+			destroy: "alchemy destroy"
 		};
 		await fs.writeJson(pkgPath, pkg, { spaces: 2 });
 	}
@@ -3889,7 +3887,12 @@ function getFrontendType(frontend) {
 }
 function getApiDependencies(api, frontendType) {
 	const deps = {};
-	if (api === "orpc") deps.server = { dependencies: ["@orpc/server", "@orpc/client"] };
+	if (api === "orpc") deps.server = { dependencies: [
+		"@orpc/server",
+		"@orpc/client",
+		"@orpc/openapi",
+		"@orpc/zod"
+	] };
 	else if (api === "trpc") deps.server = { dependencies: ["@trpc/server", "@trpc/client"] };
 	if (frontendType.hasReactWeb) {
 		if (api === "orpc") deps.web = { dependencies: ["@orpc/tanstack-query", "@orpc/client"] };
@@ -5737,7 +5740,7 @@ async function getDockerStatus(database) {
 //#endregion
 //#region src/helpers/core/post-installation.ts
 async function displayPostInstallInstructions(config) {
-	const { database, relativePath, packageManager, depsInstalled, orm, addons, runtime, frontend, backend, dbSetup, webDeploy, serverDeploy } = config;
+	const { api, database, relativePath, packageManager, depsInstalled, orm, addons, runtime, frontend, backend, dbSetup, webDeploy, serverDeploy } = config;
 	const isConvex = backend === "convex";
 	const runCmd = packageManager === "npm" ? "npm run" : packageManager === "pnpm" ? "pnpm run" : "bun run";
 	const cdCmd = `cd ${relativePath}`;
@@ -5785,7 +5788,11 @@ async function displayPostInstallInstructions(config) {
 	output += `${pc.bold("Your project will be available at:")}\n`;
 	if (hasWeb) output += `${pc.cyan("•")} Frontend: http://localhost:${webPort}\n`;
 	else if (!hasNative && !addons?.includes("starlight")) output += `${pc.yellow("NOTE:")} You are creating a backend-only app\n   (no frontend selected)\n`;
-	if (!isConvex) output += `${pc.cyan("•")} Backend API: http://localhost:3000\n`;
+	if (!isConvex) {
+		output += `${pc.cyan("•")} Backend API: http://localhost:3000\n`;
+		if (api === "orpc") if (backend === "next") output += `${pc.cyan("•")} OpenAPI (Scalar UI): http://localhost:3000/rpc/api\n`;
+		else output += `${pc.cyan("•")} OpenAPI (Scalar UI): http://localhost:3000/api\n`;
+	}
 	if (addons?.includes("starlight")) output += `${pc.cyan("•")} Docs: http://localhost:4321\n`;
 	if (addons?.includes("fumadocs")) output += `${pc.cyan("•")} Fumadocs: http://localhost:4000\n`;
 	if (nativeInstructions) output += `\n${nativeInstructions.trim()}\n`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-better-t-stack",
-  "version": "2.40.3-canary.0e4f85b3",
+  "version": "2.40.3-canary.34eb1c18",
   "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,35 @@
 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 { NextRequest } from 'next/server'
 
-const handler = new RPCHandler(appRouter)
+const rpcHandler = new RPCHandler(appRouter)
+const apiHandler = new OpenAPIHandler(appRouter, {
+  plugins: [
+    new OpenAPIReferencePlugin({
+      schemaConverters: [new ZodToJsonSchemaConverter()],
+    }),
+  ],
+})
 
 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/backend/server/elysia/src/index.ts.hbs

@@ -10,6 +10,9 @@ 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 { appRouter } from "./routers";
 import { createContext } from "./lib/context";
@@ -19,7 +22,14 @@ import { auth } from "./lib/auth";
 {{/if}}
 
 {{#if (eq api "orpc")}}
-const handler = new RPCHandler(appRouter);
+const rpcHandler = new RPCHandler(appRouter);
+const apiHandler = new OpenAPIHandler(appRouter, {
+  plugins: [
+    new OpenAPIReferencePlugin({
+      schemaConverters: [new ZodToJsonSchemaConverter()],
+    }),
+  ],
+});
 {{/if}}
 
 {{#if (eq runtime "node")}}
@@ -48,12 +58,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,6 +5,9 @@ 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 { appRouter } from "./routers";
 {{#if (eq auth "better-auth")}}
@@ -50,9 +53,17 @@ 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);
+const apiHandler = new OpenAPIHandler(appRouter, {
+  plugins: [
+    new OpenAPIReferencePlugin({
+      schemaConverters: [new ZodToJsonSchemaConverter()],
+    }),
+  ],
+});
+
+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 +71,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,6 +9,9 @@ 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 { appRouter } from "./routers/index";
@@ -40,7 +43,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,
@@ -50,11 +53,19 @@ const handler = new RPCHandler(appRouter, {
   ],
 });
 
+const apiHandler = new OpenAPIHandler(appRouter, {
+  plugins: [
+    new OpenAPIReferencePlugin({
+      schemaConverters: [new ZodToJsonSchemaConverter()],
+    }),
+  ],
+});
+
 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 +74,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,6 +5,9 @@ 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 { createContext } from "./lib/context";
 import { appRouter } from "./routers/index";
@@ -54,17 +57,37 @@ 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()],
+    }),
+  ],
+});
+
+export const rpcHandler = new RPCHandler(appRouter);
+
+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}}