Skip to content

Commit 7a51d62

Browse files
committed
Merge commit '37d9a7f7e6238f8cb1ab7541b75b252b87db4a50'
2 parents ed68176 + 3cfa23f commit 7a51d62

File tree

7 files changed

+13
-11
lines changed

7 files changed

+13
-11
lines changed

base/.eslintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ module.exports = {
1616
'../../../configs/base.eslintrc.json',
1717
'../../../configs/warnings.eslintrc.json',
1818
'../../../configs/errors.eslintrc.json',
19-
"prettier"
19+
'prettier'
2020
],
2121
ignorePatterns: [
2222
'node_modules',

base/package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,13 @@
1919
"tsp-typescript-client": "^0.7.0"
2020
},
2121
"devDependencies": {
22-
"@typescript-eslint/eslint-plugin": "^3.4.0",
23-
"@typescript-eslint/parser": "^3.4.0",
24-
"eslint": "^7.3.0",
22+
"@typescript-eslint/eslint-plugin": "^6.0.0",
23+
"@typescript-eslint/parser": "^6.0.0",
24+
"eslint": "^8.43.0",
2525
"eslint-plugin-import": "^2.21.2",
2626
"eslint-plugin-no-null": "^1.0.2",
2727
"eslint-plugin-react": "^7.20.0",
28+
"eslint-config-prettier": "^9.0.0",
2829
"prettier": "^3.6.2",
2930
"rimraf": "^5.0.0",
3031
"typescript": "4.9.5"

react-components/.eslintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ module.exports = {
2020
'../../../configs/base.eslintrc.json',
2121
'../../../configs/warnings.eslintrc.json',
2222
'../../../configs/errors.eslintrc.json',
23-
"prettier"
23+
'prettier'
2424
],
2525
ignorePatterns: [
2626
'node_modules',

react-components/package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,13 @@
4949
"@types/react-modal": "^3.8.2",
5050
"@types/react-test-renderer": "^18.3.0",
5151
"@types/react-virtualized": "^9.21.1",
52-
"@typescript-eslint/eslint-plugin": "^3.4.0",
53-
"@typescript-eslint/parser": "^3.4.0",
54-
"eslint": "^7.3.0",
52+
"@typescript-eslint/eslint-plugin": "^6.0.0",
53+
"@typescript-eslint/parser": "^6.0.0",
54+
"eslint": "^8.43.0",
5555
"eslint-plugin-import": "^2.21.2",
5656
"eslint-plugin-no-null": "^1.0.2",
5757
"eslint-plugin-react": "^7.20.0",
58+
"eslint-config-prettier": "^9.0.0",
5859
"jest": "^28.1.3",
5960
"jest-canvas-mock": "^2.4.0",
6061
"jest-environment-jsdom": "^28.1.3",

react-components/src/components/data-providers/tsp-data-provider.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ export class TspDataProvider {
296296
start: annotation.time - chartStart,
297297
end: annotation.time + annotation.duration - chartStart
298298
},
299-
label: annotation.label,
299+
label: annotation.label ?? '',
300300
data: {
301301
style: annotation.style
302302
}

react-components/src/components/utils/unit-controller-history-handler.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ export class UnitControllerHistoryHandler {
8484
let oneIsDifferent = false;
8585
const { selectionRange: itemSR, viewRange: itemVR } = item;
8686
const { selectionRange: prevSR, viewRange: prevVR } = this.history[this.index];
87-
const check = (value1: BigInt | undefined, value2: BigInt | undefined) => {
87+
const check = (value1: bigint | undefined, value2: bigint | undefined) => {
8888
if (oneIsDifferent) {
8989
return;
9090
}

react-components/src/trace-explorer/trace-explorer-views-widget.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ export class ReactAvailableViewsWidget extends React.Component<ReactAvailableVie
300300
private handleCustomizeClick = async (entry: OutputDescriptor, e: React.MouseEvent) => {
301301
e.stopPropagation();
302302
if (this.props.onCustomizationClick && this._selectedExperiment) {
303-
await this.props.onCustomizationClick(entry, this._selectedExperiment);
303+
this.props.onCustomizationClick(entry, this._selectedExperiment);
304304
this.updateAvailableViews();
305305
}
306306
};

0 commit comments

Comments
 (0)