react-native-tvos 0.80.1-0 → 0.81.0-0

package/ReactCommon/cxxreact/RAMBundleRegistry.h

@@ -7,6 +7,8 @@
 
 #pragma once
 
+#ifndef RCT_FIT_RM_OLD_RUNTIME
+
 #include <cstdint>
 #include <functional>
 #include <memory>
@@ -41,7 +43,7 @@ class RN_EXPORT RAMBundleRegistry {
 
   void registerBundle(uint32_t bundleId, std::string bundlePath);
   JSModulesUnbundle::Module getModule(uint32_t bundleId, uint32_t moduleId);
-  virtual ~RAMBundleRegistry(){};
+  virtual ~RAMBundleRegistry() = default;
 
  private:
   JSModulesUnbundle* getBundle(uint32_t bundleId) const;
@@ -52,3 +54,5 @@ class RN_EXPORT RAMBundleRegistry {
 };
 
 } // namespace facebook::react
+
+#endif // RCT_FIT_RM_OLD_RUNTIME

package/ReactCommon/cxxreact/React-cxxreact.podspec

@@ -27,8 +27,7 @@ Pod::Spec.new do |s|
   s.author                 = "Meta Platforms, Inc. and its affiliates"
   s.platforms              = min_supported_versions
   s.source                 = source
