Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
75 changes: 75 additions & 0 deletions .changeset/bumpy-melons-give.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
---
"@uifabricshared/foundation-composable": patch
"@fluentui-react-native/experimental-appearance-additions": patch
"@uifabricshared/theming-react-native": patch
"@uifabricshared/foundation-settings": patch
"@fluentui-react-native/experimental-activity-indicator": patch
"@fluentui-react-native/experimental-native-font-metrics": patch
"@uifabricshared/foundation-compose": patch
"@fluentui-react-native/experimental-native-date-picker": patch
"@uifabricshared/foundation-tokens": patch
"@fluentui-react-native/themed-stylesheet": patch
"@uifabricshared/themed-settings": patch
"@fluentui-react-native/contextual-menu": patch
"@uifabricshared/theme-registry": patch
"@fluentui-react-native/vibrancy-view": patch
"@fluentui-react-native/focus-trap-zone": patch
"@fluentui-react-native/notification": patch
"@uifabricshared/theming-ramp": patch
"@fluentui-react-native/experimental-menu-button": patch
"@fluentui-react-native/interactive-hooks": patch
"@fluentui-react-native/persona-coin": patch
"@fluentui-react-native/menu-button": patch
"@fluentui-react-native/radio-group": patch
"@fluentui-react-native/experimental-checkbox": patch
"@fluentui-react-native/dropdown": patch
"@fluentui-react-native/experimental-expander": patch
"@fluentui-react-native/overflow": patch
"@fluentui-react-native/composition": patch
"@fluentui-react-native/use-styling": patch
"@fluentui-react-native/android-theme": patch
"@fluentui-react-native/default-theme": patch
"@fluentui-react-native/theming-utils": patch
"@fluentui-react-native/focus-zone": patch
"@fluentui-react-native/pressable": patch
"@fluentui-react-native/separator": patch
"@fluentui-react-native/popover": patch
"@fluentui-react-native/experimental-shimmer": patch
"@fluentui-react-native/spinner": patch
"@fluentui-react-native/tooltip": patch
"@fluentui-react-native/use-tokens": patch
"@fluentui-react-native/theme-tokens": patch
"@fluentui-react-native/checkbox": patch
"@fluentui-react-native/experimental-avatar": patch
"@fluentui-react-native/drawer": patch
"@fluentui-react-native/experimental-shadow": patch
"@fluentui-react-native/framework": patch
"@fluentui-react-native/use-slots": patch
"@fluentui-react-native/apple-theme": patch
"@fluentui-react-native/theme-types": patch
"@fluentui-react-native/win32-theme": patch
"@fluentui-react-native/callout": patch
"@fluentui-react-native/divider": patch
"@fluentui-react-native/persona": patch
"@fluentui-react-native/tablist": patch
"@fluentui-react-native/use-slot": patch
"@fluentui-react-native/avatar": patch
"@fluentui-react-native/button": patch
"@fluentui-react-native/switch": patch
"@fluentui-react-native/badge": patch
"@fluentui-react-native/input": patch
"@fluentui-react-native/stack": patch
"@fluentui-react-native/chip": patch
"@fluentui-react-native/icon": patch
"@fluentui-react-native/link": patch
"@fluentui-react-native/menu": patch
"@fluentui-react-native/text": patch
"@fluentui-react-native/theme": patch
"@fluentui-react-native/framework-base": patch
"@fluentui/react-native": patch
"@fluentui-react-native/adapters": patch
"@fluentui-react-native/styling-utils": patch
"@fluentui-react-native/tokens": patch
---

Update to the latest rnx-kit versions, fix some typing issues, and correct the vscode settings
5 changes: 4 additions & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
"recommendations": [
// Extension identifier format: ${publisher}.${name}. Example: vscode.csharp
"dbaeumer.vscode-eslint",
"esbenp.prettier-vscode"
// Use the OXC formatter as the default formatter
"oxc.oxc-vscode",
// Use the native typescript preview to run the editor typescript server
"typescriptteam.native-preview"
]
}
22 changes: 7 additions & 15 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@
"editor.codeActionsOnSave": {
"source.fixAll.eslint": "explicit"
},
// Use the OXC formatter as the default formatter which matches what yarn format will do
"editor.defaultFormatter": "oxc.oxc-vscode",

// Prettier settings for those that are still using the prettier extension
"prettier.singleQuote": true,
"prettier.tabWidth": 2,
"prettier.printWidth": 140,
Expand Down Expand Up @@ -46,6 +50,9 @@

