create-better-t-stack 3.9.0 → 3.10.0

package/README.md

@@ -38,7 +38,7 @@ Follow the prompts to configure your project or use the `--yes` flag for default
 | **Runtime**              | • Bun<br>• Node.js<br>• Cloudflare Workers<br>• None                                                                                                                                                                                                       |
 | **Database**             | • SQLite<br>• PostgreSQL<br>• MySQL<br>• MongoDB<br>• None                                                                                                                                                                                                 |
 | **ORM**                  | • Drizzle (TypeScript-first)<br>• Prisma (feature-rich)<br>• Mongoose (for MongoDB)<br>• None                                                                                                                                                              |
-| **Database Setup**       | • Turso (SQLite)<br>• Cloudflare D1 (SQLite)<br>• Neon (PostgreSQL)<br>• Supabase (PostgreSQL)<br>• Prisma Postgres<br>• MongoDB Atlas<br>• None (manual setup)                                                                    |
+| **Database Setup**       | • Turso (SQLite)<br>• Cloudflare D1 (SQLite)<br>• Neon (PostgreSQL)<br>• Supabase (PostgreSQL)<br>• Prisma Postgres<br>• MongoDB Atlas<br>• None (manual setup)                                                                                            |
 | **Authentication**       | Better-Auth (email/password, with more options coming soon)                                                                                                                                                                                                |
 | **Styling**              | Tailwind CSS with shadcn/ui components                                                                                                                                                                                                                     |
 | **Addons**               | • PWA support<br>• Tauri (desktop applications)<br>• Starlight (documentation site)<br>• Biome (linting and formatting)<br>• Husky (Git hooks)<br>• Turborepo (optimized builds)                                                                           |
@@ -77,6 +77,7 @@ Options:
 ## Telemetry
 
 This CLI collects anonymous usage data to help improve the tool. The data collected includes:
+
 - Configuration options selected
 - CLI version
 - Node.js version

package/dist/cli.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { n as createBtsCli } from "./src-DLvUK0Qf.mjs";
+import { n as createBtsCli } from "./src-QkFdHtZE.mjs";
 
 //#region src/cli.ts
 createBtsCli().run();

package/dist/index.mjs

@@ -1,4 +1,4 @@
 #!/usr/bin/env node
-import { a as router, i as init, n as createBtsCli, o as sponsors, r as docs, t as builder } from "./src-DLvUK0Qf.mjs";
+import { a as router, i as init, n as createBtsCli, o as sponsors, r as docs, t as builder } from "./src-QkFdHtZE.mjs";
 
 export { builder, createBtsCli, docs, init, router, sponsors };

package/dist/{src-DLvUK0Qf.mjs → src-QkFdHtZE.mjs}

