react-native-tvos 0.76.6-0 → 0.77.0-0

package/ReactCommon/react/runtime/hermes/HermesInstance.cpp

@@ -139,16 +139,13 @@ std::unique_ptr<JSRuntime> HermesInstance::createJSRuntime(
     gcConfig.withAllocInYoung(false).withRevertToYGAtTTI(true);
   }
 
-  int64_t vmExperimentFlags = reactNativeConfig
-      ? reactNativeConfig->getInt64("ios_hermes:vm_experiment_flags")
-      : 0;
-
   ::hermes::vm::RuntimeConfig::Builder runtimeConfigBuilder =
       ::hermes::vm::RuntimeConfig::Builder()
           .withGCConfig(gcConfig.build())
           .withEnableSampleProfiling(true)
-          .withMicrotaskQueue(ReactNativeFeatureFlags::enableMicrotasks())
-          .withVMExperimentFlags(vmExperimentFlags);
+          .withMicrotaskQueue(
+              ReactNativeFeatureFlags::enableBridgelessArchitecture() &&
+              !ReactNativeFeatureFlags::disableEventLoopOnBridgeless());
 
   if (crashManager) {
     runtimeConfigBuilder.withCrashMgr(crashManager);

package/ReactCommon/react/runtime/iostests/RCTHostTests.mm

@@ -135,11 +135,29 @@ static ShimRCTInstance *shimmedRCTInstance;
   stackFrame0[@"file"] = @"file2.js";
   [stack addObject:stackFrame1];
 
-  [instanceDelegate instance:[OCMArg any] didReceiveJSErrorStack:stack message:@"message" exceptionId:5 isFatal:YES];
+  id extraData = [NSDictionary dictionary];
+
+  [instanceDelegate instance:[OCMArg any]
+      didReceiveJSErrorStack:stack
+                     message:@"message"
+             originalMessage:nil
+                        name:nil
+              componentStack:nil
+                 exceptionId:5
+                     isFatal:YES
+                   extraData:extraData];
 
   OCMVerify(
       OCMTimes(1),
-      [_mockHostDelegate host:_subject didReceiveJSErrorStack:stack message:@"message" exceptionId:5 isFatal:YES]);
+      [_mockHostDelegate host:_subject
+          didReceiveJSErrorStack:stack
+                         message:@"message"
+                 originalMessage:nil
+                            name:nil
+                  componentStack:nil
+                     exceptionId:5
+                         isFatal:YES
+                       extraData:extraData]);
 }
 
 - (void)testDidInitializeRuntime

package/ReactCommon/react/runtime/platform/ios/React-RuntimeApple.podspec

@@ -19,8 +19,10 @@ end
 folly_config = get_folly_config()
 folly_compiler_flags = folly_config[:compiler_flags]
 folly_version = folly_config[:version]