"json.format.enable": false,

// enable the native preview for typescript, used to build internally as well
"typescript.experimental.useTsgo": true,

"typescript.preferences.quoteStyle": "single",
"typescript.format.insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces": false,
"typescript.format.insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis": false,
Expand All @@ -58,21 +65,6 @@
"**/lib-commonjs": true,
"**/dist": true
},
"[json]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[jsonc]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[typescript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[typescriptreact]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[javascript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[handlebars]": {
"editor.formatOnSave": false
},
Expand Down
28 changes: 16 additions & 12 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,23 @@ catalog:
"@babel/preset-react": ^7.20.0
"@babel/preset-typescript": ^7.20.0
"@babel/runtime": ^7.20.0
"@rnx-kit/align-deps": ^3.4.0
"@rnx-kit/babel-preset-metro-react-native": ^3.0.1
"@rnx-kit/cli": ^1.0.0
"@rnx-kit/config": ^0.7.4
"@rnx-kit/eslint-plugin": ^0.9.5
"@rnx-kit/align-deps": ^3.4.2
"@rnx-kit/babel-preset-metro-react-native": ^3.0.2
"@rnx-kit/cli": ^1.1.0
"@rnx-kit/config": ^0.7.5
"@rnx-kit/eslint-plugin": ^0.9.8
"@rnx-kit/jest-preset": ^0.3.1
"@rnx-kit/lint-lockfile": ^0.1.2
"@rnx-kit/metro-config": ^2.2.3
"@rnx-kit/lint-lockfile": ^0.1.3
"@rnx-kit/metro-config": ^2.2.4
"@rnx-kit/metro-resolver-symlinks": ^0.2.11
"@rnx-kit/metro-serializer": "^2.0.3"
"@rnx-kit/metro-serializer-esbuild": "^0.3.1"
"@rnx-kit/reporter": ^0.1.0
"@rnx-kit/tools-packages": ^0.1.1
"@rnx-kit/tools-typescript": ^0.1.1
"@rnx-kit/tsconfig": ^2.1.1
"@rnx-kit/tools-packages": ^0.1.2
"@rnx-kit/tools-typescript": ^0.1.3
"@rnx-kit/tsconfig": ^3.0.0
"@rnx-kit/types-kit-config": "^1.0.0"
"@rnx-kit/types-node": "^1.0.0"
"@types/jasmine": 5.1.13
"@types/node": ^22.19.7
"@wdio/appium-service": ^9.24.0
Expand Down Expand Up @@ -213,7 +217,7 @@ catalogs:
metro-core: ^0.83.1
metro-resolver: ^0.83.1
metro-runtime: ^0.83.1
react: 19.1.0
react: 19.1.4
react-dom: ^19.1.0
react-native: ^0.81.0
react-native-base64: ^0.2.1
Expand All @@ -233,7 +237,7 @@ catalogs:
react-native-test-app: ^4.4.11
react-native-webview: ^13.14.1
react-native-windows: ^0.81.0
react-test-renderer: 19.1.0
react-test-renderer: 19.1.4

dynamicPackageExtensions: ./scripts/dynamic.extensions.mjs

