Skip to content

Commit

Permalink
Add support for version 18 of React (#7146)
Browse files Browse the repository at this point in the history
  • Loading branch information
jonkoops authored Sep 20, 2022
1 parent ac79742 commit b323409
Show file tree
Hide file tree
Showing 16 changed files with 66 additions and 82 deletions.
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@
"@octokit/rest": "^16.43.2",
"@testing-library/react-hooks": "^8.0.1",
"@testing-library/jest-dom": "^5.16.2",
"@testing-library/react": "^12.1.5",
"@testing-library/react": "^13.4.0",
"@testing-library/user-event": "14.4.3",
"@types/jest": "27.0.2",
"@types/react": "^17.0.0",
"@types/react-dom": "^17.0.0",
"@types/react": "^18",
"@types/react-dom": "^18",
"@typescript-eslint/eslint-plugin": "^4.4.1",
"@typescript-eslint/parser": "^4.4.1",
"babel-jest": "^27.2.5",
Expand All @@ -60,8 +60,8 @@
"mutation-observer": "^1.0.3",
"plop": "^2.0.0",
"prettier": "^1.18.2",
"react": "^17.0.0",
"react-dom": "^17.0.0",
"react": "^18",
"react-dom": "^18",
"surge": "^0.23.1",
"ts-patch": "^1.4.2",
"typescript": "^4.0.0"
Expand Down
4 changes: 2 additions & 2 deletions packages/react-catalog-view-extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"typescript": "^4.7.4"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0",
"react-dom": "^16.8.0 || ^17.0.0"
"react": "^16.8 || ^17 || ^18",
"react-dom": "^16.8 || ^17 || ^18"
}
}
4 changes: 2 additions & 2 deletions packages/react-charts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@
"victory-zoom-container": "^36.6.7"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0",
"react-dom": "^16.8.0 || ^17.0.0"
"react": "^16.8 || ^17 || ^18",
"react-dom": "^16.8 || ^17 || ^18"
},
"scripts": {
"clean": "rimraf dist"
Expand Down
4 changes: 2 additions & 2 deletions packages/react-code-editor/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ Install peer deps
```json
"monaco-editor": "^0.21.3",
"monaco-editor-webpack-plugin": "^2.1.0",
"react": "^16.8.0 || ^17.0.0",
"react-dom": "^16.8.0 || ^17.0.0",
"react": "^16.8 || ^17 || ^18",
"react-dom": "^16.8 || ^17 || ^18",
"react-monaco-editor": "^0.41.2"
```

Expand Down
4 changes: 2 additions & 2 deletions packages/react-code-editor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
"tslib": "^2.0.0"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0",
"react-dom": "^16.8.0 || ^17.0.0",
"react": "^16.8 || ^17 || ^18",
"react-dom": "^16.8 || ^17 || ^18",
"react-monaco-editor": "^0.41.2"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/react-console/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"typescript": "^4.7.4"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0",
"react-dom": "^16.8.0 || ^17.0.0"
"react": "^16.8 || ^17 || ^18",
"react-dom": "^16.8 || ^17 || ^18"
}
}
4 changes: 2 additions & 2 deletions packages/react-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"typescript": "^4.7.4"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0",
"react-dom": "^16.8.0 || ^17.0.0"
"react": "^16.8 || ^17 || ^18",
"react-dom": "^16.8 || ^17 || ^18"
}
}
4 changes: 2 additions & 2 deletions packages/react-icons/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"typescript": "^4.7.4"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0",
"react-dom": "^16.8.0 || ^17.0.0"
"react": "^16.8 || ^17 || ^18",
"react-dom": "^16.8 || ^17 || ^18"
}
}
4 changes: 2 additions & 2 deletions packages/react-inline-edit-extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
"@patternfly/react-table": "^4.110.0"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0",
"react-dom": "^16.8.0 || ^17.0.0"
"react": "^16.8 || ^17 || ^18",
"react-dom": "^16.8 || ^17 || ^18"
},
"devDependencies": {
"rimraf": "^2.6.2",
Expand Down
8 changes: 4 additions & 4 deletions packages/react-integration/demo-app-ts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
},
"dependencies": {
"@patternfly/react-core": "^4.241.0",
"react": "^17.0.0",
"react-dom": "^17.0.0",
"react": "^18",
"react-dom": "^18",
"react-router": "^5.3.3",
"react-router-dom": "^5.3.3"
},
"devDependencies": {
"@types/react": "^17.0.0",
"@types/react-dom": "^17.0.0",
"@types/react": "^18",
"@types/react-dom": "^18",
"@types/react-router": "^5.1.18",
"@types/react-router-dom": "^5.3.3",
"classnames": "^2.2.6",
Expand Down
4 changes: 2 additions & 2 deletions packages/react-log-viewer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
"resize-observer-polyfill": "^1.5.1"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0",
"react-dom": "^16.8.0 || ^17.0.0"
"react": "^16.8 || ^17 || ^18",
"react-dom": "^16.8 || ^17 || ^18"
},
"devDependencies": {
"rimraf": "^2.6.2",
Expand Down
4 changes: 2 additions & 2 deletions packages/react-table/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"typescript": "^4.7.4"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0",
"react-dom": "^16.8.0 || ^17.0.0"
"react": "^16.8 || ^17 || ^18",
"react-dom": "^16.8 || ^17 || ^18"
}
}
4 changes: 2 additions & 2 deletions packages/react-topology/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@
"webcola": "3.4.0"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0",
"react-dom": "^16.8.0 || ^17.0.0"
"react": "^16.8 || ^17 || ^18",
"react-dom": "^16.8 || ^17 || ^18"
},
"devDependencies": {
"rimraf": "^2.6.2",
Expand Down
4 changes: 2 additions & 2 deletions packages/react-virtualized-extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
"tslib": "^2.0.0"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0",
"react-dom": "^16.8.0 || ^17.0.0"
"react": "^16.8 || ^17 || ^18",
"react-dom": "^16.8 || ^17 || ^18"
},
"devDependencies": {
"@types/dom-helpers": "^3.4.1",
Expand Down
4 changes: 2 additions & 2 deletions scripts/generators/package/package.json.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
{{/if}}
},
"peerDependencies": {
"react": "^16.8.0",
"react-dom": "^16.8.0"
"react": "^16.8 || ^17 || ^18",
"react-dom": "^16.8 || ^17 || ^18"
}
}
78 changes: 31 additions & 47 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3676,10 +3676,10 @@
resolved "https://registry.yarnpkg.com/@testim/chrome-version/-/chrome-version-1.1.2.tgz#092005c5b77bd3bb6576a4677110a11485e11864"
integrity sha512-1c4ZOETSRpI0iBfIFUqU4KqwBAB2lHUAlBjZz/YqOHqwM9dTTzjV6Km0ZkiEiSCx/tLr1BtESIKyWWMww+RUqw==

