create-better-t-stack 2.19.1 → 2.21.0

package/dist/index.js

@@ -60,7 +60,7 @@ const dependencyVersionMap = {
 	"vite-plugin-pwa": "^0.21.2",
 	"@vite-pwa/assets-generator": "^0.2.6",
 	"@tauri-apps/cli": "^2.4.0",
-	"@biomejs/biome": "1.9.4",
+	"@biomejs/biome": "^2.0.0",
 	husky: "^9.1.7",
 	"lint-staged": "^15.5.0",
 	"@hono/node-server": "^1.14.0",
@@ -609,22 +609,6 @@ async function setupBackendDependencies(config) {
 	});
 }
 
-//#endregion
-//#region src/utils/command-exists.ts
-async function commandExists(command) {
-	try {
-		const isWindows = process.platform === "win32";
-		if (isWindows) {
-			const result$1 = await execa("where", [command]);
-			return result$1.exitCode === 0;
-		}
-		const result = await execa("which", [command]);
-		return result.exitCode === 0;
-	} catch {
-		return false;
-	}
-}
-
 //#endregion
 //#region src/helpers/project-generation/env-setup.ts
 async function addEnvVariablesToFile(filePath, variables) {
@@ -730,7 +714,7 @@ async function setupEnvironmentVariables(config) {
 	let corsOrigin = "http://localhost:3001";
 	if (hasReactRouter || hasSvelte) corsOrigin = "http://localhost:5173";
 	let databaseUrl = null;
-	const specializedSetup = dbSetup === "turso" || dbSetup === "prisma-postgres" || dbSetup === "mongodb-atlas" || dbSetup === "neon" || dbSetup === "supabase";
+	const specializedSetup = dbSetup === "turso" || dbSetup === "prisma-postgres" || dbSetup === "mongodb-atlas" || dbSetup === "neon" || dbSetup === "supabase" || dbSetup === "d1";
 	if (database !== "none" && !specializedSetup) switch (database) {
 		case "postgres":
 			databaseUrl = "postgresql://postgres:password@localhost:5432/postgres";
@@ -782,6 +766,49 @@ async function setupEnvironmentVariables(config) {
 	}
 }
 
+//#endregion
+//#region src/helpers/database-providers/d1-setup.ts
+async function setupCloudflareD1(config) {
+	const { projectDir } = config;
+	const envPath = path.join(projectDir, "apps/server", ".env");
+	const variables = [
+		{
+			key: "CLOUDFLARE_ACCOUNT_ID",
+			value: "",
+			condition: true
+		},
+		{
+			key: "CLOUDFLARE_DATABASE_ID",
+			value: "",
+			condition: true
+		},
+		{
+			key: "CLOUDFLARE_D1_TOKEN",
+			value: "",
+			condition: true
+		}
+	];
+	try {
+		await addEnvVariablesToFile(envPath, variables);
+	} catch (_err) {}
+}
+
+//#endregion
+//#region src/utils/command-exists.ts
+async function commandExists(command) {
+	try {
+		const isWindows = process.platform === "win32";
+		if (isWindows) {
+			const result$1 = await execa("where", [command]);
+			return result$1.exitCode === 0;
+		}
+		const result = await execa("which", [command]);
+		return result.exitCode === 0;
+	} catch {
+		return false;
+	}
+}
+
 //#endregion
 //#region src/helpers/database-providers/mongodb-atlas-setup.ts
 async function checkAtlasCLI() {
@@ -885,6 +912,163 @@ async function setupMongoDBAtlas(config) {
 	}
 }
 
+//#endregion
+//#region src/helpers/database-providers/neon-setup.ts
+const NEON_REGIONS = [
+	{
+		label: "AWS US East (N. Virginia)",
+		value: "aws-us-east-1"
+	},
+	{
+		label: "AWS US East (Ohio)",
+		value: "aws-us-east-2"
+	},
+	{
+		label: "AWS US West (Oregon)",
+		value: "aws-us-west-2"
+	},
+	{
+		label: "AWS Europe (Frankfurt)",
+		value: "aws-eu-central-1"
+	},
+	{
+		label: "AWS Asia Pacific (Singapore)",
+		value: "aws-ap-southeast-1"
+	},
+	{
+		label: "AWS Asia Pacific (Sydney)",
+		value: "aws-ap-southeast-2"
+	},
+	{
+		label: "Azure East US 2 region (Virginia)",
+		value: "azure-eastus2"
+	}
+];
+async function executeNeonCommand(packageManager, commandArgsString, spinnerText) {
+	const s = spinner();
+	try {
+		const fullCommand = getPackageExecutionCommand(packageManager, commandArgsString);
+		if (spinnerText) s.start(spinnerText);
+		const result = await execa(fullCommand, { shell: true });
+		if (spinnerText) s.stop(pc.green(spinnerText.replace("...", "").replace("ing ", "ed ").trim()));
+		return result;
+	} catch (error) {
+		if (s) s.stop(pc.red(`Failed: ${spinnerText || "Command execution"}`));
+		throw error;
+	}
+}
+async function createNeonProject(projectName, regionId, packageManager) {
+	try {
+		const commandArgsString = `neonctl projects create --name ${projectName} --region-id ${regionId} --output json`;
+		const { stdout } = await executeNeonCommand(packageManager, commandArgsString, `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;
+			const connectionUri = response.connection_uris[0].connection_uri;
+			const params = response.connection_uris[0].connection_parameters;
+			return {
+				connectionString: connectionUri,
+				projectId,
+				dbName: params.database,
+				roleName: params.role
+			};
+		}
+		consola$1.error(pc.red("Failed to extract connection information from response"));
+		return null;
+	} catch (_error) {
+		consola$1.error(pc.red("Failed to create Neon project"));
+	}
+}
+async function writeEnvFile$2(projectDir, config) {
+	const envPath = path.join(projectDir, "apps/server", ".env");
+	const variables = [{
+		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) {
+	try {
+		const s = spinner();
+		s.start("Creating Neon database using neondb...");
+		const serverDir = path.join(projectDir, "apps/server");
+		await fs.ensureDir(serverDir);
+		const packageCmd = getPackageExecutionCommand(packageManager, "neondb --yes");
+		await execa(packageCmd, {
+			shell: true,
+			cwd: serverDir
+		});
+		s.stop(pc.green("Neon database created successfully!"));
+		return true;
+	} catch (error) {
+		consola$1.error(pc.red("Failed to create database with neondb"));
+		throw error;
+	}
+}
+function displayManualSetupInstructions$2() {
+	log.info(`Manual Neon PostgreSQL Setup Instructions:
+
+1. Visit https://neon.tech and create an account
+2. Create a new project from the dashboard
+3. Get your connection string
+4. Add the database URL to the .env file in apps/server/.env
+
+DATABASE_URL="your_connection_string"`);
+}
+async function setupNeonPostgres(config) {
+	const { packageManager, projectDir } = config;
+	try {
+		const setupMethod = await select({
+			message: "Choose your Neon setup method:",
+			options: [{
+				label: "Quick setup with neondb",
+				value: "neondb",
+				hint: "fastest, no auth required"
+			}, {
+				label: "Custom setup with neonctl",
+				value: "neonctl",
+				hint: "More control - choose project name and region"
+			}],
+			initialValue: "neondb"
+		});
+		if (isCancel(setupMethod)) {
+			cancel(pc.red("Operation cancelled"));
+			process.exit(0);
+		}
+		if (setupMethod === "neondb") await setupWithNeonDb(projectDir, packageManager);
+		else {
+			const suggestedProjectName = path.basename(projectDir);
+			const projectName = await text({
+				message: "Enter a name for your Neon project:",
+				defaultValue: suggestedProjectName,
+				initialValue: suggestedProjectName
+			});
+			const regionId = await select({
+				message: "Select a region for your Neon project:",
+				options: NEON_REGIONS,
+				initialValue: NEON_REGIONS[0].value
+			});
+			if (isCancel(projectName) || isCancel(regionId)) {
+				cancel(pc.red("Operation cancelled"));
+				process.exit(0);
+			}
+			const neonConfig = await createNeonProject(projectName, regionId, packageManager);
+			if (!neonConfig) throw new Error("Failed to create project - couldn't get connection information");
+			const finalSpinner = spinner();
+			finalSpinner.start("Configuring database connection");
+			await fs.ensureDir(path.join(projectDir, "apps/server"));
+			await writeEnvFile$2(projectDir, neonConfig);
+			finalSpinner.stop("Neon database configured!");
+		}
+	} catch (error) {
+		if (error instanceof Error) consola$1.error(pc.red(error.message));
+		await writeEnvFile$2(projectDir);
+		displayManualSetupInstructions$2();
+	}
+}
+
 //#endregion
 //#region src/helpers/database-providers/prisma-postgres-setup.ts
 async function initPrismaDatabase(serverDir, packageManager) {
@@ -919,7 +1103,7 @@ async function initPrismaDatabase(serverDir, packageManager) {
 		return null;
 	}
 }
-async function writeEnvFile$2(projectDir, config) {
+async function writeEnvFile$1(projectDir, config) {
 	try {
 		const envPath = path.join(projectDir, "apps/server", ".env");
 		const variables = [{
@@ -932,7 +1116,7 @@ async function writeEnvFile$2(projectDir, config) {
 		consola$1.error("Failed to update environment configuration");
 	}
 }
-function displayManualSetupInstructions$2() {
+function displayManualSetupInstructions$1() {
 	log.info(`Manual Prisma PostgreSQL Setup Instructions:
 
 1. Visit https://console.prisma.io and create an account
@@ -983,23 +1167,23 @@ async function setupPrismaPostgres(config) {
 		s.stop("Prisma PostgreSQL setup ready");
 		const config$1 = await initPrismaDatabase(serverDir, packageManager);
 		if (config$1) {
-			await writeEnvFile$2(projectDir, config$1);
+			await writeEnvFile$1(projectDir, config$1);
 			await addPrismaAccelerateExtension(serverDir);
 			log.success(pc.green("Prisma PostgreSQL database configured successfully!"));
 			log.info(pc.cyan("NOTE: Make sure to uncomment `import \"dotenv/config\";` in `apps/server/src/prisma.config.ts` to load environment variables."));
 		} else {
 			const fallbackSpinner = spinner();
 			fallbackSpinner.start("Setting up fallback configuration...");
-			await writeEnvFile$2(projectDir);
+			await writeEnvFile$1(projectDir);
 			fallbackSpinner.stop("Fallback configuration ready");
-			displayManualSetupInstructions$2();
+			displayManualSetupInstructions$1();
 		}
 	} catch (error) {
 		s.stop(pc.red("Prisma PostgreSQL setup failed"));
 		consola$1.error(pc.red(`Error during Prisma PostgreSQL setup: ${error instanceof Error ? error.message : String(error)}`));
 		try {
-			await writeEnvFile$2(projectDir);
-			displayManualSetupInstructions$2();
+			await writeEnvFile$1(projectDir);
+			displayManualSetupInstructions$1();
 		} catch {}
 		log.info("Setup completed with manual configuration required.");
 	}
@@ -1246,7 +1430,7 @@ async function createTursoDatabase(dbName, groupName) {
 		s.stop(pc.red("Failed to retrieve database connection details"));
 	}
 }
-async function writeEnvFile$1(projectDir, config) {
+async function writeEnvFile(projectDir, config) {
 	const envPath = path.join(projectDir, "apps/server", ".env");
 	const variables = [{
 		key: "DATABASE_URL",
@@ -1259,7 +1443,7 @@ async function writeEnvFile$1(projectDir, config) {
 	}];
 	await addEnvVariablesToFile(envPath, variables);
 }
-function displayManualSetupInstructions$1() {
+function displayManualSetupInstructions() {
 	log.info(`Manual Turso Setup Instructions:
 
 1. Visit https://turso.tech and create an account
@@ -1283,8 +1467,8 @@ async function setupTurso(config) {
 		if (isWindows) {
 			setupSpinner.stop(pc.yellow("Turso setup not supported on Windows"));
 			log.warn(pc.yellow("Automatic Turso setup is not supported on Windows."));
-			await writeEnvFile$1(projectDir);
-			displayManualSetupInstructions$1();
+			await writeEnvFile(projectDir);
+			displayManualSetupInstructions();
 			return;
 		}
 		setupSpinner.stop("Turso CLI availability checked");
@@ -1299,8 +1483,8 @@ async function setupTurso(config) {
 				process.exit(0);
 			}
 			if (!shouldInstall) {
-				await writeEnvFile$1(projectDir);
-				displayManualSetupInstructions$1();
+				await writeEnvFile(projectDir);
+				displayManualSetupInstructions();
 				return;
 			}
 			await installTursoCLI(isMac);
@@ -1325,7 +1509,7 @@ async function setupTurso(config) {
 			dbName = dbNameResponse;
 			try {
 				const config$1 = await createTursoDatabase(dbName, selectedGroup);
-				await writeEnvFile$1(projectDir, config$1);
+				await writeEnvFile(projectDir, config$1);
 				success = true;
 			} catch (error) {
 				if (error instanceof Error && error.message === "DATABASE_EXISTS") {
@@ -1338,166 +1522,9 @@ async function setupTurso(config) {
 	} catch (error) {
 		setupSpinner.stop(pc.red("Turso CLI availability check failed"));
 		consola.error(pc.red(`Error during Turso setup: ${error instanceof Error ? error.message : String(error)}`));
-		await writeEnvFile$1(projectDir);
-		displayManualSetupInstructions$1();
-		log.success("Setup completed with manual configuration required.");
-	}
-}
-
-//#endregion
-//#region src/helpers/database-providers/neon-setup.ts
-const NEON_REGIONS = [
-	{
-		label: "AWS US East (N. Virginia)",
-		value: "aws-us-east-1"
-	},
-	{
-		label: "AWS US East (Ohio)",
-		value: "aws-us-east-2"
-	},
-	{
-		label: "AWS US West (Oregon)",
-		value: "aws-us-west-2"
-	},
-	{
-		label: "AWS Europe (Frankfurt)",
-		value: "aws-eu-central-1"
-	},
-	{
-		label: "AWS Asia Pacific (Singapore)",
-		value: "aws-ap-southeast-1"
-	},
-	{
-		label: "AWS Asia Pacific (Sydney)",
-		value: "aws-ap-southeast-2"
-	},
-	{
-		label: "Azure East US 2 region (Virginia)",
-		value: "azure-eastus2"
-	}
-];
-async function executeNeonCommand(packageManager, commandArgsString, spinnerText) {
-	const s = spinner();
-	try {
-		const fullCommand = getPackageExecutionCommand(packageManager, commandArgsString);
-		if (spinnerText) s.start(spinnerText);
-		const result = await execa(fullCommand, { shell: true });
-		if (spinnerText) s.stop(pc.green(spinnerText.replace("...", "").replace("ing ", "ed ").trim()));
-		return result;
-	} catch (error) {
-		if (s) s.stop(pc.red(`Failed: ${spinnerText || "Command execution"}`));
-		throw error;
-	}
-}
-async function createNeonProject(projectName, regionId, packageManager) {
-	try {
-		const commandArgsString = `neonctl projects create --name ${projectName} --region-id ${regionId} --output json`;
-		const { stdout } = await executeNeonCommand(packageManager, commandArgsString, `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;
-			const connectionUri = response.connection_uris[0].connection_uri;
-			const params = response.connection_uris[0].connection_parameters;
-			return {
-				connectionString: connectionUri,
-				projectId,
-				dbName: params.database,
-				roleName: params.role
-			};
-		}
-		consola$1.error(pc.red("Failed to extract connection information from response"));
-		return null;
-	} catch (_error) {
-		consola$1.error(pc.red("Failed to create Neon project"));
-	}
-}
-async function writeEnvFile(projectDir, config) {
-	const envPath = path.join(projectDir, "apps/server", ".env");
-	const variables = [{
-		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) {
-	try {
-		const s = spinner();
-		s.start("Creating Neon database using neondb...");
-		const serverDir = path.join(projectDir, "apps/server");
-		await fs.ensureDir(serverDir);
-		const packageCmd = getPackageExecutionCommand(packageManager, "neondb --yes");
-		await execa(packageCmd, {
-			shell: true,
-			cwd: serverDir
-		});
-		s.stop(pc.green("Neon database created successfully!"));
-		return true;
-	} catch (error) {
-		consola$1.error(pc.red("Failed to create database with neondb"));
-		throw error;
-	}
-}
-function displayManualSetupInstructions() {
-	log.info(`Manual Neon PostgreSQL Setup Instructions:
-
-1. Visit https://neon.tech and create an account
-2. Create a new project from the dashboard
-3. Get your connection string
-4. Add the database URL to the .env file in apps/server/.env
-
-DATABASE_URL="your_connection_string"`);
-}
-async function setupNeonPostgres(config) {
-	const { packageManager, projectDir } = config;
-	try {
-		const setupMethod = await select({
-			message: "Choose your Neon setup method:",
-			options: [{
-				label: "Quick setup with neondb",
-				value: "neondb",
-				hint: "fastest, no auth required"
-			}, {
-				label: "Custom setup with neonctl",
-				value: "neonctl",
-				hint: "More control - choose project name and region"
-			}],
-			initialValue: "neondb"
-		});
-		if (isCancel(setupMethod)) {
-			cancel(pc.red("Operation cancelled"));
-			process.exit(0);
-		}
-		if (setupMethod === "neondb") await setupWithNeonDb(projectDir, packageManager);
-		else {
-			const suggestedProjectName = path.basename(projectDir);
-			const projectName = await text({
-				message: "Enter a name for your Neon project:",
-				defaultValue: suggestedProjectName,
-				initialValue: suggestedProjectName
-			});
-			const regionId = await select({
-				message: "Select a region for your Neon project:",
-				options: NEON_REGIONS,
-				initialValue: NEON_REGIONS[0].value
-			});
-			if (isCancel(projectName) || isCancel(regionId)) {
-				cancel(pc.red("Operation cancelled"));
-				process.exit(0);
-			}
-			const neonConfig = await createNeonProject(projectName, regionId, packageManager);
-			if (!neonConfig) throw new Error("Failed to create project - couldn't get connection information");
-			const finalSpinner = spinner();
-			finalSpinner.start("Configuring database connection");
-			await fs.ensureDir(path.join(projectDir, "apps/server"));
-			await writeEnvFile(projectDir, neonConfig);
-			finalSpinner.stop("Neon database configured!");
-		}
-	} catch (error) {
-		if (error instanceof Error) consola$1.error(pc.red(error.message));
 		await writeEnvFile(projectDir);
 		displayManualSetupInstructions();
+		log.success("Setup completed with manual configuration required.");
 	}
 }
 
@@ -1544,6 +1571,7 @@ async function setupDatabase(config) {
 			projectDir: serverDir
 		});
 		if (database === "sqlite" && dbSetup === "turso") await setupTurso(config);
+		else if (database === "sqlite" && dbSetup === "d1") await setupCloudflareD1(config);
 		else if (database === "postgres") {
 			if (orm === "prisma" && dbSetup === "prisma-postgres") await setupPrismaPostgres(config);
 			else if (dbSetup === "neon") await setupNeonPostgres(config);
@@ -1596,6 +1624,22 @@ async function setupRuntime(config) {
 	else if (runtime === "node") await setupNodeRuntime(serverDir, backend);
 	else if (runtime === "workers") await setupWorkersRuntime(serverDir);
 }
+async function generateCloudflareWorkerTypes(config) {
+	if (config.runtime !== "workers") return;
+	const serverDir = path.join(config.projectDir, "apps/server");
+	if (!await fs.pathExists(serverDir)) return;
+	const s = spinner();
+	try {
+		s.start("Generating Cloudflare Workers types...");
+		const runCmd = config.packageManager === "npm" ? "npm" : config.packageManager;
+		await execa(runCmd, ["run", "cf-typegen"], { cwd: serverDir });
+		s.stop("Cloudflare Workers types generated successfully!");
+	} catch {
+		s.stop(pc.yellow("Failed to generate Cloudflare Workers types"));
+		const managerCmd = config.packageManager === "npm" ? "npm run" : `${config.packageManager} run`;
+		console.warn(`Note: You can manually run 'cd apps/server && ${managerCmd} cf-typegen' in the project directory later`);
+	}
+}
 async function setupBunRuntime(serverDir, _backend) {
 	const packageJsonPath = path.join(serverDir, "package.json");
 	if (!await fs.pathExists(packageJsonPath)) return;
@@ -1867,12 +1911,12 @@ async function installDependencies({ projectDir, packageManager }) {
 //#endregion
 //#region src/helpers/project-generation/post-installation.ts
 function displayPostInstallInstructions(config) {
-	const { database, relativePath, packageManager, depsInstalled, orm, addons, runtime, frontend, backend } = config;
+	const { database, relativePath, packageManager, depsInstalled, orm, addons, runtime, frontend, backend, dbSetup } = config;
 	const isConvex = backend === "convex";
 	const runCmd = packageManager === "npm" ? "npm run" : packageManager;
 	const cdCmd = `cd ${relativePath}`;
 	const hasHuskyOrBiome = addons?.includes("husky") || addons?.includes("biome");
-	const databaseInstructions = !isConvex && database !== "none" ? getDatabaseInstructions(database, orm, runCmd, runtime) : "";
+	const databaseInstructions = !isConvex && database !== "none" ? getDatabaseInstructions(database, orm, runCmd, runtime, dbSetup) : "";
 	const tauriInstructions = addons?.includes("tauri") ? getTauriInstructions(runCmd) : "";
 	const lintingInstructions = hasHuskyOrBiome ? getLintingInstructions(runCmd) : "";
 	const nativeInstructions = frontend?.includes("native-nativewind") || frontend?.includes("native-unistyles") ? getNativeInstructions(isConvex) : "";
@@ -1903,6 +1947,7 @@ function displayPostInstallInstructions(config) {
 	} else {
 		if (runtime !== "workers") output += `${pc.cyan(`${stepCounter++}.`)} ${runCmd} dev\n`;
 		if (runtime === "workers") {
+			if (dbSetup === "d1") output += `${pc.yellow("IMPORTANT:")} Complete D1 database setup first (see Database commands below)\n`;
 			output += `${pc.cyan(`${stepCounter++}.`)} bun dev\n`;
 			output += `${pc.cyan(`${stepCounter++}.`)} cd apps/server && bun run cf-typegen\n\n`;
 		} else output += "\n";
@@ -1937,8 +1982,18 @@ function getNativeInstructions(isConvex) {
 function getLintingInstructions(runCmd) {
 	return `${pc.bold("Linting and formatting:")}\n${pc.cyan("•")} Format and lint fix: ${`${runCmd} check`}\n`;
 }
-function getDatabaseInstructions(database, orm, runCmd, runtime) {
+function getDatabaseInstructions(database, orm, runCmd, runtime, dbSetup) {
 	const instructions = [];
+	if (runtime === "workers" && dbSetup === "d1") {
+		const packageManager = runCmd === "npm run" ? "npm" : runCmd || "npm";
+		instructions.push(`${pc.cyan("1.")} Login to Cloudflare: ${pc.white(`${packageManager} wrangler login`)}`);
+		instructions.push(`${pc.cyan("2.")} Create D1 database: ${pc.white(`${packageManager} wrangler d1 create your-database-name`)}`);
+		instructions.push(`${pc.cyan("3.")} Update apps/server/wrangler.jsonc with database_id and database_name`);
+		instructions.push(`${pc.cyan("4.")} Generate migrations: ${pc.white("cd apps/server && bun db:generate")}`);
+		instructions.push(`${pc.cyan("5.")} Apply migrations locally: ${pc.white(`${packageManager} wrangler d1 migrations apply YOUR_DB_NAME --local`)}`);
+		instructions.push(`${pc.cyan("6.")} Apply migrations to production: ${pc.white(`${packageManager} wrangler d1 migrations apply YOUR_DB_NAME`)}`);
+		instructions.push("");
+	}
 	if (orm === "prisma") {
 		if (database === "sqlite") instructions.push(`${pc.yellow("NOTE:")} Turso support with Prisma is in Early Access and requires additional setup.`, `Learn more at: https://www.prisma.io/docs/orm/overview/databases/turso`);
 		if (runtime === "bun") instructions.push(`${pc.yellow("NOTE:")} Prisma with Bun may require additional configuration. If you encounter errors,\nfollow the guidance provided in the error messages`);
@@ -1947,7 +2002,7 @@ function getDatabaseInstructions(database, orm, runCmd, runtime) {
 	} else if (orm === "drizzle") {
 		instructions.push(`${pc.cyan("•")} Apply schema: ${`${runCmd} db:push`}`);
 		instructions.push(`${pc.cyan("•")} Database UI: ${`${runCmd} db:studio`}`);
-		if (database === "sqlite") instructions.push(`${pc.cyan("•")} Start local DB (if needed): ${`cd apps/server && ${runCmd} db:local`}`);
+		if (database === "sqlite" && dbSetup !== "d1") instructions.push(`${pc.cyan("•")} Start local DB (if needed): ${`cd apps/server && ${runCmd} db:local`}`);
 	} else if (orm === "none") instructions.push(`${pc.yellow("NOTE:")} Manual database schema setup required.`);
 	return instructions.length ? `${pc.bold("Database commands:")}\n${instructions.join("\n")}` : "";
 }
@@ -2539,10 +2594,13 @@ async function createProject(options) {
 		await createReadme(projectDir, options);
 		await initializeGit(projectDir, options.git);
 		log.success("Project template successfully scaffolded!");
-		if (options.install) await installDependencies({
-			projectDir,
-			packageManager: options.packageManager
-		});
+		if (options.install) {
+			await installDependencies({
+				projectDir,
+				packageManager: options.packageManager
+			});
+			await generateCloudflareWorkerTypes(options);
+		}
 		displayPostInstallInstructions({
 			...options,
 			depsInstalled: options.install
@@ -2784,21 +2842,29 @@ async function getDatabaseChoice(database, backend, runtime) {
 
 //#endregion
 //#region src/prompts/database-setup.ts
-async function getDBSetupChoice(databaseType, dbSetup, orm, backend) {
+async function getDBSetupChoice(databaseType, dbSetup, orm, backend, runtime) {
 	if (backend === "convex") return "none";
 	if (dbSetup !== void 0) return dbSetup;
 	if (databaseType === "none") return "none";
 	if (databaseType === "sqlite" && orm === "prisma") return "none";
 	let options = [];
-	if (databaseType === "sqlite") options = [{
-		value: "turso",
-		label: "Turso",
-		hint: "SQLite for Production. Powered by libSQL"
-	}, {
-		value: "none",
-		label: "None",
-		hint: "Manual setup"
-	}];
+	if (databaseType === "sqlite") options = [
+		{
+			value: "turso",
+			label: "Turso",
+			hint: "SQLite for Production. Powered by libSQL"
+		},
+		...runtime === "workers" ? [{
+			value: "d1",
+			label: "Cloudflare D1",
+			hint: "Cloudflare's managed, serverless database with SQLite's SQL semantics"
+		}] : [],
+		{
+			value: "none",
+			label: "None",
+			hint: "Manual setup"
+		}
+	];
 	else if (databaseType === "postgres") options = [
 		{
 			value: "neon",
@@ -3121,7 +3187,7 @@ async function gatherConfig(flags, projectName, projectDir, relativePath) {
 		auth: ({ results }) => getAuthChoice(flags.auth, results.database !== "none", results.backend),
 		addons: ({ results }) => getAddonsChoice(flags.addons, results.frontend),
 		examples: ({ results }) => getExamplesChoice(flags.examples, results.database, results.frontend, results.backend, results.api),
-		dbSetup: ({ results }) => getDBSetupChoice(results.database ?? "none", flags.dbSetup, results.orm, results.backend),
+		dbSetup: ({ results }) => getDBSetupChoice(results.database ?? "none", flags.dbSetup, results.orm, results.backend, results.runtime),
 		git: () => getGitChoice(flags.git),
 		packageManager: () => getPackageManagerChoice(flags.packageManager),
 		install: () => getinstallChoice(flags.install)
@@ -3234,6 +3300,7 @@ const DatabaseSetupSchema = z.enum([
 	"prisma-postgres",
 	"mongodb-atlas",
 	"supabase",
+	"d1",
 	"none"
 ]).describe("Database hosting setup");
 const APISchema = z.enum([
@@ -3702,6 +3769,16 @@ function processAndValidateFlags(options, providedFlags, projectName) {
 		consola$1.fatal("Supabase setup requires PostgreSQL database. Please use '--database postgres' or choose a different setup.");
 		process.exit(1);
 	}
+	if (config.dbSetup === "d1") {
+		if (config.database !== "sqlite") {
+			consola$1.fatal("Cloudflare D1 setup requires SQLite database. Please use '--database sqlite' or choose a different setup.");
+			process.exit(1);
+		}
+		if (config.runtime !== "workers") {
+			consola$1.fatal("Cloudflare D1 setup requires the Cloudflare Workers runtime. Please use '--runtime workers' or choose a different setup.");
+			process.exit(1);
+		}
+	}
 	if (providedFlags.has("runtime") && options.runtime === "workers" && config.backend && config.backend !== "hono") {
 		consola$1.fatal(`Cloudflare Workers runtime (--runtime workers) is only supported with Hono backend (--backend hono). Current backend: ${config.backend}. Please use '--backend hono' or choose a different runtime.`);
 		process.exit(1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-better-t-stack",
-  "version": "2.19.1",
+  "version": "2.21.0",
   "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/addons/biome/biome.json.hbs

@@ -0,0 +1,83 @@
+{
+	"$schema": "https://biomejs.dev/schemas/2.0.0/schema.json",
+	"vcs": {
+		"enabled": false,
+		"clientKind": "git",
+		"useIgnoreFile": false
+	},
+	"files": {
+		"ignoreUnknown": false,
+		"includes": [
+			"**",
+			"!**/.next",
+			"!**/dist",
+			"!**/.turbo",
+			"!**/dev-dist",
+			"!**/.zed",
+			"!**/.vscode",
+			"!**/routeTree.gen.ts",
+			"!**/src-tauri",
+			"!**/.nuxt"
+		]
+	},
+	"formatter": {
+		"enabled": true,
+		"indentStyle": "tab"
+	},
+	"assist": { "actions": { "source": { "organizeImports": "on" } } },
+	"linter": {
+		"enabled": true,
+		"rules": {
+			"recommended": true,
+			"correctness": {
+				"useExhaustiveDependencies": "info"
+			},
+			"nursery": {
+				"useSortedClasses": {
+					"level": "warn",
+					"fix": "safe",
+					"options": {
+						"functions": ["clsx", "cva", "cn"]
+					}
+				}
+			},
+			"style": {
+				"noParameterAssign": "error",
+				"useAsConstAssertion": "error",
+				"useDefaultParameterLast": "error",
+				"useEnumInitializers": "error",
+				"useSelfClosingElements": "error",
+				"useSingleVarDeclarator": "error",
+				"noUnusedTemplateLiteral": "error",
+				"useNumberNamespace": "error",
+				"noInferrableTypes": "error",
+				"noUselessElse": "error"
+			}
+		}
+	},
+	"javascript": {
+		"formatter": {
+			"quoteStyle": "double"
+		}
+	}
+	{{#if (or (eq frontend "svelte") (eq frontend "nuxt"))}}
+	,
+	"overrides": [
+		{
+			"includes": ["**/*.svelte", "**/*.vue"],
+			"linter": {
+				"rules": {
+					"style": {
+						"useConst": "off",
+						"useImportType": "off"
+					},
+					"correctness": {
+						"noUnusedVariables": "off",
+						"noUnusedImports": "off"
+					}
+				}
+			}
+		}
+	]
+	{{/if}}
+}

package/templates/auth/web/solid/src/components/{user-menu.tsx → user-menu.tsx.hbs}

@@ -32,6 +32,7 @@ export default function UserMenu() {
           <div class="absolute right-0 mt-2 w-56 rounded p-1 shadow-sm">
             <div class="px-4  text-sm">{session().data?.user.email}</div>
             <button
+              type="button"
               class="mt-1 w-full border rounded px-4  text-center text-sm"
               onClick={() => {
                 setIsMenuOpen(false);

package/templates/db/drizzle/sqlite/drizzle.config.ts.hbs

@@ -3,6 +3,16 @@ import { defineConfig } from "drizzle-kit";
 export default defineConfig({
   schema: "./src/db/schema",
   out: "./src/db/migrations",
+  {{#if (eq dbSetup "d1")}}
+  // DOCS: https://orm.drizzle.team/docs/guides/d1-http-with-drizzle-kit
+  dialect: "sqlite",
+  driver: "d1-http",
+  dbCredentials: {
+    accountId: process.env.CLOUDFLARE_ACCOUNT_ID!,
+    databaseId: process.env.CLOUDFLARE_DATABASE_ID!,
+    token: process.env.CLOUDFLARE_D1_TOKEN!,
+  },
+  {{else}}
   dialect: "turso",
   dbCredentials: {
     url: process.env.DATABASE_URL || "",
@@ -10,4 +20,5 @@ export default defineConfig({
     authToken: process.env.DATABASE_AUTH_TOKEN,
     {{/if}}
   },
+  {{/if}}
 });

package/templates/db/drizzle/sqlite/src/db/index.ts.hbs

@@ -13,6 +13,12 @@ export const db = drizzle({ client });
 {{/if}}
 
 {{#if (eq runtime "workers")}}
+{{#if (eq dbSetup "d1")}}
+import { drizzle } from "drizzle-orm/d1";
+import { env } from "cloudflare:workers";
+
+export const db = drizzle(env.DB);
+{{else}}
 import { drizzle } from "drizzle-orm/libsql";
 import { env } from "cloudflare:workers";
 import { createClient } from "@libsql/client";
@@ -26,3 +32,4 @@ const client = createClient({
 
 export const db = drizzle({ client });
 {{/if}}
+{{/if}}

package/templates/runtime/workers/apps/server/wrangler.jsonc.hbs

@@ -5,14 +5,30 @@
   "compatibility_flags": ["nodejs_compat"],
   "vars": {
     "NODE_ENV": "production"
-    // Non-sensitive environment variables (visible in dashboard)
-    // "CORS_ORIGIN": "https://your-frontend-domain.com",
-    // "BETTER_AUTH_URL": "https://your-worker-domain.workers.dev"
+    // Add public environment variables here
+    // Example: "CORS_ORIGIN": "https://your-domain.com"
   }
-  // ⚠️ SENSITIVE DATA: Use `wrangler secret put` instead of adding here
-  // Don't put these in "vars" - they'll be visible in the dashboard!
-  // - DATABASE_URL
-  // - DATABASE_AUTH_TOKEN
-  // - GOOGLE_GENERATIVE_AI_API_KEY
-  // - BETTER_AUTH_SECRET
+  // For sensitive data, use:
+  // wrangler secret put SECRET_NAME
+  // Don't add secrets to "vars" - they're visible in the dashboard!
+
+  {{#if (eq dbSetup "d1")}},
+  // To set up D1 database:
+  // 1. Run: wrangler login
+  // 2. Run: wrangler d1 create your-database-name
+  // 3. Copy the output and paste below
+  // Then run migrations:
+  // bun db:generate
+  // To apply migrations locally, run:
+  // wrangler d1 migrations apply YOUR_DB_NAME --local
+  "d1_databases": [
+    {
+      "binding": "DB",
+      "database_name": "YOUR_DB_NAME",
+      "database_id": "YOUR_DB_ID",
+      "preview_database_id": "local-test-db",
+      "migrations_dir": "./src/db/migrations"
+    }
+  ]
+  {{/if}}
 }

package/templates/addons/biome/biome.json

@@ -1,52 +0,0 @@
-{
-	"$schema": "https://biomejs.dev/schemas/1.9.4/schema.json",
-	"vcs": {
-		"enabled": false,
-		"clientKind": "git",
-		"useIgnoreFile": false
-	},
-	"files": {
-		"ignoreUnknown": false,
-		"ignore": [
-			".next",
-			"dist",
-			".turbo",
-			"dev-dist",
-			".zed",
-			".vscode",
-			"routeTree.gen.ts",
-			"src-tauri",
-			".nuxt"
-		]
-	},
-	"formatter": {
-		"enabled": true,
-		"indentStyle": "tab"
-	},
-	"organizeImports": {
-		"enabled": true
-	},
-	"linter": {
-		"enabled": true,
-		"rules": {
-			"recommended": true,
-			"correctness": {
-				"useExhaustiveDependencies": "info"
-			},
-			"nursery": {
-				"useSortedClasses": {
-					"level": "warn",
-					"fix": "safe",
-					"options": {
-						"functions": ["clsx", "cva", "cn"]
-					}
-				}
-			}
-		}
-	},
-	"javascript": {
-		"formatter": {
-			"quoteStyle": "double"
-		}
-	}
-}