create-better-t-stack 2.37.0 → 2.38.1

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

@@ -0,0 +1,37 @@
+import { SignInButton, UserButton, useUser } from "@clerk/clerk-react";
+import { api } from "@{{projectName}}/backend/convex/_generated/api";
+import { createFileRoute } from "@tanstack/react-router";
+import {
+	Authenticated,
+	AuthLoading,
+	Unauthenticated,
+	useQuery,
+} from "convex/react";
+
+export const Route = createFileRoute("/dashboard")({
+	component: RouteComponent,
+});
+
+function RouteComponent() {
+	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>
+		</>
+	);
+}

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

@@ -0,0 +1,37 @@
+import { SignInButton, UserButton, useUser } from "@clerk/tanstack-react-start";
+import { api } from "@{{projectName}}/backend/convex/_generated/api";
+import { createFileRoute } from "@tanstack/react-router";
+import {
+	Authenticated,
+	AuthLoading,
+	Unauthenticated,
+	useQuery,
+} from "convex/react";
+
+export const Route = createFileRoute("/dashboard")({
+	component: RouteComponent,
+});
+
+function RouteComponent() {
+	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>
+		</>
+	);
+}

package/templates/auth/clerk/convex/web/react/tanstack-start/src/server.ts.hbs

@@ -0,0 +1,18 @@
+import { createClerkHandler } from "@clerk/tanstack-react-start/server";
+import {
+	createStartHandler,
+	defaultStreamHandler,
+	defineHandlerCallback,
+} from "@tanstack/react-start/server";
+import { createRouter } from "./router";
+
+const handlerFactory = createClerkHandler(
+	createStartHandler({
+		createRouter,
+	}),
+);
+
+export default defineHandlerCallback(async (event) => {
+	const startHandler = await handlerFactory(defaultStreamHandler);
+	return startHandler(event);
+});

package/templates/backend/convex/packages/backend/package.json.hbs

