react-native-windows 0.71.35 → 0.71.37

package/Shared/Shared.vcxitems.filters

@@ -43,6 +43,9 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)CxxMessageQueue.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)HermesRuntimeHolder.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="$(MSBuildThisFileDirectory)JSBigAbiString.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -55,6 +58,9 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)Utils.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)V8JSIRuntimeHolder.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="$(MSBuildThisFileDirectory)Modules\AsyncStorageModuleWin32.cpp">
       <Filter>Source Files\Modules</Filter>
     </ClCompile>
@@ -112,6 +118,15 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)InspectorPackagerConnection.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)JSI\NapiJsiV8RuntimeHolder.cpp">
+      <Filter>Source Files\JSI</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)HermesSamplingProfiler.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)HermesShim.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="$(MSBuildThisFileDirectory)Modules\HttpModule.cpp">
       <Filter>Source Files\Modules</Filter>
     </ClCompile>
@@ -148,15 +163,6 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)Networking\DefaultBlobResource.cpp">
       <Filter>Source Files\Networking</Filter>
     </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)HermesRuntimeHolder.cpp">
-      <Filter>Hermes</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)HermesSamplingProfiler.cpp">
-      <Filter>Hermes</Filter>
-    </ClCompile>
-    <ClCompile Include="$(NodeApiJsiDir)src\ApiLoaders\HermesApi.cpp" />
-    <ClCompile Include="$(MSBuildThisFileDirectory)JSI\V8RuntimeHolder.cpp" />
-    <ClCompile Include="$(MSBuildThisFileDirectory)SafeLoadLibrary.cpp" />
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Source Files">
@@ -216,9 +222,6 @@
     <Filter Include="Source Files\Networking">
       <UniqueIdentifier>{71196e04-aca0-48d6-99e4-f418c957b50f}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Hermes">
-      <UniqueIdentifier>{b32590e6-ae3d-4388-ab98-767345ce38c9}</UniqueIdentifier>
-    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="$(MSBuildThisFileDirectory)AsyncStorage\StorageFileIO.h">
@@ -284,6 +287,9 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)DevSettings.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)HermesRuntimeHolder.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="$(MSBuildThisFileDirectory)IDevSupportManager.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -335,6 +341,9 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)Utils.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)V8JSIRuntimeHolder.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="$(MSBuildThisFileDirectory)WebSocketJSExecutorFactory.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -390,6 +399,15 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)tracing\tracing.h">
       <Filter>Header Files\tracing</Filter>
     </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)JSI\NapiJsiV8RuntimeHolder.h">
+      <Filter>Header Files\JSI</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)HermesSamplingProfiler.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)HermesShim.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="$(MSBuildThisFileDirectory)Modules\HttpModule.h">
       <Filter>Header Files\Modules</Filter>
     </ClInclude>
@@ -474,17 +492,6 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)IBlobPersistor.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)HermesRuntimeHolder.h">
-      <Filter>Hermes</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)HermesSamplingProfiler.h">
-      <Filter>Hermes</Filter>
-    </ClInclude>
-    <ClInclude Include="$(NodeApiJsiDir)src\ApiLoaders\HermesApi.h" />
-    <ClInclude Include="$(NodeApiJsiDir)src\ApiLoaders\HermesApi.inc" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\JsiApi.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)JSI\V8RuntimeHolder.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)SafeLoadLibrary.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="$(MSBuildThisFileDirectory)tracing\rnw.wprp">

package/Shared/V8JSIRuntimeHolder.cpp

