From b6a09aa5da1d2f0fae93c532297dbe5f17a49d36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Ma=C5=82ecki?= Date: Wed, 14 Oct 2026 02:05:26 -0700 Subject: [PATCH] Reach public modules through umbrellas from unguarded exported headers (#59026) Summary: Pull Request resolved: https://github.com/react/react-native/pull/59026 Several exported headers without a stable API guard included fine-grained headers of public modules directly. They are preprocessed in the including translation unit, so under `RN_STRICT_API` any app or library including them hits the public module's `UmbrellaGuard.h` `#error`. Switch them to the module umbrellas: - iOS `RCTCallInvoker.h`, `RCTBridgeProxy+Cxx.h`: ``; `NSDataBigString.h`: ``. - Android `react/fabric/AnimatedPropBufferEncoder.h`: ``; `react/runtime/jni/JJSTimerExecutor.h`, `JReactInstance.h`: ``. - ReactCxxPlatform `ImageLoaderModule.h`, `NativeExceptionsManager.h`: ``; `IMountingManager.h`, `RunLoopObserverManager.h`: ``; `ReactHost.h`: ``, ``; `ReactInstanceConfig.h`: ``. Each umbrella is a superset of the header it replaces, so no declarations are lost. Includes of "for frameworks" headers stay direct. The guards are inert without `RN_STRICT_API`. With `use_frameworks!`, a `` umbrella lives only in its owning pod's framework headers, which CocoaPods adds to dependents' search paths only for pods in `ReactNativePodsUtils.stable_umbrella_frameworks`. React-Core now reaches the `React-cxxreact` and `React-callinvoker` umbrellas, so add both pods to that list; otherwise the dynamic frameworks build fails with `'React/JSBigString.h' file not found`. Changelog: [Internal] Reviewed By: christophpurrer Differential Revision: D124323428 fbshipit-source-id: b77551e56974561c1199a50dd3f550dc6ef48578 --- packages/react-native/React/Base/RCTBridgeProxy+Cxx.h | 2 +- packages/react-native/React/Base/RCTCallInvoker.h | 2 +- packages/react-native/React/CxxBridge/NSDataBigString.h | 2 +- .../src/main/jni/react/fabric/AnimatedPropBufferEncoder.h | 2 +- .../src/main/jni/react/runtime/jni/JJSTimerExecutor.h | 2 +- .../src/main/jni/react/runtime/jni/JReactInstance.h | 2 +- .../ReactCxxPlatform/react/io/ImageLoaderModule.h | 2 +- .../ReactCxxPlatform/react/logging/NativeExceptionsManager.h | 2 +- .../react/renderer/uimanager/IMountingManager.h | 2 +- .../react-native/ReactCxxPlatform/react/runtime/ReactHost.h | 4 ++-- .../ReactCxxPlatform/react/runtime/ReactInstanceConfig.h | 2 +- .../ReactCxxPlatform/react/utils/RunLoopObserverManager.h | 2 +- .../react-native/scripts/cocoapods/__tests__/utils-test.rb | 4 +++- packages/react-native/scripts/cocoapods/utils.rb | 2 ++ 14 files changed, 18 insertions(+), 14 deletions(-) diff --git a/packages/react-native/React/Base/RCTBridgeProxy+Cxx.h b/packages/react-native/React/Base/RCTBridgeProxy+Cxx.h index 2748178a3db..d54521260c9 100644 --- a/packages/react-native/React/Base/RCTBridgeProxy+Cxx.h +++ b/packages/react-native/React/Base/RCTBridgeProxy+Cxx.h @@ -6,7 +6,7 @@ */ #ifdef __cplusplus -#import +#import #endif #import "RCTBridgeProxy.h" diff --git a/packages/react-native/React/Base/RCTCallInvoker.h b/packages/react-native/React/Base/RCTCallInvoker.h index 3c3fec429d6..6c28474bb4d 100644 --- a/packages/react-native/React/Base/RCTCallInvoker.h +++ b/packages/react-native/React/Base/RCTCallInvoker.h @@ -8,7 +8,7 @@ #import #ifdef __cplusplus -#import +#import #endif NS_ASSUME_NONNULL_BEGIN diff --git a/packages/react-native/React/CxxBridge/NSDataBigString.h b/packages/react-native/React/CxxBridge/NSDataBigString.h index b8c571f8182..426640bfbcd 100644 --- a/packages/react-native/React/CxxBridge/NSDataBigString.h +++ b/packages/react-native/React/CxxBridge/NSDataBigString.h @@ -7,7 +7,7 @@ #import -#include +#include namespace facebook::react { diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/AnimatedPropBufferEncoder.h b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/AnimatedPropBufferEncoder.h index d7377cd1674..5dbd596017a 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/AnimatedPropBufferEncoder.h +++ b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/AnimatedPropBufferEncoder.h @@ -7,8 +7,8 @@ #pragma once +#include #include -#include #include #include diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/runtime/jni/JJSTimerExecutor.h b/packages/react-native/ReactAndroid/src/main/jni/react/runtime/jni/JJSTimerExecutor.h index b34b7fec883..06c9793e53f 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/runtime/jni/JJSTimerExecutor.h +++ b/packages/react-native/ReactAndroid/src/main/jni/react/runtime/jni/JJSTimerExecutor.h @@ -7,7 +7,7 @@ #pragma once -#include +#include #include #include #include diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/runtime/jni/JReactInstance.h b/packages/react-native/ReactAndroid/src/main/jni/react/runtime/jni/JReactInstance.h index d58e52722b7..cdad5ecc136 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/runtime/jni/JReactInstance.h +++ b/packages/react-native/ReactAndroid/src/main/jni/react/runtime/jni/JReactInstance.h @@ -7,9 +7,9 @@ #pragma once +#include #include #include -#include #include #include #include diff --git a/packages/react-native/ReactCxxPlatform/react/io/ImageLoaderModule.h b/packages/react-native/ReactCxxPlatform/react/io/ImageLoaderModule.h index 0966a70af3b..1fa3819c809 100644 --- a/packages/react-native/ReactCxxPlatform/react/io/ImageLoaderModule.h +++ b/packages/react-native/ReactCxxPlatform/react/io/ImageLoaderModule.h @@ -8,7 +8,7 @@ #pragma once #include -#include +#include #include #include #include diff --git a/packages/react-native/ReactCxxPlatform/react/logging/NativeExceptionsManager.h b/packages/react-native/ReactCxxPlatform/react/logging/NativeExceptionsManager.h index 9e8d49ac8c2..7a7a9b39c66 100644 --- a/packages/react-native/ReactCxxPlatform/react/logging/NativeExceptionsManager.h +++ b/packages/react-native/ReactCxxPlatform/react/logging/NativeExceptionsManager.h @@ -8,9 +8,9 @@ #pragma once #include +#include #include #include -#include #include #include #include diff --git a/packages/react-native/ReactCxxPlatform/react/renderer/uimanager/IMountingManager.h b/packages/react-native/ReactCxxPlatform/react/renderer/uimanager/IMountingManager.h index b68da46f54a..3334c594852 100644 --- a/packages/react-native/ReactCxxPlatform/react/renderer/uimanager/IMountingManager.h +++ b/packages/react-native/ReactCxxPlatform/react/renderer/uimanager/IMountingManager.h @@ -7,8 +7,8 @@ #pragma once +#include #include -#include #include #include diff --git a/packages/react-native/ReactCxxPlatform/react/runtime/ReactHost.h b/packages/react-native/ReactCxxPlatform/react/runtime/ReactHost.h index 9ff4a1d6894..ff16401fe2b 100644 --- a/packages/react-native/ReactCxxPlatform/react/runtime/ReactHost.h +++ b/packages/react-native/ReactCxxPlatform/react/runtime/ReactHost.h @@ -9,8 +9,8 @@ #include "ReactInstanceConfig.h" -#include -#include +#include +#include #include #include #include diff --git a/packages/react-native/ReactCxxPlatform/react/runtime/ReactInstanceConfig.h b/packages/react-native/ReactCxxPlatform/react/runtime/ReactInstanceConfig.h index 559a928f4ed..90a871692cc 100644 --- a/packages/react-native/ReactCxxPlatform/react/runtime/ReactInstanceConfig.h +++ b/packages/react-native/ReactCxxPlatform/react/runtime/ReactInstanceConfig.h @@ -7,7 +7,7 @@ #pragma once -#include +#include #include #include #include diff --git a/packages/react-native/ReactCxxPlatform/react/utils/RunLoopObserverManager.h b/packages/react-native/ReactCxxPlatform/react/utils/RunLoopObserverManager.h index f7b0f241e99..6ea85411c73 100644 --- a/packages/react-native/ReactCxxPlatform/react/utils/RunLoopObserverManager.h +++ b/packages/react-native/ReactCxxPlatform/react/utils/RunLoopObserverManager.h @@ -9,7 +9,7 @@ #include "PlatformRunLoopObserver.h" -#include +#include #include #include diff --git a/packages/react-native/scripts/cocoapods/__tests__/utils-test.rb b/packages/react-native/scripts/cocoapods/__tests__/utils-test.rb index 8432512de07..28590836cfc 100644 --- a/packages/react-native/scripts/cocoapods/__tests__/utils-test.rb +++ b/packages/react-native/scripts/cocoapods/__tests__/utils-test.rb @@ -782,7 +782,7 @@ class UtilsTests < Test::Unit::TestCase # Assert user_project_mock.build_configurations.each do |config| received_search_path = config.build_settings["HEADER_SEARCH_PATHS"] - expected_search_path = "$(inherited) ${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers ${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core ${PODS_CONFIGURATION_BUILD_DIR}/React-runtimeexecutor/React_runtimeexecutor.framework/Headers ${PODS_CONFIGURATION_BUILD_DIR}/React-runtimeexecutor/React_runtimeexecutor.framework/Headers/platform/ios ${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon-Samples/ReactCommon_Samples.framework/Headers ${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon-Samples/ReactCommon_Samples.framework/Headers/platform/ios ${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/components/view/platform/cxx ${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/components/scrollview/platform/cxx ${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/components/scrollview/platform/ios ${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers ${PODS_CONFIGURATION_BUILD_DIR}/React-debug/React_debug.framework/Headers ${PODS_CONFIGURATION_BUILD_DIR}/React-rendererdebug/React_rendererdebug.framework/Headers ${PODS_CONFIGURATION_BUILD_DIR}/React-timing/React_timing.framework/Headers ${PODS_CONFIGURATION_BUILD_DIR}/React-utils/React_utils.framework/Headers ${PODS_CONFIGURATION_BUILD_DIR}/React-FabricComponents/React_FabricComponents.framework/Headers/react/renderer/textlayoutmanager/platform/ios ${PODS_CONFIGURATION_BUILD_DIR}/React-FabricComponents/React_FabricComponents.framework/Headers/react/renderer/components/text/platform/cxx ${PODS_CONFIGURATION_BUILD_DIR}/React-FabricComponents/React_FabricComponents.framework/Headers/react/renderer/components/textinput/platform/ios ${PODS_CONFIGURATION_BUILD_DIR}/React-FabricComponents/React_FabricComponents.framework/Headers/react/renderer/components/switch/iosswitch ${PODS_CONFIGURATION_BUILD_DIR}/React-NativeModulesApple/React_NativeModulesApple.framework/Headers ${PODS_CONFIGURATION_BUILD_DIR}/React-bridging/React_bridging.framework/Headers ${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers ${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios ${PODS_CONFIGURATION_BUILD_DIR}/React-featureflags/React_featureflags.framework/Headers ${PODS_CONFIGURATION_BUILD_DIR}/React-renderercss/React_renderercss.framework/Headers ${PODS_CONFIGURATION_BUILD_DIR}/React-cxxstableapi/React_cxxstableapi.framework/Headers" + expected_search_path = "$(inherited) ${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers ${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core ${PODS_CONFIGURATION_BUILD_DIR}/React-runtimeexecutor/React_runtimeexecutor.framework/Headers ${PODS_CONFIGURATION_BUILD_DIR}/React-runtimeexecutor/React_runtimeexecutor.framework/Headers/platform/ios ${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon-Samples/ReactCommon_Samples.framework/Headers ${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon-Samples/ReactCommon_Samples.framework/Headers/platform/ios ${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/components/view/platform/cxx ${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/components/scrollview/platform/cxx ${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/components/scrollview/platform/ios ${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers ${PODS_CONFIGURATION_BUILD_DIR}/React-callinvoker/React_callinvoker.framework/Headers ${PODS_CONFIGURATION_BUILD_DIR}/React-cxxreact/React_cxxreact.framework/Headers ${PODS_CONFIGURATION_BUILD_DIR}/React-debug/React_debug.framework/Headers ${PODS_CONFIGURATION_BUILD_DIR}/React-rendererdebug/React_rendererdebug.framework/Headers ${PODS_CONFIGURATION_BUILD_DIR}/React-timing/React_timing.framework/Headers ${PODS_CONFIGURATION_BUILD_DIR}/React-utils/React_utils.framework/Headers ${PODS_CONFIGURATION_BUILD_DIR}/React-FabricComponents/React_FabricComponents.framework/Headers/react/renderer/textlayoutmanager/platform/ios ${PODS_CONFIGURATION_BUILD_DIR}/React-FabricComponents/React_FabricComponents.framework/Headers/react/renderer/components/text/platform/cxx ${PODS_CONFIGURATION_BUILD_DIR}/React-FabricComponents/React_FabricComponents.framework/Headers/react/renderer/components/textinput/platform/ios ${PODS_CONFIGURATION_BUILD_DIR}/React-FabricComponents/React_FabricComponents.framework/Headers/react/renderer/components/switch/iosswitch ${PODS_CONFIGURATION_BUILD_DIR}/React-NativeModulesApple/React_NativeModulesApple.framework/Headers ${PODS_CONFIGURATION_BUILD_DIR}/React-bridging/React_bridging.framework/Headers ${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers ${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios ${PODS_CONFIGURATION_BUILD_DIR}/React-featureflags/React_featureflags.framework/Headers ${PODS_CONFIGURATION_BUILD_DIR}/React-renderercss/React_renderercss.framework/Headers ${PODS_CONFIGURATION_BUILD_DIR}/React-cxxstableapi/React_cxxstableapi.framework/Headers" assert_equal(expected_search_path, received_search_path) end @@ -986,6 +986,8 @@ class UtilsTests < Test::Unit::TestCase assert_equal([ "${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers", + "${PODS_CONFIGURATION_BUILD_DIR}/React-callinvoker/React_callinvoker.framework/Headers", + "${PODS_CONFIGURATION_BUILD_DIR}/React-cxxreact/React_cxxreact.framework/Headers", "${PODS_CONFIGURATION_BUILD_DIR}/React-debug/React_debug.framework/Headers", "${PODS_CONFIGURATION_BUILD_DIR}/React-rendererdebug/React_rendererdebug.framework/Headers", "${PODS_CONFIGURATION_BUILD_DIR}/React-timing/React_timing.framework/Headers", diff --git a/packages/react-native/scripts/cocoapods/utils.rb b/packages/react-native/scripts/cocoapods/utils.rb index 119ce41c24b..237aa084c66 100644 --- a/packages/react-native/scripts/cocoapods/utils.rb +++ b/packages/react-native/scripts/cocoapods/utils.rb @@ -366,6 +366,8 @@ class ReactNativePodsUtils def self.stable_umbrella_frameworks [ ["React-Fabric", "React_Fabric"], + ["React-callinvoker", "React_callinvoker"], + ["React-cxxreact", "React_cxxreact"], ["React-debug", "React_debug"], ["React-rendererdebug", "React_rendererdebug"], ["React-timing", "React_timing"],