@depup/react-native 0.86.2-depup.0 → 0.87.1-depup.0

package/ReactAndroid/src/main/jni/react/jni/JReactMarker.cpp

@@ -13,13 +13,14 @@
 
 namespace facebook::react {
 
+namespace {
+const int kInstanceKey = 1;
+}
+
 void JReactMarker::setLogPerfMarkerIfNeeded() {
   static std::once_flag flag{};
   std::call_once(flag, []() {
-    std::unique_lock lock(ReactMarker::logTaggedMarkerImplMutex);
     ReactMarker::logTaggedMarkerImpl = JReactMarker::logPerfMarker;
-    ReactMarker::logTaggedMarkerBridgelessImpl =
-        JReactMarker::logPerfMarkerBridgeless;
   });
 }
 
@@ -51,21 +52,6 @@ void JReactMarker::logMarker(
 void JReactMarker::logPerfMarker(
     const ReactMarker::ReactMarkerId markerId,
     const char* tag) {
-  const int bridgeInstanceKey = 0;
-  logPerfMarkerWithInstanceKey(markerId, tag, bridgeInstanceKey);
-}
-
-void JReactMarker::logPerfMarkerBridgeless(
-    const ReactMarker::ReactMarkerId markerId,
-    const char* tag) {
-  const int bridgelessInstanceKey = 1;
-  logPerfMarkerWithInstanceKey(markerId, tag, bridgelessInstanceKey);
-}
-
-void JReactMarker::logPerfMarkerWithInstanceKey(
-    const ReactMarker::ReactMarkerId markerId,
-    const char* tag,
-    const int instanceKey) {
   switch (markerId) {
     case ReactMarker::APP_STARTUP_START:
       JReactMarker::logMarker("APP_STARTUP_START");
@@ -80,10 +66,10 @@ void JReactMarker::logPerfMarkerWithInstanceKey(
       JReactMarker::logMarker("INIT_REACT_RUNTIME_END");
       break;
     case ReactMarker::RUN_JS_BUNDLE_START:
-      JReactMarker::logMarker("RUN_JS_BUNDLE_START", tag, instanceKey);
+      JReactMarker::logMarker("RUN_JS_BUNDLE_START", tag, kInstanceKey);
       break;
     case ReactMarker::RUN_JS_BUNDLE_STOP:
-      JReactMarker::logMarker("RUN_JS_BUNDLE_END", tag, instanceKey);
+      JReactMarker::logMarker("RUN_JS_BUNDLE_END", tag, kInstanceKey);
       break;
     case ReactMarker::CREATE_REACT_CONTEXT_STOP:
       JReactMarker::logMarker("CREATE_REACT_CONTEXT_END");
@@ -95,16 +81,16 @@ void JReactMarker::logPerfMarkerWithInstanceKey(
       JReactMarker::logMarker("loadApplicationScript_endStringConvert");
       break;
     case ReactMarker::NATIVE_MODULE_SETUP_START:
-      JReactMarker::logMarker("NATIVE_MODULE_SETUP_START", tag, instanceKey);
+      JReactMarker::logMarker("NATIVE_MODULE_SETUP_START", tag, kInstanceKey);
       break;
     case ReactMarker::NATIVE_MODULE_SETUP_STOP:
-      JReactMarker::logMarker("NATIVE_MODULE_SETUP_END", tag, instanceKey);
+      JReactMarker::logMarker("NATIVE_MODULE_SETUP_END", tag, kInstanceKey);
       break;
     case ReactMarker::REGISTER_JS_SEGMENT_START:
-      JReactMarker::logMarker("REGISTER_JS_SEGMENT_START", tag, instanceKey);
+      JReactMarker::logMarker("REGISTER_JS_SEGMENT_START", tag, kInstanceKey);
       break;
     case ReactMarker::REGISTER_JS_SEGMENT_STOP:
-      JReactMarker::logMarker("REGISTER_JS_SEGMENT_STOP", tag, instanceKey);
+      JReactMarker::logMarker("REGISTER_JS_SEGMENT_STOP", tag, kInstanceKey);
       break;
     case ReactMarker::NATIVE_REQUIRE_START:
     case ReactMarker::NATIVE_REQUIRE_STOP:

package/ReactAndroid/src/main/jni/react/jni/JReactMarker.h

@@ -25,8 +25,6 @@ class JReactMarker : public facebook::jni::JavaClass<JReactMarker> {
   static void logMarker(const std::string &marker, const std::string &tag);
   static void logMarker(const std::string &marker, const std::string &tag, int instanceKey);
   static void logPerfMarker(ReactMarker::ReactMarkerId markerId, const char *tag);
-  static void logPerfMarkerBridgeless(ReactMarker::ReactMarkerId markerId, const char *tag);
-  static void logPerfMarkerWithInstanceKey(ReactMarker::ReactMarkerId markerId, const char *tag, int instanceKey);
   static void nativeLogMarker(jni::alias_ref<jclass> /* unused */, const std::string &markerNameStr, jlong markerTime);
 };
 

package/ReactAndroid/src/main/jni/react/mapbuffer/react/common/mapbuffer/JWritableMapBuffer.cpp

@@ -35,6 +35,8 @@ MapBuffer JWritableMapBuffer::getMapBuffer() {
     static const auto stringClass = jni::JString::javaClassStatic();
     static const auto readableMapClass = JReadableMapBuffer::javaClassStatic();
     static const auto writableMapClass = JWritableMapBuffer::javaClassStatic();
+    static const auto intArrayClass = jni::JArrayInt::javaClassStatic();
+    static const auto doubleArrayClass = jni::JArrayDouble::javaClassStatic();
 
     if (value->isInstanceOf(booleanClass)) {
       auto element = jni::static_ref_cast<jni::JBoolean>(value);
@@ -56,6 +58,17 @@ MapBuffer JWritableMapBuffer::getMapBuffer() {
       auto element =
           jni::static_ref_cast<JWritableMapBuffer::javaobject>(value);
       builder.putMapBuffer(key, element->getMapBuffer());
+    } else if (value->isInstanceOf(intArrayClass)) {
+      auto array = jni::static_ref_cast<jni::JArrayInt>(value);
+      auto pinned = array->pin();
+      builder.putIntBuffer(
+          key,
+          std::vector<int32_t>(pinned.get(), pinned.get() + pinned.size()));
+    } else if (value->isInstanceOf(doubleArrayClass)) {
+      auto array = jni::static_ref_cast<jni::JArrayDouble>(value);
+      auto pinned = array->pin();
+      builder.putDoubleBuffer(
+          key, std::vector<double>(pinned.get(), pinned.get() + pinned.size()));
     }
   }
 

package/ReactAndroid/src/main/jni/react/runtime/jni/JReactInstance.cpp

@@ -173,7 +173,10 @@ void JReactInstance::callFunctionOnModule(
     const std::string& moduleName,
     const std::string& methodName,
     NativeArray* args) {
-  instance_->callFunctionOnModule(moduleName, methodName, args->consume());
+  instance_->callFunctionOnModule(
+      moduleName,
+      methodName,
+      args != nullptr ? args->consume() : folly::dynamic::array());
 }
 
 jni::alias_ref<JRuntimeExecutor::javaobject>

package/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/TurboModuleManager.cpp

@@ -24,6 +24,7 @@
 
 namespace facebook::react {
 
+#ifndef RCT_REMOVE_LEGACY_MODULE_INTEROP
 namespace {
 
 class JMethodDescriptor : public jni::JavaClass<JMethodDescriptor> {
@@ -93,6 +94,7 @@ class JMethodDescriptor : public jni::JavaClass<JMethodDescriptor> {
   }
 };
 } // namespace
+#endif // RCT_REMOVE_LEGACY_MODULE_INTEROP
 
 TurboModuleManager::TurboModuleManager(
     std::shared_ptr<CallInvoker> jsCallInvoker,
@@ -222,6 +224,7 @@ std::shared_ptr<TurboModule> TurboModuleManager::getTurboModule(
   return nullptr;
 }
 
+#ifndef RCT_REMOVE_LEGACY_MODULE_INTEROP
 TurboModuleProviderFunctionTypeWithRuntime
 TurboModuleManager::createLegacyModuleProvider(
     jni::alias_ref<jhybridobject> javaPart) {
@@ -318,14 +321,19 @@ std::shared_ptr<TurboModule> TurboModuleManager::getLegacyModule(
 
   return nullptr;
 }
+#endif // RCT_REMOVE_LEGACY_MODULE_INTEROP
 
 void TurboModuleManager::installJSBindings(
     jsi::Runtime& runtime,
     jni::alias_ref<jhybridobject> javaPart) {
+#ifndef RCT_REMOVE_LEGACY_MODULE_INTEROP
   TurboModuleBinding::install(
       runtime,
       createTurboModuleProvider(javaPart),
       createLegacyModuleProvider(javaPart));
+#else
+  TurboModuleBinding::install(runtime, createTurboModuleProvider(javaPart));
+#endif // RCT_REMOVE_LEGACY_MODULE_INTEROP
 }
 
 void TurboModuleManager::dispatchJSBindingInstall(

package/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/TurboModuleManager.h

@@ -48,7 +48,9 @@ class TurboModuleManager : public jni::HybridClass<TurboModuleManager> {
    * they want to be long-lived or short-lived.
    */
   ModuleCache turboModuleCache_;
+#ifndef RCT_REMOVE_LEGACY_MODULE_INTEROP
   ModuleCache legacyModuleCache_;
+#endif // RCT_REMOVE_LEGACY_MODULE_INTEROP
 
   explicit TurboModuleManager(
       std::shared_ptr<CallInvoker> jsCallInvoker,
@@ -64,8 +66,10 @@ class TurboModuleManager : public jni::HybridClass<TurboModuleManager> {
   std::shared_ptr<TurboModule>
   getTurboModule(jni::alias_ref<jhybridobject> javaPart, const std::string &name, jsi::Runtime &runtime);
 
+#ifndef RCT_REMOVE_LEGACY_MODULE_INTEROP
   static TurboModuleProviderFunctionTypeWithRuntime createLegacyModuleProvider(jni::alias_ref<jhybridobject> javaPart);
   std::shared_ptr<TurboModule> getLegacyModule(jni::alias_ref<jhybridobject> javaPart, const std::string &name);
+#endif // RCT_REMOVE_LEGACY_MODULE_INTEROP
 };
 
 } // namespace facebook::react

package/ReactAndroid/src/main/res/views/uimanager/values/ids.xml

@@ -66,6 +66,11 @@
   <!-- tag is used to invalidate transform style in view manager -->
   <item type="id" name="invalidate_transform"/>
 
+  <!-- tag stores the active 2D-affine skew Matrix applied to the View via setAnimationMatrix,
+       so non-skew updates can clear it only on the transition out and TouchTargetHelper can
+       reuse it for hit testing -->
+  <item type="id" name="skew_animation_matrix"/>
+
   <!-- tag is used to store if we should render the view to a hardware texture -->
   <item type="id" name="use_hardware_layer"/>
 

package/ReactAndroid/src/main/res/views/uimanager/values-zu/strings.xml

@@ -3,4 +3,7 @@
 <!-- @generated -->
 <!-- FB Locale: zu_ZA -->
 <resources exclude-from-buck-resource-map="true">
+    <string name="menu_description" gender="unknown">Imenyu</string>
+    <string name="rn_tab_description" gender="unknown">Ithebhu</string>
+    <string name="state_off_description" gender="unknown">kuvaliwe</string>
 </resources>

package/ReactApple/Libraries/RCTFoundation/RCTDeprecation/RCTDeprecation.podspec

@@ -14,7 +14,7 @@ Pod::Spec.new do |s|
     s.author                 = "Meta Platforms, Inc. and its affiliates"
     s.license                = package["license"]
     s.homepage               = "https://reactnative.dev/"
-    s.source                 = { :git => 'https://github.com/react/react-native.git', :tag => 'v#{version}' }
+    s.source                 = { :git => 'https://github.com/facebook/react-native.git', :tag => 'v#{version}' }
     s.summary                = "Macros for marking APIs as deprecated"
     s.source_files           = podspec_sources(["Exported/*.h", "RCTDeprecation.m"], "Exported/*.h")
     s.pod_target_xcconfig    = {

package/ReactApple/RCTAnimatedModuleProvider/React-RCTAnimatedModuleProvider.podspec

@@ -0,0 +1,63 @@
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+require "json"
+
+package = JSON.parse(File.read(File.join(__dir__, "..", "..", "package.json")))
+version = package['version']
+
+source = { :git => 'https://github.com/facebook/react-native.git' }
+if version == '1000.0.0'
+  # This is an unpublished version, use the latest commit hash of the react-native repo, which we're presumably in.
+  source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")
+else
+  source[:tag] = "v#{version}"
+end
+
+is_new_arch_enabled = ENV["RCT_NEW_ARCH_ENABLED"] != "0"
+new_arch_enabled_flag = (is_new_arch_enabled ? " -DRCT_NEW_ARCH_ENABLED=1" : "")
+other_cflags = "$(inherited) " + new_arch_enabled_flag + " " + js_engine_flags()
+
+header_search_paths = [
+  "$(PODS_TARGET_SRCROOT)/../../ReactCommon",
+  "$(PODS_ROOT)/Headers/Private/React-Core",
+  "$(PODS_ROOT)/Headers/Private/Yoga",
+  "$(PODS_ROOT)/Headers/Public/ReactCommon",
+]
+
+Pod::Spec.new do |s|
+  s.name                   = "React-RCTAnimatedModuleProvider"
+  s.version                = version
+  s.summary                = "Provides the C++ Native Animated TurboModule to React Native apps."
+  s.homepage               = "https://reactnative.dev/"
+  s.documentation_url      = "https://reactnative.dev/"
+  s.license                = package["license"]
+  s.author                 = "Meta Platforms, Inc. and its affiliates"
+  s.platforms              = min_supported_versions
+  s.source                 = source
+  s.source_files           = podspec_sources("*.{m,mm,h}", "*.h")
+  s.public_header_files    = "*.h"
+  s.module_name            = "RCTAnimatedModuleProvider"
+  s.header_dir             = "RCTAnimatedModuleProvider"
+
+  s.compiler_flags = other_cflags
+  s.pod_target_xcconfig    = {
+    "HEADER_SEARCH_PATHS" => header_search_paths,
+    "OTHER_CPLUSPLUSFLAGS" => other_cflags,
+    "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(),
+    "DEFINES_MODULE" => "YES"
+  }
+
+  s.dependency "React-Core"
+  s.dependency "React-featureflags"
+  s.dependency "React-Fabric/animated"
+  s.dependency "Yoga"
+
+  add_dependency(s, "ReactCommon", :subspec => "turbomodule/core", :additional_framework_paths => ["react/nativemodule/core"])
+
+  depend_on_js_engine(s)
+  add_rn_third_party_dependencies(s)
+  add_rncore_dependency(s)
+end

package/ReactApple/RCTSwiftUI/RCTSwiftUI.podspec

@@ -8,7 +8,7 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "..", "..", "package.json")))
 version = package['version']
 
-source = { :git => 'https://github.com/react/react-native.git' }
+source = { :git => 'https://github.com/facebook/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we're presumably in.
   source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")

package/ReactApple/RCTSwiftUIWrapper/RCTSwiftUIWrapper.podspec

@@ -8,7 +8,7 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "..", "..", "package.json")))
 version = package['version']
 
-source = { :git => 'https://github.com/react/react-native.git' }
+source = { :git => 'https://github.com/facebook/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we're presumably in.
   source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")

package/ReactCommon/React-Fabric.podspec

@@ -8,7 +8,7 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "..", "package.json")))
 version = package['version']
 
-source = { :git => 'https://github.com/react/react-native.git' }
+source = { :git => 'https://github.com/facebook/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
   source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")
@@ -45,6 +45,7 @@ Pod::Spec.new do |s|
   s.dependency "React-featureflags"
   s.dependency "React-runtimescheduler"
   s.dependency "React-cxxreact"
+  s.dependency "React-bridging"
 
   add_dependency(s, "React-runtimeexecutor", :additional_framework_paths => ["platform/ios"])
   add_dependency(s, "React-rendererdebug")
@@ -159,6 +160,7 @@ Pod::Spec.new do |s|
 
   s.subspec "scheduler" do |ss|
     ss.source_files         = podspec_sources("react/renderer/scheduler/**/*.{m,mm,cpp,h}", "react/renderer/scheduler/**/*.h")
+    ss.exclude_files        = "react/renderer/scheduler/tests"
     ss.header_dir           = "react/renderer/scheduler"
 
     ss.dependency             "React-Fabric/animationbackend"

package/ReactCommon/React-FabricComponents.podspec

@@ -8,7 +8,7 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "..", "package.json")))
 version = package['version']
 
-source = { :git => 'https://github.com/react/react-native.git' }
+source = { :git => 'https://github.com/facebook/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
   source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")

package/ReactCommon/React-FabricImage.podspec

@@ -8,7 +8,7 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "..", "package.json")))
 version = package['version']
 
-source = { :git => 'https://github.com/react/react-native.git' }
+source = { :git => 'https://github.com/facebook/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
   source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")

package/ReactCommon/React-Mapbuffer.podspec

@@ -8,7 +8,7 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "..", "package.json")))
 version = package['version']
 
