react-native-windows 0.64.22 → 0.64.26

package/JSI/Desktop/JSI.Desktop.vcxproj

@@ -82,9 +82,6 @@
       <Optimization>Disabled</Optimization>
     </ClCompile>
   </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="$(MSBuildThisFileDirectory)ChakraJsiRuntime_core.cpp" />
-  </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>

package/JSI/Desktop/JSI.Desktop.vcxproj.filters

@@ -11,9 +11,4 @@
       <UniqueIdentifier>{ade98a5d-cda0-4794-a7e9-9b60b83966f8}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="$(MSBuildThisFileDirectory)ChakraJsiRuntime_core.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
 </Project>

package/JSI/Shared/ChakraApi.cpp

@@ -144,17 +144,9 @@ ChakraApi::JsRefHolder::~JsRefHolder() noexcept {
   JsPropertyIdRef propertyId{JS_INVALID_REFERENCE};
   // We use a #ifdef here because we can avoid a UTF-8 to UTF-16 conversion
   // using ChakraCore's JsCreatePropertyId API.
-#ifdef CHAKRACORE
-  if (React::GetRuntimeOptionBool("JSI.ForceSystemChakra")) {
-    std::wstring utf16 = Common::Unicode::Utf8ToUtf16(name.data(), name.length());
-    ChakraVerifyJsErrorElseThrow(JsGetPropertyIdFromName(utf16.data(), &propertyId));
-  } else {
-    ChakraVerifyJsErrorElseThrow(JsCreatePropertyId(name.data(), name.length(), &propertyId));
-  }
-#else
   std::wstring utf16 = Common::Unicode::Utf8ToUtf16(name.data(), name.length());
   ChakraVerifyJsErrorElseThrow(JsGetPropertyIdFromName(utf16.data(), &propertyId));
-#endif
+
   return propertyId;
 }
 
