create-better-t-stack 3.12.5 → 3.12.7

package/dist/cli.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { r as createBtsCli } from "./src-D3EHRs6z.mjs";
+import { r as createBtsCli } from "./src-DNjxspj9.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 docs, n as create, o as sponsors, r as createBtsCli, t as builder } from "./src-D3EHRs6z.mjs";
+import { a as router, i as docs, n as create, o as sponsors, r as createBtsCli, t as builder } from "./src-DNjxspj9.mjs";
 
 export { builder, create, createBtsCli, docs, router, sponsors };

package/dist/{src-D3EHRs6z.mjs → src-DNjxspj9.mjs}

@@ -100,7 +100,7 @@ const dependencyVersionMap = {
 	husky: "^9.1.7",
 	"lint-staged": "^16.1.2",
 	tsx: "^4.19.2",
-	"@types/node": "^22.13.11",
+	"@types/node": "^22.13.14",
 	"@types/bun": "^1.3.4",
 	"@elysiajs/node": "^1.3.1",
 	"@elysiajs/cors": "^1.3.3",
@@ -116,13 +116,14 @@ const dependencyVersionMap = {
 	fastify: "^5.3.3",
 	"@fastify/cors": "^11.0.1",
 	turbo: "^2.6.3",
-	ai: "^5.0.49",
-	"@ai-sdk/google": "^2.0.51",
-	"@ai-sdk/vue": "^2.0.49",
-	"@ai-sdk/svelte": "^3.0.39",
-	"@ai-sdk/react": "^2.0.39",
+	ai: "^6.0.3",
+	"@ai-sdk/google": "^3.0.1",
+	"@ai-sdk/vue": "^3.0.3",
+	"@ai-sdk/svelte": "^4.0.3",
+	"@ai-sdk/react": "^3.0.3",
+	"@ai-sdk/devtools": "^0.0.2",
 	streamdown: "^1.6.10",
-	shiki: "^3.12.2",
+	shiki: "^3.20.0",
 	"@orpc/server": "^1.12.2",
 	"@orpc/client": "^1.12.2",
 	"@orpc/openapi": "^1.12.2",
@@ -292,8 +293,10 @@ function allowedApisForFrontends(frontends = []) {
 	if (includesNuxt || includesSvelte || includesSolid) return ["orpc", "none"];
 	return base;
 }
-function isExampleTodoAllowed(backend, database) {
-	return !(backend !== "convex" && backend !== "none" && database === "none");
+function isExampleTodoAllowed(backend, database, api) {
+	if (backend === "convex") return true;
+	if (database === "none" || api === "none") return false;
+	return true;
 }
 function isExampleAIAllowed(backend, frontends = []) {
 	if (frontends.includes("solid")) return false;
@@ -343,10 +346,13 @@ function validatePaymentsCompatibility(payments, auth, _backend, frontends = [])
 		if (web.length === 0 && frontends.length > 0) exitWithError("Polar payments requires a web frontend or no frontend. Please select a web frontend or choose a different payments provider.");
 	}
 }
-function validateExamplesCompatibility(examples, backend, database, frontend) {
+function validateExamplesCompatibility(examples, backend, database, frontend, api) {
 	const examplesArr = examples ?? [];
 	if (examplesArr.length === 0 || examplesArr.includes("none")) return;
-	if (examplesArr.includes("todo") && backend !== "convex" && backend !== "none" && database === "none") exitWithError("The 'todo' example requires a database if a backend (other than Convex) is present. Cannot use --examples todo when database is 'none' and a backend is selected.");
+	if (examplesArr.includes("todo") && backend !== "convex") {
+		if (database === "none") exitWithError("The 'todo' example requires a database. Cannot use --examples todo when database is 'none'.");
+		if (api === "none") exitWithError("The 'todo' example requires an API layer (tRPC or oRPC). Cannot use --examples todo when api is 'none'.");
+	}
 	if (examplesArr.includes("ai") && (frontend ?? []).includes("solid")) exitWithError("The 'ai' example is not compatible with the Solid frontend.");
 	if (examplesArr.includes("ai") && backend === "convex") {
 		const frontendArr = frontend ?? [];
@@ -578,6 +584,7 @@ async function getAuthChoice(auth, backend, frontend) {
 			label: "Clerk",
 			hint: "More than auth, Complete User Management"
 		});
+		if (options.length === 0) return "none";
 		options.push({
 			value: "none",
 			label: "None",
@@ -802,13 +809,9 @@ async function getDBSetupChoice(databaseType, dbSetup, _orm, backend, runtime) {
 async function getExamplesChoice(examples, database, frontends, backend, api) {
 	if (examples !== void 0) return examples;
 	if (backend === "none") return [];
-	if (backend !== "convex") {
-		if (api === "none") return [];
-		if (database === "none") return [];
-	}
 	let response = [];
 	const options = [];
-	if (isExampleTodoAllowed(backend, database)) options.push({
+	if (isExampleTodoAllowed(backend, database, api)) options.push({
 		value: "todo",
 		label: "Todo App",
 		hint: "A simple CRUD example app"
@@ -1758,7 +1761,7 @@ function validateFrontendConstraints(config, providedFlags) {
 }
 function validateApiConstraints(config, options) {
 	if (config.api === "none") {
-		if (options.examples && !(options.examples.length === 1 && options.examples[0] === "none") && options.backend !== "convex" && options.backend !== "none") exitWithError("Cannot use '--examples' when '--api' is set to 'none'. Please remove the --examples flag or choose an API type.");
+		if (options.examples?.includes("todo") && options.backend !== "convex" && options.backend !== "none") exitWithError("Cannot use '--examples todo' when '--api' is set to 'none'. The todo example requires an API layer. Please remove 'todo' from --examples or choose an API type.");
 	}
 }
 function validateFullConfig(config, providedFlags, options) {
@@ -1779,7 +1782,7 @@ function validateFullConfig(config, providedFlags, options) {
 		validateAddonsAgainstFrontends(config.addons, config.frontend, config.auth);
 		config.addons = [...new Set(config.addons)];
 	}
-	validateExamplesCompatibility(config.examples ?? [], config.backend, config.database, config.frontend ?? []);
+	validateExamplesCompatibility(config.examples ?? [], config.backend, config.database, config.frontend ?? [], config.api);
 	validatePaymentsCompatibility(config.payments, config.auth, config.backend, config.frontend ?? []);
 }
 function validateConfigForProgrammaticUse(config) {
@@ -1789,7 +1792,7 @@ function validateConfigForProgrammaticUse(config) {
 		validateApiFrontendCompatibility(config.api, config.frontend);
 		validatePaymentsCompatibility(config.payments, config.auth, config.backend, config.frontend);
 		if (config.addons && config.addons.length > 0) validateAddonsAgainstFrontends(config.addons, config.frontend, config.auth);
-		validateExamplesCompatibility(config.examples ?? [], config.backend, config.database, config.frontend ?? []);
+		validateExamplesCompatibility(config.examples ?? [], config.backend, config.database, config.frontend ?? [], config.api);
 	} catch (error) {
 		if (error instanceof Error) throw error;
 		throw new Error(String(error));
@@ -4007,11 +4010,19 @@ async function setupAIDependencies(config) {
 		projectDir: convexBackendDir
 	});
 	else if (backend === "self" && webClientDirExists) await addPackageDependency({
-		dependencies: ["ai", "@ai-sdk/google"],
+		dependencies: [
+			"ai",
+			"@ai-sdk/google",
+			"@ai-sdk/devtools"
+		],
 		projectDir: webClientDir
 	});
 	else if (serverDirExists && backend !== "none") await addPackageDependency({
-		dependencies: ["ai", "@ai-sdk/google"],
+		dependencies: [
+			"ai",
+			"@ai-sdk/google",
+			"@ai-sdk/devtools"
+		],
 		projectDir: serverDir
 	});
 	if (webClientDirExists) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-better-t-stack",
-  "version": "3.12.5",
+  "version": "3.12.7",
   "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.12.5",
+    "@better-t-stack/types": "^3.12.7",
     "@clack/prompts": "^1.0.0-alpha.8",
     "@orpc/server": "^1.13.0",
     "consola": "^3.4.2",

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

@@ -11,7 +11,7 @@ import { appRouter } from "@{{projectName}}/api/routers/index";
 import { createContext } from "@{{projectName}}/api/context";
 {{else if (includes frontend "tanstack-start")}}
 import type { RouterClient } from "@orpc/server";
-import { appRouter } from "@{{projectName}}/api/routers/index";
+import type { AppRouter } from "@{{projectName}}/api/routers/index";
 import { env } from "@{{projectName}}/env/web";
 {{else}}
 import type { AppRouterClient } from "@{{projectName}}/api/routers/index";
@@ -73,10 +73,10 @@ const link = new RPCLink({
 });
 
 const getORPCClient = () => {
-	return createORPCClient(link) as RouterClient<typeof appRouter>;
+	return createORPCClient(link) as RouterClient<AppRouter>;
 };
 
-export const client: RouterClient<typeof appRouter> = getORPCClient();
+export const client: RouterClient<AppRouter> = getORPCClient();
 {{else}}
 export const link = new RPCLink({
 {{#if (and (eq backend "self") (includes frontend "next"))}}

package/templates/auth/better-auth/convex/native/uniwind/components/sign-in.tsx.hbs

@@ -1,13 +1,7 @@
 import { authClient } from "@/lib/auth-client";
 import { useState } from "react";
-import {
-  ActivityIndicator,
-  Text,
-  TextInput,
-  Pressable,
-  View,
-} from "react-native";
-import { Card, useThemeColor } from "heroui-native";
+import { Text, View } from "react-native";
+import { Button, ErrorView, Spinner, Surface, TextField } from "heroui-native";
 
 export function SignIn() {
   const [email, setEmail] = useState("");
@@ -15,11 +9,6 @@ export function SignIn() {
   const [isLoading, setIsLoading] = useState(false);
   const [error, setError] = useState<string | null>(null);
 
-  const mutedColor = useThemeColor("muted");
-  const accentColor = useThemeColor("accent");
-  const foregroundColor = useThemeColor("foreground");
-  const dangerColor = useThemeColor("danger");
-
   const handleLogin = async () => {
     setIsLoading(true);
     setError(null);
@@ -46,46 +35,39 @@ export function SignIn() {
   };
 
   return (
-    <Card variant="secondary" className="mt-6 p-4">
-      <Card.Title className="mb-4">Sign In</Card.Title>
+    <Surface variant="secondary" className="p-4 rounded-lg">
+      <Text className="text-foreground font-medium mb-4">Sign In</Text>
 
-      {error && (
-        <View className="mb-4 p-3 bg-danger/10 rounded-lg">
-          <Text className="text-danger text-sm">{error}</Text>
-        </View>
-      )}
+      <ErrorView isInvalid={!!error} className="mb-3">
+        {error}
+      </ErrorView>
 
-      <TextInput
-        className="mb-3 py-3 px-4 rounded-lg bg-surface text-foreground border border-divider"
-        placeholder="Email"
-        value={email}
-        onChangeText={setEmail}
-        placeholderTextColor={mutedColor}
-        keyboardType="email-address"
-        autoCapitalize="none"
-      />
+      <View className="gap-3">
+        <TextField>
+          <TextField.Label>Email</TextField.Label>
+          <TextField.Input
+            value={email}
+            onChangeText={setEmail}
+            placeholder="email@example.com"
+            keyboardType="email-address"
+            autoCapitalize="none"
+          />
+        </TextField>
 
-      <TextInput
-        className="mb-4 py-3 px-4 rounded-lg bg-surface text-foreground border border-divider"
-        placeholder="Password"
-        value={password}
-        onChangeText={setPassword}
-        placeholderTextColor={mutedColor}
-        secureTextEntry
-      />
+        <TextField>
+          <TextField.Label>Password</TextField.Label>
+          <TextField.Input
+            value={password}
+            onChangeText={setPassword}
+            placeholder="••••••••"
+            secureTextEntry
+          />
+        </TextField>
 
-      <Pressable
-        onPress={handleLogin}
-        disabled={isLoading}
-        className="bg-accent p-4 rounded-lg flex-row justify-center items-center active:opacity-70"
-      >
-        {isLoading ? (
-          <ActivityIndicator size="small" color={foregroundColor} />
-        ) : (
-          <Text className="text-foreground font-medium">Sign In</Text>
-        )}
-      </Pressable>
-    </Card>
+        <Button onPress={handleLogin} isDisabled={isLoading} className="mt-1">
+          {isLoading ? <Spinner size="sm" color="default" /> : <Button.Label>Sign In</Button.Label>}
+        </Button>
+      </View>
+    </Surface>
   );
 }
-

package/templates/auth/better-auth/convex/native/uniwind/components/sign-up.tsx.hbs

@@ -1,13 +1,7 @@
 import { authClient } from "@/lib/auth-client";
 import { useState } from "react";
-import {
-  ActivityIndicator,
-  Text,
-  TextInput,
-  Pressable,
-  View,
-} from "react-native";
-import { Card, useThemeColor } from "heroui-native";
+import { Text, View } from "react-native";
+import { Button, ErrorView, Spinner, Surface, TextField } from "heroui-native";
 
 export function SignUp() {
   const [name, setName] = useState("");
@@ -16,11 +10,6 @@ export function SignUp() {
   const [isLoading, setIsLoading] = useState(false);
   const [error, setError] = useState<string | null>(null);
 
-  const mutedColor = useThemeColor("muted");
-  const accentColor = useThemeColor("accent");
-  const foregroundColor = useThemeColor("foreground");
-  const dangerColor = useThemeColor("danger");
-
   const handleSignUp = async () => {
     setIsLoading(true);
     setError(null);
@@ -49,54 +38,48 @@ export function SignUp() {
   };
 
   return (
-    <Card variant="secondary" className="mt-6 p-4">
-      <Card.Title className="mb-4">Create Account</Card.Title>
+    <Surface variant="secondary" className="p-4 rounded-lg">
+      <Text className="text-foreground font-medium mb-4">Create Account</Text>
 
-      {error && (
-        <View className="mb-4 p-3 bg-danger/10 rounded-lg">
-          <Text className="text-danger text-sm">{error}</Text>
-        </View>
-      )}
+      <ErrorView isInvalid={!!error} className="mb-3">
+        {error}
+      </ErrorView>
 
-      <TextInput
-        className="mb-3 py-3 px-4 rounded-lg bg-surface text-foreground border border-divider"
-        placeholder="Name"
-        value={name}
-        onChangeText={setName}
-        placeholderTextColor={mutedColor}
-      />
+      <View className="gap-3">
+        <TextField>
+          <TextField.Label>Name</TextField.Label>
+          <TextField.Input value={name} onChangeText={setName} placeholder="John Doe" />
+        </TextField>
 
-      <TextInput
-        className="mb-3 py-3 px-4 rounded-lg bg-surface text-foreground border border-divider"
-        placeholder="Email"
-        value={email}
-        onChangeText={setEmail}
-        placeholderTextColor={mutedColor}
-        keyboardType="email-address"
-        autoCapitalize="none"
-      />
+        <TextField>
+          <TextField.Label>Email</TextField.Label>
+          <TextField.Input
+            value={email}
+            onChangeText={setEmail}
+            placeholder="email@example.com"
+            keyboardType="email-address"
+            autoCapitalize="none"
+          />
+        </TextField>
 
-      <TextInput
-        className="mb-4 py-3 px-4 rounded-lg bg-surface text-foreground border border-divider"
-        placeholder="Password"
-        value={password}
-        onChangeText={setPassword}
-        placeholderTextColor={mutedColor}
-        secureTextEntry
-      />
+        <TextField>
+          <TextField.Label>Password</TextField.Label>
+          <TextField.Input
+            value={password}
+            onChangeText={setPassword}
+            placeholder="••••••••"
+            secureTextEntry
+          />
+        </TextField>
 
-      <Pressable
-        onPress={handleSignUp}
-        disabled={isLoading}
-        className="bg-accent p-4 rounded-lg flex-row justify-center items-center active:opacity-70"
-      >
-        {isLoading ? (
-          <ActivityIndicator size="small" color={foregroundColor} />
-        ) : (
-          <Text className="text-foreground font-medium">Sign Up</Text>
-        )}
-      </Pressable>
-    </Card>
+        <Button onPress={handleSignUp} isDisabled={isLoading} className="mt-1">
+          {isLoading ? (
+            <Spinner size="sm" color="default" />
+          ) : (
+            <Button.Label>Create Account</Button.Label>
+          )}
+        </Button>
+      </View>
+    </Surface>
   );
 }
-

package/templates/auth/better-auth/native/uniwind/components/sign-in.tsx.hbs

@@ -6,14 +6,8 @@ import { queryClient } from "@/utils/trpc";
 import { queryClient } from "@/utils/orpc";
 {{/if}}
 import { useState } from "react";
-import {
-ActivityIndicator,
-Text,
-TextInput,
-Pressable,
-View,
-} from "react-native";
-import { Card, useThemeColor } from "heroui-native";
+import { Text, View } from "react-native";
+import { Button, ErrorView, Spinner, Surface, TextField } from "heroui-native";
 
 function SignIn() {
 const [email, setEmail] = useState("");
@@ -21,11 +15,6 @@ const [password, setPassword] = useState("");
 const [isLoading, setIsLoading] = useState(false);
 const [error, setError] = useState<string | null>(null);
 
-  const mutedColor = useThemeColor("muted");
-  const accentColor = useThemeColor("accent");
-  const foregroundColor = useThemeColor("foreground");
-  const dangerColor = useThemeColor("danger");
-
   async function handleLogin() {
   setIsLoading(true);
   setError(null);
@@ -58,32 +47,40 @@ const [error, setError] = useState<string | null>(null);
   }
 
   return (
-  <Card variant="secondary" className="mt-6 p-4">
-    <Card.Title className="mb-4">Sign In</Card.Title>
+  <Surface variant="secondary" className="p-4 rounded-lg">
+    <Text className="text-foreground font-medium mb-4">Sign In</Text>
 
-    {error ? (
-    <View className="mb-4 p-3 bg-danger/10 rounded-lg">
-      <Text className="text-danger text-sm">{error}</Text>
-    </View>
-    ) : null}
+    <ErrorView isInvalid={!!error} className="mb-3">
+      {error}
+    </ErrorView>
 
-    <TextInput className="mb-3 py-3 px-4 rounded-lg bg-surface text-foreground border border-divider"
-      placeholder="Email" value={email} onChangeText={setEmail} placeholderTextColor={mutedColor}
-      keyboardType="email-address" autoCapitalize="none" />
+    <View className="gap-3">
+      <TextField>
+        <TextField.Label>Email</TextField.Label>
+        <TextField.Input
+          value={email}
+          onChangeText={setEmail}
+          placeholder="email@example.com"
+          keyboardType="email-address"
+          autoCapitalize="none"
+        />
+      </TextField>
 
-    <TextInput className="mb-4 py-3 px-4 rounded-lg bg-surface text-foreground border border-divider"
-      placeholder="Password" value={password} onChangeText={setPassword} placeholderTextColor={mutedColor}
-      secureTextEntry />
+      <TextField>
+        <TextField.Label>Password</TextField.Label>
+        <TextField.Input
+          value={password}
+          onChangeText={setPassword}
+          placeholder="••••••••"
+          secureTextEntry
+        />
+      </TextField>
 
-    <Pressable onPress={handleLogin} disabled={isLoading}
-      className="bg-accent p-4 rounded-lg flex-row justify-center items-center active:opacity-70">
-      {isLoading ? (
-      <ActivityIndicator size="small" color={foregroundColor} />
-      ) : (
-      <Text className="text-foreground font-medium">Sign In</Text>
-      )}
-    </Pressable>
-  </Card>
+      <Button onPress={handleLogin} isDisabled={isLoading} className="mt-1">
+        {isLoading ? <Spinner size="sm" color="default" /> : <Button.Label>Sign In</Button.Label>}
+      </Button>
+    </View>
+  </Surface>
   );
   }
 

package/templates/auth/better-auth/native/uniwind/components/sign-up.tsx.hbs

@@ -6,14 +6,8 @@ import { queryClient } from "@/utils/trpc";
 import { queryClient } from "@/utils/orpc";
 {{/if}}
 import { useState } from "react";
-import {
-ActivityIndicator,
-Text,
-TextInput,
-Pressable,
-View,
-} from "react-native";
-import { Card, useThemeColor } from "heroui-native";
+import { Text, View } from "react-native";
+import { Button, ErrorView, Spinner, Surface, TextField } from "heroui-native";
 
 function signUpHandler({
 name,
@@ -24,6 +18,15 @@ setIsLoading,
 setName,
 setEmail,
 setPassword,
+}: {
+  name: string;
+  email: string;
+  password: string;
+  setError: (error: string | null) => void;
+  setIsLoading: (loading: boolean) => void;
+  setName: (name: string) => void;
+  setEmail: (email: string) => void;
+  setPassword: (password: string) => void;
 }) {
 setIsLoading(true);
 setError(null);
@@ -64,11 +67,6 @@ const [password, setPassword] = useState("");
 const [isLoading, setIsLoading] = useState(false);
 const [error, setError] = useState<string | null>(null);
 
-  const mutedColor = useThemeColor("muted");
-  const accentColor = useThemeColor("accent");
-  const foregroundColor = useThemeColor("foreground");
-  const dangerColor = useThemeColor("danger");
-
   function handlePress() {
   signUpHandler({
   name,
@@ -83,34 +81,48 @@ const [error, setError] = useState<string | null>(null);
   }
 
   return (
-  <Card variant="secondary" className="mt-6 p-4">
-    <Card.Title className="mb-4">Create Account</Card.Title>
+  <Surface variant="secondary" className="p-4 rounded-lg">
+    <Text className="text-foreground font-medium mb-4">Create Account</Text>
 
-    {error && (
-    <View className="mb-4 p-3 bg-danger/10 rounded-lg">
-      <Text className="text-danger text-sm">{error}</Text>
-    </View>
-    )}
+    <ErrorView isInvalid={!!error} className="mb-3">
+      {error}
+    </ErrorView>
 
-    <TextInput className="mb-3 py-3 px-4 rounded-lg bg-surface text-foreground border border-divider" placeholder="Name"
-      value={name} onChangeText={setName} placeholderTextColor={mutedColor} />
+    <View className="gap-3">
+      <TextField>
+        <TextField.Label>Name</TextField.Label>
+        <TextField.Input value={name} onChangeText={setName} placeholder="John Doe" />
+      </TextField>
 
-    <TextInput className="mb-3 py-3 px-4 rounded-lg bg-surface text-foreground border border-divider"
-      placeholder="Email" value={email} onChangeText={setEmail} placeholderTextColor={mutedColor}
-      keyboardType="email-address" autoCapitalize="none" />
+      <TextField>
+        <TextField.Label>Email</TextField.Label>
+        <TextField.Input
+          value={email}
+          onChangeText={setEmail}
+          placeholder="email@example.com"
+          keyboardType="email-address"
+          autoCapitalize="none"
+        />
+      </TextField>
 
-    <TextInput className="mb-4 py-3 px-4 rounded-lg bg-surface text-foreground border border-divider"
-      placeholder="Password" value={password} onChangeText={setPassword} placeholderTextColor={mutedColor}
-      secureTextEntry />
+      <TextField>
+        <TextField.Label>Password</TextField.Label>
+        <TextField.Input
+          value={password}
+          onChangeText={setPassword}
+          placeholder="••••••••"
+          secureTextEntry
+        />
+      </TextField>
 
-    <Pressable onPress={handlePress} disabled={isLoading}
-      className="bg-accent p-4 rounded-lg flex-row justify-center items-center active:opacity-70">
-      {isLoading ? (
-      <ActivityIndicator size="small" color={foregroundColor} />
-      ) : (
-      <Text className="text-foreground font-medium">Sign Up</Text>
-      )}
-    </Pressable>
-  </Card>
+      <Button onPress={handlePress} isDisabled={isLoading} className="mt-1">
+        {isLoading ? (
+          <Spinner size="sm" color="default" />
+        ) : (
+          <Button.Label>Create Account</Button.Label>
+        )}
+      </Button>
+    </View>
+  </Surface>
   );
   }