create-better-t-stack 2.50.1-canary.7ebd503f → 2.50.1-canary.9643d88e

package/dist/cli.js

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

package/dist/{src-DG05Vcnx.js → src-B0pvu6Z-.js}

@@ -347,21 +347,17 @@ 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"
-];
+const FULLSTACK_FRONTENDS$1 = ["next"];
 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 { web, native } = splitFrontends(frontends);
+		if (!(web.length === 1 && FULLSTACK_FRONTENDS$1.includes(web[0]))) exitWithError("Backend 'self' (fullstack) currently only supports Next.js frontend. Please use --frontend next. Support for Nuxt, SvelteKit, and TanStack Start will be added in a future update.");
+		if (native.length > 1) exitWithError("Cannot select multiple native frameworks. Choose only one of: native-nativewind, native-unistyles");
 	}
 	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.");
+	if (providedFlags.has("backend") && !hasFullstackFrontend && backend === "self") exitWithError("Backend 'self' (fullstack) currently only supports Next.js frontend. Please use --frontend next or choose a different backend. Support for Nuxt, SvelteKit, and TanStack Start will be added in a future update.");
 }
 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.`);
@@ -684,12 +680,7 @@ async function getAuthChoice(auth, hasDatabase, backend, frontend) {
 
 //#endregion
 //#region src/prompts/backend.ts
-const FULLSTACK_FRONTENDS = [
-	"next",
-	"nuxt",
-	"svelte",
-	"tanstack-start"
-];
+const FULLSTACK_FRONTENDS = ["next"];
 async function getBackendFrameworkChoice(backendFramework, frontends) {
 	if (backendFramework !== void 0) return backendFramework;
 	const hasIncompatibleFrontend = frontends?.some((f) => f === "solid");
@@ -1776,6 +1767,12 @@ function validateBackendNoneConstraints(config, providedFlags) {
 	if (has("dbSetup") && config.dbSetup !== "none") exitWithError("Backend 'none' requires '--db-setup none'. Please remove the --db-setup flag or set it to 'none'.");
 	if (has("serverDeploy") && config.serverDeploy !== "none") exitWithError("Backend 'none' requires '--server-deploy none'. Please remove the --server-deploy flag or set it to 'none'.");
 }
+function validateSelfBackendConstraints(config, providedFlags) {
+	const { backend } = config;
+	if (backend !== "self") return;
+	const has = (k) => providedFlags.has(k);
+	if (has("runtime") && config.runtime !== "none") exitWithError("Backend 'self' (fullstack) requires '--runtime none'. Please remove the --runtime flag or set it to 'none'.");
+}
 function validateBackendConstraints(config, providedFlags, options) {
 	const { backend } = config;
 	if (config.auth === "clerk" && backend !== "convex") exitWithError("Clerk authentication is only supported with the Convex backend. Please use '--backend convex' or choose a different auth provider.");
@@ -1814,6 +1811,7 @@ function validateFullConfig(config, providedFlags, options) {
 	validateDatabaseSetup(config, providedFlags);
 	validateConvexConstraints(config, providedFlags);
 	validateBackendNoneConstraints(config, providedFlags);
+	validateSelfBackendConstraints(config, providedFlags);
 	validateBackendConstraints(config, providedFlags, options);
 	validateFrontendConstraints(config, providedFlags);
 	validateApiConstraints(config, options);
@@ -3155,25 +3153,29 @@ async function setupDockerComposeTemplates(projectDir, context) {
 	if (await fs.pathExists(dockerSrcDir)) await processAndCopyFiles("**/*", dockerSrcDir, dbPackageDir, context);
 }
 async function setupDeploymentTemplates(projectDir, context) {
-	if (context.webDeploy === "alchemy" || context.serverDeploy === "alchemy") if (context.webDeploy === "alchemy" && context.serverDeploy === "alchemy") {
+	const isBackendSelf = context.backend === "self";
+	if (context.webDeploy === "alchemy" || context.serverDeploy === "alchemy") {
 		const alchemyTemplateSrc = path.join(PKG_ROOT, "templates/deploy/alchemy");
-		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);
-		}
-	} else {
-		if (context.webDeploy === "alchemy") {
-			const alchemyTemplateSrc = path.join(PKG_ROOT, "templates/deploy/alchemy");
-			const webAppDir = path.join(projectDir, "apps/web");
-			if (await fs.pathExists(alchemyTemplateSrc) && await fs.pathExists(webAppDir)) await processAndCopyFiles("alchemy.run.ts.hbs", alchemyTemplateSrc, webAppDir, context);
-		}
-		if (context.serverDeploy === "alchemy") {
-			const alchemyTemplateSrc = path.join(PKG_ROOT, "templates/deploy/alchemy");
-			const serverAppDir = path.join(projectDir, "apps/server");
-			if (await fs.pathExists(alchemyTemplateSrc) && await fs.pathExists(serverAppDir)) {
-				await processAndCopyFiles("alchemy.run.ts.hbs", alchemyTemplateSrc, serverAppDir, context);
-				await processAndCopyFiles("env.d.ts.hbs", alchemyTemplateSrc, serverAppDir, context);
+		if (context.webDeploy === "alchemy" && (context.serverDeploy === "alchemy" || isBackendSelf)) {
+			if (await fs.pathExists(alchemyTemplateSrc)) {
+				await processAndCopyFiles("alchemy.run.ts.hbs", alchemyTemplateSrc, projectDir, context);
+				await addEnvDtsToPackages(projectDir, context, alchemyTemplateSrc);
+			}
+		} else {
+			if (context.webDeploy === "alchemy") {
+				const webAppDir = path.join(projectDir, "apps/web");
+				if (await fs.pathExists(alchemyTemplateSrc) && await fs.pathExists(webAppDir)) {
+					await processAndCopyFiles("alchemy.run.ts.hbs", alchemyTemplateSrc, webAppDir, context);
+					await addEnvDtsToPackages(projectDir, context, alchemyTemplateSrc);
+				}
+			}
+			if (context.serverDeploy === "alchemy" && !isBackendSelf) {
+				const serverAppDir = path.join(projectDir, "apps/server");
+				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 addEnvDtsToPackages(projectDir, context, alchemyTemplateSrc);
+				}
 			}
 		}
 	}
@@ -3196,7 +3198,7 @@ async function setupDeploymentTemplates(projectDir, context) {
 			}
 		}
 	}
-	if (context.serverDeploy !== "none" && context.serverDeploy !== "alchemy") {
+	if (context.serverDeploy !== "none" && context.serverDeploy !== "alchemy" && !isBackendSelf) {
 		const serverAppDir = path.join(projectDir, "apps/server");
 		if (await fs.pathExists(serverAppDir)) {
 			const deployTemplateSrc = path.join(PKG_ROOT, `templates/deploy/${context.serverDeploy}/server`);
@@ -3204,6 +3206,18 @@ async function setupDeploymentTemplates(projectDir, context) {
 		}
 	}
 }
+async function addEnvDtsToPackages(projectDir, context, alchemyTemplateSrc) {
+	for (const packageName of [
+		"packages/api",
+		"packages/auth",
+		"packages/db"
+	]) {
+		const packageDir = path.join(projectDir, packageName);
+		if (await fs.pathExists(packageDir)) await processAndCopyFiles("env.d.ts.hbs", alchemyTemplateSrc, packageDir, context);
+	}
+	const serverAppDir = path.join(projectDir, "apps/server");
+	if (await fs.pathExists(serverAppDir)) await processAndCopyFiles("env.d.ts.hbs", alchemyTemplateSrc, serverAppDir, context);
+}
 
 //#endregion
 //#region src/helpers/core/add-addons.ts
@@ -3269,7 +3283,7 @@ async function setupServerDeploy(config) {
 			serverDir,
 			packageManager
 		});
-	} else if (serverDeploy === "alchemy") await setupAlchemyServerDeploy(serverDir, packageManager);
+	} else if (serverDeploy === "alchemy") await setupAlchemyServerDeploy(serverDir, packageManager, projectDir);
 }
 async function setupWorkersServerDeploy(serverDir, _packageManager) {
 	const packageJsonPath = path.join(serverDir, "package.json");
@@ -3306,7 +3320,7 @@ async function generateCloudflareWorkerTypes({ serverDir, packageManager }) {
 		log.warn(`Note: You can manually run 'cd apps/server && ${managerCmd} cf-typegen' in the project directory later`);
 	}
 }
-async function setupAlchemyServerDeploy(serverDir, _packageManager) {
+async function setupAlchemyServerDeploy(serverDir, _packageManager, projectDir) {
 	if (!await fs.pathExists(serverDir)) return;
 	await addPackageDependency({
 		devDependencies: [
@@ -3317,6 +3331,7 @@ async function setupAlchemyServerDeploy(serverDir, _packageManager) {
 		],
 		projectDir: serverDir
 	});
+	if (projectDir) await addAlchemyPackagesDependencies$1(projectDir);
 	const packageJsonPath = path.join(serverDir, "package.json");
 	if (await fs.pathExists(packageJsonPath)) {
 		const packageJson = await fs.readJson(packageJsonPath);
@@ -3329,6 +3344,19 @@ async function setupAlchemyServerDeploy(serverDir, _packageManager) {
 		await fs.writeJson(packageJsonPath, packageJson, { spaces: 2 });
 	}
 }
+async function addAlchemyPackagesDependencies$1(projectDir) {
+	for (const packageName of [
+		"packages/api",
+		"packages/auth",
+		"packages/db"
+	]) {
+		const packageDir = path.join(projectDir, packageName);
+		if (await fs.pathExists(packageDir)) await addPackageDependency({
+			devDependencies: ["@cloudflare/workers-types"],
+			projectDir: packageDir
+		});
+	}
+}
 
 //#endregion
 //#region src/helpers/deployment/alchemy/alchemy-next-setup.ts
@@ -3634,7 +3662,7 @@ async function setupCombinedAlchemyDeploy(projectDir, packageManager, config) {
 		await fs.writeJson(rootPkgPath, pkg, { spaces: 2 });
 	}
 	const serverDir = path.join(projectDir, "apps/server");
-	if (await fs.pathExists(serverDir)) await setupAlchemyServerDeploy(serverDir, packageManager);
+	if (await fs.pathExists(serverDir)) await setupAlchemyServerDeploy(serverDir, packageManager, projectDir);
 	const frontend = config.frontend;
 	const isNext = frontend.includes("next");
 	const isNuxt = frontend.includes("nuxt");
@@ -3867,6 +3895,7 @@ async function setupWebDeploy(config) {
 	if (webDeploy !== "wrangler" && webDeploy !== "alchemy") return;
 	if (webDeploy === "alchemy" && serverDeploy === "alchemy") {
 		await setupCombinedAlchemyDeploy(projectDir, packageManager, config);
+		await addAlchemyPackagesDependencies(projectDir);
 		return;
 	}
 	const isNext = frontend.includes("next");
@@ -3890,6 +3919,7 @@ async function setupWebDeploy(config) {
 		else if (isTanstackRouter) await setupTanStackRouterAlchemyDeploy(projectDir, packageManager);
 		else if (isReactRouter) await setupReactRouterAlchemyDeploy(projectDir, packageManager);
 		else if (isSolid) await setupSolidAlchemyDeploy(projectDir, packageManager);
+		await addAlchemyPackagesDependencies(projectDir);
 	}
 }
 async function setupWorkersWebDeploy(projectDir, pkgManager) {
@@ -3907,6 +3937,19 @@ async function setupWorkersWebDeploy(projectDir, pkgManager) {
 	}
 	await setupWorkersVitePlugin(projectDir);
 }
+async function addAlchemyPackagesDependencies(projectDir) {
+	for (const packageName of [
+		"packages/api",
+		"packages/auth",
+		"packages/db"
+	]) {
+		const packageDir = path.join(projectDir, packageName);
+		if (await fs.pathExists(packageDir)) await addPackageDependency({
+			devDependencies: ["@cloudflare/workers-types"],
+			projectDir: packageDir
+		});
+	}
+}
 
 //#endregion
 //#region src/helpers/core/add-deployment.ts
@@ -3966,6 +4009,7 @@ async function setupCatalogs(projectDir, options) {
 	const packagePaths = [
 		"apps/server",
 		"apps/web",
+		"apps/native",
 		"packages/api",
 		"packages/db",
 		"packages/auth",
@@ -4232,7 +4276,7 @@ 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");
@@ -4253,40 +4297,14 @@ async function setupApi(config) {
 				dependencies: apiDeps.server.dependencies,
 				projectDir: webDir
 			});
-			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 (backend === "self") {
+				const frameworkDeps = [];
 				if (frontend.includes("next")) frameworkDeps.push("next");
-			}
-			if (frameworkDeps.length > 0) await addPackageDependency({
-				dependencies: frameworkDeps,
-				projectDir: apiPackageDir
-			});
-			if (api === "trpc") {
-				if (backend === "hono") await addPackageDependency({
-					dependencies: ["@hono/trpc-server"],
-					projectDir: apiPackageDir
-				});
-				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"],
+				if (frameworkDeps.length > 0) await addPackageDependency({
+					dependencies: frameworkDeps,
 					projectDir: apiPackageDir
 				});
 			}
-			if (auth === "better-auth") await addPackageDependency({
-				dependencies: ["better-auth"],
-				projectDir: apiPackageDir
-			});
 		}
 		if (webDirExists && apiDeps.web) await addPackageDependency({
 			dependencies: apiDeps.web.dependencies,
@@ -4338,34 +4356,23 @@ async function setupBackendDependencies(config) {
 	const devDependencies = [];
 	if (framework === "hono") {
 		dependencies.push("hono");
-		if (api === "trpc") dependencies.push("@hono/trpc-server");
-		if (runtime === "node") {
-			dependencies.push("@hono/node-server");
-			devDependencies.push("tsx", "@types/node");
-		}
+		if (runtime === "node") dependencies.push("@hono/node-server");
 	} else if (framework === "elysia") {
 		dependencies.push("elysia", "@elysiajs/cors");
-		if (api === "trpc") dependencies.push("@elysiajs/trpc");
-		if (runtime === "node") {
-			dependencies.push("@elysiajs/node");
-			devDependencies.push("tsx", "@types/node");
-		}
+		if (runtime === "node") dependencies.push("@elysiajs/node");
 	} else if (framework === "express") {
 		dependencies.push("express", "cors");
 		devDependencies.push("@types/express", "@types/cors");
-		if (runtime === "node") devDependencies.push("tsx", "@types/node");
-	} else if (framework === "fastify") {
-		dependencies.push("fastify", "@fastify/cors");
-		if (runtime === "node") devDependencies.push("tsx", "@types/node");
-	}
+	} else if (framework === "fastify") dependencies.push("fastify", "@fastify/cors");
 	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");
+		dependencies.push("@trpc/server");
+		if (framework === "hono") dependencies.push("@hono/trpc-server");
+		else if (framework === "elysia") dependencies.push("@elysiajs/trpc");
 	} 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 (runtime === "node") devDependencies.push("tsx", "@types/node");
+	else if (runtime === "bun") devDependencies.push("@types/bun");
 	if (dependencies.length > 0 || devDependencies.length > 0) await addPackageDependency({
 		dependencies,
 		devDependencies,
@@ -4626,7 +4633,7 @@ async function setupEnvironmentVariables(config) {
 		const nativeDir = path.join(projectDir, "apps/native");
 		if (await fs.pathExists(nativeDir)) {
 			let envVarName = "EXPO_PUBLIC_SERVER_URL";
-			let serverUrl = "http://localhost:3000";
+			let serverUrl = backend === "self" ? "http://localhost:3001" : "http://localhost:3000";
 			if (backend === "convex") {
 				envVarName = "EXPO_PUBLIC_CONVEX_URL";
 				serverUrl = "https://<YOUR_CONVEX_URL>";
@@ -5995,7 +6002,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.${auth === "clerk" ? " See [Convex + Clerk guide](https://docs.convex.dev/auth/clerk) for auth setup." : ""}` : generateDatabaseSetup(database, auth, packageManagerRunCmd, orm, options.dbSetup, options.serverDeploy)}
+Follow the prompts to create a new Convex project and connect it to your application.${auth === "clerk" ? " See [Convex + Clerk guide](https://docs.convex.dev/auth/clerk) for auth setup." : ""}` : generateDatabaseSetup(database, auth, packageManagerRunCmd, orm, options.dbSetup, options.serverDeploy, options.backend)}
 
 Then, run the development server:
 
@@ -6048,6 +6055,7 @@ function generateRunningInstructions(frontend, backend, webPort, hasNative, isCo
 	const instructions = [];
 	const hasFrontendNone = frontend.length === 0 || frontend.includes("none");
 	const isBackendNone = backend === "none";
+	const isBackendSelf = backend === "self";
 	if (!hasFrontendNone) {
 		const hasTanstackRouter = frontend.includes("tanstack-router");
 		const hasReactRouter = frontend.includes("react-router");
@@ -6056,17 +6064,19 @@ function generateRunningInstructions(frontend, backend, webPort, hasNative, isCo
 		const hasSvelte = frontend.includes("svelte");
 		const hasNuxt = frontend.includes("nuxt");
 		const hasSolid = frontend.includes("solid");
-		if (hasTanstackRouter || hasReactRouter || hasNext || hasTanstackStart || hasSvelte || hasNuxt || hasSolid) instructions.push(`Open [http://localhost:${webPort}](http://localhost:${webPort}) in your browser to see the web application.`);
+		if (hasTanstackRouter || hasReactRouter || hasNext || hasTanstackStart || hasSvelte || hasNuxt || hasSolid) if (isBackendSelf) instructions.push(`Open [http://localhost:${webPort}](http://localhost:${webPort}) in your browser to see your fullstack application.`);
+		else instructions.push(`Open [http://localhost:${webPort}](http://localhost:${webPort}) in your browser to see the web application.`);
 	}
 	if (hasNative) instructions.push("Use the Expo Go app to run the mobile application.");
 	if (isConvex) instructions.push("Your app will connect to the Convex cloud backend automatically.");
