react-native-windows 0.81.3 → 0.82.0-preview.10

package/Microsoft.ReactNative/ReactHost/ReactInstanceWin.h

@@ -15,15 +15,11 @@
 #ifndef CORE_ABI
 #include <Modules/AppearanceModule.h>
 #include <Modules/I18nManagerModule.h>
-#include <Views/ExpressionAnimationStore.h>
 #endif
 
-#ifdef USE_FABRIC
 #include <react/runtime/ReactInstance.h>
-#endif
 
 namespace winrt::Microsoft::ReactNative {
-class NativeModulesProvider;
 class TurboModulesProvider;
 } // namespace winrt::Microsoft::ReactNative
 
@@ -56,11 +52,6 @@ class ReactInstanceWin final : public Mso::ActiveObject<IReactInstanceInternal>
   const ReactOptions &Options() const noexcept override;
   ReactInstanceState State() const noexcept override;
   Mso::React::IReactContext &GetReactContext() const noexcept override;
-  void AttachMeasuredRootView(
-      facebook::react::IReactRootView *rootView,
-      const winrt::Microsoft::ReactNative::JSValueArgWriter &initialProps,
-      bool useFabric) noexcept override;
-  void DetachRootView(facebook::react::IReactRootView *rootView, bool useFabric) noexcept override;
 
  public: // IReactInstanceInternal
   Mso::Future<void> Destroy() noexcept override;
@@ -69,10 +60,8 @@ class ReactInstanceWin final : public Mso::ActiveObject<IReactInstanceInternal>
   void CallJsFunction(std::string &&moduleName, std::string &&method, folly::dynamic &&params) noexcept;
   void DispatchEvent(int64_t viewTag, std::string &&eventName, folly::dynamic &&eventData) noexcept;
   winrt::Microsoft::ReactNative::JsiRuntime JsiRuntime() noexcept;
-  std::shared_ptr<facebook::react::Instance> GetInnerInstance() noexcept;
   bool IsLoaded() const noexcept;
 
-  bool UseWebDebugger() const noexcept;
   bool UseFastRefresh() const noexcept;
   bool UseDirectDebugger() const noexcept;
   bool DebuggerBreakOnNextLine() const noexcept;
@@ -100,27 +89,16 @@ class ReactInstanceWin final : public Mso::ActiveObject<IReactInstanceInternal>
       Mso::VoidFunctor &&updateUI) noexcept;
   void LoadModules(
       const std::shared_ptr<facebook::react::DevSettings> &devSettings,
-      const std::shared_ptr<winrt::Microsoft::ReactNative::NativeModulesProvider> &nativeModulesProvider,
       const std::shared_ptr<winrt::Microsoft::ReactNative::TurboModulesProvider> &turboModulesProvider) noexcept;
   void Initialize() noexcept override;
   ~ReactInstanceWin() noexcept override;
 
  private:
-  void LoadJSBundles() noexcept;
-  void InitJSMessageThread() noexcept;
-  void InitNativeMessageThread() noexcept;
-  void InitUIMessageThread() noexcept;
   void SetupHMRClient() noexcept;
-#if !defined(CORE_ABI) && !defined(USE_FABRIC)
-  void InitUIManager() noexcept;
-#endif
 
-#ifdef USE_FABRIC
   void InitializeBridgeless() noexcept;
   void LoadJSBundlesBridgeless(std::shared_ptr<facebook::react::DevSettings> devSettings) noexcept;
-#endif
 
-  void InitializeWithBridge() noexcept;
   void InitUIQueue() noexcept;
   void InitDevMenu() noexcept;
   void InitUIDependentCalls() noexcept;
@@ -134,16 +112,12 @@ class ReactInstanceWin final : public Mso::ActiveObject<IReactInstanceInternal>
   std::function<void(std::string)> GetErrorCallback() noexcept;
   facebook::react::NativeLoggingHook GetLoggingCallback() noexcept;
   std::shared_ptr<Mso::React::IRedBoxHandler> GetRedBoxHandler() noexcept;
-  std::function<void()> GetWaitingForDebuggerCallback() noexcept;
-  std::function<void()> GetDebuggerAttachCallback() noexcept;
 
   void OnError(const Mso::ErrorCode &errorcode) noexcept;
   void OnErrorWithMessage(const std::string &errorMessage) noexcept;
