create-better-t-stack 2.46.4 → 2.47.0

package/dist/cli.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { createBtsCli } from "./src-El86OdG5.js";
+import { createBtsCli } from "./src-Wv9qeyOh.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-El86OdG5.js";
+import { builder, createBtsCli, docs, init, router, sponsors } from "./src-Wv9qeyOh.js";
 
 export { builder, createBtsCli, docs, init, router, sponsors };

package/dist/{src-El86OdG5.js → src-Wv9qeyOh.js}

@@ -122,11 +122,12 @@ const dependencyVersionMap = {
 	"@trpc/tanstack-react-query": "^11.5.0",
 	"@trpc/server": "^11.5.0",
 	"@trpc/client": "^11.5.0",
-	convex: "^1.25.4",
+	convex: "^1.27.0",
 	"@convex-dev/react-query": "^0.0.0-alpha.8",
 	"convex-svelte": "^0.0.11",
 	"convex-nuxt": "0.1.5",
 	"convex-vue": "^0.1.5",
+	"@convex-dev/better-auth": "^0.8.4",
 	"@tanstack/svelte-query": "^5.85.3",
 	"@tanstack/svelte-query-devtools": "^5.85.3",
 	"@tanstack/vue-query-devtools": "^5.83.0",
@@ -423,11 +424,10 @@ function validateAddonsAgainstFrontends(addons = [], frontends = [], auth) {
 		if (!isCompatible) exitWithError(`Incompatible addon/frontend combination: ${reason}`);
 	}
 }
