create-better-t-stack 2.37.0 → 2.38.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-better-t-stack",
-  "version": "2.37.0",
+  "version": "2.38.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",

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

@@ -77,7 +77,7 @@ Database models are located in `apps/server/src/db/models/`
 {{/if}}
 {{/if}}
 
-{{#if auth}}
+{{#if (eq auth "better-auth")}}
 ## Authentication
 
 Authentication is enabled in this project:
@@ -129,4 +129,4 @@ This project includes a `bts.jsonc` configuration file that stores your Better-T
 - Turborepo handles build caching and parallel execution
 {{/if}}
 - Use `{{#if (eq packageManager "bun")}}bunx{{else if (eq packageManager "pnpm")}}pnpx{{else}}npx{{/if}}
-create-better-t-stack add` to add more features later
+create-better-t-stack add` to add more features later

package/templates/api/orpc/native/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 type { AppRouterClient } from "../../server/src/routers";
-{{#if auth}}
+{{#if (eq auth "better-auth")}}
 import { authClient } from "@/lib/auth-client";
 {{/if}}
 
@@ -17,7 +17,7 @@ export const queryClient = new QueryClient({
 
 export const link = new RPCLink({
   url: `${process.env.EXPO_PUBLIC_SERVER_URL}/rpc`,
-  {{#if auth}}
+  {{#if (eq auth "better-auth")}}
   headers() {
     const headers = new Map<string, string>();
     const cookies = authClient.getCookie();

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

@@ -1,11 +1,11 @@
 {{#if (eq backend 'next')}}
 import type { NextRequest } from "next/server";
-{{#if auth}}
+{{#if (eq auth "better-auth")}}
 import { auth } from "./auth";
 {{/if}}
 
 export async function createContext(req: NextRequest) {
-{{#if auth}}
+{{#if (eq auth "better-auth")}}
   const session = await auth.api.getSession({
     headers: req.headers,
   });
@@ -19,7 +19,7 @@ export async function createContext(req: NextRequest) {
 
 {{else if (eq backend 'hono')}}
 import type { Context as HonoContext } from "hono";
-{{#if auth}}
+{{#if (eq auth "better-auth")}}
 import { auth } from "./auth";
 {{/if}}
 
@@ -28,7 +28,7 @@ export type CreateContextOptions = {
 };
 
 export async function createContext({ context }: CreateContextOptions) {
-{{#if auth}}
+{{#if (eq auth "better-auth")}}
   const session = await auth.api.getSession({
     headers: context.req.raw.headers,
   });
@@ -45,7 +45,7 @@ export async function createContext({ context }: CreateContextOptions) {
 
 {{else if (eq backend 'elysia')}}
 import type { Context as ElysiaContext } from "elysia";
-{{#if auth}}
+{{#if (eq auth "better-auth")}}
 import { auth } from "./auth";
 {{/if}}
 
@@ -54,7 +54,7 @@ export type CreateContextOptions = {
 };
 
 export async function createContext({ context }: CreateContextOptions) {
-{{#if auth}}
+{{#if (eq auth "better-auth")}}
   const session = await auth.api.getSession({
     headers: context.request.headers,
   });
@@ -70,13 +70,13 @@ export async function createContext({ context }: CreateContextOptions) {
 }
 
 {{else if (eq backend 'express')}}
-{{#if auth}}
+{{#if (eq auth "better-auth")}}
 import { fromNodeHeaders } from "better-auth/node";
 import { auth } from "./auth";
 {{/if}}
 
 export async function createContext(opts: any) {
-{{#if auth}}
+{{#if (eq auth "better-auth")}}
 	const session = await auth.api.getSession({
 		headers: fromNodeHeaders(opts.req.headers),
 	});
@@ -93,13 +93,13 @@ export async function createContext(opts: any) {
 
 {{else if (eq backend 'fastify')}}
 import type { IncomingHttpHeaders } from "node:http";
-{{#if auth}}
+{{#if (eq auth "better-auth")}}
 import { fromNodeHeaders } from "better-auth/node";
 import { auth } from "./auth";
 {{/if}}
 
 export async function createContext(req: IncomingHttpHeaders) {
-{{#if auth}}
+{{#if (eq auth "better-auth")}}
   const session = await auth.api.getSession({
     headers: fromNodeHeaders(req),
   });

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

@@ -5,7 +5,7 @@ export const o = os.$context<Context>();
 
 export const publicProcedure = o;
 
-{{#if auth}}
+{{#if (eq auth "better-auth")}}
 const requireAuth = o.middleware(async ({ context, next }) => {
   if (!context.session?.user) {
     throw new ORPCError("UNAUTHORIZED");

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

@@ -1,4 +1,4 @@
-{{#if auth}}
+{{#if (eq auth "better-auth")}}
 import { createContext } from '@/lib/context'
 {{/if}}
 import { appRouter } from '@/routers'
@@ -10,7 +10,7 @@ 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}},
+    context: {{#if (eq auth "better-auth")}}await createContext(req){{else}}{}{{/if}},
   })
 
   return response ?? new Response('Not found', { status: 404 })

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

@@ -12,7 +12,7 @@ export default defineNuxtPlugin(() => {
 
   const rpcLink = new RPCLink({
     url: rpcUrl,
-    {{#if auth}}
+    {{#if (eq auth "better-auth")}}
     fetch(url, options) {
         return fetch(url, {
         ...options,

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

@@ -26,13 +26,23 @@ export const link = new RPCLink({
   {{else}}
   url: `${import.meta.env.VITE_SERVER_URL}/rpc`,
   {{/if}}
-  {{#if auth}}
+  {{#if (eq auth "better-auth")}}
   fetch(url, options) {
     return fetch(url, {
       ...options,
       credentials: "include",
     });
   },
+  {{#if (includes frontend "next")}}
+  headers: async () => {
+    if (typeof window !== "undefined") {
+      return {}
+    }
+
+    const { headers } = await import("next/headers")
+    return Object.fromEntries(await headers())
+  },
+  {{/if}}
   {{/if}}
 });
 

package/templates/api/orpc/web/solid/src/utils/orpc.ts.hbs

@@ -14,7 +14,7 @@ export const queryClient = new QueryClient({
 
 export const link = new RPCLink({
   url: `${import.meta.env.VITE_SERVER_URL}/rpc`,
-  {{#if auth}}
+  {{#if (eq auth "better-auth")}}
   fetch(url, options) {
     return fetch(url, {
       ...options,

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

@@ -15,7 +15,7 @@ export const queryClient = new QueryClient({
 
 export const link = new RPCLink({
 	url: `${PUBLIC_SERVER_URL}/rpc`,
-	{{#if auth}}
+	{{#if (eq auth "better-auth")}}
 	fetch(url, options) {
 		return fetch(url, {
 			...options,

package/templates/api/trpc/native/utils/trpc.ts.hbs

@@ -1,4 +1,4 @@
-{{#if auth}}
+{{#if (eq auth "better-auth")}}
 import { authClient } from "@/lib/auth-client";
 {{/if}}
 import { QueryClient } from "@tanstack/react-query";
@@ -12,7 +12,7 @@ const trpcClient = createTRPCClient<AppRouter>({
 	links: [
 		httpBatchLink({
 			url: `${process.env.EXPO_PUBLIC_SERVER_URL}/trpc`,
-			{{#if auth}}
+			{{#if (eq auth "better-auth")}}
 			headers() {
 				const headers = new Map<string, string>();
 				const cookies = authClient.getCookie();

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

@@ -1,11 +1,11 @@
 {{#if (eq backend 'next')}}
 import type { NextRequest } from "next/server";
-{{#if auth}}
+{{#if (eq auth "better-auth")}}
 import { auth } from "./auth";
 {{/if}}
 
 export async function createContext(req: NextRequest) {
-{{#if auth}}
+{{#if (eq auth "better-auth")}}
   const session = await auth.api.getSession({
     headers: req.headers,
   });
@@ -22,7 +22,7 @@ export async function createContext(req: NextRequest) {
 
 {{else if (eq backend 'hono')}}
 import type { Context as HonoContext } from "hono";
-{{#if auth}}
+{{#if (eq auth "better-auth")}}
 import { auth } from "./auth";
 {{/if}}
 
@@ -31,7 +31,7 @@ export type CreateContextOptions = {
 };
 
 export async function createContext({ context }: CreateContextOptions) {
-{{#if auth}}
+{{#if (eq auth "better-auth")}}
   const session = await auth.api.getSession({
     headers: context.req.raw.headers,
   });
@@ -48,7 +48,7 @@ export async function createContext({ context }: CreateContextOptions) {
 
 {{else if (eq backend 'elysia')}}
 import type { Context as ElysiaContext } from "elysia";
-{{#if auth}}
+{{#if (eq auth "better-auth")}}
 import { auth } from "./auth";
 {{/if}}
 
@@ -57,7 +57,7 @@ export type CreateContextOptions = {
 };
 
 export async function createContext({ context }: CreateContextOptions) {
-{{#if auth}}
+{{#if (eq auth "better-auth")}}
   const session = await auth.api.getSession({
     headers: context.request.headers,
   });
@@ -74,13 +74,13 @@ export async function createContext({ context }: CreateContextOptions) {
 
 {{else if (eq backend 'express')}}
 import type { CreateExpressContextOptions } from "@trpc/server/adapters/express";
-{{#if auth}}
+{{#if (eq auth "better-auth")}}
 import { fromNodeHeaders } from "better-auth/node";
 import { auth } from "./auth";
 {{/if}}
 
 export async function createContext(opts: CreateExpressContextOptions) {
-{{#if auth}}
+{{#if (eq auth "better-auth")}}
 	const session = await auth.api.getSession({
 		headers: fromNodeHeaders(opts.req.headers),
 	});
@@ -97,13 +97,13 @@ export async function createContext(opts: CreateExpressContextOptions) {
 
 {{else if (eq backend 'fastify')}}
 import type { CreateFastifyContextOptions } from "@trpc/server/adapters/fastify";
-{{#if auth}}
+{{#if (eq auth "better-auth")}}
 import { fromNodeHeaders } from "better-auth/node";
 import { auth } from "./auth";
 {{/if}}
 
 export async function createContext({ req, res }: CreateFastifyContextOptions) {
-{{#if auth}}
+{{#if (eq auth "better-auth")}}
   const session = await auth.api.getSession({
     headers: fromNodeHeaders(req.headers),
   });

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

@@ -7,7 +7,7 @@ export const router = t.router;
 
 export const publicProcedure = t.procedure;
 
-{{#if auth}}
+{{#if (eq auth "better-auth")}}
 export const protectedProcedure = t.procedure.use(({ ctx, next }) => {
   if (!ctx.session) {
     throw new TRPCError({

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

@@ -28,7 +28,7 @@ const trpcClient = createTRPCClient<AppRouter>({
       {{else}}
       url: `${import.meta.env.VITE_SERVER_URL}/trpc`,
       {{/if}}
-      {{#if auth}}
+      {{#if (eq auth "better-auth")}}
       fetch(url, options) {
         return fetch(url, {
           ...options,
@@ -78,7 +78,7 @@ export const trpcClient = createTRPCClient<AppRouter>({
   links: [
     httpBatchLink({
       url: `${import.meta.env.VITE_SERVER_URL}/trpc`,
-      {{#if auth}}
+      {{#if (eq auth "better-auth")}}
       fetch(url, options) {
         return fetch(url, {
           ...options,

package/templates/auth/clerk/convex/backend/convex/auth.config.ts.hbs

@@ -0,0 +1,12 @@
+export default {
+	providers: [
+		{
+			// Replace with your own Clerk Issuer URL from your "convex" JWT template
+			// or with `process.env.CLERK_JWT_ISSUER_DOMAIN`
+			// and configure CLERK_JWT_ISSUER_DOMAIN on the Convex Dashboard
+			// See https://docs.convex.dev/auth/clerk#configuring-dev-and-prod-instances
+			domain: process.env.CLERK_JWT_ISSUER_DOMAIN,
+			applicationID: "convex",
+		},
+	],
+};

package/templates/auth/clerk/convex/backend/convex/privateData.ts.hbs

@@ -0,0 +1,16 @@
+import { query } from "./_generated/server";
+
+export const get = query({
+	args: {},
+	handler: async (ctx) => {
+		const identity = await ctx.auth.getUserIdentity();
+		if (identity === null) {
+			return {
+				message: "Not authenticated",
+			};
+		}
+		return {
+			message: "This is private",
+		};
+	},
+});

package/templates/auth/clerk/convex/native/base/app/(auth)/_layout.tsx.hbs

@@ -0,0 +1,12 @@
+import { Redirect, Stack } from "expo-router";
+import { useAuth } from "@clerk/clerk-expo";
+
+export default function AuthRoutesLayout() {
+  const { isSignedIn } = useAuth();
+
+  if (isSignedIn) {
+    return <Redirect href={"/"} />;
+  }
+
+  return <Stack />;
+}

package/templates/auth/clerk/convex/native/base/app/(auth)/sign-in.tsx.hbs

@@ -0,0 +1,67 @@
+import { useSignIn } from "@clerk/clerk-expo";
+import { Link, useRouter } from "expo-router";
+import { Text, TextInput, TouchableOpacity, View } from "react-native";
+import React from "react";
+
+export default function Page() {
+  const { signIn, setActive, isLoaded } = useSignIn();
+  const router = useRouter();
+
+  const [emailAddress, setEmailAddress] = React.useState("");
+  const [password, setPassword] = React.useState("");
+
+  // Handle the submission of the sign-in form
+  const onSignInPress = async () => {
+    if (!isLoaded) return;
+
+    // Start the sign-in process using the email and password provided
+    try {
+      const signInAttempt = await signIn.create({
+        identifier: emailAddress,
+        password,
+      });
+
+      // If sign-in process is complete, set the created session as active
+      // and redirect the user
+      if (signInAttempt.status === "complete") {
+        await setActive({ session: signInAttempt.createdSessionId });
+        router.replace("/");
+      } else {
+        // If the status isn't complete, check why. User might need to
+        // complete further steps.
+        console.error(JSON.stringify(signInAttempt, null, 2));
+      }
+    } catch (err) {
+      // See https://clerk.com/docs/custom-flows/error-handling
+      // for more info on error handling
+      console.error(JSON.stringify(err, null, 2));
+    }
+  };
+
+  return (
+    <View>
+      <Text>Sign in</Text>
+      <TextInput
+        autoCapitalize="none"
+        value={emailAddress}
+        placeholder="Enter email"
+        onChangeText={(emailAddress) => setEmailAddress(emailAddress)}
+      />
+      <TextInput
+        value={password}
+        placeholder="Enter password"
+        secureTextEntry={true}
+        onChangeText={(password) => setPassword(password)}
+      />
+      <TouchableOpacity onPress={onSignInPress}>
+        <Text>Continue</Text>
+      </TouchableOpacity>
+      <View style=\{{ display: "flex", flexDirection: "row", gap: 3 }}>
+        <Text>Don't have an account?</Text>
+        <Link href="/sign-up">
+          <Text>Sign up</Text>
+        </Link>
+      </View>
+    </View>
+  );
+}

package/templates/auth/clerk/convex/native/base/app/(auth)/sign-out.tsx.hbs

@@ -0,0 +1,110 @@
+import * as React from "react";
+import { Text, TextInput, TouchableOpacity, View } from "react-native";
+import { useSignUp } from "@clerk/clerk-expo";
+import { Link, useRouter } from "expo-router";
+
+export default function SignUpScreen() {
+  const { isLoaded, signUp, setActive } = useSignUp();
+  const router = useRouter();
+
+  const [emailAddress, setEmailAddress] = React.useState("");
+  const [password, setPassword] = React.useState("");
+  const [pendingVerification, setPendingVerification] = React.useState(false);
+  const [code, setCode] = React.useState("");
+
+  // Handle submission of sign-up form
+  const onSignUpPress = async () => {
+    if (!isLoaded) return;
+
+    console.log(emailAddress, password);
+
+    // Start sign-up process using email and password provided
+    try {
+      await signUp.create({
+        emailAddress,
+        password,
+      });
+
+      // Send user an email with verification code
+      await signUp.prepareEmailAddressVerification({ strategy: "email_code" });
+
+      // Set 'pendingVerification' to true to display second form
+      // and capture OTP code
+      setPendingVerification(true);
+    } catch (err) {
+      // See https://clerk.com/docs/custom-flows/error-handling
+      // for more info on error handling
+      console.error(JSON.stringify(err, null, 2));
+    }
+  };
+
+  // Handle submission of verification form
+  const onVerifyPress = async () => {
+    if (!isLoaded) return;
+
+    try {
+      // Use the code the user provided to attempt verification
+      const signUpAttempt = await signUp.attemptEmailAddressVerification({
+        code,
+      });
+
+      // If verification was completed, set the session to active
+      // and redirect the user
+      if (signUpAttempt.status === "complete") {
+        await setActive({ session: signUpAttempt.createdSessionId });
+        router.replace("/");
+      } else {
+        // If the status is not complete, check why. User may need to
+        // complete further steps.
+        console.error(JSON.stringify(signUpAttempt, null, 2));
+      }
+    } catch (err) {
+      // See https://clerk.com/docs/custom-flows/error-handling
+      // for more info on error handling
+      console.error(JSON.stringify(err, null, 2));
+    }
+  };
+
+  if (pendingVerification) {
+    return (
+      <>
+        <Text>Verify your email</Text>
+        <TextInput
+          value={code}
+          placeholder="Enter your verification code"
+          onChangeText={(code) => setCode(code)}
+        />
+        <TouchableOpacity onPress={onVerifyPress}>
+          <Text>Verify</Text>
+        </TouchableOpacity>
+      </>
+    );
+  }
+
+  return (
+    <View>
+      <Text>Sign up</Text>
+      <TextInput
+        autoCapitalize="none"
+        value={emailAddress}
+        placeholder="Enter email"
+        onChangeText={(email) => setEmailAddress(email)}
+      />
+      <TextInput
+        value={password}
+        placeholder="Enter password"
+        secureTextEntry={true}
+        onChangeText={(password) => setPassword(password)}
+      />
+      <TouchableOpacity onPress={onSignUpPress}>
+        <Text>Continue</Text>
+      </TouchableOpacity>
+      <View style=\{{ display: "flex", flexDirection: "row", gap: 3 }}>
+        <Text>Already have an account?</Text>
+        <Link href="/sign-in">
+          <Text>Sign in</Text>
+        </Link>
+      </View>
+    </View>
+  );
+}

package/templates/auth/clerk/convex/native/base/components/sign-out-button.tsx.hbs

@@ -0,0 +1,27 @@
+import { useClerk } from "@clerk/clerk-expo";
+import { useRouter } from "expo-router";
+import { Text, TouchableOpacity } from "react-native";
+
+export const SignOutButton = () => {
+  // Use `useClerk()` to access the `signOut()` function
+  const { signOut } = useClerk();
+  const router = useRouter();
+
+  const handleSignOut = async () => {
+    try {
+      await signOut();
+      // Redirect to your desired page
+      router.replace("/");
+    } catch (err) {
+      // See https://clerk.com/docs/custom-flows/error-handling
+      // for more info on error handling
+      console.error(JSON.stringify(err, null, 2));
+    }
+  };
+
+  return (
+    <TouchableOpacity onPress={handleSignOut}>
+      <Text>Sign out</Text>
+    </TouchableOpacity>
+  );
+};

package/templates/auth/clerk/convex/web/react/next/src/app/dashboard/page.tsx.hbs

@@ -0,0 +1,29 @@
+"use client";
+
+import { api } from "@{{projectName}}/backend/convex/_generated/api";
+import { SignInButton, UserButton, useUser } from "@clerk/nextjs";
+import { Authenticated, AuthLoading, Unauthenticated, useQuery } from "convex/react";
+
+export default function Dashboard() {
+  const user = useUser();
+  const privateData = useQuery(api.privateData.get);
+
+  return (
+    <>
+      <Authenticated>
+        <div>
+          <h1>Dashboard</h1>
+          <p>Welcome {user.user?.fullName}</p>
+          <p>privateData: {privateData?.message}</p>
+          <UserButton />
+        </div>
+      </Authenticated>
+      <Unauthenticated>
+        <SignInButton />
+      </Unauthenticated>
+      <AuthLoading>
+        <div>Loading...</div>
+      </AuthLoading>
+    </>
+  );
+}

package/templates/auth/clerk/convex/web/react/next/src/middleware.ts.hbs

@@ -0,0 +1,12 @@
+import { clerkMiddleware } from "@clerk/nextjs/server";
+
+export default clerkMiddleware();
+
+export const config = {
+	matcher: [
+		// Skip Next.js internals and all static files, unless found in search params
+		"/((?!_next|[^?]*\\.(?:html?|css|js(?!on)|jpe?g|webp|png|gif|svg|ttf|woff2?|ico|csv|docx?|xlsx?|zip|webmanifest)).*)",
+		// Always run for API routes
+		"/(api|trpc)(.*)",
+	],
+};

package/templates/auth/clerk/convex/web/react/react-router/src/routes/dashboard.tsx.hbs

@@ -0,0 +1,32 @@
+import { SignInButton, UserButton, useUser } from "@clerk/clerk-react";
+import { api } from "@{{projectName}}/backend/convex/_generated/api";
+import {
+	Authenticated,
+	AuthLoading,
+	Unauthenticated,
+	useQuery,
+} from "convex/react";
+
+export default function Dashboard() {
+	const privateData = useQuery(api.privateData.get);
+	const user = useUser();
+
+	return (
+		<>
+			<Authenticated>
+				<div>
+					<h1>Dashboard</h1>
+					<p>Welcome {user.user?.fullName}</p>
+					<p>privateData: {privateData?.message}</p>
+					<UserButton />
+				</div>
+			</Authenticated>
+			<Unauthenticated>
+				<SignInButton />
+			</Unauthenticated>
+			<AuthLoading>
+				<div>Loading...</div>
+			</AuthLoading>
+		</>
+	);
+}