Skip to content

Commit

Permalink
chore: update monorepo to React19 (#6738)
Browse files Browse the repository at this point in the history
  • Loading branch information
Lukas742 authored Dec 12, 2024
1 parent 6c377c0 commit 243ba13
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 52 deletions.
11 changes: 5 additions & 6 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,13 @@ jobs:
- name: Install
run: yarn install --immutable

- name: Install 19
if: ${{ matrix.react == '19' }}
- name: Install 18
if: ${{ matrix.react == '18' }}
run: |
yarn add "@types/react@19" "@types/react-dom@19" --dev
yarn add react@19 react-dom@19
yarn add "@types/react@18" "@types/react-dom@18" --dev
yarn add react@18 react-dom@18
- name: Cypress run
if: ${{ (matrix.react == '19' && matrix.spec == 'charts') != true }}
uses: cypress-io/github-action@v6
with:
browser: chrome
Expand All @@ -51,7 +50,7 @@ jobs:
install: false

- uses: coverallsapp/[email protected]
if: ${{ inputs.reportCoverage && (matrix.react == '19' && matrix.spec != 'charts' || matrix.react == '18' && matrix.spec == 'charts') }}
if: ${{ inputs.reportCoverage && matrix.react == '19' }}
with:
file: temp/cypress-coverage/lcov.info
github-token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
3 changes: 2 additions & 1 deletion .storybook/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ import { isChromatic } from './utils';
const isDevMode = process.env.NODE_ENV === 'development';

const addons = [
'./addons/version-switch',
// todo: enable again once https://github.com/storybookjs/storybook/pull/30003 is published
// './addons/version-switch',
{
name: '@storybook/addon-essentials',
options: {
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@
"@ui5/webcomponents-compat": "2.5.0",
"@ui5/webcomponents-fiori": "2.5.0",
"@ui5/webcomponents-icons": "2.5.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"remark-gfm": "^4.0.0",
"storybook": "8.4.5",
"tocbot": "4.32.2"
Expand All @@ -63,8 +63,8 @@
"@types/eslint__js": "^8.42.3",
"@types/jscodeshift": "^0.12.0",
"@types/node": "^22.0.0",
"@types/react": "^18.3.4",
"@types/react-dom": "^18.3.0",
"@types/react": "^19.0.1",
"@types/react-dom": "^19.0.1",
"@ui5/webcomponents-tools": "2.5.0",
"@vitejs/plugin-react": "^4.2.0",
"chromatic": "^11.0.0",
Expand Down
69 changes: 28 additions & 41 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5094,13 +5094,6 @@ __metadata:
languageName: node
linkType: hard

"@types/prop-types@npm:*":
version: 15.7.12
resolution: "@types/prop-types@npm:15.7.12"
checksum: 10c0/1babcc7db6a1177779f8fde0ccc78d64d459906e6ef69a4ed4dd6339c920c2e05b074ee5a92120fe4e9d9f1a01c952f843ebd550bee2332fc2ef81d1706878f8
languageName: node
linkType: hard

"@types/qs@npm:*":
version: 6.9.7
resolution: "@types/qs@npm:6.9.7"
Expand All @@ -5122,22 +5115,21 @@ __metadata:
languageName: node
linkType: hard

"@types/react-dom@npm:^18.3.0":
version: 18.3.2
resolution: "@types/react-dom@npm:18.3.2"
dependencies:
"@types/react": "npm:^18"
checksum: 10c0/22510231af67044a9542633b5b52ec16a8d71fa1da177f82428b8120d36619fd874c3b975b2eda6895baa53667f9fe8cba3acea1232a0244dffe8b11f6b32284
"@types/react-dom@npm:^19.0.1":
version: 19.0.2
resolution: "@types/react-dom@npm:19.0.2"
peerDependencies:
"@types/react": ^19.0.0
checksum: 10c0/3d0c7b78dbe8df64ea769f30af990a5950173a8321c745fe11094d765423f7964c3519dca6e7cd36b4be6521c8efc690bdd3b79b327b229dd1e9d5a8bad677dd
languageName: node
linkType: hard

"@types/react@npm:^18, @types/react@npm:^18.3.4":
version: 18.3.14
resolution: "@types/react@npm:18.3.14"
"@types/react@npm:^19.0.1":
version: 19.0.1
resolution: "@types/react@npm:19.0.1"
dependencies:
"@types/prop-types": "npm:*"
csstype: "npm:^3.0.2"
checksum: 10c0/d925fbfcf084238b93d1a0b5406d4cf9aeb37c4a1191559aa4ee107c2e55cc15327989140f03eddda4d471f5b935d4673fd74a86f451860edea18eae48ca44f8
checksum: 10c0/25eb69114abb9a6d5fc4414ee584388275bbc9ac32976449cf58b95fe9880efe6b3f936c3842be9bed8c571546a9752e8d3e2095288381e9c809269f5f574f2e
languageName: node
linkType: hard

Expand Down Expand Up @@ -19071,15 +19063,14 @@ __metadata:
languageName: node
linkType: hard

"react-dom@npm:^18.3.1":
version: 18.3.1
resolution: "react-dom@npm:18.3.1"
"react-dom@npm:^19.0.0":
version: 19.0.0
resolution: "react-dom@npm:19.0.0"
dependencies:
loose-envify: "npm:^1.1.0"
scheduler: "npm:^0.23.2"
scheduler: "npm:^0.25.0"
peerDependencies:
react: ^18.3.1
checksum: 10c0/a752496c1941f958f2e8ac56239172296fcddce1365ce45222d04a1947e0cc5547df3e8447f855a81d6d39f008d7c32eab43db3712077f09e3f67c4874973e85
react: ^19.0.0
checksum: 10c0/a36ce7ab507b237ae2759c984cdaad4af4096d8199fb65b3815c16825e5cfeb7293da790a3fc2184b52bfba7ba3ff31c058c01947aff6fd1a3701632aabaa6a9
languageName: node
linkType: hard

Expand Down Expand Up @@ -19165,12 +19156,10 @@ __metadata:
languageName: node
linkType: hard

"react@npm:^18.3.1":
version: 18.3.1
resolution: "react@npm:18.3.1"
dependencies:
loose-envify: "npm:^1.1.0"
checksum: 10c0/283e8c5efcf37802c9d1ce767f302dd569dd97a70d9bb8c7be79a789b9902451e0d16334b05d73299b20f048cbc3c7d288bbbde10b701fa194e2089c237dbea3
"react@npm:^19.0.0":
version: 19.0.0
resolution: "react@npm:19.0.0"
checksum: 10c0/9cad8f103e8e3a16d15cb18a0d8115d8bd9f9e1ce3420310aea381eb42aa0a4f812cf047bb5441349257a05fba8a291515691e3cb51267279b2d2c3253f38471
languageName: node
linkType: hard

Expand Down Expand Up @@ -20168,12 +20157,10 @@ __metadata:
languageName: node
linkType: hard

"scheduler@npm:^0.23.2":
version: 0.23.2
resolution: "scheduler@npm:0.23.2"
dependencies:
loose-envify: "npm:^1.1.0"
checksum: 10c0/26383305e249651d4c58e6705d5f8425f153211aef95f15161c151f7b8de885f24751b377e4a0b3dd42cce09aad3f87a61dab7636859c0d89b7daf1a1e2a5c78
"scheduler@npm:^0.25.0":
version: 0.25.0
resolution: "scheduler@npm:0.25.0"
checksum: 10c0/a4bb1da406b613ce72c1299db43759526058fdcc413999c3c3e0db8956df7633acf395cb20eb2303b6a65d658d66b6585d344460abaee8080b4aa931f10eaafe
languageName: node
linkType: hard

Expand Down Expand Up @@ -22032,8 +22019,8 @@ __metadata:
"@types/eslint__js": "npm:^8.42.3"
"@types/jscodeshift": "npm:^0.12.0"
"@types/node": "npm:^22.0.0"
"@types/react": "npm:^18.3.4"
"@types/react-dom": "npm:^18.3.0"
"@types/react": "npm:^19.0.1"
"@types/react-dom": "npm:^19.0.1"
"@ui5/webcomponents": "npm:2.5.0"
"@ui5/webcomponents-compat": "npm:2.5.0"
"@ui5/webcomponents-fiori": "npm:2.5.0"
Expand Down Expand Up @@ -22067,8 +22054,8 @@ __metadata:
postcss-modules: "npm:^6.0.0"
postcss-nesting: "npm:^13.0.0"
prettier: "npm:^3.0.0"
react: "npm:^18.3.1"
react-dom: "npm:^18.3.1"
react: "npm:^19.0.0"
react-dom: "npm:^19.0.0"
remark-gfm: "npm:^4.0.0"
rimraf: "npm:^6.0.0"
storybook: "npm:8.4.5"
Expand Down

0 comments on commit 243ba13

Please sign in to comment.