Skip to content

Commit 4e2269a

Browse files
committed
get 81 app building for macos
1 parent 8d8361f commit 4e2269a

6 files changed

Lines changed: 53 additions & 45 deletions

File tree

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1 @@
1-
module.exports = {
2-
presets: [
3-
[
4-
'@babel/preset-env',
5-
{
6-
modules: 'auto',
7-
targets: { node: 'current' },
8-
},
9-
],
10-
['@babel/preset-react', { runtime: 'automatic' }],
11-
['@babel/preset-typescript', { allowSyntheticDefaultImports: true }],
12-
['module:@rnx-kit/babel-preset-metro-react-native', { runtime: 'automatic' }],
13-
],
14-
overrides: [
15-
{
16-
plugins: [
17-
[require('@babel/plugin-transform-react-jsx'), { runtime: 'automatic' }],
18-
[require('@babel/plugin-transform-react-jsx-source')],
19-
],
20-
},
21-
],
22-
};
1+
module.exports = require('@fluentui-react-native/scripts/babel-config');

apps/fluent-tester-81/macos/Podfile

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,20 @@ workspace 'DesktopTester.xcworkspace'
1313
# (pnpm mode)
1414
react_native_path = "#{__dir__}/../node_modules/react-native"
1515

16-
use_test_app! :hermes_enabled => true, :fabric_enabled => false
16+
# Apple Clang 21 (Xcode 26) rejects fmt's consteval format string checks as
17+
# non-constant expressions. fmt's base.h redefines FMT_USE_CONSTEVAL
18+
# unconditionally, so a -D override is ignored — patch the header instead.
19+
# (Re-applied each `pod install`, since the fmt pod is re-fetched from git.)
20+
fmt_consteval_workaround = ->(installer) do
21+
base_h = File.join(installer.sandbox.root, 'fmt', 'include', 'fmt', 'base.h')
22+
next unless File.exist?(base_h)
23+
original = File.read(base_h)
24+
patched = original.gsub('# define FMT_USE_CONSTEVAL 1', '# define FMT_USE_CONSTEVAL 0')
25+
if patched != original
26+
File.chmod(0644, base_h)
27+
File.write(base_h, patched)
28+
end
29+
end
30+
31+
use_test_app! :hermes_enabled => true, :fabric_enabled => false, :post_install => fmt_consteval_workaround
1732

