react-native-tvos 0.79.2-0 → 0.80.0-0

package/ReactCommon/hermes/inspector-modern/CMakeLists.txt

@@ -6,18 +6,15 @@
 cmake_minimum_required(VERSION 3.13)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
+include(${REACT_COMMON_DIR}/cmake-utils/react-native-flags.cmake)
+
 file(GLOB hermesinspectormodern_SRC CONFIGURE_DEPENDS chrome/*.cpp)
 
 add_library(hermes_inspector_modern
         OBJECT
         ${hermesinspectormodern_SRC})
 
-target_compile_options(
-        hermes_inspector_modern
-        PRIVATE
-        -std=c++20
-        -fexceptions
-)
+target_compile_reactnative_options(hermes_inspector_modern PRIVATE)
 
 if(${CMAKE_BUILD_TYPE} MATCHES Debug)
         target_compile_options(

package/ReactCommon/hermes/inspector-modern/chrome/ConnectionDemux.cpp

@@ -14,10 +14,7 @@
 
 #include <jsinspector-modern/InspectorInterfaces.h>
 
-namespace facebook {
-namespace hermes {
-namespace inspector_modern {
-namespace chrome {
+namespace facebook::hermes::inspector_modern::chrome {
 
 using ::facebook::react::jsinspector_modern::IInspector;
 using ::facebook::react::jsinspector_modern::ILocalConnection;
@@ -139,9 +136,6 @@ void ConnectionDemux::removePage(int pageId) {
   conns_.erase(pageId);
 }
 
-} // namespace chrome
-} // namespace inspector_modern
-} // namespace hermes
-} // namespace facebook
+} // namespace facebook::hermes::inspector_modern::chrome
 
 #endif // HERMES_ENABLE_DEBUGGER

package/ReactCommon/hermes/inspector-modern/chrome/ConnectionDemux.h

@@ -21,10 +21,7 @@
 #include <hermes/inspector/chrome/CDPHandler.h>
 #include <jsinspector-modern/InspectorInterfaces.h>
 
-namespace facebook {
-namespace hermes {
-namespace inspector_modern {
-namespace chrome {
+namespace facebook::hermes::inspector_modern::chrome {
 
 /*
  * ConnectionDemux keeps track of all debuggable Hermes runtimes (called
@@ -60,9 +57,6 @@ class ConnectionDemux {
   std::shared_ptr<std::unordered_set<std::string>> inspectedContexts_;
 };
 
-} // namespace chrome
-} // namespace inspector_modern
-} // namespace hermes
-} // namespace facebook
+} // namespace facebook::hermes::inspector_modern::chrome
 
 #endif // HERMES_ENABLE_DEBUGGER

package/ReactCommon/hermes/inspector-modern/chrome/HermesRuntimeSamplingProfileSerializer.cpp

@@ -5,12 +5,16 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+#include <variant>
+
 #include "HermesRuntimeSamplingProfileSerializer.h"
 
 namespace facebook::react::jsinspector_modern::tracing {
 
 namespace {
 
+namespace fhsp = facebook::hermes::sampling_profiler;
+
 /// Fallback script ID for call frames, when Hermes didn't provide one or when
 /// this frame is part of the VM, like native functions, used for parity with
 /// Chromium + V8.
@@ -21,123 +25,114 @@ const std::string GARBAGE_COLLECTOR_FRAME_NAME = "(garbage collector)";
 /// Filters out Hermes Suspend frames related to Debugger.
 /// Even though Debugger domain is expected to be disabled, Hermes might run
 /// Debugger loop while recording sampling profile. We only allow GC frames.
-bool shouldIgnoreHermesFrame(
-    hermes::sampling_profiler::ProfileSampleCallStackFrame* hermesFrame) {
-  if (hermesFrame->getKind() !=
-      hermes::sampling_profiler::ProfileSampleCallStackFrame::Kind::Suspend) {
-    return false;
-  }
+inline bool shouldIgnoreHermesFrame(
+    const fhsp::ProfileSampleCallStackSuspendFrame& suspendFrame) {
+  return suspendFrame.getSuspendFrameKind() !=
+      fhsp::ProfileSampleCallStackSuspendFrame::SuspendFrameKind::GC;
+}
 
-  auto* suspendFrame = static_cast<
-      hermes::sampling_profiler::ProfileSampleCallStackSuspendFrame*>(
-      hermesFrame);
-  auto suspendFrameKind = suspendFrame->getSuspendFrameKind();
-  return suspendFrameKind !=
-      hermes::sampling_profiler::ProfileSampleCallStackSuspendFrame::
-          SuspendFrameKind::GC;
+RuntimeSamplingProfile::SampleCallStackFrame convertNativeHermesFrame(
+    const fhsp::ProfileSampleCallStackNativeFunctionFrame& frame) {
+  return RuntimeSamplingProfile::SampleCallStackFrame{
+      RuntimeSamplingProfile::SampleCallStackFrame::Kind::NativeFunction,
+      FALLBACK_SCRIPT_ID, // JavaScript Runtime defines the implementation
+                          // for native function, no script ID to reference.
+      frame.getFunctionName(),
+  };
 }
 
-RuntimeSamplingProfile::SampleCallStackFrame convertHermesFrameToTracingFrame(
-    hermes::sampling_profiler::ProfileSampleCallStackFrame* hermesFrame) {
-  switch (hermesFrame->getKind()) {
-    case hermes::sampling_profiler::ProfileSampleCallStackFrame::Kind::
-        JSFunction: {
-      auto* jsFunctionFrame = static_cast<
-          hermes::sampling_profiler::ProfileSampleCallStackJSFunctionFrame*>(
-          hermesFrame);
-      return RuntimeSamplingProfile::SampleCallStackFrame{
-          RuntimeSamplingProfile::SampleCallStackFrame::Kind::JSFunction,
-          jsFunctionFrame->hasScriptId() ? jsFunctionFrame->getScriptId()
-                                         : FALLBACK_SCRIPT_ID,
-          jsFunctionFrame->getFunctionName(),
-          jsFunctionFrame->hasUrl()
-              ? std::optional<std::string>{jsFunctionFrame->getUrl()}
-              : std::nullopt,
-          jsFunctionFrame->hasLineNumber()
-              ? std::optional<uint32_t>{jsFunctionFrame->getLineNumber() - 1}
-              // Hermes VM keeps line numbers as 1-based. Convert to
-              // 0-based.
-              : std::nullopt,
-          jsFunctionFrame->hasColumnNumber()
-              ? std::optional<uint32_t>{jsFunctionFrame->getColumnNumber() - 1}
-              // Hermes VM keeps column numbers as 1-based. Convert to
-              // 0-based.
-              : std::nullopt,
-      };
-    }
-    case hermes::sampling_profiler::ProfileSampleCallStackFrame::Kind::
-        NativeFunction: {
-      auto* nativeFunctionFrame =
-          static_cast<hermes::sampling_profiler::
-                          ProfileSampleCallStackNativeFunctionFrame*>(
-              hermesFrame);
+RuntimeSamplingProfile::SampleCallStackFrame convertHostFunctionHermesFrame(
+    const fhsp::ProfileSampleCallStackHostFunctionFrame& frame) {
+  return RuntimeSamplingProfile::SampleCallStackFrame{
+      RuntimeSamplingProfile::SampleCallStackFrame::Kind::HostFunction,
+      FALLBACK_SCRIPT_ID, // JavaScript Runtime defines the implementation
+                          // for host function, no script ID to reference.
+      frame.getFunctionName(),
+  };
+}
 
-      return RuntimeSamplingProfile::SampleCallStackFrame{
-          RuntimeSamplingProfile::SampleCallStackFrame::Kind::NativeFunction,
-          FALLBACK_SCRIPT_ID, // JavaScript Runtime defines the implementation
-                              // for native function, no script ID to reference.
-          nativeFunctionFrame->getFunctionName(),
-      };
-    }
-    case hermes::sampling_profiler::ProfileSampleCallStackFrame::Kind::
-        HostFunction: {
-      auto* hostFunctionFrame = static_cast<
-          hermes::sampling_profiler::ProfileSampleCallStackHostFunctionFrame*>(
-          hermesFrame);
-
-      return RuntimeSamplingProfile::SampleCallStackFrame{
-          RuntimeSamplingProfile::SampleCallStackFrame::Kind::HostFunction,
-          FALLBACK_SCRIPT_ID, // JavaScript Runtime defines the implementation
-                              // for host function, no script ID to reference.
-          hostFunctionFrame->getFunctionName(),
-      };
-    }
-    case hermes::sampling_profiler::ProfileSampleCallStackFrame::Kind::
-        Suspend: {
-      auto* suspendFrame = static_cast<
-          hermes::sampling_profiler::ProfileSampleCallStackSuspendFrame*>(
-          hermesFrame);
-      auto suspendFrameKind = suspendFrame->getSuspendFrameKind();
-      if (suspendFrameKind ==
-          hermes::sampling_profiler::ProfileSampleCallStackSuspendFrame::
-              SuspendFrameKind::GC) {
-        return RuntimeSamplingProfile::SampleCallStackFrame{
-            RuntimeSamplingProfile::SampleCallStackFrame::Kind::
-                GarbageCollector,
-            FALLBACK_SCRIPT_ID, // GC frames are part of the VM, no script ID to
-                                // reference.
-            GARBAGE_COLLECTOR_FRAME_NAME,
-        };
-      }
+RuntimeSamplingProfile::SampleCallStackFrame convertSuspendHermesFrame(
+    const fhsp::ProfileSampleCallStackSuspendFrame& frame) {
+  if (frame.getSuspendFrameKind() ==
+      fhsp::ProfileSampleCallStackSuspendFrame::SuspendFrameKind::GC) {
+    return RuntimeSamplingProfile::SampleCallStackFrame{
+        RuntimeSamplingProfile::SampleCallStackFrame::Kind::GarbageCollector,
+        FALLBACK_SCRIPT_ID, // GC frames are part of the VM, no script ID to
+                            // reference.
+        GARBAGE_COLLECTOR_FRAME_NAME,
+    };
+  }
 
-      // We should have filtered out Debugger Suspend frames before in
-      // shouldFilterOutHermesFrame().
-      throw std::logic_error{
-          "Unexpected Suspend frame found in Hermes call stack"};
-    }
+  // We should have filtered out Debugger Suspend frames before in
+  // shouldFilterOutHermesFrame().
+  throw std::logic_error{"Unexpected Suspend frame found in Hermes call stack"};
+}
 
-    default:
-      throw std::logic_error{"Unknown Hermes stack frame kind"};
-  }
+RuntimeSamplingProfile::SampleCallStackFrame convertJSFunctionHermesFrame(
+    const fhsp::ProfileSampleCallStackJSFunctionFrame& frame) {
+  return RuntimeSamplingProfile::SampleCallStackFrame{
+      RuntimeSamplingProfile::SampleCallStackFrame::Kind::JSFunction,
+      frame.getScriptId(),
+      frame.getFunctionName(),
+      frame.hasUrl() ? std::optional<std::string>{frame.getUrl()}
+                     : std::nullopt,
+      frame.hasFunctionLineNumber()
+          ? std::optional<uint32_t>{frame.getFunctionLineNumber() - 1}
+          // Hermes VM keeps line numbers as 1-based. Convert
+          // to 0-based.
+          : std::nullopt,
+      frame.hasFunctionColumnNumber()
+          ? std::optional<uint32_t>{frame.getFunctionColumnNumber() - 1}
+          // Hermes VM keeps column numbers as 1-based. Convert to
+          // 0-based.
+          : std::nullopt,
+  };
 }
 
 RuntimeSamplingProfile::Sample convertHermesSampleToTracingSample(
-    hermes::sampling_profiler::ProfileSample& hermesSample) {
+    const fhsp::ProfileSample& hermesSample) {
   uint64_t reconciledTimestamp = hermesSample.getTimestamp();
-  std::vector<hermes::sampling_profiler::ProfileSampleCallStackFrame*>
-      hermesSampleCallStack = hermesSample.getCallStack();
+  const auto callStackRange = hermesSample.getCallStackFramesRange();
 
   std::vector<RuntimeSamplingProfile::SampleCallStackFrame>
       reconciledSampleCallStack;
-  reconciledSampleCallStack.reserve(hermesSampleCallStack.size());
+  reconciledSampleCallStack.reserve(hermesSample.getCallStackFramesCount());
+
+  for (const auto& hermesFrame : callStackRange) {
+    if (std::holds_alternative<fhsp::ProfileSampleCallStackSuspendFrame>(
+            hermesFrame)) {
+      const auto& suspendFrame =
+          std::get<fhsp::ProfileSampleCallStackSuspendFrame>(hermesFrame);
+      if (shouldIgnoreHermesFrame(suspendFrame)) {
+        continue;
+      }
 
-  for (auto* hermesFrame : hermesSampleCallStack) {
-    if (shouldIgnoreHermesFrame(hermesFrame)) {
-      continue;
+      reconciledSampleCallStack.emplace_back(
+          convertSuspendHermesFrame(suspendFrame));
+    } else if (std::holds_alternative<
+                   fhsp::ProfileSampleCallStackNativeFunctionFrame>(
+                   hermesFrame)) {
+      const auto& nativeFunctionFrame =
+          std::get<fhsp::ProfileSampleCallStackNativeFunctionFrame>(
+              hermesFrame);
+      reconciledSampleCallStack.emplace_back(
+          convertNativeHermesFrame(nativeFunctionFrame));
+    } else if (std::holds_alternative<
+                   fhsp::ProfileSampleCallStackHostFunctionFrame>(
+                   hermesFrame)) {
+      const auto& hostFunctionFrame =
+          std::get<fhsp::ProfileSampleCallStackHostFunctionFrame>(hermesFrame);
+      reconciledSampleCallStack.emplace_back(
+          convertHostFunctionHermesFrame(hostFunctionFrame));
+    } else if (std::holds_alternative<
+                   fhsp::ProfileSampleCallStackJSFunctionFrame>(hermesFrame)) {
+      const auto& jsFunctionFrame =
+          std::get<fhsp::ProfileSampleCallStackJSFunctionFrame>(hermesFrame);
+      reconciledSampleCallStack.emplace_back(
+          convertJSFunctionHermesFrame(jsFunctionFrame));
+    } else {
+      throw std::logic_error{"Unknown Hermes stack frame kind"};
     }
-    RuntimeSamplingProfile::SampleCallStackFrame reconciledFrame =
-        convertHermesFrameToTracingFrame(hermesFrame);
-    reconciledSampleCallStack.push_back(std::move(reconciledFrame));
   }
 
   return RuntimeSamplingProfile::Sample{
@@ -151,12 +146,11 @@ RuntimeSamplingProfile::Sample convertHermesSampleToTracingSample(
 /* static */ RuntimeSamplingProfile
 HermesRuntimeSamplingProfileSerializer::serializeToTracingSamplingProfile(
     const hermes::sampling_profiler::Profile& hermesProfile) {
-  std::vector<hermes::sampling_profiler::ProfileSample> hermesSamples =
-      hermesProfile.getSamples();
+  const auto samplesRange = hermesProfile.getSamplesRange();
   std::vector<RuntimeSamplingProfile::Sample> reconciledSamples;
-  reconciledSamples.reserve(hermesSamples.size());
+  reconciledSamples.reserve(hermesProfile.getSamplesCount());
 
-  for (auto& hermesSample : hermesSamples) {
+  for (const auto& hermesSample : samplesRange) {
     RuntimeSamplingProfile::Sample reconciledSample =
         convertHermesSampleToTracingSample(hermesSample);
     reconciledSamples.push_back(std::move(reconciledSample));

package/ReactCommon/hermes/inspector-modern/chrome/HermesRuntimeTargetDelegate.cpp

@@ -31,7 +31,7 @@ namespace facebook::react::jsinspector_modern {
 #ifdef HERMES_ENABLE_DEBUGGER
 namespace {
 
-const uint16_t HERMES_SAMPLING_FREQUENCY_HZ = 1000;
+const uint16_t HERMES_SAMPLING_FREQUENCY_HZ = 10000;
 
 } // namespace
 

package/ReactCommon/hermes/inspector-modern/chrome/Registration.cpp

@@ -10,10 +10,7 @@
 
 #ifdef HERMES_ENABLE_DEBUGGER
 
-namespace facebook {
-namespace hermes {
-namespace inspector_modern {
-namespace chrome {
+namespace facebook::hermes::inspector_modern::chrome {
 
 namespace {
 
@@ -35,9 +32,6 @@ void disableDebugging(DebugSessionToken session) {
   demux().disableDebugging(session);
 }
 
-} // namespace chrome
-} // namespace inspector_modern
-} // namespace hermes
-} // namespace facebook
+} // namespace facebook::hermes::inspector_modern::chrome
 
 #endif // HERMES_ENABLE_DEBUGGER

package/ReactCommon/hermes/inspector-modern/chrome/Registration.h

@@ -15,10 +15,7 @@
 #include <hermes/hermes.h>
 #include <hermes/inspector/RuntimeAdapter.h>
 
-namespace facebook {
-namespace hermes {
-namespace inspector_modern {
-namespace chrome {
+namespace facebook::hermes::inspector_modern::chrome {
 
 using DebugSessionToken = int;
 
@@ -39,9 +36,6 @@ extern DebugSessionToken enableDebugging(
  */
 extern void disableDebugging(DebugSessionToken session);
 
-} // namespace chrome
-} // namespace inspector_modern
-} // namespace hermes
-} // namespace facebook
+} // namespace facebook::hermes::inspector_modern::chrome
 
 #endif // HERMES_ENABLE_DEBUGGER

package/ReactCommon/jsc/CMakeLists.txt

@@ -10,13 +10,7 @@
 cmake_minimum_required(VERSION 3.13)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
-add_compile_options(
-        -fexceptions
-        -frtti
-        -O3
-        -Wno-unused-lambda-capture
-        -DLOG_TAG=\"ReactNative\")
-
+include(${REACT_COMMON_DIR}/cmake-utils/react-native-flags.cmake)
 include(${REACT_ANDROID_DIR}/src/main/jni/first-party/jni-lib-merge/SoMerging-utils.cmake)
 
 add_library(jscruntime
@@ -35,3 +29,6 @@ target_link_libraries(jscruntime
 if(NOT ${CMAKE_BUILD_TYPE} MATCHES Debug)
         target_compile_options(jscruntime PRIVATE -DNDEBUG)
 endif()
+
+target_compile_reactnative_options(jscruntime PRIVATE "ReactNative")
+target_compile_options(jscruntime PRIVATE -O3 -Wno-unused-lambda-capture)

package/ReactCommon/jsc/React-jsc.podspec

@@ -32,6 +32,6 @@ Pod::Spec.new do |s|
   s.dependency "React-jsi", version
 
   s.subspec "Fabric" do |ss|
-    ss.pod_target_xcconfig  = { "OTHER_CFLAGS" => "$(inherited)" }
+    ss.pod_target_xcconfig  = { "OTHER_CFLAGS" => "$(inherited)", "DEFINES_MODULE" => "YES" }
   end
 end

package/ReactCommon/jserrorhandler/CMakeLists.txt

@@ -6,7 +6,7 @@
 cmake_minimum_required(VERSION 3.13)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
-add_compile_options(-std=c++20)
+include(${REACT_COMMON_DIR}/cmake-utils/react-native-flags.cmake)
 
 file(GLOB js_error_handler_SRC CONFIGURE_DEPENDS *.cpp)
 add_library(
@@ -21,3 +21,4 @@ target_link_libraries(jserrorhandler
         mapbufferjni
         react_featureflags
 )
+target_compile_reactnative_options(jserrorhandler PRIVATE)

package/ReactCommon/jserrorhandler/JsErrorHandler.cpp

@@ -348,11 +348,18 @@ void JsErrorHandler::handleErrorWithCppPipeline(
   data.setProperty(runtime, "isComponentError", isComponentError);
 
   if (logToConsole) {
-    auto console = runtime.global().getPropertyAsObject(runtime, "console");
-    auto errorFn = console.getPropertyAsFunction(runtime, "error");
-    auto finalMessage =
-        jsi::String::createFromUtf8(runtime, processedError.message);
-    errorFn.callWithThis(runtime, console, finalMessage);
+    try {
+      auto console = runtime.global().getPropertyAsObject(runtime, "console");
+      auto errorFn = console.getPropertyAsFunction(runtime, "error");
+      auto finalMessage =
+          jsi::String::createFromUtf8(runtime, processedError.message);
+      errorFn.callWithThis(runtime, console, finalMessage);
+    } catch (jsi::JSError& ex) {
+      logErrorWhileReporting(
+          "handleErrorWithCppPipeline(): Error while logToConsole: ",
+          ex,
+          error);
+    }
   }
 
   std::shared_ptr<bool> shouldPreventDefault = std::make_shared<bool>(false);

package/ReactCommon/jserrorhandler/React-jserrorhandler.podspec

@@ -16,13 +16,6 @@ else
   source[:tag] = "v#{version}"
 end
 
-folly_config = get_folly_config()
-folly_compiler_flags = folly_config[:compiler_flags]
-folly_version = folly_config[:version]
-folly_dep_name = folly_config[:dep_name]
-
-boost_config = get_boost_config()
-boost_compiler_flags = boost_config[:compiler_flags]
 react_native_path = ".."
 
 Pod::Spec.new do |s|
@@ -40,17 +33,13 @@ Pod::Spec.new do |s|
     "USE_HEADERMAP" => "YES",
     "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard()
   }
-  s.compiler_flags         = folly_compiler_flags + ' ' + boost_compiler_flags
-
   if ENV['USE_FRAMEWORKS']
     s.header_mappings_dir     = '../'
     s.module_name             = 'React_jserrorhandler'
   end
 
-  s.dependency folly_dep_name, folly_version
   s.dependency "React-jsi"
   s.dependency "React-cxxreact"
-  s.dependency "glog"
   s.dependency "ReactCommon/turbomodule/bridging"
   add_dependency(s, "React-featureflags")
   add_dependency(s, "React-debug")
@@ -59,4 +48,6 @@ Pod::Spec.new do |s|
     s.dependency 'hermes-engine'
   end
 
+  add_rn_third_party_dependencies(s)
+
 end

package/ReactCommon/jsi/CMakeLists.txt

@@ -10,12 +10,8 @@
 cmake_minimum_required(VERSION 3.13)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
-add_compile_options(
-        -fexceptions
-        -frtti
-        -O3
-        -Wno-unused-lambda-capture
-        -DLOG_TAG=\"ReactNative\")
+include(${REACT_COMMON_DIR}/cmake-utils/react-native-flags.cmake)
+
 
 file(GLOB jsi_SRC CONFIGURE_DEPENDS jsi/*.cpp)
 add_library(jsi SHARED ${jsi_SRC})
@@ -25,3 +21,6 @@ target_include_directories(jsi PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 target_link_libraries(jsi
         folly_runtime
         glog)
+
+target_compile_reactnative_options(jsi PRIVATE "ReactNative")
+target_compile_options(jsi PRIVATE -O3 -Wno-unused-lambda-capture)

package/ReactCommon/jsi/React-jsi.podspec

@@ -20,12 +20,6 @@ else
   source[:tag] = "v#{version}"
 end
 
-folly_config = get_folly_config()
-folly_compiler_flags = folly_config[:compiler_flags]
-folly_version = folly_config[:version]
-boost_config = get_boost_config()
-boost_compiler_flags = boost_config[:compiler_flags]
-
 Pod::Spec.new do |s|
   s.name                   = "React-jsi"
   s.version                = version
@@ -37,20 +31,11 @@ Pod::Spec.new do |s|
   s.source                 = source
 
   s.header_dir    = "jsi"
-  s.compiler_flags         = folly_compiler_flags + ' ' + boost_compiler_flags
   s.pod_target_xcconfig    = {
-    "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/fast_float/include\" \"$(PODS_ROOT)/fmt/include\"",
     "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(),
     "DEFINES_MODULE" => "YES"
   }
 
-  s.dependency "boost"
-  s.dependency "DoubleConversion"
-  s.dependency "fast_float", "6.1.4"
-  s.dependency "fmt", "11.0.2"
-  s.dependency "RCT-Folly", folly_version
-  s.dependency "glog"
-
   s.source_files  = "**/*.{cpp,h}"
   files_to_exclude = [
                       "jsi/jsilib-posix.cpp",
@@ -63,4 +48,6 @@ Pod::Spec.new do |s|
     s.dependency "hermes-engine"
   end
   s.exclude_files = files_to_exclude
+
+  add_rn_third_party_dependencies(s)
 end

package/ReactCommon/jsiexecutor/CMakeLists.txt

@@ -6,11 +6,7 @@
 cmake_minimum_required(VERSION 3.13)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
-add_compile_options(
-        -fexceptions
-        -frtti
-        -std=c++20
-        -O3)
+include(${REACT_COMMON_DIR}/cmake-utils/react-native-flags.cmake)
 
 add_library(jsireact
         OBJECT
@@ -25,3 +21,6 @@ target_link_libraries(jsireact
         folly_runtime
         glog
         jsi)
+
+target_compile_reactnative_options(jsireact PRIVATE)
+target_compile_options(jsireact PRIVATE -O3)

package/ReactCommon/jsiexecutor/React-jsiexecutor.podspec

@@ -16,12 +16,6 @@ else
   source[:tag] = "v#{version}"
 end
 
-folly_config = get_folly_config()
-folly_compiler_flags = folly_config[:compiler_flags]
-folly_version = folly_config[:version]
-boost_config = get_boost_config()
-boost_compiler_flags = boost_config[:compiler_flags]
-
 Pod::Spec.new do |s|
   s.name                   = "React-jsiexecutor"
   s.version                = version
@@ -32,22 +26,18 @@ Pod::Spec.new do |s|
   s.platforms              = min_supported_versions
   s.source                 = source
   s.source_files         = "jsireact/*.{cpp,h}"
-  s.compiler_flags         = folly_compiler_flags + ' ' + boost_compiler_flags
-  s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/fast_float/include\" \"$(PODS_ROOT)/fmt/include\"",
-                               "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard() }
+  s.pod_target_xcconfig    = { "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard() }
   s.header_dir             = "jsireact"
 
   s.dependency "React-cxxreact", version
   s.dependency "React-jsi", version
   s.dependency "React-perflogger", version
-  s.dependency "RCT-Folly", folly_version
-  s.dependency "DoubleConversion"
-  s.dependency "fast_float", "6.1.4"
-  s.dependency "fmt", "11.0.2"
-  s.dependency "glog"
   add_dependency(s, "React-jsinspector", :framework_name => 'jsinspector_modern')
+  add_dependency(s, "React-jsinspectorcdp", :framework_name => 'jsinspector_moderncdp')
   add_dependency(s, "React-jsinspectortracing", :framework_name => 'jsinspector_moderntracing')
   if ENV['USE_HERMES'] == nil || ENV['USE_HERMES'] == "1"
     s.dependency 'hermes-engine'
   end
+
+  add_rn_third_party_dependencies(s)
 end

package/ReactCommon/jsiexecutor/jsireact/JSIExecutor.cpp

@@ -12,7 +12,6 @@
 #include <cxxreact/ModuleRegistry.h>
 #include <cxxreact/ReactMarker.h>
 #include <cxxreact/TraceSection.h>
-#include <folly/Conv.h>
 #include <folly/json.h>
 #include <glog/logging.h>
 #include <jsi/JSIDynamic.h>
@@ -195,7 +194,7 @@ void JSIExecutor::setBundleRegistry(std::unique_ptr<RAMBundleRegistry> r) {
 void JSIExecutor::registerBundle(
     uint32_t bundleId,
     const std::string& bundlePath) {
-  const auto tag = folly::to<std::string>(bundleId);
+  auto tag = std::to_string(bundleId);
   ReactMarker::logTaggedMarker(
       ReactMarker::REGISTER_JS_SEGMENT_START, tag.c_str());
   if (bundleRegistry_) {
@@ -265,7 +264,7 @@ void JSIExecutor::invokeCallback(
         *runtime_, callbackId, valueFromDynamic(*runtime_, arguments));
   } catch (...) {
     std::throw_with_nested(std::runtime_error(
-        folly::to<std::string>("Error invoking callback ", callbackId)));
+        "Error invoking callback " + std::to_string(callbackId)));
   }
 
   callNativeModules(ret, true);
@@ -436,8 +435,9 @@ Value JSIExecutor::nativeRequire(const Value* args, size_t count) {
     throw std::invalid_argument("Got wrong number of args");
   }
 
-  uint32_t moduleId = folly::to<uint32_t>(args[0].getNumber());
-  uint32_t bundleId = count == 2 ? folly::to<uint32_t>(args[1].getNumber()) : 0;
+  auto moduleId = static_cast<uint32_t>(args[0].getNumber());
+  uint32_t bundleId =
+      count == 2 ? static_cast<uint32_t>(args[1].getNumber()) : 0;
   auto module = bundleRegistry_->getModule(bundleId, moduleId);
 
   runtime_->evaluateJavaScript(
@@ -451,8 +451,7 @@ Value JSIExecutor::nativeCallSyncHook(const Value* args, size_t count) {
   }
 
   if (!args[2].isObject() || !args[2].asObject(*runtime_).isArray(*runtime_)) {
-    throw std::invalid_argument(
-        folly::to<std::string>("method parameters should be array"));
+    throw std::invalid_argument("method parameters should be array");
   }
 
   unsigned int moduleId = static_cast<unsigned int>(args[0].getNumber());
@@ -541,7 +540,7 @@ void bindNativeLogger(Runtime& runtime, Logger logger) {
             }
             logger(
                 args[0].asString(runtime).utf8(runtime),
-                folly::to<unsigned int>(args[1].asNumber()));
+                static_cast<unsigned int>(args[1].asNumber()));
             return Value::undefined();
           }));
 }