react-native-windows 0.81.2 → 0.82.0-preview.2

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,

package/Shared/Networking/OriginPolicyHttpFilter.cpp

@@ -43,6 +43,13 @@ namespace Microsoft::React::Networking {
 #pragma region CaseInsensitiveComparer
 
 bool OriginPolicyHttpFilter::CaseInsensitiveComparer::operator()(const wchar_t *a, const wchar_t *b) const {
+  if (a == b)
+    return false;
+  // Validate a, b before calling _wcsicmp
+  if (a == nullptr)
+    return false;
+  if (b == nullptr)
+    return true;
   return _wcsicmp(a, b) < 0;
 }
 
@@ -758,7 +765,8 @@ ResponseOperation OriginPolicyHttpFilter::SendRequestAsync(HttpRequestMessage co
     if (originPolicy == OriginPolicy::CrossOriginResourceSharing) {
       // If inner filter can AllowRedirect, disable for preflight.
       winrt::impl::com_ref<IHttpBaseProtocolFilter> baseFilter;
-      if (baseFilter = m_innerFilter.try_as<IHttpBaseProtocolFilter>()) {
+      baseFilter = m_innerFilter.try_as<IHttpBaseProtocolFilter>();
+      if (baseFilter) {
         baseFilter.AllowAutoRedirect(false);
       }