create-better-t-stack 2.50.0-canary.dd7000f2 → 2.50.1

package/dist/{src-dv6H37db.js → src-B8TD9m4n.js}

@@ -15,7 +15,6 @@ import { IndentationText, Node, Project, QuoteKind, SyntaxKind } from "ts-morph"
 import { glob } from "tinyglobby";
 import handlebars from "handlebars";
 import { Biome } from "@biomejs/js-api/nodejs";
-import yaml from "yaml";
 import os$1 from "node:os";
 
 //#region src/utils/get-package-manager.ts
@@ -72,7 +71,6 @@ const dependencyVersionMap = {
 	"drizzle-kit": "^0.31.2",
 	"@planetscale/database": "^1.19.0",
 	"@libsql/client": "^0.15.9",
-	libsql: "^0.5.22",
 	"@neondatabase/serverless": "^1.0.1",
 	pg: "^8.14.1",
 	"@types/pg": "^8.11.11",
@@ -125,7 +123,6 @@ const dependencyVersionMap = {
 	"@trpc/tanstack-react-query": "^11.5.0",
 	"@trpc/server": "^11.5.0",
 	"@trpc/client": "^11.5.0",
-	next: "^15.1.0",
 	convex: "^1.27.0",
 	"@convex-dev/react-query": "^0.0.0-alpha.8",
 	"convex-svelte": "^0.0.11",
@@ -149,9 +146,7 @@ const dependencyVersionMap = {
 	"@cloudflare/workers-types": "^4.20250822.0",
 	alchemy: "^0.70.0",
 	nitropack: "^2.12.4",
-	dotenv: "^17.2.2",
-	tsdown: "^0.15.5",
-	zod: "^4.1.11",
+	dotenv: "^17.2.1",
 	"@polar-sh/better-auth": "^1.1.3",
 	"@polar-sh/sdk": "^0.34.16"
 };
@@ -200,9 +195,9 @@ const BackendSchema = z.enum([
 	"hono",
 	"express",
 	"fastify",
+	"next",
 	"elysia",
 	"convex",
-	"self",
 	"none"
 ]).describe("Backend framework");
 const RuntimeSchema = z.enum([
@@ -348,22 +343,6 @@ function ensureSingleWebAndNative(frontends) {
 	if (web.length > 1) exitWithError("Cannot select multiple web frameworks. Choose only one of: tanstack-router, tanstack-start, react-router, next, nuxt, svelte, solid");
 	if (native.length > 1) exitWithError("Cannot select multiple native frameworks. Choose only one of: native-nativewind, native-unistyles");
 }
-const FULLSTACK_FRONTENDS$1 = [
-	"next",
-	"nuxt",
-	"svelte",
-	"tanstack-start"
-];
-function validateSelfBackendCompatibility(providedFlags, options, config) {
-	const backend = config.backend || options.backend;
-	const frontends = config.frontend || options.frontend || [];
-	if (backend === "self") {
-		if (!frontends.some((f) => FULLSTACK_FRONTENDS$1.includes(f))) exitWithError("Backend 'self' (fullstack) requires a fullstack-capable frontend. Please use --frontend with one of: next, nuxt, svelte, tanstack-start");
-		if (frontends.length > 1) exitWithError("Backend 'self' (fullstack) can only be used with a single frontend framework.");
-	}
-	const hasFullstackFrontend = frontends.some((f) => FULLSTACK_FRONTENDS$1.includes(f));
-	if (providedFlags.has("backend") && !hasFullstackFrontend && backend === "self") exitWithError("Backend 'self' (fullstack) is only compatible with fullstack-capable frontends: next, nuxt, svelte, tanstack-start. Please choose a different backend or use a fullstack frontend.");
-}
 function validateWorkersCompatibility(providedFlags, options, config) {
 	if (providedFlags.has("runtime") && options.runtime === "workers" && config.backend && config.backend !== "hono") exitWithError(`Cloudflare Workers runtime (--runtime workers) is only supported with Hono backend (--backend hono). Current backend: ${config.backend}. Please use '--backend hono' or choose a different runtime.`);
 	if (providedFlags.has("backend") && config.backend && config.backend !== "hono" && config.runtime === "workers") exitWithError(`Backend '${config.backend}' is not compatible with Cloudflare Workers runtime. Cloudflare Workers runtime is only supported with Hono backend. Please use '--backend hono' or choose a different runtime.`);
@@ -685,39 +664,36 @@ async function getAuthChoice(auth, hasDatabase, backend, frontend) {
 
 //#endregion
 //#region src/prompts/backend.ts
-const FULLSTACK_FRONTENDS = [
-	"next",
-	"nuxt",
-	"svelte",
-	"tanstack-start"
-];
 async function getBackendFrameworkChoice(backendFramework, frontends) {
 	if (backendFramework !== void 0) return backendFramework;
 	const hasIncompatibleFrontend = frontends?.some((f) => f === "solid");
-	const hasFullstackFrontend = frontends?.some((f) => FULLSTACK_FRONTENDS.includes(f));
-	const backendOptions = [];
-	if (hasFullstackFrontend) backendOptions.push({
-		value: "self",
-		label: "Self (Fullstack)",
-		hint: "Use frontend's built-in backend capabilities"
-	});
-	backendOptions.push({
-		value: "hono",
-		label: "Hono",
-		hint: "Lightweight, ultrafast web framework"
-	}, {
-		value: "express",
-		label: "Express",
-		hint: "Fast, unopinionated, minimalist web framework for Node.js"
-	}, {
-		value: "fastify",
-		label: "Fastify",
-		hint: "Fast, low-overhead web framework for Node.js"
-	}, {
-		value: "elysia",
-		label: "Elysia",
-		hint: "Ergonomic web framework for building backend servers"
-	});
+	const backendOptions = [
+		{
+			value: "hono",
+			label: "Hono",
+			hint: "Lightweight, ultrafast web framework"
+		},
+		{
+			value: "next",
+			label: "Next.js",
+			hint: "separate api routes only backend"
+		},
+		{
+			value: "express",
+			label: "Express",
+			hint: "Fast, unopinionated, minimalist web framework for Node.js"
+		},
+		{
+			value: "fastify",
+			label: "Fastify",
+			hint: "Fast, low-overhead web framework for Node.js"
+		},
+		{
+			value: "elysia",
+			label: "Elysia",
+			hint: "Ergonomic web framework for building backend servers"
+		}
+	];
 	if (!hasIncompatibleFrontend) backendOptions.push({
 		value: "convex",
 		label: "Convex",
@@ -731,7 +707,7 @@ async function getBackendFrameworkChoice(backendFramework, frontends) {
 	const response = await select({
 		message: "Select backend",
 		options: backendOptions,
-		initialValue: hasFullstackFrontend ? "self" : DEFAULT_CONFIG.backend
+		initialValue: DEFAULT_CONFIG.backend
 	});
 	if (isCancel(response)) return exitCancelled("Operation cancelled");
 	return response;
@@ -1110,8 +1086,9 @@ async function getPaymentsChoice(payments, auth, backend, frontends) {
 //#endregion
 //#region src/prompts/runtime.ts
 async function getRuntimeChoice(runtime, backend) {
-	if (backend === "convex" || backend === "none" || backend === "self") return "none";
+	if (backend === "convex" || backend === "none") return "none";
 	if (runtime !== void 0) return runtime;
+	if (backend === "next") return "node";
 	const runtimeOptions = [{
 		value: "bun",
 		label: "Bun",
@@ -1398,7 +1375,7 @@ const getLatestCLIVersion = () => {
 */
 function isTelemetryEnabled() {
 	const BTS_TELEMETRY_DISABLED = process.env.BTS_TELEMETRY_DISABLED;
-	const BTS_TELEMETRY = "0";
+	const BTS_TELEMETRY = "1";
 	if (BTS_TELEMETRY_DISABLED !== void 0) return BTS_TELEMETRY_DISABLED !== "1";
 	if (BTS_TELEMETRY !== void 0) return BTS_TELEMETRY === "1";
 	return true;
@@ -1406,8 +1383,8 @@ function isTelemetryEnabled() {
 
 //#endregion
 //#region src/utils/analytics.ts
-const POSTHOG_API_KEY = "random";
-const POSTHOG_HOST = "random";
+const POSTHOG_API_KEY = "phc_8ZUxEwwfKMajJLvxz1daGd931dYbQrwKNficBmsdIrs";
+const POSTHOG_HOST = "https://us.i.posthog.com";
 function generateSessionId() {
 	const rand = Math.random().toString(36).slice(2);
 	return `cli_${Date.now().toString(36)}${rand}`;
@@ -1788,8 +1765,8 @@ function validateBackendConstraints(config, providedFlags, options) {
 		].includes(f));
 		if (incompatibleFrontends.length > 0) exitWithError(`Clerk authentication is not compatible with the following frontends: ${incompatibleFrontends.join(", ")}. Please choose a different frontend or auth provider.`);
 	}
-	if (providedFlags.has("backend") && backend && backend !== "convex" && backend !== "none" && backend !== "self") {
-		if (providedFlags.has("runtime") && options.runtime === "none") exitWithError("'--runtime none' is only supported with '--backend convex', '--backend none', or '--backend self'. Please choose 'bun', 'node', or remove the --runtime flag.");
+	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" && providedFlags.has("frontend") && options.frontend) {
 		const incompatibleFrontends = options.frontend.filter((f) => f === "solid");
@@ -1819,7 +1796,6 @@ function validateFullConfig(config, providedFlags, options) {
 	validateFrontendConstraints(config, providedFlags);
 	validateApiConstraints(config, options);
 	validateServerDeployRequiresBackend(config.serverDeploy, config.backend);
-	validateSelfBackendCompatibility(providedFlags, options, config);
 	validateWorkersCompatibility(providedFlags, options, config);
 	if (config.runtime === "workers" && config.serverDeploy === "none") exitWithError("Cloudflare Workers runtime requires a server deployment. Please choose 'wrangler' or 'alchemy' for --server-deploy.");
 	if (config.addons && config.addons.length > 0) {
@@ -1873,7 +1849,6 @@ const CORE_STACK_FLAGS = new Set([
 	"examples",
 	"auth",
 	"dbSetup",
-	"payments",
 	"api",
 	"webDeploy",
 	"serverDeploy"
@@ -2017,17 +1992,15 @@ const addPackageDependency = async (opts) => {
 	if (!pkgJson.dependencies) pkgJson.dependencies = {};
 	if (!pkgJson.devDependencies) pkgJson.devDependencies = {};
 	for (const pkgName of dependencies) {
-		const version = dependencyVersionMap[pkgName];
+		const version = customDependencies[pkgName] || dependencyVersionMap[pkgName];
 		if (version) pkgJson.dependencies[pkgName] = version;
 		else console.warn(`Warning: Dependency ${pkgName} not found in version map.`);
 	}
 	for (const pkgName of devDependencies) {
-		const version = dependencyVersionMap[pkgName];
+		const version = customDevDependencies[pkgName] || dependencyVersionMap[pkgName];
 		if (version) pkgJson.devDependencies[pkgName] = version;
 		else console.warn(`Warning: Dev dependency ${pkgName} not found in version map.`);
 	}
-	for (const [pkgName, version] of Object.entries(customDependencies)) pkgJson.dependencies[pkgName] = version;
-	for (const [pkgName, version] of Object.entries(customDevDependencies)) pkgJson.devDependencies[pkgName] = version;
 	await fs.writeJson(pkgJsonPath, pkgJson, { spaces: 2 });
 };
 
@@ -2682,12 +2655,8 @@ async function processTemplate(srcPath, destPath, context) {
 }
 handlebars.registerHelper("eq", (a, b) => a === b);
 handlebars.registerHelper("ne", (a, b) => a !== b);
-handlebars.registerHelper("and", (...args) => {
-	return args.slice(0, -1).every((value) => value);
-});
-handlebars.registerHelper("or", (...args) => {
-	return args.slice(0, -1).some((value) => value);
-});
+handlebars.registerHelper("and", (a, b) => a && b);
+handlebars.registerHelper("or", (a, b) => a || b);
 handlebars.registerHelper("includes", (array, value) => Array.isArray(array) && array.includes(value));
 
 //#endregion
@@ -2789,52 +2758,35 @@ async function setupFrontendTemplates(projectDir, context) {
 		}
 	}
 }
-async function setupApiPackage(projectDir, context) {
-	if (context.api === "none") return;
-	const apiPackageDir = path.join(projectDir, "packages/api");
-	await fs.ensureDir(apiPackageDir);
-	const apiServerDir = path.join(PKG_ROOT, `templates/api/${context.api}/server`);
-	if (await fs.pathExists(apiServerDir)) await processAndCopyFiles("**/*", apiServerDir, apiPackageDir, context);
-}
-async function setupDbPackage(projectDir, context) {
-	if (context.database === "none" || context.orm === "none") return;
-	const dbPackageDir = path.join(projectDir, "packages/db");
-	await fs.ensureDir(dbPackageDir);
-	const dbBaseDir = path.join(PKG_ROOT, "templates/db/base");
-	if (await fs.pathExists(dbBaseDir)) await processAndCopyFiles("**/*", dbBaseDir, dbPackageDir, context);
-	const dbOrmSrcDir = path.join(PKG_ROOT, `templates/db/${context.orm}/${context.database}`);
-	if (await fs.pathExists(dbOrmSrcDir)) await processAndCopyFiles("**/*", dbOrmSrcDir, dbPackageDir, context);
-}
-async function setupConvexBackend(projectDir, context) {
-	const serverAppDir = path.join(projectDir, "apps/server");
-	if (await fs.pathExists(serverAppDir)) await fs.remove(serverAppDir);
-	const convexBackendDestDir = path.join(projectDir, "packages/backend");
-	const convexSrcDir = path.join(PKG_ROOT, "templates/backend/convex/packages/backend");
-	await fs.ensureDir(convexBackendDestDir);
-	if (await fs.pathExists(convexSrcDir)) await processAndCopyFiles("**/*", convexSrcDir, convexBackendDestDir, context);
-}
-async function setupServerApp(projectDir, context) {
-	const serverAppDir = path.join(projectDir, "apps/server");
-	await fs.ensureDir(serverAppDir);
-	const serverBaseDir = path.join(PKG_ROOT, "templates/backend/server/base");
-	if (await fs.pathExists(serverBaseDir)) await processAndCopyFiles("**/*", serverBaseDir, serverAppDir, context);
-	const frameworkSrcDir = path.join(PKG_ROOT, `templates/backend/server/${context.backend}`);
-	if (await fs.pathExists(frameworkSrcDir)) await processAndCopyFiles("**/*", frameworkSrcDir, serverAppDir, context, true);
-}
 async function setupBackendFramework(projectDir, context) {
 	if (context.backend === "none") return;
+	const serverAppDir = path.join(projectDir, "apps/server");
 	if (context.backend === "convex") {
-		await setupConvexBackend(projectDir, context);
+		if (await fs.pathExists(serverAppDir)) await fs.remove(serverAppDir);
+		const convexBackendDestDir = path.join(projectDir, "packages/backend");
+		const convexSrcDir = path.join(PKG_ROOT, "templates/backend/convex/packages/backend");
+		await fs.ensureDir(convexBackendDestDir);
+		if (await fs.pathExists(convexSrcDir)) await processAndCopyFiles("**/*", convexSrcDir, convexBackendDestDir, context);
 		return;
 	}
-	if (context.backend === "self") {
-		await setupApiPackage(projectDir, context);
-		await setupDbPackage(projectDir, context);
-		return;
+	await fs.ensureDir(serverAppDir);
+	const serverBaseDir = path.join(PKG_ROOT, "templates/backend/server/server-base");
+	if (await fs.pathExists(serverBaseDir)) await processAndCopyFiles("**/*", serverBaseDir, serverAppDir, context);
+	const frameworkSrcDir = path.join(PKG_ROOT, `templates/backend/server/${context.backend}`);
+	if (await fs.pathExists(frameworkSrcDir)) await processAndCopyFiles("**/*", frameworkSrcDir, serverAppDir, context, true);
+	if (context.api !== "none") {
+		const apiServerBaseDir = path.join(PKG_ROOT, `templates/api/${context.api}/server/base`);
+		if (await fs.pathExists(apiServerBaseDir)) await processAndCopyFiles("**/*", apiServerBaseDir, serverAppDir, context, true);
+		const apiServerFrameworkDir = path.join(PKG_ROOT, `templates/api/${context.api}/server/${context.backend}`);
+		if (await fs.pathExists(apiServerFrameworkDir)) await processAndCopyFiles("**/*", apiServerFrameworkDir, serverAppDir, context, true);
 	}
-	await setupServerApp(projectDir, context);
-	await setupApiPackage(projectDir, context);
-	await setupDbPackage(projectDir, context);
+}
+async function setupDbOrmTemplates(projectDir, context) {
+	if (context.backend === "convex" || context.orm === "none" || context.database === "none") return;
+	const serverAppDir = path.join(projectDir, "apps/server");
+	await fs.ensureDir(serverAppDir);
+	const dbOrmSrcDir = path.join(PKG_ROOT, `templates/db/${context.orm}/${context.database}`);
+	if (await fs.pathExists(dbOrmSrcDir)) await processAndCopyFiles("**/*", dbOrmSrcDir, serverAppDir, context);
 }
 async function setupAuthTemplate(projectDir, context) {
 	if (!context.auth || context.auth === "none") return;
@@ -2914,21 +2866,21 @@ async function setupAuthTemplate(projectDir, context) {
 		}
 		return;
 	}
-	if ((serverAppDirExists || context.backend === "self") && context.backend !== "convex") {
-		const authPackageDir = path.join(projectDir, "packages/auth");
-		await fs.ensureDir(authPackageDir);
+	if (serverAppDirExists && context.backend !== "convex") {
 		const authServerBaseSrc = path.join(PKG_ROOT, `templates/auth/${authProvider}/server/base`);
-		if (await fs.pathExists(authServerBaseSrc)) await processAndCopyFiles("**/*", authServerBaseSrc, authPackageDir, context);
+		if (await fs.pathExists(authServerBaseSrc)) await processAndCopyFiles("**/*", authServerBaseSrc, serverAppDir, context);
+		if (context.backend === "next") {
+			const authServerNextSrc = path.join(PKG_ROOT, `templates/auth/${authProvider}/server/next`);
+			if (await fs.pathExists(authServerNextSrc)) await processAndCopyFiles("**/*", authServerNextSrc, serverAppDir, context);
+		}
 		if (context.orm !== "none" && context.database !== "none") {
-			const dbPackageDir = path.join(projectDir, "packages/db");
-			await fs.ensureDir(dbPackageDir);
 			const orm = context.orm;
 			const db = context.database;
 			let authDbSrc = "";
 			if (orm === "drizzle") authDbSrc = path.join(PKG_ROOT, `templates/auth/${authProvider}/server/db/drizzle/${db}`);
 			else if (orm === "prisma") authDbSrc = path.join(PKG_ROOT, `templates/auth/${authProvider}/server/db/prisma/${db}`);
 			else if (orm === "mongoose") authDbSrc = path.join(PKG_ROOT, `templates/auth/${authProvider}/server/db/mongoose/${db}`);
-			if (authDbSrc && await fs.pathExists(authDbSrc)) await processAndCopyFiles("**/*", authDbSrc, dbPackageDir, context);
+			if (authDbSrc && await fs.pathExists(authDbSrc)) await processAndCopyFiles("**/*", authDbSrc, serverAppDir, context);
 		}
 	}
 	if ((hasReactWeb || hasNuxtWeb || hasSvelteWeb || hasSolidWeb) && webAppDirExists) {
@@ -2974,11 +2926,9 @@ async function setupPaymentsTemplate(projectDir, context) {
 	const webAppDir = path.join(projectDir, "apps/web");
 	const serverAppDirExists = await fs.pathExists(serverAppDir);
 	const webAppDirExists = await fs.pathExists(webAppDir);
-	if ((serverAppDirExists || context.backend === "self") && context.backend !== "convex") {
-		const authPackageDir = path.join(projectDir, "packages/auth");
-		await fs.ensureDir(authPackageDir);
+	if (serverAppDirExists && context.backend !== "convex") {
 		const paymentsServerSrc = path.join(PKG_ROOT, `templates/payments/${context.payments}/server/base`);
-		if (await fs.pathExists(paymentsServerSrc)) await processAndCopyFiles("**/*", paymentsServerSrc, authPackageDir, context);
+		if (await fs.pathExists(paymentsServerSrc)) await processAndCopyFiles("**/*", paymentsServerSrc, serverAppDir, context);
 	}
 	const hasReactWeb = context.frontend.some((f) => [
 		"tanstack-router",
@@ -3054,19 +3004,17 @@ async function setupExamplesTemplate(projectDir, context) {
 	for (const example of context.examples) {
 		if (example === "none") continue;
 		const exampleBaseDir = path.join(PKG_ROOT, `templates/examples/${example}`);
-		if ((serverAppDirExists || context.backend === "self") && context.backend !== "convex" && context.backend !== "none") {
+		if (serverAppDirExists && context.backend !== "convex" && context.backend !== "none") {
 			const exampleServerSrc = path.join(exampleBaseDir, "server");
-			if (context.api !== "none") {
-				const apiPackageDir = path.join(projectDir, "packages/api");
-				await fs.ensureDir(apiPackageDir);
-				const exampleOrmBaseSrc = path.join(exampleServerSrc, context.orm, "base");
-				if (await fs.pathExists(exampleOrmBaseSrc)) await processAndCopyFiles("**/*", exampleOrmBaseSrc, apiPackageDir, context, false);
+			if (example === "ai" && context.backend === "next") {
+				const aiNextServerSrc = path.join(exampleServerSrc, "next");
+				if (await fs.pathExists(aiNextServerSrc)) await processAndCopyFiles("**/*", aiNextServerSrc, serverAppDir, context, false);
 			}
 			if (context.orm !== "none" && context.database !== "none") {
-				const dbPackageDir = path.join(projectDir, "packages/db");
-				await fs.ensureDir(dbPackageDir);
+				const exampleOrmBaseSrc = path.join(exampleServerSrc, context.orm, "base");
+				if (await fs.pathExists(exampleOrmBaseSrc)) await processAndCopyFiles("**/*", exampleOrmBaseSrc, serverAppDir, context, false);
 				const exampleDbSchemaSrc = path.join(exampleServerSrc, context.orm, context.database);
-				if (await fs.pathExists(exampleDbSchemaSrc)) await processAndCopyFiles("**/*", exampleDbSchemaSrc, dbPackageDir, context, false);
+				if (await fs.pathExists(exampleDbSchemaSrc)) await processAndCopyFiles("**/*", exampleDbSchemaSrc, serverAppDir, context, false);
 			}
 		}
 		if (webAppDirExists) {
@@ -3133,9 +3081,9 @@ async function handleExtras(projectDir, context) {
 }
 async function setupDockerComposeTemplates(projectDir, context) {
 	if (context.dbSetup !== "docker" || context.database === "none") return;
-	const dbPackageDir = path.join(projectDir, "packages/db");
+	const serverAppDir = path.join(projectDir, "apps/server");
 	const dockerSrcDir = path.join(PKG_ROOT, `templates/db-setup/docker-compose/${context.database}`);
-	if (await fs.pathExists(dockerSrcDir)) await processAndCopyFiles("**/*", dockerSrcDir, dbPackageDir, context);
+	if (await fs.pathExists(dockerSrcDir)) await processAndCopyFiles("**/*", dockerSrcDir, serverAppDir, context);
 }
 async function setupDeploymentTemplates(projectDir, context) {
 	if (context.webDeploy === "alchemy" || context.serverDeploy === "alchemy") if (context.webDeploy === "alchemy" && context.serverDeploy === "alchemy") {
@@ -3953,110 +3901,6 @@ async function addDeploymentToProject(input) {
 	}
 }
 
-//#endregion
-//#region src/utils/setup-catalogs.ts
-async function setupCatalogs(projectDir, options) {
-	if (options.packageManager === "npm") return;
-	const packagePaths = [
-		"apps/server",
-		"apps/web",
-		"packages/api",
-		"packages/db",
-		"packages/auth",
-		"packages/backend"
-	];
-	const packagesInfo = [];
-	for (const pkgPath of packagePaths) {
-		const fullPath = path.join(projectDir, pkgPath);
-		const pkgJsonPath = path.join(fullPath, "package.json");
-		if (await fs.pathExists(pkgJsonPath)) {
-			const pkgJson = await fs.readJson(pkgJsonPath);
-			packagesInfo.push({
-				path: fullPath,
-				dependencies: pkgJson.dependencies || {},
-				devDependencies: pkgJson.devDependencies || {}
-			});
-		}
-	}
-	const catalog = findDuplicateDependencies(packagesInfo, options.projectName);
-	if (Object.keys(catalog).length === 0) return;
-	if (options.packageManager === "bun") await setupBunCatalogs(projectDir, catalog);
-	else if (options.packageManager === "pnpm") await setupPnpmCatalogs(projectDir, catalog);
-	await updatePackageJsonsWithCatalogs(packagesInfo, catalog);
-}
-function findDuplicateDependencies(packagesInfo, projectName) {
-	const depCount = /* @__PURE__ */ new Map();
-	const projectScope = `@${projectName}/`;
-	for (const pkg of packagesInfo) {
-		const allDeps = {
-			...pkg.dependencies,
-			...pkg.devDependencies
-		};
-		for (const [depName, version] of Object.entries(allDeps)) {
-			if (depName.startsWith(projectScope)) continue;
-			if (version.startsWith("workspace:")) continue;
-			const existing = depCount.get(depName);
-			if (existing) existing.packages.push(pkg.path);
-			else depCount.set(depName, {
-				version,
-				packages: [pkg.path]
-			});
-		}
-	}
-	const catalog = {};
-	for (const [depName, info] of depCount.entries()) if (info.packages.length > 1) catalog[depName] = info.version;
-	return catalog;
-}
-async function setupBunCatalogs(projectDir, catalog) {
-	const rootPkgJsonPath = path.join(projectDir, "package.json");
-	const rootPkgJson = await fs.readJson(rootPkgJsonPath);
-	if (!rootPkgJson.workspaces) rootPkgJson.workspaces = {};
-	if (Array.isArray(rootPkgJson.workspaces)) rootPkgJson.workspaces = {
-		packages: rootPkgJson.workspaces,
-		catalog
-	};
-	else if (typeof rootPkgJson.workspaces === "object") {
-		if (!rootPkgJson.workspaces.catalog) rootPkgJson.workspaces.catalog = {};
-		rootPkgJson.workspaces.catalog = {
-			...rootPkgJson.workspaces.catalog,
-			...catalog
-		};
-	}
-	await fs.writeJson(rootPkgJsonPath, rootPkgJson, { spaces: 2 });
-}
-async function setupPnpmCatalogs(projectDir, catalog) {
-	const workspaceYamlPath = path.join(projectDir, "pnpm-workspace.yaml");
-	if (!await fs.pathExists(workspaceYamlPath)) return;
-	const workspaceContent = await fs.readFile(workspaceYamlPath, "utf-8");
-	const workspaceYaml = yaml.parse(workspaceContent);
-	if (!workspaceYaml.catalog) workspaceYaml.catalog = {};
-	workspaceYaml.catalog = {
-		...workspaceYaml.catalog,
-		...catalog
-	};
-	await fs.writeFile(workspaceYamlPath, yaml.stringify(workspaceYaml));
-}
-async function updatePackageJsonsWithCatalogs(packagesInfo, catalog) {
-	for (const pkg of packagesInfo) {
-		const pkgJsonPath = path.join(pkg.path, "package.json");
-		const pkgJson = await fs.readJson(pkgJsonPath);
-		let updated = false;
-		if (pkgJson.dependencies) {
-			for (const depName of Object.keys(pkgJson.dependencies)) if (catalog[depName]) {
-				pkgJson.dependencies[depName] = "catalog:";
-				updated = true;
-			}
-		}
-		if (pkgJson.devDependencies) {
-			for (const depName of Object.keys(pkgJson.devDependencies)) if (catalog[depName]) {
-				pkgJson.devDependencies[depName] = "catalog:";
-				updated = true;
-			}
-		}
-		if (updated) await fs.writeJson(pkgJsonPath, pkgJson, { spaces: 2 });
-	}
-}
-
 //#endregion
 //#region src/helpers/addons/examples-setup.ts
 async function setupExamples(config) {
@@ -4065,10 +3909,10 @@ async function setupExamples(config) {
 	if (examples.includes("ai")) {
 		const webClientDir = path.join(projectDir, "apps/web");
 		const nativeClientDir = path.join(projectDir, "apps/native");
-		const apiDir = path.join(projectDir, "packages/api");
+		const serverDir = path.join(projectDir, "apps/server");
 		const webClientDirExists = await fs.pathExists(webClientDir);
 		const nativeClientDirExists = await fs.pathExists(nativeClientDir);
-		const apiDirExists = await fs.pathExists(apiDir);
+		const serverDirExists = await fs.pathExists(serverDir);
 		const hasNuxt = frontend.includes("nuxt");
 		const hasSvelte = frontend.includes("svelte");
 		const hasReactWeb = frontend.includes("react-router") || frontend.includes("tanstack-router") || frontend.includes("next") || frontend.includes("tanstack-start");
@@ -4089,9 +3933,9 @@ async function setupExamples(config) {
 			dependencies: ["ai", "@ai-sdk/react"],
 			projectDir: nativeClientDir
 		});
-		if (apiDirExists && backend !== "none") await addPackageDependency({
+		if (serverDirExists && backend !== "none") await addPackageDependency({
 			dependencies: ["ai", "@ai-sdk/google"],
-			projectDir: apiDir
+			projectDir: serverDir
 		});
 	}
 }
@@ -4207,57 +4051,32 @@ function getConvexDependencies(frontend) {
 	return deps;
 }
 async function setupApi(config) {
-	const { api, projectName, frontend, backend, packageManager, projectDir, auth } = config;
+	const { api, projectName, frontend, backend, packageManager, projectDir } = config;
 	const isConvex = backend === "convex";
 	const webDir = path.join(projectDir, "apps/web");
 	const nativeDir = path.join(projectDir, "apps/native");
 	const serverDir = path.join(projectDir, "apps/server");
 	const webDirExists = await fs.pathExists(webDir);
 	const nativeDirExists = await fs.pathExists(nativeDir);
-	await fs.pathExists(serverDir);
+	const serverDirExists = await fs.pathExists(serverDir);
 	const frontendType = getFrontendType(frontend);
 	if (!isConvex && api !== "none") {
 		const apiDeps = getApiDependencies(api, frontendType);
-		const apiPackageDir = path.join(projectDir, "packages/api");
-		if (apiDeps.server) {
+		if (serverDirExists && apiDeps.server) {
 			await addPackageDependency({
 				dependencies: apiDeps.server.dependencies,
-				projectDir: apiPackageDir
-			});
-			const frameworkDeps = [];
-			if (backend === "hono") frameworkDeps.push("hono");
-			else if (backend === "elysia") frameworkDeps.push("elysia");
-			else if (backend === "express") frameworkDeps.push("express", "@types/express");
-			else if (backend === "fastify") frameworkDeps.push("fastify");
-			else if (backend === "self") {
-				if (frontend.includes("next")) frameworkDeps.push("next");
-			}
-			if (frameworkDeps.length > 0) await addPackageDependency({
-				dependencies: frameworkDeps,
-				projectDir: apiPackageDir
+				projectDir: serverDir
 			});
 			if (api === "trpc") {
 				if (backend === "hono") await addPackageDependency({
 					dependencies: ["@hono/trpc-server"],
-					projectDir: apiPackageDir
+					projectDir: serverDir
 				});
 				else if (backend === "elysia") await addPackageDependency({
 					dependencies: ["@elysiajs/trpc"],
-					projectDir: apiPackageDir
-				});
-				else if (backend === "express") await addPackageDependency({
-					dependencies: ["@trpc/server"],
-					projectDir: apiPackageDir
-				});
-				else if (backend === "fastify") await addPackageDependency({
-					dependencies: ["@trpc/server"],
-					projectDir: apiPackageDir
+					projectDir: serverDir
 				});
 			}
-			if (auth === "better-auth") await addPackageDependency({
-				dependencies: ["better-auth"],
-				projectDir: apiPackageDir
-			});
 		}
 		if (webDirExists && apiDeps.web) await addPackageDependency({
 			dependencies: apiDeps.web.dependencies,
@@ -4301,7 +4120,7 @@ async function setupApi(config) {
 //#endregion
 //#region src/helpers/core/backend-setup.ts
 async function setupBackendDependencies(config) {
-	const { backend, runtime, api, auth, examples, projectDir } = config;
+	const { backend, runtime, api, projectDir } = config;
 	if (backend === "convex") return;
 	const framework = backend;
 	const serverDir = path.join(projectDir, "apps/server");
@@ -4329,13 +4148,6 @@ async function setupBackendDependencies(config) {
 		dependencies.push("fastify", "@fastify/cors");
 		if (runtime === "node") devDependencies.push("tsx", "@types/node");
 	}
-	if (api === "trpc") {
-		if (framework === "express") dependencies.push("@trpc/server");
-		else if (framework === "fastify") dependencies.push("@trpc/server");
-		else if (runtime === "workers") dependencies.push("@trpc/server");
-	} else if (api === "orpc") dependencies.push("@orpc/server", "@orpc/openapi", "@orpc/zod");
-	if (auth === "better-auth") dependencies.push("better-auth");
-	if (examples.includes("ai")) dependencies.push("ai", "@ai-sdk/google");
 	if (runtime === "bun") devDependencies.push("@types/bun");
 	if (dependencies.length > 0 || devDependencies.length > 0) await addPackageDependency({
 		dependencies,
@@ -4354,7 +4166,7 @@ async function setupAuth(config) {
 	const nativeDir = path.join(projectDir, "apps/native");
 	const clientDirExists = await fs.pathExists(clientDir);
 	const nativeDirExists = await fs.pathExists(nativeDir);
-	await fs.pathExists(serverDir);
+	const serverDirExists = await fs.pathExists(serverDir);
 	try {
 		if (backend === "convex") {
 			if (auth === "clerk" && clientDirExists) {
@@ -4410,11 +4222,9 @@ async function setupAuth(config) {
 			});
 			return;
 		}
-		const authPackageDir = path.join(projectDir, "packages/auth");
-		const authPackageDirExists = await fs.pathExists(authPackageDir);
-		if (authPackageDirExists && auth === "better-auth") await addPackageDependency({
+		if (serverDirExists && auth === "better-auth") await addPackageDependency({
 			dependencies: ["better-auth"],
-			projectDir: authPackageDir
+			projectDir: serverDir
 		});
 		if (frontend.some((f) => [
 			"react-router",
@@ -4436,9 +4246,9 @@ async function setupAuth(config) {
 					dependencies: ["better-auth", "@better-auth/expo"],
 					projectDir: nativeDir
 				});
-				if (authPackageDirExists) await addPackageDependency({
+				if (serverDirExists) await addPackageDependency({
 					dependencies: ["@better-auth/expo"],
-					projectDir: authPackageDir
+					projectDir: serverDir
 				});
 			}
 		}
@@ -4621,6 +4431,8 @@ async function setupEnvironmentVariables(config) {
 		return;
 	}
 	const serverDir = path.join(projectDir, "apps/server");
+	if (!await fs.pathExists(serverDir)) return;
+	const envPath = path.join(serverDir, ".env");
 	let corsOrigin = "http://localhost:3001";
 	if (hasReactRouter || hasSvelte) corsOrigin = "http://localhost:5173";
 	let databaseUrl = null;
@@ -4636,50 +4448,47 @@ async function setupEnvironmentVariables(config) {
 			break;
 		case "sqlite":
 			if (config.runtime === "workers") databaseUrl = "http://127.0.0.1:8080";
-			else databaseUrl = `file:${path.join(config.projectDir, "apps/server", "local.db")}`;
+			else databaseUrl = "file:./local.db";
 			break;
 	}
-	if (await fs.pathExists(serverDir)) {
-		const serverEnvPath = path.join(serverDir, ".env");
-		const serverVars = [
-			{
-				key: "BETTER_AUTH_SECRET",
-				value: generateAuthSecret(),
-				condition: !!auth
-			},
-			{
-				key: "BETTER_AUTH_URL",
-				value: "http://localhost:3000",
-				condition: !!auth
-			},
-			{
-				key: "POLAR_ACCESS_TOKEN",
-				value: "",
-				condition: config.payments === "polar"
-			},
-			{
-				key: "POLAR_SUCCESS_URL",
-				value: `${corsOrigin}/success?checkout_id={CHECKOUT_ID}`,
-				condition: config.payments === "polar"
-			},
-			{
-				key: "CORS_ORIGIN",
-				value: corsOrigin,
-				condition: true
-			},
-			{
-				key: "GOOGLE_GENERATIVE_AI_API_KEY",
-				value: "",
-				condition: examples?.includes("ai") || false
-			},
-			{
-				key: "DATABASE_URL",
-				value: databaseUrl,
-				condition: database !== "none" && dbSetup === "none"
-			}
-		];
-		await addEnvVariablesToFile(serverEnvPath, serverVars);
-	}
+	const serverVars = [
+		{
+			key: "CORS_ORIGIN",
+			value: corsOrigin,
+			condition: true
+		},
+		{
+			key: "BETTER_AUTH_SECRET",
+			value: generateAuthSecret(),
+			condition: !!auth
+		},
+		{
+			key: "BETTER_AUTH_URL",
+			value: "http://localhost:3000",
+			condition: !!auth
+		},
+		{
+			key: "DATABASE_URL",
+			value: databaseUrl,
+			condition: database !== "none" && dbSetup === "none"
+		},
+		{
+			key: "GOOGLE_GENERATIVE_AI_API_KEY",
+			value: "",
+			condition: examples?.includes("ai") || false
+		},
+		{
+			key: "POLAR_ACCESS_TOKEN",
+			value: "",
+			condition: config.payments === "polar"
+		},
+		{
+			key: "POLAR_SUCCESS_URL",
+			value: `${corsOrigin}/success?checkout_id={CHECKOUT_ID}`,
+			condition: config.payments === "polar"
+		}
+	];
+	await addEnvVariablesToFile(envPath, serverVars);
 	const isUnifiedAlchemy = webDeploy === "alchemy" && serverDeploy === "alchemy";
 	const isIndividualAlchemy = webDeploy === "alchemy" || serverDeploy === "alchemy";
 	if (isUnifiedAlchemy) {
@@ -4698,11 +4507,14 @@ async function setupEnvironmentVariables(config) {
 				condition: true
 			}]);
 		}
-		if (serverDeploy === "alchemy") await addEnvVariablesToFile(path.join(serverDir, ".env"), [{
-			key: "ALCHEMY_PASSWORD",
-			value: "please-change-this",
-			condition: true
-		}]);
+		if (serverDeploy === "alchemy") {
+			const serverDir$1 = path.join(projectDir, "apps/server");
+			if (await fs.pathExists(serverDir$1)) await addEnvVariablesToFile(path.join(serverDir$1, ".env"), [{
+				key: "ALCHEMY_PASSWORD",
+				value: "please-change-this",
+				condition: true
+			}]);
+		}
 	}
 }
 
@@ -4737,7 +4549,7 @@ async function setupCloudflareD1(config) {
 		const envPath = path.join(projectDir, "apps/server", ".env");
 		const variables = [{
 			key: "DATABASE_URL",
-			value: `file:${path.join(projectDir, "apps/server", "local.db")}`,
+			value: "file:./local.db",
 			condition: true
 		}];
 		try {
@@ -4794,14 +4606,13 @@ async function commandExists(command) {
 //#endregion
 //#region src/helpers/database-providers/mongodb-atlas-setup.ts
 async function checkAtlasCLI() {
-	const s = spinner();
-	s.start("Checking for MongoDB Atlas CLI...");
 	try {
 		const exists = await commandExists("atlas");
-		s.stop(exists ? "MongoDB Atlas CLI found" : pc.yellow("MongoDB Atlas CLI not found"));
+		if (exists) log.info("MongoDB Atlas CLI found");
+		else log.warn(pc.yellow("MongoDB Atlas CLI not found"));
 		return exists;
 	} catch (_error) {
-		s.stop(pc.red("Error checking MongoDB Atlas CLI"));
+		log.error(pc.red("Error checking MongoDB Atlas CLI"));
 		return false;
 	}
 }
@@ -4812,12 +4623,13 @@ async function initMongoDBAtlas(serverDir) {
 			log.info(pc.yellow("Please install it from: https://www.mongodb.com/docs/atlas/cli/current/install-atlas-cli/"));
 			return null;
 		}
-		log.info(pc.blue("Running MongoDB Atlas setup..."));
+		log.info("Running MongoDB Atlas setup...");
 		await execa("atlas", ["deployments", "setup"], {
 			cwd: serverDir,
+			shell: true,
 			stdio: "inherit"
 		});
-		log.info(pc.green("MongoDB Atlas deployment ready"));
+		log.success("MongoDB Atlas deployment ready");
 		const connectionString = await text({
 			message: "Enter your MongoDB connection string:",
 			placeholder: "mongodb+srv://username:password@cluster.mongodb.net/database",
@@ -4869,13 +4681,11 @@ ${pc.green("MongoDB Atlas Manual Setup Instructions:")}
 async function setupMongoDBAtlas(config, cliInput) {
 	const { projectDir } = config;
 	const manualDb = cliInput?.manualDb ?? false;
-	const mainSpinner = spinner();
-	mainSpinner.start("Setting up MongoDB Atlas...");
 	const serverDir = path.join(projectDir, "apps/server");
 	try {
 		await fs.ensureDir(serverDir);
 		if (manualDb) {
-			mainSpinner.stop("MongoDB Atlas manual setup selected");
+			log.info("MongoDB Atlas manual setup selected");
 			await writeEnvFile$3(projectDir);
 			displayManualSetupInstructions$3();
 			return;
@@ -4895,15 +4705,14 @@ async function setupMongoDBAtlas(config, cliInput) {
 		});
 		if (isCancel(mode)) return exitCancelled("Operation cancelled");
 		if (mode === "manual") {
-			mainSpinner.stop("MongoDB Atlas manual setup selected");
+			log.info("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) {
-			await writeEnvFile$3(projectDir, config$1);
+		const atlasConfig = await initMongoDBAtlas(serverDir);
+		if (atlasConfig) {
+			await writeEnvFile$3(projectDir, atlasConfig);
 			log.success(pc.green("MongoDB Atlas setup complete! Connection saved to .env file."));
 		} else {
 			log.warn(pc.yellow("Falling back to local MongoDB configuration"));
@@ -4911,7 +4720,6 @@ async function setupMongoDBAtlas(config, cliInput) {
 			displayManualSetupInstructions$3();
 		}
 	} catch (error) {
-		mainSpinner.stop(pc.red("MongoDB Atlas setup failed"));
 		consola.error(pc.red(`Error during MongoDB Atlas setup: ${error instanceof Error ? error.message : String(error)}`));
 		try {
 			await writeEnvFile$3(projectDir);
@@ -5267,9 +5075,9 @@ async function writeEnvFile$1(projectDir, config) {
 }
 async function addDotenvImportToPrismaConfig(projectDir) {
 	try {
-		const prismaConfigPath = path.join(projectDir, "packages/db/prisma.config.ts");
+		const prismaConfigPath = path.join(projectDir, "apps/server/prisma.config.ts");
 		let content = await fs.readFile(prismaConfigPath, "utf8");
-		content = `import dotenv from "dotenv";\ndotenv.config({ path: "../../apps/server/.env" });\n${content}`;
+		content = `import "dotenv/config";\n${content}`;
 		await fs.writeFile(prismaConfigPath, content);
 	} catch (_error) {
 		consola$1.error("Failed to update prisma.config.ts");
@@ -5285,12 +5093,11 @@ function displayManualSetupInstructions$1() {
 
 DATABASE_URL="your_database_url"`);
 }
-async function addPrismaAccelerateExtension(projectDir) {
+async function addPrismaAccelerateExtension(serverDir) {
 	try {
-		const dbPackageDir = path.join(projectDir, "packages/db");
 		await addPackageDependency({
 			dependencies: ["@prisma/extension-accelerate"],
-			projectDir: dbPackageDir
+			projectDir: serverDir
 		});
 		return true;
 	} catch (_error) {
@@ -5351,7 +5158,7 @@ async function setupPrismaPostgres(config, cliInput) {
 			await writeEnvFile$1(projectDir, prismaConfig);
 			if (orm === "prisma") {
 				await addDotenvImportToPrismaConfig(projectDir);
-				await addPrismaAccelerateExtension(projectDir);
+				await addPrismaAccelerateExtension(serverDir);
 			}
 			const connectionType = orm === "drizzle" ? "direct connection" : "Prisma Accelerate";
 			log.success(pc.green(`Prisma Postgres database configured successfully with ${connectionType}!`));
@@ -5451,18 +5258,18 @@ function displayManualSupabaseInstructions(output) {
 	log.info(`"Manual Supabase Setup Instructions:"
 1. Ensure Docker is installed and running.
 2. Install the Supabase CLI (e.g., \`npm install -g supabase\`).
-3. Run \`supabase init\` in your project's \`packages/db\` directory.
-4. Run \`supabase start\` in your project's \`packages/db\` directory.
+3. Run \`supabase init\` in your project's \`apps/server\` directory.
+4. Run \`supabase start\` in your project's \`apps/server\` directory.
 5. Copy the 'DB URL' from the output.${output ? `
 ${pc.bold("Relevant output from `supabase start`:")}
 ${pc.dim(output)}` : ""}
-6. Add the DB URL to the .env file in \`packages/db/.env\` as \`DATABASE_URL\`:
+6. Add the DB URL to the .env file in \`apps/server/.env\` as \`DATABASE_URL\`:
 			${pc.gray("DATABASE_URL=\"your_supabase_db_url\"")}`);
 }
 async function setupSupabase(config, cliInput) {
 	const { projectDir, packageManager } = config;
 	const manualDb = cliInput?.manualDb ?? false;
-	const serverDir = path.join(projectDir, "packages", "db");
+	const serverDir = path.join(projectDir, "apps", "server");
 	try {
 		await fs.ensureDir(serverDir);
 		if (manualDb) {
@@ -5745,15 +5552,15 @@ async function setupDatabase(config, cliInput) {
 	const { database, orm, dbSetup, backend, projectDir } = config;
 	if (backend === "convex" || database === "none") {
 		if (backend !== "convex") {
-			const serverDir = path.join(projectDir, "apps/server");
-			const serverDbDir = path.join(serverDir, "src/db");
+			const serverDir$1 = path.join(projectDir, "apps/server");
+			const serverDbDir = path.join(serverDir$1, "src/db");
 			if (await fs.pathExists(serverDbDir)) await fs.remove(serverDbDir);
 		}
 		return;
 	}
 	const s = spinner();
-	const dbPackageDir = path.join(projectDir, "packages/db");
-	if (!await fs.pathExists(dbPackageDir)) return;
+	const serverDir = path.join(projectDir, "apps/server");
+	if (!await fs.pathExists(serverDir)) return;
 	try {
 		if (orm === "prisma") if (database === "mysql" && dbSetup === "planetscale") await addPackageDependency({
 			dependencies: [
@@ -5762,27 +5569,23 @@ async function setupDatabase(config, cliInput) {
 				"@planetscale/database"
 			],
 			devDependencies: ["prisma"],
-			projectDir: dbPackageDir
+			projectDir: serverDir
 		});
 		else if (database === "sqlite" && dbSetup === "turso") await addPackageDependency({
 			dependencies: ["@prisma/client", "@prisma/adapter-libsql"],
 			devDependencies: ["prisma"],
-			projectDir: dbPackageDir
+			projectDir: serverDir
 		});
 		else await addPackageDependency({
 			dependencies: ["@prisma/client"],
 			devDependencies: ["prisma"],
-			projectDir: dbPackageDir
+			projectDir: serverDir
 		});
 		else if (orm === "drizzle") {
 			if (database === "sqlite") await addPackageDependency({
-				dependencies: [
-					"drizzle-orm",
-					"@libsql/client",
-					"libsql"
-				],
+				dependencies: ["drizzle-orm", "@libsql/client"],
 				devDependencies: ["drizzle-kit"],
-				projectDir: dbPackageDir
+				projectDir: serverDir
 			});
 			else if (database === "postgres") if (dbSetup === "neon") await addPackageDependency({
 				dependencies: [
@@ -5791,32 +5594,32 @@ async function setupDatabase(config, cliInput) {
 					"ws"
 				],
 				devDependencies: ["drizzle-kit", "@types/ws"],
-				projectDir: dbPackageDir
+				projectDir: serverDir
 			});
 			else if (dbSetup === "planetscale") await addPackageDependency({
 				dependencies: ["drizzle-orm", "pg"],
 				devDependencies: ["drizzle-kit", "@types/pg"],
-				projectDir: dbPackageDir
+				projectDir: serverDir
 			});
 			else await addPackageDependency({
 				dependencies: ["drizzle-orm", "pg"],
 				devDependencies: ["drizzle-kit", "@types/pg"],
-				projectDir: dbPackageDir
+				projectDir: serverDir
 			});
 			else if (database === "mysql") if (dbSetup === "planetscale") await addPackageDependency({
 				dependencies: ["drizzle-orm", "@planetscale/database"],
 				devDependencies: ["drizzle-kit"],
-				projectDir: dbPackageDir
+				projectDir: serverDir
 			});
 			else await addPackageDependency({
 				dependencies: ["drizzle-orm", "mysql2"],
 				devDependencies: ["drizzle-kit"],
-				projectDir: dbPackageDir
+				projectDir: serverDir
 			});
 		} else if (orm === "mongoose") await addPackageDependency({
 			dependencies: ["mongoose"],
 			devDependencies: [],
-			projectDir: dbPackageDir
+			projectDir: serverDir
 		});
 		if (dbSetup === "docker") await setupDockerCompose(config);
 		else if (database === "sqlite" && dbSetup === "turso") await setupTurso(config, cliInput);
@@ -5839,7 +5642,7 @@ async function setupDatabase(config, cliInput) {
 //#region src/helpers/core/runtime-setup.ts
 async function setupRuntime(config) {
 	const { runtime, backend, projectDir } = config;
-	if (backend === "convex" || backend === "self" || runtime === "none") return;
+	if (backend === "convex" || backend === "next" || runtime === "none") return;
 	const serverDir = path.join(projectDir, "apps/server");
 	if (!await fs.pathExists(serverDir)) return;
 	if (runtime === "bun") await setupBunRuntime(serverDir, backend);
@@ -6359,7 +6162,7 @@ async function displayPostInstallInstructions(config) {
 	else if (!hasNative && !addons?.includes("starlight")) output += `${pc.yellow("NOTE:")} You are creating a backend-only app\n   (no frontend selected)\n`;
 	if (!isConvex) {
 		output += `${pc.cyan("•")} Backend API: http://localhost:3000\n`;
-		if (api === "orpc") if (backend === "self") output += `${pc.cyan("•")} OpenAPI (Scalar UI): http://localhost:3000/rpc/api\n`;
+		if (api === "orpc") if (backend === "next") output += `${pc.cyan("•")} OpenAPI (Scalar UI): http://localhost:3000/rpc/api\n`;
 		else output += `${pc.cyan("•")} OpenAPI (Scalar UI): http://localhost:3000/api\n`;
 	}
 	if (addons?.includes("starlight")) output += `${pc.cyan("•")} Docs: http://localhost:4321\n`;
@@ -6473,78 +6276,12 @@ function getAlchemyDeployInstructions(runCmd, webDeploy, serverDeploy) {
 	return instructions.length ? `\n${instructions.join("\n")}` : "";
 }
 
-//#endregion
-//#region src/helpers/core/workspace-setup.ts
-async function setupWorkspaceDependencies(projectDir, options) {
-	const projectName = options.projectName;
-	const workspaceVersion = options.packageManager === "npm" ? "*" : "workspace:*";
-	const commonDeps = ["dotenv", "zod"];
-	const commonDevDeps = ["tsdown"];
-	const dbPackageDir = path.join(projectDir, "packages/db");
-	if (await fs.pathExists(dbPackageDir)) await addPackageDependency({
-		dependencies: commonDeps,
-		devDependencies: commonDevDeps,
-		projectDir: dbPackageDir
-	});
-	const authPackageDir = path.join(projectDir, "packages/auth");
-	if (await fs.pathExists(authPackageDir)) await addPackageDependency({
-		dependencies: commonDeps,
-		devDependencies: commonDevDeps,
-		customDependencies: { [`@${projectName}/db`]: workspaceVersion },
-		projectDir: authPackageDir
-	});
-	const apiPackageDir = path.join(projectDir, "packages/api");
-	if (await fs.pathExists(apiPackageDir)) await addPackageDependency({
-		dependencies: commonDeps,
-		devDependencies: commonDevDeps,
-		customDependencies: {
-			[`@${projectName}/auth`]: workspaceVersion,
-			[`@${projectName}/db`]: workspaceVersion
-		},
-		projectDir: apiPackageDir
-	});
-	const serverPackageDir = path.join(projectDir, "apps/server");
-	if (await fs.pathExists(serverPackageDir)) await addPackageDependency({
-		dependencies: commonDeps,
-		devDependencies: commonDevDeps,
-		customDependencies: {
-			[`@${projectName}/api`]: workspaceVersion,
-			[`@${projectName}/auth`]: workspaceVersion,
-			[`@${projectName}/db`]: workspaceVersion
-		},
-		projectDir: serverPackageDir
-	});
-	const needsApiDependency = options.api && options.api !== "none";
-	const webPackageDir = path.join(projectDir, "apps/web");
-	if (await fs.pathExists(webPackageDir)) {
-		const webDeps = {};
-		if (options.backend === "self") {
-			webDeps[`@${projectName}/api`] = workspaceVersion;
-			webDeps[`@${projectName}/auth`] = workspaceVersion;
-			webDeps[`@${projectName}/db`] = workspaceVersion;
-		} else if (needsApiDependency) webDeps[`@${projectName}/api`] = workspaceVersion;
-		if (Object.keys(webDeps).length > 0) await addPackageDependency({
-			customDependencies: webDeps,
-			projectDir: webPackageDir
-		});
-	}
-}
-
 //#endregion
 //#region src/helpers/core/project-config.ts
 async function updatePackageConfigurations(projectDir, options) {
 	await updateRootPackageJson(projectDir, options);
-	if (options.backend === "convex") await updateConvexPackageJson(projectDir, options);
-	else if (options.backend === "self") {
-		await updateAuthPackageJson(projectDir, options);
-		await updateApiPackageJson(projectDir, options);
-		await setupWorkspaceDependencies(projectDir, options);
-	} else if (options.backend !== "none") {
-		await updateServerPackageJson(projectDir, options);
-		await updateAuthPackageJson(projectDir, options);
-		await updateApiPackageJson(projectDir, options);
-		await setupWorkspaceDependencies(projectDir, options);
-	}
+	if (options.backend !== "convex") await updateServerPackageJson(projectDir, options);
+	else await updateConvexPackageJson(projectDir, options);
 }
 async function updateRootPackageJson(projectDir, options) {
 	const rootPackageJsonPath = path.join(projectDir, "package.json");
@@ -6554,7 +6291,6 @@ async function updateRootPackageJson(projectDir, options) {
 	if (!packageJson.scripts) packageJson.scripts = {};
 	const scripts = packageJson.scripts;
 	const backendPackageName = options.backend === "convex" ? `@${options.projectName}/backend` : "server";
-	const dbPackageName = `@${options.projectName}/db`;
 	let serverDevScript = "";
 	if (options.addons.includes("turborepo")) serverDevScript = `turbo -F ${backendPackageName} dev`;
 	else if (options.packageManager === "bun") serverDevScript = `bun run --filter ${backendPackageName} dev`;
@@ -6571,17 +6307,17 @@ async function updateRootPackageJson(projectDir, options) {
 		scripts["check-types"] = "turbo check-types";
 		scripts["dev:native"] = "turbo -F native dev";
 		scripts["dev:web"] = "turbo -F web dev";
-		if (options.backend !== "self" && options.backend !== "none") scripts["dev:server"] = serverDevScript;
+		scripts["dev:server"] = serverDevScript;
 		if (options.backend === "convex") scripts["dev:setup"] = `turbo -F ${backendPackageName} dev:setup`;
 		if (needsDbScripts) {
-			scripts["db:push"] = `turbo -F ${dbPackageName} db:push`;
-			if (!(options.dbSetup === "d1" && options.serverDeploy === "alchemy")) scripts["db:studio"] = `turbo -F ${dbPackageName} db:studio`;
+			scripts["db:push"] = `turbo -F ${backendPackageName} db:push`;
+			if (!(options.dbSetup === "d1" && options.serverDeploy === "alchemy")) scripts["db:studio"] = `turbo -F ${backendPackageName} db:studio`;
 			if (options.orm === "prisma") {
-				scripts["db:generate"] = `turbo -F ${dbPackageName} db:generate`;
-				scripts["db:migrate"] = `turbo -F ${dbPackageName} db:migrate`;
+				scripts["db:generate"] = `turbo -F ${backendPackageName} db:generate`;
+				scripts["db:migrate"] = `turbo -F ${backendPackageName} db:migrate`;
 			} else if (options.orm === "drizzle") {
-				scripts["db:generate"] = `turbo -F ${dbPackageName} db:generate`;
-				if (!(options.dbSetup === "d1" && options.serverDeploy === "alchemy")) scripts["db:migrate"] = `turbo -F ${dbPackageName} db:migrate`;
+				scripts["db:generate"] = `turbo -F ${backendPackageName} db:generate`;
+				if (!(options.dbSetup === "d1" && options.serverDeploy === "alchemy")) scripts["db:migrate"] = `turbo -F ${backendPackageName} db:migrate`;
 			}
 		}
 		if (options.dbSetup === "docker") {
@@ -6596,17 +6332,17 @@ async function updateRootPackageJson(projectDir, options) {
 		scripts["check-types"] = "pnpm -r check-types";
 		scripts["dev:native"] = "pnpm --filter native dev";
 		scripts["dev:web"] = "pnpm --filter web dev";
-		if (options.backend !== "self" && options.backend !== "none") scripts["dev:server"] = serverDevScript;
+		scripts["dev:server"] = serverDevScript;
 		if (options.backend === "convex") scripts["dev:setup"] = `pnpm --filter ${backendPackageName} dev:setup`;
 		if (needsDbScripts) {
-			scripts["db:push"] = `pnpm --filter ${dbPackageName} db:push`;
-			if (!(options.dbSetup === "d1" && options.serverDeploy === "alchemy")) scripts["db:studio"] = `pnpm --filter ${dbPackageName} db:studio`;
+			scripts["db:push"] = `pnpm --filter ${backendPackageName} db:push`;
+			if (!(options.dbSetup === "d1" && options.serverDeploy === "alchemy")) scripts["db:studio"] = `pnpm --filter ${backendPackageName} db:studio`;
 			if (options.orm === "prisma") {
-				scripts["db:generate"] = `pnpm --filter ${dbPackageName} db:generate`;
-				scripts["db:migrate"] = `pnpm --filter ${dbPackageName} db:migrate`;
+				scripts["db:generate"] = `pnpm --filter ${backendPackageName} db:generate`;
+				scripts["db:migrate"] = `pnpm --filter ${backendPackageName} db:migrate`;
 			} else if (options.orm === "drizzle") {
-				scripts["db:generate"] = `pnpm --filter ${dbPackageName} db:generate`;
-				if (!(options.dbSetup === "d1" && options.serverDeploy === "alchemy")) scripts["db:migrate"] = `pnpm --filter ${dbPackageName} db:migrate`;
+				scripts["db:generate"] = `pnpm --filter ${backendPackageName} db:generate`;
+				if (!(options.dbSetup === "d1" && options.serverDeploy === "alchemy")) scripts["db:migrate"] = `pnpm --filter ${backendPackageName} db:migrate`;
 			}
 		}
 		if (options.dbSetup === "docker") {
@@ -6621,17 +6357,17 @@ async function updateRootPackageJson(projectDir, options) {
 		scripts["check-types"] = "npm run check-types --workspaces";
 		scripts["dev:native"] = "npm run dev --workspace native";
 		scripts["dev:web"] = "npm run dev --workspace web";
-		if (options.backend !== "self" && options.backend !== "none") scripts["dev:server"] = serverDevScript;
+		scripts["dev:server"] = serverDevScript;
 		if (options.backend === "convex") scripts["dev:setup"] = `npm run dev:setup --workspace ${backendPackageName}`;
 		if (needsDbScripts) {
-			scripts["db:push"] = `npm run db:push --workspace ${dbPackageName}`;
-			if (!(options.dbSetup === "d1" && options.serverDeploy === "alchemy")) scripts["db:studio"] = `npm run db:studio --workspace ${dbPackageName}`;
+			scripts["db:push"] = `npm run db:push --workspace ${backendPackageName}`;
+			if (!(options.dbSetup === "d1" && options.serverDeploy === "alchemy")) scripts["db:studio"] = `npm run db:studio --workspace ${backendPackageName}`;
 			if (options.orm === "prisma") {
-				scripts["db:generate"] = `npm run db:generate --workspace ${dbPackageName}`;
-				scripts["db:migrate"] = `npm run db:migrate --workspace ${dbPackageName}`;
+				scripts["db:generate"] = `npm run db:generate --workspace ${backendPackageName}`;
+				scripts["db:migrate"] = `npm run db:migrate --workspace ${backendPackageName}`;
 			} else if (options.orm === "drizzle") {
-				scripts["db:generate"] = `npm run db:generate --workspace ${dbPackageName}`;
-				if (!(options.dbSetup === "d1" && options.serverDeploy === "alchemy")) scripts["db:migrate"] = `npm run db:migrate --workspace ${dbPackageName}`;
+				scripts["db:generate"] = `npm run db:generate --workspace ${backendPackageName}`;
+				if (!(options.dbSetup === "d1" && options.serverDeploy === "alchemy")) scripts["db:migrate"] = `npm run db:migrate --workspace ${backendPackageName}`;
 			}
 		}
 		if (options.dbSetup === "docker") {
@@ -6646,17 +6382,17 @@ async function updateRootPackageJson(projectDir, options) {
 		scripts["check-types"] = "bun run --filter '*' check-types";
 		scripts["dev:native"] = "bun run --filter native dev";
 		scripts["dev:web"] = "bun run --filter web dev";
-		if (options.backend !== "self" && options.backend !== "none") scripts["dev:server"] = serverDevScript;
+		scripts["dev:server"] = serverDevScript;
 		if (options.backend === "convex") scripts["dev:setup"] = `bun run --filter ${backendPackageName} dev:setup`;
 		if (needsDbScripts) {
-			scripts["db:push"] = `bun run --filter ${dbPackageName} db:push`;
-			if (!(options.dbSetup === "d1" && options.serverDeploy === "alchemy")) scripts["db:studio"] = `bun run --filter ${dbPackageName} db:studio`;
+			scripts["db:push"] = `bun run --filter ${backendPackageName} db:push`;
+			if (!(options.dbSetup === "d1" && options.serverDeploy === "alchemy")) scripts["db:studio"] = `bun run --filter ${backendPackageName} db:studio`;
 			if (options.orm === "prisma") {
-				scripts["db:generate"] = `bun run --filter ${dbPackageName} db:generate`;
-				scripts["db:migrate"] = `bun run --filter ${dbPackageName} db:migrate`;
+				scripts["db:generate"] = `bun run --filter ${backendPackageName} db:generate`;
+				scripts["db:migrate"] = `bun run --filter ${backendPackageName} db:migrate`;
 			} else if (options.orm === "drizzle") {
-				scripts["db:generate"] = `bun run --filter ${dbPackageName} db:generate`;
-				if (!(options.dbSetup === "d1" && options.serverDeploy === "alchemy")) scripts["db:migrate"] = `bun run --filter ${dbPackageName} db:migrate`;
+				scripts["db:generate"] = `bun run --filter ${backendPackageName} db:generate`;
+				if (!(options.dbSetup === "d1" && options.serverDeploy === "alchemy")) scripts["db:migrate"] = `bun run --filter ${backendPackageName} db:migrate`;
 			}
 		}
 		if (options.dbSetup === "docker") {
@@ -6689,22 +6425,6 @@ async function updateServerPackageJson(projectDir, options) {
 	const serverPackageJson = await fs.readJson(serverPackageJsonPath);
 	if (!serverPackageJson.scripts) serverPackageJson.scripts = {};
 	const scripts = serverPackageJson.scripts;
-	if (options.dbSetup === "docker") {
-		scripts["db:start"] = "docker compose up -d";
-		scripts["db:watch"] = "docker compose up";
-		scripts["db:stop"] = "docker compose stop";
-		scripts["db:down"] = "docker compose down";
-	}
-	await fs.writeJson(serverPackageJsonPath, serverPackageJson, { spaces: 2 });
-	await updateDbPackageJson(projectDir, options);
-}
-async function updateDbPackageJson(projectDir, options) {
-	const dbPackageJsonPath = path.join(projectDir, "packages/db/package.json");
-	if (!await fs.pathExists(dbPackageJsonPath)) return;
-	const dbPackageJson = await fs.readJson(dbPackageJsonPath);
-	dbPackageJson.name = `@${options.projectName}/db`;
-	if (!dbPackageJson.scripts) dbPackageJson.scripts = {};
-	const scripts = dbPackageJson.scripts;
 	if (options.database !== "none") {
 		if (options.database === "sqlite" && options.orm === "drizzle" && options.dbSetup !== "d1") scripts["db:local"] = "turso dev --db-file local.db";
 		if (options.orm === "prisma") {
@@ -6719,21 +6439,13 @@ async function updateDbPackageJson(projectDir, options) {
 			if (!(options.dbSetup === "d1" && options.serverDeploy === "alchemy")) scripts["db:migrate"] = "drizzle-kit migrate";
 		}
 	}
-	await fs.writeJson(dbPackageJsonPath, dbPackageJson, { spaces: 2 });
-}
-async function updateAuthPackageJson(projectDir, options) {
-	const authPackageJsonPath = path.join(projectDir, "packages/auth/package.json");
-	if (!await fs.pathExists(authPackageJsonPath)) return;
-	const authPackageJson = await fs.readJson(authPackageJsonPath);
-	authPackageJson.name = `@${options.projectName}/auth`;
-	await fs.writeJson(authPackageJsonPath, authPackageJson, { spaces: 2 });
-}
-async function updateApiPackageJson(projectDir, options) {
-	const apiPackageJsonPath = path.join(projectDir, "packages/api/package.json");
-	if (!await fs.pathExists(apiPackageJsonPath)) return;
-	const apiPackageJson = await fs.readJson(apiPackageJsonPath);
-	apiPackageJson.name = `@${options.projectName}/api`;
-	await fs.writeJson(apiPackageJsonPath, apiPackageJson, { spaces: 2 });
+	if (options.dbSetup === "docker") {
+		scripts["db:start"] = "docker compose up -d";
+		scripts["db:watch"] = "docker compose up";
+		scripts["db:stop"] = "docker compose stop";
+		scripts["db:down"] = "docker compose down";
+	}
+	await fs.writeJson(serverPackageJsonPath, serverPackageJson, { spaces: 2 });
 }
 async function updateConvexPackageJson(projectDir, options) {
 	const convexPackageJsonPath = path.join(projectDir, "packages/backend/package.json");
@@ -6749,14 +6461,15 @@ async function updateConvexPackageJson(projectDir, options) {
 async function createProject(options, cliInput) {
 	const projectDir = options.projectDir;
 	const isConvex = options.backend === "convex";
-	const isSelfBackend = options.backend === "self";
-	const needsServerSetup = !isConvex && !isSelfBackend;
 	try {
 		await fs.ensureDir(projectDir);
 		await copyBaseTemplate(projectDir, options);
 		await setupFrontendTemplates(projectDir, options);
 		await setupBackendFramework(projectDir, options);
-		if (needsServerSetup) await setupDockerComposeTemplates(projectDir, options);
+		if (!isConvex) {
+			await setupDbOrmTemplates(projectDir, options);
+			await setupDockerComposeTemplates(projectDir, options);
+		}
 		await setupAuthTemplate(projectDir, options);
 		if (options.payments && options.payments !== "none") await setupPaymentsTemplate(projectDir, options);
 		if (options.examples.length > 0 && options.examples[0] !== "none") await setupExamplesTemplate(projectDir, options);
@@ -6764,11 +6477,9 @@ async function createProject(options, cliInput) {
 		await setupDeploymentTemplates(projectDir, options);
 		await setupApi(options);
 		if (!isConvex) {
-			if (needsServerSetup) {
-				await setupBackendDependencies(options);
-				await setupRuntime(options);
-			}
+			await setupBackendDependencies(options);
 			await setupDatabase(options, cliInput);
+			await setupRuntime(options);
 			if (options.examples.length > 0 && options.examples[0] !== "none") await setupExamples(options);
 		}
 		if (options.addons.length > 0 && options.addons[0] !== "none") await setupAddons(options);
@@ -6777,7 +6488,6 @@ async function createProject(options, cliInput) {
 		await handleExtras(projectDir, options);
 		await setupEnvironmentVariables(options);
 		await updatePackageConfigurations(projectDir, options);
-		await setupCatalogs(projectDir, options);
 		await setupWebDeploy(options);
 		await setupServerDeploy(options);
 		await createReadme(projectDir, options);