create-better-t-stack 3.8.3-pr730.1784e47 → 3.9.0-pr730.0ee9844

package/README.md

@@ -38,7 +38,7 @@ Follow the prompts to configure your project or use the `--yes` flag for default
 | **Runtime**              | • Bun<br>• Node.js<br>• Cloudflare Workers<br>• None                                                                                                                                                                                                       |
 | **Database**             | • SQLite<br>• PostgreSQL<br>• MySQL<br>• MongoDB<br>• None                                                                                                                                                                                                 |
 | **ORM**                  | • Drizzle (TypeScript-first)<br>• Prisma (feature-rich)<br>• Mongoose (for MongoDB)<br>• None                                                                                                                                                              |
-| **Database Setup**       | • Turso (SQLite)<br>• Cloudflare D1 (SQLite)<br>• Neon (PostgreSQL)<br>• Supabase (PostgreSQL)<br>• Prisma Postgres<br>• MongoDB Atlas<br>• None (manual setup)                                                                    |
+| **Database Setup**       | • Turso (SQLite)<br>• Cloudflare D1 (SQLite)<br>• Neon (PostgreSQL)<br>• Supabase (PostgreSQL)<br>• Prisma Postgres<br>• MongoDB Atlas<br>• None (manual setup)                                                                                            |
 | **Authentication**       | Better-Auth (email/password, with more options coming soon)                                                                                                                                                                                                |
 | **Styling**              | Tailwind CSS with shadcn/ui components                                                                                                                                                                                                                     |
 | **Addons**               | • PWA support<br>• Tauri (desktop applications)<br>• Starlight (documentation site)<br>• Biome (linting and formatting)<br>• Husky (Git hooks)<br>• Turborepo (optimized builds)                                                                           |
@@ -77,6 +77,7 @@ Options:
 ## Telemetry
 
 This CLI collects anonymous usage data to help improve the tool. The data collected includes:
+
 - Configuration options selected
 - CLI version
 - Node.js version
@@ -90,7 +91,7 @@ You can disable telemetry by setting the `BTS_TELEMETRY_DISABLED` environment va
 
 ```bash
 # Disable telemetry for a single run
-BTS_TELEMETRY_DISABLED=1 npx create-better-t-stack my-app
+BTS_TELEMETRY_DISABLED=1 npx create-better-t-stack
 
 # Disable telemetry globally in your shell profile (.bashrc, .zshrc, etc.)
 export BTS_TELEMETRY_DISABLED=1
@@ -101,85 +102,85 @@ export BTS_TELEMETRY_DISABLED=1
 Create a project with default configuration:
 
 ```bash
-npx create-better-t-stack my-app --yes
+npx create-better-t-stack --yes
 ```
 
 Create a project with specific options:
 
 ```bash
-npx create-better-t-stack my-app --database postgres --orm drizzle --auth --addons pwa biome
+npx create-better-t-stack --database postgres --orm drizzle --auth --addons pwa biome
 ```
 
 Create a project with Elysia backend and Node.js runtime:
 
 ```bash
-npx create-better-t-stack my-app --backend elysia --runtime node
+npx create-better-t-stack --backend elysia --runtime node
 ```
 
 Create a project with multiple frontend options (one web + one native):
 
 ```bash
-npx create-better-t-stack my-app --frontend tanstack-router native-bare
+npx create-better-t-stack --frontend tanstack-router native-bare
 ```
 
 Create a project with examples:
 
 ```bash
-npx create-better-t-stack my-app --examples todo ai
+npx create-better-t-stack --examples todo ai
 ```
 
 Create a project with Turso database setup:
 
 ```bash
-npx create-better-t-stack my-app --database sqlite --orm drizzle --db-setup turso
+npx create-better-t-stack --database sqlite --orm drizzle --db-setup turso
 ```
 
 Create a project with Supabase PostgreSQL setup:
 
 ```bash
