Skip to content

Use umbrella instead of a direct include in bridging module (#58549) #58549

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
j-piasecki wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Use umbrella instead of a direct include in bridging module (#58549) #58549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cef9a6d
Fix formatting in iOS prebuild header docs
cortinico Sep 25, 2026
7b1f48a
Use umbrella instead of a direct include in bridging module (#58549)
j-piasecki Sep 25, 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
1 change: 1 addition & 0 deletions ...react-native/ReactApple/RCTAnimatedModuleProvider/React-RCTAnimatedModuleProvider.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ Pod::Spec.new do |s|
s.dependency "React-Fabric/animated"
s.dependency "Yoga"

add_dependency(s, "React-Fabric")
add_dependency(s, "ReactCommon", :subspec => "turbomodule/core", :additional_framework_paths => ["react/nativemodule/core"])

depend_on_js_engine(s)
Expand Down
1 change: 1 addition & 0 deletions ...s/react-native/ReactCommon/react/nativemodule/defaults/React-defaultsnativemodule.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ Pod::Spec.new do |s|
s.dependency "React-webperformancenativemodule"
s.dependency "React-Fabric/animated"
s.dependency "React-cxxstableapi"
add_dependency(s, "React-Fabric")
add_dependency(s, "React-RCTFBReactNativeSpec")
add_dependency(s, "React-featureflags")
add_dependency(s, "React-featureflagsnativemodule")
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/ReactCommon/react/nativemodule/dom/React-domnativemodule.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ Pod::Spec.new do |s|
s.dependency "Yoga"
s.dependency "ReactCommon/turbomodule/core"
s.dependency "React-bridging"
s.dependency "React-Fabric"
add_dependency(s, "React-Fabric")
s.dependency "React-Fabric/bridging"
s.dependency "React-FabricComponents"
s.dependency "React-cxxstableapi"
Expand Down
2 changes: 1 addition & 1 deletion ...on/react/nativemodule/intersectionobserver/React-intersectionobservernativemodule.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ Pod::Spec.new do |s|
s.dependency "ReactCommon/turbomodule/core"
s.dependency "React-bridging"

s.dependency "React-Fabric"
add_dependency(s, "React-Fabric")
s.dependency "React-Fabric/bridging"
s.dependency "React-runtimescheduler"
s.dependency "React-cxxstableapi"
Expand Down
2 changes: 1 addition & 1 deletion ...eactCommon/react/nativemodule/mutationobserver/React-mutationobservernativemodule.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ Pod::Spec.new do |s|
s.dependency "ReactCommon/turbomodule/core"
s.dependency "React-bridging"

s.dependency "React-Fabric"
add_dependency(s, "React-Fabric")
s.dependency "React-Fabric/bridging"
s.dependency "React-Fabric/observers/mutation"
s.dependency "React-featureflags"
Expand Down
2 changes: 1 addition & 1 deletion ...ve/ReactCommon/react/nativemodule/resizeobserver/React-resizeobservernativemodule.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ Pod::Spec.new do |s|
s.dependency "ReactCommon/turbomodule/core"
s.dependency "React-bridging"

s.dependency "React-Fabric"
add_dependency(s, "React-Fabric")
s.dependency "React-Fabric/bridging"
s.dependency "React-Fabric/observers/resize"
s.dependency "React-runtimescheduler"
Expand Down
2 changes: 1 addition & 1 deletion ...ve/ReactCommon/react/nativemodule/viewtransition/React-viewtransitionnativemodule.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ Pod::Spec.new do |s|

s.dependency "Yoga"
s.dependency "ReactCommon/turbomodule/core"
s.dependency "React-Fabric"
add_dependency(s, "React-Fabric")
s.dependency "React-Fabric/bridging"
add_dependency(s, "React-runtimeexecutor", :additional_framework_paths => ["platform/ios"])
add_dependency(s, "React-RCTFBReactNativeSpec")
Expand Down
5 changes: 4 additions & 1 deletion packages/react-native/ReactCommon/react/renderer/bridging/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ add_library(react_renderer_bridging INTERFACE)

target_include_directories(react_renderer_bridging INTERFACE ${REACT_COMMON_DIR})

target_link_libraries(react_renderer_bridging INTERFACE react_cxxstableapi)
target_link_libraries(react_renderer_bridging INTERFACE
react_bridging
react_cxxstableapi
react_renderer_core)
target_compile_reactnative_options(react_renderer_bridging INTERFACE)
target_compile_options(react_renderer_bridging INTERFACE -Wpedantic)
4 changes: 2 additions & 2 deletions packages/react-native/ReactCommon/react/renderer/bridging/bridging.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@

#include <react/cxxstableapi/FrameworksGuard.h>

#include <React/Bridging.h>
#include <React/RendererCore.h>
#include <jsi/jsi.h>
#include <react/bridging/Base.h>
#include <react/renderer/core/ShadowNode.h>

namespace facebook::react {

Expand Down
4 changes: 2 additions & 2 deletions packages/react-native/scripts/ios-prebuild/__docs__/headers-rules.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,8 +246,8 @@ of module `React`, closing a cycle:
React -> ReactNativeHeaders_react -> React
```

Found empirically: `react/timing/primitives.h` -> `<React/Debug.h>`. This is
the same two-module-ownership failure as `UMBRELLA_CXX_GUARDED_EXCLUSIONS`
Found empirically: `react/timing/primitives.h` -> `<React/Debug.h>`. This is the
same two-module-ownership failure as `UMBRELLA_CXX_GUARDED_EXCLUSIONS`
(`RCTFrameTimingsObserver.h`, which reaches the same `primitives.h`), in the
opposite direction. They are `objc-blocked` by construction (they re-export
their module's C++ surface), so they were never R4 umbrella or R5 module
Expand Down
Loading