Skip to content

Commit cc7bbfd

Browse files
FaberVitaleFaberVitale
committed
chore: upgrade /react(-dom)?/ to 18 and react-redux to 8
Changes: 1. updates resolutions of react, react-redux & react-dom 2. adds @types/react & @types/react-dom to resolutions 3. removes @types/react-redux (no longer necessary) 4. upgrages react, react-redux, react-dom, @types/react & @types/react-dom in every workspace
1 parent 2b80d8b commit cc7bbfd

File tree

23 files changed

+269
-332
lines changed

23 files changed

+269
-332
lines changed

‎examples/action-listener/counter/package.json

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
"dependencies": {
66
"@reduxjs/toolkit": "^1.8.0",
77
"@types/node": "^12.0.0",
8-
"@types/react": "^17.0.0",
9-
"@types/react-dom": "^17.0.0",
8+
"@types/react": "^18.0.12",
9+
"@types/react-dom": "^18.0.5",
1010
"clsx": "1.1.1",
11-
"react": "^17.0.2",
12-
"react-dom": "^17.0.2",
13-
"react-redux": "7.2.2",
11+
"react": "^18.1.0",
12+
"react-dom": "^18.1.0",
13+
"react-redux": "^8.0.2",
1414
"react-scripts": "4.0.3",
1515
"typescript": "~4.2.4"
1616
},
@@ -22,9 +22,11 @@
2222
},
2323
"eslintConfig": {
2424
"extends": [
25-
"react-app",
26-
"react-app/jest"
27-
]
25+
"react-app"
26+
],
27+
"rules": {
28+
"react/react-in-jsx-scope": "off"
29+
}
2830
},
2931
"browserslist": {
3032
"production": [

‎examples/query/react/advanced/package.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,14 @@
77
"main": "src/index.tsx",
88
"dependencies": {
99
"@reduxjs/toolkit": "^1.6.0-rc.1",
10-
"react": "17.0.0",
11-
"react-dom": "17.0.0",
12-
"react-redux": "7.2.2",
10+
"react": "^18.1.0",
11+
"react-dom": "^18.1.0",
12+
"react-redux": "^8.0.2",
1313
"react-scripts": "4.0.2"
1414
},
1515
"devDependencies": {
16-
"@types/react": "17.0.0",
17-
"@types/react-dom": "17.0.0",
18-
"@types/react-redux": "7.1.9",
16+
"@types/react": "^18.0.5",
17+
"@types/react-dom": "^18.0.5",
1918
"typescript": "~4.2.4"
2019
},
2120
"eslintConfig": {

‎examples/query/react/authentication-with-extrareducers/package.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,16 @@
1212
"@reduxjs/toolkit": "^1.6.0-rc.1",
1313
"framer-motion": "^2.9.5",
1414
"msw": "^0.41.1",
15-
"react": "17.0.2",
16-
"react-dom": "17.0.2",
15+
"react": "^18.1.0",
16+
"react-dom": "^18.1.0",
1717
"react-icons": "3.11.0",
18-
"react-redux": "^7.2.4",
18+
"react-redux": "^8.0.2",
1919
"react-router-dom": "5.2.0",
2020
"react-scripts": "4.0.2"
2121
},
2222
"devDependencies": {
23-
"@types/react": "17.0.0",
24-
"@types/react-dom": "17.0.0",
25-
"@types/react-redux": "7.1.9",
23+
"@types/react": "^18.0.5",
24+
"@types/react-dom": "^18.0.5",
2625
"@types/react-router-dom": "5.1.6",
2726
"typescript": "~4.2.4"
2827
},

‎examples/query/react/authentication/package.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,16 @@
1212
"@reduxjs/toolkit": "^1.6.0-rc.1",
1313
"framer-motion": "^2.9.5",
1414
"msw": "^0.41.1",
15-
"react": "17.0.2",
16-
"react-dom": "17.0.2",
15+
"react": "^18.1.0",
16+
"react-dom": "^18.1.0",
1717
"react-icons": "3.11.0",
18-
"react-redux": "^7.2.4",
18+
"react-redux": "^8.0.2",
1919
"react-router-dom": "5.2.0",
2020
"react-scripts": "4.0.2"
2121
},
2222
"devDependencies": {
23-
"@types/react": "17.0.0",
24-
"@types/react-dom": "17.0.0",
25-
"@types/react-redux": "7.1.9",
23+
"@types/react": "^18.0.5",
24+
"@types/react-dom": "^18.0.5",
2625
"@types/react-router-dom": "5.1.6",
2726
"typescript": "~4.2.4"
2827
},

‎examples/query/react/basic/package.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,16 @@
77
"main": "src/index.tsx",
88
"dependencies": {
99
"@reduxjs/toolkit": "^1.6.0-rc.1",
10-
"react": "17.0.0",
11-
"react-dom": "17.0.0",
12-
"react-redux": "7.2.2",
10+
"react": "^18.1.0",
11+
"react-dom": "^18.1.0",
12+
"react-redux": "^8.0.2",
1313
"react-scripts": "4.0.2"
1414
},
1515
"devDependencies": {
1616
"@testing-library/react": "^12.0.0",
1717
"@types/jest": "^26.0.23",
18-
"@types/react": "17.0.0",
19-
"@types/react-dom": "17.0.0",
20-
"@types/react-redux": "7.1.9",
18+
"@types/react": "^18.0.5",
19+
"@types/react-dom": "^18.0.5",
2120
"msw": "^0.41.1",
2221
"typescript": "~4.2.4"
2322
},

‎examples/query/react/conditional-fetching/package.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,14 @@
77
"main": "src/index.tsx",
88
"dependencies": {
99
"@reduxjs/toolkit": "^1.6.0-rc.1",
10-
"react": "17.0.0",
11-
"react-dom": "17.0.0",
12-
"react-redux": "7.2.2",
10+
"react": "^18.1.0",
11+
"react-dom": "^18.1.0",
12+
"react-redux": "^8.0.2",
1313
"react-scripts": "4.0.2"
1414
},
1515
"devDependencies": {
16-
"@types/react": "17.0.0",
17-
"@types/react-dom": "17.0.0",
18-
"@types/react-redux": "7.1.9",
16+
"@types/react": "^18.0.5",
17+
"@types/react-dom": "^18.0.5",
1918
"typescript": "~4.2.4"
2019
},
2120
"eslintConfig": {

‎examples/query/react/deduping-queries/package.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,14 @@
77
"main": "src/index.tsx",
88
"dependencies": {
99
"@reduxjs/toolkit": "^1.6.0-rc.1",
10-
"react": "17.0.0",
11-
"react-dom": "17.0.0",
12-
"react-redux": "7.2.2",
10+
"react": "^18.1.0",
11+
"react-dom": "^18.1.0",
12+
"react-redux": "^8.0.2",
1313
"react-scripts": "4.0.2"
1414
},
1515
"devDependencies": {
16-
"@types/react": "17.0.0",
17-
"@types/react-dom": "17.0.0",
18-
"@types/react-redux": "7.1.9",
16+
"@types/react": "^18.0.5",
17+
"@types/react-dom": "^18.0.5",
1918
"typescript": "~4.2.4"
2019
},
2120
"eslintConfig": {

‎examples/query/react/graphql-codegen/package.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
"graphql": "^15.5.0",
1717
"graphql-request": "^3.4.0",
1818
"msw": "0.28.2",
19-
"react": "17.0.2",
20-
"react-dom": "17.0.2",
19+
"react": "^18.1.0",
20+
"react-dom": "^18.1.0",
2121
"react-icons": "3.11.0",
22-
"react-redux": "^7.2.4",
22+
"react-redux": "^8.0.2",
2323
"react-router-dom": "5.2.0",
2424
"react-scripts": "4.0.2"
2525
},
@@ -34,9 +34,8 @@
3434
"@graphql-codegen/typescript-rtk-query": "^1.1.0",
3535
"@graphql-typed-document-node/core": "^3.1.0",
3636
"@types/faker": "^5.5.5",
37-
"@types/react": "17.0.0",
38-
"@types/react-dom": "17.0.0",
39-
"@types/react-redux": "7.1.9",
37+
"@types/react": "^18.0.5",
38+
"@types/react-dom": "^18.0.5",
4039
"@types/react-router-dom": "5.1.6",
4140
"@types/webpack-env": "^1.16.0",
4241
"concurrently": "^6.2.0",

‎examples/query/react/graphql/package.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,17 @@
1717
"graphql": "^15.5.0",
1818
"graphql-request": "^3.4.0",
1919
"msw": "0.28.2",
20-
"react": "17.0.2",
21-
"react-dom": "17.0.2",
20+
"react": "^18.1.0",
21+
"react-dom": "^18.1.0",
2222
"react-icons": "3.11.0",
23-
"react-redux": "^7.2.4",
23+
"react-redux": "^8.0.2",
2424
"react-router-dom": "5.2.0",
2525
"react-scripts": "4.0.2"
2626
},
2727
"devDependencies": {
2828
"@types/faker": "^5.5.5",
29-
"@types/react": "17.0.0",
30-
"@types/react-dom": "17.0.0",
31-
"@types/react-redux": "7.1.9",
29+
"@types/react": "^18.0.5",
30+
"@types/react-dom": "^18.0.5",
3231
"@types/react-router-dom": "5.1.6",
3332
"typescript": "~4.2.4"
3433
},

‎examples/query/react/kitchen-sink/package.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
"dependencies": {
99
"@reduxjs/toolkit": "1.8.1",
1010
"msw": "^0.41.1",
11-
"react": "17.0.0",
12-
"react-dom": "17.0.0",
13-
"react-redux": "7.2.2",
11+
"react": "^18.1.0",
12+
"react-dom": "^18.1.0",
13+
"react-redux": "^8.0.2",
1414
"react-router-dom": "5.3.0",
1515
"react-scripts": "4.0.2"
1616
},
@@ -19,9 +19,8 @@
1919
"@testing-library/react": "^12.0.0",
2020
"@types/jest": "^26.0.23",
2121
"@types/node": "^14.14.6",
22-
"@types/react": "17.0.0",
23-
"@types/react-dom": "17.0.0",
24-
"@types/react-redux": "7.1.9",
22+
"@types/react": "^18.0.5",
23+
"@types/react-dom": "^18.0.5",
2524
"typescript": "~4.2.4",
2625
"whatwg-fetch": "^3.4.1"
2726
},