-folly_dep_name = 'RCT-Folly/Fabric'
-boost_compiler_flags = '-Wno-documentation'
+folly_dep_name = folly_config[:dep_name]
+
+boost_config = get_boost_config()
+boost_compiler_flags = boost_config[:compiler_flags]
 
 header_search_paths = [
   "$(PODS_ROOT)/boost",
@@ -67,6 +69,9 @@ Pod::Spec.new do |s|
   s.dependency "React-Mapbuffer"
   s.dependency "React-jserrorhandler"
   s.dependency "React-jsinspector"
+  s.dependency "React-featureflags"
+
+  add_dependency(s, "React-RCTFBReactNativeSpec")
 
   if ENV["USE_HERMES"] == nil || ENV["USE_HERMES"] == "1"
     s.dependency "hermes-engine"

package/ReactCommon/react/runtime/platform/ios/ReactCommon/RCTHost+Internal.h

@@ -14,5 +14,8 @@
 - (void)registerSegmentWithId:(NSNumber *)segmentId path:(NSString *)path;
 - (void)setBundleURLProvider:(RCTHostBundleURLProvider)bundleURLProvider;
 - (void)setContextContainerHandler:(id<RCTContextContainerHandling>)contextContainerHandler;
+- (void)reload;
+
+@property (nonatomic, readonly) RCTBundleManager *bundleManager;
 
 @end

package/ReactCommon/react/runtime/platform/ios/ReactCommon/RCTHost.h

@@ -27,12 +27,6 @@ typedef NSURL *_Nullable (^RCTHostBundleURLProvider)(void);
 
 @protocol RCTHostDelegate <NSObject>
 
-- (void)host:(RCTHost *)host
-    didReceiveJSErrorStack:(NSArray<NSDictionary<NSString *, id> *> *)stack
-                   message:(NSString *)message
-               exceptionId:(NSUInteger)exceptionId
-                   isFatal:(BOOL)isFatal;
-
 - (void)hostDidStart:(RCTHost *)host;
 
 @optional
@@ -40,6 +34,17 @@ typedef NSURL *_Nullable (^RCTHostBundleURLProvider)(void);
              onProgress:(RCTSourceLoadProgressBlock)onProgress
              onComplete:(RCTSourceLoadBlock)loadCallback;
 
+// TODO(T205780509): Remove this api in react native v0.78
+// The bridgeless js error handling api will just call into exceptionsmanager directly
+- (void)host:(RCTHost *)host
+    didReceiveJSErrorStack:(NSArray<NSDictionary<NSString *, id> *> *)stack
+                   message:(NSString *)message
+           originalMessage:(NSString *_Nullable)originalMessage
+                      name:(NSString *_Nullable)name
+            componentStack:(NSString *_Nullable)componentStack
+               exceptionId:(NSUInteger)exceptionId
+                   isFatal:(BOOL)isFatal
+                 extraData:(NSDictionary<NSString *, id> *)extraData __attribute__((deprecated));
 @end
 
 @protocol RCTHostRuntimeDelegate <NSObject>
@@ -64,6 +69,9 @@ typedef std::shared_ptr<facebook::react::JSRuntimeFactory> (^RCTHostJSEngineProv
                  jsEngineProvider:(RCTHostJSEngineProvider)jsEngineProvider
                     launchOptions:(nullable NSDictionary *)launchOptions __deprecated;
 
+- (instancetype)init NS_UNAVAILABLE;
++ (instancetype)new NS_UNAVAILABLE;
+
 @property (nonatomic, weak, nullable) id<RCTHostRuntimeDelegate> runtimeDelegate;
 
 @property (nonatomic, readonly) RCTSurfacePresenter *surfacePresenter;

package/ReactCommon/react/runtime/platform/ios/ReactCommon/RCTHost.mm

@@ -273,6 +273,11 @@ class RCTHostHostTargetDelegate : public facebook::react::jsinspector_modern::Ho
   return [_instance surfacePresenter];
 }
 
+- (RCTBundleManager *)bundleManager
+{
+  return _bundleManager;
+}
+
 - (void)callFunctionOnJSModule:(NSString *)moduleName method:(NSString *)method args:(NSArray *)args
 {
   [_instance callFunctionOnJSModule:moduleName method:method args:args];
@@ -282,25 +287,7 @@ class RCTHostHostTargetDelegate : public facebook::react::jsinspector_modern::Ho
 
 - (void)didReceiveReloadCommand
 {
-  [_instance invalidate];
-  _instance = nil;
-  if (_bundleURLProvider) {
-    [self _setBundleURL:_bundleURLProvider()];
-  }
-
-  _instance = [[RCTInstance alloc] initWithDelegate:self
-                                   jsRuntimeFactory:[self _provideJSEngine]
-                                      bundleManager:_bundleManager
-                         turboModuleManagerDelegate:_turboModuleManagerDelegate
-                                     moduleRegistry:_moduleRegistry
-                              parentInspectorTarget:_inspectorTarget.get()
-                                      launchOptions:_launchOptions];
-  [_hostDelegate hostDidStart:self];
-
-  for (RCTFabricSurface *surface in [self _getAttachedSurfaces]) {
-    [surface resetWithSurfacePresenter:self.surfacePresenter];
-    [_instance callFunctionOnBufferedRuntimeExecutor:[surface](facebook::jsi::Runtime &_) { [surface start]; }];
-  }
+  [self _reloadWithShouldRestartSurfaces:YES];
 }
 
 - (void)dealloc
@@ -315,13 +302,32 @@ class RCTHostHostTargetDelegate : public facebook::react::jsinspector_modern::Ho
 
 #pragma mark - RCTInstanceDelegate
 
-- (void)instance:(RCTInstance *)instance
+- (BOOL)instance:(RCTInstance *)instance
     didReceiveJSErrorStack:(NSArray<NSDictionary<NSString *, id> *> *)stack
                    message:(NSString *)message
+           originalMessage:(NSString *_Nullable)originalMessage
+                      name:(NSString *_Nullable)name
+            componentStack:(NSString *_Nullable)componentStack
                exceptionId:(NSUInteger)exceptionId
                    isFatal:(BOOL)isFatal
+                 extraData:(NSDictionary<NSString *, id> *)extraData
 {
-  [_hostDelegate host:self didReceiveJSErrorStack:stack message:message exceptionId:exceptionId isFatal:isFatal];
+  if (![_hostDelegate respondsToSelector:@selector(host:
+                                             didReceiveJSErrorStack:message:originalMessage:name:componentStack
+                                                                   :exceptionId:isFatal:extraData:)]) {
+    return NO;
+  }
+
+  [_hostDelegate host:self
+      didReceiveJSErrorStack:stack
+                     message:message
+             originalMessage:originalMessage
+                        name:name
+              componentStack:componentStack
+                 exceptionId:exceptionId
+                     isFatal:isFatal
+                   extraData:extraData];
+  return YES;
 }
 
 - (void)instance:(RCTInstance *)instance didInitializeRuntime:(facebook::jsi::Runtime &)runtime
@@ -364,6 +370,11 @@ class RCTHostHostTargetDelegate : public facebook::react::jsinspector_modern::Ho
   _contextContainerHandler = contextContainerHandler;
 }
 
+- (void)reload
+{
+  [self _reloadWithShouldRestartSurfaces:NO];
+}
+
 #pragma mark - Private
 
 - (void)_attachSurface:(RCTFabricSurface *)surface
@@ -408,6 +419,33 @@ class RCTHostHostTargetDelegate : public facebook::react::jsinspector_modern::Ho
   RCTReloadCommandSetBundleURL(_bundleURL);
 }
 