@@ -275,18 +267,7 @@ ChakraApi::JsRefHolder::~JsRefHolder() noexcept {
 /*static*/ JsValueRef ChakraApi::PointerToString(std::string_view value) {
   ChakraVerifyElseThrow(value.data(), "Cannot convert a nullptr to a JS string.");
 
-  // ChakraCore  API helps to reduce cost of UTF-8 to UTF-16 conversion.
-#ifdef CHAKRACORE
-  if (React::GetRuntimeOptionBool("JSI.ForceSystemChakra")) {
-    return PointerToString(Common::Unicode::Utf8ToUtf16(value));
-  } else {
-    JsValueRef result{JS_INVALID_REFERENCE};
-    ChakraVerifyJsErrorElseThrow(JsCreateString(value.data(), value.length(), &result));
-    return result;
-  }
-#else
   return PointerToString(Common::Unicode::Utf8ToUtf16(value));
-#endif
 }
 
 /*static*/ std::wstring_view ChakraApi::StringToPointer(JsValueRef string) {
@@ -300,24 +281,7 @@ ChakraApi::JsRefHolder::~JsRefHolder() noexcept {
   ChakraVerifyElseThrow(
       GetValueType(string) == JsString, "Cannot convert a non JS string ChakraObjectRef to a std::string.");
 
-  // We use a #ifdef here because we can avoid a UTF-8 to UTF-16 conversion
-  // using ChakraCore's JsCopyString API.
-#ifdef CHAKRACORE
-  if (React::GetRuntimeOptionBool("JSI.ForceSystemChakra")) {
-    return Common::Unicode::Utf16ToUtf8(StringToPointer(string));
-  } else {
-    size_t length{0};
-    ChakraVerifyJsErrorElseThrow(JsCopyString(string, nullptr, 0, &length));
-
-    std::string result(length, 'a');
-    ChakraVerifyJsErrorElseThrow(JsCopyString(string, result.data(), result.length(), &length));
-
-    ChakraVerifyElseThrow(length == result.length(), "Failed to convert a JS string to a std::string.");
-    return result;
-  }
-#else
   return Common::Unicode::Utf16ToUtf8(StringToPointer(string));
-#endif
 }
 
 /*static*/ JsValueRef ChakraApi::ConvertValueToString(JsValueRef value) {

package/JSI/Shared/ChakraApi.h

@@ -3,14 +3,10 @@
 
 #pragma once
 
-#ifdef CHAKRACORE
-#include "ChakraCore.h"
-#else
 #ifndef USE_EDGEMODE_JSRT
 #define USE_EDGEMODE_JSRT
 #endif
 #include <jsrt.h>
-#endif
 
 #include <cassert>
 #include <cstddef>

package/JSI/Shared/ChakraJsiRuntime_edgemode.cpp

@@ -15,7 +15,7 @@ JsStartDebugging();
 
 namespace Microsoft::JSI {
 
-#if defined(USE_EDGEMODE_JSRT) && !defined(CHAKRACORE)
+#if defined(USE_EDGEMODE_JSRT)
 /*static*/ void ChakraRuntime::initRuntimeVersion() noexcept {}
 #endif
 
@@ -42,11 +42,7 @@ std::unique_ptr<const facebook::jsi::Buffer> SystemChakraRuntime::generatePrepar
   const std::wstring scriptUTF16 =
       Microsoft::Common::Unicode::Utf8ToUtf16(reinterpret_cast<const char *>(sourceBuffer.data()), sourceBuffer.size());
 
-#ifdef CHAKRACORE
-  unsigned int bytecodeSize = 0;
-#else
   unsigned long bytecodeSize = 0;
-#endif
   if (JsSerializeScript(scriptUTF16.c_str(), nullptr, &bytecodeSize) == JsNoError) {
     std::unique_ptr<ByteArrayBuffer> bytecodeBuffer(std::make_unique<ByteArrayBuffer>(bytecodeSize));
     if (JsSerializeScript(scriptUTF16.c_str(), bytecodeBuffer->data(), &bytecodeSize) == JsNoError) {

package/JSI/Shared/ChakraRuntime.cpp

@@ -17,14 +17,10 @@
 #include <sstream>
 #include <unordered_set>
 
-#ifdef CHAKRACORE
-#include <ChakraCore.h>
-#else
 #ifndef USE_EDGEMODE_JSRT
 #define USE_EDGEMODE_JSRT
 #endif
 #include <jsrt.h>
-#endif
 
 namespace Microsoft::JSI {
 
@@ -1027,15 +1023,7 @@ std::once_flag ChakraRuntime::s_runtimeVersionInitFlag;
 uint64_t ChakraRuntime::s_runtimeVersion = 0;
 
 std::unique_ptr<facebook::jsi::Runtime> makeChakraRuntime(ChakraRuntimeArgs &&args) noexcept {
-#ifdef CHAKRACORE
-  if (React::GetRuntimeOptionBool("JSI.ForceSystemChakra")) {
-    return MakeSystemChakraRuntime(std::move(args));
-  } else {
-    return MakeChakraCoreRuntime(std::move(args));
-  }
-#else
   return MakeSystemChakraRuntime(std::move(args));
-#endif // CHAKRACORE
 }
 
 } // namespace Microsoft::JSI

package/JSI/Shared/ChakraRuntimeFactory.h

@@ -11,7 +11,5 @@ struct ChakraRuntimeArgs;
 
 std::unique_ptr<facebook::jsi::Runtime> makeChakraRuntime(ChakraRuntimeArgs &&args) noexcept;
 
-std::unique_ptr<facebook::jsi::Runtime> MakeChakraCoreRuntime(ChakraRuntimeArgs &&args) noexcept;
-
 std::unique_ptr<facebook::jsi::Runtime> MakeSystemChakraRuntime(ChakraRuntimeArgs &&args) noexcept;
 } // namespace Microsoft::JSI

package/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj

@@ -123,8 +123,6 @@
         REACTWINDOWS_BUILD - building with REACTWINDOWS_API as dll exports
         OLD_CPPWINRT is a workaround to make target version to 19H1
       -->
-      <PreprocessorDefinitions Condition="'$(CHAKRACOREUWP)'=='true'">CHAKRACORE;CHAKRACORE_UWP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(CHAKRACOREUWP)'!='true'">USE_EDGEMODE_JSRT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions>
         REACTWINDOWS_BUILD;
         RN_PLATFORM=windows;

package/PropertySheets/Autolink.props

@@ -9,7 +9,7 @@
     <RunAutolinkCheck Condition="'$(RunAutolinkCheck)' == ''">true</RunAutolinkCheck>
     <AutolinkCommand Condition="'$(AutolinkCommand)' == ''">npx react-native autolink-windows</AutolinkCommand>
     <AutolinkCommandWorkingDir Condition="'$(AutolinkCommandWorkingDir)' == ''">$([MSBuild]::GetDirectoryNameOfFileAbove($(ProjectDir), 'package.json'))</AutolinkCommandWorkingDir>
-    <AutolinkCommandArgs Condition="'$(AutolinkCommandArgs)' == '' And '$(SolutionPath)' != '' And '$(ProjectPath)' != ''">--check --sln "$([MSBuild]::MakeRelative($(AutolinkCommandWorkingDir), $(SolutionPath)))" --proj "$([MSBuild]::MakeRelative($(AutolinkCommandWorkingDir), $(ProjectPath)))"</AutolinkCommandArgs>
+    <AutolinkCommandArgs Condition="'$(AutolinkCommandArgs)' == '' And '$(SolutionPath)' != '' And '$(SolutionPath)' != '*Undefined*' And '$(ProjectPath)' != ''">--check --sln "$([MSBuild]::MakeRelative($(AutolinkCommandWorkingDir), $(SolutionPath)))" --proj "$([MSBuild]::MakeRelative($(AutolinkCommandWorkingDir), $(ProjectPath)))"</AutolinkCommandArgs>
     <AutolinkCommandArgs Condition="'$(AutolinkCommandArgs)' == ''">--check</AutolinkCommandArgs>
   </PropertyGroup>
 

package/PropertySheets/React.Cpp.props

@@ -82,6 +82,7 @@
         BOOST_NO_TYPEID               - Configure boost not to check typeid (not to use RTTI)
         BOOST_SYSTEM_SOURCE           - Build boost::system symbols from sources (drop dependency on boost_system.lib).
         GTEST_HAS_RTTI                - Let GTest know not to use RTTI
+        USE_EDGEMODE_JSRT               When using Chakra, enforce System Chakra instead of JS9.
         WIN32_LEAN_AND_MEAN           - Reduce the Windows API included surface.
         WINRT_LEAN_AND_MEAN           - Disable rarely used cppwinrt templates that impact compile-time/PCH size.
       -->
@@ -93,6 +94,7 @@
         BOOST_NO_TYPEID;
         BOOST_SYSTEM_SOURCE;
         GTEST_HAS_RTTI=0;
+        USE_EDGEMODE_JSRT;
         WIN32_LEAN_AND_MEAN;
         %(PreprocessorDefinitions)
       </PreprocessorDefinitions>

package/ReactCommon/TEMP_UntilReactCommonUpdate/yoga/yoga/YGValue.h

@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include <math.h>
+#include "YGEnums.h"
+#include "YGMacros.h"
+
+#if defined(_MSC_VER) && defined(__clang__)
+#define COMPILING_WITH_CLANG_ON_WINDOWS
+#endif
+#if defined(COMPILING_WITH_CLANG_ON_WINDOWS)
+#include <limits>
+constexpr float YGUndefined = std::numeric_limits<float>::quiet_NaN();
+#else
+YG_EXTERN_C_BEGIN
+
+#if defined(_MSC_VER)
+#define YGUndefined __builtin_nanf("0")
+#else
+#define YGUndefined NAN
+#endif
+
+#endif
+
+typedef struct YGValue {
+  float value;
+  YGUnit unit;
+} YGValue;
+
+YOGA_EXPORT extern const YGValue YGValueAuto;
+YOGA_EXPORT extern const YGValue YGValueUndefined;
+YOGA_EXPORT extern const YGValue YGValueZero;
+
+#if !defined(COMPILING_WITH_CLANG_ON_WINDOWS)
+YG_EXTERN_C_END
+#endif
+#undef COMPILING_WITH_CLANG_ON_WINDOWS
+
+#ifdef __cplusplus
+
+inline bool operator==(const YGValue& lhs, const YGValue& rhs) {
+  if (lhs.unit != rhs.unit) {
+    return false;
+  }
+
+  switch (lhs.unit) {
+    case YGUnitUndefined:
+    case YGUnitAuto:
+      return true;
+    case YGUnitPoint:
+    case YGUnitPercent:
+      return lhs.value == rhs.value;
+  }
+
+  return false;
+}
+
+inline bool operator!=(const YGValue& lhs, const YGValue& rhs) {
+  return !(lhs == rhs);
+}
+
+inline YGValue operator-(const YGValue& value) {
+  return {-value.value, value.unit};
+}
+
+namespace facebook {
+namespace yoga {
+namespace literals {
+
+inline YGValue operator"" _pt(long double value) {
+  return YGValue{static_cast<float>(value), YGUnitPoint};
+}
+inline YGValue operator"" _pt(unsigned long long value) {
+  return operator"" _pt(static_cast<long double>(value));
+}
+
+inline YGValue operator"" _percent(long double value) {
+  return YGValue{static_cast<float>(value), YGUnitPercent};
+}
+inline YGValue operator"" _percent(unsigned long long value) {
+  return operator"" _percent(static_cast<long double>(value));
+}
+
+} // namespace literals
+} // namespace yoga
+} // namespace facebook
+
+#endif

package/Shared/Modules/PlatformConstantsModule.cpp

@@ -60,10 +60,16 @@ std::map<std::string, folly::dynamic> PlatformConstantsModule::getConstants() {
 }
 
 /*static*/ int32_t PlatformConstantsModule::OsVersion() noexcept {
-  for (uint16_t i = 1;; ++i) {
-    if (!ApiInformation::IsApiContractPresent(L"Windows.Foundation.UniversalApiContract", i)) {
-      return i - 1;
+  try {
+    for (uint16_t i = 1;; ++i) {
+      if (!ApiInformation::IsApiContractPresent(L"Windows.Foundation.UniversalApiContract", i)) {
+        return i - 1;
+      }
     }
+  } catch (winrt::hresult_error const &e) {
+    // ApiInformation::IsApiContractPresent did not exist before Windows 10240
+    // So this indicates a version of windows earlier than this.
+    return 0;
   }
 }
 

package/Shared/OInstance.cpp

@@ -388,12 +388,6 @@ InstanceImpl::InstanceImpl(
           [[fallthrough]];
 #endif
         }
-        case JSIEngineOverride::Chakra:
-          // Applies only to ChakraCore-linked binaries.
-          Microsoft::React::SetRuntimeOptionBool("JSI.ForceSystemChakra", true);
-          m_devSettings->jsiRuntimeHolder =
-              std::make_shared<Microsoft::JSI::ChakraRuntimeHolder>(m_devSettings, m_jsThread, nullptr, nullptr);
-          break;
         case JSIEngineOverride::V8NodeApi: {
 #if defined(USE_V8)
           std::unique_ptr<facebook::jsi::PreparedScriptStore> preparedScriptStore;
@@ -421,6 +415,7 @@ InstanceImpl::InstanceImpl(
           [[fallthrough]];
 #endif
         }
+        case JSIEngineOverride::Chakra:
         case JSIEngineOverride::ChakraCore:
         default: // TODO: Add other engines once supported
           m_devSettings->jsiRuntimeHolder =
@@ -564,11 +559,7 @@ void InstanceImpl::loadBundleInternal(std::string &&jsBundleRelativePath, bool s
       // Otherwise all bundles (User and Platform) are loaded through
       // platformBundles.
       if (PathFileExistsA(fullBundleFilePath.c_str())) {
-#if defined(_CHAKRACORE_H_)
         auto bundleString = FileMappingBigString::fromPath(fullBundleFilePath);
-#else
-        auto bundleString = JSBigFileString::fromPath(fullBundleFilePath);
-#endif
         m_innerInstance->loadScriptFromString(std::move(bundleString), std::move(fullBundleFilePath), synchronously);
       }
 
@@ -580,11 +571,7 @@ void InstanceImpl::loadBundleInternal(std::string &&jsBundleRelativePath, bool s
       m_innerInstance->loadScriptFromString(std::move(bundleString), jsBundleRelativePath, synchronously);
 #endif
     }
-#if defined(_CHAKRACORE_H_)
-  } catch (const facebook::react::ChakraJSException &e) {
-    m_devSettings->errorCallback(std::string{e.what()} + "\r\n" + e.getStack());
-#endif
-  } catch (std::exception &e) {
+  } catch (const std::exception &e) {
     m_devSettings->errorCallback(e.what());
   }
 }

package/package.json

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

package/Chakra/ChakraCoreDebugger.h

@@ -1,147 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-#pragma once
-
-#include <exception>
-#include <stdexcept>
-
-#include <ChakraDebugProtocolHandler.h>
-#include <ChakraDebugService.h>
-
-class DebugProtocolHandler {
- private:
-  JsDebugProtocolHandler m_protocolHandler{nullptr};
-
- public:
-  DebugProtocolHandler(JsRuntimeHandle runtime) {
-    JsDebugProtocolHandler protocolHandler;
-
-    JsErrorCode result = JsDebugProtocolHandlerCreate(runtime, &protocolHandler);
-
-    if (result != JsNoError) {
-      throw new std::runtime_error("Unable to create debug protocol handler.");
-    }
-
-    m_protocolHandler = protocolHandler;
-  }
-
-  ~DebugProtocolHandler() {
-    Destroy();
-  }
-
-  JsErrorCode Connect(bool breakOnNextLine, JsDebugProtocolHandlerSendResponseCallback callback, void *callbackState) {
-    JsErrorCode result = JsDebugProtocolHandlerConnect(m_protocolHandler, breakOnNextLine, callback, callbackState);
-
-    return result;
-  }
-
-  JsErrorCode Destroy() {
-    JsErrorCode result = JsNoError;
-
-    if (m_protocolHandler != nullptr) {
-      result = JsDebugProtocolHandlerDestroy(m_protocolHandler);
-
-      if (result == JsNoError) {
-        m_protocolHandler = nullptr;
-      }
-    }
-
-    return result;
-  }
-
-  JsErrorCode Disconnect() {
-    JsErrorCode result = JsDebugProtocolHandlerDisconnect(m_protocolHandler);
-
-    return result;
-  }
-
-  JsDebugProtocolHandler GetHandle() {
-    return m_protocolHandler;
-  }
-
-  JsErrorCode ProcessCommandQueue() {
-    JsErrorCode result = JsDebugProtocolHandlerProcessCommandQueue(m_protocolHandler);
-
-    return result;
-  }
-
-  JsErrorCode SetCommandQueueCallback(JsDebugProtocolHandlerCommandQueueCallback callback, void *callbackState) {
-    JsErrorCode result = JsDebugProtocolHandlerSetCommandQueueCallback(m_protocolHandler, callback, callbackState);
-
-    return result;
-  }
-
-  JsErrorCode WaitForDebugger() {
-    JsErrorCode result = JsDebugProtocolHandlerWaitForDebugger(m_protocolHandler);
-
-    return result;
-  }
-
-  JsErrorCode GetConsoleObject(JsValueRef *consoleObject) {
-    JsErrorCode result = JsDebugProtocolHandlerCreateConsoleObject(m_protocolHandler, consoleObject);
-
-    return result;
-  }
-};
-
-class DebugService {
- private:
-  JsDebugService m_service{nullptr};
-
- public:
-  DebugService(JsRuntimeHandle runtime) {
-    JsDebugService service;
-
-    JsErrorCode result = JsDebugServiceCreate(&service);
-
-    if (result != JsNoError) {
-      throw new std::exception("Unable to create debug service.");
-    }
-
-    m_service = service;
-  }
-
-  ~DebugService() {
-    Destroy();
-  }
-
-  JsErrorCode Close() {
-    JsErrorCode result = JsDebugServiceClose(m_service);
-
-    return result;
-  }
-
-  JsErrorCode Destroy() {
-    JsErrorCode result = JsNoError;
-
-    if (m_service != nullptr) {
-      result = JsDebugServiceDestroy(m_service);
-
-      if (result == JsNoError) {
-        m_service = nullptr;
-      }
-    }
-
-    return result;
-  }
-
-  JsErrorCode Listen(uint16_t port) {
-    JsErrorCode result = JsDebugServiceListen(m_service, port);
-
-    return result;
-  }
-
-  JsErrorCode
-  RegisterHandler(std::string const &runtimeName, DebugProtocolHandler &protocolHandler, bool breakOnNextLine) {
-    JsErrorCode result =
-        JsDebugServiceRegisterHandler(m_service, runtimeName.c_str(), protocolHandler.GetHandle(), breakOnNextLine);
-
-    return result;
-  }
-
-  JsErrorCode UnregisterHandler(std::string const &runtimeName) {
-    JsErrorCode result = JsDebugServiceUnregisterHandler(m_service, runtimeName.c_str());
-
-    return result;
-  }
-};