create-better-t-stack 3.11.0 → 3.11.1

package/dist/cli.mjs

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

package/dist/{src-XVvJUQ_h.mjs → src-Dc2OdxbP.mjs}

@@ -64,8 +64,8 @@ function getDefaultConfig() {
 const DEFAULT_CONFIG = getDefaultConfig();
 const dependencyVersionMap = {
 	typescript: "^5",
-	"better-auth": "^1.4.7",
-	"@better-auth/expo": "^1.4.7",
+	"better-auth": "^1.4.9",
+	"@better-auth/expo": "^1.4.9",
 	"@clerk/nextjs": "^6.31.5",
 	"@clerk/clerk-react": "^5.45.0",
 	"@clerk/tanstack-react-start": "^0.26.3",
@@ -138,13 +138,14 @@ const dependencyVersionMap = {
 	"convex-svelte": "^0.0.12",
 	"convex-nuxt": "0.1.5",
 	"convex-vue": "^0.1.5",
-	"@convex-dev/better-auth": "^0.10.6",
+	"@convex-dev/better-auth": "^0.10.9",
 	"@tanstack/svelte-query": "^5.85.3",
 	"@tanstack/svelte-query-devtools": "^5.85.3",
 	"@tanstack/vue-query-devtools": "^5.90.2",
 	"@tanstack/vue-query": "^5.90.2",
 	"@tanstack/react-query-devtools": "^5.91.1",
 	"@tanstack/react-query": "^5.90.12",
+	"@tanstack/react-router-ssr-query": "^1.142.7",
 	"@tanstack/solid-query": "^5.87.4",
 	"@tanstack/solid-query-devtools": "^5.87.4",
 	"@tanstack/solid-router-devtools": "^1.131.44",
@@ -4171,7 +4172,10 @@ function getConvexDependencies(frontend) {
 		web: { dependencies: ["convex"] },
 		native: { dependencies: ["convex"] }
 	};
-	if (frontend.includes("tanstack-start")) deps.web.dependencies.push("@convex-dev/react-query");
+	if (frontend.includes("tanstack-start")) {
+		deps.web.dependencies.push("@convex-dev/react-query");
+		deps.web.dependencies.push("@tanstack/react-router-ssr-query");
+	}
 	if (frontend.includes("svelte")) deps.web.dependencies.push("convex-svelte");
 	if (frontend.includes("nuxt")) deps.web.dependencies.push("convex-nuxt", "convex-vue");
 	return deps;
@@ -4367,12 +4371,12 @@ async function setupAuth(config) {
 				if (convexBackendDirExists) {
 					await addPackageDependency({
 						dependencies: ["better-auth", "@convex-dev/better-auth"],
-						customDependencies: { "better-auth": "1.4.7" },
+						customDependencies: { "better-auth": "1.4.9" },
 						projectDir: convexBackendDir
 					});
 					if (hasNativeForBA) await addPackageDependency({
 						dependencies: ["@better-auth/expo"],
-						customDependencies: { "@better-auth/expo": "1.4.7" },
+						customDependencies: { "@better-auth/expo": "1.4.9" },
 						projectDir: convexBackendDir
 					});
 				}
@@ -4382,17 +4386,17 @@ async function setupAuth(config) {
 					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.4.7" },
+						customDependencies: { "better-auth": "1.4.9" },
 						projectDir: clientDir
 					});
 					else if (hasTanStackStart) await addPackageDependency({
 						dependencies: ["better-auth", "@convex-dev/better-auth"],
-						customDependencies: { "better-auth": "1.4.7" },
+						customDependencies: { "better-auth": "1.4.9" },
 						projectDir: clientDir
 					});
 					else if (hasViteReactOther) await addPackageDependency({
 						dependencies: ["better-auth", "@convex-dev/better-auth"],
-						customDependencies: { "better-auth": "1.4.7" },
+						customDependencies: { "better-auth": "1.4.9" },
 						projectDir: clientDir
 					});
 				}
@@ -4406,8 +4410,8 @@ async function setupAuth(config) {
 						"@convex-dev/better-auth"
 					],
 					customDependencies: {
-						"better-auth": "1.4.7",
-						"@better-auth/expo": "1.4.7"
+						"better-auth": "1.4.9",
+						"@better-auth/expo": "1.4.9"
 					},
 					projectDir: nativeDir
 				});
