Facebook/react-native
1
0
Fork 0
mirror of https://github.com/facebook/react-native.git synced 2025-11-01 09:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Gate legacy debugger behind a preprocessor directive (#53578)

Browse Source 
Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/53578

Changelog: [Internal]

Adds a new preprocessor directive which should be set when the new Hermes is being used. This directive will disable the legacy debugger which isn't supported by it.

Reviewed By: cipolleschi, cortinico

Differential Revision: D81035112

fbshipit-source-id: b30ae348b3419ec2d064dfe7f91c9d664a66f5cf
This commit is contained in:
Jakub Piasecki
2025-09-04 07:42:12 -07:00
committed by Facebook GitHub Bot
parent 10a46f7b52
commit 30432addfb
13 changed files with 51 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/react-native/ReactAndroid/src/main/jni/react/hermes/reactexecutor/CMakeLists.txt
+4
View File
@@ -27,4 +27,8 @@ target_link_libraries(
target_compile_reactnative_options(hermes_executor PRIVATE)
if(${CMAKE_BUILD_TYPE} MATCHES Debug OR REACT_NATIVE_DEBUG_OPTIMIZED)
target_compile_options(hermes_executor PRIVATE -DHERMES_ENABLE_DEBUGGER=1)
if (DEFINED HERMES_V1_ENABLED)
target_compile_options(hermes_executor PRIVATE -DHERMES_V1_ENABLED=1)
endif()
endif()
packages/react-native/ReactAndroid/src/main/jni/react/runtime/hermes/jni/CMakeLists.txt
+4
View File
@@ -29,4 +29,8 @@ target_link_libraries(hermesinstancejni
target_compile_reactnative_options(hermesinstancejni PRIVATE)
if(${CMAKE_BUILD_TYPE} MATCHES Debug OR REACT_NATIVE_DEBUG_OPTIMIZED)
target_compile_options(hermesinstancejni PRIVATE -DHERMES_ENABLE_DEBUGGER=1)
if (DEFINED HERMES_V1_ENABLED)
target_compile_options(hermesinstancejni PRIVATE -DHERMES_V1_ENABLED=1)
endif()
endif ()
packages/react-native/ReactAndroid/src/main/jni/react/runtime/jni/CMakeLists.txt
+4
View File
@@ -19,6 +19,10 @@ add_library(rninstance
target_compile_reactnative_options(rninstance PRIVATE)
if(${CMAKE_BUILD_TYPE} MATCHES Debug OR REACT_NATIVE_DEBUG_OPTIMIZED)
target_compile_options(rninstance PRIVATE -DHERMES_ENABLE_DEBUGGER=1)
if (DEFINED HERMES_V1_ENABLED)
target_compile_options(rninstance PRIVATE -DHERMES_V1_ENABLED=1)
endif()
endif ()
target_merge_so(rninstance)
packages/react-native/ReactCommon/hermes/executor/CMakeLists.txt
+4
View File
@@ -32,6 +32,10 @@ if(${CMAKE_BUILD_TYPE} MATCHES Debug OR REACT_NATIVE_DEBUG_OPTIMIZED)
PRIVATE
-DHERMES_ENABLE_DEBUGGER=1
)
if (DEFINED HERMES_V1_ENABLED)
target_compile_options(hermes_executor_common PRIVATE -DHERMES_V1_ENABLED=1)
endif()
else()
target_compile_options(
hermes_executor_common
packages/react-native/ReactCommon/hermes/executor/HermesExecutorFactory.cpp
+8 -5
View File
@@ -14,8 +14,11 @@
#include <jsinspector-modern/InspectorFlags.h>
#include <hermes/inspector-modern/chrome/HermesRuntimeTargetDelegate.h>
#if defined(HERMES_ENABLE_DEBUGGER) && !defined(HERMES_V1_ENABLED)
#include <hermes/inspector-modern/chrome/Registration.h>
#include <hermes/inspector/RuntimeAdapter.h>
#endif
using namespace facebook::hermes;
using namespace facebook::jsi;
@@ -24,7 +27,7 @@ namespace facebook::react {
namespace {
#ifdef HERMES_ENABLE_DEBUGGER
#if defined(HERMES_ENABLE_DEBUGGER) && !defined(HERMES_V1_ENABLED)
class HermesExecutorRuntimeAdapter
: public facebook::hermes::inspector_modern::RuntimeAdapter {
@@ -59,7 +62,7 @@ class HermesExecutorRuntimeAdapter
std::shared_ptr<MessageQueueThread> thread_;
};
#endif // HERMES_ENABLE_DEBUGGER
#endif // defined(HERMES_ENABLE_DEBUGGER) && !defined(HERMES_V1_ENABLED)
struct ReentrancyCheck {
// This is effectively a very subtle and complex assert, so only
@@ -144,7 +147,7 @@ class DecoratedRuntime : public jsi::WithRuntimeDecorator<ReentrancyCheck> {
const std::string& debuggerName)
: jsi::WithRuntimeDecorator<ReentrancyCheck>(*runtime, reentrancyCheck_),
runtime_(std::move(runtime)) {
#ifdef HERMES_ENABLE_DEBUGGER
#if defined(HERMES_ENABLE_DEBUGGER) && !defined(HERMES_V1_ENABLED)
enableDebugger_ = enableDebugger;
if (enableDebugger_) {
std::shared_ptr<HermesRuntime> rt(runtime_, &hermesRuntime);
@@ -159,7 +162,7 @@ class DecoratedRuntime : public jsi::WithRuntimeDecorator<ReentrancyCheck> {
}
~DecoratedRuntime() {
#ifdef HERMES_ENABLE_DEBUGGER
#if defined(HERMES_ENABLE_DEBUGGER) && !defined(HERMES_V1_ENABLED)
if (enableDebugger_) {
facebook::hermes::inspector_modern::chrome::disableDebugging(debugToken_);
}
@@ -176,7 +179,7 @@ class DecoratedRuntime : public jsi::WithRuntimeDecorator<ReentrancyCheck> {
std::shared_ptr<Runtime> runtime_;
ReentrancyCheck reentrancyCheck_;
#ifdef HERMES_ENABLE_DEBUGGER
#if defined(HERMES_ENABLE_DEBUGGER) && !defined(HERMES_V1_ENABLED)
bool enableDebugger_;
facebook::hermes::inspector_modern::chrome::DebugSessionToken debugToken_;
#endif // HERMES_ENABLE_DEBUGGER
packages/react-native/ReactCommon/hermes/inspector-modern/CMakeLists.txt
+4
View File
@@ -23,6 +23,10 @@ if(${CMAKE_BUILD_TYPE} MATCHES Debug OR REACT_NATIVE_DEBUG_OPTIMIZED)
PRIVATE
-DHERMES_ENABLE_DEBUGGER=1
)
if (DEFINED HERMES_V1_ENABLED)
target_compile_options(hermes_inspector_modern PRIVATE -DHERMES_V1_ENABLED=1)
endif()
endif()
target_include_directories(hermes_inspector_modern PUBLIC ${REACT_COMMON_DIR})
packages/react-native/ReactCommon/hermes/inspector-modern/chrome/ConnectionDemux.cpp
+2 -2
View File
@@ -7,7 +7,7 @@
#include "ConnectionDemux.h"
#ifdef HERMES_ENABLE_DEBUGGER
#if defined(HERMES_ENABLE_DEBUGGER) && !defined(HERMES_V1_ENABLED)
#include <hermes/inspector/RuntimeAdapter.h>
#include <hermes/inspector/chrome/CDPHandler.h>
@@ -139,4 +139,4 @@ void ConnectionDemux::removePage(int pageId) {
} // namespace facebook::hermes::inspector_modern::chrome
#endif // HERMES_ENABLE_DEBUGGER
#endif // defined(HERMES_ENABLE_DEBUGGER) && !defined(HERMES_V1_ENABLED)
packages/react-native/ReactCommon/hermes/inspector-modern/chrome/ConnectionDemux.h
+2 -2
View File
@@ -7,7 +7,7 @@
#pragma once
#ifdef HERMES_ENABLE_DEBUGGER
#if defined(HERMES_ENABLE_DEBUGGER) && !defined(HERMES_V1_ENABLED)
#include <memory>
#include <mutex>
@@ -59,4 +59,4 @@ class ConnectionDemux {
} // namespace facebook::hermes::inspector_modern::chrome
#endif // HERMES_ENABLE_DEBUGGER
#endif // defined(HERMES_ENABLE_DEBUGGER) && !defined(HERMES_V1_ENABLED)
packages/react-native/ReactCommon/hermes/inspector-modern/chrome/Registration.cpp
+2 -2
View File
@@ -8,7 +8,7 @@
#include "Registration.h"
#include "ConnectionDemux.h"
#ifdef HERMES_ENABLE_DEBUGGER
#if defined(HERMES_ENABLE_DEBUGGER) && !defined(HERMES_V1_ENABLED)
namespace facebook::hermes::inspector_modern::chrome {
@@ -34,4 +34,4 @@ void disableDebugging(DebugSessionToken session) {
} // namespace facebook::hermes::inspector_modern::chrome
#endif // HERMES_ENABLE_DEBUGGER
#endif // defined(HERMES_ENABLE_DEBUGGER) && !defined(HERMES_V1_ENABLED)
packages/react-native/ReactCommon/hermes/inspector-modern/chrome/Registration.h
+2 -2
View File
@@ -7,7 +7,7 @@
#pragma once
#ifdef HERMES_ENABLE_DEBUGGER
#if defined(HERMES_ENABLE_DEBUGGER) && !defined(HERMES_V1_ENABLED)
#include <memory>
#include <string>
@@ -38,4 +38,4 @@ extern void disableDebugging(DebugSessionToken session);
} // namespace facebook::hermes::inspector_modern::chrome
#endif // HERMES_ENABLE_DEBUGGER
#endif // defined(HERMES_ENABLE_DEBUGGER) && !defined(HERMES_V1_ENABLED)
packages/react-native/ReactCommon/react/runtime/CMakeLists.txt
+4
View File
@@ -18,6 +18,10 @@ add_library(bridgeless
target_compile_reactnative_options(bridgeless PRIVATE)
if(${CMAKE_BUILD_TYPE} MATCHES Debug OR REACT_NATIVE_DEBUG_OPTIMIZED)
target_compile_options(bridgeless PRIVATE -DHERMES_ENABLE_DEBUGGER=1)
if (DEFINED HERMES_V1_ENABLED)
target_compile_options(bridgeless PRIVATE -DHERMES_V1_ENABLED=1)
endif()
endif ()
target_include_directories(bridgeless PUBLIC .)
packages/react-native/ReactCommon/react/runtime/hermes/CMakeLists.txt
+4
View File
@@ -35,4 +35,8 @@ if(${CMAKE_BUILD_TYPE} MATCHES Debug OR REACT_NATIVE_DEBUG_OPTIMIZED)
PRIVATE
-DHERMES_ENABLE_DEBUGGER=1
)
if (DEFINED HERMES_V1_ENABLED)
target_compile_options(bridgelesshermes PRIVATE -DHERMES_V1_ENABLED=1)
endif()
endif()
packages/react-native/ReactCommon/react/runtime/hermes/HermesInstance.cpp
+7 -3
View File
@@ -14,7 +14,11 @@
#ifdef HERMES_ENABLE_DEBUGGER
#include <hermes/inspector-modern/chrome/Registration.h>
#ifndef HERMES_V1_ENABLED
#include <hermes/inspector/RuntimeAdapter.h>
#endif
#include <jsi/decorator.h>
#endif
@@ -23,7 +27,7 @@ using namespace facebook::jsi;
namespace facebook::react {
#ifdef HERMES_ENABLE_DEBUGGER
#if defined(HERMES_ENABLE_DEBUGGER) && !defined(HERMES_V1_ENABLED)
// Wrapper that strongly retains the HermesRuntime for on device debugging.
//
@@ -90,7 +94,7 @@ class DecoratedRuntime : public jsi::RuntimeDecorator<jsi::Runtime> {
inspector_modern::chrome::DebugSessionToken debugToken_;
};
#endif
#endif // defined(HERMES_ENABLE_DEBUGGER) && !defined(HERMES_V1_ENABLED)
class HermesJSRuntime : public JSRuntime {
public:
@@ -157,7 +161,7 @@ std::unique_ptr<JSRuntime> HermesInstance::createJSRuntime(
.getPropertyAsObject(*hermesRuntime, "prototype");
errorPrototype.setProperty(*hermesRuntime, "jsEngine", "hermes");
#ifdef HERMES_ENABLE_DEBUGGER
#if defined(HERMES_ENABLE_DEBUGGER) && !defined(HERMES_V1_ENABLED)
auto& inspectorFlags = jsinspector_modern::InspectorFlags::getInstance();
if (!inspectorFlags.getFuseboxEnabled()) {
std::unique_ptr<DecoratedRuntime> decoratedRuntime =