@@ -0,0 +1,70 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#include "pch.h"
+
+#include <V8JsiRuntime.h>
+#include "V8JSIRuntimeHolder.h"
+
+#include <atomic>
+#include <queue>
+
+using namespace facebook;
+using namespace facebook::react;
+
+namespace facebook {
+namespace react {
+
+class TaskRunnerAdapter : public v8runtime::JSITaskRunner {
+ public:
+  TaskRunnerAdapter(std::shared_ptr<facebook::react::MessageQueueThread> jsQueue) : jsQueue_(std::move(jsQueue)) {}
+
+  void postTask(std::unique_ptr<v8runtime::JSITask> task) override {
+    std::shared_ptr<v8runtime::JSITask> shared_task(task.release());
+    jsQueue_->runOnQueue([shared_task2 = std::move(shared_task)]() { shared_task2->run(); });
+  }
+
+ private:
+  TaskRunnerAdapter(const TaskRunnerAdapter &) = delete;
+  TaskRunnerAdapter &operator=(const TaskRunnerAdapter &) = delete;
+
+  std::shared_ptr<facebook::react::MessageQueueThread> jsQueue_;
+};
+
+facebook::react::JSIEngineOverride V8JSIRuntimeHolder::getRuntimeType() noexcept {
+  return facebook::react::JSIEngineOverride::V8;
+}
+
+std::shared_ptr<facebook::jsi::Runtime> V8JSIRuntimeHolder::getRuntime() noexcept {
+  std::call_once(once_flag_, [this]() { initRuntime(); });
+
+  if (!runtime_)
+    std::terminate();
+
+  // V8JsiRuntime is not thread safe as of now.
+  if (own_thread_id_ != std::this_thread::get_id())
+    std::terminate();
+
+  return runtime_;
+}
+
+void V8JSIRuntimeHolder::initRuntime() noexcept {
+  v8runtime::V8RuntimeArgs args{};
+
+  if (debuggerPort_ > 0)
+    args.inspectorPort = debuggerPort_;
+
+  args.flags.enableInspector = useDirectDebugger_;
+  args.flags.waitForDebugger = debuggerBreakOnNextLine_;
+  args.debuggerRuntimeName = debuggerRuntimeName_;
+
+  args.foreground_task_runner = std::make_shared<TaskRunnerAdapter>(jsQueue_);
+  args.preparedScriptStore = std::move(preparedScriptStore_);
+
+  runtime_ = v8runtime::makeV8Runtime(std::move(args));
+
+  own_thread_id_ = std::this_thread::get_id();
+}
+
+} // namespace react
+} // namespace facebook

package/Shared/V8JSIRuntimeHolder.h

@@ -0,0 +1,53 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#pragma once
+
+#include <DevSettings.h>
+
+#include <JSI/RuntimeHolder.h>
+#include <JSI/ScriptStore.h>
+
+#include <Logging.h>
+
+namespace facebook {
+namespace react {
+
+class V8JSIRuntimeHolder : public Microsoft::JSI::RuntimeHolderLazyInit {
+ public:
+  std::shared_ptr<facebook::jsi::Runtime> getRuntime() noexcept override;
+  facebook::react::JSIEngineOverride getRuntimeType() noexcept override;
+
+  V8JSIRuntimeHolder(
+      std::shared_ptr<facebook::react::DevSettings> devSettings,
+      std::shared_ptr<facebook::react::MessageQueueThread> jsQueue,
+      std::unique_ptr<facebook::jsi::ScriptStore> &&scriptStore,
+      std::unique_ptr<facebook::jsi::PreparedScriptStore> &&preparedScriptStore) noexcept
+      : useDirectDebugger_(devSettings->useDirectDebugger),
+        debuggerBreakOnNextLine_(devSettings->debuggerBreakOnNextLine),
+        debuggerPort_(devSettings->debuggerPort),
+        debuggerRuntimeName_(devSettings->debuggerRuntimeName),
+        jsQueue_(std::move(jsQueue)),
+        scriptStore_(std::move(scriptStore)),
+        preparedScriptStore_(std::move(preparedScriptStore)) {}
+
+ private:
+  void initRuntime() noexcept;
+
+  std::shared_ptr<facebook::jsi::Runtime> runtime_;
+  std::shared_ptr<facebook::react::MessageQueueThread> jsQueue_;
+
+  std::unique_ptr<facebook::jsi::ScriptStore> scriptStore_;
+  std::unique_ptr<facebook::jsi::PreparedScriptStore> preparedScriptStore_;
+
+  std::once_flag once_flag_;
+  std::thread::id own_thread_id_;
+
+  uint16_t debuggerPort_;
+  bool useDirectDebugger_;
+  bool debuggerBreakOnNextLine_;
+  std::string debuggerRuntimeName_;
+};
+
+} // namespace react
+} // namespace facebook

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-windows",
-  "version": "0.71.35",
+  "version": "0.71.37",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -26,7 +26,7 @@
     "@react-native-community/cli": "10.2.4",
     "@react-native-community/cli-platform-android": "10.2.0",
     "@react-native-community/cli-platform-ios": "10.2.4",