@@ -5944,7 +5948,7 @@ ${generateProjectStructure(projectName, frontend, backend, addons, isConvex, api
 
 ## Available Scripts
 
-${generateScriptsList(packageManagerRunCmd, database, orm, auth, hasNative, addons, backend)}
+${generateScriptsList(packageManagerRunCmd, database, orm, auth, hasNative, addons, backend, options.dbSetup)}
 `;
 }
 function generateStackDescription(frontend, backend, api, isConvex) {
@@ -6099,15 +6103,13 @@ function generateDatabaseSetup(database, _auth, packageManagerRunCmd, orm, dbSet
 	if (database === "none") return "";
 	const isBackendSelf = backend === "self";
 	const envPath = isBackendSelf ? "apps/web/.env" : "apps/server/.env";
-	const dbLocalPath = "packages/db";
 	let setup = "## Database Setup\n\n";
 	if (database === "sqlite") setup += `This project uses SQLite${orm === "drizzle" ? " with Drizzle ORM" : orm === "prisma" ? " with Prisma" : ` with ${orm}`}.
 
-1. Start the local SQLite database:
+ 1. Start the local SQLite database (optional):
 ${dbSetup === "d1" ? "D1 local development and migrations are handled automatically by Alchemy during dev and deploy." : `\`\`\`bash
-cd ${dbLocalPath} && ${packageManagerRunCmd} db:local
-\`\`\`
-`}
+${packageManagerRunCmd} db:local
+\`\`\``}
 
 2. Update your \`.env\` file in the \`${isBackendSelf ? "apps/web" : "apps/server"}\` directory with the appropriate connection details if needed.
 `;
@@ -6140,7 +6142,7 @@ ${packageManagerRunCmd} db:push
 `;
 	return setup;
 }
-function generateScriptsList(packageManagerRunCmd, database, orm, _auth, hasNative, addons, backend) {
+function generateScriptsList(packageManagerRunCmd, database, orm, _auth, hasNative, addons, backend, dbSetup) {
 	const isConvex = backend === "convex";
 	const isBackendNone = backend === "none";
 	const isBackendSelf = backend === "self";
@@ -6160,8 +6162,8 @@ function generateScriptsList(packageManagerRunCmd, database, orm, _auth, hasNati
 		scripts += `
 - \`${packageManagerRunCmd} db:push\`: Push schema changes to database
 - \`${packageManagerRunCmd} db:studio\`: Open database studio UI`;
-		if (database === "sqlite" && orm === "drizzle") scripts += `
-- \`cd packages/db && ${packageManagerRunCmd} db:local\`: Start the local SQLite database`;
+		if (database === "sqlite" && dbSetup !== "d1") scripts += `
+- \`${packageManagerRunCmd} db:local\`: Start the local SQLite database`;
 	}
 	if (addons.includes("biome")) scripts += `
 - \`${packageManagerRunCmd} check\`: Run Biome formatting and linting`;
