create-better-t-stack 2.46.3-canary.a2097c5b → 2.46.3-canary.f7f132c8

package/dist/cli.js

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

package/dist/{src-C8eRIOI8.js → src-FqipJoqR.js}

@@ -611,30 +611,30 @@ 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",
-			"native-nativewind",
-			"native-unistyles"
+		const supportedBetterAuthFrontends = frontend?.some((f) => [
+			"tanstack-router",
+			"tanstack-start",
+			"next"
 		].includes(f));
-		if (unsupportedFrontends && unsupportedFrontends.length > 0) return "none";
-		const hasReactFrontends = frontend?.some((f) => [
+		const hasClerkCompatibleFrontends = frontend?.some((f) => [
 			"react-router",
 			"tanstack-router",
 			"tanstack-start",
-			"next"
+			"next",
+			"native-nativewind",
+			"native-unistyles"
 		].includes(f));
-		const options = [{
-			value: "clerk",
-			label: "Clerk",
-			hint: "More than auth, Complete User Management"
-		}];
-		if (hasReactFrontends) options.unshift({
+		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",
@@ -1750,14 +1750,13 @@ function validateConvexConstraints(config, providedFlags) {
 	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") {
-		const hasUnsupportedFrontends = config.frontend?.some((f) => [
-			"nuxt",
-			"svelte",
-			"solid",
-			"native-nativewind",
-			"native-unistyles"
-		].includes(f));
-		if (hasUnsupportedFrontends) exitWithError("Better-Auth with Convex backend is not supported for non-React frontends (nuxt, svelte, solid) or native frontends (native-nativewind, native-unistyles). Please use '--auth clerk' or '--auth none'.");
+		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) {
@@ -4384,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}=`);
@@ -4395,6 +4394,7 @@ async function addEnvVariablesToFile(filePath, variables) {
 				modified = true;
 			}
 		} else {
+			if (comment) contentToAdd += `# ${comment}\n`;
 			contentToAdd += `${key}=${valueToWrite}\n`;
 			modified = true;
 		}
@@ -4521,16 +4521,26 @@ async function setupEnvironmentVariables(config) {
 		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: hasTanStackStart ? "NEXT_PUBLIC_CONVEX_SITE_URL" : "VITE_CONVEX_SITE_URL",
+					key: hasNextJs ? "NEXT_PUBLIC_CONVEX_SITE_URL" : "VITE_CONVEX_SITE_URL",
 					value: "",
-					condition: true
+					condition: true,
+					comment: "Same as CONVEX_URL but ends in .site"
 				}, {
 					key: "SITE_URL",
 					value: "http://localhost:3001",
 					condition: true
 				}];
-				await addEnvVariablesToFile(path.join(convexBackendDir, ".env.local"), convexBackendVars);
+				await addEnvVariablesToFile(envLocalPath, convexBackendVars);
 			}
 		}
 		return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-better-t-stack",
-  "version": "2.46.3-canary.a2097c5b",
+  "version": "2.46.3-canary.f7f132c8",
   "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

@@ -1,5 +1,5 @@
 import { createClient, type GenericCtx } from "@convex-dev/better-auth";
-{{#if (or (eq frontend "tanstack-start") (eq frontend "next"))}}
+{{#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";
@@ -21,7 +21,7 @@ export const createAuth = (
         logger: {
             disabled: optionsOnly,
         },
-        {{#if (or (eq frontend "tanstack-start") (eq frontend "next"))}}
+        {{#if (or (includes frontend "tanstack-start") (includes frontend "next"))}}
         baseUrl: siteUrl,
         {{else}}
         trustedOrigins: [siteUrl],
@@ -32,7 +32,7 @@ export const createAuth = (
             requireEmailVerification: false,
         },
         plugins: [
-            {{#unless (or (eq frontend "tanstack-start") (eq frontend "next"))}}
+            {{#unless (or (includes frontend "tanstack-start") (includes frontend "next"))}}
             crossDomain({ siteUrl }),
             {{/unless}}
             convex(),

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 (eq frontend "tanstack-start") (eq frontend "next"))}}
+{{#if (or (includes frontend "tanstack-start") (includes frontend "next"))}}
 authComponent.registerRoutes(http, createAuth);
 {{else}}
 authComponent.registerRoutes(http, createAuth, { cors: true });