create-better-t-stack 3.2.4 → 3.2.6-canary.46b928a7

package/dist/cli.js

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

package/dist/{src-BcBhk2Os.js → src-D60cASJW.js}

@@ -66,7 +66,7 @@ const dependencyVersionMap = {
 	"@better-auth/expo": "^1.3.13",
 	"@clerk/nextjs": "^6.31.5",
 	"@clerk/clerk-react": "^5.45.0",
-	"@clerk/tanstack-react-start": "^0.25.1",
+	"@clerk/tanstack-react-start": "^0.26.3",
 	"@clerk/clerk-expo": "^2.14.25",
 	"drizzle-orm": "^0.44.2",
 	"drizzle-kit": "^0.31.2",
@@ -334,11 +334,9 @@ function isWebFrontend(value) {
 	return WEB_FRAMEWORKS.includes(value);
 }
 function splitFrontends(values = []) {
-	const web = values.filter((f) => isWebFrontend(f));
-	const native = values.filter((f) => f === "native-nativewind" || f === "native-unistyles");
 	return {
-		web,
-		native
+		web: values.filter((f) => isWebFrontend(f)),
+		native: values.filter((f) => f === "native-nativewind" || f === "native-unistyles")
 	};
 }
 function ensureSingleWebAndNative(frontends) {
@@ -411,13 +409,10 @@ function validateServerDeployRequiresBackend(serverDeploy, backend) {
 function validateAddonCompatibility(addon, frontend, _auth) {
 	const compatibleFrontends = ADDON_COMPATIBILITY[addon];
 	if (compatibleFrontends.length > 0) {
-		if (!frontend.some((f) => compatibleFrontends.includes(f))) {
-			const frontendList = compatibleFrontends.join(", ");
-			return {
-				isCompatible: false,
-				reason: `${addon} addon requires one of these frontends: ${frontendList}`
-			};
-		}
+		if (!frontend.some((f) => compatibleFrontends.includes(f))) return {
+			isCompatible: false,
+			reason: `${addon} addon requires one of these frontends: ${compatibleFrontends.join(", ")}`
+		};
 	}
 	return { isCompatible: true };
 }
@@ -546,11 +541,10 @@ async function getAddonsChoice(addons, frontends, auth) {
 	Object.keys(groupedOptions).forEach((group$1) => {
 		if (groupedOptions[group$1].length === 0) delete groupedOptions[group$1];
 	});
-	const initialValues = DEFAULT_CONFIG.addons.filter((addonValue) => Object.values(groupedOptions).some((options) => options.some((opt) => opt.value === addonValue)));
 	const response = await groupMultiselect({
 		message: "Select addons",
 		options: groupedOptions,
-		initialValues,
+		initialValues: DEFAULT_CONFIG.addons.filter((addonValue) => Object.values(groupedOptions).some((options) => options.some((opt) => opt.value === addonValue))),
 		required: false,
 		selectableGroups: false
 	});
@@ -924,46 +918,45 @@ async function getFrontendChoice(frontendOptions, backend, auth) {
 	if (isCancel(frontendTypes)) return exitCancelled("Operation cancelled");
 	const result = [];
 	if (frontendTypes.includes("web")) {
-		const webOptions = [
-			{
-				value: "tanstack-router",
-				label: "TanStack Router",
-				hint: "Modern and scalable routing for React Applications"
-			},
-			{
-				value: "react-router",
-				label: "React Router",
-				hint: "A user‑obsessed, standards‑focused, multi‑strategy router"
-			},
-			{
-				value: "next",
-				label: "Next.js",
-				hint: "The React Framework for the Web"
-			},
-			{
-				value: "nuxt",
-				label: "Nuxt",
-				hint: "The Progressive Web Framework for Vue.js"
-			},
-			{
-				value: "svelte",
-				label: "Svelte",
-				hint: "web development for the rest of us"
-			},
-			{
-				value: "solid",
-				label: "Solid",
-				hint: "Simple and performant reactivity for building user interfaces"
-			},
-			{
-				value: "tanstack-start",
-				label: "TanStack Start",
-				hint: "SSR, Server Functions, API Routes and more with TanStack Router"
-			}
-		].filter((option) => isFrontendAllowedWithBackend(option.value, backend, auth));
 		const webFramework = await select({
 			message: "Choose web",
-			options: webOptions,
+			options: [
+				{
+					value: "tanstack-router",
+					label: "TanStack Router",
+					hint: "Modern and scalable routing for React Applications"
+				},
+				{
+					value: "react-router",
+					label: "React Router",
+					hint: "A user‑obsessed, standards‑focused, multi‑strategy router"
+				},
+				{
+					value: "next",
+					label: "Next.js",
+					hint: "The React Framework for the Web"
+				},
+				{
+					value: "nuxt",
+					label: "Nuxt",
+					hint: "The Progressive Web Framework for Vue.js"
+				},
+				{
+					value: "svelte",
+					label: "Svelte",
+					hint: "web development for the rest of us"
+				},
+				{
+					value: "solid",
+					label: "Solid",
+					hint: "Simple and performant reactivity for building user interfaces"
+				},
+				{
+					value: "tanstack-start",
+					label: "TanStack Start",
+					hint: "SSR, Server Functions, API Routes and more with TanStack Router"
+				}
+			].filter((option) => isFrontendAllowedWithBackend(option.value, backend, auth)),
 			initialValue: DEFAULT_CONFIG.frontend[0]
 		});
 		if (isCancel(webFramework)) return exitCancelled("Operation cancelled");
@@ -1036,10 +1029,9 @@ async function getORMChoice(orm, hasDatabase, database, backend, runtime) {
 	if (backend === "convex") return "none";
 	if (!hasDatabase) return "none";
 	if (orm !== void 0) return orm;
-	const options = [...database === "mongodb" ? [ormOptions.prisma, ormOptions.mongoose] : [ormOptions.drizzle, ormOptions.prisma]];
 	const response = await select({
 		message: "Select ORM",
-		options,
+		options: [...database === "mongodb" ? [ormOptions.prisma, ormOptions.mongoose] : [ormOptions.drizzle, ormOptions.prisma]],
 		initialValue: database === "mongodb" ? "prisma" : runtime === "workers" ? "drizzle" : DEFAULT_CONFIG.orm
 	});
 	if (isCancel(response)) return exitCancelled("Operation cancelled");
@@ -1050,7 +1042,6 @@ async function getORMChoice(orm, hasDatabase, database, backend, runtime) {
 //#region src/prompts/package-manager.ts
 async function getPackageManagerChoice(packageManager) {
 	if (packageManager !== void 0) return packageManager;
-	const detectedPackageManager = getUserPkgManager();
 	const response = await select({
 		message: "Choose package manager",
 		options: [
@@ -1070,7 +1061,7 @@ async function getPackageManagerChoice(packageManager) {
 				hint: "All-in-one JavaScript runtime & toolkit"
 			}
 		],
-		initialValue: detectedPackageManager
+		initialValue: getUserPkgManager()
 	});
 	if (isCancel(response)) return exitCancelled("Operation cancelled");
 	return response;
@@ -1219,21 +1210,20 @@ function getDeploymentDisplay(deployment) {
 async function getDeploymentChoice(deployment, _runtime, _backend, frontend = []) {
 	if (deployment !== void 0) return deployment;
 	if (!hasWebFrontend(frontend)) return "none";
-	const options = [
-		"wrangler",
-		"alchemy",
-		"none"
-	].map((deploy) => {
-		const { label, hint } = getDeploymentDisplay(deploy);
-		return {
-			value: deploy,
-			label,
-			hint
-		};
-	});
 	const response = await select({
 		message: "Select web deployment",
-		options,
+		options: [
+			"wrangler",
+			"alchemy",
+			"none"
+		].map((deploy) => {
+			const { label, hint } = getDeploymentDisplay(deploy);
+			return {
+				value: deploy,
+				label,
+				hint
+			};
+		}),
 		initialValue: DEFAULT_CONFIG.webDeploy
 	});
 	if (isCancel(response)) return exitCancelled("Operation cancelled");
@@ -1333,10 +1323,8 @@ function validateDirectoryName(name) {
 async function getProjectName(initialName) {
 	if (initialName) {
 		if (initialName === ".") return initialName;
-		const finalDirName = path.basename(initialName);
-		if (!validateDirectoryName(finalDirName)) {
-			const projectDir = path.resolve(process.cwd(), initialName);
-			if (isPathWithinCwd(projectDir)) return initialName;
+		if (!validateDirectoryName(path.basename(initialName))) {
+			if (isPathWithinCwd(path.resolve(process.cwd(), initialName))) return initialName;
 			consola.error(pc.red("Project path must be within current directory"));
 		}
 	}
@@ -1356,12 +1344,10 @@ async function getProjectName(initialName) {
 			defaultValue: defaultName,
 			validate: (value) => {
 				const nameToUse = String(value ?? "").trim() || defaultName;
-				const finalDirName = path.basename(nameToUse);
-				const validationError = validateDirectoryName(finalDirName);
+				const validationError = validateDirectoryName(path.basename(nameToUse));
 				if (validationError) return validationError;
 				if (nameToUse !== ".") {
-					const projectDir = path.resolve(process.cwd(), nameToUse);
-					if (!isPathWithinCwd(projectDir)) return "Project path must be within current directory";
+					if (!isPathWithinCwd(path.resolve(process.cwd(), nameToUse))) return "Project path must be within current directory";
 				}
 			}
 		});
@@ -1389,7 +1375,7 @@ const getLatestCLIVersion = () => {
 */
 function isTelemetryEnabled() {
 	const BTS_TELEMETRY_DISABLED = process.env.BTS_TELEMETRY_DISABLED;
-	const BTS_TELEMETRY = "1";
+	const BTS_TELEMETRY = "0";
 	if (BTS_TELEMETRY_DISABLED !== void 0) return BTS_TELEMETRY_DISABLED !== "1";
 	if (BTS_TELEMETRY !== void 0) return BTS_TELEMETRY === "1";
 	return true;
@@ -1397,8 +1383,8 @@ function isTelemetryEnabled() {
 
 //#endregion
 //#region src/utils/analytics.ts
-const POSTHOG_API_KEY = "phc_8ZUxEwwfKMajJLvxz1daGd931dYbQrwKNficBmsdIrs";
-const POSTHOG_HOST = "https://us.i.posthog.com";
+const POSTHOG_API_KEY = "random";
+const POSTHOG_HOST = "random";
 function generateSessionId() {
 	const rand = Math.random().toString(36).slice(2);
 	return `cli_${Date.now().toString(36)}${rand}`;
@@ -1552,11 +1538,9 @@ async function handleDirectoryConflict(currentPathInput, silent = false) {
 					finalPathInput: currentPathInput,
 					shouldClearDirectory: false
 				};
-			case "rename": {
+			case "rename":
 				log.info("Please choose a different project name or path.");
-				const newPathInput = await getProjectName(void 0);
-				return await handleDirectoryConflict(newPathInput);
-			}
+				return await handleDirectoryConflict(await getProjectName(void 0));
 			case "cancel": return exitCancelled("Operation cancelled.");
 		}
 	}
@@ -1621,8 +1605,7 @@ const catppuccinTheme = {
 const renderTitle = () => {
 	const terminalWidth = process.stdout.columns || 80;
 	const titleLines = TITLE_TEXT.split("\n");
-	const titleWidth = Math.max(...titleLines.map((line) => line.length));
-	if (terminalWidth < titleWidth) console.log(gradient(Object.values(catppuccinTheme)).multiline(`
+	if (terminalWidth < Math.max(...titleLines.map((line) => line.length))) console.log(gradient(Object.values(catppuccinTheme)).multiline(`
     ╔══════════════════╗
     ║  Better T Stack  ║
     ╚══════════════════╝
@@ -1904,10 +1887,7 @@ function processAndValidateFlags(options, providedFlags, projectName) {
 	return config;
 }
 function processProvidedFlagsWithoutValidation(options, projectName) {
-	if (!options.yolo) {
-		const providedFlags = getProvidedFlags(options);
-		validateYesFlagCombination(options, providedFlags);
-	}
+	if (!options.yolo) validateYesFlagCombination(options, getProvidedFlags(options));
 	const config = processFlags(options, projectName);
 	const validatedProjectName = extractAndValidateProjectName(projectName, options.projectDirectory, true);
 	if (validatedProjectName) config.projectName = validatedProjectName;
@@ -2088,8 +2068,7 @@ async function setupFumadocs(config) {
 			initialValue: "next-mdx"
 		});
 		if (isCancel(template)) return exitCancelled("Operation cancelled");
-		const commandWithArgs = `create-fumadocs-app@latest fumadocs --template ${TEMPLATES[template].value} --src --no-install --pm ${packageManager} --no-eslint --no-git`;
-		const fumadocsInitCommand = getPackageExecutionCommand(packageManager, commandWithArgs);
+		const fumadocsInitCommand = getPackageExecutionCommand(packageManager, `create-fumadocs-app@latest fumadocs --template ${TEMPLATES[template].value} --src --no-install --pm ${packageManager} --no-eslint --no-git`);
 		const s = spinner();
 		s.start("Setting up Fumadocs...");
 		const appsDir = path.join(projectDir, "apps");
@@ -2176,8 +2155,7 @@ async function setupRuler(config) {
 		const s = spinner();
 		s.start("Applying rules with Ruler...");
 		try {
-			const rulerApplyCmd = getPackageExecutionCommand(packageManager, `@intellectronica/ruler@latest apply --agents ${selectedEditors.join(",")} --local-only`);
-			await execa(rulerApplyCmd, {
+			await execa(getPackageExecutionCommand(packageManager, `@intellectronica/ruler@latest apply --agents ${selectedEditors.join(",")} --local-only`), {
 				cwd: projectDir,
 				env: { CI: "true" },
 				shell: true
@@ -2211,7 +2189,7 @@ async function setupStarlight(config) {
 	const s = spinner();
 	try {
 		s.start("Setting up Starlight docs...");
-		const commandWithArgs = `create-astro@latest ${[
+		const starlightInitCommand = getPackageExecutionCommand(packageManager, `create-astro@latest ${[
 			"docs",
 			"--template",
 			"starlight",
@@ -2220,8 +2198,7 @@ async function setupStarlight(config) {
 			"tailwind",
 			"--no-git",
 			"--skip-houston"
-		].join(" ")}`;
-		const starlightInitCommand = getPackageExecutionCommand(packageManager, commandWithArgs);
+		].join(" ")}`);
 		const appsDir = path.join(projectDir, "apps");
 		await fs.ensureDir(appsDir);
 		await execa(starlightInitCommand, {
@@ -2268,7 +2245,7 @@ async function setupTauri(config) {
 		const hasNext = frontend.includes("next");
 		const devUrl = hasReactRouter || hasSvelte ? "http://localhost:5173" : hasNext ? "http://localhost:3001" : "http://localhost:3001";
 		const frontendDist = hasNuxt ? "../.output/public" : hasSvelte ? "../build" : hasNext ? "../.next" : hasReactRouter ? "../build/client" : "../dist";
-		const commandWithArgs = `@tauri-apps/cli@latest ${[
+		await execa(getPackageExecutionCommand(packageManager, `@tauri-apps/cli@latest ${[
 			"init",
 			`--app-name=${path.basename(projectDir)}`,
 			`--window-title=${path.basename(projectDir)}`,
@@ -2276,9 +2253,7 @@ async function setupTauri(config) {
 			`--dev-url=${devUrl}`,
 			`--before-dev-command="${packageManager} run dev"`,
 			`--before-build-command="${packageManager} run build"`
-		].join(" ")}`;
-		const tauriInitCommand = getPackageExecutionCommand(packageManager, commandWithArgs);
-		await execa(tauriInitCommand, {
+		].join(" ")}`), {
 			cwd: clientPackageDir,
 			env: { CI: "true" },
 			shell: true
@@ -2350,8 +2325,7 @@ async function setupUltracite(config, hasHusky) {
 		if (editors.length > 0) ultraciteArgs.push("--editors", ...editors);
 		if (rules.length > 0) ultraciteArgs.push("--rules", ...rules);
 		if (hasHusky) ultraciteArgs.push("--integrations", "husky", "lint-staged");
-		const commandWithArgs = `ultracite@latest ${ultraciteArgs.join(" ")} --skip-install`;
-		const ultraciteInitCommand = getPackageExecutionCommand(packageManager, commandWithArgs);
+		const ultraciteInitCommand = getPackageExecutionCommand(packageManager, `ultracite@latest ${ultraciteArgs.join(" ")} --skip-install`);
 		const s = spinner();
 		s.start("Setting up Ultracite...");
 		await execa(ultraciteInitCommand, {
@@ -2738,8 +2712,7 @@ async function processAndCopyFiles(sourcePattern, baseSourceDir, destDir, contex
 	}
 }
 async function copyBaseTemplate(projectDir, context) {
-	const templateDir = path.join(PKG_ROOT, "templates/base");
-	await processAndCopyFiles(["**/*"], templateDir, projectDir, context);
+	await processAndCopyFiles(["**/*"], path.join(PKG_ROOT, "templates/base"), projectDir, context);
 }
 async function setupFrontendTemplates(projectDir, context) {
 	const hasReactWeb = context.frontend.some((f) => [
@@ -3191,8 +3164,7 @@ async function setupDeploymentTemplates(projectDir, context) {
 		if (context.webDeploy === "alchemy" && (context.serverDeploy === "alchemy" || isBackendSelf)) {
 			if (await fs.pathExists(alchemyTemplateSrc)) {
 				const webAppDir = path.join(projectDir, "apps/web");
-				const destDir = isBackendSelf && await fs.pathExists(webAppDir) ? webAppDir : projectDir;
-				await processAndCopyFiles("alchemy.run.ts.hbs", alchemyTemplateSrc, destDir, context);
+				await processAndCopyFiles("alchemy.run.ts.hbs", alchemyTemplateSrc, isBackendSelf && await fs.pathExists(webAppDir) ? webAppDir : projectDir, context);
 				await addEnvDtsToPackages(projectDir, context, alchemyTemplateSrc);
 			}
 		} else {
@@ -3289,16 +3261,14 @@ async function addAddonsToProject(input) {
 		await setupAddonsTemplate(projectDir, config);
 		await setupAddons(config, true);
 		const currentAddons = detectedConfig.addons || [];
-		const mergedAddons = [...new Set([...currentAddons, ...input.addons])];
-		await updateBtsConfig(projectDir, { addons: mergedAddons });
+		await updateBtsConfig(projectDir, { addons: [...new Set([...currentAddons, ...input.addons])] });
 		if (config.install) await installDependencies({
 			projectDir,
 			packageManager: config.packageManager
 		});
 		else if (!input.suppressInstallMessage) log.info(pc.yellow(`Run ${pc.bold(`${config.packageManager} install`)} to install dependencies`));
 	} catch (error) {
-		const message = error instanceof Error ? error.message : String(error);
-		exitWithError(`Error adding addons: ${message}`);
+		exitWithError(`Error adding addons: ${error instanceof Error ? error.message : String(error)}`);
 	}
 }
 
@@ -3342,8 +3312,7 @@ async function generateCloudflareWorkerTypes({ serverDir, packageManager }) {
 	const s = spinner();
 	try {
 		s.start("Generating Cloudflare Workers types...");
-		const runCmd = getPackageExecutionCommand(packageManager, "wrangler types --env-interface CloudflareBindings");
-		await execa(runCmd, {
+		await execa(getPackageExecutionCommand(packageManager, "wrangler types --env-interface CloudflareBindings"), {
 			cwd: serverDir,
 			shell: true
 		});
@@ -4017,8 +3986,7 @@ async function addDeploymentToProject(input) {
 		});
 		else if (!input.suppressInstallMessage) log.info(pc.yellow(`Run ${pc.bold(`${config.packageManager} install`)} to install dependencies`));
 	} catch (error) {
-		const message = error instanceof Error ? error.message : String(error);
-		exitWithError(`Error adding deployment: ${message}`);
+		exitWithError(`Error adding deployment: ${error instanceof Error ? error.message : String(error)}`);
 	}
 }
 
@@ -4337,6 +4305,10 @@ async function setupApi(config) {
 				});
 			}
 		}
+		if (config.auth === "better-auth" && (backend === "express" || backend === "fastify")) await addPackageDependency({
+			dependencies: ["better-auth"],
+			projectDir: apiPackageDir
+		});
 		if (webDirExists && apiDeps.web) await addPackageDependency({
 			dependencies: apiDeps.web.dependencies,
 			devDependencies: apiDeps.web.devDependencies,
@@ -4442,8 +4414,7 @@ async function setupBetterAuthPlugins(projectDir, config) {
 	if (betterAuthCall) {
 		const configObject = betterAuthCall.getArguments()[0];
 		if (configObject && configObject.getKind() === SyntaxKind.ObjectLiteralExpression) {
-			const objLiteral = configObject.asKindOrThrow(SyntaxKind.ObjectLiteralExpression);
-			const pluginsArray = ensureArrayProperty(objLiteral, "plugins");
+			const pluginsArray = ensureArrayProperty(configObject.asKindOrThrow(SyntaxKind.ObjectLiteralExpression), "plugins");
 			pluginsToAdd.forEach((plugin) => {
 				pluginsArray.addElement(plugin);
 			});
@@ -4681,11 +4652,9 @@ async function setupEnvironmentVariables(config) {
 		const clientDir = path.join(projectDir, "apps/web");
 		if (await fs.pathExists(clientDir)) {
 			const baseVar = getClientServerVar(frontend, backend);
-			const envVarName = backend === "convex" ? getConvexVar(frontend) : baseVar.key;
-			const serverUrl = backend === "convex" ? "https://<YOUR_CONVEX_URL>" : baseVar.value;
 			const clientVars = [{
-				key: envVarName,
-				value: serverUrl,
+				key: backend === "convex" ? getConvexVar(frontend) : baseVar.key,
+				value: backend === "convex" ? "https://<YOUR_CONVEX_URL>" : baseVar.value,
 				condition: backend === "convex" ? true : baseVar.write
 			}];
 			if (backend === "convex" && auth === "clerk") {
@@ -4860,14 +4829,12 @@ ${hasWeb ? "# npx convex env set SITE_URL http://localhost:3001\n" : ""}
 	} else if (await fs.pathExists(serverDir)) await addEnvVariablesToFile(path.join(serverDir, ".env"), serverVars);
 	const isUnifiedAlchemy = webDeploy === "alchemy" && serverDeploy === "alchemy";
 	const isIndividualAlchemy = webDeploy === "alchemy" || serverDeploy === "alchemy";
-	if (isUnifiedAlchemy) {
-		const rootEnvPath = path.join(projectDir, ".env");
-		await addEnvVariablesToFile(rootEnvPath, [{
-			key: "ALCHEMY_PASSWORD",
-			value: "please-change-this",
-			condition: true
-		}]);
-	} else if (isIndividualAlchemy) {
+	if (isUnifiedAlchemy) await addEnvVariablesToFile(path.join(projectDir, ".env"), [{
+		key: "ALCHEMY_PASSWORD",
+		value: "please-change-this",
+		condition: true
+	}]);
+	else if (isIndividualAlchemy) {
 		if (webDeploy === "alchemy") {
 			const webDir = path.join(projectDir, "apps/web");
 			if (await fs.pathExists(webDir)) await addEnvVariablesToFile(path.join(webDir, ".env"), [{
@@ -4929,10 +4896,9 @@ async function setupCloudflareD1(config) {
 		try {
 			await addEnvVariablesToFile(envPath, variables);
 		} catch (_err) {}
-		const serverDir = path.join(projectDir, backend === "self" ? "apps/web" : "apps/server");
 		await addPackageDependency({
 			dependencies: ["@prisma/adapter-d1"],
-			projectDir: serverDir
+			projectDir: path.join(projectDir, backend === "self" ? "apps/web" : "apps/server")
 		});
 	}
 }
@@ -4950,13 +4916,11 @@ async function setupDockerCompose(config) {
 }
 async function writeEnvFile$4(projectDir, database, projectName, backend) {
 	const targetApp = backend === "self" ? "apps/web" : "apps/server";
-	const envPath = path.join(projectDir, targetApp, ".env");
-	const variables = [{
+	await addEnvVariablesToFile(path.join(projectDir, targetApp, ".env"), [{
 		key: "DATABASE_URL",
 		value: getDatabaseUrl(database, projectName),
 		condition: true
-	}];
-	await addEnvVariablesToFile(envPath, variables);
+	}]);
 }
 function getDatabaseUrl(database, projectName) {
 	switch (database) {
@@ -5026,13 +4990,11 @@ async function initMongoDBAtlas(serverDir) {
 async function writeEnvFile$3(projectDir, backend, config) {
 	try {
 		const targetApp = backend === "self" ? "apps/web" : "apps/server";
-		const envPath = path.join(projectDir, targetApp, ".env");
-		const variables = [{
+		await addEnvVariablesToFile(path.join(projectDir, targetApp, ".env"), [{
 			key: "DATABASE_URL",
 			value: config?.connectionString ?? "mongodb://localhost:27017/mydb",
 			condition: true
-		}];
-		await addEnvVariablesToFile(envPath, variables);
+		}]);
 	} catch (_error) {
 		consola.error("Failed to update environment configuration");
 	}
@@ -5155,8 +5117,7 @@ async function executeNeonCommand(packageManager, commandArgsString, spinnerText
 }
 async function createNeonProject(projectName, regionId, packageManager) {
 	try {
-		const commandArgsString = `neonctl@latest projects create --name ${projectName} --region-id ${regionId} --output json`;
-		const { stdout } = await executeNeonCommand(packageManager, commandArgsString, `Creating Neon project "${projectName}"...`);
+		const { stdout } = await executeNeonCommand(packageManager, `neonctl@latest projects create --name ${projectName} --region-id ${regionId} --output json`, `Creating Neon project "${projectName}"...`);
 		const response = JSON.parse(stdout);
 		if (response.project && response.connection_uris && response.connection_uris.length > 0) {
 			const projectId = response.project.id;
@@ -5177,13 +5138,11 @@ async function createNeonProject(projectName, regionId, packageManager) {
 }
 async function writeEnvFile$2(projectDir, backend, config) {
 	const targetApp = backend === "self" ? "apps/web" : "apps/server";
-	const envPath = path.join(projectDir, targetApp, ".env");
-	const variables = [{
+	await addEnvVariablesToFile(path.join(projectDir, targetApp, ".env"), [{
 		key: "DATABASE_URL",
 		value: config?.connectionString ?? "postgresql://postgres:postgres@localhost:5432/mydb?schema=public",
 		condition: true
-	}];
-	await addEnvVariablesToFile(envPath, variables);
+	}]);
 	return true;
 }
 async function setupWithNeonDb(projectDir, packageManager, backend) {
@@ -5193,8 +5152,7 @@ async function setupWithNeonDb(projectDir, packageManager, backend) {
 		const targetApp = backend === "self" ? "apps/web" : "apps/server";
 		const targetDir = path.join(projectDir, targetApp);
 		await fs.ensureDir(targetDir);
-		const packageCmd = getPackageExecutionCommand(packageManager, "neondb@latest --yes");
-		await execa(packageCmd, {
+		await execa(getPackageExecutionCommand(packageManager, "neondb@latest --yes"), {
 			shell: true,
 			cwd: targetDir
 		});
@@ -5412,8 +5370,7 @@ async function initPrismaDatabase(serverDir, packageManager) {
 		const prismaDir = path.join(serverDir, "prisma");
 		await fs.ensureDir(prismaDir);
 		log.info("Starting Prisma PostgreSQL setup.");
-		const prismaInitCommand = getPackageExecutionCommand(packageManager, "prisma init --db");
-		await execa(prismaInitCommand, {
+		await execa(getPackageExecutionCommand(packageManager, "prisma init --db"), {
 			cwd: serverDir,
 			stdio: "inherit",
 			shell: true
@@ -5474,10 +5431,9 @@ DATABASE_URL="your_database_url"`);
 }
 async function addPrismaAccelerateExtension(projectDir) {
 	try {
-		const dbPackageDir = path.join(projectDir, "packages/db");
 		await addPackageDependency({
 			dependencies: ["@prisma/extension-accelerate"],
-			projectDir: dbPackageDir
+			projectDir: path.join(projectDir, "packages/db")
 		});
 		return true;
 	} catch (_error) {
@@ -5588,8 +5544,7 @@ function extractDbUrl(output) {
 async function initializeSupabase(serverDir, packageManager) {
 	log.info("Initializing Supabase project...");
 	try {
-		const supabaseInitCommand = getPackageExecutionCommand(packageManager, "supabase init");
-		await execa(supabaseInitCommand, {
+		await execa(getPackageExecutionCommand(packageManager, "supabase init"), {
 			cwd: serverDir,
 			stdio: "inherit",
 			shell: true
@@ -5780,13 +5735,12 @@ async function selectTursoGroup() {
 		log.info(`Using the only available group: ${pc.blue(groups[0].name)}`);
 		return groups[0].name;
 	}
-	const groupOptions = groups.map((group$1) => ({
-		value: group$1.name,
-		label: `${group$1.name} (${group$1.locations})`
-	}));
 	const selectedGroup = await select({
 		message: "Select a Turso database group:",
-		options: groupOptions
+		options: groups.map((group$1) => ({
+			value: group$1.name,
+			label: `${group$1.name} (${group$1.locations})`
+		}))
 	});
 	if (isCancel(selectedGroup)) return exitCancelled("Operation cancelled");
 	return selectedGroup;
@@ -5817,8 +5771,7 @@ async function createTursoDatabase(dbName, groupName) {
 }
 async function writeEnvFile(projectDir, backend, config) {
 	const targetApp = backend === "self" ? "apps/web" : "apps/server";
-	const envPath = path.join(projectDir, targetApp, ".env");
-	const variables = [{
+	await addEnvVariablesToFile(path.join(projectDir, targetApp, ".env"), [{
 		key: "DATABASE_URL",
 		value: config?.dbUrl ?? "",
 		condition: true
@@ -5826,8 +5779,7 @@ async function writeEnvFile(projectDir, backend, config) {
 		key: "DATABASE_AUTH_TOKEN",
 		value: config?.authToken ?? "",
 		condition: true
-	}];
-	await addEnvVariablesToFile(envPath, variables);
+	}]);
 }
 function displayManualSetupInstructions() {
 	log.info(`Manual Turso Setup Instructions:
@@ -5908,8 +5860,7 @@ async function setupTurso(config, cliInput) {
 			if (isCancel(dbNameResponse)) return exitCancelled("Operation cancelled");
 			dbName = dbNameResponse;
 			try {
-				const config$1 = await createTursoDatabase(dbName, selectedGroup);
-				await writeEnvFile(projectDir, backend, config$1);
+				await writeEnvFile(projectDir, backend, await createTursoDatabase(dbName, selectedGroup));
 				success = true;
 			} catch (error) {
 				if (error instanceof Error && error.message === "DATABASE_EXISTS") {
@@ -7079,7 +7030,6 @@ async function createProjectHandler(input) {
 			shouldClearDirectory = result.shouldClearDirectory;
 		}
 	} catch (error) {
-		const elapsedTimeMs$1 = Date.now() - startTime;
 		return {
 			success: false,
 			projectConfig: {
@@ -7105,7 +7055,7 @@ async function createProjectHandler(input) {
 			},
 			reproducibleCommand: "",
 			timeScaffolded,
-			elapsedTimeMs: elapsedTimeMs$1,
+			elapsedTimeMs: Date.now() - startTime,
 			projectDirectory: "",
 			relativePath: "",
 			error: error instanceof Error ? error.message : String(error)
@@ -7357,11 +7307,10 @@ const router = os.router({
 		manualDb: z$1.boolean().optional().default(false).describe("Skip automatic/manual database setup prompt and use manual setup")
 	})])).handler(async ({ input }) => {
 		const [projectName, options] = input;
-		const combinedInput = {
+		const result = await createProjectHandler({
 			projectName,
 			...options
-		};
-		const result = await createProjectHandler(combinedInput);
+		});
 		if (options.verbose) return result;
 	}),
 	add: os.meta({ description: "Add addons or deployment configurations to an existing Better-T-Stack project" }).input(z$1.tuple([z$1.object({
@@ -7379,8 +7328,7 @@ const router = os.router({
 		try {
 			renderTitle();
 			intro(pc.magenta("Better-T-Stack Sponsors"));
-			const sponsors$1 = await fetchSponsors();
-			displaySponsors(sponsors$1);
+			displaySponsors(await fetchSponsors());
 		} catch (error) {
 			handleError(error, "Failed to display sponsors");
 		}
@@ -7468,4 +7416,4 @@ async function builder() {
 }
 
 //#endregion
-export { builder, createBtsCli, docs, init, router, sponsors };
+export { router as a, init as i, createBtsCli as n, sponsors as o, docs as r, builder as t };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-better-t-stack",
-  "version": "3.2.4",
+  "version": "3.2.6-canary.46b928a7",
   "description": "A modern CLI tool for scaffolding end-to-end type-safe TypeScript projects with best practices and customizable configurations",
   "type": "module",
   "license": "MIT",
@@ -67,9 +67,9 @@
   },
   "dependencies": {
     "@biomejs/js-api": "^3.0.0",
-    "@biomejs/wasm-nodejs": "^2.2.4",
-    "@clack/prompts": "^1.0.0-alpha.5",
-    "@orpc/server": "^1.9.0",
+    "@biomejs/wasm-nodejs": "^2.2.6",
+    "@clack/prompts": "^1.0.0-alpha.6",
+    "@orpc/server": "^1.10.0",
     "consola": "^3.4.2",
     "execa": "^9.6.0",
     "fs-extra": "^11.3.2",
@@ -78,18 +78,18 @@
     "jsonc-parser": "^3.3.1",
     "picocolors": "^1.1.1",
     "tinyglobby": "^0.2.15",
-    "trpc-cli": "^0.11.0",
-    "ts-morph": "^27.0.0",
-    "yaml": "^2.7.0",
-    "zod": "^4.1.11"
+    "trpc-cli": "^0.12.0",
+    "ts-morph": "^27.0.2",
+    "yaml": "^2.8.1",
+    "zod": "^4.1.12"
   },
   "devDependencies": {
     "@types/fs-extra": "^11.0.4",
-    "@types/node": "^24.5.2",
+    "@types/node": "^24.9.1",
     "@vitest/ui": "^3.2.4",
-    "publint": "^0.3.13",
-    "tsdown": "^0.15.4",
-    "typescript": "^5.9.2",
+    "publint": "^0.3.15",
+    "tsdown": "^0.15.9",
+    "typescript": "^5.9.3",
     "vitest": "^3.2.4"
   }
 }

package/templates/auth/clerk/convex/web/react/tanstack-start/src/start.ts.hbs

@@ -0,0 +1,8 @@
+import { clerkMiddleware } from '@clerk/tanstack-react-start/server'
+import { createStart } from '@tanstack/react-start'
+
+export const startInstance = createStart(() => {
+	return {
+		requestMiddleware: [clerkMiddleware()],
+	}
+})

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

@@ -28,15 +28,14 @@ import Loader from "@/components/loader";
 
 {{#if (and (eq backend "convex") (eq auth "clerk"))}}
 import { ClerkProvider, useAuth } from "@clerk/tanstack-react-start";
-import { getAuth } from "@clerk/tanstack-react-start/server";
+import { auth } from "@clerk/tanstack-react-start/server";
 import { createServerFn } from "@tanstack/react-start";
-import { getRequest } from "@tanstack/react-start/server";
 import { ConvexProviderWithClerk } from "convex/react-clerk";
 
 const fetchClerkAuth = createServerFn({ method: "GET" }).handler(async () => {
-  const auth = await getAuth(getRequest());
-  const token = await auth.getToken({ template: "convex" });
-  return { userId: auth.userId, token };
+  const clerkAuth = await auth();
+  const token = await clerkAuth.getToken({ template: "convex" });
+  return { userId: clerkAuth.userId, token };
 });
 {{else if (and (eq backend "convex") (eq auth "better-auth"))}}
 import { createServerFn } from "@tanstack/react-start";

package/templates/auth/clerk/convex/web/react/tanstack-start/src/server.ts.hbs

@@ -1,19 +0,0 @@
-import { createClerkHandler } from "@clerk/tanstack-react-start/server";
-import {
-	createStartHandler,
-	defaultStreamHandler,
-	defineHandlerCallback,
-} from "@tanstack/react-start/server";
-import { createRouter } from "./router";
-
-// this is broken right now, waiting for a fix
-const handlerFactory = createClerkHandler(
-	createStartHandler({
-		createRouter,
-	}),
-);
-
-export default defineHandlerCallback(async (event) => {
-	const startHandler = await handlerFactory(defaultStreamHandler);
-	return startHandler(event);
-});