Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/reduxjs/redux-toolkit int…
Browse files Browse the repository at this point in the history 
…o cut-down-on-resolutions
  • Loading branch information
@aryaemami59
aryaemami59 committed May 2, 2024
2 parents def0ce1 + 7cd8142 commit 746c324
Show file tree
Hide file tree
Showing 20 changed files with 39 additions and 38 deletions.
2 changes: 1 addition & 1 deletion examples/action-listener/counter/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"clsx": "1.1.1",
"react": "^18.1.0",
"react-dom": "^18.1.0",
"react-redux": "^8.0.2",
"react-redux": "^9.1.0",
"react-scripts": "5.0.1",
"typescript": "~4.9"
},
Expand Down
2 changes: 1 addition & 1 deletion examples/query/react/advanced/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"@reduxjs/toolkit": "^1.6.0-rc.1",
"react": "^18.1.0",
"react-dom": "^18.1.0",
"react-redux": "^8.0.2",
"react-redux": "^9.1.0",
"react-scripts": "5.0.1"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion examples/query/react/authentication-with-extrareducers/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"react": "^18.1.0",
"react-dom": "^18.1.0",
"react-icons": "3.11.0",
"react-redux": "^8.0.2",
"react-redux": "^9.1.0",
"react-router-dom": "6.3.0",
"react-scripts": "5.0.1"
},
Expand Down
2 changes: 1 addition & 1 deletion examples/query/react/authentication/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"react": "^18.1.0",
"react-dom": "^18.1.0",
"react-icons": "3.11.0",
"react-redux": "^8.0.2",
"react-redux": "^9.1.0",
"react-router-dom": "6.3.0",
"react-scripts": "5.0.1"
},
Expand Down
2 changes: 1 addition & 1 deletion examples/query/react/basic/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"@reduxjs/toolkit": "^1.6.0-rc.1",
"react": "^18.1.0",
"react-dom": "^18.1.0",
"react-redux": "^8.0.2",
"react-redux": "^9.1.0",
"react-scripts": "5.0.1"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion examples/query/react/conditional-fetching/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"@reduxjs/toolkit": "^1.6.0-rc.1",
"react": "^18.1.0",
"react-dom": "^18.1.0",
"react-redux": "^8.0.2",
"react-redux": "^9.1.0",
"react-scripts": "5.0.1"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion examples/query/react/deduping-queries/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"@reduxjs/toolkit": "^1.6.0-rc.1",
"react": "^18.1.0",
"react-dom": "^18.1.0",
"react-redux": "^8.0.2",
"react-redux": "^9.1.0",
"react-scripts": "5.0.1"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion examples/query/react/graphql-codegen/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"react": "^18.1.0",
"react-dom": "^18.1.0",
"react-icons": "3.11.0",
"react-redux": "^8.0.2",
"react-redux": "^9.1.0",
"react-router-dom": "6.3.0",
"react-scripts": "5.0.1"
},
Expand Down
2 changes: 1 addition & 1 deletion examples/query/react/graphql/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"react": "^18.1.0",
"react-dom": "^18.1.0",
"react-icons": "3.11.0",
"react-redux": "^8.0.2",
"react-redux": "^9.1.0",
"react-router-dom": "6.3.0",
"react-scripts": "5.0.1"
},
Expand Down
2 changes: 1 addition & 1 deletion examples/query/react/kitchen-sink/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"msw": "^0.40.2",
"react": "^18.1.0",
"react-dom": "^18.1.0",
"react-redux": "^8.0.2",
"react-redux": "^9.1.0",
"react-router-dom": "6.3.0",
"react-scripts": "5.0.1"
},
Expand Down
2 changes: 1 addition & 1 deletion examples/query/react/mutations/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"react": "^18.1.0",
"react-dom": "^18.1.0",
"react-icons": "3.11.0",
"react-redux": "^8.0.2",
"react-redux": "^9.1.0",
"react-router-dom": "6.3.0",
"react-scripts": "5.0.1"
},
Expand Down
2 changes: 1 addition & 1 deletion examples/query/react/optimistic-update/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"react": "^18.1.0",
"react-dom": "^18.1.0",
"react-icons": "3.11.0",
"react-redux": "^8.0.2",
"react-redux": "^9.1.0",
"react-router-dom": "6.3.0",
"react-scripts": "5.0.1",
"uuid": "^8.3.2"
Expand Down
2 changes: 1 addition & 1 deletion examples/query/react/pagination/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"react": "^18.1.0",
"react-dom": "^18.1.0",
"react-icons": "3.11.0",
"react-redux": "^8.0.2",
"react-redux": "^9.1.0",
"react-router-dom": "6.3.0",
"react-scripts": "5.0.1"
},
Expand Down
2 changes: 1 addition & 1 deletion examples/query/react/polling/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"@reduxjs/toolkit": "^1.6.0-rc.1",
"react": "^18.1.0",
"react-dom": "^18.1.0",
"react-redux": "^8.0.2",
"react-redux": "^9.1.0",
"react-scripts": "5.0.1"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion examples/query/react/prefetching-automatic-waterfall/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"react": "^18.1.0",
"react-dom": "^18.1.0",
"react-icons": "3.11.0",
"react-redux": "^8.0.2",
"react-redux": "^9.1.0",
"react-router-dom": "6.3.0",
"react-scripts": "5.0.1"
},
Expand Down
2 changes: 1 addition & 1 deletion examples/query/react/prefetching-automatic/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"react": "^18.1.0",
"react-dom": "^18.1.0",
"react-icons": "3.11.0",
"react-redux": "^8.0.2",
"react-redux": "^9.1.0",
"react-router-dom": "6.3.0",
"react-scripts": "5.0.1"
},
Expand Down
2 changes: 1 addition & 1 deletion examples/query/react/prefetching/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"react": "^18.1.0",
"react-dom": "^18.1.0",
"react-icons": "3.11.0",
"react-redux": "^8.0.2",
"react-redux": "^9.1.0",
"react-router-dom": "6.3.0",
"react-scripts": "5.0.1"
},
Expand Down
2 changes: 1 addition & 1 deletion examples/query/react/with-apiprovider/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"@reduxjs/toolkit": "^1.6.0-rc.1",
"react": "^18.1.0",
"react-dom": "^18.1.0",
"react-redux": "^8.0.2",
"react-redux": "^9.1.0",
"react-scripts": "5.0.1"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
"prettier": "^3.2.5",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-redux": "^9.1.0",
"release-it": "^14.12.5",
"serve": "^14.2.0",
"ts-node": "^10.9.2",
Expand All @@ -54,7 +55,6 @@
"resolutions": {
"esbuild": "0.19.7",
"jest-snapshot": "29.3.1",
"react-redux": "npm:9.1.0",
"console-testing-library@0.6.1": "patch:console-testing-library@npm%3A0.6.1#./.yarn/patches/console-testing-library-npm-0.6.1-4d9957d402.patch"
},
"scripts": {
Expand Down
39 changes: 20 additions & 19 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5274,7 +5274,7 @@ __metadata:
jest-watch-typeahead: "npm:^1.1.0"
react: "npm:^18.1.0"
react-dom: "npm:^18.1.0"
react-redux: "npm:^8.0.2"
react-redux: "npm:^9.1.0"
react-scripts: "npm:5.0.1"
typescript: "npm:~4.9"
languageName: unknown
Expand All @@ -5289,7 +5289,7 @@ __metadata:
"@types/react-dom": "npm:^18.0.5"
react: "npm:^18.1.0"
react-dom: "npm:^18.1.0"
react-redux: "npm:^8.0.2"
react-redux: "npm:^9.1.0"
react-scripts: "npm:5.0.1"
typescript: "npm:~4.9"
languageName: unknown
Expand All @@ -5310,7 +5310,7 @@ __metadata:
react: "npm:^18.1.0"
react-dom: "npm:^18.1.0"
react-icons: "npm:3.11.0"
react-redux: "npm:^8.0.2"
react-redux: "npm:^9.1.0"
react-router-dom: "npm:6.3.0"
react-scripts: "npm:5.0.1"
typescript: "npm:~4.9"
Expand All @@ -5332,7 +5332,7 @@ __metadata:
react: "npm:^18.1.0"
react-dom: "npm:^18.1.0"
react-icons: "npm:3.11.0"
react-redux: "npm:^8.0.2"
react-redux: "npm:^9.1.0"
react-router-dom: "npm:6.3.0"
react-scripts: "npm:5.0.1"
typescript: "npm:~4.9"
Expand All @@ -5351,7 +5351,7 @@ __metadata:
msw: "npm:^0.40.2"
react: "npm:^18.1.0"
react-dom: "npm:^18.1.0"
react-redux: "npm:^8.0.2"
react-redux: "npm:^9.1.0"
react-scripts: "npm:5.0.1"
typescript: "npm:~4.9"
languageName: unknown
Expand All @@ -5366,7 +5366,7 @@ __metadata:
"@types/react-dom": "npm:^18.0.5"
react: "npm:^18.1.0"
react-dom: "npm:^18.1.0"
react-redux: "npm:^8.0.2"
react-redux: "npm:^9.1.0"
react-scripts: "npm:5.0.1"
typescript: "npm:~4.9"
languageName: unknown
Expand All @@ -5381,7 +5381,7 @@ __metadata:
"@types/react-dom": "npm:^18.0.5"
react: "npm:^18.1.0"
react-dom: "npm:^18.1.0"
react-redux: "npm:^8.0.2"
react-redux: "npm:^9.1.0"
react-scripts: "npm:5.0.1"
typescript: "npm:~4.9"
languageName: unknown
Expand Down Expand Up @@ -5420,7 +5420,7 @@ __metadata:
react: "npm:^18.1.0"
react-dom: "npm:^18.1.0"
react-icons: "npm:3.11.0"
react-redux: "npm:^8.0.2"
react-redux: "npm:^9.1.0"
react-router-dom: "npm:6.3.0"
react-scripts: "npm:5.0.1"
ts-node: "npm:^10.0.0"
Expand Down Expand Up @@ -5449,7 +5449,7 @@ __metadata:
react: "npm:^18.1.0"
react-dom: "npm:^18.1.0"
react-icons: "npm:3.11.0"
react-redux: "npm:^8.0.2"
react-redux: "npm:^9.1.0"
react-router-dom: "npm:6.3.0"
react-scripts: "npm:5.0.1"
typescript: "npm:~4.2.4"
Expand All @@ -5470,7 +5470,7 @@ __metadata:
msw: "npm:^0.40.2"
react: "npm:^18.1.0"
react-dom: "npm:^18.1.0"
react-redux: "npm:^8.0.2"
react-redux: "npm:^9.1.0"
react-router-dom: "npm:6.3.0"
react-scripts: "npm:5.0.1"
typescript: "npm:~4.9"
Expand All @@ -5494,7 +5494,7 @@ __metadata:
react: "npm:^18.1.0"
react-dom: "npm:^18.1.0"
react-icons: "npm:3.11.0"
react-redux: "npm:^8.0.2"
react-redux: "npm:^9.1.0"
react-router-dom: "npm:6.3.0"
react-scripts: "npm:5.0.1"
typescript: "npm:~4.9"
Expand All @@ -5517,7 +5517,7 @@ __metadata:
react: "npm:^18.1.0"
react-dom: "npm:^18.1.0"
react-icons: "npm:3.11.0"
react-redux: "npm:^8.0.2"
react-redux: "npm:^9.1.0"
react-router-dom: "npm:6.3.0"
react-scripts: "npm:5.0.1"
typescript: "npm:~4.9"
Expand All @@ -5544,7 +5544,7 @@ __metadata:
react: "npm:^18.1.0"
react-dom: "npm:^18.1.0"
react-icons: "npm:3.11.0"
react-redux: "npm:^8.0.2"
react-redux: "npm:^9.1.0"
react-router-dom: "npm:6.3.0"
react-scripts: "npm:5.0.1"
typescript: "npm:~4.9"
Expand All @@ -5560,7 +5560,7 @@ __metadata:
"@types/react-dom": "npm:^18.0.5"
react: "npm:^18.1.0"
react-dom: "npm:^18.1.0"
react-redux: "npm:^8.0.2"
react-redux: "npm:^9.1.0"
react-scripts: "npm:5.0.1"
typescript: "npm:~4.9"
languageName: unknown
Expand All @@ -5584,7 +5584,7 @@ __metadata:
react: "npm:^18.1.0"
react-dom: "npm:^18.1.0"
react-icons: "npm:3.11.0"
react-redux: "npm:^8.0.2"
react-redux: "npm:^9.1.0"
react-router-dom: "npm:6.3.0"
react-scripts: "npm:5.0.1"
typescript: "npm:~4.9"
Expand All @@ -5609,7 +5609,7 @@ __metadata:
react: "npm:^18.1.0"
react-dom: "npm:^18.1.0"
react-icons: "npm:3.11.0"
react-redux: "npm:^8.0.2"
react-redux: "npm:^9.1.0"
react-router-dom: "npm:6.3.0"
react-scripts: "npm:5.0.1"
typescript: "npm:~4.9"
Expand All @@ -5634,7 +5634,7 @@ __metadata:
react: "npm:^18.1.0"
react-dom: "npm:^18.1.0"
react-icons: "npm:3.11.0"
react-redux: "npm:^8.0.2"
react-redux: "npm:^9.1.0"
react-router-dom: "npm:6.3.0"
react-scripts: "npm:5.0.1"
typescript: "npm:~4.9"
Expand All @@ -5650,7 +5650,7 @@ __metadata:
"@types/react-dom": "npm:^18.0.5"
react: "npm:^18.1.0"
react-dom: "npm:^18.1.0"
react-redux: "npm:^8.0.2"
react-redux: "npm:^9.1.0"
react-scripts: "npm:5.0.1"
typescript: "npm:~4.9"
languageName: unknown
Expand Down Expand Up @@ -24420,7 +24420,7 @@ __metadata:
languageName: node
linkType: hard

"react-redux@npm:9.1.0":
"react-redux@npm:^9.1.0":
version: 9.1.0
resolution: "react-redux@npm:9.1.0"
dependencies:
Expand Down Expand Up @@ -25740,6 +25740,7 @@ __metadata:
prettier: "npm:^3.2.5"
react: "npm:^18.2.0"
react-dom: "npm:^18.2.0"
react-redux: "npm:^9.1.0"
release-it: "npm:^14.12.5"
serve: "npm:^14.2.0"
ts-node: "npm:^10.9.2"
Expand Down

0 comments on commit 746c324

Please sign in to comment.