react-native-tvos 0.75.2-0rc0 → 0.76.0-0rc0

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

@@ -19,8 +19,9 @@ class HermesInstance {
  public:
   static std::unique_ptr<JSRuntime> createJSRuntime(
       std::shared_ptr<const ReactNativeConfig> reactNativeConfig,
-      std::shared_ptr<::hermes::vm::CrashManager> cm,
-      std::shared_ptr<MessageQueueThread> msgQueueThread) noexcept;
+      std::shared_ptr<::hermes::vm::CrashManager> crashManager,
+      std::shared_ptr<MessageQueueThread> msgQueueThread,
+      bool allocInOldGenBeforeTTI) noexcept;
 };
 
 } // namespace facebook::react

package/ReactCommon/react/runtime/nativeviewconfig/CMakeLists.txt

@@ -11,7 +11,7 @@ add_compile_options(-std=c++20)
 file(GLOB_RECURSE bridgeless_nativeviewconfig_SRC CONFIGURE_DEPENDS *.cpp)
 add_library(
         bridgelessnativeviewconfig
-        STATIC
+        OBJECT
         ${bridgeless_nativeviewconfig_SRC}
 )
 target_include_directories(bridgelessnativeviewconfig PUBLIC .)

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

@@ -13,8 +13,8 @@
 #import <react/runtime/JSRuntimeFactory.h>
 #import <react/runtime/hermes/HermesInstance.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
+
 using CrashManagerProvider =
     std::function<std::shared_ptr<::hermes::vm::CrashManager>()>;
 
@@ -24,7 +24,8 @@ class RCTHermesInstance : public JSRuntimeFactory {
   RCTHermesInstance();
   RCTHermesInstance(
       std::shared_ptr<const ReactNativeConfig> reactNativeConfig,
-      CrashManagerProvider crashManagerProvider);
+      CrashManagerProvider crashManagerProvider,
+      bool allocInOldGenBeforeTTI);
 
   std::unique_ptr<JSRuntime> createJSRuntime(
       std::shared_ptr<MessageQueueThread> msgQueueThread) noexcept override;
@@ -35,6 +36,7 @@ class RCTHermesInstance : public JSRuntimeFactory {
   std::shared_ptr<const ReactNativeConfig> _reactNativeConfig;
   CrashManagerProvider _crashManagerProvider;
   std::unique_ptr<HermesInstance> _hermesInstance;
+  bool _allocInOldGenBeforeTTI;
 };
-} // namespace react
-} // namespace facebook
+
+} // namespace facebook::react

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

@@ -7,16 +7,18 @@
 
 #import "RCTHermesInstance.h"
 
