Skip to content

Commit 8725e32

Browse files
committed
Merge branch 'master' of https://github.com/reduxjs/redux-toolkit into improve-treeshakeability
2 parents 8c45bc3 + 07614dd commit 8725e32

File tree

5 files changed

+73
-320
lines changed

5 files changed

+73
-320
lines changed

packages/rtk-codemods/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"eslint-plugin-node": "^11.1.0",
3737
"eslint-plugin-prettier": "^5.1.3",
3838
"prettier": "^3.2.5",
39-
"vitest": "^1.2.1"
39+
"vitest": "^1.6.0"
4040
},
4141
"engines": {
4242
"node": ">= 16"

packages/rtk-query-codegen-openapi/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"pretty-quick": "^4.0.0",
5353
"rimraf": "^5.0.5",
5454
"ts-node": "^10.9.2",
55-
"vitest": "^1.2.2",
55+
"vitest": "^1.6.0",
5656
"yalc": "^1.0.0-pre.47"
5757
},
5858
"dependencies": {

packages/toolkit/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
"tsx": "^3.12.2",
9494
"typescript": "^5.4.5",
9595
"vite-tsconfig-paths": "^4.3.1",
96-
"vitest": "^1.1.3",
96+
"vitest": "^1.6.0",
9797
"yargs": "^15.3.1"
9898
},
9999
"scripts": {

packages/toolkit/src/configureStore.ts

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,36 @@
11
import type {
2-
Action,
3-
Middleware,
42
Reducer,
53
ReducersMapObject,
6-
Store,
4+
Middleware,
5+
Action,
76
StoreEnhancer,
7+
Store,
88
UnknownAction,
99
} from 'redux'
1010
import {
1111
applyMiddleware,
12-
combineReducers,
13-
compose,
1412
createStore,
13+
compose,
14+
combineReducers,
1515
isPlainObject,
1616
} from 'redux'
1717
import type { DevToolsEnhancerOptions as DevToolsOptions } from './devtoolsExtension'
1818
import { composeWithDevTools } from './devtoolsExtension'
19-
import type { GetDefaultEnhancers } from './getDefaultEnhancers'
20-
import { buildGetDefaultEnhancers } from './getDefaultEnhancers'
19+
2120
import type {
22-
GetDefaultMiddleware,
2321
ThunkMiddlewareFor,
22+
GetDefaultMiddleware,
2423
} from './getDefaultMiddleware'
2524
import { buildGetDefaultMiddleware } from './getDefaultMiddleware'
2625
import type {
2726
ExtractDispatchExtensions,
28-
ExtractStateExtensions,
2927
ExtractStoreExtensions,
28+
ExtractStateExtensions,
3029
UnknownIfNonSpecific,
3130
} from './tsHelpers'
3231
import type { Tuple } from './utils'
32+
import type { GetDefaultEnhancers } from './getDefaultEnhancers'
33+
import { buildGetDefaultEnhancers } from './getDefaultEnhancers'
3334

3435
/**
3536
* Options for `configureStore()`.

0 commit comments

Comments
 (0)