Skip to content

Commit 3ad5e81

Browse files
committed
[DevTools][iOS] Compile React DevTools runtime settings modules out of production builds
1 parent cf90a81 commit 3ad5e81

7 files changed

Lines changed: 38 additions & 2 deletions

File tree

‎packages/react-native/Package.swift‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,10 @@ let reactCoreModules = RNTarget(
420420
path: "React/CoreModules",
421421
linkedFrameworks: ["Accessibility"],
422422
excludedPaths: ["PlatformStubs/RCTStatusBarManager.mm"],
423-
dependencies: [.reactNativeDependencies, .jsi, .yoga, .reactTurboModuleCore, .reactFeatureFlags]
423+
dependencies: [.reactNativeDependencies, .jsi, .yoga, .reactTurboModuleCore, .reactFeatureFlags],
424+
defines: [
425+
CXXSetting.define("REACT_NATIVE_DEBUGGER_ENABLED_DEVONLY", to: "1", .when(configuration: BuildConfiguration.debug))
426+
]
424427
)
425428

426429
/// React-runtimeCore.podspec

‎packages/react-native/React/CoreModules/RCTDevToolsRuntimeSettingsModule.mm‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010

1111
#import "CoreModulesPlugins.h"
1212

13+
#ifdef REACT_NATIVE_DEBUGGER_ENABLED_DEVONLY
14+
1315
struct Config {
1416
bool shouldReloadAndProfile = false;
1517
bool recordChangeDescriptions = false;
@@ -51,7 +53,13 @@ - (void)setReloadAndProfileConfig:(JS::NativeReactDevToolsRuntimeSettingsModule:
5153

5254
@end
5355

56+
#endif // REACT_NATIVE_DEBUGGER_ENABLED_DEVONLY
57+
5458
Class RCTDevToolsRuntimeSettingsCls(void)
5559
{
60+
#ifdef REACT_NATIVE_DEBUGGER_ENABLED_DEVONLY
5661
return RCTDevToolsRuntimeSettingsModule.class;
62+
#else
63+
return nil;
64+
#endif
5765
}

‎packages/react-native/ReactCommon/devtoolsruntimesettings/CMakeLists.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,9 @@ target_include_directories(devtoolsruntimesettings PUBLIC .)
1515

1616
target_link_libraries(devtoolsruntimesettings jsi react_codegen_rncore react_cxxstableapi)
1717
target_compile_reactnative_options(devtoolsruntimesettings PRIVATE)
18+
19+
if(${CMAKE_BUILD_TYPE} MATCHES Debug OR REACT_NATIVE_DEBUG_OPTIMIZED)
20+
target_compile_options(devtoolsruntimesettings PRIVATE
21+
-DREACT_NATIVE_DEBUGGER_ENABLED_DEVONLY=1
22+
)
23+
endif ()

‎packages/react-native/ReactCommon/devtoolsruntimesettings/DevToolsRuntimeSettings.cpp‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77

88
#include "DevToolsRuntimeSettings.h"
99

10+
#ifdef REACT_NATIVE_DEBUGGER_ENABLED_DEVONLY
11+
1012
namespace facebook::react {
1113

1214
void DevToolsRuntimeSettings::setReloadAndProfileConfig(
@@ -25,3 +27,5 @@ DevToolsRuntimeSettings::getReloadAndProfileConfig() const {
2527
};
2628

2729
} // namespace facebook::react
30+
31+
#endif // REACT_NATIVE_DEBUGGER_ENABLED_DEVONLY

‎packages/react-native/ReactCommon/react/nativemodule/devtoolsruntimesettings/CMakeLists.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,9 @@ target_link_libraries(react_nativemodule_devtoolsruntimesettings
1919
)
2020
target_compile_reactnative_options(react_nativemodule_devtoolsruntimesettings PRIVATE)
2121
target_compile_options(react_nativemodule_devtoolsruntimesettings PRIVATE -Wpedantic)
22+
23+
if(${CMAKE_BUILD_TYPE} MATCHES Debug OR REACT_NATIVE_DEBUG_OPTIMIZED)
24+
target_compile_options(react_nativemodule_devtoolsruntimesettings PRIVATE
25+
-DREACT_NATIVE_DEBUGGER_ENABLED_DEVONLY=1
26+
)
27+
endif ()

‎packages/react-native/ReactCommon/react/nativemodule/devtoolsruntimesettings/DevToolsRuntimeSettingsModule.cpp‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,17 @@
1212

1313
std::shared_ptr<facebook::react::TurboModule>
1414
ReactDevToolsRuntimeSettingsModuleProvider(
15-
std::shared_ptr<facebook::react::CallInvoker> jsInvoker) {
15+
[[maybe_unused]] std::shared_ptr<facebook::react::CallInvoker> jsInvoker) {
16+
#ifdef REACT_NATIVE_DEBUGGER_ENABLED_DEVONLY
1617
return std::make_shared<facebook::react::DevToolsRuntimeSettingsModule>(
1718
std::move(jsInvoker));
19+
#else
20+
return nullptr;
21+
#endif
1822
}
1923

24+
#ifdef REACT_NATIVE_DEBUGGER_ENABLED_DEVONLY
25+
2026
namespace facebook::react {
2127

2228
DevToolsRuntimeSettingsModule::DevToolsRuntimeSettingsModule(
@@ -35,3 +41,5 @@ DevToolsRuntimeSettingsModule::getReloadAndProfileConfig(jsi::Runtime& /*rt*/) {
3541
};
3642

3743
} // namespace facebook::react
44+
45+
#endif // REACT_NATIVE_DEBUGGER_ENABLED_DEVONLY

‎packages/react-native/scripts/cocoapods/utils.rb‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ def self.set_gcc_preprocessor_definition_for_debugger(installer)
116116
self.add_build_settings_to_pod(installer, "GCC_PREPROCESSOR_DEFINITIONS", "REACT_NATIVE_DEBUGGER_ENABLED_DEVONLY=1", "React-jsinspectornetwork", :debug)
117117
self.add_build_settings_to_pod(installer, "GCC_PREPROCESSOR_DEFINITIONS", "REACT_NATIVE_DEBUGGER_ENABLED_DEVONLY=1", "React-RCTNetwork", :debug)
118118
self.add_build_settings_to_pod(installer, "GCC_PREPROCESSOR_DEFINITIONS", "REACT_NATIVE_DEBUGGER_ENABLED_DEVONLY=1", "React-networking", :debug)
119+
self.add_build_settings_to_pod(installer, "GCC_PREPROCESSOR_DEFINITIONS", "REACT_NATIVE_DEBUGGER_ENABLED_DEVONLY=1", "React-CoreModules", :debug)
119120
end
120121

121122
# The react/cxxstableapi guards turn a direct include of a fine-grained React Native

0 commit comments

Comments
 (0)