create-better-t-stack 3.46.1 → 3.47.0

package/dist/cli.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { D as setProcessMode, i as SchemaNameSchema, l as create, m as getSchemaResult, s as add, u as createBtsCli, v as types_exports, y as getLatestCLIVersion } from "./src-_HMF_A8q.mjs";
+import { D as setProcessMode, i as SchemaNameSchema, l as create, m as getSchemaResult, s as add, u as createBtsCli, v as types_exports, y as getLatestCLIVersion } from "./src-CC7QNkfh.mjs";
 import { lineByLineConsoleLogger } from "trpc-cli";
 import z from "zod";
 import { McpServer } from "@modelcontextprotocol/server";

package/dist/index.mjs

@@ -1,3 +1,3 @@
 #!/usr/bin/env node
-import { C as DirectoryConflictError, E as ValidationError, S as DatabaseSetupError, T as UserCancelledError, _ as ProjectLauncherSchema, a as TEMPLATE_COUNT, b as CLIError, c as builder, d as createVirtual, f as docs, g as sponsors, h as router, i as SchemaNameSchema, l as create, m as getSchemaResult, n as GeneratorError, o as VirtualFileSystem, p as generate, r as Result, s as add, t as EMBEDDED_TEMPLATES, u as createBtsCli, w as ProjectCreationError, x as CompatibilityError } from "./src-_HMF_A8q.mjs";
+import { C as DirectoryConflictError, E as ValidationError, S as DatabaseSetupError, T as UserCancelledError, _ as ProjectLauncherSchema, a as TEMPLATE_COUNT, b as CLIError, c as builder, d as createVirtual, f as docs, g as sponsors, h as router, i as SchemaNameSchema, l as create, m as getSchemaResult, n as GeneratorError, o as VirtualFileSystem, p as generate, r as Result, s as add, t as EMBEDDED_TEMPLATES, u as createBtsCli, w as ProjectCreationError, x as CompatibilityError } from "./src-CC7QNkfh.mjs";
 export { CLIError, CompatibilityError, DatabaseSetupError, DirectoryConflictError, EMBEDDED_TEMPLATES, GeneratorError, ProjectCreationError, ProjectLauncherSchema, Result, SchemaNameSchema, TEMPLATE_COUNT, UserCancelledError, ValidationError, VirtualFileSystem, add, builder, create, createBtsCli, createVirtual, docs, generate, getSchemaResult, router, sponsors };

package/dist/{src-_HMF_A8q.mjs → src-CC7QNkfh.mjs}

@@ -8078,19 +8078,21 @@ async function setupPrismaPostgres(config, cliInput) {
 }
 //#endregion
 //#region src/helpers/database-providers/supabase-setup.ts