@@ -95,7 +95,7 @@ const dependencyVersionMap = {
 	"@vite-pwa/assets-generator": "^1.0.0",
 	"@tauri-apps/cli": "^2.4.0",
 	"@biomejs/biome": "^2.2.0",
-	oxlint: "^1.32.0",
+	oxlint: "^1.34.0",
 	oxfmt: "^0.19.0",
 	husky: "^9.1.7",
 	"lint-staged": "^16.1.2",
@@ -137,7 +137,7 @@ const dependencyVersionMap = {
 	"convex-svelte": "^0.0.12",
 	"convex-nuxt": "0.1.5",
 	"convex-vue": "^0.1.5",
-	"@convex-dev/better-auth": "^0.9.7",
+	"@convex-dev/better-auth": "^0.10.4",
 	"@tanstack/svelte-query": "^5.85.3",
 	"@tanstack/svelte-query-devtools": "^5.85.3",
 	"@tanstack/vue-query-devtools": "^5.90.2",
@@ -4204,12 +4204,12 @@ async function setupAuth(config) {
 				if (convexBackendDirExists) {
 					await addPackageDependency({
 						dependencies: ["better-auth", "@convex-dev/better-auth"],
-						customDependencies: { "better-auth": "1.3.34" },
+						customDependencies: { "better-auth": "1.4.7" },
 						projectDir: convexBackendDir
 					});
 					if (hasNativeForBA) await addPackageDependency({
 						dependencies: ["@better-auth/expo"],
-						customDependencies: { "@better-auth/expo": "1.3.34" },
+						customDependencies: { "@better-auth/expo": "1.4.7" },
 						projectDir: convexBackendDir
 					});
 				}
@@ -4219,17 +4219,17 @@ async function setupAuth(config) {
 					const hasViteReactOther = frontend.some((f) => ["tanstack-router", "react-router"].includes(f));
 					if (hasNextJs) await addPackageDependency({
 						dependencies: ["better-auth", "@convex-dev/better-auth"],
-						customDependencies: { "better-auth": "1.3.34" },
+						customDependencies: { "better-auth": "1.4.7" },
 						projectDir: clientDir
 					});
 					else if (hasTanStackStart) await addPackageDependency({
 						dependencies: ["better-auth", "@convex-dev/better-auth"],
-						customDependencies: { "better-auth": "1.3.34" },
+						customDependencies: { "better-auth": "1.4.7" },
 						projectDir: clientDir
 					});
 					else if (hasViteReactOther) await addPackageDependency({
 						dependencies: ["better-auth", "@convex-dev/better-auth"],
-						customDependencies: { "better-auth": "1.3.34" },
+						customDependencies: { "better-auth": "1.4.7" },
 						projectDir: clientDir
 					});
 				}
@@ -4243,8 +4243,8 @@ async function setupAuth(config) {
 						"@convex-dev/better-auth"
 					],
 					customDependencies: {
-						"better-auth": "1.3.34",
-						"@better-auth/expo": "1.3.34"
+						"better-auth": "1.4.7",
+						"@better-auth/expo": "1.4.7"
 					},
 					projectDir: nativeDir
 				});
@@ -4486,10 +4486,11 @@ async function setupEnvironmentVariables(config) {
 				const hasNative = frontend.includes("native-bare") || frontend.includes("native-uniwind") || frontend.includes("native-unistyles");
 				const hasWeb = hasWebFrontend$1;
 				if (!await fs.pathExists(envLocalPath) || !(await fs.readFile(envLocalPath, "utf8")).includes("npx convex env set")) {
+					let siteUrlComments = "";
+					if (hasWeb) siteUrlComments += "# npx convex env set SITE_URL http://localhost:3001\n";
 					const convexCommands = `# Set Convex environment variables
 # npx convex env set BETTER_AUTH_SECRET=$(openssl rand -base64 32)
-${hasWeb ? "# npx convex env set SITE_URL http://localhost:3001\n" : ""}
-`;
+${siteUrlComments}`;
 					await fs.appendFile(envLocalPath, convexCommands);
 				}
 				const convexBackendVars = [];
@@ -4507,7 +4508,8 @@ ${hasWeb ? "# npx convex env set SITE_URL http://localhost:3001\n" : ""}
 				}, {
 					key: "SITE_URL",
 					value: "http://localhost:3001",
-					condition: true
+					condition: true,
+					comment: "Web app URL for authentication"
 				});
 				await addEnvVariablesToFile(envLocalPath, convexBackendVars);
 			}
@@ -6148,7 +6150,7 @@ async function displayPostInstallInstructions(config) {
 	const tauriInstructions = addons?.includes("tauri") ? getTauriInstructions(runCmd) : "";
 	const huskyInstructions = hasHusky ? getHuskyInstructions(runCmd) : "";
 	const lintingInstructions = hasLinting ? getLintingInstructions(runCmd) : "";
-	const nativeInstructions = (frontend?.includes("native-bare") || frontend?.includes("native-uniwind") || frontend?.includes("native-unistyles")) && backend !== "none" ? getNativeInstructions(isConvex, isBackendSelf, frontend || []) : "";
+	const nativeInstructions = (frontend?.includes("native-bare") || frontend?.includes("native-uniwind") || frontend?.includes("native-unistyles")) && backend !== "none" ? getNativeInstructions(isConvex, isBackendSelf, frontend || [], runCmd) : "";
 	const pwaInstructions = addons?.includes("pwa") && frontend?.includes("react-router") ? getPwaInstructions() : "";
 	const starlightInstructions = addons?.includes("starlight") ? getStarlightInstructions(runCmd) : "";
 	const clerkInstructions = isConvex && config.auth === "clerk" ? getClerkInstructions() : "";
@@ -6214,13 +6216,14 @@ async function displayPostInstallInstructions(config) {
 	output += pc.cyan("https://github.com/AmanVarshney01/create-better-t-stack");
 	consola$1.box(output);
 }
-function getNativeInstructions(isConvex, isBackendSelf, _frontend) {
+function getNativeInstructions(isConvex, isBackendSelf, frontend, runCmd) {
 	const envVar = isConvex ? "EXPO_PUBLIC_CONVEX_URL" : "EXPO_PUBLIC_SERVER_URL";
 	const exampleUrl = isConvex ? "https://<YOUR_CONVEX_URL>" : isBackendSelf ? "http://<YOUR_LOCAL_IP>:3001" : "http://<YOUR_LOCAL_IP>:3000";
 	const envFileName = ".env";
 	const ipNote = isConvex ? "your Convex deployment URL (find after running 'dev:setup')" : "your local IP address";
 	let instructions = `${pc.yellow("NOTE:")} For Expo connectivity issues, update\n   apps/native/${envFileName} with ${ipNote}:\n   ${`${envVar}=${exampleUrl}`}\n`;
 	if (isConvex) instructions += `\n${pc.yellow("IMPORTANT:")} When using local development with Convex and native apps,\n   ensure you use your local IP address instead of localhost or 127.0.0.1\n   for proper connectivity.\n`;
+	if (frontend.includes("native-unistyles")) instructions += `\n${pc.yellow("NOTE:")} Unistyles requires a development build.\n   cd apps/native and run ${runCmd} android or ${runCmd} ios\n`;
 	return instructions;
 }
 function getHuskyInstructions(runCmd) {

package/package.json

@@ -1,52 +1,61 @@
 {
   "name": "create-better-t-stack",
-  "version": "3.9.0",
+  "version": "3.10.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/cli.mjs"
-  },
-  "files": [
-    "templates",
-    "dist"
-  ],
   "keywords": [
+    "better-auth",
     "better-t-stack",
-    "typescript",
+    "biome",
     "boilerplate",
-    "starter",
     "cli",
-    "turborepo",
-    "trpc",
-    "better-auth",
-    "monorepo",
-    "fullstack",
-    "type-safety",
-    "react",
-    "react-native",
+    "drizzle",
+    "elysia",
     "expo",
+    "fullstack",
     "hono",
-    "elysia",
-    "drizzle",
+    "monorepo",
     "prisma",
-    "tanstack",
-    "tailwind",
-    "shadcn",
     "pwa",
+    "react",
+    "react-native",
+    "shadcn",
+    "starter",
+    "tailwind",
+    "tanstack",
     "tauri",
-    "biome"
+    "trpc",
+    "turborepo",
+    "type-safety",
+    "typescript"
   ],
+  "homepage": "https://better-t-stack.dev/",
+  "license": "MIT",
+  "author": "Aman Varshney",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/AmanVarshney01/create-better-t-stack.git",
     "directory": "apps/cli"
   },
+  "bin": {
+    "create-better-t-stack": "dist/cli.mjs"
+  },
+  "files": [
+    "dist",
+    "templates"
+  ],
+  "type": "module",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.mts",
+      "import": "./dist/index.mjs"
+    },
+    "./cli": {
+      "import": "./dist/cli.mjs"
+    }
+  },
   "publishConfig": {
     "access": "public"
   },
-  "homepage": "https://better-t-stack.dev/",
   "scripts": {
     "build": "tsdown --publint",
     "dev": "tsdown --watch",
@@ -57,17 +66,8 @@
     "test:ci": "bun run build && AGENT=1 bun test --bail=5",
     "prepublishOnly": "npm run build"
   },
-  "exports": {
-    ".": {
-      "types": "./dist/index.d.mts",
-      "import": "./dist/index.mjs"
-    },
-    "./cli": {
-      "import": "./dist/cli.mjs"
-    }
-  },
   "dependencies": {
-    "@better-t-stack/types": "^3.9.0",
+    "@better-t-stack/types": "^3.10.0",
     "@clack/prompts": "^1.0.0-alpha.8",
     "@orpc/server": "^1.12.2",
     "consola": "^3.4.2",

package/templates/auth/better-auth/convex/backend/convex/auth.config.ts.hbs

@@ -1,8 +1,6 @@
+import { getAuthConfigProvider } from "@convex-dev/better-auth/auth-config";
+import type { AuthConfig } from "convex/server";
+
 export default {
-    providers: [
-        {
-            domain: process.env.CONVEX_SITE_URL,
-            applicationID: "convex",
-        },
-    ],
-};
+  providers: [getAuthConfigProvider()],
+} satisfies AuthConfig;

package/templates/auth/better-auth/convex/backend/convex/auth.ts.hbs

@@ -2,19 +2,21 @@ import { createClient, type GenericCtx } from "@convex-dev/better-auth";
 {{#if (or (includes frontend "native-bare") (includes frontend "native-uniwind") (includes frontend "native-unistyles"))}}
 import { convex } from "@convex-dev/better-auth/plugins";
 import { expo } from "@better-auth/expo";
+{{else if (or (includes frontend "tanstack-router") (includes frontend "react-router") (includes frontend "nuxt") (includes frontend "svelte") (includes frontend "solid"))}}
+import { convex, crossDomain } from "@convex-dev/better-auth/plugins";
 {{else}}
 import { convex } from "@convex-dev/better-auth/plugins";
 {{/if}}
-{{#if (or (includes frontend "tanstack-router") (includes frontend "react-router") (includes frontend "nuxt") (includes frontend "svelte") (includes frontend "solid"))}}
-import { crossDomain } from "@convex-dev/better-auth/plugins";
-{{/if}}
 import { components } from "./_generated/api";
 import { DataModel } from "./_generated/dataModel";
 import { query } from "./_generated/server";
 import { betterAuth } from "better-auth";
 import { v } from "convex/values";
+import authConfig from "./auth.config";
 
-{{#if (or (includes frontend "tanstack-start") (includes frontend "next") (includes frontend "tanstack-router") (includes frontend "react-router") (includes frontend "nuxt") (includes frontend "svelte") (includes frontend "solid"))}}
+{{#if (or (includes frontend "tanstack-start") (includes frontend "next"))}}
+const siteUrl = process.env.SITE_URL!;
+{{else if (or (includes frontend "tanstack-router") (includes frontend "react-router") (includes frontend "nuxt") (includes frontend "svelte") (includes frontend "solid"))}}
 const siteUrl = process.env.SITE_URL!;
 {{/if}}
 {{#if (or (includes frontend "native-bare") (includes frontend "native-uniwind") (includes frontend "native-unistyles"))}}
@@ -23,23 +25,19 @@ const nativeAppUrl = process.env.NATIVE_APP_URL || "mybettertapp://";
 
 export const authComponent = createClient<DataModel>(components.betterAuth);
 
-function createAuth(
-  ctx: GenericCtx<DataModel>,
-  { optionsOnly }: { optionsOnly?: boolean } = { optionsOnly: false }
-) {
+function createAuth(ctx: GenericCtx<DataModel>) {
   return betterAuth({
-    logger: {
-      disabled: optionsOnly,
-    },
     {{#if (and (or (includes frontend "native-bare") (includes frontend "native-uniwind") (includes frontend "native-unistyles")) (or (includes frontend "tanstack-start") (includes frontend "next")))}}
     baseURL: siteUrl,
     trustedOrigins: [siteUrl, nativeAppUrl],
+    {{else if (and (or (includes frontend "native-bare") (includes frontend "native-uniwind") (includes frontend "native-unistyles")) (or (includes frontend "tanstack-router") (includes frontend "react-router") (includes frontend "nuxt") (includes frontend "svelte") (includes frontend "solid")))}}
+    trustedOrigins: [siteUrl, nativeAppUrl],
     {{else if (or (includes frontend "native-bare") (includes frontend "native-uniwind") (includes frontend "native-unistyles"))}}
     trustedOrigins: [nativeAppUrl],
     {{else if (or (includes frontend "tanstack-start") (includes frontend "next"))}}
     baseURL: siteUrl,
     trustedOrigins: [siteUrl],
-    {{else}}
+    {{else if (or (includes frontend "tanstack-router") (includes frontend "react-router") (includes frontend "nuxt") (includes frontend "svelte") (includes frontend "solid"))}}
     trustedOrigins: [siteUrl],
     {{/if}}
     database: authComponent.adapter(ctx),
@@ -50,11 +48,13 @@ function createAuth(
     plugins: [
       {{#if (or (includes frontend "native-bare") (includes frontend "native-uniwind") (includes frontend "native-unistyles"))}}
       expo(),
-      {{/if}}
-      {{#if (or (includes frontend "tanstack-router") (includes frontend "react-router") (includes frontend "nuxt") (includes frontend "svelte") (includes frontend "solid"))}}
+      {{else if (or (includes frontend "tanstack-router") (includes frontend "react-router") (includes frontend "nuxt") (includes frontend "svelte") (includes frontend "solid"))}}
       crossDomain({ siteUrl }),
       {{/if}}
-      convex(),
+      convex({
+        authConfig,
+        jwksRotateOnTokenGenerationError: true,
+      }),
     ],
   });
 }
@@ -67,4 +67,4 @@ export const getCurrentUser = query({
   handler: async function (ctx, args) {
     return authComponent.getAuthUser(ctx);
   },
-});
+});

package/templates/auth/better-auth/convex/backend/convex/http.ts.hbs

@@ -3,10 +3,10 @@ import { authComponent, createAuth } from "./auth";
 
 const http = httpRouter();
 
-{{#if (or (includes frontend "tanstack-start") (includes frontend "next") (includes frontend "native-bare") (includes frontend "native-uniwind") (includes frontend "native-unistyles"))}}
-authComponent.registerRoutes(http, createAuth);
-{{else}}
+{{#if (or (includes frontend "tanstack-router") (includes frontend "react-router") (includes frontend "nuxt") (includes frontend "svelte") (includes frontend "solid"))}}
 authComponent.registerRoutes(http, createAuth, { cors: true });
+{{else}}
+authComponent.registerRoutes(http, createAuth);
 {{/if}}
 
-export default http;
+export default http;

package/templates/auth/better-auth/convex/web/react/next/src/app/api/auth/[...all]/route.ts.hbs

@@ -1,3 +1,3 @@
-import { nextJsHandler } from "@convex-dev/better-auth/nextjs";
+import { handler } from "@/lib/auth-server";
 
-export const { GET, POST } = nextJsHandler();
+export const { GET, POST } = handler;

package/templates/auth/better-auth/convex/web/react/next/src/components/user-menu.tsx.hbs

@@ -1,6 +1,7 @@
 import {
 	DropdownMenu,
 	DropdownMenuContent,
+	DropdownMenuGroup,
 	DropdownMenuItem,
 	DropdownMenuLabel,
 	DropdownMenuSeparator,
@@ -18,17 +19,16 @@ export default function UserMenu() {
 
 	return (
 		<DropdownMenu>
-			<DropdownMenuTrigger asChild>
-				<Button variant="outline">{user?.name}</Button>
+			<DropdownMenuTrigger render={<Button variant="outline" />}>
+				{user?.name}
 			</DropdownMenuTrigger>
 			<DropdownMenuContent className="bg-card">
-				<DropdownMenuLabel>My Account</DropdownMenuLabel>
-				<DropdownMenuSeparator />
-				<DropdownMenuItem>{user?.email}</DropdownMenuItem>
-				<DropdownMenuItem asChild>
-					<Button
+				<DropdownMenuGroup>
+					<DropdownMenuLabel>My Account</DropdownMenuLabel>
+					<DropdownMenuSeparator />
+					<DropdownMenuItem>{user?.email}</DropdownMenuItem>
+					<DropdownMenuItem
 						variant="destructive"
-						className="w-full"
 						onClick={() => {
 							authClient.signOut({
 								fetchOptions: {
@@ -40,8 +40,8 @@ export default function UserMenu() {
 						}}
 					>
 						Sign Out
-					</Button>
-				</DropdownMenuItem>
+					</DropdownMenuItem>
+				</DropdownMenuGroup>
 			</DropdownMenuContent>
 		</DropdownMenu>
 	);

package/templates/auth/better-auth/convex/web/react/next/src/lib/auth-server.ts.hbs

@@ -1,6 +1,14 @@
-import { createAuth } from "@{{projectName}}/backend/convex/auth";
-import { getToken as getTokenNextjs } from "@convex-dev/better-auth/nextjs";
+import { convexBetterAuthNextJs } from "@convex-dev/better-auth/nextjs";
 
-export const getToken = () => {
-    return getTokenNextjs(createAuth);
-};
+export const {
+  handler,
+  preloadAuthQuery,
+  isAuthenticated,
+  getToken,
+  fetchAuthQuery,
+  fetchAuthMutation,
+  fetchAuthAction,
+} = convexBetterAuthNextJs({
+  convexUrl: process.env.NEXT_PUBLIC_CONVEX_URL!,
+  convexSiteUrl: process.env.NEXT_PUBLIC_CONVEX_SITE_URL!,
+});

package/templates/auth/better-auth/convex/web/react/tanstack-router/src/components/user-menu.tsx.hbs

@@ -1,34 +1,36 @@
+import { useNavigate } from "@tanstack/react-router";
+
 import {
     DropdownMenu,
     DropdownMenuContent,
+    DropdownMenuGroup,
     DropdownMenuItem,
     DropdownMenuLabel,
     DropdownMenuSeparator,
     DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
 import { authClient } from "@/lib/auth-client";
-import { useNavigate } from "@tanstack/react-router";
-import { Button } from "./ui/button";
 import { useQuery } from "convex/react";
 import { api } from "@{{projectName}}/backend/convex/_generated/api";
 
+import { Button } from "./ui/button";
+
 export default function UserMenu() {
     const navigate = useNavigate();
     const user = useQuery(api.auth.getCurrentUser)
 
     return (
         <DropdownMenu>
-            <DropdownMenuTrigger asChild>
-                <Button variant="outline">{user?.name}</Button>
+            <DropdownMenuTrigger render={<Button variant="outline" />}>
+                {user?.name}
             </DropdownMenuTrigger>
             <DropdownMenuContent className="bg-card">
-                <DropdownMenuLabel>My Account</DropdownMenuLabel>
-                <DropdownMenuSeparator />
-                <DropdownMenuItem>{user?.email}</DropdownMenuItem>
-                <DropdownMenuItem asChild>
-                    <Button
+                <DropdownMenuGroup>
+                    <DropdownMenuLabel>My Account</DropdownMenuLabel>
+                    <DropdownMenuSeparator />
+                    <DropdownMenuItem>{user?.email}</DropdownMenuItem>
+                    <DropdownMenuItem
                         variant="destructive"
-                        className="w-full"
                         onClick={() => {
                             authClient.signOut({
                                 fetchOptions: {
@@ -42,8 +44,8 @@ export default function UserMenu() {
                         }}
                     >
                         Sign Out
-                    </Button>
-                </DropdownMenuItem>
+                    </DropdownMenuItem>
+                </DropdownMenuGroup>
             </DropdownMenuContent>
         </DropdownMenu>
     );

package/templates/auth/better-auth/convex/web/react/tanstack-start/src/components/user-menu.tsx.hbs

@@ -1,49 +1,46 @@
 import {
     DropdownMenu,
     DropdownMenuContent,
+    DropdownMenuGroup,
     DropdownMenuItem,
     DropdownMenuLabel,
     DropdownMenuSeparator,
     DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
 import { authClient } from "@/lib/auth-client";
-import { useNavigate } from "@tanstack/react-router";
-import { Button } from "./ui/button";
 import { useQuery } from "convex/react";
 import { api } from "@{{projectName}}/backend/convex/_generated/api";
 
+import { Button } from "./ui/button";
+
 export default function UserMenu() {
-    const navigate = useNavigate();
     const user = useQuery(api.auth.getCurrentUser)
 
     return (
         <DropdownMenu>
-            <DropdownMenuTrigger asChild>
-                <Button variant="outline">{user?.name}</Button>
+            <DropdownMenuTrigger render={<Button variant="outline" />}>
+                {user?.name}
             </DropdownMenuTrigger>
             <DropdownMenuContent className="bg-card">
-                <DropdownMenuLabel>My Account</DropdownMenuLabel>
-                <DropdownMenuSeparator />
-                <DropdownMenuItem>{user?.email}</DropdownMenuItem>
-                <DropdownMenuItem asChild>
-                    <Button
+                <DropdownMenuGroup>
+                    <DropdownMenuLabel>My Account</DropdownMenuLabel>
+                    <DropdownMenuSeparator />
+                    <DropdownMenuItem>{user?.email}</DropdownMenuItem>
+                    <DropdownMenuItem
                         variant="destructive"
-                        className="w-full"
                         onClick={() => {
                             authClient.signOut({
                                 fetchOptions: {
                                     onSuccess: () => {
-                                        navigate({
-                                            to: "/dashboard",
-                                        });
+                                        location.reload();
                                     },
                                 },
                             });
                         }}
                     >
                         Sign Out
-                    </Button>
-                </DropdownMenuItem>
+                    </DropdownMenuItem>
+                </DropdownMenuGroup>
             </DropdownMenuContent>
         </DropdownMenu>
     );

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

@@ -1,6 +1,12 @@
-import { createAuth } from "@{{projectName}}/backend/convex/auth";
-import { setupFetchClient } from "@convex-dev/better-auth/react-start";
-import { getCookie } from "@tanstack/react-start/server";
+import { convexBetterAuthReactStart } from "@convex-dev/better-auth/react-start";
 
-export const { fetchQuery, fetchMutation, fetchAction } =
-	await setupFetchClient(createAuth, getCookie);
+export const {
+  handler,
+  getToken,
+  fetchAuthQuery,
+  fetchAuthMutation,
+  fetchAuthAction,
+} = convexBetterAuthReactStart({
+  convexUrl: process.env.VITE_CONVEX_URL!,
+  convexSiteUrl: process.env.VITE_CONVEX_SITE_URL!,
+});

package/templates/auth/better-auth/convex/web/react/tanstack-start/src/routes/api/auth/$.ts.hbs

@@ -1,11 +1,11 @@
-import { reactStartHandler } from "@convex-dev/better-auth/react-start";
 import { createFileRoute } from "@tanstack/react-router";
+import { handler } from "@/lib/auth-server";
 
 export const Route = createFileRoute("/api/auth/$")({
   server: {
     handlers: {
-      GET: ({ request }) => reactStartHandler(request),
-      POST: ({ request }) => reactStartHandler(request),
+      GET: ({ request }) => handler(request),
+      POST: ({ request }) => handler(request),
     },
   },
-});
+});

package/templates/auth/better-auth/fullstack/tanstack-start/src/routes/api/auth/$.ts.hbs

@@ -12,4 +12,4 @@ export const Route = createFileRoute('/api/auth/$')({
       },
     },
   },
-})
+})