create-better-t-stack 2.33.8-canary.98a850ad → 2.33.9-canary.20c8e952

package/dist/cli.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { createBtsCli } from "./src-D0MPVT22.js";
+import { createBtsCli } from "./src-CpB-qAME.js";
 
 //#region src/cli.ts
 createBtsCli().run();

package/dist/index.js

@@ -1,4 +1,4 @@
 #!/usr/bin/env node
-import { builder, createBtsCli, docs, init, router, sponsors } from "./src-D0MPVT22.js";
+import { builder, createBtsCli, docs, init, router, sponsors } from "./src-CpB-qAME.js";
 
 export { builder, createBtsCli, docs, init, router, sponsors };

package/dist/{src-D0MPVT22.js → src-CpB-qAME.js}

@@ -5,7 +5,6 @@ import { createCli, trpcServer } from "trpc-cli";
 import z from "zod";
 import path from "node:path";
 import consola, { consola as consola$1 } from "consola";
-import * as fs$1 from "fs-extra";
 import fs from "fs-extra";
 import { fileURLToPath } from "node:url";
 import gradient from "gradient-string";
@@ -30,9 +29,8 @@ const getUserPkgManager = () => {
 const __filename = fileURLToPath(import.meta.url);
 const distPath = path.dirname(__filename);
 const PKG_ROOT = path.join(distPath, "../");
-const DEFAULT_CONFIG = {
+const DEFAULT_CONFIG_BASE = {
 	projectName: "my-better-t-app",
-	projectDir: path.resolve(process.cwd(), "my-better-t-app"),
 	relativePath: "my-better-t-app",
 	frontend: ["tanstack-router"],
 	database: "sqlite",
@@ -41,7 +39,6 @@ const DEFAULT_CONFIG = {
 	addons: ["turborepo"],
 	examples: [],
 	git: true,
-	packageManager: getUserPkgManager(),
 	install: true,
 	dbSetup: "none",
 	backend: "hono",
@@ -50,6 +47,17 @@ const DEFAULT_CONFIG = {
 	webDeploy: "none",
 	serverDeploy: "none"
 };
+function getDefaultConfig() {
+	return {
+		...DEFAULT_CONFIG_BASE,
+		projectDir: path.resolve(process.cwd(), DEFAULT_CONFIG_BASE.projectName),
+		packageManager: getUserPkgManager(),
+		frontend: [...DEFAULT_CONFIG_BASE.frontend],
+		addons: [...DEFAULT_CONFIG_BASE.addons],
+		examples: [...DEFAULT_CONFIG_BASE.examples]
+	};
+}
+const DEFAULT_CONFIG = getDefaultConfig();
 const dependencyVersionMap = {
 	"better-auth": "^1.3.4",
 	"@better-auth/expo": "^1.3.4",
@@ -137,7 +145,8 @@ const ADDON_COMPATIBILITY = {
 		"react-router",
 		"nuxt",
 		"svelte",
-		"solid"
+		"solid",
+		"next"
 	],
 	biome: [],
 	husky: [],
@@ -565,6 +574,20 @@ function validateWebDeployRequiresWebFrontend(webDeploy, hasWebFrontendFlag) {
 function validateServerDeployRequiresBackend(serverDeploy, backend) {
 	if (serverDeploy && serverDeploy !== "none" && (!backend || backend === "none")) exitWithError("'--server-deploy' requires a backend. Please select a backend or set '--server-deploy none'.");
 }
+function validateAddonsAgainstFrontends(addons = [], frontends = []) {
+	for (const addon of addons) {
+		if (addon === "none") continue;
+		const { isCompatible, reason } = validateAddonCompatibility(addon, frontends);
+		if (!isCompatible) exitWithError(`Incompatible addon/frontend combination: ${reason}`);
+	}
+}
+function validateExamplesCompatibility(examples, backend, database, frontend) {
+	const examplesArr = examples ?? [];
+	if (examplesArr.length === 0 || examplesArr.includes("none")) return;
+	if (examplesArr.includes("todo") && backend !== "convex" && backend !== "none" && database === "none") exitWithError("The 'todo' example requires a database if a backend (other than Convex) is present. Cannot use --examples todo when database is 'none' and a backend is selected.");
+	if (examplesArr.includes("ai") && backend === "elysia") exitWithError("The 'ai' example is not compatible with the Elysia backend.");
+	if (examplesArr.includes("ai") && (frontend ?? []).includes("solid")) exitWithError("The 'ai' example is not compatible with the Solid frontend.");
+}
 
 //#endregion
 //#region src/prompts/api.ts
@@ -1298,9 +1321,9 @@ async function getProjectName(initialName) {
 
 //#endregion
 //#region src/utils/get-latest-cli-version.ts
-const getLatestCLIVersion = async () => {
+const getLatestCLIVersion = () => {
 	const packageJsonPath = path.join(PKG_ROOT, "package.json");
-	const packageJsonContent = await fs.readJSON(packageJsonPath);
+	const packageJsonContent = fs.readJSONSync(packageJsonPath);
 	return packageJsonContent.version ?? "1.0.0";
 };
 
@@ -1562,7 +1585,7 @@ const renderTitle = () => {
 };
 
 //#endregion
-//#region src/validation.ts
+//#region src/utils/config-processing.ts
 function processArrayOption(options) {
 	if (!options || options.length === 0) return [];
 	if (options.includes("none")) return [];
@@ -1573,22 +1596,10 @@ function deriveProjectName(projectName, projectDirectory) {
 	if (projectDirectory) return path.basename(path.resolve(process.cwd(), projectDirectory));
 	return "";
 }
-function validateProjectName(name) {
-	const result = ProjectNameSchema.safeParse(name);
-	if (!result.success) exitWithError(`Invalid project name: ${result.error.issues[0]?.message || "Invalid project name"}`);
-}
-function processAndValidateFlags(options, providedFlags, projectName) {
+function processFlags(options, projectName) {
 	const config = {};
-	if (options.api) {
-		config.api = options.api;
-		if (options.api === "none") {
-			if (options.examples && !(options.examples.length === 1 && options.examples[0] === "none") && options.backend !== "convex") exitWithError("Cannot use '--examples' when '--api' is set to 'none'. Please remove the --examples flag or choose an API type.");
-		}
-	}
+	if (options.api) config.api = options.api;
 	if (options.backend) config.backend = options.backend;
-	if (providedFlags.has("backend") && config.backend && config.backend !== "convex" && config.backend !== "none") {
-		if (providedFlags.has("runtime") && options.runtime === "none") exitWithError(`'--runtime none' is only supported with '--backend convex' or '--backend none'. Please choose 'bun', 'node', or remove the --runtime flag.`);
-	}
 	if (options.database) config.database = options.database;
 	if (options.orm) config.orm = options.orm;
 	if (options.auth !== void 0) config.auth = options.auth;
@@ -1600,70 +1611,180 @@ function processAndValidateFlags(options, providedFlags, projectName) {
 	if (options.webDeploy) config.webDeploy = options.webDeploy;
 	if (options.serverDeploy) config.serverDeploy = options.serverDeploy;
 	const derivedName = deriveProjectName(projectName, options.projectDirectory);
-	if (derivedName) {
-		const nameToValidate = projectName ? path.basename(projectName) : derivedName;
-		validateProjectName(nameToValidate);
-		config.projectName = projectName || derivedName;
-	}
-	if (options.frontend && options.frontend.length > 0) if (options.frontend.includes("none")) {
-		if (options.frontend.length > 1) exitWithError(`Cannot combine 'none' with other frontend options.`);
-		config.frontend = [];
-	} else {
-		const validOptions = processArrayOption(options.frontend);
-		ensureSingleWebAndNative(validOptions);
-		config.frontend = validOptions;
-	}
-	if (providedFlags.has("api") && providedFlags.has("frontend") && config.api && config.frontend && config.frontend.length > 0) validateApiFrontendCompatibility(config.api, config.frontend);
-	if (options.addons && options.addons.length > 0) if (options.addons.includes("none")) {
-		if (options.addons.length > 1) exitWithError(`Cannot combine 'none' with other addons.`);
-		config.addons = [];
-	} else config.addons = processArrayOption(options.addons);
-	if (options.examples && options.examples.length > 0) if (options.examples.includes("none")) {
-		if (options.examples.length > 1) exitWithError("Cannot combine 'none' with other examples.");
-		config.examples = [];
-	} else {
-		config.examples = processArrayOption(options.examples);
-		if (options.examples.includes("none") && config.backend !== "convex") config.examples = [];
+	if (derivedName) config.projectName = projectName || derivedName;
+	if (options.frontend && options.frontend.length > 0) config.frontend = processArrayOption(options.frontend);
+	if (options.addons && options.addons.length > 0) config.addons = processArrayOption(options.addons);
+	if (options.examples && options.examples.length > 0) config.examples = processArrayOption(options.examples);
+	return config;
+}
+function getProvidedFlags(options) {
+	return new Set(Object.keys(options).filter((key) => options[key] !== void 0));
+}
+function validateNoneExclusivity(options, optionName) {
+	if (!options || options.length === 0) return;
+	if (options.includes("none") && options.length > 1) throw new Error(`Cannot combine 'none' with other ${optionName}.`);
+}
+function validateArrayOptions(options) {
+	validateNoneExclusivity(options.frontend, "frontend options");
+	validateNoneExclusivity(options.addons, "addons");
+	validateNoneExclusivity(options.examples, "examples");
+}
+
+//#endregion
+//#region src/utils/config-validation.ts
+function validateDatabaseOrmAuth(cfg, flags) {
+	const db = cfg.database;
+	const orm = cfg.orm;
+	const has = (k) => flags ? flags.has(k) : true;
+	if (has("orm") && has("database") && orm === "mongoose" && db !== "mongodb") exitWithError("Mongoose ORM requires MongoDB database. Please use '--database mongodb' or choose a different ORM.");
+	if (has("orm") && has("database") && orm === "drizzle" && db === "mongodb") exitWithError("Drizzle ORM does not support MongoDB. Please use '--orm mongoose' or '--orm prisma' or choose a different database.");
+	if (has("database") && has("orm") && db === "mongodb" && orm && orm !== "mongoose" && orm !== "prisma" && orm !== "none") exitWithError("MongoDB database requires Mongoose or Prisma ORM. Please use '--orm mongoose' or '--orm prisma' or choose a different database.");
+	if (has("database") && has("orm") && db && db !== "none" && orm === "none") exitWithError("Database selection requires an ORM. Please choose '--orm drizzle', '--orm prisma', or '--orm mongoose'.");
+	if (has("orm") && has("database") && orm && orm !== "none" && db === "none") exitWithError("ORM selection requires a database. Please choose a database or set '--orm none'.");
+	if (has("auth") && has("database") && cfg.auth && db === "none") exitWithError("Authentication requires a database. Please choose a database or set '--no-auth'.");
+	if (cfg.auth && db === "none") exitWithError("Authentication requires a database. Please choose a database or set '--no-auth'.");
+	if (orm && orm !== "none" && db === "none") exitWithError("ORM selection requires a database. Please choose a database or set '--orm none'.");
+}
+function validateDatabaseSetup(config, providedFlags) {
+	const { dbSetup, database, runtime } = config;
+	if (providedFlags.has("dbSetup") && providedFlags.has("database") && dbSetup && dbSetup !== "none" && database === "none") exitWithError("Database setup requires a database. Please choose a database or set '--db-setup none'.");
+	const setupValidations = {
+		turso: {
+			database: "sqlite",
+			errorMessage: "Turso setup requires SQLite database. Please use '--database sqlite' or choose a different setup."
+		},
+		neon: {
+			database: "postgres",
+			errorMessage: "Neon setup requires PostgreSQL database. Please use '--database postgres' or choose a different setup."
+		},
+		"prisma-postgres": {
+			database: "postgres",
+			errorMessage: "Prisma PostgreSQL setup requires PostgreSQL database. Please use '--database postgres' or choose a different setup."
+		},
+		"mongodb-atlas": {
+			database: "mongodb",
+			errorMessage: "MongoDB Atlas setup requires MongoDB database. Please use '--database mongodb' or choose a different setup."
+		},
+		supabase: {
+			database: "postgres",
+			errorMessage: "Supabase setup requires PostgreSQL database. Please use '--database postgres' or choose a different setup."
+		},
+		d1: {
+			database: "sqlite",
+			runtime: "workers",
+			errorMessage: "Cloudflare D1 setup requires SQLite database and Cloudflare Workers runtime."
+		},
+		docker: { errorMessage: "Docker setup is not compatible with SQLite database or Cloudflare Workers runtime." },
+		none: { errorMessage: "" }
+	};
+	if (dbSetup && dbSetup !== "none") {
+		const validation = setupValidations[dbSetup];
+		if (validation.database && database !== validation.database) exitWithError(validation.errorMessage);
+		if (validation.runtime && runtime !== validation.runtime) exitWithError(validation.errorMessage);
+		if (dbSetup === "docker") {
+			if (database === "sqlite") exitWithError("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") exitWithError("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.");
+		}
 	}
-	if (config.backend === "convex" || config.backend === "none") {
-		const incompatibleFlags = incompatibleFlagsForBackend(config.backend, providedFlags, options);
-		if (incompatibleFlags.length > 0) exitWithError(`The following flags are incompatible with '--backend ${config.backend}': ${incompatibleFlags.join(", ")}. Please remove them.`);
-		if (config.backend === "convex" && providedFlags.has("frontend") && options.frontend) {
+}
+function validateBackendConstraints(config, providedFlags, options) {
+	const { backend } = config;
+	if (providedFlags.has("backend") && backend && backend !== "convex" && backend !== "none") {
+		if (providedFlags.has("runtime") && options.runtime === "none") exitWithError("'--runtime none' is only supported with '--backend convex' or '--backend none'. Please choose 'bun', 'node', or remove the --runtime flag.");
+	}
+	if (backend === "convex" || backend === "none") {
+		const incompatibleFlags = incompatibleFlagsForBackend(backend, providedFlags, options);
+		if (incompatibleFlags.length > 0) exitWithError(`The following flags are incompatible with '--backend ${backend}': ${incompatibleFlags.join(", ")}. Please remove them.`);
+		if (backend === "convex" && providedFlags.has("frontend") && options.frontend) {
 			const incompatibleFrontends = options.frontend.filter((f) => f === "solid");
 			if (incompatibleFrontends.length > 0) exitWithError(`The following frontends are not compatible with '--backend convex': ${incompatibleFrontends.join(", ")}. Please choose a different frontend or backend.`);
 		}
 		coerceBackendPresets(config);
 	}
-	if (providedFlags.has("orm") && providedFlags.has("database") && config.orm === "mongoose" && config.database !== "mongodb") exitWithError("Mongoose ORM requires MongoDB database. Please use '--database mongodb' or choose a different ORM.");
-	if (providedFlags.has("database") && providedFlags.has("orm") && config.database === "mongodb" && config.orm && config.orm !== "mongoose" && config.orm !== "prisma") exitWithError("MongoDB database requires Mongoose or Prisma ORM. Please use '--orm mongoose' or '--orm prisma' or choose a different database.");
-	if (providedFlags.has("orm") && providedFlags.has("database") && config.orm === "drizzle" && config.database === "mongodb") exitWithError("Drizzle ORM does not support MongoDB. Please use '--orm mongoose' or '--orm prisma' or choose a different database.");
-	if (providedFlags.has("database") && providedFlags.has("orm") && config.database && config.database !== "none" && config.orm === "none") exitWithError("Database selection requires an ORM. Please choose '--orm drizzle', '--orm prisma', or '--orm mongoose'.");
-	if (providedFlags.has("orm") && providedFlags.has("database") && config.orm && config.orm !== "none" && config.database === "none") exitWithError("ORM selection requires a database. Please choose a database or set '--orm none'.");
-	if (providedFlags.has("auth") && providedFlags.has("database") && config.auth && config.database === "none") exitWithError("Authentication requires a database. Please choose a database or set '--no-auth'.");
-	if (providedFlags.has("dbSetup") && providedFlags.has("database") && config.dbSetup && config.dbSetup !== "none" && config.database === "none") exitWithError("Database setup requires a database. Please choose a database or set '--db-setup none'.");
-	if (providedFlags.has("dbSetup") && (config.database ? providedFlags.has("database") : true) && config.dbSetup === "turso" && config.database !== "sqlite") exitWithError("Turso setup requires SQLite database. Please use '--database sqlite' or choose a different setup.");
-	if (providedFlags.has("dbSetup") && (config.database ? providedFlags.has("database") : true) && config.dbSetup === "neon" && config.database !== "postgres") exitWithError("Neon setup requires PostgreSQL database. Please use '--database postgres' or choose a different setup.");
-	if (providedFlags.has("dbSetup") && (config.database ? providedFlags.has("database") : true) && config.dbSetup === "prisma-postgres" && config.database !== "postgres") exitWithError("Prisma PostgreSQL setup requires PostgreSQL database. Please use '--database postgres' or choose a different setup.");
-	if (providedFlags.has("dbSetup") && (config.database ? providedFlags.has("database") : true) && config.dbSetup === "mongodb-atlas" && config.database !== "mongodb") exitWithError("MongoDB Atlas setup requires MongoDB database. Please use '--database mongodb' or choose a different setup.");
-	if (providedFlags.has("dbSetup") && (config.database ? providedFlags.has("database") : true) && config.dbSetup === "supabase" && config.database !== "postgres") exitWithError("Supabase setup requires PostgreSQL database. Please use '--database postgres' or choose a different setup.");
-	if (config.dbSetup === "d1") {
-		if (providedFlags.has("dbSetup") && providedFlags.has("database") || providedFlags.has("dbSetup") && !config.database) {
-			if (config.database !== "sqlite") exitWithError("Cloudflare D1 setup requires SQLite database. Please use '--database sqlite' or choose a different setup.");
-		}
-		if (providedFlags.has("dbSetup") && providedFlags.has("runtime") || providedFlags.has("dbSetup") && !config.runtime) {
-			if (config.runtime !== "workers") exitWithError("Cloudflare D1 setup requires the Cloudflare Workers runtime. Please use '--runtime workers' or choose a different setup.");
-		}
+}
+function validateFrontendConstraints(config, providedFlags) {
+	const { frontend } = config;
+	if (frontend && frontend.length > 0) {
+		ensureSingleWebAndNative(frontend);
+		if (providedFlags.has("api") && providedFlags.has("frontend") && config.api) validateApiFrontendCompatibility(config.api, frontend);
+		const hasWebFrontendFlag = frontend.some((f) => isWebFrontend(f));
+		validateWebDeployRequiresWebFrontend(config.webDeploy, hasWebFrontendFlag);
 	}
-	if (providedFlags.has("dbSetup") && providedFlags.has("database") && config.dbSetup === "docker" && config.database === "sqlite") exitWithError("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 (providedFlags.has("dbSetup") && providedFlags.has("runtime") && config.dbSetup === "docker" && config.runtime === "workers") exitWithError("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.");
-	validateWorkersCompatibility(providedFlags, options, config);
-	const hasWebFrontendFlag = (config.frontend ?? []).some((f) => isWebFrontend(f));
-	validateWebDeployRequiresWebFrontend(config.webDeploy, hasWebFrontendFlag);
+}
+function validateApiConstraints(config, options) {
+	if (config.api === "none") {
+		if (options.examples && !(options.examples.length === 1 && options.examples[0] === "none") && options.backend !== "convex") exitWithError("Cannot use '--examples' when '--api' is set to 'none'. Please remove the --examples flag or choose an API type.");
+	}
+}
+function validateFullConfig(config, providedFlags, options) {
+	validateDatabaseOrmAuth(config, providedFlags);
+	validateDatabaseSetup(config, providedFlags);
+	validateBackendConstraints(config, providedFlags, options);
+	validateFrontendConstraints(config, providedFlags);
+	validateApiConstraints(config, options);
 	validateServerDeployRequiresBackend(config.serverDeploy, config.backend);
+	validateWorkersCompatibility(providedFlags, options, config);
+	if (config.addons && config.addons.length > 0) {
+		validateAddonsAgainstFrontends(config.addons, config.frontend);
+		config.addons = [...new Set(config.addons)];
+	}
+	validateExamplesCompatibility(config.examples ?? [], config.backend, config.database, config.frontend ?? []);
+}
+function validateConfigForProgrammaticUse(config) {
+	try {
+		validateDatabaseOrmAuth(config);
+		if (config.frontend && config.frontend.length > 0) ensureSingleWebAndNative(config.frontend);
+		validateApiFrontendCompatibility(config.api, config.frontend);
+		if (config.addons && config.addons.length > 0) validateAddonsAgainstFrontends(config.addons, config.frontend);
+		validateExamplesCompatibility(config.examples ?? [], config.backend, config.database, config.frontend ?? []);
+	} catch (error) {
+		if (error instanceof Error) throw error;
+		throw new Error(String(error));
+	}
+}
+
+//#endregion
+//#region src/utils/project-name-validation.ts
+function validateProjectName(name) {
+	const result = ProjectNameSchema.safeParse(name);
+	if (!result.success) exitWithError(`Invalid project name: ${result.error.issues[0]?.message || "Invalid project name"}`);
+}
+function validateProjectNameThrow(name) {
+	const result = ProjectNameSchema.safeParse(name);
+	if (!result.success) throw new Error(`Invalid project name: ${result.error.issues[0]?.message}`);
+}
+function extractAndValidateProjectName(projectName, projectDirectory, throwOnError = false) {
+	const derivedName = projectName || (projectDirectory ? path.basename(path.resolve(process.cwd(), projectDirectory)) : "");
+	if (!derivedName) return "";
+	const nameToValidate = projectName ? path.basename(projectName) : derivedName;
+	if (throwOnError) validateProjectNameThrow(nameToValidate);
+	else validateProjectName(nameToValidate);
+	return projectName || derivedName;
+}
+
+//#endregion
+//#region src/validation.ts
+function processAndValidateFlags(options, providedFlags, projectName) {
+	try {
+		validateArrayOptions(options);
+	} catch (error) {
+		exitWithError(error instanceof Error ? error.message : String(error));
+	}
+	const config = processFlags(options, projectName);
+	const validatedProjectName = extractAndValidateProjectName(projectName, options.projectDirectory, false);
+	if (validatedProjectName) config.projectName = validatedProjectName;
+	validateFullConfig(config, providedFlags, options);
 	return config;
 }
-function getProvidedFlags(options) {
-	return new Set(Object.keys(options).filter((key) => options[key] !== void 0));
+function processProvidedFlagsWithoutValidation(options, projectName) {
+	const config = processFlags(options, projectName);
+	const validatedProjectName = extractAndValidateProjectName(projectName, options.projectDirectory, true);
+	if (validatedProjectName) config.projectName = validatedProjectName;
+	return config;
+}
+function validateConfigCompatibility(config, providedFlags, options) {
+	if (options && providedFlags) validateFullConfig(config, providedFlags, options);
+	else validateConfigForProgrammaticUse(config);
 }
 
 //#endregion
@@ -2216,20 +2337,16 @@ async function setupDeploymentTemplates(projectDir, context) {
 		}
 	} else {
 		if (context.webDeploy === "alchemy") {
+			const alchemyTemplateSrc = path.join(PKG_ROOT, "templates/deploy/alchemy");
 			const webAppDir = path.join(projectDir, "apps/web");
-			if (await fs.pathExists(webAppDir)) {
-				const alchemyTemplateSrc = path.join(PKG_ROOT, "templates/deploy/alchemy");
-				if (await fs.pathExists(alchemyTemplateSrc)) await processAndCopyFiles("**/*", alchemyTemplateSrc, webAppDir, context);
-			}
+			if (await fs.pathExists(alchemyTemplateSrc) && await fs.pathExists(webAppDir)) await processAndCopyFiles("alchemy.run.ts.hbs", alchemyTemplateSrc, webAppDir, context);
 		}
 		if (context.serverDeploy === "alchemy") {
+			const alchemyTemplateSrc = path.join(PKG_ROOT, "templates/deploy/alchemy");
 			const serverAppDir = path.join(projectDir, "apps/server");
-			if (await fs.pathExists(serverAppDir)) {
-				const alchemyTemplateSrc = path.join(PKG_ROOT, "templates/deploy/alchemy");
-				if (await fs.pathExists(alchemyTemplateSrc)) {
-					await processAndCopyFiles("alchemy.run.ts.hbs", alchemyTemplateSrc, serverAppDir, context);
-					await processAndCopyFiles("env.d.ts.hbs", alchemyTemplateSrc, serverAppDir, context);
-				}
+			if (await fs.pathExists(alchemyTemplateSrc) && await fs.pathExists(serverAppDir)) {
+				await processAndCopyFiles("alchemy.run.ts.hbs", alchemyTemplateSrc, serverAppDir, context);
+				await processAndCopyFiles("env.d.ts.hbs", alchemyTemplateSrc, serverAppDir, context);
 			}
 		}
 	}
@@ -2501,7 +2618,7 @@ async function setupUltracite(config, hasHusky) {
 		];
 		if (editors.length > 0) ultraciteArgs.push("--editors", ...editors);
 		if (rules.length > 0) ultraciteArgs.push("--rules", ...rules);
-		if (hasHusky) ultraciteArgs.push("--features", "husky", "lint-staged");
+		if (hasHusky) ultraciteArgs.push("--integrations", "husky", "lint-staged");
 		const ultraciteArgsString = ultraciteArgs.join(" ");
 		const commandWithArgs = `ultracite@latest ${ultraciteArgsString} --skip-install`;
 		const ultraciteInitCommand = getPackageExecutionCommand(packageManager, commandWithArgs);
@@ -3342,15 +3459,15 @@ async function setupCombinedAlchemyDeploy(projectDir, packageManager, config) {
 //#region src/helpers/deployment/workers/workers-next-setup.ts
 async function setupNextWorkersDeploy(projectDir, _packageManager) {
 	const webAppDir = path.join(projectDir, "apps/web");
-	if (!await fs$1.pathExists(webAppDir)) return;
+	if (!await fs.pathExists(webAppDir)) return;
 	await addPackageDependency({
 		dependencies: ["@opennextjs/cloudflare"],
 		devDependencies: ["wrangler"],
 		projectDir: webAppDir
 	});
 	const packageJsonPath = path.join(webAppDir, "package.json");
-	if (await fs$1.pathExists(packageJsonPath)) {
-		const pkg = await fs$1.readJson(packageJsonPath);
+	if (await fs.pathExists(packageJsonPath)) {
+		const pkg = await fs.readJson(packageJsonPath);
 		pkg.scripts = {
 			...pkg.scripts,
 			preview: "opennextjs-cloudflare build && opennextjs-cloudflare preview",
@@ -3358,7 +3475,7 @@ async function setupNextWorkersDeploy(projectDir, _packageManager) {
 			upload: "opennextjs-cloudflare build && opennextjs-cloudflare upload",
 			"cf-typegen": "wrangler types --env-interface CloudflareEnv cloudflare-env.d.ts"
 		};
-		await fs$1.writeJson(packageJsonPath, pkg, { spaces: 2 });
+		await fs.writeJson(packageJsonPath, pkg, { spaces: 2 });
 	}
 }
 
@@ -5471,13 +5588,14 @@ async function displayPostInstallInstructions(config) {
 	const runCmd = packageManager === "npm" ? "npm run" : packageManager;
 	const cdCmd = `cd ${relativePath}`;
 	const hasHuskyOrBiome = addons?.includes("husky") || addons?.includes("biome");
-	const databaseInstructions = !isConvex && database !== "none" ? await getDatabaseInstructions(database, orm, runCmd, runtime, dbSetup) : "";
+	const databaseInstructions = !isConvex && database !== "none" ? await getDatabaseInstructions(database, orm, runCmd, runtime, dbSetup, serverDeploy) : "";
 	const tauriInstructions = addons?.includes("tauri") ? getTauriInstructions(runCmd) : "";
 	const lintingInstructions = hasHuskyOrBiome ? getLintingInstructions(runCmd) : "";
 	const nativeInstructions = frontend?.includes("native-nativewind") || frontend?.includes("native-unistyles") ? getNativeInstructions(isConvex) : "";
 	const pwaInstructions = addons?.includes("pwa") && frontend?.includes("react-router") ? getPwaInstructions() : "";
 	const starlightInstructions = addons?.includes("starlight") ? getStarlightInstructions(runCmd) : "";
-	const workersDeployInstructions = webDeploy === "wrangler" ? getWorkersDeployInstructions(runCmd) : "";
+	const wranglerDeployInstructions = getWranglerDeployInstructions(runCmd, webDeploy, serverDeploy);
+	const alchemyDeployInstructions = getAlchemyDeployInstructions(runCmd, webDeploy, serverDeploy);
 	const hasWeb = frontend?.some((f) => [
 		"tanstack-router",
 		"react-router",
@@ -5506,8 +5624,8 @@ async function displayPostInstallInstructions(config) {
 		if (runtime === "workers") {
 			if (dbSetup === "d1") output += `${pc.yellow("IMPORTANT:")} Complete D1 database setup first\n   (see Database commands below)\n`;
 			output += `${pc.cyan(`${stepCounter++}.`)} ${runCmd} dev\n`;
-			if (serverDeploy === "wrangler") output += `${pc.cyan(`${stepCounter++}.`)} cd apps/server && ${runCmd} cf-typegen\n\n`;
-		} else output += "\n";
+			if (serverDeploy === "wrangler") output += `${pc.cyan(`${stepCounter++}.`)} cd apps/server && ${runCmd} cf-typegen\n`;
+		}
 	}
 	output += `${pc.bold("Your project will be available at:")}\n`;
 	if (hasWeb) output += `${pc.cyan("•")} Frontend: http://localhost:${webPort}\n`;
@@ -5520,7 +5638,8 @@ async function displayPostInstallInstructions(config) {
 	if (tauriInstructions) output += `\n${tauriInstructions.trim()}\n`;
 	if (lintingInstructions) output += `\n${lintingInstructions.trim()}\n`;
 	if (pwaInstructions) output += `\n${pwaInstructions.trim()}\n`;
-	if (workersDeployInstructions) output += `\n${workersDeployInstructions.trim()}\n`;
+	if (wranglerDeployInstructions) output += `\n${wranglerDeployInstructions.trim()}\n`;
+	if (alchemyDeployInstructions) output += `\n${alchemyDeployInstructions.trim()}\n`;
 	if (starlightInstructions) output += `\n${starlightInstructions.trim()}\n`;
 	if (noOrmWarning) output += `\n${noOrmWarning.trim()}\n`;
 	if (bunWebNativeWarning) output += `\n${bunWebNativeWarning.trim()}\n`;
@@ -5541,7 +5660,7 @@ function getNativeInstructions(isConvex) {
 function getLintingInstructions(runCmd) {
 	return `${pc.bold("Linting and formatting:")}\n${pc.cyan("•")} Format and lint fix: ${`${runCmd} check`}\n`;
 }
-async function getDatabaseInstructions(database, orm, runCmd, runtime, dbSetup) {
+async function getDatabaseInstructions(database, orm, runCmd, _runtime, dbSetup, serverDeploy) {
 	const instructions = [];
 	if (dbSetup === "docker") {
 		const dockerStatus = await getDockerStatus(database);
@@ -5550,7 +5669,7 @@ async function getDatabaseInstructions(database, orm, runCmd, runtime, dbSetup)
 			instructions.push("");
 		}
 	}
-	if (runtime === "workers" && dbSetup === "d1") {
+	if (serverDeploy === "wrangler" && 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`)}`);
@@ -5558,8 +5677,8 @@ async function getDatabaseInstructions(database, orm, runCmd, runtime, dbSetup)
 		instructions.push(`${pc.cyan("4.")} Generate migrations: ${pc.white(`cd apps/server && ${packageManager} 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 (dbSetup === "d1" && serverDeploy === "alchemy") instructions.push(`${pc.cyan("•")} Generate migrations: ${pc.white(`${runCmd} db:generate`)}`);
 	if (orm === "prisma") {
 		if (dbSetup === "turso") instructions.push(`${pc.yellow("NOTE:")} Turso support with Prisma is in Early Access and requires\n   additional setup. Learn more at:\n   https://www.prisma.io/docs/orm/overview/databases/turso`);
 		if (database === "mongodb" && dbSetup === "docker") instructions.push(`${pc.yellow("WARNING:")} Prisma + MongoDB + Docker combination\n   may not work.`);
@@ -5568,7 +5687,7 @@ async function getDatabaseInstructions(database, orm, runCmd, runtime, dbSetup)
 		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`}`);
-		instructions.push(`${pc.cyan("•")} Apply schema: ${`${runCmd} db:push`}`);
+		if (dbSetup !== "d1") instructions.push(`${pc.cyan("•")} Apply schema: ${`${runCmd} db:push`}`);
 		instructions.push(`${pc.cyan("•")} Database UI: ${`${runCmd} db:studio`}`);
 		if (database === "sqlite" && dbSetup !== "d1") instructions.push(`${pc.cyan("•")} Start local DB (if needed): ${`cd apps/server && ${runCmd} db:local`}`);
 	} else if (orm === "mongoose") {
@@ -5591,8 +5710,18 @@ function getNoOrmWarning() {
 function getBunWebNativeWarning() {
 	return `\n${pc.yellow("WARNING:")} 'bun' might cause issues with web + native apps in a monorepo.\n   Use 'pnpm' if problems arise.`;
 }
-function getWorkersDeployInstructions(runCmd) {
-	return `\n${pc.bold("Deploy frontend to Cloudflare Workers:")}\n${pc.cyan("•")} Deploy: ${`cd apps/web && ${runCmd} run deploy`}`;
+function getWranglerDeployInstructions(runCmd, webDeploy, serverDeploy) {
+	const instructions = [];
+	if (webDeploy === "wrangler") instructions.push(`${pc.bold("Deploy web to Cloudflare Workers:")}\n${pc.cyan("•")} Deploy: ${`cd apps/web && ${runCmd} run deploy`}`);
+	if (serverDeploy === "wrangler") instructions.push(`${pc.bold("Deploy server to Cloudflare Workers:")}\n${pc.cyan("•")} Deploy: ${`cd apps/server && ${runCmd} run deploy`}`);
+	return instructions.length ? `\n${instructions.join("\n")}` : "";
+}
+function getAlchemyDeployInstructions(runCmd, webDeploy, serverDeploy) {
+	const instructions = [];
+	if (webDeploy === "alchemy" && serverDeploy !== "alchemy") instructions.push(`${pc.bold("Deploy web to Alchemy:")}\n${pc.cyan("•")} Deploy: ${`cd apps/web && ${runCmd} deploy`}`);
+	else if (serverDeploy === "alchemy" && webDeploy !== "alchemy") instructions.push(`${pc.bold("Deploy server to Alchemy:")}\n${pc.cyan("•")} Deploy: ${`cd apps/server && ${runCmd} deploy`}`);
+	else if (webDeploy === "alchemy" && serverDeploy === "alchemy") instructions.push(`${pc.bold("Deploy to Alchemy:")}\n${pc.cyan("•")} Deploy: ${`${runCmd} deploy`}`);
+	return instructions.length ? `\n${instructions.join("\n")}` : "";
 }
 
 //#endregion
@@ -5805,6 +5934,7 @@ async function createProject(options) {
 		if (!isConvex && options.auth) await setupAuth(options);
 		await handleExtras(projectDir, options);
 		await setupWebDeploy(options);
+		await setupServerDeploy(options);
 		await setupEnvironmentVariables(options);
 		await updatePackageConfigurations(projectDir, options);
 		await createReadme(projectDir, options);
@@ -5844,10 +5974,11 @@ async function createProjectHandler(input) {
 	let currentPathInput;
 	if (input.yes && input.projectName) currentPathInput = input.projectName;
 	else if (input.yes) {
-		let defaultName = DEFAULT_CONFIG.relativePath;
+		const defaultConfig = getDefaultConfig();
+		let defaultName = defaultConfig.relativePath;
 		let counter = 1;
 		while (await fs.pathExists(path.resolve(process.cwd(), defaultName)) && (await fs.readdir(path.resolve(process.cwd(), defaultName))).length > 0) {
-			defaultName = `${DEFAULT_CONFIG.projectName}-${counter}`;
+			defaultName = `${defaultConfig.projectName}-${counter}`;
 			counter++;
 		}
 		currentPathInput = defaultName;
@@ -5902,28 +6033,33 @@ async function createProjectHandler(input) {
 		projectDirectory: input.projectName
 	};
 	const providedFlags = getProvidedFlags(cliInput);
-	const flagConfig = processAndValidateFlags(cliInput, providedFlags, finalBaseName);
-	const { projectName: _projectNameFromFlags,...otherFlags } = flagConfig;
-	if (!input.yes && Object.keys(otherFlags).length > 0) {
-		log.info(pc.yellow("Using these pre-selected options:"));
-		log.message(displayConfig(otherFlags));
-		log.message("");
-	}
 	let config;
 	if (input.yes) {
+		const flagConfig = processProvidedFlagsWithoutValidation(cliInput, finalBaseName);
 		config = {
-			...DEFAULT_CONFIG,
+			...getDefaultConfig(),
 			...flagConfig,
 			projectName: finalBaseName,
 			projectDir: finalResolvedPath,
 			relativePath: finalPathInput
 		};
+		coerceBackendPresets(config);
+		validateConfigCompatibility(config, providedFlags, cliInput);
 		if (config.backend === "convex") log.info("Due to '--backend convex' flag, the following options have been automatically set: auth=false, database=none, orm=none, api=none, runtime=none, dbSetup=none, examples=todo");
 		else if (config.backend === "none") log.info("Due to '--backend none', the following options have been automatically set: --auth=false, --database=none, --orm=none, --api=none, --runtime=none, --db-setup=none, --examples=none");
 		log.info(pc.yellow("Using default/flag options (config prompts skipped):"));
 		log.message(displayConfig(config));
 		log.message("");
-	} else config = await gatherConfig(flagConfig, finalBaseName, finalResolvedPath, finalPathInput);
+	} else {
+		const flagConfig = processAndValidateFlags(cliInput, providedFlags, finalBaseName);
+		const { projectName: _projectNameFromFlags,...otherFlags } = flagConfig;
+		if (Object.keys(otherFlags).length > 0) {
+			log.info(pc.yellow("Using these pre-selected options:"));
+			log.message(displayConfig(otherFlags));
+			log.message("");
+		}
+		config = await gatherConfig(flagConfig, finalBaseName, finalResolvedPath, finalPathInput);
+	}
 	await createProject(config);
 	const reproducibleCommand = generateReproducibleCommand(config);
 	log.success(pc.blue(`You can reproduce this setup with the following command:\n${reproducibleCommand}`));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-better-t-stack",
-  "version": "2.33.8-canary.98a850ad",
+  "version": "2.33.9-canary.20c8e952",
   "description": "A modern CLI tool for scaffolding end-to-end type-safe TypeScript projects with best practices and customizable configurations",
   "type": "module",
   "license": "MIT",