Repository navigation
fix(fabric): select view platform headers by build destination - #3175
Jason Morse (JasonVMo) wants to merge 1 commit into
Conversation
Adapt the focused platform-dispatch repair from ff90a9b for current main. Preserve platform-relative CocoaPods and prebuild headers, remove SwiftPM host-based selection, and guard macOS translation units on other destinations. Related future-merge integration: #3058, #3104, #3105. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 33ea5c72-8bbd-448d-aa21-c9b99dd03c96
|
Additional parent integration validation: passed with all six independent Validated integration HEAD: Commands and results: # PASSED: regenerate Pods and generated headers from the RNTester directory.
cd packages/rn-tester
PATH="/opt/homebrew/opt/ruby/bin:$PATH" SDKROOT="$(xcrun --sdk macosx --show-sdk-path)" RCT_NEW_ARCH_ENABLED=1 bundle exec pod install
cd ../..
# PASSED: New Architecture RNTester-macOS, static Pods, Hermes.
xcodebuild -workspace packages/rn-tester/RNTesterPods.xcworkspace -sdk macosx -configuration Debug -scheme RNTester-macOS -derivedDataPath packages/rn-tester -jobs 4 CODE_SIGNING_ALLOWED=NO COMPILER_INDEX_STORE_ENABLE=NO build
# PASSED: RNTester iOS simulator destination, including arm64 and x86_64.
xcodebuild -workspace packages/rn-tester/RNTesterPods.xcworkspace -sdk iphonesimulator -configuration Debug -scheme RNTester -destination 'generic/platform=iOS Simulator' -derivedDataPath packages/rn-tester -jobs 4 CODE_SIGNING_ALLOWED=NO COMPILER_INDEX_STORE_ENABLE=NO buildThe first combined build failed after Pods were invoked from the monorepo root These are native application build checks, not UI interaction tests or The separately requested |
Summary:
Current main can select different
HostPlatformViewPropsclass layouts and view traits depending on header packaging: CocoaPods flattens competing cxx/macOS headers, framework paths prefer cxx, SwiftPM selects sources using the manifest host, and prebuild stages different families in its two include namespaces.This adapts the focused repair in
ff90a9b67703e689f8e7819aa6482f782bc1fc8f, already present in related #3058, #3104 and #3105. Those PRs target0.85-merge,0.87-mergeandreview/0.87-apple-foundation, respectively; this PR delivers the repair independently to current main, without their unrelated future-version integration. It also repairs main's prebuild staging rather than importing the future header-composition pipeline.This is fork-specific packaging of the macOS platform extension, not an upstream runtime behavior change. No Changeset is needed for main.
Test Plan:
yarn jest packages/react-native/scripts/ios-prebuild/__tests__/setup-test.js --runInBand --watchman=false— passed, 1 test.yarn eslint packages/react-native/scripts/ios-prebuild/setup.js packages/react-native/scripts/ios-prebuild/__tests__/setup-test.js— passed.yarn exec prettier --check packages/react-native/scripts/ios-prebuild/setup.js packages/react-native/scripts/ios-prebuild/__tests__/setup-test.js— passed.ruby -c packages/react-native/ReactCommon/React-Fabric.podspec— passed,Syntax OK.git diff --check— passed.python3 ../../../.copilot/session-state/33ea5c72-8bbd-448d-aa21-c9b99dd03c96/files/cpp-view-platforms-validate.py— passed using a local, uncommitted validation harness; exact subprocess arguments, results and output are retained in the session'scpp-view-platforms-validation.jsonartifact:dump-packageparsing.Not run here: Pods installation, Xcode/native application builds, Metro, full Jest/Flow/lint/format suites. No screenshot is applicable to this packaging change.