create-better-t-stack 1.13.2 → 2.0.0

package/package.json

@@ -1,71 +1,74 @@
 {
-	"name": "create-better-t-stack",
-	"version": "1.13.2",
-	"description": "A modern CLI tool for scaffolding end-to-end type-safe TypeScript projects with best practices and customizable configurations",
-	"type": "module",
-	"license": "MIT",
-	"author": "Aman Varshney",
-	"bin": {
-		"create-better-t-stack": "dist/index.js"
-	},
-	"files": [
-		"template",
-		"dist"
-	],
-	"keywords": [
-		"better-t-stack",
-		"typescript",
-		"boilerplate",
-		"starter",
-		"cli",
-		"turborepo",
-		"trpc",
-		"better-auth",
-		"monorepo",
-		"fullstack",
-		"type-safety",
-		"react",
-		"react-native",
-		"expo",
-		"hono",
-		"elysia",
-		"drizzle",
-		"prisma",
-		"tanstack",
-		"tailwind",
-		"shadcn",
-		"pwa",
-		"tauri",
-		"biome"
-	],
-	"repository": {
-		"type": "git",
-		"url": "git+https://github.com/AmanVarshney01/create-better-t-stack.git",
-		"directory": "apps/cli"
-	},
-	"homepage": "https://better-t-stack.pages.dev/",
-	"scripts": {
-		"build": "tsup",
-		"dev": "tsup --watch",
-		"check-types": "tsc --noEmit",
-		"check": "biome check --write .",
-		"test": "vitest run",
-		"prepublishOnly": "npm run build"
-	},
-	"dependencies": {
-		"@clack/prompts": "^0.10.1",
-		"consola": "^3.4.2",
-		"execa": "^8.0.1",
-		"fs-extra": "^11.3.0",
-		"gradient-string": "^3.0.0",
-		"picocolors": "^1.1.1",
-		"yargs": "^17.7.2"
-	},
-	"devDependencies": {
-		"@types/fs-extra": "^11.0.4",
-		"@types/node": "^20.17.30",
-		"@types/yargs": "^17.0.33",
-		"tsup": "^8.4.0",
-		"typescript": "^5.8.3"
-	}
+  "name": "create-better-t-stack",
+  "version": "2.0.0",
+  "description": "A modern CLI tool for scaffolding end-to-end type-safe TypeScript projects with best practices and customizable configurations",
+  "type": "module",
+  "license": "MIT",
+  "author": "Aman Varshney",
+  "bin": {
+    "create-better-t-stack": "dist/index.js"
+  },
+  "files": [
+    "templates",
+    "dist"
+  ],
+  "keywords": [
+    "better-t-stack",
+    "typescript",
+    "boilerplate",
+    "starter",
+    "cli",
+    "turborepo",
+    "trpc",
+    "better-auth",
+    "monorepo",
+    "fullstack",
+    "type-safety",
+    "react",
+    "react-native",
+    "expo",
+    "hono",
+    "elysia",
+    "drizzle",
+    "prisma",
+    "tanstack",
+    "tailwind",
+    "shadcn",
+    "pwa",
+    "tauri",
+    "biome"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/AmanVarshney01/create-better-t-stack.git",
+    "directory": "apps/cli"
+  },
+  "homepage": "https://better-t-stack.pages.dev/",
+  "scripts": {
+    "build": "tsup",
+    "dev": "tsup --watch",
+    "check-types": "tsc --noEmit",
+    "check": "biome check --write .",
+    "test": "vitest run",
+    "prepublishOnly": "npm run build"
+  },
+  "dependencies": {
+    "@clack/prompts": "^0.10.1",
+    "consola": "^3.4.2",
+    "execa": "^8.0.1",
+    "fs-extra": "^11.3.0",
+    "globby": "^14.1.0",
+    "gradient-string": "^3.0.0",
+    "handlebars": "^4.7.8",
+    "picocolors": "^1.1.1",
+    "yargs": "^17.7.2"
+  },
+  "devDependencies": {
+    "@types/fs-extra": "^11.0.4",
+    "@types/globby": "^9.1.0",
+    "@types/node": "^20.17.30",
+    "@types/yargs": "^17.0.33",
+    "tsup": "^8.4.0",
+    "typescript": "^5.8.3"
+  }
 }

