create-better-t-stack 2.50.0-canary.08568a05 → 2.50.0-canary.5b25d7db

package/dist/cli.js

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

package/dist/{src-DfbhNFZ9.js → src-Vtq3I-LI.js}

@@ -125,7 +125,7 @@ const dependencyVersionMap = {
 	"@trpc/tanstack-react-query": "^11.5.0",
 	"@trpc/server": "^11.5.0",
 	"@trpc/client": "^11.5.0",
-	"next": "15.5.4",
+	next: "15.5.4",
 	convex: "^1.27.0",
 	"@convex-dev/react-query": "^0.0.0-alpha.8",
 	"convex-svelte": "^0.0.11",
@@ -699,7 +699,7 @@ async function getBackendFrameworkChoice(backendFramework, frontends) {
 	if (hasFullstackFrontend) backendOptions.push({
 		value: "self",
 		label: "Self (Fullstack)",
-		hint: "Use frontend's built-in backend capabilities"
+		hint: "Use frontend's built-in api routes"
 	});
 	backendOptions.push({
 		value: "hono",
@@ -4120,6 +4120,10 @@ async function setupExamples(config) {
 			dependencies: ["ai", "@ai-sdk/google"],
 			projectDir: apiDir$1
 		});
+		if (backend === "self" && webClientDirExists) await addPackageDependency({
+			dependencies: ["ai", "@ai-sdk/google"],
+			projectDir: webClientDir
+		});
 	}
 }
 
@@ -4251,6 +4255,10 @@ async function setupApi(config) {
 				dependencies: apiDeps.server.dependencies,
 				projectDir: apiPackageDir
 			});
+			if (backend === "self" && webDirExists) await addPackageDependency({
+				dependencies: apiDeps.server.dependencies,
+				projectDir: webDir
+			});
 			const frameworkDeps = [];
 			if (backend === "hono") frameworkDeps.push("hono");
 			else if (backend === "elysia") frameworkDeps.push("elysia");