Expand Down
12 changes: 6 additions & 6 deletions apps/E2E/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"@rnx-kit/metro-config": "catalog:",
"@types/jasmine": "catalog:",
"@types/node": "catalog:",
"@types/react": "~19.1.0",
"@types/react": "~19.1.4",
"@wdio/appium-service": "catalog:",
"@wdio/cli": "catalog:",
"@wdio/globals": "catalog:",
Expand All @@ -74,8 +74,8 @@
"cross-env": "catalog:",
"expect-webdriverio": "catalog:",
"metro-config": "^0.80.3",
"react": "19.1.0",
"react-native": "^0.81.0",
"react": "19.1.4",
"react-native": "^0.81.6",
"react-native-macos": "^0.81.0",
"react-native-windows": "^0.81.0",
"rimraf": "catalog:",
Expand All @@ -84,9 +84,9 @@
},
"peerDependencies": {
"@office-iss/react-native-win32": "^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.0",
"@types/react": "~18.2.0 || ~19.0.0 || ~19.1.0",
"react": "18.2.0 || 19.0.0 || 19.1.0",
"react-native": "^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.0",
"@types/react": "~18.2.0 || ~19.0.0 || ~19.1.4",
"react": "18.2.0 || 19.0.0 || 19.1.4",
"react-native": "^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.6",
"react-native-macos": "^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.0",
"react-native-windows": "^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.0"
},
Expand Down
18 changes: 9 additions & 9 deletions apps/tester-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
"build-core": "tsgo --outDir lib --module esnext --moduleResolution bundler",
"clean": "fluentui-scripts clean",
"depcheck": "fluentui-scripts depcheck",
"format": "fluentui-scripts format",
"lint": "fluentui-scripts eslint",
"lint-package": "fluentui-scripts lint-package",
"format": "fluentui-scripts format"
"lint-package": "fluentui-scripts lint-package"
},
"dependencies": {
"@fluentui-react-native/adapters": "workspace:*",
Expand Down Expand Up @@ -110,7 +110,7 @@
"@rnx-kit/metro-config": "catalog:",
"@rnx-kit/metro-resolver-symlinks": "catalog:",
"@types/jasmine": "catalog:",
"@types/react": "~19.1.0",
"@types/react": "~19.1.4",
"@types/react-test-renderer": "^19.1.0",
"@wdio/cli": "catalog:",
"@wdio/globals": "catalog:",
Expand All @@ -120,14 +120,14 @@
"expect-webdriverio": "catalog:",
"flow-bin": "^0.113.0",
"metro-config": "^0.80.3",
"react": "19.1.0",
"react-native": "^0.81.0",
"react": "19.1.4",
"react-native": "^0.81.6",
"react-native-macos": "^0.81.0",
"react-native-svg": "^15.12.1",
"react-native-svg-transformer": "^1.0.0",
"react-native-test-app": "^3.9.2",
"react-native-windows": "^0.81.0",
"react-test-renderer": "19.1.0",
"react-test-renderer": "19.1.4",
"webdriverio": "catalog:"
},
"peerDependencies": {
Expand All @@ -146,9 +146,9 @@
"@fluentui-react-native/tooltip": "workspace:*",
"@fluentui-react-native/vibrancy-view": "workspace:*",
"@office-iss/react-native-win32": "^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.0",
"@types/react": "~18.2.0 || ~19.0.0 || ~19.1.0",
"react": "18.2.0 || 19.0.0 || 19.1.0",
"react-native": "^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.0",
"@types/react": "~18.2.0 || ~19.0.0 || ~19.1.4",
"react": "18.2.0 || 19.0.0 || 19.1.4",
"react-native": "^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.6",
"react-native-macos": "^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.0",
"react-native-svg": ">=15.0.0 <15.13.0 || >=15.4.0 <15.13.0 || ^15.11.2 || ^15.12.1",
"react-native-windows": "^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.0"
Expand Down
12 changes: 6 additions & 6 deletions apps/win32-81/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@
"dependencies": {
"@fluentui-react-native/tester-core": "workspace:*",
"@office-iss/react-native-win32": "^0.81.0",
"@types/react": "~19.1.0",
"react": "19.1.0",
"react-native": "^0.81.0",
"@types/react": "~19.1.4",
"react": "19.1.4",
"react-native": "^0.81.6",
"react-native-svg": "^15.12.1"
},
"devDependencies": {
Expand All @@ -62,8 +62,8 @@
"@rnx-kit/cli": "catalog:",
"@rnx-kit/metro-config": "catalog:",
"@rnx-kit/metro-resolver-symlinks": "catalog:",
"@rnx-kit/metro-serializer": "^2.0.3",
"@rnx-kit/metro-serializer-esbuild": "^0.3.0",
"@rnx-kit/metro-serializer": "catalog:",
"@rnx-kit/metro-serializer-esbuild": "catalog:",
"@rnx-kit/tools-react-native": "^2.3.2",
"@types/react-test-renderer": "^19.1.0",
"metro": "^0.83.1",
Expand All @@ -73,7 +73,7 @@
"oxc-resolver": "catalog:",
"react-native-svg-transformer": "^1.0.0",
"react-native-test-app": "^4.4.11",
"react-test-renderer": "19.1.0",
"react-test-renderer": "19.1.4",
"rimraf": "catalog:"
},
"jest": {
Expand Down
2 changes: 1 addition & 1 deletion apps/win32/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"@rnx-kit/cli": "catalog:",
"@rnx-kit/metro-config": "catalog:",
"@rnx-kit/metro-resolver-symlinks": "catalog:",
"@rnx-kit/metro-serializer-esbuild": "^0.3.0",
"@rnx-kit/metro-serializer-esbuild": "catalog:",
"@types/react-test-renderer": "^18.2.0",
"metro-config": "^0.80.3",
"oxc-resolver": "catalog:",
Expand Down
16 changes: 8 additions & 8 deletions packages/components/Avatar/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
"build-core": "tsgo --outDir lib --module esnext --moduleResolution bundler",
"clean": "fluentui-scripts clean",
"depcheck": "fluentui-scripts depcheck",
"format": "fluentui-scripts format",
"lint": "fluentui-scripts eslint",
"lint-package": "fluentui-scripts lint-package",
"format": "fluentui-scripts format",
"test": "fluentui-scripts jest",
"update-snapshots": "fluentui-scripts jest -u"
},
Expand Down Expand Up @@ -58,20 +58,20 @@
"@react-native-community/cli-platform-ios": "^20.0.0",
"@react-native/babel-preset": "^0.81.0",
"@react-native/metro-config": "^0.81.0",
"@types/react": "~19.1.0",
"@types/react": "~19.1.4",
"@types/react-test-renderer": "^19.1.0",
"react": "19.1.0",
"react-native": "^0.81.0",
"react": "19.1.4",
"react-native": "^0.81.6",
"react-native-macos": "^0.81.0",
"react-native-svg": "^15.12.1",
"react-native-windows": "^0.81.0",
"react-test-renderer": "19.1.0"
"react-test-renderer": "19.1.4"
},
"peerDependencies": {
"@office-iss/react-native-win32": "^0.74.0",
"@types/react": "~18.2.0 || ~19.0.0 || ~19.1.0",
"react": "18.2.0 || 19.0.0 || 19.1.0",
"react-native": "^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.0",
"@types/react": "~18.2.0 || ~19.0.0 || ~19.1.4",
"react": "18.2.0 || 19.0.0 || 19.1.4",
"react-native": "^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.6",
"react-native-macos": "^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.0",
"react-native-svg": ">=15.0.0 <15.13.0 || >=15.4.0 <15.13.0 || ^15.11.2 || ^15.12.1",
"react-native-windows": "^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/components/Badge/jest.config.js
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
const { configureReactNativeJest } = require('@fluentui-react-native/jest-config');
module.exports = configureReactNativeJest('windows');
module.exports = configureReactNativeJest('ios');
16 changes: 8 additions & 8 deletions packages/components/Badge/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
"build-core": "tsgo --outDir lib --module esnext --moduleResolution bundler",
"clean": "fluentui-scripts clean",
"depcheck": "fluentui-scripts depcheck",
"format": "fluentui-scripts format",
"lint": "fluentui-scripts eslint",
"lint-package": "fluentui-scripts lint-package",
"format": "fluentui-scripts format",
"test": "fluentui-scripts jest",
"update-snapshots": "fluentui-scripts jest -u"
},
Expand Down Expand Up @@ -57,20 +57,20 @@
"@react-native-community/cli-platform-ios": "^20.0.0",
"@react-native/babel-preset": "^0.81.0",
"@react-native/metro-config": "^0.81.0",
"@types/react": "~19.1.0",
"@types/react": "~19.1.4",
"@types/react-test-renderer": "^19.1.0",
"react": "19.1.0",
"react-native": "^0.81.0",
"react": "19.1.4",
"react-native": "^0.81.6",
"react-native-macos": "^0.81.0",
"react-native-svg": "^15.12.1",
"react-native-windows": "^0.81.0",
"react-test-renderer": "19.1.0"
"react-test-renderer": "19.1.4"
},
"peerDependencies": {
"@office-iss/react-native-win32": "^0.74.0",
"@types/react": "~18.2.0 || ~19.0.0 || ~19.1.0",
"react": "18.2.0 || 19.0.0 || 19.1.0",
"react-native": "^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.0",
"@types/react": "~18.2.0 || ~19.0.0 || ~19.1.4",
"react": "18.2.0 || 19.0.0 || 19.1.4",
"react-native": "^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.6",
"react-native-macos": "^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.0",
"react-native-svg": ">=15.0.0 <15.13.0 || >=15.4.0 <15.13.0 || ^15.11.2 || ^15.12.1",
"react-native-windows": "^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.0"
Expand Down
Loading
Loading