‎examples/query/react/mutations/package.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,16 @@
1313
"@reduxjs/toolkit": "^1.6.0-rc.1",
1414
"framer-motion": "^2.9.5",
1515
"msw": "^0.41.1",
16-
"react": "17.0.2",
17-
"react-dom": "17.0.2",
16+
"react": "^18.1.0",
17+
"react-dom": "^18.1.0",
1818
"react-icons": "3.11.0",
19-
"react-redux": "^7.2.4",
19+
"react-redux": "^8.0.2",
2020
"react-router-dom": "5.2.0",
2121
"react-scripts": "4.0.2"
2222
},
2323
"devDependencies": {
24-
"@types/react": "17.0.0",
25-
"@types/react-dom": "17.0.0",
26-
"@types/react-redux": "7.1.9",
24+
"@types/react": "^18.0.5",
25+
"@types/react-dom": "^18.0.5",
2726
"@types/react-router-dom": "5.1.6",
2827
"typescript": "~4.2.4"
2928
},

‎examples/query/react/optimistic-update/package.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,17 @@
1313
"@reduxjs/toolkit": "^1.6.0-rc.1",
1414
"framer-motion": "^2.9.5",
1515
"msw": "^0.41.1",
16-
"react": "17.0.2",
17-
"react-dom": "17.0.2",
16+
"react": "^18.1.0",
17+
"react-dom": "^18.1.0",
1818
"react-icons": "3.11.0",
19-
"react-redux": "^7.2.4",
19+
"react-redux": "^8.0.2",
2020
"react-router-dom": "5.2.0",
2121
"react-scripts": "4.0.2",
2222
"uuid": "^8.3.2"
2323
},
2424
"devDependencies": {
25-
"@types/react": "17.0.0",
26-
"@types/react-dom": "17.0.0",
27-
"@types/react-redux": "7.1.9",
25+
"@types/react": "^18.0.5",
26+
"@types/react-dom": "^18.0.5",
2827
"@types/react-router-dom": "5.1.6",
2928
"typescript": "~4.2.4",
3029
"whatwg-fetch": "^3.4.1"

‎examples/query/react/pagination/package.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,17 @@
1414
"faker": "^5.5.3",
1515
"framer-motion": "^2.9.5",
1616
"msw": "^0.41.1",
17-
"react": "17.0.2",
18-
"react-dom": "17.0.2",
17+
"react": "^18.1.0",
18+
"react-dom": "^18.1.0",
1919
"react-icons": "3.11.0",
20-
"react-redux": "^7.2.4",
20+
"react-redux": "^8.0.2",
2121
"react-router-dom": "5.2.0",
2222
"react-scripts": "4.0.2"
2323
},
2424
"devDependencies": {
2525
"@types/faker": "^5.5.5",
26-
"@types/react": "17.0.0",
27-
"@types/react-dom": "17.0.0",
28-
"@types/react-redux": "7.1.9",
26+
"@types/react": "^18.0.5",
27+
"@types/react-dom": "^18.0.5",
2928
"@types/react-router-dom": "5.1.6",
3029
"typescript": "~4.2.4"
3130
},

