create-better-t-stack 2.50.1 → 3.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-better-t-stack",
-  "version": "2.50.1",
+  "version": "3.0.1",
   "description": "A modern CLI tool for scaffolding end-to-end type-safe TypeScript projects with best practices and customizable configurations",
   "type": "module",
   "license": "MIT",
@@ -77,6 +77,7 @@
     "tinyglobby": "^0.2.15",
     "trpc-cli": "^0.11.0",
     "ts-morph": "^27.0.0",
+    "yaml": "^2.7.0",
     "zod": "^4.1.11"
   },
   "devDependencies": {

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/fullstack/next/src/app/api/rpc/[[...rest]]/route.ts.hbs

@@ -0,0 +1,50 @@
+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 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(req: NextRequest) {
+	const rpcResult = await rpcHandler.handle(req, {
+		prefix: "/api/rpc",
+		context: await createContext(req),
+	});
+	if (rpcResult.response) return rpcResult.response;
+
+	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 GET = handleRequest;
+export const POST = handleRequest;
+export const PUT = handleRequest;
+export const PATCH = handleRequest;
+export const DELETE = handleRequest;

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/_gitignore

@@ -0,0 +1,34 @@
+# dependencies (bun install)
+node_modules
+
+# output
+out
+dist
+*.tgz
+
+# code coverage
+coverage
+*.lcov
+
+# logs
+logs
+_.log
+report.[0-9]_.[0-9]_.[0-9]_.[0-9]_.json
+
+# dotenv environment variable files
+.env
+.env.development.local
+.env.test.local
+.env.production.local
+.env.local
+
+# caches
+.eslintcache
+.cache
+*.tsbuildinfo
+
+# IntelliJ based IDEs
+.idea
+
+# Finder (MacOS) folder config
+.DS_Store

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

@@ -0,0 +1,22 @@
+{
+  "name": "@{{projectName}}/api",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "default": "./src/index.ts"
+    },
+    "./*": {
+      "types": "./dist/*.d.ts",
+      "default": "./src/*.ts"
+    }
+  },
+  "type": "module",
+  "scripts": {
+    "build": "tsdown"
+  },
+  "devDependencies": {},
+  "peerDependencies": {
+    "typescript": "^5"
+  },
+  "dependencies": {}
+}

package/templates/api/orpc/server/{base/src/lib → src}/context.ts.hbs

