create-better-t-stack 3.1.8-canary.932e5243 → 3.2.0

package/dist/cli.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { createBtsCli } from "./src-EpWSiOd8.js";
+import { createBtsCli } from "./src-JAo0_3IZ.js";
 
 //#region src/cli.ts
 createBtsCli().run();

package/dist/index.js

@@ -1,4 +1,4 @@
 #!/usr/bin/env node
-import { builder, createBtsCli, docs, init, router, sponsors } from "./src-EpWSiOd8.js";
+import { builder, createBtsCli, docs, init, router, sponsors } from "./src-JAo0_3IZ.js";
 
 export { builder, createBtsCli, docs, init, router, sponsors };

package/dist/{src-EpWSiOd8.js → src-JAo0_3IZ.js}

@@ -1390,7 +1390,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;
@@ -1398,8 +1398,8 @@ function isTelemetryEnabled() {
 
 //#endregion
 //#region src/utils/analytics.ts
-const POSTHOG_API_KEY = "random";
-const POSTHOG_HOST = "random";
+const POSTHOG_API_KEY = "phc_8ZUxEwwfKMajJLvxz1daGd931dYbQrwKNficBmsdIrs";
+const POSTHOG_HOST = "https://us.i.posthog.com";
 function generateSessionId() {
 	const rand = Math.random().toString(36).slice(2);
 	return `cli_${Date.now().toString(36)}${rand}`;
@@ -4674,7 +4674,8 @@ async function setupEnvironmentVariables(config) {
 	const hasNuxt = frontend.includes("nuxt");
 	const hasSvelte = frontend.includes("svelte");
 	const hasSolid = frontend.includes("solid");
-	if (hasReactRouter || hasTanStackRouter || hasTanStackStart || hasNextJs || hasNuxt || hasSolid || hasSvelte) {
+	const hasWebFrontend$1 = hasReactRouter || hasTanStackRouter || hasTanStackStart || hasNextJs || hasNuxt || hasSolid || hasSvelte;
+	if (hasWebFrontend$1) {
 		const clientDir = path.join(projectDir, "apps/web");
 		if (await fs.pathExists(clientDir)) {
 			const baseVar = getClientServerVar(frontend, backend);
@@ -4747,6 +4748,11 @@ async function setupEnvironmentVariables(config) {
 				value: "",
 				condition: true
 			});
+			if (backend === "convex" && auth === "better-auth") nativeVars.push({
+				key: "EXPO_PUBLIC_CONVEX_SITE_URL",
+				value: "https://<YOUR_CONVEX_URL>",
+				condition: true
+			});
 			await addEnvVariablesToFile(path.join(nativeDir, ".env"), nativeVars);
 		}
 	}
@@ -4755,12 +4761,23 @@ async function setupEnvironmentVariables(config) {
 			const convexBackendDir = path.join(projectDir, "packages/backend");
 			if (await fs.pathExists(convexBackendDir)) {
 				const envLocalPath = path.join(convexBackendDir, ".env.local");
-				if (!await fs.pathExists(envLocalPath) || !(await fs.readFile(envLocalPath, "utf8")).includes("npx convex env set")) await fs.appendFile(envLocalPath, `# Set Convex environment variables
+				const hasNative = frontend.includes("native-nativewind") || frontend.includes("native-unistyles");
+				const hasWeb = hasWebFrontend$1;
+				if (!await fs.pathExists(envLocalPath) || !(await fs.readFile(envLocalPath, "utf8")).includes("npx convex env set")) {
+					const convexCommands = `# Set Convex environment variables
 # npx convex env set BETTER_AUTH_SECRET=$(openssl rand -base64 32)
-# npx convex env set SITE_URL http://localhost:3001
-
-`);
-				await addEnvVariablesToFile(envLocalPath, [{
+${hasWeb ? "# npx convex env set SITE_URL http://localhost:3001\n" : ""}
+`;
+					await fs.appendFile(envLocalPath, convexCommands);
+				}
+				const convexBackendVars = [];
+				if (hasNative) convexBackendVars.push({
+					key: "EXPO_PUBLIC_CONVEX_SITE_URL",
+					value: "",
+					condition: true,
+					comment: "Same as CONVEX_URL but ends in .site"
+				});
+				if (hasWeb) convexBackendVars.push({
 					key: hasNextJs ? "NEXT_PUBLIC_CONVEX_SITE_URL" : "VITE_CONVEX_SITE_URL",
 					value: "",
 					condition: true,
@@ -4769,7 +4786,8 @@ async function setupEnvironmentVariables(config) {
 					key: "SITE_URL",
 					value: "http://localhost:3001",
 					condition: true
-				}]);
+				});
+				await addEnvVariablesToFile(envLocalPath, convexBackendVars);
 			}
 		}
 		return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-better-t-stack",
-  "version": "3.1.8-canary.932e5243",
+  "version": "3.2.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/auth/better-auth/convex/backend/convex/auth.ts.hbs

@@ -2,56 +2,69 @@ import { createClient, type GenericCtx } from "@convex-dev/better-auth";
 {{#if (or (includes frontend "native-nativewind") (includes frontend "native-unistyles"))}}
 import { convex } from "@convex-dev/better-auth/plugins";
 import { expo } from "@better-auth/expo";
-{{else if (or (includes frontend "tanstack-start") (includes frontend "next"))}}
-import { convex } from "@convex-dev/better-auth/plugins";
 {{else}}
-import { convex, crossDomain } from "@convex-dev/better-auth/plugins";
+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";
 
+{{#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"))}}
 const siteUrl = process.env.SITE_URL!;
+{{/if}}
+{{#if (or (includes frontend "native-nativewind") (includes frontend "native-unistyles"))}}
+const nativeAppUrl = process.env.NATIVE_APP_URL || "mybettertapp://";
+{{/if}}
 
 export const authComponent = createClient<DataModel>(components.betterAuth);
 
-export const createAuth = (
-    ctx: GenericCtx<DataModel>,
-    { optionsOnly } = { optionsOnly: false },
-) => {
-    return betterAuth({
-        logger: {
-            disabled: optionsOnly,
-        },
-        {{#if (or (includes frontend "native-nativewind") (includes frontend "native-unistyles"))}}
-        trustedOrigins: ["mybettertapp://"],
-        {{else if (or (includes frontend "tanstack-start") (includes frontend "next"))}}
-        baseURL: siteUrl,
-        trustedOrigins: [siteUrl],
-        {{else}}
-        trustedOrigins: [siteUrl],
-        {{/if}}
-        database: authComponent.adapter(ctx),
-        emailAndPassword: {
-            enabled: true,
-            requireEmailVerification: false,
-        },
-        plugins: [
-            {{#if (or (includes frontend "native-nativewind") (includes frontend "native-unistyles"))}}
-            expo(),
-            {{/if}}
-            {{#unless (or (includes frontend "tanstack-start") (includes frontend "next"))}}
-            crossDomain({ siteUrl }),
-            {{/unless}}
-            convex(),
-        ],
-    });
-};
+function createAuth(
+  ctx: GenericCtx<DataModel>,
+  { optionsOnly }: { optionsOnly?: boolean } = { optionsOnly: false }
+) {
+  return betterAuth({
+    logger: {
+      disabled: optionsOnly,
+    },
+    {{#if (and (or (includes frontend "native-nativewind") (includes frontend "native-unistyles")) (or (includes frontend "tanstack-start") (includes frontend "next")))}}
+    baseURL: siteUrl,
+    trustedOrigins: [siteUrl, nativeAppUrl],
+    {{else if (or (includes frontend "native-nativewind") (includes frontend "native-unistyles"))}}
+    trustedOrigins: [nativeAppUrl],
+    {{else if (or (includes frontend "tanstack-start") (includes frontend "next"))}}
+    baseURL: siteUrl,
+    trustedOrigins: [siteUrl],
+    {{else}}
+    trustedOrigins: [siteUrl],
+    {{/if}}
+    database: authComponent.adapter(ctx),
+    emailAndPassword: {
+      enabled: true,
+      requireEmailVerification: false,
+    },
+    plugins: [
+      {{#if (or (includes frontend "native-nativewind") (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"))}}
+      crossDomain({ siteUrl }),
+      {{/if}}
+      convex(),
+    ],
+  });
+}
+
+export { createAuth };
 
 export const getCurrentUser = query({
-    args: {},
-    handler: async (ctx) => {
-        return authComponent.getAuthUser(ctx);
-    },
-});
+  args: {},
+  returns: v.any(),
+  handler: async function (ctx, args) {
+    return authComponent.getAuthUser(ctx);
+  },
+});

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

@@ -3,7 +3,7 @@ import { authComponent, createAuth } from "./auth";
 
 const http = httpRouter();
 
-{{#if (or (includes frontend "tanstack-start") (includes frontend "next"))}}
+{{#if (or (includes frontend "tanstack-start") (includes frontend "next") (includes frontend "native-nativewind") (includes frontend "native-unistyles"))}}
 authComponent.registerRoutes(http, createAuth);
 {{else}}
 authComponent.registerRoutes(http, createAuth, { cors: true });

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

@@ -8,171 +8,171 @@ import { orpc } from "@/utils/orpc";
 import { useQuery } from "@tanstack/react-query";
 import { trpc } from "@/utils/trpc";
 {{/if}}
-{{#if (eq backend "convex")}}
-{{#if (eq auth "clerk")}}
+{{#if (and (eq backend "convex") (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}}
-{{#if (eq auth "better-auth")}}
+{{else if (and (eq backend "convex") (eq auth "better-auth"))}}
 import { useConvexAuth, useQuery } from "convex/react";
 import { api } from "@{{ projectName }}/backend/convex/_generated/api";
 import { authClient } from "@/lib/auth-client";
 import { SignIn } from "@/components/sign-in";
 import { SignUp } from "@/components/sign-up";
-{{else}}
+{{else if (eq backend "convex")}}
 import { useQuery } from "convex/react";
 import { api } from "@{{ projectName }}/backend/convex/_generated/api";
 {{/if}}
-{{/if}}
-{{/if}}
 
 export default function Home() {
-{{#if (eq api "orpc")}}
-const healthCheck = useQuery(orpc.healthCheck.queryOptions());
-{{/if}}
-{{#if (eq api "trpc")}}
-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}}
-{{#if (eq auth "better-auth")}}
-const healthCheck = useQuery(api.healthCheck.get);
-const { isAuthenticated } = useConvexAuth();
-const user = useQuery(api.auth.getCurrentUser, isAuthenticated ? {} : "skip");
-{{else}}
-const healthCheck = useQuery(api.healthCheck.get);
-{{/if}}
-{{/if}}
-{{/if}}
+  {{#if (eq api "orpc")}}
+  const healthCheck = useQuery(orpc.healthCheck.queryOptions());
+  {{/if}}
+  {{#if (eq api "trpc")}}
+  const healthCheck = useQuery(trpc.healthCheck.queryOptions());
+  {{/if}}
+  {{#if (and (eq backend "convex") (eq auth "clerk"))}}
+  const { user } = useUser();
+  const healthCheck = useQuery(api.healthCheck.get);
+  const privateData = useQuery(api.privateData.get);
+  {{else if (and (eq backend "convex") (eq auth "better-auth"))}}
+  const healthCheck = useQuery(api.healthCheck.get);
+  const { isAuthenticated } = useConvexAuth();
+  const user = useQuery(api.auth.getCurrentUser, isAuthenticated ? {} : "skip");
+  {{else if (eq backend "convex")}}
+  const healthCheck = useQuery(api.healthCheck.get);
+  {{/if}}
 
-return (
-<Container>
-  <ScrollView className="flex-1">
-    <View className="px-4">
-      <Text className="font-mono text-foreground text-3xl font-bold mb-4">
-        BETTER T STACK
-      </Text>
-      <View className="bg-card border border-border rounded-xl p-6 mb-6 shadow-sm">
-        {{#if (eq backend "convex")}}
-        {{#unless (eq auth "better-auth")}}
-        <View className="flex-row items-center gap-3">
-          <View className={`h-3 w-3 rounded-full ${ healthCheck ? "bg-green-500" : "bg-orange-500" }`} />
-          <View className="flex-1">
-            <Text className="text-sm font-medium text-card-foreground">
-              Convex
-            </Text>
-            <Text className="text-xs text-muted-foreground">
-              {healthCheck === undefined
-              ? "Checking connection..."
-              : healthCheck === "OK"
-              ? "All systems operational"
-              : "Service unavailable"}
-            </Text>
+  return (
+    <Container>
+      <ScrollView className="flex-1">
+        <View className="px-4">
+          <Text className="font-mono text-foreground text-3xl font-bold mb-4">
+            BETTER T STACK
+          </Text>
+
+          {{#unless (and (eq backend "convex") (eq auth "better-auth"))}}
+          <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"
+                }`}
+              />
+              <View className="flex-1">
+                <Text className="text-sm font-medium text-card-foreground">
+                  Convex
+                </Text>
+                <Text className="text-muted-foreground">
+                  {
+                    healthCheck === undefined
+                      ? "Checking..."
+                      : healthCheck === "OK"
+                      ? "Connected to API"
+                      : "API Disconnected"
+                  }
+                </Text>
+              </View>
+            </View>
+            {{else}}
+            {{#unless (eq api "none")}}
+            <View className="flex-row items-center gap-3">
+              <View
+                className={`h-3 w-3 rounded-full ${
+                  healthCheck.data ? "bg-green-500" : "bg-orange-500"
+                }`}
+              />
+            <View className="flex-1">
+              <Text className="text-sm font-medium text-card-foreground">
+                {{#if (eq api "orpc")}}ORPC{{else}}TRPC{{/if}}
+              </Text>
+              <Text className="text-xs text-muted-foreground">
+                {healthCheck.isLoading
+                  ? "Checking connection..."
+                  : healthCheck.data
+                  ? "All systems operational"
+                  : "Service unavailable"}
+              </Text>
+            </View>
+            </View>
+            {{/unless}}
+            {{/if}}
           </View>
-        </View>
-        {{/unless}}
-        {{else}}
-        {{#unless (eq api "none")}}
-        <View className="flex-row items-center gap-3">
-          <View className={`h-3 w-3 rounded-full ${ healthCheck.data ? "bg-green-500" : "bg-orange-500" }`} />
-          <View className="flex-1">
-            <Text className="text-sm font-medium text-card-foreground">
-              {{#if (eq api "orpc")}}
-              ORPC
-              {{/if}}
-              {{#if (eq api "trpc")}}
-              TRPC
-              {{/if}}
-            </Text>
-            <Text className="text-xs text-muted-foreground">
-              {{#if (eq api "orpc")}}
-              {healthCheck.isLoading
-              ? "Checking connection..."
-              : healthCheck.data
-              ? "All systems operational"
-              : "Service unavailable"}
-              {{/if}}
-              {{#if (eq api "trpc")}}
-              {healthCheck.isLoading
-              ? "Checking connection..."
-              : healthCheck.data
-              ? "All systems operational"
-              : "Service unavailable"}
-              {{/if}}
+          {{/unless}}
+
+          {{#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}}
+
+          {{#if (and (eq backend "convex") (eq auth "better-auth"))}}
+          {user ? (
+            <View className="mb-6 p-4 bg-card rounded-lg border border-border">
+              <View className="flex-row justify-between items-center mb-2">
+                <Text className="text-foreground text-base">
+                  Welcome,{" "}
+                  <Text className="font-medium">{user.name}</Text>
+                </Text>
+              </View>
+              <Text className="text-muted-foreground text-sm mb-4">
+                {user.email}
+              </Text>
+              <TouchableOpacity
+                className="bg-destructive py-2 px-4 rounded-md self-start"
+                onPress={() => {
+                  authClient.signOut();
+                }}
+              >
+                <Text className="text-white font-medium">Sign Out</Text>
+              </TouchableOpacity>
+            </View>
+          ) : null}
+          <View className="mb-6 rounded-lg border border-border p-4">
+            <Text className="mb-3 font-medium text-foreground">
+              API Status
             </Text>
+            <View className="flex-row items-center gap-2">
+              <View
+                className={`h-3 w-3 rounded-full ${
+                  healthCheck ? "bg-green-500" : "bg-red-500"
+                }`}
+              />
+              <Text className="text-muted-foreground">
+                {
+                  healthCheck === undefined
+                    ? "Checking..."
+                    : healthCheck === "OK"
+                    ? "Connected to API"
+                    : "API Disconnected"
+                }
+              </Text>
+            </View>
           </View>
+          {!user && (
+            <>
+              <SignIn />
+              <SignUp />
+            </>
+          )}
+          {{/if}}
         </View>
-        {{/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}}
-      {{#if (and (eq backend "convex") (eq auth "better-auth"))}}
-      {user ? (
-      <View className="mb-6 p-4 bg-card rounded-lg border border-border">
-        <View className="flex-row justify-between items-center mb-2">
-          <Text className="text-foreground text-base">
-            Welcome,{" "}
-            <Text className="font-medium">{user.name}</Text>
-          </Text>
-        </View>
-        <Text className="text-muted-foreground text-sm mb-4">
-          {user.email}
-        </Text>
-
-        <TouchableOpacity className="bg-destructive py-2 px-4 rounded-md self-start" onPress={()=> {
-          authClient.signOut();
-          }}
-          >
-          <Text className="text-white font-medium">Sign Out</Text>
-        </TouchableOpacity>
-      </View>
-      ) : null}
-      <View className="mb-6 rounded-lg border border-border p-4">
-        <Text className="mb-3 font-medium text-foreground">API Status</Text>
-        <View className="flex-row items-center gap-2">
-          <View className={`h-3 w-3 rounded-full ${healthCheck ? "bg-green-500" : "bg-red-500" }`} />
-          <Text className="text-muted-foreground">
-            {healthCheck === undefined
-            ? "Checking..."
-            : healthCheck === "OK"
-            ? "Connected to API"
-            : "API Disconnected"}
-          </Text>
-        </View>
-      </View>
-      {!user && (
-      <>
-        <SignIn />
-        <SignUp />
-      </>
-      )}
-      {{/if}}
-    </View>
-  </ScrollView>
-</Container>
-);
+      </ScrollView>
+    </Container>
+  );
 }

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

@@ -10,48 +10,40 @@ import { orpc } from "@/utils/orpc";
 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}}
-    {{#if (eq auth "better-auth")}}
-      import { useConvexAuth, useQuery } from "convex/react";
-      import { api } from "@{{ projectName }}/backend/convex/_generated/api";
-      import { authClient } from "@/lib/auth-client";
-      import { SignIn } from "@/components/sign-in";
-      import { SignUp } from "@/components/sign-up";
-    {{else}}
-      import { useQuery } from "convex/react";
-      import { api } from "@{{ projectName }}/backend/convex/_generated/api";
-    {{/if}}
-  {{/if}}
+{{#if (and (eq backend "convex") (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 if (and (eq backend "convex") (eq auth "better-auth"))}}
+import { useConvexAuth, useQuery } from "convex/react";
+import { api } from "@{{ projectName }}/backend/convex/_generated/api";
+import { authClient } from "@/lib/auth-client";
+import { SignIn } from "@/components/sign-in";
+import { SignUp } from "@/components/sign-up";
+{{else if (eq backend "convex")}}
+import { useQuery } from "convex/react";
+import { api } from "@{{ projectName }}/backend/convex/_generated/api";
 {{/if}}
 
 export default function Home() {
   {{#if (eq api "orpc")}}
-    const healthCheck = useQuery(orpc.healthCheck.queryOptions());
+  const healthCheck = useQuery(orpc.healthCheck.queryOptions());
   {{/if}}
   {{#if (eq api "trpc")}}
-    const healthCheck = useQuery(trpc.healthCheck.queryOptions());
+  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}}
-      {{#if (eq auth "better-auth")}}
-        const healthCheck = useQuery(api.healthCheck.get);
-        const { isAuthenticated } = useConvexAuth();
-        const user = useQuery(api.auth.getCurrentUser, isAuthenticated ? {} : "skip");
-      {{else}}
-        const healthCheck = useQuery(api.healthCheck.get);
-      {{/if}}
-    {{/if}}
+  {{#if (and (eq backend "convex") (eq auth "clerk"))}}
+  const { user } = useUser();
+  const healthCheck = useQuery(api.healthCheck.get);
+  const privateData = useQuery(api.privateData.get);
+  {{else if (and (eq backend "convex") (eq auth "better-auth"))}}
+  const healthCheck = useQuery(api.healthCheck.get);
+  const { isAuthenticated } = useConvexAuth();
+  const user = useQuery(api.auth.getCurrentUser, isAuthenticated ? {} : "skip");
+  {{else if (eq backend "convex")}}
+  const healthCheck = useQuery(api.healthCheck.get);
   {{/if}}
 
   return (
@@ -60,7 +52,11 @@ export default function Home() {
         contentContainerStyle={styles.container}
         showsVerticalScrollIndicator={false}
       >
-        <Text style={styles.heroTitle}>BETTER T STACK</Text>
+        <Text style={styles.heroTitle}>
+          BETTER T STACK
+        </Text>
+
+        {{#unless (and (eq backend "convex") (eq auth "better-auth"))}}
         <View style={styles.statusCard}>
           <View style={styles.statusHeader}>
             <Text style={styles.statusTitle}>System Status</Text>
@@ -70,123 +66,126 @@ export default function Home() {
           </View>
           {{#if (eq backend "convex")}}
             {{#unless (eq auth "better-auth")}}
-              <View style={styles.statusRow}>
-                <View
-                  style={[
-                    styles.statusDot,
-                    healthCheck === "OK"
-                      ? styles.statusDotSuccess
-                      : styles.statusDotWarning,
-                  ]}
-                />
-                <View style={styles.statusContent}>
-                  <Text style={styles.statusLabel}>Convex</Text>
-                  <Text style={styles.statusDescription}>
-                    {healthCheck === undefined
-                      ? "Checking connection..."
-                      : healthCheck === "OK"
-                      ? "All systems operational"
-                      : "Service unavailable"}
-                  </Text>
-                </View>
+            <View style={styles.statusRow}>
+              <View
+                style={[
+                  styles.statusDot,
+                  healthCheck === "OK"
+                    ? styles.statusDotSuccess
+                    : styles.statusDotWarning,
+                ]}
+              />
+              <View style={styles.statusContent}>
+                <Text style={styles.statusLabel}>Convex</Text>
+                <Text style={styles.statusDescription}>
+                  {healthCheck === undefined
+                    ? "Checking connection..."
+                    : healthCheck === "OK"
+                    ? "Connected to API"
+                    : "API Disconnected"}
+                </Text>
               </View>
+            </View>
             {{/unless}}
           {{else}}
             {{#unless (eq api "none")}}
-              <View style={styles.statusRow}>
-                <View
-                  style={[
-                    styles.statusDot,
-                    healthCheck.data
-                      ? styles.statusDotSuccess
-                      : styles.statusDotWarning,
-                  ]}
-                />
-                <View style={styles.statusContent}>
-                  <Text style={styles.statusLabel}>
-                    {{#if (eq api "orpc")}}ORPC{{/if}}
-                    {{#if (eq api "trpc")}}TRPC{{/if}}
-                  </Text>
-                  <Text style={styles.statusDescription}>
-                    {(healthCheck.isLoading)
-                      ? "Checking connection..."
-                      : healthCheck.data
-                      ? "All systems operational"
-                      : "Service unavailable"}
-                  </Text>
-                </View>
-              </View>
-            {{/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}}
-        {{#if (and (eq backend "convex") (eq auth "better-auth"))}}
-          {user ? (
-            <View style={styles.userCard}>
-              <View style={styles.userHeader}>
-                <Text style={styles.userWelcome}>
-                  Welcome,{" "}
-                  <Text style={styles.userName}>{user.name}</Text>
-                </Text>
-              </View>
-              <Text style={styles.userEmail}>{user.email}</Text>
-              <TouchableOpacity
-                style={styles.signOutButton}
-                onPress={() => {
-                  authClient.signOut();
-                }}
-              >
-                <Text style={styles.signOutText}>Sign Out</Text>
-              </TouchableOpacity>
-            </View>
-          ) : null}
-          <View style={styles.apiStatusCard}>
-            <Text style={styles.apiStatusTitle}>API Status</Text>
-            <View style={styles.apiStatusRow}>
+            <View style={styles.statusRow}>
               <View
                 style={[
                   styles.statusDot,
-                  healthCheck === "OK"
+                  healthCheck.data
                     ? styles.statusDotSuccess
                     : styles.statusDotWarning,
                 ]}
               />
-              <Text style={styles.apiStatusText}>
-                {healthCheck === undefined
-                  ? "Checking..."
-                  : healthCheck === "OK"
-                  ? "Connected to API"
-                  : "API Disconnected"}
+              <View style={styles.statusContent}>
+                <Text style={styles.statusLabel}>
+                  {{#if (eq api "orpc")}}ORPC{{/if}}
+                  {{#if (eq api "trpc")}}TRPC{{/if}}
+                </Text>
+                <Text style={styles.statusDescription}>
+                  {healthCheck.isLoading
+                    ? "Checking connection..."
+                    : healthCheck.data
+                    ? "Connected to API"
+                    : "API Disconnected"}
+                </Text>
+              </View>
+            </View>
+            {{/unless}}
+          {{/if}}
+        </View>
+        {{/unless}}
+
+        {{#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}}
+
+        {{#if (and (eq backend "convex") (eq auth "better-auth"))}}
+        {user ? (
+          <View style={styles.userCard}>
+            <View style={styles.userHeader}>
+              <Text style={styles.userWelcome}>
+                Welcome,{" "}
+                <Text style={styles.userName}>{user.name}</Text>
               </Text>
             </View>
+            <Text style={styles.userEmail}>{user.email}</Text>
+            <TouchableOpacity
+              style={styles.signOutButton}
+              onPress={() => {
+                authClient.signOut();
+              }}
+            >
+              <Text style={styles.signOutText}>Sign Out</Text>
+            </TouchableOpacity>
           </View>
-          {!user && (
-            <>
-              <SignIn />
-              <SignUp />
-            </>
-          )}
+        ) : null}
+        <View style={styles.apiStatusCard}>
+          <Text style={styles.apiStatusTitle}>API Status</Text>
+          <View style={styles.apiStatusRow}>
+            <View
+              style={[
+                styles.statusDot,
+                healthCheck === "OK"
+                  ? styles.statusDotSuccess
+                  : styles.statusDotWarning,
+              ]}
+            />
+            <Text style={styles.apiStatusText}>
+              {healthCheck === undefined
+                ? "Checking..."
+                : healthCheck === "OK"
+                ? "Connected to API"
+                : "API Disconnected"}
+            </Text>
+          </View>
+        </View>
+        {!user && (
+          <>
+            <SignIn />
+            <SignUp />
+          </>
+        )}
         {{/if}}
       </ScrollView>
     </Container>

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

@@ -85,7 +85,7 @@ export default function RootLayout() {
               color: theme.colors.foreground,
             },
             headerTintColor: theme.colors.foreground,
-          }}}
+          }}
         >
           <Stack.Screen name="(drawer)" options=\{{ headerShown: false }} />
           <Stack.Screen

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

@@ -20,7 +20,7 @@
       },
       "edgeToEdgeEnabled": true,
       "predictiveBackGestureEnabled": false,
-      "package": "com.anonymous.mybettertapp6"
+      "package": "com.anonymous.mybettertapp"
     },
     "web": {
       "output": "static",