"@testing-library/dom@^8.0.0":
version "8.11.3"
resolved "https://registry.npmjs.org/@testing-library/dom/-/dom-8.11.3.tgz"
integrity sha512-9LId28I+lx70wUiZjLvi1DB/WT2zGOxUh46glrSNMaWVx849kKAluezVzZrXJfTKKoQTmEOutLes/bHg4Bj3aA==
"@testing-library/dom@^8.5.0":
version "8.18.1"
resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-8.18.1.tgz#80f91be02bc171fe5a3a7003f88207be31ac2cf3"
integrity sha512-oEvsm2B/WtcHKE+IcEeeCqNU/ltFGaVyGbpcm4g/2ytuT49jrlH9x5qRKL/H3A6yfM4YAbSbC0ceT5+9CEXnLg==
dependencies:
"@babel/code-frame" "^7.10.4"
"@babel/runtime" "^7.12.5"
Expand Down Expand Up @@ -3713,14 +3713,14 @@
"@babel/runtime" "^7.12.5"
react-error-boundary "^3.1.0"

"@testing-library/react@^12.1.5":
version "12.1.5"
resolved "https://registry.npmjs.org/@testing-library/react/-/react-12.1.5.tgz"
integrity sha512-OfTXCJUFgjd/digLUuPxa0+/3ZxsQmE7ub9kcbW/wi96Bh3o/p5vrETcBGfP17NWPGqeYYl5LTRpwyGoMC4ysg==
"@testing-library/react@^13.4.0":
version "13.4.0"
resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-13.4.0.tgz#6a31e3bf5951615593ad984e96b9e5e2d9380966"
integrity sha512-sXOGON+WNTh3MLE9rve97ftaZukN3oNf2KjDy7YTx6hcTO2uuLHuCGynMDhFwGw/jYf4OJ2Qk0i4i79qMNNkyw==
dependencies:
"@babel/runtime" "^7.12.5"
"@testing-library/dom" "^8.0.0"
"@types/react-dom" "<18.0.0"
"@testing-library/dom" "^8.5.0"
"@types/react-dom" "^18.0.0"

"@testing-library/[email protected]":
version "14.4.3"
Expand Down Expand Up @@ -4177,17 +4177,10 @@
version "15.7.3"
resolved "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.3.tgz"

