react-native-windows 0.81.1 → 0.82.0-preview.1

package/Scripts/OfficeReact.Win32.nuspec

@@ -46,7 +46,6 @@
 
     <file src="$nugetroot$\inc\Shared\AbiSafe.h" target="inc"/>
     <file src="$nugetroot$\inc\Shared\DevSettings.h" target="inc"/>
-    <file src="$nugetroot$\inc\ReactWin32\INativeUIManagerLegacy.h" target="inc"/>
     <file src="$nugetroot$\inc\Shared\InstanceManager.h" target="inc"/>
     <file src="$nugetroot$\inc\Shared\IDevSupportManager.h" target="inc"/>
     <file src="$nugetroot$\inc\Shared\IReactRootView.h" target="inc"/>
@@ -55,12 +54,10 @@
     <file src="$nugetroot$\inc\Shared\LayoutAnimation.h" target="inc"/>
     <file src="$nugetroot$\inc\Shared\Logging.h" target="inc"/>
     <file src="$nugetroot$\inc\Shared\MemoryMappedBuffer.h" target="inc"/>
-    <file src="$nugetroot$\inc\Shared\NativeModuleProvider.h" target="inc"/>
     <file src="$nugetroot$\inc\Shared\Networking\IWebSocketResource.h" target="inc"/>
     <file src="$nugetroot$\inc\Shared\Networking\OriginPolicy.h" target="inc"/>
     <file src="$nugetroot$\inc\Shared\RuntimeOptions.h" target="inc"/>
     <file src="$nugetroot$\inc\Shared\Tracing.h" target="inc"/>
-    <file src="$nugetroot$\inc\Shared\JSI\JSExecutorFactoryDelegate.h" target="inc\JSI"/>
 
     <!-- Test DLL -->
     <file src="$nugetroot$\inc\Test\WebSocketServer.h" target="inc\Test" />

package/Scripts/creaternwapp.cmd

@@ -117,7 +117,7 @@ if not "x%RN_VERSION:nightly=%"=="x%RN_VERSION%" (
   REM Do not change, this makes sure we always get a nightly template when still consuming a nightly RN and NOT a later "stable" template that may have been released
   REM set RNCLI_TEMPLATE=--template "@react-native-community/template@^%RN_VERSION:~0,4%.0-"
   REM Windows we need to manually update this with every integration #15124
-  set RNCLI_TEMPLATE=--template "@react-native-community/template@0.81.0-nightly-202565-2f67cec"
+  set RNCLI_TEMPLATE=--template "@react-native-community/template@0.82.0-nightly-202591-d2a0bee"
 )
 
 @echo creaternwapp.cmd: Creating base RN app project with: npx --yes @react-native-community/cli@%RNCLI_VERSION% init %APP_NAME% --version %RN_VERSION% %RNCLI_TEMPLATE% --verbose --skip-install --install-pods false --skip-git-init true

package/Shared/DevServerHelper.h

@@ -3,7 +3,8 @@
 
 #pragma once
 