-    "@react-native-windows/cli": "0.71.17",
+    "@react-native-windows/cli": "0.71.18",
     "@react-native/assets": "1.0.0",
     "@react-native/normalize-color": "2.1.0",
     "@react-native/polyfills": "2.0.0",

package/template/cs-app-WinAppSDK/proj/ExperimentalFeatures.props

@@ -12,7 +12,7 @@
 
     <!--
       Compiles Hermes-related code and sets it to the default JS engine.
-      Requires the "Microsoft.JavaScript.Hermes" NuGet package.
+      Requires the "ReactNative.Hermes.Windows" NuGet package.
       
       See https://microsoft.github.io/react-native-windows/docs/0.64/hermes
     -->

package/Microsoft.ReactNative.Cxx/JSI/NodeApiJsiLoader.cpp

@@ -1,16 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-#include "ApiLoaders/NodeApi.h"
-
-namespace Microsoft::NodeApiJsi {
-
-LibHandle LibLoader::loadLib(const char * /*libName*/) {
-  return reinterpret_cast<LibHandle>(0);
-}
-
-FuncPtr LibLoader::getFuncPtr(LibHandle /*libHandle*/, const char * /*funcName*/) {
-  return reinterpret_cast<FuncPtr>(0);
-}
-
-} // namespace Microsoft::NodeApiJsi

package/ReactCommon/cgmanifest.json

@@ -1,15 +0,0 @@
-{
-    "$schema": "https://json.schemastore.org/component-detection-manifest.json",
-    "Registrations": [
-        {
-            "Component": {
-                "Type": "git",
-                "Git": {
-                  "RepositoryUrl": "https://github.com/microsoft/node-api-jsi",
-                  "CommitHash": "53b897b03c1c7e57c3372acc6234447a44e150d6"
-                }
-            },
-            "DevelopmentDependency": false
-        }
-    ]
-}

package/Shared/JSI/V8RuntimeHolder.cpp

