Merge pull request #3957 from reduxjs/retry-error-type

reduxjs · May 9, 2024 · 72b3ac6 · 72b3ac6
2 parents c892abd + c2cfd23
commit 72b3ac6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/packages/toolkit/src/query/retry.ts b/packages/toolkit/src/query/retry.ts
@@ -2,6 +2,7 @@ import type {
   BaseQueryApi,
   BaseQueryArg,
   BaseQueryEnhancer,
+  BaseQueryError,
   BaseQueryExtraOptions,
   BaseQueryFn,
 } from './baseQueryTypes'
@@ -31,7 +32,7 @@ async function defaultBackoff(attempt: number = 0, maxRetries: number = 5) {
 }
 
 type RetryConditionFunction = (
-  error: FetchBaseQueryError,
+  error: BaseQueryError<BaseQueryFn>,
   args: BaseQueryArg<BaseQueryFn>,
   extraArgs: {
     attempt: number

diff --git a/packages/toolkit/src/query/tests/retry.test.ts b/packages/toolkit/src/query/tests/retry.test.ts
@@ -1,4 +1,5 @@
-import type { BaseQueryFn } from '@reduxjs/toolkit/query'
+import { vi } from 'vitest'
+import type { BaseQueryFn, FetchBaseQueryError } from '@reduxjs/toolkit/query'
 import { createApi, retry } from '@reduxjs/toolkit/query'
 import { setupApiStore } from '../../tests/utils/helpers'
 
@@ -422,7 +423,8 @@ describe('configuration', () => {
         m1: build.mutation({
           query: () => ({ method: 'PUT' }),
           extraOptions: {
-            retryCondition: (e) => e.data === 'hello retryCondition',
+            retryCondition: (e) =>
+              (e as FetchBaseQueryError).data === 'hello retryCondition',
           },
         }),
       }),