create-better-t-stack 2.15.2 → 2.16.1

package/dist/index.js

@@ -86,12 +86,9 @@ const dependencyVersionMap = {
 	"@ai-sdk/svelte": "^2.1.9",
 	"@ai-sdk/react": "^1.2.12",
 	"@prisma/extension-accelerate": "^1.3.0",
-	"@orpc/server": "^1.2.0",
-	"@orpc/client": "^1.2.0",
-	"@orpc/react-query": "^1.2.0",
-	"@orpc/solid-query": "^1.2.0",
-	"@orpc/vue-query": "^1.2.0",
-	"@orpc/svelte-query": "^1.2.0",
+	"@orpc/server": "^1.4.1",
+	"@orpc/client": "^1.4.1",
+	"@orpc/tanstack-query": "^1.4.1",
 	"@trpc/tanstack-react-query": "^11.0.0",
 	"@trpc/server": "^11.0.0",
 	"@trpc/client": "^11.0.0",
@@ -99,8 +96,8 @@ const dependencyVersionMap = {
 	"@convex-dev/react-query": "^0.0.0-alpha.8",
 	"convex-svelte": "^0.0.11",
 	"@tanstack/svelte-query": "^5.74.4",
-	"@tanstack/react-query-devtools": "^5.69.0",
-	"@tanstack/react-query": "^5.69.0",
+	"@tanstack/react-query-devtools": "^5.80.5",
+	"@tanstack/react-query": "^5.80.5",
 	"@tanstack/solid-query": "^5.75.0",
 	"@tanstack/solid-query-devtools": "^5.75.0"
 };
@@ -499,7 +496,7 @@ async function setupApi(config) {
 			if (hasReactWeb) {
 				if (api === "orpc") await addPackageDependency({
 					dependencies: [
-						"@orpc/react-query",
+						"@orpc/tanstack-query",
 						"@orpc/client",
 						"@orpc/server"
 					],
@@ -516,7 +513,7 @@ async function setupApi(config) {
 			} else if (hasNuxtWeb) {
 				if (api === "orpc") await addPackageDependency({
 					dependencies: [
-						"@orpc/vue-query",
+						"@orpc/tanstack-query",
 						"@orpc/client",
 						"@orpc/server"
 					],
@@ -525,7 +522,7 @@ async function setupApi(config) {
 			} else if (hasSvelteWeb) {
 				if (api === "orpc") await addPackageDependency({
 					dependencies: [
-						"@orpc/svelte-query",
+						"@orpc/tanstack-query",
 						"@orpc/client",
 						"@orpc/server",
 						"@tanstack/svelte-query"
@@ -535,7 +532,7 @@ async function setupApi(config) {
 			} else if (hasSolidWeb) {
 				if (api === "orpc") await addPackageDependency({
 					dependencies: [
-						"@orpc/solid-query",
+						"@orpc/tanstack-query",
 						"@orpc/client",
 						"@orpc/server",
 						"@tanstack/solid-query"
@@ -555,7 +552,7 @@ async function setupApi(config) {
 			});
 			else if (api === "orpc") await addPackageDependency({
 				dependencies: [
-					"@orpc/react-query",
+					"@orpc/tanstack-query",
 					"@orpc/client",
 					"@orpc/server"
 				],
@@ -3484,7 +3481,7 @@ function processAndValidateFlags(options, projectName) {
 	if (options.api) {
 		config.api = options.api;
 		if (options.api === "none") {
-			if (options.examples && !(options.examples.length === 1 && options.examples[0] === "none")) {
+			if (options.examples && !(options.examples.length === 1 && options.examples[0] === "none") && options.backend !== "convex") {
 				consola$1.fatal("Cannot use '--examples' when '--api' is set to 'none'. Please remove the --examples flag or choose an API type.");
 				process.exit(1);
 			}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-better-t-stack",
-  "version": "2.15.2",
+  "version": "2.16.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",

package/templates/api/orpc/native/utils/orpc.ts.hbs

@@ -1,17 +1,13 @@
 import { createORPCClient } from "@orpc/client";
 import { RPCLink } from "@orpc/client/fetch";
-import { createORPCReactQueryUtils } from "@orpc/react-query";
-import type { RouterUtils } from "@orpc/react-query";
+import { createTanstackQueryUtils } 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) => {
@@ -36,14 +32,4 @@ export const link = new RPCLink({
 
 export const client: RouterClient<typeof appRouter> = createORPCClient(link);
 
-export const orpc = createORPCReactQueryUtils(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;
-}
+export const orpc = createTanstackQueryUtils(client);

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

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

@@ -3,7 +3,7 @@ import type { RouterClient } from '@orpc/server'
 import type { appRouter } from "../../../server/src/routers/index";
 import { createORPCClient } from '@orpc/client'
 import { RPCLink } from '@orpc/client/fetch'
-import { createORPCVueQueryUtils } from '@orpc/vue-query'
+import { createTanstackQueryUtils } from "@orpc/tanstack-query";
 
 export default defineNuxtPlugin(() => {
   const config = useRuntimeConfig()
@@ -25,7 +25,7 @@ export default defineNuxtPlugin(() => {
 
 
   const client: RouterClient<typeof appRouter> = createORPCClient(rpcLink)
-  const orpcUtils = createORPCVueQueryUtils(client)
+  const orpcUtils = createTanstackQueryUtils(client)
 
   return {
     provide: {

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

@@ -1,14 +1,10 @@
 import { createORPCClient } from "@orpc/client";
 import { RPCLink } from "@orpc/client/fetch";
-import { createORPCReactQueryUtils } from "@orpc/react-query";
+import { createTanstackQueryUtils } from "@orpc/tanstack-query";
 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/react-query'
-
-type ORPCReactUtils = RouterUtils<RouterClient<typeof appRouter>>
 
 export const queryClient = new QueryClient({
   queryCache: new QueryCache({
@@ -43,15 +39,4 @@ export const link = new RPCLink({
 
 export const client: RouterClient<typeof appRouter> = createORPCClient(link)
 
-export const orpc = createORPCReactQueryUtils(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
-}
+export const orpc = createTanstackQueryUtils(client)

package/templates/api/orpc/web/solid/src/utils/orpc.ts.hbs

@@ -1,6 +1,6 @@
 import { createORPCClient } from "@orpc/client";
 import { RPCLink } from "@orpc/client/fetch";
-import { createORPCSolidQueryUtils } from "@orpc/solid-query";
+import { createTanstackQueryUtils } from "@orpc/tanstack-query";
 import { QueryCache, QueryClient } from "@tanstack/solid-query";
 import type { appRouter } from "../../../server/src/routers/index";
 import type { RouterClient } from "@orpc/server";
@@ -27,4 +27,4 @@ export const link = new RPCLink({
 
 export const client: RouterClient<typeof appRouter> = createORPCClient(link);
 
-export const orpc = createORPCSolidQueryUtils(client);
+export const orpc = createTanstackQueryUtils(client);

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

@@ -2,7 +2,7 @@ import { PUBLIC_SERVER_URL } from "$env/static/public";
 import { createORPCClient } from "@orpc/client";
 import { RPCLink } from "@orpc/client/fetch";
 import type { RouterClient } from "@orpc/server";
-import { createORPCSvelteQueryUtils } from "@orpc/svelte-query";
+import { createTanstackQueryUtils } from "@orpc/tanstack-query";
 import { QueryCache, QueryClient } from "@tanstack/svelte-query";
 import type { appRouter } from "../../../server/src/routers/index";
 
@@ -28,4 +28,4 @@ export const link = new RPCLink({
 
 export const client: RouterClient<typeof appRouter> = createORPCClient(link);
 
-export const orpc = createORPCSvelteQueryUtils(client);
+export const orpc = createTanstackQueryUtils(client);

package/templates/auth/web/nuxt/app/components/SignInForm.vue

@@ -9,7 +9,7 @@ const toast = useToast()
 const loading = ref(false)
 
 const schema = z.object({
-  email: z.string().email('Invalid email address'),
+  email: z.email('Invalid email address'),
   password: z.string().min(8, 'Password must be at least 8 characters'),
 })
 

package/templates/auth/web/nuxt/app/components/SignUpForm.vue

@@ -10,7 +10,7 @@ const loading = ref(false)
 
 const schema = z.object({
   name: z.string().min(2, 'Name must be at least 2 characters'),
-  email: z.string().email('Invalid email address'),
+  email: z.email('Invalid email address'),
   password: z.string().min(8, 'Password must be at least 8 characters'),
 })
 

package/templates/auth/web/react/next/src/components/sign-in-form.tsx

@@ -40,7 +40,7 @@ export default function SignInForm({
     },
     validators: {
       onSubmit: z.object({
-        email: z.string().email("Invalid email address"),
+        email: z.email("Invalid email address"),
         password: z.string().min(8, "Password must be at least 8 characters"),
       }),
     },

package/templates/auth/web/react/next/src/components/sign-up-form.tsx

@@ -43,7 +43,7 @@ export default function SignUpForm({
     validators: {
       onSubmit: z.object({
         name: z.string().min(2, "Name must be at least 2 characters"),
-        email: z.string().email("Invalid email address"),
+        email: z.email("Invalid email address"),
         password: z.string().min(8, "Password must be at least 8 characters"),
       }),
     },

package/templates/auth/web/react/react-router/src/components/sign-in-form.tsx

@@ -40,7 +40,7 @@ export default function SignInForm({
     },
     validators: {
       onSubmit: z.object({
-        email: z.string().email("Invalid email address"),
+        email: z.email("Invalid email address"),
         password: z.string().min(8, "Password must be at least 8 characters"),
       }),
     },

package/templates/auth/web/react/react-router/src/components/sign-up-form.tsx

@@ -43,7 +43,7 @@ export default function SignUpForm({
     validators: {
       onSubmit: z.object({
         name: z.string().min(2, "Name must be at least 2 characters"),
-        email: z.string().email("Invalid email address"),
+        email: z.email("Invalid email address"),
         password: z.string().min(8, "Password must be at least 8 characters"),
       }),
     },

package/templates/auth/web/react/tanstack-router/src/components/sign-in-form.tsx

@@ -44,7 +44,7 @@ export default function SignInForm({
 		},
 		validators: {
 			onSubmit: z.object({
-				email: z.string().email("Invalid email address"),
+				email: z.email("Invalid email address"),
 				password: z.string().min(8, "Password must be at least 8 characters"),
 			}),
 		},

package/templates/auth/web/react/tanstack-router/src/components/sign-up-form.tsx

@@ -47,7 +47,7 @@ export default function SignUpForm({
 		validators: {
 			onSubmit: z.object({
 				name: z.string().min(2, "Name must be at least 2 characters"),
-				email: z.string().email("Invalid email address"),
+				email: z.email("Invalid email address"),
 				password: z.string().min(8, "Password must be at least 8 characters"),
 			}),
 		},

package/templates/auth/web/react/tanstack-start/src/components/sign-in-form.tsx

@@ -44,7 +44,7 @@ export default function SignInForm({
 		},
 		validators: {
 			onSubmit: z.object({
-				email: z.string().email("Invalid email address"),
+				email: z.email("Invalid email address"),
 				password: z.string().min(8, "Password must be at least 8 characters"),
 			}),
 		},

package/templates/auth/web/react/tanstack-start/src/components/sign-up-form.tsx

@@ -47,7 +47,7 @@ export default function SignUpForm({
 		validators: {
 			onSubmit: z.object({
 				name: z.string().min(2, "Name must be at least 2 characters"),
-				email: z.string().email("Invalid email address"),
+				email: z.email("Invalid email address"),
 				password: z.string().min(8, "Password must be at least 8 characters"),
 			}),
 		},

package/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();
 

package/templates/auth/web/solid/src/components/sign-in-form.tsx

@@ -39,7 +39,7 @@ export default function SignInForm({
     },
     validators: {
       onSubmit: z.object({
-        email: z.string().email("Invalid email address"),
+        email: z.email("Invalid email address"),
         password: z.string().min(8, "Password must be at least 8 characters"),
       }),
     },

package/templates/auth/web/solid/src/components/sign-up-form.tsx

@@ -42,7 +42,7 @@ export default function SignUpForm({
     validators: {
       onSubmit: z.object({
         name: z.string().min(2, "Name must be at least 2 characters"),
-        email: z.string().email("Invalid email address"),
+        email: z.email("Invalid email address"),
         password: z.string().min(8, "Password must be at least 8 characters"),
       }),
     },

package/templates/auth/web/svelte/src/components/SignInForm.svelte

@@ -7,7 +7,7 @@
 	let { switchToSignUp } = $props<{ switchToSignUp: () => void }>();
 
 	const validationSchema = z.object({
-		email: z.string().email('Invalid email address'),
+		email: z.email('Invalid email address'),
 		password: z.string().min(1, 'Password is required'),
 	});
 

package/templates/auth/web/svelte/src/components/SignUpForm.svelte

@@ -8,7 +8,7 @@
 
 	const validationSchema = z.object({
 		name: z.string().min(2, 'Name must be at least 2 characters'),
-		email: z.string().email('Invalid email address'),
+		email: z.email('Invalid email address'),
 		password: z.string().min(8, 'Password must be at least 8 characters'),
 	});
 

package/templates/examples/todo/native/nativewind/app/(drawer)/todos.tsx.hbs

@@ -70,12 +70,12 @@ export default function TodosScreen() {
     );
     const toggleMutation = useMutation(
       orpc.todo.toggle.mutationOptions({
-        onSuccess: () => todos.refetch(),
+        onSuccess: () => { todos.refetch() },
       }),
     );
     const deleteMutation = useMutation(
       orpc.todo.delete.mutationOptions({
-        onSuccess: () => todos.refetch(),
+        onSuccess: () => { todos.refetch() },
       }),
     );
     {{/if}}
@@ -91,12 +91,12 @@ export default function TodosScreen() {
     );
     const toggleMutation = useMutation(
       trpc.todo.toggle.mutationOptions({
-        onSuccess: () => todos.refetch(),
+        onSuccess: () => { todos.refetch() },
       }),
     );
     const deleteMutation = useMutation(
       trpc.todo.delete.mutationOptions({
-        onSuccess: () => todos.refetch(),
+        onSuccess: () => { todos.refetch() },
       }),
     );
     {{/if}}

package/templates/examples/todo/native/unistyles/app/(drawer)/todos.tsx.hbs

@@ -73,12 +73,12 @@ export default function TodosScreen() {
     );
     const toggleMutation = useMutation(
       orpc.todo.toggle.mutationOptions({
-        onSuccess: () => todos.refetch(),
+        onSuccess: () => { todos.refetch() },
       })
     );
     const deleteMutation = useMutation(
       orpc.todo.delete.mutationOptions({
-        onSuccess: () => todos.refetch(),
+        onSuccess: () => { todos.refetch() },
       })
     );
     {{/if}}
@@ -94,12 +94,12 @@ export default function TodosScreen() {
     );
     const toggleMutation = useMutation(
       trpc.todo.toggle.mutationOptions({
-        onSuccess: () => todos.refetch(),
+        onSuccess: () => { todos.refetch() },
       })
     );
     const deleteMutation = useMutation(
       trpc.todo.delete.mutationOptions({
-        onSuccess: () => todos.refetch(),
+        onSuccess: () => { todos.refetch() },
       })
     );
     {{/if}}
@@ -337,4 +337,4 @@ const styles = StyleSheet.create((theme) => ({
     textDecorationLine: "line-through",
     color: theme.colors.border,
   },
-})); 
+}));

package/templates/examples/todo/web/react/next/src/app/todos/page.tsx.hbs

@@ -65,12 +65,12 @@ export default function TodosPage() {
     );
     const toggleMutation = useMutation(
       orpc.todo.toggle.mutationOptions({
-        onSuccess: () => todos.refetch(),
+        onSuccess: () => { todos.refetch() },
       }),
     );
     const deleteMutation = useMutation(
       orpc.todo.delete.mutationOptions({
-        onSuccess: () => todos.refetch(),
+        onSuccess: () => { todos.refetch() },
       }),
     );
     {{/if}}
@@ -86,12 +86,12 @@ export default function TodosPage() {
     );
     const toggleMutation = useMutation(
       trpc.todo.toggle.mutationOptions({
-        onSuccess: () => todos.refetch(),
+        onSuccess: () => { todos.refetch() },
       }),
     );
     const deleteMutation = useMutation(
       trpc.todo.delete.mutationOptions({
-        onSuccess: () => todos.refetch(),
+        onSuccess: () => { todos.refetch() },
       }),
     );
     {{/if}}

package/templates/examples/todo/web/react/react-router/src/routes/todos.tsx.hbs

@@ -62,12 +62,12 @@ export default function Todos() {
     );
     const toggleMutation = useMutation(
       orpc.todo.toggle.mutationOptions({
-        onSuccess: () => todos.refetch(),
+        onSuccess: () => { todos.refetch() },
       })
     );
     const deleteMutation = useMutation(
       orpc.todo.delete.mutationOptions({
-        onSuccess: () => todos.refetch(),
+        onSuccess: () => { todos.refetch() },
       })
     );
     {{/if}}
@@ -83,12 +83,12 @@ export default function Todos() {
     );
     const toggleMutation = useMutation(
       trpc.todo.toggle.mutationOptions({
-        onSuccess: () => todos.refetch(),
+        onSuccess: () => { todos.refetch() },
       })
     );
     const deleteMutation = useMutation(
       trpc.todo.delete.mutationOptions({
-        onSuccess: () => todos.refetch(),
+        onSuccess: () => { todos.refetch() },
       })
     );
     {{/if}}

package/templates/examples/todo/web/react/tanstack-router/src/routes/todos.tsx.hbs

@@ -67,12 +67,12 @@ function TodosRoute() {
     );
     const toggleMutation = useMutation(
       orpc.todo.toggle.mutationOptions({
-        onSuccess: () => todos.refetch(),
+        onSuccess: () => { todos.refetch() },
       }),
     );
     const deleteMutation = useMutation(
       orpc.todo.delete.mutationOptions({
-        onSuccess: () => todos.refetch(),
+        onSuccess: () => { todos.refetch() },
       }),
     );
     {{/if}}
@@ -88,12 +88,12 @@ function TodosRoute() {
     );
     const toggleMutation = useMutation(
       trpc.todo.toggle.mutationOptions({
-        onSuccess: () => todos.refetch(),
+        onSuccess: () => { todos.refetch() },
       }),
     );
     const deleteMutation = useMutation(
       trpc.todo.delete.mutationOptions({
-        onSuccess: () => todos.refetch(),
+        onSuccess: () => { todos.refetch() },
       }),
     );
     {{/if}}

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

@@ -17,14 +17,14 @@ import { useSuspenseQuery } from "@tanstack/react-query";
 import { convexQuery } from "@convex-dev/react-query";
 import { useMutation } from "convex/react";
 import { api } from "@{{projectName}}/backend/convex/_generated/api";
-import type { Id } from "@{{projectName}}/backend/convex/_generated/dataModel.js";
+import type { Id } from "@{{projectName}}/backend/convex/_generated/dataModel";
 {{else}}
-  {{#if (eq api "trpc")}}
+{{#if (eq api "trpc")}}
 import { useTRPC } from "@/utils/trpc";
-  {{/if}}
-  {{#if (eq api "orpc")}}
-import { useORPC } from "@/utils/orpc";
-  {{/if}}
+{{/if}}
+{{#if (eq api "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")}}
@@ -92,12 +91,12 @@ function TodosRoute() {
   );
   const toggleMutation = useMutation(
     trpc.todo.toggle.mutationOptions({
-      onSuccess: () => todos.refetch(),
+      onSuccess: () => { todos.refetch() },
     }),
   );
   const deleteMutation = useMutation(
     trpc.todo.delete.mutationOptions({
-      onSuccess: () => todos.refetch(),
+      onSuccess: () => { todos.refetch() },
     }),
   );
     {{/if}}
@@ -113,12 +112,12 @@ function TodosRoute() {
   );
   const toggleMutation = useMutation(
     orpc.todo.toggle.mutationOptions({
-      onSuccess: () => todos.refetch(),
+      onSuccess: () => { todos.refetch() },
     }),
   );
   const deleteMutation = useMutation(
     orpc.todo.delete.mutationOptions({
-      onSuccess: () => todos.refetch(),
+      onSuccess: () => { todos.refetch() },
     }),
   );
     {{/if}}

package/templates/examples/todo/web/solid/src/routes/{todos.tsx → todos.tsx.hbs}

@@ -24,13 +24,13 @@ function TodosRoute() {
 
   const toggleMutation = useMutation(() =>
     orpc.todo.toggle.mutationOptions({
-      onSuccess: () => todos.refetch(),
+      onSuccess: () => { todos.refetch() },
     }),
   );
 
   const deleteMutation = useMutation(() =>
     orpc.todo.delete.mutationOptions({
-      onSuccess: () => todos.refetch(),
+      onSuccess: () => { todos.refetch() },
     }),
   );
 

package/templates/examples/todo/web/svelte/src/routes/todos/+page.svelte.hbs

@@ -2,7 +2,7 @@
 <script lang="ts">
 	import { useQuery, useConvexClient } from 'convex-svelte';
 	import { api } from '@{{projectName}}/backend/convex/_generated/api';
-	import type { Id } from '@{{projectName}}/backend/convex/_generated/dataModel.js';
+	import type { Id } from '@{{projectName}}/backend/convex/_generated/dataModel';
 
 	let newTodoText = $state('');
 	let isAdding = $state(false);
@@ -164,9 +164,6 @@
 	{{#if (eq api "orpc")}}
 	import { orpc } from '$lib/orpc';
 	{{/if}}
-	{{#if (eq api "trpc")}}
-	import { trpc } from '$lib/trpc';
-	{{/if}}
 	import { createQuery, createMutation } from '@tanstack/svelte-query';
 
 	let newTodoText = $state('');
@@ -208,43 +205,6 @@
 		})
 	);
 	{{/if}}
-	{{#if (eq api "trpc")}}
-	const todosQuery = createQuery(trpc.todo.getAll.queryOptions());
-
-	const addMutation = createMutation(
-		trpc.todo.create.mutationOptions({
-			onSuccess: () => {
-				$todosQuery.refetch();
-				newTodoText = '';
-			},
-			onError: (error) => {
-				console.error('Failed to create todo:', error?.message ?? error);
-			},
-		})
-	);
-
-	const toggleMutation = createMutation(
-		trpc.todo.toggle.mutationOptions({
-			onSuccess: () => {
-				$todosQuery.refetch();
-			},
-			onError: (error) => {
-				console.error('Failed to toggle todo:', error?.message ?? error);
-			},
-		})
-	);
-
-	const deleteMutation = createMutation(
-		trpc.todo.delete.mutationOptions({
-			onSuccess: () => {
-				$todosQuery.refetch();
-			},
-			onError: (error) => {
-				console.error('Failed to delete todo:', error?.message ?? error);
-			},
-		})
-	);
-	{{/if}}
 
 	function handleAddTodo(event: SubmitEvent) {
 		event.preventDefault();
@@ -271,7 +231,7 @@
 </script>
 
 <div class="p-4">
-	<h1 class="text-xl mb-4">Todos{{#if (eq api "trpc")}} (tRPC){{/if}}{{#if (eq api "orpc")}} (oRPC){{/if}}</h1>
+	<h1 class="text-xl mb-4">Todos{{#if (eq api "orpc")}} (oRPC){{/if}}</h1>
 
 	<form onsubmit={handleAddTodo} class="flex gap-2 mb-4">
 		<input

package/templates/frontend/react/next/src/components/providers.tsx.hbs

@@ -1,28 +1,32 @@
 "use client";
 
 {{#if (eq backend "convex")}}
-  import { ConvexProvider, ConvexReactClient } from "convex/react";
+import { ConvexProvider, ConvexReactClient } from "convex/react";
 {{else}}
-  {{#unless (eq api "none")}}
-    import { QueryClientProvider } from "@tanstack/react-query";
-    import { ReactQueryDevtools } from "@tanstack/react-query-devtools";
-    {{#if (eq api "orpc")}}
-      import { orpc, ORPCContext, queryClient } from "@/utils/orpc";
-    {{/if}}
-    {{#if (eq api "trpc")}}
-      import { queryClient } from "@/utils/trpc";
-    {{/if}}
-  {{/unless}}
+{{#unless (eq api "none")}}
+import { QueryClientProvider } from "@tanstack/react-query";
+import { ReactQueryDevtools } from "@tanstack/react-query-devtools";
+{{#if (eq api "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";
 
 {{#if (eq backend "convex")}}
-  const convex = new ConvexReactClient(process.env.NEXT_PUBLIC_CONVEX_URL!);
+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"
@@ -30,23 +34,21 @@ export default function Providers({ children }: { children: React.ReactNode }) {
       disableTransitionOnChange
     >
       {{#if (eq backend "convex")}}
-        <ConvexProvider client={convex}>{children}</ConvexProvider>
+      <ConvexProvider client={convex}>{children}</ConvexProvider>
+      {{else}}
+      {{#unless (eq api "none")}}
+      <QueryClientProvider client={queryClient}>
+        {{#if (eq api "orpc")}}
+        {children}
+        {{/if}}
+        {{#if (eq api "trpc")}}
+        {children}
+        {{/if}}
+        <ReactQueryDevtools />
+      </QueryClientProvider>
       {{else}}
-        {{#unless (eq api "none")}}
-          <QueryClientProvider client={queryClient}>
-            {{#if (eq api "orpc")}}
-              <ORPCContext.Provider value={orpc}>
-                {children}
-              </ORPCContext.Provider>
-            {{/if}}
-            {{#if (eq api "trpc")}}
-              {children}
-            {{/if}}
-            <ReactQueryDevtools />
-          </QueryClientProvider>
-        {{else}}
-          {children}
-        {{/unless}}
+      {children}
+      {{/unless}}
       {{/if}}
       <Toaster richColors />
     </ThemeProvider>

package/templates/frontend/react/react-router/src/root.tsx.hbs

@@ -13,18 +13,18 @@ import { ThemeProvider } from "./components/theme-provider";
 import { Toaster } from "./components/ui/sonner";
 
 {{#if (eq backend "convex")}}
-  import { ConvexProvider, ConvexReactClient } from "convex/react";
+import { ConvexProvider, ConvexReactClient } from "convex/react";
 {{else}}
-  {{#unless (eq api "none")}}
-    import { QueryClientProvider } from "@tanstack/react-query";
-    import { ReactQueryDevtools } from "@tanstack/react-query-devtools";
-    {{#if (eq api "orpc")}}
-      import { orpc, ORPCContext, queryClient } from "./utils/orpc";
-    {{/if}}
-    {{#if (eq api "trpc")}}
-      import { queryClient } from "./utils/trpc";
-    {{/if}}
-  {{/unless}}
+{{#unless (eq api "none")}}
+import { QueryClientProvider } from "@tanstack/react-query";
+import { ReactQueryDevtools } from "@tanstack/react-query-devtools";
+{{#if (eq api "orpc")}}
+import { queryClient } from "./utils/orpc";
+{{/if}}
+{{#if (eq api "trpc")}}
+import { queryClient } from "./utils/trpc";
+{{/if}}
+{{/unless}}
 {{/if}}
 
 export const links: Route.LinksFunction = () => [
@@ -62,43 +62,26 @@ export function Layout({ children }: { children: React.ReactNode }) {
 }
 
 {{#if (eq backend "convex")}}
-  export default function App() {
-    const convex = new ConvexReactClient(
-      import.meta.env.VITE_CONVEX_URL as string,
-    );
-    return (
-      <ConvexProvider client={convex}>
-        <ThemeProvider defaultTheme="dark" storageKey="vite-ui-theme">
-          <div className="grid grid-rows-[auto_1fr] h-svh">
-            <Header />
-            <Outlet />
-          </div>
-          <Toaster richColors />
-        </ThemeProvider>
-      </ConvexProvider>
-    );
-  }
+export default function App() {
+  const convex = new ConvexReactClient(
+    import.meta.env.VITE_CONVEX_URL as string,
+  );
+  return (
+    <ConvexProvider client={convex}>
+      <ThemeProvider defaultTheme="dark" storageKey="vite-ui-theme">
+        <div className="grid grid-rows-[auto_1fr] h-svh">
+          <Header />
+          <Outlet />
+        </div>
+        <Toaster richColors />
+      </ThemeProvider>
+    </ConvexProvider>
+  );
+}
 {{else if (eq api "orpc")}}
-  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 />
-              <Outlet />
-            </div>
-            <Toaster richColors />
-          </ThemeProvider>
-        </ORPCContext.Provider>
-        <ReactQueryDevtools position="bottom" buttonPosition="bottom-right" />
-      </QueryClientProvider>
-    );
-  }
-{{else if (eq api "trpc")}}
-  export default function App() {
-    return (
-      <QueryClientProvider client={queryClient}>
+export default function App() {
+  return (
+    <QueryClientProvider client={queryClient}>
         <ThemeProvider defaultTheme="dark" storageKey="vite-ui-theme">
           <div className="grid grid-rows-[auto_1fr] h-svh">
             <Header />
@@ -106,13 +89,14 @@ export function Layout({ children }: { children: React.ReactNode }) {
           </div>
           <Toaster richColors />
         </ThemeProvider>
-        <ReactQueryDevtools position="bottom" buttonPosition="bottom-right" />
-      </QueryClientProvider>
-    );
-  }
-{{else}}
-  export default function App() {
-    return (
+      <ReactQueryDevtools position="bottom" buttonPosition="bottom-right" />
+    </QueryClientProvider>
+  );
+}
+{{else if (eq api "trpc")}}
+export default function App() {
+  return (
+    <QueryClientProvider client={queryClient}>
       <ThemeProvider defaultTheme="dark" storageKey="vite-ui-theme">
         <div className="grid grid-rows-[auto_1fr] h-svh">
           <Header />
@@ -120,8 +104,22 @@ export function Layout({ children }: { children: React.ReactNode }) {
         </div>
         <Toaster richColors />
       </ThemeProvider>
-    );
-  }
+      <ReactQueryDevtools position="bottom" buttonPosition="bottom-right" />
+    </QueryClientProvider>
+  );
+}
+{{else}}
+export default function App() {
+  return (
+    <ThemeProvider defaultTheme="dark" storageKey="vite-ui-theme">
+      <div className="grid grid-rows-[auto_1fr] h-svh">
+        <Header />
+        <Outlet />
+      </div>
+      <Toaster richColors />
+    </ThemeProvider>
+  );
+}
 {{/if}}
 
 export function ErrorBoundary({ error }: Route.ErrorBoundaryProps) {

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 type { RouterClient } from "@orpc/server";
-import { createORPCReactQueryUtils } from "@orpc/react-query";
+import { createTanstackQueryUtils } from "@orpc/tanstack-query";
 import type { appRouter } from "../../../server/src/routers";
 import { createORPCClient } from "@orpc/client";
 {{/if}}
@@ -68,14 +68,13 @@ function RootComponent() {
 
   {{#if (eq api "orpc")}}
   const [client] = useState<RouterClient<typeof appRouter>>(() => createORPCClient(link));
-  const [orpcUtils] = useState(() => createORPCReactQueryUtils(client));
+  const [orpcUtils] = useState(() => createTanstackQueryUtils(client));
   {{/if}}
 
   return (
     <>
       <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">

package/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",
-    "@tanstack/react-query": "^5.71.10",
-    "@tanstack/react-router": "^1.114.3",
-    "@tanstack/react-router-with-query": "^1.114.3",
-    "@tanstack/react-start": "^1.114.3",
-    "@tanstack/router-plugin": "^1.114.3",
+    "@tailwindcss/vite": "^4.1.8",
+    "@tanstack/react-query": "^5.80.5",
+    "@tanstack/react-router": "^1.120.15",
+    "@tanstack/react-router-with-query": "^1.120.15",
+    "@tanstack/react-start": "^1.120.15",
+    "@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-dom": "^19.0.0",
+    "react": "^19.1.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-dom": "^19.0.3",
+    "@types/react": "^19.1.6",
+    "@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"
   }
 }

package/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 { orpc, ORPCContext, queryClient as orpcQueryClient } from "./utils/orpc";
+import { QueryClientProvider } from "@tanstack/react-query";
+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>
+        {children}
       </QueryClientProvider>
     ),
     {{else}}

package/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}}
 

package/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",