@@ -1,260 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-#include "V8RuntimeHolder.h"
-#include <ApiLoaders/V8Api.h>
-#include <NodeApiJsiRuntime.h>
-#include <crash/verifyElseCrash.h>
-#include "SafeLoadLibrary.h"
-
-using namespace Microsoft::NodeApiJsi;
-
-#define CRASH_ON_ERROR(result) VerifyElseCrash(result == napi_ok);
-
-namespace Microsoft::ReactNative {
-namespace {
-
-class V8FuncResolver : public IFuncResolver {
- public:
-  V8FuncResolver() : libHandle_(LoadLibraryAsPeerFirst(L"v8jsi.dll")) {}
-
-  FuncPtr getFuncPtr(const char *funcName) override {
-    return reinterpret_cast<FuncPtr>(GetProcAddress(libHandle_, funcName));
-  }
-
- private:
-  HMODULE libHandle_;
-};
-
-V8Api &initV8Api() noexcept {
-  static V8FuncResolver funcResolver;
-  static V8Api s_v8Api(&funcResolver);
-  V8Api::setCurrent(&s_v8Api);
-  return s_v8Api;
-}
-
-V8Api &getV8Api() noexcept {
-  static V8Api &s_v8Api = initV8Api();
-  return s_v8Api;
-}
-
-class V8Task {
- public:
-  V8Task(void *taskData, jsr_task_run_cb taskRunCallback, jsr_data_delete_cb taskDataDeleteCallback, void *deleterData)
-      : taskData_(taskData),
-        taskRunCallback_(taskRunCallback),
-        taskDataDeleteCallback_(taskDataDeleteCallback),
-        deleterData_(deleterData) {}
-
-  V8Task(const V8Task &other) = delete;
-  V8Task &operator=(const V8Task &other) = delete;
-
-  ~V8Task() {
-    if (taskDataDeleteCallback_ != nullptr) {
-      taskDataDeleteCallback_(taskData_, deleterData_);
-    }
-  }
-
-  void Run() const {
-    if (taskRunCallback_ != nullptr) {
-      taskRunCallback_(taskData_);
-    }
-  }
-
- private:
-  void *taskData_;
-  jsr_task_run_cb taskRunCallback_;
-  jsr_data_delete_cb taskDataDeleteCallback_;
-  void *deleterData_;
-};
-
-class V8TaskRunner {
- public:
-  static void Create(jsr_config config, std::shared_ptr<facebook::react::MessageQueueThread> queue) {
-    CRASH_ON_ERROR(
-        getV8Api().jsr_config_set_task_runner(config, new V8TaskRunner(std::move(queue)), &PostTask, &Delete, nullptr));
-  }
-
- private:
-  V8TaskRunner(std::shared_ptr<facebook::react::MessageQueueThread> queue) : queue_(std::move(queue)) {}
-
-  static void NAPI_CDECL PostTask(
-      void *taskRunnerData,
-      void *taskData,
-      jsr_task_run_cb taskRunCallback,
-      jsr_data_delete_cb taskDataDeleteCallback,
-      void *deleterData) {
-    auto task = std::make_shared<V8Task>(taskData, taskRunCallback, taskDataDeleteCallback, deleterData);
-    reinterpret_cast<V8TaskRunner *>(taskRunnerData)->queue_->runOnQueue([task = std::move(task)] { task->Run(); });
-  }
-
-  static void NAPI_CDECL Delete(void *taskRunner, void * /*deleterData*/) {
-    delete reinterpret_cast<V8TaskRunner *>(taskRunner);
-  }
-
- private:
-  std::shared_ptr<facebook::react::MessageQueueThread> queue_;
-};
-
-struct V8JsiBuffer : facebook::jsi::Buffer {
-  static std::shared_ptr<const facebook::jsi::Buffer>
-  Create(const uint8_t *buffer, size_t bufferSize, jsr_data_delete_cb bufferDeleteCallback, void *deleterData) {
-    return std::shared_ptr<const facebook::jsi::Buffer>(
-        new V8JsiBuffer(buffer, bufferSize, bufferDeleteCallback, deleterData));
-  }
-
-  V8JsiBuffer(
-      const uint8_t *buffer,
-      size_t bufferSize,
-      jsr_data_delete_cb bufferDeleteCallback,
-      void *deleterData) noexcept
-      : buffer_(buffer),
-        bufferSize_(bufferSize),
-        bufferDeleteCallback_(bufferDeleteCallback),
-        deleterData_(deleterData) {}
-
-  ~V8JsiBuffer() override {
-    if (bufferDeleteCallback_) {
-      bufferDeleteCallback_(const_cast<uint8_t *>(buffer_), deleterData_);
-    }
-  }
-
-  const uint8_t *data() const override {
-    return buffer_;
-  }
-
-  size_t size() const override {
-    return bufferSize_;
-  }
-
- private:
-  const uint8_t *buffer_;
-  size_t bufferSize_;
-  jsr_data_delete_cb bufferDeleteCallback_;
-  void *deleterData_;
-};
-
-class V8ScriptCache {
- public:
-  static void Create(jsr_config config, std::shared_ptr<facebook::jsi::PreparedScriptStore> scriptStore) {
-    CRASH_ON_ERROR(getV8Api().jsr_config_set_script_cache(
-        config, new V8ScriptCache(std::move(scriptStore)), &LoadScript, &StoreScript, &Delete, nullptr));
-  }
-
- private:
-  V8ScriptCache(std::shared_ptr<facebook::jsi::PreparedScriptStore> scriptStore)
-      : scriptStore_(std::move(scriptStore)) {}
-
-  static void NAPI_CDECL LoadScript(
-      void *scriptCache,
-      const char *sourceUrl,
-      uint64_t sourceHash,
-      const char *runtimeName,
-      uint64_t runtimeVersion,
-      const char *cacheTag,
-      const uint8_t **buffer,
-      size_t *bufferSize,
-      jsr_data_delete_cb *bufferDeleteCallback,
-      void **deleterData) {
-    auto &scriptStore = reinterpret_cast<V8ScriptCache *>(scriptCache)->scriptStore_;
-    std::shared_ptr<const facebook::jsi::Buffer> preparedScript = scriptStore->tryGetPreparedScript(
-        facebook::jsi::ScriptSignature{sourceUrl, sourceHash},
-        facebook::jsi::JSRuntimeSignature{runtimeName, runtimeVersion},
-        cacheTag);
-    if (preparedScript) {
-      *buffer = preparedScript->data();
-      *bufferSize = preparedScript->size();
-      *bufferDeleteCallback = [](void * /*data*/, void *deleterData) noexcept {
-        delete reinterpret_cast<std::shared_ptr<const facebook::jsi::Buffer> *>(deleterData);
-      };
-      *deleterData = new std::shared_ptr<const facebook::jsi::Buffer>(std::move(preparedScript));
-    } else {
-      *buffer = nullptr;
-      *bufferSize = 0;
-      *bufferDeleteCallback = nullptr;
-      *deleterData = nullptr;
-    }
-  }
-
-  static void NAPI_CDECL StoreScript(
-      void *scriptCache,
-      const char *sourceUrl,
-      uint64_t sourceHash,
-      const char *runtimeName,
-      uint64_t runtimeVersion,
-      const char *cacheTag,
-      const uint8_t *buffer,
-      size_t bufferSize,
-      jsr_data_delete_cb bufferDeleteCallback,
-      void *deleterData) {
-    auto &scriptStore = reinterpret_cast<V8ScriptCache *>(scriptCache)->scriptStore_;
-    scriptStore->persistPreparedScript(
-        V8JsiBuffer::Create(buffer, bufferSize, bufferDeleteCallback, deleterData),
-        facebook::jsi::ScriptSignature{sourceUrl, sourceHash},
-        facebook::jsi::JSRuntimeSignature{runtimeName, runtimeVersion},
-        cacheTag);
-  }
-
-  static void NAPI_CDECL Delete(void *scriptCache, void * /*deleterData*/) {
-    delete reinterpret_cast<V8ScriptCache *>(scriptCache);
-  }
-
- private:
-  std::shared_ptr<facebook::jsi::PreparedScriptStore> scriptStore_;
-};
-
-} // namespace
-
-V8RuntimeHolder::V8RuntimeHolder(
-    std::shared_ptr<facebook::react::DevSettings> devSettings,
-    std::shared_ptr<facebook::react::MessageQueueThread> jsQueue,
-    std::shared_ptr<facebook::jsi::PreparedScriptStore> preparedScriptStore,
-    bool enableMultiThreadingSupport) noexcept
-    : m_weakDevSettings(devSettings),
-      m_jsQueue(std::move(jsQueue)),
-      m_preparedScriptStore(std::move(preparedScriptStore)),
-      m_enableMultiThreadingSupport(enableMultiThreadingSupport) {}
-
-void V8RuntimeHolder::initRuntime() noexcept {
-  std::shared_ptr<facebook::react::DevSettings> devSettings = m_weakDevSettings.lock();
-  VerifyElseCrash(devSettings);
-
-  V8Api &api = getV8Api();
-  V8Api::setCurrent(&api);
-  jsr_config config{};
-  CRASH_ON_ERROR(api.jsr_create_config(&config));
-  CRASH_ON_ERROR(api.jsr_config_enable_inspector(config, devSettings->useDirectDebugger));
-  CRASH_ON_ERROR(api.jsr_config_set_inspector_runtime_name(config, devSettings->debuggerRuntimeName.c_str()));
-  CRASH_ON_ERROR(api.jsr_config_set_inspector_port(config, devSettings->debuggerPort));
-  CRASH_ON_ERROR(api.jsr_config_set_inspector_break_on_start(config, devSettings->debuggerBreakOnNextLine));
-  CRASH_ON_ERROR(api.v8_config_enable_multithreading(config, m_enableMultiThreadingSupport));
-
-  if (m_jsQueue) {
-    V8TaskRunner::Create(config, m_jsQueue);
-  }
-  if (m_preparedScriptStore) {
-    V8ScriptCache::Create(config, m_preparedScriptStore);
-  }
-  jsr_runtime runtime{};
-  CRASH_ON_ERROR(api.jsr_create_runtime(config, &runtime));
-  CRASH_ON_ERROR(api.jsr_delete_config(config));
-
-  napi_env env{};
-  CRASH_ON_ERROR(api.jsr_runtime_get_node_api_env(runtime, &env));
-
-  m_jsiRuntime =
-      makeNodeApiJsiRuntime(env, &api, [runtime]() { CRASH_ON_ERROR(V8Api::current()->jsr_delete_runtime(runtime)); });
-  m_ownThreadId = std::this_thread::get_id();
-}
-
-facebook::react::JSIEngineOverride V8RuntimeHolder::getRuntimeType() noexcept {
-  return facebook::react::JSIEngineOverride::V8NodeApi;
-}
-
-std::shared_ptr<facebook::jsi::Runtime> V8RuntimeHolder::getRuntime() noexcept {
-  std::call_once(m_onceFlag, [this]() { initRuntime(); });
-  VerifyElseCrash(m_jsiRuntime);
-  return m_jsiRuntime;
-}
-
-} // namespace Microsoft::ReactNative

