From c79e79926e209c5bff1f76c9aa380ac5e29f6539 Mon Sep 17 00:00:00 2001 From: Arya Emami Date: Fri, 12 Apr 2024 15:02:19 -0500 Subject: [PATCH 1/2] Move `react-redux` from `resolutions` to `devDependencies` --- package.json | 2 +- yarn.lock | 47 +++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 46 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 1605fac60..c057859ea 100644 --- a/package.json +++ b/package.json @@ -36,6 +36,7 @@ "eslint-plugin-react-hooks": "^4.2.0", "netlify-plugin-cache": "^1.0.3", "prettier": "^3.2.5", + "react-redux": "^9.1.0", "release-it": "^14.12.5", "serve": "^14.2.0", "ts-node": "^10.9.2", @@ -50,7 +51,6 @@ "@babel/types": "7.19.3", "esbuild": "0.19.7", "jest-snapshot": "29.3.1", - "react-redux": "npm:9.1.0", "react": "npm:18.2.0", "react-dom": "npm:18.2.0", "resolve": "1.22.1", diff --git a/yarn.lock b/yarn.lock index da15c590b..3bf264185 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8495,6 +8495,16 @@ __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" @@ -16914,7 +16924,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.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": version: 3.3.2 resolution: "hoist-non-react-statics@npm:3.3.2" dependencies: @@ -24256,7 +24266,39 @@ __metadata: languageName: node linkType: hard -"react-redux@npm:9.1.0": +"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" dependencies: @@ -25502,6 +25544,7 @@ __metadata: eslint-plugin-react-hooks: "npm:^4.2.0" netlify-plugin-cache: "npm:^1.0.3" prettier: "npm:^3.2.5" + react-redux: "npm:^9.1.0" release-it: "npm:^14.12.5" serve: "npm:^14.2.0" ts-node: "npm:^10.9.2" From f099aac724c896b8b31ffd2f908857cc6b5d4576 Mon Sep 17 00:00:00 2001 From: Arya Emami Date: Fri, 12 Apr 2024 15:07:19 -0500 Subject: [PATCH 2/2] Deduplicate `react-redux` across the entire monorepo --- examples/action-listener/counter/package.json | 2 +- examples/query/react/advanced/package.json | 2 +- .../package.json | 2 +- .../query/react/authentication/package.json | 2 +- examples/query/react/basic/package.json | 2 +- .../react/conditional-fetching/package.json | 2 +- .../query/react/deduping-queries/package.json | 2 +- .../query/react/graphql-codegen/package.json | 2 +- examples/query/react/graphql/package.json | 2 +- .../query/react/kitchen-sink/package.json | 2 +- examples/query/react/mutations/package.json | 2 +- .../react/optimistic-update/package.json | 2 +- examples/query/react/pagination/package.json | 2 +- examples/query/react/polling/package.json | 2 +- .../package.json | 2 +- .../react/prefetching-automatic/package.json | 2 +- examples/query/react/prefetching/package.json | 2 +- .../query/react/with-apiprovider/package.json | 2 +- yarn.lock | 80 +++++-------------- 19 files changed, 37 insertions(+), 79 deletions(-) diff --git a/examples/action-listener/counter/package.json b/examples/action-listener/counter/package.json index 3d614a9be..1743b6457 100644 --- a/examples/action-listener/counter/package.json +++ b/examples/action-listener/counter/package.json @@ -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" }, diff --git a/examples/query/react/advanced/package.json b/examples/query/react/advanced/package.json index fd8f138c8..d8c2e34b3 100644 --- a/examples/query/react/advanced/package.json +++ b/examples/query/react/advanced/package.json @@ -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": { diff --git a/examples/query/react/authentication-with-extrareducers/package.json b/examples/query/react/authentication-with-extrareducers/package.json index d311f8504..d4b648e3e 100644 --- a/examples/query/react/authentication-with-extrareducers/package.json +++ b/examples/query/react/authentication-with-extrareducers/package.json @@ -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" }, diff --git a/examples/query/react/authentication/package.json b/examples/query/react/authentication/package.json index 4df608f9a..01eaab4ae 100644 --- a/examples/query/react/authentication/package.json +++ b/examples/query/react/authentication/package.json @@ -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" }, diff --git a/examples/query/react/basic/package.json b/examples/query/react/basic/package.json index 14f5a8a17..709c27b6c 100644 --- a/examples/query/react/basic/package.json +++ b/examples/query/react/basic/package.json @@ -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": { diff --git a/examples/query/react/conditional-fetching/package.json b/examples/query/react/conditional-fetching/package.json index db8c2c020..371d14db7 100644 --- a/examples/query/react/conditional-fetching/package.json +++ b/examples/query/react/conditional-fetching/package.json @@ -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": { diff --git a/examples/query/react/deduping-queries/package.json b/examples/query/react/deduping-queries/package.json index bab6efc94..1db08cf57 100644 --- a/examples/query/react/deduping-queries/package.json +++ b/examples/query/react/deduping-queries/package.json @@ -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": { diff --git a/examples/query/react/graphql-codegen/package.json b/examples/query/react/graphql-codegen/package.json index 56d301bbf..a2446dd48 100644 --- a/examples/query/react/graphql-codegen/package.json +++ b/examples/query/react/graphql-codegen/package.json @@ -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" }, diff --git a/examples/query/react/graphql/package.json b/examples/query/react/graphql/package.json index 3e003bd2d..17d65186a 100644 --- a/examples/query/react/graphql/package.json +++ b/examples/query/react/graphql/package.json @@ -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" }, diff --git a/examples/query/react/kitchen-sink/package.json b/examples/query/react/kitchen-sink/package.json index 5208a2928..2e1675c6f 100644 --- a/examples/query/react/kitchen-sink/package.json +++ b/examples/query/react/kitchen-sink/package.json @@ -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" }, diff --git a/examples/query/react/mutations/package.json b/examples/query/react/mutations/package.json index cd5eacb87..1715dbb44 100644 --- a/examples/query/react/mutations/package.json +++ b/examples/query/react/mutations/package.json @@ -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" }, diff --git a/examples/query/react/optimistic-update/package.json b/examples/query/react/optimistic-update/package.json index 300cc10ef..84317eb1b 100644 --- a/examples/query/react/optimistic-update/package.json +++ b/examples/query/react/optimistic-update/package.json @@ -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" diff --git a/examples/query/react/pagination/package.json b/examples/query/react/pagination/package.json index dd80a1a0a..e82a4e0c5 100644 --- a/examples/query/react/pagination/package.json +++ b/examples/query/react/pagination/package.json @@ -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" }, diff --git a/examples/query/react/polling/package.json b/examples/query/react/polling/package.json index 939153d13..01db92d16 100644 --- a/examples/query/react/polling/package.json +++ b/examples/query/react/polling/package.json @@ -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": { diff --git a/examples/query/react/prefetching-automatic-waterfall/package.json b/examples/query/react/prefetching-automatic-waterfall/package.json index 6a303964f..16d3860cf 100644 --- a/examples/query/react/prefetching-automatic-waterfall/package.json +++ b/examples/query/react/prefetching-automatic-waterfall/package.json @@ -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" }, diff --git a/examples/query/react/prefetching-automatic/package.json b/examples/query/react/prefetching-automatic/package.json index f5cb57a84..d1daa496c 100644 --- a/examples/query/react/prefetching-automatic/package.json +++ b/examples/query/react/prefetching-automatic/package.json @@ -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" }, diff --git a/examples/query/react/prefetching/package.json b/examples/query/react/prefetching/package.json index 2e63421cc..5ef7c8a13 100644 --- a/examples/query/react/prefetching/package.json +++ b/examples/query/react/prefetching/package.json @@ -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" }, diff --git a/examples/query/react/with-apiprovider/package.json b/examples/query/react/with-apiprovider/package.json index ec0b49340..6895d5981 100644 --- a/examples/query/react/with-apiprovider/package.json +++ b/examples/query/react/with-apiprovider/package.json @@ -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": { diff --git a/yarn.lock b/yarn.lock index 3bf264185..bb8834c25 100644 --- a/yarn.lock +++ b/yarn.lock @@ -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 @@ -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 @@ -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" @@ -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" @@ -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 @@ -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 @@ -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 @@ -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" @@ -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" @@ -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" @@ -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" @@ -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" @@ -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" @@ -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 @@ -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" @@ -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" @@ -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" @@ -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 @@ -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" @@ -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: @@ -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"