Skip to content

Commit 8a7b549

Browse files
JasonVMoJasonVMo
authored
Bump rnx-kit packages, fix some preset typing issues, and add extensions and settings for vscode to match our tools (#4055)
* update rnx-kit packages, fix type issues, and turn on the right extensions * docs(changeset): Update to the latest rnx-kit versions, fix some typing issues, and correct the vscode settings * fix react-test-renderer version mismatch * fix issue with windows test component embedding the wrong react-test-renderer version
1 parent 64b6580 commit 8a7b549

94 files changed

Lines changed: 1718 additions & 1610 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.changeset/bumpy-melons-give.md‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
---
2+
"@uifabricshared/foundation-composable": patch
3+
"@fluentui-react-native/experimental-appearance-additions": patch
4+
"@uifabricshared/theming-react-native": patch
5+
"@uifabricshared/foundation-settings": patch
6+
"@fluentui-react-native/experimental-activity-indicator": patch
7+
"@fluentui-react-native/experimental-native-font-metrics": patch
8+
"@uifabricshared/foundation-compose": patch
9+
"@fluentui-react-native/experimental-native-date-picker": patch
10+
"@uifabricshared/foundation-tokens": patch
11+
"@fluentui-react-native/themed-stylesheet": patch
12+
"@uifabricshared/themed-settings": patch
13+
"@fluentui-react-native/contextual-menu": patch
14+
"@uifabricshared/theme-registry": patch
15+
"@fluentui-react-native/vibrancy-view": patch
16+
"@fluentui-react-native/focus-trap-zone": patch
17+
"@fluentui-react-native/notification": patch
18+
"@uifabricshared/theming-ramp": patch
19+
"@fluentui-react-native/experimental-menu-button": patch
20+
"@fluentui-react-native/interactive-hooks": patch
21+
"@fluentui-react-native/persona-coin": patch
22+
"@fluentui-react-native/menu-button": patch
23+
"@fluentui-react-native/radio-group": patch
24+
"@fluentui-react-native/experimental-checkbox": patch
25+
"@fluentui-react-native/dropdown": patch
26+
"@fluentui-react-native/experimental-expander": patch
27+
"@fluentui-react-native/overflow": patch
28+
"@fluentui-react-native/composition": patch
29+
"@fluentui-react-native/use-styling": patch
30+
"@fluentui-react-native/android-theme": patch
31+
"@fluentui-react-native/default-theme": patch
32+
"@fluentui-react-native/theming-utils": patch
33+
"@fluentui-react-native/focus-zone": patch
34+
"@fluentui-react-native/pressable": patch
35+
"@fluentui-react-native/separator": patch
36+
"@fluentui-react-native/popover": patch
37+
"@fluentui-react-native/experimental-shimmer": patch
38+
"@fluentui-react-native/spinner": patch
39+
"@fluentui-react-native/tooltip": patch
40+
"@fluentui-react-native/use-tokens": patch
41+
"@fluentui-react-native/theme-tokens": patch
42+
"@fluentui-react-native/checkbox": patch
43+
"@fluentui-react-native/experimental-avatar": patch
44+
"@fluentui-react-native/drawer": patch
45+
"@fluentui-react-native/experimental-shadow": patch
46+
"@fluentui-react-native/framework": patch
47+
"@fluentui-react-native/use-slots": patch
48+
"@fluentui-react-native/apple-theme": patch
49+
"@fluentui-react-native/theme-types": patch
50+
"@fluentui-react-native/win32-theme": patch
51+
"@fluentui-react-native/callout": patch
52+
"@fluentui-react-native/divider": patch
53+
"@fluentui-react-native/persona": patch
54+
"@fluentui-react-native/tablist": patch
55+
"@fluentui-react-native/use-slot": patch
56+
"@fluentui-react-native/avatar": patch
57+
"@fluentui-react-native/button": patch
58+
"@fluentui-react-native/switch": patch
59+
"@fluentui-react-native/badge": patch
60+
"@fluentui-react-native/input": patch
61+
"@fluentui-react-native/stack": patch
62+
"@fluentui-react-native/chip": patch
63+
"@fluentui-react-native/icon": patch
64+
"@fluentui-react-native/link": patch
65+
"@fluentui-react-native/menu": patch
66+
"@fluentui-react-native/text": patch
67+
"@fluentui-react-native/theme": patch
68+
"@fluentui-react-native/framework-base": patch
69+
"@fluentui/react-native": patch
70+
"@fluentui-react-native/adapters": patch
71+
"@fluentui-react-native/styling-utils": patch
72+
"@fluentui-react-native/tokens": patch
73+
---
74+
75+
Update to the latest rnx-kit versions, fix some typing issues, and correct the vscode settings

‎.vscode/extensions.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
"recommendations": [
55
// Extension identifier format: ${publisher}.${name}. Example: vscode.csharp
66
"dbaeumer.vscode-eslint",
7-
"esbenp.prettier-vscode"
7+
// Use the OXC formatter as the default formatter
8+
"oxc.oxc-vscode",
9+
// Use the native typescript preview to run the editor typescript server
10+
"typescriptteam.native-preview"
811
]
912
}

