Skip to content

Commit

Permalink
React: Update to v18.3.1 (#90436)
Browse files Browse the repository at this point in the history
* Rebase
Bump react deps to v18.3.1

* yarn dedupe

* Yarn dedupe

* Remove tour-kit (not in trunk anymore)

* Remove references to tour-kit that  slipped in

---------

Co-authored-by: Tim Broddin <tim@wannabes.be>
  • Loading branch information
tyxla and TimBroddin authored Sep 20, 2024
1 parent 58f9c38 commit cd4c07d
Show file tree
Hide file tree
Showing 56 changed files with 557 additions and 403 deletions.
4 changes: 2 additions & 2 deletions apps/blaze-dashboard/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
"debug": "^4.3.4",
"moment": "^2.26.0",
"prop-types": "^15.8.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-redux": "^8.1.3",
"redux": "^4.2.1",
"redux-thunk": "^2.4.2",
Expand Down
4 changes: 2 additions & 2 deletions apps/command-palette-wp-admin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
"@wordpress/i18n": "^5.7.0",
"calypso": "workspace:^",
"i18n-calypso": "workspace:^",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"redux": "^4.2.1"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions apps/happy-blocks/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@
"clsx": "^2.1.1",
"glob": "^7.1.6",
"i18n-calypso": "workspace:^",
"react": "^18.2.0",
"react-dom": "^18.2.0"
"react": "^18.3.1",
"react-dom": "^18.3.1"
},
"devDependencies": {
"@automattic/calypso-apps-builder": "workspace:^",
Expand Down
4 changes: 2 additions & 2 deletions apps/notifications/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
"debug": "^4.3.3",
"i18n-calypso": "workspace:^",
"prop-types": "^15.7.2",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-redux": "^8.1.3",
"redux": "^4.2.1",
"redux-thunk": "^2.4.2",
Expand Down
4 changes: 2 additions & 2 deletions apps/o2-blocks/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
"lodash": "^4.17.21",
"moment": "^2.26.0",
"new-github-issue-url": "^0.2.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"redux": "^4.2.1"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions apps/odyssey-stats/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
"debug": "^4.3.4",
"moment": "^2.26.0",
"prop-types": "^15.8.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-redux": "^8.1.3",
"redux": "^4.2.1",
"redux-thunk": "^2.4.2",
Expand Down
4 changes: 2 additions & 2 deletions apps/wpcom-block-editor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@
"@wordpress/url": "^4.7.0",
"debug": "^4.3.3",
"lodash": "^4.17.21",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"redux": "^4.2.1",
"tinymce": "^5.0.0"
},
Expand Down
6 changes: 3 additions & 3 deletions client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -181,10 +181,10 @@
"prop-types": "^15.7.2",
"qrcode.react": "^3.1.0",
"qs": "^6.9.1",
"react": "^18.2.0",
"react": "^18.3.1",
"react-click-outside": "^3.0.1",
"react-day-picker": "^7.4.10",
"react-dom": "^18.2.0",
"react-dom": "^18.3.1",
"react-element-to-jsx-string": "^15.0.0",
"react-intersection-observer": "^9.4.3",
"react-live": "^4.1.1",
Expand Down Expand Up @@ -242,7 +242,7 @@
"ignore-loader": "^0.1.2",
"pkg-dir": "^5.0.0",
"react-router": "^6.23.1",
"react-test-renderer": "^18.2.0",
"react-test-renderer": "^18.3.1",
"redux-mock-store": "^1.5.4",
"stream-browserify": "^3.0.0"
}
Expand Down
4 changes: 2 additions & 2 deletions desktop/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@
"lodash": "^4.17.21",
"playwright": "^1.37",
"postcss": "^8.4.5",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"webpack": "^5.94.0",
"webpack-cli": "^4.10.0"
},
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -217,8 +217,8 @@
"lottie-web": "^5.9.6",
"moment": "^2.26.0",
"photon": "workspace:^",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-hook-form": "^7.52.2",
"react-intersection-observer": "^9.4.3",
"react-modal": "^3.16.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/block-renderer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
},
"devDependencies": {
"@automattic/calypso-typescript-config": "workspace:^",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"typescript": "^5.3.3"
},
"peerDependencies": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
"watch": "tsc --build ./tsconfig.json --watch"
},
"dependencies": {
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"tslib": "^2.3.0"
},
"devDependencies": {
Expand Down
6 changes: 3 additions & 3 deletions packages/calypso-products/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,12 @@
"devDependencies": {
"@automattic/calypso-typescript-config": "workspace:^",
"@wordpress/data": "^10.7.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"typescript": "^5.3.3"
},
"peerDependencies": {
"@wordpress/data": "^10.7.0",
"react": "^18.2.0"
"react": "^18.3.1"
}
}
4 changes: 2 additions & 2 deletions packages/calypso-razorpay/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
"homepage": "https://github.com/Automattic/wp-calypso/tree/HEAD/packages/calypso-stripe#readme",
"dependencies": {
"debug": "^4.3.3",
"react": "^18.2.0",
"react-dom": "^18.2.0"
"react": "^18.3.1",
"react-dom": "^18.3.1"
},
"devDependencies": {
"@automattic/calypso-typescript-config": "workspace:^",
Expand Down
4 changes: 2 additions & 2 deletions packages/calypso-sentry/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
"dependencies": {
"@automattic/calypso-config": "workspace:^",
"@sentry/react": "^7.54.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"tslib": "^2.3.0"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/calypso-storybook/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
"@storybook/preset-scss": "^1.0.3",
"@storybook/react-webpack5": "^7.6.19",
"css-loader": "^6.11.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"sass-loader": "^12.1.0",
"style-loader": "^1.3.0",
"webpack": "^5.94.0"
Expand Down
4 changes: 2 additions & 2 deletions packages/calypso-stripe/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
"@stripe/react-stripe-js": "^2.1.0",
"@stripe/stripe-js": "^1.53.0",
"debug": "^4.3.3",
"react": "^18.2.0",
"react-dom": "^18.2.0"
"react": "^18.3.1",
"react-dom": "^18.3.1"
},
"devDependencies": {
"@automattic/calypso-typescript-config": "workspace:^",
Expand Down
4 changes: 2 additions & 2 deletions packages/command-palette/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@
},
"peerDependencies": {
"@wordpress/data": "^10.7.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"redux": "^4.2.1"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@
},
"peerDependencies": {
"@wordpress/data": "^10.7.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
"react": "^18.3.1",
"react-dom": "^18.3.1"
},
"devDependencies": {
"@automattic/calypso-build": "workspace:^",
Expand Down
8 changes: 4 additions & 4 deletions packages/composite-checkout/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,12 @@
"@testing-library/jest-dom": "^6.4.5",
"@testing-library/react": "^15.0.7",
"@testing-library/user-event": "^14.5.2",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"typescript": "^5.3.3"
},
"peerDependencies": {
"react": "^18.2.0",
"react-dom": "^18.2.0"
"react": "^18.3.1",
"react-dom": "^18.3.1"
}
}
8 changes: 4 additions & 4 deletions packages/data-stores/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@
"fast-json-stable-stringify": "^2.1.0",
"i18n-calypso": "workspace:^",
"qs": "^6.9.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"redux": "^4.2.1",
"tslib": "^2.3.0",
"use-debounce": "^3.1.0",
Expand All @@ -62,8 +62,8 @@
},
"peerDependencies": {
"@wordpress/data": "^10.7.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
"react": "^18.3.1",
"react-dom": "^18.3.1"
},
"devDependencies": {
"@automattic/calypso-typescript-config": "workspace:^",
Expand Down
8 changes: 4 additions & 4 deletions packages/design-carousel/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
"@automattic/calypso-build": "workspace:^",
"@automattic/calypso-typescript-config": "workspace:^",
"postcss": "^8.4.5",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"redux": "^4.2.1",
"typescript": "^5.3.3",
"webpack": "^5.94.0"
Expand All @@ -54,8 +54,8 @@
"@wordpress/element": "^6.7.0",
"@wordpress/i18n": "^5.7.0",
"debug": "^4.3.3",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"redux": "^4.2.1"
},
"private": true
Expand Down
8 changes: 4 additions & 4 deletions packages/design-picker/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@
"@testing-library/react": "^15.0.7",
"jest": "^29.7.0",
"postcss": "^8.4.5",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"redux": "^4.2.1",
"typescript": "^5.3.3",
"webpack": "^5.94.0"
Expand All @@ -64,8 +64,8 @@
"@wordpress/element": "^6.7.0",
"@wordpress/i18n": "^5.7.0",
"debug": "^4.3.3",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"redux": "^4.2.1"
},
"private": true
Expand Down
8 changes: 4 additions & 4 deletions packages/design-preview/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,17 +45,17 @@
"@automattic/calypso-typescript-config": "workspace:^",
"@testing-library/jest-dom": "^6.4.5",
"@testing-library/react": "^15.0.7",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"typescript": "^5.3.3"
},
"peerDependencies": {
"@wordpress/data": "^10.7.0",
"@wordpress/element": "^6.7.0",
"@wordpress/i18n": "^5.7.0",
"debug": "^4.3.3",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"redux": "^4.2.1"
},
"private": true
Expand Down
6 changes: 3 additions & 3 deletions packages/domain-picker/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,15 @@
"@automattic/calypso-typescript-config": "workspace:^",
"@testing-library/jest-dom": "^6.4.5",
"@testing-library/react": "^15.0.7",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"typescript": "^5.3.3"
},
"peerDependencies": {
"@wordpress/data": "^10.7.0",
"@wordpress/element": "^6.7.0",
"@wordpress/i18n": "^5.7.0",
"react": "^18.2.0",
"react": "^18.3.1",
"redux": "^4.2.1"
},
"private": true
Expand Down
8 changes: 4 additions & 4 deletions packages/domains-table/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@
"@testing-library/react": "^15.0.7",
"jest": "^29.7.0",
"postcss": "^8.4.5",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"resize-observer-polyfill": "^1.5.1",
"typescript": "^5.3.3",
"webpack": "^5.94.0"
Expand All @@ -60,8 +60,8 @@
"@automattic/calypso-router": "workspace:^",
"@wordpress/data": "^10.7.0",
"@wordpress/i18n": "^5.7.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
"react": "^18.3.1",
"react-dom": "^18.3.1"
},
"private": true
}
4 changes: 2 additions & 2 deletions packages/explat-client-react-helpers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@
},
"dependencies": {
"@automattic/explat-client": "workspace:^",
"react": "^18.2.0",
"react": "^18.3.1",
"tslib": ">=2.3.0"
},
"devDependencies": {
"@automattic/calypso-polyfills": "workspace:^",
"@automattic/calypso-typescript-config": "workspace:^",
"@testing-library/react": "^15.0.7",
"jest": "^29.7.0",
"react-dom": "^18.2.0",
"react-dom": "^18.3.1",
"typescript": "^5.3.3"
}
}
4 changes: 2 additions & 2 deletions packages/global-styles/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@
"deepmerge": "^4.3.0",
"i18n-calypso": "workspace:^",
"is-plain-object": "^5.0.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-intersection-observer": "^9.4.3",
"tslib": "^2.3.0",
"wpcom-proxy-request": "workspace:^"
Expand Down
Loading

0 comments on commit cd4c07d

Please sign in to comment.