-#ifdef USE_FABRIC
   void OnJSError(
       facebook::jsi::Runtime &runtime,
       const facebook::react::JsErrorHandler::ProcessedError &error) noexcept;
-#endif
   void OnLiveReload() noexcept;
   void OnWaitingForDebugger() noexcept;
   void OnDebuggerAttach() noexcept;
@@ -175,7 +149,6 @@ class ReactInstanceWin final : public Mso::ActiveObject<IReactInstanceInternal>
   const bool m_isFastReloadEnabled : 1;
   const bool m_isLiveReloadEnabled : 1;
   const bool m_useDirectDebugger : 1;
-  const bool m_useWebDebugger : 1;
 
   const Mso::CntPtr<::Mso::React::ReactContext> m_reactContext;
 
@@ -187,26 +160,18 @@ class ReactInstanceWin final : public Mso::ActiveObject<IReactInstanceInternal>
   mutable std::mutex m_mutex;
 
   // !Bridgeless
-  const Mso::ActiveReadableField<Mso::DispatchQueue> m_jsDispatchQueue{nullptr, Queue(), m_mutex};
   const Mso::ActiveReadableField<std::shared_ptr<facebook::react::MessageQueueThread>> m_jsMessageThread{
       Queue(),
       m_mutex};
-  const Mso::ActiveReadableField<std::shared_ptr<facebook::react::MessageQueueThread>> m_nativeMessageThread{
-      Queue(),
-      m_mutex};
   const Mso::ActiveReadableField<std::shared_ptr<facebook::react::MessageQueueThread>> m_uiMessageThread{
       Queue(),
       m_mutex};
-  const Mso::ActiveReadableField<std::shared_ptr<facebook::react::InstanceWrapper>> m_instanceWrapper{Queue(), m_mutex};
-  const Mso::ActiveReadableField<std::shared_ptr<facebook::react::Instance>> m_instance{Queue(), m_mutex};
   std::deque<JSCallEntry> m_jsCallQueue;
-  winrt::Microsoft::ReactNative::JsiRuntime m_jsiRuntime{nullptr};
-  std::shared_ptr<Microsoft::JSI::RuntimeHolderLazyInit> m_jsiRuntimeHolder;
 
-#ifdef USE_FABRIC
   // Bridgeless
   std::shared_ptr<facebook::react::ReactInstance> m_bridgelessReactInstance;
-#endif
+  std::shared_ptr<Microsoft::JSI::RuntimeHolderLazyInit> m_jsiRuntimeHolder;
+  winrt::Microsoft::ReactNative::JsiRuntime m_jsiRuntime{nullptr};
 
   std::atomic<ReactInstanceState> m_state{ReactInstanceState::Loading};
 

package/Microsoft.ReactNative/ReactHost/ReactNativeHeaders.h

@@ -24,26 +24,13 @@
 
 #if defined(MS_TARGET_APPLE) || (MS_TARGET_ANDROID)
 #undef _WIN32
-
-// Following headers are not present in Win nuget.
-#include <cxxreact/CxxNativeModule.h>
 #else
 // Following are Windows specific headers
 #include <InstanceManager.h>
 #endif
 
-#include <cxxreact/Instance.h>
-#include <cxxreact/JsArgumentHelpers.h>
 #include <folly/Json.h>
 
-#if !MS_TARGET_APPLE
-using CxxModuleProviders = std::vector<std::tuple<
-    std::string,
-    facebook::xplat::module::CxxModule::Provider,
-    std::shared_ptr<facebook::react::MessageQueueThread>>>;
-#include <cxxreact/JSBigString.h>
-#endif
-
 #pragma pop_macro("_WIN32")
 #pragma pop_macro("Check")
 #pragma pop_macro("ERROR")

package/Microsoft.ReactNative/ReactHost/React_Win.h

@@ -4,7 +4,6 @@
 #pragma once
 
 #ifndef CORE_ABI
-#include <INativeUIManager.h>
 #include <IReactInstance.h>
 #endif
 

package/Microsoft.ReactNative/ReactInstanceSettings.cpp

