create-better-t-stack 2.40.4-canary.49f23d48 → 2.40.4-canary.f07be855

package/dist/cli.js

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

package/dist/{src-D32Mc1TH.js → src-BMkTBm89.js}

@@ -79,6 +79,7 @@ const dependencyVersionMap = {
 	prisma: "^6.15.0",
 	"@prisma/adapter-d1": "^6.15.0",
 	"@prisma/extension-accelerate": "^2.0.2",
+	"@prisma/adapter-libsql": "^6.15.0",
 	"@prisma/adapter-planetscale": "^6.15.0",
 	undici: "^7.15.0",
 	mongoose: "^8.14.0",
@@ -136,7 +137,7 @@ const dependencyVersionMap = {
 	"@tanstack/solid-router-devtools": "^1.131.25",
 	wrangler: "^4.23.0",
 	"@cloudflare/vite-plugin": "^1.9.0",
-	"@opennextjs/cloudflare": "^1.3.0",
+	"@opennextjs/cloudflare": "^1.6.5",
 	"nitro-cloudflare-dev": "^0.2.2",
 	"@sveltejs/adapter-cloudflare": "^7.2.1",
 	"@cloudflare/workers-types": "^4.20250822.0",
@@ -567,17 +568,6 @@ function validateExamplesCompatibility(examples, backend, database, frontend) {
 	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.");
 }
-function validateAlchemyCompatibility(webDeploy, serverDeploy, frontends = []) {
-	const isAlchemyWebDeploy = webDeploy === "alchemy";
-	const isAlchemyServerDeploy = serverDeploy === "alchemy";
-	if (isAlchemyWebDeploy || isAlchemyServerDeploy) {
-		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.`);
-		}
-	}
-}
 
 //#endregion
 //#region src/prompts/api.ts
@@ -1174,8 +1164,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");
-	const availableDeployments = hasIncompatibleFrontend ? ["wrangler", "none"] : [
+	const availableDeployments = [
 		"wrangler",
 		"alchemy",
 		"none"
@@ -1191,14 +1180,13 @@ async function getDeploymentChoice(deployment, _runtime, _backend, frontend = []
 	const response = await select({
 		message: "Select web deployment",
 		options,
-		initialValue: hasIncompatibleFrontend ? "wrangler" : DEFAULT_CONFIG.webDeploy
+		initialValue: DEFAULT_CONFIG.webDeploy
 	});
 	if (isCancel(response)) return exitCancelled("Operation cancelled");
 	return response;
 }
 async function getDeploymentToAdd(frontend, existingDeployment) {
 	if (!hasWebFrontend(frontend)) return "none";
-	const hasIncompatibleFrontend = frontend.some((f) => f === "next");
 	const options = [];
 	if (existingDeployment !== "wrangler") {
 		const { label, hint } = getDeploymentDisplay("wrangler");
@@ -1208,7 +1196,7 @@ async function getDeploymentToAdd(frontend, existingDeployment) {
 			hint
 		});
 	}
-	if (existingDeployment !== "alchemy" && !hasIncompatibleFrontend) {
+	if (existingDeployment !== "alchemy") {
 		const { label, hint } = getDeploymentDisplay("alchemy");
 		options.push({
 			value: "alchemy",
@@ -1226,7 +1214,7 @@ async function getDeploymentToAdd(frontend, existingDeployment) {
 	const response = await select({
 		message: "Select web deployment",
 		options,
-		initialValue: hasIncompatibleFrontend ? "wrangler" : DEFAULT_CONFIG.webDeploy
+		initialValue: DEFAULT_CONFIG.webDeploy
 	});
 	if (isCancel(response)) return exitCancelled("Operation cancelled");
 	return response;
@@ -1772,7 +1760,6 @@ function validateFullConfig(config, providedFlags, options) {
 		config.addons = [...new Set(config.addons)];
 	}
 	validateExamplesCompatibility(config.examples ?? [], config.backend, config.database, config.frontend ?? []);
-	validateAlchemyCompatibility(config.webDeploy, config.serverDeploy, config.frontend ?? []);
 }
 function validateConfigForProgrammaticUse(config) {
 	try {
@@ -3109,7 +3096,12 @@ async function setupNextAlchemyDeploy(projectDir, _packageManager, options) {
 	const webAppDir = path.join(projectDir, "apps/web");
 	if (!await fs.pathExists(webAppDir)) return;
 	await addPackageDependency({
-		devDependencies: ["alchemy", "dotenv"],
+		dependencies: ["@opennextjs/cloudflare"],
+		devDependencies: [
+			"alchemy",
+			"dotenv",
+			"wrangler"
+		],
 		projectDir: webAppDir
 	});
 	const pkgPath = path.join(webAppDir, "package.json");
@@ -3122,6 +3114,17 @@ async function setupNextAlchemyDeploy(projectDir, _packageManager, options) {
 		};
 		await fs.writeJson(pkgPath, pkg, { spaces: 2 });
 	}
+	const openNextConfigPath = path.join(webAppDir, "open-next.config.ts");
+	const openNextConfigContent = `import { defineCloudflareConfig } from "@opennextjs/cloudflare";
+
+export default defineCloudflareConfig({});
+`;
+	await fs.writeFile(openNextConfigPath, openNextConfigContent);
+	const gitignorePath = path.join(webAppDir, ".gitignore");
+	if (await fs.pathExists(gitignorePath)) {
+		const gitignoreContent = await fs.readFile(gitignorePath, "utf-8");
+		if (!gitignoreContent.includes("wrangler.jsonc")) await fs.appendFile(gitignorePath, "\nwrangler.jsonc\n");
+	} else await fs.writeFile(gitignorePath, "wrangler.jsonc\n");
 }
 
 //#endregion
@@ -4567,6 +4570,26 @@ async function setupMongoDBAtlas(config) {
 	const serverDir = path.join(projectDir, "apps/server");
 	try {
 		await fs.ensureDir(serverDir);
+		const mode = await select({
+			message: "MongoDB Atlas setup: choose mode",
+			options: [{
+				label: "Automatic",
+				value: "auto",
+				hint: "Automated setup with provider CLI, sets .env"
+			}, {
+				label: "Manual",
+				value: "manual",
+				hint: "Manual setup, add env vars yourself"
+			}],
+			initialValue: "auto"
+		});
+		if (isCancel(mode)) return exitCancelled("Operation cancelled");
+		if (mode === "manual") {
+			mainSpinner.stop("MongoDB Atlas manual setup selected");
+			await writeEnvFile$3(projectDir);
+			displayManualSetupInstructions$3();
+			return;
+		}
 		mainSpinner.stop("MongoDB Atlas setup ready");
 		const config$1 = await initMongoDBAtlas(serverDir);
 		if (config$1) {
@@ -4699,6 +4722,25 @@ DATABASE_URL="your_connection_string"`);
 async function setupNeonPostgres(config) {
 	const { packageManager, projectDir } = config;
 	try {
+		const mode = await select({
+			message: "Neon setup: choose mode",
+			options: [{
+				label: "Automatic",
+				value: "auto",
+				hint: "Automated setup with provider CLI, sets .env"
+			}, {
+				label: "Manual",
+				value: "manual",
+				hint: "Manual setup, add env vars yourself"
+			}],
+			initialValue: "auto"
+		});
+		if (isCancel(mode)) return exitCancelled("Operation cancelled");
+		if (mode === "manual") {
+			await writeEnvFile$2(projectDir);
+			displayManualSetupInstructions$2();
+			return;
+		}
 		const setupMethod = await select({
 			message: "Choose your Neon setup method:",
 			options: [{
@@ -4969,6 +5011,25 @@ async function setupPrismaPostgres(config) {
 	const serverDir = path.join(projectDir, "apps/server");
 	try {
 		await fs.ensureDir(serverDir);
+		const mode = await select({
+			message: "Prisma Postgres setup: choose mode",
+			options: [{
+				label: "Automatic",
+				value: "auto",
+				hint: "Automated setup with provider CLI, sets .env"
+			}, {
+				label: "Manual",
+				value: "manual",
+				hint: "Manual setup, add env vars yourself"
+			}],
+			initialValue: "auto"
+		});
+		if (isCancel(mode)) return exitCancelled("Operation cancelled");
+		if (mode === "manual") {
+			await writeEnvFile$1(projectDir);
+			displayManualSetupInstructions$1();
+			return;
+		}
 		const setupOptions = [{
 			label: "Quick setup with create-db",
 			value: "create-db",
@@ -5107,6 +5168,24 @@ async function setupSupabase(config) {
 	const serverDir = path.join(projectDir, "apps", "server");
 	try {
 		await fs.ensureDir(serverDir);
+		const mode = await select({
+			message: "Supabase setup: choose mode",
+			options: [{
+				label: "Automatic",
+				value: "auto",
+				hint: "Automated setup with provider CLI, sets .env"
+			}, {
+				label: "Manual",
+				value: "manual",
+				hint: "Manual setup, add env vars yourself"
+			}],
+			initialValue: "auto"
+		});
+		if (isCancel(mode)) return exitCancelled("Operation cancelled");
+		if (mode === "manual") {
+			displayManualSupabaseInstructions();
+			return;
+		}
 		const initialized = await initializeSupabase(serverDir, packageManager);
 		if (!initialized) {
 			displayManualSupabaseInstructions();
@@ -5276,19 +5355,38 @@ DATABASE_AUTH_TOKEN=your_auth_token`);
 async function setupTurso(config) {
 	const { orm, projectDir } = config;
 	const setupSpinner = spinner();
-	setupSpinner.start("Checking Turso CLI availability...");
 	try {
+		const mode = await select({
+			message: "Turso setup: choose mode",
+			options: [{
+				label: "Automatic",
+				value: "auto",
+				hint: "Automated setup with provider CLI, sets .env"
+			}, {
+				label: "Manual",
+				value: "manual",
+				hint: "Manual setup, add env vars yourself"
+			}],
+			initialValue: "auto"
+		});
+		if (isCancel(mode)) return exitCancelled("Operation cancelled");
+		if (mode === "manual") {
+			await writeEnvFile(projectDir);
+			displayManualSetupInstructions();
+			return;
+		}
+		setupSpinner.start("Checking Turso CLI availability...");
 		const platform = os.platform();
 		const isMac = platform === "darwin";
 		const isWindows = platform === "win32";
 		if (isWindows) {
-			setupSpinner.stop(pc.yellow("Turso setup not supported on Windows"));
+			if (setupSpinner) setupSpinner.stop(pc.yellow("Turso setup not supported on Windows"));
 			log.warn(pc.yellow("Automatic Turso setup is not supported on Windows."));
 			await writeEnvFile(projectDir);
 			displayManualSetupInstructions();
 			return;
 		}
-		setupSpinner.stop("Turso CLI availability checked");
+		if (setupSpinner) setupSpinner.stop("Turso CLI availability checked");
 		const isCliInstalled = await isTursoInstalled();
 		if (!isCliInstalled) {
 			const shouldInstall = await confirm({
@@ -5331,7 +5429,7 @@ async function setupTurso(config) {
 		}
 		log.success("Turso database setup completed successfully!");
 	} catch (error) {
-		setupSpinner.stop(pc.red("Turso CLI availability check failed"));
+		if (setupSpinner) setupSpinner.stop(pc.red("Turso CLI availability check failed"));
 		consola.error(pc.red(`Error during Turso setup: ${error instanceof Error ? error.message : String(error)}`));
 		await writeEnvFile(projectDir);
 		displayManualSetupInstructions();
@@ -5359,11 +5457,17 @@ async function setupDatabase(config) {
 			dependencies: [
 				"@prisma/client",
 				"@prisma/adapter-planetscale",
+				"@planetscale/database",
 				"undici"
 			],
 			devDependencies: ["prisma"],
 			projectDir: serverDir
 		});
+		else if (database === "sqlite" && dbSetup === "turso") await addPackageDependency({
+			dependencies: ["@prisma/client", "@prisma/adapter-libsql"],
+			devDependencies: ["prisma"],
+			projectDir: serverDir
+		});
 		else await addPackageDependency({
 			dependencies: ["@prisma/client"],
 			devDependencies: ["prisma"],
@@ -5972,7 +6076,6 @@ async function getDatabaseInstructions(database, orm, runCmd, _runtime, dbSetup,
 		}
 	}
 	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.`);
 		if (dbSetup === "docker") instructions.push(`${pc.cyan("•")} Start docker container: ${`${runCmd} db:start`}`);
 		instructions.push(`${pc.cyan("•")} Apply schema: ${`${runCmd} db:push`}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-better-t-stack",
-  "version": "2.40.4-canary.49f23d48",
+  "version": "2.40.4-canary.f07be855",
   "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/prisma/sqlite/prisma/schema/schema.prisma.hbs

@@ -14,9 +14,16 @@ generator client {
   previewFeatures = ["driverAdapters"]
   {{/if}}
   {{/if}}
+  {{#if (eq dbSetup "turso")}}
+  previewFeatures = ["driverAdapters"]
+  {{/if}}
 }
 
 datasource db {
   provider = "sqlite"
+  {{#if (eq dbSetup "turso")}}
+  url      = "file:./local.db"
+  {{else}}
   url      = env("DATABASE_URL")
+  {{/if}}
 }

package/templates/db/prisma/sqlite/prisma.config.ts.hbs

@@ -1,12 +1,15 @@
 import "dotenv/config";
 import path from "node:path";
 import type { PrismaConfig } from "prisma";
-{{#if (eq serverDeploy "wrangler")}}
+{{#if (eq dbSetup "d1")}}
 import { PrismaD1 } from "@prisma/adapter-d1";
 {{/if}}
+{{#if (eq dbSetup "turso")}}
+import { PrismaLibSQL } from "@prisma/adapter-libsql";
+{{/if}}
 
 export default {
-  {{#if (eq serverDeploy "wrangler")}}
+  {{#if (or (eq dbSetup "d1") (eq dbSetup "turso"))}}
   experimental: {
     adapter: true
   },
@@ -15,7 +18,7 @@ export default {
   migrations: {
     path: path.join("prisma", "migrations"),
   },
-  {{#if (eq serverDeploy "wrangler")}}
+  {{#if (eq dbSetup "d1")}}
   async adapter() {
 			return new PrismaD1({
 				CLOUDFLARE_D1_TOKEN: process.env.CLOUDFLARE_D1_TOKEN!,
@@ -24,4 +27,12 @@ export default {
 			});
 		},
   {{/if}}
+  {{#if (eq dbSetup "turso")}}
+  async adapter() {
+		return new PrismaLibSQL({
+			url: process.env.DATABASE_URL || "",
+			authToken: process.env.DATABASE_AUTH_TOKEN,
+		});
+	},
+  {{/if}}
 } satisfies PrismaConfig;

package/templates/db/prisma/sqlite/src/db/index.ts.hbs

@@ -1,4 +1,4 @@
-{{#if (and (eq dbSetup "d1") (eq runtime "workers"))}}
+{{#if (eq dbSetup "d1")}}
 import { env } from "cloudflare:workers";
 import { PrismaD1 } from "@prisma/adapter-d1";
 import { PrismaClient } from "../../prisma/generated/client";
@@ -6,6 +6,18 @@ import { PrismaClient } from "../../prisma/generated/client";
 const adapter = new PrismaD1(env.DB);
 const prisma = new PrismaClient({ adapter });
 
+export default prisma;
+{{else if (eq dbSetup "turso")}}
+import { PrismaLibSQL } from "@prisma/adapter-libsql";
+import { PrismaClient } from "../../prisma/generated/client";
+
+const adapter = new PrismaLibSQL({
+	url: process.env.DATABASE_URL || "",
+	authToken: process.env.DATABASE_AUTH_TOKEN,
+});
+
+const prisma = new PrismaClient({ adapter });
+
 export default prisma;
 {{else}}
 import { PrismaClient } from "../../prisma/generated/client";

package/templates/deploy/alchemy/alchemy.run.ts.hbs

@@ -1,7 +1,7 @@
 import alchemy from "alchemy";
 {{#if (eq webDeploy "alchemy")}}
 {{#if (includes frontend "next")}}
-import { Next } from "alchemy/cloudflare";
+import { Nextjs } from "alchemy/cloudflare";
 {{else if (includes frontend "nuxt")}}
 import { Nuxt } from "alchemy/cloudflare";
 {{else if (includes frontend "svelte")}}
@@ -54,7 +54,7 @@ const db = await D1Database("database", {
 
 {{#if (eq webDeploy "alchemy")}}
 {{#if (includes frontend "next")}}
-export const web = await Next("web", {
+export const web = await Nextjs("web", {
   {{#if (eq serverDeploy "alchemy")}}cwd: "apps/web",{{/if}}
   bindings: {
     {{#if (eq backend "convex")}}

package/templates/extras/bunfig.toml.hbs

@@ -1,7 +1,2 @@
 [install]
-{{#if (or (or (includes frontend "nuxt") (includes frontend "native-nativewind")) (includes frontend
-"native-unistyles"))}}
 # linker = "isolated"
-{{else}}
-linker = "isolated"
-{{/if}}

package/templates/frontend/react/next/next.config.ts.hbs

@@ -1,3 +1,6 @@
+{{#if (or (eq webDeploy "alchemy") (eq webDeploy "wrangler"))}}
+import { initOpenNextCloudflareForDev } from "@opennextjs/cloudflare";
+{{/if}}
 import type { NextConfig } from "next";
 
 const nextConfig: NextConfig = {
@@ -5,3 +8,7 @@ const nextConfig: NextConfig = {
 };
 
 export default nextConfig;
+
+{{#if (or (eq webDeploy "alchemy") (eq webDeploy "wrangler"))}}
+initOpenNextCloudflareForDev();
+{{/if}}