package/Shared/JSI/V8RuntimeHolder.h

@@ -1,37 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-#pragma once
-
-#include "RuntimeHolder.h"
-#include "ScriptStore.h"
-
-#include <cxxreact/MessageQueueThread.h>
-
-namespace Microsoft::ReactNative {
-
-class V8RuntimeHolder : public Microsoft::JSI::RuntimeHolderLazyInit {
- public: // RuntimeHolderLazyInit implementation.
-  std::shared_ptr<facebook::jsi::Runtime> getRuntime() noexcept override;
-  facebook::react::JSIEngineOverride getRuntimeType() noexcept override;
-
-  V8RuntimeHolder(
-      std::shared_ptr<facebook::react::DevSettings> devSettings,
-      std::shared_ptr<facebook::react::MessageQueueThread> jsQueue,
-      std::shared_ptr<facebook::jsi::PreparedScriptStore> preparedScriptStore,
-      bool enableMultiThreadingSupport) noexcept;
-
- private:
-  void initRuntime() noexcept;
-
- private:
-  std::shared_ptr<facebook::jsi::Runtime> m_jsiRuntime;
-  std::once_flag m_onceFlag{};
-  std::thread::id m_ownThreadId{};
-  std::weak_ptr<facebook::react::DevSettings> m_weakDevSettings;
-  std::shared_ptr<facebook::react::MessageQueueThread> m_jsQueue;
-  std::shared_ptr<facebook::jsi::PreparedScriptStore> m_preparedScriptStore;
-  bool m_enableMultiThreadingSupport;
-};
-
-} // namespace Microsoft::ReactNative

