Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
6b6286f
initial conversion
JasonVMo Jun 9, 2026
e453713
turn on full composite builds in repo
JasonVMo Jun 10, 2026
01e5682
fix to scope tsconfig changes
JasonVMo Jun 10, 2026
397824c
Merge branch 'main' of https://github.com/microsoft/fluentui-react-na…
JasonVMo Jun 11, 2026
ab7cad6
fix some build issues
JasonVMo Jun 11, 2026
b3d8a27
add ignore plugin to fix dependencies
JasonVMo Jun 11, 2026
2e0a315
align versions and fix parallel build issues
JasonVMo Jun 11, 2026
34e6561
defork types in adapters to avoid multiple versions of react-native t…
JasonVMo Jun 11, 2026
35f7380
formatting changes
JasonVMo Jun 11, 2026
c21da71
remove old lintPackage command and update agent instructions
JasonVMo Jun 11, 2026
0b5ed56
fix mac build errors with new xcode
JasonVMo Jun 11, 2026
09bbef0
add changeset and re-enable macos PR runs
JasonVMo Jun 11, 2026
c604c1f
make lage tests wait on builds correctly
JasonVMo Jun 12, 2026
b7c0e85
add copilot instructions
JasonVMo Jun 12, 2026
b9aa964
ci(windows): capture diagnostics when ReactApp fails to launch
JasonVMo Jun 12, 2026
fcaa2b0
fix(windows): bump react-native-test-app to 5.2.3
JasonVMo Jun 12, 2026
782df09
update workflows to recent tools and allow rnta to pick xcode
JasonVMo Jun 12, 2026
8a9d151
remove unnecessary patches
JasonVMo Jun 12, 2026
31b4895
setup additional entries in the metro config for picking modules
JasonVMo Jun 12, 2026
fb3fce1
remove bogus require entries from packages
JasonVMo Jun 12, 2026
c4170e0
finish module conversion by changing package type designations
JasonVMo Jun 12, 2026
2d7d95b
udpate to a more modern metro config
JasonVMo Jun 12, 2026
efc1ec4
fix normalizeColor signature issue
JasonVMo Jun 13, 2026
321308c
Merge branch 'main' of https://github.com/microsoft/fluentui-react-na…
JasonVMo Jun 13, 2026
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
78 changes: 78 additions & 0 deletions .changeset/clean-numbers-fly.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
---
"@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/dependency-profiles": 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
"@fluentui-react-native/tester": patch
"@fluentui-react-native/codemods": patch
---

Update packages to esm, with new builds with project references
1 change: 1 addition & 0 deletions .github/copilot-instructions.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
See [AGENTS.md](../AGENTS.md) for guidance on working with code in this repository.
2 changes: 1 addition & 1 deletion .github/workflows/changesets-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
persist-credentials: false

- name: Set up toolchain
uses: microsoft/react-native-test-app/.github/actions/setup-toolchain@5.0.14
uses: microsoft/react-native-test-app/.github/actions/setup-toolchain@5.2.3

- name: Install dependencies
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v6

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
85 changes: 42 additions & 43 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ jobs:
timeout-minutes: 60
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
fetch-depth: 0

- name: Set up toolchain
uses: microsoft/react-native-test-app/.github/actions/setup-toolchain@5.0.14
uses: microsoft/react-native-test-app/.github/actions/setup-toolchain@5.2.3
with:
node-version: 22

Expand All @@ -36,10 +36,10 @@ jobs:
timeout-minutes: 60
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v6

- name: Set up toolchain
uses: microsoft/react-native-test-app/.github/actions/setup-toolchain@5.0.14
uses: microsoft/react-native-test-app/.github/actions/setup-toolchain@5.2.3
with:
platform: android
node-version: 22
Expand All @@ -62,18 +62,17 @@ jobs:

macos:
name: macOS PR
runs-on: macos-latest
runs-on: macos-26
timeout-minutes: 60
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v6

- name: Set up toolchain
uses: microsoft/react-native-test-app/.github/actions/setup-toolchain@5.0.14
uses: microsoft/react-native-test-app/.github/actions/setup-toolchain@5.2.3
with:
platform: macos
node-version: 22
xcode-developer-dir: /Applications/Xcode_16.4.app

- name: Install dependencies
run: yarn
Expand All @@ -99,37 +98,36 @@ jobs:
CCACHE_DISABLE: 1

# Disable macOS E2E test to unblock 0.81 checkin
#- name: Prepare E2E macOS tests
# run: yarn e2eprep:macos
# working-directory: apps/E2E

#- name: Run E2E macOS tests
# run: yarn e2etest:macos
# working-directory: apps/E2E

#- name: Upload E2E macOS artifacts
# if: ${{ always() }}
# uses: actions/upload-artifact@v4
# with:
# name: E2E_macos_Dump
# path: |
# apps/E2E/reports
# apps/E2E/errorShots
- name: Prepare E2E macOS tests
run: yarn e2eprep:macos
working-directory: apps/E2E

- name: Run E2E macOS tests
run: yarn e2etest:macos
working-directory: apps/E2E

- name: Upload E2E macOS artifacts
if: ${{ always() }}
uses: actions/upload-artifact@v7
with:
name: E2E_macos_Dump
path: |
apps/E2E/reports
apps/E2E/errorShots

