diff --git a/package.json b/package.json index eea8aa6dd75..41b11a9d345 100644 --- a/package.json +++ b/package.json @@ -118,9 +118,9 @@ "@types/papaparse": "5.3.14", "@types/pluralize": "^0.0.33", "@types/prismjs": "1.26.3", - "@types/react": "18.2.15", + "@types/react": "18.2.48", "@types/react-beautiful-dnd": "13.1.8", - "@types/react-dom": "18.2.7", + "@types/react-dom": "18.2.18", "@types/react-grid-layout": "1.3.5", "@types/react-highlight-words": "0.16.7", "@types/react-router-dom": "5.3.3", diff --git a/packages/grafana-data/package.json b/packages/grafana-data/package.json index 6e8eda912dd..4b2c1ed2e86 100644 --- a/packages/grafana-data/package.json +++ b/packages/grafana-data/package.json @@ -78,8 +78,8 @@ "@types/marked": "5.0.2", "@types/node": "20.11.5", "@types/papaparse": "5.3.14", - "@types/react": "18.2.15", - "@types/react-dom": "18.2.7", + "@types/react": "18.2.48", + "@types/react-dom": "18.2.18", "@types/testing-library__jest-dom": "5.14.9", "@types/tinycolor2": "1.4.6", "esbuild": "0.18.12", diff --git a/packages/grafana-flamegraph/package.json b/packages/grafana-flamegraph/package.json index d1e3c704dc9..2134e38441c 100644 --- a/packages/grafana-flamegraph/package.json +++ b/packages/grafana-flamegraph/package.json @@ -67,7 +67,7 @@ "@types/d3": "^7", "@types/jest": "^29.5.4", "@types/lodash": "4.14.202", - "@types/react": "18.2.15", + "@types/react": "18.2.48", "@types/react-virtualized-auto-sizer": "1.0.4", "@types/tinycolor2": "1.4.6", "babel-jest": "29.7.0", diff --git a/packages/grafana-runtime/package.json b/packages/grafana-runtime/package.json index 4b310192dc8..9be4aa525a2 100644 --- a/packages/grafana-runtime/package.json +++ b/packages/grafana-runtime/package.json @@ -59,8 +59,8 @@ "@types/history": "4.7.11", "@types/jest": "29.5.11", "@types/lodash": "4.14.202", - "@types/react": "18.2.15", - "@types/react-dom": "18.2.7", + "@types/react": "18.2.48", + "@types/react-dom": "18.2.18", "@types/systemjs": "6.13.5", "esbuild": "0.18.12", "lodash": "4.17.21", diff --git a/packages/grafana-ui/package.json b/packages/grafana-ui/package.json index 11d4a667582..575777c8654 100644 --- a/packages/grafana-ui/package.json +++ b/packages/grafana-ui/package.json @@ -142,11 +142,11 @@ "@types/mock-raf": "1.0.6", "@types/node": "20.11.5", "@types/prismjs": "1.26.3", - "@types/react": "18.2.15", + "@types/react": "18.2.48", "@types/react-beautiful-dnd": "13.1.8", "@types/react-calendar": "3.9.0", "@types/react-color": "3.0.11", - "@types/react-dom": "18.2.7", + "@types/react-dom": "18.2.18", "@types/react-highlight-words": "0.16.7", "@types/react-router-dom": "5.3.3", "@types/react-table": "7.7.19", diff --git a/packages/grafana-ui/src/components/ErrorBoundary/ErrorBoundary.tsx b/packages/grafana-ui/src/components/ErrorBoundary/ErrorBoundary.tsx index 808ed22c4ca..4c5760a377e 100644 --- a/packages/grafana-ui/src/components/ErrorBoundary/ErrorBoundary.tsx +++ b/packages/grafana-ui/src/components/ErrorBoundary/ErrorBoundary.tsx @@ -1,4 +1,4 @@ -import React, { PureComponent, ReactNode, ComponentType } from 'react'; +import React, { PureComponent, ReactNode, ComponentType, ErrorInfo } from 'react'; import { faro } from '@grafana/faro-web-sdk'; @@ -6,9 +6,7 @@ import { Alert } from '../Alert/Alert'; import { ErrorWithStack } from './ErrorWithStack'; -export interface ErrorInfo { - componentStack: string; -} +export type { ErrorInfo }; export interface ErrorBoundaryApi { error: Error | null; diff --git a/packages/grafana-ui/src/components/ThemeDemos/EmotionPerfTest.tsx b/packages/grafana-ui/src/components/ThemeDemos/EmotionPerfTest.tsx index 46e74b5c08d..3399fff3fc0 100644 --- a/packages/grafana-ui/src/components/ThemeDemos/EmotionPerfTest.tsx +++ b/packages/grafana-ui/src/components/ThemeDemos/EmotionPerfTest.tsx @@ -126,14 +126,7 @@ function NoStyles({ index }: TestComponentProps) { } function MeasureRender({ children, id }: { children: React.ReactNode; id: string }) { - const onRender: ProfilerOnRenderCallback = ( - id: string, - phase: 'mount' | 'update', - actualDuration: number, - baseDuration: number, - startTime: number, - commitTime: number - ) => { + const onRender: ProfilerOnRenderCallback = (id, phase, actualDuration, baseDuration, startTime, commitTime) => { console.log('Profile ' + id, actualDuration); }; diff --git a/public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/Filter.tsx b/public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/Filter.tsx index 3707f29a8ec..eaa0c47e5ac 100644 --- a/public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/Filter.tsx +++ b/public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/Filter.tsx @@ -248,7 +248,6 @@ const Filter = ( width={25} /> - placeholder="Operator" value={item.operation ? { label: item.operation === 'eq' ? '=' : '!=', value: item.operation } : undefined} options={[ { label: '=', value: 'eq' }, diff --git a/public/app/plugins/datasource/azuremonitor/package.json b/public/app/plugins/datasource/azuremonitor/package.json index e7d2375455a..e6db91bc7e3 100644 --- a/public/app/plugins/datasource/azuremonitor/package.json +++ b/public/app/plugins/datasource/azuremonitor/package.json @@ -31,7 +31,7 @@ "@types/lodash": "4.14.202", "@types/node": "20.11.5", "@types/prismjs": "1.26.3", - "@types/react": "18.2.15", + "@types/react": "18.2.48", "@types/testing-library__jest-dom": "5.14.9", "react-select-event": "5.5.1", "ts-node": "10.9.2", diff --git a/public/app/plugins/datasource/grafana-pyroscope-datasource/package.json b/public/app/plugins/datasource/grafana-pyroscope-datasource/package.json index a6ece0d3c5d..eec36d7b736 100644 --- a/public/app/plugins/datasource/grafana-pyroscope-datasource/package.json +++ b/public/app/plugins/datasource/grafana-pyroscope-datasource/package.json @@ -27,8 +27,8 @@ "@types/jest": "29.5.11", "@types/lodash": "4.14.202", "@types/prismjs": "1.26.3", - "@types/react": "18.2.15", - "@types/react-dom": "18.2.7", + "@types/react": "18.2.48", + "@types/react-dom": "18.2.18", "@types/testing-library__jest-dom": "5.14.9", "css-loader": "6.9.1", "jest": "29.7.0", diff --git a/public/app/plugins/datasource/grafana-testdata-datasource/package.json b/public/app/plugins/datasource/grafana-testdata-datasource/package.json index da2cd345004..51d6e0b430d 100644 --- a/public/app/plugins/datasource/grafana-testdata-datasource/package.json +++ b/public/app/plugins/datasource/grafana-testdata-datasource/package.json @@ -25,7 +25,7 @@ "@types/jest": "29.5.11", "@types/lodash": "4.14.202", "@types/node": "20.11.5", - "@types/react": "18.2.15", + "@types/react": "18.2.48", "@types/testing-library__jest-dom": "5.14.9", "ts-node": "10.9.2", "webpack": "5.89.0" diff --git a/public/app/plugins/datasource/parca/package.json b/public/app/plugins/datasource/parca/package.json index d319044e930..169e308c53b 100644 --- a/public/app/plugins/datasource/parca/package.json +++ b/public/app/plugins/datasource/parca/package.json @@ -21,7 +21,7 @@ "@testing-library/react": "14.1.2", "@testing-library/user-event": "14.5.2", "@types/lodash": "4.14.202", - "@types/react": "18.2.15", + "@types/react": "18.2.48", "ts-node": "10.9.2", "webpack": "5.89.0" }, diff --git a/public/app/plugins/datasource/tempo/package.json b/public/app/plugins/datasource/tempo/package.json index 0c22593567f..870157362e6 100644 --- a/public/app/plugins/datasource/tempo/package.json +++ b/public/app/plugins/datasource/tempo/package.json @@ -48,8 +48,8 @@ "@types/lodash": "4.14.202", "@types/node": "20.11.5", "@types/prismjs": "1.26.3", - "@types/react": "18.2.15", - "@types/react-dom": "18.2.7", + "@types/react": "18.2.48", + "@types/react-dom": "18.2.18", "@types/semver": "7.5.6", "@types/uuid": "9.0.7", "glob": "10.3.10", diff --git a/yarn.lock b/yarn.lock index 1c3c94cfecc..e4c2be978d6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2914,7 +2914,7 @@ __metadata: "@types/lodash": "npm:4.14.202" "@types/node": "npm:20.11.5" "@types/prismjs": "npm:1.26.3" - "@types/react": "npm:18.2.15" + "@types/react": "npm:18.2.48" "@types/testing-library__jest-dom": "npm:5.14.9" fast-deep-equal: "npm:^3.1.3" i18next: "npm:^22.0.0" @@ -2951,8 +2951,8 @@ __metadata: "@types/jest": "npm:29.5.11" "@types/lodash": "npm:4.14.202" "@types/prismjs": "npm:1.26.3" - "@types/react": "npm:18.2.15" - "@types/react-dom": "npm:18.2.7" + "@types/react": "npm:18.2.48" + "@types/react-dom": "npm:18.2.18" "@types/testing-library__jest-dom": "npm:5.14.9" css-loader: "npm:6.9.1" fast-deep-equal: "npm:^3.1.3" @@ -2991,7 +2991,7 @@ __metadata: "@types/jest": "npm:29.5.11" "@types/lodash": "npm:4.14.202" "@types/node": "npm:20.11.5" - "@types/react": "npm:18.2.15" + "@types/react": "npm:18.2.48" "@types/testing-library__jest-dom": "npm:5.14.9" lodash: "npm:4.17.21" micro-memoize: "npm:^4.1.2" @@ -3042,7 +3042,7 @@ __metadata: "@testing-library/react": "npm:14.1.2" "@testing-library/user-event": "npm:14.5.2" "@types/lodash": "npm:4.14.202" - "@types/react": "npm:18.2.15" + "@types/react": "npm:18.2.48" lodash: "npm:4.17.21" monaco-editor: "npm:0.34.0" react: "npm:18.2.0" @@ -3084,8 +3084,8 @@ __metadata: "@types/lodash": "npm:4.14.202" "@types/node": "npm:20.11.5" "@types/prismjs": "npm:1.26.3" - "@types/react": "npm:18.2.15" - "@types/react-dom": "npm:18.2.7" + "@types/react": "npm:18.2.48" + "@types/react-dom": "npm:18.2.18" "@types/semver": "npm:7.5.6" "@types/uuid": "npm:9.0.7" buffer: "npm:6.0.3" @@ -3157,8 +3157,8 @@ __metadata: "@types/marked": "npm:5.0.2" "@types/node": "npm:20.11.5" "@types/papaparse": "npm:5.3.14" - "@types/react": "npm:18.2.15" - "@types/react-dom": "npm:18.2.7" + "@types/react": "npm:18.2.48" + "@types/react-dom": "npm:18.2.18" "@types/string-hash": "npm:1.1.3" "@types/testing-library__jest-dom": "npm:5.14.9" "@types/tinycolor2": "npm:1.4.6" @@ -3392,7 +3392,7 @@ __metadata: "@types/d3": "npm:^7" "@types/jest": "npm:^29.5.4" "@types/lodash": "npm:4.14.202" - "@types/react": "npm:18.2.15" + "@types/react": "npm:18.2.48" "@types/react-virtualized-auto-sizer": "npm:1.0.4" "@types/tinycolor2": "npm:1.4.6" babel-jest: "npm:29.7.0" @@ -3491,8 +3491,8 @@ __metadata: "@types/history": "npm:4.7.11" "@types/jest": "npm:29.5.11" "@types/lodash": "npm:4.14.202" - "@types/react": "npm:18.2.15" - "@types/react-dom": "npm:18.2.7" + "@types/react": "npm:18.2.48" + "@types/react-dom": "npm:18.2.18" "@types/systemjs": "npm:6.13.5" esbuild: "npm:0.18.12" history: "npm:4.10.1" @@ -3619,11 +3619,11 @@ __metadata: "@types/mock-raf": "npm:1.0.6" "@types/node": "npm:20.11.5" "@types/prismjs": "npm:1.26.3" - "@types/react": "npm:18.2.15" + "@types/react": "npm:18.2.48" "@types/react-beautiful-dnd": "npm:13.1.8" "@types/react-calendar": "npm:3.9.0" "@types/react-color": "npm:3.0.11" - "@types/react-dom": "npm:18.2.7" + "@types/react-dom": "npm:18.2.18" "@types/react-highlight-words": "npm:0.16.7" "@types/react-router-dom": "npm:5.3.3" "@types/react-table": "npm:7.7.19" @@ -8804,12 +8804,12 @@ __metadata: languageName: node linkType: hard -"@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" +"@types/react-dom@npm:*, @types/react-dom@npm:18.2.18, @types/react-dom@npm:^18.0.0": + version: 18.2.18 + resolution: "@types/react-dom@npm:18.2.18" dependencies: "@types/react": "npm:*" - checksum: 9b70ef66cbe2d2898ea37eb79ee3697e0e4ad3d950e769a601f79be94097d43b8ef45b98a0b29528203c7d731c81666f637b2b7032deeced99214b4bc0662614 + checksum: 4ef7725b4cebd4a32e049097ddfdfd855a178e63ead97ab6d3084872e7d6c1acd71aa923488123cd1015f0e0b11489d2b44f674a1df8fe82d7827eabbec6dbf1 languageName: node linkType: hard @@ -8928,14 +8928,14 @@ __metadata: languageName: node linkType: hard -"@types/react@npm:*, @types/react@npm:18.2.15, @types/react@npm:>=16": - version: 18.2.15 - resolution: "@types/react@npm:18.2.15" +"@types/react@npm:*, @types/react@npm:18.2.48, @types/react@npm:>=16": + version: 18.2.48 + resolution: "@types/react@npm:18.2.48" dependencies: "@types/prop-types": "npm:*" "@types/scheduler": "npm:*" csstype: "npm:^3.0.2" - checksum: 282f3f86f94983ef1af1d66cb552b78131cf3650d29c3080e08a4de8f81489e5b6111c635ad59acf6984ce72281dfcf95004514985b84b5af35898d10414e84f + checksum: 2e56ea6bd821ae96bd943f727a59d85384eaf5f8a3e6fce4fa1d34453e32d8eedda742432b3857fa0de7a4214bf84ce4239757eb52918e76452c00384731e585 languageName: node linkType: hard @@ -17003,9 +17003,9 @@ __metadata: "@types/papaparse": "npm:5.3.14" "@types/pluralize": "npm:^0.0.33" "@types/prismjs": "npm:1.26.3" - "@types/react": "npm:18.2.15" + "@types/react": "npm:18.2.48" "@types/react-beautiful-dnd": "npm:13.1.8" - "@types/react-dom": "npm:18.2.7" + "@types/react-dom": "npm:18.2.18" "@types/react-grid-layout": "npm:1.3.5" "@types/react-highlight-words": "npm:0.16.7" "@types/react-resizable": "npm:3.0.7"