react-native-tvos 0.83.1-1 → 0.84.0-0

package/ReactCommon/react/renderer/debug/flags.h

@@ -29,8 +29,9 @@
 // #define RN_SHADOW_TREE_INTROSPECTION 1
 
 // This enables certain object-to-string debug conversions to be compiled.
-// Enable if `REACT_NATIVE_DEBUG` is enabled.
-#ifdef REACT_NATIVE_DEBUG
+// Enable if either `REACT_NATIVE_DEBUG` or `RN_ENABLE_DEBUG_STRING_CONVERTIBLE`
+// is defined
+#if defined(REACT_NATIVE_DEBUG) || defined(RN_ENABLE_DEBUG_STRING_CONVERTIBLE)
 #define RN_DEBUG_STRING_CONVERTIBLE 1
 #else
 #define RN_DEBUG_STRING_CONVERTIBLE 0

package/ReactCommon/react/renderer/graphics/BlendMode.h

@@ -105,6 +105,8 @@ inline std::string toString(const BlendMode &blendMode)
       return "color";
     case BlendMode::Luminosity:
       return "luminosity";
+    default:
+      abort();
   }
 }
 } // namespace facebook::react

package/ReactCommon/react/renderer/graphics/Filter.h

@@ -79,6 +79,8 @@ inline std::string toString(const FilterType &filterType)
       return "sepia";
     case FilterType::DropShadow:
       return "dropShadow";
+    default:
+      abort();
   }
 }
 

package/ReactCommon/react/renderer/imagemanager/ImageManager.h

@@ -37,6 +37,9 @@ class ImageManager {
       Tag tag = {}) const;
 
  private:
+#ifdef ANDROID
+  std::shared_ptr<const ContextContainer> contextContainer_{};
+#endif
   void *self_{};
 };
 

package/ReactCommon/react/renderer/imagemanager/platform/android/react/renderer/imagemanager/ImageFetcher.cpp

@@ -8,10 +8,13 @@
 #include "ImageFetcher.h"
 
 #include <react/common/mapbuffer/JReadableMapBuffer.h>