-npx create-better-t-stack my-app --database postgres --orm drizzle --db-setup supabase --auth
+npx create-better-t-stack --database postgres --orm drizzle --db-setup supabase --auth
 ```
 
 Create a project with Convex backend:
 
 ```bash
-npx create-better-t-stack my-app --backend convex --frontend tanstack-router
+npx create-better-t-stack --backend convex --frontend tanstack-router
 ```
 
 Create a project with documentation site:
 
 ```bash
-npx create-better-t-stack my-app --addons starlight
+npx create-better-t-stack --addons starlight
 ```
 
 Create a minimal TypeScript project with no backend:
 
 ```bash
-npx create-better-t-stack my-app --backend none --frontend tanstack-router
+npx create-better-t-stack --backend none --frontend tanstack-router
 ```
 
 Create a backend-only project with no frontend:
 
 ```bash
-npx create-better-t-stack my-app --frontend none --backend hono --database postgres --orm drizzle
+npx create-better-t-stack --frontend none --backend hono --database postgres --orm drizzle
 ```
 
 Create a simple frontend-only project:
 
 ```bash
-npx create-better-t-stack my-app --backend none --frontend next --addons none --examples none
+npx create-better-t-stack --backend none --frontend next --addons none --examples none
 ```
 
 Create a Cloudflare Workers project:
 
 ```bash
-npx create-better-t-stack my-app --backend hono --runtime workers --database sqlite --orm drizzle --db-setup d1
+npx create-better-t-stack --backend hono --runtime workers --database sqlite --orm drizzle --db-setup d1
 ```
 
 Create a minimal API-only project:
 
 ```bash
