react-native-windows 0.70.8 → 0.71.0-preview.1

package/Microsoft.ReactNative.Cxx/ModuleRegistration.cpp

@@ -15,16 +15,26 @@ ModuleRegistration::ModuleRegistration(wchar_t const *moduleName) noexcept : m_m
   s_head = this;
 }
 
-void AddAttributedModules(IReactPackageBuilder const &packageBuilder) noexcept {
+void AddAttributedModules(IReactPackageBuilder const &packageBuilder, bool useTurboModules) noexcept {
   for (auto const *reg = ModuleRegistration::Head(); reg != nullptr; reg = reg->Next()) {
-    packageBuilder.AddModule(reg->ModuleName(), reg->MakeModuleProvider());
+    if (useTurboModules)
+      packageBuilder.AddTurboModule(reg->ModuleName(), reg->MakeModuleProvider());
+    else
+      packageBuilder.AddModule(reg->ModuleName(), reg->MakeModuleProvider());
   }
 }
 
-bool TryAddAttributedModule(IReactPackageBuilder const &packageBuilder, std::wstring_view moduleName) noexcept {
+bool TryAddAttributedModule(
+    IReactPackageBuilder const &packageBuilder,
+    std::wstring_view moduleName,
+    bool useTurboModule) noexcept {
   for (auto const *reg = ModuleRegistration::Head(); reg != nullptr; reg = reg->Next()) {
     if (moduleName == reg->ModuleName()) {
-      packageBuilder.AddModule(moduleName, reg->MakeModuleProvider());
+      if (useTurboModule) {
+        packageBuilder.AddTurboModule(moduleName, reg->MakeModuleProvider());
+      } else {
+        packageBuilder.AddModule(moduleName, reg->MakeModuleProvider());
+      }
       return true;
     }
   }

package/Microsoft.ReactNative.Cxx/ModuleRegistration.h

@@ -100,8 +100,11 @@ struct ModuleRegistration {
   static const ModuleRegistration *s_head;
 };
 
-void AddAttributedModules(IReactPackageBuilder const &packageBuilder) noexcept;
+void AddAttributedModules(IReactPackageBuilder const &packageBuilder, bool useTurboModules = false) noexcept;
 
-bool TryAddAttributedModule(IReactPackageBuilder const &packageBuilder, std::wstring_view moduleName) noexcept;
+bool TryAddAttributedModule(
+    IReactPackageBuilder const &packageBuilder,
+    std::wstring_view moduleName,
+    bool useTurboModules = false) noexcept;
 
 } // namespace winrt::Microsoft::ReactNative

package/Microsoft.ReactNative.Cxx/NamespaceRedirect.h

@@ -2,6 +2,8 @@
 
 #ifndef USE_WINUI3
 #define XAML_NAMESPACE Windows.UI.Xaml
+#define COMP_NAMESPACE Windows.UI.Composition
 #else
 #define XAML_NAMESPACE Microsoft.UI.Xaml
+#define COMP_NAMESPACE Microsoft.UI.Composition
 #endif

package/Microsoft.ReactNative.Cxx/TurboModuleProvider.h

@@ -17,8 +17,7 @@ template <
     typename TTurboModule,
     std::enable_if_t<std::is_base_of_v<::facebook::react::TurboModule, TTurboModule>, int> = 0>
 void AddTurboModuleProvider(IReactPackageBuilder const &packageBuilder, std::wstring_view moduleName) {
-  auto experimental = packageBuilder.as<IReactPackageBuilderExperimental>();
-  experimental.AddTurboModule(
+  packageBuilder.AddTurboModule(
       moduleName, [](IReactModuleBuilder const &moduleBuilder) noexcept -> winrt::Windows::Foundation::IInspectable {
         IJsiHostObject abiTurboModule{nullptr};
         // We expect the initializer to be called immediately for TurboModules

package/Microsoft.ReactNative.Managed/IReactPromise.cs

@@ -30,24 +30,4 @@ namespace Microsoft.ReactNative.Managed
     // Report an Error.
     void Reject(ReactError error);
   }
-
-  public class ReactError
-  {
-    public string Code = null;
-    public string Message = null;
-    public Exception Exception = null;
-    public IReadOnlyDictionary<string, JSValue> UserInfo = null;
-  }
-  
-  internal class ReactErrorConstants
-  {
-    internal const string DefaultCode = "EUNSPECIFIED";
-    internal const string DefaultMessage = "Error not specified.";
-    
-    // Keys for m_reject's Error object
-    internal const string Code = "code";
-    internal const string Message = "message";
-    internal const string UserInfo = "userInfo";
-    internal const string NativeStack = "nativeStackWindows";
-  }
 }

package/Microsoft.ReactNative.Managed/JSValue.cs

@@ -254,7 +254,7 @@ namespace Microsoft.ReactNative.Managed
     // It does not implement GetHashCode() and must not be used as a key in a dictionary.
     public struct JSValue : IEquatable<JSValue>
     {
-        public static readonly JSValue Null = new JSValue();
+        public static readonly JSValue Null = default;
         public static readonly JSValue EmptyObject = new JSValueObject();
         public static readonly JSValue EmptyArray = new JSValueArray();
         public static readonly JSValue EmptyString = "";