Repository navigation
[0.89] Fix case-colliding React/ and react/ folders in the prebuilt iOS headers - #60150
Open
j-piasecki wants to merge 1 commit into
Open
j-piasecki wants to merge 1 commit into
j-piasecki wants to merge 1 commit into
Conversation
The C++ module umbrellas (React/Debug.h, React/View.h and 15 others) shipped in ReactNativeHeaders next to the react/ folder. On a case-insensitive filesystem the two folders merge, so every #include <react/...> warns with -Wnonportable-include-path. On a case-sensitive filesystem these includes do not resolve. Ship the umbrellas in React.framework again and list them as `exclude header` in its module map. Including them from a react/ header then stays textual and does not close the React -> ReactNativeHeaders_react -> React module cycle. The Swift C++ interop gate in headers-verify now also searches React.framework, as every real consumer does.
j-piasecki
marked this pull request as ready for review
November 19, 2026 15:04
This branch has not been deployed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary:
This is a cherry-pick of #60148 to
0.89-stable.In the 0.89.0-rc.1 and rc.2 artifacts, the C++ module umbrella headers (
React/Debug.h,React/View.hand 15 others) sit next to thereact/folder inReactNativeHeaders.xcframework. On macOS the disk ignores letter case, so the two folders become oneReact/folder. Because of this, clang warns with-Wnonportable-include-pathon each#include <react/...>, and Reanimated's clang-tidy run fails. This change puts the umbrella headers back inReact.framework/Headersand marks them asexclude headerin the React module map, so they do not cause the module cycle that #58635 fixed. See #60148 for the full description.The pick had one small conflict in
headers-spec.js: 0.89 writes one Flow type as{[string]: Array<string>}. I kept the 0.89 form.Changelog:
[IOS] [FIXED] - Fix
-Wnonportable-include-pathwarnings for<react/...>includes with the prebuilt React Native coreTest Plan:
yarn test packages/react-native/scripts/ios-prebuildon this branch: all tests pass.main: the header check script, a direct compile of the reported include (522 warnings before, 0 after), and RNTester builds through CocoaPods (no frameworks, static and dynamic frameworks) and SwiftPM.