‎.vscode/settings.json‎

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@
77
"editor.codeActionsOnSave": {
88
"source.fixAll.eslint": "explicit"
99
},
10+
// Use the OXC formatter as the default formatter which matches what yarn format will do
11+
"editor.defaultFormatter": "oxc.oxc-vscode",
12+
13+
// Prettier settings for those that are still using the prettier extension
1014
"prettier.singleQuote": true,
1115
"prettier.tabWidth": 2,
1216
"prettier.printWidth": 140,
@@ -46,6 +50,9 @@
4650

4751
"json.format.enable": false,
4852

53+
// enable the native preview for typescript, used to build internally as well
54+
"typescript.experimental.useTsgo": true,
55+
4956
"typescript.preferences.quoteStyle": "single",
5057
"typescript.format.insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces": false,
5158
"typescript.format.insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis": false,
@@ -58,21 +65,6 @@
5865
"**/lib-commonjs": true,
5966
"**/dist": true
6067
},
61-
"[json]": {
62-
"editor.defaultFormatter": "esbenp.prettier-vscode"
63-
},
64-
"[jsonc]": {
65-
"editor.defaultFormatter": "esbenp.prettier-vscode"
66-
},
67-
"[typescript]": {
68-
"editor.defaultFormatter": "esbenp.prettier-vscode"
69-
},
70-
"[typescriptreact]": {
71-
"editor.defaultFormatter": "esbenp.prettier-vscode"
72-
},
73-
"[javascript]": {
74-
"editor.defaultFormatter": "esbenp.prettier-vscode"
75-
},
7668
"[handlebars]": {
7769
"editor.formatOnSave": false
7870
},

‎.yarnrc.yml‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,23 @@ catalog:
88
"@babel/preset-react": ^7.20.0
99
"@babel/preset-typescript": ^7.20.0
1010
"@babel/runtime": ^7.20.0
11-
"@rnx-kit/align-deps": ^3.4.0
12-
"@rnx-kit/babel-preset-metro-react-native": ^3.0.1
13-
"@rnx-kit/cli": ^1.0.0
14-
"@rnx-kit/config": ^0.7.4
15-
"@rnx-kit/eslint-plugin": ^0.9.5
11+
"@rnx-kit/align-deps": ^3.4.2
12+
"@rnx-kit/babel-preset-metro-react-native": ^3.0.2
13+
"@rnx-kit/cli": ^1.1.0
14+
"@rnx-kit/config": ^0.7.5
15+
"@rnx-kit/eslint-plugin": ^0.9.8
1616
"@rnx-kit/jest-preset": ^0.3.1
17-
"@rnx-kit/lint-lockfile": ^0.1.2
18-
"@rnx-kit/metro-config": ^2.2.3
17+
"@rnx-kit/lint-lockfile": ^0.1.3
18+
"@rnx-kit/metro-config": ^2.2.4
1919
"@rnx-kit/metro-resolver-symlinks": ^0.2.11
20+
"@rnx-kit/metro-serializer": "^2.0.3"
21+
"@rnx-kit/metro-serializer-esbuild": "^0.3.1"
2022
"@rnx-kit/reporter": ^0.1.0
21-
"@rnx-kit/tools-packages": ^0.1.1
22-
"@rnx-kit/tools-typescript": ^0.1.1
23-
"@rnx-kit/tsconfig": ^2.1.1
23+
"@rnx-kit/tools-packages": ^0.1.2
24+
"@rnx-kit/tools-typescript": ^0.1.3
25+
"@rnx-kit/tsconfig": ^3.0.0
26+
"@rnx-kit/types-kit-config": "^1.0.0"
27+
"@rnx-kit/types-node": "^1.0.0"
2428
"@types/jasmine": 5.1.13
2529
"@types/node": ^22.19.7
2630
"@wdio/appium-service": ^9.24.0
@@ -213,7 +217,7 @@ catalogs:
213217
metro-core: ^0.83.1
214218
metro-resolver: ^0.83.1
215219
metro-runtime: ^0.83.1
216-
react: 19.1.0
220+
react: 19.1.4
217221
react-dom: ^19.1.0
218222
react-native: ^0.81.0
219223
react-native-base64: ^0.2.1
@@ -233,7 +237,7 @@ catalogs:
233237
react-native-test-app: ^4.4.11
234238
react-native-webview: ^13.14.1
235239
react-native-windows: ^0.81.0
236-
react-test-renderer: 19.1.0
240+
react-test-renderer: 19.1.4
237241