+#include <react/featureflags/ReactNativeFeatureFlags.h>
 #include <react/renderer/imagemanager/conversions.h>
 
 namespace facebook::react {
 
+extern const char ImageFetcherKey[] = "ImageFetcher";
+
 ImageFetcher::ImageFetcher(
     std::shared_ptr<const ContextContainer> contextContainer)
     : contextContainer_(std::move(contextContainer)) {}
@@ -21,22 +24,32 @@ ImageRequest ImageFetcher::requestImage(
     SurfaceId surfaceId,
     const ImageRequestParams& imageRequestParams,
     Tag tag) {
-  items_[surfaceId].emplace_back(
-      ImageRequestItem{
-          .imageSource = imageSource,
-          .imageRequestParams = imageRequestParams,
-          .tag = tag});
+  {
+    std::lock_guard<std::mutex> lock(mutex_);
+    items_[surfaceId].emplace_back(
+        ImageRequestItem{
+            .imageSource = imageSource,
+            .imageRequestParams = imageRequestParams,
+            .tag = tag});
+  }
 
   auto telemetry = std::make_shared<ImageTelemetry>(surfaceId);
 
-  flushImageRequests();
+  if (!ReactNativeFeatureFlags::enableImagePrefetchingJNIBatchingAndroid()) {
+    flushImageRequests();
+  }
 
-  return {imageSource, telemetry};
+  return ImageRequest{imageSource, telemetry};
 }
 
 void ImageFetcher::flushImageRequests() {
-  if (items_.empty()) {
-    return;
+  std::unordered_map<SurfaceId, std::vector<ImageRequestItem>> items;
+  {
+    std::lock_guard<std::mutex> lock(mutex_);
+    if (items_.empty()) {
+      return;
+    }
+    items.swap(items_);
   }
 
   auto fabricUIManager_ =
@@ -47,14 +60,12 @@ void ImageFetcher::flushImageRequests() {
               SurfaceId, std::string, JReadableMapBuffer::javaobject)>(
               "experimental_prefetchResources");
 
-  for (auto& [surfaceId, surfaceImageRequests] : items_) {
+  for (auto& [surfaceId, surfaceImageRequests] : items) {
     auto readableMapBuffer = JReadableMapBuffer::createWithContents(
         serializeImageRequests(surfaceImageRequests));
     prefetchResources(
         fabricUIManager_, surfaceId, "RCTImageView", readableMapBuffer.get());
   }
-
-  items_.clear();
 }
 
 } // namespace facebook::react

package/ReactCommon/react/renderer/imagemanager/platform/android/react/renderer/imagemanager/ImageFetcher.h

@@ -11,11 +11,14 @@
 #include <react/renderer/imagemanager/ImageRequestParams.h>
 #include <react/utils/ContextContainer.h>
 #include <memory>
+#include <mutex>
 #include <unordered_map>
 #include <vector>
 
 namespace facebook::react {
 
+extern const char ImageFetcherKey[];
+
 class ImageFetcher {
  public:
   ImageFetcher(std::shared_ptr<const ContextContainer> contextContainer);
@@ -25,16 +28,18 @@ class ImageFetcher {
   ImageFetcher(ImageFetcher &&) = delete;
   ImageFetcher &operator=(ImageFetcher &&) = delete;
 
+  void flushImageRequests();
+
+ private:
+  friend class ImageManager;
   ImageRequest requestImage(
       const ImageSource &imageSource,
       SurfaceId surfaceId,
       const ImageRequestParams &imageRequestParams,
       Tag tag);
 
- private:
-  void flushImageRequests();
-
   std::unordered_map<SurfaceId, std::vector<ImageRequestItem>> items_;
+  std::mutex mutex_;
   std::shared_ptr<const ContextContainer> contextContainer_;
 };
 } // namespace facebook::react

package/ReactCommon/react/renderer/imagemanager/platform/android/react/renderer/imagemanager/ImageManager.cpp

@@ -22,10 +22,21 @@ constexpr inline bool isInteger(const std::string& str) {
 
 ImageManager::ImageManager(
     const std::shared_ptr<const ContextContainer>& contextContainer)
-    : self_(new ImageFetcher(contextContainer)) {}
+    : contextContainer_(contextContainer),
+      self_(new std::shared_ptr<ImageFetcher>(
+          std::make_shared<ImageFetcher>(contextContainer))) {
+  if (ReactNativeFeatureFlags::enableImagePrefetchingJNIBatchingAndroid()) {
+    std::weak_ptr<ImageFetcher> weakImageFetcher =
+        *static_cast<std::shared_ptr<ImageFetcher>*>(self_);
+    contextContainer->insert(ImageFetcherKey, weakImageFetcher);
+  }
+}
 
 ImageManager::~ImageManager() {
-  delete static_cast<ImageFetcher*>(self_);
+  if (ReactNativeFeatureFlags::enableImagePrefetchingJNIBatchingAndroid()) {
+    contextContainer_->erase(ImageFetcherKey);
+  }
+  delete static_cast<std::shared_ptr<ImageFetcher>*>(self_);
 }
 
 ImageRequest ImageManager::requestImage(
@@ -35,8 +46,9 @@ ImageRequest ImageManager::requestImage(
     Tag tag) const {
   if (ReactNativeFeatureFlags::enableImagePrefetchingAndroid()) {
     if (!isInteger(imageSource.uri)) {
-      return static_cast<ImageFetcher*>(self_)->requestImage(
-          imageSource, surfaceId, imageRequestParams, tag);
+      return static_cast<std::shared_ptr<ImageFetcher>*>(self_)
+          ->get()
+          ->requestImage(imageSource, surfaceId, imageRequestParams, tag);
     }
   }
   return {imageSource, nullptr, {}};

package/ReactCommon/react/renderer/imagemanager/platform/android/react/renderer/imagemanager/ImageRequestParams.h

@@ -30,7 +30,8 @@ class ImageRequestParams {
       Float fadeDuration,
       bool progressiveRenderingEnabled,
       ImageSource loadingIndicatorSource,
-      std::string analyticTag)
+      std::string analyticTag,
+      Size size)
       : blurRadius(blurRadius),
         defaultSource(std::move(defaultSource)),
         resizeMode(resizeMode),
@@ -42,7 +43,8 @@ class ImageRequestParams {
         fadeDuration(fadeDuration),
         progressiveRenderingEnabled(progressiveRenderingEnabled),
         loadingIndicatorSource(std::move(loadingIndicatorSource)),
-        analyticTag(std::move(analyticTag))
+        analyticTag(std::move(analyticTag)),
+        size(size)
   {
   }
 
@@ -58,6 +60,7 @@ class ImageRequestParams {
   bool progressiveRenderingEnabled{};
   ImageSource loadingIndicatorSource{};
   std::string analyticTag{};
+  Size size{};
 
   bool operator==(const ImageRequestParams &rhs) const
   {
@@ -73,7 +76,8 @@ class ImageRequestParams {
                this->fadeDuration,
                this->progressiveRenderingEnabled,
                this->loadingIndicatorSource,
-               this->analyticTag) ==
+               this->analyticTag,
+               this->size) ==
         std::tie(
                rhs.blurRadius,
                rhs.defaultSource,
@@ -86,7 +90,8 @@ class ImageRequestParams {
                rhs.fadeDuration,
                rhs.progressiveRenderingEnabled,
                rhs.loadingIndicatorSource,
-               rhs.analyticTag);
+               rhs.analyticTag,
+               rhs.size);
   }
 
   bool operator!=(const ImageRequestParams &rhs) const

package/ReactCommon/react/renderer/imagemanager/platform/android/react/renderer/imagemanager/conversions.h

@@ -24,8 +24,8 @@ constexpr MapBuffer::Key IS_KEY_DEFAULT_SRC = 1;
 constexpr MapBuffer::Key IS_KEY_RESIZE_MODE = 2;
 constexpr MapBuffer::Key IS_KEY_RESIZE_METHOD = 3;
 constexpr MapBuffer::Key IS_KEY_BLUR_RADIUS = 4;
-constexpr MapBuffer::Key IS_KEY_VIEW_WIDTH = 5;
-constexpr MapBuffer::Key IS_KEY_VIEW_HEIGHT = 6;
+constexpr MapBuffer::Key IS_KEY_IMAGE_WIDTH = 5;
+constexpr MapBuffer::Key IS_KEY_IMAGE_HEIGHT = 6;
 constexpr MapBuffer::Key IS_KEY_RESIZE_MULTIPLIER = 7;
 constexpr MapBuffer::Key IS_KEY_SHOULD_NOTIFY_LOAD_EVENTS = 8;
 constexpr MapBuffer::Key IS_KEY_OVERLAY_COLOR = 9;
@@ -35,16 +35,20 @@ constexpr MapBuffer::Key IS_KEY_PROGRESSIVE_RENDERING_ENABLED = 12;
 constexpr MapBuffer::Key IS_KEY_LOADING_INDICATOR_SRC = 13;
 constexpr MapBuffer::Key IS_KEY_ANALYTIC_TAG = 14;
 constexpr MapBuffer::Key IS_KEY_TAG = 15;
+constexpr MapBuffer::Key IS_KEY_VIEW_WIDTH = 16;
+constexpr MapBuffer::Key IS_KEY_VIEW_HEIGHT = 17;
 
 inline void serializeImageSource(MapBufferBuilder &builder, const ImageSource &imageSource)
 {
   builder.putString(IS_KEY_URI, imageSource.uri);
-  builder.putInt(IS_KEY_VIEW_WIDTH, static_cast<int32_t>(imageSource.size.width));
-  builder.putInt(IS_KEY_VIEW_HEIGHT, static_cast<int32_t>(imageSource.size.height));
+  builder.putInt(IS_KEY_IMAGE_WIDTH, static_cast<int32_t>(imageSource.size.width));
+  builder.putInt(IS_KEY_IMAGE_HEIGHT, static_cast<int32_t>(imageSource.size.height));
 }
 
 inline void serializeImageRequestParams(MapBufferBuilder &builder, const ImageRequestParams &imageRequestParams)
 {
+  builder.putInt(IS_KEY_VIEW_WIDTH, static_cast<int32_t>(imageRequestParams.size.width));
+  builder.putInt(IS_KEY_VIEW_HEIGHT, static_cast<int32_t>(imageRequestParams.size.height));
   builder.putString(IS_KEY_DEFAULT_SRC, imageRequestParams.defaultSource.uri);
   builder.putInt(IS_KEY_RESIZE_MODE, to_underlying(imageRequestParams.resizeMode));
   builder.putString(IS_KEY_RESIZE_METHOD, imageRequestParams.resizeMethod);

package/ReactCommon/react/renderer/imagemanager/platform/ios/react/renderer/imagemanager/RCTSyncImageManager.mm

@@ -90,7 +90,7 @@ using namespace facebook::react;
                                  partialLoadBlock:nil
                                   completionBlock:completionBlock];
 
-  auto result = dispatch_group_wait(imageWaitGroup, dispatch_time(DISPATCH_TIME_NOW, 2 * NSEC_PER_SEC));
+  auto result = dispatch_group_wait(imageWaitGroup, dispatch_time(DISPATCH_TIME_NOW, 5 * NSEC_PER_SEC));
   if (result != 0) {
     RCTLogError(@"Image timed out in test environment for url: %@", loaderRequest.imageURL);
   }

package/ReactCommon/react/renderer/imagemanager/primitives.h

@@ -10,6 +10,7 @@
 #include <string>
 #include <vector>
 
+#include <react/debug/react_native_assert.h>
 #include <react/renderer/core/graphicsConversions.h>
 #include <react/renderer/core/propsConversions.h>
 #include <react/renderer/debug/debugStringConvertibleUtils.h>
@@ -48,15 +49,16 @@ class ImageSource {
   {
     folly::dynamic imageSourceResult = folly::dynamic::object();
     switch (type) {
-      case ImageSource::Type::Invalid:
-        imageSourceResult["type"] = "invalid";
-        break;
       case ImageSource::Type::Remote:
         imageSourceResult["type"] = "remote";
         break;
       case ImageSource::Type::Local:
         imageSourceResult["type"] = "local";
         break;
+      case ImageSource::Type::Invalid:
+      default:
+        imageSourceResult["type"] = "invalid";
+        break;
     }
 
     imageSourceResult["uri"] = uri;
@@ -72,9 +74,6 @@ class ImageSource {
     imageSourceResult["method"] = method;
 
     switch (cache) {
-      case ImageSource::CacheStategy::Default:
-        imageSourceResult["cache"] = "default";
-        break;
       case ImageSource::CacheStategy::Reload:
         imageSourceResult["cache"] = "reload";
         break;
@@ -84,6 +83,10 @@ class ImageSource {
       case ImageSource::CacheStategy::OnlyIfCached:
         imageSourceResult["cache"] = "only-if-cached";
         break;
+      case ImageSource::CacheStategy::Default:
+      default:
+        imageSourceResult["cache"] = "default";
+        break;
     }
 
     folly::dynamic headersObject = folly::dynamic::object();
@@ -128,6 +131,9 @@ class ImageSource {
         return "remote";
       case ImageSource::Type::Local:
         return "local";
+      default:
+        react_native_assert(false && "Invalid ImageSource::Type");
+        return "";
     }
   }
 
@@ -142,6 +148,9 @@ class ImageSource {
         return "force-cache";
       case ImageSource::CacheStategy::OnlyIfCached:
         return "only-if-cached";
+      default:
+        react_native_assert(false && "Invalid ImageSource::CacheStategy");
+        return "";
     }
   }
 #endif

package/ReactCommon/react/renderer/mounting/MountingCoordinator.cpp

@@ -68,17 +68,6 @@ bool MountingCoordinator::waitForTransaction(
       lock, timeout, [this]() { return lastRevision_.has_value(); });
 }
 
-void MountingCoordinator::updateBaseRevision(
-    const ShadowTreeRevision& baseRevision) const {
-  std::scoped_lock lock(mutex_);
-  baseRevision_ = baseRevision;
-}
-
-void MountingCoordinator::resetLatestRevision() const {
-  std::scoped_lock lock(mutex_);
-  lastRevision_.reset();
-}
-
 std::optional<MountingTransaction> MountingCoordinator::pullTransaction(
     bool willPerformAsynchronously) const {
   TraceSection section("MountingCoordinator::pullTransaction");

package/ReactCommon/react/renderer/mounting/MountingCoordinator.h

@@ -101,9 +101,6 @@ class MountingCoordinator final {
    * `MountingOverrideDelegate` only.
    */
  public:
-  void updateBaseRevision(const ShadowTreeRevision &baseRevision) const;
-  void resetLatestRevision() const;
-
   void setMountingOverrideDelegate(std::weak_ptr<const MountingOverrideDelegate> delegate) const;
 
   /*
@@ -123,7 +120,6 @@ class MountingCoordinator final {
    */
   void revoke() const;
 
- private:
   const SurfaceId surfaceId_;
 
   // Protects access to `baseRevision_`, `lastRevision_` and

package/ReactCommon/react/renderer/scheduler/SurfaceHandler.cpp

@@ -23,26 +23,6 @@ SurfaceHandler::SurfaceHandler(
   parameters_.surfaceId = surfaceId;
 }
 
-SurfaceHandler::SurfaceHandler(SurfaceHandler&& other) noexcept {
-  operator=(std::move(other));
-}
-
-SurfaceHandler& SurfaceHandler::operator=(SurfaceHandler&& other) noexcept {
-  std::unique_lock lock1(linkMutex_, std::defer_lock);
-  std::unique_lock lock2(parametersMutex_, std::defer_lock);
-  std::unique_lock lock3(other.linkMutex_, std::defer_lock);
-  std::unique_lock lock4(other.parametersMutex_, std::defer_lock);
-  std::lock(lock1, lock2, lock3, lock4);
-
-  link_ = other.link_;
-  parameters_ = other.parameters_;
-
-  other.link_ = Link{};
-  other.parameters_ = Parameters{};
-  other.parameters_.contextContainer = parameters_.contextContainer;
-  return *this;
-}
-
 #pragma mark - Surface Life-Cycle Management
 
 void SurfaceHandler::setContextContainer(

package/ReactCommon/react/renderer/scheduler/SurfaceHandler.h

@@ -67,11 +67,11 @@ class SurfaceHandler {
   virtual ~SurfaceHandler() noexcept;
 
   /*
-   * Movable-only.
+   * Not moveable or copyable
    */
-  SurfaceHandler(SurfaceHandler &&other) noexcept;
+  SurfaceHandler(SurfaceHandler &&other) noexcept = delete;
   SurfaceHandler(const SurfaceHandler &SurfaceHandler) noexcept = delete;
-  SurfaceHandler &operator=(SurfaceHandler &&other) noexcept;
+  SurfaceHandler &operator=(SurfaceHandler &&other) noexcept = delete;
   SurfaceHandler &operator=(const SurfaceHandler &other) noexcept = delete;
 
 #pragma mark - Surface Life-Cycle Management

package/ReactCommon/react/renderer/scheduler/SurfaceManager.cpp

@@ -29,9 +29,8 @@ void SurfaceManager::startSurface(
     const LayoutContext& layoutContext) noexcept {
   {
     std::unique_lock lock(mutex_);
-    auto surfaceHandler = SurfaceHandler{moduleName, surfaceId};
-    surfaceHandler.setContextContainer(scheduler_.getContextContainer());
-    registry_.emplace(surfaceId, std::move(surfaceHandler));
+    auto [it, _] = registry_.try_emplace(surfaceId, moduleName, surfaceId);
+    it->second.setContextContainer(scheduler_.getContextContainer());
   }
 
   visit(surfaceId, [&](const SurfaceHandler& surfaceHandler) {

package/ReactCommon/react/renderer/uimanager/UIManager.cpp

@@ -205,6 +205,12 @@ void UIManager::completeSurface(
       // after we commit a specific one.
       lazyShadowTreeRevisionConsistencyManager_->updateCurrentRevision(
           surfaceId, shadowTree.getCurrentRevision().rootShadowNode);
+
+      if (ReactNativeFeatureFlags::useSharedAnimatedBackend()) {
+        if (auto animationBackend = animationBackend_.lock()) {
+          animationBackend->clearRegistry(surfaceId);
+        }
+      }
     }
   });
 }

package/ReactCommon/react/renderer/uimanager/UIManagerAnimationBackend.h

@@ -19,6 +19,7 @@ class UIManagerAnimationBackend {
   virtual void onAnimationFrame(double timestamp) = 0;
   // TODO: T240293839 Move over start() function and mutation types
   virtual void stop(bool isAsync) = 0;
+  virtual void clearRegistry(SurfaceId surfaceId) = 0;
 };
 
 } // namespace facebook::react

package/ReactCommon/react/runtime/CMakeLists.txt

@@ -18,10 +18,6 @@ add_library(bridgeless
 target_compile_reactnative_options(bridgeless PRIVATE)
 if(${CMAKE_BUILD_TYPE} MATCHES Debug OR REACT_NATIVE_DEBUG_OPTIMIZED)
   target_compile_options(bridgeless PRIVATE -DHERMES_ENABLE_DEBUGGER=1)
-
-  if (HERMES_V1_ENABLED)
-        target_compile_options(bridgeless PRIVATE -DHERMES_V1_ENABLED=1)
-  endif()
 endif ()
 target_include_directories(bridgeless PUBLIC .)
 

package/ReactCommon/react/runtime/PlatformTimerRegistry.h

@@ -25,6 +25,8 @@ class PlatformTimerRegistry {
   virtual void createRecurringTimer(uint32_t timerID, double delayMS) = 0;
 
   virtual ~PlatformTimerRegistry() noexcept = default;
+
+  virtual void quit() {}
 };
 
 using TimerManagerDelegate = PlatformTimerRegistry;

package/ReactCommon/react/runtime/ReactInstance.cpp

@@ -15,13 +15,13 @@
 #include <cxxreact/TraceSection.h>
 #include <glog/logging.h>
 #include <jsi/JSIDynamic.h>
-#include <jsi/hermes.h>
+#include <jsi/hermes-interfaces.h>
 #include <jsi/instrumentation.h>
 #include <jsinspector-modern/HostTarget.h>
-#include <jsireact/JSIExecutor.h>
 #include <react/featureflags/ReactNativeFeatureFlags.h>
 #include <react/renderer/core/ShadowNode.h>
 #include <react/renderer/runtimescheduler/RuntimeSchedulerBinding.h>
+#include <react/runtime/JSRuntimeBindings.h>
 #include <react/timing/primitives.h>
 #include <react/utils/jsi-utils.h>
 #include <iostream>
@@ -48,6 +48,12 @@ std::shared_ptr<RuntimeScheduler> createRuntimeScheduler(
   return scheduler;
 }
 
+std::string getSyntheticBundlePath(uint32_t bundleId) {
+  std::array<char, 32> buffer{};
+  std::snprintf(buffer.data(), buffer.size(), "seg-%u.js", bundleId);
+  return buffer.data();
+}
+
 } // namespace
 
 ReactInstance::ReactInstance(
@@ -89,7 +95,7 @@ ReactInstance::ReactInstance(
               jsErrorHandler->handleError(jsiRuntime, originalError, true);
             } catch (std::exception& ex) {
               jsi::JSError error(
-                  jsiRuntime, std::string("Non-js exception: ") + ex.what());
+                  jsiRuntime, std::string("Non-JS exception: ") + ex.what());
               jsErrorHandler->handleError(jsiRuntime, error, true);
             }
           });
@@ -156,6 +162,11 @@ ReactInstance::ReactInstance(
         runtimeScheduler->scheduleWork(std::move(callback));
       });
 }
+ReactInstance::~ReactInstance() noexcept {
+  if (timerManager_ != nullptr) {
+    timerManager_->quit();
+  }
+}
 
 void ReactInstance::unregisterFromInspector() {
   if (inspectorTarget_ != nullptr) {
@@ -178,8 +189,8 @@ RuntimeExecutor ReactInstance::getUnbufferedRuntimeExecutor() noexcept {
 
 // This BufferedRuntimeExecutor ensures that the main JS bundle finished
 // execution before any JS queued into it from C++ are executed. Use
-// getUnbufferedRuntimeExecutor() instead if you do not need the main JS bundle
-// to have finished. e.g. setting global variables into JS runtime.
+// getUnbufferedRuntimeExecutor() instead if you do not need the main JS
+// bundle to have finished. e.g. setting global variables into JS runtime.
 RuntimeExecutor ReactInstance::getBufferedRuntimeExecutor() noexcept {
   return [weakBufferedRuntimeExecutor_ =
               std::weak_ptr<BufferedRuntimeExecutor>(bufferedRuntimeExecutor_)](
@@ -213,15 +224,15 @@ std::string simpleBasename(const std::string& path) {
  * Load the JS bundle and flush buffered JS calls, future JS calls won't be
  * buffered after calling this.
  * Note that this method is asynchronous. However, a completion callback
- * isn't needed because all calls into JS should be dispatched to the JSThread,
- * preferably via the runtimeExecutor_.
+ * isn't needed because all calls into JS should be dispatched to the
+ * JSThread, preferably via the runtimeExecutor_.
  */
 void ReactInstance::loadScript(
     std::unique_ptr<const JSBigString> script,
     const std::string& sourceURL,
     std::function<void(jsi::Runtime& runtime)>&& beforeLoad,
     std::function<void(jsi::Runtime& runtime)>&& afterLoad) {
-  auto buffer = std::make_shared<BigStringBuffer>(std::move(script));
+  std::shared_ptr<const jsi::Buffer> buffer(std::move(script));
   std::string scriptName = simpleBasename(sourceURL);
 
   runtimeScheduler_->scheduleWork([this,
@@ -232,7 +243,7 @@ void ReactInstance::loadScript(
                                        std::weak_ptr<BufferedRuntimeExecutor>(
                                            bufferedRuntimeExecutor_),
                                    beforeLoad,
-                                   afterLoad](jsi::Runtime& runtime) {
+                                   afterLoad](jsi::Runtime& runtime) mutable {
     if (beforeLoad) {
       beforeLoad(runtime);
     }
@@ -357,7 +368,6 @@ void ReactInstance::registerSegment(
       throw std::invalid_argument(
           "Empty segment registered with ID " + tag + " from " + segmentPath);
     }
-    auto buffer = std::make_shared<BigStringBuffer>(std::move(script));
 
     bool hasLogger(ReactMarker::logTaggedMarkerBridgelessImpl != nullptr);
     if (hasLogger) {
@@ -366,11 +376,8 @@ void ReactInstance::registerSegment(
     }
     LOG(WARNING) << "Starting to evaluate segment " << segmentId
                  << " in ReactInstance::registerSegment";
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     runtime.evaluateJavaScript(
-        buffer, JSExecutor::getSyntheticBundlePath(segmentId, segmentPath));
-#pragma clang diagnostic pop
+        std::move(script), getSyntheticBundlePath(segmentId));
     LOG(WARNING) << "Finished evaluating segment " << segmentId
                  << " in ReactInstance::registerSegment";
     if (hasLogger) {

package/ReactCommon/react/runtime/ReactInstance.h

@@ -13,7 +13,6 @@
 #include <jserrorhandler/JsErrorHandler.h>
 #include <jsi/jsi.h>
 #include <jsinspector-modern/ReactCdp.h>
-#include <jsireact/JSIExecutor.h>
 #include <react/renderer/runtimescheduler/RuntimeScheduler.h>
 #include <react/runtime/BufferedRuntimeExecutor.h>
 #include <react/runtime/JSRuntimeFactory.h>
@@ -31,6 +30,11 @@ class ReactInstance final : private jsinspector_modern::InstanceTargetDelegate {
       std::shared_ptr<TimerManager> timerManager,
       JsErrorHandler::OnJsError onJsError,
       jsinspector_modern::HostTarget *parentInspectorTarget = nullptr);
+  ReactInstance(const ReactInstance &) = delete;
+  ReactInstance(ReactInstance &&) = delete;
+  ReactInstance &operator=(const ReactInstance &) = delete;
+  ReactInstance &operator=(ReactInstance &&) = delete;
+  ~ReactInstance() noexcept override;
 
   RuntimeExecutor getUnbufferedRuntimeExecutor() noexcept;