invertase · kaueDM · Aug 23, 2022 · Aug 23, 2022 · Aug 23, 2022 · Aug 23, 2022
diff --git a/.gitignore b/.gitignore
@@ -10,3 +10,4 @@ dist
 
 functions/lib/**/*.js
 functions/lib/**/*.js.map
+packages/**/*.tgz
diff --git a/docs/auth/id-token.mdx b/docs/auth/id-token.mdx
@@ -58,7 +58,7 @@ Imagine we've got a custom `useApiRequest` hook within our application, using th
 token before the request and attach it to the API request.
 
 ```js
-import { useQueryClient, useQuery } from "react-query";
+import { useQueryClient, useQuery } from "@tanstack/react-query";
 
 function useApiRequest(url) {
   const client = useQueryClient();

diff --git a/examples/auth-basic/package.json b/examples/auth-basic/package.json
@@ -10,7 +10,7 @@
     "firebase": "^9.1.1",
     "react": "17.0.2",
     "react-dom": "17.0.2",
-    "react-query": "^3.23.2",
+    "@tanstack/react-query": "^4.2.1",
     "react-scripts": "5.0.0"
   },
   "devDependencies": {

diff --git a/examples/auth-basic/src/index.tsx b/examples/auth-basic/src/index.tsx
@@ -1,7 +1,7 @@
 import React from "react";
 import ReactDOM from "react-dom";
-import { QueryClient, QueryClientProvider } from "react-query";
-import { ReactQueryDevtools } from "react-query/devtools";
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
+import { ReactQueryDevtools } from "@tanstack/react-query-devtools";
 
 import { signInAnonymously, signOut } from "firebase/auth";
 import { useAuthUser } from "@react-query-firebase/auth";

diff --git a/examples/functions-basic/package.json b/examples/functions-basic/package.json
@@ -10,7 +10,7 @@
     "firebase": "^9.1.1",
     "react": "17.0.2",
     "react-dom": "17.0.2",
-    "react-query": "3.19.0",
+    "@tanstack/react-query": "^4.2.1",
     "react-scripts": "4.0.0"
   },
   "devDependencies": {

diff --git a/examples/functions-basic/src/index.tsx b/examples/functions-basic/src/index.tsx
@@ -1,14 +1,14 @@
 import React from "react";
 import ReactDOM from "react-dom";
-import { QueryClient, QueryClientProvider } from "react-query";
-import { ReactQueryDevtools } from "react-query/devtools";
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
+import { ReactQueryDevtools } from "@tanstack/react-query-devtools";
 
 import {
   useFunctionsQuery,
   useFunctionsCall,
 } from "@react-query-firebase/functions";
 import { functions } from "./firebase";
-import { useQueryClient } from "react-query";
+import { useQueryClient } from "@tanstack/react-query";
 
 const queryClient = new QueryClient();
 

diff --git a/functions/yarn.lock b/functions/yarn.lock
diff --git a/package.json b/package.json
@@ -5,6 +5,7 @@
   "keywords": [
     "react",
     "react-query",
+    "@tanstack/react-query",
     "firebase",
     "hooks"
   ],
@@ -17,6 +18,7 @@
     "@babel/preset-env": "^7.15.6",
     "@babel/preset-react": "^7.14.5",
     "@babel/preset-typescript": "^7.15.0",
+    "@tanstack/react-query": "^4.2.1",
     "@testing-library/jest-dom": "^5.14.1",
     "@testing-library/react-hooks": "^7.0.2",
     "@types/jest": "^27.0.1",
@@ -41,7 +43,6 @@
     "prettier": "^2.3.2",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "react-query": "^3.23.2",
     "react-test-renderer": "^18.2.0",
     "rimraf": "^3.0.2",
     "rollup": "^2.63.0",

diff --git a/packages/analytics/package.json b/packages/analytics/package.json
@@ -15,13 +15,14 @@
     "build": "npm run clean && rollup -c",
     "prepublish": "npm run build",
     "clean": "rimraf dist",
-    "prepublishOnly": "npm run build"
+    "prepublishOnly": "npm run build",
+    "pack": "npm pack"
   },
   "author": "",
   "license": "Apache-2.0",
   "peerDependencies": {
     "firebase": "^9.0.1",
     "react": "^16.8.0 || ^17.0.0 || ^18.2.0",
-    "react-query": "^3.23.2"
+    "@tanstack/react-query": "^4.2.1"
   }
 }
diff --git a/packages/analytics/rollup.config.js b/packages/analytics/rollup.config.js
@@ -13,4 +13,5 @@ export default {
     },
   ],
   plugins: [typescript()],
+  external: ['firebase/analytics', '@tanstack/react-query']
 };
diff --git a/packages/analytics/src/index.ts b/packages/analytics/src/index.ts
@@ -18,7 +18,7 @@ import {
   useQuery,
   UseQueryOptions,
   UseQueryResult,
-} from "react-query";
+} from "@tanstack/react-query";
 
 export function useAnalyticsIsSupported(
   key: QueryKey,

diff --git a/packages/auth/__test__/helpers.tsx b/packages/auth/__test__/helpers.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import { QueryClient, QueryClientProvider, setLogger } from "react-query";
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { initializeApp } from "firebase/app";
 import {
   getAuth,
@@ -9,13 +9,6 @@ import {
   createUserWithEmailAndPassword,
 } from "firebase/auth";
 
-setLogger({
-  log: console.log,
-  warn: console.warn,
-  // ✅ no more errors on the console
-  error: () => null,
-});
-
 let emulatorsStarted = false;
 
 export function genId(): string {
@@ -47,6 +40,12 @@ export function init(): any {
         cacheTime: 0,
       },
     },
+    logger: {
+      log: console.log,
+      warn: console.warn,
+      // ✅ no more errors on the console
+      error: () => null,
+    },
   });
 
   const wrapper = ({ children }) => (

diff --git a/packages/auth/__test__/useAuthUser.test.ts b/packages/auth/__test__/useAuthUser.test.ts
@@ -1,5 +1,5 @@
 import React from "react";
-import { QueryClient } from "react-query";
+import { QueryClient } from "@tanstack/react-query";
 import { renderHook, act, cleanup } from "@testing-library/react-hooks";
 import { Auth, UserCredential } from "firebase/auth";
 import { genId, init, signIn } from "./helpers";

diff --git a/packages/auth/package.json b/packages/auth/package.json
@@ -26,13 +26,14 @@
     "build": "npm run clean && rollup -c",
     "prepublish": "npm run build",
     "clean": "rimraf dist",
-    "prepublishOnly": "npm run build"
+    "prepublishOnly": "npm run build",
+    "pack": "npm pack"
   },
   "author": "",
   "license": "Apache-2.0",
   "peerDependencies": {
     "firebase": "^9.0.1",
     "react": "^16.8.0 || ^17.0.0 || ^18.2.0",
-    "react-query": "^3.23.2"
+    "@tanstack/react-query": "^4.2.1"
   }
 }
diff --git a/packages/auth/rollup.config.js b/packages/auth/rollup.config.js
@@ -13,4 +13,10 @@ export default {
     },
   ],
   plugins: [typescript()],
+  external: [
+    '@tanstack/react-query',
+    'firebase/auth',
+    '@firebase/auth',
+    'react'
+  ]
 };
diff --git a/packages/auth/src/mutations.ts b/packages/auth/src/mutations.ts
@@ -66,7 +66,7 @@ import {
   useMutation,
   UseMutationOptions,
   UseMutationResult,
-} from "react-query";
+} from "@tanstack/react-query";
 
 export function useAuthApplyActionCode(
   auth: Auth,

diff --git a/packages/auth/src/useAuthFetchSignInMethodsForEmail.ts b/packages/auth/src/useAuthFetchSignInMethodsForEmail.ts
@@ -19,7 +19,7 @@ import {
   useQuery,
   UseQueryOptions,
   UseQueryResult,
-} from "react-query";
+} from "@tanstack/react-query";
 import { Auth, fetchSignInMethodsForEmail, AuthError } from "firebase/auth";
 
 export function useAuthFetchSignInMethodsForEmail(

diff --git a/packages/auth/src/useAuthGetRedirectResult.ts b/packages/auth/src/useAuthGetRedirectResult.ts
@@ -19,7 +19,7 @@ import {
   useQuery,
   UseQueryOptions,
   UseQueryResult,
-} from "react-query";
+} from "@tanstack/react-query";
 import {
   Auth,
   AuthError,

diff --git a/packages/auth/src/useAuthIdToken.ts b/packages/auth/src/useAuthIdToken.ts
@@ -14,7 +14,11 @@
  * limitations under the License.
  *
  */
-import { QueryKey, UseQueryOptions, UseQueryResult } from "react-query";
+import {
+  QueryKey,
+  UseQueryOptions,
+  UseQueryResult,
+} from "@tanstack/react-query";
 import { Auth, AuthError, IdTokenResult } from "firebase/auth";
 import { useSubscription } from "../../utils/src/useSubscription";
 
@@ -37,7 +41,7 @@ export function useAuthIdToken<R = { token: IdTokenResult }>(
 
   return useSubscription<{ token: IdTokenResult }, AuthError, R>(
     queryKey,
-    "useAuthIdToken",
+    ["useAuthIdToken"],
     subscribeFn,
     options
   );

diff --git a/packages/auth/src/useAuthUser.ts b/packages/auth/src/useAuthUser.ts
@@ -14,7 +14,11 @@
  * limitations under the License.
  *
  */
-import { QueryKey, UseQueryOptions, UseQueryResult } from "react-query";
+import {
+  QueryKey,
+  UseQueryOptions,
+  UseQueryResult,
+} from "@tanstack/react-query";
 import { Auth, AuthError, NextOrObserver, User } from "firebase/auth";
 import { useSubscription } from "../../utils/src/useSubscription";
 
@@ -28,7 +32,7 @@ export function useAuthUser<R = User>(
 
   return useSubscription<User, AuthError, R>(
     queryKey,
-    "useAuthUser",
+    ["useAuthUser"],
     subscribeFn,
     options
   );

diff --git a/packages/database/__test__/helpers.tsx b/packages/database/__test__/helpers.tsx
@@ -1,15 +1,8 @@
 import React from "react";
-import { QueryClient, QueryClientProvider, setLogger } from "react-query";
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { initializeApp } from "firebase/app";
 import { connectDatabaseEmulator, getDatabase } from "firebase/database";
 
-setLogger({
-  log: console.log,
-  warn: console.warn,
-  // ✅ no more errors on the console
-  error: () => null,
-});
-
 let emulatorsStarted = false;
 
 export function genId(): string {
@@ -37,6 +30,12 @@ export function init(): any {
         cacheTime: 0,
       },
     },
+    logger: {
+      log: console.log,
+      warn: console.warn,
+      // ✅ no more errors on the console
+      error: () => null,
+    },
   });
 
   const wrapper = ({ children }) => (

diff --git a/packages/database/__test__/useDatabaseMutation.test.ts b/packages/database/__test__/useDatabaseMutation.test.ts
@@ -1,5 +1,5 @@
 import React from "react";
-import { QueryClient } from "react-query";
+import { QueryClient } from "@tanstack/react-query";
 import { renderHook } from "@testing-library/react-hooks";
 import { genId, init } from "./helpers";
 import {

diff --git a/packages/database/__test__/useDatabaseSnapshot.test.ts b/packages/database/__test__/useDatabaseSnapshot.test.ts
@@ -1,5 +1,5 @@
 import React from "react";
-import { QueryClient } from "react-query";
+import { QueryClient } from "@tanstack/react-query";
 import { renderHook } from "@testing-library/react-hooks";
 import { genId, init } from "./helpers";
 import { useDatabaseSnapshot, useDatabaseValue } from "../src";

diff --git a/packages/database/package.json b/packages/database/package.json
@@ -26,13 +26,14 @@
     "build": "npm run clean && rollup -c",
     "prepublish": "npm run build",
     "clean": "rimraf dist",
-    "prepublishOnly": "npm run build"
+    "prepublishOnly": "npm run build",
+    "pack": "npm pack"
   },
   "author": "",
   "license": "Apache-2.0",
   "peerDependencies": {
     "firebase": "^9.0.1",
     "react": "^16.8.0 || ^17.0.0 || ^18.2.0",
-    "react-query": "^3.23.2"
+    "@tanstack/react-query": "^4.2.1"
   }
 }
diff --git a/packages/database/rollup.config.js b/packages/database/rollup.config.js
@@ -13,4 +13,10 @@ export default {
     },
   ],
   plugins: [typescript()],
+  external: [
+    'firebase/database',
+    'react',
+    '@tanstack/react-query',
+    '@firebase/database'
+  ]
 };
diff --git a/packages/database/src/useDatabaseMutation.ts b/packages/database/src/useDatabaseMutation.ts
@@ -18,7 +18,7 @@ import {
   useMutation,
   UseMutationOptions,
   UseMutationResult,
-} from "react-query";
+} from "@tanstack/react-query";
 import {
   DatabaseReference,
   remove,

diff --git a/packages/database/src/useDatabaseSnapshot.ts b/packages/database/src/useDatabaseSnapshot.ts
@@ -14,7 +14,11 @@
  * limitations under the License.
  *
  */
-import { QueryKey, UseQueryOptions, UseQueryResult } from "react-query";
+import {
+  QueryKey,
+  UseQueryOptions,
+  UseQueryResult,
+} from "@tanstack/react-query";
 import { DatabaseReference, onValue, DataSnapshot } from "firebase/database";
 import { useCallback } from "react";
 import { useSubscription } from "../../utils/src/useSubscription";

diff --git a/packages/firestore/__test__/helpers.tsx b/packages/firestore/__test__/helpers.tsx
@@ -17,17 +17,10 @@
 
 import * as React from "react";
 import axios from "axios";
-import { QueryClient, QueryClientProvider, setLogger } from "react-query";
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { initializeApp } from "firebase/app";
 import { getFirestore, connectFirestoreEmulator } from "firebase/firestore";
 
-setLogger({
-  log: console.log,
-  warn: console.warn,
-  // ✅ no more errors on the console
-  error: () => null,
-});
-
 let emulatorsStarted = false;
 
 export function genId(): string {
@@ -58,6 +51,12 @@ export function init(): any {
         cacheTime: 0,
       },
     },
+    logger: {
+      log: console.log,
+      warn: console.warn,
+      // ✅ no more errors on the console
+      error: () => null,
+    },
   });
 
   const wrapper = ({ children }) => (
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,3 +10,4 @@ dist

		functions/lib/*/.js
		functions/lib/*/.js.map
		packages/*/.tgz
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,4 +13,5 @@ export default { @@
         },
       ],
       plugins: [typescript()],
+      external: ['firebase/analytics', '@tanstack/react-query']
     };