mirror of
https://github.com/facebook/react-native.git
synced 2026-11-18 20:19:07 +00:00
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`: `<React/CallInvoker.h>`; `NSDataBigString.h`: `<React/JSBigString.h>`. - Android `react/fabric/AnimatedPropBufferEncoder.h`: `<React/RendererCore.h>`; `react/runtime/jni/JJSTimerExecutor.h`, `JReactInstance.h`: `<React/RuntimeExecutor.h>`. - ReactCxxPlatform `ImageLoaderModule.h`, `NativeExceptionsManager.h`: `<React/Bridging.h>`; `IMountingManager.h`, `RunLoopObserverManager.h`: `<React/RendererCore.h>`; `ReactHost.h`: `<React/CallInvoker.h>`, `<React/NativeModuleCore.h>`; `ReactInstanceConfig.h`: `<React/Debug.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 `<React/...>` 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
This commit is contained in:
1 parent
b8ec87e457
commit
b6a09aa5da
14 files changed
+18
-14
No files matched your search
@@ -6,7 +6,7 @@
|
||||
*/
|
||||
|
||||
#ifdef __cplusplus
|
||||
#import <ReactCommon/CallInvoker.h>
|
||||
#import <React/CallInvoker.h>
|
||||
#endif
|
||||
|
||||
#import "RCTBridgeProxy.h"
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
#import <Foundation/Foundation.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
#import <ReactCommon/CallInvoker.h>
|
||||
#import <React/CallInvoker.h>
|
||||
#endif
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
#import <Foundation/Foundation.h>
|
||||
|
||||
#include <cxxreact/JSBigString.h>
|
||||
#include <React/JSBigString.h>
|
||||
|
||||
namespace facebook::react {
|
||||
|
||||
|
||||
+1
-1
@@ -7,8 +7,8 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <React/RendererCore.h>
|
||||
#include <react/renderer/animationbackend/AnimatedProps.h>
|
||||
#include <react/renderer/core/ReactPrimitives.h>
|
||||
#include <unordered_map>
|
||||
#include <vector>
|
||||
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <ReactCommon/RuntimeExecutor.h>
|
||||
#include <React/RuntimeExecutor.h>
|
||||
#include <fbjni/fbjni.h>
|
||||
#include <jni.h>
|
||||
#include <react/jni/WritableNativeArray.h>
|
||||
|
||||
@@ -7,9 +7,9 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <React/RuntimeExecutor.h>
|
||||
#include <ReactCommon/CallInvokerHolder.h>
|
||||
#include <ReactCommon/NativeMethodCallInvokerHolder.h>
|
||||
#include <ReactCommon/RuntimeExecutor.h>
|
||||
#include <fbjni/fbjni.h>
|
||||
#include <jni.h>
|
||||
#include <jsi/jsi.h>
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <FBReactNativeSpec/FBReactNativeSpecJSI.h>
|
||||
#include <react/bridging/Promise.h>
|
||||
#include <React/Bridging.h>
|
||||
#include <memory>
|
||||
#include <string>
|
||||
#include <utility>
|
||||
|
||||
@@ -8,9 +8,9 @@
|
||||
#pragma once
|
||||
|
||||
#include <FBReactNativeSpec/FBReactNativeSpecJSI.h>
|
||||
#include <React/Bridging.h>
|
||||
#include <folly/dynamic.h>
|
||||
#include <jserrorhandler/JsErrorHandler.h>
|
||||
#include <react/bridging/Base.h>
|
||||
#include <optional>
|
||||
#include <string>
|
||||
#include <utility>
|
||||
|
||||
@@ -7,8 +7,8 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <React/RendererCore.h>
|
||||
#include <react/renderer/componentregistry/ComponentDescriptorFactory.h>
|
||||
#include <react/renderer/core/ComponentDescriptor.h>
|
||||
#include <react/renderer/mounting/MountingTransaction.h>
|
||||
#include <react/renderer/mounting/ShadowView.h>
|
||||
|
||||
|
||||
@@ -9,8 +9,8 @@
|
||||
|
||||
#include "ReactInstanceConfig.h"
|
||||
|
||||
#include <ReactCommon/CallInvoker.h>
|
||||
#include <ReactCommon/TurboModule.h>
|
||||
#include <React/CallInvoker.h>
|
||||
#include <React/NativeModuleCore.h>
|
||||
#include <cxxreact/MessageQueueThread.h>
|
||||
#include <react/logging/DefaultLogger.h>
|
||||
#include <react/nativemodule/JavaScriptModule.h>
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <react/debug/flags.h>
|
||||
#include <React/Debug.h>
|
||||
#include <functional>
|
||||
#include <memory>
|
||||
#include <string>
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
#include "PlatformRunLoopObserver.h"
|
||||
|
||||
#include <react/renderer/core/EventBeat.h>
|
||||
#include <React/RendererCore.h>
|
||||
#include <react/renderer/runtimescheduler/RuntimeScheduler.h>
|
||||
#include <memory>
|
||||
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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"],
|
||||
|
||||
Reference in new issue
Block a user