react-native-windows 0.71.35 → 0.71.36

package/Microsoft.ReactNative/ReactHost/ReactInstanceWin.cpp

@@ -76,6 +76,7 @@
 #include <tuple>
 #include "ChakraRuntimeHolder.h"
 
+#include <CppRuntimeOptions.h>
 #include <CreateModules.h>
 #include <Utils/Helpers.h>
 #include "CrashManager.h"
@@ -373,15 +374,17 @@ void ReactInstanceWin::LoadModules(
       L"Timing", winrt::Microsoft::ReactNative::MakeTurboModuleProvider<::Microsoft::ReactNative::Timing>());
 #endif
 
-  registerTurboModule(::Microsoft::React::GetBlobTurboModuleName(), ::Microsoft::React::GetBlobModuleProvider());
+  registerTurboModule(
+      ::Microsoft::React::GetWebSocketTurboModuleName(), ::Microsoft::React::GetWebSocketModuleProvider());
 
-  registerTurboModule(::Microsoft::React::GetHttpTurboModuleName(), ::Microsoft::React::GetHttpModuleProvider());
+  if (!Microsoft::React::GetRuntimeOptionBool("Blob.DisableModule")) {
+    registerTurboModule(::Microsoft::React::GetHttpTurboModuleName(), ::Microsoft::React::GetHttpModuleProvider());
 
-  registerTurboModule(
-      ::Microsoft::React::GetFileReaderTurboModuleName(), ::Microsoft::React::GetFileReaderModuleProvider());
+    registerTurboModule(::Microsoft::React::GetBlobTurboModuleName(), ::Microsoft::React::GetBlobModuleProvider());
 
-  registerTurboModule(
-      ::Microsoft::React::GetWebSocketTurboModuleName(), ::Microsoft::React::GetWebSocketModuleProvider());
+    registerTurboModule(
+        ::Microsoft::React::GetFileReaderTurboModuleName(), ::Microsoft::React::GetFileReaderModuleProvider());
+  }
 }
 
 //! Initialize() is called from the native queue.
@@ -530,6 +533,9 @@ void ReactInstanceWin::Initialize() noexcept {
             // We need to keep the instance wrapper alive as its destruction shuts down the native queue.
             m_options.TurboModuleProvider->SetReactContext(
                 winrt::make<implementation::ReactContext>(Mso::Copy(m_reactContext)));
+            auto omitNetCxxPropName = ReactPropertyBagHelper::GetName(nullptr, L"OmitNetworkingCxxModules");
+            auto omitNetCxxPropValue = m_options.Properties.Get(omitNetCxxPropName);
+            devSettings->omitNetworkingCxxModules = winrt::unbox_value_or(omitNetCxxPropValue, false);
             auto bundleRootPath = devSettings->bundleRootPath;
             auto instanceWrapper = facebook::react::CreateReactInstance(
                 std::shared_ptr<facebook::react::Instance>(strongThis->m_instance.Load()),

package/PropertySheets/Generated/PackageVersion.g.props

@@ -10,11 +10,11 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ReactNativeWindowsVersion>0.71.35</ReactNativeWindowsVersion>
+    <ReactNativeWindowsVersion>0.71.36</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
     <ReactNativeWindowsMinor>71</ReactNativeWindowsMinor>
-    <ReactNativeWindowsPatch>35</ReactNativeWindowsPatch>
+    <ReactNativeWindowsPatch>36</ReactNativeWindowsPatch>
     <ReactNativeWindowsCanary>false</ReactNativeWindowsCanary>
-    <ReactNativeWindowsCommitId>acc90938f92e73823f2137ae2d8d958c8983f310</ReactNativeWindowsCommitId>
+    <ReactNativeWindowsCommitId>95cd4c91aab6d83e0bfcfbb2bee0310374d35911</ReactNativeWindowsCommitId>
   </PropertyGroup>
 </Project>

package/Shared/DevSettings.h

@@ -99,6 +99,9 @@ struct DevSettings {
   bool devBundle{true};
 
   bool enableDefaultCrashHandler{false};
+
+  // Transitory. Used to indicate whether or not to load networking types in the default Cxx module registry.
+  bool omitNetworkingCxxModules{false};
 };
 
 } // namespace react

package/Shared/OInstance.cpp

@@ -538,35 +538,34 @@ std::vector<std::unique_ptr<NativeModule>> InstanceImpl::GetDefaultNativeModules
   // If this code is enabled, we will have unused module instances.
   // Also, MSRN has a different property bag mechanism incompatible with this method's transitionalProps variable.
 #if (defined(_MSC_VER) && !defined(WINRT))
-  modules.push_back(std::make_unique<CxxNativeModule>(
-      m_innerInstance,
-      Microsoft::React::GetHttpModuleName(),
-      [nativeQueue, transitionalProps]() -> std::unique_ptr<xplat::module::CxxModule> {
-        return Microsoft::React::CreateHttpModule(transitionalProps);
-      },
-      nativeQueue));
-
-  modules.push_back(std::make_unique<CxxNativeModule>(
-      m_innerInstance,
-      Microsoft::React::GetWebSocketModuleName(),
-      [nativeQueue, transitionalProps]() -> std::unique_ptr<xplat::module::CxxModule> {
-        return Microsoft::React::CreateWebSocketModule(transitionalProps);
-      },
-      nativeQueue));
-
-  // Use in case the host app provides its a non-Blob-compatilbe HTTP module.
-  if (!Microsoft::React::GetRuntimeOptionBool("Blob.DisableModule")) {
+  // Applications using the Windows ABI feature should loade the networking TurboModule variants instead.
+  if (!m_devSettings->omitNetworkingCxxModules) {
     modules.push_back(std::make_unique<CxxNativeModule>(
         m_innerInstance,
-        Microsoft::React::GetBlobModuleName(),
-        [transitionalProps]() { return Microsoft::React::CreateBlobModule(transitionalProps); },
+        Microsoft::React::GetWebSocketModuleName(),
+        [transitionalProps]() { return Microsoft::React::CreateWebSocketModule(transitionalProps); },
         nativeQueue));
 
-    modules.push_back(std::make_unique<CxxNativeModule>(
-        m_innerInstance,
-        Microsoft::React::GetFileReaderModuleName(),
-        [transitionalProps]() { return Microsoft::React::CreateFileReaderModule(transitionalProps); },
-        nativeQueue));
+    // Use in case the host app provides its a non-Blob-compatilbe HTTP module.
+    if (!Microsoft::React::GetRuntimeOptionBool("Blob.DisableModule")) {
+      modules.push_back(std::make_unique<CxxNativeModule>(
+          m_innerInstance,
+          Microsoft::React::GetHttpModuleName(),
+          [transitionalProps]() { return Microsoft::React::CreateHttpModule(transitionalProps); },
+          nativeQueue));
+
+      modules.push_back(std::make_unique<CxxNativeModule>(
+          m_innerInstance,
+          Microsoft::React::GetBlobModuleName(),
+          [transitionalProps]() { return Microsoft::React::CreateBlobModule(transitionalProps); },
+          nativeQueue));
+
+      modules.push_back(std::make_unique<CxxNativeModule>(
+          m_innerInstance,
+          Microsoft::React::GetFileReaderModuleName(),
+          [transitionalProps]() { return Microsoft::React::CreateFileReaderModule(transitionalProps); },
+          nativeQueue));
+    }
   }
 
   modules.push_back(std::make_unique<CxxNativeModule>(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-windows",
-  "version": "0.71.35",
+  "version": "0.71.36",
   "license": "MIT",
   "repository": {
     "type": "git",