create-better-t-stack 2.36.3 → 2.37.0

package/dist/cli.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { createBtsCli } from "./src-CN1zi2A-.js";
+import { createBtsCli } from "./src-CGVrE3la.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-CN1zi2A-.js";
+import { builder, createBtsCli, docs, init, router, sponsors } from "./src-CGVrE3la.js";
 
 export { builder, createBtsCli, docs, init, router, sponsors };

package/dist/{src-CN1zi2A-.js → src-CGVrE3la.js}

@@ -129,7 +129,7 @@ const dependencyVersionMap = {
 	"nitro-cloudflare-dev": "^0.2.2",
 	"@sveltejs/adapter-cloudflare": "^7.2.1",
 	"@cloudflare/workers-types": "^4.20250822.0",
-	alchemy: "^0.62.1",
+	alchemy: "^0.63.0",
 	nitropack: "^2.12.4",
 	dotenv: "^17.2.1"
 };
@@ -592,7 +592,7 @@ function validateAlchemyCompatibility(webDeploy, serverDeploy, frontends = []) {
 	const isAlchemyWebDeploy = webDeploy === "alchemy";
 	const isAlchemyServerDeploy = serverDeploy === "alchemy";
 	if (isAlchemyWebDeploy || isAlchemyServerDeploy) {
-		const incompatibleFrontends = frontends.filter((f) => f === "next" || f === "react-router");
+		const incompatibleFrontends = frontends.filter((f) => f === "next");
 		if (incompatibleFrontends.length > 0) {
 			const deployType = isAlchemyWebDeploy && isAlchemyServerDeploy ? "web and server deployment" : isAlchemyWebDeploy ? "web deployment" : "server deployment";
 			exitWithError(`Alchemy ${deployType} is temporarily not compatible with ${incompatibleFrontends.join(" and ")} frontend(s). Please choose a different frontend or deployment option.`);
@@ -1152,7 +1152,7 @@ function getDeploymentDisplay(deployment) {
 async function getDeploymentChoice(deployment, _runtime, _backend, frontend = []) {
 	if (deployment !== void 0) return deployment;
 	if (!hasWebFrontend(frontend)) return "none";
-	const hasIncompatibleFrontend = frontend.some((f) => f === "next" || f === "react-router");
+	const hasIncompatibleFrontend = frontend.some((f) => f === "next");
 	const availableDeployments = hasIncompatibleFrontend ? ["wrangler", "none"] : [
 		"wrangler",
 		"alchemy",
@@ -1176,7 +1176,7 @@ async function getDeploymentChoice(deployment, _runtime, _backend, frontend = []
 }
 async function getDeploymentToAdd(frontend, existingDeployment) {
 	if (!hasWebFrontend(frontend)) return "none";
-	const hasIncompatibleFrontend = frontend.some((f) => f === "next" || f === "react-router");
+	const hasIncompatibleFrontend = frontend.some((f) => f === "next");
 	const options = [];
 	if (existingDeployment !== "wrangler") {
 		const { label, hint } = getDeploymentDisplay("wrangler");
@@ -2350,10 +2350,7 @@ async function setupDeploymentTemplates(projectDir, context) {
 		if (await fs.pathExists(alchemyTemplateSrc)) {
 			await processAndCopyFiles("alchemy.run.ts.hbs", alchemyTemplateSrc, projectDir, context);
 			const serverAppDir = path.join(projectDir, "apps/server");
-			if (await fs.pathExists(serverAppDir)) {
-				await processAndCopyFiles("env.d.ts.hbs", alchemyTemplateSrc, serverAppDir, context);
-				await processAndCopyFiles("wrangler.jsonc.hbs", alchemyTemplateSrc, serverAppDir, context);
-			}
+			if (await fs.pathExists(serverAppDir)) await processAndCopyFiles("env.d.ts.hbs", alchemyTemplateSrc, serverAppDir, context);
 		}
 	} else {
 		if (context.webDeploy === "alchemy") {
@@ -2367,7 +2364,6 @@ async function setupDeploymentTemplates(projectDir, 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);
-				await processAndCopyFiles("wrangler.jsonc.hbs", alchemyTemplateSrc, serverAppDir, context);
 			}
 		}
 	}
@@ -3000,11 +2996,9 @@ async function setupAlchemyServerDeploy(serverDir, _packageManager) {
 		const packageJson = await fs.readJson(packageJsonPath);
 		packageJson.scripts = {
 			...packageJson.scripts,
-			dev: "wrangler dev --port=3000",
-			build: "wrangler deploy --dry-run",
+			dev: "alchemy dev",
 			deploy: "alchemy deploy",
-			destroy: "alchemy destroy",
-			"alchemy:dev": "alchemy dev"
+			destroy: "alchemy destroy"
 		};
 		await fs.writeJson(packageJsonPath, packageJson, { spaces: 2 });
 	}
@@ -3012,7 +3006,7 @@ async function setupAlchemyServerDeploy(serverDir, _packageManager) {
 
 //#endregion
 //#region src/helpers/deployment/alchemy/alchemy-next-setup.ts
-async function setupNextAlchemyDeploy(projectDir, _packageManager) {
+async function setupNextAlchemyDeploy(projectDir, _packageManager, options) {
 	const webAppDir = path.join(projectDir, "apps/web");
 	if (!await fs.pathExists(webAppDir)) return;
 	await addPackageDependency({
@@ -3022,11 +3016,11 @@ async function setupNextAlchemyDeploy(projectDir, _packageManager) {
 	const pkgPath = path.join(webAppDir, "package.json");
 	if (await fs.pathExists(pkgPath)) {
 		const pkg = await fs.readJson(pkgPath);
-		pkg.scripts = {
+		if (!options?.skipAppScripts) pkg.scripts = {
 			...pkg.scripts,
 			deploy: "alchemy deploy",
 			destroy: "alchemy destroy",
-			"alchemy:dev": "alchemy dev"
+			dev: "alchemy dev"
 		};
 		await fs.writeJson(pkgPath, pkg, { spaces: 2 });
 	}
@@ -3034,7 +3028,7 @@ async function setupNextAlchemyDeploy(projectDir, _packageManager) {
 
 //#endregion
 //#region src/helpers/deployment/alchemy/alchemy-nuxt-setup.ts
-async function setupNuxtAlchemyDeploy(projectDir, _packageManager) {
+async function setupNuxtAlchemyDeploy(projectDir, _packageManager, options) {
 	const webAppDir = path.join(projectDir, "apps/web");
 	if (!await fs.pathExists(webAppDir)) return;
 	await addPackageDependency({
@@ -3048,11 +3042,11 @@ async function setupNuxtAlchemyDeploy(projectDir, _packageManager) {
 	const pkgPath = path.join(webAppDir, "package.json");
 	if (await fs.pathExists(pkgPath)) {
 		const pkg = await fs.readJson(pkgPath);
-		pkg.scripts = {
+		if (!options?.skipAppScripts) pkg.scripts = {
 			...pkg.scripts,
 			deploy: "alchemy deploy",
 			destroy: "alchemy destroy",
-			"alchemy:dev": "alchemy dev"
+			dev: "alchemy dev"
 		};
 		await fs.writeJson(pkgPath, pkg, { spaces: 2 });
 	}
@@ -3102,112 +3096,29 @@ async function setupNuxtAlchemyDeploy(projectDir, _packageManager) {
 
 //#endregion
 //#region src/helpers/deployment/alchemy/alchemy-react-router-setup.ts
-async function setupReactRouterAlchemyDeploy(projectDir, _packageManager) {
+async function setupReactRouterAlchemyDeploy(projectDir, _packageManager, options) {
 	const webAppDir = path.join(projectDir, "apps/web");
 	if (!await fs.pathExists(webAppDir)) return;
 	await addPackageDependency({
-		devDependencies: [
-			"alchemy",
-			"@cloudflare/vite-plugin",
-			"dotenv"
-		],
+		devDependencies: ["alchemy", "dotenv"],
 		projectDir: webAppDir
 	});
 	const pkgPath = path.join(webAppDir, "package.json");
 	if (await fs.pathExists(pkgPath)) {
 		const pkg = await fs.readJson(pkgPath);
-		pkg.scripts = {
+		if (!options?.skipAppScripts) pkg.scripts = {
 			...pkg.scripts,
 			deploy: "alchemy deploy",
 			destroy: "alchemy destroy",
-			"alchemy:dev": "alchemy dev"
+			dev: "alchemy dev"
 		};
 		await fs.writeJson(pkgPath, pkg, { spaces: 2 });
 	}
-	const viteConfigPath = path.join(webAppDir, "vite.config.ts");
-	if (await fs.pathExists(viteConfigPath)) try {
-		const project = new Project({ manipulationSettings: {
-			indentationText: IndentationText.TwoSpaces,
-			quoteKind: QuoteKind.Double
-		} });
-		project.addSourceFileAtPath(viteConfigPath);
-		const sourceFile = project.getSourceFileOrThrow(viteConfigPath);
-		const alchemyImport = sourceFile.getImportDeclaration("alchemy/cloudflare/react-router");
-		if (!alchemyImport) sourceFile.addImportDeclaration({
-			moduleSpecifier: "alchemy/cloudflare/react-router",
-			defaultImport: "alchemy"
-		});
-		const exportAssignment = sourceFile.getExportAssignment((d) => !d.isExportEquals());
-		if (!exportAssignment) return;
-		const defineConfigCall = exportAssignment.getExpression();
-		if (!Node.isCallExpression(defineConfigCall) || defineConfigCall.getExpression().getText() !== "defineConfig") return;
-		let configObject = defineConfigCall.getArguments()[0];
-		if (!configObject) configObject = defineConfigCall.addArgument("{}");
-		if (Node.isObjectLiteralExpression(configObject)) {
-			const pluginsProperty = configObject.getProperty("plugins");
-			if (pluginsProperty && Node.isPropertyAssignment(pluginsProperty)) {
-				const initializer = pluginsProperty.getInitializer();
-				if (Node.isArrayLiteralExpression(initializer)) {
-					const hasCloudflarePlugin = initializer.getElements().some((el) => el.getText().includes("cloudflare("));
-					if (!hasCloudflarePlugin) initializer.addElement("alchemy()");
-				}
-			} else if (!pluginsProperty) configObject.addPropertyAssignment({
-				name: "plugins",
-				initializer: "[alchemy()]"
-			});
-		}
-		await project.save();
-	} catch (error) {
-		console.warn("Failed to update vite.config.ts:", error);
-	}
-	const reactRouterConfigPath = path.join(webAppDir, "react-router.config.ts");
-	if (await fs.pathExists(reactRouterConfigPath)) try {
-		const project = new Project({ manipulationSettings: {
-			indentationText: IndentationText.TwoSpaces,
-			quoteKind: QuoteKind.Double
-		} });
-		project.addSourceFileAtPath(reactRouterConfigPath);
-		const sourceFile = project.getSourceFileOrThrow(reactRouterConfigPath);
-		const exportAssignment = sourceFile.getExportAssignment((d) => !d.isExportEquals());
-		if (!exportAssignment) return;
-		const configExpression = exportAssignment.getExpression();
-		let configObject;
-		if (Node.isObjectLiteralExpression(configExpression)) configObject = configExpression;
-		else if (Node.isSatisfiesExpression(configExpression)) {
-			const expression = configExpression.getExpression();
-			if (Node.isObjectLiteralExpression(expression)) configObject = expression;
-		}
-		if (!configObject || !Node.isObjectLiteralExpression(configObject)) return;
-		const futureProperty = configObject.getProperty("future");
-		if (!futureProperty) configObject.addPropertyAssignment({
-			name: "future",
-			initializer: `{
-    unstable_viteEnvironmentApi: true,
-  }`
-		});
-		else if (Node.isPropertyAssignment(futureProperty)) {
-			const futureInitializer = futureProperty.getInitializer();
-			if (Node.isObjectLiteralExpression(futureInitializer)) {
-				const viteEnvApiProp = futureInitializer.getProperty("unstable_viteEnvironmentApi");
-				if (!viteEnvApiProp) futureInitializer.addPropertyAssignment({
-					name: "unstable_viteEnvironmentApi",
-					initializer: "true"
-				});
-				else if (Node.isPropertyAssignment(viteEnvApiProp)) {
-					const value = viteEnvApiProp.getInitializer()?.getText();
-					if (value === "false") viteEnvApiProp.setInitializer("true");
-				}
-			}
-		}
-		await project.save();
-	} catch (error) {
-		console.warn("Failed to update react-router.config.ts:", error);
-	}
 }
 
 //#endregion
 //#region src/helpers/deployment/alchemy/alchemy-solid-setup.ts
-async function setupSolidAlchemyDeploy(projectDir, _packageManager) {
+async function setupSolidAlchemyDeploy(projectDir, _packageManager, options) {
 	const webAppDir = path.join(projectDir, "apps/web");
 	if (!await fs.pathExists(webAppDir)) return;
 	await addPackageDependency({
@@ -3217,11 +3128,11 @@ async function setupSolidAlchemyDeploy(projectDir, _packageManager) {
 	const pkgPath = path.join(webAppDir, "package.json");
 	if (await fs.pathExists(pkgPath)) {
 		const pkg = await fs.readJson(pkgPath);
-		pkg.scripts = {
+		if (!options?.skipAppScripts) pkg.scripts = {
 			...pkg.scripts,
 			deploy: "alchemy deploy",
 			destroy: "alchemy destroy",
-			"alchemy:dev": "alchemy dev"
+			dev: "alchemy dev"
 		};
 		await fs.writeJson(pkgPath, pkg, { spaces: 2 });
 	}
@@ -3229,7 +3140,7 @@ async function setupSolidAlchemyDeploy(projectDir, _packageManager) {
 
 //#endregion
 //#region src/helpers/deployment/alchemy/alchemy-svelte-setup.ts
-async function setupSvelteAlchemyDeploy(projectDir, _packageManager) {
+async function setupSvelteAlchemyDeploy(projectDir, _packageManager, options) {
 	const webAppDir = path.join(projectDir, "apps/web");
 	if (!await fs.pathExists(webAppDir)) return;
 	await addPackageDependency({
@@ -3243,11 +3154,11 @@ async function setupSvelteAlchemyDeploy(projectDir, _packageManager) {
 	const pkgPath = path.join(webAppDir, "package.json");
 	if (await fs.pathExists(pkgPath)) {
 		const pkg = await fs.readJson(pkgPath);
-		pkg.scripts = {
+		if (!options?.skipAppScripts) pkg.scripts = {
 			...pkg.scripts,
 			deploy: "alchemy deploy",
 			destroy: "alchemy destroy",
-			"alchemy:dev": "alchemy dev"
+			dev: "alchemy dev"
 		};
 		await fs.writeJson(pkgPath, pkg, { spaces: 2 });
 	}
@@ -3300,7 +3211,7 @@ function updateAdapterInConfig(configObject) {
 
 //#endregion
 //#region src/helpers/deployment/alchemy/alchemy-tanstack-router-setup.ts
-async function setupTanStackRouterAlchemyDeploy(projectDir, _packageManager) {
+async function setupTanStackRouterAlchemyDeploy(projectDir, _packageManager, options) {
 	const webAppDir = path.join(projectDir, "apps/web");
 	if (!await fs.pathExists(webAppDir)) return;
 	await addPackageDependency({
@@ -3310,11 +3221,11 @@ async function setupTanStackRouterAlchemyDeploy(projectDir, _packageManager) {
 	const pkgPath = path.join(webAppDir, "package.json");
 	if (await fs.pathExists(pkgPath)) {
 		const pkg = await fs.readJson(pkgPath);
-		pkg.scripts = {
+		if (!options?.skipAppScripts) pkg.scripts = {
 			...pkg.scripts,
 			deploy: "alchemy deploy",
 			destroy: "alchemy destroy",
-			"alchemy:dev": "alchemy dev"
+			dev: "alchemy dev"
 		};
 		await fs.writeJson(pkgPath, pkg, { spaces: 2 });
 	}
@@ -3322,7 +3233,7 @@ async function setupTanStackRouterAlchemyDeploy(projectDir, _packageManager) {
 
 //#endregion
 //#region src/helpers/deployment/alchemy/alchemy-tanstack-start-setup.ts
-async function setupTanStackStartAlchemyDeploy(projectDir, _packageManager) {
+async function setupTanStackStartAlchemyDeploy(projectDir, _packageManager, options) {
 	const webAppDir = path.join(projectDir, "apps/web");
 	if (!await fs.pathExists(webAppDir)) return;
 	await addPackageDependency({
@@ -3336,11 +3247,11 @@ async function setupTanStackStartAlchemyDeploy(projectDir, _packageManager) {
 	const pkgPath = path.join(webAppDir, "package.json");
 	if (await fs.pathExists(pkgPath)) {
 		const pkg = await fs.readJson(pkgPath);
-		pkg.scripts = {
+		if (!options?.skipAppScripts) pkg.scripts = {
 			...pkg.scripts,
 			deploy: "alchemy deploy",
 			destroy: "alchemy destroy",
-			"alchemy:dev": "alchemy dev"
+			dev: "alchemy dev"
 		};
 		await fs.writeJson(pkgPath, pkg, { spaces: 2 });
 	}
@@ -3456,7 +3367,7 @@ async function setupCombinedAlchemyDeploy(projectDir, packageManager, config) {
 			...pkg.scripts,
 			deploy: "alchemy deploy",
 			destroy: "alchemy destroy",
-			"alchemy:dev": "alchemy dev"
+			dev: "alchemy dev"
 		};
 		await fs.writeJson(rootPkgPath, pkg, { spaces: 2 });
 	}
@@ -3470,13 +3381,13 @@ async function setupCombinedAlchemyDeploy(projectDir, packageManager, config) {
 	const isTanstackStart = frontend.includes("tanstack-start");
 	const isReactRouter = frontend.includes("react-router");
 	const isSolid = frontend.includes("solid");
-	if (isNext) await setupNextAlchemyDeploy(projectDir, packageManager);
-	else if (isNuxt) await setupNuxtAlchemyDeploy(projectDir, packageManager);
-	else if (isSvelte) await setupSvelteAlchemyDeploy(projectDir, packageManager);
-	else if (isTanstackStart) await setupTanStackStartAlchemyDeploy(projectDir, packageManager);
-	else if (isTanstackRouter) await setupTanStackRouterAlchemyDeploy(projectDir, packageManager);
-	else if (isReactRouter) await setupReactRouterAlchemyDeploy(projectDir, packageManager);
-	else if (isSolid) await setupSolidAlchemyDeploy(projectDir, packageManager);
+	if (isNext) await setupNextAlchemyDeploy(projectDir, packageManager, { skipAppScripts: true });
+	else if (isNuxt) await setupNuxtAlchemyDeploy(projectDir, packageManager, { skipAppScripts: true });
+	else if (isSvelte) await setupSvelteAlchemyDeploy(projectDir, packageManager, { skipAppScripts: true });
+	else if (isTanstackStart) await setupTanStackStartAlchemyDeploy(projectDir, packageManager, { skipAppScripts: true });
+	else if (isTanstackRouter) await setupTanStackRouterAlchemyDeploy(projectDir, packageManager, { skipAppScripts: true });
+	else if (isReactRouter) await setupReactRouterAlchemyDeploy(projectDir, packageManager, { skipAppScripts: true });
+	else if (isSolid) await setupSolidAlchemyDeploy(projectDir, packageManager, { skipAppScripts: true });
 }
 
 //#endregion
@@ -5282,7 +5193,7 @@ async function createReadme(projectDir, options) {
 	}
 }
 function generateReadmeContent(options) {
-	const { projectName, packageManager, database, auth, addons = [], orm = "drizzle", runtime = "bun", frontend = ["tanstack-router"], backend = "hono", api = "trpc" } = options;
+	const { projectName, packageManager, database, auth, addons = [], orm = "drizzle", runtime = "bun", frontend = ["tanstack-router"], backend = "hono", api = "trpc", webDeploy, serverDeploy } = options;
 	const isConvex = backend === "convex";
 	const hasReactRouter = frontend.includes("react-router");
 	const hasNative = frontend.includes("native-nativewind") || frontend.includes("native-unistyles");
@@ -5315,7 +5226,7 @@ This project uses Convex as a backend. You'll need to set up Convex before runni
 ${packageManagerRunCmd} dev:setup
 \`\`\`
 
-Follow the prompts to create a new Convex project and connect it to your application.` : generateDatabaseSetup(database, auth, packageManagerRunCmd, orm, options.dbSetup)}
+Follow the prompts to create a new Convex project and connect it to your application.` : generateDatabaseSetup(database, auth, packageManagerRunCmd, orm, options.dbSetup, options.serverDeploy)}
 
 Then, run the development server:
 
@@ -5327,6 +5238,8 @@ ${generateRunningInstructions(frontend, backend, webPort, hasNative, isConvex)}
 
 ${addons.includes("pwa") && hasReactRouter ? "\n## PWA Support with React Router v7\n\nThere is a known compatibility issue between VitePWA and React Router v7.\nSee: https://github.com/vite-pwa/vite-plugin-pwa/issues/809\n" : ""}
 
+${generateDeploymentCommands(packageManagerRunCmd, webDeploy, serverDeploy)}
+
 ## Project Structure
 
 \`\`\`
@@ -5470,13 +5383,13 @@ function generateFeaturesList(database, auth, addons, orm, runtime, frontend, ba
 	else if (addon === "turborepo") addonsList.push("- **Turborepo** - Optimized monorepo build system");
 	return addonsList.join("\n");
 }
-function generateDatabaseSetup(database, _auth, packageManagerRunCmd, orm, dbSetup) {
+function generateDatabaseSetup(database, _auth, packageManagerRunCmd, orm, dbSetup, serverDeploy) {
 	if (database === "none") return "";
 	let setup = "## Database Setup\n\n";
 	if (database === "sqlite") setup += `This project uses SQLite${orm === "drizzle" ? " with Drizzle ORM" : orm === "prisma" ? " with Prisma" : ` with ${orm}`}.
 
 1. Start the local SQLite database:
-${dbSetup === "d1" ? "Local development for a Cloudflare D1 database will already be running as part of the `wrangler dev` command." : `\`\`\`bash
+${dbSetup === "d1" ? serverDeploy === "alchemy" ? "D1 local development and migrations are handled automatically by Alchemy during dev and deploy." : "Local development for a Cloudflare D1 database will already be running as part of the `wrangler dev` command." : `\`\`\`bash
 cd apps/server && ${packageManagerRunCmd} db:local
 \`\`\`
 `}
@@ -5546,6 +5459,21 @@ function generateScriptsList(packageManagerRunCmd, database, orm, _auth, hasNati
 - \`cd apps/docs && ${packageManagerRunCmd} build\`: Build documentation site`;
 	return scripts;
 }
+function generateDeploymentCommands(packageManagerRunCmd, webDeploy, serverDeploy) {
+	const lines = [];
+	if (webDeploy === "alchemy" || serverDeploy === "alchemy") {
+		lines.push("## Deployment (Alchemy)");
+		if (webDeploy === "alchemy" && serverDeploy !== "alchemy") lines.push(`- Web dev: cd apps/web && ${packageManagerRunCmd} dev`, `- Web deploy: cd apps/web && ${packageManagerRunCmd} deploy`, `- Web destroy: cd apps/web && ${packageManagerRunCmd} destroy`);
+		if (serverDeploy === "alchemy" && webDeploy !== "alchemy") lines.push(`- Server dev: cd apps/server && ${packageManagerRunCmd} dev`, `- Server deploy: cd apps/server && ${packageManagerRunCmd} deploy`, `- Server destroy: cd apps/server && ${packageManagerRunCmd} destroy`);
+		if (webDeploy === "alchemy" && serverDeploy === "alchemy") lines.push(`- Dev: ${packageManagerRunCmd} dev`, `- Deploy: ${packageManagerRunCmd} deploy`, `- Destroy: ${packageManagerRunCmd} destroy`);
+	}
+	if (webDeploy === "wrangler" || serverDeploy === "wrangler") {
+		lines.push("\n## Deployment (Cloudflare Wrangler)");
+		if (webDeploy === "wrangler") lines.push(`- Web deploy: cd apps/web && ${packageManagerRunCmd} deploy`);
+		if (serverDeploy === "wrangler") lines.push(`- Server dev: cd apps/server && ${packageManagerRunCmd} dev`, `- Server deploy: cd apps/server && ${packageManagerRunCmd} deploy`);
+	}
+	return lines.length ? `\n${lines.join("\n")}\n` : "";
+}
 
 //#endregion
 //#region src/helpers/core/git.ts
@@ -5761,9 +5689,9 @@ function getWranglerDeployInstructions(runCmd, webDeploy, serverDeploy) {
 }
 function getAlchemyDeployInstructions(runCmd, webDeploy, serverDeploy) {
 	const instructions = [];
-	if (webDeploy === "alchemy" && serverDeploy !== "alchemy") instructions.push(`${pc.bold("Deploy web with Alchemy:")}\n${pc.cyan("•")} Dev: ${`cd apps/web && ${runCmd} alchemy:dev`}\n${pc.cyan("•")} Deploy: ${`cd apps/web && ${runCmd} deploy`}\n${pc.cyan("•")} Destroy: ${`cd apps/web && ${runCmd} destroy`}`);
-	else if (serverDeploy === "alchemy" && webDeploy !== "alchemy") instructions.push(`${pc.bold("Deploy server with Alchemy:")}\n${pc.cyan("•")} Dev: ${`cd apps/server && ${runCmd} alchemy:dev`}\n${pc.cyan("•")} Deploy: ${`cd apps/server && ${runCmd} deploy`}\n${pc.cyan("•")} Destroy: ${`cd apps/server && ${runCmd} destroy`}`);
-	else if (webDeploy === "alchemy" && serverDeploy === "alchemy") instructions.push(`${pc.bold("Deploy with Alchemy:")}\n${pc.cyan("•")} Dev: ${`${runCmd} alchemy:dev`}\n${pc.cyan("•")} Deploy: ${`${runCmd} deploy`}\n${pc.cyan("•")} Destroy: ${`${runCmd} destroy`}`);
+	if (webDeploy === "alchemy" && serverDeploy !== "alchemy") instructions.push(`${pc.bold("Deploy web with Alchemy:")}\n${pc.cyan("•")} Dev: ${`cd apps/web && ${runCmd} dev`}\n${pc.cyan("•")} Deploy: ${`cd apps/web && ${runCmd} deploy`}\n${pc.cyan("•")} Destroy: ${`cd apps/web && ${runCmd} destroy`}`);
+	else if (serverDeploy === "alchemy" && webDeploy !== "alchemy") instructions.push(`${pc.bold("Deploy server with Alchemy:")}\n${pc.cyan("•")} Dev: ${`cd apps/server && ${runCmd} dev`}\n${pc.cyan("•")} Deploy: ${`cd apps/server && ${runCmd} deploy`}\n${pc.cyan("•")} Destroy: ${`cd apps/server && ${runCmd} destroy`}`);
+	else if (webDeploy === "alchemy" && serverDeploy === "alchemy") instructions.push(`${pc.bold("Deploy with Alchemy:")}\n${pc.cyan("•")} Dev: ${`${runCmd} dev`}\n${pc.cyan("•")} Deploy: ${`${runCmd} deploy`}\n${pc.cyan("•")} Destroy: ${`${runCmd} destroy`}`);
 	return instructions.length ? `\n${instructions.join("\n")}` : "";
 }
 
@@ -5976,10 +5904,10 @@ async function createProject(options) {
 		if (options.addons.length > 0 && options.addons[0] !== "none") await setupAddons(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 setupWebDeploy(options);
+		await setupServerDeploy(options);
 		await createReadme(projectDir, options);
 		await writeBtsConfig(options);
 		await formatProjectWithBiome(projectDir);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-better-t-stack",
-  "version": "2.36.3",
+  "version": "2.37.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/deploy/alchemy/alchemy.run.ts.hbs

@@ -17,7 +17,7 @@ import { Vite } from "alchemy/cloudflare";
 {{/if}}
 {{/if}}
 {{#if (eq serverDeploy "alchemy")}}
-import { Worker, WranglerJson } from "alchemy/cloudflare";
+import { Worker } from "alchemy/cloudflare";
 {{#if (eq dbSetup "d1")}}
 import { D1Database } from "alchemy/cloudflare";
 {{/if}}
@@ -44,7 +44,6 @@ await Exec("db-generate", {
 });
 
 const db = await D1Database("database", {
-	name: `${app.name}-${app.stage}-db`,
 	migrationsDir: "apps/server/src/db/migrations",
 });
 {{/if}}
@@ -53,7 +52,6 @@ const db = await D1Database("database", {
 {{#if (includes frontend "next")}}
 export const web = await Next("web", {
   {{#if (eq serverDeploy "alchemy")}}cwd: "apps/web",{{/if}}
-  name: `${app.name}-${app.stage}-web`,
   bindings: {
     {{#if (eq backend "convex")}}
     NEXT_PUBLIC_CONVEX_URL: process.env.NEXT_PUBLIC_CONVEX_URL || "",
@@ -68,7 +66,6 @@ export const web = await Next("web", {
 {{else if (includes frontend "nuxt")}}
 export const web = await Nuxt("web", {
   {{#if (eq serverDeploy "alchemy")}}cwd: "apps/web",{{/if}}
-  name: `${app.name}-${app.stage}-web`,
   bindings: {
     {{#if (eq backend "convex")}}
     NUXT_PUBLIC_CONVEX_URL: process.env.NUXT_PUBLIC_CONVEX_URL || "",
@@ -83,7 +80,6 @@ export const web = await Nuxt("web", {
 {{else if (includes frontend "svelte")}}
 export const web = await SvelteKit("web", {
   {{#if (eq serverDeploy "alchemy")}}cwd: "apps/web",{{/if}}
-  name: `${app.name}-${app.stage}-web`,
   bindings: {
     {{#if (eq backend "convex")}}
     PUBLIC_CONVEX_URL: process.env.PUBLIC_CONVEX_URL || "",
@@ -98,7 +94,6 @@ export const web = await SvelteKit("web", {
 {{else if (includes frontend "tanstack-start")}}
 export const web = await TanStackStart("web", {
   {{#if (eq serverDeploy "alchemy")}}cwd: "apps/web",{{/if}}
-  name: `${app.name}-${app.stage}-web`,
   bindings: {
     {{#if (eq backend "convex")}}
     VITE_CONVEX_URL: process.env.VITE_CONVEX_URL || "",
@@ -113,7 +108,6 @@ export const web = await TanStackStart("web", {
 {{else if (includes frontend "tanstack-router")}}
 export const web = await Vite("web", {
   {{#if (eq serverDeploy "alchemy")}}cwd: "apps/web",{{/if}}
-  name: `${app.name}-${app.stage}-web`,
   assets: "dist",
   bindings: {
     {{#if (eq backend "convex")}}
@@ -129,7 +123,6 @@ export const web = await Vite("web", {
 {{else if (includes frontend "react-router")}}
 export const web = await ReactRouter("web", {
   {{#if (eq serverDeploy "alchemy")}}cwd: "apps/web",{{/if}}
-  name: `${app.name}-${app.stage}-web`,
   bindings: {
     {{#if (eq backend "convex")}}
     VITE_CONVEX_URL: process.env.VITE_CONVEX_URL || "",
@@ -144,7 +137,6 @@ export const web = await ReactRouter("web", {
 {{else if (includes frontend "solid")}}
 export const web = await Vite("web", {
   {{#if (eq serverDeploy "alchemy")}}cwd: "apps/web",{{/if}}
-  name: `${app.name}-${app.stage}-web`,
   assets: "dist",
   bindings: {
     {{#if (eq backend "convex")}}
@@ -163,7 +155,6 @@ export const web = await Vite("web", {
 {{#if (eq serverDeploy "alchemy")}}
 export const server = await Worker("server", {
   {{#if (eq webDeploy "alchemy")}}cwd: "apps/server",{{/if}}
-  name: `${app.name}-${app.stage}`,
   entrypoint: "src/index.ts",
   compatibility: "node",
   bindings: {
@@ -188,14 +179,8 @@ export const server = await Worker("server", {
 		port: 3000,
 	},
 });
-
-await WranglerJson("wrangler", {
-	worker: server,
-});
 {{/if}}
 
-
-
 {{#if (and (eq webDeploy "alchemy") (eq serverDeploy "alchemy"))}}
 console.log(`Web    -> ${web.url}`);
 console.log(`Server -> ${server.url}`);

package/templates/deploy/alchemy/wrangler.jsonc.hbs

@@ -1,11 +0,0 @@
-// This is a temporary wrangler.jsonc file that will be overwritten by alchemy
-// It's only here so that `wrangler dev` can work or use alchemy dev instead
-{
-  "name": "{{projectName}}",
-  "main": "src/index.ts",
-  "compatibility_date": "2025-08-16",
-  "compatibility_flags": [
-    "nodejs_compat",
-    "nodejs_compat_populate_process_env"
-  ]
-}