-#include <cxxreact/JSExecutor.h>
+#include <string>
+#include "Utils.h"
 
 namespace facebook {
 namespace react {
@@ -13,13 +14,14 @@ class DevServerHelper {
   DevServerHelper() = default;
 
   static std::string get_WebsocketProxyUrl(const std::string &sourceBundleHost, const uint16_t sourceBundlePort) {
-    return string_format(WebsocketProxyUrlFormat, GetDeviceLocalHost(sourceBundleHost, sourceBundlePort).c_str());
+    return Microsoft::React::FormatString(
+        WebsocketProxyUrlFormat, GetDeviceLocalHost(sourceBundleHost, sourceBundlePort).c_str());
   }
 
   static std::string get_LaunchDevToolsCommandUrl(
       const std::string &sourceBundleHost,
       const uint16_t sourceBundlePort) {
-    return string_format(
+    return Microsoft::React::FormatString(
         LaunchDevToolsCommandUrlFormat, GetDeviceLocalHost(sourceBundleHost, sourceBundlePort).c_str());
   }
 
@@ -36,16 +38,17 @@ class DevServerHelper {
     std::string hermesBytecodeVersionQuery;
     if (hermesBytecodeVersion > 0) {
       static constexpr const char HermesBytecodeVersionQueryFormat[] = "&runtimeBytecodeVersion=%d";
-      hermesBytecodeVersionQuery = string_format(HermesBytecodeVersionQueryFormat, hermesBytecodeVersion);
+      hermesBytecodeVersionQuery =
+          Microsoft::React::FormatString(HermesBytecodeVersionQueryFormat, hermesBytecodeVersion);
     }
 
     std::string appIdQuery;
     if (bundleAppId.size() > 0) {
       static constexpr const char AppIdQueryFormat[] = "&app=%s";
-      appIdQuery = string_format(AppIdQueryFormat, bundleAppId.c_str());
+      appIdQuery = Microsoft::React::FormatString(AppIdQueryFormat, bundleAppId.c_str());
     }
 
-    return string_format(
+    return Microsoft::React::FormatString(
         BundleUrlFormat,
         GetDeviceLocalHost(sourceBundleHost, sourceBundlePort).c_str(),
         jsbundle.c_str(),
@@ -58,17 +61,19 @@ class DevServerHelper {
   }
 
   static std::string get_OnChangeEndpointUrl(const std::string &sourceBundleHost, const uint16_t sourceBundlePort) {
-    return string_format(OnChangeEndpointUrlFormat, GetDeviceLocalHost(sourceBundleHost, sourceBundlePort).c_str());
+    return Microsoft::React::FormatString(
+        OnChangeEndpointUrlFormat, GetDeviceLocalHost(sourceBundleHost, sourceBundlePort).c_str());
   }
 
   static std::string get_PackagerConnectionUrl(const std::string &sourceBundleHost, const uint16_t sourceBundlePort) {
-    return string_format(PackagerConnectionUrlFormat, GetDeviceLocalHost(sourceBundleHost, sourceBundlePort).c_str());
+    return Microsoft::React::FormatString(
+        PackagerConnectionUrlFormat, GetDeviceLocalHost(sourceBundleHost, sourceBundlePort).c_str());
   }
 
   static std::string get_PackagerOpenStackFrameUrl(
       const std::string &sourceBundleHost,
       const uint16_t sourceBundlePort) {
-    return string_format(
+    return Microsoft::React::FormatString(
         PackagerOpenStackFrameUrlFormat, GetDeviceLocalHost(sourceBundleHost, sourceBundlePort).c_str());
   }
 
@@ -78,7 +83,7 @@ class DevServerHelper {
       const std::string &deviceName,
       const std::string &packageName,
       const std::string &deviceId) {
-    return string_format(
+    return Microsoft::React::FormatString(
         InspectorDeviceUrlFormat,
         GetDeviceLocalHost(packagerHost, packagerPort).c_str(),
         deviceName.c_str(),
@@ -88,7 +93,7 @@ class DevServerHelper {
 
   static std::string
   get_OpenDebuggerUrl(const std::string &packagerHost, const uint16_t packagerPort, const std::string &deviceId) {
-    return string_format(
+    return Microsoft::React::FormatString(
         OpenDebuggerUrlFormat, GetDeviceLocalHost(packagerHost, packagerPort).c_str(), deviceId.c_str());
   }
 
@@ -97,7 +102,7 @@ class DevServerHelper {
 
  private:
   static std::string GetDeviceLocalHost(const std::string &sourceBundleHost, const uint16_t sourceBundlePort) {
-    return string_format(
+    return Microsoft::React::FormatString(
         DeviceLocalHostFormat,
         sourceBundleHost.empty() ? DefaultPackagerHost : sourceBundleHost.c_str(),
         sourceBundlePort ? sourceBundlePort : DefaultPackagerPort);
@@ -118,15 +123,6 @@ class DevServerHelper {
 
   static constexpr const char PackagerOkStatus[] = "packager-status:running";
   const int LongPollFailureDelayMs = 5000;
-
-  // TODO: [vmoroz]  avoid using vaiadic args for the format and move it to a utility class.
-  template <typename... Args>
-  static std::string string_format(const char *format, Args... args) {
-    size_t size = snprintf(nullptr, 0, format, args...) + 1;
-    std::unique_ptr<char[]> buf(new char[size]);
-    snprintf(buf.get(), size, format, args...);
-    return std::string(buf.get(), buf.get() + size - 1);
-  }
 };
 
 } // namespace react

package/Shared/DevSettings.h

@@ -2,8 +2,6 @@
 // Licensed under the MIT License.
 
 #pragma once
-
-#include "JSI/JSExecutorFactoryDelegate.h"
 #include "Logging.h"
 
 #include <IRedBoxHandler.h>
@@ -28,12 +26,7 @@ class HostTarget;
 } // namespace jsinspector_modern
 
 enum class JSIEngineOverride : int32_t {
-  Default = 0, // No JSI, will use the legacy ExecutorFactory
-  Chakra = 1, // Use the JSIExecutorFactory with ChakraRuntime
-
-#if 0 // Deprecated
-  ChakraCore = 2, // Use the JSIExecutorFactory with ChakraCoreRuntime
-#endif
+  Default = 3, // Now defaults to Hermes (New Architecture)
 
   Hermes = 3, // Use the JSIExecutorFactory with Hermes
   V8 = 4, // Use the JSIExecutorFactory with V8
@@ -53,7 +46,6 @@ struct DevSettings {
   std::function<void()> liveReloadCallback;
   std::function<void(std::string)> errorCallback;
   std::function<void()> waitingForDebuggerCallback;
-  std::function<void()> debuggerAttachCallback;
   NativeLoggingHook loggingCallback;
   std::shared_ptr<Mso::React::IRedBoxHandler> redboxHandler;
 
@@ -66,24 +58,12 @@ struct DevSettings {
   /// For direct debugging, break on the next line of JavaScript executed
   bool debuggerBreakOnNextLine{false};
 
-  /// Enable function nativePerformanceNow.
-  /// Method nativePerformanceNow() returns high resolution time info.
-  /// It is not safe to expose to Custom Function. Add this flag so we can turn
-  /// it off for Custom Function.
-  bool enableNativePerformanceNow{true};
-
   /// For direct debugging, the port number to use, or zero for the default
   uint16_t debuggerPort{0};
 
   /// For direct debugging, name of runtime instance, or empty for default.
   std::string debuggerRuntimeName;
 
-  /// Enables debugging by running the JavaScript in a web browser (Chrome)
-  /// using http://localhost:8081/debugger-ui from the React Native packager
-  /// (Metro / Haul). Debugging will start as soon as the React Native instance
-  /// is loaded.
-  bool useWebDebugger{false};
-
   bool useFastRefresh{false};
 
   /// A factory and holder of jsi::Runtime instance to be used for this react
@@ -92,10 +72,6 @@ struct DevSettings {
   /// reentrancy.
   std::shared_ptr<Microsoft::JSI::RuntimeHolderLazyInit> jsiRuntimeHolder;
 
-  /// A function that can be called with the current Instance to get
-  /// a JSExecutorFactory. This can be used to bypass the ABI JSI.
-  JSExecutorFactoryDelegate jsExecutorFactoryDelegate{nullptr};
-
   // Until the ABI story is addressed we'll use this instead of the above for
   // the purposes of selecting a JSI Runtime to use.
   JSIEngineOverride jsiEngineOverride{JSIEngineOverride::Default};

package/Shared/DevSupportManager.cpp

@@ -8,7 +8,6 @@
 #include <Shared/DevServerHelper.h>
 #include <Shared/DevSettings.h>
 
-#include <Executors/WebSocketJSExecutor.h>
 #include "Inspector/ReactInspectorPackagerConnectionDelegate.h"
 #include "PackagerConnection.h"
 
@@ -31,7 +30,6 @@
 
 #pragma warning(push)
 #pragma warning(disable : 4068 4251 4101 4804 4309)
-#include <cxxreact/JSExecutor.h>
 #include <cxxreact/MessageQueueThread.h>
 #pragma warning(pop)
 
@@ -118,38 +116,6 @@ void LaunchDevTools(const facebook::react::DevSettings &settings) {
   httpClient.SendRequestAsync(request);
 }
 
-facebook::react::JSECreator DevSupportManager::LoadJavaScriptInProxyMode(
-    const facebook::react::DevSettings &settings,
-    std::function<void()> &&errorCallback) {
-  try {
-    LaunchDevTools(settings);
-    Microsoft::ReactNative::PackagerConnection::CreateOrReusePackagerConnection(settings);
-
-    return [this, settings, errorCallback](
-               std::shared_ptr<facebook::react::ExecutorDelegate> delegate,
-               std::shared_ptr<facebook::react::MessageQueueThread> jsQueue) {
-      auto websocketJSE = std::make_unique<WebSocketJSExecutor>(delegate, jsQueue);
-      try {
-        websocketJSE
-            ->ConnectAsync(
-                facebook::react::DevServerHelper::get_WebsocketProxyUrl(
-                    settings.sourceBundleHost, settings.sourceBundlePort),
-                settings.errorCallback,
-                settings.waitingForDebuggerCallback,
-                settings.debuggerAttachCallback)
-            .get();
-      } catch (...) {
-        errorCallback();
-      }
-
-      return websocketJSE;
-    };
-  } catch (winrt::hresult_error const &e) {
-    errorCallback();
-    throw std::exception(Microsoft::Common::Unicode::Utf16ToUtf8(e.message().c_str(), e.message().size()).c_str());
-  }
-}
-
 DevSupportManager::~DevSupportManager() {
   StopPollingLiveReload();
 }
@@ -286,22 +252,6 @@ void DevSupportManager::StopPollingLiveReload() {
   m_cancellation_token = true;
 }
 
-// TODO: (vmoroz) Use or delete this function
-void DevSupportManager::OpenDevTools(const std::string &bundleAppId) {
-  winrt::Windows::Web::Http::Filters::HttpBaseProtocolFilter filter;
-  filter.CacheControl().ReadBehavior(winrt::Windows::Web::Http::Filters::HttpCacheReadBehavior::NoCache);
-  winrt::Windows::Web::Http::HttpClient httpClient(filter);
-  // TODO: Use currently configured dev server host
-  winrt::Windows::Foundation::Uri uri(
-      Microsoft::Common::Unicode::Utf8ToUtf16(facebook::react::DevServerHelper::get_OpenDebuggerUrl(
-          std::string{DevServerHelper::DefaultPackagerHost},
-          DevServerHelper::DefaultPackagerPort,
-          GetDeviceId(GetPackageName(bundleAppId)))));
-
-  winrt::Windows::Web::Http::HttpRequestMessage request(winrt::Windows::Web::Http::HttpMethod::Post(), uri);
-  httpClient.SendRequestAsync(request);
-}
-
 void DevSupportManager::EnsureInspectorPackagerConnection(
     [[maybe_unused]] const std::string &packagerHost,
     [[maybe_unused]] const uint16_t packagerPort,

package/Shared/DevSupportManager.h

@@ -40,15 +40,11 @@ class DevSupportManager final : public facebook::react::IDevSupportManager {
   DevSupportManager() = default;
   ~DevSupportManager();
 
-  virtual facebook::react::JSECreator LoadJavaScriptInProxyMode(
-      const facebook::react::DevSettings &settings,
-      std::function<void()> &&errorCallback) override;
   virtual void StartPollingLiveReload(
       const std::string &sourceBundleHost,
       const uint16_t sourceBundlePort,
       std::function<void()> onChangeCallback) override;
   virtual void StopPollingLiveReload() override;
-  virtual void OpenDevTools(const std::string &bundleAppId) override;
 
   virtual void EnsureInspectorPackagerConnection(
       const std::string &packagerHost,

package/Shared/Hermes/HermesRuntimeTargetDelegate.cpp

@@ -15,6 +15,7 @@
 
 #include "HermesRuntimeTargetDelegate.h"
 #include <jsinspector-modern/RuntimeTarget.h>
+#include <windows.h>
 #include <utility>
 #include "HermesRuntimeAgentDelegate.h"
 
@@ -268,7 +269,10 @@ tracing::RuntimeSamplingProfile HermesRuntimeTargetDelegate::collectSamplingProf
 
   // Return the complete profile with samples. Wrap the raw profile since it owns the strings.
   return tracing::RuntimeSamplingProfile(
-      "Hermes", std::move(readerState.samples), std::make_unique<HermesRawRuntimeProfile>(std::move(profile)));
+      "Hermes",
+      GetCurrentProcessId(),
+      std::move(readerState.samples),
+      std::make_unique<HermesRawRuntimeProfile>(std::move(profile)));
 }
 
 } // namespace Microsoft::ReactNative

package/Shared/HermesRuntimeHolder.cpp

@@ -319,37 +319,6 @@ void HermesRuntimeHolder::crashHandler(int fileDescriptor) noexcept {
   CRASH_ON_ERROR(getHermesApi().hermes_dump_crash_data(m_runtime, fileDescriptor));
 }
 
-std::shared_ptr<HermesRuntimeHolder> HermesRuntimeHolder::loadFrom(
-    React::ReactPropertyBag const &propertyBag) noexcept {
-  return *(propertyBag.Get(HermesRuntimeHolderProperty()));
-}
-
-void HermesRuntimeHolder::storeTo(
-    React::ReactPropertyBag const &propertyBag,
-    std::shared_ptr<HermesRuntimeHolder> const &holder) noexcept {
-  propertyBag.Set(HermesRuntimeHolderProperty(), holder);
-}
-
-void HermesRuntimeHolder::addToProfiling() const noexcept {
-  CRASH_ON_ERROR(getHermesApi().hermes_sampling_profiler_add(m_runtime));
-}
-
-void HermesRuntimeHolder::removeFromProfiling() const noexcept {
-  CRASH_ON_ERROR(getHermesApi().hermes_sampling_profiler_remove(m_runtime));
-}
-
-/*static*/ void HermesRuntimeHolder::enableSamplingProfiler() noexcept {
-  CRASH_ON_ERROR(getHermesApi().hermes_sampling_profiler_enable());
-}
-
-/*static*/ void HermesRuntimeHolder::disableSamplingProfiler() noexcept {
-  CRASH_ON_ERROR(getHermesApi().hermes_sampling_profiler_disable());
-}
-
-/*static*/ void HermesRuntimeHolder::dumpSampledTraceToFile(const std::string &fileName) noexcept {
-  CRASH_ON_ERROR(getHermesApi().hermes_sampling_profiler_dump_to_file(fileName.c_str()));
-}
-
 hermes_runtime HermesRuntimeHolder::getHermesRuntime() noexcept {
   return reinterpret_cast<hermes_runtime>(m_runtime);
 }

package/Shared/HermesRuntimeHolder.h

@@ -231,20 +231,6 @@ class HermesRuntimeHolder : public Microsoft::JSI::RuntimeHolderLazyInit,
 
   std::shared_ptr<facebook::react::jsinspector_modern::RuntimeTargetDelegate> createRuntimeTargetDelegate() override;
 
-  static std::shared_ptr<HermesRuntimeHolder> loadFrom(
-      winrt::Microsoft::ReactNative::ReactPropertyBag const &propertyBag) noexcept;
-
-  static void storeTo(
-      winrt::Microsoft::ReactNative::ReactPropertyBag const &propertyBag,
-      std::shared_ptr<HermesRuntimeHolder> const &holder) noexcept;
-
-  void addToProfiling() const noexcept;
-  void removeFromProfiling() const noexcept;
-
-  static void enableSamplingProfiler() noexcept;
-  static void disableSamplingProfiler() noexcept;
-  static void dumpSampledTraceToFile(const std::string &fileName) noexcept;
-
   hermes_runtime getHermesRuntime() noexcept;
 
  private:

package/Shared/IDevSupportManager.h

@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <cxxreact/JSExecutor.h>
 #include <functional>
 #include <memory>
 #include <string>
@@ -11,19 +10,14 @@
 namespace facebook {
 namespace react {
 
-using JSECreator =
-    std::function<std::unique_ptr<JSExecutor>(std::shared_ptr<ExecutorDelegate>, std::shared_ptr<MessageQueueThread>)>;
-
 struct DevSettings;
 
 struct IDevSupportManager {
-  virtual JSECreator LoadJavaScriptInProxyMode(const DevSettings &settings, std::function<void()> &&errorCallback) = 0;
   virtual void StartPollingLiveReload(
       const std::string &sourceBundleHost,
       const uint16_t sourceBundlePort,
       std::function<void()> onChangeCallback) = 0;
   virtual void StopPollingLiveReload() = 0;
-  virtual void OpenDevTools(const std::string &bundleAppId) = 0;
 
   virtual void EnsureInspectorPackagerConnection(
       const std::string &packagerHost,

package/Shared/InstanceManager.cpp

@@ -3,13 +3,8 @@
 
 #include "pch.h"
 
-#include <InstanceManager.h>
-
 #include <DevSettings.h>
 #include <IDevSupportManager.h>
-#include <OInstance.h>
-
-#include <cxxreact/Instance.h>
 
 namespace Microsoft::ReactNative {
 
@@ -19,95 +14,3 @@ const std::shared_ptr<facebook::react::IDevSupportManager> &GetSharedDevManager(
   return s_devManager;
 }
 } // namespace Microsoft::ReactNative
-
-namespace facebook {
-namespace react {
-
-std::shared_ptr<InstanceWrapper> CreateReactInstance(
-    std::shared_ptr<Instance> &&instance,
-    std::string &&jsBundleBasePath,
-    std::vector<
-        std::tuple<std::string, facebook::xplat::module::CxxModule::Provider, std::shared_ptr<MessageQueueThread>>>
-        &&cxxModules,
-    std::shared_ptr<TurboModuleRegistry> turboModuleRegistry,
-    std::unique_ptr<InstanceCallback> &&callback,
-    std::shared_ptr<MessageQueueThread> jsQueue,
-    std::shared_ptr<MessageQueueThread> nativeQueue,
-    std::shared_ptr<DevSettings> devSettings) noexcept {
-  // Now create the instance
-  std::shared_ptr<InstanceWrapper> inner = InstanceImpl::MakeNoBundle(
-      std::move(instance),
-      std::move(jsBundleBasePath),
-      std::move(cxxModules),
-      std::move(turboModuleRegistry),
-      nullptr, // longLivedObjectCollection
-      nullptr, // PropertyBag
-      std::move(callback),
-      std::move(jsQueue),
-      std::move(nativeQueue),
-      std::move(devSettings),
-      ::Microsoft::ReactNative::GetSharedDevManager());
-
-  return inner;
-}
-
-std::shared_ptr<InstanceWrapper> CreateReactInstance(
-    std::shared_ptr<Instance> &&instance,
-    std::string &&jsBundleBasePath,
-    std::vector<
-        std::tuple<std::string, facebook::xplat::module::CxxModule::Provider, std::shared_ptr<MessageQueueThread>>>
-        &&cxxModules,
-    std::shared_ptr<TurboModuleRegistry> turboModuleRegistry,
-    std::shared_ptr<facebook::react::LongLivedObjectCollection> longLivedObjectCollection,
-    const winrt::Microsoft::ReactNative::IReactPropertyBag &propertyBag,
-    std::unique_ptr<InstanceCallback> &&callback,
-    std::shared_ptr<MessageQueueThread> jsQueue,
-    std::shared_ptr<MessageQueueThread> nativeQueue,
-    std::shared_ptr<DevSettings> devSettings) noexcept {
-  // Now create the instance
-  std::shared_ptr<InstanceWrapper> inner = InstanceImpl::MakeNoBundle(
-      std::move(instance),
-      std::move(jsBundleBasePath),
-      std::move(cxxModules),
-      std::move(turboModuleRegistry),
-      std::move(longLivedObjectCollection),
-      propertyBag,
-      std::move(callback),
-      std::move(jsQueue),
-      std::move(nativeQueue),
-      std::move(devSettings),
-      ::Microsoft::ReactNative::GetSharedDevManager());
-
-  return inner;
-}
-
-std::shared_ptr<InstanceWrapper> CreateReactInstance(
-    std::shared_ptr<Instance> &&instance,
-    std::string &&jsBundleBasePath,
-    std::string &&jsBundleRelativePath,
-    std::vector<
-        std::tuple<std::string, facebook::xplat::module::CxxModule::Provider, std::shared_ptr<MessageQueueThread>>>
-        &&cxxModules,
-    std::shared_ptr<TurboModuleRegistry> turboModuleRegistry,
-    std::unique_ptr<InstanceCallback> &&callback,
-    std::shared_ptr<MessageQueueThread> jsQueue,
-    std::shared_ptr<MessageQueueThread> nativeQueue,
-    std::shared_ptr<DevSettings> devSettings) noexcept {
-  // Now create the instance
-  std::shared_ptr<InstanceWrapper> inner = InstanceImpl::MakeAndLoadBundle(
-      std::move(instance),
-      std::move(jsBundleBasePath),
-      std::move(jsBundleRelativePath),
-      std::move(cxxModules),
-      std::move(turboModuleRegistry),
-      std::move(callback),
-      std::move(jsQueue),
-      std::move(nativeQueue),
-      std::move(devSettings),
-      ::Microsoft::ReactNative::GetSharedDevManager());
-
-  return inner;
-}
-
-} // namespace react
-} // namespace facebook

package/Shared/InstanceManager.h

@@ -4,7 +4,6 @@
 #pragma once
 
 #include <Logging.h>
-#include <cxxreact/CxxModule.h>
 #include <cxxreact/JSBigString.h>
 #include <react/bridging/LongLivedObject.h>
 #include <map>
@@ -15,58 +14,6 @@
 #include "IDevSupportManager.h"
 #include "IReactRootView.h"
 
-namespace folly {
-struct dynamic;
-}
-
-namespace facebook::react {
-
-class Instance;
-struct InstanceCallback;
-class MessageQueueThread;
-class ModuleRegistry;
-class IUIManager;
-class TurboModuleRegistry;
-class RuntimeScheduler;
-
-struct InstanceWrapper {
-  virtual const std::shared_ptr<Instance> &GetInstance() const noexcept = 0;
-
-  virtual void DispatchEvent(int64_t viewTag, std::string eventName, folly::dynamic &&eventData) = 0;
-  virtual void invokeCallback(const int64_t callbackId, folly::dynamic &&params) = 0;
-  virtual void loadBundle(std::string &&jsBundleRelativePath) = 0;
-  virtual void loadBundleSync(std::string &&jsBundleRelativePath) = 0;
-};
-
-// Things that used to be exported from InstanceManager, but probably belong
-// elsewhere
-std::shared_ptr<InstanceWrapper> CreateReactInstance(
-    std::shared_ptr<Instance> &&instance,
-    std::string &&jsBundleRelativePath,
-    std::vector<
-        std::tuple<std::string, facebook::xplat::module::CxxModule::Provider, std::shared_ptr<MessageQueueThread>>>
-        &&cxxModules,
-    std::shared_ptr<TurboModuleRegistry> turboModuleRegistry,
-    std::unique_ptr<InstanceCallback> &&callback,
-    std::shared_ptr<MessageQueueThread> jsQueue,
-    std::shared_ptr<MessageQueueThread> nativeQueue,
-    std::shared_ptr<DevSettings> devSettings) noexcept;
-
-std::shared_ptr<InstanceWrapper> CreateReactInstance(
-    std::shared_ptr<Instance> &&instance,
-    std::string &&jsBundleBasePath,
-    std::string &&jsBundleRelativePath,
-    std::vector<
-        std::tuple<std::string, facebook::xplat::module::CxxModule::Provider, std::shared_ptr<MessageQueueThread>>>
-        &&cxxModules,
-    std::shared_ptr<TurboModuleRegistry> turboModuleRegistry,
-    std::unique_ptr<InstanceCallback> &&callback,
-    std::shared_ptr<MessageQueueThread> jsQueue,
-    std::shared_ptr<MessageQueueThread> nativeQueue,
-    std::shared_ptr<DevSettings> devSettings) noexcept;
-
-} // namespace facebook::react
-
 namespace Microsoft::ReactNative {
 const std::shared_ptr<facebook::react::IDevSupportManager> &GetSharedDevManager() noexcept;
 }

package/Shared/JSI/ScriptStore.h

@@ -23,7 +23,7 @@ struct ScriptSignature {
 };
 
 struct JSRuntimeSignature {
-  std::string runtimeName; // e.g. Chakra, V8
+  std::string runtimeName; // e.g. Hermes, V8
   JSRuntimeVersion_t version;
 };
 

package/Shared/Logging.cpp

@@ -5,9 +5,7 @@
 
 #include "Logging.h"
 
-#include <cxxreact/ReactMarker.h>
 #include <chrono>
-#include "../Chakra/ChakraPlatform.h"
 
 namespace facebook {
 namespace react {
@@ -20,20 +18,11 @@ void LogHook(RCTLogLevel logLevel, const char *message) {
   g_nativeLogHook(logLevel, message);
 }
 
-static double nativePerformanceNow() {
-  return std::chrono::duration<double, std::milli>(std::chrono::steady_clock::now().time_since_epoch()).count();
-}
-
-void logMarker(const ReactMarker::ReactMarkerId /*id*/, const char * /*tag*/) {}
+void logMarker(int /*id*/, const char * /*tag*/) {}
 } // end anonymous namespace
 
 void InitializeLogging(NativeLoggingHook &&hook) {
   g_nativeLogHook = std::move(hook);
-
-  JSNativeHooks::loggingHook = LogHook;
-  JSNativeHooks::nowHook = nativePerformanceNow;
-
-  ReactMarker::logTaggedMarkerImpl = logMarker;
 }
 
 } // namespace react

package/Shared/Modules/CxxModuleUtilities.cpp

@@ -7,19 +7,10 @@
 
 namespace msrn = winrt::Microsoft::ReactNative;
 
-using facebook::react::Instance;
 using folly::dynamic;
-using std::string;
-using std::weak_ptr;
 
 namespace Microsoft::React::Modules {
 
-void SendEvent(weak_ptr<Instance> weakReactInstance, string &&eventName, dynamic &&args) {
-  if (auto instance = weakReactInstance.lock()) {
-    instance->callJSFunction("RCTDeviceEventEmitter", "emit", dynamic::array(std::move(eventName), std::move(args)));
-  }
-}
-
 void SendEvent(
     msrn::ReactContext const &reactContext,
     std::wstring_view &&eventName,

package/Shared/Modules/CxxModuleUtilities.h

@@ -6,9 +6,6 @@
 // Folly
 #include <folly/dynamic.h>
 
-// React Native
-#include <cxxreact/Instance.h>
-
 // React Native Windows
 #include <ReactContext.h>
 
@@ -18,11 +15,6 @@
 
 namespace Microsoft::React::Modules {
 
-void SendEvent(
-    std::weak_ptr<facebook::react::Instance> weakReactInstance,
-    std::string &&eventName,
-    folly::dynamic &&args);
-
 void SendEvent(
     winrt::Microsoft::ReactNative::ReactContext const &reactContext,
     std::wstring_view &&eventName,