+- (void)_reloadWithShouldRestartSurfaces:(BOOL)shouldRestartSurfaces
+{
+  [_instance invalidate];
+  _instance = nil;
+  if (_bundleURLProvider) {
+    [self _setBundleURL:_bundleURLProvider()];
+  }
+
+  _instance = [[RCTInstance alloc] initWithDelegate:self
+                                   jsRuntimeFactory:[self _provideJSEngine]
+                                      bundleManager:_bundleManager
+                         turboModuleManagerDelegate:_turboModuleManagerDelegate
+                                     moduleRegistry:_moduleRegistry
+                              parentInspectorTarget:_inspectorTarget.get()
+                                      launchOptions:_launchOptions];
+  [_hostDelegate hostDidStart:self];
+
+  for (RCTFabricSurface *surface in [self _getAttachedSurfaces]) {
+    [surface resetWithSurfacePresenter:self.surfacePresenter];
+    if (shouldRestartSurfaces) {
+      [_instance callFunctionOnBufferedRuntimeExecutor:[surface](facebook::jsi::Runtime &_) { [surface start]; }];
+    }
+  }
+}
+
+#pragma mark - jsinspector_modern
+
 - (jsinspector_modern::HostTarget *)inspectorTarget
 {
   return _inspectorTarget.get();

package/ReactCommon/react/runtime/platform/ios/ReactCommon/RCTInstance.h

@@ -37,18 +37,23 @@ RCT_EXTERN void RCTInstanceSetRuntimeDiagnosticFlags(NSString *_Nullable flags);
 
 @protocol RCTInstanceDelegate <RCTContextContainerHandling>
 
-- (void)instance:(RCTInstance *)instance
-    didReceiveJSErrorStack:(NSArray<NSDictionary<NSString *, id> *> *)stack
-                   message:(NSString *)message
-               exceptionId:(NSUInteger)exceptionId
-                   isFatal:(BOOL)isFatal;
-
 - (void)instance:(RCTInstance *)instance didInitializeRuntime:(facebook::jsi::Runtime &)runtime;
 
 - (void)loadBundleAtURL:(NSURL *)sourceURL
              onProgress:(RCTSourceLoadProgressBlock)onProgress
              onComplete:(RCTSourceLoadBlock)loadCallback;
 
+// TODO(T205780509): Remove this api in react native v0.78
+// The bridgeless js error handling api will just call into exceptionsmanager directly
+- (BOOL)instance:(RCTInstance *)instance
+    didReceiveJSErrorStack:(NSArray<NSDictionary<NSString *, id> *> *)stack
+                   message:(NSString *)message
+           originalMessage:(NSString *_Nullable)originalMessage
+                      name:(NSString *_Nullable)name
+            componentStack:(NSString *_Nullable)componentStack
+               exceptionId:(NSUInteger)exceptionId
+                   isFatal:(BOOL)isFatal
+                 extraData:(NSDictionary<NSString *, id> *)extraData __attribute__((deprecated));
 @end
 
 /**

package/ReactCommon/react/runtime/platform/ios/ReactCommon/RCTInstance.mm

@@ -9,6 +9,7 @@
 
 #import <memory>
 
+#import <FBReactNativeSpec/FBReactNativeSpec.h>
 #import <React/NSDataBigString.h>
 #import <React/RCTAssert.h>
 #import <React/RCTBridge+Inspector.h>
@@ -31,11 +32,13 @@
 #import <React/RCTPerformanceLogger.h>
 #import <React/RCTRedBox.h>
 #import <React/RCTSurfacePresenter.h>
+#import <ReactCommon/RCTTurboModule.h>
 #import <ReactCommon/RCTTurboModuleManager.h>
 #import <ReactCommon/RuntimeExecutor.h>
 #import <cxxreact/ReactMarker.h>
 #import <jsinspector-modern/ReactCdp.h>
 #import <jsireact/JSIExecutor.h>
+#import <react/featureflags/ReactNativeFeatureFlags.h>
 #import <react/renderer/runtimescheduler/RuntimeSchedulerCallInvoker.h>
 #import <react/utils/ContextContainer.h>
 #import <react/utils/ManagedObjectWrapper.h>
@@ -66,7 +69,7 @@ void RCTInstanceSetRuntimeDiagnosticFlags(NSString *flags)
   sRuntimeDiagnosticFlags = [flags copy];
 }
 
-@interface RCTInstance () <RCTTurboModuleManagerDelegate, RCTTurboModuleManagerRuntimeHandler>
+@interface RCTInstance () <RCTTurboModuleManagerDelegate>
 @end
 
 @implementation RCTInstance {
@@ -133,7 +136,7 @@ void RCTInstanceSetRuntimeDiagnosticFlags(NSString *flags)
 {
   if (_valid) {
     _reactInstance->callFunctionOnModule(
-        [moduleName UTF8String], [method UTF8String], convertIdToFollyDynamic(args ?: @[]));
+        [moduleName UTF8String], [method UTF8String], convertIdToFollyDynamic(args ? args : @[]));
   }
 }
 
@@ -141,8 +144,8 @@ void RCTInstanceSetRuntimeDiagnosticFlags(NSString *flags)
 {
   std::lock_guard<std::mutex> lock(_invalidationMutex);
   _valid = false;
-  if (self->_reactInstance) {
-    self->_reactInstance->unregisterFromInspector();
+  if (_reactInstance) {
+    _reactInstance->unregisterFromInspector();
   }
   [_surfacePresenter suspend];
   [_jsThreadManager dispatchToJSThread:^{
@@ -207,15 +210,13 @@ void RCTInstanceSetRuntimeDiagnosticFlags(NSString *flags)
   return nullptr;
 }
 
-#pragma mark - RCTTurboModuleManagerRuntimeHandler
-
-- (RuntimeExecutor)runtimeExecutorForTurboModuleManager:(RCTTurboModuleManager *)turboModuleManager
+- (NSArray<id<RCTBridgeModule>> *)extraModulesForBridge:(RCTBridge *)bridge
 {
-  if (_valid) {
-    return _reactInstance->getBufferedRuntimeExecutor();
+  if ([_appTMMDelegate respondsToSelector:@selector(extraModulesForBridge:)]) {
+    return [_appTMMDelegate extraModulesForBridge:nil];
   }
 
-  return nullptr;
+  return @[];
 }
 
 #pragma mark - Private
@@ -231,7 +232,9 @@ void RCTInstanceSetRuntimeDiagnosticFlags(NSString *flags)
   objCTimerRegistryRawPtr->setTimerManager(timerManager);
 
   __weak __typeof(self) weakSelf = self;
-  auto onJsError = [=](const JsErrorHandler::ParsedError &error) { [weakSelf _handleJSError:error]; };
+  auto onJsError = [=](jsi::Runtime &runtime, const JsErrorHandler::ParsedError &error) {
+    [weakSelf _handleJSError:error withRuntime:runtime];
+  };
 
   // Create the React Instance
   _reactInstance = std::make_unique<ReactInstance>(
@@ -273,7 +276,6 @@ void RCTInstanceSetRuntimeDiagnosticFlags(NSString *flags)
                                                      bridgeModuleDecorator:_bridgeModuleDecorator
                                                                   delegate:self
                                                                  jsInvoker:jsCallInvoker];
-  _turboModuleManager.runtimeHandler = self;
 
 #if RCT_DEV
   /**
@@ -336,7 +338,7 @@ void RCTInstanceSetRuntimeDiagnosticFlags(NSString *flags)
     });
     RCTInstallNativeComponentRegistryBinding(runtime);
 
-    if (RCTGetUseNativeViewConfigsInBridgelessMode()) {
+    if (ReactNativeFeatureFlags::useNativeViewConfigsInBridgelessMode()) {
       installLegacyUIManagerConstantsProviderBinding(runtime);
     }
 
@@ -475,23 +477,59 @@ void RCTInstanceSetRuntimeDiagnosticFlags(NSString *flags)
   });
 }
 
-- (void)_handleJSError:(const JsErrorHandler::ParsedError &)error
+- (void)_handleJSError:(const JsErrorHandler::ParsedError &)error withRuntime:(jsi::Runtime &)runtime
 {
-  NSString *message = [NSString stringWithCString:error.message.c_str() encoding:[NSString defaultCStringEncoding]];
+  NSMutableDictionary<NSString *, id> *errorData = [NSMutableDictionary new];
+  errorData[@"message"] = @(error.message.c_str());
+  if (error.originalMessage) {
+    errorData[@"originalMessage"] = @(error.originalMessage->c_str());
+  }
+  if (error.name) {
+    errorData[@"name"] = @(error.name->c_str());
+  }
+  if (error.componentStack) {
+    errorData[@"componentStack"] = @(error.componentStack->c_str());
+  }
+
   NSMutableArray<NSDictionary<NSString *, id> *> *stack = [NSMutableArray new];
-  for (const JsErrorHandler::ParsedError::StackFrame &frame : error.frames) {
-    [stack addObject:@{
-      @"file" : [NSString stringWithCString:frame.fileName.c_str() encoding:[NSString defaultCStringEncoding]],
-      @"methodName" : [NSString stringWithCString:frame.methodName.c_str() encoding:[NSString defaultCStringEncoding]],
-      @"lineNumber" : [NSNumber numberWithInt:frame.lineNumber],
-      @"column" : [NSNumber numberWithInt:frame.columnNumber],
-    }];
+  for (const JsErrorHandler::ParsedError::StackFrame &frame : error.stack) {
+    NSMutableDictionary<NSString *, id> *stackFrame = [NSMutableDictionary new];
+    if (frame.file) {
+      stackFrame[@"file"] = @(frame.file->c_str());
+    }
+    stackFrame[@"methodName"] = @(frame.methodName.c_str());
+    if (frame.lineNumber) {
+      stackFrame[@"lineNumber"] = @(*frame.lineNumber);
+    }
+    if (frame.column) {
+      stackFrame[@"column"] = @(*frame.column);
+    }
+    [stack addObject:stackFrame];
+  }
+
+  errorData[@"stack"] = stack;
+  errorData[@"id"] = @(error.id);
+  errorData[@"isFatal"] = @(error.isFatal);
+
+  id extraData =
+      TurboModuleConvertUtils::convertJSIValueToObjCObject(runtime, jsi::Value(runtime, error.extraData), nullptr);
+  if (extraData) {
+    errorData[@"extraData"] = extraData;
+  }
+
+  if (![_delegate instance:self
+          didReceiveJSErrorStack:errorData[@"stack"]
+                         message:errorData[@"message"]
+                 originalMessage:errorData[@"originalMessage"]
+                            name:errorData[@"name"]
+                  componentStack:errorData[@"componentStack"]
+                     exceptionId:error.id
+                         isFatal:errorData[@"isFatal"]
+                       extraData:errorData[@"extraData"]]) {
+    JS::NativeExceptionsManager::ExceptionData jsErrorData{errorData};
+    id<NativeExceptionsManagerSpec> exceptionsManager = [_turboModuleManager moduleForName:"ExceptionsManager"];
+    [exceptionsManager reportException:jsErrorData];
   }
-  [_delegate instance:self
-      didReceiveJSErrorStack:stack
-                     message:message
-                 exceptionId:error.exceptionId
-                     isFatal:error.isFatal];
 }
 
 @end

package/ReactCommon/react/runtime/tests/cxx/ReactInstanceTest.cpp

@@ -124,7 +124,8 @@ class ReactInstanceTest : public ::testing::Test {
     auto mockRegistry = std::make_unique<MockTimerRegistry>();
     mockRegistry_ = mockRegistry.get();
     timerManager_ = std::make_shared<TimerManager>(std::move(mockRegistry));
-    auto onJsError = [](const JsErrorHandler::ParsedError& errorMap) noexcept {
+    auto onJsError = [](jsi::Runtime& /*runtime*/,
+                        const JsErrorHandler::ParsedError& /*error*/) noexcept {
       // Do nothing
     };
 