-npx create-better-t-stack my-app --frontend none --backend hono --api trpc --database none --addons none
+npx create-better-t-stack --frontend none --backend hono --api trpc --database none --addons none
 ```
 
 ## Compatibility Notes

package/dist/cli.mjs

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

package/dist/{src-GZpht_dQ.mjs → src-DW15ZRe9.mjs}

@@ -15,7 +15,7 @@ import { $, execa } from "execa";
 import { IndentationText, Node, Project, QuoteKind, SyntaxKind } from "ts-morph";
 import { glob } from "tinyglobby";
 import handlebars from "handlebars";
-import { Biome } from "@biomejs/js-api/nodejs";
+import { format } from "oxfmt";
 import yaml from "yaml";
 import os$1 from "node:os";
 
@@ -95,7 +95,8 @@ const dependencyVersionMap = {
 	"@vite-pwa/assets-generator": "^1.0.0",
 	"@tauri-apps/cli": "^2.4.0",
 	"@biomejs/biome": "^2.2.0",
-	oxlint: "^1.32.0",
+	oxlint: "^1.34.0",
+	oxfmt: "^0.19.0",
 	husky: "^9.1.7",
 	"lint-staged": "^16.1.2",
 	tsx: "^4.19.2",
@@ -363,7 +364,7 @@ function getAddonDisplay(addon) {
 			break;
 		case "oxlint":
 			label = "Oxlint";
-			hint = "Rust-powered linter";
+			hint = "Oxlint + Oxfmt (linting & formatting)";
 			break;
 		case "ultracite":
 			label = "Ultracite";
@@ -2022,6 +2023,38 @@ async function setupFumadocs(config) {
 	}
 }
 
+//#endregion
+//#region src/helpers/addons/oxlint-setup.ts
+async function setupOxlint(projectDir, packageManager) {
+	await addPackageDependency({
+		devDependencies: ["oxlint", "oxfmt"],
+		projectDir
+	});
+	const packageJsonPath = path.join(projectDir, "package.json");
+	if (await fs.pathExists(packageJsonPath)) {
+		const packageJson = await fs.readJson(packageJsonPath);
+		packageJson.scripts = {
+			...packageJson.scripts,
+			check: "oxlint && oxfmt --write"
+		};
+		await fs.writeJson(packageJsonPath, packageJson, { spaces: 2 });
+	}
+	const s = spinner();
+	const oxlintInitCommand = getPackageExecutionCommand(packageManager, "oxlint@latest --init");
+	s.start("Initializing oxlint and oxfmt...");
+	await execa(oxlintInitCommand, {
+		cwd: projectDir,
+		env: { CI: "true" },
+		shell: true
+	});
+	await execa(getPackageExecutionCommand(packageManager, "oxfmt@latest --init"), {
+		cwd: projectDir,
+		env: { CI: "true" },
+		shell: true
+	});
+	s.stop("oxlint and oxfmt initialized successfully!");
+}
+
 //#endregion
 //#region src/helpers/addons/ruler-setup.ts
 async function setupRuler(config) {
@@ -2391,7 +2424,7 @@ ${pc.cyan("Docs:")} ${pc.underline("https://turborepo.com/docs")}
 			await setupHusky(projectDir, linter);
 		}
 	}
-	if (addons.includes("oxlint")) await setupOxlint(projectDir, packageManager);
+	if (hasOxlint) await setupOxlint(projectDir, packageManager);
 	if (addons.includes("starlight")) await setupStarlight(config);
 	if (addons.includes("ruler")) await setupRuler(config);
 	if (addons.includes("fumadocs")) await setupFumadocs(config);
@@ -2433,7 +2466,7 @@ async function setupHusky(projectDir, linter) {
 			...packageJson.scripts,
 			prepare: "husky"
 		};
-		if (linter === "oxlint") packageJson["lint-staged"] = { "**/*.{js,mjs,cjs,jsx,ts,mts,cts,tsx,vue,astro,svelte}": "oxlint" };
+		if (linter === "oxlint") packageJson["lint-staged"] = { "*": ["oxlint", "oxfmt --write"] };
 		else if (linter === "biome") packageJson["lint-staged"] = { "*.{js,ts,cjs,mjs,d.cts,d.mts,jsx,tsx,json,jsonc}": ["biome check --write ."] };
 		else packageJson["lint-staged"] = { "**/*.{js,mjs,cjs,jsx,ts,mts,cts,tsx,vue,astro,svelte}": "" };
 		await fs.writeJson(packageJsonPath, packageJson, { spaces: 2 });
@@ -2464,30 +2497,6 @@ async function setupPwa(projectDir, frontends) {
 	const viteConfigTs = path.join(clientPackageDir, "vite.config.ts");
 	if (await fs.pathExists(viteConfigTs)) await addPwaToViteConfig(viteConfigTs, path.basename(projectDir));
 }
-async function setupOxlint(projectDir, packageManager) {
-	await addPackageDependency({
-		devDependencies: ["oxlint"],
-		projectDir
-	});
-	const packageJsonPath = path.join(projectDir, "package.json");
-	if (await fs.pathExists(packageJsonPath)) {
-		const packageJson = await fs.readJson(packageJsonPath);
-		packageJson.scripts = {
-			...packageJson.scripts,
-			check: "oxlint"
-		};
-		await fs.writeJson(packageJsonPath, packageJson, { spaces: 2 });
-	}
-	const oxlintInitCommand = getPackageExecutionCommand(packageManager, "oxlint@latest --init");
-	const s = spinner();
-	s.start("Initializing oxlint...");
-	await execa(oxlintInitCommand, {
-		cwd: projectDir,
-		env: { CI: "true" },
-		shell: true
-	});
-	s.stop("oxlint initialized successfully!");
-}
 
 //#endregion
 //#region src/helpers/core/detect-project-config.ts
@@ -2543,61 +2552,16 @@ async function installDependencies({ projectDir, packageManager }) {
 }
 
 //#endregion
-//#region src/utils/biome-formatter.ts
-function initializeBiome() {
-	try {
-		const biome = new Biome();
-		const projectKey = biome.openProject("./").projectKey;
-		biome.applyConfiguration(projectKey, {
-			formatter: {
-				enabled: true,
-				indentStyle: "tab",
-				indentWidth: 2,
-				lineWidth: 80
-			},
-			linter: { enabled: false },
-			javascript: { formatter: { enabled: true } },
-			json: { formatter: { enabled: true } }
-		});
-		return {
-			biome,
-			projectKey
-		};
-	} catch {
-		return null;
-	}
-}
-function isSupportedFile(filePath) {
-	const ext = path.extname(filePath).toLowerCase();
-	return [
-		".js",
-		".jsx",
-		".ts",
-		".tsx",
-		".json",
-		".jsonc"
-	].includes(ext);
-}
-function shouldSkipFile(filePath) {
-	const basename = path.basename(filePath);
-	return [
-		".hbs",
-		"package-lock.json",
-		"yarn.lock",
-		"pnpm-lock.yaml",
-		"bun.lock",
-		".d.ts"
-	].some((pattern) => basename.includes(pattern));
-}
-function formatFileWithBiome(filePath, content) {
-	if (!isSupportedFile(filePath) || shouldSkipFile(filePath)) return null;
+//#region src/utils/file-formatter.ts
+const formatOptions = {
+	experimentalSortPackageJson: true,
+	experimentalSortImports: { order: "asc" }
+};
+async function formatFile(filePath, content) {
 	try {
-		const biomeResult = initializeBiome();
-		if (!biomeResult) return null;
-		const { biome, projectKey } = biomeResult;
-		const result = biome.formatContent(projectKey, content, { filePath: path.basename(filePath) });
-		if (result.diagnostics && result.diagnostics.length > 0) consola.debug(`Biome formatting diagnostics for ${filePath}:`, result.diagnostics);
-		return result.content;
+		const result = await format(path.basename(filePath), content, formatOptions);
+		if (result.errors && result.errors.length > 0) return null;
+		return result.code;
 	} catch {
 		return null;
 	}
@@ -2627,7 +2591,7 @@ async function processTemplate(srcPath, destPath, context) {
 			content = handlebars.compile(templateContent)(context);
 		} else content = await fs.readFile(srcPath, "utf-8");
 		try {
-			const formattedContent = await formatFileWithBiome(destPath, content);
+			const formattedContent = await formatFile(destPath, content);
 			if (formattedContent) content = formattedContent;
 		} catch (formatError) {
 			consola.debug(`Failed to format ${destPath}:`, formatError);
@@ -4513,10 +4477,12 @@ async function setupEnvironmentVariables(config) {
 				const hasNative = frontend.includes("native-bare") || frontend.includes("native-uniwind") || frontend.includes("native-unistyles");
 				const hasWeb = hasWebFrontend$1;
 				if (!await fs.pathExists(envLocalPath) || !(await fs.readFile(envLocalPath, "utf8")).includes("npx convex env set")) {
+					let siteUrlComments = "";
+					if (hasWeb) siteUrlComments += "# npx convex env set SITE_URL http://localhost:3001\n";
+					if (hasNative) siteUrlComments += "# npx convex env set NATIVE_SITE_URL http://localhost:8081  # For Expo Web\n";
 					const convexCommands = `# Set Convex environment variables
 # npx convex env set BETTER_AUTH_SECRET=$(openssl rand -base64 32)
