Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove react-redux from resolutions field of package.json #4342

Merged
merged 6 commits into from
May 2, 2024
Merged

Remove react-redux from resolutions field of package.json #4342

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c79e799
Move `react-redux` from `resolutions` to `devDependencies`
aryaemami59 Apr 12, 2024
f099aac
Deduplicate `react-redux` across the entire monorepo
aryaemami59 Apr 12, 2024
e08e130
Merge branch 'master' of https://github.com/reduxjs/redux-toolkit int…
aryaemami59 Apr 16, 2024
87bbde7
Merge branch 'master' of https://github.com/reduxjs/redux-toolkit int…
aryaemami59 Apr 17, 2024
1496b0a
Merge branch 'master' of https://github.com/reduxjs/redux-toolkit int…
aryaemami59 May 1, 2024
f2f09a9
Merge branch 'master' of https://github.com/reduxjs/redux-toolkit int…
aryaemami59 May 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Deduplicate react-redux across the entire monorepo
  • Loading branch information
@aryaemami59
aryaemami59 committed Apr 12, 2024
commit f099aac724c896b8b31ffd2f908857cc6b5d4576
2 changes: 1 addition & 1 deletion examples/action-listener/counter/package.json
View file
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
80 changes: 19 additions & 61 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5175,7 +5175,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 @@ -5190,7 +5190,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 @@ -5211,7 +5211,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 @@ -5233,7 +5233,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 @@ -5252,7 +5252,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 @@ -5267,7 +5267,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 @@ -5282,7 +5282,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 @@ -5321,7 +5321,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 @@ -5350,7 +5350,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 @@ -5371,7 +5371,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 @@ -5395,7 +5395,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 @@ -5418,7 +5418,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 @@ -5445,7 +5445,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 @@ -5461,7 +5461,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 @@ -5485,7 +5485,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 @@ -5510,7 +5510,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 @@ -5535,7 +5535,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 @@ -5551,7 +5551,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 @@ -8495,16 +8495,6 @@ __metadata:
languageName: node
linkType: hard

"@types/hoist-non-react-statics@npm:^3.3.1":
version: 3.3.5
resolution: "@types/hoist-non-react-statics@npm:3.3.5"
dependencies:
"@types/react": "npm:*"
hoist-non-react-statics: "npm:^3.3.0"
checksum: 10/b645b062a20cce6ab1245ada8274051d8e2e0b2ee5c6bd58215281d0ec6dae2f26631af4e2e7c8abe238cdcee73fcaededc429eef569e70908f82d0cc0ea31d7
languageName: node
linkType: hard

"@types/html-minifier-terser@npm:^6.0.0":
version: 6.1.0
resolution: "@types/html-minifier-terser@npm:6.1.0"
Expand Down Expand Up @@ -16924,7 +16914,7 @@ __metadata:
languageName: node
linkType: hard

"hoist-non-react-statics@npm:^3.1.0, hoist-non-react-statics@npm:^3.3.0, hoist-non-react-statics@npm:^3.3.1, hoist-non-react-statics@npm:^3.3.2":
"hoist-non-react-statics@npm:^3.1.0, hoist-non-react-statics@npm:^3.3.0, hoist-non-react-statics@npm:^3.3.1":
version: 3.3.2
resolution: "hoist-non-react-statics@npm:3.3.2"
dependencies:
Expand Down Expand Up @@ -24266,38 +24256,6 @@ __metadata:
languageName: node
linkType: hard

"react-redux@npm:^8.0.2":
version: 8.1.3
resolution: "react-redux@npm:8.1.3"
dependencies:
"@babel/runtime": "npm:^7.12.1"
"@types/hoist-non-react-statics": "npm:^3.3.1"
"@types/use-sync-external-store": "npm:^0.0.3"
hoist-non-react-statics: "npm:^3.3.2"
react-is: "npm:^18.0.0"
use-sync-external-store: "npm:^1.0.0"
peerDependencies:
"@types/react": ^16.8 || ^17.0 || ^18.0
"@types/react-dom": ^16.8 || ^17.0 || ^18.0
react: ^16.8 || ^17.0 || ^18.0
react-dom: ^16.8 || ^17.0 || ^18.0
react-native: ">=0.59"
redux: ^4 || ^5.0.0-beta.0
peerDependenciesMeta:
"@types/react":
optional: true
"@types/react-dom":
optional: true
react-dom:
optional: true
react-native:
optional: true
redux:
optional: true
checksum: 10/c4c7586cff3abeb784e73598d330f5301116a4e9942fd36895f2bccd8990001709c6c3ea1817edb75ee477470d6c67c9113e05a7f86b2b68a3950c9c29fe20cb
languageName: node
linkType: hard

"react-redux@npm:^9.1.0":
version: 9.1.0
resolution: "react-redux@npm:9.1.0"
Expand Down