-namespace facebook {
-namespace react {
-RCTHermesInstance::RCTHermesInstance() : RCTHermesInstance(nullptr, nullptr) {}
+namespace facebook::react {
+
+RCTHermesInstance::RCTHermesInstance() : RCTHermesInstance(nullptr, nullptr, false) {}
 
 RCTHermesInstance::RCTHermesInstance(
     std::shared_ptr<const ReactNativeConfig> reactNativeConfig,
-    CrashManagerProvider crashManagerProvider)
+    CrashManagerProvider crashManagerProvider,
+    bool allocInOldGenBeforeTTI)
     : _reactNativeConfig(std::move(reactNativeConfig)),
       _crashManagerProvider(std::move(crashManagerProvider)),
-      _hermesInstance(std::make_unique<HermesInstance>())
+      _hermesInstance(std::make_unique<HermesInstance>()),
+      _allocInOldGenBeforeTTI(allocInOldGenBeforeTTI)
 {
 }
 
@@ -24,8 +26,10 @@ std::unique_ptr<JSRuntime> RCTHermesInstance::createJSRuntime(
     std::shared_ptr<MessageQueueThread> msgQueueThread) noexcept
 {
   return _hermesInstance->createJSRuntime(
-      _reactNativeConfig, _crashManagerProvider ? _crashManagerProvider() : nullptr, msgQueueThread);
+      _reactNativeConfig,
+      _crashManagerProvider ? _crashManagerProvider() : nullptr,
+      std::move(msgQueueThread),
+      _allocInOldGenBeforeTTI);
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react

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

@@ -13,6 +13,8 @@
 #import <React/RCTConvert.h>
 #import <React/RCTFabricSurface.h>
 #import <React/RCTInspectorDevServerHelper.h>
+#import <React/RCTInspectorNetworkHelper.h>
+#import <React/RCTInspectorUtils.h>
 #import <React/RCTJSThread.h>
 #import <React/RCTLog.h>
 #import <React/RCTMockDef.h>
@@ -36,14 +38,23 @@ using namespace facebook::react;
 class RCTHostHostTargetDelegate : public facebook::react::jsinspector_modern::HostTargetDelegate {
  public:
   RCTHostHostTargetDelegate(RCTHost *host)
-      : host_(host), pauseOverlayController_([[RCTPausedInDebuggerOverlayController alloc] init])
+      : host_(host),
+        pauseOverlayController_([[RCTPausedInDebuggerOverlayController alloc] init]),
+        networkHelper_([[RCTInspectorNetworkHelper alloc] init])
   {
   }
 
   jsinspector_modern::HostTargetMetadata getMetadata() override
   {
+    auto metadata = [RCTInspectorUtils getHostMetadata];
+
     return {
+        .appDisplayName = [metadata.appDisplayName UTF8String],
+        .appIdentifier = [metadata.appIdentifier UTF8String],
+        .deviceName = [metadata.deviceName UTF8String],
         .integrationName = "iOS Bridgeless (RCTHost)",
+        .platform = [metadata.platform UTF8String],
+        .reactNativeVersion = [metadata.reactNativeVersion UTF8String],
     };
   }
 
@@ -76,9 +87,16 @@ class RCTHostHostTargetDelegate : public facebook::react::jsinspector_modern::Ho
     }
   }
 
+  void loadNetworkResource(const RCTInspectorLoadNetworkResourceRequest &params, RCTInspectorNetworkExecutor executor)
+      override
+  {
+    [networkHelper_ loadNetworkResourceWithParams:params executor:executor];
+  }
+
  private:
   __weak RCTHost *host_;
   RCTPausedInDebuggerOverlayController *pauseOverlayController_;
+  RCTInspectorNetworkHelper *networkHelper_;
 };
 
 @implementation RCTHost {
@@ -96,11 +114,6 @@ class RCTHostHostTargetDelegate : public facebook::react::jsinspector_modern::Ho
 
   NSDictionary *_launchOptions;
 
-  // All the surfaces that need to be started after main bundle execution
-  NSMutableArray<RCTFabricSurface *> *_surfaceStartBuffer;
-  std::mutex _surfaceStartBufferMutex;
-
-  RCTInstanceInitialBundleLoadCompletionBlock _onInitialBundleLoad;
   std::vector<__weak RCTFabricSurface *> _attachedSurfaces;
 
   RCTModuleRegistry *_moduleRegistry;
@@ -144,7 +157,6 @@ class RCTHostHostTargetDelegate : public facebook::react::jsinspector_modern::Ho
   if (self = [super init]) {
     _hostDelegate = hostDelegate;
     _turboModuleManagerDelegate = turboModuleManagerDelegate;
-    _surfaceStartBuffer = [NSMutableArray new];
     _bundleManager = [RCTBundleManager new];
     _moduleRegistry = [RCTModuleRegistry new];
     _jsEngineProvider = [jsEngineProvider copy];
@@ -177,33 +189,6 @@ class RCTHostHostTargetDelegate : public facebook::react::jsinspector_modern::Ho
                                        andSetter:bundleURLSetter
                                 andDefaultGetter:defaultBundleURLGetter];
 
-    /**
-     * TODO (T108401473) Remove _onInitialBundleLoad, because it was initially
-     * introduced to start surfaces after the main JSBundle was fully executed.
-     * It is no longer needed because Fabric now dispatches all native-to-JS calls
-     * onto the JS thread, including JS calls to start Fabric surfaces.
-     * JS calls should be dispatched using the BufferedRuntimeExecutor, which can buffer
-     * JS calls before the main JSBundle finishes execution, and execute them after.
-     */
-    _onInitialBundleLoad = ^{
-      RCTHost *strongSelf = weakSelf;
-      if (!strongSelf) {
-        return;
-      }
-
-      NSArray<RCTFabricSurface *> *unstartedSurfaces = @[];
-
-      {
-        std::lock_guard<std::mutex> guard{strongSelf->_surfaceStartBufferMutex};
-        unstartedSurfaces = [NSArray arrayWithArray:strongSelf->_surfaceStartBuffer];
-        strongSelf->_surfaceStartBuffer = nil;
-      }
-
-      for (RCTFabricSurface *surface in unstartedSurfaces) {
-        [surface start];
-      }
-    };
-
     // Listen to reload commands
     dispatch_async(dispatch_get_main_queue(), ^{
       RCTRegisterReloadCommandListener(self);
@@ -231,7 +216,7 @@ class RCTHostHostTargetDelegate : public facebook::react::jsinspector_modern::Ho
         });
     __weak RCTHost *weakSelf = self;
     _inspectorPageId = facebook::react::jsinspector_modern::getInspectorInstance().addPage(
-        "React Native Bridgeless (Experimental)",
+        "React Native Bridgeless",
         /* vm */ "",
         [weakSelf](std::unique_ptr<facebook::react::jsinspector_modern::IRemoteConnection> remote)
             -> std::unique_ptr<facebook::react::jsinspector_modern::ILocalConnection> {
@@ -253,7 +238,6 @@ class RCTHostHostTargetDelegate : public facebook::react::jsinspector_modern::Ho
                                    jsRuntimeFactory:[self _provideJSEngine]
                                       bundleManager:_bundleManager
                          turboModuleManagerDelegate:_turboModuleManagerDelegate
-                                onInitialBundleLoad:_onInitialBundleLoad
                                      moduleRegistry:_moduleRegistry
                               parentInspectorTarget:_inspectorTarget.get()
                                       launchOptions:_launchOptions];
@@ -270,15 +254,7 @@ class RCTHostHostTargetDelegate : public facebook::react::jsinspector_modern::Ho
   surface.surfaceHandler.setDisplayMode(displayMode);
   [self _attachSurface:surface];
 
-  {
-    std::lock_guard<std::mutex> guard{_surfaceStartBufferMutex};
-    if (_surfaceStartBuffer) {
-      [_surfaceStartBuffer addObject:surface];
-      return surface;
-    }
-  }
-
-  [surface start];
+  [_instance callFunctionOnBufferedRuntimeExecutor:[surface](facebook::jsi::Runtime &_) { [surface start]; }];
   return surface;
 }
 
@@ -312,17 +288,10 @@ class RCTHostHostTargetDelegate : public facebook::react::jsinspector_modern::Ho
     [self _setBundleURL:_bundleURLProvider()];
   }
 