-  s.source_files           = "*.{cpp,h}"
-  s.exclude_files          = "SampleCxxModule.*"
+  s.source_files           = podspec_sources("*.{cpp,h}", "*.h")
   s.pod_target_xcconfig    = {
     "HEADER_SEARCH_PATHS" => "\"$(PODS_CONFIGURATION_BUILD_DIR)/React-debug/React_debug.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-runtimeexecutor/React_runtimeexecutor.framework/Headers\"",
     "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard()
@@ -39,7 +38,7 @@ Pod::Spec.new do |s|
   add_dependency(s, "React-jsinspectorcdp", :framework_name => 'jsinspector_moderncdp')
   add_dependency(s, "React-jsinspectortracing", :framework_name => 'jsinspector_moderntracing')
   s.dependency "React-callinvoker", version
-  s.dependency "React-runtimeexecutor", version
+  add_dependency(s, "React-runtimeexecutor", :additional_framework_paths => ["platform/ios"])
   s.dependency "React-perflogger", version
   s.dependency "React-jsi", version
   s.dependency "React-logger", version
@@ -48,9 +47,10 @@ Pod::Spec.new do |s|
 
   s.resource_bundles = {'React-cxxreact_privacy' => 'PrivacyInfo.xcprivacy'}
 
-  if ENV['USE_HERMES'] == nil || ENV['USE_HERMES'] == "1"
+  if use_hermes()
     s.dependency 'hermes-engine'
   end
 
   add_rn_third_party_dependencies(s)
+  add_rncore_dependency(s)
 end

package/ReactCommon/cxxreact/ReactMarker.cpp

@@ -8,8 +8,7 @@
 #include "ReactMarker.h"
 #include <cxxreact/JSExecutor.h>
 
-namespace facebook::react {
-namespace ReactMarker {
+namespace facebook::react::ReactMarker {
 
 #if __clang__
 #pragma clang diagnostic push
@@ -138,5 +137,4 @@ double StartupLogger::getAppStartupEndTime() {
   return appStartupEndTime;
 }
 
-} // namespace ReactMarker
-} // namespace facebook::react
+} // namespace facebook::react::ReactMarker

package/ReactCommon/cxxreact/ReactMarker.h

@@ -14,8 +14,7 @@
 #include <functional>
 #endif
 
-namespace facebook::react {
-namespace ReactMarker {
+namespace facebook::react::ReactMarker {
 
 enum ReactMarkerId {
   APP_STARTUP_START,
@@ -106,5 +105,4 @@ extern RN_EXPORT void logMarkerDone(
     const ReactMarkerId markerId,
     double markerTime);
 
-} // namespace ReactMarker
-} // namespace facebook::react
+} // namespace facebook::react::ReactMarker

package/ReactCommon/cxxreact/ReactNativeVersion.h

@@ -16,8 +16,8 @@ namespace facebook::react {
 
 constexpr struct {
   int32_t Major = 0;
-  int32_t Minor = 80;
-  int32_t Patch = 1;
+  int32_t Minor = 81;
+  int32_t Patch = 0;
   std::string_view Prerelease = "0";
 } ReactNativeVersion;
 

package/ReactCommon/cxxreact/SharedProxyCxxModule.h

@@ -11,9 +11,7 @@
 
 #include <cxxreact/CxxModule.h>
 
-namespace facebook {
-namespace xplat {
-namespace module {
+namespace facebook::xplat::module {
 
 // Allows a Cxx-module to be shared or reused across multiple React instances
 // Caveat: the setInstance call is not forwarded, so usages of getInstance
@@ -39,6 +37,4 @@ class SharedProxyCxxModule : public CxxModule {
   std::shared_ptr<CxxModule> shared_;
 };
 
-} // namespace module
-} // namespace xplat
-} // namespace facebook
+} // namespace facebook::xplat::module

package/ReactCommon/devtoolsruntimesettings/CMakeLists.txt

@@ -8,10 +8,10 @@ set(CMAKE_VERBOSE_MAKEFILE on)
 
 include(${REACT_COMMON_DIR}/cmake-utils/react-native-flags.cmake)
 
-add_library(react_devtoolsruntimesettingscxx INTERFACE)
+file(GLOB devtoolsruntimesettings_SRCS *.cpp)
+add_library(devtoolsruntimesettings OBJECT ${devtoolsruntimesettings_SRCS})
 
-target_include_directories(react_devtoolsruntimesettingscxx INTERFACE .)
+target_include_directories(devtoolsruntimesettings PUBLIC .)
 
-target_link_libraries(react_devtoolsruntimesettingscxx jsi)
-target_compile_reactnative_options(react_devtoolsruntimesettingscxx PRIVATE)
-target_compile_options(react_devtoolsruntimesettingscxx PRIVATE -Wpedantic)
+target_link_libraries(devtoolsruntimesettings jsi react_codegen_rncore)
+target_compile_reactnative_options(devtoolsruntimesettings PRIVATE)

package/ReactCommon/hermes/React-hermes.podspec

@@ -26,8 +26,10 @@ Pod::Spec.new do |s|
   s.author                 = "Meta Platforms, Inc. and its affiliates"
   s.platforms              = min_supported_versions
   s.source                 = source
-  s.source_files           = "executor/*.{cpp,h}",
-                             "inspector-modern/chrome/*.{cpp,h}",
+  s.source_files           = podspec_sources(["executor/*.{cpp,h}",
+                              "inspector-modern/chrome/*.{cpp,h}"],
+                              ["executor/*.h",
+                              "inspector-modern/chrome/*.h"])
   s.public_header_files    = "executor/HermesExecutorFactory.h"
   s.pod_target_xcconfig    = {
                                "HEADER_SEARCH_PATHS" => "\"${PODS_ROOT}/hermes-engine/destroot/include\" \"$(PODS_TARGET_SRCROOT)/..\"",
@@ -43,7 +45,8 @@ Pod::Spec.new do |s|
   s.dependency "React-perflogger", version
   s.dependency "hermes-engine"
   s.dependency "React-jsi"
-  s.dependency "React-runtimeexecutor"
+  add_dependency(s, "React-runtimeexecutor", :additional_framework_paths => ["platform/ios"])
 
   add_rn_third_party_dependencies(s)
+  add_rncore_dependency(s)
 end

package/ReactCommon/hermes/executor/CMakeLists.txt

@@ -6,6 +6,7 @@
 cmake_minimum_required(VERSION 3.13)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
+include(${REACT_COMMON_DIR}/cmake-utils/internal/react-native-platform-selector.cmake)
 include(${REACT_COMMON_DIR}/cmake-utils/react-native-flags.cmake)
 
 file(GLOB_RECURSE hermes_executor_SRC CONFIGURE_DEPENDS *.cpp)
@@ -15,11 +16,13 @@ add_library(
         ${hermes_executor_SRC}
 )
 target_include_directories(hermes_executor_common PUBLIC .)
+react_native_android_selector(reactnative reactnative "")
 target_link_libraries(hermes_executor_common
         hermes-engine::libhermes
         hermes_inspector_modern
         jsi
-        reactnative
+        jsireact
+        ${reactnative}
 )
 
 target_compile_reactnative_options(hermes_executor_common PRIVATE)

package/ReactCommon/hermes/executor/React-jsitracing.podspec

@@ -25,7 +25,7 @@ Pod::Spec.new do |s|
   s.author                 = "Meta Platforms, Inc. and its affiliates"
   s.platforms              = min_supported_versions
   s.source                 = source
-  s.source_files           = "JSITracing.{cpp,h}"
+  s.source_files           = podspec_sources("JSITracing.{cpp,h}", "JSITracing.h")
   s.header_dir             = "."
   s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"${PODS_TARGET_SRCROOT}/../..\"",
                                 "USE_HEADERMAP" => "YES",

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

@@ -6,6 +6,7 @@
 cmake_minimum_required(VERSION 3.13)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
+include(${REACT_COMMON_DIR}/cmake-utils/internal/react-native-platform-selector.cmake)
 include(${REACT_COMMON_DIR}/cmake-utils/react-native-flags.cmake)
 
 file(GLOB hermesinspectormodern_SRC CONFIGURE_DEPENDS chrome/*.cpp)
@@ -25,7 +26,9 @@ if(${CMAKE_BUILD_TYPE} MATCHES Debug)
 endif()
 
 target_include_directories(hermes_inspector_modern PUBLIC ${REACT_COMMON_DIR})
+react_native_android_selector(reactnative reactnative "")
 target_link_libraries(hermes_inspector_modern
         hermes-engine::libhermes
         jsi
-        reactnative)
+        jsinspector
+        ${reactnative})

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

@@ -18,9 +18,9 @@ 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.
-const uint32_t FALLBACK_SCRIPT_ID = 0;
+constexpr uint32_t FALLBACK_SCRIPT_ID = 0;
 /// Garbage collector frame name, used for parity with Chromium + V8.
-const std::string GARBAGE_COLLECTOR_FRAME_NAME = "(garbage collector)";
+constexpr std::string_view 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
@@ -74,8 +74,9 @@ RuntimeSamplingProfile::SampleCallStackFrame convertJSFunctionHermesFrame(
       RuntimeSamplingProfile::SampleCallStackFrame::Kind::JSFunction,
       frame.getScriptId(),
       frame.getFunctionName(),
-      frame.hasUrl() ? std::optional<std::string>{frame.getUrl()}
-                     : std::nullopt,
+      frame.hasScriptUrl()
+          ? std::optional<std::string_view>{frame.getScriptUrl()}
+          : std::nullopt,
       frame.hasFunctionLineNumber()
           ? std::optional<uint32_t>{frame.getFunctionLineNumber() - 1}
           // Hermes VM keeps line numbers as 1-based. Convert
@@ -145,7 +146,7 @@ RuntimeSamplingProfile::Sample convertHermesSampleToTracingSample(
 
 /* static */ RuntimeSamplingProfile
 HermesRuntimeSamplingProfileSerializer::serializeToTracingSamplingProfile(
-    const hermes::sampling_profiler::Profile& hermesProfile) {
+    hermes::sampling_profiler::Profile hermesProfile) {
   const auto samplesRange = hermesProfile.getSamplesRange();
   std::vector<RuntimeSamplingProfile::Sample> reconciledSamples;
   reconciledSamples.reserve(hermesProfile.getSamplesCount());
@@ -156,7 +157,10 @@ HermesRuntimeSamplingProfileSerializer::serializeToTracingSamplingProfile(
     reconciledSamples.push_back(std::move(reconciledSample));
   }
 
-  return RuntimeSamplingProfile{"Hermes", std::move(reconciledSamples)};
+  return RuntimeSamplingProfile{
+      "Hermes",
+      std::move(reconciledSamples),
+      std::make_unique<RawHermesRuntimeProfile>(std::move(hermesProfile))};
 }
 
 } // namespace facebook::react::jsinspector_modern::tracing

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

@@ -13,10 +13,20 @@
 
 namespace facebook::react::jsinspector_modern::tracing {
 
+class RawHermesRuntimeProfile : public RawRuntimeProfile {
+ public:
+  explicit RawHermesRuntimeProfile(
+      hermes::sampling_profiler::Profile hermesProfile)
+      : hermesProfile_{std::move(hermesProfile)} {}
+
+ private:
+  hermes::sampling_profiler::Profile hermesProfile_;
+};
+
 class HermesRuntimeSamplingProfileSerializer {
  public:
   static tracing::RuntimeSamplingProfile serializeToTracingSamplingProfile(
-      const hermes::sampling_profiler::Profile& hermesProfile);
+      hermes::sampling_profiler::Profile hermesProfile);
 };
 
 } // namespace facebook::react::jsinspector_modern::tracing

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

@@ -5,6 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+#include <jsi/jsi.h>
 #include <jsinspector-modern/RuntimeTarget.h>
 
 #include "HermesRuntimeSamplingProfileSerializer.h"
@@ -28,13 +29,39 @@ using namespace facebook::hermes;
 
 namespace facebook::react::jsinspector_modern {
 
-#ifdef HERMES_ENABLE_DEBUGGER
 namespace {
 
 const uint16_t HERMES_SAMPLING_FREQUENCY_HZ = 10000;
 
+class HermesRuntimeSamplingProfileDelegate {
+ public:
+  explicit HermesRuntimeSamplingProfileDelegate(
+      std::shared_ptr<HermesRuntime> hermesRuntime)
+      : hermesRuntime_(std::move(hermesRuntime)) {}
+
+  void startSampling() {
+    auto* hermesAPI = jsi::castInterface<IHermesRootAPI>(makeHermesRootAPI());
+    hermesAPI->enableSamplingProfiler(HERMES_SAMPLING_FREQUENCY_HZ);
+  }
+
+  void stopSampling() {
+    auto* hermesAPI = jsi::castInterface<IHermesRootAPI>(makeHermesRootAPI());
+    hermesAPI->disableSamplingProfiler();
+  }
+
+  tracing::RuntimeSamplingProfile collectSamplingProfile() {
+    return tracing::HermesRuntimeSamplingProfileSerializer::
+        serializeToTracingSamplingProfile(
+            hermesRuntime_->dumpSampledTraceToProfile());
+  }
+
+ private:
+  std::shared_ptr<HermesRuntime> hermesRuntime_;
+};
+
 } // namespace
 
+#ifdef HERMES_ENABLE_DEBUGGER
 class HermesRuntimeTargetDelegate::Impl final : public RuntimeTargetDelegate {
   using HermesStackTrace = debugger::StackTrace;
 
@@ -60,8 +87,11 @@ class HermesRuntimeTargetDelegate::Impl final : public RuntimeTargetDelegate {
       HermesRuntimeTargetDelegate& delegate,
       std::shared_ptr<HermesRuntime> hermesRuntime)
       : delegate_(delegate),
-        runtime_(std::move(hermesRuntime)),
-        cdpDebugAPI_(CDPDebugAPI::create(*runtime_)) {}
+        runtime_(hermesRuntime),
+        cdpDebugAPI_(CDPDebugAPI::create(*runtime_)),
+        samplingProfileDelegate_(
+            std::make_unique<HermesRuntimeSamplingProfileDelegate>(
+                std::move(hermesRuntime))) {}
 
   CDPDebugAPI& getCDPDebugAPI() {
     return *cdpDebugAPI_;
@@ -175,23 +205,23 @@ class HermesRuntimeTargetDelegate::Impl final : public RuntimeTargetDelegate {
   }
 
   void enableSamplingProfiler() override {
-    runtime_->enableSamplingProfiler(HERMES_SAMPLING_FREQUENCY_HZ);
+    samplingProfileDelegate_->startSampling();
   }
 
   void disableSamplingProfiler() override {
-    runtime_->disableSamplingProfiler();
+    samplingProfileDelegate_->stopSampling();
   }
 
   tracing::RuntimeSamplingProfile collectSamplingProfile() override {
-    return tracing::HermesRuntimeSamplingProfileSerializer::
-        serializeToTracingSamplingProfile(
-            runtime_->dumpSampledTraceToProfile());
+    return samplingProfileDelegate_->collectSamplingProfile();
   }
 
  private:
   HermesRuntimeTargetDelegate& delegate_;
   std::shared_ptr<HermesRuntime> runtime_;
   const std::unique_ptr<CDPDebugAPI> cdpDebugAPI_;
+  std::unique_ptr<HermesRuntimeSamplingProfileDelegate>
+      samplingProfileDelegate_;
 };
 
 #else
@@ -206,7 +236,26 @@ class HermesRuntimeTargetDelegate::Impl final
   explicit Impl(
       HermesRuntimeTargetDelegate&,
       std::shared_ptr<HermesRuntime> hermesRuntime)
-      : FallbackRuntimeTargetDelegate{hermesRuntime->description()} {}
+      : FallbackRuntimeTargetDelegate{hermesRuntime->description()},
+        samplingProfileDelegate_(
+            std::make_unique<HermesRuntimeSamplingProfileDelegate>(
+                std::move(hermesRuntime))) {}
+
+  void enableSamplingProfiler() override {
+    samplingProfileDelegate_->startSampling();
+  }
+
+  void disableSamplingProfiler() override {
+    samplingProfileDelegate_->stopSampling();
+  }
+
+  tracing::RuntimeSamplingProfile collectSamplingProfile() override {
+    return samplingProfileDelegate_->collectSamplingProfile();
+  }
+
+ private:
+  std::unique_ptr<HermesRuntimeSamplingProfileDelegate>
+      samplingProfileDelegate_;
 };
 
 #endif // HERMES_ENABLE_DEBUGGER

package/ReactCommon/jsc/JSCRuntime.cpp

@@ -18,8 +18,7 @@
 #include <sstream>
 #include <thread>
 
-namespace facebook {
-namespace jsc {
+namespace facebook::jsc {
 
 namespace detail {
 class ArgsConverter;
@@ -1587,5 +1586,4 @@ std::unique_ptr<jsi::Runtime> makeJSCRuntime() {
   return std::make_unique<JSCRuntime>();
 }
 
-} // namespace jsc
-} // namespace facebook
+} // namespace facebook::jsc

package/ReactCommon/jsc/JSCRuntime.h

@@ -10,10 +10,8 @@
 #include <jsi/jsi.h>
 #include <memory.h>
 
-namespace facebook {
-namespace jsc {
+namespace facebook::jsc {
 
 std::unique_ptr<jsi::Runtime> makeJSCRuntime();
 
-} // namespace jsc
-} // namespace facebook
+} // namespace facebook::jsc

package/ReactCommon/jserrorhandler/CMakeLists.txt

@@ -15,10 +15,12 @@ add_library(
         ${js_error_handler_SRC}
 )
 target_include_directories(jserrorhandler PUBLIC .)
+react_native_android_selector(marbufferjni marbufferjni "")
 target_link_libraries(jserrorhandler
         jsi
+        callinvoker
         folly_runtime
-        mapbufferjni
+        ${mapbufferjni}
         react_featureflags
 )
 target_compile_reactnative_options(jserrorhandler PRIVATE)

package/ReactCommon/jserrorhandler/JsErrorHandler.cpp

@@ -125,7 +125,7 @@ namespace facebook::react {
 
 template <>
 struct Bridging<JsErrorHandler::ProcessedError::StackFrame> {
-  static jsi::Value toJs(
+  static jsi::Object toJs(
       jsi::Runtime& runtime,
       const JsErrorHandler::ProcessedError::StackFrame& frame) {
     auto stackFrame = jsi::Object(runtime);
@@ -143,7 +143,7 @@ struct Bridging<JsErrorHandler::ProcessedError::StackFrame> {
 
 template <>
 struct Bridging<JsErrorHandler::ProcessedError> {
-  static jsi::Value toJs(
+  static jsi::Object toJs(
       jsi::Runtime& runtime,
       const JsErrorHandler::ProcessedError& error) {
     auto data = jsi::Object(runtime);
@@ -276,12 +276,6 @@ void JsErrorHandler::handleErrorWithCppPipeline(
     message = *name + ": " + message;
   }
 
-  auto jsEngineValue = errorObj.getProperty(runtime, "jsEngine");
-
-  if (!isLooselyNull(jsEngineValue)) {
-    message += ", js engine: " + stringifyToCpp(runtime, jsEngineValue);
-  }
-
   auto extraDataKey = jsi::PropNameID::forUtf8(runtime, "RN$ErrorExtraDataKey");
   auto extraDataValue = errorObj.getProperty(runtime, extraDataKey);
 
@@ -290,6 +284,7 @@ void JsErrorHandler::handleErrorWithCppPipeline(
     objectAssign(runtime, extraData, extraDataValue.asObject(runtime));
   }
 
+  auto jsEngineValue = errorObj.getProperty(runtime, "jsEngine");
   auto isDEV =
       isTruthy(runtime, runtime.global().getProperty(runtime, "__DEV__"));
 
@@ -341,7 +336,7 @@ void JsErrorHandler::handleErrorWithCppPipeline(
       .extraData = std::move(extraData),
   };
 
-  auto data = bridging::toJs(runtime, processedError).asObject(runtime);
+  auto data = bridging::toJs(runtime, processedError);
 
   auto isComponentError =
       isTruthy(runtime, errorObj.getProperty(runtime, "isComponentError"));

package/ReactCommon/jserrorhandler/React-jserrorhandler.podspec

@@ -28,12 +28,12 @@ Pod::Spec.new do |s|
   s.platforms              = min_supported_versions
   s.source                 = source
   s.header_dir             = "jserrorhandler"
-  s.source_files           = "JsErrorHandler.{cpp,h}", "StackTraceParser.{cpp,h}"
+  s.source_files           = podspec_sources(["JsErrorHandler.{cpp,h}", "StackTraceParser.{cpp,h}"], ["JsErrorHandler.h", "StackTraceParser.h"])
   s.pod_target_xcconfig = {
     "USE_HEADERMAP" => "YES",
     "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard()
   }
-  if ENV['USE_FRAMEWORKS']
+  if ENV['USE_FRAMEWORKS'] && ReactNativeCoreUtils.build_rncore_from_source()
     s.header_mappings_dir     = '../'
     s.module_name             = 'React_jserrorhandler'
   end
@@ -44,10 +44,11 @@ Pod::Spec.new do |s|
   add_dependency(s, "React-featureflags")
   add_dependency(s, "React-debug")
 
-  if ENV['USE_HERMES'] == nil || ENV['USE_HERMES'] == "1"
+  if use_hermes()
     s.dependency 'hermes-engine'
   end
 
   add_rn_third_party_dependencies(s)
+  add_rncore_dependency(s)
 
 end

package/ReactCommon/jserrorhandler/StackTraceParser.cpp

@@ -13,7 +13,7 @@
 #include <sstream>
 #include <string>
 
-using namespace facebook::react;
+namespace facebook::react {
 
 const std::string UNKNOWN_FUNCTION = "<unknown>";
 
@@ -315,3 +315,5 @@ std::vector<JsErrorHandler::ProcessedError::StackFrame> StackTraceParser::parse(
       isHermes ? parseHermes(stackString) : parseOthers(stackString);
   return stackFrames;
 }
+
+} // namespace facebook::react

package/ReactCommon/jsi/CMakeLists.txt

@@ -22,5 +22,5 @@ target_link_libraries(jsi
         folly_runtime
         glog)
 
-target_compile_reactnative_options(jsi PRIVATE "ReactNative")
+target_compile_reactnative_options(jsi PRIVATE)
 target_compile_options(jsi PRIVATE -O3 -Wno-unused-lambda-capture)

package/ReactCommon/jsi/React-jsi.podspec

@@ -5,10 +5,6 @@
 
 require "json"
 
-js_engine = ENV['USE_HERMES'] == "0" ?
-  :jsc :
-  :hermes
-
 package = JSON.parse(File.read(File.join(__dir__, "..", "..", "package.json")))
 version = package['version']
 
@@ -36,13 +32,13 @@ Pod::Spec.new do |s|
     "DEFINES_MODULE" => "YES"
   }
 
-  s.source_files  = "**/*.{cpp,h}"
+  s.source_files  = podspec_sources("**/*.{cpp,h}", "**/*.h")
   files_to_exclude = [
                       "jsi/jsilib-posix.cpp",
                       "jsi/jsilib-windows.cpp",
                       "**/test/*"
                      ]
-  if js_engine == :hermes
+  if use_hermes()
     # JSI is a part of hermes-engine. Including them also in react-native will violate the One Definition Rulle.
     files_to_exclude += [ "jsi/jsi.cpp" ]
     s.dependency "hermes-engine"
@@ -50,4 +46,5 @@ Pod::Spec.new do |s|
   s.exclude_files = files_to_exclude
 
   add_rn_third_party_dependencies(s)
+  add_rncore_dependency(s)
 end

package/ReactCommon/jsi/jsi/CMakeLists.txt

@@ -3,7 +3,7 @@
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.
 
-set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 add_library(jsi

package/ReactCommon/jsi/jsi/decorator.h

@@ -112,6 +112,10 @@ class RuntimeDecorator : public Base, private jsi::Instrumentation {
     return plain_;
   }
 
+  ICast* castInterface(const UUID& interfaceUUID) override {
+    return plain().castInterface(interfaceUUID);
+  }
+
   Value evaluateJavaScript(
       const std::shared_ptr<const Buffer>& buffer,
       const std::string& sourceURL) override {
@@ -393,6 +397,17 @@ class RuntimeDecorator : public Base, private jsi::Instrumentation {
     return plain_.callAsConstructor(f, args, count);
   };
 
+  void setRuntimeDataImpl(
+      const UUID& uuid,
+      const void* data,
+      void (*deleter)(const void* data)) override {
+    return plain_.setRuntimeDataImpl(uuid, data, deleter);
+  }
+
+  const void* getRuntimeDataImpl(const UUID& uuid) override {
+    return plain_.getRuntimeDataImpl(uuid);
+  }
+
   // Private data for managing scopes.
   Runtime::ScopeState* pushScope() override {
     return plain_.pushScope();
@@ -576,6 +591,11 @@ class WithRuntimeDecorator : public RuntimeDecorator<Plain, Base> {
   // the derived class.
   WithRuntimeDecorator(Plain& plain, With& with) : RD(plain), with_(with) {}
 
+  ICast* castInterface(const UUID& interfaceUUID) override {
+    Around around{with_};
+    return RD::castInterface(interfaceUUID);
+  }
+
   Value evaluateJavaScript(
       const std::shared_ptr<const Buffer>& buffer,
       const std::string& sourceURL) override {
@@ -957,6 +977,19 @@ class WithRuntimeDecorator : public RuntimeDecorator<Plain, Base> {
     RD::setExternalMemoryPressure(obj, amount);
   };
 
+  void setRuntimeDataImpl(
+      const UUID& uuid,
+      const void* data,
+      void (*deleter)(const void* data)) override {
+    Around around{with_};
+    RD::setRuntimeDataImpl(uuid, data, deleter);
+  }
+
+  const void* getRuntimeDataImpl(const UUID& uuid) override {
+    Around around{with_};
+    return RD::getRuntimeDataImpl(uuid);
+  }
+
  private:
   // Wrap an RAII type around With& to guarantee after always happens.
   struct Around {