-source = { :git => 'https://github.com/react/react-native.git' }
+source = { :git => 'https://github.com/facebook/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
   source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")

package/ReactCommon/ReactCommon.podspec

@@ -8,7 +8,7 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "..", "package.json")))
 version = package['version']
 
-source = { :git => 'https://github.com/react/react-native.git' }
+source = { :git => 'https://github.com/facebook/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
   source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")
@@ -43,27 +43,17 @@ Pod::Spec.new do |s|
   s.subspec "turbomodule" do |ss|
     ss.dependency "React-callinvoker", version
     ss.dependency "React-perflogger", version
-    ss.dependency "React-cxxreact", version
     ss.dependency "React-jsi", version
     ss.dependency "React-logger", version
     if use_hermes()
       ss.dependency "hermes-engine"
     end
 
-    ss.subspec "bridging" do |sss|
-      sss.dependency           "React-jsi", version
-      sss.source_files         = podspec_sources("react/bridging/**/*.{cpp,h}", "react/bridging/**/*.h")
-      sss.exclude_files        = "react/bridging/tests"
-      sss.header_dir           = "react/bridging"
-      sss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\"" }
-      if use_hermes()
-        sss.dependency "hermes-engine"
-      end
-    end
-
     ss.subspec "core" do |sss|
       sss.source_files = podspec_sources("react/nativemodule/core/ReactCommon/**/*.{cpp,h}", "react/nativemodule/core/ReactCommon/**/*.h")
       sss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_CONFIGURATION_BUILD_DIR)/React-debug/React_debug.framework/Headers\" \"$(PODS_CONFIGURATION_BUILD_DIR)/React-debug/React_featureflags.framework/Headers\" \"$(PODS_CONFIGURATION_BUILD_DIR)/React-utils/React_utils.framework/Headers\"" }
