Move ErrorUtils from cxxreact to jserrorhandler

Summary:
Move `handleJSError` from `cxxreact/ErrorUtils.h` (header-inline) to `jserrorhandler/ErrorUtils.{h,cpp}` (declared + linked). Inverts the cyclic dep so `jserrorhandler` becomes a standalone leaf and `cxxreact:bridge` can be narrowed out of more consumers in follow-ups.

The old `<cxxreact/ErrorUtils.h>` include path continues to work via a deprecated `#warning` forwarder header that includes the new location. `cxxreact:bridge` now depends on `jserrorhandler:jserrorhandler` so existing consumers of the deprecated path still link cleanly. `jserrorhandler/BUCK` drops its `cxxreact:bridge` dep (and the matching `React-cxxreact` podspec entry).

Changelog:
[Internal]

Differential Revision: D108786498

Author: javache

packages/react-native/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>

packages/react-native/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"

packages/react-native/ReactCommon/cxxreact/NativeToJsBridge.cpp

@@ -15,7 +15,7 @@
 #include <jsi/jsi.h>
 #include <reactperflogger/BridgeNativeModulePerfLogger.h>
 
-#include "ErrorUtils.h"
+#include <jserrorhandler/ErrorUtils.h>
 #include "Instance.h"
 #include "JSBigString.h"
 #include "MessageQueueThread.h"

packages/react-native/ReactCommon/cxxreact/React-cxxreact.podspec

@@ -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

packages/react-native/ReactCommon/jserrorhandler/ErrorUtils.cpp

@@ -0,0 +1,42 @@
+/*
+ * 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.
+ */
+
+#include "ErrorUtils.h"
+
+namespace facebook::react {
+
+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

packages/react-native/ReactCommon/jserrorhandler/ErrorUtils.h

@@ -0,0 +1,16 @@
+/*
+ * 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.
+ */
+
+#pragma once
+
+#include <jsi/jsi.h>
+
+namespace facebook::react {
+
+void handleJSError(jsi::Runtime &runtime, const jsi::JSError &error, bool isFatal);
+
+} // namespace facebook::react

packages/react-native/ReactCommon/jserrorhandler/JsErrorHandler.cpp

@@ -6,12 +6,12 @@
  */
 
 #include "JsErrorHandler.h"
-#include <cxxreact/ErrorUtils.h>
 #include <glog/logging.h>
 #include <react/bridging/Bridging.h>
 #include <react/featureflags/ReactNativeFeatureFlags.h>
 #include <ostream>
 #include <string>
+#include "ErrorUtils.h"
 #include "StackTraceParser.h"
 
 using namespace facebook;

packages/react-native/ReactCommon/jserrorhandler/React-jserrorhandler.podspec

@@ -28,7 +28,7 @@ Pod::Spec.new do |s|
   s.platforms              = min_supported_versions
   s.source                 = source
   s.header_dir             = "jserrorhandler"
-  s.source_files           = podspec_sources(["JsErrorHandler.{cpp,h}", "StackTraceParser.{cpp,h}"], ["JsErrorHandler.h", "StackTraceParser.h"])
+  s.source_files           = podspec_sources(["ErrorUtils.{cpp,h}", "JsErrorHandler.{cpp,h}", "StackTraceParser.{cpp,h}"], ["ErrorUtils.h", "JsErrorHandler.h", "StackTraceParser.h"])
   s.pod_target_xcconfig = {
     "USE_HEADERMAP" => "YES",
     "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard()
@@ -37,7 +37,6 @@ Pod::Spec.new do |s|
   resolve_use_frameworks(s, header_mappings_dir: '../', module_name: "React_jserrorhandler")
 
   s.dependency "React-jsi"
-  s.dependency "React-cxxreact"
   s.dependency "ReactCommon/turbomodule/bridging"
   add_dependency(s, "React-featureflags")
   add_dependency(s, "React-debug")

packages/react-native/ReactCommon/jsiexecutor/jsireact/JSIExecutor.cpp

@@ -7,13 +7,13 @@
 
 #include "jsireact/JSIExecutor.h"
 
-#include <cxxreact/ErrorUtils.h>
 #include <cxxreact/JSBigString.h>
 #include <cxxreact/ModuleRegistry.h>
 #include <cxxreact/ReactMarker.h>
 #include <cxxreact/TraceSection.h>
 #include <folly/json.h>
 #include <glog/logging.h>
+#include <jserrorhandler/ErrorUtils.h>
 #include <jsi/JSIDynamic.h>
 #include <jsi/instrumentation.h>
 #include <reactperflogger/BridgeNativeModulePerfLogger.h>

packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler.cpp

@@ -11,8 +11,8 @@
 #include "RuntimeScheduler_Legacy.h"
 #endif
 
-#include <cxxreact/ErrorUtils.h>
 #include <cxxreact/TraceSection.h>
+#include <jserrorhandler/ErrorUtils.h>
 #ifndef RCT_REMOVE_LEGACY_ARCH
 #include <react/featureflags/ReactNativeFeatureFlags.h>
 #endif