@@ -6348,7 +6350,7 @@ async function displayPostInstallInstructions(config) {
 	let output = `${pc.bold("Next steps")}\n${pc.cyan("1.")} ${cdCmd}\n`;
 	let stepCounter = 2;
 	if (!depsInstalled) output += `${pc.cyan(`${stepCounter++}.`)} ${packageManager} install\n`;
-	if (database === "sqlite" && dbSetup === "none" && (serverDeploy === "alchemy" || webDeploy === "alchemy")) output += `${pc.cyan(`${stepCounter++}.`)} ${runCmd} db:local\n${pc.dim("   (starts local SQLite server for Workers compatibility)")}\n`;
+	if (database === "sqlite" && dbSetup !== "d1") output += `${pc.cyan(`${stepCounter++}.`)} ${runCmd} db:local\n${pc.dim("   (optional - starts local SQLite database)")}\n`;
 	if (isConvex) {
 		output += `${pc.cyan(`${stepCounter++}.`)} ${runCmd} dev:setup\n${pc.dim("   (this will guide you through Convex project setup)")}\n`;
 		output += `${pc.cyan(`${stepCounter++}.`)} Copy environment variables from\n${pc.white("   packages/backend/.env.local")} to ${pc.white("apps/*/.env")}\n`;
@@ -6635,7 +6637,7 @@ async function updateRootPackageJson(projectDir, options) {
 			if (!isD1Alchemy) scripts["db:migrate"] = pmConfig.filter(dbPackageName, "db:migrate");
 		}
 	}
-	if (database === "sqlite" && dbSetup !== "d1" && orm !== "none") scripts["db:local"] = pmConfig.filter(dbPackageName, "db:local");
+	if (database === "sqlite" && dbSetup !== "d1") scripts["db:local"] = pmConfig.filter(dbPackageName, "db:local");
 	if (dbSetup === "docker") {
 		scripts["db:start"] = pmConfig.filter(dbPackageName, "db:start");
 		scripts["db:watch"] = pmConfig.filter(dbPackageName, "db:watch");

package/package.json

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

package/templates/addons/turborepo/turbo.json.hbs

@@ -55,6 +55,11 @@
 		"db:down": {
 			"cache": false,
 			"persistent": true
+		}{{/if}}
+		{{#if (and (eq database "sqlite") (ne dbSetup "d1"))}},
+		"db:local": {
+			"cache": false,
+			"persistent": true
 		}
 		{{/if}}
 	}

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

@@ -8,10 +8,9 @@ import { convex, crossDomain } from "@convex-dev/better-auth/plugins";
 import { convex } from "@convex-dev/better-auth/plugins";
 {{/if}}
 import { components } from "./_generated/api";
-import { DataModel } from "./_generated/dataModel";
+import type { DataModel } from "./_generated/dataModel";
 import { query } from "./_generated/server";
 import { betterAuth } from "better-auth";
-import { v } from "convex/values";
 import authConfig from "./auth.config";
 
 {{#if (or (includes frontend "tanstack-start") (includes frontend "next"))}}
@@ -63,8 +62,7 @@ export { createAuth };
 
 export const getCurrentUser = query({
   args: {},
-  returns: v.any(),
-  handler: async function (ctx) {
-    return authComponent.getAuthUser(ctx);
+  handler: async (ctx) => {
+    return await authComponent.safeGetAuthUser(ctx);
   },
 });

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

@@ -1,16 +1,17 @@
 import { query } from "./_generated/server";
+import { authComponent } from "./auth";
 
 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",
-        };
-    },
+  args: {},
+  handler: async (ctx) => {
+    const authUser = await authComponent.safeGetAuthUser(ctx);
+    if (!authUser) {
+      return {
+        message: "Not authenticated",
+      };
+    }
+    return {
+      message: "This is private",
+    };
+  },
 });

package/templates/auth/better-auth/convex/web/react/next/src/lib/auth-client.ts.hbs

@@ -2,5 +2,5 @@ import { createAuthClient } from "better-auth/react";
 import { convexClient } from "@convex-dev/better-auth/client/plugins";
 
 export const authClient = createAuthClient({
-    plugins: [convexClient()],
-});
+  plugins: [convexClient()],
+});

package/templates/auth/better-auth/convex/web/react/next/src/lib/auth-server.ts.hbs

@@ -1,4 +1,5 @@
 import { convexBetterAuthNextJs } from "@convex-dev/better-auth/nextjs";