-${hasWeb ? "# npx convex env set SITE_URL http://localhost:3001\n" : ""}
-`;
+${siteUrlComments}`;
 					await fs.appendFile(envLocalPath, convexCommands);
 				}
 				const convexBackendVars = [];
@@ -4525,6 +4491,11 @@ ${hasWeb ? "# npx convex env set SITE_URL http://localhost:3001\n" : ""}
 					value: "",
 					condition: true,
 					comment: "Same as CONVEX_URL but ends in .site"
+				}, {
+					key: "NATIVE_SITE_URL",
+					value: "http://localhost:8081",
+					condition: true,
+					comment: "Expo Web URL for authentication"
 				});
 				if (hasWeb) convexBackendVars.push({
 					key: hasNextJs ? "NEXT_PUBLIC_CONVEX_SITE_URL" : "VITE_CONVEX_SITE_URL",
@@ -4534,7 +4505,8 @@ ${hasWeb ? "# npx convex env set SITE_URL http://localhost:3001\n" : ""}
 				}, {
 					key: "SITE_URL",
 					value: "http://localhost:3001",
-					condition: true
+					condition: true,
+					comment: "Web app URL for authentication"
 				});
 				await addEnvVariablesToFile(envLocalPath, convexBackendVars);
 			}
@@ -5940,6 +5912,7 @@ function generateFeaturesList(database, auth, addons, orm, runtime, frontend, ba
 	for (const addon of addons) if (addon === "pwa") addonsList.push("- **PWA** - Progressive Web App support");
 	else if (addon === "tauri") addonsList.push("- **Tauri** - Build native desktop applications");
 	else if (addon === "biome") addonsList.push("- **Biome** - Linting and formatting");
+	else if (addon === "oxlint") addonsList.push("- **Oxlint** - Oxlint + Oxfmt (linting & formatting)");
 	else if (addon === "husky") addonsList.push("- **Husky** - Git hooks for code quality");
 	else if (addon === "starlight") addonsList.push("- **Starlight** - Documentation site with Astro");
 	else if (addon === "turborepo") addonsList.push("- **Turborepo** - Optimized monorepo build system");
@@ -6015,6 +5988,8 @@ function generateScriptsList(packageManagerRunCmd, database, orm, _auth, hasNati
 	}
 	if (addons.includes("biome")) scripts += `
 - \`${packageManagerRunCmd} check\`: Run Biome formatting and linting`;
+	if (addons.includes("oxlint")) scripts += `
+- \`${packageManagerRunCmd} check\`: Run Oxlint and Oxfmt`;
 	if (addons.includes("pwa")) scripts += `
 - \`cd apps/web && ${packageManagerRunCmd} generate-pwa-assets\`: Generate PWA assets`;
 	if (addons.includes("tauri")) scripts += `
@@ -6166,10 +6141,12 @@ async function displayPostInstallInstructions(config) {
 	const isBackendSelf = backend === "self";
 	const runCmd = packageManager === "npm" ? "npm run" : packageManager === "pnpm" ? "pnpm run" : "bun run";
 	const cdCmd = `cd ${relativePath}`;
-	const hasHuskyOrBiome = addons?.includes("husky") || addons?.includes("biome");
+	const hasHusky = addons?.includes("husky");
+	const hasLinting = addons?.includes("biome") || addons?.includes("oxlint");
 	const databaseInstructions = !isConvex && database !== "none" ? await getDatabaseInstructions(database, orm, runCmd, runtime, dbSetup, serverDeploy, backend) : "";
 	const tauriInstructions = addons?.includes("tauri") ? getTauriInstructions(runCmd) : "";
-	const lintingInstructions = hasHuskyOrBiome ? getLintingInstructions(runCmd) : "";
+	const huskyInstructions = hasHusky ? getHuskyInstructions(runCmd) : "";
+	const lintingInstructions = hasLinting ? getLintingInstructions(runCmd) : "";
 	const nativeInstructions = (frontend?.includes("native-bare") || frontend?.includes("native-uniwind") || frontend?.includes("native-unistyles")) && backend !== "none" ? getNativeInstructions(isConvex, isBackendSelf, frontend || []) : "";
 	const pwaInstructions = addons?.includes("pwa") && frontend?.includes("react-router") ? getPwaInstructions() : "";
 	const starlightInstructions = addons?.includes("starlight") ? getStarlightInstructions(runCmd) : "";
@@ -6223,6 +6200,7 @@ async function displayPostInstallInstructions(config) {
 	if (nativeInstructions) output += `\n${nativeInstructions.trim()}\n`;
 	if (databaseInstructions) output += `\n${databaseInstructions.trim()}\n`;
 	if (tauriInstructions) output += `\n${tauriInstructions.trim()}\n`;
+	if (huskyInstructions) output += `\n${huskyInstructions.trim()}\n`;
 	if (lintingInstructions) output += `\n${lintingInstructions.trim()}\n`;
 	if (pwaInstructions) output += `\n${pwaInstructions.trim()}\n`;
 	if (alchemyDeployInstructions) output += `\n${alchemyDeployInstructions.trim()}\n`;
@@ -6244,6 +6222,9 @@ function getNativeInstructions(isConvex, isBackendSelf, _frontend) {
 	if (isConvex) instructions += `\n${pc.yellow("IMPORTANT:")} When using local development with Convex and native apps,\n   ensure you use your local IP address instead of localhost or 127.0.0.1\n   for proper connectivity.\n`;
 	return instructions;
 }
+function getHuskyInstructions(runCmd) {
+	return `${pc.bold("Git hooks with Husky:")}\n${pc.cyan("•")} Initialize hooks: ${`${runCmd} prepare`}\n`;
+}
 function getLintingInstructions(runCmd) {
 	return `${pc.bold("Linting and formatting:")}\n${pc.cyan("•")} Format and lint fix: ${`${runCmd} check`}\n`;
 }

package/package.json

@@ -1,52 +1,61 @@
 {
   "name": "create-better-t-stack",
-  "version": "3.8.3-pr730.1784e47",
+  "version": "3.9.0-pr730.0ee9844",
   "description": "A modern CLI tool for scaffolding end-to-end type-safe TypeScript projects with best practices and customizable configurations",
-  "type": "module",
-  "license": "MIT",
-  "author": "Aman Varshney",
-  "bin": {
-    "create-better-t-stack": "dist/cli.mjs"
-  },
-  "files": [
-    "templates",
-    "dist"
-  ],
   "keywords": [
+    "better-auth",
     "better-t-stack",
-    "typescript",
+    "biome",
     "boilerplate",
-    "starter",
     "cli",
-    "turborepo",
-    "trpc",
-    "better-auth",
-    "monorepo",
-    "fullstack",
-    "type-safety",
-    "react",
-    "react-native",
+    "drizzle",
+    "elysia",
     "expo",
+    "fullstack",
     "hono",
-    "elysia",
-    "drizzle",
+    "monorepo",
     "prisma",
-    "tanstack",
-    "tailwind",
-    "shadcn",
     "pwa",
+    "react",
+    "react-native",
+    "shadcn",
+    "starter",
+    "tailwind",
+    "tanstack",
     "tauri",
-    "biome"
+    "trpc",
+    "turborepo",
+    "type-safety",
+    "typescript"
   ],
+  "homepage": "https://better-t-stack.dev/",
+  "license": "MIT",
+  "author": "Aman Varshney",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/AmanVarshney01/create-better-t-stack.git",
     "directory": "apps/cli"
   },
+  "bin": {
+    "create-better-t-stack": "dist/cli.mjs"
+  },
+  "files": [
+    "dist",
+    "templates"
+  ],
+  "type": "module",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.mts",
+      "import": "./dist/index.mjs"
+    },
+    "./cli": {
+      "import": "./dist/cli.mjs"
+    }
+  },
   "publishConfig": {
     "access": "public"
   },
-  "homepage": "https://better-t-stack.dev/",
   "scripts": {
     "build": "tsdown --publint",
     "dev": "tsdown --watch",
@@ -57,19 +66,8 @@
     "test:ci": "bun run build && AGENT=1 bun test --bail=5",
     "prepublishOnly": "npm run build"
   },
-  "exports": {
-    ".": {
-      "types": "./dist/index.d.mts",
-      "import": "./dist/index.mjs"
-    },
-    "./cli": {
-      "import": "./dist/cli.mjs"
-    }
-  },
   "dependencies": {
-    "@better-t-stack/types": "3.8.3-pr730.1784e47",
-    "@biomejs/js-api": "^4.0.0",
-    "@biomejs/wasm-nodejs": "^2.3.8",
+    "@better-t-stack/types": "3.9.0-pr730.0ee9844",
     "@clack/prompts": "^1.0.0-alpha.8",
     "@orpc/server": "^1.12.2",
     "consola": "^3.4.2",
@@ -78,6 +76,7 @@
     "gradient-string": "^3.0.0",
     "handlebars": "^4.7.8",
     "jsonc-parser": "^3.3.1",
+    "oxfmt": "^0.19.0",
     "picocolors": "^1.1.1",
     "tinyglobby": "^0.2.15",
     "trpc-cli": "^0.12.1",

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

@@ -1,45 +1,44 @@
 import { createClient, type GenericCtx } from "@convex-dev/better-auth";
 {{#if (or (includes frontend "native-bare") (includes frontend "native-uniwind") (includes frontend "native-unistyles"))}}
-import { convex } from "@convex-dev/better-auth/plugins";
+import { convex, crossDomain } from "@convex-dev/better-auth/plugins";
 import { expo } from "@better-auth/expo";
+{{else if (or (includes frontend "tanstack-router") (includes frontend "react-router") (includes frontend "nuxt") (includes frontend "svelte") (includes frontend "solid"))}}
+import { convex, crossDomain } from "@convex-dev/better-auth/plugins";
 {{else}}
 import { convex } from "@convex-dev/better-auth/plugins";
 {{/if}}
-{{#if (or (includes frontend "tanstack-router") (includes frontend "react-router") (includes frontend "nuxt") (includes frontend "svelte") (includes frontend "solid"))}}
-import { 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";
 import { v } from "convex/values";
+import authConfig from "./auth.config";
 
-{{#if (or (includes frontend "tanstack-start") (includes frontend "next") (includes frontend "tanstack-router") (includes frontend "react-router") (includes frontend "nuxt") (includes frontend "svelte") (includes frontend "solid"))}}
+{{#if (or (includes frontend "tanstack-start") (includes frontend "next"))}}
+const siteUrl = process.env.SITE_URL!;
+{{else if (or (includes frontend "tanstack-router") (includes frontend "react-router") (includes frontend "nuxt") (includes frontend "svelte") (includes frontend "solid"))}}
 const siteUrl = process.env.SITE_URL!;
 {{/if}}
 {{#if (or (includes frontend "native-bare") (includes frontend "native-uniwind") (includes frontend "native-unistyles"))}}
 const nativeAppUrl = process.env.NATIVE_APP_URL || "mybettertapp://";
+const nativeSiteUrl = process.env.NATIVE_SITE_URL || "http://localhost:8081";
 {{/if}}
 
 export const authComponent = createClient<DataModel>(components.betterAuth);
 
-function createAuth(
-  ctx: GenericCtx<DataModel>,
-  { optionsOnly }: { optionsOnly?: boolean } = { optionsOnly: false }
-) {
+function createAuth(ctx: GenericCtx<DataModel>) {
   return betterAuth({
-    logger: {
-      disabled: optionsOnly,
-    },
     {{#if (and (or (includes frontend "native-bare") (includes frontend "native-uniwind") (includes frontend "native-unistyles")) (or (includes frontend "tanstack-start") (includes frontend "next")))}}
     baseURL: siteUrl,
-    trustedOrigins: [siteUrl, nativeAppUrl],
+    trustedOrigins: [siteUrl, nativeSiteUrl, nativeAppUrl],
+    {{else if (and (or (includes frontend "native-bare") (includes frontend "native-uniwind") (includes frontend "native-unistyles")) (or (includes frontend "tanstack-router") (includes frontend "react-router") (includes frontend "nuxt") (includes frontend "svelte") (includes frontend "solid")))}}
+    trustedOrigins: [siteUrl, nativeSiteUrl, nativeAppUrl],
     {{else if (or (includes frontend "native-bare") (includes frontend "native-uniwind") (includes frontend "native-unistyles"))}}
-    trustedOrigins: [nativeAppUrl],
+    trustedOrigins: [nativeSiteUrl, nativeAppUrl],
     {{else if (or (includes frontend "tanstack-start") (includes frontend "next"))}}
     baseURL: siteUrl,
     trustedOrigins: [siteUrl],
-    {{else}}
+    {{else if (or (includes frontend "tanstack-router") (includes frontend "react-router") (includes frontend "nuxt") (includes frontend "svelte") (includes frontend "solid"))}}
     trustedOrigins: [siteUrl],
     {{/if}}
     database: authComponent.adapter(ctx),
@@ -50,11 +49,14 @@ function createAuth(
     plugins: [
       {{#if (or (includes frontend "native-bare") (includes frontend "native-uniwind") (includes frontend "native-unistyles"))}}
       expo(),
-      {{/if}}
-      {{#if (or (includes frontend "tanstack-router") (includes frontend "react-router") (includes frontend "nuxt") (includes frontend "svelte") (includes frontend "solid"))}}
+      crossDomain({ siteUrl: nativeSiteUrl }),
+      {{else if (or (includes frontend "tanstack-router") (includes frontend "react-router") (includes frontend "nuxt") (includes frontend "svelte") (includes frontend "solid"))}}
       crossDomain({ siteUrl }),
       {{/if}}
-      convex(),
+      convex({
+        authConfig,
+        jwksRotateOnTokenGenerationError: true,
+      }),
     ],
   });
 }
@@ -67,4 +69,4 @@ export const getCurrentUser = query({
   handler: async function (ctx, args) {
     return authComponent.getAuthUser(ctx);
   },
-});
+});

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

@@ -3,10 +3,14 @@ import { authComponent, createAuth } from "./auth";
 
 const http = httpRouter();
 
-{{#if (or (includes frontend "tanstack-start") (includes frontend "next") (includes frontend "native-bare") (includes frontend "native-uniwind") (includes frontend "native-unistyles"))}}
+{{#if (or (includes frontend "tanstack-start") (includes frontend "next"))}}
+{{#if (or (includes frontend "native-bare") (includes frontend "native-uniwind") (includes frontend "native-unistyles"))}}
+authComponent.registerRoutes(http, createAuth, { cors: true });
+{{else}}
 authComponent.registerRoutes(http, createAuth);
+{{/if}}
 {{else}}
 authComponent.registerRoutes(http, createAuth, { cors: true });
 {{/if}}
 
-export default http;
+export default http;

package/templates/auth/better-auth/convex/native/base/lib/auth-client.ts.hbs

@@ -1,17 +1,22 @@
 import { createAuthClient } from "better-auth/react";
-import { convexClient } from "@convex-dev/better-auth/client/plugins";
+import { convexClient, crossDomainClient } from "@convex-dev/better-auth/client/plugins";
 import { expoClient } from "@better-auth/expo/client";
 import Constants from "expo-constants";
 import * as SecureStore from "expo-secure-store";
+import { Platform } from "react-native";
 
 export const authClient = createAuthClient({
   baseURL: process.env.EXPO_PUBLIC_CONVEX_SITE_URL,
   plugins: [
-    expoClient({
-      scheme: Constants.expoConfig?.scheme as string,
-      storagePrefix: Constants.expoConfig?.scheme as string,
-      storage: SecureStore,
-    }),
     convexClient(),
+    ...(Platform.OS === "web"
+      ? [crossDomainClient()]
+      : [
+          expoClient({
+            scheme: Constants.expoConfig?.scheme as string,
+            storagePrefix: Constants.expoConfig?.scheme as string,
+            storage: SecureStore,
+          }),
+        ]),
   ],
 });