Skip to content

Commit 1b45589

Browse files
JasonVMoCopilot
andauthored
Update various dependencies in the repository (#4167)
* update tool versions to latest * update oxc tools and run new formatter * fix new lint errors * dedupe packages * further lockfile updates * patch non-windows platform CI errors with new RNW version * add changefile * Update Windows PR runner for VS 2026 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Ignore Windows build diagnostic files Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 0c278bc commit 1b45589

18 files changed

Lines changed: 1079 additions & 983 deletions

File tree

.changeset/pretty-kids-start.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"@fluentui-react-native/use-styling": patch
3+
"@fluentui-react-native/tester": patch
4+
---
5+
6+
Update dependency and tool versions

.github/workflows/pr.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ permissions:
55
contents: read
66

77
env:
8-
VisualStudioVersion: '17.0'
8+
VisualStudioVersion: '18.0'
99
WindowsTargetPlatformVersion: '10.0.26100.0'
1010

1111
concurrency:
@@ -166,7 +166,7 @@ jobs:
166166

167167
windows:
168168
name: Windows PR
169-
runs-on: windows-2022
169+
runs-on: windows-latest
170170
timeout-minutes: 60
171171
steps:
172172
- name: Checkout
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
diff --git a/lib-commonjs/commands/healthCheck/healthChecks.js b/lib-commonjs/commands/healthCheck/healthChecks.js
2+
index 885c0a228d061792272e423f0958affeaf9c9299..4acfd4ccf081d50e9c6e08e9225d375500bd76dc 100644
3+
--- a/lib-commonjs/commands/healthCheck/healthChecks.js
4+
+++ b/lib-commonjs/commands/healthCheck/healthChecks.js
5+
@@ -37,7 +37,6 @@ const pathHelpers = __importStar(require("../../utils/pathHelpers"));
6+
const execa_1 = __importDefault(require("execa"));
7+
const find_dotnet_tools_1 = require("@react-native-windows/find-dotnet-tools");
8+
const healthCheckList_1 = require("./healthCheckList");
9+
-const powershell = (0, find_dotnet_tools_1.findPowerShell)();
10+
function getHealthChecks() {
11+
// #8471: There are known cases where the dependencies script will error out.
12+
// Fail gracefully if that happens in the meantime.
13+
@@ -68,6 +67,7 @@ function getHealthChecksUnsafe() {
14+
if (process.platform !== 'win32') {
15+
return undefined;
16+
}
17+
+ const powershell = (0, find_dotnet_tools_1.findPowerShell)();
18+
const rnwDepScriptPath = path_1.default.join(pathHelpers.resolveRnwRoot(process.cwd()), 'Scripts/rnw-dependencies.ps1');
19+
return [
20+
{
21+
diff --git a/lib-commonjs/utils/commandWithProgress.js b/lib-commonjs/utils/commandWithProgress.js
22+
index 0674bea984af02cd0f02ac7959fc017eb94a3619..ffb609527b165771b43e9320dca741cc5df54ae9 100644
23+
--- a/lib-commonjs/utils/commandWithProgress.js
24+
+++ b/lib-commonjs/utils/commandWithProgress.js
25+
@@ -42,9 +42,9 @@ function newSpinner(text) {
26+
return (0, ora_1.default)(options).start();
27+
}
28+
exports.newSpinner = newSpinner;
29+
-const powershell = (0, find_dotnet_tools_1.findPowerShell)();
30+
async function runPowerShellScriptFunction(taskDescription, script, funcName, verbose, errorCategory, useAppxCompatibility = false) {
31+
try {
32+
+ const powershell = (0, find_dotnet_tools_1.findPowerShell)();
33+
const printException = verbose ? '$_;' : '';
34+
const importAppx = useAppxCompatibility
35+
? 'Import-Module Appx -WarningAction SilentlyContinue; '

.yarn/patches/react-native-macos-npm-0.81.2-dabaa9c16d.patch

Lines changed: 0 additions & 22 deletions
This file was deleted.

.yarnrc.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ catalog:
1313
"@fluentui-react-native/design-tokens-macos": ^0.53.0
1414
"@fluentui-react-native/design-tokens-win32": ^0.53.0
1515
"@fluentui-react-native/design-tokens-windows": ^0.53.0
16-
"@rnx-kit/align-deps": ^4.0.1
16+
"@rnx-kit/align-deps": ^4.0.3
1717
"@rnx-kit/babel-preset-metro-react-native": ^4.0.0
18-
"@rnx-kit/cli": ^2.0.1
18+
"@rnx-kit/cli": ^2.0.2
1919
"@rnx-kit/config": ^0.9.0
2020
"@rnx-kit/eslint-plugin": ^0.9.9
2121
"@rnx-kit/jest-preset": ^0.3.2
2222
"@rnx-kit/lint-json": ^0.2.0
23-
"@rnx-kit/lint-lockfile": ^0.2.0
23+
"@rnx-kit/lint-lockfile": ^0.2.1
2424
"@rnx-kit/lint-package": ^0.2.1
2525
"@rnx-kit/metro-config": ^2.2.4
2626
"@rnx-kit/metro-resolver-symlinks": ^0.3.1
@@ -30,8 +30,8 @@ catalog:
3030
"@rnx-kit/reporter": ^0.2.0
3131
"@rnx-kit/tools-packages": ^0.1.3
3232
"@rnx-kit/tools-react-native": ^2.3.8
33-
"@rnx-kit/tools-typescript": ^0.2.0
34-
"@rnx-kit/tools-workspaces": ^0.2.3
33+
"@rnx-kit/tools-typescript": ^0.2.1
34+
"@rnx-kit/tools-workspaces": ^0.2.4
3535
"@rnx-kit/tsconfig": ^3.0.3
3636
"@rnx-kit/types-kit-config": ^1.0.0
3737
"@rnx-kit/types-node": ^1.0.0
@@ -55,7 +55,7 @@ catalog:
5555
expect-webdriverio: ^5.6.1
5656
knip: ^6.12.1
5757
lage: ^2.14.19
58-
oxc-resolver: ^11.17.0
58+
oxc-resolver: ^11.24.0
5959
react-native-test-app: ^5.3.3
6060
rimraf: ^6.1.2
6161
webdriverio: ^9.24.0

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ FluentUI React Native is a javascript component library that provides developers
77
FluentUI React Native is still in the alpha stages of development for both the components and the repo. We encourage anyone who is interested in getting an early glimpse of our plans to download and use our components, but please note that you may hit bumps along the way. Please leave us feedback or file issues if you run into bumps, and we will continue to improve the quality of the repo.
88

99
Development status on each platform:
10-
| Windows | macOS | iOS | Android |
11-
|---------------------|---------------------|-------------|-------------|
10+
11+
| Windows | macOS | iOS | Android |
12+
| ------------------- | ------------------- | ------------------- | ------------------- |
1213
| Alpha (in progress) | Alpha (in progress) | Alpha (in progress) | Alpha (in progress) |
1314

1415
## Getting Started

apps/E2E/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ For each component/scenario you want to test, you will have a page object class
147147
Page Object is a design pattern which has become popular in test automation for enhancing test maintenance and reducing code duplication. A [page object](https://webdriver.io/docs/pageobjects.html) is an object-oriented class that serves as an interface to a page of you testing app. The tests then use the methods of this Page Object whenever they need to interact with the UI of that page.
148148
The benefit is that if the UI changes for the test page, the tests themselves don’t need to change, only the code within the page object needs to change.
149149

150-
Page Objects should be put in apps/E2E/src/_ *ComponentToBeTested* _/pages/.
150+
Page Objects should be put in apps/E2E/src/_ _ComponentToBeTested_ _/pages/.
151151

152152
In most cases, you can copy/paste ButtonPageObject.ts and simply change all instances of Button to your new component.
153153

apps/E2E/wdio.conf.macos.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ const jasmineDefaultTimeout = 60000; // 60 seconds for Jasmine test timeout
77
exports.config = {
88
runner: 'local', // Where should your test be launched
99
specs: [['src/**/specs/*.macos.ts']],
10-
exclude: [
11-
/* 'path/to/excluded/files' */
12-
],
10+
exclude: [/* 'path/to/excluded/files' */],
1311

1412
maxInstances: 30,
1513
capabilities: [

apps/E2E/wdio.conf.windows.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@ exports.config = {
2424
'src/Tokens/specs/*.win.ts',
2525
],
2626
],
27-
exclude: [
28-
/* 'path/to/excluded/files' */
29-
],
27+
exclude: [/* 'path/to/excluded/files' */],
3028

3129
maxInstances: 1,
3230
capabilities: [

0 commit comments

Comments
 (0)