create-better-t-stack 2.20.0 → 2.21.0

package/dist/index.js

@@ -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() {
@@ -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.20.0",
+  "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/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}}
 }