create-better-t-stack 3.9.0-pr730.0ee9844 → 3.10.0

package/dist/cli.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { n as createBtsCli } from "./src-DW15ZRe9.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-DW15ZRe9.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-DW15ZRe9.mjs → src-QkFdHtZE.mjs}

@@ -1234,7 +1234,7 @@ const getLatestCLIVersion = () => {
 */
 function isTelemetryEnabled() {
 	const BTS_TELEMETRY_DISABLED = process.env.BTS_TELEMETRY_DISABLED;
-	const BTS_TELEMETRY = "0";
+	const BTS_TELEMETRY = "1";
 	if (BTS_TELEMETRY_DISABLED !== void 0) return BTS_TELEMETRY_DISABLED !== "1";
 	if (BTS_TELEMETRY !== void 0) return BTS_TELEMETRY === "1";
 	return true;
@@ -1242,7 +1242,16 @@ function isTelemetryEnabled() {
 
 //#endregion
 //#region src/utils/analytics.ts
-async function sendConvexEvent(payload) {}
+const CONVEX_INGEST_URL = "https://striped-seahorse-863.convex.site/api/analytics/ingest";
+async function sendConvexEvent(payload) {
+	try {
+		await fetch(CONVEX_INGEST_URL, {
+			method: "POST",
+			headers: { "Content-Type": "application/json" },
+			body: JSON.stringify(payload)
+		});
+	} catch {}
+}
 async function trackProjectCreation(config, disableAnalytics = false) {
 	if (!isTelemetryEnabled() || disableAnalytics) return;
 	const { projectName: _projectName, projectDir: _projectDir, relativePath: _relativePath, ...safeConfig } = config;
@@ -4479,7 +4488,6 @@ async function setupEnvironmentVariables(config) {
 				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";
-					if (hasNative) siteUrlComments += "# npx convex env set NATIVE_SITE_URL http://localhost:8081  # For Expo Web\n";
 					const convexCommands = `# Set Convex environment variables
 # npx convex env set BETTER_AUTH_SECRET=$(openssl rand -base64 32)
 ${siteUrlComments}`;
@@ -4491,11 +4499,6 @@ ${siteUrlComments}`;
 					value: "",
 					condition: true,
 					comment: "Same as CONVEX_URL but ends in .site"
-				}, {
-					key: "NATIVE_SITE_URL",
-					value: "http://localhost:8081",
-					condition: true,
-					comment: "Expo Web URL for authentication"
 				});
 				if (hasWeb) convexBackendVars.push({
 					key: hasNextJs ? "NEXT_PUBLIC_CONVEX_SITE_URL" : "VITE_CONVEX_SITE_URL",
@@ -6147,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() : "";
@@ -6213,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,6 +1,6 @@
 {
   "name": "create-better-t-stack",
-  "version": "3.9.0-pr730.0ee9844",
+  "version": "3.10.0",
   "description": "A modern CLI tool for scaffolding end-to-end type-safe TypeScript projects with best practices and customizable configurations",
   "keywords": [
     "better-auth",
@@ -67,7 +67,7 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@better-t-stack/types": "3.9.0-pr730.0ee9844",
+    "@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.ts.hbs

@@ -1,6 +1,6 @@
 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, crossDomain } from "@convex-dev/better-auth/plugins";
+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";
@@ -21,7 +21,6 @@ const siteUrl = process.env.SITE_URL!;
 {{/if}}
 {{#if (or (includes frontend "native-bare") (includes frontend "native-uniwind") (includes frontend "native-unistyles"))}}
 const nativeAppUrl = process.env.NATIVE_APP_URL || "mybettertapp://";
-const nativeSiteUrl = process.env.NATIVE_SITE_URL || "http://localhost:8081";
 {{/if}}
 
 export const authComponent = createClient<DataModel>(components.betterAuth);
@@ -30,11 +29,11 @@ function createAuth(ctx: GenericCtx<DataModel>) {
   return betterAuth({
     {{#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, nativeSiteUrl, nativeAppUrl],
+    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, nativeSiteUrl, nativeAppUrl],
+    trustedOrigins: [siteUrl, nativeAppUrl],
     {{else if (or (includes frontend "native-bare") (includes frontend "native-uniwind") (includes frontend "native-unistyles"))}}
-    trustedOrigins: [nativeSiteUrl, nativeAppUrl],
+    trustedOrigins: [nativeAppUrl],
     {{else if (or (includes frontend "tanstack-start") (includes frontend "next"))}}
     baseURL: siteUrl,
     trustedOrigins: [siteUrl],
@@ -49,7 +48,6 @@ function createAuth(ctx: GenericCtx<DataModel>) {
     plugins: [
       {{#if (or (includes frontend "native-bare") (includes frontend "native-uniwind") (includes frontend "native-unistyles"))}}
       expo(),
-      crossDomain({ siteUrl: nativeSiteUrl }),
       {{else if (or (includes frontend "tanstack-router") (includes frontend "react-router") (includes frontend "nuxt") (includes frontend "svelte") (includes frontend "solid"))}}
       crossDomain({ siteUrl }),
       {{/if}}

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

@@ -3,14 +3,10 @@ import { authComponent, createAuth } from "./auth";
 
 const http = httpRouter();
 
-{{#if (or (includes frontend "tanstack-start") (includes frontend "next"))}}
-{{#if (or (includes frontend "native-bare") (includes frontend "native-uniwind") (includes frontend "native-unistyles"))}}
+{{#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}}
-{{else}}
-authComponent.registerRoutes(http, createAuth, { cors: true });
-{{/if}}
 
 export default http;

package/templates/auth/better-auth/convex/native/base/lib/auth-client.ts.hbs

@@ -1,22 +1,17 @@
 import { createAuthClient } from "better-auth/react";
-import { convexClient, crossDomainClient } from "@convex-dev/better-auth/client/plugins";
+import { convexClient } from "@convex-dev/better-auth/client/plugins";
 import { expoClient } from "@better-auth/expo/client";
 import Constants from "expo-constants";
 import * as SecureStore from "expo-secure-store";
-import { Platform } from "react-native";
 
 export const authClient = createAuthClient({
   baseURL: process.env.EXPO_PUBLIC_CONVEX_SITE_URL,
   plugins: [
+    expoClient({
+      scheme: Constants.expoConfig?.scheme as string,
+      storagePrefix: Constants.expoConfig?.scheme as string,
+      storage: SecureStore,
+    }),
     convexClient(),
-    ...(Platform.OS === "web"
-      ? [crossDomainClient()]
-      : [
-          expoClient({
-            scheme: Constants.expoConfig?.scheme as string,
-            storagePrefix: Constants.expoConfig?.scheme as string,
-            storage: SecureStore,
-          }),
-        ]),
   ],
 });

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

@@ -19,30 +19,27 @@ export default function UserMenu() {
 
 	return (
 		<DropdownMenu>
-			<DropdownMenuTrigger>
-				<Button variant="outline">{user?.name}</Button>
+			<DropdownMenuTrigger render={<Button variant="outline" />}>
+				{user?.name}
 			</DropdownMenuTrigger>
 			<DropdownMenuContent className="bg-card">
 				<DropdownMenuGroup>
 					<DropdownMenuLabel>My Account</DropdownMenuLabel>
 					<DropdownMenuSeparator />
 					<DropdownMenuItem>{user?.email}</DropdownMenuItem>
-					<DropdownMenuItem>
-						<Button
-							variant="destructive"
-							className="w-full"
-							onClick={() => {
-								authClient.signOut({
-									fetchOptions: {
-										onSuccess: () => {
-											router.push("/dashboard");
-										},
+					<DropdownMenuItem
+						variant="destructive"
+						onClick={() => {
+							authClient.signOut({
+								fetchOptions: {
+									onSuccess: () => {
+										router.push("/dashboard");
 									},
-								});
-							}}
-						>
-							Sign Out
-						</Button>
+								},
+							});
+						}}
+					>
+						Sign Out
 					</DropdownMenuItem>
 				</DropdownMenuGroup>
 			</DropdownMenuContent>

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

@@ -1,3 +1,5 @@
+import { useNavigate } from "@tanstack/react-router";
+
 import {
     DropdownMenu,
     DropdownMenuContent,
@@ -8,43 +10,40 @@ import {
     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>
-                <Button variant="outline">{user?.name}</Button>
+            <DropdownMenuTrigger render={<Button variant="outline" />}>
+                {user?.name}
             </DropdownMenuTrigger>
             <DropdownMenuContent className="bg-card">
                 <DropdownMenuGroup>
                     <DropdownMenuLabel>My Account</DropdownMenuLabel>
                     <DropdownMenuSeparator />
                     <DropdownMenuItem>{user?.email}</DropdownMenuItem>
-                    <DropdownMenuItem>
-                        <Button
-                            variant="destructive"
-                            className="w-full"
-                            onClick={() => {
-                                authClient.signOut({
-                                    fetchOptions: {
-                                        onSuccess: () => {
-                                            navigate({
-                                                to: "/dashboard",
-                                            });
-                                        },
+                    <DropdownMenuItem
+                        variant="destructive"
+                        onClick={() => {
+                            authClient.signOut({
+                                fetchOptions: {
+                                    onSuccess: () => {
+                                        navigate({
+                                            to: "/dashboard",
+                                        });
                                     },
-                                });
-                            }}
-                        >
-                            Sign Out
-                        </Button>
+                                },
+                            });
+                        }}
+                    >
+                        Sign Out
                     </DropdownMenuItem>
                 </DropdownMenuGroup>
             </DropdownMenuContent>

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

@@ -8,39 +8,37 @@ import {
     DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
 import { authClient } from "@/lib/auth-client";
-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 user = useQuery(api.auth.getCurrentUser)
 
     return (
         <DropdownMenu>
-            <DropdownMenuTrigger>
-                <Button variant="outline">{user?.name}</Button>
+            <DropdownMenuTrigger render={<Button variant="outline" />}>
+                {user?.name}
             </DropdownMenuTrigger>
             <DropdownMenuContent className="bg-card">
                 <DropdownMenuGroup>
                     <DropdownMenuLabel>My Account</DropdownMenuLabel>
                     <DropdownMenuSeparator />
                     <DropdownMenuItem>{user?.email}</DropdownMenuItem>
-                    <DropdownMenuItem>
-                        <Button
-                            variant="destructive"
-                            className="w-full"
-                            onClick={() => {
-                                authClient.signOut({
-                                    fetchOptions: {
-                                        onSuccess: () => {
-                                            location.reload();
-                                        },
+                    <DropdownMenuItem
+                        variant="destructive"
+                        onClick={() => {
+                            authClient.signOut({
+                                fetchOptions: {
+                                    onSuccess: () => {
+                                        location.reload();
                                     },
-                                });
-                            }}
-                        >
-                            Sign Out
-                        </Button>
+                                },
+                            });
+                        }}
+                    >
+                        Sign Out
                     </DropdownMenuItem>
                 </DropdownMenuGroup>
             </DropdownMenuContent>

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

@@ -1,11 +1,15 @@
-import { createFileRoute } from "@tanstack/react-router";
-import { handler } from "@/lib/auth-server";
+import { auth } from '@{{projectName}}/auth'
+import { createFileRoute } from '@tanstack/react-router'
 
-export const Route = createFileRoute("/api/auth/$")({
+export const Route = createFileRoute('/api/auth/$')({
   server: {
     handlers: {
-      GET: ({ request }) => handler(request),
-      POST: ({ request }) => handler(request),
+      GET: ({ request }) => {
+        return auth.handler(request)
+      },
+      POST: ({ request }) => {
+        return auth.handler(request)
+      },
     },
   },
-});
+})

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

@@ -1,3 +1,6 @@
+import Link from "next/link";
+import { useRouter } from "next/navigation";
+
 import {
   DropdownMenu,
   DropdownMenuContent,
@@ -8,10 +11,9 @@ import {
   DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
 import { authClient } from "@/lib/auth-client";
+
 import { Button } from "./ui/button";
 import { Skeleton } from "./ui/skeleton";
-import { useRouter } from "next/navigation";
-import Link from "next/link";
 
 export default function UserMenu() {
   const router = useRouter();
@@ -23,38 +25,35 @@ export default function UserMenu() {
 
   if (!session) {
     return (
-      <Button variant="outline">
-        <Link href="/login">Sign In</Link>
-      </Button>
+      <Link href="/login">
+        <Button variant="outline">Sign In</Button>
+      </Link>
     );
   }
 
   return (
     <DropdownMenu>
-      <DropdownMenuTrigger>
-        <Button variant="outline">{session.user.name}</Button>
+      <DropdownMenuTrigger render={<Button variant="outline" />}>
+        {session.user.name}
       </DropdownMenuTrigger>
       <DropdownMenuContent className="bg-card">
         <DropdownMenuGroup>
           <DropdownMenuLabel>My Account</DropdownMenuLabel>
           <DropdownMenuSeparator />
           <DropdownMenuItem>{session.user.email}</DropdownMenuItem>
-          <DropdownMenuItem>
-            <Button
-              variant="destructive"
-              className="w-full"
-              onClick={() => {
-                authClient.signOut({
-                  fetchOptions: {
-                    onSuccess: () => {
-                      router.push("/");
-                    },
+          <DropdownMenuItem
+            variant="destructive"
+            onClick={() => {
+              authClient.signOut({
+                fetchOptions: {
+                  onSuccess: () => {
+                    router.push("/");
                   },
-                });
-              }}
-            >
-              Sign Out
-            </Button>
+                },
+              });
+            }}
+          >
+            Sign Out
           </DropdownMenuItem>
         </DropdownMenuGroup>
       </DropdownMenuContent>

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

@@ -1,3 +1,5 @@
+import { Link, useNavigate } from "react-router";
+
 import {
   DropdownMenu,
   DropdownMenuContent,
@@ -8,10 +10,9 @@ import {
   DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
 import { authClient } from "@/lib/auth-client";
-import { useNavigate } from "react-router";
+
 import { Button } from "./ui/button";
 import { Skeleton } from "./ui/skeleton";
-import { Link } from "react-router";
 
 export default function UserMenu() {
   const navigate = useNavigate();
@@ -23,38 +24,35 @@ export default function UserMenu() {
 
   if (!session) {
     return (
-      <Button variant="outline">
-        <Link to="/login">Sign In</Link>
-      </Button>
+      <Link to="/login">
+        <Button variant="outline">Sign In</Button>
+      </Link>
     );
   }
 
   return (
     <DropdownMenu>
-      <DropdownMenuTrigger>
-        <Button variant="outline">{session.user.name}</Button>
+      <DropdownMenuTrigger render={<Button variant="outline" />}>
+        {session.user.name}
       </DropdownMenuTrigger>
       <DropdownMenuContent className="bg-card">
         <DropdownMenuGroup>
           <DropdownMenuLabel>My Account</DropdownMenuLabel>
           <DropdownMenuSeparator />
           <DropdownMenuItem>{session.user.email}</DropdownMenuItem>
-          <DropdownMenuItem>
-            <Button
-              variant="destructive"
-              className="w-full"
-              onClick={() => {
-                authClient.signOut({
-                  fetchOptions: {
-                    onSuccess: () => {
-                      navigate("/");
-                    },
+          <DropdownMenuItem
+            variant="destructive"
+            onClick={() => {
+              authClient.signOut({
+                fetchOptions: {
+                  onSuccess: () => {
+                    navigate("/");
                   },
-                });
-              }}
-            >
-              Sign Out
-            </Button>
+                },
+              });
+            }}
+          >
+            Sign Out
           </DropdownMenuItem>
         </DropdownMenuGroup>
       </DropdownMenuContent>

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

@@ -1,3 +1,5 @@
+import { Link, useNavigate } from "@tanstack/react-router";
+
 import {
   DropdownMenu,
   DropdownMenuContent,
@@ -8,10 +10,9 @@ import {
   DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
 import { authClient } from "@/lib/auth-client";
-import { useNavigate } from "@tanstack/react-router";
+
 import { Button } from "./ui/button";
 import { Skeleton } from "./ui/skeleton";
-import { Link } from "@tanstack/react-router";
 
 export default function UserMenu() {
   const navigate = useNavigate();
@@ -23,40 +24,37 @@ export default function UserMenu() {
 
   if (!session) {
     return (
-      <Button variant="outline">
-        <Link to="/login">Sign In</Link>
-      </Button>
+      <Link to="/login">
+        <Button variant="outline">Sign In</Button>
+      </Link>
     );
   }
 
   return (
     <DropdownMenu>
-      <DropdownMenuTrigger>
-        <Button variant="outline">{session.user.name}</Button>
+      <DropdownMenuTrigger render={<Button variant="outline" />}>
+        {session.user.name}
       </DropdownMenuTrigger>
       <DropdownMenuContent className="bg-card">
         <DropdownMenuGroup>
           <DropdownMenuLabel>My Account</DropdownMenuLabel>
           <DropdownMenuSeparator />
           <DropdownMenuItem>{session.user.email}</DropdownMenuItem>
-          <DropdownMenuItem>
-            <Button
-              variant="destructive"
-              className="w-full"
-              onClick={() => {
-                authClient.signOut({
-                  fetchOptions: {
-                    onSuccess: () => {
-                      navigate({
-                        to: "/",
-                      });
-                    },
+          <DropdownMenuItem
+            variant="destructive"
+            onClick={() => {
+              authClient.signOut({
+                fetchOptions: {
+                  onSuccess: () => {
+                    navigate({
+                      to: "/",
+                    });
                   },
-                });
-              }}
-            >
-              Sign Out
-            </Button>
+                },
+              });
+            }}
+          >
+            Sign Out
           </DropdownMenuItem>
         </DropdownMenuGroup>
       </DropdownMenuContent>

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

@@ -1,3 +1,5 @@
+import { Link, useNavigate } from "@tanstack/react-router";
+
 import {
   DropdownMenu,
   DropdownMenuContent,
@@ -8,10 +10,9 @@ import {
   DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
 import { authClient } from "@/lib/auth-client";
-import { useNavigate } from "@tanstack/react-router";
+
 import { Button } from "./ui/button";
 import { Skeleton } from "./ui/skeleton";
-import { Link } from "@tanstack/react-router";
 
 export default function UserMenu() {
   const navigate = useNavigate();
@@ -23,40 +24,37 @@ export default function UserMenu() {
 
   if (!session) {
     return (
-      <Button variant="outline">
-        <Link to="/login">Sign In</Link>
-      </Button>
+      <Link to="/login">
+        <Button variant="outline">Sign In</Button>
+      </Link>
     );
   }
 
   return (
     <DropdownMenu>
-      <DropdownMenuTrigger>
-        <Button variant="outline">{session.user.name}</Button>
+      <DropdownMenuTrigger render={<Button variant="outline" />}>
+        {session.user.name}
       </DropdownMenuTrigger>
       <DropdownMenuContent className="bg-card">
         <DropdownMenuGroup>
           <DropdownMenuLabel>My Account</DropdownMenuLabel>
           <DropdownMenuSeparator />
           <DropdownMenuItem>{session.user.email}</DropdownMenuItem>
-          <DropdownMenuItem>
-            <Button
-              variant="destructive"
-              className="w-full"
-              onClick={() => {
-                authClient.signOut({
-                  fetchOptions: {
-                    onSuccess: () => {
-                      navigate({
-                        to: "/",
-                      });
-                    },
+          <DropdownMenuItem
+            variant="destructive"
+            onClick={() => {
+              authClient.signOut({
+                fetchOptions: {
+                  onSuccess: () => {
+                    navigate({
+                      to: "/",
+                    });
                   },
-                });
-              }}
-            >
-              Sign Out
-            </Button>
+                },
+              });
+            }}
+          >
+            Sign Out
           </DropdownMenuItem>
         </DropdownMenuGroup>
       </DropdownMenuContent>

package/templates/backend/convex/packages/backend/convex/README.md

@@ -6,7 +6,7 @@ See https://docs.convex.dev/functions for more.
 A query function that takes two arguments looks like:
 
 ```ts
-// functions.js
+// convex/myFunctions.ts
 import { query } from "./_generated/server";
 import { v } from "convex/values";
 
@@ -36,7 +36,7 @@ export const myQueryFunction = query({
 Using this query function in a React component looks like:
 
 ```ts
-const data = useQuery(api.functions.myQueryFunction, {
+const data = useQuery(api.myFunctions.myQueryFunction, {
   first: 10,
   second: "hello",
 });
@@ -45,7 +45,7 @@ const data = useQuery(api.functions.myQueryFunction, {
 A mutation function looks like:
 
 ```ts
-// functions.js
+// convex/myFunctions.ts
 import { mutation } from "./_generated/server";
 import { v } from "convex/values";
 
@@ -73,7 +73,7 @@ export const myMutationFunction = mutation({
 Using this mutation function in a React component looks like:
 
 ```ts
-const mutation = useMutation(api.functions.myMutationFunction);
+const mutation = useMutation(api.myFunctions.myMutationFunction);
 function handleButtonPress() {
   // fire and forget, the most common way to use mutations
   mutation({ first: "Hello!", second: "me" });

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

@@ -1,7 +1,7 @@
 {
   /* This TypeScript project config describes the environment that
    * Convex functions run in and is used to typecheck them.
-   * You can modify it, but some settings required to use Convex.
+   * You can modify it, but some settings are required to use Convex.
    */
   "compilerOptions": {
     /* These settings are not required by Convex and can be modified. */

package/templates/frontend/react/next/src/components/mode-toggle.tsx.hbs

@@ -16,12 +16,10 @@ export function ModeToggle() {
 
   return (
     <DropdownMenu>
-      <DropdownMenuTrigger asChild>
-        <Button variant="outline" size="icon">
-          <Sun className="h-[1.2rem] w-[1.2rem] rotate-0 scale-100 transition-all dark:-rotate-90 dark:scale-0" />
-          <Moon className="absolute h-[1.2rem] w-[1.2rem] rotate-90 scale-0 transition-all dark:rotate-0 dark:scale-100" />
-          <span className="sr-only">Toggle theme</span>
-        </Button>
+      <DropdownMenuTrigger render={<Button variant="outline" size="icon" />}>
+        <Sun className="h-[1.2rem] w-[1.2rem] rotate-0 scale-100 transition-all dark:-rotate-90 dark:scale-0" />
+        <Moon className="absolute h-[1.2rem] w-[1.2rem] rotate-90 scale-0 transition-all dark:rotate-0 dark:scale-100" />
+        <span className="sr-only">Toggle theme</span>
       </DropdownMenuTrigger>
       <DropdownMenuContent align="end">
         <DropdownMenuItem onClick={() => setTheme("light")}>

package/templates/frontend/react/react-router/src/components/mode-toggle.tsx.hbs

@@ -14,12 +14,10 @@ export function ModeToggle() {
 
   return (
     <DropdownMenu>
-      <DropdownMenuTrigger>
-        <Button variant="outline" size="icon">
-          <Sun className="h-[1.2rem] w-[1.2rem] scale-100 rotate-0 transition-all dark:scale-0 dark:-rotate-90" />
-          <Moon className="absolute h-[1.2rem] w-[1.2rem] scale-0 rotate-90 transition-all dark:scale-100 dark:rotate-0" />
-          <span className="sr-only">Toggle theme</span>
-        </Button>
+      <DropdownMenuTrigger render={<Button variant="outline" size="icon" />}>
+        <Sun className="h-[1.2rem] w-[1.2rem] scale-100 rotate-0 transition-all dark:scale-0 dark:-rotate-90" />
+        <Moon className="absolute h-[1.2rem] w-[1.2rem] scale-0 rotate-90 transition-all dark:scale-100 dark:rotate-0" />
+        <span className="sr-only">Toggle theme</span>
       </DropdownMenuTrigger>
       <DropdownMenuContent align="end">
         <DropdownMenuItem onClick={() => setTheme("light")}>Light</DropdownMenuItem>

package/templates/frontend/react/tanstack-router/src/components/mode-toggle.tsx.hbs

@@ -14,12 +14,10 @@ export function ModeToggle() {
 
   return (
     <DropdownMenu>
-      <DropdownMenuTrigger>
-        <Button variant="outline" size="icon">
-          <Sun className="h-[1.2rem] w-[1.2rem] scale-100 rotate-0 transition-all dark:scale-0 dark:-rotate-90" />
-          <Moon className="absolute h-[1.2rem] w-[1.2rem] scale-0 rotate-90 transition-all dark:scale-100 dark:rotate-0" />
-          <span className="sr-only">Toggle theme</span>
-        </Button>
+      <DropdownMenuTrigger render={<Button variant="outline" size="icon" />}>
+        <Sun className="h-[1.2rem] w-[1.2rem] scale-100 rotate-0 transition-all dark:scale-0 dark:-rotate-90" />
+        <Moon className="absolute h-[1.2rem] w-[1.2rem] scale-0 rotate-90 transition-all dark:scale-100 dark:rotate-0" />
+        <span className="sr-only">Toggle theme</span>
       </DropdownMenuTrigger>
       <DropdownMenuContent align="end">
         <DropdownMenuItem onClick={() => setTheme("light")}>Light</DropdownMenuItem>