238242
dynamicPackageExtensions: ./scripts/dynamic.extensions.mjs
239243

‎apps/E2E/package.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
"@rnx-kit/metro-config": "catalog:",
5757
"@types/jasmine": "catalog:",
5858
"@types/node": "catalog:",
59-
"@types/react": "~19.1.0",
59+
"@types/react": "~19.1.4",
6060
"@wdio/appium-service": "catalog:",
6161
"@wdio/cli": "catalog:",
6262
"@wdio/globals": "catalog:",
@@ -74,8 +74,8 @@
7474
"cross-env": "catalog:",
7575
"expect-webdriverio": "catalog:",
7676
"metro-config": "^0.80.3",
77-
"react": "19.1.0",
78-
"react-native": "^0.81.0",
77+
"react": "19.1.4",
78+
"react-native": "^0.81.6",
7979
"react-native-macos": "^0.81.0",
8080
"react-native-windows": "^0.81.0",
8181
"rimraf": "catalog:",
@@ -84,9 +84,9 @@
8484
},
8585
"peerDependencies": {
8686
"@office-iss/react-native-win32": "^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.0",
87-
"@types/react": "~18.2.0 || ~19.0.0 || ~19.1.0",
88-
"react": "18.2.0 || 19.0.0 || 19.1.0",
89-
"react-native": "^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.0",
87+
"@types/react": "~18.2.0 || ~19.0.0 || ~19.1.4",
88+
"react": "18.2.0 || 19.0.0 || 19.1.4",
89+
"react-native": "^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.6",
9090
"react-native-macos": "^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.0",
9191
"react-native-windows": "^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.0"
9292
},