@@ -236,136 +237,6 @@ TEST_F(ReactInstanceTest, testProfilingFlag) {
   EXPECT_EQ(val.getBool(), true);
 }
 
-TEST_F(ReactInstanceTest, testPromiseIntegration) {
-  initializeRuntimeWithScript("");
-
-  eval(R"xyz123(
-let called = 0;
-function getResult() {
-  return called;
-}
-Promise.resolve().then(() => {
-  called++;
-}).then(() => {
-  called++;
-})
-)xyz123");
-  auto result = runtime_->global()
-                    .getPropertyAsFunction(*runtime_, "getResult")
-                    .call(*runtime_);
-  EXPECT_EQ(result.getNumber(), 2);
-}
-
-TEST_F(ReactInstanceTest, testSetImmediate) {
-  initializeRuntimeWithScript("");
-
-  eval(R"xyz123(
-let called = false;
-function getResult() {
-  return called;
-}
-setImmediate(() => {
-  called = true;
-});
-)xyz123");
-  auto result = runtime_->global()
-                    .getPropertyAsFunction(*runtime_, "getResult")
-                    .call(*runtime_);
-  EXPECT_EQ(result.getBool(), true);
-}
-
-TEST_F(ReactInstanceTest, testNestedSetImmediate) {
-  initializeRuntimeWithScript("");
-
-  eval(R"xyz123(
-let called = false;
-function getResult() {
-  return called;
-}
-setImmediate(() => {
-  setImmediate(() => {
-    called = true;
-  })
-});
-)xyz123");
-  auto result = runtime_->global()
-                    .getPropertyAsFunction(*runtime_, "getResult")
-                    .call(*runtime_);
-  EXPECT_EQ(result.getBool(), true);
-}
-
-TEST_F(ReactInstanceTest, testSetImmediateWithInvalidArgs) {
-  initializeRuntimeWithScript("");
-
-  EXPECT_EQ(
-      getErrorMessage("setImmediate();"),
-      "setImmediate must be called with at least one argument (a function to call)");
-
-  eval("setImmediate('invalid');");
-  expectNoError();
-
-  eval("setImmediate({});");
-  expectNoError();
-}
-
-TEST_F(ReactInstanceTest, testClearImmediate) {
-  initializeRuntimeWithScript("");
-
-  eval(R"xyz123(
-let called = false;
-function getResult() {
-  return called;
-}
-const handle = setImmediate(() => {
-  called = true;
-});
-clearImmediate(handle);
-)xyz123");
-
-  auto func = runtime_->global().getPropertyAsFunction(*runtime_, "getResult");
-  auto val = func.call(*runtime_);
-  EXPECT_EQ(val.getBool(), false);
-}
-
-TEST_F(ReactInstanceTest, testClearImmediateWithInvalidHandle) {
-  initializeRuntimeWithScript("");
-
-  auto js = R"xyz123(
-let called = false;
-const handle = setImmediate(() => {
-  called = true;
-});
-function getResult() {
-  return called;
-}
-function clearInvalidHandle() {
-  clearImmediate(handle);
-}
-)xyz123";
-  eval(js);
-
-  auto clear =
-      runtime_->global().getPropertyAsFunction(*runtime_, "clearInvalidHandle");
-  // Clearing an invalid handle should fail silently.
-  EXPECT_NO_THROW(clear.call((*runtime_)));
-}
-
-TEST_F(ReactInstanceTest, testClearImmediateWithInvalidArgs) {
-  initializeRuntimeWithScript("");
-
-  eval("clearImmediate();");
-  expectNoError();
-
-  eval("clearImmediate('invalid');");
-  expectNoError();
-
-  eval("clearImmediate({});");
-  expectNoError();
-
-  eval("clearImmediate(undefined);");
-  expectNoError();
-}
-
 TEST_F(ReactInstanceTest, testSetTimeout) {
   initializeRuntimeWithScript("");
 

package/ReactCommon/react/timing/CMakeLists.txt

@@ -15,4 +15,4 @@ add_compile_options(
 
 add_library(react_timing INTERFACE)
 
-target_include_directories(react_timing INTERFACE .)
+target_include_directories(react_timing INTERFACE ${REACT_COMMON_DIR})

package/ReactCommon/react/timing/primitives.h

@@ -17,6 +17,8 @@ namespace facebook::react {
 // not necessary in React Native.
 using DOMHighResTimeStamp = double;
 
+constexpr DOMHighResTimeStamp DOM_HIGH_RES_TIME_STAMP_UNSET = -1.0;
+
 inline DOMHighResTimeStamp chronoToDOMHighResTimeStamp(
     std::chrono::steady_clock::duration duration) {
   return static_cast<std::chrono::duration<double, std::milli>>(duration)

package/ReactCommon/react/utils/RunLoopObserver.cpp

@@ -11,10 +11,8 @@
 
 namespace facebook::react {
 
-RunLoopObserver::RunLoopObserver(
-    Activity activities,
-    const WeakOwner& owner) noexcept
-    : activities_(activities), owner_(owner) {}
+RunLoopObserver::RunLoopObserver(Activity activities, WeakOwner owner) noexcept
+    : activities_(activities), owner_(std::move(owner)) {}
 
 void RunLoopObserver::setDelegate(const Delegate* delegate) const noexcept {
   // We need these constraints to ensure basic thread-safety.

package/ReactCommon/react/utils/RunLoopObserver.h

@@ -18,8 +18,6 @@ namespace facebook::react {
  */
 class RunLoopObserver {
  public:
-  using Unique = std::unique_ptr<const RunLoopObserver>;
-
   /*
    * The concept of an owner.
    * A run loop observer normally observes a run loop running on a different
@@ -76,7 +74,7 @@ class RunLoopObserver {
   /*
    * Constructs a run loop observer.
    */
-  RunLoopObserver(Activity activities, const WeakOwner& owner) noexcept;
+  RunLoopObserver(Activity activities, WeakOwner owner) noexcept;
   virtual ~RunLoopObserver() noexcept = default;
 
   /*

package/ReactCommon/react/utils/SharedFunction.h

@@ -9,6 +9,7 @@
 
 #include <functional>
 #include <memory>
+#include <mutex>
 #include <shared_mutex>
 
 namespace facebook::react {

package/ReactCommon/reactperflogger/CMakeLists.txt

@@ -21,4 +21,7 @@ add_library(reactperflogger OBJECT ${reactperflogger_SRC})
 
 target_include_directories(reactperflogger PUBLIC .)
 
-target_link_libraries(reactperflogger folly_runtime)
+target_link_libraries(reactperflogger
+        react_timing
+        folly_runtime
+)

package/ReactCommon/reactperflogger/React-perflogger.podspec

@@ -24,6 +24,7 @@ header_search_paths = [
   "\"$(PODS_TARGET_SRCROOT)/..\"",
   "\"$(PODS_ROOT)/RCT-Folly\"",
   "\"$(PODS_ROOT)/DoubleConversion\"",
+  "\"$(PODS_ROOT)/fast_float/include\"",
   "\"$(PODS_ROOT)/fmt/include\""
 ]