@@ -87,14 +87,6 @@ void ReactInstanceSettings::UseLiveReload(bool value) noexcept {
   Mso::React::ReactOptions::SetUseLiveReload(m_properties, value);
 }
 
-bool ReactInstanceSettings::UseWebDebugger() noexcept {
-  return Mso::React::ReactOptions::UseWebDebugger(m_properties);
-}
-
-void ReactInstanceSettings::UseWebDebugger(bool value) noexcept {
-  Mso::React::ReactOptions::SetUseWebDebugger(m_properties, value);
-}
-
 bool ReactInstanceSettings::UseDirectDebugger() noexcept {
   return Mso::React::ReactOptions::UseDirectDebugger(m_properties);
 }

package/Microsoft.ReactNative/ReactInstanceSettings.h

@@ -72,12 +72,6 @@ struct ReactInstanceSettings : ReactInstanceSettingsT<ReactInstanceSettings> {
   bool RequestDevBundle() noexcept;
   void RequestDevBundle(bool value) noexcept;
 
-  //! Should the instance run in a remote environment such as within a browser
-  //! By default, this is using a browser navigated to  http://localhost:8081/debugger-ui served
-  //! by Metro/Haul. Debugging will start as soon as the React Native instance is loaded.
-  bool UseWebDebugger() noexcept;
-  void UseWebDebugger(bool value) noexcept;
-
   //! Should the instance trigger the hot reload logic when it first loads the instance
   //! Most edits should be visible within a second or two without the instance having to reload
   //! Non-compatible changes still cause full reloads
@@ -193,14 +187,7 @@ struct ReactInstanceSettings : ReactInstanceSettingsT<ReactInstanceSettings> {
   uint16_t m_sourceBundlePort{0};
   bool m_requestInlineSourceMap{true};
   LogHandler m_nativeLogger{nullptr};
-
-#if USE_HERMES
   JSIEngine m_jSIEngineOverride{JSIEngine::Hermes};
-#elif USE_V8
-  JSIEngine m_jSIEngineOverride{JSIEngine::V8};
-#else
-  JSIEngine m_jSIEngineOverride{JSIEngine::Chakra};
-#endif
 };
 
 } // namespace winrt::Microsoft::ReactNative::implementation

package/Microsoft.ReactNative/ReactInstanceSettings.idl

@@ -33,7 +33,6 @@ namespace Microsoft.ReactNative
   // Keep in sync with enum in IReactInstance.h
   enum JSIEngine
   {
-    Chakra = 0,
     Hermes = 1,
     V8 = 2
   };
@@ -121,15 +120,6 @@ namespace Microsoft.ReactNative
       "When querying the bundle server for a bundle, should it request the dev bundle or release bundle.")
     Boolean RequestDevBundle { get; set; };
 
-    DOC_STRING(
-      "Controls whether the instance JavaScript runs in a remote environment such as within a browser.\n"
-      "By default, this is using a browser navigated to http://localhost:8081/debugger-ui served by Metro/Haul.\n"
-      "Debugging will start as soon as the react native instance is loaded.")
-    [deprecated(
-      "Debugging should be done using DirectDebugging rather than WebDebugger.  Web debugging changes the app behavior "
-      "and will be removed in a future version.", deprecate, 1)]
-    Boolean UseWebDebugger { get; set; };
-
     DOC_STRING(
       "Controls whether the instance triggers the hot module reload logic when it first loads the instance.\n"
       "Most edits should be visible within a second or two without the instance having to reload.\n"
@@ -144,16 +134,12 @@ namespace Microsoft.ReactNative
     Boolean UseLiveReload { get; set; };
 
     DOC_STRING(
-      "Enables debugging in the JavaScript engine (if supported).\n"
-      "For Chakra this enables debugging of the JS runtime directly within the app using "
-      "Visual Studio -> Attach to process (Script)")
+      "Enables debugging in the JavaScript engine (if supported).")
     Boolean UseDirectDebugger { get; set; };
 
     DOC_STRING(
       "For direct debugging, controls whether to break on the next line of JavaScript that is executed.\n"
-      "This can help debug issues hit early in the JavaScript bundle load.\n"
-      "***Note: this is not supported with the Chakra JS engine which is the currently used JavaScript engine. "
-      "As a workaround you could add the `debugger` keyword in the beginning of the bundle.***")
+      "This can help debug issues hit early in the JavaScript bundle load.")
     Boolean DebuggerBreakOnNextLine { get; set; };
 
     DOC_STRING("Flag controlling whether the JavaScript engine uses JIT compilation.")
