Skip to content

Commit 29f8092

Browse files
committed
brute force and ignorance
1 parent 6ac866c commit 29f8092

File tree

1 file changed

+21
-21
lines changed

1 file changed

+21
-21
lines changed

packages/toolkit/src/query/tests/helpers.tsx

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ import type {
55
Middleware,
66
Store,
77
Reducer,
8-
MiddlewareArray,
9-
ThunkMiddleware,
8+
EnhancerArray,
9+
StoreEnhancer,
10+
ThunkDispatch,
1011
} from '@reduxjs/toolkit'
1112
import { configureStore } from '@reduxjs/toolkit'
1213
import { setupListeners } from '@reduxjs/toolkit/query'
@@ -206,41 +207,40 @@ export function setupApiStore<
206207
}
207208
} = {}
208209
) {
210+
type State = {
211+
api: ReturnType<A['reducer']>
212+
} & {
213+
[K in keyof R]: ReturnType<R[K]>
214+
}
215+
type StoreType = EnhancedStore<
216+
State,
217+
AnyAction,
218+
EnhancerArray<
219+
[StoreEnhancer<{ dispatch: ThunkDispatch<State, unknown, AnyAction> }>]
220+
>
221+
>
222+
209223
const { middleware } = options
210224
const getStore = () =>
211225
configureStore({
212226
reducer: { api: api.reducer, ...extraReducers },
213-
middleware: (
214-
gdm
215-
): MiddlewareArray<[ThunkMiddleware<{ api: any }>, ...Middleware[]]> => {
227+
middleware: (gdm) => {
216228
const tempMiddleware = gdm({
217229
serializableCheck: false,
218230
immutableCheck: false,
219231
}).concat(api.middleware)
220232

221233
return tempMiddleware
222234
.concat(...(middleware?.concat ?? []))
223-
.prepend(...(middleware?.prepend ?? [])) as typeof tempMiddleware
235+
.prepend(...(middleware?.prepend ?? [])) as any
224236
},
225237
enhancers: (gde) =>
226238
gde({
227239
autoBatch: false,
228240
}),
229-
})
230-
231-
type StoreType = EnhancedStore<
232-
{
233-
api: ReturnType<A['reducer']>
234-
} & {
235-
[K in keyof R]: ReturnType<R[K]>
236-
},
237-
AnyAction,
238-
ReturnType<typeof getStore> extends EnhancedStore<any, any, infer M>
239-
? M
240-
: never
241-
>
241+
}) as StoreType
242242

243-
const initialStore = getStore() as StoreType
243+
const initialStore = getStore()
244244
const refObj = {
245245
api,
246246
store: initialStore,
@@ -250,7 +250,7 @@ export function setupApiStore<
250250

251251
if (!options.withoutTestLifecycles) {
252252
beforeEach(() => {
253-
const store = getStore() as StoreType
253+
const store = getStore()
254254
refObj.store = store
255255
refObj.wrapper = withProvider(store)
256256
if (!options.withoutListeners) {

0 commit comments

Comments
 (0)