Skip to content

Commit 17a20c4

Browse files
author
ben.durrant
committed
AnyAction -> UnknownAction
1 parent 25a0f6f commit 17a20c4

File tree

7 files changed

+26
-23
lines changed

7 files changed

+26
-23
lines changed

docs/api/createDynamicMiddleware.mdx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ The "dynamic middleware instance" returned from `createDynamicMiddleware` is an
8080
```ts no-transpile
8181
export type DynamicMiddlewareInstance<
8282
State = unknown,
83-
Dispatch extends ReduxDispatch<AnyAction> = ReduxDispatch<AnyAction>
83+
Dispatch extends ReduxDispatch<UnknownAction> = ReduxDispatch<UnknownAction>
8484
> = {
8585
middleware: DynamicMiddleware<State, Dispatch>
8686
addMiddleware: AddMiddleware<State, Dispatch>
@@ -131,7 +131,7 @@ _These depend on having `react-redux` installed._
131131
```ts no-transpile
132132
interface ReactDynamicMiddlewareInstance<
133133
State = any,
134-
Dispatch extends ReduxDispatch<AnyAction> = ReduxDispatch<AnyAction>
134+
Dispatch extends ReduxDispatch<UnknownAction> = ReduxDispatch<UnknownAction>
135135
> extends DynamicMiddlewareInstance<State, Dispatch> {
136136
createDispatchWithMiddlewareHook: CreateDispatchWithMiddlewareHook<
137137
State,

packages/toolkit/src/combineSlices.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { AnyAction, Reducer, StateFromReducersMapObject } from 'redux'
1+
import type { UnknownAction, Reducer, StateFromReducersMapObject } from 'redux'
22
import { combineReducers } from 'redux'
33
import { nanoid } from './nanoid'
44
import type {
@@ -56,7 +56,7 @@ export type InjectConfig = {
5656
export interface CombinedSliceReducer<
5757
InitialState,
5858
DeclaredState = InitialState
59-
> extends Reducer<DeclaredState, AnyAction, Partial<DeclaredState>> {
59+
> extends Reducer<DeclaredState, UnknownAction, Partial<DeclaredState>> {
6060
/**
6161
* Provide a type for slices that will be injected lazily.
6262
*
@@ -378,7 +378,10 @@ export function combineSlices<Slices extends Array<AnySliceLike | ReducerMap>>(
378378

379379
let reducer = getReducer()
380380

381-
function combinedReducer(state: Record<string, unknown>, action: AnyAction) {
381+
function combinedReducer(
382+
state: Record<string, unknown>,
383+
action: UnknownAction
384+
) {
382385
return reducer(state, action)
383386
}
384387

packages/toolkit/src/dynamicMiddleware/index.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import type {
22
Middleware,
33
Dispatch as ReduxDispatch,
4-
AnyAction,
4+
UnknownAction,
55
MiddlewareAPI,
66
} from 'redux'
77
import { compose } from 'redux'
@@ -18,7 +18,7 @@ import type {
1818

1919
const createMiddlewareEntry = <
2020
State = any,
21-
Dispatch extends ReduxDispatch<AnyAction> = ReduxDispatch<AnyAction>
21+
Dispatch extends ReduxDispatch<UnknownAction> = ReduxDispatch<UnknownAction>
2222
>(
2323
middleware: Middleware<any, State, Dispatch>
2424
): MiddlewareEntry<State, Dispatch> => ({
@@ -29,7 +29,7 @@ const createMiddlewareEntry = <
2929

3030
export const createDynamicMiddleware = <
3131
State = any,
32-
Dispatch extends ReduxDispatch<AnyAction> = ReduxDispatch<AnyAction>
32+
Dispatch extends ReduxDispatch<UnknownAction> = ReduxDispatch<UnknownAction>
3333
>(): DynamicMiddlewareInstance<State, Dispatch> => {
3434
const instanceId = nanoid()
3535
const middlewareMap = new Map<string, MiddlewareEntry<State, Dispatch>>()

packages/toolkit/src/dynamicMiddleware/react/index.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type {
22
Action as ReduxAction,
3-
AnyAction,
3+
UnknownAction,
44
Dispatch as ReduxDispatch,
55
Middleware,
66
} from 'redux'
@@ -23,12 +23,12 @@ import type {
2323
export type UseDispatchWithMiddlewareHook<
2424
Middlewares extends Middleware<any, State, Dispatch>[] = [],
2525
State = any,
26-
Dispatch extends ReduxDispatch<AnyAction> = ReduxDispatch<AnyAction>
26+
Dispatch extends ReduxDispatch<UnknownAction> = ReduxDispatch<UnknownAction>
2727
> = () => ExtractDispatchExtensions<Middlewares> & Dispatch
2828

2929
export type CreateDispatchWithMiddlewareHook<
3030
State = any,
31-
Dispatch extends ReduxDispatch<AnyAction> = ReduxDispatch<AnyAction>
31+
Dispatch extends ReduxDispatch<UnknownAction> = ReduxDispatch<UnknownAction>
3232
> = {
3333
<
3434
Middlewares extends [
@@ -51,7 +51,7 @@ type ActionFromDispatch<Dispatch extends ReduxDispatch<ReduxAction>> =
5151

5252
interface ReactDynamicMiddlewareInstance<
5353
State = any,
54-
Dispatch extends ReduxDispatch<AnyAction> = ReduxDispatch<AnyAction>
54+
Dispatch extends ReduxDispatch<UnknownAction> = ReduxDispatch<UnknownAction>
5555
> extends DynamicMiddlewareInstance<State, Dispatch> {
5656
createDispatchWithMiddlewareHookFactory: (
5757
context?: Context<
@@ -66,7 +66,7 @@ interface ReactDynamicMiddlewareInstance<
6666

6767
export const createDynamicMiddleware = <
6868
State = any,
69-
Dispatch extends ReduxDispatch<AnyAction> = ReduxDispatch<AnyAction>
69+
Dispatch extends ReduxDispatch<UnknownAction> = ReduxDispatch<UnknownAction>
7070
>(): ReactDynamicMiddlewareInstance<State, Dispatch> => {
7171
const instance = cDM<State, Dispatch>()
7272
const createDispatchWithMiddlewareHookFactory = (

packages/toolkit/src/dynamicMiddleware/tests/index.typetest.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
/* eslint-disable no-lone-blocks */
2-
import type { Action, AnyAction, Middleware } from 'redux'
2+
import type { Action, UnknownAction, Middleware } from 'redux'
33
import type { ThunkDispatch } from 'redux-thunk'
44
import { createDynamicMiddleware } from '../index'
55
import { configureStore } from '../../configureStore'
66
import { expectExactType, expectType } from '../../tests/helpers'
77

88
const untypedInstance = createDynamicMiddleware()
99

10-
interface AppDispatch extends ThunkDispatch<number, undefined, AnyAction> {
10+
interface AppDispatch extends ThunkDispatch<number, undefined, UnknownAction> {
1111
(n: 1): 1
1212
}
1313

packages/toolkit/src/dynamicMiddleware/tests/react.typetest.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
/* eslint-disable no-lone-blocks */
22
import type { Context } from 'react'
33
import type { ReactReduxContextValue } from 'react-redux'
4-
import type { Action, AnyAction, Middleware } from 'redux'
4+
import type { Action, UnknownAction, Middleware } from 'redux'
55
import type { ThunkDispatch } from 'redux-thunk'
66
import { createDynamicMiddleware } from '../react'
77
import { expectExactType, expectType } from '../../tests/helpers'
88
/* eslint-disable no-lone-blocks */
99

10-
interface AppDispatch extends ThunkDispatch<number, undefined, AnyAction> {
10+
interface AppDispatch extends ThunkDispatch<number, undefined, UnknownAction> {
1111
(n: 1): 1
1212
}
1313

packages/toolkit/src/dynamicMiddleware/types.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import type {
22
Middleware,
33
Dispatch as ReduxDispatch,
4-
AnyAction,
4+
UnknownAction,
55
MiddlewareAPI,
66
} from 'redux'
77
import type { ExtractDispatchExtensions, FallbackIfUnknown } from '../tsHelpers'
@@ -32,7 +32,7 @@ export type GetDispatch<MiddlewareApiConfig> = MiddlewareApiConfig extends {
3232

3333
export type AddMiddleware<
3434
State = any,
35-
Dispatch extends ReduxDispatch<AnyAction> = ReduxDispatch<AnyAction>
35+
Dispatch extends ReduxDispatch<UnknownAction> = ReduxDispatch<UnknownAction>
3636
> = {
3737
(...middlewares: Middleware<any, State, Dispatch>[]): void
3838
withTypes<MiddlewareConfig extends MiddlewareApiConfig>(): AddMiddleware<
@@ -43,7 +43,7 @@ export type AddMiddleware<
4343

4444
export interface WithMiddleware<
4545
State = any,
46-
Dispatch extends ReduxDispatch<AnyAction> = ReduxDispatch<AnyAction>
46+
Dispatch extends ReduxDispatch<UnknownAction> = ReduxDispatch<UnknownAction>
4747
> extends BaseActionCreator<
4848
Middleware<any, State, Dispatch>[],
4949
'dynamicMiddleware/add',
@@ -67,7 +67,7 @@ export interface DynamicDispatch {
6767

6868
export type MiddlewareEntry<
6969
State = unknown,
70-
Dispatch extends ReduxDispatch<AnyAction> = ReduxDispatch<AnyAction>
70+
Dispatch extends ReduxDispatch<UnknownAction> = ReduxDispatch<UnknownAction>
7171
> = {
7272
id: string
7373
middleware: Middleware<any, State, Dispatch>
@@ -79,12 +79,12 @@ export type MiddlewareEntry<
7979

8080
export type DynamicMiddleware<
8181
State = unknown,
82-
Dispatch extends ReduxDispatch<AnyAction> = ReduxDispatch<AnyAction>
82+
Dispatch extends ReduxDispatch<UnknownAction> = ReduxDispatch<UnknownAction>
8383
> = Middleware<DynamicDispatch, State, Dispatch>
8484

8585
export type DynamicMiddlewareInstance<
8686
State = unknown,
87-
Dispatch extends ReduxDispatch<AnyAction> = ReduxDispatch<AnyAction>
87+
Dispatch extends ReduxDispatch<UnknownAction> = ReduxDispatch<UnknownAction>
8888
> = {
8989
middleware: DynamicMiddleware<State, Dispatch>
9090
addMiddleware: AddMiddleware<State, Dispatch>

0 commit comments

Comments
 (0)