react-native 0.84.0-nightly-20251106-de5141a3d → 0.84.0-nightly-20251108-7486a2bc5

package/ReactAndroid/src/main/jni/react/featureflags/JReactNativeFeatureFlagsCxxInterop.cpp

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<0527dbb4a838be34b80d76b11d18cea0>>
+ * @generated SignedSource<<95ebd4929bf0f98aa059ad4b8139f7b3>>
  */
 
 /**
@@ -75,6 +75,12 @@ class ReactNativeFeatureFlagsJavaProvider
     return method(javaProvider_);
   }
 
+  bool disableImageViewPreallocationAndroid() override {
+    static const auto method =
+        getReactNativeFeatureFlagsProviderJavaClass()->getMethod<jboolean()>("disableImageViewPreallocationAndroid");
+    return method(javaProvider_);
+  }
+
   bool disableMountItemReorderingAndroid() override {
     static const auto method =
         getReactNativeFeatureFlagsProviderJavaClass()->getMethod<jboolean()>("disableMountItemReorderingAndroid");
@@ -99,6 +105,12 @@ class ReactNativeFeatureFlagsJavaProvider
     return method(javaProvider_);
   }
 
+  bool disableViewPreallocationAndroid() override {
+    static const auto method =
+        getReactNativeFeatureFlagsProviderJavaClass()->getMethod<jboolean()>("disableViewPreallocationAndroid");
+    return method(javaProvider_);
+  }
+
   bool enableAccessibilityOrder() override {
     static const auto method =
         getReactNativeFeatureFlagsProviderJavaClass()->getMethod<jboolean()>("enableAccessibilityOrder");
@@ -565,6 +577,11 @@ bool JReactNativeFeatureFlagsCxxInterop::disableFabricCommitInCXXAnimated(
   return ReactNativeFeatureFlags::disableFabricCommitInCXXAnimated();
 }
 
+bool JReactNativeFeatureFlagsCxxInterop::disableImageViewPreallocationAndroid(
+    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop> /*unused*/) {
+  return ReactNativeFeatureFlags::disableImageViewPreallocationAndroid();
+}
+
 bool JReactNativeFeatureFlagsCxxInterop::disableMountItemReorderingAndroid(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop> /*unused*/) {
   return ReactNativeFeatureFlags::disableMountItemReorderingAndroid();
@@ -585,6 +602,11 @@ bool JReactNativeFeatureFlagsCxxInterop::disableTextLayoutManagerCacheAndroid(
   return ReactNativeFeatureFlags::disableTextLayoutManagerCacheAndroid();
 }
 
+bool JReactNativeFeatureFlagsCxxInterop::disableViewPreallocationAndroid(
+    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop> /*unused*/) {
+  return ReactNativeFeatureFlags::disableViewPreallocationAndroid();
+}
+
 bool JReactNativeFeatureFlagsCxxInterop::enableAccessibilityOrder(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop> /*unused*/) {
   return ReactNativeFeatureFlags::enableAccessibilityOrder();
@@ -994,6 +1016,9 @@ void JReactNativeFeatureFlagsCxxInterop::registerNatives() {
       makeNativeMethod(
         "disableFabricCommitInCXXAnimated",
         JReactNativeFeatureFlagsCxxInterop::disableFabricCommitInCXXAnimated),
+      makeNativeMethod(
+        "disableImageViewPreallocationAndroid",
+        JReactNativeFeatureFlagsCxxInterop::disableImageViewPreallocationAndroid),
       makeNativeMethod(
         "disableMountItemReorderingAndroid",
         JReactNativeFeatureFlagsCxxInterop::disableMountItemReorderingAndroid),
@@ -1006,6 +1031,9 @@ void JReactNativeFeatureFlagsCxxInterop::registerNatives() {
       makeNativeMethod(
         "disableTextLayoutManagerCacheAndroid",
         JReactNativeFeatureFlagsCxxInterop::disableTextLayoutManagerCacheAndroid),
+      makeNativeMethod(
+        "disableViewPreallocationAndroid",
+        JReactNativeFeatureFlagsCxxInterop::disableViewPreallocationAndroid),
       makeNativeMethod(
         "enableAccessibilityOrder",
         JReactNativeFeatureFlagsCxxInterop::enableAccessibilityOrder),

package/ReactAndroid/src/main/jni/react/featureflags/JReactNativeFeatureFlagsCxxInterop.h

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<a1deb0145d8c51d608903e1704e96b8d>>
+ * @generated SignedSource<<155f615584a7738dc5b89205c2ecad8b>>
  */
 
 /**
@@ -48,6 +48,9 @@ class JReactNativeFeatureFlagsCxxInterop
   static bool disableFabricCommitInCXXAnimated(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
+  static bool disableImageViewPreallocationAndroid(
+    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
+
   static bool disableMountItemReorderingAndroid(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
@@ -60,6 +63,9 @@ class JReactNativeFeatureFlagsCxxInterop
   static bool disableTextLayoutManagerCacheAndroid(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
+  static bool disableViewPreallocationAndroid(
+    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
+
   static bool enableAccessibilityOrder(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 

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

@@ -164,8 +164,6 @@ void CatalystInstanceImpl::initializeBridge(
     jni::alias_ref<JavaMessageQueueThread::javaobject> nativeModulesQueue,
     jni::alias_ref<jni::JCollection<JavaModuleWrapper::javaobject>::javaobject>
         javaModules,
-    jni::alias_ref<jni::JCollection<ModuleHolder::javaobject>::javaobject>
-        cxxModules,
     jni::alias_ref<ReactInstanceManagerInspectorTarget::javaobject>
         inspectorTarget) {
   set_react_native_logfunc(&log);
@@ -194,10 +192,7 @@ void CatalystInstanceImpl::initializeBridge(
   // stack.
 
   moduleRegistry_ = std::make_shared<ModuleRegistry>(buildNativeModuleList(
-      std::weak_ptr<Instance>(instance_),
-      javaModules,
-      cxxModules,
-      moduleMessageQueue_));
+      std::weak_ptr<Instance>(instance_), javaModules, moduleMessageQueue_));
 
   instance_->initializeBridge(
       std::make_unique<InstanceCallbackImpl>(callback),
@@ -211,14 +206,9 @@ void CatalystInstanceImpl::initializeBridge(
 
 void CatalystInstanceImpl::extendNativeModules(
     jni::alias_ref<jni::JCollection<JavaModuleWrapper::javaobject>::javaobject>
-        javaModules,
-    jni::alias_ref<jni::JCollection<ModuleHolder::javaobject>::javaobject>
-        cxxModules) {
+        javaModules) {
   moduleRegistry_->registerModules(buildNativeModuleList(
-      std::weak_ptr<Instance>(instance_),
-      javaModules,
-      cxxModules,
-      moduleMessageQueue_));
+      std::weak_ptr<Instance>(instance_), javaModules, moduleMessageQueue_));
 }
 
 void CatalystInstanceImpl::jniSetSourceURL(const std::string& sourceURL) {

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

@@ -60,12 +60,9 @@ class [[deprecated("This API will be removed along with the legacy architecture.
       jni::alias_ref<JavaMessageQueueThread::javaobject> jsQueue,
       jni::alias_ref<JavaMessageQueueThread::javaobject> nativeModulesQueue,
       jni::alias_ref<jni::JCollection<JavaModuleWrapper::javaobject>::javaobject> javaModules,
-      jni::alias_ref<jni::JCollection<ModuleHolder::javaobject>::javaobject> cxxModules,
       jni::alias_ref<ReactInstanceManagerInspectorTarget::javaobject> inspectorTarget);
 
-  void extendNativeModules(
-      jni::alias_ref<jni::JCollection<JavaModuleWrapper::javaobject>::javaobject> javaModules,
-      jni::alias_ref<jni::JCollection<ModuleHolder::javaobject>::javaobject> cxxModules);
+  void extendNativeModules(jni::alias_ref<jni::JCollection<JavaModuleWrapper::javaobject>::javaobject> javaModules);
 
   /**
    * Sets the source URL of the underlying bridge without loading any JS code.

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

@@ -7,10 +7,6 @@
 
 #pragma once
 
-#include <memory>
-#include <string>
-
-#include <cxxreact/CxxModule.h>
 #include <fbjni/fbjni.h>
 
 namespace facebook::react {
@@ -19,24 +15,4 @@ struct JNativeModule : jni::JavaClass<JNativeModule> {
   constexpr static const char *const kJavaDescriptor = "Lcom/facebook/react/bridge/NativeModule;";
 };
 
-/**
- * The C++ part of a CxxModuleWrapper is not a unique class, but it
- * must extend this base class.
- */
-class CxxModuleWrapperBase : public jni::HybridClass<CxxModuleWrapperBase, JNativeModule> {
- public:
-  constexpr static const char *const kJavaDescriptor = "Lcom/facebook/react/bridge/CxxModuleWrapperBase;";
-
-  static void registerNatives()
-  {
-    registerHybrid({makeNativeMethod("getName", CxxModuleWrapperBase::getName)});
-  }
-
-  // JNI method
-  virtual std::string getName() = 0;
-
-  // Called by ModuleRegistryBuilder
-  virtual std::unique_ptr<xplat::module::CxxModule> getModule() = 0;
-};
-
 } // namespace facebook::react

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

@@ -9,7 +9,6 @@
 
 #include <glog/logging.h>
 
-#include <cxxreact/CxxModule.h>
 #include <cxxreact/CxxNativeModule.h>
 #include <cxxreact/Instance.h>
 #include <cxxreact/JsArgumentHelpers.h>

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

@@ -24,30 +24,13 @@ std::string ModuleHolder::getName() const {
 
 xplat::module::CxxModule::Provider ModuleHolder::getProvider(
     const std::string& moduleName) const {
-  return [self = jni::make_global(self()), moduleName] {
-    static auto getModule =
-        ModuleHolder::javaClassStatic()->getMethod<JNativeModule::javaobject()>(
-            "getModule");
-    // This is the call which uses the lazy Java Provider to instantiate the
-    // Java CxxModuleWrapper which contains the CxxModule.
-    auto module = getModule(self);
-
-    CHECK(module->isInstanceOf(CxxModuleWrapperBase::javaClassStatic()))
-        << "NativeModule '" << moduleName << "' isn't a C++ module";
-
-    auto cxxModule =
-        jni::static_ref_cast<CxxModuleWrapperBase::javaobject>(module);
-    // Then, we grab the CxxModule from the wrapper, which is no longer needed.
-    return cxxModule->cthis()->getModule();
-  };
+  return [self = jni::make_global(self()), moduleName] { return nullptr; };
 }
 
 std::vector<std::unique_ptr<NativeModule>> buildNativeModuleList(
     std::weak_ptr<Instance> winstance,
     jni::alias_ref<jni::JCollection<JavaModuleWrapper::javaobject>::javaobject>
         javaModules,
-    jni::alias_ref<jni::JCollection<ModuleHolder::javaobject>::javaobject>
-        cxxModules,
     std::shared_ptr<MessageQueueThread> moduleMessageQueue) {
   std::vector<std::unique_ptr<NativeModule>> modules;
   if (javaModules) {
@@ -57,17 +40,6 @@ std::vector<std::unique_ptr<NativeModule>> buildNativeModuleList(
               winstance, jm, moduleMessageQueue));
     }
   }
-  if (cxxModules) {
-    for (const auto& cm : *cxxModules) {
-      std::string moduleName = cm->getName();
-      modules.emplace_back(
-          std::make_unique<CxxNativeModule>(
-              winstance,
-              moduleName,
-              cm->getProvider(moduleName),
-              moduleMessageQueue));
-    }
-  }
   return modules;
 }
 

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

@@ -11,7 +11,7 @@
 #include <cxxreact/ModuleRegistry.h>
 #include <fbjni/fbjni.h>
 
-#include "CxxModuleWrapper.h"
+#include "CxxModuleWrapperBase.h"
 #include "JavaModuleWrapper.h"
 
 #ifndef RCT_REMOVE_LEGACY_ARCH
@@ -33,7 +33,6 @@ class [[deprecated("This API will be removed along with the legacy architecture.
 std::vector<std::unique_ptr<NativeModule>> buildNativeModuleList(
     std::weak_ptr<Instance> winstance,
     jni::alias_ref<jni::JCollection<JavaModuleWrapper::javaobject>::javaobject> javaModules,
-    jni::alias_ref<jni::JCollection<ModuleHolder::javaobject>::javaobject> cxxModules,
     std::shared_ptr<MessageQueueThread> moduleMessageQueue);
 } // namespace facebook::react
 

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

@@ -11,7 +11,6 @@
 #include <fbjni/fbjni.h>
 
 #include "CatalystInstanceImpl.h"
-#include "CxxModuleWrapperBase.h"
 #include "InspectorNetworkRequestListener.h"
 #include "JavaScriptExecutorHolder.h"
 #include "ReactInstanceManagerInspectorTarget.h"
@@ -42,7 +41,6 @@ extern "C" JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
     CatalystInstanceImpl::registerNatives();
 #pragma clang diagnostic pop
 #endif
-    CxxModuleWrapperBase::registerNatives();
     ReactInstanceManagerInspectorTarget::registerNatives();
     InspectorNetworkRequestListener::registerNatives();
   });

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

@@ -146,7 +146,14 @@ HostTarget* JReactHostInspectorTarget::getInspectorTarget() {
 
 bool JReactHostInspectorTarget::startBackgroundTrace() {
   if (inspectorTarget_) {
-    return inspectorTarget_->startTracing(tracing::Mode::Background);
+    return inspectorTarget_->startTracing(
+        tracing::Mode::Background,
+        {
+            tracing::Category::HiddenTimeline,
+            tracing::Category::RuntimeExecution,
+            tracing::Category::Timeline,
+            tracing::Category::UserTiming,
+        });
   } else {
     jni::throwNewJavaException(
         "java/lang/IllegalStateException",

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

@@ -13,11 +13,12 @@
 #include <glog/logging.h>
 #include <jni.h>
 #include <jsi/jsi.h>
-#include <jsireact/JSIExecutor.h>
 #include <react/jni/JRuntimeExecutor.h>
 #include <react/jni/JSLogging.h>
 #include <react/renderer/runtimescheduler/RuntimeSchedulerCallInvoker.h>
 #include <react/runtime/BridgelessNativeMethodCallInvoker.h>
+#include <react/runtime/JSRuntimeBindings.h>
+
 #include "JavaTimerRegistry.h"
 
 namespace facebook::react {

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

@@ -17,10 +17,9 @@
 #include <ReactCommon/BindingsInstallerHolder.h>
 #include <ReactCommon/CxxTurboModuleUtils.h>
 #include <ReactCommon/JavaInteropTurboModule.h>
-#include <ReactCommon/TurboCxxModule.h>
 #include <ReactCommon/TurboModuleBinding.h>
 #include <ReactCommon/TurboModulePerfLogger.h>
-#include <react/jni/CxxModuleWrapper.h>
+#include <react/jni/CxxModuleWrapperBase.h>
 
 namespace facebook::react {
 
@@ -208,22 +207,6 @@ std::shared_ptr<TurboModule> TurboModuleManager::getTurboModule(
     return turboModule;
   }
 
-  static auto getTurboLegacyCxxModule =
-      javaPart->getClass()
-          ->getMethod<jni::alias_ref<CxxModuleWrapper::javaobject>(
-              const std::string&)>("getTurboLegacyCxxModule");
-  auto legacyCxxModule = getTurboLegacyCxxModule(javaPart.get(), name);
-  if (legacyCxxModule) {
-    TurboModulePerfLogger::moduleJSRequireEndingStart(moduleName);
-
-    auto turboModule = std::make_shared<react::TurboCxxModule>(
-        legacyCxxModule->cthis()->getModule(), jsCallInvoker_);
-    turboModuleCache_.insert({name, turboModule});
-
-    TurboModulePerfLogger::moduleJSRequireEndingEnd(moduleName);
-    return turboModule;
-  }
-
   return nullptr;
 }
 
@@ -260,23 +243,6 @@ std::shared_ptr<TurboModule> TurboModuleManager::getLegacyModule(
 
   TurboModulePerfLogger::moduleJSRequireBeginningEnd(moduleName);
 
-  static auto getLegacyCxxModule =
-      javaPart->getClass()
-          ->getMethod<jni::alias_ref<CxxModuleWrapper::javaobject>(
-              const std::string&)>("getLegacyCxxModule");
-  auto legacyCxxModule = getLegacyCxxModule(javaPart.get(), name);
-
-  if (legacyCxxModule) {
-    TurboModulePerfLogger::moduleJSRequireEndingStart(moduleName);
-
-    auto turboModule = std::make_shared<react::TurboCxxModule>(
-        legacyCxxModule->cthis()->getModule(), jsCallInvoker_);
-    legacyModuleCache_.insert({name, turboModule});
-
-    TurboModulePerfLogger::moduleJSRequireEndingEnd(moduleName);
-    return turboModule;
-  }
-
   static auto getLegacyJavaModule =
       javaPart->getClass()
           ->getMethod<jni::alias_ref<JNativeModule>(const std::string&)>(

package/ReactAndroid/src/main/jni/third-party/folly/CMakeLists.txt

@@ -43,6 +43,7 @@ SET(folly_runtime_SRC
         folly/json/json_pointer.cpp
         folly/json/json.cpp
         folly/lang/CString.cpp
+        folly/lang/Exception.cpp
         folly/lang/SafeAssert.cpp
         folly/lang/ToAscii.cpp
         folly/memory/detail/MallocImpl.cpp

package/ReactApple/RCTAnimatedModuleProvider/RCTAnimatedModuleProvider.mm

@@ -26,6 +26,26 @@
   std::function<void()> _onRender;
 }
 
+- (void)dealloc
+{
+  if (_displayLink != nil) {
+#if TARGET_OS_OSX
+    RCTPlatformDisplayLink *displayLink = _displayLink;
+#else
+    CADisplayLink *displayLink = _displayLink;
+#endif
+    _displayLink = nil;
+    if ([NSThread isMainThread]) {
+      [displayLink invalidate];
+    } else {
+      dispatch_sync(dispatch_get_main_queue(), ^{
+        [displayLink invalidate];
+      });
+    }
+    _onRender = nullptr;
+  }
+}
+
 - (void)_onDisplayLinkTick
 {
   if (_displayLink != nullptr && _onRender != nullptr) {
@@ -69,11 +89,16 @@
             const auto stop_render = [weakSelf]() {
               RCTAnimatedModuleProvider *strongSelf = weakSelf;
               if (strongSelf) {
-                if (strongSelf->_displayLink != nil) {
-                  [strongSelf->_displayLink invalidate];
-                  strongSelf->_displayLink = nil;
-                  strongSelf->_onRender = nullptr;
+#if TARGET_OS_OSX
+                RCTPlatformDisplayLink *displayLink = strongSelf->_displayLink;
+#else
+                CADisplayLink *displayLink = strongSelf->_displayLink;
+#endif
+                strongSelf->_displayLink = nil;
+                if (displayLink != nil) {
+                  [displayLink invalidate];
                 }
+                strongSelf->_onRender = nullptr;
               }
             };
 

package/ReactCommon/cxxreact/ReactMarker.cpp

@@ -6,7 +6,6 @@
  */
 
 #include "ReactMarker.h"
-#include <cxxreact/JSExecutor.h>
 
 namespace facebook::react::ReactMarker {
 

package/ReactCommon/cxxreact/ReactNativeVersion.h

@@ -22,7 +22,7 @@ constexpr struct {
   int32_t Major = 0;
   int32_t Minor = 84;
   int32_t Patch = 0;
-  std::string_view Prerelease = "nightly-20251106-de5141a3d";
+  std::string_view Prerelease = "nightly-20251108-7486a2bc5";
 } ReactNativeVersion;
 
 } // namespace facebook::react

package/ReactCommon/jsiexecutor/CMakeLists.txt

@@ -20,7 +20,9 @@ target_link_libraries(jsireact
         reactperflogger
         folly_runtime
         glog
-        jsi)
+        jserrorhandler
+        jsi
+        jsitooling)
 
 target_compile_reactnative_options(jsireact PRIVATE)
 target_compile_options(jsireact PRIVATE -O3)

package/ReactCommon/jsiexecutor/React-jsiexecutor.podspec

@@ -30,7 +30,9 @@ Pod::Spec.new do |s|
   s.header_dir             = "jsireact"
 
   s.dependency "React-cxxreact"
+  s.dependency "React-jserrorhandler"
   s.dependency "React-jsi"
+  s.dependency "React-jsitooling"
   s.dependency "React-perflogger"
   add_dependency(s, "React-debug")
   add_dependency(s, "React-runtimeexecutor", :additional_framework_paths => ["platform/ios"])

package/ReactCommon/jsiexecutor/jsireact/JSIExecutor.cpp

@@ -576,44 +576,4 @@ void JSIExecutor::flush() {}
 
 #endif // RCT_REMOVE_LEGACY_ARCH
 
-void bindNativeLogger(Runtime& runtime, Logger logger) {
-  runtime.global().setProperty(
-      runtime,
-      "nativeLoggingHook",
-      Function::createFromHostFunction(
-          runtime,
-          PropNameID::forAscii(runtime, "nativeLoggingHook"),
-          2,
-          [logger = std::move(logger)](
-              jsi::Runtime& runtime,
-              const jsi::Value&,
-              const jsi::Value* args,
-              size_t count) {
-            if (count != 2) {
-              throw std::invalid_argument(
-                  "nativeLoggingHook takes 2 arguments");
-            }
-            logger(
-                args[0].asString(runtime).utf8(runtime),
-                static_cast<unsigned int>(args[1].asNumber()));
-            return Value::undefined();
-          }));
-}
-
-void bindNativePerformanceNow(Runtime& runtime) {
-  runtime.global().setProperty(
-      runtime,
-      "nativePerformanceNow",
-      Function::createFromHostFunction(
-          runtime,
-          PropNameID::forAscii(runtime, "nativePerformanceNow"),
-          0,
-          [](jsi::Runtime& runtime,
-             const jsi::Value&,
-             const jsi::Value* args,
-             size_t /*count*/) {
-            return HighResTimeStamp::now().toDOMHighResTimeStamp();
-          }));
-}
-
 } // namespace facebook::react

package/ReactCommon/jsiexecutor/jsireact/JSIExecutor.h

@@ -12,6 +12,7 @@
 #include <cxxreact/RAMBundleRegistry.h>
 #include <jsi/jsi.h>
 #include <jsireact/JSINativeModules.h>
+#include <react/runtime/JSRuntimeBindings.h>
 #include <functional>
 #include <mutex>
 #include <optional>
@@ -127,10 +128,4 @@ class [[deprecated("This API will be removed along with the legacy architecture.
 #endif // RCT_REMOVE_LEGACY_ARCH
 };
 
-using Logger = std::function<void(const std::string &message, unsigned int logLevel)>;
-void bindNativeLogger(jsi::Runtime &runtime, Logger logger);
-
-void bindNativePerformanceNow(jsi::Runtime &runtime);
-
-double performanceNow();
 } // namespace facebook::react

package/ReactCommon/jsinspector-modern/ConsoleTask.cpp

@@ -0,0 +1,27 @@
+/*
+ * 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 "ConsoleTask.h"
+#include "ConsoleTaskOrchestrator.h"
+
+namespace facebook::react::jsinspector_modern {
+
+ConsoleTask::ConsoleTask(std::shared_ptr<ConsoleTaskContext> taskContext)
+    : taskContext_(std::move(taskContext)),
+      orchestrator_(ConsoleTaskOrchestrator::getInstance()) {
+  if (taskContext_) {
+    orchestrator_.startTask(taskContext_->id());
+  }
+}
+
+ConsoleTask::~ConsoleTask() {
+  if (taskContext_) {
+    orchestrator_.finishTask(taskContext_->id());
+  }
+}
+
+} // namespace facebook::react::jsinspector_modern

package/ReactCommon/jsinspector-modern/ConsoleTask.h

@@ -0,0 +1,38 @@
+/*
+ * 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 <memory>
+
+namespace facebook::react::jsinspector_modern {
+
+class ConsoleTaskContext;
+class RuntimeTargetDelegate;
+class ConsoleTaskOrchestrator;
+
+class ConsoleTask {
+ public:
+  /**
+   * \param runtimeTargetDelegate The delegate to the corresponding runtime.
+   * \param taskContext The context that tracks the task.
+   */
+  explicit ConsoleTask(std::shared_ptr<ConsoleTaskContext> taskContext);
+  ~ConsoleTask();
+
+  ConsoleTask(const ConsoleTask &) = default;
+  ConsoleTask &operator=(const ConsoleTask &) = delete;
+
+  ConsoleTask(ConsoleTask &&) = default;
+  ConsoleTask &operator=(ConsoleTask &&) = delete;
+
+ private:
+  std::shared_ptr<ConsoleTaskContext> taskContext_;
+  ConsoleTaskOrchestrator &orchestrator_;
+};
+
+} // namespace facebook::react::jsinspector_modern

package/ReactCommon/jsinspector-modern/ConsoleTaskContext.cpp

@@ -0,0 +1,46 @@
+/*
+ * 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 "ConsoleTaskContext.h"
+#include "ConsoleTaskOrchestrator.h"
+#include "RuntimeTarget.h"
+
+namespace facebook::react::jsinspector_modern {
+
+ConsoleTaskContext::ConsoleTaskContext(
+    jsi::Runtime& runtime,
+    RuntimeTargetDelegate& runtimeTargetDelegate,
+    std::string name)
+    : runtimeTargetDelegate_(runtimeTargetDelegate),
+      name_(std::move(name)),
+      orchestrator_(ConsoleTaskOrchestrator::getInstance()) {
+  stackTrace_ = runtimeTargetDelegate_.captureStackTrace(runtime);
+}
+
+ConsoleTaskContext::~ConsoleTaskContext() {
+  orchestrator_.cancelTask(id());
+}
+
+ConsoleTaskId ConsoleTaskContext::id() const {
+  return ConsoleTaskId{(void*)this};
+}
+
+std::optional<folly::dynamic> ConsoleTaskContext::getSerializedStackTrace()
+    const {
+  auto maybeValue = runtimeTargetDelegate_.serializeStackTrace(*stackTrace_);
+  if (maybeValue) {
+    maybeValue.value()["description"] = name_;
+  }
+
+  return maybeValue;
+}
+
+void ConsoleTaskContext::schedule() {
+  orchestrator_.scheduleTask(id(), weak_from_this());
+}
+
+} // namespace facebook::react::jsinspector_modern