create-better-t-stack 3.26.1 → 3.27.0

package/README.md

@@ -217,6 +217,12 @@ Create a Cloudflare Workers project:
 npx create-better-t-stack --backend hono --runtime workers --database sqlite --orm drizzle --db-setup d1
 ```
 
+Create a self-hosted fullstack project on Cloudflare with D1:
+
+```bash
+npx create-better-t-stack --backend self --frontend next --api trpc --database sqlite --orm drizzle --db-setup d1 --web-deploy cloudflare
+```
+
 Create a minimal API-only project:
 
 ```bash
@@ -232,7 +238,8 @@ npx create-better-t-stack --frontend none --backend hono --api trpc --database n
 - **Database 'none'**: Disables database setup and requires ORM to be `none`.
 - **ORM 'none'**: Can be used when you want to handle database operations manually or use a different ORM.
 - **Runtime 'none'**: Only available with Convex backend, backend `none`, or backend `self`.
-- **Cloudflare Workers runtime**: Only compatible with Hono backend, Drizzle ORM (or no ORM), and SQLite database (with D1 setup). Not compatible with MongoDB.
+- **Cloudflare Workers runtime**: Only compatible with Hono backend. If a database is used, MongoDB is not supported.
+- **Cloudflare D1 setup**: Requires `sqlite` and either `--runtime workers --server-deploy cloudflare` or `--backend self --web-deploy cloudflare`. For `backend self`, D1 is supported on `next`, `tanstack-start`, `nuxt`, and `astro`.
 - **Addons 'none'**: Skips all addons.
 - **Examples 'none'**: Skips all example implementations (todo, AI chat).
 - **Nuxt, Svelte, SolidJS, and Astro** frontends are only compatible with oRPC API layer

package/dist/cli.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { _ as types_exports, i as SchemaNameSchema, l as create, m as getSchemaResult, s as add, u as createBtsCli, v as getLatestCLIVersion } from "./src-Kus6HC8q.mjs";
+import { _ as types_exports, i as SchemaNameSchema, l as create, m as getSchemaResult, s as add, u as createBtsCli, v as getLatestCLIVersion } from "./src-CiY2JajO.mjs";
 import z from "zod";
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";

package/dist/index.mjs

@@ -1,3 +1,3 @@
 #!/usr/bin/env node
-import { C as ProjectCreationError, S as DirectoryConflictError, T as ValidationError, a as TEMPLATE_COUNT, b as CompatibilityError, 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 UserCancelledError, x as DatabaseSetupError, y as CLIError } from "./src-Kus6HC8q.mjs";
+import { C as ProjectCreationError, S as DirectoryConflictError, T as ValidationError, a as TEMPLATE_COUNT, b as CompatibilityError, 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 UserCancelledError, x as DatabaseSetupError, y as CLIError } from "./src-CiY2JajO.mjs";
 export { CLIError, CompatibilityError, DatabaseSetupError, DirectoryConflictError, EMBEDDED_TEMPLATES, GeneratorError, ProjectCreationError, Result, SchemaNameSchema, TEMPLATE_COUNT, UserCancelledError, ValidationError, VirtualFileSystem, add, builder, create, createBtsCli, createVirtual, docs, generate, getSchemaResult, router, sponsors };

package/dist/{src-Kus6HC8q.mjs → src-CiY2JajO.mjs}

@@ -3392,7 +3392,7 @@ async function getDBSetupChoice(databaseType, dbSetup, _orm, backend, runtime) {
 			label: "Turso",
 			hint: "SQLite for Production. Powered by libSQL"
 		},