‎examples/query/react/polling/package.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,14 @@
77
"main": "src/index.tsx",
88
"dependencies": {
99
"@reduxjs/toolkit": "^1.6.0-rc.1",
10-
"react": "17.0.0",
11-
"react-dom": "17.0.0",
12-
"react-redux": "7.2.2",
10+
"react": "^18.1.0",
11+
"react-dom": "^18.1.0",
12+
"react-redux": "^8.0.2",
1313
"react-scripts": "4.0.2"
1414
},
1515
"devDependencies": {
16-
"@types/react": "17.0.0",
17-
"@types/react-dom": "17.0.0",
18-
"@types/react-redux": "7.1.9",
16+
"@types/react": "^18.0.5",
17+
"@types/react-dom": "^18.0.5",
1918
"typescript": "~4.2.4"
2019
},
2120
"eslintConfig": {

‎examples/query/react/prefetching-automatic-waterfall/package.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,17 @@
1414
"faker": "^5.5.3",
1515
"framer-motion": "^2.9.5",
1616
"msw": "^0.41.1",
17-
"react": "17.0.2",
18-
"react-dom": "17.0.2",
17+
"react": "^18.1.0",
18+
"react-dom": "^18.1.0",
1919
"react-icons": "3.11.0",
20-
"react-redux": "^7.2.4",
20+
"react-redux": "^8.0.2",
2121
"react-router-dom": "5.2.0",
2222
"react-scripts": "4.0.2"
2323
},
2424
"devDependencies": {
2525
"@types/faker": "^5.5.5",
26-
"@types/react": "17.0.0",
27-
"@types/react-dom": "17.0.0",
28-
"@types/react-redux": "7.1.9",
26+
"@types/react": "^18.0.5",
27+
"@types/react-dom": "^18.0.5",
2928
"@types/react-router-dom": "5.1.6",
3029
"typescript": "~4.2.4"
3130
},

‎examples/query/react/prefetching-automatic/package.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,17 @@
1414
"faker": "^5.5.3",
1515
"framer-motion": "^2.9.5",
1616
"msw": "^0.41.1",
17-
"react": "17.0.2",
18-
"react-dom": "17.0.2",
17+
"react": "^18.1.0",
18+
"react-dom": "^18.1.0",
1919
"react-icons": "3.11.0",
20-
"react-redux": "^7.2.4",
20+
"react-redux": "^8.0.2",
2121
"react-router-dom": "5.2.0",
2222
"react-scripts": "4.0.2"
2323
},
2424
"devDependencies": {
2525
"@types/faker": "^5.5.5",
26-
"@types/react": "17.0.0",
27-
"@types/react-dom": "17.0.0",
28-
"@types/react-redux": "7.1.9",
26+
"@types/react": "^18.0.5",
27+
"@types/react-dom": "^18.0.5",
2928
"@types/react-router-dom": "5.1.6",
3029
"typescript": "~4.2.4"
3130
},

0 commit comments

Comments
 (0)