From cd1b53ead15baadf229cbd9b17563c91ead7af6c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 14 Jul 2023 12:11:26 +0300 Subject: [PATCH] Update react monorepo (#71552) * Update react monorepo * dedupe packages + fix type errors --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Ashley Harrison --- package.json | 4 +- packages/grafana-data/package.json | 4 +- packages/grafana-runtime/package.json | 4 +- packages/grafana-ui/package.json | 4 +- .../src/components/Dropdown/ButtonSelect.tsx | 2 +- .../src/components/Tooltip/Popover.tsx | 2 +- yarn.lock | 49 ++++++++----------- 7 files changed, 30 insertions(+), 39 deletions(-) diff --git a/package.json b/package.json index 6f816430f8c..5ea07eaf306 100644 --- a/package.json +++ b/package.json @@ -146,9 +146,9 @@ "@types/papaparse": "5.3.7", "@types/pluralize": "^0.0.29", "@types/prismjs": "1.26.0", - "@types/react": "18.0.28", + "@types/react": "18.2.15", "@types/react-beautiful-dnd": "13.1.3", - "@types/react-dom": "18.0.11", + "@types/react-dom": "18.2.7", "@types/react-grid-layout": "1.3.2", "@types/react-highlight-words": "0.16.4", "@types/react-redux": "7.1.25", diff --git a/packages/grafana-data/package.json b/packages/grafana-data/package.json index e102c1bc4fe..f9afc4726d3 100644 --- a/packages/grafana-data/package.json +++ b/packages/grafana-data/package.json @@ -77,8 +77,8 @@ "@types/marked": "4.0.8", "@types/node": "18.16.16", "@types/papaparse": "5.3.7", - "@types/react": "18.0.28", - "@types/react-dom": "18.0.11", + "@types/react": "18.2.15", + "@types/react-dom": "18.2.7", "@types/sinon": "10.0.13", "@types/testing-library__jest-dom": "5.14.5", "@types/tinycolor2": "1.4.3", diff --git a/packages/grafana-runtime/package.json b/packages/grafana-runtime/package.json index 262253256a6..4dce798898f 100644 --- a/packages/grafana-runtime/package.json +++ b/packages/grafana-runtime/package.json @@ -58,8 +58,8 @@ "@types/history": "4.7.11", "@types/jest": "29.2.3", "@types/lodash": "4.14.191", - "@types/react": "18.0.28", - "@types/react-dom": "18.0.11", + "@types/react": "18.2.15", + "@types/react-dom": "18.2.7", "@types/systemjs": "^0.20.6", "esbuild": "0.18.6", "lodash": "4.17.21", diff --git a/packages/grafana-ui/package.json b/packages/grafana-ui/package.json index daeac7c5d03..22894f04a94 100644 --- a/packages/grafana-ui/package.json +++ b/packages/grafana-ui/package.json @@ -147,11 +147,11 @@ "@types/mock-raf": "1.0.3", "@types/node": "18.16.16", "@types/prismjs": "1.26.0", - "@types/react": "18.0.28", + "@types/react": "18.2.15", "@types/react-beautiful-dnd": "13.1.3", "@types/react-calendar": "3.9.0", "@types/react-color": "3.0.6", - "@types/react-dom": "18.0.11", + "@types/react-dom": "18.2.7", "@types/react-highlight-words": "0.16.4", "@types/react-router-dom": "5.3.3", "@types/react-table": "7.7.14", diff --git a/packages/grafana-ui/src/components/Dropdown/ButtonSelect.tsx b/packages/grafana-ui/src/components/Dropdown/ButtonSelect.tsx index 131b00e920e..1cbd25e54ec 100644 --- a/packages/grafana-ui/src/components/Dropdown/ButtonSelect.tsx +++ b/packages/grafana-ui/src/components/Dropdown/ButtonSelect.tsx @@ -64,7 +64,7 @@ const ButtonSelectComponent = (props: Props) => { tabIndex=-1 is needed here to support highlighting text within the menu when using FocusScope see https://github.com/adobe/react-spectrum/issues/1604#issuecomment-781574668 */} - + {options.map((item) => ( JSX.Element; -interface Props extends React.HTMLAttributes { +interface Props extends Omit, 'content'> { show: boolean; placement?: Placement; content: PopoverContent; diff --git a/yarn.lock b/yarn.lock index 25b8ecf41b5..a1d197b7b2b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3739,8 +3739,8 @@ __metadata: "@types/marked": 4.0.8 "@types/node": 18.16.16 "@types/papaparse": 5.3.7 - "@types/react": 18.0.28 - "@types/react-dom": 18.0.11 + "@types/react": 18.2.15 + "@types/react-dom": 18.2.7 "@types/sinon": 10.0.13 "@types/string-hash": 1.1.1 "@types/testing-library__jest-dom": 5.14.5 @@ -4012,8 +4012,8 @@ __metadata: "@types/history": 4.7.11 "@types/jest": 29.2.3 "@types/lodash": 4.14.191 - "@types/react": 18.0.28 - "@types/react-dom": 18.0.11 + "@types/react": 18.2.15 + "@types/react-dom": 18.2.7 "@types/systemjs": ^0.20.6 esbuild: 0.18.6 history: 4.10.1 @@ -4154,11 +4154,11 @@ __metadata: "@types/mock-raf": 1.0.3 "@types/node": 18.16.16 "@types/prismjs": 1.26.0 - "@types/react": 18.0.28 + "@types/react": 18.2.15 "@types/react-beautiful-dnd": 13.1.3 "@types/react-calendar": 3.9.0 "@types/react-color": 3.0.6 - "@types/react-dom": 18.0.11 + "@types/react-dom": 18.2.7 "@types/react-highlight-words": 0.16.4 "@types/react-router-dom": 5.3.3 "@types/react-table": 7.7.14 @@ -10415,21 +10415,12 @@ __metadata: languageName: node linkType: hard -"@types/react-dom@npm:*": - version: 17.0.10 - resolution: "@types/react-dom@npm:17.0.10" - dependencies: - "@types/react": "*" - checksum: cc7d8d5b77ee2f3b989c107abd8ec0f2460ba1b1ee6e6d637124e1939594b5619fa4166ef0ea7632a69b68358e0b71aa618de446ccc416dcc0017175549da601 - languageName: node - linkType: hard - -"@types/react-dom@npm:18.0.11, @types/react-dom@npm:^18.0.0": - version: 18.0.11 - resolution: "@types/react-dom@npm:18.0.11" +"@types/react-dom@npm:*, @types/react-dom@npm:18.2.7, @types/react-dom@npm:^18.0.0": + version: 18.2.7 + resolution: "@types/react-dom@npm:18.2.7" dependencies: "@types/react": "*" - checksum: 579691e4d5ec09688087568037c35edf8cfb1ab3e07f6c60029280733ee7b5c06d66df6fcc90786702c93ac8cb13bc7ff16c79ddfc75d082938fbaa36e1cdbf4 + checksum: e02ea908289a7ad26053308248d2b87f6aeafd73d0e2de2a3d435947bcea0422599016ffd1c3e38ff36c42f5e1c87c7417f05b0a157e48649e4a02f21727d54f languageName: node linkType: hard @@ -10569,25 +10560,25 @@ __metadata: languageName: node linkType: hard -"@types/react@npm:*, @types/react@npm:18.0.28": - version: 18.0.28 - resolution: "@types/react@npm:18.0.28" +"@types/react@npm:*, @types/react@npm:18.2.15, @types/react@npm:>=16": + version: 18.2.15 + resolution: "@types/react@npm:18.2.15" dependencies: "@types/prop-types": "*" "@types/scheduler": "*" csstype: ^3.0.2 - checksum: e752df961105e5127652460504785897ca6e77259e0da8f233f694f9e8f451cde7fa0709d4456ade0ff600c8ce909cfe29f9b08b9c247fa9b734e126ec53edd7 + checksum: 36989f638201bfe2f4110b06c119180f6df9c0e13d7060481e82e7a745f81745a01ae543c478a25b61e0767cb52e82da2ad5b0dedacabf99339e523d06176705 languageName: node linkType: hard -"@types/react@npm:>=16": - version: 18.0.33 - resolution: "@types/react@npm:18.0.33" +"@types/react@npm:18.0.28": + version: 18.0.28 + resolution: "@types/react@npm:18.0.28" dependencies: "@types/prop-types": "*" "@types/scheduler": "*" csstype: ^3.0.2 - checksum: 4fbd2b2b6a26378bdfde121081a6406ec2d39e4ba87ea5f6897ab7bb2198713165e6fd703ad4ed7ba1d4f23ef54a4c9f108f3105c7ed8e136411ee6bdebc5669 + checksum: e752df961105e5127652460504785897ca6e77259e0da8f233f694f9e8f451cde7fa0709d4456ade0ff600c8ce909cfe29f9b08b9c247fa9b734e126ec53edd7 languageName: node linkType: hard @@ -19306,9 +19297,9 @@ __metadata: "@types/papaparse": 5.3.7 "@types/pluralize": ^0.0.29 "@types/prismjs": 1.26.0 - "@types/react": 18.0.28 + "@types/react": 18.2.15 "@types/react-beautiful-dnd": 13.1.3 - "@types/react-dom": 18.0.11 + "@types/react-dom": 18.2.7 "@types/react-grid-layout": 1.3.2 "@types/react-highlight-words": 0.16.4 "@types/react-redux": 7.1.25