@tanstack/react-query 4.7.1 → 4.8.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/react-query",
-  "version": "4.7.1",
+  "version": "4.8.0",
   "description": "Hooks for managing, caching and syncing asynchronous and remote data in React",
   "author": "tannerlinsley",
   "license": "MIT",
@@ -24,13 +24,6 @@
   "sideEffects": [
     "./src/setBatchUpdatesFn.ts"
   ],
-  "scripts": {
-    "clean": "rm -rf ./build",
-    "test:codemods": "../../node_modules/.bin/jest --config codemods/jest.config.js",
-    "test:eslint": "../../node_modules/.bin/eslint --ext .ts,.tsx ./src",
-    "test:jest": "yarn test:codemods && ../../node_modules/.bin/jest --config jest.config.js",
-    "test:jest:dev": "yarn test:jest --watch"
-  },
   "files": [
     "build/lib/*",
     "build/umd/*",
@@ -47,7 +40,7 @@
     "react-error-boundary": "^3.1.4"
   },
   "dependencies": {
-    "@tanstack/query-core": "4.7.1",
+    "@tanstack/query-core": "4.8.0",
     "use-sync-external-store": "^1.2.0"
   },
   "peerDependencies": {
@@ -62,5 +55,12 @@
     "react-native": {
       "optional": true
     }
+  },
+  "scripts": {
+    "clean": "rm -rf ./build",
+    "test:codemods": "../../node_modules/.bin/jest --config codemods/jest.config.js",
+    "test:eslint": "../../node_modules/.bin/eslint --ext .ts,.tsx ./src",
+    "test:jest": "pnpm test:codemods && ../../node_modules/.bin/jest --config jest.config.js",
+    "test:jest:dev": "pnpm test:jest --watch"
   }
-}
+}

package/src/__tests__/useInfiniteQuery.test.tsx