@@ -4484,6 +4492,34 @@ function generateAuthSecret(length = 32) {
 
 //#endregion
 //#region src/helpers/core/env-setup.ts
+function getClientServerVar(frontend, backend) {
+	const hasNextJs = frontend.includes("next");
+	const hasNuxt = frontend.includes("nuxt");
+	const hasSvelte = frontend.includes("svelte");
+	if (backend === "self") return {
+		key: "",
+		value: "",
+		write: false
+	};
+	let key = "VITE_SERVER_URL";
+	if (hasNextJs) key = "NEXT_PUBLIC_SERVER_URL";
+	else if (hasNuxt) key = "NUXT_PUBLIC_SERVER_URL";
+	else if (hasSvelte) key = "PUBLIC_SERVER_URL";
+	return {
+		key,
+		value: "http://localhost:3000",
+		write: true
+	};
+}
+function getConvexVar(frontend) {
+	const hasNextJs = frontend.includes("next");
+	const hasNuxt = frontend.includes("nuxt");
+	const hasSvelte = frontend.includes("svelte");
+	if (hasNextJs) return "NEXT_PUBLIC_CONVEX_URL";
+	if (hasNuxt) return "NUXT_PUBLIC_CONVEX_URL";
+	if (hasSvelte) return "PUBLIC_CONVEX_URL";
+	return "VITE_CONVEX_URL";
+}
 async function addEnvVariablesToFile(filePath, variables) {
 	await fs.ensureDir(path.dirname(filePath));
 	let envContent = "";
@@ -4542,22 +4578,13 @@ async function setupEnvironmentVariables(config) {
 	if (hasReactRouter || hasTanStackRouter || hasTanStackStart || hasNextJs || hasNuxt || hasSolid || hasSvelte) {
 		const clientDir = path.join(projectDir, "apps/web");
 		if (await fs.pathExists(clientDir)) {
-			let envVarName = "VITE_SERVER_URL";
-			let serverUrl = "http://localhost:3000";
-			if (hasNextJs) envVarName = "NEXT_PUBLIC_SERVER_URL";
-			else if (hasNuxt) envVarName = "NUXT_PUBLIC_SERVER_URL";
-			else if (hasSvelte) envVarName = "PUBLIC_SERVER_URL";
-			if (backend === "convex") {
-				if (hasNextJs) envVarName = "NEXT_PUBLIC_CONVEX_URL";
-				else if (hasNuxt) envVarName = "NUXT_PUBLIC_CONVEX_URL";
-				else if (hasSvelte) envVarName = "PUBLIC_CONVEX_URL";
-				else envVarName = "VITE_CONVEX_URL";
-				serverUrl = "https://<YOUR_CONVEX_URL>";
-			}
+			const baseVar = getClientServerVar(frontend, backend);
+			const envVarName = backend === "convex" ? getConvexVar(frontend) : baseVar.key;
+			const serverUrl = backend === "convex" ? "https://<YOUR_CONVEX_URL>" : baseVar.value;
 			const clientVars = [{
 				key: envVarName,
 				value: serverUrl,
-				condition: backend !== "self"
+				condition: backend === "convex" ? true : baseVar.write
 			}];
 			if (backend === "convex" && auth === "clerk") {
 				if (hasNextJs) clientVars.push({
@@ -4649,7 +4676,8 @@ async function setupEnvironmentVariables(config) {
 	}
 	const serverDir = path.join(projectDir, "apps/server");
 	let corsOrigin = "http://localhost:3001";
-	if (hasReactRouter || hasSvelte) corsOrigin = "http://localhost:5173";
+	if (backend === "self") corsOrigin = "http://localhost:3001";
+	else if (hasReactRouter || hasSvelte) corsOrigin = "http://localhost:5173";
 	let databaseUrl = null;
 	if (database !== "none" && dbSetup === "none") switch (database) {
 		case "postgres":
@@ -4663,7 +4691,10 @@ 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 {
+				const dbAppDir = backend === "self" ? "apps/web" : "apps/server";
+				databaseUrl = `file:${path.join(config.projectDir, dbAppDir, "local.db")}`;
+			}
 			break;
 	}
 	const serverVars = [
@@ -4674,7 +4705,7 @@ async function setupEnvironmentVariables(config) {
 		},
 		{
 			key: "BETTER_AUTH_URL",
-			value: "http://localhost:3000",
+			value: backend === "self" ? "http://localhost:3001" : "http://localhost:3000",
 			condition: !!auth
 		},
 		{
@@ -4742,9 +4773,10 @@ async function setupEnvironmentVariables(config) {
 //#endregion
 //#region src/helpers/database-providers/d1-setup.ts
 async function setupCloudflareD1(config) {
-	const { projectDir, serverDeploy, orm } = config;
+	const { projectDir, serverDeploy, orm, backend } = config;
 	if (serverDeploy === "wrangler") {
-		const envPath = path.join(projectDir, "apps/server", ".env");
+		const targetApp = backend === "self" ? "apps/web" : "apps/server";
+		const envPath = path.join(projectDir, targetApp, ".env");
 		const variables = [
 			{
 				key: "CLOUDFLARE_ACCOUNT_ID",
@@ -4767,7 +4799,8 @@ async function setupCloudflareD1(config) {
 		} catch (_err) {}
 	}
 	if ((serverDeploy === "wrangler" || serverDeploy === "alchemy") && orm === "prisma") {
-		const envPath = path.join(projectDir, "apps/server", ".env");
+		const targetApp2 = backend === "self" ? "apps/web" : "apps/server";
+		const envPath = path.join(projectDir, targetApp2, ".env");
 		const variables = [{
 			key: "DATABASE_URL",
 			value: `file:${path.join(projectDir, "apps/server", "local.db")}`,
@@ -4776,7 +4809,7 @@ async function setupCloudflareD1(config) {
 		try {
 			await addEnvVariablesToFile(envPath, variables);
 		} catch (_err) {}
-		const serverDir = path.join(projectDir, "apps/server");
+		const serverDir = path.join(projectDir, backend === "self" ? "apps/web" : "apps/server");
 		await addPackageDependency({
 			dependencies: ["@prisma/adapter-d1"],
 			projectDir: serverDir
@@ -4869,9 +4902,10 @@ async function initMongoDBAtlas(serverDir) {
 		return null;
 	}
 }
-async function writeEnvFile$3(projectDir, config) {
+async function writeEnvFile$3(projectDir, backend, config) {
 	try {
-		const envPath = path.join(projectDir, "apps/server", ".env");
+		const targetApp = backend === "self" ? "apps/web" : "apps/server";
+		const envPath = path.join(projectDir, targetApp, ".env");
 		const variables = [{
 			key: "DATABASE_URL",
 			value: config?.connectionString ?? "mongodb://localhost:27017/mydb",
@@ -4900,16 +4934,16 @@ ${pc.green("MongoDB Atlas Manual Setup Instructions:")}
 `);
 }
 async function setupMongoDBAtlas(config, cliInput) {
-	const { projectDir } = config;
+	const { projectDir, backend } = config;
 	const manualDb = cliInput?.manualDb ?? false;
 	const mainSpinner = spinner();
 	mainSpinner.start("Setting up MongoDB Atlas...");
-	const serverDir = path.join(projectDir, "apps/server");
+	const serverDir = path.join(projectDir, "packages/db");
 	try {
 		await fs.ensureDir(serverDir);
 		if (manualDb) {
 			mainSpinner.stop("MongoDB Atlas manual setup selected");
-			await writeEnvFile$3(projectDir);
+			await writeEnvFile$3(projectDir, backend);
 			displayManualSetupInstructions$3();
 			return;
 		}
@@ -4929,25 +4963,25 @@ async function setupMongoDBAtlas(config, cliInput) {
 		if (isCancel(mode)) return exitCancelled("Operation cancelled");
 		if (mode === "manual") {
 			mainSpinner.stop("MongoDB Atlas manual setup selected");
-			await writeEnvFile$3(projectDir);
+			await writeEnvFile$3(projectDir, backend);
 			displayManualSetupInstructions$3();
 			return;
 		}
 		mainSpinner.stop("MongoDB Atlas setup ready");
 		const config$1 = await initMongoDBAtlas(serverDir);
 		if (config$1) {
-			await writeEnvFile$3(projectDir, config$1);
+			await writeEnvFile$3(projectDir, backend, config$1);
 			log.success(pc.green("MongoDB Atlas setup complete! Connection saved to .env file."));
 		} else {
 			log.warn(pc.yellow("Falling back to local MongoDB configuration"));
-			await writeEnvFile$3(projectDir);
+			await writeEnvFile$3(projectDir, backend);
 			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);
+			await writeEnvFile$3(projectDir, backend);
 			displayManualSetupInstructions$3();
 		} catch {}
 	}
@@ -5004,7 +5038,7 @@ async function executeNeonCommand(packageManager, commandArgsString, spinnerText
 }
 async function createNeonProject(projectName, regionId, packageManager) {
 	try {
-		const commandArgsString = `neonctl projects create --name ${projectName} --region-id ${regionId} --output json`;
+		const commandArgsString = `neonctl@latest projects create --name ${projectName} --region-id ${regionId} --output json`;
 		const { stdout } = await executeNeonCommand(packageManager, commandArgsString, `Creating Neon project "${projectName}"...`);
 		const response = JSON.parse(stdout);
 		if (response.project && response.connection_uris && response.connection_uris.length > 0) {
@@ -5024,8 +5058,9 @@ async function createNeonProject(projectName, regionId, packageManager) {
 		consola$1.error(pc.red("Failed to create Neon project"));
 	}
 }
-async function writeEnvFile$2(projectDir, config) {
-	const envPath = path.join(projectDir, "apps/server", ".env");
+async function writeEnvFile$2(projectDir, backend, config) {
+	const targetApp = backend === "self" ? "apps/web" : "apps/server";
+	const envPath = path.join(projectDir, targetApp, ".env");
 	const variables = [{
 		key: "DATABASE_URL",
 		value: config?.connectionString ?? "postgresql://postgres:postgres@localhost:5432/mydb?schema=public",
@@ -5034,16 +5069,17 @@ async function writeEnvFile$2(projectDir, config) {
 	await addEnvVariablesToFile(envPath, variables);
 	return true;
 }
-async function setupWithNeonDb(projectDir, packageManager) {
+async function setupWithNeonDb(projectDir, packageManager, backend) {
 	try {
 		const s = spinner();
 		s.start("Creating Neon database using neondb...");
-		const serverDir = path.join(projectDir, "apps/server");
-		await fs.ensureDir(serverDir);
-		const packageCmd = getPackageExecutionCommand(packageManager, "neondb --yes");
+		const targetApp = backend === "self" ? "apps/web" : "apps/server";
+		const targetDir = path.join(projectDir, targetApp);
+		await fs.ensureDir(targetDir);
+		const packageCmd = getPackageExecutionCommand(packageManager, "neondb@latest --yes");
 		await execa(packageCmd, {
 			shell: true,
-			cwd: serverDir
+			cwd: targetDir
 		});
 		s.stop(pc.green("Neon database created successfully!"));
 		return true;
@@ -5052,23 +5088,23 @@ async function setupWithNeonDb(projectDir, packageManager) {
 		throw error;
 	}
 }
-function displayManualSetupInstructions$2() {
+function displayManualSetupInstructions$2(target) {
 	log.info(`Manual Neon PostgreSQL Setup Instructions:
 
 1. Visit https://neon.tech and create an account
 2. Create a new project from the dashboard
 3. Get your connection string
-4. Add the database URL to the .env file in apps/server/.env
+4. Add the database URL to the .env file in ${target}/.env
 
 DATABASE_URL="your_connection_string"`);
 }
 async function setupNeonPostgres(config, cliInput) {
-	const { packageManager, projectDir } = config;
+	const { packageManager, projectDir, backend } = config;
 	const manualDb = cliInput?.manualDb ?? false;
 	try {
 		if (manualDb) {
-			await writeEnvFile$2(projectDir);
-			displayManualSetupInstructions$2();
+			await writeEnvFile$2(projectDir, backend);
+			displayManualSetupInstructions$2(backend === "self" ? "apps/web" : "apps/server");
 			return;
 		}
 		const mode = await select({
@@ -5086,8 +5122,8 @@ async function setupNeonPostgres(config, cliInput) {
 		});
 		if (isCancel(mode)) return exitCancelled("Operation cancelled");
 		if (mode === "manual") {
-			await writeEnvFile$2(projectDir);
-			displayManualSetupInstructions$2();
+			await writeEnvFile$2(projectDir, backend);
+			displayManualSetupInstructions$2(backend === "self" ? "apps/web" : "apps/server");
 			return;
 		}
 		const setupMethod = await select({
@@ -5104,7 +5140,7 @@ async function setupNeonPostgres(config, cliInput) {
 			initialValue: "neondb"
 		});
 		if (isCancel(setupMethod)) return exitCancelled("Operation cancelled");
-		if (setupMethod === "neondb") await setupWithNeonDb(projectDir, packageManager);
+		if (setupMethod === "neondb") await setupWithNeonDb(projectDir, packageManager, backend);
 		else {
 			const suggestedProjectName = path.basename(projectDir);
 			const projectName = await text({
@@ -5122,22 +5158,22 @@ async function setupNeonPostgres(config, cliInput) {
 			if (!neonConfig) throw new Error("Failed to create project - couldn't get connection information");
 			const finalSpinner = spinner();
 			finalSpinner.start("Configuring database connection");
-			await fs.ensureDir(path.join(projectDir, "apps/server"));
-			await writeEnvFile$2(projectDir, neonConfig);
+			await writeEnvFile$2(projectDir, backend, neonConfig);
 			finalSpinner.stop("Neon database configured!");
 		}
 	} catch (error) {
 		if (error instanceof Error) consola$1.error(pc.red(error.message));
-		await writeEnvFile$2(projectDir);
-		displayManualSetupInstructions$2();
+		await writeEnvFile$2(projectDir, backend);
+		displayManualSetupInstructions$2(backend === "self" ? "apps/web" : "apps/server");
 	}
 }
 
 //#endregion
 //#region src/helpers/database-providers/planetscale-setup.ts
 async function setupPlanetScale(config) {
-	const { projectDir, database, orm } = config;
-	const envPath = path.join(projectDir, "apps/server", ".env");
+	const { projectDir, database, orm, backend } = config;
+	const targetApp = backend === "self" ? "apps/web" : "apps/server";
+	const envPath = path.join(projectDir, targetApp, ".env");
 	if (database === "mysql" && orm === "drizzle") {
 		const variables = [
 			{
@@ -5161,7 +5197,7 @@ async function setupPlanetScale(config) {
 				condition: true
 			}
 		];
-		await fs.ensureDir(path.join(projectDir, "apps/server"));
+		await fs.ensureDir(path.join(projectDir, targetApp));
 		await addEnvVariablesToFile(envPath, variables);
 	}
 	if (database === "postgres" && orm === "prisma") {
@@ -5170,7 +5206,7 @@ async function setupPlanetScale(config) {
 			value: "postgresql://username:password@host/database?sslaccept=strict",
 			condition: true
 		}];
-		await fs.ensureDir(path.join(projectDir, "apps/server"));
+		await fs.ensureDir(path.join(projectDir, targetApp));
 		await addEnvVariablesToFile(envPath, variables);
 	}
 	if (database === "postgres" && orm === "drizzle") {
@@ -5179,7 +5215,7 @@ async function setupPlanetScale(config) {
 			value: "postgresql://username:password@host/database?sslmode=verify-full",
 			condition: true
 		}];
-		await fs.ensureDir(path.join(projectDir, "apps/server"));
+		await fs.ensureDir(path.join(projectDir, targetApp));
 		await addEnvVariablesToFile(envPath, variables);
 	}
 	if (database === "mysql" && orm === "prisma") {
@@ -5188,7 +5224,7 @@ async function setupPlanetScale(config) {
 			value: "mysql://username:password@host/database?sslaccept=strict",
 			condition: true
 		}];
-		await fs.ensureDir(path.join(projectDir, "apps/server"));
+		await fs.ensureDir(path.join(projectDir, targetApp));
 		await addEnvVariablesToFile(envPath, variables);
 	}
 }
@@ -5258,7 +5294,7 @@ async function initPrismaDatabase(serverDir, packageManager) {
 	try {
 		const prismaDir = path.join(serverDir, "prisma");
 		await fs.ensureDir(prismaDir);
-		log.info("Starting Prisma PostgreSQL setup. Please follow the instructions below:");
+		log.info("Starting Prisma PostgreSQL setup.");
 		const prismaInitCommand = getPackageExecutionCommand(packageManager, "prisma init --db");
 		await execa(prismaInitCommand, {
 			cwd: serverDir,
@@ -5280,9 +5316,10 @@ async function initPrismaDatabase(serverDir, packageManager) {
 		return null;
 	}
 }
-async function writeEnvFile$1(projectDir, config) {
+async function writeEnvFile$1(projectDir, backend, config) {
 	try {
-		const envPath = path.join(projectDir, "apps/server", ".env");
+		const targetApp = backend === "self" ? "apps/web" : "apps/server";
+		const envPath = path.join(projectDir, targetApp, ".env");
 		const variables = [{
 			key: "DATABASE_URL",
 			value: config?.databaseUrl ?? "postgresql://postgres:postgres@localhost:5432/mydb?schema=public",
@@ -5298,23 +5335,23 @@ async function writeEnvFile$1(projectDir, config) {
 		consola$1.error("Failed to update environment configuration");
 	}
 }
-async function addDotenvImportToPrismaConfig(projectDir) {
+async function addDotenvImportToPrismaConfig(projectDir, backend) {
 	try {
 		const prismaConfigPath = path.join(projectDir, "packages/db/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 from "dotenv";\ndotenv.config({ path: "${backend === "self" ? "../../apps/web/.env" : "../../apps/server/.env"}" });\n${content}`;
 		await fs.writeFile(prismaConfigPath, content);
 	} catch (_error) {
 		consola$1.error("Failed to update prisma.config.ts");
 	}
 }
-function displayManualSetupInstructions$1() {
+function displayManualSetupInstructions$1(target) {
 	log.info(`Manual Prisma PostgreSQL Setup Instructions:
 
 1. Visit https://console.prisma.io and create an account
 2. Create a new PostgreSQL database from the dashboard
 3. Get your database URL
-4. Add the database URL to the .env file in apps/server/.env
+4. Add the database URL to the .env file in ${target}/.env
 
 DATABASE_URL="your_database_url"`);
 }
@@ -5332,14 +5369,14 @@ async function addPrismaAccelerateExtension(projectDir) {
 	}
 }
 async function setupPrismaPostgres(config, cliInput) {
-	const { packageManager, projectDir, orm } = config;
+	const { packageManager, projectDir, orm, backend } = config;
 	const manualDb = cliInput?.manualDb ?? false;
-	const serverDir = path.join(projectDir, "apps/server");
+	const dbDir = path.join(projectDir, "packages/db");
 	try {
-		await fs.ensureDir(serverDir);
+		await fs.ensureDir(dbDir);
 		if (manualDb) {
-			await writeEnvFile$1(projectDir);
-			displayManualSetupInstructions$1();
+			await writeEnvFile$1(projectDir, backend);
+			displayManualSetupInstructions$1(backend === "self" ? "apps/web" : "apps/server");
 			return;
 		}
 		const mode = await select({
@@ -5357,8 +5394,8 @@ async function setupPrismaPostgres(config, cliInput) {
 		});
 		if (isCancel(mode)) return exitCancelled("Operation cancelled");
 		if (mode === "manual") {
-			await writeEnvFile$1(projectDir);
-			displayManualSetupInstructions$1();
+			await writeEnvFile$1(projectDir, backend);
+			displayManualSetupInstructions$1(backend === "self" ? "apps/web" : "apps/server");
 			return;
 		}
 		const setupOptions = [{
@@ -5378,26 +5415,26 @@ async function setupPrismaPostgres(config, cliInput) {
 		});
 		if (isCancel(setupMethod)) return exitCancelled("Operation cancelled");
 		let prismaConfig = null;
-		if (setupMethod === "create-db") prismaConfig = await setupWithCreateDb(serverDir, packageManager, orm);
-		else prismaConfig = await initPrismaDatabase(serverDir, packageManager);
+		if (setupMethod === "create-db") prismaConfig = await setupWithCreateDb(dbDir, packageManager, orm);
+		else prismaConfig = await initPrismaDatabase(dbDir, packageManager);
 		if (prismaConfig) {
-			await writeEnvFile$1(projectDir, prismaConfig);
+			await writeEnvFile$1(projectDir, backend, prismaConfig);
 			if (orm === "prisma") {
-				await addDotenvImportToPrismaConfig(projectDir);
+				await addDotenvImportToPrismaConfig(projectDir, backend);
 				await addPrismaAccelerateExtension(projectDir);
 			}
 			const connectionType = orm === "drizzle" ? "direct connection" : "Prisma Accelerate";
 			log.success(pc.green(`Prisma Postgres database configured successfully with ${connectionType}!`));
 			if (prismaConfig.claimUrl) log.info(pc.blue(`Claim URL saved to .env: ${prismaConfig.claimUrl}`));
 		} else {
-			await writeEnvFile$1(projectDir);
-			displayManualSetupInstructions$1();
+			await writeEnvFile$1(projectDir, backend);
+			displayManualSetupInstructions$1(backend === "self" ? "apps/web" : "apps/server");
 		}
 	} catch (error) {
 		consola$1.error(pc.red(`Error during Prisma Postgres setup: ${error instanceof Error ? error.message : String(error)}`));
 		try {
-			await writeEnvFile$1(projectDir);
-			displayManualSetupInstructions$1();
+			await writeEnvFile$1(projectDir, backend);
+			displayManualSetupInstructions$1(backend === "self" ? "apps/web" : "apps/server");
 		} catch {}
 		log.info("Setup completed with manual configuration required.");
 	}
@@ -5405,9 +5442,10 @@ async function setupPrismaPostgres(config, cliInput) {
 
 //#endregion
 //#region src/helpers/database-providers/supabase-setup.ts
-async function writeSupabaseEnvFile(projectDir, databaseUrl) {
+async function writeSupabaseEnvFile(projectDir, backend, databaseUrl) {
 	try {
-		const envPath = path.join(projectDir, "apps/server", ".env");
+		const targetApp = backend === "self" ? "apps/web" : "apps/server";
+		const envPath = path.join(projectDir, targetApp, ".env");
 		const dbUrlToUse = databaseUrl || "postgresql://postgres:postgres@127.0.0.1:54322/postgres";
 		await addEnvVariablesToFile(envPath, [{
 			key: "DATABASE_URL",
@@ -5493,14 +5531,14 @@ ${pc.dim(output)}` : ""}
 			${pc.gray("DATABASE_URL=\"your_supabase_db_url\"")}`);
 }
 async function setupSupabase(config, cliInput) {
-	const { projectDir, packageManager } = config;
+	const { projectDir, packageManager, backend } = config;
 	const manualDb = cliInput?.manualDb ?? false;
 	const serverDir = path.join(projectDir, "packages", "db");
 	try {
 		await fs.ensureDir(serverDir);
 		if (manualDb) {
 			displayManualSupabaseInstructions();
-			await writeSupabaseEnvFile(projectDir, "");
+			await writeSupabaseEnvFile(projectDir, backend, "");
 			return;
 		}
 		const mode = await select({
@@ -5519,7 +5557,7 @@ async function setupSupabase(config, cliInput) {
 		if (isCancel(mode)) return exitCancelled("Operation cancelled");
 		if (mode === "manual") {
 			displayManualSupabaseInstructions();
-			await writeSupabaseEnvFile(projectDir, "");
+			await writeSupabaseEnvFile(projectDir, backend, "");
 			return;
 		}
 		if (!await initializeSupabase(serverDir, packageManager)) {
@@ -5532,7 +5570,7 @@ async function setupSupabase(config, cliInput) {
 			return;
 		}
 		const dbUrl = extractDbUrl(supabaseOutput);
-		if (dbUrl) if (await writeSupabaseEnvFile(projectDir, dbUrl)) log.success(pc.green("Supabase local development setup ready!"));
+		if (dbUrl) if (await writeSupabaseEnvFile(projectDir, backend, dbUrl)) log.success(pc.green("Supabase local development setup ready!"));
 		else {
 			log.error(pc.red("Supabase setup completed, but failed to update .env automatically."));
 			displayManualSupabaseInstructions(supabaseOutput);
@@ -5660,8 +5698,9 @@ async function createTursoDatabase(dbName, groupName) {
 		s.stop(pc.red("Failed to retrieve database connection details"));
 	}
 }
-async function writeEnvFile(projectDir, config) {
-	const envPath = path.join(projectDir, "apps/server", ".env");
+async function writeEnvFile(projectDir, backend, config) {
+	const targetApp = backend === "self" ? "apps/web" : "apps/server";
+	const envPath = path.join(projectDir, targetApp, ".env");
 	const variables = [{
 		key: "DATABASE_URL",
 		value: config?.dbUrl ?? "",
@@ -5685,12 +5724,12 @@ DATABASE_URL=your_database_url
 DATABASE_AUTH_TOKEN=your_auth_token`);
 }
 async function setupTurso(config, cliInput) {
-	const { orm, projectDir } = config;
+	const { orm, projectDir, backend } = config;
 	const manualDb = cliInput?.manualDb ?? false;
 	const setupSpinner = spinner();
 	try {
 		if (manualDb) {
-			await writeEnvFile(projectDir);
+			await writeEnvFile(projectDir, backend);
 			displayManualSetupInstructions();
 			return;
 		}
@@ -5709,7 +5748,7 @@ async function setupTurso(config, cliInput) {
 		});
 		if (isCancel(mode)) return exitCancelled("Operation cancelled");
 		if (mode === "manual") {
-			await writeEnvFile(projectDir);
+			await writeEnvFile(projectDir, backend);
 			displayManualSetupInstructions();
 			return;
 		}
@@ -5719,7 +5758,7 @@ async function setupTurso(config, cliInput) {
 		if (platform === "win32") {
 			if (setupSpinner) setupSpinner.stop(pc.yellow("Turso setup not supported on Windows"));
 			log.warn(pc.yellow("Automatic Turso setup is not supported on Windows."));
-			await writeEnvFile(projectDir);
+			await writeEnvFile(projectDir, backend);
 			displayManualSetupInstructions();
 			return;
 		}
@@ -5731,7 +5770,7 @@ async function setupTurso(config, cliInput) {
 			});
 			if (isCancel(shouldInstall)) return exitCancelled("Operation cancelled");
 			if (!shouldInstall) {
-				await writeEnvFile(projectDir);
+				await writeEnvFile(projectDir, backend);
 				displayManualSetupInstructions();
 				return;
 			}
@@ -5753,7 +5792,7 @@ async function setupTurso(config, cliInput) {
 			dbName = dbNameResponse;
 			try {
 				const config$1 = await createTursoDatabase(dbName, selectedGroup);
-				await writeEnvFile(projectDir, config$1);
+				await writeEnvFile(projectDir, backend, config$1);
 				success = true;
 			} catch (error) {
 				if (error instanceof Error && error.message === "DATABASE_EXISTS") {
@@ -5766,7 +5805,7 @@ async function setupTurso(config, cliInput) {
 	} catch (error) {
 		if (setupSpinner) setupSpinner.stop(pc.red("Turso CLI availability check failed"));
 		consola.error(pc.red(`Error during Turso setup: ${error instanceof Error ? error.message : String(error)}`));
-		await writeEnvFile(projectDir);
+		await writeEnvFile(projectDir, backend);
 		displayManualSetupInstructions();
 		log.success("Setup completed with manual configuration required.");
 	}
@@ -5788,26 +5827,34 @@ async function setupDatabase(config, cliInput) {
 	const dbPackageDir = path.join(projectDir, "packages/db");
 	if (!await fs.pathExists(dbPackageDir)) return;
 	try {
-		if (orm === "prisma") if (database === "mysql" && dbSetup === "planetscale") await addPackageDependency({
-			dependencies: [
-				"@prisma/client",
-				"@prisma/adapter-planetscale",
-				"@planetscale/database"
-			],
-			devDependencies: ["prisma"],
-			projectDir: dbPackageDir
-		});
-		else if (database === "sqlite" && dbSetup === "turso") await addPackageDependency({
-			dependencies: ["@prisma/client", "@prisma/adapter-libsql"],
-			devDependencies: ["prisma"],
-			projectDir: dbPackageDir
-		});
-		else await addPackageDependency({
-			dependencies: ["@prisma/client"],
-			devDependencies: ["prisma"],
-			projectDir: dbPackageDir
-		});
-		else if (orm === "drizzle") {
+		if (orm === "prisma") {
+			if (database === "mysql" && dbSetup === "planetscale") await addPackageDependency({
+				dependencies: [
+					"@prisma/client",
+					"@prisma/adapter-planetscale",
+					"@planetscale/database"
+				],
+				devDependencies: ["prisma"],
+				projectDir: dbPackageDir
+			});
+			else if (database === "sqlite" && dbSetup === "turso") await addPackageDependency({
+				dependencies: ["@prisma/client", "@prisma/adapter-libsql"],
+				devDependencies: ["prisma"],
+				projectDir: dbPackageDir
+			});
+			else await addPackageDependency({
+				dependencies: ["@prisma/client"],
+				devDependencies: ["prisma"],
+				projectDir: dbPackageDir
+			});
+			if (backend === "self") {
+				const webDir = path.join(projectDir, "apps/web");
+				if (await fs.pathExists(webDir)) await addPackageDependency({
+					dependencies: ["@prisma/client"],
+					projectDir: webDir
+				});
+			}
+		} else if (orm === "drizzle") {
 			if (database === "sqlite") await addPackageDependency({
 				dependencies: [
 					"drizzle-orm",
@@ -6261,15 +6308,14 @@ async function initializeGit(projectDir, useGit) {
 async function setupPayments(config) {
 	const { payments, projectDir, frontend } = config;
 	if (!payments || payments === "none") return;
-	const serverDir = path.join(projectDir, "apps/server");
 	const clientDir = path.join(projectDir, "apps/web");
-	const serverDirExists = await fs.pathExists(serverDir);
+	const authDir = path.join(projectDir, "packages/auth");
 	const clientDirExists = await fs.pathExists(clientDir);
-	if (!serverDirExists) return;
+	const authDirExists = await fs.pathExists(authDir);
 	if (payments === "polar") {
-		await addPackageDependency({
+		if (authDirExists) await addPackageDependency({
 			dependencies: ["@polar-sh/better-auth", "@polar-sh/sdk"],
-			projectDir: serverDir
+			projectDir: authDir
 		});
 		if (clientDirExists) {
 			if (frontend.some((f) => [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-better-t-stack",
-  "version": "2.50.0-canary.08568a05",
+  "version": "2.50.0-canary.5b25d7db",
   "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/api/orpc/fullstack/next/src/app/api/rpc/[[...rest]]/route.ts.hbs

@@ -1,21 +1,50 @@
-import { RPCHandler } from '@orpc/server/fetch'
-import { createContext } from '@{{projectName}}/api/context'
-import { appRouter } from '@{{projectName}}/api/routers/index'
+import { createContext } from "@{{projectName}}/api/context";
+import { appRouter } from "@{{projectName}}/api/routers/index";
+import { OpenAPIHandler } from "@orpc/openapi/fetch";
+import { OpenAPIReferencePlugin } from "@orpc/openapi/plugins";
+import { ZodToJsonSchemaConverter } from "@orpc/zod/zod4";
+import { RPCHandler } from "@orpc/server/fetch";
+import { onError } from "@orpc/server";
+import { NextRequest } from "next/server";
 
-const handler = new RPCHandler(appRouter)
+const rpcHandler = new RPCHandler(appRouter, {
+	interceptors: [
+		onError((error) => {
+			console.error(error);
+		}),
+	],
+});
+const apiHandler = new OpenAPIHandler(appRouter, {
+	plugins: [
+		new OpenAPIReferencePlugin({
+			schemaConverters: [new ZodToJsonSchemaConverter()],
+		}),
+	],
+	interceptors: [
+		onError((error) => {
+			console.error(error);
+		}),
+	],
+});
 
-async function handleRequest(request: Request) {
-  const { response } = await handler.handle(request, {
-    prefix: '/api/rpc',
-    context: createContext(request)
-  })
+async function handleRequest(req: NextRequest) {
+	const rpcResult = await rpcHandler.handle(req, {
+		prefix: "/api/rpc",
+		context: await createContext(req),
+	});
+	if (rpcResult.response) return rpcResult.response;
 
-  return response ?? new Response('Not found', { status: 404 })
+	const apiResult = await apiHandler.handle(req, {
+		prefix: "/api/rpc/api",
+		context: await createContext(req),
+	});
+	if (apiResult.response) return apiResult.response;
+
+	return new Response("Not found", { status: 404 });
 }
 
-export const HEAD = handleRequest
-export const GET = handleRequest
-export const POST = handleRequest
-export const PUT = handleRequest
-export const PATCH = handleRequest
-export const DELETE = handleRequest
+export const GET = handleRequest;
+export const POST = handleRequest;
+export const PUT = handleRequest;
+export const PATCH = handleRequest;
+export const DELETE = handleRequest;

package/templates/api/orpc/web/nuxt/app/plugins/orpc.ts.hbs

@@ -1,5 +1,5 @@
 import { defineNuxtPlugin, useRuntimeConfig } from '#app'
-import type { AppRouterClient } from "@{{projectName}}/api/src/routers/index";
+import type { AppRouterClient } from "@{{projectName}}/api/routers/index";
 import { createORPCClient } from '@orpc/client'
 import { RPCLink } from '@orpc/client/fetch'
 import { createTanstackQueryUtils } from "@orpc/tanstack-query";

package/templates/api/orpc/web/react/base/src/utils/orpc.ts.hbs

@@ -3,7 +3,7 @@ import { RPCLink } from "@orpc/client/fetch";
 import { createTanstackQueryUtils } from "@orpc/tanstack-query";
 import { QueryCache, QueryClient } from "@tanstack/react-query";
 import { toast } from "sonner";
-import type { AppRouterClient } from "@{{projectName}}/api/src/routers/index";
+import type { AppRouterClient } from "@{{projectName}}/api/routers/index";
 
 export const queryClient = new QueryClient({
   queryCache: new QueryCache({
@@ -22,7 +22,7 @@ export const queryClient = new QueryClient({
 
 export const link = new RPCLink({
   {{#if (and (eq backend "self") (includes frontend "next"))}}
-  url: "/api/rpc",
+  url: `${typeof window !== "undefined" ? window.location.origin : "http://localhost:3001"}/api/rpc`,
   {{else if (includes frontend "next")}}
   url: `${process.env.NEXT_PUBLIC_SERVER_URL}/rpc`,
   {{else}}

package/templates/api/orpc/web/solid/src/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/solid-query";
-import type { AppRouterClient } from "@{{projectName}}/api/src/routers/index";
+import type { AppRouterClient } from "@{{projectName}}/api/routers/index";
 
 export const queryClient = new QueryClient({
   queryCache: new QueryCache({

package/templates/api/orpc/web/svelte/src/lib/orpc.ts.hbs

@@ -3,7 +3,7 @@ import { createORPCClient } from "@orpc/client";
 import { RPCLink } from "@orpc/client/fetch";
 import { createTanstackQueryUtils } from "@orpc/tanstack-query";
 import { QueryCache, QueryClient } from "@tanstack/svelte-query";
-import type { AppRouterClient } from "@{{projectName}}/api/src/routers/index";
+import type { AppRouterClient } from "@{{projectName}}/api/routers/index";
 
 export const queryClient = new QueryClient({
 	queryCache: new QueryCache({

package/templates/api/trpc/web/react/base/src/utils/trpc.ts.hbs

@@ -49,13 +49,13 @@ export const trpc = createTRPCOptionsProxy<AppRouter>({
 
 {{else if (includes frontend 'tanstack-start')}}
 import { createTRPCContext } from "@trpc/tanstack-react-query";
-import type { AppRouter } from "@{{projectName}}/api/src/routers/index";
+import type { AppRouter } from "@{{projectName}}/api/routers/index";
 
 export const { TRPCProvider, useTRPC, useTRPCClient } =
   createTRPCContext<AppRouter>();
 
 {{else}}
-import type { AppRouter } from "@{{projectName}}/api/src/routers/index";
+import type { AppRouter } from "@{{projectName}}/api/routers/index";
 import { QueryCache, QueryClient } from "@tanstack/react-query";
 import { createTRPCClient, httpBatchLink } from "@trpc/client";
 import { createTRPCOptionsProxy } from "@trpc/tanstack-react-query";

package/templates/auth/better-auth/server/base/src/index.ts.hbs

@@ -6,7 +6,7 @@ import { expo } from "@better-auth/expo";
 {{/if}}
 {{#if (eq payments "polar")}}
 import { polar, checkout, portal } from "@polar-sh/better-auth";
-import { polarClient } from "./payments";
+import { polarClient } from "./lib/payments";
 {{/if}}
 import prisma from "@{{projectName}}/db";
 
@@ -74,7 +74,7 @@ import { expo } from "@better-auth/expo";
 {{/if}}
 {{#if (eq payments "polar")}}
 import { polar, checkout, portal } from "@polar-sh/better-auth";
-import { polarClient } from "./payments";
+import { polarClient } from "./lib/payments";
 {{/if}}
 import { db } from "@{{projectName}}/db";
 import * as schema from "@{{projectName}}/db/schema/auth";
@@ -142,7 +142,7 @@ import { expo } from "@better-auth/expo";
 {{/if}}
 {{#if (eq payments "polar")}}
 import { polar, checkout, portal } from "@polar-sh/better-auth";
-import { polarClient } from "./payments";
+import { polarClient } from "./lib/payments";
 {{/if}}
 import { db } from "@{{projectName}}/db";
 import * as schema from "@{{projectName}}/db/schema/auth";
@@ -224,7 +224,7 @@ import { expo } from "@better-auth/expo";
 {{/if}}
 {{#if (eq payments "polar")}}
 import { polar, checkout, portal } from "@polar-sh/better-auth";
-import { polarClient } from "./payments";
+import { polarClient } from "./lib/payments";
 {{/if}}
 import { client } from "@{{projectName}}/db";
 
@@ -285,7 +285,7 @@ import { expo } from "@better-auth/expo";
 {{/if}}
 {{#if (eq payments "polar")}}
 import { polar, checkout, portal } from "@polar-sh/better-auth";
-import { polarClient } from "./payments";
+import { polarClient } from "./lib/payments";
 {{/if}}
 
 export const auth = betterAuth<BetterAuthOptions>({

package/templates/auth/better-auth/web/react/base/src/lib/auth-client.ts.hbs

@@ -4,12 +4,14 @@ import { polarClient } from "@polar-sh/better-auth";
 {{/if}}
 
 export const authClient = createAuthClient({
+  {{#unless (eq backend "self")}}
   baseURL:
     {{#if (includes frontend "next")}}
       process.env.NEXT_PUBLIC_SERVER_URL,
     {{else}}
       import.meta.env.VITE_SERVER_URL,
     {{/if}}
+  {{/unless}}
 {{#if (eq payments "polar")}}
   plugins: [polarClient()]
 {{/if}}

package/templates/auth/better-auth/web/react/next/src/app/dashboard/page.tsx.hbs

@@ -1,3 +1,33 @@
+{{#if (eq backend "self")}}
+import { redirect } from "next/navigation";
+import Dashboard from "./dashboard";
+import { headers } from "next/headers";
+import { auth } from "@{{projectName}}/auth";
+
+export default async function DashboardPage() {
+	const session = await auth.api.getSession({
+		headers: await headers(),
+	});
+
+	if (!session?.user) {
+		redirect("/login");
+	}
+
+	{{#if (eq payments "polar")}}
+	const { data: customerState } = await auth.api.customer.state({
+		headers: await headers(),
+	});
+	{{/if}}
+
+	return (
+		<div>
+			<h1>Dashboard</h1>
+			<p>Welcome {session.user.name}</p>
+			<Dashboard session={session} {{#if (eq payments "polar")}}customerState={customerState}{{/if}} />
+		</div>
+	);
+}
+{{else}}
 import { authClient } from "@/lib/auth-client";
 import { redirect } from "next/navigation";
 import Dashboard from "./dashboard";
@@ -35,3 +65,4 @@ export default async function DashboardPage() {
 		</div>
 	);
 }
+{{/if}}

package/templates/db/drizzle/mysql/drizzle.config.ts.hbs

@@ -2,7 +2,11 @@ import { defineConfig } from "drizzle-kit";
 import dotenv from "dotenv";
 
 dotenv.config({
-	path: "../../apps/server/.env",
+    {{#if (eq backend "self")}}
+    path: "../../apps/web/.env",
+    {{else}}
+    path: "../../apps/server/.env",
+    {{/if}}
 });
 
 export default defineConfig({

package/templates/db/drizzle/postgres/drizzle.config.ts.hbs

@@ -2,7 +2,11 @@ import { defineConfig } from "drizzle-kit";
 import dotenv from "dotenv";
 
 dotenv.config({
-	path: "../../apps/server/.env",
+    {{#if (eq backend "self")}}
+    path: "../../apps/web/.env",
+    {{else}}
+    path: "../../apps/server/.env",
+    {{/if}}
 });
 
 export default defineConfig({

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

@@ -2,7 +2,11 @@ import { defineConfig } from "drizzle-kit";
 import dotenv from "dotenv";
 
 dotenv.config({
-	path: "../../apps/server/.env",
+    {{#if (eq backend "self")}}
+    path: "../../apps/web/.env",
+    {{else}}
+    path: "../../apps/server/.env",
+    {{/if}}
 });
 
 export default defineConfig({

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

@@ -3,7 +3,11 @@ import type { PrismaConfig } from "prisma";
 import dotenv from "dotenv";
 
 dotenv.config({
-	path: "../../apps/server/.env",
+    {{#if (eq backend "self")}}
+    path: "../../apps/web/.env",
+    {{else}}
+    path: "../../apps/server/.env",
+    {{/if}}
 });
 
 export default {

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

@@ -3,7 +3,11 @@ import type { PrismaConfig } from "prisma";
 import dotenv from "dotenv";
 
 dotenv.config({
-	path: "../../apps/server/.env",
+    {{#if (eq backend "self")}}
+    path: "../../apps/web/.env",
+    {{else}}
+    path: "../../apps/server/.env",
+    {{/if}}
 });
 
 export default {

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

@@ -4,7 +4,11 @@ import type { PrismaConfig } from "prisma";
 import dotenv from "dotenv";
 
 dotenv.config({
-	path: "../../apps/server/.env",
+    {{#if (eq backend "self")}}
+    path: "../../apps/web/.env",
+    {{else}}
+    path: "../../apps/server/.env",
+    {{/if}}
 });
 {{/unless}}
 

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

@@ -3,7 +3,11 @@ import type { PrismaConfig } from "prisma";
 import dotenv from "dotenv";
 
 dotenv.config({
-	path: "../../apps/server/.env",
+    {{#if (eq backend "self")}}
+    path: "../../apps/web/.env",
+    {{else}}
+    path: "../../apps/server/.env",
+    {{/if}}
 });
 
 export default {

package/templates/frontend/native/nativewind/tsconfig.json.hbs

@@ -14,10 +14,5 @@
     ".expo/types/**/*.ts",
     "expo-env.d.ts",
     "nativewind-env.d.ts"
-  ],
-  {{#unless (or (eq backend "convex") (eq backend "none"))}}
-  "references": [{
-    "path": "../server"
-  }]
-  {{/unless}}
+  ]
 }

package/templates/frontend/native/unistyles/tsconfig.json.hbs

@@ -8,10 +8,5 @@
       "@/*": ["*"]
     }
   },
-  "include": ["**/*.ts", "**/*.tsx", ".expo/types/**/*.ts", "expo-env.d.ts"],
-  {{#unless (or (eq backend "convex") (eq backend "none"))}}
-  "references": [{
-    "path": "../server"
-  }]
-  {{/unless}}
+  "include": ["**/*.ts", "**/*.tsx", ".expo/types/**/*.ts", "expo-env.d.ts"]
 }

package/templates/frontend/nuxt/tsconfig.json.hbs

@@ -13,10 +13,6 @@
     },
     {
       "path": "./.nuxt/tsconfig.node.json"
-    }{{#unless (or (eq backend "convex") (eq backend "none"))}},
-    {
-        "path": "../server"
     }
-  {{/unless}}
   ]
 }

package/templates/frontend/react/next/tsconfig.json.hbs

@@ -40,12 +40,5 @@
   ],
   "exclude": [
     "./node_modules"
-  ],
-  {{#unless (or (eq backend "convex") (eq backend "none"))}}
-  "references": [
-    {
-      "path": "../server"
-    }
   ]
-  {{/unless}}
 }

package/templates/frontend/react/react-router/tsconfig.json.hbs

@@ -23,10 +23,5 @@
     "resolveJsonModule": true,
     "skipLibCheck": true,
     "strict": true
-  },
-  {{#unless (or (eq backend "convex") (eq backend "none"))}}
-  "references": [{
-    "path": "../server"
-  }]
-  {{/unless}}
+  }
 }

package/templates/frontend/react/tanstack-router/src/routes/__root.tsx.hbs

@@ -8,7 +8,7 @@ import type { QueryClient } from "@tanstack/react-query";
 import { ReactQueryDevtools } from "@tanstack/react-query-devtools";
 import { useState } from "react";
 import { createTanstackQueryUtils } from "@orpc/tanstack-query";
-import type { AppRouterClient } from "@{{projectName}}/api/src/routers/index";
+import type { AppRouterClient } from "@{{projectName}}/api/routers/index";
 import { createORPCClient } from "@orpc/client";
 {{/if}}
 {{#if (eq api "trpc")}}

package/templates/frontend/react/tanstack-router/tsconfig.json.hbs

@@ -14,10 +14,5 @@
     "paths": {
       "@/*": ["./src/*"]
     }
-  },
-  {{#unless (or (eq backend "convex") (eq backend "none"))}}
-  "references": [{
-    "path": "../server"
-  }]
-  {{/unless}}
+  }
 }

package/templates/frontend/react/tanstack-start/src/routes/__root.tsx.hbs

@@ -66,7 +66,7 @@ export interface RouterAppContext {
 {{else}}
   {{#if (eq api "trpc")}}
 import type { TRPCOptionsProxy } from "@trpc/tanstack-react-query";
-import type { AppRouter } from "@{{projectName}}/api/src/routers/index";
+import type { AppRouter } from "@{{projectName}}/api/routers/index";
 export interface RouterAppContext {
   trpc: TRPCOptionsProxy<AppRouter>;
   queryClient: QueryClient;

package/templates/frontend/react/tanstack-start/tsconfig.json.hbs

@@ -24,10 +24,5 @@
     "paths": {
       "@/*": ["./src/*"]
     }
-  },
-  {{#unless (or (eq backend "convex") (eq backend "none"))}}
-  "references": [{
-    "path": "../server"
-  }]
-  {{/unless}}
+  }
 }

package/templates/frontend/solid/tsconfig.json.hbs

@@ -25,10 +25,5 @@
     "paths": {
       "@/*": ["./src/*"]
     }
-  },
-  {{#unless (or (eq backend "convex") (eq backend "none"))}}
-  "references": [{
-    "path": "../server"
-  }]
-  {{/unless}}
+  }
 }

package/templates/frontend/svelte/tsconfig.json.hbs

@@ -10,12 +10,7 @@
 		"sourceMap": true,
 		"strict": true,
 		"moduleResolution": "bundler"
-	},
-      {{#unless (or (eq backend "convex") (eq backend "none"))}}
-  "references": [{
-    "path": "../server"
-  }]
-  {{/unless}}
+	}
 	// Path aliases are handled by https://svelte.dev/docs/kit/configuration#alias
 	// except $lib which is handled by https://svelte.dev/docs/kit/configuration#files
 	//