regression: re-export react query client utilites

integration-tests/auth-with-rpc/package.json

@@ -24,7 +24,6 @@
     "@hookform/error-message": "2.0.0",
     "@hookform/resolvers": "2.9.10",
     "@prisma/client": "4.6.1",
-    "@tanstack/react-query": "4.24.4",
     "blitz": "2.0.0-beta.36",
     "delay": "5.0.0",
     "next": "14.0.4",

integration-tests/auth-with-rpc/src/pages/_app.tsx

@@ -1,5 +1,5 @@
 import {withBlitz} from "../blitz-client"
-import {useQueryErrorResetBoundary} from "@tanstack/react-query"
+import {useQueryErrorResetBoundary} from "@blitzjs/rpc"
 import {AppProps, ErrorBoundary, ErrorFallbackProps} from "@blitzjs/next"
 
 if (typeof window !== "undefined") {

packages/blitz-next/package.json

@@ -38,15 +38,13 @@
     "supports-color": "8.1.1"
   },
   "peerDependencies": {
-    "@tanstack/react-query": "*",
     "blitz": "2.0.0-beta.36",
     "next": "*",
     "react": "*",
     "tslog": "4.9.0"
   },
   "devDependencies": {
     "@blitzjs/config": "2.0.0-beta.36",
-    "@tanstack/react-query": "4.24.4",
     "@testing-library/dom": "8.13.0",
     "@testing-library/jest-dom": "5.16.3",
     "@testing-library/react": "13.4.0",

packages/blitz-next/src/provider.tsx

@@ -1,4 +1,4 @@
-import {QueryClientProvider, Hydrate} from "@tanstack/react-query"
+import {QueryClientProvider, Hydrate} from "@blitzjs/rpc"
 import type {QueryClient, HydrateOptions} from "@blitzjs/rpc"
 import React from "react"
 

packages/blitz-rpc/src/index-browser.tsx

@@ -1,4 +1,32 @@
 import "./global"
 export * from "./client/index"
-export * from "./query/react-query"
+export {
+  BlitzProvider,
+  BlitzRpcPlugin,
+  QueryClient,
+  dehydrate,
+  getInfiniteQueryKey,
+  getQueryClient,
+  getQueryData,
+  getQueryKey,
+  invalidateQuery,
+  setQueryData,
+  useInfiniteQuery,
+  useMutation,
+  usePaginatedQuery,
+  useQuery,
+} from "./query/react-query"
+export type {
+  DefaultOptions,
+  HydrateOptions,
+  MutateFunction,
+  MutationFunction,
+  MutationResultPair,
+  RestPaginatedResult,
+  RestQueryResult,
+} from "./query/react-query"
 export * from "./query/utils"
+
+import {reactQueryClientReExports} from "./query/react-query"
+const {QueryClientProvider, Hydrate, useQueryErrorResetBoundary} = reactQueryClientReExports
+export {QueryClientProvider, Hydrate, useQueryErrorResetBoundary}

packages/blitz-rpc/src/query/react-query/react-query.ts

@@ -1,7 +1,15 @@
+import {useQueryErrorResetBoundary, QueryClientProvider, Hydrate} from "@tanstack/react-query"
+
 import {useInfiniteQuery as useInfiniteReactQuery} from "@tanstack/react-query"
 import {useQuery as useReactQuery} from "@tanstack/react-query"
 import {useMutation as useReactQueryMutation} from "@tanstack/react-query"
 
+export const reactQueryClientReExports = {
+  useQueryErrorResetBoundary,
+  QueryClientProvider,
+  Hydrate,
+}
+
 import type {
   UseInfiniteQueryOptions,
   UseInfiniteQueryResult,