ios:
name: iOS PR
runs-on: macos-latest
runs-on: macos-26
timeout-minutes: 60
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v6

- name: Set up toolchain
uses: microsoft/react-native-test-app/.github/actions/setup-toolchain@5.0.14
uses: microsoft/react-native-test-app/.github/actions/setup-toolchain@5.2.3
with:
platform: ios
node-version: 22
xcode-developer-dir: /Applications/Xcode_16.4.app

- name: Install dependencies
run: yarn
Expand Down Expand Up @@ -168,12 +166,12 @@ jobs:
timeout-minutes: 60
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
fetch-depth: 5

- name: Set up toolchain
uses: microsoft/react-native-test-app/.github/actions/setup-toolchain@5.0.14
uses: microsoft/react-native-test-app/.github/actions/setup-toolchain@5.2.3
with:
platform: windows
node-version: 22
Expand Down Expand Up @@ -204,7 +202,7 @@ jobs:
working-directory: apps/E2E

- name: Start packager
run: cmd /c "start yarn start"
run: cmd /c "start /B cmd /c yarn start ^> packager.log 2^>^&1"
working-directory: apps/fluent-tester

# First build of RNW may fail with Cannot open include file: 'CppWinRTIncludes.h' error
Expand All @@ -221,23 +219,24 @@ jobs:

- name: Upload E2E Windows artifacts
if: ${{ always() }}
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: E2E_RNW_Dump
path: |
apps/E2E/reports
apps/E2E/errorShots
apps/fluent-tester/packager.log

win32:
name: Win32 PR
runs-on: windows-latest
timeout-minutes: 60
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v6

- name: Set up toolchain
uses: microsoft/react-native-test-app/.github/actions/setup-toolchain@5.0.14
uses: microsoft/react-native-test-app/.github/actions/setup-toolchain@5.2.3
with:
platform: windows
node-version: 22
Expand Down Expand Up @@ -269,7 +268,7 @@ jobs:

- name: Upload E2E Win32 artifacts
if: ${{ always() }}
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: E2E_win32_Dump
path: |
Expand Down Expand Up @@ -312,10 +311,10 @@ jobs:
has-tarballs: ${{ steps.check.outputs.has-tarballs }}
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v6

- name: Set up toolchain
uses: microsoft/react-native-test-app/.github/actions/setup-toolchain@5.0.14
uses: microsoft/react-native-test-app/.github/actions/setup-toolchain@5.2.3
with:
node-version: 22

Expand All @@ -340,7 +339,7 @@ jobs:

- name: Upload packed tarballs
if: steps.check.outputs.has-tarballs == 'true'
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: packed-tarballs-dry-run
path: _packed/
Expand All @@ -353,18 +352,18 @@ jobs:
if: needs.publish-dry-run-pack.outputs.has-tarballs == 'true'
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v6

- name: Set up toolchain
uses: microsoft/react-native-test-app/.github/actions/setup-toolchain@5.0.14
uses: microsoft/react-native-test-app/.github/actions/setup-toolchain@5.2.3
with:
node-version: 22

- name: Install dependencies
run: yarn

- name: Download packed tarballs
uses: actions/download-artifact@v4
uses: actions/download-artifact@v8
with:
name: packed-tarballs-dry-run
path: _packed/
Expand All @@ -378,10 +377,10 @@ jobs:
timeout-minutes: 60
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v6

- name: Set up toolchain
uses: microsoft/react-native-test-app/.github/actions/setup-toolchain@5.0.14
uses: microsoft/react-native-test-app/.github/actions/setup-toolchain@5.2.3
with:
node-version: 22

Expand Down
12 changes: 0 additions & 12 deletions .yarn/patches/react-native-macos-npm-0.74.30-e4edf98920.patch

This file was deleted.

22 changes: 22 additions & 0 deletions .yarn/patches/react-native-macos-npm-0.81.2-dabaa9c16d.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
diff --git a/Libraries/StyleSheet/PlatformColorValueTypes.macos.js b/Libraries/StyleSheet/PlatformColorValueTypes.macos.js
index 29ae835410baf640dc869d2c1bcbd6d8ea508ded..df23765985f5fd1f634189f7f6ef28f58889716a 100644
--- a/Libraries/StyleSheet/PlatformColorValueTypes.macos.js
+++ b/Libraries/StyleSheet/PlatformColorValueTypes.macos.js
@@ -82,7 +82,7 @@ const _normalizeColorObject = (
// a macOS semantic color
return color;
} else if ('dynamic' in color && color.dynamic !== undefined) {
- const normalizeColor = require('./normalizeColor');
+ const normalizeColor = require('./normalizeColor').default;

// a dynamic, appearance aware color
const dynamic = color.dynamic;
@@ -103,7 +103,7 @@ const _normalizeColorObject = (
'colorWithSystemEffect' in color &&
color.colorWithSystemEffect != null
) {
- const normalizeColor = require('./normalizeColor');
+ const normalizeColor = require('./normalizeColor').default;
const colorWithSystemEffect = color.colorWithSystemEffect;
const colorObject: LocalNativeColorValue = {
colorWithSystemEffect: {
Loading
Loading