Merging main

Author: jherr

package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-tsrouter-app",
-  "version": "0.10.0-alpha.2",
+  "version": "0.11.0-alpha.2",
   "description": "Tanstack Application Builder",
   "bin": "./dist/index.js",
   "type": "module",

templates/react/add-on/tRPC/assets/src/integrations/trpc/react.ts

@@ -1,4 +1,4 @@
 import { createTRPCContext } from "@trpc/tanstack-react-query";
-import type { TRPCRouter } from "@/trpc/router";
+import type { TRPCRouter } from "@/integrations/trpc/router";
 
 export const { TRPCProvider, useTRPC } = createTRPCContext<TRPCRouter>();

templates/react/file-router/src/routes/__root.tsx.ejs

@@ -11,13 +11,14 @@ import appCss from '../styles.css?url'
 <% } %><% if (addOnEnabled["tanstack-query"]) { %>
 import type { QueryClient } from '@tanstack/react-query'
 <% if (addOnEnabled.tRPC) { %>
-import { TRPCRouter } from '@/integrations/trpc/router'
+import type { TRPCRouter } from '@/integrations/trpc/router'
+import type { TRPCOptionsProxy } from '@trpc/tanstack-react-query'
 <% } %>
 
 interface MyRouterContext {
   queryClient: QueryClient
   <% if (addOnEnabled.tRPC) { %>
-  trpc: TRPCRouter
+  trpc: TRPCOptionsProxy<TRPCRouter>
   <% } %>
 }<% } %>
 
@@ -78,4 +79,4 @@ function RootDocument({ children }: { children: React.ReactNode }) {
     </html>
   )
 }
-<% } %>
+<% } %>