Skip to content

Commit 5690e9d

Browse files
committed
Make retryCondition receive unknown error, as the user may not be using fetchBaseQuery
1 parent 5eb3680 commit 5690e9d

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

packages/toolkit/src/query/retry.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import type {
22
BaseQueryApi,
33
BaseQueryArg,
44
BaseQueryEnhancer,
5+
BaseQueryError,
56
BaseQueryExtraOptions,
67
BaseQueryFn,
78
} from './baseQueryTypes'
@@ -31,7 +32,7 @@ async function defaultBackoff(attempt: number = 0, maxRetries: number = 5) {
3132
}
3233

3334
type RetryConditionFunction = (
34-
error: FetchBaseQueryError,
35+
error: BaseQueryError<BaseQueryFn>,
3536
args: BaseQueryArg<BaseQueryFn>,
3637
extraArgs: {
3738
attempt: number

packages/toolkit/src/query/tests/retry.test.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { vi } from 'vitest'
2-
import type { BaseQueryFn } from '@reduxjs/toolkit/query'
2+
import type { BaseQueryFn, FetchBaseQueryError } from '@reduxjs/toolkit/query'
33
import { createApi, retry } from '@reduxjs/toolkit/query'
44
import { setupApiStore, waitMs } from './helpers'
55
import type { RetryOptions } from '../retry'
@@ -17,8 +17,6 @@ const loopTimers = async (max: number = 12) => {
1717
}
1818
}
1919

20-
vi.fn()
21-
2220
describe('configuration', () => {
2321
test('retrying without any config options', async () => {
2422
const baseBaseQuery = vi.fn<
@@ -426,7 +424,8 @@ describe('configuration', () => {
426424
m1: build.mutation({
427425
query: () => ({ method: 'PUT' }),
428426
extraOptions: {
429-
retryCondition: (e) => e.data === 'hello retryCondition',
427+
retryCondition: (e) =>
428+
(e as FetchBaseQueryError).data === 'hello retryCondition',
430429
},
431430
}),
432431
}),

0 commit comments

Comments
 (0)