-		...runtime === "workers" ? [{
+		...runtime === "workers" || backend === "self" ? [{
 			value: "d1",
 			label: "Cloudflare D1",
 			hint: "Cloudflare's managed, serverless database with SQLite's SQL semantics"
@@ -3832,9 +3832,10 @@ function getDeploymentDisplay(deployment) {
 		hint: `Add ${deployment} deployment`
 	};
 }
-async function getDeploymentChoice(deployment, _runtime, _backend, frontend = []) {
+async function getDeploymentChoice(deployment, _runtime, backend, frontend = [], dbSetup) {
 	if (deployment !== void 0) return deployment;
 	if (!hasWebFrontend(frontend)) return "none";
+	if (backend === "self" && dbSetup === "d1") return "cloudflare";
 	const response = await navigableSelect({
 		message: "Select web deployment",
 		options: ["cloudflare", "none"].map((deploy) => {
@@ -3888,7 +3889,7 @@ async function gatherConfig(flags, projectName, projectDir, relativePath) {
 		addons: ({ results }) => getAddonsChoice(flags.addons, results.frontend, results.auth),
 		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, results.runtime),
-		webDeploy: ({ results }) => getDeploymentChoice(flags.webDeploy, results.runtime, results.backend, results.frontend),
+		webDeploy: ({ results }) => getDeploymentChoice(flags.webDeploy, results.runtime, results.backend, results.frontend, results.dbSetup),
 		serverDeploy: ({ results }) => getServerDeploymentChoice(flags.serverDeploy, results.runtime, results.backend, results.webDeploy),
 		git: () => getGitChoice(flags.git),
 		packageManager: () => getPackageManagerChoice(flags.packageManager),
@@ -4305,6 +4306,18 @@ function validateArrayOptions(options) {
 function validationErr(message) {
 	return Result.err(new ValidationError({ message }));
 }
+function hasResolvedWorkersD1Target(config) {
+	return config.backend === "hono" && config.runtime === "workers" && config.serverDeploy === "cloudflare";
+}
+function hasResolvedSelfCloudflareD1Target(config) {
+	return config.backend === "self" && config.runtime === "none" && config.webDeploy === "cloudflare";
+}
+function canResolveWorkersD1Target(config) {
+	return (config.backend === void 0 || config.backend === "hono") && (config.runtime === void 0 || config.runtime === "workers") && (config.serverDeploy === void 0 || config.serverDeploy === "cloudflare");
+}
+function canResolveSelfCloudflareD1Target(config) {
+	return (config.backend === void 0 || config.backend === "self") && (config.runtime === void 0 || config.runtime === "none") && (config.webDeploy === void 0 || config.webDeploy === "cloudflare");
+}
 function validateDatabaseOrmAuth(cfg, flags) {
 	const db = cfg.database;
 	const orm = cfg.orm;
@@ -4343,8 +4356,7 @@ function validateDatabaseSetup(config, providedFlags) {
 		},
 		d1: {
 			database: "sqlite",
-			runtime: "workers",
-			errorMessage: "Cloudflare D1 setup requires SQLite database and Cloudflare Workers runtime."
+			errorMessage: "Cloudflare D1 setup requires SQLite database."
 		},
 		docker: { errorMessage: "Docker setup is not compatible with SQLite database or Cloudflare Workers runtime." },
 		none: { errorMessage: "" }
@@ -4355,6 +4367,13 @@ function validateDatabaseSetup(config, providedFlags) {
 			if (database !== "postgres" && database !== "mysql") return validationErr(validation.errorMessage);
 		} else if (validation.database && database !== validation.database) return validationErr(validation.errorMessage);
 		if (validation.runtime && runtime !== validation.runtime) return validationErr(validation.errorMessage);
+		if (dbSetup === "d1") {
+			const isWorkersTarget = hasResolvedWorkersD1Target(config);
+			const isSelfCloudflareTarget = hasResolvedSelfCloudflareD1Target(config);
+			const canResolveWorkersTarget = canResolveWorkersD1Target(config);
+			const canResolveSelfCloudflareTarget = canResolveSelfCloudflareD1Target(config);
+			if (!isWorkersTarget && !isSelfCloudflareTarget && !canResolveWorkersTarget && !canResolveSelfCloudflareTarget) return validationErr("Cloudflare D1 setup requires SQLite database and either Cloudflare Workers runtime with server deployment or backend 'self' with Cloudflare web deployment.");
+		}
 		if (dbSetup === "docker") {
 			if (database === "sqlite") return validationErr("Docker setup is not compatible with SQLite database. SQLite is file-based and doesn't require Docker. Please use '--database postgres', '--database mysql', '--database mongodb', or choose a different setup.");
 			if (runtime === "workers") return validationErr("Docker setup is not compatible with Cloudflare Workers runtime. Workers runtime uses serverless databases (D1) and doesn't support local Docker containers. Please use '--db-setup d1' for SQLite or choose a different runtime.");
@@ -4612,8 +4631,8 @@ async function addEnvVariablesToFile(envPath, variables) {
 //#endregion
 //#region src/helpers/database-providers/d1-setup.ts
 async function setupCloudflareD1(config) {
-	const { projectDir, serverDeploy, orm, backend } = config;
-	if (!(serverDeploy === "cloudflare" && orm === "prisma")) return Result.ok(void 0);
+	const { projectDir, serverDeploy, webDeploy, orm, backend } = config;
+	if (!(orm === "prisma" && (serverDeploy === "cloudflare" || backend === "self" && webDeploy === "cloudflare"))) return Result.ok(void 0);
 	return Result.tryPromise({
 		try: async () => {
 			const targetApp = backend === "self" ? "apps/web" : "apps/server";
@@ -5995,7 +6014,7 @@ async function displayPostInstallInstructions(config) {
 	const hasHusky = addons?.includes("husky");
 	const hasLefthook = addons?.includes("lefthook");
 	const hasGitHooksOrLinting = addons?.includes("husky") || addons?.includes("biome") || addons?.includes("lefthook") || addons?.includes("oxlint");
-	const databaseInstructions = !isConvex && database !== "none" ? await getDatabaseInstructions(database, orm, runCmd, runtime, dbSetup, serverDeploy, backend) : "";
+	const databaseInstructions = !isConvex && database !== "none" ? await getDatabaseInstructions(database, orm, runCmd, runtime, dbSetup, webDeploy, serverDeploy, backend) : "";
 	const tauriInstructions = addons?.includes("tauri") ? getTauriInstructions(runCmd, frontend) : "";
 	const electrobunInstructions = addons?.includes("electrobun") ? getElectrobunInstructions(runCmd, frontend) : "";
 	const huskyInstructions = hasHusky ? getHuskyInstructions(runCmd) : "";
@@ -6088,8 +6107,9 @@ function getLefthookInstructions(packageManager) {
 	const cmd = packageManager === "npm" ? "npx" : packageManager;
 	return `${pc.bold("Git hooks with Lefthook:")}\n${pc.cyan("•")} Install hooks: ${cmd} lefthook install\n`;
 }
-async function getDatabaseInstructions(database, orm, runCmd, _runtime, dbSetup, serverDeploy, _backend) {
+async function getDatabaseInstructions(database, orm, runCmd, _runtime, dbSetup, webDeploy, serverDeploy, backend) {
 	const instructions = [];
+	const isD1Alchemy = dbSetup === "d1" && (serverDeploy === "cloudflare" || backend === "self" && webDeploy === "cloudflare");
 	if (dbSetup === "docker") {
 		const dockerStatus = await getDockerStatus(database);
 		if (dockerStatus.message) {
@@ -6097,7 +6117,7 @@ async function getDatabaseInstructions(database, orm, runCmd, _runtime, dbSetup,
 			instructions.push("");
 		}
 	}
-	if (dbSetup === "d1" && serverDeploy === "cloudflare") {
+	if (isD1Alchemy) {
 		if (orm === "drizzle") instructions.push(`${pc.cyan("•")} Generate migrations: ${`${runCmd} db:generate`}`);
 		else if (orm === "prisma") {
 			instructions.push(`${pc.cyan("•")} Generate Prisma client: ${`${runCmd} db:generate`}`);
@@ -6112,15 +6132,15 @@ async function getDatabaseInstructions(database, orm, runCmd, _runtime, dbSetup,
 	if (orm === "prisma") {
 		if (database === "mongodb" && dbSetup === "docker") instructions.push(`${pc.yellow("WARNING:")} Prisma + MongoDB + Docker combination\n   may not work.`);
 		if (dbSetup === "docker") instructions.push(`${pc.cyan("•")} Start docker container: ${`${runCmd} db:start`}`);
-		if (!(dbSetup === "d1" && serverDeploy === "cloudflare")) {
+		if (!isD1Alchemy) {
 			instructions.push(`${pc.cyan("•")} Generate Prisma Client: ${`${runCmd} db:generate`}`);
 			instructions.push(`${pc.cyan("•")} Apply schema: ${`${runCmd} db:push`}`);
 		}
-		if (!(dbSetup === "d1" && serverDeploy === "cloudflare")) instructions.push(`${pc.cyan("•")} Database UI: ${`${runCmd} db:studio`}`);
+		if (!isD1Alchemy) instructions.push(`${pc.cyan("•")} Database UI: ${`${runCmd} db:studio`}`);
 	} else if (orm === "drizzle") {
 		if (dbSetup === "docker") instructions.push(`${pc.cyan("•")} Start docker container: ${`${runCmd} db:start`}`);
-		if (dbSetup !== "d1") instructions.push(`${pc.cyan("•")} Apply schema: ${`${runCmd} db:push`}`);
-		if (!(dbSetup === "d1" && serverDeploy === "cloudflare")) instructions.push(`${pc.cyan("•")} Database UI: ${`${runCmd} db:studio`}`);
+		if (!isD1Alchemy) instructions.push(`${pc.cyan("•")} Apply schema: ${`${runCmd} db:push`}`);
+		if (!isD1Alchemy) instructions.push(`${pc.cyan("•")} Database UI: ${`${runCmd} db:studio`}`);
 	} else if (orm === "mongoose") {
 		if (dbSetup === "docker") instructions.push(`${pc.cyan("•")} Start docker container: ${`${runCmd} db:start`}`);
 	} else if (orm === "none") instructions.push(`${pc.yellow("NOTE:")} Manual database schema setup\n   required.`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-better-t-stack",
-  "version": "3.26.1",
+  "version": "3.27.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.26.1",
-    "@better-t-stack/types": "^3.26.1",
+    "@better-t-stack/template-generator": "^3.27.0",
+    "@better-t-stack/types": "^3.27.0",
     "@clack/core": "^1.1.0",
     "@clack/prompts": "^1.1.0",
     "@modelcontextprotocol/sdk": "1.27.1",