package/templates/api/orpc/server/base/src/lib/context.ts.hbs

@@ -0,0 +1,105 @@
+{{#if (eq backend 'next')}}
+import type { NextRequest } from "next/server";
+{{#if auth}}
+import { auth } from "./auth";
+{{/if}}
+
+export async function createContext(req: NextRequest) {
+{{#if auth}}
+  const session = await auth.api.getSession({
+    headers: req.headers,
+  });
+  return {
+    session,
+  };
+{{else}}
+  return {}
+{{/if}}
+}
+
+{{else if (eq backend 'hono')}}
+import type { Context as HonoContext } from "hono";
+{{#if auth}}
+import { auth } from "./auth";
+{{/if}}
+
+export type CreateContextOptions = {
+  context: HonoContext;
+};
+
+export async function createContext({ context }: CreateContextOptions) {
+{{#if auth}}
+  const session = await auth.api.getSession({
+    headers: context.req.raw.headers,
+  });
+  return {
+    session,
+  };
+{{else}}
+  // No auth configured
+  return {
+    session: null,
+  };
+{{/if}}
+}
+
+{{else if (eq backend 'elysia')}}
+import type { Context as ElysiaContext } from "elysia";
+{{#if auth}}
+import { auth } from "./auth";
+{{/if}}
+
+export type CreateContextOptions = {
+  context: ElysiaContext;
+};
+
+export async function createContext({ context }: CreateContextOptions) {
+{{#if auth}}
+  const session = await auth.api.getSession({
+    headers: context.request.headers,
+  });
+  return {
+    session,
+  };
+{{else}}
+  // No auth configured
+  return {
+    session: null,
+  };
+{{/if}}
+}
+
+{{else if (eq backend 'express')}}
+import type { CreateExpressContextOptions } from "@trpc/server/adapters/express";
+{{#if auth}}
+import { fromNodeHeaders } from "better-auth/node";
+import { auth } from "./auth";
+{{/if}}
+
+export async function createContext(opts: CreateExpressContextOptions) {
+{{#if auth}}
+	const session = await auth.api.getSession({
+		headers: fromNodeHeaders(opts.req.headers),
+	});
+	return {
+		session,
+	};
+{{else}}
+  // No auth configured
+	return {
+		session: null,
+	};
+{{/if}}
+}
+
+{{else}}
+// Default or fallback context if backend is not recognized or none
+// This might need adjustment based on your default behavior
+export async function createContext() {
+  return {
+    session: null,
+  };
+}
+{{/if}}
+
+export type Context = Awaited<ReturnType<typeof createContext>>;

package/templates/api/orpc/server/base/src/lib/orpc.ts.hbs

@@ -0,0 +1,17 @@
+import { ORPCError, os } from "@orpc/server";
+import type { Context } from "./context";
+
+export const o = os.$context<Context>();
+
+export const publicProcedure = o;
+
+{{#if auth}}
+const requireAuth = o.middleware(async ({ context, next }) => {
+  if (!context.session?.user) {
+    throw new ORPCError("UNAUTHORIZED");
+  }
+  return next({ context });
+});
+
+export const protectedProcedure = publicProcedure.use(requireAuth);
+{{/if}}

package/templates/api/orpc/server/next/src/app/rpc/[...all]/route.ts.hbs

@@ -0,0 +1,23 @@
+{{#if auth}}
+import { createContext } from '@/lib/context'
+{{/if}}
+import { appRouter } from '@/routers'
+import { RPCHandler } from '@orpc/server/fetch'
+import { NextRequest } from 'next/server'
+
+const handler = new RPCHandler(appRouter)
+
+async function handleRequest(req: NextRequest) {
+  const { response } = await handler.handle(req, {
+    prefix: '/rpc',
+    context: {{#if auth}}await createContext(req){{else}}{}{{/if}},
+  })
+
+  return response ?? 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/web/base/src/utils/orpc.ts.hbs

@@ -0,0 +1,57 @@
+import { createORPCClient } from "@orpc/client";
+import { RPCLink } from "@orpc/client/fetch";
+import { createORPCReactQueryUtils } from "@orpc/react-query";
+import { QueryCache, QueryClient } from "@tanstack/react-query";
+import { toast } from "sonner";
+import type { appRouter } from "../../../server/src/routers/index";
+import type { RouterClient } from "@orpc/server";
+import { createContext, use } from 'react'
+import type { RouterUtils } from '@orpc/react-query'
+
+type ORPCReactUtils = RouterUtils<RouterClient<typeof appRouter>>
+
+export const queryClient = new QueryClient({
+  queryCache: new QueryCache({
+    onError: (error) => {
+      toast.error(`Error: ${error.message}`, {
+        action: {
+          label: "retry",
+          onClick: () => {
+            queryClient.invalidateQueries();
+          },
+        },
+      });
+    },
+  }),
+});
+
+export const link = new RPCLink({
+  {{#if (includes frontend "next")}}
+  url: `${process.env.NEXT_PUBLIC_SERVER_URL}/rpc`,
+  {{else}}
+  url: `${import.meta.env.VITE_SERVER_URL}/rpc`,
+  {{/if}}
+  {{#if auth}}
+  fetch(url, options) {
+    return fetch(url, {
+      ...options,
+      credentials: "include",
+    });
+  },
+  {{/if}}
+});
+
+export const client: RouterClient<typeof appRouter> = createORPCClient(link)
+
+export const orpc = createORPCReactQueryUtils(client)
+
+
+export const ORPCContext = createContext<ORPCReactUtils | undefined>(undefined)
+
+export function useORPC(): ORPCReactUtils {
+  const orpc = use(ORPCContext)
+  if (!orpc) {
+    throw new Error('ORPCContext is not set up properly')
+  }
+  return orpc
+}

package/templates/api/trpc/server/base/src/lib/context.ts.hbs

@@ -0,0 +1,108 @@
+{{#if (eq backend 'next')}}
+import type { NextRequest } from "next/server";
+{{#if auth}}
+import { auth } from "./auth";
+{{/if}}
+
+export async function createContext(req: NextRequest) {
+{{#if auth}}
+  const session = await auth.api.getSession({
+    headers: req.headers,
+  });
+  return {
+    session,
+  };
+{{else}}
+  // No auth configured
+  return {
+    session: null,
+  };
+{{/if}}
+}
+
+{{else if (eq backend 'hono')}}
+import type { Context as HonoContext } from "hono";
+{{#if auth}}
+import { auth } from "./auth";
+{{/if}}
+
+export type CreateContextOptions = {
+  context: HonoContext;
+};
+
+export async function createContext({ context }: CreateContextOptions) {
+{{#if auth}}
+  const session = await auth.api.getSession({
+    headers: context.req.raw.headers,
+  });
+  return {
+    session,
+  };
+{{else}}
+  // No auth configured
+  return {
+    session: null,
+  };
+{{/if}}
+}
+
+{{else if (eq backend 'elysia')}}
+import type { Context as ElysiaContext } from "elysia";
+{{#if auth}}
+import { auth } from "./auth";
+{{/if}}
+
+export type CreateContextOptions = {
+  context: ElysiaContext;
+};
+
+export async function createContext({ context }: CreateContextOptions) {
+{{#if auth}}
+  const session = await auth.api.getSession({
+    headers: context.request.headers,
+  });
+  return {
+    session,
+  };
+{{else}}
+  // No auth configured
+  return {
+    session: null,
+  };
+{{/if}}
+}
+
+{{else if (eq backend 'express')}}
+import type { CreateExpressContextOptions } from "@trpc/server/adapters/express";
+{{#if auth}}
+import { fromNodeHeaders } from "better-auth/node";
+import { auth } from "./auth";
+{{/if}}
+
+export async function createContext(opts: CreateExpressContextOptions) {
+{{#if auth}}
+	const session = await auth.api.getSession({
+		headers: fromNodeHeaders(opts.req.headers),
+	});
+	return {
+		session,
+	};
+{{else}}
+  // No auth configured
+	return {
+		session: null,
+	};
+{{/if}}
+}
+
+{{else}}
+// Default or fallback context if backend is not recognized or none
+// This might need adjustment based on your default behavior
+export async function createContext() {
+  return {
+    session: null,
+  };
+}
+{{/if}}
+
+export type Context = Awaited<ReturnType<typeof createContext>>;

package/{template/with-auth/apps/server/src/lib/trpc.ts → templates/api/trpc/server/base/src/lib/trpc.ts.hbs}

@@ -7,6 +7,7 @@ export const router = t.router;
 
 export const publicProcedure = t.procedure;
 
+{{#if auth}}
 export const protectedProcedure = t.procedure.use(({ ctx, next }) => {
   if (!ctx.session) {
     throw new TRPCError({
@@ -22,3 +23,4 @@ export const protectedProcedure = t.procedure.use(({ ctx, next }) => {
     },
   });
 });
+{{/if}}

package/templates/api/trpc/web/base/src/utils/trpc.ts.hbs

@@ -0,0 +1,100 @@
+{{#if (includes frontend 'next')}}
+{{!-- Next.js tRPC Client Setup --}}
+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'; {{! Adjust path if necessary }}
+import { toast } from 'sonner';
+
+export const queryClient = new QueryClient({
+  queryCache: new QueryCache({
+    onError: (error) => {
+      toast.error(error.message, {
+        action: {
+          label: "retry",
+          onClick: () => {
+            queryClient.invalidateQueries();
+          },
+        },
+      });
+    },
+  }),
+});
+
+const trpcClient = createTRPCClient<AppRouter>({
+  links: [
+    httpBatchLink({
+      {{#if (includes frontend 'next')}}
+      url: `${process.env.NEXT_PUBLIC_SERVER_URL}/trpc`,
+      {{else}}
+      url: `${import.meta.env.VITE_SERVER_URL}/trpc`,
+      {{/if}}
+      {{#if auth}}
+      fetch(url, options) {
+        return fetch(url, {
+          ...options,
+          credentials: "include",
+        });
+      },
+      {{/if}}
+    }),
+  ],
+})
+
+export const trpc = createTRPCOptionsProxy<AppRouter>({
+  client: trpcClient,
+  queryClient,
+});
+
+{{else if (includes frontend 'tanstack-start')}}
+{{!-- TanStack Start tRPC Client Setup --}}
+import { createTRPCContext } from "@trpc/tanstack-react-query";
+import type { AppRouter } from "../../../server/src/routers"; {{! Adjust path if necessary }}
+
+export const { TRPCProvider, useTRPC, useTRPCClient } =
+  createTRPCContext<AppRouter>();
+
+{{else}}
+{{!-- Default Web tRPC Client Setup (TanStack Router, React Router, etc.) --}}
+import type { AppRouter } from "../../../server/src/routers"; {{! Adjust path if necessary }}
+import { QueryCache, QueryClient } from "@tanstack/react-query";
+import { createTRPCClient, httpBatchLink } from "@trpc/client";
+import { createTRPCOptionsProxy } from "@trpc/tanstack-react-query";
+import { toast } from "sonner";
+
+export const queryClient = new QueryClient({
+  queryCache: new QueryCache({
+    onError: (error) => {
+      toast.error(error.message, {
+        action: {
+          label: "retry",
+          onClick: () => {
+            queryClient.invalidateQueries();
+          },
+        },
+      });
+    },
+  }),
+});
+
+export const trpcClient = createTRPCClient<AppRouter>({
+  links: [
+    httpBatchLink({
+      url: `${import.meta.env.VITE_SERVER_URL}/trpc`,
+      {{#if auth}}
+      fetch(url, options) {
+        return fetch(url, {
+          ...options,
+          credentials: "include",
+        });
+      },
+      {{/if}}
+    }),
+  ],
+});
+
+export const trpc = createTRPCOptionsProxy<AppRouter>({
+  client: trpcClient,
+  queryClient,
+});
+{{/if}}

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

@@ -0,0 +1,30 @@
+import { betterAuth } from "better-auth";
+
+{{#if (eq orm "prisma")}}
+import { prismaAdapter } from "better-auth/adapters/prisma";
+import prisma from "../../prisma";
+
+export const auth = betterAuth({
+  database: prismaAdapter(prisma, {
+    provider: "{{database}}"
+  }),
+  trustedOrigins: [process.env.CORS_ORIGIN || ""],
+  emailAndPassword: { enabled: true }
+});
+
+{{else if (eq orm "drizzle")}}
+import { drizzleAdapter } from "better-auth/adapters/drizzle";
+import { db } from "../db";
+import * as schema from "../db/schema/auth";
+
+export const auth = betterAuth({
+  database: drizzleAdapter(db, {
+    {{#if (eq database "postgresql")}}provider: "pg",{{/if}}
+    {{#if (eq database "sqlite")}}provider: "sqlite",{{/if}}
+    {{#if (eq database "mysql")}}provider: "mysql",{{/if}}
+    schema: schema
+  }),
+  trustedOrigins: [process.env.CORS_ORIGIN || ""],
+  emailAndPassword: { enabled: true }
+});
+{{/if}}

package/templates/auth/web/base/src/lib/auth-client.ts.hbs

@@ -0,0 +1,10 @@
+import { createAuthClient } from "better-auth/react";
+
+export const authClient = createAuthClient({
+  baseURL:
+    {{#if (includes frontend "next")}}
+      process.env.NEXT_PUBLIC_SERVER_URL,
+    {{else}}
+      import.meta.env.VITE_SERVER_URL,
+    {{/if}}
+});

package/{template/with-auth/apps/web-next/src/app/dashboard/page.tsx → templates/auth/web/next/src/app/dashboard/page.tsx.hbs}

@@ -1,6 +1,11 @@
 "use client"
 import { authClient } from "@/lib/auth-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";
 import { useRouter } from "next/navigation";
 import { useEffect } from "react";
@@ -9,7 +14,12 @@ export default function Dashboard() {
   const router = useRouter()
   const { data: session, isPending } = authClient.useSession();
 
+  {{#if (eq api "orpc")}}
+  const privateData = useQuery(orpc.privateData.queryOptions());
+  {{/if}}
+  {{#if (eq api "trpc")}}
   const privateData = useQuery(trpc.privateData.queryOptions());
+  {{/if}}
 
   useEffect(() => {
     if (!session && !isPending) {

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

@@ -1,5 +1,10 @@
 import { authClient } from "@/lib/auth-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";
 import { useEffect } from "react";
 import { useNavigate } from "react-router";
@@ -8,7 +13,12 @@ export default function Dashboard() {
   const { data: session, isPending } = authClient.useSession();
   const navigate = useNavigate();
 
+  {{#if (eq api "orpc")}}
+  const privateData = useQuery(orpc.privateData.queryOptions());
+  {{/if}}
+  {{#if (eq api "trpc")}}
   const privateData = useQuery(trpc.privateData.queryOptions());
+  {{/if}}
 
   useEffect(() => {
     if (!session && !isPending) {

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

@@ -1,5 +1,10 @@
 import { authClient } from "@/lib/auth-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";
 import { createFileRoute } from "@tanstack/react-router";
 import { useEffect } from "react";
@@ -13,7 +18,12 @@ function RouteComponent() {
 
   const navigate = Route.useNavigate();
 
+  {{#if (eq api "orpc")}}
+  const privateData = useQuery(orpc.privateData.queryOptions());
+  {{/if}}
+  {{#if (eq api "trpc")}}
   const privateData = useQuery(trpc.privateData.queryOptions());
+  {{/if}}
 
   useEffect(() => {
     if (!session && !isPending) {