Skip to content

Commit 9dd14c6

Browse files
authored
chore: migrate to ts 5.7.3 (#35378)
1 parent 3326f93 commit 9dd14c6

File tree

16 files changed

+227
-251
lines changed

16 files changed

+227
-251
lines changed
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "chore: bump tsdoc\" ",
4+
"packageName": "@fluentui/api-docs",
5+
"email": "vgenaev@gmail.com",
6+
"dependentChangeType": "patch"
7+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "chore: update ts-eslint to 8.46.2",
4+
"packageName": "@fluentui/eslint-plugin-react-components",
5+
"email": "vgenaev@gmail.com",
6+
"dependentChangeType": "patch"
7+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "none",
3+
"comment": "chore: fix ts issues",
4+
"packageName": "@fluentui/react-charts",
5+
"email": "vgenaev@gmail.com",
6+
"dependentChangeType": "none"
7+
}

package.json

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@
6767
"@griffel/webpack-loader": "2.2.10",
6868
"@jest/reporters": "29.7.0",
6969
"@mdx-js/loader": "2.3.0",
70-
"@microsoft/api-extractor": "7.49.1",
71-
"@microsoft/api-extractor-model": "7.30.2",
70+
"@microsoft/api-extractor": "7.51.0",
71+
"@microsoft/api-extractor-model": "7.31.2",
7272
"@microsoft/eslint-plugin-sdl": "1.0.1",
7373
"@microsoft/load-themed-styles": "1.10.26",
7474
"@microsoft/loader-load-themed-styles": "2.0.17",
@@ -163,7 +163,8 @@
163163
"@types/webpack-hot-middleware": "2.25.9",
164164
"@types/yargs": "13.0.11",
165165
"@types/yargs-unparser": "2.0.1",
166-
"@typescript-eslint/rule-tester": "8.38.0",
166+
"@typescript-eslint/rule-tester": "8.46.2",
167+
"@typescript-eslint/eslint-plugin": "^8.46.2",
167168
"autoprefixer": "10.2.1",
168169
"babel-jest": "29.7.0",
169170
"babel-loader": "9.1.3",
@@ -316,8 +317,8 @@
316317
"tslib": "2.8.1",
317318
"turndown": "7.2.0",
318319
"turndown-plugin-gfm": "1.0.2",
319-
"typescript": "5.5.2",
320-
"typescript-eslint": "8.38.0",
320+
"typescript": "5.7.3",
321+
"typescript-eslint": "8.46.2",
321322
"vite": "6.3.4",
322323
"webpack": "5.99.8",
323324
"webpack-bundle-analyzer": "4.10.1",
@@ -353,8 +354,8 @@
353354
},
354355
"resolutions": {
355356
"@types/jest-axe/axe-core": "4.7.2",
357+
"@phenomnomnominal/tsquery": "6.1.3",
356358
"esbuild": "0.25.0",
357-
"@microsoft/api-extractor/typescript": "5.5.2",
358359
"swc-loader": "^0.2.6",
359360
"prettier": "2.8.8",
360361
"puppeteer": "19.6.3",

packages/api-docs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"@fluentui/scripts-tasks": "*"
2222
},
2323
"dependencies": {
24-
"@microsoft/api-extractor-model": "7.30.2",
24+
"@microsoft/api-extractor-model": "7.31.2",
2525
"@microsoft/tsdoc": "0.15.1",
2626
"fs-extra": "^8.1.0"
2727
}

packages/charts/react-charts/library/src/components/CommonComponents/CartesianChart.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ export const CartesianChart: React.FunctionComponent<ModifiedCartesianChartProps
4747
const yAxisElementSecondary = React.useRef<SVGSVGElement>();
4848
let margins: IMargins;
4949
const idForGraph: string = 'chart_';
50-
let _reqID: number;
50+
let _reqID: number | undefined;
5151
const _useRtl: boolean = useRtl();
5252
let _tickValues: (string | number)[];
5353
const titleMargin: number = 8;
@@ -146,7 +146,9 @@ export const CartesianChart: React.FunctionComponent<ModifiedCartesianChartProps
146146
setStartFromX(0);
147147
}
148148
return () => {
149-
cancelAnimationFrame(_reqID);
149+
if (_reqID !== undefined) {
150+
cancelAnimationFrame(_reqID);
151+
}
150152
};
151153
}, [props]);
152154

packages/eslint-plugin/package.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
"@griffel/eslint-plugin": "^2.0.0",
1515
"@rnx-kit/eslint-plugin": "^0.8.4",
1616
"@nx/eslint-plugin": "20.8.1",
17-
"@typescript-eslint/type-utils": "^8.38.0",
18-
"@typescript-eslint/utils": "^8.38.0",
17+
"@typescript-eslint/type-utils": "^8.46.2",
18+
"@typescript-eslint/utils": "^8.46.2",
1919
"eslint-config-airbnb": "^18.2.1",
2020
"eslint-config-prettier": "^10.1.8",
2121
"eslint-plugin-react-compiler": "0.0.0-experimental-a97cca1-20240529",
@@ -32,11 +32,12 @@
3232
"globals": "13.24.0",
3333
"jju": "^1.4.0",
3434
"minimatch": "^3.1.2",
35-
"typescript-eslint": "^8.38.0"
35+
"typescript-eslint": "^8.46.2",
36+
"@typescript-eslint/eslint-plugin": "^8.46.2"
3637
},
3738
"peerDependencies": {
3839
"eslint": "^9.0.0",
39-
"typescript": "^4.8.4"
40+
"typescript": "^5.0.0"
4041
},
4142
"files": [
4243
"src"

packages/react-components/eslint-plugin-react-components/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
"eslint-plugin-eslint-plugin": "6.4.0"
1515
},
1616
"dependencies": {
17-
"@typescript-eslint/utils": "^8.38.0",
17+
"@typescript-eslint/utils": "^8.46.2",
1818
"@swc/helpers": "^0.5.1"
1919
},
2020
"peerDependencies": {
21-
"typescript-eslint": "^8.38.0",
21+
"typescript-eslint": "^8.46.2",
2222
"eslint": "^8.0.0",
2323
"typescript": "^5.0.0"
2424
},

packages/react-components/react-utilities/src/hooks/useControllableState.test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ describe('useControllableState', () => {
2424
expect(result.current[0]).toBe(false);
2525

2626
// this will cause console.error to be called
27+
// @ts-expect-error - intentionally passing both state and defaultState to trigger error
2728
rerender({ defaultState: true, state: false, initialState: false });
2829
expect(result.current[0]).toBe(false);
2930
expect(consoleErrorSpy).toHaveBeenCalledTimes(1);

packages/react-components/react-utilities/src/trigger/applyTriggerPropsToChildren.test.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ import { render } from '@testing-library/react';
33
import { applyTriggerPropsToChildren } from './applyTriggerPropsToChildren';
44
import type { FluentTriggerComponent, TriggerProps } from './types';
55

6-
export const TestTrigger: React.FC<TriggerProps & { id?: string }> & FluentTriggerComponent = props => (
7-
<>{props.children}</>
8-
);
6+
export const TestTrigger: React.FC<TriggerProps & { id?: string }> & FluentTriggerComponent = props => {
7+
return props.children as React.ReactElement;
8+
};
99
TestTrigger.displayName = 'TestTrigger';
1010
TestTrigger.isFluentTriggerComponent = true;
1111

0 commit comments

Comments
 (0)