@@ -9,6 +9,7 @@
   "license": "ISC",
   "description": "",
   "devDependencies": {
+    "@types/node": "^24.3.0",
     "typescript": "^5.9.2"
   },
   "dependencies": {

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

@@ -14,7 +14,7 @@ import { RPCHandler } from "@orpc/server/fetch";
 import { appRouter } from "./routers";
 import { createContext } from "./lib/context";
 {{/if}}
-{{#if auth}}
+{{#if (eq auth "better-auth")}}
 import { auth } from "./lib/auth";
 {{/if}}
 
@@ -31,13 +31,13 @@ const app = new Elysia()
     cors({
       origin: process.env.CORS_ORIGIN || "",
       methods: ["GET", "POST", "OPTIONS"],
-      {{#if auth}}
+      {{#if (eq auth "better-auth")}}
       allowedHeaders: ["Content-Type", "Authorization"],
       credentials: true,
       {{/if}}
     }),
   )
-  {{#if auth}}
+  {{#if (eq auth "better-auth")}}
   .all("/api/auth/*", async (context) => {
     const { request } = context;
     if (["POST", "GET"].includes(request.method)) {

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

@@ -7,7 +7,7 @@ import { appRouter } from "./routers/index";
 {{#if (eq api "orpc")}}
 import { RPCHandler } from "@orpc/server/node";
 import { appRouter } from "./routers";
-{{#if auth}}
+{{#if (eq auth "better-auth")}}
 import { createContext } from "./lib/context";
 {{/if}}
 {{/if}}
@@ -17,7 +17,7 @@ import express from "express";
 import { streamText, type UIMessage, convertToModelMessages } from "ai";
 import { google } from "@ai-sdk/google";
 {{/if}}
-{{#if auth}}
+{{#if (eq auth "better-auth")}}
 import { auth } from "./lib/auth";
 import { toNodeHandler } from "better-auth/node";
 {{/if}}
@@ -28,14 +28,14 @@ app.use(
   cors({
     origin: process.env.CORS_ORIGIN || "",
     methods: ["GET", "POST", "OPTIONS"],
-    {{#if auth}}
+    {{#if (eq auth "better-auth")}}
     allowedHeaders: ["Content-Type", "Authorization"],
     credentials: true,
     {{/if}}
   })
 );
 
-{{#if auth}}
+{{#if (eq auth "better-auth")}}
 app.all("/api/auth{/*path}", toNodeHandler(auth));
 {{/if}}
 
@@ -54,7 +54,7 @@ const handler = new RPCHandler(appRouter);
 app.use("/rpc{*path}", async (req, res, next) => {
   const { matched } = await handler.handle(req, res, {
     prefix: "/rpc",
-    {{#if auth}}
+    {{#if (eq auth "better-auth")}}
     context: await createContext({ req }),
     {{else}}
     context: {},
@@ -85,4 +85,4 @@ app.get("/", (_req, res) => {
 const port = process.env.PORT || 3000;
 app.listen(port, () => {
   console.log(`Server is running on port ${port}`);
-});
+});

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

@@ -13,7 +13,7 @@ import { RPCHandler } from "@orpc/server/node";
 import { CORSPlugin } from "@orpc/server/plugins";
 import { appRouter } from "./routers/index";
 import { createServer } from "node:http";
-{{#if auth}}
+{{#if (eq auth "better-auth")}}
 import { createContext } from "./lib/context";
 {{/if}}
 {{/if}}
@@ -23,7 +23,7 @@ import { streamText, type UIMessage, convertToModelMessages } from "ai";
 import { google } from "@ai-sdk/google";
 {{/if}}
 
-{{#if auth}}
+{{#if (eq auth "better-auth")}}
 import { auth } from "./lib/auth";
 {{/if}}
 
@@ -77,7 +77,7 @@ const fastify = Fastify({
 
 fastify.register(fastifyCors, baseCorsConfig);
 
-{{#if auth}}
+{{#if (eq auth "better-auth")}}
 fastify.route({
   method: ["GET", "POST"],
   url: "/api/auth/*",
@@ -149,4 +149,4 @@ fastify.listen({ port: 3000 }, (err) => {
     process.exit(1);
   }
   console.log("Server running on port 3000");
-});
+});

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

@@ -14,7 +14,7 @@ import { trpcServer } from "@hono/trpc-server";
 import { createContext } from "./lib/context";
 import { appRouter } from "./routers/index";
 {{/if}}
-{{#if auth}}
+{{#if (eq auth "better-auth")}}
 import { auth } from "./lib/auth";
 {{/if}}
 import { Hono } from "hono";
@@ -42,14 +42,14 @@ app.use(
     origin: env.CORS_ORIGIN || "",
     {{/if}}
     allowMethods: ["GET", "POST", "OPTIONS"],
-    {{#if auth}}
+    {{#if (eq auth "better-auth")}}
     allowHeaders: ["Content-Type", "Authorization"],
     credentials: true,
     {{/if}}
   })
 );
 
-{{#if auth}}
+{{#if (eq auth "better-auth")}}
 app.on(["POST", "GET"], "/api/auth/**", (c) => auth.handler(c.req.raw));
 {{/if}}
 
@@ -133,4 +133,4 @@ export default app;
 {{#if (eq runtime "workers")}}
 export default app;
 {{/if}}
-{{/if}}
+{{/if}}

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

@@ -1,5 +1,5 @@
 {{#if (eq api "orpc")}}
-import { {{#if auth}}protectedProcedure, {{/if}}publicProcedure } from "../lib/orpc";
+import { {{#if (eq auth "better-auth")}}protectedProcedure, {{/if}}publicProcedure } from "../lib/orpc";
 import type { RouterClient } from "@orpc/server";
 {{#if (includes examples "todo")}}
 import { todoRouter } from "./todo";
@@ -9,7 +9,7 @@ export const appRouter = {
   healthCheck: publicProcedure.handler(() => {
     return "OK";
   }),
-  {{#if auth}}
+  {{#if (eq auth "better-auth")}}
   privateData: protectedProcedure.handler(({ context }) => {
     return {
       message: "This is private",
@@ -25,7 +25,7 @@ export type AppRouter = typeof appRouter;
 export type AppRouterClient = RouterClient<typeof appRouter>;
 {{else if (eq api "trpc")}}
 import {
-  {{#if auth}}protectedProcedure, {{/if}}publicProcedure,
+  {{#if (eq auth "better-auth")}}protectedProcedure, {{/if}}publicProcedure,
   router,
 } from "../lib/trpc";
 {{#if (includes examples "todo")}}
@@ -36,7 +36,7 @@ export const appRouter = router({
   healthCheck: publicProcedure.query(() => {
     return "OK";
   }),
-  {{#if auth}}
+  {{#if (eq auth "better-auth")}}
   privateData: protectedProcedure.query(({ ctx }) => {
     return {
       message: "This is private",

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

@@ -164,7 +164,7 @@ export const server = await Worker("server", {
     DATABASE_URL: alchemy.secret(process.env.DATABASE_URL),
     {{/if}}
     CORS_ORIGIN: process.env.CORS_ORIGIN || "",
-    {{#if auth}}
+    {{#if (eq auth "better-auth")}}
     BETTER_AUTH_SECRET: alchemy.secret(process.env.BETTER_AUTH_SECRET),
     BETTER_AUTH_URL: process.env.BETTER_AUTH_URL || "",
     {{/if}}
@@ -190,4 +190,4 @@ console.log(`Web    -> ${web.url}`);
 console.log(`Server -> ${server.url}`);
 {{/if}}
 
-await app.finalize();
+await app.finalize();

package/templates/frontend/native/nativewind/app/(drawer)/index.tsx.hbs

@@ -9,9 +9,17 @@ import { useQuery } from "@tanstack/react-query";
 import { trpc } from "@/utils/trpc";
 {{/if}}
 {{#if (eq backend "convex")}}
+{{#if (eq auth "clerk")}}
+import { Link } from "expo-router";
+import { Authenticated, AuthLoading, Unauthenticated, useQuery } from "convex/react";
+import { api } from "@{{ projectName }}/backend/convex/_generated/api";
+import { useUser } from "@clerk/clerk-expo";
+import { SignOutButton } from "@/components/sign-out-button";
+{{else}}
 import { useQuery } from "convex/react";
 import { api } from "@{{ projectName }}/backend/convex/_generated/api";
 {{/if}}
+{{/if}}
 
 export default function Home() {
   {{#if (eq api "orpc")}}
@@ -21,21 +29,27 @@ export default function Home() {
   const healthCheck = useQuery(trpc.healthCheck.queryOptions());
   {{/if}}
   {{#if (eq backend "convex")}}
+  {{#if (eq auth "clerk")}}
+  const { user } = useUser();
   const healthCheck = useQuery(api.healthCheck.get);
+  const privateData = useQuery(api.privateData.get);
+  {{else}}
+  const healthCheck = useQuery(api.healthCheck.get);
+  {{/if}}
   {{/if}}
 
   return (
     <Container>
       <ScrollView showsVerticalScrollIndicator={false} className="flex-1">
         <Text className="font-mono text-foreground text-3xl font-bold mb-4">
-			BETTER T STACK
-		</Text>
+          BETTER T STACK
+        </Text>
         <View className="bg-card border border-border rounded-xl p-6 mb-6 shadow-sm">
           {{#if (eq backend "convex")}}
           <View className="flex-row items-center gap-3">
             <View
               className={`h-3 w-3 rounded-full ${
-                  healthCheck ? "bg-green-500" : "bg-orange-500"
+                healthCheck ? "bg-green-500" : "bg-orange-500"
               }`}
             />
             <View className="flex-1">
@@ -89,6 +103,24 @@ export default function Home() {
             {{/unless}}
           {{/if}}
         </View>
+        {{#if (and (eq backend "convex") (eq auth "clerk"))}}
+        <Authenticated>
+          <Text>Hello {user?.emailAddresses[0].emailAddress}</Text>
+          <Text>Private Data: {privateData?.message}</Text>
+          <SignOutButton />
+        </Authenticated>
+        <Unauthenticated>
+          <Link href="/(auth)/sign-in">
+            <Text>Sign in</Text>
+          </Link>
+          <Link href="/(auth)/sign-up">
+            <Text>Sign up</Text>
+          </Link>
+        </Unauthenticated>
+        <AuthLoading>
+          <Text>Loading...</Text>
+        </AuthLoading>
+        {{/if}}
       </ScrollView>
     </Container>
   );

package/templates/frontend/native/nativewind/app/_layout.tsx.hbs

@@ -3,6 +3,11 @@ import "@/polyfills";
 {{/if}}
 {{#if (eq backend "convex")}}
 import { ConvexProvider, ConvexReactClient } from "convex/react";
+{{#if (eq auth "clerk")}}
+import { ClerkProvider, useAuth } from "@clerk/clerk-expo";
+import { ConvexProviderWithClerk } from "convex/react-clerk";
+import { tokenCache } from "@clerk/clerk-expo/token-cache";
+{{/if}}
 {{else}}
 {{#unless (eq api "none")}}
 import { QueryClientProvider } from "@tanstack/react-query";
@@ -72,6 +77,28 @@ export default function RootLayout() {
   }
   return (
     {{#if (eq backend "convex")}}
+    {{#if (eq auth "clerk")}}
+    <ClerkProvider
+      tokenCache={tokenCache}
+      publishableKey={process.env.EXPO_PUBLIC_CLERK_PUBLISHABLE_KEY}
+    >
+      <ConvexProviderWithClerk client={convex} useAuth={useAuth}>
+        <ThemeProvider value={isDarkColorScheme ? DARK_THEME : LIGHT_THEME}>
+          <StatusBar style={isDarkColorScheme ? "light" : "dark"} />
+          <GestureHandlerRootView style=\{{ flex: 1 }}>
+            <Stack>
+              <Stack.Screen name="(drawer)" options=\{{ headerShown: false }} />
+              <Stack.Screen name="(auth)" options=\{{ headerShown: false }} />
+              <Stack.Screen
+                name="modal"
+                options=\{{ title: "Modal", presentation: "modal" }}
+              />
+            </Stack>
+          </GestureHandlerRootView>
+        </ThemeProvider>
+      </ConvexProviderWithClerk>
+    </ClerkProvider>
+    {{else}}
     <ConvexProvider client={convex}>
       <ThemeProvider value={isDarkColorScheme ? DARK_THEME : LIGHT_THEME}>
         <StatusBar style={isDarkColorScheme ? "light" : "dark"} />
@@ -86,6 +113,7 @@ export default function RootLayout() {
         </GestureHandlerRootView>
       </ThemeProvider>
     </ConvexProvider>
+    {{/if}}
     {{else}}
     {{#unless (eq api "none")}}
     <QueryClientProvider client={queryClient}>

package/templates/frontend/native/nativewind/package.json.hbs

@@ -22,6 +22,7 @@
     {{/if}}
     "expo": "^53.0.4",
     "expo-constants": "~17.1.4",
+    "expo-crypto": "~14.1.5",
     "expo-linking": "~7.1.4",
     "expo-navigation-bar": "~4.2.3",
     "expo-router": "~5.0.3",

package/templates/frontend/native/unistyles/app/(drawer)/index.tsx.hbs

@@ -11,9 +11,17 @@ import { useQuery } from "@tanstack/react-query";
 import { trpc } from "@/utils/trpc";
 {{/if}}
 {{#if (eq backend "convex")}}
+{{#if (eq auth "clerk")}}
+import { Link } from "expo-router";
+import { Authenticated, AuthLoading, Unauthenticated, useQuery } from "convex/react";
+import { api } from "@{{ projectName }}/backend/convex/_generated/api";
+import { useUser } from "@clerk/clerk-expo";
+import { SignOutButton } from "@/components/sign-out-button";
+{{else}}
 import { useQuery } from "convex/react";
 import { api } from "@{{ projectName }}/backend/convex/_generated/api";
 {{/if}}
+{{/if}}
 
 export default function Home() {
   {{#if (eq api "orpc")}}
@@ -23,7 +31,13 @@ export default function Home() {
   const healthCheck = useQuery(trpc.healthCheck.queryOptions());
   {{/if}}
   {{#if (eq backend "convex")}}
+  {{#if (eq auth "clerk")}}
+  const { user } = useUser();
   const healthCheck = useQuery(api.healthCheck.get);
+  const privateData = useQuery(api.privateData.get);
+  {{else}}
+  const healthCheck = useQuery(api.healthCheck.get);
+  {{/if}}
   {{/if}}
 
   return (
@@ -105,6 +119,24 @@ export default function Home() {
             {{/unless}}
           {{/if}}
         </View>
+        {{#if (and (eq backend "convex") (eq auth "clerk"))}}
+        <Authenticated>
+          <Text>Hello {user?.emailAddresses[0].emailAddress}</Text>
+          <Text>Private Data: {privateData?.message}</Text>
+          <SignOutButton />
+        </Authenticated>
+        <Unauthenticated>
+          <Link href="/(auth)/sign-in">
+            <Text>Sign in</Text>
+          </Link>
+          <Link href="/(auth)/sign-up">
+            <Text>Sign up</Text>
+          </Link>
+        </Unauthenticated>
+        <AuthLoading>
+          <Text>Loading...</Text>
+        </AuthLoading>
+        {{/if}}
       </ScrollView>
     </Container>
   );

package/templates/frontend/native/unistyles/app/_layout.tsx.hbs

@@ -9,6 +9,11 @@ import { queryClient } from "@/utils/orpc";
 {{/if}}
 {{#if (eq backend "convex")}}
 import { ConvexProvider, ConvexReactClient } from "convex/react";
+{{#if (eq auth "clerk")}}
+import { ClerkProvider, useAuth } from "@clerk/clerk-expo";
+import { ConvexProviderWithClerk } from "convex/react-clerk";
+import { tokenCache } from "@clerk/clerk-expo/token-cache";
+{{/if}}
 {{else}}
   {{#unless (eq api "none")}}
 import { QueryClientProvider } from "@tanstack/react-query";
@@ -34,6 +39,35 @@ export default function RootLayout() {
 
   return (
     {{#if (eq backend "convex")}}
+    {{#if (eq auth "clerk")}}
+    <ClerkProvider
+      tokenCache={tokenCache}
+      publishableKey={process.env.EXPO_PUBLIC_CLERK_PUBLISHABLE_KEY}
+    >
+      <ConvexProviderWithClerk client={convex} useAuth={useAuth}>
+        <GestureHandlerRootView style=\{{ flex: 1 }}>
+          <Stack
+            screenOptions=\{{
+              headerStyle: {
+                backgroundColor: theme.colors.background,
+              },
+              headerTitleStyle: {
+                color: theme.colors.foreground,
+              },
+              headerTintColor: theme.colors.foreground,
+            }}
+          >
+            <Stack.Screen name="(drawer)" options=\{{ headerShown: false }} />
+            <Stack.Screen name="(auth)" options=\{{ headerShown: false }} />
+            <Stack.Screen
+              name="modal"
+              options=\{{ title: "Modal", presentation: "modal" }}
+            />
+          </Stack>
+        </GestureHandlerRootView>
+      </ConvexProviderWithClerk>
+    </ClerkProvider>
+    {{else}}
     <ConvexProvider client={convex}>
       <GestureHandlerRootView style=\{{ flex: 1 }}>
         <Stack
@@ -55,6 +89,7 @@ export default function RootLayout() {
         </Stack>
       </GestureHandlerRootView>
     </ConvexProvider>
+    {{/if}}
     {{else}}
       {{#unless (eq api "none")}}
     <QueryClientProvider client={queryClient}>

package/templates/frontend/native/unistyles/package.json.hbs

@@ -21,6 +21,7 @@
     "babel-plugin-react-compiler": "^19.1.0-rc.2",
     "expo": "^53.0.17",
     "expo-constants": "~17.1.7",
+    "expo-crypto": "~14.1.5",
     "expo-linking": "~7.1.7",
     "expo-router": "~5.1.3",
     "expo-secure-store": "~14.2.3",

package/templates/frontend/nuxt/app/components/Header.vue.hbs

@@ -1,12 +1,12 @@
 <script setup lang="ts">
 import ModeToggle from './ModeToggle.vue'
-{{#if auth}}
+{{#if (eq auth "better-auth")}}
 import UserMenu from './UserMenu.vue'
 {{/if}}
 
 const links = [
     { to: "/", label: "Home" },
-    {{#if auth}}
+    {{#if (or (eq auth "better-auth") (eq auth "clerk"))}}
     { to: "/dashboard", label: "Dashboard" },
     {{/if}}
     {{#if (includes examples "todo")}}
@@ -34,7 +34,7 @@ const links = [
       </nav>
       <div class="flex items-center gap-2">
         <ModeToggle />
-        {{#if auth}}
+        {{#if (eq auth "better-auth")}}
         <UserMenu />
         {{/if}}
       </div>

package/templates/frontend/react/next/src/app/layout.tsx.hbs

@@ -1,7 +1,8 @@
 import type { Metadata } from "next";
 import { Geist, Geist_Mono } from "next/font/google";
 import "../index.css";
-import Providers from "@/components/providers";
+{{#if (eq auth "clerk")}}{{#if (eq backend "convex")}}import { ClerkProvider } from "@clerk/nextjs";
+{{/if}}{{/if}}import Providers from "@/components/providers";
 import Header from "@/components/header";
 
 const geistSans = Geist({
@@ -24,18 +25,25 @@ export default function RootLayout({
 }: Readonly<{
   children: React.ReactNode;
 }>) {
-  return (
-    <html lang="en" suppressHydrationWarning>
-      <body
-        className={`${geistSans.variable} ${geistMono.variable} antialiased`}
-      >
-        <Providers>
-          <div className="grid grid-rows-[auto_1fr] h-svh">
-            <Header />
-            {children}
-          </div>
-        </Providers>
-      </body>
-    </html>
-  );
+  	return (
+		<html lang="en" suppressHydrationWarning>
+			<body
+				className={`${geistSans.variable} ${geistMono.variable} antialiased`}
+			>
+				{{#if (and (eq auth "clerk") (eq backend "convex"))}}<ClerkProvider>
+					<Providers>
+						<div className="grid grid-rows-[auto_1fr] h-svh">
+							<Header />
+							{children}
+						</div>
+					</Providers>
+				</ClerkProvider>{{else}}<Providers>
+					<div className="grid grid-rows-[auto_1fr] h-svh">
+						<Header />
+						{children}
+					</div>
+				</Providers>{{/if}}
+			</body>
+		</html>
+	);
 }

package/templates/frontend/react/next/src/components/providers.tsx.hbs

@@ -1,7 +1,13 @@
 "use client";
 
 {{#if (eq backend "convex")}}
+{{#if (eq auth "clerk")}}
+import { useAuth } from "@clerk/nextjs";
+import { ConvexReactClient } from "convex/react";
+import { ConvexProviderWithClerk } from "convex/react-clerk";
+{{else}}
 import { ConvexProvider, ConvexReactClient } from "convex/react";
+{{/if}}
 {{else}}
 {{#unless (eq api "none")}}
 import { QueryClientProvider } from "@tanstack/react-query";
@@ -34,7 +40,13 @@ export default function Providers({
       disableTransitionOnChange
     >
       {{#if (eq backend "convex")}}
+      {{#if (eq auth "clerk")}}
+      <ConvexProviderWithClerk client={convex} useAuth={useAuth}>
+        {children}
+      </ConvexProviderWithClerk>
+      {{else}}
       <ConvexProvider client={convex}>{children}</ConvexProvider>
+      {{/if}}
       {{else}}
       {{#unless (eq api "none")}}
       <QueryClientProvider client={queryClient}>