@@ -238,29 +224,27 @@ namespace Microsoft.ReactNative
     IReactDispatcher UIDispatcher { get; set; };
 
     DOC_STRING(
-      "When using @.UseFastRefresh, @.UseLiveReload, or @.UseWebDebugger this is the server hostname "
+      "When using @.UseFastRefresh or @.UseLiveReload this is the server hostname "
       "that will be used to load the bundle from.")
     DOC_DEFAULT("localhost")
     String SourceBundleHost { get; set; };
 
     DOC_STRING(
-      "When using @.UseFastRefresh, @.UseLiveReload, or @.UseWebDebugger this is the server port "
+      "When using @.UseFastRefresh or @.UseLiveReload this is the server port "
       "that will be used to load the bundle from.")
     DOC_DEFAULT("8081")
     UInt16 SourceBundlePort { get; set; };
 
     DOC_STRING(
-      "When using @.UseFastRefresh, @.UseLiveReload, or @.UseWebDebugger this controls whether the bundler should include inline source maps."
+      "When using @.UseFastRefresh or @.UseLiveReload this controls whether the bundler should include inline source maps."
       "If set, the bundler will include the source maps inline (this will improve debugging experience, but for very large bundles it could have a significant performance hit)")
     DOC_DEFAULT("true")
     Boolean RequestInlineSourceMap { get; set; };
 
     DOC_STRING(
       "The @JSIEngine override to be used with the React instance.\n"
-      "In order for the override to work, Microsoft.ReactNative must be compiled with support of that engine. "
-      "This override will be ignored when @.UseWebDebugger is set to true, since the browser must use its own "
-      "engine to debug correctly.")
-    DOC_DEFAULT("JSIEngine.Chakra")
+      "In order for the override to work, Microsoft.ReactNative must be compiled with support of that engine. ")
+    DOC_DEFAULT("JSIEngine.Hermes")
     JSIEngine JSIEngineOverride { get; set; };
 
     DOC_STRING(

package/Microsoft.ReactNative/ReactNativeHost.cpp

@@ -13,23 +13,19 @@
 #include <winrt/Windows.Foundation.Collections.h>
 #include "IReactContext.h"
 #include "ReactInstanceSettings.h"
+#ifdef RNW_XAML_ISLAND
+#include "XamlApplication.h"
+#endif // RNW_XAML_ISLAND
 
-#ifdef USE_FABRIC
 #include <Fabric/Composition/Modal/WindowsModalHostViewComponentView.h>
 #include <Fabric/WindowsComponentDescriptorRegistry.h>
 #include <ReactPackageBuilder.h>
 #include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
-#endif
 
 using namespace winrt;
 using namespace Windows::Foundation;
 using namespace Windows::Foundation::Collections;
 
-#if !defined(CORE_ABI) && !defined(USE_FABRIC)
-using namespace xaml;
-using namespace xaml::Controls;
-#endif
-
 namespace winrt::Microsoft::ReactNative::implementation {
 
 ReactNativeHost::ReactNativeHost() noexcept : m_reactHost{Mso::React::MakeReactHost()} {
@@ -86,15 +82,8 @@ ReactNativeHostProperty() noexcept {
 }
 
 IAsyncAction ReactNativeHost::ReloadInstance() noexcept {
-  auto modulesProvider = std::make_shared<NativeModulesProvider>();
-
-#if !defined(CORE_ABI) && !defined(USE_FABRIC)
-  auto viewManagersProvider = std::make_shared<ViewManagersProvider>();
-#endif
-
   auto turboModulesProvider = std::make_shared<TurboModulesProvider>();
 
-#ifdef USE_FABRIC
   auto uriImageManager =
       std::make_shared<winrt::Microsoft::ReactNative::Composition::implementation::UriImageManager>();
   auto componentregistry = std::make_shared<::Microsoft::ReactNative::WindowsComponentDescriptorRegistry>();
@@ -102,23 +91,10 @@ IAsyncAction ReactNativeHost::ReloadInstance() noexcept {
 
   ::Microsoft::ReactNative::WindowsComponentDescriptorRegistry::AddToProperties(
       ReactPropertyBag(m_instanceSettings.Properties()), componentregistry);
-#endif
 
-  m_packageBuilder = make<ReactPackageBuilder>(
-      modulesProvider,
-#if !defined(CORE_ABI) && !defined(USE_FABRIC)
-      viewManagersProvider,
-#endif
-      turboModulesProvider,
-#ifdef USE_FABRIC
-      componentregistry,
-      uriImageManager,
-#endif
-      m_instanceSettings.UseWebDebugger());
+  m_packageBuilder = make<ReactPackageBuilder>(turboModulesProvider, componentregistry, uriImageManager);
 
-#ifdef USE_FABRIC
   winrt::Microsoft::ReactNative::Composition::implementation::RegisterWindowsModalHostNativeComponent(m_packageBuilder);
-#endif
 
   if (auto packageProviders = InstanceSettings().PackageProviders()) {
     for (auto const &packageProvider : packageProviders) {
@@ -126,6 +102,12 @@ IAsyncAction ReactNativeHost::ReloadInstance() noexcept {
     }
   }
 
+#ifdef RNW_XAML_ISLAND
+  if (componentregistry->isXamlSupportRequired()) {
+    winrt::Microsoft::ReactNative::Xaml::implementation::XamlApplication::EnsureCreated();
+  }
+#endif // RNW_XAML_ISLAND
+
   ReactPropertyBag(m_instanceSettings.Properties()).Set(ReactNativeHostProperty(), get_weak());
 
   Mso::React::ReactOptions reactOptions{};
@@ -133,7 +115,6 @@ IAsyncAction ReactNativeHost::ReloadInstance() noexcept {
   reactOptions.Notifications = m_instanceSettings.Notifications();
   reactOptions.SetUseDeveloperSupport(m_instanceSettings.UseDeveloperSupport());
   reactOptions.DeveloperSettings.SourceBundleName = to_string(m_instanceSettings.DebugBundlePath());
-  reactOptions.SetUseWebDebugger(m_instanceSettings.UseWebDebugger());
   reactOptions.SetUseDirectDebugger(m_instanceSettings.UseDirectDebugger());
   reactOptions.SetDebuggerBreakOnNextLine(m_instanceSettings.DebuggerBreakOnNextLine());
   reactOptions.SetUseFastRefresh(m_instanceSettings.UseFastRefresh());
@@ -167,15 +148,9 @@ IAsyncAction ReactNativeHost::ReloadInstance() noexcept {
   reactOptions.SetEnableDefaultCrashHandler(m_instanceSettings.EnableDefaultCrashHandler());
   reactOptions.SetJsiEngine(static_cast<Mso::React::JSIEngine>(m_instanceSettings.JSIEngineOverride()));
 
-  reactOptions.ModuleProvider = modulesProvider;
-#if !defined(CORE_ABI) && !defined(USE_FABRIC)
-  reactOptions.ViewManagerProvider = viewManagersProvider;
-#endif
   reactOptions.TurboModuleProvider = turboModulesProvider;
 
-#ifdef USE_FABRIC
   reactOptions.UriImageManager = uriImageManager;
-#endif
 
   reactOptions.OnInstanceCreated = [](Mso::CntPtr<Mso::React::IReactContext> &&context) {
     auto notifications = context->Notifications();

package/Microsoft.ReactNative/ReactNativeHost.h

@@ -5,7 +5,6 @@
 
 #include "ReactNativeHost.g.h"
 
-#include "NativeModulesProvider.h"
 #include "ReactHost/React.h"
 #include "ReactInstanceSettings.h"
 #include "ReactPropertyBag.h"

package/Microsoft.ReactNative/ReactNativeIsland.idl

@@ -83,12 +83,10 @@ namespace Microsoft.ReactNative
     DOC_STRING("Creates a new instance of @ReactNativeIsland. Can be implemented with a ReactViewHost or a ComponentView with reactContext")
     ReactNativeIsland();
 
-#ifdef USE_WINUI3
     ReactNativeIsland(Microsoft.UI.Composition.Compositor compositor);
 
     DOC_STRING("Used to create react portals, such as a native modal component.")
     static ReactNativeIsland CreatePortal(Microsoft.ReactNative.Composition.PortalComponentView portal);
-#endif
 
     DOC_STRING(
       "A ReactViewHost specifies the root UI component and initial properties to render in this RootView"
@@ -122,9 +120,7 @@ namespace Microsoft.ReactNative
     DOC_STRING("Initial props should be set on ReactViewHost. This is used to update props after the initial props are set")
     void SetProperties(JSValueArgWriter props);
 
-#ifdef USE_WINUI3
     Microsoft.UI.Content.ContentIsland Island { get; };
-#endif
 
     event Windows.Foundation.EventHandler<RootViewSizeChangedEventArgs> SizeChanged;
   }

package/Microsoft.ReactNative/ReactPackageBuilder.cpp

@@ -4,9 +4,7 @@
 #include "pch.h"
 #include "ReactPackageBuilder.h"
 
-#ifdef USE_FABRIC
 #include <Fabric/AbiViewComponentDescriptor.h>
-#endif
 
 namespace winrt::Microsoft::ReactNative {
 
@@ -15,51 +13,27 @@ namespace winrt::Microsoft::ReactNative {
 //===========================================================================
 
 ReactPackageBuilder::ReactPackageBuilder(
-    std::shared_ptr<NativeModulesProvider> const &modulesProvider,
-#if !defined(CORE_ABI) && !defined(USE_FABRIC)
-    std::shared_ptr<ViewManagersProvider> const &viewManagersProvider,
-#endif
     std::shared_ptr<TurboModulesProvider> const &turboModulesProvider,
-#ifdef USE_FABRIC
     std::shared_ptr<::Microsoft::ReactNative::WindowsComponentDescriptorRegistry> const &componentRegistry,
-    std::shared_ptr<winrt::Microsoft::ReactNative::Composition::implementation::UriImageManager> const &uriImageManager,
-#endif
-    bool isWebDebugging) noexcept
-    : m_modulesProvider{modulesProvider},
-#if !defined(CORE_ABI) && !defined(USE_FABRIC)
-      m_viewManagersProvider{viewManagersProvider},
-#endif
-      m_turboModulesProvider{turboModulesProvider},
-#ifdef USE_FABRIC
+    std::shared_ptr<winrt::Microsoft::ReactNative::Composition::implementation::UriImageManager> const
+        &uriImageManager) noexcept
+    : m_turboModulesProvider{turboModulesProvider},
       m_componentRegistry{componentRegistry},
-      m_uriImageManager{uriImageManager},
-#endif
-
-      m_isWebDebugging{isWebDebugging} {
-}
+      m_uriImageManager{uriImageManager} {}
 
 void ReactPackageBuilder::AddModule(hstring const &moduleName, ReactModuleProvider const &moduleProvider) noexcept {
-  m_modulesProvider->AddModuleProvider(moduleName, moduleProvider);
-}
-
-#if !defined(CORE_ABI) && !defined(USE_FABRIC)
-void ReactPackageBuilder::AddViewManager(
-    hstring const &viewManagerName,
-    ReactViewManagerProvider const &viewManagerProvider) noexcept {
-  m_viewManagersProvider->AddViewManagerProvider(viewManagerName, viewManagerProvider);
+  // AddModule previously registered CxxModule-based modules via NativeModulesProvider.
+  // Now it forwards to AddTurboModule for backward compatibility.
+  // Modules registered this way will work as TurboModules.
+  m_turboModulesProvider->AddModuleProvider(moduleName, moduleProvider, true);
 }
-#endif
 
 void ReactPackageBuilder::AddTurboModule(
     hstring const &moduleName,
     ReactModuleProvider const &moduleProvider) noexcept {
-  if (m_isWebDebugging)
-    m_modulesProvider->AddModuleProvider(moduleName, moduleProvider);
-  else
-    m_turboModulesProvider->AddModuleProvider(moduleName, moduleProvider, true);
+  m_turboModulesProvider->AddModuleProvider(moduleName, moduleProvider, true);
 }
 
-#ifdef USE_FABRIC
 void ReactPackageBuilder::AddViewComponent(
     winrt::hstring componentName,
     ReactViewComponentProvider const &viewComponentProvider) noexcept {
@@ -71,5 +45,4 @@ void ReactPackageBuilder::AddUriImageProvider(
   m_uriImageManager->AddUriImageProvider(provider);
 }
 
-#endif
 } // namespace winrt::Microsoft::ReactNative

package/Microsoft.ReactNative/ReactPackageBuilder.h

@@ -2,67 +2,33 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-#include "NativeModulesProvider.h"
-#include "TurboModulesProvider.h"
-#if !defined(CORE_ABI) && !defined(USE_FABRIC)
-#include "ViewManagersProvider.h"
-#endif
-#include "winrt/Microsoft.ReactNative.h"
-#ifdef USE_FABRIC
 #include <Fabric/Composition/UriImageManager.h>
 #include <Fabric/WindowsComponentDescriptorRegistry.h>
+#include "TurboModulesProvider.h"
 #include "winrt/Microsoft.ReactNative.Composition.h"
-#endif
+#include "winrt/Microsoft.ReactNative.h"
 
 namespace winrt::Microsoft::ReactNative {
 
-struct ReactPackageBuilder : winrt::implements<
-                                 ReactPackageBuilder,
-                                 IReactPackageBuilder
-#ifdef USE_FABRIC
-                                 ,
-                                 IReactPackageBuilderFabric
-#endif
-                                 > {
+struct ReactPackageBuilder : winrt::implements<ReactPackageBuilder, IReactPackageBuilder, IReactPackageBuilderFabric> {
   ReactPackageBuilder(
-      std::shared_ptr<NativeModulesProvider> const &modulesProvider,
-#if !defined(CORE_ABI) && !defined(USE_FABRIC)
-      std::shared_ptr<ViewManagersProvider> const &viewManagersProvider,
-#endif
       std::shared_ptr<TurboModulesProvider> const &turboModulesProvider,
-#ifdef USE_FABRIC
       std::shared_ptr<::Microsoft::ReactNative::WindowsComponentDescriptorRegistry> const &componentRegistry,
       std::shared_ptr<winrt::Microsoft::ReactNative::Composition::implementation::UriImageManager> const
-          &uriImageManager,
-#endif
-      bool isWebDebugging) noexcept;
+          &uriImageManager) noexcept;
 
  public: // IReactPackageBuilder
   void AddModule(hstring const &moduleName, ReactModuleProvider const &moduleProvider) noexcept;
-#if !defined(CORE_ABI) && !defined(USE_FABRIC)
-  void AddViewManager(hstring const &viewManagerName, ReactViewManagerProvider const &viewManagerProvider) noexcept;
-#endif
   void AddTurboModule(hstring const &moduleName, ReactModuleProvider const &moduleProvider) noexcept;
 
-#ifdef USE_FABRIC
   // IReactPackageBuilderFabric
   void AddViewComponent(winrt::hstring componentName, ReactViewComponentProvider const &viewComponentProvider) noexcept;
   void AddUriImageProvider(const winrt::Microsoft::ReactNative::Composition::IUriImageProvider &provider) noexcept;
-#endif // USE_FABRIC
 
  private:
-  std::shared_ptr<NativeModulesProvider> m_modulesProvider;
-#if !defined(CORE_ABI) && !defined(USE_FABRIC)
-  std::shared_ptr<ViewManagersProvider> m_viewManagersProvider;
-#endif
   std::shared_ptr<TurboModulesProvider> m_turboModulesProvider;
-
-#ifdef USE_FABRIC
   std::shared_ptr<::Microsoft::ReactNative::WindowsComponentDescriptorRegistry> m_componentRegistry;
   std::shared_ptr<winrt::Microsoft::ReactNative::Composition::implementation::UriImageManager> m_uriImageManager;
-#endif
-
-  const bool m_isWebDebugging;
 };
 
 } // namespace winrt::Microsoft::ReactNative