Skip to content

Commit 4b52155

Browse files
authored
Merge pull request #3381 from reduxjs/feature/2.0-tweak-reducer-type
2 parents 6231891 + 6dfe740 commit 4b52155

File tree

5 files changed

+360
-241
lines changed

5 files changed

+360
-241
lines changed

.codesandbox/ci.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"/examples/action-listener/counter",
99
"/examples/publish-ci/cra5"
1010
],
11-
"node": "14",
11+
"node": "16",
1212
"buildCommand": "build:packages",
1313
"packages": [
1414
"packages/toolkit",

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@
4444
"@babel/helper-compilation-targets": "7.19.3",
4545
"@babel/traverse": "7.19.3",
4646
"@babel/types": "7.19.3",
47-
"esbuild": "0.17.0",
47+
"esbuild": "0.17.17",
4848
"jest-snapshot": "29.3.1",
4949
"msw": "patch:msw@npm:0.40.2#.yarn/patches/msw-npm-0.40.2-2107d48752",
5050
"jscodeshift": "0.13.1",
5151
"react-redux": "npm:8.0.2",
52-
"react": "npm:18.1.0",
53-
"react-dom": "npm:18.1.0",
52+
"react": "npm:18.2.0",
53+
"react-dom": "npm:18.2.0",
5454
"resolve": "1.22.1",
5555
"ts-node": "10.4.0",
5656
"@types/react": "npm:18.0.12",

packages/toolkit/package.json

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949
"@testing-library/react": "^13.3.0",
5050
"@testing-library/user-event": "^13.1.5",
5151
"@types/convert-source-map": "^1.5.1",
52-
"@types/jest": "^27",
5352
"@types/json-stringify-safe": "^5.0.0",
5453
"@types/nanoid": "^2.1.0",
5554
"@types/node": "^10.14.4",
@@ -62,7 +61,6 @@
6261
"axios": "^0.19.2",
6362
"console-testing-library": "0.6.1",
6463
"convert-source-map": "^1.7.0",
65-
"esbuild": "~0.17",
6664
"eslint": "^7.25.0",
6765
"eslint-config-prettier": "^8.3.0",
6866
"eslint-config-react-app": "^7.0.1",
@@ -76,23 +74,17 @@
7674
"invariant": "^2.2.4",
7775
"jsdom": "^21.0.0",
7876
"json-stringify-safe": "^5.0.1",
79-
"magic-string": "^0.25.7",
80-
"merge-source-map": "^1.1.0",
8177
"msw": "^0.40.2",
8278
"node-fetch": "^2.6.1",
8379
"prettier": "^2.2.1",
8480
"query-string": "^7.0.1",
8581
"rimraf": "^3.0.2",
86-
"rollup": "^2.47.0",
87-
"rollup-plugin-strip-code": "^0.2.6",
8882
"size-limit": "^4.11.0",
89-
"source-map": "^0.7.3",
90-
"terser": "^5.6.1",
9183
"tslib": "^1.10.0",
9284
"tsup": "^6.7.0",
9385
"tsx": "^3.12.2",
9486
"typescript": "~4.9",
95-
"vitest": "^0.27.2",
87+
"vitest": "^0.30.1",
9688
"yargs": "^15.3.1"
9789
},
9890
"scripts": {

packages/toolkit/src/combineSlices.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ export type InjectConfig = {
5656
export interface CombinedSliceReducer<
5757
InitialState,
5858
DeclaredState = InitialState
59-
> extends Reducer<DeclaredState, AnyAction> {
59+
> extends Reducer<DeclaredState, AnyAction, Partial<DeclaredState>> {
6060
/**
6161
* Provide a type for slices that will be injected lazily.
6262
*

0 commit comments

Comments
 (0)