package/Shared/SafeLoadLibrary.cpp

@@ -1,77 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-#include "SafeLoadLibrary.h"
-#include "PathCch.h"
-
-EXTERN_C IMAGE_DOS_HEADER __ImageBase;
-
-namespace Microsoft::ReactNative {
-
-// Unsafe calls to LoadLibrary/LoadLibraryEx.
-// The default behavior of LoadLibrary, or LoadLibraryEx without flags, is to try and find the dependency by iterating
-// through a search order. This search order contains the current working directory. In the classic attack, a malicious
-// DLL is dropped in the likely - controllable current working directory. The malicious DLL has the same name as a
-// missing dependency or dependency that is not in the same directory as the executable. When the call to LoadLibrary
-// is reached, the malicious DLL is loaded preferentially, and code execution occurs.
-//
-// The SafeLoadLibrary is the preferred ways to manually load dependencies.
-// The API does not search the current working directory when resolving dependencies.
-// The implementation is "borrowed" from Office MsoSafeLoadLibrary.
-
-/**
-      List of new flags that control where to search for DLLs. Requires KB2533623.
-*/
-const DWORD SafeLoadLibraryFlags = LOAD_LIBRARY_SEARCH_APPLICATION_DIR | LOAD_LIBRARY_SEARCH_DEFAULT_DIRS |
-    LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR | LOAD_LIBRARY_SEARCH_SYSTEM32 | LOAD_LIBRARY_SEARCH_USER_DIRS;
-
-HMODULE SafeLoadLibrary(const wchar_t *fileName, DWORD dwFlags) noexcept {
-  // When calling LoadLibrary, OR in LOAD_LIBRARY_SEARCH_DEFAULT_DIRS which enables all of the
-  // safe behaviors. Note that this flag is not compatible with LOAD_WITH_ALTERED_SEARCH_PATH.
-#pragma push_macro("LoadLibraryExW")
-#undef LoadLibraryExW
-  HMODULE module =
-      ::LoadLibraryExW(fileName, 0, (dwFlags | LOAD_LIBRARY_SEARCH_DEFAULT_DIRS) & ~LOAD_WITH_ALTERED_SEARCH_PATH);
-  if (module == nullptr && GetLastError() == ERROR_INVALID_PARAMETER) {
-    // Could have failed with actual bad parameters or an unpatched OS without KB2533623.
-    if (::GetProcAddress(::GetModuleHandleW(L"kernel32.dll"), "AddDllDirectory") == nullptr) {
-      // Unpatched OS, remove all new flags.
-      module = ::LoadLibraryExW(fileName, 0, dwFlags & ~SafeLoadLibraryFlags);
-    }
-  }
-#pragma pop_macro("LoadLibraryExW")
-
-  return module;
-}
-
-// Gets the full file name in the same directory as the current DLL.
-// It returns nullptr if we cannot create the full file name.
-wchar_t *GePeerFullFileName(const wchar_t *fileName, wchar_t *buffer, size_t bufferSize) {
-  size_t nameSize =
-      ::GetModuleFileNameW(reinterpret_cast<HINSTANCE>(&__ImageBase), buffer, static_cast<DWORD>(bufferSize));
-  if (nameSize == 0 || nameSize == bufferSize)
-    return nullptr;
-
-  if (::PathCchRemoveFileSpec(buffer, bufferSize) != S_OK)
-    return nullptr;
-  if (::PathCchCombineEx(buffer, bufferSize, buffer, fileName, PATHCCH_ALLOW_LONG_PATHS) != S_OK)
-    return nullptr;
-
-  return buffer;
-}
-
-HMODULE LoadLibraryAsPeerFirst(const wchar_t *fileName) noexcept {
-  HMODULE lib{nullptr};
-  constexpr size_t nameBufferSize = 4096;
-  wchar_t nameBuffer[nameBufferSize] = L"";
-
-  if (wchar_t *fullFileName = GePeerFullFileName(fileName, nameBuffer, nameBufferSize))
-    lib = SafeLoadLibrary(fullFileName);
-
-  if (!lib)
-    lib = SafeLoadLibrary(fileName);
-
-  return lib;
-}
-
-} // namespace Microsoft::ReactNative