+      sss.dependency "React-bridging"
+      sss.dependency "React-cxxreact", version
       sss.dependency "React-debug", version
       sss.dependency "React-featureflags", version
       sss.dependency "React-utils", version

package/ReactCommon/callinvoker/React-callinvoker.podspec

@@ -8,7 +8,7 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "..", "..", "package.json")))
 version = package['version']
 
-source = { :git => 'https://github.com/react/react-native.git' }
+source = { :git => 'https://github.com/facebook/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
   source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")

package/ReactCommon/cmake-utils/react-native-flags.cmake

@@ -32,7 +32,5 @@ function(target_compile_reactnative_options target_name scope)
   if(ANDROID)
     target_compile_definitions(${target_name} ${scope} RN_SERIALIZABLE_STATE)
   endif()
-  if(HERMES_V1_ENABLED)
-    target_compile_definitions(${target_name} ${scope} HERMES_V1_ENABLED=1)
-  endif()
+  target_compile_definitions(${target_name} ${scope} HERMES_V1_ENABLED=1)
 endfunction()

package/ReactCommon/cxxreact/CMakeLists.txt

@@ -18,6 +18,7 @@ target_link_libraries(react_cxxreact
         callinvoker
         folly_runtime
         glog
+        jserrorhandler
         jsi
         jsinspector
         logger

package/ReactCommon/cxxreact/ErrorUtils.h

@@ -7,36 +7,6 @@
 
 #pragma once
 
-#include <jsi/jsi.h>
+#warning Deprecated: use <jserrorhandler/ErrorUtils.h> instead.
 
-namespace facebook::react {
-
-inline static void handleJSError(jsi::Runtime &runtime, const jsi::JSError &error, bool isFatal)
-{
-  auto errorUtils = runtime.global().getProperty(runtime, "ErrorUtils");
-  if (errorUtils.isUndefined() || !errorUtils.isObject() ||
-      !errorUtils.getObject(runtime).hasProperty(runtime, "reportFatalError") ||
-      !errorUtils.getObject(runtime).hasProperty(runtime, "reportError")) {
-    // ErrorUtils was not set up. This probably means the bundle didn't
-    // load properly.
-    throw jsi::JSError(
-        runtime,
-        "ErrorUtils is not set up properly. Something probably went wrong trying to load the JS bundle. Trying to report error " +
-            error.getMessage(),
-        error.getStack());
-  }
-
-  // TODO(janzer): Rewrite this function to return the processed error
-  // instead of just reporting it through the native module
-  if (isFatal) {
-    auto func = errorUtils.asObject(runtime).getPropertyAsFunction(runtime, "reportFatalError");
-
-    func.call(runtime, error.value());
-  } else {
-    auto func = errorUtils.asObject(runtime).getPropertyAsFunction(runtime, "reportError");
-
-    func.call(runtime, error.value());
-  }
-}
-
-} // namespace facebook::react
+#include <jserrorhandler/ErrorUtils.h>

package/ReactCommon/cxxreact/Instance.cpp

@@ -9,7 +9,7 @@
 
 #ifndef RCT_REMOVE_LEGACY_ARCH
 
-#include "ErrorUtils.h"
+#include <jserrorhandler/ErrorUtils.h>
 #include "JSBigString.h"
 #include "JSBundleType.h"
 #include "JSExecutor.h"
@@ -20,7 +20,6 @@
 #include "RecoverableError.h"
 #include "TraceSection.h"
 
-#include <cxxreact/JSIndexedRAMBundle.h>
 #include <folly/json.h>
 #include <react/debug/react_native_assert.h>
 
@@ -175,30 +174,6 @@ void Instance::loadScriptFromString(
   }
 }
 
-void Instance::loadRAMBundleFromString(
-    std::unique_ptr<const JSBigString> script,
-    const std::string& sourceURL) {
-  auto bundle = std::make_unique<JSIndexedRAMBundle>(std::move(script));
-  auto startupScript = bundle->getStartupCode();
-  auto registry = RAMBundleRegistry::singleBundleRegistry(std::move(bundle));
-  loadRAMBundle(std::move(registry), std::move(startupScript), sourceURL, true);
-}
-
-void Instance::loadRAMBundleFromFile(
-    const std::string& sourcePath,
-    const std::string& sourceURL,
-    bool loadSynchronously) {
-  auto bundle = std::make_unique<JSIndexedRAMBundle>(sourcePath.c_str());
-  auto startupScript = bundle->getStartupCode();
-  auto registry = RAMBundleRegistry::multipleBundlesRegistry(
-      std::move(bundle), JSIndexedRAMBundle::buildFactory());
-  loadRAMBundle(
-      std::move(registry),
-      std::move(startupScript),
-      sourceURL,
-      loadSynchronously);
-}
-
 void Instance::loadRAMBundle(
     std::unique_ptr<RAMBundleRegistry> bundleRegistry,
     std::unique_ptr<const JSBigString> startupScript,

package/ReactCommon/cxxreact/Instance.h

@@ -57,8 +57,6 @@ class RN_EXPORT [[deprecated("This API will be removed along with the legacy arc
   void setSourceURL(std::string sourceURL);
 
   void loadScriptFromString(std::unique_ptr<const JSBigString> string, std::string sourceURL, bool loadSynchronously);
-  void loadRAMBundleFromString(std::unique_ptr<const JSBigString> script, const std::string &sourceURL);
-  void loadRAMBundleFromFile(const std::string &sourcePath, const std::string &sourceURL, bool loadSynchronously);
   void loadRAMBundle(
       std::unique_ptr<RAMBundleRegistry> bundleRegistry,
       std::unique_ptr<const JSBigString> startupScript,

package/ReactCommon/cxxreact/NativeToJsBridge.cpp

@@ -15,16 +15,17 @@
 #include <jsi/jsi.h>
 #include <reactperflogger/BridgeNativeModulePerfLogger.h>
 
-#include "ErrorUtils.h"
+#include <jserrorhandler/ErrorUtils.h>
 #include "Instance.h"
 #include "JSBigString.h"
 #include "MessageQueueThread.h"
 #include "MethodCall.h"
 #include "ModuleRegistry.h"
-#include "MoveWrapper.h"
 #include "RAMBundleRegistry.h"
 #include "TraceSection.h"
 
+#include <react/utils/MoveWrapper.h>
+
 #include <memory>
 #include <utility>
 

package/ReactCommon/cxxreact/RAMBundleRegistry.cpp

@@ -20,18 +20,6 @@ namespace facebook::react {
 constexpr uint32_t RAMBundleRegistry::MAIN_BUNDLE_ID;
 #pragma clang diagnostic pop
 
-std::unique_ptr<RAMBundleRegistry> RAMBundleRegistry::singleBundleRegistry(
-    std::unique_ptr<JSModulesUnbundle> mainBundle) {
-  return std::make_unique<RAMBundleRegistry>(std::move(mainBundle));
-}
-
-std::unique_ptr<RAMBundleRegistry> RAMBundleRegistry::multipleBundlesRegistry(
-    std::unique_ptr<JSModulesUnbundle> mainBundle,
-    std::function<std::unique_ptr<JSModulesUnbundle>(std::string)> factory) {
-  return std::make_unique<RAMBundleRegistry>(
-      std::move(mainBundle), std::move(factory));
-}
-
 RAMBundleRegistry::RAMBundleRegistry(
     std::unique_ptr<JSModulesUnbundle> mainBundle,
     std::function<std::unique_ptr<JSModulesUnbundle>(std::string)> factory)

package/ReactCommon/cxxreact/RAMBundleRegistry.h

@@ -27,11 +27,6 @@ class RN_EXPORT [[deprecated("This API will be removed along with the legacy arc
  public:
   constexpr static uint32_t MAIN_BUNDLE_ID = 0;
 
-  static std::unique_ptr<RAMBundleRegistry> singleBundleRegistry(std::unique_ptr<JSModulesUnbundle> mainBundle);
-  static std::unique_ptr<RAMBundleRegistry> multipleBundlesRegistry(
-      std::unique_ptr<JSModulesUnbundle> mainBundle,
-      std::function<std::unique_ptr<JSModulesUnbundle>(std::string)> factory);
-
   explicit RAMBundleRegistry(
       std::unique_ptr<JSModulesUnbundle> mainBundle,
       std::function<std::unique_ptr<JSModulesUnbundle>(std::string)> factory = nullptr);

package/ReactCommon/cxxreact/React-cxxreact.podspec

@@ -9,7 +9,7 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "..", "..", "package.json")))
 version = package['version']
 
-source = { :git => 'https://github.com/react/react-native.git' }
+source = { :git => 'https://github.com/facebook/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
   source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")
@@ -29,7 +29,7 @@ Pod::Spec.new do |s|
   s.source                 = source
   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\"",
+    "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/..\" \"$(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()
   }
   s.header_dir             = "cxxreact"
@@ -40,6 +40,7 @@ Pod::Spec.new do |s|
   s.dependency "React-callinvoker", version
   add_dependency(s, "React-runtimeexecutor", :additional_framework_paths => ["platform/ios"])
   s.dependency "React-perflogger", version
+  s.dependency "React-jserrorhandler", version
   s.dependency "React-jsi", version
   s.dependency "React-logger", version
   s.dependency "React-debug", version