Skip to content

Commit

Permalink
Upgrade @types/react to v18.x latest (#1927)
Browse files Browse the repository at this point in the history
## Which problem is this PR solving?
- part of: #998

## Description of the changes
- This PR upgrades the `@types/react` dep to v18 latest

## How was this change tested?
- yarn lint

## Checklist
- [x] I have read
https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md
- [x] I have signed all commits
- [x] I have added unit tests for the new functionality
- [x] I have run lint and test steps successfully
  - for `jaeger`: `make lint test`
  - for `jaeger-ui`: `yarn lint` and `yarn test`

Signed-off-by: Ansh Goyal <[email protected]>
  • Loading branch information
anshgoyalevil authored Nov 1, 2023
1 parent 3bc6b9a commit 7b5074e
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 9 deletions.
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@
},
"resolutions": {
"**/lodash": "4.17.21",
"**/@types/react": "16.14.35",
"**/@types/react-dom": "16.9.18"
"**/@types/react": "18.2.33"
},
"workspaces": {
"packages": [
Expand Down
2 changes: 1 addition & 1 deletion packages/jaeger-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"@babel/preset-typescript": "^7.21.0",
"@testing-library/jest-dom": "^6.0.0",
"@testing-library/react": "^14.0.0",
"@types/react": "16.14.35",
"@types/react": "^18.2.33",
"@types/react-window": "^1.8.0",
"@types/redux-form": "^8.3.5",
"@types/rollup-plugin-visualizer": "^4.2.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export const _onCell = (dataIndex: string) => (row: TRow) => {
};

// exported for tests
export const _onFilter = (dataIndex: string) => (value: string | number | boolean, row: TRow) => {
export const _onFilter = (dataIndex: string) => (value: React.Key | boolean, row: TRow) => {
const data = row[dataIndex];
if (typeof data === 'object' && !Array.isArray(data) && typeof data.value === 'string') {
return data.value === value;
Expand Down
2 changes: 1 addition & 1 deletion packages/plexus/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
"@babel/preset-env": "7.23.2",
"@babel/preset-react": "7.22.15",
"@babel/preset-typescript": "7.23.2",
"@types/react": "16.8.7",
"@types/d3-zoom": "3.0.6",
"@types/react": "^18.2.33",
"@types/react-dom": "18.2.5",
"@typescript-eslint/eslint-plugin": "^6.4.0",
"@typescript-eslint/parser": "^6.4.0",
Expand Down
1 change: 1 addition & 0 deletions packages/plexus/src/Digraph/HtmlLayer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ type TProps<T = {}, U = {}> = Record<string, unknown> &
graphState: TExposedGraphState<T, U>;
standalone?: boolean;
topLayer?: boolean;
children: React.ReactNode;
};

const STYLE: React.CSSProperties = { left: 0, position: 'absolute', top: 0 };
Expand Down
1 change: 1 addition & 0 deletions packages/plexus/src/Digraph/SvgLayer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ type TProps<T = {}, U = {}> = Record<string, unknown> &
graphState: TExposedGraphState<T, U>;
standalone?: boolean;
topLayer?: boolean;
children: React.ReactNode;
};

const STYLE: React.CSSProperties = {
Expand Down
9 changes: 5 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2736,10 +2736,11 @@
dependencies:
"@types/react" "*"

"@types/react@*", "@types/[email protected]", "@types/[email protected]", "@types/react@^16":
version "16.14.35"
resolved "https://registry.yarnpkg.com/@types/react/-/react-16.14.35.tgz#9d3cf047d85aca8006c4776693124a5be90ee429"
integrity sha512-NUEiwmSS1XXtmBcsm1NyRRPYjoZF2YTE89/5QiLt5mlGffYK9FQqOKuOLuXNrjPQV04oQgaZG+Yq02ZfHoFyyg==
"@types/react@*", "@types/[email protected]", "@types/react@^18.2.33":
version "18.2.33"
resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.33.tgz#055356243dc4350a9ee6c6a2c07c5cae12e38877"
integrity sha512-v+I7S+hu3PIBoVkKGpSYYpiBT1ijqEzWpzQD62/jm4K74hPpSP7FF9BnKG6+fg2+62weJYkkBWDJlZt5JO/9hg==

dependencies:
"@types/prop-types" "*"
"@types/scheduler" "*"
Expand Down

0 comments on commit 7b5074e

Please sign in to comment.