create-better-t-stack 3.0.12-canary.b6015ca7 → 3.1.0

package/dist/cli.js

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

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

@@ -1388,7 +1388,7 @@ const getLatestCLIVersion = () => {
 */
 function isTelemetryEnabled() {
 	const BTS_TELEMETRY_DISABLED = process.env.BTS_TELEMETRY_DISABLED;
-	const BTS_TELEMETRY = "0";
+	const BTS_TELEMETRY = "1";
 	if (BTS_TELEMETRY_DISABLED !== void 0) return BTS_TELEMETRY_DISABLED !== "1";
 	if (BTS_TELEMETRY !== void 0) return BTS_TELEMETRY === "1";
 	return true;
@@ -1396,8 +1396,8 @@ function isTelemetryEnabled() {
 
 //#endregion
 //#region src/utils/analytics.ts
-const POSTHOG_API_KEY = "random";
-const POSTHOG_HOST = "random";
+const POSTHOG_API_KEY = "phc_8ZUxEwwfKMajJLvxz1daGd931dYbQrwKNficBmsdIrs";
+const POSTHOG_HOST = "https://us.i.posthog.com";
 function generateSessionId() {
 	const rand = Math.random().toString(36).slice(2);
 	return `cli_${Date.now().toString(36)}${rand}`;
@@ -4034,10 +4034,6 @@ async function setupBetterAuthPlugins(projectDir, config) {
 	}
 	authIndexFile.save();
 }
-async function setupBetterAuthPluginsForSelfBackend(projectDir, config) {
-	if (config.backend !== "self" || config.auth !== "better-auth") return;
-	await setupBetterAuthPlugins(projectDir, config);
-}
 
 //#endregion
 //#region src/utils/setup-catalogs.ts
@@ -4238,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",
@@ -4248,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"]
 	};
@@ -4256,6 +4257,7 @@ function getApiDependencies(api, frontendType) {
 		dependencies: [
 			"@orpc/tanstack-query",
 			"@orpc/client",
+			"@orpc/server",
 			"@tanstack/svelte-query"
 		],
 		devDependencies: ["@tanstack/svelte-query-devtools"]
@@ -4264,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"]
@@ -6490,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`;
@@ -6940,7 +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 setupBetterAuthPluginsForSelfBackend(projectDir, 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-canary.b6015ca7",
+  "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

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

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

@@ -3,10 +3,14 @@ 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/routers/index";
 {{#if (includes frontend "tanstack-start")}}
+import { createRouterClient } from "@orpc/server";
+import type { RouterClient } from "@orpc/server";
 import { createIsomorphicFn } from "@tanstack/react-start";
-import { getRequestHeaders } from "@tanstack/react-start/server";
+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({
@@ -25,61 +29,31 @@ export const queryClient = new QueryClient({
 });
 
 {{#if (includes frontend "tanstack-start")}}
-{{#if (eq backend "self")}}
-const getClientLink = createIsomorphicFn()
-  .client(() => new RPCLink({
-    url: `${window.location.origin}/api/rpc`,
-    {{#if (eq auth "better-auth")}}
-    fetch(url, options) {
-      return fetch(url, {
-        ...options,
-        credentials: "include",
-      });
-    },
-    {{/if}}
-  }))
-  .server(() => new RPCLink({
-    url: "http://localhost:3001/api/rpc",
-    {{#if (eq auth "better-auth")}}
-    headers: () => getRequestHeaders(),
-    fetch(url, options) {
-      return fetch(url, {
-        ...options,
-        credentials: "include",
-      });
-    },
-    {{/if}}
-  }));
+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}}
+    });
 
-export const link = getClientLink();
-{{else}}
-const getClientLink = createIsomorphicFn()
-  .client(() => new RPCLink({
-    url: `${window.location.origin}/api/rpc`,
-    {{#if (eq auth "better-auth")}}
-    fetch(url, options) {
-      return fetch(url, {
-        ...options,
-        credentials: "include",
-      });
-    },
-    {{/if}}
-  }))
-  .server(() => new RPCLink({
-    url: `${import.meta.env.VITE_SERVER_URL}/rpc`,
-    {{#if (eq auth "better-auth")}}
-    headers: () => getRequestHeaders(),
-    fetch(url, options) {
-      return fetch(url, {
-        ...options,
-        credentials: "include",
-      });
-    },
-    {{/if}}
-  }));
+    return createORPCClient(link);
+  });
 
-export const link = getClientLink();
-{{/if}}
+export const client: RouterClient<typeof appRouter> = getORPCClient();
 {{else}}
 export const link = new RPCLink({
   {{#if (and (eq backend "self") (includes frontend "next"))}}
@@ -108,8 +82,8 @@ export const link = new RPCLink({
   {{/if}}
   {{/if}}
 });
-{{/if}}
 
 export const client: AppRouterClient = createORPCClient(link)
+{{/if}}
 
 export const orpc = createTanstackQueryUtils(client)

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,
   });