-function validatePaymentsCompatibility(payments, auth, backend, frontends = []) {
+function validatePaymentsCompatibility(payments, auth, _backend, frontends = []) {
 	if (!payments || payments === "none") return;
 	if (payments === "polar") {
 		if (!auth || auth === "none" || auth !== "better-auth") exitWithError("Polar payments requires Better Auth. Please use '--auth better-auth' or choose a different payments provider.");
-		if (backend === "convex") exitWithError("Polar payments is not compatible with Convex backend. Please use a different backend or choose a different payments provider.");
 		const { web } = splitFrontends(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.");
 	}
@@ -611,23 +611,39 @@ async function getApiChoice(Api, frontend, backend) {
 async function getAuthChoice(auth, hasDatabase, backend, frontend) {
 	if (auth !== void 0) return auth;
 	if (backend === "convex") {
-		const unsupportedFrontends = frontend?.filter((f) => [
-			"nuxt",
-			"svelte",
-			"solid"
+		const supportedBetterAuthFrontends = frontend?.some((f) => [
+			"tanstack-router",
+			"tanstack-start",
+			"next"
+		].includes(f));
+		const hasClerkCompatibleFrontends = frontend?.some((f) => [
+			"react-router",
+			"tanstack-router",
+			"tanstack-start",
+			"next",
+			"native-nativewind",
+			"native-unistyles"
 		].includes(f));
-		if (unsupportedFrontends && unsupportedFrontends.length > 0) return "none";
+		const options = [];
+		if (supportedBetterAuthFrontends) options.push({
+			value: "better-auth",
+			label: "Better-Auth",
+			hint: "comprehensive auth framework for TypeScript"
+		});
+		if (hasClerkCompatibleFrontends) options.push({
+			value: "clerk",
+			label: "Clerk",
+			hint: "More than auth, Complete User Management"
+		});
+		options.push({
+			value: "none",
+			label: "None",
+			hint: "No auth"
+		});
 		const response$1 = await select({
 			message: "Select authentication provider",
-			options: [{
-				value: "clerk",
-				label: "Clerk",
-				hint: "More than auth, Complete User Management"
-			}, {
-				value: "none",
-				label: "None"
-			}],
-			initialValue: "clerk"
+			options,
+			initialValue: "none"
 		});
 		if (isCancel(response$1)) return exitCancelled("Operation cancelled");
 		return response$1;
@@ -1733,7 +1749,15 @@ function validateConvexConstraints(config, providedFlags) {
 	if (has("api") && config.api !== "none") exitWithError("Convex backend requires '--api none'. Please remove the --api flag or set it to 'none'.");
 	if (has("dbSetup") && config.dbSetup !== "none") exitWithError("Convex backend requires '--db-setup none'. Please remove the --db-setup flag or set it to 'none'.");
 	if (has("serverDeploy") && config.serverDeploy !== "none") exitWithError("Convex backend requires '--server-deploy none'. Please remove the --server-deploy flag or set it to 'none'.");
-	if (has("auth") && config.auth === "better-auth") exitWithError("Better-Auth is not compatible with Convex backend. Please use '--auth clerk' or '--auth none'.");
+	if (has("auth") && config.auth === "better-auth") {
+		const supportedFrontends = [
+			"tanstack-router",
+			"tanstack-start",
+			"next"
+		];
+		const hasSupportedFrontend = config.frontend?.some((f) => supportedFrontends.includes(f));
+		if (!hasSupportedFrontend) exitWithError("Better-Auth with Convex backend is only supported with TanStack Router, TanStack Start, or Next.js frontends. Please use '--auth clerk' or '--auth none'.");
+	}
 }
 function validateBackendNoneConstraints(config, providedFlags) {
 	const { backend } = config;
@@ -1980,18 +2004,18 @@ async function updateBtsConfig(projectDir, updates) {
 //#endregion
 //#region src/utils/add-package-deps.ts
 const addPackageDependency = async (opts) => {
-	const { dependencies = [], devDependencies = [], projectDir } = opts;
+	const { dependencies = [], devDependencies = [], customDependencies = {}, customDevDependencies = {}, projectDir } = opts;
 	const pkgJsonPath = path.join(projectDir, "package.json");
 	const pkgJson = await fs.readJson(pkgJsonPath);
 	if (!pkgJson.dependencies) pkgJson.dependencies = {};
 	if (!pkgJson.devDependencies) pkgJson.devDependencies = {};
 	for (const pkgName of dependencies) {
-		const version = dependencyVersionMap[pkgName];
+		const version = customDependencies[pkgName] || dependencyVersionMap[pkgName];
 		if (version) pkgJson.dependencies[pkgName] = version;
 		else console.warn(`Warning: Dependency ${pkgName} not found in version map.`);
 	}
 	for (const pkgName of devDependencies) {
-		const version = dependencyVersionMap[pkgName];
+		const version = customDevDependencies[pkgName] || dependencyVersionMap[pkgName];
 		if (version) pkgJson.devDependencies[pkgName] = version;
 		else console.warn(`Warning: Dev dependency ${pkgName} not found in version map.`);
 	}
@@ -2853,6 +2877,29 @@ async function setupAuthTemplate(projectDir, context) {
 		}
 		return;
 	}
+	if (context.backend === "convex" && authProvider === "better-auth") {
+		const convexBackendDestDir = path.join(projectDir, "packages/backend");
+		const convexBetterAuthBackendSrc = path.join(PKG_ROOT, "templates/auth/better-auth/convex/backend");
+		if (await fs.pathExists(convexBetterAuthBackendSrc)) {
+			await fs.ensureDir(convexBackendDestDir);
+			await processAndCopyFiles("**/*", convexBetterAuthBackendSrc, convexBackendDestDir, context);
+		}
+		if (webAppDirExists && hasReactWeb) {
+			const convexBetterAuthWebBaseSrc = path.join(PKG_ROOT, "templates/auth/better-auth/convex/web/react/base");
+			if (await fs.pathExists(convexBetterAuthWebBaseSrc)) await processAndCopyFiles("**/*", convexBetterAuthWebBaseSrc, webAppDir, context);
+			const reactFramework = context.frontend.find((f) => [
+				"tanstack-router",
+				"react-router",
+				"tanstack-start",
+				"next"
+			].includes(f));
+			if (reactFramework) {
+				const convexBetterAuthWebSrc = path.join(PKG_ROOT, `templates/auth/better-auth/convex/web/react/${reactFramework}`);
+				if (await fs.pathExists(convexBetterAuthWebSrc)) await processAndCopyFiles("**/*", convexBetterAuthWebSrc, webAppDir, context);
+			}
+		}
+		return;
+	}
 	if (serverAppDirExists && context.backend !== "convex") {
 		const authServerBaseSrc = path.join(PKG_ROOT, `templates/auth/${authProvider}/server/base`);
 		if (await fs.pathExists(authServerBaseSrc)) await processAndCopyFiles("**/*", authServerBaseSrc, serverAppDir, context);
@@ -4246,6 +4293,35 @@ async function setupAuth(config) {
 					projectDir: clientDir
 				});
 			}
+			if (auth === "better-auth") {
+				const convexBackendDir = path.join(projectDir, "packages/backend");
+				const convexBackendDirExists = await fs.pathExists(convexBackendDir);
+				if (convexBackendDirExists) await addPackageDependency({
+					dependencies: ["better-auth", "@convex-dev/better-auth"],
+					customDependencies: { "better-auth": "1.3.8" },
+					projectDir: convexBackendDir
+				});
+				if (clientDirExists) {
+					const hasNextJs = frontend.includes("next");
+					const hasTanStackStart = frontend.includes("tanstack-start");
+					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.8" },
+						projectDir: clientDir
+					});
+					else if (hasTanStackStart) await addPackageDependency({
+						dependencies: ["better-auth", "@convex-dev/better-auth"],
+						customDependencies: { "better-auth": "1.3.8" },
+						projectDir: clientDir
+					});
+					else if (hasViteReactOther) await addPackageDependency({
+						dependencies: ["better-auth", "@convex-dev/better-auth"],
+						customDependencies: { "better-auth": "1.3.8" },
+						projectDir: clientDir
+					});
+				}
+			}
 			const hasNativeWind = frontend.includes("native-nativewind");
 			const hasUnistyles = frontend.includes("native-unistyles");
 			if (auth === "clerk" && nativeDirExists && (hasNativeWind || hasUnistyles)) await addPackageDependency({
@@ -4307,7 +4383,7 @@ async function addEnvVariablesToFile(filePath, variables) {
 	let modified = false;
 	let contentToAdd = "";
 	const exampleVariables = [];
-	for (const { key, value, condition } of variables) if (condition) {
+	for (const { key, value, condition, comment } of variables) if (condition) {
 		const regex = new RegExp(`^${key}=.*$`, "m");
 		const valueToWrite = value ?? "";
 		exampleVariables.push(`${key}=`);
@@ -4318,6 +4394,7 @@ async function addEnvVariablesToFile(filePath, variables) {
 				modified = true;
 			}
 		} else {
+			if (comment) contentToAdd += `# ${comment}\n`;
 			contentToAdd += `${key}=${valueToWrite}\n`;
 			modified = true;
 		}
@@ -4403,6 +4480,18 @@ async function setupEnvironmentVariables(config) {
 					});
 				}
 			}
+			if (backend === "convex" && auth === "better-auth") {
+				if (hasNextJs) clientVars.push({
+					key: "NEXT_PUBLIC_CONVEX_SITE_URL",
+					value: "https://<YOUR_CONVEX_URL>",
+					condition: true
+				});
+				else if (hasReactRouter || hasTanStackRouter || hasTanStackStart) clientVars.push({
+					key: "VITE_CONVEX_SITE_URL",
+					value: "https://<YOUR_CONVEX_URL>",
+					condition: true
+				});
+			}
 			await addEnvVariablesToFile(path.join(clientDir, ".env"), clientVars);
 		}
 	}
@@ -4428,7 +4517,34 @@ async function setupEnvironmentVariables(config) {
 			await addEnvVariablesToFile(path.join(nativeDir, ".env"), nativeVars);
 		}
 	}
-	if (backend === "convex") return;
+	if (backend === "convex") {
+		if (auth === "better-auth") {
+			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")) {
+					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 fs.appendFile(envLocalPath, convexCommands);
+				}
+				const convexBackendVars = [{
+					key: hasNextJs ? "NEXT_PUBLIC_CONVEX_SITE_URL" : "VITE_CONVEX_SITE_URL",
+					value: "",
+					condition: true,
+					comment: "Same as CONVEX_URL but ends in .site"
+				}, {
+					key: "SITE_URL",
+					value: "http://localhost:3001",
+					condition: true
+				}];
+				await addEnvVariablesToFile(envLocalPath, convexBackendVars);
+			}
+		}
+		return;
+	}
 	const serverDir = path.join(projectDir, "apps/server");
 	if (!await fs.pathExists(serverDir)) return;
 	const envPath = path.join(serverDir, ".env");
@@ -5713,17 +5829,6 @@ async function setupNodeRuntime(serverDir, backend) {
 	});
 }
 
-//#endregion
-//#region src/helpers/core/convex-codegen.ts
-async function runConvexCodegen(projectDir, packageManager) {
-	const backendDir = path.join(projectDir, "packages/backend");
-	const cmd = getPackageExecutionCommand(packageManager, "convex codegen");
-	await execa(cmd, {
-		cwd: backendDir,
-		shell: true
-	});
-}
-
 //#endregion
 //#region src/helpers/core/create-readme.ts
 async function createReadme(projectDir, options) {
@@ -6515,7 +6620,6 @@ async function createProject(options, cliInput) {
 		await setupServerDeploy(options);
 		await createReadme(projectDir, options);
 		await writeBtsConfig(options);
-		if (isConvex) await runConvexCodegen(projectDir, options.packageManager);
 		log.success("Project template successfully scaffolded!");
 		if (options.install) await installDependencies({
 			projectDir,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-better-t-stack",
-  "version": "2.46.4",
+  "version": "2.47.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/addons/biome/biome.json.hbs

@@ -22,6 +22,7 @@
 			"!**/.expo",
 			"!**/.wrangler",
 			"!**/.alchemy",
+			"!**/.svelte-kit",
 			"!**/wrangler.jsonc",
 			"!**/.source"
 		]
@@ -66,7 +67,7 @@
 			"quoteStyle": "double"
 		}
 	}
-	{{#if (or (eq frontend "svelte") (eq frontend "nuxt"))}}
+	{{#if (or (includes frontend "svelte") (includes frontend "nuxt"))}}
 	,
 	"overrides": [
 		{

package/templates/addons/ultracite/biome.json.hbs

@@ -17,6 +17,7 @@
 			"!**/.expo",
 			"!**/.wrangler",
 			"!**/.alchemy",
+			"!**/.svelte-kit",
 			"!**/wrangler.jsonc",
 			"!**/.source"
 		]

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

@@ -0,0 +1,8 @@
+export default {
+    providers: [
+        {
+            domain: process.env.CONVEX_SITE_URL,
+            applicationID: "convex",
+        },
+    ],
+};

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

@@ -0,0 +1,48 @@
+import { createClient, type GenericCtx } from "@convex-dev/better-auth";
+{{#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";
+{{/if}}
+import { components } from "./_generated/api";
+import { DataModel } from "./_generated/dataModel";
+import { query } from "./_generated/server";
+import { betterAuth } from "better-auth";
+
+const siteUrl = process.env.SITE_URL!;
+
+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 "tanstack-start") (includes frontend "next"))}}
+        baseUrl: siteUrl,
+        {{else}}
+        trustedOrigins: [siteUrl],
+        {{/if}}
+        database: authComponent.adapter(ctx),
+        emailAndPassword: {
+            enabled: true,
+            requireEmailVerification: false,
+        },
+        plugins: [
+            {{#unless (or (includes frontend "tanstack-start") (includes frontend "next"))}}
+            crossDomain({ siteUrl }),
+            {{/unless}}
+            convex(),
+        ],
+    });
+};
+
+export const getCurrentUser = query({
+    args: {},
+    handler: async (ctx) => {
+        return authComponent.getAuthUser(ctx);
+    },
+});

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

@@ -0,0 +1,7 @@
+import { defineApp } from "convex/server";
+import betterAuth from "@convex-dev/better-auth/convex.config";
+
+const app = defineApp();
+app.use(betterAuth);
+
+export default app;

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

@@ -0,0 +1,12 @@
+import { httpRouter } from "convex/server";
+import { authComponent, createAuth } from "./auth";
+
+const http = httpRouter();
+
+{{#if (or (includes frontend "tanstack-start") (includes frontend "next"))}}
+authComponent.registerRoutes(http, createAuth);
+{{else}}
+authComponent.registerRoutes(http, createAuth, { cors: true });
+{{/if}}
+
+export default http;

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

@@ -0,0 +1,16 @@
+import { query } from "./_generated/server";
+
+export const get = query({
+    args: {},
+    handler: async (ctx) => {
+        const identity = await ctx.auth.getUserIdentity();
+        if (identity === null) {
+            return {
+                message: "Not authenticated",
+            };
+        }
+        return {
+            message: "This is private",
+        };
+    },
+});

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

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

package/templates/auth/better-auth/convex/web/react/next/src/app/dashboard/page.tsx.hbs

@@ -0,0 +1,40 @@
+"use client"
+
+import SignInForm from "@/components/sign-in-form";
+import SignUpForm from "@/components/sign-up-form";
+import UserMenu from "@/components/user-menu";
+import { api } from "@{{projectName}}/backend/convex/_generated/api";
+import {
+    Authenticated,
+    AuthLoading,
+    Unauthenticated,
+    useQuery,
+} from "convex/react";
+import { useState } from "react";
+
+export default function DashboardPage() {
+    const [showSignIn, setShowSignIn] = useState(false);
+    const privateData = useQuery(api.privateData.get);
+
+    return (
+        <>
+            <Authenticated>
+                <div>
+                    <h1>Dashboard</h1>
+                    <p>privateData: {privateData?.message}</p>
+                    <UserMenu />
+                </div>
+            </Authenticated>
+            <Unauthenticated>
+                {showSignIn ? (
+                    <SignInForm onSwitchToSignUp={() => setShowSignIn(false)} />
+                ) : (
+                    <SignUpForm onSwitchToSignIn={() => setShowSignIn(true)} />
+                )}
+            </Unauthenticated>
+            <AuthLoading>
+                <div>Loading...</div>
+            </AuthLoading>
+        </>
+    );
+}

package/templates/auth/better-auth/convex/web/react/next/src/components/sign-in-form.tsx.hbs

@@ -0,0 +1,129 @@
+import { authClient } from "@/lib/auth-client";
+import { useForm } from "@tanstack/react-form";
+import { toast } from "sonner";
+import z from "zod";
+import { Button } from "./ui/button";
+import { Input } from "./ui/input";
+import { Label } from "./ui/label";
+import { useRouter } from "next/navigation";
+
+export default function SignInForm({
+	onSwitchToSignUp,
+}: {
+	onSwitchToSignUp: () => void;
+}) {
+	const router = useRouter();
+
+	const form = useForm({
+		defaultValues: {
+			email: "",
+			password: "",
+		},
+		onSubmit: async ({ value }) => {
+			await authClient.signIn.email(
+				{
+					email: value.email,
+					password: value.password,
+				},
+				{
+					onSuccess: () => {
+						router.push("/dashboard");
+						toast.success("Sign in successful");
+					},
+					onError: (error) => {
+						toast.error(error.error.message || error.error.statusText);
+					},
+				},
+			);
+		},
+		validators: {
+			onSubmit: z.object({
+				email: z.email("Invalid email address"),
+				password: z.string().min(8, "Password must be at least 8 characters"),
+			}),
+		},
+	});
+
+	return (
+		<div className="mx-auto w-full mt-10 max-w-md p-6">
+			<h1 className="mb-6 text-center text-3xl font-bold">Welcome Back</h1>
+
+			<form
+				onSubmit={(e) => {
+					e.preventDefault();
+					e.stopPropagation();
+					form.handleSubmit();
+				}}
+				className="space-y-4"
+			>
+				<div>
+					<form.Field name="email">
+						{(field) => (
+							<div className="space-y-2">
+								<Label htmlFor={field.name}>Email</Label>
+								<Input
+									id={field.name}
+									name={field.name}
+									type="email"
+									value={field.state.value}
+									onBlur={field.handleBlur}
+									onChange={(e) => field.handleChange(e.target.value)}
+								/>
+								{field.state.meta.errors.map((error) => (
+									<p key={error?.message} className="text-red-500">
+										{error?.message}
+									</p>
+								))}
+							</div>
+						)}
+					</form.Field>
+				</div>
+
+				<div>
+					<form.Field name="password">
+						{(field) => (
+							<div className="space-y-2">
+								<Label htmlFor={field.name}>Password</Label>
+								<Input
+									id={field.name}
+									name={field.name}
+									type="password"
+									value={field.state.value}
+									onBlur={field.handleBlur}
+									onChange={(e) => field.handleChange(e.target.value)}
+								/>
+								{field.state.meta.errors.map((error) => (
+									<p key={error?.message} className="text-red-500">
+										{error?.message}
+									</p>
+								))}
+							</div>
+						)}
+					</form.Field>
+				</div>
+
+				<form.Subscribe>
+					{(state) => (
+						<Button
+							type="submit"
+							className="w-full"
+							disabled={!state.canSubmit || state.isSubmitting}
+						>
+							{state.isSubmitting ? "Submitting..." : "Sign In"}
+						</Button>
+					)}
+				</form.Subscribe>
+			</form>
+
+			<div className="mt-4 text-center">
+				<Button
+					variant="link"
+					onClick={onSwitchToSignUp}
+					className="text-indigo-600 hover:text-indigo-800"
+				>
+					Need an account? Sign Up
+				</Button>
+			</div>
+		</div>
+	);
+}