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

package/dist/cli.js

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

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

@@ -122,12 +122,11 @@ const dependencyVersionMap = {
 	"@trpc/tanstack-react-query": "^11.5.0",
 	"@trpc/server": "^11.5.0",
 	"@trpc/client": "^11.5.0",
-	convex: "^1.27.0",
+	convex: "^1.25.4",
 	"@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",
@@ -424,10 +423,11 @@ 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,39 +611,23 @@ async function getApiChoice(Api, frontend, backend) {
 async function getAuthChoice(auth, hasDatabase, backend, frontend) {
 	if (auth !== void 0) return auth;
 	if (backend === "convex") {
-		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"
+		const unsupportedFrontends = frontend?.filter((f) => [
+			"nuxt",
+			"svelte",
+			"solid"
 		].includes(f));
-		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"
-		});
+		if (unsupportedFrontends && unsupportedFrontends.length > 0) return "none";
 		const response$1 = await select({
 			message: "Select authentication provider",
-			options,
-			initialValue: "none"
+			options: [{
+				value: "clerk",
+				label: "Clerk",
+				hint: "More than auth, Complete User Management"
+			}, {
+				value: "none",
+				label: "None"
+			}],
+			initialValue: "clerk"
 		});
 		if (isCancel(response$1)) return exitCancelled("Operation cancelled");
 		return response$1;
@@ -1386,7 +1370,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;
@@ -1394,8 +1378,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);
 	const now = Date.now().toString(36);
@@ -1749,15 +1733,7 @@ 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") {
-		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'.");
-	}
+	if (has("auth") && config.auth === "better-auth") exitWithError("Better-Auth is not compatible with Convex backend. Please use '--auth clerk' or '--auth none'.");
 }
 function validateBackendNoneConstraints(config, providedFlags) {
 	const { backend } = config;
@@ -2004,18 +1980,18 @@ async function updateBtsConfig(projectDir, updates) {
 //#endregion
 //#region src/utils/add-package-deps.ts
 const addPackageDependency = async (opts) => {
-	const { dependencies = [], devDependencies = [], customDependencies = {}, customDevDependencies = {}, projectDir } = opts;
+	const { dependencies = [], devDependencies = [], 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 = customDependencies[pkgName] || dependencyVersionMap[pkgName];
+		const version = 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 = customDevDependencies[pkgName] || dependencyVersionMap[pkgName];
+		const version = dependencyVersionMap[pkgName];
 		if (version) pkgJson.devDependencies[pkgName] = version;
 		else console.warn(`Warning: Dev dependency ${pkgName} not found in version map.`);
 	}
@@ -2877,29 +2853,6 @@ 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);
@@ -4293,35 +4246,6 @@ 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({
@@ -4383,7 +4307,7 @@ async function addEnvVariablesToFile(filePath, variables) {
 	let modified = false;
 	let contentToAdd = "";
 	const exampleVariables = [];
-	for (const { key, value, condition, comment } of variables) if (condition) {
+	for (const { key, value, condition } of variables) if (condition) {
 		const regex = new RegExp(`^${key}=.*$`, "m");
 		const valueToWrite = value ?? "";
 		exampleVariables.push(`${key}=`);
@@ -4394,7 +4318,6 @@ async function addEnvVariablesToFile(filePath, variables) {
 				modified = true;
 			}
 		} else {
-			if (comment) contentToAdd += `# ${comment}\n`;
 			contentToAdd += `${key}=${valueToWrite}\n`;
 			modified = true;
 		}
@@ -4480,18 +4403,6 @@ 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);
 		}
 	}
@@ -4517,34 +4428,7 @@ async function setupEnvironmentVariables(config) {
 			await addEnvVariablesToFile(path.join(nativeDir, ".env"), nativeVars);
 		}
 	}
-	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;
-	}
+	if (backend === "convex") return;
 	const serverDir = path.join(projectDir, "apps/server");
 	if (!await fs.pathExists(serverDir)) return;
 	const envPath = path.join(serverDir, ".env");
@@ -5829,6 +5713,17 @@ 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) {
@@ -6620,6 +6515,7 @@ 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.3-canary.f7f132c8",
+  "version": "2.46.4",
   "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/web/react/next/src/components/theme-provider.tsx.hbs

@@ -0,0 +1,11 @@
+"use client"
+
+import * as React from "react"
+import { ThemeProvider as NextThemesProvider } from "next-themes"
+
+export function ThemeProvider({
+  children,
+  ...props
+}: React.ComponentProps<typeof NextThemesProvider>) {
+  return <NextThemesProvider {...props}>{children}</NextThemesProvider>
+}

package/templates/deploy/alchemy/alchemy.run.ts.hbs

@@ -172,12 +172,26 @@ export const server = await Worker("server", {
     BETTER_AUTH_SECRET: alchemy.secret(process.env.BETTER_AUTH_SECRET),
     BETTER_AUTH_URL: process.env.BETTER_AUTH_URL || "",
     {{/if}}
+    {{#if (eq auth "clerk")}}
+    CLERK_SECRET_KEY: alchemy.secret(process.env.CLERK_SECRET_KEY),
+    {{/if}}
     {{#if (includes examples "ai")}}
     GOOGLE_GENERATIVE_AI_API_KEY: alchemy.secret(process.env.GOOGLE_GENERATIVE_AI_API_KEY),
     {{/if}}
+    {{#if (eq payments "polar")}}
+    POLAR_ACCESS_TOKEN: alchemy.secret(process.env.POLAR_ACCESS_TOKEN),
+    POLAR_SUCCESS_URL: process.env.POLAR_SUCCESS_URL || "",
+    {{/if}}
     {{#if (eq dbSetup "turso")}}
     DATABASE_AUTH_TOKEN: alchemy.secret(process.env.DATABASE_AUTH_TOKEN),
     {{/if}}
+    {{#if (eq database "mysql")}}
+    {{#if (eq orm "drizzle")}}
+    DATABASE_HOST: process.env.DATABASE_HOST || "",
+    DATABASE_USERNAME: process.env.DATABASE_USERNAME || "",
+    DATABASE_PASSWORD: process.env.DATABASE_PASSWORD || "",
+    {{/if}}
+    {{/if}}
   },
   dev: {
 		port: 3000,

package/templates/frontend/react/next/src/components/providers.tsx.hbs

@@ -5,10 +5,6 @@
 import { useAuth } from "@clerk/nextjs";
 import { ConvexReactClient } from "convex/react";
 import { ConvexProviderWithClerk } from "convex/react-clerk";
-{{else if (eq auth "better-auth")}}
-import { ConvexProvider, ConvexReactClient } from "convex/react";
-import { ConvexBetterAuthProvider } from "@convex-dev/better-auth/react";
-import { authClient } from "@/lib/auth-client";
 {{else}}
 import { ConvexProvider, ConvexReactClient } from "convex/react";
 {{/if}}
@@ -48,10 +44,6 @@ export default function Providers({
       <ConvexProviderWithClerk client={convex} useAuth={useAuth}>
         {children}
       </ConvexProviderWithClerk>
-      {{else if (eq auth "better-auth")}}
-      <ConvexBetterAuthProvider client={convex} authClient={authClient}>
-        {children}
-      </ConvexBetterAuthProvider>
       {{else}}
       <ConvexProvider client={convex}>{children}</ConvexProvider>
       {{/if}}

package/templates/frontend/react/tanstack-router/src/main.tsx.hbs

@@ -16,15 +16,10 @@ import { routeTree } from "./routeTree.gen";
   {{#if (eq auth "clerk")}}
   import { ClerkProvider, useAuth } from "@clerk/clerk-react";
   import { ConvexProviderWithClerk } from "convex/react-clerk";
-  {{else if (eq auth "better-auth")}}
-  import { ConvexBetterAuthProvider } from "@convex-dev/better-auth/react";
-  import { authClient } from "@/lib/auth-client";
   {{else}}
   import { ConvexProvider } from "convex/react";
   {{/if}}
-  const convex = new ConvexReactClient(import.meta.env.VITE_CONVEX_URL as string{{#if (eq auth "better-auth")}}, {
-    expectAuth: true,
-  }{{/if}});
+  const convex = new ConvexReactClient(import.meta.env.VITE_CONVEX_URL as string);
 {{/if}}
 
 const router = createRouter({
@@ -62,8 +57,6 @@ const router = createRouter({
         </ConvexProviderWithClerk>
       </ClerkProvider>
     );
-    {{else if (eq auth "better-auth")}}
-    return <ConvexBetterAuthProvider client={convex} authClient={authClient}>{children}</ConvexBetterAuthProvider>;
     {{else}}
     return <ConvexProvider client={convex}>{children}</ConvexProvider>;
     {{/if}}

package/templates/frontend/react/tanstack-start/src/routes/__root.tsx.hbs

@@ -8,9 +8,7 @@ import {
   Scripts,
   createRootRouteWithContext,
   useRouterState,
-{{#if (and (eq backend "convex") (or (eq auth "clerk") (eq auth "better-auth")))}}
   useRouteContext,
-{{/if}}
 } from "@tanstack/react-router";
 import { TanStackRouterDevtools } from "@tanstack/react-router-devtools";
 import Header from "../components/header";
@@ -38,23 +36,6 @@ const fetchClerkAuth = createServerFn({ method: "GET" }).handler(async () => {
   const token = await auth.getToken({ template: "convex" });
   return { userId: auth.userId, token };
 });
-{{else if (and (eq backend "convex") (eq auth "better-auth"))}}
-import { createServerFn } from "@tanstack/react-start";
-import { getWebRequest, getCookie } from "@tanstack/react-start/server";
-import { ConvexBetterAuthProvider } from "@convex-dev/better-auth/react";
-import { fetchSession, getCookieName } from "@convex-dev/better-auth/react-start";
-import { authClient } from "@/lib/auth-client";
-import { createAuth } from "@{{projectName}}/backend/convex/auth";
-
-const fetchAuth = createServerFn({ method: "GET" }).handler(async () => {
-  const { session } = await fetchSession(getWebRequest());
-  const sessionCookieName = getCookieName(createAuth);
-  const token = getCookie(sessionCookieName);
-  return {
-    userId: session?.user.id,
-    token,
-  };
-});
 {{/if}}
 
 {{#if (eq backend "convex")}}
@@ -114,14 +95,6 @@ export const Route = createRootRouteWithContext<RouterAppContext>()({
     }
     return { userId, token };
   },
-  {{else if (and (eq backend "convex") (eq auth "better-auth"))}}
-  beforeLoad: async (ctx) => {
-    const { userId, token } = await fetchAuth();
-    if (token) {
-      ctx.context.convexQueryClient.serverHttpClient?.setAuth(token);
-    }
-    return { userId, token };
-  },
   {{/if}}
 });
 
@@ -149,26 +122,6 @@ function RootDocument() {
       </ConvexProviderWithClerk>
     </ClerkProvider>
   );
-  {{else if (and (eq backend "convex") (eq auth "better-auth"))}}
-  const context = useRouteContext({ from: Route.id });
-  return (
-    <ConvexBetterAuthProvider client={context.convexClient} authClient={authClient}>
-      <html lang="en" className="dark">
-        <head>
-          <HeadContent />
-        </head>
-        <body>
-          <div className="grid h-svh grid-rows-[auto_1fr]">
-            <Header />
-            {isFetching ? <Loader /> : <Outlet />}
-          </div>
-          <Toaster richColors />
-          <TanStackRouterDevtools position="bottom-left" />
-          <Scripts />
-        </body>
-      </html>
-    </ConvexBetterAuthProvider>
-  );
   {{else}}
   return (
     <html lang="en" className="dark">

package/templates/frontend/react/tanstack-start/src/routes/index.tsx.hbs

@@ -1,7 +1,7 @@
 import { createFileRoute } from "@tanstack/react-router";
 {{#if (eq backend "convex")}}
 import { convexQuery } from "@convex-dev/react-query";
-import { useQuery } from "@tanstack/react-query";
+import { useSuspenseQuery } from "@tanstack/react-query";
 import { api } from "@{{projectName}}/backend/convex/_generated/api";
 {{else if (or (eq api "trpc") (eq api "orpc"))}}
 import { useQuery } from "@tanstack/react-query";
@@ -35,7 +35,7 @@ const TITLE_TEXT = `
 
 function HomeComponent() {
   {{#if (eq backend "convex")}}
-  const healthCheck = useQuery(convexQuery(api.healthCheck.get, {}));
+  const healthCheck = useSuspenseQuery(convexQuery(api.healthCheck.get, {}));
   {{else if (eq api "trpc")}}
   const trpc = useTRPC();
   const healthCheck = useQuery(trpc.healthCheck.queryOptions());

package/templates/frontend/react/web-base/src/components/header.tsx.hbs

@@ -9,7 +9,7 @@ import { Link } from "@tanstack/react-router";
 {{#unless (includes frontend "tanstack-start")}}
 import { ModeToggle } from "./mode-toggle";
 {{/unless}}
-{{#if (and (eq auth "better-auth") (ne backend "convex"))}}
+{{#if (eq auth "better-auth")}}
 import UserMenu from "./user-menu";
 {{/if}}
 
@@ -67,7 +67,7 @@ export default function Header() {
           {{#unless (includes frontend "tanstack-start")}}
           <ModeToggle />
           {{/unless}}
-          {{#if (and (eq auth "better-auth") (ne backend "convex"))}}
+          {{#if (eq auth "better-auth")}}
           <UserMenu />
           {{/if}}
         </div>

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

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

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

@@ -1,48 +0,0 @@
-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

@@ -1,7 +0,0 @@
-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

@@ -1,12 +0,0 @@
-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

@@ -1,16 +0,0 @@
-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

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