create-better-t-stack 1.13.1 → 2.0.0

package/{template/with-auth/apps/web-tanstack-start/src/routes/dashboard.tsx → templates/auth/web/tanstack-start/src/routes/dashboard.tsx.hbs}

@@ -1,5 +1,10 @@
 import { authClient } from "@/lib/auth-client";
+{{#if (eq api "trpc")}}
 import { useTRPC } from "@/utils/trpc";
+{{/if}}
+{{#if (eq api "orpc")}}
+import { useORPC } from "@/utils/orpc";
+{{/if}}
 import { useQuery } from "@tanstack/react-query";
 import { createFileRoute } from "@tanstack/react-router";
 import { useEffect } from "react";
@@ -10,10 +15,20 @@ export const Route = createFileRoute("/dashboard")({
 
 function RouteComponent() {
   const navigate = Route.useNavigate();
+  {{#if (eq api "trpc")}}
   const trpc = useTRPC();
+  {{/if}}
+  {{#if (eq api "orpc")}}
+  const orpc = useORPC();
+  {{/if}}
   const { data: session, isPending } = authClient.useSession();
 
+  {{#if (eq api "trpc")}}
   const privateData = useQuery(trpc.privateData.queryOptions());
+  {{/if}}
+  {{#if (eq api "orpc")}}
+  const privateData = useQuery(orpc.privateData.queryOptions());
+  {{/if}}
 
   useEffect(() => {
     if (!session && !isPending) {

package/{template/with-auth/apps/server/src/with-elysia-index.ts → templates/backend/elysia/src/index.ts.hbs}

@@ -1,20 +1,43 @@
+{{#if (eq runtime "node")}}
+import { node } from "@elysiajs/node";
+{{/if}}
 import "dotenv/config";
 import { Elysia } from "elysia";
 import { cors } from "@elysiajs/cors";
-import { auth } from "./lib/auth";
+{{#if (eq api "trpc")}}
 import { createContext } from "./lib/context";
 import { appRouter } from "./routers/index";
 import { fetchRequestHandler } from "@trpc/server/adapters/fetch";
+{{/if}}
+{{#if (eq api "orpc")}}
+import { RPCHandler } from "@orpc/server/fetch";
+import { appRouter } from "./routers";
+import { createContext } from "./lib/context";
+{{/if}}
+{{#if auth}}
+import { auth } from "./lib/auth";
+{{/if}}
 
+{{#if (eq api "orpc")}}
+const handler = new RPCHandler(appRouter);
+{{/if}}
+
+{{#if (eq runtime "node")}}
+const app = new Elysia({ adapter: node() })
+{{else}}
 const app = new Elysia()
+{{/if}}
   .use(
     cors({
       origin: process.env.CORS_ORIGIN || "",
       methods: ["GET", "POST", "OPTIONS"],
+      {{#if auth}}
       allowedHeaders: ["Content-Type", "Authorization"],
       credentials: true,
+      {{/if}}
     }),
   )
+  {{#if auth}}
   .all("/api/auth/*", async (context) => {
     const { request } = context;
     if (["POST", "GET"].includes(request.method)) {
@@ -22,6 +45,17 @@ const app = new Elysia()
     }
     context.error(405);
   })
+  {{/if}}
+{{#if (eq api "orpc")}}
+  .all('/rpc*', async (context) => {
+    const { response } = await handler.handle(context.request, {
+      prefix: '/rpc',
+      context: await createContext({ context })
+    })
+    return response ?? new Response('Not Found', { status: 404 })
+  })
+{{/if}}
+{{#if (eq api "trpc")}}
   .all("/trpc/*", async (context) => {
     const res = await fetchRequestHandler({
       endpoint: "/trpc",
@@ -31,7 +65,8 @@ const app = new Elysia()
     });
     return res;
   })
+{{/if}}
   .get("/", () => "OK")
   .listen(3000, () => {
-    console.log("Server is running on http://localhost:3000");
-  });
+    console.log(`Server is running on http://localhost:3000`);
+  });

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

@@ -0,0 +1,78 @@
+import "dotenv/config";
+{{#if (eq api "trpc")}}
+import { createExpressMiddleware } from "@trpc/server/adapters/express";
+import { createContext } from "./lib/context";
+import { appRouter } from "./routers/index";
+{{/if}}
+{{#if (eq api "orpc")}}
+import { RPCHandler } from "@orpc/server/node";
+import { appRouter } from "./routers";
+{{/if}}
+import cors from "cors";
+import express from "express";
+{{#if (includes examples "ai")}}
+import { streamText } from "ai";
+import { google } from "@ai-sdk/google";
+{{/if}}
+{{#if auth}}
+import { auth } from "./lib/auth";
+{{/if}}
+
+const app = express();
+
+app.use(
+  cors({
+    origin: process.env.CORS_ORIGIN || "",
+    methods: ["GET", "POST", "OPTIONS"],
+    {{#if auth}}
+    allowedHeaders: ["Content-Type", "Authorization"],
+    credentials: true,
+    {{/if}}
+  })
+);
+
+{{#if auth}}
+app.all("/api/auth{/*path}", toNodeHandler(auth));
+{{/if}}
+
+{{#if (eq api "trpc")}}
+app.use(
+  "/trpc",
+  createExpressMiddleware({
+    router: appRouter,
+    createContext
+  })
+);
+{{/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, {
+    prefix: '/rpc',
+    context: {},
+  });
+  if (matched) return;
+  next();
+});
+{{/if}}
+
+{{#if (includes examples "ai")}}
+// AI chat endpoint
+app.post("/ai", async (req, res) => {
+  const { messages = [] } = req.body;
+  const result = streamText({
+    model: google("gemini-1.5-flash"),
+    messages,
+  });
+  result.pipeDataStreamToResponse(res);
+});
+{{/if}}
+
+app.get("/", (_req, res) => {
+  res.status(200).send("OK");
+});
+
+app.listen(3000, () => {
+  console.log("Server is running on port 3000");
+});

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

@@ -0,0 +1,105 @@
+{{#if (eq api "orpc")}}
+import { RPCHandler } from "@orpc/server/fetch";
+import { createContext } from "./lib/context";
+import { appRouter } from "./routers/index";
+{{#if auth}}
+import { auth } from "./lib/auth";
+{{/if}}
+{{/if}}
+{{#if (eq api "trpc")}}
+import { trpcServer } from "@hono/trpc-server";
+{{/if}}
+import "dotenv/config";
+import { Hono } from "hono";
+import { cors } from "hono/cors";
+import { logger } from "hono/logger";
+{{#if (includes examples "ai")}}
+import { streamText } from "ai";
+import { google } from "@ai-sdk/google";
+import { stream } from "hono/streaming";
+{{/if}}
+{{#if (eq api "trpc")}}
+import { createContext } from "./lib/context";
+import { appRouter } from "./routers/index";
+{{#if auth}}
+import { auth } from "./lib/auth";
+{{/if}}
+{{/if}}
+
+const app = new Hono();
+
+app.use(logger());
+app.use(
+  "/*",
+  cors({
+    origin: process.env.CORS_ORIGIN || "",
+    allowMethods: ["GET", "POST", "OPTIONS"],
+    {{#if auth}}
+    allowHeaders: ["Content-Type", "Authorization"],
+    credentials: true,
+    {{/if}}
+  })
+);
+
+{{#if auth}}
+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) => {
+  const context = await createContext({ context: c });
+  const { matched, response } = await handler.handle(c.req.raw, {
+    prefix: "/rpc",
+    context: context,
+  });
+  if (matched) {
+    return c.newResponse(response.body, response);
+  }
+  await next();
+});
+{{/if}}
+
+{{#if (eq api "trpc")}}
+app.use("/trpc/*", trpcServer({
+  router: appRouter,
+  createContext: (_opts, context) => {
+    return createContext({ context });
+  },
+}));
+{{/if}}
+
+{{#if (includes examples "ai")}}
+// AI chat endpoint
+app.post("/ai", async (c) => {
+  const body = await c.req.json();
+  const messages = body.messages || [];
+  
+  const result = streamText({
+    model: google("gemini-1.5-flash"),
+    messages,
+  });
+
+  c.header("X-Vercel-AI-Data-Stream", "v1");
+  c.header("Content-Type", "text/plain; charset=utf-8");
+  
+  return stream(c, (stream) => stream.pipe(result.toDataStream()));
+});
+{{/if}}
+
+app.get("/", (c) => {
+  return c.text("OK");
+});
+
+{{#if (eq runtime "node")}}
+import { serve } from "@hono/node-server";
+
+serve({
+  fetch: app.fetch,
+  port: 3000,
+}, (info) => {
+  console.log(`Server is running on http://localhost:${info.port}`);
+});
+{{else}}
+export default app;
+{{/if}}

package/{template/with-next/apps/server → templates/backend/next}/package.json

@@ -8,8 +8,6 @@
     "start": "next start"
   },
   "dependencies": {
-    "@trpc/client": "^11.1.0",
-    "@trpc/server": "^11.1.0",
     "next": "15.3.0"
   },
   "devDependencies": {

package/{template/base/apps/server → templates/backend/server-base}/package.json

@@ -8,7 +8,6 @@
 		"compile": "bun build --compile --minify --sourcemap --bytecode ./src/index.ts --outfile server"
 	},
 	"dependencies": {
-		"@trpc/server": "^11.0.0",
 		"dotenv": "^16.4.7",
 		"zod": "^3.24.2"
 	},

package/templates/backend/server-base/src/routers/index.ts.hbs

@@ -0,0 +1,51 @@
+{{#if (eq api "orpc")}}
+import { {{#if auth}}protectedProcedure, {{/if}}publicProcedure } from "../lib/orpc";
+{{#if (includes examples "todo")}}
+import { todoRouter } from "./todo";
+{{/if}}
+
+export const appRouter = {
+  healthCheck: publicProcedure.handler(() => {
+    return "OK";
+  }),
+  {{#if auth}}
+  privateData: protectedProcedure.handler(({ context }) => {
+    return {
+      message: "This is private",
+      user: context.session!.user,
+    };
+  }),
+  {{/if}}
+  {{#if (includes examples "todo")}}
+  todo: todoRouter,
+  {{/if}}
+};
+{{/if}}
+
+{{#if (eq api "trpc")}}
+import {
+  {{#if auth}}protectedProcedure, {{/if}}publicProcedure,
+  router,
+} from "../lib/trpc";
+{{#if (includes examples "todo")}}
+import { todoRouter } from "./todo";
+{{/if}}
+
+export const appRouter = router({
+  healthCheck: publicProcedure.query(() => {
+    return "OK";
+  }),
+  {{#if auth}}
+  privateData: protectedProcedure.query(({ ctx }) => {
+    return {
+      message: "This is private",
+      user: ctx.session.user,
+    };
+  }),
+  {{/if}}
+  {{#if (includes examples "todo")}}
+  todo: todoRouter,
+  {{/if}}
+});
+{{/if}}
+export type AppRouter = typeof appRouter;

package/templates/base/package.json

@@ -0,0 +1,10 @@
+{
+  "name": "better-t-stack",
+  "private": true,
+  "workspaces": [
+    "apps/*"
+  ],
+  "scripts": {
+
+  }
+}

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

@@ -0,0 +1,79 @@
+{{#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";
+
+export const todoRouter = {
+  getAll: publicProcedure.handler(async () => {
+    return await db.select().from(todo);
+  }),
+
+  create: publicProcedure
+    .input(z.object({ text: z.string().min(1) }))
+    .handler(async ({ input }) => {
+      const result = await db
+        .insert(todo)
+        .values({
+          text: input.text,
+        })
+        .returning();
+      return result[0];
+    }),
+
+  toggle: publicProcedure
+    .input(z.object({ id: z.number(), completed: z.boolean() }))
+    .handler(async ({ input }) => {
+      await db
+        .update(todo)
+        .set({ completed: input.completed })
+        .where(eq(todo.id, input.id));
+      return { success: true };
+    }),
+
+  delete: publicProcedure
+    .input(z.object({ id: z.number() }))
+    .handler(async ({ input }) => {
+      await db.delete(todo).where(eq(todo.id, input.id));
+      return { success: true };
+    }),
+};
+{{/if}}
+
+{{#if (eq api "trpc")}}
+import { z } from "zod";
+import { router, publicProcedure } from "../lib/trpc";
+import { todo } from "../db/schema/todo";
+import { eq } from "drizzle-orm";
+import { db } from "../db";
+
+export const todoRouter = router({
+  getAll: publicProcedure.query(async () => {
+    return await db.select().from(todo);
+  }),
+
+  create: publicProcedure
+    .input(z.object({ text: z.string().min(1) }))
+    .mutation(async ({ input }) => {
+      return await db.insert(todo).values({
+        text: input.text,
+      });
+    }),
+
+  toggle: publicProcedure
+    .input(z.object({ id: z.number(), completed: z.boolean() }))
+    .mutation(async ({ input }) => {
+      return await db
+        .update(todo)
+        .set({ completed: input.completed })
+        .where(eq(todo.id, input.id));
+    }),
+
+  delete: publicProcedure
+    .input(z.object({ id: z.number() }))
+    .mutation(async ({ input }) => {
+      return await db.delete(todo).where(eq(todo.id, input.id));
+    }),
+});
+{{/if}}

package/{template/with-drizzle-sqlite/apps/server → templates/examples/todo/server/drizzle/sqlite}/src/db/schema/todo.ts

@@ -1,7 +1,7 @@
-import { sqliteTable, text, integer } from "drizzle-orm/sqlite-core";
+import { integer, sqliteTable, text } from "drizzle-orm/sqlite-core";
 
 export const todo = sqliteTable("todo", {
   id: integer("id").primaryKey({ autoIncrement: true }),
   text: text("text").notNull(),
-  completed: integer("completed", { mode: "boolean" }).default(false).notNull()
+  completed: integer("completed", { mode: "boolean" }).default(false).notNull(),
 });

package/{template/examples/todo/apps/web-react-router/src/routes/todos.tsx → templates/examples/todo/web/react-router/src/routes/todos.tsx.hbs}

@@ -8,7 +8,12 @@ import {
 } from "@/components/ui/card";
 import { Checkbox } from "@/components/ui/checkbox";
 import { Input } from "@/components/ui/input";
+{{#if (eq api "orpc")}}
+import { orpc } from "@/utils/orpc";
+{{/if}}
+{{#if (eq api "trpc")}}
 import { trpc } from "@/utils/trpc";
+{{/if}}
 import { useMutation, useQuery } from "@tanstack/react-query";
 import { Loader2, Trash2 } from "lucide-react";
 import { useState } from "react";
@@ -16,6 +21,28 @@ import { useState } from "react";
 export default function Todos() {
   const [newTodoText, setNewTodoText] = useState("");
 
+  {{#if (eq api "orpc")}}
+  const todos = useQuery(orpc.todo.getAll.queryOptions());
+  const createMutation = useMutation(
+    orpc.todo.create.mutationOptions({
+      onSuccess: () => {
+        todos.refetch();
+        setNewTodoText("");
+      },
+    })
+  );
+  const toggleMutation = useMutation(
+    orpc.todo.toggle.mutationOptions({
+      onSuccess: () => todos.refetch(),
+    })
+  );
+  const deleteMutation = useMutation(
+    orpc.todo.delete.mutationOptions({
+      onSuccess: () => todos.refetch(),
+    })
+  );
+  {{/if}}
+  {{#if (eq api "trpc")}}
   const todos = useQuery(trpc.todo.getAll.queryOptions());
   const createMutation = useMutation(
     trpc.todo.create.mutationOptions({
@@ -35,6 +62,7 @@ export default function Todos() {
       onSuccess: () => todos.refetch(),
     })
   );
+  {{/if}}
 
   const handleAddTodo = (e: React.FormEvent) => {
     e.preventDefault();

package/{template/examples/todo/apps/web-tanstack-router/src/routes/todos.tsx → templates/examples/todo/web/tanstack-router/src/routes/todos.tsx.hbs}

@@ -8,7 +8,12 @@ import {
 } from "@/components/ui/card";
 import { Checkbox } from "@/components/ui/checkbox";
 import { Input } from "@/components/ui/input";
+{{#if (eq api "orpc")}}
+import { orpc } from "@/utils/orpc";
+{{/if}}
+{{#if (eq api "trpc")}}
 import { trpc } from "@/utils/trpc";
+{{/if}}
 import { useMutation, useQuery } from "@tanstack/react-query";
 import { createFileRoute } from "@tanstack/react-router";
 import { Loader2, Trash2 } from "lucide-react";
@@ -21,6 +26,28 @@ export const Route = createFileRoute("/todos")({
 function TodosRoute() {
   const [newTodoText, setNewTodoText] = useState("");
 
+  {{#if (eq api "orpc")}}
+  const todos = useQuery(orpc.todo.getAll.queryOptions());
+  const createMutation = useMutation(
+    orpc.todo.create.mutationOptions({
+      onSuccess: () => {
+        todos.refetch();
+        setNewTodoText("");
+      },
+    }),
+  );
+  const toggleMutation = useMutation(
+    orpc.todo.toggle.mutationOptions({
+      onSuccess: () => todos.refetch(),
+    }),
+  );
+  const deleteMutation = useMutation(
+    orpc.todo.delete.mutationOptions({
+      onSuccess: () => todos.refetch(),
+    }),
+  );
+  {{/if}}
+  {{#if (eq api "trpc")}}
   const todos = useQuery(trpc.todo.getAll.queryOptions());
   const createMutation = useMutation(
     trpc.todo.create.mutationOptions({
@@ -40,6 +67,7 @@ function TodosRoute() {
       onSuccess: () => todos.refetch(),
     }),
   );
+  {{/if}}
 
   const handleAddTodo = (e: React.FormEvent) => {
     e.preventDefault();

package/{template/examples/todo/apps/web-tanstack-start/src/routes/todos.tsx → templates/examples/todo/web/tanstack-start/src/routes/todos.tsx.hbs}

@@ -8,7 +8,12 @@ import {
 } from "@/components/ui/card";
 import { Checkbox } from "@/components/ui/checkbox";
 import { Input } from "@/components/ui/input";
+{{#if (eq api "trpc")}}
 import { useTRPC } from "@/utils/trpc";
+{{/if}}
+{{#if (eq api "orpc")}}
+import { useORPC } from "@/utils/orpc";
+{{/if}}
 import { useMutation, useQuery } from "@tanstack/react-query";
 import { createFileRoute } from "@tanstack/react-router";
 import { Loader2, Trash2 } from "lucide-react";
@@ -19,10 +24,16 @@ export const Route = createFileRoute("/todos")({
 });
 
 function TodosRoute() {
+  {{#if (eq api "trpc")}}
   const trpc = useTRPC();
+  {{/if}}
+  {{#if (eq api "orpc")}}
+  const orpc = useORPC();
+  {{/if}}
 
   const [newTodoText, setNewTodoText] = useState("");
 
+  {{#if (eq api "trpc")}}
   const todos = useQuery(trpc.todo.getAll.queryOptions());
   const createMutation = useMutation(
     trpc.todo.create.mutationOptions({
@@ -42,6 +53,28 @@ function TodosRoute() {
       onSuccess: () => todos.refetch(),
     }),
   );
+  {{/if}}
+  {{#if (eq api "orpc")}}
+  const todos = useQuery(orpc.todo.getAll.queryOptions());
+  const createMutation = useMutation(
+    orpc.todo.create.mutationOptions({
+      onSuccess: () => {
+        todos.refetch();
+        setNewTodoText("");
+      },
+    }),
+  );
+  const toggleMutation = useMutation(
+    orpc.todo.toggle.mutationOptions({
+      onSuccess: () => todos.refetch(),
+    }),
+  );
+  const deleteMutation = useMutation(
+    orpc.todo.delete.mutationOptions({
+      onSuccess: () => todos.refetch(),
+    }),
+  );
+  {{/if}}
 
   const handleAddTodo = (e: React.FormEvent) => {
     e.preventDefault();

package/{template/base/apps/web-next → templates/frontend/next}/package.json

@@ -15,8 +15,6 @@
     "@radix-ui/react-slot": "^1.2.0",
     "@tanstack/react-form": "^1.3.2",
     "@tanstack/react-query": "^5.72.2",
-    "@trpc/client": "^11.1.0",
-    "@trpc/tanstack-react-query": "^11.1.0",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "lucide-react": "^0.487.0",

package/{template/base/apps/web-next/src/app/page.tsx → templates/frontend/next/src/app/page.tsx.hbs}

@@ -1,5 +1,10 @@
 "use client"
+{{#if (eq api "orpc")}}
+import { orpc } from "@/utils/orpc";
+{{/if}}
+{{#if (eq api "trpc")}}
 import { trpc } from "@/utils/trpc";
+{{/if}}
 import { useQuery } from "@tanstack/react-query";
 
 const TITLE_TEXT = `
@@ -19,7 +24,12 @@ const TITLE_TEXT = `
  `;
 
 export default function Home() {
+  {{#if (eq api "orpc")}}
+  const healthCheck = useQuery(orpc.healthCheck.queryOptions());
+  {{/if}}
+  {{#if (eq api "trpc")}}
   const healthCheck = useQuery(trpc.healthCheck.queryOptions());
+  {{/if}}
 
   return (
     <div className="container mx-auto max-w-3xl px-4 py-2">

package/{template/base/apps/web-next/src/components/providers.tsx → templates/frontend/next/src/components/providers.tsx.hbs}

@@ -1,6 +1,11 @@
 "use client"
 import { QueryClientProvider } from "@tanstack/react-query";
+{{#if (eq api "orpc")}}
+import { orpc, ORPCContext, queryClient } from "@/utils/orpc";
+{{/if}}
+{{#if (eq api "trpc")}}
 import { queryClient } from "@/utils/trpc";
+{{/if}}
 import { ThemeProvider } from "./theme-provider";
 import { Toaster } from "./ui/sonner";
 
@@ -17,7 +22,14 @@ export default function Providers({
       disableTransitionOnChange
     >
       <QueryClientProvider client={queryClient}>
+        {{#if (eq api "orpc")}}
+        <ORPCContext.Provider value={orpc}>
+          {children}
+        </ORPCContext.Provider>
+        {{/if}}
+        {{#if (eq api "trpc")}}
         {children}
+        {{/if}}
       </QueryClientProvider>
       <Toaster richColors />
     </ThemeProvider>

package/{template/base/apps/web-react-router → templates/frontend/react-router}/package.json

@@ -18,9 +18,6 @@
     "@react-router/serve": "^7.4.1",
     "@tanstack/react-form": "^1.2.3",
     "@tanstack/react-query": "^5.71.3",
-    "@trpc/client": "^11.0.1",
-    "@trpc/server": "^11.0.1",
-    "@trpc/tanstack-react-query": "^11.0.1",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "isbot": "^5.1.17",