‎apps/tester-core/package.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
"build-core": "tsgo --outDir lib --module esnext --moduleResolution bundler",
2929
"clean": "fluentui-scripts clean",
3030
"depcheck": "fluentui-scripts depcheck",
31+
"format": "fluentui-scripts format",
3132
"lint": "fluentui-scripts eslint",
32-
"lint-package": "fluentui-scripts lint-package",
33-
"format": "fluentui-scripts format"
33+
"lint-package": "fluentui-scripts lint-package"
3434
},
3535
"dependencies": {
3636
"@fluentui-react-native/adapters": "workspace:*",
@@ -110,7 +110,7 @@
110110
"@rnx-kit/metro-config": "catalog:",
111111
"@rnx-kit/metro-resolver-symlinks": "catalog:",
112112
"@types/jasmine": "catalog:",
113-
"@types/react": "~19.1.0",
113+
"@types/react": "~19.1.4",
114114
"@types/react-test-renderer": "^19.1.0",
115115
"@wdio/cli": "catalog:",
116116
"@wdio/globals": "catalog:",
@@ -120,14 +120,14 @@
120120
"expect-webdriverio": "catalog:",
121121
"flow-bin": "^0.113.0",
122122
"metro-config": "^0.80.3",
123-
"react": "19.1.0",
124-
"react-native": "^0.81.0",
123+
"react": "19.1.4",
124+
"react-native": "^0.81.6",
125125
"react-native-macos": "^0.81.0",
126126
"react-native-svg": "^15.12.1",
127127
"react-native-svg-transformer": "^1.0.0",
128128
"react-native-test-app": "^3.9.2",
129129
"react-native-windows": "^0.81.0",
130-
"react-test-renderer": "19.1.0",
130+
"react-test-renderer": "19.1.4",
131131
"webdriverio": "catalog:"
132132
},
133133
"peerDependencies": {
@@ -146,9 +146,9 @@
146146
"@fluentui-react-native/tooltip": "workspace:*",
147147
"@fluentui-react-native/vibrancy-view": "workspace:*",
148148
"@office-iss/react-native-win32": "^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.0",
149-
"@types/react": "~18.2.0 || ~19.0.0 || ~19.1.0",
150-
"react": "18.2.0 || 19.0.0 || 19.1.0",
151-
"react-native": "^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.0",
149+
"@types/react": "~18.2.0 || ~19.0.0 || ~19.1.4",
150+
"react": "18.2.0 || 19.0.0 || 19.1.4",
151+
"react-native": "^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.6",
152152
"react-native-macos": "^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.0",
153153
"react-native-svg": ">=15.0.0 <15.13.0 || >=15.4.0 <15.13.0 || ^15.11.2 || ^15.12.1",
154154
"react-native-windows": "^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.0"

‎apps/win32-81/package.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@
3939
"dependencies": {
4040
"@fluentui-react-native/tester-core": "workspace:*",
4141
"@office-iss/react-native-win32": "^0.81.0",
42-
"@types/react": "~19.1.0",
43-
"react": "19.1.0",
44-
"react-native": "^0.81.0",
42+
"@types/react": "~19.1.4",
43+
"react": "19.1.4",
44+
"react-native": "^0.81.6",
4545
"react-native-svg": "^15.12.1"
4646
},
4747
"devDependencies": {
@@ -62,8 +62,8 @@
6262
"@rnx-kit/cli": "catalog:",
6363
"@rnx-kit/metro-config": "catalog:",
6464
"@rnx-kit/metro-resolver-symlinks": "catalog:",
65-
"@rnx-kit/metro-serializer": "^2.0.3",
66-
"@rnx-kit/metro-serializer-esbuild": "^0.3.0",
65+
"@rnx-kit/metro-serializer": "catalog:",
66+
"@rnx-kit/metro-serializer-esbuild": "catalog:",
6767
"@rnx-kit/tools-react-native": "^2.3.2",
6868
"@types/react-test-renderer": "^19.1.0",
6969
"metro": "^0.83.1",
@@ -73,7 +73,7 @@
7373
"oxc-resolver": "catalog:",
7474
"react-native-svg-transformer": "^1.0.0",
7575
"react-native-test-app": "^4.4.11",
76-
"react-test-renderer": "19.1.0",
76+
"react-test-renderer": "19.1.4",
7777
"rimraf": "catalog:"
7878
},
7979
"jest": {

‎apps/win32/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
"@rnx-kit/cli": "catalog:",
6363
"@rnx-kit/metro-config": "catalog:",
6464
"@rnx-kit/metro-resolver-symlinks": "catalog:",
65-
"@rnx-kit/metro-serializer-esbuild": "^0.3.0",
65+
"@rnx-kit/metro-serializer-esbuild": "catalog:",
6666
"@types/react-test-renderer": "^18.2.0",
6767
"metro-config": "^0.80.3",
6868
"oxc-resolver": "catalog:",

‎packages/components/Avatar/package.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
"build-core": "tsgo --outDir lib --module esnext --moduleResolution bundler",
2828
"clean": "fluentui-scripts clean",
2929
"depcheck": "fluentui-scripts depcheck",
30+
"format": "fluentui-scripts format",
3031
"lint": "fluentui-scripts eslint",
3132
"lint-package": "fluentui-scripts lint-package",
32-
"format": "fluentui-scripts format",
3333
"test": "fluentui-scripts jest",
3434
"update-snapshots": "fluentui-scripts jest -u"
3535
},
@@ -58,20 +58,20 @@
5858
"@react-native-community/cli-platform-ios": "^20.0.0",
5959
"@react-native/babel-preset": "^0.81.0",
6060
"@react-native/metro-config": "^0.81.0",
61-
"@types/react": "~19.1.0",
61+
"@types/react": "~19.1.4",
6262
"@types/react-test-renderer": "^19.1.0",
63-
"react": "19.1.0",
64-
"react-native": "^0.81.0",
63+
"react": "19.1.4",
64+
"react-native": "^0.81.6",
6565
"react-native-macos": "^0.81.0",
6666
"react-native-svg": "^15.12.1",
6767
"react-native-windows": "^0.81.0",
68-
"react-test-renderer": "19.1.0"
68+
"react-test-renderer": "19.1.4"
6969
},
7070
"peerDependencies": {
7171
"@office-iss/react-native-win32": "^0.74.0",
72-
"@types/react": "~18.2.0 || ~19.0.0 || ~19.1.0",
73-
"react": "18.2.0 || 19.0.0 || 19.1.0",
74-
"react-native": "^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.0",
72+
"@types/react": "~18.2.0 || ~19.0.0 || ~19.1.4",
73+
"react": "18.2.0 || 19.0.0 || 19.1.4",
74+
"react-native": "^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.6",
7575
"react-native-macos": "^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.0",
7676
"react-native-svg": ">=15.0.0 <15.13.0 || >=15.4.0 <15.13.0 || ^15.11.2 || ^15.12.1",
7777
"react-native-windows": "^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.0"

‎packages/components/Badge/jest.config.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
const { configureReactNativeJest } = require('@fluentui-react-native/jest-config');
2-
module.exports = configureReactNativeJest('windows');
2+
module.exports = configureReactNativeJest('ios');

0 commit comments

Comments
 (0)