@better-t-stack/template-generator 3.31.0 → 3.31.1

package/dist/index.mjs

@@ -393,7 +393,7 @@ function getDbScriptSupport(config) {
 	};
 	return {
 		hasDbScripts: true,
-		hasDbPush: true,
+		hasDbPush: !isD1Alchemy,
 		hasDbGenerate: true,
 		hasDbMigrate: config.orm === "prisma" || config.orm === "drizzle" && !isD1Alchemy,
 		hasDbStudio: !isD1Alchemy,
@@ -466,7 +466,7 @@ function updateRootPackageJson(vfs, config) {
 	if (backend !== "self" && backend !== "none") scripts["dev:server"] = pmConfig.filter(backendPackageName, "dev");
 	if (backend === "convex") scripts["dev:setup"] = pmConfig.filter(backendPackageName, "dev:setup");
 	if (needsDbScripts) {
-		scripts["db:push"] = pmConfig.filter(dbPackageName, "db:push");
+		if (dbSupport.hasDbPush) scripts["db:push"] = pmConfig.filter(dbPackageName, "db:push");
 		if (!isD1Alchemy) scripts["db:studio"] = pmConfig.filter(dbPackageName, "db:studio");
 		if (orm === "prisma") {
 			scripts["db:generate"] = pmConfig.filter(dbPackageName, "db:generate");
@@ -588,17 +588,18 @@ function updateDbPackageJson(vfs, config) {
 	pkgJson.scripts = pkgJson.scripts || {};
 	const scripts = pkgJson.scripts;
 	const { database, orm, dbSetup } = config;
-	const { isD1Alchemy } = getDbScriptSupport(config);
+	const dbSupport = getDbScriptSupport(config);
+	const { isD1Alchemy } = dbSupport;
 	if (database !== "none") {
 		if (database === "sqlite" && dbSetup !== "d1") scripts["db:local"] = "turso dev --db-file local.db";
 		if (orm === "prisma") {
-			scripts["db:push"] = "prisma db push";
+			if (dbSupport.hasDbPush) scripts["db:push"] = "prisma db push";
 			scripts["db:generate"] = "prisma generate";
 			scripts["db:migrate"] = "prisma migrate dev";
 			scripts.postinstall ??= "prisma generate";
 			if (!isD1Alchemy) scripts["db:studio"] = "prisma studio";
 		} else if (orm === "drizzle") {
-			scripts["db:push"] = "drizzle-kit push";
+			if (dbSupport.hasDbPush) scripts["db:push"] = "drizzle-kit push";
 			scripts["db:generate"] = "drizzle-kit generate";
 			if (!isD1Alchemy) {
 				scripts["db:studio"] = "drizzle-kit studio";
@@ -2835,7 +2836,7 @@ function processReadme(vfs, config) {
 	vfs.writeFile("README.md", content);
 }
 function generateReadmeContent(options) {
-	const { projectName, packageManager, database, auth, addons = [], orm = "drizzle", runtime = "bun", frontend = ["tanstack-router"], backend = "hono", api = "trpc", webDeploy, serverDeploy } = options;
+	const { projectName, packageManager, database, auth, addons = [], orm = "drizzle", runtime = "bun", frontend = ["tanstack-router"], backend = "hono", api = "trpc", dbSetup, webDeploy, serverDeploy } = options;
 	const isConvex = backend === "convex";
 	const hasReactRouter = frontend.includes("react-router");
 	const hasTanStackRouter = frontend.includes("tanstack-router");
@@ -2857,7 +2858,7 @@ This project was created with [Better-T-Stack](https://github.com/AmanVarshney01
 
 ## Features
 
-${generateFeaturesList(database, auth, addons, orm, runtime, frontend, backend, api)}
+${generateFeaturesList(database, auth, addons, orm, runtime, frontend, backend, api, dbSetup)}
 
 ## Getting Started
 
@@ -3031,7 +3032,7 @@ function generateProjectStructure(config) {
 	}
 	return structure.join("\n");
 }
-function generateFeaturesList(database, auth, addons, orm, runtime, frontend, backend, api) {
+function generateFeaturesList(database, auth, addons, orm, runtime, frontend, backend, api, dbSetup) {
 	const isConvex = backend === "convex";
 	const hasNative = hasNativeFrontend(frontend);
 	const hasAppWebFrontend = hasWebFrontend(frontend);
@@ -3074,16 +3075,20 @@ function generateFeaturesList(database, auth, addons, orm, runtime, frontend, ba
 		const runtimeName = runtime === "bun" ? "Bun" : runtime === "node" ? "Node.js" : runtime;
 		features.push(`- **${runtimeName}** - Runtime environment`);
 	}
-	if (database !== "none" && !isConvex) features.push(`- **${{
-		drizzle: "Drizzle",
-		prisma: "Prisma",
-		mongoose: "Mongoose"
-	}[orm] || "ORM"}** - TypeScript-first ORM`, `- **${{
-		sqlite: "SQLite/Turso",
-		postgres: "PostgreSQL",
-		mysql: "MySQL",
-		mongodb: "MongoDB"
-	}[database] || "Database"}** - Database engine`);
+	if (database !== "none" && !isConvex) {
+		const ormNames = {
+			drizzle: "Drizzle",
+			prisma: "Prisma",
+			mongoose: "Mongoose"
+		};
+		const dbNames = {
+			sqlite: dbSetup === "d1" ? "Cloudflare D1" : "SQLite/Turso",
+			postgres: "PostgreSQL",
+			mysql: "MySQL",
+			mongodb: "MongoDB"
+		};
+		features.push(`- **${ormNames[orm] || "ORM"}** - TypeScript-first ORM`, `- **${dbNames[database] || "Database"}** - Database engine`);
+	}
 	if (auth !== "none") {
 		const authLabel = auth === "clerk" ? "Clerk" : "Better-Auth";
 		features.push(`- **Authentication** - ${authLabel}`);
@@ -3114,7 +3119,27 @@ function generateDatabaseSetup(config, packageManagerRunCmd) {
 		none: "ORM"
 	}[orm] || orm}`;
 	const dbSupport = getDbScriptSupport(config);
+	const isD1Alchemy = dbSupport.isD1Alchemy;
 	let setup = "## Database Setup\n\n";
+	if (isD1Alchemy) {
+		const steps = [];
+		if (dbSupport.hasDbGenerate) steps.push(`${steps.length + 1}. ${orm === "prisma" ? "Generate the Prisma client" : "Generate migration files"}:
+\`\`\`bash
+${packageManagerRunCmd} db:generate
+\`\`\``);
+		if (dbSupport.hasDbMigrate) steps.push(`${steps.length + 1}. Create and apply Prisma migrations locally:
+\`\`\`bash
+${packageManagerRunCmd} db:migrate
+\`\`\``);
+		return `${setup}This project uses Cloudflare D1 (SQLite)${ormDesc}.
+
+Runtime database access uses the Cloudflare \`DB\` binding from \`packages/infra/alchemy.run.ts\`. If a local \`DATABASE_URL\` is present, it is only for database tooling.
+
+Alchemy provisions the D1 database and applies migrations during \`dev\` and \`deploy\`.
+
+${steps.join("\n\n")}
+`;
+	}
 	const dbDescriptions = {
 		sqlite: `This project uses SQLite${ormDesc}.
 
@@ -3170,7 +3195,7 @@ function generateScriptsList(packageManagerRunCmd, config, hasNative) {
 	scripts += `\n- \`${packageManagerRunCmd} check-types\`: Check TypeScript types across all apps`;
 	if (hasNative) scripts += `\n- \`${packageManagerRunCmd} dev:native\`: Start the React Native/Expo development server`;
 	if (dbSupport.hasDbScripts) {
-		scripts += `\n- \`${packageManagerRunCmd} db:push\`: Push schema changes to database`;
+		if (dbSupport.hasDbPush) scripts += `\n- \`${packageManagerRunCmd} db:push\`: Push schema changes to database`;
 		if (dbSupport.hasDbGenerate) scripts += `\n- \`${packageManagerRunCmd} db:generate\`: Generate database client/types`;
 		if (dbSupport.hasDbMigrate) scripts += `\n- \`${packageManagerRunCmd} db:migrate\`: Run database migrations`;
 		if (dbSupport.hasDbStudio) scripts += `\n- \`${packageManagerRunCmd} db:studio\`: Open database studio UI`;
@@ -3282,7 +3307,7 @@ function generateTurboConfig(config) {
 }
 function getBaseTasks(frontend) {
 	const buildOutputs = ["dist/**"];
-	if (frontend.includes("next")) buildOutputs.push(".next/**");
+	if (frontend.includes("next")) buildOutputs.push(".next/**", "!.next/cache/**");
 	if (frontend.includes("nuxt")) buildOutputs.push(".nuxt/**", ".output/**");
 	if (frontend.includes("svelte")) buildOutputs.push(".svelte-kit/**", "build/**");
 	if (frontend.includes("astro")) buildOutputs.push(".astro/**");