-  // Ensure all attached surfaces are restarted after reload
-  {
-    std::lock_guard<std::mutex> guard{_surfaceStartBufferMutex};
-    _surfaceStartBuffer = [NSMutableArray arrayWithArray:[self _getAttachedSurfaces]];
-  }
-
   _instance = [[RCTInstance alloc] initWithDelegate:self
                                    jsRuntimeFactory:[self _provideJSEngine]
                                       bundleManager:_bundleManager
                          turboModuleManagerDelegate:_turboModuleManagerDelegate
-                                onInitialBundleLoad:_onInitialBundleLoad
                                      moduleRegistry:_moduleRegistry
                               parentInspectorTarget:_inspectorTarget.get()
                                       launchOptions:_launchOptions];
@@ -330,6 +299,7 @@ class RCTHostHostTargetDelegate : public facebook::react::jsinspector_modern::Ho
 
   for (RCTFabricSurface *surface in [self _getAttachedSurfaces]) {
     [surface resetWithSurfacePresenter:self.surfacePresenter];
+    [_instance callFunctionOnBufferedRuntimeExecutor:[surface](facebook::jsi::Runtime &_) { [surface start]; }];
   }
 }
 

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

@@ -46,8 +46,6 @@ RCT_EXTERN void RCTInstanceSetRuntimeDiagnosticFlags(NSString *_Nullable flags);
 
 @end
 