apps/fluent-tester-81/macos/Podfile.lock

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ PODS:
44
- fast_float (8.0.0)
55
- FBLazyVector (0.81.2)
66
- fmt (11.0.2)
7-
- FRNAvatar (0.22.1):
7+
- FRNAvatar (0.22.3):
88
- MicrosoftFluentUI (= 0.13.1)
99
- React
10-
- FRNCallout (0.28.1):
10+
- FRNCallout (0.28.3):
1111
- boost
1212
- DoubleConversion
1313
- fast_float
@@ -36,13 +36,13 @@ PODS:
3636
- ReactCommon/turbomodule/core
3737
- SocketRocket
3838
- Yoga
39-
- FRNCheckbox (0.18.1):
39+
- FRNCheckbox (0.18.3):
4040
- React
41-
- FRNMenuButton (0.14.1):
41+
- FRNMenuButton (0.14.3):
4242
- React
43-
- FRNRadioButton (0.22.1):
43+
- FRNRadioButton (0.22.3):
4444
- React
45-
- FRNVibrancyView (0.4.1):
45+
- FRNVibrancyView (0.4.3):
4646
- React
4747
- glog (0.3.5)
4848
- hermes-engine (0.81.5):
@@ -137,7 +137,7 @@ PODS:
137137
- fmt (= 11.0.2)
138138
- glog
139139
- RCTDeprecation (0.81.2)
140-
- RCTFocusZone (0.22.1):
140+
- RCTFocusZone (0.22.3):
141141
- React
142142
- RCTRequired (0.81.2)
143143
- RCTTypeSafety (0.81.2):
@@ -2398,7 +2398,7 @@ PODS:
23982398
- React-Core
23992399
- React-jsi
24002400
- ReactTestApp-Resources (1.0.0-dev)
2401-
- RNSVG (15.15.1):
2401+
- RNSVG (15.15.5):
24022402
- React-Core
24032403
- SocketRocket (0.7.1)
24042404
- Yoga (0.0.0)
@@ -2482,7 +2482,7 @@ DEPENDENCIES:
24822482
- ReactAppDependencyProvider (from `build/generated/ios`)
24832483
- ReactCodegen (from `build/generated/ios`)
24842484
- ReactCommon/turbomodule/core (from `../node_modules/react-native-macos/ReactCommon`)
2485-
- "ReactNativeHost (from `../../../node_modules/.store/react-native-test-app-virtual-c3cc871312/node_modules/@rnx-kit/react-native-host`)"
2485+
- "ReactNativeHost (from `../../../node_modules/.store/react-native-test-app-virtual-546a517efa/node_modules/@rnx-kit/react-native-host`)"
24862486
- ReactTestApp-DevSupport (from `../node_modules/react-native-test-app`)
24872487
- ReactTestApp-Resources (from `..`)
24882488
- RNSVG (from `../node_modules/react-native-svg`)
@@ -2651,7 +2651,7 @@ EXTERNAL SOURCES:
26512651
ReactCommon:
26522652
:path: "../node_modules/react-native-macos/ReactCommon"
26532653
ReactNativeHost:
2654-
:path: "../../../node_modules/.store/react-native-test-app-virtual-c3cc871312/node_modules/@rnx-kit/react-native-host"
2654+
:path: "../../../node_modules/.store/react-native-test-app-virtual-546a517efa/node_modules/@rnx-kit/react-native-host"
26552655
ReactTestApp-DevSupport:
26562656
:path: "../node_modules/react-native-test-app"
26572657
ReactTestApp-Resources:
@@ -2667,18 +2667,18 @@ SPEC CHECKSUMS:
26672667
fast_float: 20817c22759af6ac8d4d67e6e059b8b499953656
26682668
FBLazyVector: 0e3076dbb16169b0afc2d701a24a526423b5e76b
26692669
fmt: 24e7591456deb60b4a77518f83d9a916ac84223f
2670-
FRNAvatar: 919ae3fc7d01eee287295360e543d1d2a0432673
2671-
FRNCallout: 7f778112c7395ddad481ed943aa8d655c5ec3c9a
2672-
FRNCheckbox: 3e478c3229e3a41523a563f9d8e4db5c3bd821cc
2673-
FRNMenuButton: 1cdaadd041da62cefba6d095b2a09caac99f38c7
2674-
FRNRadioButton: e0dabd91fb4bd361aa7c0b69b2bd293097bfb8b9
2675-
FRNVibrancyView: 00d49c101e73930d6c714d54747239a4b4077b7a
2670+
FRNAvatar: ffa0facb219806b0e5083d2388bc61e590f5df19
2671+
FRNCallout: bc2178e4478504e21c01a3c1c8617c91783eae8c
2672+
FRNCheckbox: 1cba85c9c8c75257970f8ffcc4a5e2602c22be7c
2673+
FRNMenuButton: 709f3218ce9a421c154ea0570acbeb3f535629d3
2674+
FRNRadioButton: a0e58ac8a7be290778a30add5bdf41dc245e3483
2675+
FRNVibrancyView: 96debdb9a1d2d9315c25748450a33fe2cb8b6321
26762676
glog: 0b31c25149b9d350b2666c7d459229861a00ec07
26772677
hermes-engine: 9f4dfe93326146a1c99eb535b1cb0b857a3cd172
26782678
MicrosoftFluentUI: dde98d8ed3fc306d9ddd0a6f0bc0c1f24fe5275e
26792679
RCT-Folly: c803cf33238782d5fd21a5e02d44f64068e0e130
26802680
RCTDeprecation: b60b889eafa75f46c3d6be5332681efbb16ad0c7
2681-
RCTFocusZone: db02a721beefe1adc3cf7f20a74b21ad6af4da6c
2681+
RCTFocusZone: 1b8ab01688bbb8ef6357bd8789e5c6f38ddac4d9
26822682
RCTRequired: 070d7f0ef937e7a93aab20761cef55419f16b5de
26832683
RCTTypeSafety: dd2ad1eb0c0c01ba41222d115be141f9a348c636
26842684
React: 304df3d34c8c0281fd1fd3a506e69f234095425d
@@ -2743,10 +2743,10 @@ SPEC CHECKSUMS:
27432743
ReactNativeHost: ba9bdd449af5c793d28ff2610c1bec3015d014cc
27442744
ReactTestApp-DevSupport: 0e7676c00b33b0545e72d89ea09f990d737db6d3
27452745
ReactTestApp-Resources: 7625eab22d0a702577b048d60b5fb3f2e2f5b2a7
2746-
RNSVG: 866f818ba926c5d3f7863705abed51bb09d8ddd3
2746+
RNSVG: 7ee150379dc2a5ed4c9fdac92a5d6efab98e9cf7
27472747
SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
27482748
Yoga: 6048a55441c73f8e3916a8eac6b83886708c77f9
27492749