"@types/react-dom@<18.0.0":
version "17.0.17"
resolved "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.17.tgz"
integrity sha512-VjnqEmqGnasQKV0CWLevqMTXBYG9GbwuE6x3VetERLh0cq2LTptFE73MrQi2S7GkKXCf2GgwItB/melLnxfnsg==
dependencies:
"@types/react" "^17"

"@types/react-dom@^17.0.0":
version "17.0.11"
resolved "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.11.tgz"
integrity sha512-f96K3k+24RaLGVu/Y2Ng3e1EbZ8/cVJvypZWd7cy0ofCBaf2lcM46xNhycMZ2xGwbBjRql7hOlZ+e2WlJ5MH3Q==
"@types/react-dom@^18", "@types/react-dom@^18.0.0":
version "18.0.6"
resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.0.6.tgz#36652900024842b74607a17786b6662dd1e103a1"
integrity sha512-/5OFZgfIPSwy+YuIBP/FgJnQnsxhZhjjrnxudMddeblOouIodEQ75X14Rr4wGSG/bknL+Omy9iWlLo1u/9GzAA==
dependencies:
"@types/react" "*"

Expand Down Expand Up @@ -4228,19 +4221,10 @@
"@types/prop-types" "*"
"@types/react" "*"

"@types/react@*", "@types/react@^17.0.0":
version "17.0.34"
resolved "https://registry.npmjs.org/@types/react/-/react-17.0.34.tgz"
integrity sha512-46FEGrMjc2+8XhHXILr+3+/sTe3OfzSPU9YGKILLrUYbQ1CLQC9Daqo1KzENGXAWwrFwiY0l4ZbF20gRvgpWTg==
dependencies:
"@types/prop-types" "*"
"@types/scheduler" "*"
csstype "^3.0.2"

"@types/react@^17":
version "17.0.45"
resolved "https://registry.npmjs.org/@types/react/-/react-17.0.45.tgz"
integrity sha512-YfhQ22Lah2e3CHPsb93tRwIGNiSwkuz1/blk4e6QrWS0jQzCSNbGLtOEYhPg02W0yGTTmpajp7dCTbBAMN3qsg==
"@types/react@*", "@types/react@^18":
version "18.0.17"
resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.17.tgz#4583d9c322d67efe4b39a935d223edcc7050ccf4"
integrity sha512-38ETy4tL+rn4uQQi7mB81G7V1g0u2ryquNmsVIOKUAEIDK+3CUjZ6rSRpdvS99dNBnkLFL83qfmtLacGOTIhwQ==
dependencies:
"@types/prop-types" "*"
"@types/scheduler" "*"
Expand Down Expand Up @@ -14348,13 +14332,13 @@ [email protected]:
node-dir "^0.1.10"
strip-indent "^3.0.0"

react-dom@^17.0.0:
version "17.0.1"
resolved "https://registry.npmjs.org/react-dom/-/react-dom-17.0.1.tgz"
react-dom@^18:
version "18.2.0"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.2.0.tgz#22aaf38708db2674ed9ada224ca4aa708d821e3d"
integrity sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==
dependencies:
loose-envify "^1.1.0"
object-assign "^4.1.1"
scheduler "^0.20.1"
scheduler "^0.23.0"

[email protected]:
version "9.0.0"
Expand Down Expand Up @@ -14468,12 +14452,12 @@ react-virtualized@^9.21.1:
prop-types "^15.7.2"
react-lifecycles-compat "^3.0.4"

react@^17.0.0:
version "17.0.1"
resolved "https://registry.npmjs.org/react/-/react-17.0.1.tgz"
react@^18:
version "18.2.0"
resolved "https://registry.yarnpkg.com/react/-/react-18.2.0.tgz#555bd98592883255fa00de14f1151a917b5d77d5"
integrity sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==
dependencies:
loose-envify "^1.1.0"
object-assign "^4.1.1"

read-cmd-shim@^1.0.1:
version "1.0.5"
Expand Down Expand Up @@ -15242,12 +15226,12 @@ saxes@^5.0.1:
dependencies:
xmlchars "^2.2.0"

scheduler@^0.20.1:
version "0.20.1"
resolved "https://registry.npmjs.org/scheduler/-/scheduler-0.20.1.tgz"
scheduler@^0.23.0:
version "0.23.0"
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.23.0.tgz#ba8041afc3d30eb206a487b6b384002e4e61fdfe"
integrity sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==
dependencies:
loose-envify "^1.1.0"
object-assign "^4.1.1"

schema-utils@^1.0.0:
version "1.0.0"
Expand Down

0 comments on commit b323409

Please sign in to comment.