-	else if (!isBackendNone) instructions.push("The API is running at [http://localhost:3000](http://localhost:3000).");
+	else if (!isBackendNone && !isBackendSelf) instructions.push("The API is running at [http://localhost:3000](http://localhost:3000).");
 	return instructions.join("\n");
 }
 function generateProjectStructure(projectName, frontend, backend, addons, isConvex, api, auth) {
 	const structure = [`${projectName}/`, "├── apps/"];
 	const hasFrontendNone = frontend.length === 0 || frontend.includes("none");
 	const isBackendNone = backend === "none";
+	const isBackendSelf = backend === "self";
 	if (!hasFrontendNone) {
 		const hasTanstackRouter = frontend.includes("tanstack-router");
 		const hasReactRouter = frontend.includes("react-router");
@@ -6084,21 +6094,32 @@ function generateProjectStructure(projectName, frontend, backend, addons, isConv
 			else if (hasSvelte) frontendType = "SvelteKit";
 			else if (hasNuxt) frontendType = "Nuxt";
 			else if (hasSolid) frontendType = "SolidJS";
-			structure.push(`│   ├── web/         # Frontend application (${frontendType})`);
+			if (isBackendSelf) structure.push(`│   └── web/         # Fullstack application (${frontendType})`);
+			else structure.push(`│   ├── web/         # Frontend application (${frontendType})`);
 		}
 	}
-	if (frontend.includes("native-nativewind") || frontend.includes("native-unistyles")) structure.push("│   ├── native/      # Mobile application (React Native, Expo)");
-	if (addons.includes("starlight")) structure.push("│   ├── docs/        # Documentation site (Astro Starlight)");
-	if (isConvex) {
-		structure.push("├── packages/");
-		structure.push("│   └── backend/     # Convex backend functions and schema");
-		if (auth === "clerk") structure.push("│       ├── convex/    # Convex functions and schema", "│       └── .env.local # Convex environment variables");
-	} else if (!isBackendNone) {
+	if (frontend.includes("native-nativewind") || frontend.includes("native-unistyles")) if (isBackendSelf) structure.push("│   ├── native/      # Mobile application (React Native, Expo)");
+	else structure.push("│   ├── native/      # Mobile application (React Native, Expo)");
+	if (addons.includes("starlight")) if (isBackendSelf) structure.push("│   ├── docs/        # Documentation site (Astro Starlight)");
+	else structure.push("│   ├── docs/        # Documentation site (Astro Starlight)");
+	if (!isBackendSelf && !isBackendNone && !isConvex) {
 		const backendName = backend[0].toUpperCase() + backend.slice(1);
 		const apiName = api !== "none" ? api.toUpperCase() : "";
 		const backendDesc = apiName ? `${backendName}, ${apiName}` : backendName;
 		structure.push(`│   └── server/      # Backend API (${backendDesc})`);
 	}
+	if (isConvex || !isBackendNone) {
+		structure.push("├── packages/");
+		if (isConvex) {
+			structure.push("│   ├── backend/     # Convex backend functions and schema");
+			if (auth === "clerk") structure.push("│   │   ├── convex/    # Convex functions and schema", "│   │   └── .env.local # Convex environment variables");
+		}
+		if (!isConvex) {
+			structure.push("│   ├── api/         # API layer / business logic");
+			if (auth !== "none") structure.push("│   ├── auth/        # Authentication configuration & logic");
+			if (api !== "none" || auth !== "none") structure.push("│   └── db/          # Database schema & queries");
+		}
+	}
 	return structure.join("\n");
 }
 function generateFeaturesList(database, auth, addons, orm, runtime, frontend, backend, api) {
@@ -6134,7 +6155,6 @@ function generateFeaturesList(database, auth, addons, orm, runtime, frontend, ba
 		else if (backend === "express") addonsList.push("- **Express** - Fast, unopinionated web framework");
 		else if (backend === "fastify") addonsList.push("- **Fastify** - Fast, low-overhead web framework");
 		else if (backend === "elysia") addonsList.push("- **Elysia** - Type-safe, high-performance framework");
-		else if (backend === "next") addonsList.push("- **Next.js** - Full-stack React framework");
 		if (api === "trpc") addonsList.push("- **tRPC** - End-to-end type-safe APIs");
 		else if (api === "orpc") addonsList.push("- **oRPC** - End-to-end type-safe APIs with OpenAPI integration");
 		if (runtime !== "none") addonsList.push(`- **${runtime === "bun" ? "Bun" : runtime === "node" ? "Node.js" : runtime}** - Runtime environment`);
@@ -6156,33 +6176,36 @@ 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, serverDeploy) {
+function generateDatabaseSetup(database, _auth, packageManagerRunCmd, orm, dbSetup, serverDeploy, backend) {
 	if (database === "none") return "";
+	const isBackendSelf = backend === "self";
+	const envPath = isBackendSelf ? "apps/web/.env" : "apps/server/.env";
+	const dbLocalPath = isBackendSelf ? "apps/web" : "apps/server";
 	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" ? 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
+cd ${dbLocalPath} && ${packageManagerRunCmd} db:local
 \`\`\`
 `}
 
-2. Update your \`.env\` file in the \`apps/server\` directory with the appropriate connection details if needed.
+2. Update your \`.env\` file in the \`${isBackendSelf ? "apps/web" : "apps/server"}\` directory with the appropriate connection details if needed.
 `;
 	else if (database === "postgres") setup += `This project uses PostgreSQL${orm === "drizzle" ? " with Drizzle ORM" : orm === "prisma" ? " with Prisma" : ` with ${orm}`}.
 
 1. Make sure you have a PostgreSQL database set up.
-2. Update your \`apps/server/.env\` file with your PostgreSQL connection details.
+2. Update your \`${envPath}\` file with your PostgreSQL connection details.
 `;
 	else if (database === "mysql") setup += `This project uses MySQL${orm === "drizzle" ? " with Drizzle ORM" : orm === "prisma" ? " with Prisma" : ` with ${orm}`}.
 
 1. Make sure you have a MySQL database set up.
-2. Update your \`apps/server/.env\` file with your MySQL connection details.
+2. Update your \`${envPath}\` file with your MySQL connection details.
 `;
 	else if (database === "mongodb") setup += `This project uses MongoDB ${orm === "mongoose" ? "with Mongoose" : orm === "prisma" ? "with Prisma ORM" : `with ${orm}`}.
 
 1. Make sure you have MongoDB set up.
-2. Update your \`apps/server/.env\` file with your MongoDB connection URI.
+2. Update your \`${envPath}\` file with your MongoDB connection URI.
 `;
 	setup += `
 3. ${orm === "prisma" ? `Generate the Prisma client and push the schema:
@@ -6201,13 +6224,14 @@ ${packageManagerRunCmd} db:push
 function generateScriptsList(packageManagerRunCmd, database, orm, _auth, hasNative, addons, backend) {
 	const isConvex = backend === "convex";
 	const isBackendNone = backend === "none";
+	const isBackendSelf = backend === "self";
 	let scripts = `- \`${packageManagerRunCmd} dev\`: Start all applications in development mode
 - \`${packageManagerRunCmd} build\`: Build all applications`;
-	scripts += `
+	if (!isBackendSelf) scripts += `
 - \`${packageManagerRunCmd} dev:web\`: Start only the web application`;
 	if (isConvex) scripts += `
 - \`${packageManagerRunCmd} dev:setup\`: Setup and configure your Convex project`;
-	else if (!isBackendNone) scripts += `
+	else if (!isBackendNone && !isBackendSelf) scripts += `
 - \`${packageManagerRunCmd} dev:server\`: Start only the server`;
 	scripts += `
 - \`${packageManagerRunCmd} check-types\`: Check TypeScript types across all apps`;
@@ -6218,7 +6242,7 @@ function generateScriptsList(packageManagerRunCmd, database, orm, _auth, hasNati
 - \`${packageManagerRunCmd} db:push\`: Push schema changes to database
 - \`${packageManagerRunCmd} db:studio\`: Open database studio UI`;
 		if (database === "sqlite" && orm === "drizzle") scripts += `
-- \`cd apps/server && ${packageManagerRunCmd} db:local\`: Start the local SQLite database`;
+- \`cd ${isBackendSelf ? "apps/web" : "apps/server"} && ${packageManagerRunCmd} db:local\`: Start the local SQLite database`;
 	}
 	if (addons.includes("biome")) scripts += `
 - \`${packageManagerRunCmd} check\`: Run Biome formatting and linting`;
@@ -6375,19 +6399,20 @@ async function getDockerStatus(database) {
 async function displayPostInstallInstructions(config) {
 	const { api, database, relativePath, packageManager, depsInstalled, orm, addons, runtime, frontend, backend, dbSetup, webDeploy, serverDeploy } = config;
 	const isConvex = backend === "convex";
+	const isBackendSelf = backend === "self";
 	const runCmd = packageManager === "npm" ? "npm run" : packageManager === "pnpm" ? "pnpm run" : "bun run";
 	const cdCmd = `cd ${relativePath}`;
 	const hasHuskyOrBiome = addons?.includes("husky") || addons?.includes("biome");
-	const databaseInstructions = !isConvex && database !== "none" ? await getDatabaseInstructions(database, orm, runCmd, runtime, dbSetup, serverDeploy) : "";
+	const databaseInstructions = !isConvex && database !== "none" ? await getDatabaseInstructions(database, orm, runCmd, runtime, dbSetup, serverDeploy, backend) : "";
 	const tauriInstructions = addons?.includes("tauri") ? getTauriInstructions(runCmd) : "";
 	const lintingInstructions = hasHuskyOrBiome ? getLintingInstructions(runCmd) : "";
-	const nativeInstructions = frontend?.includes("native-nativewind") || frontend?.includes("native-unistyles") ? getNativeInstructions(isConvex) : "";
+	const nativeInstructions = frontend?.includes("native-nativewind") || frontend?.includes("native-unistyles") ? getNativeInstructions(isConvex, isBackendSelf) : "";
 	const pwaInstructions = addons?.includes("pwa") && frontend?.includes("react-router") ? getPwaInstructions() : "";
 	const starlightInstructions = addons?.includes("starlight") ? getStarlightInstructions(runCmd) : "";
 	const clerkInstructions = isConvex && config.auth === "clerk" ? getClerkInstructions() : "";
-	const polarInstructions = config.payments === "polar" && config.auth === "better-auth" ? getPolarInstructions() : "";
-	const wranglerDeployInstructions = getWranglerDeployInstructions(runCmd, webDeploy, serverDeploy);
-	const alchemyDeployInstructions = getAlchemyDeployInstructions(runCmd, webDeploy, serverDeploy);
+	const polarInstructions = config.payments === "polar" && config.auth === "better-auth" ? getPolarInstructions(backend) : "";
+	const wranglerDeployInstructions = getWranglerDeployInstructions(runCmd, webDeploy, serverDeploy, backend);
+	const alchemyDeployInstructions = getAlchemyDeployInstructions(runCmd, webDeploy, serverDeploy, backend);
 	const hasWeb = frontend?.some((f) => [
 		"tanstack-router",
 		"react-router",
@@ -6411,7 +6436,8 @@ async function displayPostInstallInstructions(config) {
 		output += `${pc.cyan(`${stepCounter++}.`)} ${runCmd} dev:setup\n${pc.dim("   (this will guide you through Convex project setup)")}\n`;
 		output += `${pc.cyan(`${stepCounter++}.`)} Copy environment variables from\n${pc.white("   packages/backend/.env.local")} to ${pc.white("apps/*/.env")}\n`;
 		output += `${pc.cyan(`${stepCounter++}.`)} ${runCmd} dev\n\n`;
-	} else {
+	} else if (isBackendSelf) output += `${pc.cyan(`${stepCounter++}.`)} ${runCmd} dev\n`;
+	else {
 		if (runtime !== "workers") output += `${pc.cyan(`${stepCounter++}.`)} ${runCmd} dev\n`;
 		if (runtime === "workers") {
 			if (dbSetup === "d1") output += `${pc.yellow("IMPORTANT:")} Complete D1 database setup first\n   (see Database commands below)\n`;
@@ -6422,11 +6448,11 @@ async function displayPostInstallInstructions(config) {
 	output += `${pc.bold("Your project will be available at:")}\n`;
 	if (hasWeb) output += `${pc.cyan("•")} Frontend: http://localhost:${webPort}\n`;
 	else if (!hasNative && !addons?.includes("starlight")) output += `${pc.yellow("NOTE:")} You are creating a backend-only app\n   (no frontend selected)\n`;
-	if (!isConvex) {
+	if (!isConvex && !isBackendSelf) {
 		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`;
-		else output += `${pc.cyan("•")} OpenAPI (Scalar UI): http://localhost:3000/api\n`;
+		if (api === "orpc") output += `${pc.cyan("•")} OpenAPI (Scalar UI): http://localhost:3000/api\n`;
 	}
+	if (isBackendSelf && api === "orpc") output += `${pc.cyan("•")} OpenAPI (Scalar UI): http://localhost:${webPort}/rpc/api\n`;
 	if (addons?.includes("starlight")) output += `${pc.cyan("•")} Docs: http://localhost:4321\n`;
 	if (addons?.includes("fumadocs")) output += `${pc.cyan("•")} Fumadocs: http://localhost:4000\n`;
 	if (nativeInstructions) output += `\n${nativeInstructions.trim()}\n`;
@@ -6446,9 +6472,9 @@ async function displayPostInstallInstructions(config) {
 	output += pc.cyan("https://github.com/AmanVarshney01/create-better-t-stack");
 	consola$1.box(output);
 }
-function getNativeInstructions(isConvex) {
+function getNativeInstructions(isConvex, isBackendSelf) {
 	const envVar = isConvex ? "EXPO_PUBLIC_CONVEX_URL" : "EXPO_PUBLIC_SERVER_URL";
-	const exampleUrl = isConvex ? "https://<YOUR_CONVEX_URL>" : "http://<YOUR_LOCAL_IP>:3000";
+	const exampleUrl = isConvex ? "https://<YOUR_CONVEX_URL>" : isBackendSelf ? "http://<YOUR_LOCAL_IP>:3001" : "http://<YOUR_LOCAL_IP>:3000";
 	const envFileName = ".env";
 	const ipNote = isConvex ? "your Convex deployment URL (find after running 'dev:setup')" : "your local IP address";
 	let instructions = `${pc.yellow("NOTE:")} For Expo connectivity issues, update\n   apps/native/${envFileName} with ${ipNote}:\n   ${`${envVar}=${exampleUrl}`}\n`;
@@ -6458,7 +6484,7 @@ function getNativeInstructions(isConvex) {
 function getLintingInstructions(runCmd) {
 	return `${pc.bold("Linting and formatting:")}\n${pc.cyan("•")} Format and lint fix: ${`${runCmd} check`}\n`;
 }
-async function getDatabaseInstructions(database, orm, runCmd, runtime, dbSetup, serverDeploy) {
+async function getDatabaseInstructions(database, orm, runCmd, runtime, dbSetup, serverDeploy, backend) {
 	const instructions = [];
 	if (dbSetup === "docker") {
 		const dockerStatus = await getDockerStatus(database);
@@ -6472,8 +6498,9 @@ async function getDatabaseInstructions(database, orm, runCmd, runtime, dbSetup,
 		const packageManager = runCmd === "npm run" ? "npm" : runCmd || "npm";
 		instructions.push(`${pc.cyan("1.")} Login to Cloudflare: ${pc.white(`${packageManager} wrangler login`)}`);
 		instructions.push(`${pc.cyan("2.")} Create D1 database: ${pc.white(`${packageManager} wrangler d1 create your-database-name`)}`);
-		instructions.push(`${pc.cyan("3.")} Update apps/server/wrangler.jsonc with database_id and database_name`);
-		instructions.push(`${pc.cyan("4.")} Generate migrations: ${pc.white(`cd apps/server && ${runCmd} db:generate`)}`);
+		const wranglerPath = backend === "self" ? "apps/web" : "apps/server";
+		instructions.push(`${pc.cyan("3.")} Update ${wranglerPath}/wrangler.jsonc with database_id and database_name`);
+		instructions.push(`${pc.cyan("4.")} Generate migrations: ${pc.white(`cd ${wranglerPath} && ${runCmd} db:generate`)}`);
 		instructions.push(`${pc.cyan("5.")} Apply migrations locally: ${pc.white(`${packageManager} wrangler d1 migrations apply YOUR_DB_NAME --local`)}`);
 		instructions.push(`${pc.cyan("6.")} Apply migrations to production: ${pc.white(`${packageManager} wrangler d1 migrations apply YOUR_DB_NAME`)}`);
 	}
@@ -6497,7 +6524,10 @@ async function getDatabaseInstructions(database, orm, runCmd, runtime, dbSetup,
 		if (dbSetup === "docker") instructions.push(`${pc.cyan("•")} Start docker container: ${`${runCmd} db:start`}`);
 		if (dbSetup !== "d1") instructions.push(`${pc.cyan("•")} Apply schema: ${`${runCmd} db:push`}`);
 		if (!(dbSetup === "d1" && serverDeploy === "alchemy")) instructions.push(`${pc.cyan("•")} Database UI: ${`${runCmd} db:studio`}`);
-		if (database === "sqlite" && dbSetup !== "d1") instructions.push(`${pc.cyan("•")} Start local DB (if needed): ${`cd apps/server && ${runCmd} db:local`}`);
+		if (database === "sqlite" && dbSetup !== "d1") {
+			const dbLocalPath = backend === "self" ? "apps/web" : "apps/server";
+			instructions.push(`${pc.cyan("•")} Start local DB (if needed): ${`cd ${dbLocalPath} && ${runCmd} db:local`}`);
+		}
 	} else if (orm === "mongoose") {
 		if (dbSetup === "docker") instructions.push(`${pc.cyan("•")} Start docker container: ${`${runCmd} db:start`}`);
 	} else if (orm === "none") instructions.push(`${pc.yellow("NOTE:")} Manual database schema setup\n   required.`);
@@ -6518,23 +6548,28 @@ function getNoOrmWarning() {
 function getBunWebNativeWarning() {
 	return `\n${pc.yellow("WARNING:")} 'bun' might cause issues with web + native apps in a monorepo.\n   Use 'pnpm' if problems arise.`;
 }
-function getWranglerDeployInstructions(runCmd, webDeploy, serverDeploy) {
+function getWranglerDeployInstructions(runCmd, webDeploy, serverDeploy, backend) {
 	const instructions = [];
-	if (webDeploy === "wrangler") instructions.push(`${pc.bold("Deploy web to Cloudflare Workers:")}\n${pc.cyan("•")} Deploy: ${`cd apps/web && ${runCmd} run deploy`}`);
-	if (serverDeploy === "wrangler") instructions.push(`${pc.bold("Deploy server to Cloudflare Workers:")}\n${pc.cyan("•")} Deploy: ${`cd apps/server && ${runCmd} run deploy`}`);
+	if (webDeploy === "wrangler") {
+		const deployPath = backend === "self" ? "apps/web" : "apps/web";
+		instructions.push(`${pc.bold("Deploy web to Cloudflare Workers:")}\n${pc.cyan("•")} Deploy: ${`cd ${deployPath} && ${runCmd} run deploy`}`);
+	}
+	if (serverDeploy === "wrangler" && backend !== "self") instructions.push(`${pc.bold("Deploy server to Cloudflare Workers:")}\n${pc.cyan("•")} Deploy: ${`cd apps/server && ${runCmd} run deploy`}`);
 	return instructions.length ? `\n${instructions.join("\n")}` : "";
 }
 function getClerkInstructions() {
 	return `${pc.bold("Clerk Authentication Setup:")}\n${pc.cyan("•")} Follow the guide: ${pc.underline("https://docs.convex.dev/auth/clerk")}\n${pc.cyan("•")} Set CLERK_JWT_ISSUER_DOMAIN in Convex Dashboard\n${pc.cyan("•")} Set CLERK_PUBLISHABLE_KEY in apps/*/.env`;
 }
-function getPolarInstructions() {
-	return `${pc.bold("Polar Payments Setup:")}\n${pc.cyan("•")} Get access token & product ID from ${pc.underline("https://sandbox.polar.sh/")}\n${pc.cyan("•")} Set POLAR_ACCESS_TOKEN in apps/server/.env`;
+function getPolarInstructions(backend) {
+	const envPath = backend === "self" ? "apps/web/.env" : "apps/server/.env";
+	return `${pc.bold("Polar Payments Setup:")}\n${pc.cyan("•")} Get access token & product ID from ${pc.underline("https://sandbox.polar.sh/")}\n${pc.cyan("•")} Set POLAR_ACCESS_TOKEN in ${envPath}`;
 }
-function getAlchemyDeployInstructions(runCmd, webDeploy, serverDeploy) {
+function getAlchemyDeployInstructions(runCmd, webDeploy, serverDeploy, backend) {
 	const instructions = [];
+	const isBackendSelf = backend === "self";
 	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`}`);
+	else if (serverDeploy === "alchemy" && webDeploy !== "alchemy" && !isBackendSelf) 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" || isBackendSelf)) 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")}` : "";
 }
 
@@ -6590,12 +6625,30 @@ async function setupWorkspaceDependencies(projectDir, options) {
 			projectDir: webPackageDir
 		});
 	}
+	const nativePackageDir = path.join(projectDir, "apps/native");
+	if (await fs.pathExists(nativePackageDir)) {
+		const nativeDeps = {};
+		nativeDeps[`@${projectName}/api`] = workspaceVersion;
+		if (Object.keys(nativeDeps).length > 0) await addPackageDependency({
+			customDependencies: nativeDeps,
+			projectDir: nativePackageDir
+		});
+	}
+	const runtimeDevDeps = getRuntimeDevDeps(options);
 	await addPackageDependency({
 		dependencies: commonDeps,
-		devDependencies: commonDevDeps,
+		devDependencies: [...commonDevDeps, ...runtimeDevDeps],
 		projectDir
 	});
 }
+function getRuntimeDevDeps(options) {
+	const { runtime, backend } = options;
+	if (runtime === "none" && backend === "self") return ["@types/node"];
+	if (runtime === "node") return ["@types/node"];
+	if (runtime === "bun") return ["@types/bun"];
+	if (runtime === "workers") return ["@types/node"];
+	return [];
+}
 
 //#endregion
 //#region src/helpers/core/project-config.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-better-t-stack",
-  "version": "2.50.1-canary.7ebd503f",
+  "version": "2.50.1-canary.9643d88e",
   "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/addons/ruler/.ruler/bts.md.hbs

@@ -8,14 +8,14 @@ This is a monorepo with the following structure:
 
 {{#if (or (includes frontend "tanstack-router") (includes frontend "react-router") (includes frontend "tanstack-start")
 (includes frontend "next") (includes frontend "nuxt") (includes frontend "svelte") (includes frontend "solid"))}}
-- **`apps/web/`** - Frontend application{{#if (includes frontend "tanstack-router")}} (React with TanStack Router){{else
+- **`apps/web/`** - {{#if (eq backend "self")}}Fullstack application{{else}}Frontend application{{/if}}{{#if (includes frontend "tanstack-router")}} (React with TanStack Router){{else
 if (includes frontend "react-router")}} (React with React Router){{else if (includes frontend "next")}} (Next.js){{else
 if (includes frontend "nuxt")}} (Nuxt.js){{else if (includes frontend "svelte")}} (SvelteKit){{else if (includes
 frontend "solid")}} (SolidStart){{/if}}
 {{/if}}
 
 {{#if (ne backend "convex")}}
-{{#if (ne backend "none")}}
+{{#if (and (ne backend "none") (ne backend "self"))}}
 - **`apps/server/`** - Backend server{{#if (eq backend "hono")}} (Hono){{else if (eq backend "express")}}
 (Express){{else if (eq backend "fastify")}} (Fastify){{else if (eq backend "elysia")}} (Elysia){{else if (eq backend
 "next")}} (Next.js API){{/if}}
@@ -24,6 +24,18 @@ frontend "solid")}} (SolidStart){{/if}}
 - **`packages/backend/`** - Convex backend functions
 {{/if}}
 
+{{#if (or (ne backend "none") (ne backend "convex"))}}
+{{#if (ne api "none")}}
+- **`packages/api/`** - Shared API logic and types
+{{/if}}
+{{#if (and (ne auth "none") (ne backend "convex"))}}
+- **`packages/auth/`** - Authentication logic and utilities
+{{/if}}
+{{#if (and (ne database "none") (ne orm "none") (ne backend "convex"))}}
+- **`packages/db/`** - Database schema and utilities
+{{/if}}
+{{/if}}
+
 {{#if (or (includes frontend "native-nativewind") (includes frontend "native-unistyles"))}}
 - **`apps/native/`** - React Native mobile app{{#if (includes frontend "native-nativewind")}} (with NativeWind){{else if
 (includes frontend "native-unistyles")}} (with Unistyles){{/if}}
@@ -32,15 +44,13 @@ frontend "solid")}} (SolidStart){{/if}}
 ## Available Scripts
 
 - `{{packageManager}} run dev` - Start all apps in development mode
-{{#if (or (includes frontend "tanstack-router") (includes frontend "react-router") (includes frontend "tanstack-start")
-(includes frontend "next") (includes frontend "nuxt") (includes frontend "svelte") (includes frontend "solid"))}}
+{{#if (and (or (includes frontend "tanstack-router") (includes frontend "react-router") (includes frontend "tanstack-start")
+(includes frontend "next") (includes frontend "nuxt") (includes frontend "svelte") (includes frontend "solid")) (ne backend "self"))}}
 - `{{packageManager}} run dev:web` - Start only the web app
 {{/if}}
-{{#if (ne backend "none")}}
-{{#if (ne backend "convex")}}
+{{#if (and (ne backend "none") (ne backend "convex") (ne backend "self"))}}
 - `{{packageManager}} run dev:server` - Start only the server
 {{/if}}
-{{/if}}
 {{#if (or (includes frontend "native-nativewind") (includes frontend "native-unistyles"))}}
 - `{{packageManager}} run dev:native` - Start only the native app
 {{/if}}
@@ -48,7 +58,7 @@ frontend "solid")}} (SolidStart){{/if}}
 {{#if (and (ne database "none") (ne orm "none") (ne backend "convex"))}}
 ## Database Commands
 
-All database operations should be run from the server workspace:
+All database operations should be run from the {{#if (eq backend "self")}}web{{else}}server{{/if}} workspace:
 
 - `{{packageManager}} run db:push` - Push schema changes to database
 - `{{packageManager}} run db:studio` - Open database studio
@@ -57,11 +67,11 @@ All database operations should be run from the server workspace:
 - `{{packageManager}} run db:migrate` - Run database migrations
 
 {{#if (eq orm "drizzle")}}
-Database schema files are located in `apps/server/src/db/schema/`
+Database schema files are located in {{#if (eq backend "self")}}`apps/web/src/db/schema/`{{else}}`apps/server/src/db/schema/`{{/if}}
 {{else if (eq orm "prisma")}}
-Database schema is located in `apps/server/prisma/schema.prisma`
+Database schema is located in {{#if (eq backend "self")}}`apps/web/prisma/schema.prisma`{{else}}`apps/server/prisma/schema.prisma`{{/if}}
 {{else if (eq orm "mongoose")}}
-Database models are located in `apps/server/src/db/models/`
+Database models are located in {{#if (eq backend "self")}}`apps/web/src/db/models/`{{else}}`apps/server/src/db/models/`{{/if}}
 {{/if}}
 {{/if}}
 
@@ -69,10 +79,10 @@ Database models are located in `apps/server/src/db/models/`
 ## API Structure
 
 {{#if (eq api "trpc")}}
-- tRPC routers are in `apps/server/src/routers/`
+- tRPC routers are in {{#if (eq backend "self")}}`packages/api/src/routers/`{{else}}`apps/server/src/routers/`{{/if}}
 - Client-side tRPC utils are in `apps/web/src/utils/trpc.ts`
 {{else if (eq api "orpc")}}
-- oRPC endpoints are in `apps/server/src/api/`
+- oRPC endpoints are in {{#if (eq backend "self")}}`packages/api/src/api/`{{else}}`apps/server/src/api/`{{/if}}
 - Client-side API utils are in `apps/web/src/utils/api.ts`
 {{/if}}
 {{/if}}
@@ -82,7 +92,7 @@ Database models are located in `apps/server/src/db/models/`
 
 Authentication is enabled in this project:
 {{#if (ne backend "convex")}}
-- Server auth logic is in `apps/server/src/lib/auth.ts`
+- Server auth logic is in {{#if (eq backend "self")}}`packages/auth/src/lib/auth.ts`{{else}}`apps/server/src/lib/auth.ts`{{/if}}
 {{#if (or (includes frontend "tanstack-router") (includes frontend "react-router") (includes frontend "tanstack-start")
 (includes frontend "next") (includes frontend "nuxt") (includes frontend "svelte") (includes frontend "solid"))}}
 - Web app auth client is in `apps/web/src/lib/auth-client.ts`

package/templates/api/orpc/native/utils/orpc.ts.hbs

@@ -2,7 +2,7 @@ import { createORPCClient } from "@orpc/client";
 import { RPCLink } from "@orpc/client/fetch";
 import { createTanstackQueryUtils } from "@orpc/tanstack-query";
 import { QueryCache, QueryClient } from "@tanstack/react-query";
-import type { AppRouterClient } from "../../server/src/routers";
+import type { AppRouterClient } from "@{{projectName}}/api/routers/index";
 {{#if (eq auth "better-auth")}}
 import { authClient } from "@/lib/auth-client";
 {{/if}}
@@ -16,7 +16,11 @@ export const queryClient = new QueryClient({
 });
 
 export const link = new RPCLink({
+  {{#if (eq backend "self")}}
+  url: `${process.env.EXPO_PUBLIC_SERVER_URL}/api/rpc`,
+  {{else}}
   url: `${process.env.EXPO_PUBLIC_SERVER_URL}/rpc`,
+  {{/if}}
   {{#if (eq auth "better-auth")}}
   headers() {
     const headers = new Map<string, string>();

package/templates/api/orpc/server/package.json.hbs

@@ -14,9 +14,7 @@
   "scripts": {
     "build": "tsdown"
   },
-  "devDependencies": {
-    "@types/bun": "latest"
-  },
+  "devDependencies": {},
   "peerDependencies": {
     "typescript": "^5"
   },

package/templates/api/orpc/server/tsconfig.json.hbs

@@ -1,10 +1,10 @@
 {
-	"compilerOptions": {
-		"target": "ESNext",
-		"module": "ESNext",
-		"moduleResolution": "bundler",
-		"types": [
-			"bun"
-		],
-	}
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "declaration": true,
+    "declarationMap": true,
+    "sourceMap": true,
+    "outDir": "dist",
+    "composite": true
+  }
 }

package/templates/api/trpc/native/utils/trpc.ts.hbs

@@ -4,14 +4,18 @@ import { authClient } from "@/lib/auth-client";
 import { QueryClient } from "@tanstack/react-query";
 import { createTRPCClient, httpBatchLink } from "@trpc/client";
 import { createTRPCOptionsProxy } from "@trpc/tanstack-react-query";
-import type { AppRouter } from "../../server/src/routers";
+import type { AppRouter } from "@{{projectName}}/api/routers/index";
 
 export const queryClient = new QueryClient();
 
 const trpcClient = createTRPCClient<AppRouter>({
 	links: [
 		httpBatchLink({
+			 {{#if  (eq backend "self")}}
+			url: `${process.env.EXPO_PUBLIC_SERVER_URL}/api/trpc`,
+			{{else}}
 			url: `${process.env.EXPO_PUBLIC_SERVER_URL}/trpc`,
+			{{/if}}
 			{{#if (eq auth "better-auth")}}
 			headers() {
 				const headers = new Map<string, string>();

package/templates/api/trpc/server/package.json.hbs

@@ -14,9 +14,7 @@
   "scripts": {
     "build": "tsdown"
   },
-  "devDependencies": {
-    "@types/bun": "latest"
-  },
+  "devDependencies": {},
   "peerDependencies": {
     "typescript": "^5"
   }

package/templates/api/trpc/server/tsconfig.json.hbs

@@ -1,13 +1,10 @@
 {
-	"extends": "../../tsconfig.base.json",
-	"compilerOptions": {
-		"declaration": true,
-		"declarationMap": true,
-		"sourceMap": true,
-		"outDir": "dist",
-		"composite": true,
-		"types": [
-			"bun"
-		]
-	}
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "declaration": true,
+    "declarationMap": true,
+    "sourceMap": true,
+    "outDir": "dist",
+    "composite": true
+  }
 }

package/templates/auth/better-auth/server/base/package.json.hbs

@@ -14,10 +14,7 @@
   "scripts": {
     "build": "tsdown"
   },
-  "devDependencies": {
-    "@types/bun": "latest",
-    "@types/node": "^24.5.2"
-  },
+  "devDependencies": {},
   "peerDependencies": {
     "typescript": "^5"
   }

package/templates/auth/better-auth/server/base/tsconfig.json.hbs

@@ -1,13 +1,10 @@
 {
-	"extends": "../../tsconfig.base.json",
-	"compilerOptions": {
-		"declaration": true,
-		"declarationMap": true,
-		"sourceMap": true,
-		"outDir": "dist",
-		"composite": true,
-		"types": [
-			"bun"
-		]
-	}
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "declaration": true,
+    "declarationMap": true,
+    "sourceMap": true,
+    "outDir": "dist",
+    "composite": true
+  }
 }

package/templates/backend/server/base/tsconfig.json.hbs

@@ -5,22 +5,8 @@
 		"outDir": "dist",
 		"baseUrl": ".",
     "paths": {
-      "@/*": ["./src/*"]{{#if (eq orm "prisma")}},
-      "prisma": ["node_modules/prisma"]{{/if}}
+      "@/*": ["./src/*"]
     },
-    "types": [
-      {{#if (eq runtime "node")}}
-        "node"
-      {{else if (eq runtime "bun")}}
-        "bun"
-      {{else if (eq runtime "workers")}}
-        "node"
-      {{else}}
-        "node",
-        "bun"
-      {{/if}}{{#if (eq serverDeploy "alchemy")}},
-      "@cloudflare/workers-types"{{/if}}
-    ],
     "jsx": "react-jsx"{{#if (eq backend "hono")}},
     "jsxImportSource": "hono/jsx"{{/if}}
   }

package/templates/base/tsconfig.base.json.hbs

@@ -1,23 +1,33 @@
 {
-    "$schema": "https://json.schemastore.org/tsconfig",
-    "compilerOptions": {
-        "target": "ESNext",
-        "module": "ESNext",
-        "moduleResolution": "bundler",
-        "lib": [
-            "ESNext"
-        ],
-        "verbatimModuleSyntax": true,
-        "strict": true,
-        "skipLibCheck": true,
-        "resolveJsonModule": true,
-        "allowSyntheticDefaultImports": true,
-        "esModuleInterop": true,
-        "forceConsistentCasingInFileNames": true,
-        "isolatedModules": true,
-        "noUncheckedIndexedAccess": true,
-        "noUnusedLocals": true,
-        "noUnusedParameters": true,
-        "noFallthroughCasesInSwitch": true
-    }
+  "$schema": "https://json.schemastore.org/tsconfig",
+  "compilerOptions": {
+    "target": "ESNext",
+    "module": "ESNext",
+    "moduleResolution": "bundler",
+    "lib": ["ESNext"],
+    "verbatimModuleSyntax": true,
+    "strict": true,
+    "skipLibCheck": true,
+    "resolveJsonModule": true,
+    "allowSyntheticDefaultImports": true,
+    "esModuleInterop": true,
+    "forceConsistentCasingInFileNames": true,
+    "isolatedModules": true,
+    "noUncheckedIndexedAccess": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "noFallthroughCasesInSwitch": true,
+    "types": [
+      {{#if (eq runtime "node")}}
+        "node"
+      {{else if (eq runtime "bun")}}
+        "bun"
+      {{else if (eq runtime "workers")}}
+        "node"
+      {{else}}
+        "node"
+      {{/if}}{{#if (eq serverDeploy "alchemy")}},
+      "@cloudflare/workers-types"{{/if}}
+    ]
+  }
 }

package/templates/db/base/package.json.hbs

@@ -14,9 +14,7 @@
   "scripts": {
     "build": "tsdown"
   },
-  "devDependencies": {
-    "@types/node": "^24.5.2"
-  },
+  "devDependencies": {},
   "peerDependencies": {
     "typescript": "^5"
   }

package/templates/db/base/tsconfig.json.hbs

@@ -1,13 +1,10 @@
 {
-	"extends": "../../tsconfig.base.json",
-	"compilerOptions": {
-		"declaration": true,
-		"declarationMap": true,
-		"sourceMap": true,
-		"outDir": "dist",
-		"composite": true,
-		"types": [
-			"bun"
-		]
-	}
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "declaration": true,
+    "declarationMap": true,
+    "sourceMap": true,
+    "outDir": "dist",
+    "composite": true
+  }
 }

package/templates/extras/bunfig.toml.hbs

@@ -1,5 +1,5 @@
 [install]
-{{#if (includes frontend "nuxt")}}
+{{#if (or (includes frontend "nuxt") (includes frontend "native-nativewind") (includes frontend "native-unistyles"))}}
 # linker = "isolated"  # Commented out for Nuxt compatibility
 {{else}}
 linker = "isolated"