Skip to content

Commit a300779

Browse files
j-piaseckifacebook-github-bot
authored andcommitted
Include umbrella headers from jsinspector-modern (#58707)
Summary: `jsinspector-modern` headers included three public-tier headers directly: `react/timing/primitives.h`, `react/utils/OnScopeExit.h` and `ReactCommon/RuntimeExecutor.h`. These are protected by `UmbrellaGuard.h`, so any consumer that defined `RN_STRICT_API` and included one of the affected jsinspector headers (e.g. `RuntimeTarget.h`, `HostTarget.h`, `ReactCdp.h`) hit a hard `#error`, even with `RN_ALLOW_FRAMEWORKS` defined. Switch to the module umbrellas `<React/Timing.h>`, `<React/Utils.h>` and `<React/RuntimeExecutor.h>`, and declare the `react/timing` dependency that was previously used without being declared (BUCK, CMake, CocoaPods). Changelog: [Internal] Differential Revision: D122118482
1 parent 085caf0 commit a300779

7 files changed

Lines changed: 7 additions & 5 deletions

File tree

‎packages/react-native/Package.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ let reactJsInspector = RNTarget(
194194
name: .reactJsInspector,
195195
path: "ReactCommon/jsinspector-modern",
196196
excludedPaths: ["tracing", "network", "tests"],
197-
dependencies: [.reactNativeDependencies, .reactFeatureFlags, .jsi, .reactJsInspectorTracing, .reactJsInspectorNetwork, .reactRuntimeExecutor, .reactPerfLogger],
197+
dependencies: [.reactNativeDependencies, .reactFeatureFlags, .jsi, .reactJsInspectorTracing, .reactJsInspectorNetwork, .reactRuntimeExecutor, .reactPerfLogger, .reactUtils],
198198
defines: [
199199
CXXSetting.define("REACT_NATIVE_DEBUGGER_ENABLED", to: "1", .when(configuration: BuildConfiguration.debug)),
200200
CXXSetting.define("REACT_NATIVE_DEBUGGER_ENABLED_DEVONLY", to: "1", .when(configuration: BuildConfiguration.debug)),

‎packages/react-native/ReactCommon/jsinspector-modern/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ target_link_libraries(jsinspector
2525
jsinspector_tracing
2626
react_cxxstableapi
2727
react_featureflags
28+
react_timing
2829
runtimeexecutor
2930
reactperflogger
3031
react_utils

‎packages/react-native/ReactCommon/jsinspector-modern/HostTargetTraceRecording.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
#include "HostTarget.h"
1414
#include "InstanceTarget.h"
1515

16+
#include <React/Timing.h>
1617
#include <jsinspector-modern/tracing/FrameTimingSequence.h>
1718
#include <jsinspector-modern/tracing/HostTracingProfile.h>
1819
#include <jsinspector-modern/tracing/TimeWindowedBuffer.h>
1920
#include <jsinspector-modern/tracing/TraceRecordingState.h>
2021
#include <jsinspector-modern/tracing/TracingCategory.h>
21-
#include <react/timing/primitives.h>
2222

2323
#include <optional>
2424
#include <set>

‎packages/react-native/ReactCommon/jsinspector-modern/React-jsinspector.podspec‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ Pod::Spec.new do |s|
5555
add_dependency(s, "React-jsinspectortracing", :framework_name => 'jsinspector_moderntracing')
5656
s.dependency "React-perflogger", version
5757
s.dependency "React-cxxstableapi"
58+
s.dependency "React-timing"
5859
add_dependency(s, "React-oscompat")
5960
add_dependency(s, "React-utils", :additional_framework_paths => ["react/utils/platform/ios"])
6061
if use_hermes()

‎packages/react-native/ReactCommon/jsinspector-modern/RuntimeTarget.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include "StackTrace.h"
1919
#include "WeakList.h"
2020

21-
#include <ReactCommon/RuntimeExecutor.h>
21+
#include <React/RuntimeExecutor.h>
2222
#include <jsinspector-modern/tracing/RuntimeSamplingProfile.h>
2323
#include <jsinspector-modern/tracing/TraceRecordingState.h>
2424

‎packages/react-native/ReactCommon/jsinspector-modern/ScopedExecutor.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
#include <react/cxxstableapi/FrameworksGuard.h>
1111

12-
#include <react/utils/OnScopeExit.h>
12+
#include <React/Utils.h>
1313
#include <cassert>
1414
#include <functional>
1515
#include <memory>

‎packages/react-native/ReactCommon/jsinspector-modern/TracingAgent.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
#include "HostTarget.h"
1313
#include "InspectorInterfaces.h"
1414

15+
#include <React/Timing.h>
1516
#include <jsinspector-modern/cdp/CdpJson.h>
1617
#include <jsinspector-modern/tracing/HostTracingProfile.h>
1718
#include <jsinspector-modern/tracing/Timing.h>
18-
#include <react/timing/primitives.h>
1919

2020
namespace facebook::react::jsinspector_modern {
2121

0 commit comments

Comments
 (0)