create-better-t-stack 3.0.12 → 3.1.0

package/dist/cli.js

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

package/dist/{src-91MwhQvg.js → src-3Gylwm4_.js}

@@ -347,17 +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"];
+const FULLSTACK_FRONTENDS$1 = ["next", "tanstack-start"];
 function validateSelfBackendCompatibility(providedFlags, options, config) {
 	const backend = config.backend || options.backend;
 	const frontends = config.frontend || options.frontend || [];
 	if (backend === "self") {
 		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 (!(web.length === 1 && FULLSTACK_FRONTENDS$1.includes(web[0]))) exitWithError("Backend 'self' (fullstack) currently only supports Next.js and TanStack Start frontends. Please use --frontend next or --frontend tanstack-start. Support for Nuxt and SvelteKit 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) 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.");
+	if (providedFlags.has("backend") && !hasFullstackFrontend && backend === "self") exitWithError("Backend 'self' (fullstack) currently only supports Next.js and TanStack Start frontends. Please use --frontend next or --frontend tanstack-start or choose a different backend. Support for Nuxt and SvelteKit 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.`);
@@ -680,7 +680,7 @@ async function getAuthChoice(auth, hasDatabase, backend, frontend) {
 
 //#endregion
 //#region src/prompts/backend.ts
-const FULLSTACK_FRONTENDS = ["next"];
+const FULLSTACK_FRONTENDS = ["next", "tanstack-start"];
 async function getBackendFrameworkChoice(backendFramework, frontends) {
 	if (backendFramework !== void 0) return backendFramework;
 	const hasIncompatibleFrontend = frontends?.some((f) => f === "solid");
@@ -2757,8 +2757,8 @@ async function setupFrontendTemplates(projectDir, context) {
 					const apiWebBaseDir = path.join(PKG_ROOT, `templates/api/${context.api}/web/react/base`);
 					if (await fs.pathExists(apiWebBaseDir)) await processAndCopyFiles("**/*", apiWebBaseDir, webAppDir, context);
 				}
-				if (context.backend === "self" && reactFramework === "next" && context.api !== "none") {
-					const apiFullstackDir = path.join(PKG_ROOT, `templates/api/${context.api}/fullstack/next`);
+				if (context.backend === "self" && (reactFramework === "next" || reactFramework === "tanstack-start") && context.api !== "none") {
+					const apiFullstackDir = path.join(PKG_ROOT, `templates/api/${context.api}/fullstack/${reactFramework}`);
 					if (await fs.pathExists(apiFullstackDir)) await processAndCopyFiles("**/*", apiFullstackDir, webAppDir, context);
 				}
 			}
@@ -2956,8 +2956,8 @@ async function setupAuthTemplate(projectDir, context) {
 			if (reactFramework) {
 				const authWebFrameworkSrc = path.join(PKG_ROOT, `templates/auth/${authProvider}/web/react/${reactFramework}`);
 				if (await fs.pathExists(authWebFrameworkSrc)) await processAndCopyFiles("**/*", authWebFrameworkSrc, webAppDir, context);
-				if (context.backend === "self" && reactFramework === "next") {
-					const authFullstackSrc = path.join(PKG_ROOT, `templates/auth/${authProvider}/fullstack/next`);
+				if (context.backend === "self" && (reactFramework === "next" || reactFramework === "tanstack-start")) {
+					const authFullstackSrc = path.join(PKG_ROOT, `templates/auth/${authProvider}/fullstack/${reactFramework}`);
 					if (await fs.pathExists(authFullstackSrc)) await processAndCopyFiles("**/*", authFullstackSrc, webAppDir, context);
 				}
 			}
@@ -3102,8 +3102,8 @@ async function setupExamplesTemplate(projectDir, context) {
 					if (reactFramework) {
 						const exampleWebFrameworkSrc = path.join(exampleWebSrc, reactFramework);
 						if (await fs.pathExists(exampleWebFrameworkSrc)) await processAndCopyFiles("**/*", exampleWebFrameworkSrc, webAppDir, context, false);
-						if (context.backend === "self" && reactFramework === "next") {
-							const exampleFullstackSrc = path.join(exampleBaseDir, "fullstack/next");
+						if (context.backend === "self" && (reactFramework === "next" || reactFramework === "tanstack-start")) {
+							const exampleFullstackSrc = path.join(exampleBaseDir, `fullstack/${reactFramework}`);
 							if (await fs.pathExists(exampleFullstackSrc)) await processAndCopyFiles("**/*", exampleFullstackSrc, webAppDir, context, false);
 						}
 					}
@@ -3995,6 +3995,46 @@ async function addDeploymentToProject(input) {
 	}
 }
 
+//#endregion
+//#region src/utils/better-auth-plugin-setup.ts
+async function setupBetterAuthPlugins(projectDir, config) {
+	const authIndexPath = `${projectDir}/packages/auth/src/index.ts`;
+	const authIndexFile = tsProject.addSourceFileAtPath(authIndexPath);
+	if (!authIndexFile) {
+		console.warn("Better Auth index file not found, skipping plugin setup");
+		return;
+	}
+	const pluginsToAdd = [];
+	const importsToAdd = [];
+	if (config.backend === "self" && config.frontend?.includes("tanstack-start")) {
+		pluginsToAdd.push("reactStartCookies()");
+		importsToAdd.push("import { reactStartCookies } from \"better-auth/react-start\";");
+	}
+	if (config.frontend?.includes("native-nativewind") || config.frontend?.includes("native-unistyles")) {
+		pluginsToAdd.push("expo()");
+		importsToAdd.push("import { expo } from \"@better-auth/expo\";");
+	}
+	if (pluginsToAdd.length === 0) return;
+	importsToAdd.forEach((importStatement) => {
+		if (!authIndexFile.getImportDeclaration((declaration) => declaration.getModuleSpecifierValue().includes(importStatement.split("\"")[1]))) authIndexFile.insertImportDeclaration(0, {
+			moduleSpecifier: importStatement.split("\"")[1],
+			namedImports: [importStatement.split("{")[1].split("}")[0].trim()]
+		});
+	});
+	const betterAuthCall = authIndexFile.getDescendantsOfKind(SyntaxKind.CallExpression).find((call) => call.getExpression().getText() === "betterAuth");
+	if (betterAuthCall) {
+		const configObject = betterAuthCall.getArguments()[0];
+		if (configObject && configObject.getKind() === SyntaxKind.ObjectLiteralExpression) {
+			const objLiteral = configObject.asKindOrThrow(SyntaxKind.ObjectLiteralExpression);
+			const pluginsArray = ensureArrayProperty(objLiteral, "plugins");
+			pluginsToAdd.forEach((plugin) => {
+				pluginsArray.addElement(plugin);
+			});
+		}
+	}
+	authIndexFile.save();
+}
+
 //#endregion
 //#region src/utils/setup-catalogs.ts
 async function setupCatalogs(projectDir, options) {
@@ -4194,7 +4234,11 @@ function getApiDependencies(api, frontendType) {
 	] };
 	else if (api === "trpc") deps.server = { dependencies: ["@trpc/server", "@trpc/client"] };
 	if (frontendType.hasReactWeb) {
-		if (api === "orpc") deps.web = { dependencies: ["@orpc/tanstack-query", "@orpc/client"] };
+		if (api === "orpc") deps.web = { dependencies: [
+			"@orpc/tanstack-query",
+			"@orpc/client",
+			"@orpc/server"
+		] };
 		else if (api === "trpc") deps.web = { dependencies: [
 			"@trpc/tanstack-react-query",
 			"@trpc/client",
@@ -4204,7 +4248,8 @@ function getApiDependencies(api, frontendType) {
 		dependencies: [
 			"@tanstack/vue-query",
 			"@orpc/tanstack-query",
-			"@orpc/client"
+			"@orpc/client",
+			"@orpc/server"
 		],
 		devDependencies: ["@tanstack/vue-query-devtools"]
 	};
@@ -4212,6 +4257,7 @@ function getApiDependencies(api, frontendType) {
 		dependencies: [
 			"@orpc/tanstack-query",
 			"@orpc/client",
+			"@orpc/server",
 			"@tanstack/svelte-query"
 		],
 		devDependencies: ["@tanstack/svelte-query-devtools"]
@@ -4220,6 +4266,7 @@ function getApiDependencies(api, frontendType) {
 		dependencies: [
 			"@orpc/tanstack-query",
 			"@orpc/client",
+			"@orpc/server",
 			"@tanstack/solid-query"
 		],
 		devDependencies: ["@tanstack/solid-query-devtools", "@tanstack/solid-router-devtools"]
@@ -4489,6 +4536,7 @@ function getClientServerVar(frontend, backend) {
 	const hasNextJs = frontend.includes("next");
 	const hasNuxt = frontend.includes("nuxt");
 	const hasSvelte = frontend.includes("svelte");
+	const hasTanstackStart = frontend.includes("tanstack-start");
 	if (backend === "self") return {
 		key: "",
 		value: "",
@@ -4498,6 +4546,7 @@ function getClientServerVar(frontend, backend) {
 	if (hasNextJs) key = "NEXT_PUBLIC_SERVER_URL";
 	else if (hasNuxt) key = "NUXT_PUBLIC_SERVER_URL";
 	else if (hasSvelte) key = "PUBLIC_SERVER_URL";
+	else if (hasTanstackStart) key = "VITE_SERVER_URL";
 	return {
 		key,
 		value: "http://localhost:3000",
@@ -4508,9 +4557,11 @@ function getConvexVar(frontend) {
 	const hasNextJs = frontend.includes("next");
 	const hasNuxt = frontend.includes("nuxt");
 	const hasSvelte = frontend.includes("svelte");
+	const hasTanstackStart = frontend.includes("tanstack-start");
 	if (hasNextJs) return "NEXT_PUBLIC_CONVEX_URL";
 	if (hasNuxt) return "NUXT_PUBLIC_CONVEX_URL";
 	if (hasSvelte) return "PUBLIC_CONVEX_URL";
+	if (hasTanstackStart) return "VITE_CONVEX_URL";
 	return "VITE_CONVEX_URL";
 }
 async function addEnvVariablesToFile(filePath, variables) {
@@ -4625,7 +4676,8 @@ async function setupEnvironmentVariables(config) {
 		const nativeDir = path.join(projectDir, "apps/native");
 		if (await fs.pathExists(nativeDir)) {
 			let envVarName = "EXPO_PUBLIC_SERVER_URL";
-			let serverUrl = backend === "self" ? "http://localhost:3001" : "http://localhost:3000";
+			let serverUrl = "http://localhost:3000";
+			if (backend === "self") serverUrl = "http://localhost:3001";
 			if (backend === "convex") {
 				envVarName = "EXPO_PUBLIC_CONVEX_URL";
 				serverUrl = "https://<YOUR_CONVEX_URL>";
@@ -6397,7 +6449,7 @@ async function displayPostInstallInstructions(config) {
 	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, isBackendSelf) : "";
+	const nativeInstructions = frontend?.includes("native-nativewind") || frontend?.includes("native-unistyles") ? getNativeInstructions(isConvex, isBackendSelf, frontend || []) : "";
 	const pwaInstructions = addons?.includes("pwa") && frontend?.includes("react-router") ? getPwaInstructions() : "";
 	const starlightInstructions = addons?.includes("starlight") ? getStarlightInstructions(runCmd) : "";
 	const clerkInstructions = isConvex && config.auth === "clerk" ? getClerkInstructions() : "";
@@ -6441,9 +6493,9 @@ async function displayPostInstallInstructions(config) {
 	else if (!hasNative && !addons?.includes("starlight")) output += `${pc.yellow("NOTE:")} You are creating a backend-only app\n   (no frontend selected)\n`;
 	if (!isConvex && !isBackendSelf) {
 		output += `${pc.cyan("•")} Backend API: http://localhost:3000\n`;
-		if (api === "orpc") output += `${pc.cyan("•")} OpenAPI (Scalar UI): http://localhost:3000/api\n`;
+		if (api === "orpc") output += `${pc.cyan("•")} OpenAPI (Scalar UI): http://localhost:3000/api-reference\n`;
 	}
-	if (isBackendSelf && api === "orpc") output += `${pc.cyan("•")} OpenAPI (Scalar UI): http://localhost:${webPort}/rpc/api\n`;
+	if (isBackendSelf && api === "orpc") output += `${pc.cyan("•")} OpenAPI (Scalar UI): http://localhost:${webPort}/api/rpc/api-reference\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`;
@@ -6463,7 +6515,7 @@ async function displayPostInstallInstructions(config) {
 	output += pc.cyan("https://github.com/AmanVarshney01/create-better-t-stack");
 	consola$1.box(output);
 }
-function getNativeInstructions(isConvex, isBackendSelf) {
+function getNativeInstructions(isConvex, isBackendSelf, _frontend) {
 	const envVar = isConvex ? "EXPO_PUBLIC_CONVEX_URL" : "EXPO_PUBLIC_SERVER_URL";
 	const exampleUrl = isConvex ? "https://<YOUR_CONVEX_URL>" : isBackendSelf ? "http://<YOUR_LOCAL_IP>:3001" : "http://<YOUR_LOCAL_IP>:3000";
 	const envFileName = ".env";
@@ -6578,28 +6630,34 @@ async function setupWorkspaceDependencies(projectDir, options) {
 		projectDir: dbPackageDir
 	});
 	const authPackageDir = path.join(projectDir, "packages/auth");
-	if (await fs.pathExists(authPackageDir)) await addPackageDependency({
-		dependencies: commonDeps,
-		devDependencies: commonDevDeps,
-		customDependencies: { [`@${projectName}/db`]: workspaceVersion },
-		projectDir: authPackageDir
-	});
+	if (await fs.pathExists(authPackageDir)) {
+		const authDeps = {};
+		if (options.database !== "none" && await fs.pathExists(dbPackageDir)) authDeps[`@${projectName}/db`] = workspaceVersion;
+		await addPackageDependency({
+			dependencies: commonDeps,
+			devDependencies: commonDevDeps,
+			customDependencies: authDeps,
+			projectDir: authPackageDir
+		});
+	}
 	const apiPackageDir = path.join(projectDir, "packages/api");
-	if (await fs.pathExists(apiPackageDir)) await addPackageDependency({
-		dependencies: commonDeps,
-		devDependencies: commonDevDeps,
-		customDependencies: {
-			[`@${projectName}/auth`]: workspaceVersion,
-			[`@${projectName}/db`]: workspaceVersion
-		},
-		projectDir: apiPackageDir
-	});
+	if (await fs.pathExists(apiPackageDir)) {
+		const apiDeps = {};
+		if (options.auth !== "none" && await fs.pathExists(authPackageDir)) apiDeps[`@${projectName}/auth`] = workspaceVersion;
+		if (options.database !== "none" && await fs.pathExists(dbPackageDir)) apiDeps[`@${projectName}/db`] = workspaceVersion;
+		await addPackageDependency({
+			dependencies: commonDeps,
+			devDependencies: commonDevDeps,
+			customDependencies: apiDeps,
+			projectDir: apiPackageDir
+		});
+	}
 	const serverPackageDir = path.join(projectDir, "apps/server");
 	if (await fs.pathExists(serverPackageDir)) {
 		const serverDeps = {};
-		if (await fs.pathExists(apiPackageDir)) serverDeps[`@${projectName}/api`] = workspaceVersion;
-		if (await fs.pathExists(authPackageDir)) serverDeps[`@${projectName}/auth`] = workspaceVersion;
-		if (await fs.pathExists(dbPackageDir)) serverDeps[`@${projectName}/db`] = workspaceVersion;
+		if (options.api !== "none" && await fs.pathExists(apiPackageDir)) serverDeps[`@${projectName}/api`] = workspaceVersion;
+		if (options.auth !== "none" && await fs.pathExists(authPackageDir)) serverDeps[`@${projectName}/auth`] = workspaceVersion;
+		if (options.database !== "none" && await fs.pathExists(dbPackageDir)) serverDeps[`@${projectName}/db`] = workspaceVersion;
 		await addPackageDependency({
 			dependencies: commonDeps,
 			devDependencies: commonDevDeps,
@@ -6610,8 +6668,8 @@ async function setupWorkspaceDependencies(projectDir, options) {
 	const webPackageDir = path.join(projectDir, "apps/web");
 	if (await fs.pathExists(webPackageDir)) {
 		const webDeps = {};
-		if (await fs.pathExists(apiPackageDir)) webDeps[`@${projectName}/api`] = workspaceVersion;
-		if (await fs.pathExists(authPackageDir)) webDeps[`@${projectName}/auth`] = workspaceVersion;
+		if (options.api !== "none" && await fs.pathExists(apiPackageDir)) webDeps[`@${projectName}/api`] = workspaceVersion;
+		if (options.auth !== "none" && await fs.pathExists(authPackageDir)) webDeps[`@${projectName}/auth`] = workspaceVersion;
 		if (Object.keys(webDeps).length > 0) await addPackageDependency({
 			customDependencies: webDeps,
 			projectDir: webPackageDir
@@ -6620,7 +6678,7 @@ async function setupWorkspaceDependencies(projectDir, options) {
 	const nativePackageDir = path.join(projectDir, "apps/native");
 	if (await fs.pathExists(nativePackageDir)) {
 		const nativeDeps = {};
-		if (await fs.pathExists(apiPackageDir)) nativeDeps[`@${projectName}/api`] = workspaceVersion;
+		if (options.api !== "none" && await fs.pathExists(apiPackageDir)) nativeDeps[`@${projectName}/api`] = workspaceVersion;
 		if (Object.keys(nativeDeps).length > 0) await addPackageDependency({
 			customDependencies: nativeDeps,
 			projectDir: nativePackageDir
@@ -6885,6 +6943,7 @@ async function createProject(options, cliInput) {
 		}
 		if (options.addons.length > 0 && options.addons[0] !== "none") await setupAddons(options);
 		if (options.auth && options.auth !== "none") await setupAuth(options);
+		await setupBetterAuthPlugins(projectDir, options);
 		if (options.payments && options.payments !== "none") await setupPayments(options);
 		await handleExtras(projectDir, options);
 		await setupEnvironmentVariables(options);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-better-t-stack",
-  "version": "3.0.12",
+  "version": "3.1.0",
   "description": "A modern CLI tool for scaffolding end-to-end type-safe TypeScript projects with best practices and customizable configurations",
   "type": "module",
   "license": "MIT",

package/templates/api/orpc/fullstack/next/src/app/api/rpc/[[...rest]]/route.ts.hbs

@@ -35,7 +35,7 @@ async function handleRequest(req: NextRequest) {
 	if (rpcResult.response) return rpcResult.response;
 
 	const apiResult = await apiHandler.handle(req, {
-		prefix: "/api/rpc/api",
+		prefix: "/api/rpc/api-reference",
 		context: await createContext(req),
 	});
 	if (apiResult.response) return apiResult.response;

package/templates/api/orpc/fullstack/tanstack-start/src/routes/api/rpc/$.ts.hbs

@@ -0,0 +1,58 @@
+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 { createFileRoute } from "@tanstack/react-router";
+
+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 handle({ request }: { request: Request }) {
+	const rpcResult = await rpcHandler.handle(request, {
+		prefix: "/api/rpc",
+		context: await createContext({ req: request }),
+	});
+	if (rpcResult.response) return rpcResult.response;
+
+	const apiResult = await apiHandler.handle(request, {
+		prefix: "/api/rpc/api-reference",
+		context: await createContext({ req: request }),
+	});
+	if (apiResult.response) return apiResult.response;
+
+	return new Response("Not found", { status: 404 });
+}
+
+export const Route = createFileRoute('/api/rpc/$')({
+  server: {
+    handlers: {
+      HEAD: handle,
+      GET: handle,
+      POST: handle,
+      PUT: handle,
+      PATCH: handle,
+      DELETE: handle,
+    },
+  },
+})

package/templates/api/orpc/server/src/context.ts.hbs

@@ -17,6 +17,24 @@ export async function createContext(req: NextRequest) {
 {{/if}}
 }
 
+{{else if (and (eq backend 'self') (includes frontend "tanstack-start"))}}
+{{#if (eq auth "better-auth")}}
+import { auth } from "@{{projectName}}/auth";
+{{/if}}
+
+export async function createContext({ req }: { req: Request }) {
+{{#if (eq auth "better-auth")}}
+	const session = await auth.api.getSession({
+		headers: req.headers,
+	});
+	return {
+		session,
+	};
+{{else}}
+	return {};
+{{/if}}
+}
+
 {{else if (eq backend 'hono')}}
 import type { Context as HonoContext } from "hono";
 {{#if (eq auth "better-auth")}}

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

@@ -3,7 +3,15 @@ import { RPCLink } from "@orpc/client/fetch";
 import { createTanstackQueryUtils } from "@orpc/tanstack-query";
 import { QueryCache, QueryClient } from "@tanstack/react-query";
 import { toast } from "sonner";
+{{#if (includes frontend "tanstack-start")}}
+import { createRouterClient } from "@orpc/server";
+import type { RouterClient } from "@orpc/server";
+import { createIsomorphicFn } from "@tanstack/react-start";
+import { appRouter } from "@{{projectName}}/api/routers/index";
+import { createContext } from "@{{projectName}}/api/context";
+{{else}}
 import type { AppRouterClient } from "@{{projectName}}/api/routers/index";
+{{/if}}
 
 export const queryClient = new QueryClient({
   queryCache: new QueryCache({
@@ -20,6 +28,33 @@ export const queryClient = new QueryClient({
   }),
 });
 
+{{#if (includes frontend "tanstack-start")}}
+const getORPCClient = createIsomorphicFn()
+  .server(() =>
+    createRouterClient(appRouter, {
+      context: async ({ req }) => {
+        return createContext({ req });
+      },
+    }),
+  )
+  .client((): RouterClient<typeof appRouter> => {
+    const link = new RPCLink({
+      url: {{#if (eq backend "self")}}`${window.location.origin}/api/rpc`{{else}}`${import.meta.env.VITE_SERVER_URL}/rpc`{{/if}},
+      {{#if (eq auth "better-auth")}}
+      fetch(url, options) {
+        return fetch(url, {
+          ...options,
+          credentials: "include",
+        });
+      },
+      {{/if}}
+    });
+
+    return createORPCClient(link);
+  });
+
+export const client: RouterClient<typeof appRouter> = getORPCClient();
+{{else}}
 export const link = new RPCLink({
   {{#if (and (eq backend "self") (includes frontend "next"))}}
   url: `${typeof window !== "undefined" ? window.location.origin : "http://localhost:3001"}/api/rpc`,
@@ -49,5 +84,6 @@ export const link = new RPCLink({
 });
 
 export const client: AppRouterClient = createORPCClient(link)
+{{/if}}
 
 export const orpc = createTanstackQueryUtils(client)

package/templates/api/trpc/fullstack/tanstack-start/src/routes/api/trpc/$.ts.hbs

@@ -0,0 +1,22 @@
+import { fetchRequestHandler } from '@trpc/server/adapters/fetch'
+import { appRouter } from '@{{projectName}}/api/routers/index'
+import { createContext } from '@{{projectName}}/api/context'
+import { createFileRoute } from '@tanstack/react-router'
+
+function handler({ request }: { request: Request }) {
+  return fetchRequestHandler({
+    req: request,
+    router: appRouter,
+    createContext,
+    endpoint: '/api/trpc',
+  })
+}
+
+export const Route = createFileRoute('/api/trpc/$')({
+  server: {
+    handlers: {
+      GET: handler,
+      POST: handler,
+    },
+  },
+})

package/templates/api/trpc/server/src/context.ts.hbs

@@ -20,6 +20,27 @@ export async function createContext(req: NextRequest) {
 {{/if}}
 }
 
+{{else if (and (eq backend 'self') (includes frontend "tanstack-start"))}}
+{{#if (eq auth "better-auth")}}
+import { auth } from "@{{projectName}}/auth";
+{{/if}}
+
+export async function createContext({ req }: { req: Request }) {
+{{#if (eq auth "better-auth")}}
+	const session = await auth.api.getSession({
+		headers: req.headers,
+	});
+	return {
+		session,
+	};
+{{else}}
+	// No auth configured
+	return {
+		session: null,
+	};
+{{/if}}
+}
+
 {{else if (eq backend 'hono')}}
 import type { Context as HonoContext } from "hono";
 {{#if (eq auth "better-auth")}}

package/templates/auth/better-auth/fullstack/tanstack-start/src/routes/api/auth/$.ts.hbs

@@ -0,0 +1,15 @@
+import { auth } from '@{{projectName}}/auth'
+import { createFileRoute } from '@tanstack/react-router'
+
+export const Route = createFileRoute('/api/auth/$')({
+  server: {
+    handlers: {
+      GET: ({ request }) => {
+        return auth.handler(request)
+      },
+      POST: ({ request }) => {
+        return auth.handler(request)
+      },
+    },
+  },
+})

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

@@ -1,9 +1,6 @@
 {{#if (eq orm "prisma")}}
 import { betterAuth } from "better-auth";
 import { prismaAdapter } from "better-auth/adapters/prisma";
-{{#if (or (includes frontend "native-nativewind") (includes frontend "native-unistyles"))}}
-import { expo } from "@better-auth/expo";
-{{/if}}
 {{#if (eq payments "polar")}}
 import { polar, checkout, portal } from "@polar-sh/better-auth";
 import { polarClient } from "./lib/payments";
@@ -26,6 +23,7 @@ export const auth = betterAuth({
   emailAndPassword: {
     enabled: true,
   },
+  {{#if (ne backend "self")}}
   advanced: {
     defaultCookieAttributes: {
       sameSite: "none",
@@ -33,6 +31,7 @@ export const auth = betterAuth({
       httpOnly: true,
     },
   },
+  {{/if}}
   {{#if (eq payments "polar")}}
   plugins: [
     polar({
@@ -53,14 +52,7 @@ export const auth = betterAuth({
         portal(),
       ],
     }),
-    {{#if (or (includes frontend "native-nativewind") (includes frontend "native-unistyles"))}}
-    expo(),
-    {{/if}}
   ],
-  {{else}}
-  {{#if (or (includes frontend "native-nativewind") (includes frontend "native-unistyles"))}}
-  plugins: [expo()],
-  {{/if}}
   {{/if}}
 });
 {{/if}}
@@ -69,9 +61,6 @@ export const auth = betterAuth({
 {{#if (or (eq runtime "bun") (eq runtime "node") (eq runtime "none"))}}
 import { betterAuth } from "better-auth";
 import { drizzleAdapter } from "better-auth/adapters/drizzle";
-{{#if (or (includes frontend "native-nativewind") (includes frontend "native-unistyles"))}}
-import { expo } from "@better-auth/expo";
-{{/if}}
 {{#if (eq payments "polar")}}
 import { polar, checkout, portal } from "@polar-sh/better-auth";
 import { polarClient } from "./lib/payments";
@@ -95,6 +84,7 @@ export const auth = betterAuth({
   emailAndPassword: {
     enabled: true,
   },
+  {{#if (ne backend "self")}}
   advanced: {
     defaultCookieAttributes: {
       sameSite: "none",
@@ -102,6 +92,7 @@ export const auth = betterAuth({
       httpOnly: true,
     },
   },
+  {{/if}}
   {{#if (eq payments "polar")}}
   plugins: [
     polar({
@@ -122,14 +113,7 @@ export const auth = betterAuth({
         portal(),
       ],
     }),
-    {{#if (or (includes frontend "native-nativewind") (includes frontend "native-unistyles"))}}
-    expo(),
-    {{/if}}
   ],
-  {{else}}
-  {{#if (or (includes frontend "native-nativewind") (includes frontend "native-unistyles"))}}
-  plugins: [expo()],
-  {{/if}}
   {{/if}}
 });
 {{/if}}
@@ -137,9 +121,6 @@ export const auth = betterAuth({
 {{#if (eq runtime "workers")}}
 import { betterAuth } from "better-auth";
 import { drizzleAdapter } from "better-auth/adapters/drizzle";
-{{#if (or (includes frontend "native-nativewind") (includes frontend "native-unistyles"))}}
-import { expo } from "@better-auth/expo";
-{{/if}}
 {{#if (eq payments "polar")}}
 import { polar, checkout, portal } from "@polar-sh/better-auth";
 import { polarClient } from "./lib/payments";
@@ -207,10 +188,6 @@ export const auth = betterAuth({
       ],
     }),
   ],
-  {{else}}
-  {{#if (or (includes frontend "native-nativewind") (includes frontend "native-unistyles"))}}
-  plugins: [expo()],
-  {{/if}}
   {{/if}}
 });
 {{/if}}
@@ -219,9 +196,6 @@ export const auth = betterAuth({
 {{#if (eq orm "mongoose")}}
 import { betterAuth } from "better-auth";
 import { mongodbAdapter } from "better-auth/adapters/mongodb";
-{{#if (or (includes frontend "native-nativewind") (includes frontend "native-unistyles"))}}
-import { expo } from "@better-auth/expo";
-{{/if}}
 {{#if (eq payments "polar")}}
 import { polar, checkout, portal } from "@polar-sh/better-auth";
 import { polarClient } from "./lib/payments";
@@ -239,6 +213,7 @@ export const auth = betterAuth({
   emailAndPassword: {
     enabled: true,
   },
+  {{#if (ne backend "self")}}
   advanced: {
     defaultCookieAttributes: {
       sameSite: "none",
@@ -246,6 +221,7 @@ export const auth = betterAuth({
       httpOnly: true,
     },
   },
+  {{/if}}
   {{#if (eq payments "polar")}}
   plugins: [
     polar({
@@ -266,23 +242,13 @@ export const auth = betterAuth({
         portal(),
       ],
     }),
-    {{#if (or (includes frontend "native-nativewind") (includes frontend "native-unistyles"))}}
-    expo(),
-    {{/if}}
   ],
-  {{else}}
-  {{#if (or (includes frontend "native-nativewind") (includes frontend "native-unistyles"))}}
-  plugins: [expo()],
-  {{/if}}
   {{/if}}
 });
 {{/if}}
 
 {{#if (eq orm "none")}}
 import { betterAuth } from "better-auth";
-{{#if (or (includes frontend "native-nativewind") (includes frontend "native-unistyles"))}}
-import { expo } from "@better-auth/expo";
-{{/if}}
 {{#if (eq payments "polar")}}
 import { polar, checkout, portal } from "@polar-sh/better-auth";
 import { polarClient } from "./lib/payments";
@@ -299,6 +265,7 @@ export const auth = betterAuth({
   emailAndPassword: {
     enabled: true,
   },
+  {{#if (ne backend "self")}}
   advanced: {
     defaultCookieAttributes: {
       sameSite: "none",
@@ -306,6 +273,7 @@ export const auth = betterAuth({
       httpOnly: true,
     },
   },
+  {{/if}}
   {{#if (eq payments "polar")}}
   plugins: [
     polar({
@@ -326,14 +294,7 @@ export const auth = betterAuth({
         portal(),
       ],
     }),
-    {{#if (or (includes frontend "native-nativewind") (includes frontend "native-unistyles"))}}
-    expo(),
-    {{/if}}
   ],
-  {{else}}
-  {{#if (or (includes frontend "native-nativewind") (includes frontend "native-unistyles"))}}
-  plugins: [expo()],
-  {{/if}}
   {{/if}}
 });
-{{/if}}
+{{/if}}

package/templates/backend/server/elysia/src/index.ts.hbs

@@ -82,7 +82,7 @@ const app = new Elysia()
   })
   .all('/api*', async (context) => {
     const { response } = await apiHandler.handle(context.request, {
-      prefix: '/api',
+      prefix: '/api-reference',
       context: await createContext({ context })
     })
     return response ?? new Response('Not Found', { status: 404 })

package/templates/backend/server/express/src/index.ts.hbs

@@ -86,7 +86,7 @@ app.use(async (req, res, next) => {
   if (rpcResult.matched) return;
 
   const apiResult = await apiHandler.handle(req, res, {
-    prefix: "/api",
+    prefix: "/api-reference",
     {{#if (eq auth "better-auth")}}
     context: await createContext({ req }),
     {{else}}

package/templates/backend/server/fastify/src/index.ts.hbs

@@ -87,7 +87,7 @@ const fastify = Fastify({
 
       const apiResult = await apiHandler.handle(req, res, {
         context: await createContext(req.headers),
-        prefix: "/api",
+        prefix: "/api-reference",
       });
 
       if (apiResult.matched) {

package/templates/backend/server/hono/src/index.ts.hbs

@@ -92,7 +92,7 @@ app.use("/*", async (c, next) => {
   }
 
   const apiResult = await apiHandler.handle(c.req.raw, {
-    prefix: "/api",
+    prefix: "/api-reference",
     context: context,
   });
 

package/templates/examples/ai/fullstack/tanstack-start/src/routes/api/ai/$.ts.hbs

@@ -0,0 +1,31 @@
+import { createFileRoute } from "@tanstack/react-router";
+import { google } from "@ai-sdk/google";
+import { streamText, type UIMessage, convertToModelMessages } from "ai";
+
+export const Route = createFileRoute("/api/ai/$")({
+  server: {
+    handlers: {
+      POST: async ({ request }) => {
+        try {
+          const { messages }: { messages: UIMessage[] } = await request.json();
+
+          const result = streamText({
+            model: google("gemini-2.5-flash"),
+            messages: convertToModelMessages(messages),
+          });
+
+          return result.toUIMessageStreamResponse();
+        } catch (error) {
+          console.error("AI API error:", error);
+          return new Response(
+            JSON.stringify({ error: "Failed to process AI request" }),
+            {
+              status: 500,
+              headers: { "Content-Type": "application/json" },
+            },
+          );
+        }
+      },
+    },
+  },
+});

package/templates/examples/ai/web/react/tanstack-start/src/routes/ai.tsx.hbs

@@ -15,7 +15,7 @@ function RouteComponent() {
   const [input, setInput] = useState("");
   const { messages, sendMessage } = useChat({
     transport: new DefaultChatTransport({
-      api: `${import.meta.env.VITE_SERVER_URL}/ai`,
+      api: {{#if (eq backend "self")}}"/api/ai"{{else}}`${import.meta.env.VITE_SERVER_URL}/ai`{{/if}},
     }),
   });
 

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

@@ -85,7 +85,7 @@ export const queryClient = new QueryClient({
 const trpcClient = createTRPCClient<AppRouter>({
   links: [
     httpBatchLink({
-      url: `${import.meta.env.VITE_SERVER_URL}/trpc`,
+      url: {{#if (eq backend "self")}}"/api/trpc"{{else}}`${import.meta.env.VITE_SERVER_URL}/trpc`{{/if}},
       {{#if (eq auth "better-auth")}}
       fetch(url, options) {
         return fetch(url, {