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
6 changes: 6 additions & 0 deletions .changeset/pretty-kids-start.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@fluentui-react-native/use-styling": patch
"@fluentui-react-native/tester": patch
---

Update dependency and tool versions
4 changes: 2 additions & 2 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ permissions:
contents: read

env:
VisualStudioVersion: '17.0'
VisualStudioVersion: '18.0'
WindowsTargetPlatformVersion: '10.0.26100.0'

concurrency:
Expand Down Expand Up @@ -166,7 +166,7 @@ jobs:

windows:
name: Windows PR
runs-on: windows-2022
runs-on: windows-latest
timeout-minutes: 60
steps:
- name: Checkout
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
diff --git a/lib-commonjs/commands/healthCheck/healthChecks.js b/lib-commonjs/commands/healthCheck/healthChecks.js
index 885c0a228d061792272e423f0958affeaf9c9299..4acfd4ccf081d50e9c6e08e9225d375500bd76dc 100644
--- a/lib-commonjs/commands/healthCheck/healthChecks.js
+++ b/lib-commonjs/commands/healthCheck/healthChecks.js
@@ -37,7 +37,6 @@ const pathHelpers = __importStar(require("../../utils/pathHelpers"));
const execa_1 = __importDefault(require("execa"));
const find_dotnet_tools_1 = require("@react-native-windows/find-dotnet-tools");
const healthCheckList_1 = require("./healthCheckList");
-const powershell = (0, find_dotnet_tools_1.findPowerShell)();
function getHealthChecks() {
// #8471: There are known cases where the dependencies script will error out.
// Fail gracefully if that happens in the meantime.
@@ -68,6 +67,7 @@ function getHealthChecksUnsafe() {
if (process.platform !== 'win32') {
return undefined;
}
+ const powershell = (0, find_dotnet_tools_1.findPowerShell)();
const rnwDepScriptPath = path_1.default.join(pathHelpers.resolveRnwRoot(process.cwd()), 'Scripts/rnw-dependencies.ps1');
return [
{
diff --git a/lib-commonjs/utils/commandWithProgress.js b/lib-commonjs/utils/commandWithProgress.js
index 0674bea984af02cd0f02ac7959fc017eb94a3619..ffb609527b165771b43e9320dca741cc5df54ae9 100644
--- a/lib-commonjs/utils/commandWithProgress.js
+++ b/lib-commonjs/utils/commandWithProgress.js
@@ -42,9 +42,9 @@ function newSpinner(text) {
return (0, ora_1.default)(options).start();
}
exports.newSpinner = newSpinner;
-const powershell = (0, find_dotnet_tools_1.findPowerShell)();
async function runPowerShellScriptFunction(taskDescription, script, funcName, verbose, errorCategory, useAppxCompatibility = false) {
try {
+ const powershell = (0, find_dotnet_tools_1.findPowerShell)();
const printException = verbose ? '$_;' : '';
const importAppx = useAppxCompatibility
? 'Import-Module Appx -WarningAction SilentlyContinue; '
22 changes: 0 additions & 22 deletions .yarn/patches/react-native-macos-npm-0.81.2-dabaa9c16d.patch

This file was deleted.

12 changes: 6 additions & 6 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ catalog:
"@fluentui-react-native/design-tokens-macos": ^0.53.0
"@fluentui-react-native/design-tokens-win32": ^0.53.0
"@fluentui-react-native/design-tokens-windows": ^0.53.0
"@rnx-kit/align-deps": ^4.0.1
"@rnx-kit/align-deps": ^4.0.3
"@rnx-kit/babel-preset-metro-react-native": ^4.0.0
"@rnx-kit/cli": ^2.0.1
"@rnx-kit/cli": ^2.0.2
"@rnx-kit/config": ^0.9.0
"@rnx-kit/eslint-plugin": ^0.9.9
"@rnx-kit/jest-preset": ^0.3.2
"@rnx-kit/lint-json": ^0.2.0
"@rnx-kit/lint-lockfile": ^0.2.0
"@rnx-kit/lint-lockfile": ^0.2.1
"@rnx-kit/lint-package": ^0.2.1
"@rnx-kit/metro-config": ^2.2.4
"@rnx-kit/metro-resolver-symlinks": ^0.3.1
Expand All @@ -30,8 +30,8 @@ catalog:
"@rnx-kit/reporter": ^0.2.0
"@rnx-kit/tools-packages": ^0.1.3
"@rnx-kit/tools-react-native": ^2.3.8
"@rnx-kit/tools-typescript": ^0.2.0
"@rnx-kit/tools-workspaces": ^0.2.3
"@rnx-kit/tools-typescript": ^0.2.1
"@rnx-kit/tools-workspaces": ^0.2.4
"@rnx-kit/tsconfig": ^3.0.3
"@rnx-kit/types-kit-config": ^1.0.0
"@rnx-kit/types-node": ^1.0.0
Expand All @@ -55,7 +55,7 @@ catalog:
expect-webdriverio: ^5.6.1
knip: ^6.12.1
lage: ^2.14.19
oxc-resolver: ^11.17.0
oxc-resolver: ^11.24.0
react-native-test-app: ^5.3.3
rimraf: ^6.1.2
webdriverio: ^9.24.0
Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@ FluentUI React Native is a javascript component library that provides developers
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.

Development status on each platform:
| Windows | macOS | iOS | Android |
|---------------------|---------------------|-------------|-------------|

| Windows | macOS | iOS | Android |
| ------------------- | ------------------- | ------------------- | ------------------- |
| Alpha (in progress) | Alpha (in progress) | Alpha (in progress) | Alpha (in progress) |

## Getting Started
Expand Down
2 changes: 1 addition & 1 deletion apps/E2E/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ For each component/scenario you want to test, you will have a page object class
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.
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.

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

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

Expand Down
4 changes: 1 addition & 3 deletions apps/E2E/wdio.conf.macos.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@ const jasmineDefaultTimeout = 60000; // 60 seconds for Jasmine test timeout
exports.config = {
runner: 'local', // Where should your test be launched
specs: [['src/**/specs/*.macos.ts']],
exclude: [
/* 'path/to/excluded/files' */
],
exclude: [/* 'path/to/excluded/files' */],

maxInstances: 30,
capabilities: [
Expand Down
4 changes: 1 addition & 3 deletions apps/E2E/wdio.conf.windows.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,7 @@ exports.config = {
'src/Tokens/specs/*.win.ts',
],
],
exclude: [
/* 'path/to/excluded/files' */
],
exclude: [/* 'path/to/excluded/files' */],

maxInstances: 1,
capabilities: [
Expand Down
Loading
Loading