+const SUPABASE_CLI_PACKAGE = "supabase@2.121.0";
+const supabaseEnv = { SUPABASE_EXPERIMENTAL_STACK: "0" };
+const statusSchema = z$1.object({ DB_URL: z$1.url().refine((value) => ["postgres:", "postgresql:"].includes(new URL(value).protocol)) });
+/** Save a verified database URL in the app that consumes the database. */
 async function writeSupabaseEnvFile(projectDir, backend, databaseUrl) {
 	return Result.tryPromise({
 		try: async () => {
 			const targetApp = backend === "self" ? "apps/web" : "apps/server";
-			const envPath = path.join(projectDir, targetApp, ".env");
-			const dbUrlToUse = databaseUrl || "postgresql://postgres:postgres@127.0.0.1:54322/postgres";
-			await addEnvVariablesToFile(envPath, [{
+			await addEnvVariablesToFile(path.join(projectDir, targetApp, ".env"), [{
 				key: "DATABASE_URL",
-				value: dbUrlToUse,
+				value: databaseUrl,
 				condition: true
 			}, {
 				key: "DIRECT_URL",
-				value: dbUrlToUse,
+				value: databaseUrl,
 				condition: true
 			}]);
 		},
@@ -8101,28 +8103,38 @@ async function writeSupabaseEnvFile(projectDir, backend, databaseUrl) {
 		})
 	});
 }
-function extractDbUrl(statusEnv) {
-	return statusEnv.match(/^DB_URL="(postgresql:\/\/[^"]+)"$/m)?.[1] ?? null;
-}
+/** Read Docker status with cancellation and a bounded wait. */
 async function readSupabaseStatus(serverDir, packageManager) {
-	const statusArgs = getPackageExecutionArgs(packageManager, "supabase status --agent no -o env");
-	const result = await Result.tryPromise({
+	const statusArgs = getPackageExecutionArgs(packageManager, `${SUPABASE_CLI_PACKAGE} status --agent no --output json`);
+	return Result.tryPromise({
 		try: async () => {
-			const { stdout } = await execa(statusArgs[0], statusArgs.slice(1), { cwd: serverDir });
-			return stdout;
+			const { stdout } = await execa(statusArgs[0], statusArgs.slice(1), {
+				cwd: serverDir,
+				env: supabaseEnv,
+				cancelSignal: getInterruptSignal(),
+				timeout: 12e4
+			});
+			return statusSchema.parse(JSON.parse(stdout)).DB_URL;
 		},
-		catch: () => ""
+		catch: (e) => new DatabaseSetupError({
+			provider: "supabase",
+			message: "Could not read the Supabase database URL. Run Supabase status and configure DATABASE_URL and DIRECT_URL manually.",
+			cause: e
+		})
 	});
-	return result.isOk() ? result.value : "";
 }
+/** Initialize missing configuration without overwriting an existing project. */
 async function initializeSupabase(serverDir, packageManager) {
 	cliLog.info("Initializing Supabase project...");
 	return Result.tryPromise({
 		try: async () => {
-			const supabaseInitArgs = getPackageExecutionArgs(packageManager, "supabase init");
+			if (await fs.pathExists(path.join(serverDir, "supabase/config.toml"))) return;
+			const supabaseInitArgs = getPackageExecutionArgs(packageManager, `${SUPABASE_CLI_PACKAGE} init --agent no`);
 			await execa(supabaseInitArgs[0], supabaseInitArgs.slice(1), {
 				cwd: serverDir,
-				stdio: "inherit"
+				stdio: "inherit",
+				env: supabaseEnv,
+				cancelSignal: getInterruptSignal()
 			});
 			cliLog.success("Supabase project initialized");
 		},
@@ -8130,18 +8142,23 @@ async function initializeSupabase(serverDir, packageManager) {
 			const error = e;
 			return new DatabaseSetupError({
 				provider: "supabase",
-				message: error.message?.includes("ENOENT") ? "Supabase CLI not found. Please install it globally (npm install -g supabase) or ensure it's in your PATH." : `Failed to initialize Supabase project: ${error.message ?? String(e)}`,
+				message: error.message?.includes("ENOENT") ? "Could not run the Supabase CLI. Ensure your selected package manager is installed and available in PATH." : `Failed to initialize Supabase project: ${error.message ?? String(e)}`,
 				cause: e
 			});
 		}
 	});
 }
+/** Start the standard Docker runtime and stream its progress to the CLI. */
 async function startSupabase(serverDir, packageManager) {
 	cliLog.info("Starting Supabase services (this may take a moment)...");
-	const supabaseStartArgs = getPackageExecutionArgs(packageManager, "supabase start --agent no");
+	const supabaseStartArgs = getPackageExecutionArgs(packageManager, `${SUPABASE_CLI_PACKAGE} start --agent no`);
 	return Result.tryPromise({
 		try: async () => {
-			const subprocess = execa(supabaseStartArgs[0], supabaseStartArgs.slice(1), { cwd: serverDir });
+			const subprocess = execa(supabaseStartArgs[0], supabaseStartArgs.slice(1), {
+				cwd: serverDir,
+				env: supabaseEnv,
+				cancelSignal: getInterruptSignal()
+			});
 			let stdoutData = "";
 			if (subprocess.stdout) subprocess.stdout.on("data", (data) => {
 				const text = data.toString();
@@ -8150,7 +8167,6 @@ async function startSupabase(serverDir, packageManager) {
 			});
 			if (subprocess.stderr) subprocess.stderr.pipe(process.stderr);
 			await subprocess;
-			await new Promise((resolve) => setTimeout(resolve, 100));
 			return stdoutData;
 		},
 		catch: (e) => {
@@ -8163,18 +8179,21 @@ async function startSupabase(serverDir, packageManager) {
 		}
 	});
 }
-function displayManualSupabaseInstructions(targetApp, output) {
+/** Print pinned setup commands without changing configuration or credentials. */
+function displayManualSupabaseInstructions(targetApp, packageManager, output) {
+	const command = getPackageExecutionCommand(packageManager, SUPABASE_CLI_PACKAGE);
 	cliLog.info(`"Manual Supabase Setup Instructions:"
-1. Ensure Docker is installed and running.
-2. Install the Supabase CLI (e.g., \`npm install -g supabase\`).
-3. Run \`supabase init\` in your project's \`packages/db\` directory.
-4. Run \`supabase start\` in your project's \`packages/db\` directory.
-5. Copy the database URL from the output.${output ? `
+1. Open your project's \`packages/db\` directory.
+2. Run \`${command} init\` if \`supabase/config.toml\` does not exist.
+3. Ensure Docker or a Docker-compatible container runtime is installed and running.
+4. Run \`${command} start\`.
+5. Run \`${command} status --output json\` and copy \`DB_URL\`.${output ? `
 ${pc.bold("Relevant output from `supabase start`:")}
 ${pc.dim(output)}` : ""}
-6. Add the database URL to the .env file in \`${targetApp}/.env\` as \`DATABASE_URL\`:
-			${pc.gray("DATABASE_URL=\"your_supabase_db_url\"")}`);
+6. Add the database URL to the .env file in \`${targetApp}/.env\` as \`DATABASE_URL\` and \`DIRECT_URL\`:
+			${pc.gray("DATABASE_URL=\"your_supabase_db_url\"\nDIRECT_URL=\"your_supabase_db_url\"")}`);
 }
+/** Configure local Supabase, preserving credentials until automatic setup succeeds. */
 async function setupSupabase(config, cliInput) {
 	const { projectDir, packageManager, backend } = config;
 	const targetApp = backend === "self" ? "apps/web" : "apps/server";
@@ -8193,8 +8212,8 @@ async function setupSupabase(config, cliInput) {
 	});
 	if (ensureDirResult.isErr()) return ensureDirResult;
 	if (setupMode === "manual") {
-		displayManualSupabaseInstructions(targetApp);
-		return writeSupabaseEnvFile(projectDir, backend, "");
+		displayManualSupabaseInstructions(targetApp, packageManager);
+		return Result.ok();
 	}
 	let mode = setupMode;
 	if (!mode) {
@@ -8218,35 +8237,35 @@ async function setupSupabase(config, cliInput) {
 		}
 	}
 	if (mode === "manual") {
-		displayManualSupabaseInstructions(targetApp);
-		return writeSupabaseEnvFile(projectDir, backend, "");
+		displayManualSupabaseInstructions(targetApp, packageManager);
+		return Result.ok();
 	}
 	const initResult = await initializeSupabase(serverDir, packageManager);
 	if (initResult.isErr()) {
 		cliLog.error(pc.red(initResult.error.message));
-		displayManualSupabaseInstructions(targetApp);
-		return writeSupabaseEnvFile(projectDir, backend, "");
+		displayManualSupabaseInstructions(targetApp, packageManager);
+		return initResult;
 	}
 	const startResult = await startSupabase(serverDir, packageManager);
 	if (startResult.isErr()) {
 		cliLog.error(pc.red(startResult.error.message));
-		displayManualSupabaseInstructions(targetApp);
-		return writeSupabaseEnvFile(projectDir, backend, "");
+		displayManualSupabaseInstructions(targetApp, packageManager);
+		return startResult;
 	}
 	const supabaseOutput = startResult.value;
-	const dbUrl = extractDbUrl(await readSupabaseStatus(serverDir, packageManager));
-	if (dbUrl) {
-		const envResult = await writeSupabaseEnvFile(projectDir, backend, dbUrl);
+	const statusResult = await readSupabaseStatus(serverDir, packageManager);
+	if (statusResult.isOk()) {
+		const envResult = await writeSupabaseEnvFile(projectDir, backend, statusResult.value);
 		if (envResult.isOk()) cliLog.success(pc.green("Supabase local development setup ready!"));
 		else {
 			cliLog.error(pc.red("Supabase setup completed, but failed to update .env automatically."));
-			displayManualSupabaseInstructions(targetApp, supabaseOutput);
+			displayManualSupabaseInstructions(targetApp, packageManager, supabaseOutput);
 		}
 		return envResult;
 	}
 	cliLog.error(pc.yellow("Supabase started, but could not extract DB URL automatically."));
-	displayManualSupabaseInstructions(targetApp, supabaseOutput);
-	return databaseSetupError("supabase", "Could not extract database URL from Supabase output. Please configure manually.");
+	displayManualSupabaseInstructions(targetApp, packageManager, supabaseOutput);
+	return statusResult;
 }
 //#endregion
 //#region src/helpers/database-providers/turso-setup.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-better-t-stack",
-  "version": "3.46.1",
+  "version": "3.47.0",
   "description": "A modern CLI tool for scaffolding end-to-end type-safe TypeScript projects with best practices and customizable configurations",
   "keywords": [
     "better-auth",
@@ -70,8 +70,8 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@better-t-stack/template-generator": "^3.46.1",
-    "@better-t-stack/types": "^3.46.1",
+    "@better-t-stack/template-generator": "^3.47.0",
+    "@better-t-stack/types": "^3.47.0",
     "@clack/core": "^1.5.0",
     "@clack/prompts": "^1.8.0",
     "@modelcontextprotocol/server": "2.0.0",