Skip to content

Commit

Permalink
perform yarn upgrade
Browse files Browse the repository at this point in the history
Align to typescript 4.9.5

update @fortawesome/react-fontawesome to 0.2.x to remove ReactDom warning

Add license check exclusion for playwright-core@1.46.1:
Also took the opportunity to remove a previous exclusion entry that's
no longer relevant

Pin 3PP rimraf to ^5.0.0:
Version ^6.0.0 required node 20, which we have not yet adopted in this
repository

Signed-off-by: Marc Dumais <marc.dumais@ericsson.com>
  • Loading branch information
marcdumais-work committed Aug 27, 2024
1 parent b911f00 commit 77f6b11
Show file tree
Hide file tree
Showing 9 changed files with 3,605 additions and 3,777 deletions.
2 changes: 1 addition & 1 deletion configs/license-check-exclusions.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"npm/npmjs/@types/qs/6.9.10": "Believed to be licensed under MIT. IP ticket under review: https://gitlab.eclipse.org/eclipsefdn/emo-team/iplab/-/issues/13996"
"npm/npmjs/-/playwright-core/1.46.1": "Believed to be license-compatible but still under IP review: https://gitlab.eclipse.org/eclipsefdn/emo-team/iplab/-/issues/15964"
}
15 changes: 7 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,7 @@
},
"homepage": "https://github.com/eclipse-cdt-cloud/theia-trace-extension",
"resolutions": {
"msgpackr": "^1.10.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"@types/react": "^18.0.15",
"@types/react-dom": "^18.0.6"
"msgpackr": "^1.10.1"
},
"devDependencies": {
"@eclipse-dash/nodejs-wrapper": "^0.0.1",
Expand All @@ -61,7 +57,7 @@
"jsonc-parser": "^3.0.0",
"lerna": "^7.0.0",
"prettier": "2.8.8",
"typescript": "4.5.5"
"typescript": "4.9.5"
},
"workspaces": [
"examples/browser",
Expand All @@ -74,6 +70,9 @@
"@emotion/react": "^11.10.5",
"@emotion/styled": "^11.10.5",
"@types/react": "^18.0.15",
"@types/react-dom": "^18.0.6"
"@types/react-dom": "^18.0.6",
"msgpackr": "^1.10.1",
"react": "^18.2.0",
"react-dom": "^18.2.0"
}
}
}
4 changes: 2 additions & 2 deletions packages/base/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
"eslint-plugin-import": "^2.21.2",
"eslint-plugin-no-null": "^1.0.2",
"eslint-plugin-react": "^7.20.0",
"rimraf": "latest",
"typescript": "latest"
"rimraf": "^5.0.0",
"typescript": "4.9.5"
},
"scripts": {
"build": "tsc -b",
Expand Down
10 changes: 5 additions & 5 deletions packages/react-components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"dependencies": {
"@fortawesome/fontawesome-svg-core": "^1.2.17 <1.3.0",
"@fortawesome/free-solid-svg-icons": "^5.8.1",
"@fortawesome/react-fontawesome": "^0.1.4",
"@fortawesome/react-fontawesome": "^0.2.2",
"@mui/material": "^5.10.14",
"@vscode/codicons": "^0.0.29",
"@ag-grid-community/core": "^32.0.1",
Expand All @@ -42,10 +42,10 @@
"tsp-typescript-client": "^0.4.2"
},
"devDependencies": {
"@testing-library/react": "^13.4.0",
"@testing-library/react": "^15.0.6",
"@types/chart.js": "^2.7.52",
"@types/d3": "^7.1.0",
"@types/jest": "^29.0.0",
"@types/jest": "^28.0.0",
"@types/lodash": "^4.14.142",
"@types/react-grid-layout": "^1.1.1",
"@types/react-modal": "^3.8.2",
Expand All @@ -61,9 +61,9 @@
"jest-canvas-mock": "^2.4.0",
"jest-environment-jsdom": "^28.1.3",
"react-test-renderer": "^18.2.0",
"rimraf": "latest",
"rimraf": "^5.0.0",
"ts-jest": "^28.0.8",
"typescript": "latest"
"typescript": "4.9.5"
},
"scripts": {
"build": "tsc -b",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ exports[`<TableOutputComponent /> Renders AG-Grid table with provided props & st
/>
</div>
<div
class="ag-sticky-bottom"
class="ag-sticky-bottom ag-hidden"
role="presentation"
style="height: 0px; bottom: 0px; width: 100%;"
>
Expand Down Expand Up @@ -471,7 +471,6 @@ exports[`<TableOutputComponent /> Renders AG-Grid table with provided props & st
<span
class="ag-paging-row-summary-panel"
role="status"
>
Expand Down Expand Up @@ -551,7 +550,6 @@ exports[`<TableOutputComponent /> Renders AG-Grid table with provided props & st
<span
class="ag-paging-description"
role="status"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,9 @@ export class TooltipXYComponent extends React.Component<unknown, TooltipXYCompon
clearTimeout(this.timerId);
}
this.timerId = setTimeout(() => {
this.setState({ tooltipData, onDisplay: true });
if (tooltipData) {
this.setState({ tooltipData, onDisplay: true });
}
}, 500);

if (this.state.onDisplay) {
Expand Down
2 changes: 1 addition & 1 deletion playwright-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-import": "^2.27.5",
"rimraf": "^2.6.1",
"typescript": "~4.5.5"
"typescript": "4.9.5"
}
}
4 changes: 2 additions & 2 deletions theia-extensions/viewer-prototype/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
"eslint-plugin-import": "^2.21.2",
"eslint-plugin-no-null": "^1.0.2",
"eslint-plugin-react": "^7.20.0",
"rimraf": "latest",
"typescript": "latest"
"rimraf": "^5.0.0",
"typescript": "4.9.5"
},
"scripts": {
"build": "tsc -b",
Expand Down
Loading

0 comments on commit 77f6b11

Please sign in to comment.