+import { isAuthError } from "@/lib/utils";
 
 export const {
   handler,

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

@@ -72,7 +72,7 @@ export const web = await Nextjs("web", {
     {{#if (eq auth "clerk")}}
     CLERK_SECRET_KEY: alchemy.secret.env.CLERK_SECRET_KEY,
     {{/if}}
-    {{#if (includes examples "ai")}}
+    {{#if (and (includes examples "ai") (ne backend "convex"))}}
     GOOGLE_GENERATIVE_AI_API_KEY: alchemy.secret.env.GOOGLE_GENERATIVE_AI_API_KEY,
     {{/if}}
     {{#if (eq payments "polar")}}
@@ -146,7 +146,7 @@ export const web = await TanStackStart("web", {
     {{#if (eq auth "clerk")}}
     CLERK_SECRET_KEY: alchemy.secret.env.CLERK_SECRET_KEY,
     {{/if}}
-    {{#if (includes examples "ai")}}
+    {{#if (and (includes examples "ai") (ne backend "convex"))}}
     GOOGLE_GENERATIVE_AI_API_KEY: alchemy.secret.env.GOOGLE_GENERATIVE_AI_API_KEY,
     {{/if}}
     {{#if (eq payments "polar")}}

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

@@ -1,9 +1,8 @@
 {{#if (eq backend "convex")}}
 import { createRouter as createTanStackRouter } from "@tanstack/react-router";
 import { QueryClient } from "@tanstack/react-query";
-import { routerWithQueryClient } from "@tanstack/react-router-with-query";
+import { setupRouterSsrQueryIntegration } from "@tanstack/react-router-ssr-query";
 import { ConvexQueryClient } from "@convex-dev/react-query";
-import { ConvexProvider, ConvexReactClient } from "convex/react";
 import { routeTree } from "./routeTree.gen";
 import Loader from "./components/loader";
 import "./index.css";
@@ -27,21 +26,12 @@ import { orpc, queryClient } from "./utils/orpc";
 
 {{#if (eq backend "convex")}}
 export function getRouter() {
-  const CONVEX_URL = (import.meta as any).env.VITE_CONVEX_URL!;
-  if (!CONVEX_URL) {
-    console.error("missing envar VITE_CONVEX_URL");
+  const convexUrl = (import.meta as any).env.VITE_CONVEX_URL!;
+  if (!convexUrl) {
+    throw new Error("VITE_CONVEX_URL is not set");
   }
-  const convex = new ConvexReactClient(CONVEX_URL, {
-    unsavedChangesWarning: false,
-  });
 
-  {{#if (eq auth "better-auth")}}
-  const convexQueryClient = new ConvexQueryClient(convex, {
-    expectAuth: true,
-  });
-  {{else}}
-  const convexQueryClient = new ConvexQueryClient(convex);
-  {{/if}}
+  const convexQueryClient = new ConvexQueryClient(convexUrl);
 
   const queryClient: QueryClient = new QueryClient({
     defaultOptions: {
@@ -53,21 +43,19 @@ export function getRouter() {
   });
   convexQueryClient.connect(queryClient);
 
-  const router = routerWithQueryClient(
-    createTanStackRouter({
-      routeTree,
-      defaultPreload: "intent",
-      defaultPendingComponent: () => <Loader />,
-      defaultNotFoundComponent: () => <div>Not Found</div>,
-      context: { queryClient, convexClient: convex, convexQueryClient },
-      Wrap: ({ children }) => (
-        <ConvexProvider client={convexQueryClient.convexClient}>
-          {children}
-        </ConvexProvider>
-      ),
-    }),
+  const router = createTanStackRouter({
+    routeTree,
+    defaultPreload: "intent",
+    defaultPendingComponent: () => <Loader />,
+    defaultNotFoundComponent: () => <div>Not Found</div>,
+    context: { queryClient, convexQueryClient },
+  });
+
+  setupRouterSsrQueryIntegration({
+    router,
     queryClient,
-  );
+  });
+
   return router;
 }
 {{else}}

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

@@ -17,7 +17,6 @@ import appCss from "../index.css?url";
 {{#if (eq backend "convex")}}
 import type { QueryClient } from "@tanstack/react-query";
 import type { ConvexQueryClient } from "@convex-dev/react-query";
-import type { ConvexReactClient } from "convex/react";
 {{else}}
 {{#if (or (eq api "trpc") (eq api "orpc"))}}
 import type { QueryClient } from "@tanstack/react-query";
@@ -49,7 +48,6 @@ const getAuth = createServerFn({ method: "GET" }).handler(async () => {
 {{#if (eq backend "convex")}}
 export interface RouterAppContext {
   queryClient: QueryClient;
-  convexClient: ConvexReactClient;
   convexQueryClient: ConvexQueryClient;
 }
 {{else}}
@@ -122,7 +120,7 @@ function RootDocument() {
   const context = useRouteContext({ from: Route.id });
   return (
     <ClerkProvider>
-      <ConvexProviderWithClerk client={context.convexClient} useAuth={useAuth}>
+      <ConvexProviderWithClerk client={context.convexQueryClient.convexClient} useAuth={useAuth}>
         <html lang="en" className="dark">
           <head>
             <HeadContent />
@@ -144,7 +142,7 @@ function RootDocument() {
   const context = useRouteContext({ from: Route.id });
   return (
     <ConvexBetterAuthProvider
-      client={context.convexClient}
+      client={context.convexQueryClient.convexClient}
       authClient={authClient}
       initialToken={context.token}
     >