-typedef void (^_Null_unspecified RCTInstanceInitialBundleLoadCompletionBlock)();
-
 /**
  * RCTInstance owns and manages most of the pieces of infrastructure required to display a screen powered by React
  * Native. RCTInstance should never be instantiated in product code, but rather accessed through RCTHost. The host
@@ -59,12 +57,12 @@ typedef void (^_Null_unspecified RCTInstanceInitialBundleLoadCompletionBlock)();
                 jsRuntimeFactory:(std::shared_ptr<facebook::react::JSRuntimeFactory>)jsRuntimeFactory
                    bundleManager:(RCTBundleManager *)bundleManager
       turboModuleManagerDelegate:(id<RCTTurboModuleManagerDelegate>)turboModuleManagerDelegate
-             onInitialBundleLoad:(RCTInstanceInitialBundleLoadCompletionBlock)onInitialBundleLoad
                   moduleRegistry:(RCTModuleRegistry *)moduleRegistry
            parentInspectorTarget:(facebook::react::jsinspector_modern::HostTarget *)parentInspectorTarget
                    launchOptions:(nullable NSDictionary *)launchOptions;
 
 - (void)callFunctionOnJSModule:(NSString *)moduleName method:(NSString *)method args:(NSArray *)args;
+- (void)callFunctionOnBufferedRuntimeExecutor:(std::function<void(facebook::jsi::Runtime &runtime)> &&)executor;
 
 - (void)registerSegmentWithId:(NSNumber *)segmentId path:(NSString *)path;
 

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

@@ -78,7 +78,6 @@ void RCTInstanceSetRuntimeDiagnosticFlags(NSString *flags)
   RCTSurfacePresenter *_surfacePresenter;
   RCTPerformanceLogger *_performanceLogger;
   RCTDisplayLink *_displayLink;
-  RCTInstanceInitialBundleLoadCompletionBlock _onInitialBundleLoad;
   RCTTurboModuleManager *_turboModuleManager;
   std::mutex _invalidationMutex;
   std::atomic<bool> _valid;
@@ -97,7 +96,6 @@ void RCTInstanceSetRuntimeDiagnosticFlags(NSString *flags)
                 jsRuntimeFactory:(std::shared_ptr<facebook::react::JSRuntimeFactory>)jsRuntimeFactory
                    bundleManager:(RCTBundleManager *)bundleManager
       turboModuleManagerDelegate:(id<RCTTurboModuleManagerDelegate>)tmmDelegate
-             onInitialBundleLoad:(RCTInstanceInitialBundleLoadCompletionBlock)onInitialBundleLoad
                   moduleRegistry:(RCTModuleRegistry *)moduleRegistry
            parentInspectorTarget:(jsinspector_modern::HostTarget *)parentInspectorTarget
                    launchOptions:(nullable NSDictionary *)launchOptions
@@ -111,7 +109,6 @@ void RCTInstanceSetRuntimeDiagnosticFlags(NSString *flags)
     _jsRuntimeFactory = jsRuntimeFactory;
     _appTMMDelegate = tmmDelegate;
     _jsThreadManager = [RCTJSThreadManager new];
-    _onInitialBundleLoad = onInitialBundleLoad;
     _bridgeModuleDecorator = [[RCTBridgeModuleDecorator alloc] initWithViewRegistry:[RCTViewRegistry new]
                                                                      moduleRegistry:moduleRegistry
                                                                       bundleManager:bundleManager
@@ -393,6 +390,15 @@ void RCTInstanceSetRuntimeDiagnosticFlags(NSString *flags)
   }
 }
 
+- (void)callFunctionOnBufferedRuntimeExecutor:(std::function<void(facebook::jsi::Runtime &)> &&)executor
+{
+  _reactInstance->getBufferedRuntimeExecutor()([=](jsi::Runtime &runtime) {
+    if (executor) {
+      executor(runtime);
+    }
+  });
+}
+
 - (void)handleBundleLoadingError:(NSError *)error
 {
   if (!_valid) {
@@ -467,11 +473,6 @@ void RCTInstanceSetRuntimeDiagnosticFlags(NSString *flags)
   const auto *url = deriveSourceURL(source.url).UTF8String;
   _reactInstance->loadScript(std::move(script), url);
   [[NSNotificationCenter defaultCenter] postNotificationName:@"RCTInstanceDidLoadBundle" object:nil];
-
-  if (_onInitialBundleLoad) {
-    _onInitialBundleLoad();
-    _onInitialBundleLoad = nil;
-  }
 }
 
 - (void)_handleJSError:(const JsErrorHandler::ParsedError &)error

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

@@ -162,6 +162,12 @@ class ReactInstanceTest : public ::testing::Test {
     loadScript(script);
   }
 
+  jsi::Value tryEval(std::string js, std::string defaultVal) {
+    return eval(
+        "(function() { try { return " + js + "; } catch { return " +
+        defaultVal + "; } })()");
+  }
+
   jsi::Value eval(std::string js) {
     RuntimeExecutor runtimeExecutor = instance_->getUnbufferedRuntimeExecutor();
     jsi::Value ret = jsi::Value::undefined();
@@ -215,16 +221,16 @@ class ReactInstanceTest : public ::testing::Test {
 };
 
 TEST_F(ReactInstanceTest, testBridgelessFlagIsSet) {
-  eval("RN$Bridgeless === true");
-  expectError();
+  auto valBefore = tryEval("RN$Bridgeless === true", "false");
+  EXPECT_EQ(valBefore.getBool(), false);
   initializeRuntimeWithScript("");
   auto val = eval("RN$Bridgeless === true");
   EXPECT_EQ(val.getBool(), true);
 }
 
 TEST_F(ReactInstanceTest, testProfilingFlag) {
-  eval("__RCTProfileIsProfiling === true");
-  expectError();
+  auto valBefore = tryEval("__RCTProfileIsProfiling === true", "false");
+  EXPECT_EQ(valBefore.getBool(), false);
   initializeRuntimeWithScript({.isProfiling = true}, "");
   auto val = eval("__RCTProfileIsProfiling === true");
   EXPECT_EQ(val.getBool(), true);
@@ -294,12 +300,12 @@ TEST_F(ReactInstanceTest, testSetImmediateWithInvalidArgs) {
   EXPECT_EQ(
       getErrorMessage("setImmediate();"),
       "setImmediate must be called with at least one argument (a function to call)");
-  EXPECT_EQ(
-      getErrorMessage("setImmediate('invalid');"),
-      "The first argument to setImmediate must be a function.");
-  EXPECT_EQ(
-      getErrorMessage("setImmediate({});"),
-      "The first argument to setImmediate must be a function.");
+
+  eval("setImmediate('invalid');");
+  expectNoError();
+
+  eval("setImmediate({});");
+  expectNoError();
 }
 
 TEST_F(ReactInstanceTest, testClearImmediate) {
@@ -420,12 +426,12 @@ TEST_F(ReactInstanceTest, testSetTimeoutWithInvalidArgs) {
   EXPECT_EQ(
       getErrorMessage("setTimeout();"),
       "setTimeout must be called with at least one argument (the function to call).");
-  EXPECT_EQ(
-      getErrorMessage("setTimeout('invalid');"),
-      "The first argument to setTimeout must be a function.");
-  EXPECT_EQ(
-      getErrorMessage("setTimeout(() => {}, 'invalid');"),
-      "The second argument to setTimeout must be a number or undefined.");
+
+  eval("setTimeout('invalid');");
+  expectNoError();
+
+  eval("setTimeout(() => {}, 'invalid');");
+  expectNoError();
 }
 
 TEST_F(ReactInstanceTest, testClearTimeout) {

package/ReactCommon/react/test_utils/ios/Shims/ShimRCTInstance.mm

@@ -23,8 +23,8 @@ static __weak ShimRCTInstance *weakShim = nil;
         [RCTInstance class],
         [ShimRCTInstance class],
         @selector(initWithDelegate:
-                  jsRuntimeFactory:bundleManager:turboModuleManagerDelegate:onInitialBundleLoad:moduleRegistry
-                                  :parentInspectorTarget:launchOptions:));
+                  jsRuntimeFactory:bundleManager:turboModuleManagerDelegate:moduleRegistry:parentInspectorTarget
+                                  :launchOptions:));
     RCTSwizzleInstanceSelector([RCTInstance class], [ShimRCTInstance class], @selector(invalidate));
     RCTSwizzleInstanceSelector(
         [RCTInstance class], [ShimRCTInstance class], @selector(callFunctionOnJSModule:method:args:));
@@ -39,8 +39,8 @@ static __weak ShimRCTInstance *weakShim = nil;
       [RCTInstance class],
       [ShimRCTInstance class],
       @selector(initWithDelegate:
-                jsRuntimeFactory:bundleManager:turboModuleManagerDelegate:onInitialBundleLoad:moduleRegistry
-                                :parentInspectorTarget:launchOptions:));
+                jsRuntimeFactory:bundleManager:turboModuleManagerDelegate:moduleRegistry:parentInspectorTarget
+                                :launchOptions:));
   RCTSwizzleInstanceSelector([RCTInstance class], [ShimRCTInstance class], @selector(invalidate));
   RCTSwizzleInstanceSelector(
       [RCTInstance class], [ShimRCTInstance class], @selector(callFunctionOnJSModule:method:args:));
@@ -52,7 +52,6 @@ static __weak ShimRCTInstance *weakShim = nil;
                 jsRuntimeFactory:(std::shared_ptr<facebook::react::JSRuntimeFactory>)jsRuntimeFactory
                    bundleManager:(RCTBundleManager *)bundleManager
       turboModuleManagerDelegate:(id<RCTTurboModuleManagerDelegate>)tmmDelegate
-             onInitialBundleLoad:(RCTInstanceInitialBundleLoadCompletionBlock)onInitialBundleLoad
                   moduleRegistry:(RCTModuleRegistry *)moduleRegistry
            parentInspectorTarget:(facebook::react::jsinspector_modern::HostTarget *)parentInspectorTarget
                    launchOptions:(NSDictionary *)launchOptions

package/ReactCommon/react/timing/CMakeLists.txt

@@ -0,0 +1,18 @@
+# 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.
+
+cmake_minimum_required(VERSION 3.13)
+set(CMAKE_VERBOSE_MAKEFILE on)
+
+add_compile_options(
+        -fexceptions
+        -frtti
+        -std=c++20
+        -Wall
+        -Wpedantic)
+
+add_library(react_timing INTERFACE)
+
+target_include_directories(react_timing INTERFACE .)

package/ReactCommon/react/timing/React-timing.podspec

@@ -0,0 +1,44 @@
+# 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
+
+header_search_paths = []
+
+if ENV['USE_FRAMEWORKS']
+  header_search_paths << "\"$(PODS_TARGET_SRCROOT)/../..\"" # this is needed to allow the target access its own files
+end
+
+Pod::Spec.new do |s|
+  s.name                   = "React-timing"
+  s.version                = version
+  s.summary                = "React Native timing primitives"
+  s.homepage               = "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           = "*.{cpp,h}"
+  s.header_dir             = "react/timing"
+  s.pod_target_xcconfig    = { "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(),
+                               "HEADER_SEARCH_PATHS" => header_search_paths.join(' '),
+                               "DEFINES_MODULE" => "YES" }
+
+  if ENV['USE_FRAMEWORKS']
+    s.module_name            = "React_timing"
+    s.header_mappings_dir  = "./"
+  end
+end

package/ReactCommon/react/timing/primitives.h

@@ -0,0 +1,31 @@
+/*
+ * 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 <chrono>
+
+namespace facebook::react {
+
+// `DOMHighResTimeStamp` represents a time value in milliseconds (time point or
+// duration), with sub-millisecond precision.
+// On the Web, the precision can be reduced for security purposes, but that is
+// not necessary in React Native.
+using DOMHighResTimeStamp = double;
+
+inline DOMHighResTimeStamp chronoToDOMHighResTimeStamp(
+    std::chrono::steady_clock::duration duration) {
+  return static_cast<std::chrono::duration<double, std::milli>>(duration)
+      .count();
+}
+
+inline DOMHighResTimeStamp chronoToDOMHighResTimeStamp(
+    std::chrono::steady_clock::time_point timePoint) {
+  return chronoToDOMHighResTimeStamp(timePoint.time_since_epoch());
+}
+
+} // namespace facebook::react

package/ReactCommon/react/timing/tests/PrimitivesTest.cpp

@@ -0,0 +1,47 @@
+/*
+ * 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 <gtest/gtest.h>
+
+#include "../primitives.h"
+
+namespace facebook::react {
+
+using Clock = std::chrono::steady_clock;
+using TimePoint = std::chrono::time_point<Clock>;
+
+TEST(chronoToDOMHighResTimeStamp, withDurations) {
+  EXPECT_EQ(chronoToDOMHighResTimeStamp(std::chrono::nanoseconds(10)), 0.00001);
+  EXPECT_EQ(chronoToDOMHighResTimeStamp(std::chrono::microseconds(10)), 0.01);
+  EXPECT_EQ(chronoToDOMHighResTimeStamp(std::chrono::milliseconds(10)), 10.0);
+  EXPECT_EQ(chronoToDOMHighResTimeStamp(std::chrono::seconds(10)), 10000.0);
+  EXPECT_EQ(
+      chronoToDOMHighResTimeStamp(
+          std::chrono::seconds(1) + std::chrono::nanoseconds(20)),
+      1000.000020);
+}
+
+TEST(chronoToDOMHighResTimeStamp, withTimePoints) {
+  EXPECT_EQ(
+      chronoToDOMHighResTimeStamp(TimePoint(std::chrono::nanoseconds(10))),
+      0.00001);
+  EXPECT_EQ(
+      chronoToDOMHighResTimeStamp(TimePoint(std::chrono::microseconds(10))),
+      0.01);
+  EXPECT_EQ(
+      chronoToDOMHighResTimeStamp(TimePoint(std::chrono::milliseconds(10))),
+      10.0);
+  EXPECT_EQ(
+      chronoToDOMHighResTimeStamp(TimePoint(std::chrono::seconds(10))),
+      10000.0);
+  EXPECT_EQ(
+      chronoToDOMHighResTimeStamp(
+          TimePoint(std::chrono::seconds(1) + std::chrono::nanoseconds(20))),
+      1000.000020);
+}
+
+} // namespace facebook::react

package/ReactCommon/react/utils/CMakeLists.txt

@@ -15,7 +15,7 @@ add_compile_options(
         -DLOG_TAG=\"Fabric\")
 
 file(GLOB react_utils_SRC CONFIGURE_DEPENDS *.cpp *.mm)
-add_library(react_utils SHARED ${react_utils_SRC})
+add_library(react_utils OBJECT ${react_utils_SRC})
 
 target_include_directories(react_utils PUBLIC ${REACT_COMMON_DIR})
 

package/ReactCommon/react/utils/CoreFeatures.cpp

@@ -12,6 +12,5 @@ namespace facebook::react {
 bool CoreFeatures::enablePropIteratorSetter = false;
 bool CoreFeatures::enableGranularScrollViewStateUpdatesIOS = false;
 bool CoreFeatures::excludeYogaFromRawProps = false;
-bool CoreFeatures::enableReportEventPaintTime = false;
 
 } // namespace facebook::react

package/ReactCommon/react/utils/CoreFeatures.h

@@ -25,10 +25,6 @@ class CoreFeatures {
 
   // When enabled, rawProps in Props will not include Yoga specific props.
   static bool excludeYogaFromRawProps;
-
-  // Report paint time inside the Event Timing API implementation
-  // (PerformanceObserver).
-  static bool enableReportEventPaintTime;
 };
 
 } // namespace facebook::react

package/ReactCommon/reactperflogger/CMakeLists.txt

@@ -13,7 +13,12 @@ add_compile_options(
         -Wall
         -Wpedantic)
 
-file(GLOB reactperflogger_SRC CONFIGURE_DEPENDS reactperflogger/*.cpp)
-add_library(reactperflogger STATIC ${reactperflogger_SRC})
+
+file(GLOB reactperflogger_SRC CONFIGURE_DEPENDS
+        reactperflogger/*.cpp
+        fusebox/*.cpp)
+add_library(reactperflogger OBJECT ${reactperflogger_SRC})
 
 target_include_directories(reactperflogger PUBLIC .)
+
+target_link_libraries(reactperflogger folly_runtime)

package/ReactCommon/reactperflogger/React-perflogger.podspec

@@ -19,7 +19,13 @@ end
 folly_config = get_folly_config()
 folly_compiler_flags = folly_config[:compiler_flags]
 folly_version = folly_config[:version]
-boost_compiler_flags = '-Wno-documentation'
+
+header_search_paths = [
+  "\"$(PODS_TARGET_SRCROOT)/..\"",
+  "\"$(PODS_ROOT)/RCT-Folly\"",
+  "\"$(PODS_ROOT)/DoubleConversion\"",
+  "\"$(PODS_ROOT)/fmt/include\""
+]
 
 Pod::Spec.new do |s|
   s.name                   = "React-perflogger"
@@ -30,8 +36,15 @@ Pod::Spec.new do |s|
   s.author                 = "Meta Platforms, Inc. and its affiliates"
   s.platforms              = min_supported_versions
   s.source                 = source
-  s.source_files           = "**/*.{cpp,h}"
+  s.source_files           = "reactperflogger/*.{cpp,h}", "fusebox/*.{cpp,h}"
   s.header_dir             = "reactperflogger"
   s.pod_target_xcconfig    = { "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard() }
   s.compiler_flags         = folly_compiler_flags
+  s.pod_target_xcconfig    = {
+    "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(),
+    "HEADER_SEARCH_PATHS" => header_search_paths.join(' '),
+  }
+
+  s.dependency "RCT-Folly", folly_version
+  s.dependency "DoubleConversion"
 end