@@ -1,7 +1,7 @@
-{{#if (eq backend 'next')}}
+{{#if (and (eq backend 'self') (includes frontend "next"))}}
 import type { NextRequest } from "next/server";
 {{#if (eq auth "better-auth")}}
-import { auth } from "./auth";
+import { auth } from "@{{projectName}}/auth";
 {{/if}}
 
 export async function createContext(req: NextRequest) {
@@ -20,7 +20,7 @@ export async function createContext(req: NextRequest) {
 {{else if (eq backend 'hono')}}
 import type { Context as HonoContext } from "hono";
 {{#if (eq auth "better-auth")}}
-import { auth } from "./auth";
+import { auth } from "@{{projectName}}/auth";
 {{/if}}
 
 export type CreateContextOptions = {
@@ -46,7 +46,7 @@ export async function createContext({ context }: CreateContextOptions) {
 {{else if (eq backend 'elysia')}}
 import type { Context as ElysiaContext } from "elysia";
 {{#if (eq auth "better-auth")}}
-import { auth } from "./auth";
+import { auth } from "@{{projectName}}/auth";
 {{/if}}
 
 export type CreateContextOptions = {
@@ -72,7 +72,7 @@ export async function createContext({ context }: CreateContextOptions) {
 {{else if (eq backend 'express')}}
 {{#if (eq auth "better-auth")}}
 import { fromNodeHeaders } from "better-auth/node";
-import { auth } from "./auth";
+import { auth } from "@{{projectName}}/auth";
 {{/if}}
 
 export async function createContext(opts: any) {
@@ -95,7 +95,7 @@ export async function createContext(opts: any) {
 import type { IncomingHttpHeaders } from "node:http";
 {{#if (eq auth "better-auth")}}
 import { fromNodeHeaders } from "better-auth/node";
-import { auth } from "./auth";
+import { auth } from "@{{projectName}}/auth";
 {{/if}}
 
 export async function createContext(req: IncomingHttpHeaders) {

package/templates/{backend/server/server-base → api/orpc/server}/src/routers/index.ts.hbs

@@ -1,5 +1,5 @@
 {{#if (eq api "orpc")}}
-import { {{#if (eq auth "better-auth")}}protectedProcedure, {{/if}}publicProcedure } from "../lib/orpc";
+import { {{#if (eq auth "better-auth")}}protectedProcedure, {{/if}}publicProcedure } from "../index";
 import type { RouterClient } from "@orpc/server";
 {{#if (includes examples "todo")}}
 import { todoRouter } from "./todo";
@@ -27,7 +27,7 @@ export type AppRouterClient = RouterClient<typeof appRouter>;
 import {
   {{#if (eq auth "better-auth")}}protectedProcedure, {{/if}}publicProcedure,
   router,
-} from "../lib/trpc";
+} from "../index";
 {{#if (includes examples "todo")}}
 import { todoRouter } from "./todo";
 {{/if}}

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

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

package/templates/api/orpc/server/tsdown.config.ts.hbs

@@ -0,0 +1,7 @@
+import { defineConfig } from "tsdown";
+
+export default defineConfig({
+    entry: 'src/**/*.ts',
+    sourcemap: true,
+    dts: true,
+});

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

@@ -1,5 +1,5 @@
 import { defineNuxtPlugin, useRuntimeConfig } from '#app'
-import type { AppRouterClient } from "../../../server/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 "../../../server/src/routers/index";
+import type { AppRouterClient } from "@{{projectName}}/api/routers/index";
 
 export const queryClient = new QueryClient({
   queryCache: new QueryCache({
@@ -21,7 +21,9 @@ export const queryClient = new QueryClient({
 });
 
 export const link = new RPCLink({
-  {{#if (includes frontend "next")}}
+  {{#if (and (eq backend "self") (includes frontend "next"))}}
+  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}}
   url: `${import.meta.env.VITE_SERVER_URL}/rpc`,

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

package/templates/api/trpc/fullstack/next/src/app/api/trpc/[trpc]/route.ts.hbs

@@ -0,0 +1,14 @@
+import { fetchRequestHandler } from "@trpc/server/adapters/fetch";
+import { appRouter } from "@{{projectName}}/api/routers/index";
+import { createContext } from "@{{projectName}}/api/context";
+import { NextRequest } from "next/server";
+
+function handler(req: NextRequest) {
+	return fetchRequestHandler({
+		endpoint: "/api/trpc",
+		req,
+		router: appRouter,
+		createContext: () => createContext(req),
+	});
+}
+export { handler as GET, handler as POST };

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/_gitignore

@@ -0,0 +1,34 @@
+# dependencies (bun install)
+node_modules
+
+# output
+out
+dist
+*.tgz
+
+# code coverage
+coverage
+*.lcov
+
+# logs
+logs
+_.log
+report.[0-9]_.[0-9]_.[0-9]_.[0-9]_.json
+
+# dotenv environment variable files
+.env
+.env.development.local
+.env.test.local
+.env.production.local
+.env.local
+
+# caches
+.eslintcache
+.cache
+*.tsbuildinfo
+
+# IntelliJ based IDEs
+.idea
+
+# Finder (MacOS) folder config
+.DS_Store

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

@@ -0,0 +1,21 @@
+{
+  "name": "@{{projectName}}/api",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "default": "./src/index.ts"
+    },
+    "./*": {
+      "types": "./dist/*.d.ts",
+      "default": "./src/*.ts"
+    }
+  },
+  "type": "module",
+  "scripts": {
+    "build": "tsdown"
+  },
+  "devDependencies": {},
+  "peerDependencies": {
+    "typescript": "^5"
+  }
+}

package/templates/api/trpc/server/{base/src/lib → src}/context.ts.hbs

@@ -1,7 +1,7 @@
-{{#if (eq backend 'next')}}
+{{#if (and (eq backend 'self') (includes frontend "next"))}}
 import type { NextRequest } from "next/server";
 {{#if (eq auth "better-auth")}}
-import { auth } from "./auth";
+import { auth } from "@{{projectName}}/auth";
 {{/if}}
 
 export async function createContext(req: NextRequest) {
@@ -23,7 +23,7 @@ export async function createContext(req: NextRequest) {
 {{else if (eq backend 'hono')}}
 import type { Context as HonoContext } from "hono";
 {{#if (eq auth "better-auth")}}
-import { auth } from "./auth";
+import { auth } from "@{{projectName}}/auth";
 {{/if}}
 
 export type CreateContextOptions = {
@@ -49,7 +49,7 @@ export async function createContext({ context }: CreateContextOptions) {
 {{else if (eq backend 'elysia')}}
 import type { Context as ElysiaContext } from "elysia";
 {{#if (eq auth "better-auth")}}
-import { auth } from "./auth";
+import { auth } from "@{{projectName}}/auth";
 {{/if}}
 
 export type CreateContextOptions = {
@@ -76,7 +76,7 @@ export async function createContext({ context }: CreateContextOptions) {
 import type { CreateExpressContextOptions } from "@trpc/server/adapters/express";
 {{#if (eq auth "better-auth")}}
 import { fromNodeHeaders } from "better-auth/node";
-import { auth } from "./auth";
+import { auth } from "@{{projectName}}/auth";
 {{/if}}
 
 export async function createContext(opts: CreateExpressContextOptions) {
@@ -99,7 +99,7 @@ export async function createContext(opts: CreateExpressContextOptions) {
 import type { CreateFastifyContextOptions } from "@trpc/server/adapters/fastify";
 {{#if (eq auth "better-auth")}}
 import { fromNodeHeaders } from "better-auth/node";
-import { auth } from "./auth";
+import { auth } from "@{{projectName}}/auth";
 {{/if}}
 
 export async function createContext({ req, res }: CreateFastifyContextOptions) {

package/templates/api/trpc/server/src/routers/index.ts.hbs

@@ -0,0 +1,55 @@
+{{#if (eq api "orpc")}}
+import { {{#if (eq auth "better-auth")}}protectedProcedure, {{/if}}publicProcedure } from "../index";
+import type { RouterClient } from "@orpc/server";
+{{#if (includes examples "todo")}}
+import { todoRouter } from "./todo";
+{{/if}}
+
+export const appRouter = {
+  healthCheck: publicProcedure.handler(() => {
+    return "OK";
+  }),
+  {{#if (eq auth "better-auth")}}
+  privateData: protectedProcedure.handler(({ context }) => {
+    return {
+      message: "This is private",
+      user: context.session?.user,
+    };
+  }),
+  {{/if}}
+  {{#if (includes examples "todo")}}
+  todo: todoRouter,
+  {{/if}}
+};
+export type AppRouter = typeof appRouter;
+export type AppRouterClient = RouterClient<typeof appRouter>;
+{{else if (eq api "trpc")}}
+import {
+  {{#if (eq auth "better-auth")}}protectedProcedure, {{/if}}publicProcedure,
+  router,
+} from "../index";
+{{#if (includes examples "todo")}}
+import { todoRouter } from "./todo";
+{{/if}}
+
+export const appRouter = router({
+  healthCheck: publicProcedure.query(() => {
+    return "OK";
+  }),
+  {{#if (eq auth "better-auth")}}
+  privateData: protectedProcedure.query(({ ctx }) => {
+    return {
+      message: "This is private",
+      user: ctx.session.user,
+    };
+  }),
+  {{/if}}
+  {{#if (includes examples "todo")}}
+  todo: todoRouter,
+  {{/if}}
+});
+export type AppRouter = typeof appRouter;
+{{else}}
+export const appRouter = {};
+export type AppRouter = typeof appRouter;
+{{/if}}

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

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

package/templates/api/trpc/server/tsdown.config.ts.hbs

@@ -0,0 +1,7 @@
+import { defineConfig } from "tsdown";
+
+export default defineConfig({
+    entry: 'src/**/*.ts',
+    sourcemap: true,
+    dts: true,
+});

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

@@ -2,7 +2,7 @@
 import { QueryCache, 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";
 import { toast } from 'sonner';
 
 export const queryClient = new QueryClient({
@@ -23,7 +23,9 @@ export const queryClient = new QueryClient({
 const trpcClient = createTRPCClient<AppRouter>({
   links: [
     httpBatchLink({
-      {{#if (includes frontend 'next')}}
+      {{#if (and (eq backend "self") (includes frontend 'next'))}}
+      url: "/api/trpc",
+      {{else if (includes frontend 'next')}}
       url: `${process.env.NEXT_PUBLIC_SERVER_URL}/trpc`,
       {{else}}
       url: `${import.meta.env.VITE_SERVER_URL}/trpc`,
@@ -47,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 "../../../server/src/routers";
+import type { AppRouter } from "@{{projectName}}/api/routers/index";
 
 export const { TRPCProvider, useTRPC, useTRPCClient } =
   createTRPCContext<AppRouter>();
 
 {{else}}
-import type { AppRouter } from "../../../server/src/routers";
+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/next/src/app/api/auth/[...all]/route.ts → fullstack/next/src/app/api/auth/[...all]/route.ts.hbs}

@@ -1,4 +1,4 @@
-import { auth } from "@/lib/auth";
+import { auth } from "@{{projectName}}/auth";
 import { toNextJsHandler } from "better-auth/next-js";
 
 export const { GET, POST } = toNextJsHandler(auth.handler);