fix orpc templates (#302)

.changeset/olive-mails-eat.md

@@ -0,0 +1,5 @@
+---
+"create-better-t-stack": patch
+---
+
+Improve oRPC templates

apps/cli/src/constants.ts

@@ -100,8 +100,8 @@ export const dependencyVersionMap = {
 	"convex-svelte": "^0.0.11",
 
 	"@tanstack/svelte-query": "^5.74.4",
-	"@tanstack/react-query-devtools": "^5.69.0",
+	"@tanstack/react-query-devtools": "^5.80.5",
-	"@tanstack/react-query": "^5.69.0",
+	"@tanstack/react-query": "^5.80.5",
 
 	"@tanstack/solid-query": "^5.75.0",
 	"@tanstack/solid-query-devtools": "^5.75.0",

apps/cli/templates/api/orpc/native/utils/orpc.ts.hbs

@@ -1,17 +1,13 @@
 import { createORPCClient } from "@orpc/client";
 import { RPCLink } from "@orpc/client/fetch";
 import { createTanstackQueryUtils } from "@orpc/tanstack-query";
-import type { RouterUtils } from "@orpc/tanstack-query";
 import type { RouterClient } from "@orpc/server";
 import { QueryCache, QueryClient } from "@tanstack/react-query";
-import { createContext, useContext } from "react";
 import type { appRouter } from "../../server/src/routers";
 {{#if auth}}
 import { authClient } from "@/lib/auth-client";
 {{/if}}
 
-type ORPCReactUtils = RouterUtils<RouterClient<typeof appRouter>>;
-
 export const queryClient = new QueryClient({
   queryCache: new QueryCache({
     onError: (error) => {
@@ -37,13 +33,3 @@ export const link = new RPCLink({
 export const client: RouterClient<typeof appRouter> = createORPCClient(link);
 
 export const orpc = createTanstackQueryUtils(client);
-
-export const ORPCContext = createContext<ORPCReactUtils | undefined>(undefined);
-
-export function useORPC(): ORPCReactUtils {
-  const orpc = useContext(ORPCContext);
-  if (!orpc) {
-    throw new Error("ORPCContext is not set up properly");
-  }
-  return orpc;
-}

apps/cli/templates/api/orpc/server/base/src/lib/orpc.ts.hbs

@@ -12,7 +12,6 @@ const requireAuth = o.middleware(async ({ context, next }) => {
   }
   return next({
     context: {
-      ...context,
       session: context.session,
     },
   });

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

@@ -5,10 +5,6 @@ import { QueryCache, QueryClient } from "@tanstack/react-query";
 import { toast } from "sonner";
 import type { appRouter } from "../../../server/src/routers/index";
 import type { RouterClient } from "@orpc/server";
-import { createContext, use } from 'react'
-import type { RouterUtils } from '@orpc/tanstack-query'
-
-type ORPCReactUtils = RouterUtils<RouterClient<typeof appRouter>>
 
 export const queryClient = new QueryClient({
   queryCache: new QueryCache({
@@ -44,14 +40,3 @@ export const link = new RPCLink({
 export const client: RouterClient<typeof appRouter> = createORPCClient(link)
 
 export const orpc = createTanstackQueryUtils(client)
-
-
-export const ORPCContext = createContext<ORPCReactUtils | undefined>(undefined)
-
-export function useORPC(): ORPCReactUtils {
-  const orpc = use(ORPCContext)
-  if (!orpc) {
-    throw new Error('ORPCContext is not set up properly')
-  }
-  return orpc
-}

apps/cli/templates/auth/web/react/tanstack-start/src/routes/dashboard.tsx.hbs

@@ -3,7 +3,7 @@ import { authClient } from "@/lib/auth-client";
 import { useTRPC } from "@/utils/trpc";
 {{/if}}
 {{#if (eq api "orpc")}}
-import { useORPC } from "@/utils/orpc";
+import { orpc } from "@/utils/orpc";
 {{/if}}
 import { useQuery } from "@tanstack/react-query";
 import { createFileRoute } from "@tanstack/react-router";
@@ -19,7 +19,6 @@ function RouteComponent() {
   const trpc = useTRPC();
   {{/if}}
   {{#if (eq api "orpc")}}
-  const orpc = useORPC();
   {{/if}}
   const { data: session, isPending } = authClient.useSession();
 

apps/cli/templates/examples/todo/web/react/tanstack-start/src/routes/todos.tsx.hbs

@@ -23,7 +23,7 @@ import type { Id } from "@{{projectName}}/backend/convex/_generated/dataModel";
 import { useTRPC } from "@/utils/trpc";
 {{/if}}
 {{#if (eq api "orpc")}}
-import { useORPC } from "@/utils/orpc";
+import { orpc } from "@/utils/orpc";
 {{/if}}
 import { useMutation, useQuery } from "@tanstack/react-query";
 {{/if}}
@@ -77,7 +77,6 @@ function TodosRoute() {
   const trpc = useTRPC();
     {{/if}}
     {{#if (eq api "orpc")}}
-  const orpc = useORPC();
     {{/if}}
 
     {{#if (eq api "trpc")}}

apps/cli/templates/frontend/react/next/src/components/providers.tsx.hbs

@@ -7,14 +7,13 @@
 import { QueryClientProvider } from "@tanstack/react-query";
 import { ReactQueryDevtools } from "@tanstack/react-query-devtools";
 {{#if (eq api "orpc")}}
-      import { orpc, ORPCContext, queryClient } from "@/utils/orpc";
+import { queryClient } from "@/utils/orpc";
 {{/if}}
 {{#if (eq api "trpc")}}
 import { queryClient } from "@/utils/trpc";
 {{/if}}
 {{/unless}}
 {{/if}}
-
 import { ThemeProvider } from "./theme-provider";
 import { Toaster } from "./ui/sonner";
 
@@ -22,7 +21,12 @@ import { Toaster } from "./ui/sonner";
 const convex = new ConvexReactClient(process.env.NEXT_PUBLIC_CONVEX_URL!);
 {{/if}}
 
-export default function Providers({ children }: { children: React.ReactNode }) {  return (
+export default function Providers({
+  children
+}: {
+  children: React.ReactNode
+}) {
+  return (
     <ThemeProvider
       attribute="class"
       defaultTheme="system"
@@ -35,9 +39,7 @@ export default function Providers({ children }: { children: React.ReactNode }) {
       {{#unless (eq api "none")}}
       <QueryClientProvider client={queryClient}>
         {{#if (eq api "orpc")}}
-              <ORPCContext.Provider value={orpc}>
         {children}
-              </ORPCContext.Provider>
         {{/if}}
         {{#if (eq api "trpc")}}
         {children}

apps/cli/templates/frontend/react/react-router/src/root.tsx.hbs

@@ -19,7 +19,7 @@ import { Toaster } from "./components/ui/sonner";
 import { QueryClientProvider } from "@tanstack/react-query";
 import { ReactQueryDevtools } from "@tanstack/react-query-devtools";
 {{#if (eq api "orpc")}}
-      import { orpc, ORPCContext, queryClient } from "./utils/orpc";
+import { queryClient } from "./utils/orpc";
 {{/if}}
 {{#if (eq api "trpc")}}
 import { queryClient } from "./utils/trpc";
@@ -82,7 +82,6 @@ export function Layout({ children }: { children: React.ReactNode }) {
 export default function App() {
   return (
     <QueryClientProvider client={queryClient}>
-        <ORPCContext.Provider value={orpc}>
         <ThemeProvider defaultTheme="dark" storageKey="vite-ui-theme">
           <div className="grid grid-rows-[auto_1fr] h-svh">
             <Header />
@@ -90,7 +89,6 @@ export function Layout({ children }: { children: React.ReactNode }) {
           </div>
           <Toaster richColors />
         </ThemeProvider>
-        </ORPCContext.Provider>
       <ReactQueryDevtools position="bottom" buttonPosition="bottom-right" />
     </QueryClientProvider>
   );

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

@@ -75,7 +75,6 @@ function RootComponent() {
     <>
       <HeadContent />
       {{#if (eq api "orpc")}}
-      <ORPCContext.Provider value={orpcUtils}>
         <ThemeProvider defaultTheme="dark" storageKey="vite-ui-theme">
           <div className="grid grid-rows-[auto_1fr] h-svh">
             <Header />
@@ -83,7 +82,6 @@ function RootComponent() {
           </div>
           <Toaster richColors />
         </ThemeProvider>
-      </ORPCContext.Provider>
       {{else}}
       <ThemeProvider defaultTheme="dark" storageKey="vite-ui-theme">
         <div className="grid grid-rows-[auto_1fr] h-svh">

apps/cli/templates/frontend/react/tanstack-start/package.json

@@ -14,18 +14,18 @@
     "@radix-ui/react-label": "^2.1.2",
     "@radix-ui/react-slot": "^1.1.2",
     "@tanstack/react-form": "^1.0.5",
-    "@tailwindcss/vite": "^4.0.6",
+    "@tailwindcss/vite": "^4.1.8",
-    "@tanstack/react-query": "^5.71.10",
+    "@tanstack/react-query": "^5.80.5",
-    "@tanstack/react-router": "^1.114.3",
+    "@tanstack/react-router": "^1.120.15",
-    "@tanstack/react-router-with-query": "^1.114.3",
+    "@tanstack/react-router-with-query": "^1.120.15",
-    "@tanstack/react-start": "^1.114.3",
+    "@tanstack/react-start": "^1.120.15",
-    "@tanstack/router-plugin": "^1.114.3",
+    "@tanstack/router-plugin": "^1.120.15",
     "class-variance-authority": "^0.7.1",
 		"clsx": "^2.1.1",
     "lucide-react": "^0.473.0",
     "next-themes": "^0.4.6",
-    "react": "^19.0.0",
+    "react": "^19.1.0",
-    "react-dom": "^19.0.0",
+    "react-dom": "^19.1.0",
     "sonner": "^2.0.3",
     "tailwindcss": "^4.1.3",
     "tailwind-merge": "^2.6.0",
@@ -35,15 +35,15 @@
     "zod": "^3.25.16"
   },
   "devDependencies": {
-    "@tanstack/react-router-devtools": "^1.114.3",
+    "@tanstack/react-router-devtools": "^1.120.15",
     "@testing-library/dom": "^10.4.0",
     "@testing-library/react": "^16.2.0",
-    "@types/react": "^19.0.8",
+    "@types/react": "^19.1.6",
-    "@types/react-dom": "^19.0.3",
+    "@types/react-dom": "^19.1.6",
     "@vitejs/plugin-react": "^4.3.4",
     "jsdom": "^26.0.0",
     "typescript": "^5.7.2",
-    "vite": "^6.1.0",
+    "vite": "^6.3.5",
     "web-vitals": "^4.2.4"
   }
 }

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

@@ -20,8 +20,8 @@ import { toast } from "sonner";
 import type { AppRouter } from "../../server/src/routers";
 import { TRPCProvider } from "./utils/trpc";
   {{else if (eq api "orpc")}}
-import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
+import { QueryClientProvider } from "@tanstack/react-query";
-import { orpc, ORPCContext, queryClient as orpcQueryClient } from "./utils/orpc";
+import { orpc, queryClient } from "./utils/orpc";
   {{/if}}
 {{/if}}
 
@@ -99,7 +99,6 @@ const trpc = createTRPCOptionsProxy({
   queryClient: queryClient,
 });
   {{else if (eq api "orpc")}}
-  const queryClient = orpcQueryClient;
   {{/if}}
 
 export const createRouter = () => {
@@ -127,9 +126,7 @@ export const createRouter = () => {
     {{else if (eq api "orpc")}}
     Wrap: ({ children }) => (
       <QueryClientProvider client={queryClient}>
-        <ORPCContext.Provider value={orpc}>
         {children}
-        </ORPCContext.Provider>
       </QueryClientProvider>
     ),
     {{else}}

apps/cli/templates/frontend/react/tanstack-start/src/routes/index.tsx.hbs

@@ -9,7 +9,7 @@ import { useQuery } from "@tanstack/react-query";
 import { useTRPC } from "@/utils/trpc";
   {{/if}}
   {{#if (eq api "orpc")}}
-import { useORPC } from "@/utils/orpc";
+import { orpc } from "@/utils/orpc";
   {{/if}}
 {{/if}}
 
@@ -40,7 +40,6 @@ function HomeComponent() {
   const trpc = useTRPC();
   const healthCheck = useQuery(trpc.healthCheck.queryOptions());
   {{else if (eq api "orpc")}}
-  const orpc = useORPC();
   const healthCheck = useQuery(orpc.healthCheck.queryOptions());
   {{/if}}
 

apps/cli/templates/frontend/solid/package.json

@@ -9,17 +9,11 @@
     "test": "vitest run"
   },
   "dependencies": {
-    "@orpc/client": "^1.1.1",
-    "@orpc/server": "^1.1.1",
-    "@orpc/solid-query": "^1.1.1",
     "@tailwindcss/vite": "^4.0.6",
     "@tanstack/router-plugin": "^1.109.2",
     "@tanstack/solid-form": "^1.9.0",
-    "@tanstack/solid-query": "^5.75.0",
-    "@tanstack/solid-query-devtools": "^5.75.0",
     "@tanstack/solid-router": "^1.110.0",
     "@tanstack/solid-router-devtools": "^1.109.2",
-    "better-auth": "^1.2.7",
     "lucide-solid": "^0.507.0",
     "solid-js": "^1.9.4",
     "tailwindcss": "^4.0.6",

bun.lock

@@ -14,7 +14,7 @@
     },
     "apps/cli": {
       "name": "create-better-t-stack",
-      "version": "2.14.4",
+      "version": "2.16.0",
       "bin": {
         "create-better-t-stack": "dist/index.js",
       },