diff --git a/packages/react-native/ReactApple/RCTAnimatedModuleProvider/React-RCTAnimatedModuleProvider.podspec b/packages/react-native/ReactApple/RCTAnimatedModuleProvider/React-RCTAnimatedModuleProvider.podspec index f71dd4e6ae89..13e82bcad5dc 100644 --- a/packages/react-native/ReactApple/RCTAnimatedModuleProvider/React-RCTAnimatedModuleProvider.podspec +++ b/packages/react-native/ReactApple/RCTAnimatedModuleProvider/React-RCTAnimatedModuleProvider.podspec @@ -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) diff --git a/packages/react-native/ReactCommon/react/nativemodule/defaults/React-defaultsnativemodule.podspec b/packages/react-native/ReactCommon/react/nativemodule/defaults/React-defaultsnativemodule.podspec index f088cf156580..8c4dcb56a84d 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/defaults/React-defaultsnativemodule.podspec +++ b/packages/react-native/ReactCommon/react/nativemodule/defaults/React-defaultsnativemodule.podspec @@ -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") diff --git a/packages/react-native/ReactCommon/react/nativemodule/dom/React-domnativemodule.podspec b/packages/react-native/ReactCommon/react/nativemodule/dom/React-domnativemodule.podspec index 03c9a882f6a9..211efa9da1f0 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/dom/React-domnativemodule.podspec +++ b/packages/react-native/ReactCommon/react/nativemodule/dom/React-domnativemodule.podspec @@ -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" diff --git a/packages/react-native/ReactCommon/react/nativemodule/intersectionobserver/React-intersectionobservernativemodule.podspec b/packages/react-native/ReactCommon/react/nativemodule/intersectionobserver/React-intersectionobservernativemodule.podspec index b971c5d5986f..a5d1b2bdaf69 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/intersectionobserver/React-intersectionobservernativemodule.podspec +++ b/packages/react-native/ReactCommon/react/nativemodule/intersectionobserver/React-intersectionobservernativemodule.podspec @@ -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" diff --git a/packages/react-native/ReactCommon/react/nativemodule/mutationobserver/React-mutationobservernativemodule.podspec b/packages/react-native/ReactCommon/react/nativemodule/mutationobserver/React-mutationobservernativemodule.podspec index 2797c76205f2..ac89b8bdf808 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/mutationobserver/React-mutationobservernativemodule.podspec +++ b/packages/react-native/ReactCommon/react/nativemodule/mutationobserver/React-mutationobservernativemodule.podspec @@ -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" diff --git a/packages/react-native/ReactCommon/react/nativemodule/resizeobserver/React-resizeobservernativemodule.podspec b/packages/react-native/ReactCommon/react/nativemodule/resizeobserver/React-resizeobservernativemodule.podspec index 8c0fe122bc74..297f1aa2ff15 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/resizeobserver/React-resizeobservernativemodule.podspec +++ b/packages/react-native/ReactCommon/react/nativemodule/resizeobserver/React-resizeobservernativemodule.podspec @@ -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" diff --git a/packages/react-native/ReactCommon/react/nativemodule/viewtransition/React-viewtransitionnativemodule.podspec b/packages/react-native/ReactCommon/react/nativemodule/viewtransition/React-viewtransitionnativemodule.podspec index 2b07c8469a4b..0db805c4e317 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/viewtransition/React-viewtransitionnativemodule.podspec +++ b/packages/react-native/ReactCommon/react/nativemodule/viewtransition/React-viewtransitionnativemodule.podspec @@ -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") diff --git a/packages/react-native/ReactCommon/react/renderer/bridging/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/bridging/CMakeLists.txt index 434d6112ef18..68b233aed186 100644 --- a/packages/react-native/ReactCommon/react/renderer/bridging/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/renderer/bridging/CMakeLists.txt @@ -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) diff --git a/packages/react-native/ReactCommon/react/renderer/bridging/bridging.h b/packages/react-native/ReactCommon/react/renderer/bridging/bridging.h index 1a4523d6b30d..a04c0f4947d2 100644 --- a/packages/react-native/ReactCommon/react/renderer/bridging/bridging.h +++ b/packages/react-native/ReactCommon/react/renderer/bridging/bridging.h @@ -9,9 +9,9 @@ #include +#include +#include #include -#include -#include namespace facebook::react { diff --git a/packages/react-native/scripts/ios-prebuild/__docs__/headers-rules.md b/packages/react-native/scripts/ios-prebuild/__docs__/headers-rules.md index dbd9ceac6128..7c371601bdd4 100644 --- a/packages/react-native/scripts/ios-prebuild/__docs__/headers-rules.md +++ b/packages/react-native/scripts/ios-prebuild/__docs__/headers-rules.md @@ -246,8 +246,8 @@ of module `React`, closing a cycle: React -> ReactNativeHeaders_react -> React ``` -Found empirically: `react/timing/primitives.h` -> ``. This is -the same two-module-ownership failure as `UMBRELLA_CXX_GUARDED_EXCLUSIONS` +Found empirically: `react/timing/primitives.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