@@ -84,6 +84,7 @@ describe('useInfiniteQuery', () => {
       isFetchingNextPage: false,
       isFetchingPreviousPage: false,
       isLoading: true,
+      isInitialLoading: true,
       isLoadingError: false,
       isPlaceholderData: false,
       isPreviousData: false,
@@ -116,6 +117,7 @@ describe('useInfiniteQuery', () => {
       isFetchingNextPage: false,
       isFetchingPreviousPage: false,
       isLoading: false,
+      isInitialLoading: false,
       isLoadingError: false,
       isPlaceholderData: false,
       isPreviousData: false,
@@ -880,34 +882,28 @@ describe('useInfiniteQuery', () => {
     const firstCtx = fetchPage.mock.calls[callIndex]![0]
     expect(firstCtx.pageParam).toBeUndefined()
     expect(firstCtx.queryKey).toEqual(key)
-    if (typeof AbortSignal === 'function') {
-      expect(firstCtx.signal).toBeInstanceOf(AbortSignal)
-      expect(firstCtx.signal?.aborted).toBe(false)
-      expect(onAborts[callIndex]).not.toHaveBeenCalled()
-      expect(abortListeners[callIndex]).not.toHaveBeenCalled()
-    }
+    expect(firstCtx.signal).toBeInstanceOf(AbortSignal)
+    expect(firstCtx.signal?.aborted).toBe(false)
+    expect(onAborts[callIndex]).not.toHaveBeenCalled()
+    expect(abortListeners[callIndex]).not.toHaveBeenCalled()
 
     callIndex = 1
     const secondCtx = fetchPage.mock.calls[callIndex]![0]
     expect(secondCtx.pageParam).toBe(11)
     expect(secondCtx.queryKey).toEqual(key)
-    if (typeof AbortSignal === 'function') {
-      expect(secondCtx.signal).toBeInstanceOf(AbortSignal)
-      expect(secondCtx.signal?.aborted).toBe(true)
-      expect(onAborts[callIndex]).toHaveBeenCalledTimes(1)
-      expect(abortListeners[callIndex]).toHaveBeenCalledTimes(1)
-    }
+    expect(secondCtx.signal).toBeInstanceOf(AbortSignal)
+    expect(secondCtx.signal?.aborted).toBe(true)
+    expect(onAborts[callIndex]).toHaveBeenCalledTimes(1)
+    expect(abortListeners[callIndex]).toHaveBeenCalledTimes(1)
 
     callIndex = 2
     const thirdCtx = fetchPage.mock.calls[callIndex]![0]
     expect(thirdCtx.pageParam).toBe(11)
     expect(thirdCtx.queryKey).toEqual(key)
-    if (typeof AbortSignal === 'function') {
-      expect(thirdCtx.signal).toBeInstanceOf(AbortSignal)
-      expect(thirdCtx.signal?.aborted).toBe(false)
-      expect(onAborts[callIndex]).not.toHaveBeenCalled()
-      expect(abortListeners[callIndex]).not.toHaveBeenCalled()
-    }
+    expect(thirdCtx.signal).toBeInstanceOf(AbortSignal)
+    expect(thirdCtx.signal?.aborted).toBe(false)
+    expect(onAborts[callIndex]).not.toHaveBeenCalled()
+    expect(abortListeners[callIndex]).not.toHaveBeenCalled()
   })
 
   it('should not cancel an ongoing fetchNextPage request when another fetchNextPage is invoked if `cancelRefetch: false` is used ', async () => {
@@ -961,23 +957,19 @@ describe('useInfiniteQuery', () => {
     const firstCtx = fetchPage.mock.calls[callIndex]![0]
     expect(firstCtx.pageParam).toBeUndefined()
     expect(firstCtx.queryKey).toEqual(key)
-    if (typeof AbortSignal === 'function') {
-      expect(firstCtx.signal).toBeInstanceOf(AbortSignal)
-      expect(firstCtx.signal?.aborted).toBe(false)
-      expect(onAborts[callIndex]).not.toHaveBeenCalled()
-      expect(abortListeners[callIndex]).not.toHaveBeenCalled()
-    }
+    expect(firstCtx.signal).toBeInstanceOf(AbortSignal)
+    expect(firstCtx.signal?.aborted).toBe(false)
+    expect(onAborts[callIndex]).not.toHaveBeenCalled()
+    expect(abortListeners[callIndex]).not.toHaveBeenCalled()
 
     callIndex = 1
     const secondCtx = fetchPage.mock.calls[callIndex]![0]
     expect(secondCtx.pageParam).toBe(11)
     expect(secondCtx.queryKey).toEqual(key)
-    if (typeof AbortSignal === 'function') {
-      expect(secondCtx.signal).toBeInstanceOf(AbortSignal)
-      expect(secondCtx.signal?.aborted).toBe(false)
-      expect(onAborts[callIndex]).not.toHaveBeenCalled()
-      expect(abortListeners[callIndex]).not.toHaveBeenCalled()
-    }
+    expect(secondCtx.signal).toBeInstanceOf(AbortSignal)
+    expect(secondCtx.signal?.aborted).toBe(false)
+    expect(onAborts[callIndex]).not.toHaveBeenCalled()
+    expect(abortListeners[callIndex]).not.toHaveBeenCalled()
   })
 
   it('should keep fetching first page when not loaded yet and triggering fetch more', async () => {
@@ -1073,22 +1065,12 @@ describe('useInfiniteQuery', () => {
 
     await sleep(300)
 
-    if (typeof AbortSignal === 'function') {
-      expect(fetches).toBe(2)
-      expect(queryClient.getQueryState(key)).toMatchObject({
-        data: initialData,
-        status: 'success',
-        error: null,
-      })
-    } else {
-      // if AbortSignal is not consumed, fetches should not abort
-      expect(fetches).toBe(4)
-      expect(queryClient.getQueryState(key)).toMatchObject({
-        data: { pages: [0, 10, 20, 30], pageParams: [0, 1, 2, 3] },
-        status: 'success',
-        error: null,
-      })
-    }
+    expect(fetches).toBe(2)
+    expect(queryClient.getQueryState(key)).toMatchObject({
+      data: initialData,
+      status: 'success',
+      error: null,
+    })
   })
 
   it('should be able to override the cursor in the fetchNextPage callback', async () => {
@@ -1741,7 +1723,7 @@ describe('useInfiniteQuery', () => {
       const promise = new Promise<string>((resolve, reject) => {
         cancelFn = jest.fn(() => reject('Cancelled'))
         signal?.addEventListener('abort', cancelFn)
-        sleep(10).then(() => resolve('OK'))
+        sleep(20).then(() => resolve('OK'))
       })
 
       return promise
@@ -1765,8 +1747,6 @@ describe('useInfiniteQuery', () => {
 
     await waitFor(() => rendered.getByText('off'))
 
-    if (typeof AbortSignal === 'function') {
-      expect(cancelFn).toHaveBeenCalled()
-    }
+    expect(cancelFn).toHaveBeenCalled()
   })
 })

package/src/__tests__/useQuery.test.tsx

@@ -240,6 +240,7 @@ describe('useQuery', () => {
       isFetching: true,
       isPaused: false,
       isLoading: true,
+      isInitialLoading: true,
       isLoadingError: false,
       isPlaceholderData: false,
       isPreviousData: false,
@@ -266,6 +267,7 @@ describe('useQuery', () => {
       isFetching: false,
       isPaused: false,
       isLoading: false,
+      isInitialLoading: false,
       isLoadingError: false,
       isPlaceholderData: false,
       isPreviousData: false,
@@ -322,6 +324,7 @@ describe('useQuery', () => {
       isFetching: true,
       isPaused: false,
       isLoading: true,
+      isInitialLoading: true,
       isLoadingError: false,
       isPlaceholderData: false,
       isPreviousData: false,
@@ -348,6 +351,7 @@ describe('useQuery', () => {
       isFetching: true,
       isPaused: false,
       isLoading: true,
+      isInitialLoading: true,
       isLoadingError: false,
       isPlaceholderData: false,
       isPreviousData: false,
@@ -374,6 +378,7 @@ describe('useQuery', () => {
       isFetching: false,
       isPaused: false,
       isLoading: false,
+      isInitialLoading: false,
       isLoadingError: true,
       isPlaceholderData: false,
       isPreviousData: false,
@@ -4328,7 +4333,7 @@ describe('useQuery', () => {
       const promise = new Promise<string>((resolve, reject) => {
         cancelFn = jest.fn(() => reject('Cancelled'))
         signal?.addEventListener('abort', cancelFn)
-        sleep(10).then(() => resolve('OK'))
+        sleep(20).then(() => resolve('OK'))
       })
 
       return promise
@@ -4352,9 +4357,7 @@ describe('useQuery', () => {
 
     await waitFor(() => rendered.getByText('off'))
 
-    if (typeof AbortSignal === 'function') {
-      expect(cancelFn).toHaveBeenCalled()
-    }
+    expect(cancelFn).toHaveBeenCalled()
   })
 
   it('should cancel the query if the signal was consumed and there are no more subscriptions', async () => {
@@ -4402,19 +4405,11 @@ describe('useQuery', () => {
       dataUpdateCount: 1,
     })
 
-    if (typeof AbortSignal === 'function') {
-      expect(queryCache.find([key, 1])?.state).toMatchObject({
-        data: undefined,
-        status: 'loading',
-        fetchStatus: 'idle',
-      })
-    } else {
-      expect(queryCache.find([key, 1])?.state).toMatchObject({
-        data: 'data 1',
-        status: 'success',
-        dataUpdateCount: 1,
-      })
-    }
+    expect(queryCache.find([key, 1])?.state).toMatchObject({
+      data: undefined,
+      status: 'loading',
+      fetchStatus: 'idle',
+    })
 
     expect(queryCache.find([key, 2])?.state).toMatchObject({
       data: 'data 2',
@@ -4422,19 +4417,11 @@ describe('useQuery', () => {
       dataUpdateCount: 1,
     })
 
-    if (typeof AbortSignal === 'function') {
-      expect(queryCache.find([key, 3])?.state).toMatchObject({
-        data: undefined,
-        status: 'loading',
-        fetchStatus: 'idle',
-      })
-    } else {
-      expect(queryCache.find([key, 3])?.state).toMatchObject({
-        data: 'data 3',
-        status: 'success',
-        dataUpdateCount: 1,
-      })
-    }
+    expect(queryCache.find([key, 3])?.state).toMatchObject({
+      data: undefined,
+      status: 'loading',
+      fetchStatus: 'idle',
+    })
   })
 
   it('should refetch when quickly switching to a failed query', async () => {
@@ -5486,7 +5473,7 @@ describe('useQuery', () => {
         status: 'success',
       })
 
-      expect(count).toBe(typeof AbortSignal === 'function' ? 1 : 2)
+      expect(count).toBe(1)
 
       onlineMock.mockRestore()
     })