2750-
PODFILE CHECKSUM: aee9e5d90e7307d43ece2d934761984a96053ae5
2750+
PODFILE CHECKSUM: 10732d08ff54fc2faa0d3502a4f77ba76066a3ca
27512751

27522752
COCOAPODS: 1.16.2

apps/fluent-tester-81/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"react": "19.1.4",
2626
"react-native": "^0.81.6",
2727
"react-native-macos": "^0.81.0",
28-
"react-native-svg": "^15.12.1",
28+
"react-native-svg": "^15.15.5",
2929
"react-native-windows": "^0.81.0"
3030
},
3131
"devDependencies": {

apps/fluent-tester-81/tsconfig.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
2-
"extends": "@fluentui-react-native/scripts/configs/tsconfig.json",
2+
"extends": "@fluentui-react-native/scripts/tsconfig",
33
"compilerOptions": {
4+
"rootDir": "src",
45
"outDir": "lib",
56
"allowSyntheticDefaultImports": true
67
},

yarn.lock

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5421,7 +5421,7 @@ __metadata:
54215421
react: "npm:19.1.4"
54225422
react-native: "npm:^0.81.6"
54235423
react-native-macos: "npm:^0.81.0"
5424-
react-native-svg: "npm:^15.12.1"
5424+
react-native-svg: "npm:^15.15.5"
54255425
react-native-svg-transformer: "npm:^1.0.0"
54265426
react-native-test-app: "npm:^5.1.0"
54275427
react-native-windows: "npm:^0.81.0"
@@ -22056,6 +22056,19 @@ __metadata:
2205622056
languageName: node
2205722057
linkType: hard
2205822058

22059+
"react-native-svg@npm:^15.15.5":
22060+
version: 15.15.5
22061+
resolution: "react-native-svg@npm:15.15.5"
22062+
dependencies:
22063+
css-select: "npm:^5.1.0"
22064+
css-tree: "npm:^1.1.3"
22065+
peerDependencies:
22066+
react: "*"
22067+
react-native: "*"
22068+
checksum: 10c0/34b71b6c83d7235efbc4263abaffcbad780375f9e0fca95786e4f1a543a2b6d07e90c7df426f708e85be68331c412066cdc639f4a6ce82bed42bc728050d9402
22069+
languageName: node
22070+
linkType: hard
22071+
2205922072
"react-native-test-app@npm:^3.9.2":
2206022073
version: 3.10.22
2206122074
resolution: "react-native-test-app@npm:3.10.22"

0 commit comments

Comments
 (0)