Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(deps): upgrade swagger-ui-react v5.17.3, react-dom v18.3.1, and react v18.3.1. Fixes CVEs #13069

Merged
merged 4 commits into from
May 21, 2024
Merged

fix(deps): upgrade swagger-ui-react v5.17.3, react-dom v18.3.1, and react v18.3.1. Fixes CVEs #13069

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1836796
fix(deps): upgrade swagger-ui-react to v5.17.3. Fixes CVEs
terrytangyuan May 20, 2024
dff0910
update react
terrytangyuan May 21, 2024
8d1e349
fix lint
terrytangyuan May 21, 2024
a5fd739
run deduplicate
terrytangyuan May 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,16 @@
"moment": "^2.30.1",
"monaco-editor": "^0.45.0",
"prop-types": "^15.8.1",
"react": "^16.14.0",
"react": "^18.3.1",
"react-chartjs-2": "^2.11.2",
"react-datepicker": "^4.25.0",
"react-dom": "^16.14.0",
"react-dom": "^18.3.1",
Comment on lines +31 to +34
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Followed https://react.dev/blog/2022/03/08/react-18-upgrade-guide

yarn add react react-dom

"react-markdown": "^8.0.7",
"react-monaco-editor": "^0.50.1",
"react-router-dom": "^4.2.2",
"remark-gfm": "^3.0.0",
"superagent": "^8.1.2",
"swagger-ui-react": "^5.10.0"
"swagger-ui-react": "^5.17.3"
},
"devDependencies": {
"@babel/core": "^7.22.11",
Expand All @@ -53,7 +53,7 @@
"@types/react": "^16.8.5",
"@types/react-autocomplete": "^1.8.10",
"@types/react-datepicker": "^4.19.5",
"@types/react-dom": "^16.8.2",
"@types/react-dom": "^18.3.0",
"@types/react-form": "^2.16.1",
"@types/react-helmet": "^6.1.11",
"@types/react-router-dom": "^4.2.3",
Expand Down
6 changes: 4 additions & 2 deletions ui/src/app/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import * as React from 'react';
import * as ReactDOM from 'react-dom';
import {App} from './app';
import {createRoot} from 'react-dom/client';
Comment on lines -2 to +3
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we should leave the import in the same place; the react deps and the external deps were grouped and alphabetized previously.

Suggested change
import * as ReactDOM from 'react-dom';
import {App} from './app';
import {createRoot} from 'react-dom/client';
import {createRoot} from 'react-dom/client';
import {App} from './app';

I've been meaning to add an ESLint or Prettier plugin to auto sort imports for a bit now


ReactDOM.render(<App />, document.getElementById('app'));
const container = document.getElementById('app');
const root = createRoot(container!);
Comment on lines +5 to +6
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
const container = document.getElementById('app');
const root = createRoot(container!);
const root = createRoot(document.getElementById('app')!);

we can probably simplify this, the container var is otherwise unused

root.render(<App />);
Comment on lines +3 to +7
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reference: https://react.dev/blog/2022/03/08/react-18-upgrade-guide#updates-to-client-rendering-apis

Loading
Loading