react-native-tvos 0.81.3-0 → 0.82.0-0

package/ReactCommon/callinvoker/ReactCommon/tests/TestCallInvoker.h

@@ -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.
+ */
+
+#pragma once
+
+#include <ReactCommon/CallInvoker.h>
+#include <jsi/jsi.h>
+#include <list>
+
+namespace facebook::react {
+
+class TestCallInvoker : public CallInvoker {
+ public:
+  explicit TestCallInvoker(facebook::jsi::Runtime& runtime)
+      : runtime_(runtime) {}
+
+  void invokeAsync(CallFunc&& func) noexcept override {
+    queue_.push_back(std::move(func));
+  }
+
+  void invokeSync(CallFunc&& func) override {
+    func(runtime_);
+  }
+
+  void flushQueue() {
+    while (!queue_.empty()) {
+      queue_.front()(runtime_);
+      queue_.pop_front();
+      runtime_.drainMicrotasks(); // Run microtasks every cycle.
+    }
+  }
+
+  size_t queueSize() {
+    return queue_.size();
+  }
+
+ private:
+  facebook::jsi::Runtime& runtime_;
+  std::list<CallFunc> queue_{};
+};
+
+} // namespace facebook::react

package/ReactCommon/cxxreact/CxxModule.h

@@ -53,9 +53,9 @@ class CxxModule {
   class SyncTagType {};
 
  public:
-  typedef std::function<std::unique_ptr<CxxModule>()> Provider;
+  using Provider = std::function<std::unique_ptr<CxxModule>()>;
 
-  typedef std::function<void(std::vector<folly::dynamic>)> Callback;
+  using Callback = std::function<void(std::vector<folly::dynamic>)>;
 
   constexpr static AsyncTagType AsyncTag = AsyncTagType();
   constexpr static SyncTagType SyncTag = SyncTagType();

package/ReactCommon/cxxreact/CxxNativeModule.cpp

@@ -94,6 +94,7 @@ std::vector<MethodDescriptor> CxxNativeModule::getMethods() {
   lazyInit();
 
   std::vector<MethodDescriptor> descs;
+  descs.reserve(methods_.size());
   for (auto& method : methods_) {
     descs.emplace_back(method.name, method.getType());
   }
@@ -198,8 +199,8 @@ void CxxNativeModule::invoke(
     TraceSection s(
         "CxxMethodCallDispatch", "module", moduleName, "method", method.name);
     try {
-      method.func(std::move(params), first, second);
-    } catch (const facebook::xplat::JsArgumentException& ex) {
+      method.func(params, first, second);
+    } catch (const facebook::xplat::JsArgumentException&) {
       throw;
     } catch (std::exception& e) {
       LOG(ERROR) << "std::exception. Method call " << method.name.c_str()

package/ReactCommon/cxxreact/CxxNativeModule.h

@@ -23,11 +23,14 @@ class MessageQueueThread;
 
 typedef void (*WarnOnUsageLogger)(std::string message);
 
+[[deprecated("This API will be removed along with the legacy architecture.")]]
 std::function<void(folly::dynamic)> makeCallback(
     std::weak_ptr<Instance> instance,
     const folly::dynamic& callbackId);
 
-class RN_EXPORT CxxNativeModule : public NativeModule {
+class RN_EXPORT [[deprecated(
+    "This API will be removed along with the legacy architecture.")]] CxxNativeModule
+    : public NativeModule {
  public:
   CxxNativeModule(
       std::weak_ptr<Instance> instance,

package/ReactCommon/cxxreact/Instance.cpp

@@ -41,7 +41,7 @@ Instance::~Instance() {
 }
 
 void Instance::unregisterFromInspector() {
-  if (inspectorTarget_) {
+  if (inspectorTarget_ != nullptr) {
     assert(runtimeInspectorTarget_);
     inspectorTarget_->unregisterRuntime(*runtimeInspectorTarget_);
     assert(parentInspectorTarget_);
@@ -132,24 +132,28 @@ void Instance::initializeBridge(
 
 void Instance::loadBundle(
     std::unique_ptr<RAMBundleRegistry> bundleRegistry,
-    std::unique_ptr<const JSBigString> string,
+    std::unique_ptr<const JSBigString> startupScript,
     std::string sourceURL) {
   callback_->incrementPendingJSCalls();
   TraceSection s("Instance::loadBundle", "sourceURL", sourceURL);
   nativeToJsBridge_->loadBundle(
-      std::move(bundleRegistry), std::move(string), std::move(sourceURL));
+      std::move(bundleRegistry),
+      std::move(startupScript),
+      std::move(sourceURL));
 }
 
 void Instance::loadBundleSync(
     std::unique_ptr<RAMBundleRegistry> bundleRegistry,
-    std::unique_ptr<const JSBigString> string,
+    std::unique_ptr<const JSBigString> startupScript,
     std::string sourceURL) {
   std::unique_lock<std::mutex> lock(m_syncMutex);
   m_syncCV.wait(lock, [this] { return m_syncReady; });
 
   TraceSection s("Instance::loadBundleSync", "sourceURL", sourceURL);
   nativeToJsBridge_->loadBundleSync(
-      std::move(bundleRegistry), std::move(string), std::move(sourceURL));
+      std::move(bundleRegistry),
+      std::move(startupScript),
+      std::move(sourceURL));
 }
 
 void Instance::setSourceURL(std::string sourceURL) {
@@ -277,7 +281,7 @@ std::shared_ptr<CallInvoker> Instance::getJSCallInvoker() {
 RuntimeExecutor Instance::getRuntimeExecutor() {
   // HACK: RuntimeExecutor is not compatible with non-JSIExecutor, we return
   // a null callback, which the caller should handle.
-  if (!getJavaScriptContext()) {
+  if (getJavaScriptContext() == nullptr) {
     return nullptr;
   }
 
@@ -288,8 +292,8 @@ RuntimeExecutor Instance::getRuntimeExecutor() {
       strongNativeToJsBridge->runOnExecutorQueue(
           [callback = std::move(callback)](JSExecutor* executor) {
             // Assumes the underlying executor is a JSIExecutor
-            jsi::Runtime* runtime =
-                (jsi::Runtime*)executor->getJavaScriptContext();
+            auto* runtime =
+                static_cast<jsi::Runtime*>(executor->getJavaScriptContext());
             try {
               react_native_assert(runtime != nullptr);
               callback(*runtime);
@@ -315,7 +319,7 @@ void Instance::JSCallInvoker::setNativeToJsBridgeAndFlushCalls(
 
   m_shouldBuffer = false;
   m_nativeToJsBridge = nativeToJsBridge;
-  while (m_workBuffer.size() > 0) {
+  while (!m_workBuffer.empty()) {
     scheduleAsync(std::move(m_workBuffer.front()));
     m_workBuffer.pop_front();
   }

package/ReactCommon/cxxreact/Instance.h

@@ -34,14 +34,17 @@ class MessageQueueThread;
 class ModuleRegistry;
 class RAMBundleRegistry;
 
-struct InstanceCallback {
+struct [[deprecated(
+    "This API will be removed along with the legacy architecture.")]] InstanceCallback {
   virtual ~InstanceCallback() = default;
   virtual void onBatchComplete() {}
   virtual void incrementPendingJSCalls() {}
   virtual void decrementPendingJSCalls() {}
 };
 
-class RN_EXPORT Instance : private jsinspector_modern::InstanceTargetDelegate {
+class RN_EXPORT [[deprecated(
+    "This API will be removed along with the legacy architecture.")]] Instance
+    : private jsinspector_modern::InstanceTargetDelegate {
  public:
   ~Instance() override;
   void initializeBridge(
@@ -129,7 +132,7 @@ class RN_EXPORT Instance : private jsinspector_modern::InstanceTargetDelegate {
    * NativeMethodCallInvoker that schedules work on the respective thread.
    */
   std::shared_ptr<NativeMethodCallInvoker> getDecoratedNativeMethodCallInvoker(
-      std::shared_ptr<NativeMethodCallInvoker> nativeInvoker);
+      std::shared_ptr<NativeMethodCallInvoker> nativeMethodCallInvoker);
 
   /**
    * RuntimeExecutor is used by Fabric to access the jsi::Runtime.

package/ReactCommon/cxxreact/JSBigString.cpp

@@ -49,7 +49,7 @@ JSBigFileString::JSBigFileString(int fd, size_t size, off_t offset /*= 0*/)
 }
 
 JSBigFileString::~JSBigFileString() {
-  if (m_data) {
+  if (m_data != nullptr) {
     munmap((void*)m_data, m_size);
   }
   folly::fileops::close(m_fd);
@@ -59,7 +59,7 @@ const char* JSBigFileString::c_str() const {
   if (m_size == 0) {
     return "";
   }
-  if (!m_data) {
+  if (m_data == nullptr) {
     m_data = (const char*)mmap(
         nullptr, m_size, PROT_READ, MAP_PRIVATE, m_fd, m_mapOff);
     CHECK(m_data != MAP_FAILED)

package/ReactCommon/cxxreact/JSExecutor.h

@@ -31,7 +31,8 @@ class RAMBundleRegistry;
 
 // This interface describes the delegate interface required by
 // Executor implementations to call from JS into native code.
-class ExecutorDelegate {
+class [[deprecated(
+    "This API will be removed along with the legacy architecture.")]] ExecutorDelegate {
  public:
   virtual ~ExecutorDelegate() = default;
 
@@ -48,7 +49,8 @@ class ExecutorDelegate {
       folly::dynamic&& args) = 0;
 };
 
-class JSExecutorFactory {
+class [[deprecated(
+    "This API will be removed along with the legacy architecture.")]] JSExecutorFactory {
  public:
   virtual std::unique_ptr<JSExecutor> createJSExecutor(
       std::shared_ptr<ExecutorDelegate> delegate,
@@ -56,7 +58,8 @@ class JSExecutorFactory {
   virtual ~JSExecutorFactory() = default;
 };
 
-class RN_EXPORT JSExecutor {
+class RN_EXPORT [[deprecated(
+    "This API will be removed along with the legacy architecture.")]] JSExecutor {
  public:
   /**
    * Prepares the JS runtime for React Native by installing global variables.

package/ReactCommon/cxxreact/JSIndexedRAMBundle.cpp

@@ -11,6 +11,7 @@
 
 #include <glog/logging.h>
 #include <fstream>
+#include <memory>
 #include <sstream>
 
 #include <folly/lang/Bits.h>
@@ -70,8 +71,7 @@ void JSIndexedRAMBundle::init() {
   readBundle(reinterpret_cast<char*>(m_table.data.get()), m_table.byteLength());
 
   // read the startup code
-  m_startupCode = std::unique_ptr<JSBigBufferString>(
-      new JSBigBufferString{startupCodeSize - 1});
+  m_startupCode = std::make_unique<JSBigBufferString>(startupCodeSize - 1);
 
   readBundle(m_startupCode->data(), startupCodeSize - 1);
 }
@@ -95,7 +95,7 @@ std::string JSIndexedRAMBundle::getModuleCode(const uint32_t id) const {
 
   // entries without associated code have offset = 0 and length = 0
   const uint32_t length =
-      moduleData ? folly::Endian::little(moduleData->length) : 0;
+      moduleData != nullptr ? folly::Endian::little(moduleData->length) : 0;
   if (length == 0) {
     throw std::ios_base::failure(
         "Error loading module" + std::to_string(id) + "from RAM Bundle");
@@ -112,7 +112,7 @@ std::string JSIndexedRAMBundle::getModuleCode(const uint32_t id) const {
 void JSIndexedRAMBundle::readBundle(char* buffer, const std::streamsize bytes)
     const {
   if (!m_bundle->read(buffer, bytes)) {
-    if (m_bundle->rdstate() & std::ios::eofbit) {
+    if ((m_bundle->rdstate() & std::ios::eofbit) != 0) {
       throw std::ios_base::failure("Unexpected end of RAM Bundle file");
     }
     throw std::ios_base::failure(

package/ReactCommon/cxxreact/JSIndexedRAMBundle.h

@@ -23,13 +23,15 @@
 
 namespace facebook::react {
 
-class RN_EXPORT JSIndexedRAMBundle : public JSModulesUnbundle {
+class RN_EXPORT [[deprecated(
+    "This API will be removed along with the legacy architecture.")]] JSIndexedRAMBundle
+    : public JSModulesUnbundle {
  public:
   static std::function<std::unique_ptr<JSModulesUnbundle>(std::string)>
   buildFactory();
 
   // Throws std::runtime_error on failure.
-  JSIndexedRAMBundle(const char* sourceURL);
+  explicit JSIndexedRAMBundle(const char* sourcePath);
   JSIndexedRAMBundle(std::unique_ptr<const JSBigString> script);
 
   // Throws std::runtime_error on failure.
@@ -68,7 +70,7 @@ class RN_EXPORT JSIndexedRAMBundle : public JSModulesUnbundle {
 
   mutable std::unique_ptr<std::istream> m_bundle;
   ModuleTable m_table;
-  size_t m_baseOffset;
+  size_t m_baseOffset{};
   std::unique_ptr<JSBigBufferString> m_startupCode;
 };
 

package/ReactCommon/cxxreact/JSModulesUnbundle.h

@@ -15,7 +15,8 @@
 
 namespace facebook::react {
 
-class JSModulesUnbundle {
+class [[deprecated(
+    "This API will be removed along with the legacy architecture.")]] JSModulesUnbundle {
   /**
    * Represents the set of JavaScript modules that the application consists of.
    * The source code of each module can be retrieved by module ID.

package/ReactCommon/cxxreact/JsArgumentHelpers.h

@@ -68,8 +68,8 @@ namespace detail {
 // only for types compatible with folly::dynamic.
 template <typename T>
 struct is_dynamic {
-  typedef typename std::
-      enable_if<std::is_assignable<folly::dynamic, T>::value, T>::type type;
+  using type = typename std::
+      enable_if<std::is_assignable<folly::dynamic, T>::value, T>::type;
 };
 
 } // end namespace detail

package/ReactCommon/cxxreact/MethodCall.h

@@ -17,7 +17,8 @@
 
 namespace facebook::react {
 
-struct MethodCall {
+struct [[deprecated(
+    "This API will be removed along with the legacy architecture.")]] MethodCall {
   int moduleId;
   int methodId;
   folly::dynamic arguments;
@@ -31,7 +32,8 @@ struct MethodCall {
 };
 
 /// \throws std::invalid_argument
-std::vector<MethodCall> parseMethodCalls(folly::dynamic&& calls);
+[[deprecated("This API will be removed along with the legacy architecture.")]]
+std::vector<MethodCall> parseMethodCalls(folly::dynamic&& jsonData);
 
 } // namespace facebook::react
 

package/ReactCommon/cxxreact/ModuleRegistry.cpp

@@ -11,6 +11,7 @@
 
 #include <glog/logging.h>
 #include <reactperflogger/BridgeNativeModulePerfLogger.h>
+#include <utility>
 
 #include "NativeModule.h"
 #include "TraceSection.h"
@@ -37,7 +38,8 @@ std::string normalizeName(std::string name) {
 ModuleRegistry::ModuleRegistry(
     std::vector<std::unique_ptr<NativeModule>> modules,
     ModuleNotFoundCallback callback)
-    : modules_{std::move(modules)}, moduleNotFoundCallback_{callback} {}
+    : modules_{std::move(modules)},
+      moduleNotFoundCallback_{std::move(callback)} {}
 
 void ModuleRegistry::updateModuleNamesFromIndex(size_t index) {
   for (; index < modules_.size(); index++) {

package/ReactCommon/cxxreact/ModuleRegistry.h

@@ -25,12 +25,14 @@ namespace facebook::react {
 
 class NativeModule;
 
-struct ModuleConfig {
+struct [[deprecated(
+    "This API will be removed along with the legacy architecture.")]] ModuleConfig {
   size_t index;
   folly::dynamic config;
 };
 
-class RN_EXPORT ModuleRegistry {
+class RN_EXPORT [[deprecated(
+    "This API will be removed along with the legacy architecture.")]] ModuleRegistry {
  public:
   // not implemented:
   // onBatchComplete: see
@@ -58,12 +60,12 @@ class RN_EXPORT ModuleRegistry {
   MethodCallResult callSerializableNativeHook(
       unsigned int moduleId,
       unsigned int methodId,
-      folly::dynamic&& args);
+      folly::dynamic&& params);
 
   std::string getModuleName(unsigned int moduleId);
   std::string getModuleSyncMethodName(
       unsigned int moduleId,
-      unsigned int methodName);
+      unsigned int methodId);
 
  private:
   // This is always populated
@@ -71,7 +73,7 @@ class RN_EXPORT ModuleRegistry {
 
   // This is used to extend the population of modulesByName_ if registerModules
   // is called after moduleNames
-  void updateModuleNamesFromIndex(size_t size);
+  void updateModuleNamesFromIndex(size_t index);
 
   // This is only populated if moduleNames() is called.  Values are indices into
   // modules_.

package/ReactCommon/cxxreact/NativeModule.h

@@ -16,7 +16,8 @@
 namespace facebook::react {
 
 #ifndef RCT_FIT_RM_OLD_RUNTIME
-struct MethodDescriptor {
+struct [[deprecated(
+    "This API will be removed along with the legacy architecture.")]] MethodDescriptor {
   std::string name;
   // type is one of js MessageQueue.MethodTypes
   std::string type;
@@ -29,7 +30,8 @@ struct MethodDescriptor {
 using MethodCallResult = std::optional<folly::dynamic>;
 
 #ifndef RCT_FIT_RM_OLD_RUNTIME
-class NativeModule {
+class [[deprecated(
+    "This API will be removed along with the legacy architecture.")]] NativeModule {
  public:
   virtual ~NativeModule() = default;
   virtual std::string getName() = 0;

package/ReactCommon/cxxreact/NativeToJsBridge.cpp

@@ -26,6 +26,7 @@
 #include "TraceSection.h"
 
 #include <memory>
+#include <utility>
 
 #ifdef WITH_FBSYSTRACE
 #include <fbsystrace.h>
@@ -36,12 +37,14 @@ using fbsystrace::FbSystraceAsyncFlow;
 namespace facebook::react {
 
 // This class manages calls from JS to native code.
-class JsToNativeBridge : public react::ExecutorDelegate {
+class [[deprecated(
+    "This API will be removed along with the legacy architecture.")]] JsToNativeBridge
+    : public react::ExecutorDelegate {
  public:
   JsToNativeBridge(
       std::shared_ptr<ModuleRegistry> registry,
       std::shared_ptr<InstanceCallback> callback)
-      : m_registry(registry), m_callback(callback) {}
+      : m_registry(std::move(registry)), m_callback(std::move(callback)) {}
 
   std::shared_ptr<ModuleRegistry> getModuleRegistry() override {
     return m_registry;

package/ReactCommon/cxxreact/NativeToJsBridge.h

@@ -38,7 +38,8 @@ class RAMBundleRegistry;
 // Except for loadBundleSync(), all void methods will queue
 // work to run on the jsQueue passed to the ctor, and return
 // immediately.
-class NativeToJsBridge {
+class [[deprecated(
+    "This API will be removed along with the legacy architecture.")]] NativeToJsBridge {
  public:
   friend class JsToNativeBridge;
 
@@ -59,12 +60,12 @@ class NativeToJsBridge {
   void callFunction(
       std::string&& module,
       std::string&& method,
-      folly::dynamic&& args);
+      folly::dynamic&& arguments);
 
   /**
    * Invokes a callback with the cbID, and optional additional arguments in JS.
    */
-  void invokeCallback(double callbackId, folly::dynamic&& args);
+  void invokeCallback(double callbackId, folly::dynamic&& arguments);
 
   /**
    * Sets global variables in the JS Context.
@@ -78,11 +79,11 @@ class NativeToJsBridge {
    */
   void loadBundle(
       std::unique_ptr<RAMBundleRegistry> bundleRegistry,
-      std::unique_ptr<const JSBigString> startupCode,
+      std::unique_ptr<const JSBigString> startupScript,
       std::string sourceURL);
   void loadBundleSync(
       std::unique_ptr<RAMBundleRegistry> bundleRegistry,
-      std::unique_ptr<const JSBigString> startupCode,
+      std::unique_ptr<const JSBigString> startupScript,
       std::string sourceURL);
 
   void registerBundle(uint32_t bundleId, const std::string& bundlePath);
@@ -107,7 +108,7 @@ class NativeToJsBridge {
    * NativeModule thread(s).
    */
   std::shared_ptr<NativeMethodCallInvoker> getDecoratedNativeMethodCallInvoker(
-      std::shared_ptr<NativeMethodCallInvoker> nativeInvoker) const;
+      std::shared_ptr<NativeMethodCallInvoker> nativeMethodCallInvoker) const;
 
   jsinspector_modern::RuntimeTargetDelegate& getInspectorTargetDelegate();
 

package/ReactCommon/cxxreact/RAMBundleRegistry.h

@@ -23,7 +23,8 @@
 
 namespace facebook::react {
 
-class RN_EXPORT RAMBundleRegistry {
+class RN_EXPORT [[deprecated(
+    "This API will be removed along with the legacy architecture.")]] RAMBundleRegistry {
  public:
   constexpr static uint32_t MAIN_BUNDLE_ID = 0;
 

package/ReactCommon/cxxreact/ReactMarker.h

@@ -76,7 +76,7 @@ class RN_EXPORT StartupLogger {
  public:
   static StartupLogger& getInstance();
 
-  void logStartupEvent(const ReactMarkerId markerName, double markerTime);
+  void logStartupEvent(const ReactMarkerId markerId, double markerTime);
   void reset();
   double getAppStartupStartTime();
   double getInitReactRuntimeStartTime();

package/ReactCommon/cxxreact/ReactNativeVersion.h

@@ -13,15 +13,15 @@
 #include <string_view>
 
 #define REACT_NATIVE_VERSION_MAJOR 0
-#define REACT_NATIVE_VERSION_MINOR 81
-#define REACT_NATIVE_VERSION_PATCH 3
+#define REACT_NATIVE_VERSION_MINOR 82
+#define REACT_NATIVE_VERSION_PATCH 0
 
 namespace facebook::react {
 
 constexpr struct {
   int32_t Major = 0;
-  int32_t Minor = 81;
-  int32_t Patch = 3;
+  int32_t Minor = 82;
+  int32_t Patch = 0;
   std::string_view Prerelease = "0";
 } ReactNativeVersion;
 

package/ReactCommon/cxxreact/TraceSection.h

@@ -12,7 +12,23 @@
 #endif
 
 #ifdef WITH_PERFETTO
+
+// clang-format off
+// Windows.h macro fail, 'interface' clashes with a function in perfetto.h
+#ifdef interface
+#pragma push_macro("interface")
+#undef interface
+#define __RCT_INTERFACE_PUSHED
+#endif
+
 #include <perfetto.h>
+
+#ifdef __RCT_INTERFACE_PUSHED
+#undef __RCT_INTERFACE_PUSHED
+#pragma pop_macro("interface")
+#endif
+// clang-format on
+
 #include <reactperflogger/ReactPerfettoCategories.h>
 #endif
 
@@ -54,8 +70,8 @@ struct TraceSection {
  public:
   template <typename... ConvertsToStringPiece>
   explicit TraceSection(
-      const __unused char* name,
-      __unused ConvertsToStringPiece&&... args) {
+      [[maybe_unused]] const char* name,
+      [[maybe_unused]] ConvertsToStringPiece&&... args) {
     TRACE_EVENT_BEGIN("react-native", perfetto::DynamicString{name}, args...);
   }
 
@@ -82,8 +98,8 @@ struct DummyTraceSection {
  public:
   template <typename... ConvertsToStringPiece>
   explicit DummyTraceSection(
-      const __unused char* name,
-      __unused ConvertsToStringPiece&&... args) {}
+      [[maybe_unused]] const char* name,
+      [[maybe_unused]] ConvertsToStringPiece&&... args) {}
 };
 using TraceSectionUnwrapped = DummyTraceSection;
 #endif

package/ReactCommon/cxxreact/tests/RecoverableErrorTest.cpp

@@ -31,7 +31,7 @@ TEST(RecoverableError, RunRethrowingAsRecoverableFallthroughTest) {
     RecoverableError::runRethrowingAsRecoverable<std::runtime_error>(
         []() { throw std::logic_error("catch me"); });
     FAIL() << "Unthrown exception";
-  } catch (const RecoverableError& err) {
+  } catch (const RecoverableError&) {
     FAIL() << "Recovered exception that should have fallen through";
   } catch (const std::exception& err) {
     ASSERT_STREQ(err.what(), "catch me");

package/ReactCommon/cxxreact/tests/jsbigstring.cpp

@@ -14,10 +14,11 @@
 using namespace facebook::react;
 
 namespace {
-int tempFileFromString(std::string contents) {
+int tempFileFromString(const std::string& contents) {
   const char* tmpDir = getenv("TMPDIR");
-  if (tmpDir == nullptr)
+  if (tmpDir == nullptr) {
     tmpDir = "/tmp";
+  }
   std::string tmp{tmpDir};
   tmp += "/temp.XXXXXX";
 

package/ReactCommon/cxxreact/tests/methodcall.cpp

@@ -106,8 +106,7 @@ TEST(parseMethodCalls, NullReturn) {
 }
 
 TEST(parseMethodCalls, MapReturn) {
-  auto jsText =
-      "[[0],[0],[[{\"foo\": \"hello\", \"bar\": 4.0, \"baz\": true}]]]";
+  auto jsText = R"([[0],[0],[[{"foo": "hello", "bar": 4.0, "baz": true}]]])";
   auto returnedCalls = parseMethodCalls(folly::parseJson(jsText));
   EXPECT_EQ(1, returnedCalls.size());
   auto returnedCall = returnedCalls[0];

package/ReactCommon/hermes/React-hermes.podspec

@@ -46,6 +46,7 @@ Pod::Spec.new do |s|
   s.dependency "hermes-engine"
   s.dependency "React-jsi"
   add_dependency(s, "React-runtimeexecutor", :additional_framework_paths => ["platform/ios"])
+  add_dependency(s, "React-oscompat")
 
   add_rn_third_party_dependencies(s)
   add_rncore_dependency(s)

package/ReactCommon/hermes/executor/CMakeLists.txt

@@ -18,7 +18,7 @@ add_library(
 target_include_directories(hermes_executor_common PUBLIC .)
 react_native_android_selector(reactnative reactnative "")
 target_link_libraries(hermes_executor_common
-        hermes-engine::libhermes
+        hermes-engine::hermesvm
         hermes_inspector_modern
         jsi
         jsireact
@@ -32,6 +32,10 @@ if(${CMAKE_BUILD_TYPE} MATCHES Debug OR REACT_NATIVE_DEBUG_OPTIMIZED)
                 PRIVATE
                 -DHERMES_ENABLE_DEBUGGER=1
         )
+
+        if (HERMES_V1_ENABLED)
+                target_compile_options(hermes_executor_common PRIVATE -DHERMES_V1_ENABLED=1)
+        endif()
 else()
         target_compile_options(
                 hermes_executor_common