react-native-windows 0.65.7 → 0.65.8

package/CHANGELOG.json

@@ -2,7 +2,28 @@
   "name": "react-native-windows",
   "entries": [
     {
-      "date": "Mon, 01 Nov 2021 19:07:04 GMT",
+      "date": "Mon, 15 Nov 2021 16:09:05 GMT",
+      "tag": "react-native-windows_v0.65.8",
+      "version": "0.65.8",
+      "comments": {
+        "patch": [
+          {
+            "comment": "Fix crash loading bundle in win32",
+            "author": "julio.rocha@microsoft.com",
+            "commit": "b86e919ab3e7af06b8a89539e9a22b0d4f0a626e",
+            "package": "react-native-windows"
+          },
+          {
+            "comment": "Drop ChakraCore dependency (#9056)",
+            "author": "julio.rocha@microsoft.com",
+            "commit": "61938f726ab7084d9bbc8c45300539f177288574",
+            "package": "react-native-windows"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Mon, 01 Nov 2021 19:07:16 GMT",
       "tag": "react-native-windows_v0.65.7",
       "version": "0.65.7",
       "comments": {

package/CHANGELOG.md

@@ -1,19 +1,28 @@
 # Change Log - react-native-windows
 
-This log was last generated on Mon, 01 Nov 2021 19:07:04 GMT and should not be manually modified.
+This log was last generated on Mon, 15 Nov 2021 16:09:05 GMT and should not be manually modified.
 
 <!-- Start content -->
 
-## 0.65.7
+## 0.65.8
 
-Mon, 01 Nov 2021 19:07:04 GMT
+Mon, 15 Nov 2021 16:09:05 GMT
 
 ### Patches
 
-- Fix race condition when building customer projects (dannyvv@microsoft.com)
-- Fix Microsoft.ReactNative.dll version string (asklar@microsoft.com)
-- Fix crash when using TextInput.blur() (30809111+acoates-ms@users.noreply.github.com)
+- Fix crash loading bundle in win32 (julio.rocha@microsoft.com)
+- Drop ChakraCore dependency (#9056) (julio.rocha@microsoft.com)
 
+## 0.65.7
+
+Mon, 01 Nov 2021 19:07:16 GMT
+
+### Patches
+
+- Fix race condition when building customer projects (dannyvv@microsoft.com)
+- Fix Microsoft.ReactNative.dll version string (asklar@microsoft.com)
+- Fix crash when using TextInput.blur() (30809111+acoates-ms@users.noreply.github.com)
+
 ## 0.65.6
 
 Wed, 20 Oct 2021 19:14:28 GMT

package/Chakra/Chakra.vcxitems

@@ -21,7 +21,6 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)Utf8DebugExtensions.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="$(MSBuildThisFileDirectory)ChakraCoreDebugger.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)ChakraHelpers.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)ChakraInstanceArgs.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)ChakraPlatform.h" />

package/Chakra/Chakra.vcxitems.filters

@@ -21,9 +21,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="$(MSBuildThisFileDirectory)ChakraCoreDebugger.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="$(MSBuildThisFileDirectory)ChakraHelpers.h">
       <Filter>Header Files</Filter>
     </ClInclude>

package/Chakra/ChakraHelpers.cpp

@@ -32,198 +32,6 @@
 namespace facebook {
 namespace react {
 
-#if !defined(USE_EDGEMODE_JSRT)
-namespace {
-
-template <class T>
-size_t fwrite(T *p, size_t count, FILE *file) noexcept {
-  static_assert(std::is_trivially_copyable<T>::value, "T must be trivially copyable to be serialized into a file");
-  return fwrite(p, sizeof(*p), count, file);
-}
-
-template <class T>
-bool fwrite(const T &val, FILE *file) noexcept {
-  return fwrite(&val, 1, file) == 1;
-}
-
-#if !defined(CHAKRACORE_UWP)
-struct FileVersionInfoResource {
-  uint16_t len;
-  uint16_t valLen;
-  uint16_t type;
-  wchar_t key[_countof(L"VS_VERSION_INFO")];
-  uint16_t padding1;
-  VS_FIXEDFILEINFO fixedFileInfo;
-  uint32_t padding2;
-};
-#endif
-class ChakraVersionInfo {
- public:
-  ChakraVersionInfo() noexcept : m_fileVersionMS{0}, m_fileVersionLS{0}, m_productVersionMS{0}, m_productVersionLS{0} {}
-
-  bool initialize() noexcept {
-#if !defined(CHAKRACORE_UWP)
-    auto freeLibraryWrapper = [](void *p) { FreeLibrary((HMODULE)p); };
-    HMODULE moduleHandle;
-    // This code is win32 only at the moment. We will need to change these
-    // lines if we want to support UWP.
-    if (!GetModuleHandleExW(
-            0,
-            Microsoft::React::GetRuntimeOptionBool("JSI.ForceSystemChakra") ? L"Chakra.dll" : L"ChakraCore.dll",
-            &moduleHandle)) {
-      return false;
-    }
-    std::unique_ptr<void, decltype(freeLibraryWrapper)> moduleHandleWrapper(
-        moduleHandle, std::move(freeLibraryWrapper));
-
-    HRSRC versionResourceHandle = FindResourceW(moduleHandle, MAKEINTRESOURCE(VS_VERSION_INFO), RT_VERSION);
-    if (!versionResourceHandle ||
-        SizeofResource(static_cast<HMODULE>(moduleHandleWrapper.get()), versionResourceHandle) <
-            sizeof(FileVersionInfoResource)) {
-      return false;
-    }
-
-    HGLOBAL versionResourcePtrHandle = LoadResource(moduleHandle, versionResourceHandle);
-    if (!versionResourcePtrHandle) {
-      return false;
-    }
-
-    FileVersionInfoResource *chakraVersionInfo =
-        static_cast<FileVersionInfoResource *>(LockResource(versionResourcePtrHandle));
-    if (!chakraVersionInfo) {
-      return false;
-    }
-
-    m_fileVersionMS = chakraVersionInfo->fixedFileInfo.dwFileVersionMS;
-    m_fileVersionLS = chakraVersionInfo->fixedFileInfo.dwFileVersionLS;
-    m_productVersionMS = chakraVersionInfo->fixedFileInfo.dwProductVersionMS;
-    m_productVersionLS = chakraVersionInfo->fixedFileInfo.dwProductVersionLS;
-#endif
-    return true;
-  }
-
-  bool operator==(const ChakraVersionInfo &rhs) const noexcept {
-    return (m_fileVersionMS == rhs.m_fileVersionMS) && (m_fileVersionLS == rhs.m_fileVersionLS) &&
-        (m_productVersionMS == rhs.m_productVersionMS) && (m_productVersionLS == rhs.m_productVersionLS);
-  }
-
-  bool operator!=(const ChakraVersionInfo &rhs) const noexcept {
-    return !(*this == rhs);
-  }
-
- private:
-  uint32_t m_fileVersionMS;
-  uint32_t m_fileVersionLS;
-  uint32_t m_productVersionMS;
-  uint32_t m_productVersionLS;
-};
-
-class BytecodePrefix {
- public:
-  static std::pair<bool, BytecodePrefix> getBytecodePrefix(uint64_t bundleVersion) noexcept {
-    std::pair<bool, BytecodePrefix> result{false, BytecodePrefix{bundleVersion}};
-    result.first = result.second.m_chakraVersionInfo.initialize();
-    return result;
-  }
-
-  bool operator==(const BytecodePrefix &rhs) const noexcept {
-    return (m_bytecodeFileFormatVersion == rhs.m_bytecodeFileFormatVersion) &&
-        (m_bundleVersion == rhs.m_bundleVersion) && (m_chakraVersionInfo == rhs.m_chakraVersionInfo);
-  }
-
-  bool operator!=(const BytecodePrefix &rhs) const noexcept {
-    return !(*this == rhs);
-  }
-
- private:
-  uint64_t m_bytecodeFileFormatVersion;
-  uint64_t m_bundleVersion;
-  ChakraVersionInfo m_chakraVersionInfo;
-
-  static constexpr uint32_t s_bytecodeFileFormatVersion = 2;
-
-  BytecodePrefix(uint64_t bundleVersion) noexcept
-      : m_bytecodeFileFormatVersion{s_bytecodeFileFormatVersion},
-        m_bundleVersion{bundleVersion},
-        m_chakraVersionInfo{} {}
-};
-
-void serializeBytecodeToFileCore(
-    const std::shared_ptr<const JSBigString> &script,
-    const BytecodePrefix &bytecodePrefix,
-    const std::string &bytecodeFileName) {
-  FILE *bytecodeFilePtr;
-  // bytecode is a binary representation, so we need to pass in the "b" flag to
-  // fopen_s
-  if (_wfopen_s(&bytecodeFilePtr, Microsoft::Common::Unicode::Utf8ToUtf16(bytecodeFileName).c_str(), L"wb")) {
-    return;
-  }
-  std::unique_ptr<FILE, decltype(&fclose)> bytecodeFilePtrWrapper(bytecodeFilePtr, fclose);
-
-  const std::wstring scriptUTF16 = Microsoft::Common::Unicode::Utf8ToUtf16(script->c_str(), script->size());
-
-  unsigned int bytecodeSize = 0;
-  if (JsSerializeScript(scriptUTF16.c_str(), nullptr, &bytecodeSize) != JsNoError) {
-    return;
-  }
-
-  std::unique_ptr<uint8_t[]> bytecode(std::make_unique<uint8_t[]>(bytecodeSize));
-  if (JsSerializeScript(scriptUTF16.c_str(), bytecode.get(), &bytecodeSize) != JsNoError) {
-    return;
-  }
-
-  constexpr size_t bytecodePrefixSize = sizeof(bytecodePrefix);
-  uint8_t zeroArray[sizeof(bytecodePrefix)]{};
-
-  if (fwrite(zeroArray, bytecodePrefixSize, bytecodeFilePtrWrapper.get()) != bytecodePrefixSize ||
-      fwrite(bytecode.get(), bytecodeSize, bytecodeFilePtrWrapper.get()) != bytecodeSize ||
-      fflush(bytecodeFilePtrWrapper.get())) {
-    return;
-  }
-
-  fseek(bytecodeFilePtrWrapper.get(), 0, SEEK_SET);
-  if (!fwrite(bytecodePrefix, bytecodeFilePtrWrapper.get()) || fflush(bytecodeFilePtrWrapper.get())) {
-    return;
-  }
-}
-
-std::unique_ptr<JSBigString> tryGetBytecode(const BytecodePrefix &bytecodePrefix, const std::string &bytecodeFileName) {
-  auto bytecodeBigStringPtr =
-      std::make_unique<FileMappingBigString>(bytecodeFileName, static_cast<uint32_t>(sizeof(BytecodePrefix)));
-
-  if (!bytecodeBigStringPtr->file_data() || bytecodeBigStringPtr->file_size() < sizeof(bytecodePrefix) ||
-      *reinterpret_cast<const BytecodePrefix *>(bytecodeBigStringPtr->file_data()) != bytecodePrefix) {
-    return nullptr;
-  }
-
-  return bytecodeBigStringPtr;
-}
-
-void serializeBytecodeToFile(
-    const std::shared_ptr<const JSBigString> &script,
-    const BytecodePrefix &bytecodePrefix,
-    std::string &&bytecodeFileName,
-    bool async) {
-  std::future<void> bytecodeSerializationFuture = std::async(
-      std::launch::async,
-      [](const std::shared_ptr<const JSBigString> &script,
-         const BytecodePrefix &bytecodePrefix,
-         const std::string &bytecodeFileName) {
-        MinimalChakraRuntime chakraRuntime(false /* multithreaded */);
-        serializeBytecodeToFileCore(script, bytecodePrefix, bytecodeFileName);
-      },
-      script,
-      bytecodePrefix,
-      std::move(bytecodeFileName));
-
-  if (!async) {
-    bytecodeSerializationFuture.wait();
-  }
-}
-
-} // namespace
-#endif
-
 MinimalChakraRuntime::MinimalChakraRuntime(bool multithreaded)
     : runtime{new JsRuntimeHandle,
               [](JsRuntimeHandle *h) {
@@ -355,7 +163,6 @@ JsValueRef evaluateScript(JsValueRef script, JsValueRef source) {
   JsValueRef exn = nullptr;
   JsValueRef value = nullptr;
 
-#if defined(USE_EDGEMODE_JSRT)
   const wchar_t *scriptRaw;
   size_t scriptRawLength;
   JsStringToPointer(script, &scriptRaw, &scriptRawLength);
@@ -365,11 +172,6 @@ JsValueRef evaluateScript(JsValueRef script, JsValueRef source) {
   JsStringToPointer(source, &sourceRaw, &sourceRawLength);
 
   auto result = JsRunScript(scriptRaw, JS_SOURCE_CONTEXT_NONE /*sourceContext*/, sourceRaw, &value);
-#else
-  JsSourceContext sourceContext = getNextSourceContext();
-  auto result = JsRun(script, sourceContext, source, JsParseScriptAttributeNone, &value);
-#endif
-
   bool hasException = false;
   if (result == JsErrorInExceptionState || (JsHasException(&hasException), hasException)) {
     JsGetAndClearException(&exn);
@@ -385,18 +187,10 @@ JsValueRef evaluateScript(JsValueRef script, JsValueRef source) {
 
 JsValueRef evaluateScript(std::unique_ptr<const JSBigString> &&script, JsValueRef sourceURL) {
   ReactMarker::logMarker(ReactMarker::JS_BUNDLE_STRING_CONVERT_START);
-#if defined(USE_EDGEMODE_JSRT)
   JsValueRef jsScript = jsStringFromBigString(*script.get());
-#else
-  JsValueRefUniquePtr jsScript = jsArrayBufferFromBigString(std::move(script));
-#endif
   ReactMarker::logMarker(ReactMarker::JS_BUNDLE_STRING_CONVERT_STOP);
 
-#if defined(USE_EDGEMODE_JSRT)
   return evaluateScript(jsScript, sourceURL);
-#else
-  return evaluateScript(jsScript.get(), sourceURL);
-#endif
 }
 
 JsValueRef evaluateScriptWithBytecode(
@@ -405,72 +199,11 @@ JsValueRef evaluateScriptWithBytecode(
     JsValueRef scriptFileName,
     [[maybe_unused]] std::string &&bytecodeFileName,
     [[maybe_unused]] bool asyncBytecodeGeneration) {
-#if defined(WINRT)
   // TODO:
   // ChakraRT does not support the JsRunSerialized() API.
   // Hence for UWP implementation, we fall back to using the original source
   // code right now.
   return evaluateScript(std::move(script), scriptFileName);
-#else
-  auto bytecodePrefixOptional = BytecodePrefix::getBytecodePrefix(scriptVersion);
-  if (!bytecodePrefixOptional.first) {
-    return evaluateScript(std::move(script), scriptFileName);
-  }
-
-  auto &bytecodePrefix = bytecodePrefixOptional.second;
-  std::unique_ptr<const JSBigString> bytecode = tryGetBytecode(bytecodePrefix, bytecodeFileName);
-  if (!bytecode) {
-    std::shared_ptr<const JSBigString> sharedScript(script.release());
-    serializeBytecodeToFile(sharedScript, bytecodePrefix, std::move(bytecodeFileName), asyncBytecodeGeneration);
-    ReactMarker::logMarker(ReactMarker::JS_BUNDLE_STRING_CONVERT_START);
-    JsValueRefUniquePtr jsScript = jsArrayBufferFromBigString(sharedScript);
-    ReactMarker::logMarker(ReactMarker::JS_BUNDLE_STRING_CONVERT_STOP);
-    return evaluateScript(jsScript.get(), scriptFileName);
-  }
-
-  ReactMarker::logMarker(ReactMarker::JS_BUNDLE_STRING_CONVERT_START);
-  JsValueRefUniquePtr jsScript = jsArrayBufferFromBigString(std::move(script));
-  ReactMarker::logMarker(ReactMarker::JS_BUNDLE_STRING_CONVERT_STOP);
-  JsValueRef exn = nullptr;
-  JsValueRef value = nullptr;
-  JsErrorCode result = JsRunSerialized(
-      jsArrayBufferFromBigString(std::move(bytecode)).get(),
-      [](JsSourceContext sourceContext, JsValueRef *value, JsParseScriptAttributes *parseAttributes) {
-        *value = reinterpret_cast<JsValueRef>(sourceContext);
-        *parseAttributes = JsParseScriptAttributeNone;
-        return true;
-      },
-      reinterpret_cast<JsSourceContext>(jsScript.get()),
-      scriptFileName,
-      &value);
-
-  // Currently, when the existing bundle.bytecode is incompatible with the
-  // ChakraCore.dll used, we do not update it. This is because we memory mapped
-  // bundle.bytecode into a JsExternalArrayBuffer, whose lifetime is controlled
-  // by the JS engine. Hence we cannot remove/rename/modify bytecode.bundle
-  // until the JS garbage collector deletes the corresponding
-  // JsExternalArrayBuffer.
-  if (result == JsErrorBadSerializedScript) {
-    JsGetAndClearException(&exn);
-    return evaluateScript(jsScript.get(), scriptFileName);
-  }
-
-  // This code is duplicated from evaluateScript.
-  // TODO (task 1977635) get rid of this duplicated code.
-  bool hasException = false;
-  if (result == JsErrorInExceptionState || (JsHasException(&hasException), hasException)) {
-    JsGetAndClearException(&exn);
-    std::string exceptionDescription = "JavaScriptException in " + ChakraValue(scriptFileName).toString().str();
-
-    throw ChakraJSException(exn, exceptionDescription.c_str());
-  }
-
-  if (value == nullptr) {
-    formatAndThrowJSException(exn, scriptFileName);
-  }
-
-  return value;
-#endif
 }
 
 void formatAndThrowJSException(JsValueRef exn, JsValueRef source) {

package/Chakra/ChakraInstanceArgs.h

@@ -3,12 +3,7 @@
 
 #pragma once
 
-#if defined(USE_EDGEMODE_JSRT)
 #include <jsrt.h>
-#else
-#include <ChakraCore.h>
-#endif
-
 #include "DevSettings.h"
 
 namespace facebook {

package/Chakra/ChakraPlatform.h

@@ -13,11 +13,7 @@
 
 #include "Logging.h"
 
-#if defined(USE_EDGEMODE_JSRT)
 #include <jsrt.h>
-#else
-#include <ChakraCore.h>
-#endif
 
 #define CHAKRA_FAILED(jsErrorCode) ((jsErrorCode) != ::JsErrorCode::JsNoError)
 

package/Chakra/ChakraTracing.cpp

@@ -50,15 +50,6 @@ static JsValueRef __stdcall nativeTraceBeginSectionJNF(
     if (argumentType == JsValueType::JsString) {
       CHAKRA_ASSERTDO(JsGetStringLength(arguments[2], &profileNameLength));
       profileName.resize(profileNameLength);
-
-      // TODO: CharkaRT doesn't have JsCopyString, implement alternative.
-#if !defined(USE_EDGEMODE_JSRT)
-      CHAKRA_ASSERTDO(JsCopyString(
-          arguments[2],
-          const_cast<char *>(profileName.data()),
-          profileNameLength + 1 /* length */,
-          nullptr /* written */));
-#endif
     }
 #ifndef NDEBUG
     else {
@@ -73,12 +64,6 @@ static JsValueRef __stdcall nativeTraceBeginSectionJNF(
     if (argumentType == JsValueType::JsString) {
       CHAKRA_ASSERTDO(JsGetStringLength(arguments[3], &argsLength));
       argsStr.resize(argsLength + 1);
-
-      // TODO: CharkaRT doesn't have JsCopyString, implement alternative.
-#if !defined(USE_EDGEMODE_JSRT)
-      CHAKRA_ASSERTDO(JsCopyString(
-          arguments[3], const_cast<char *>(argsStr.data()), argsLength + 1 /* length */, nullptr /* written */));
-#endif
     }
 #ifndef NDEBUG
     else {
@@ -149,15 +134,6 @@ static void beginOrEndAsync(bool isEnd, JsValueRef arguments[], unsigned short a
   if (argumentType == JsValueType::JsString) {
     CHAKRA_ASSERTDO(JsGetStringLength(arguments[2], &profileNameLength));
     profileName.resize(profileNameLength);
-
-    // TODO: CharkaRT doesn't have JsCopyString, implement alternative.
-#if !defined(USE_EDGEMODE_JSRT)
-    CHAKRA_ASSERTDO(JsCopyString(
-        arguments[2],
-        const_cast<char *>(profileName.data()),
-        profileNameLength + 1 /* length */,
-        nullptr /* written */));
-#endif
   }
 #ifndef NDEBUG
   else {
@@ -240,15 +216,6 @@ static JsValueRef __stdcall nativeTraceCounterJNF(
     if (argumentType == JsValueType::JsString) {
       CHAKRA_ASSERTDO(JsGetStringLength(arguments[2], &profileNameLength));
       profileName.resize(profileNameLength);
-
-      // TODO: CharkaRT doesn't have JsCopyString, implement alternative.
-#if !defined(USE_EDGEMODE_JSRT)
-      CHAKRA_ASSERTDO(JsCopyString(
-          arguments[2],
-          const_cast<char *>(profileName.data()),
-          profileNameLength + 1 /* length */,
-          nullptr /* written */));
-#endif
     }
 #ifndef NDEBUG
     else {

package/Chakra/ChakraValue.h

@@ -10,11 +10,7 @@
 
 #include <folly/dynamic.h>
 
-#if defined(USE_EDGEMODE_JSRT)
 #include <jsrt.h>
-#else
-#include <ChakraCore.h>
-#endif
 
 #include "Utf8DebugExtensions.h"
 

package/Chakra/Utf8DebugExtensions.cpp

@@ -38,16 +38,11 @@ JsErrorCode JsPointerToStringUtf8(
   if (stringValue == nullptr) {
     return JsErrorNullArgument;
   }
-#if defined(USE_EDGEMODE_JSRT)
   // JsCreateString is not supported in universal chakra engine
   // So we convert the utf8 string to utf16 first and call JsPointerToString to
   // convert the string to JsValueRef
   std::wstring wstr = Microsoft::Common::Unicode::Utf8ToUtf16(stringValue, stringLength);
   return JsPointerToString(wstr.c_str(), wstr.size(), string);
-
-#else
-  return JsCreateString(stringValue, stringLength, string);
-#endif
 }
 
 JsErrorCode JsStringToStdStringUtf8(_In_ JsValueRef stringValue, std::string &string) {

package/Chakra/Utf8DebugExtensions.h

@@ -3,13 +3,7 @@
 
 #pragma once
 
-#if defined(USE_EDGEMODE_JSRT)
 #include <jsrt.h>
-#else
-#include <ChakraCore.h>
-#include <cstdint> //for uint16_t in <ChakraCore.h>
-#endif
-
 #include <string>
 #if _HAS_CXX17
 #include <string_view>

package/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj

@@ -119,8 +119,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/React.Cpp.props

@@ -80,6 +80,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.
       -->
@@ -91,6 +92,7 @@
         BOOST_NO_TYPEID;
         BOOST_SYSTEM_SOURCE;
         GTEST_HAS_RTTI=0;
+        USE_EDGEMODE_JSRT;
         WIN32_LEAN_AND_MEAN;
         %(PreprocessorDefinitions)
       </PreprocessorDefinitions>

package/Shared/JSI/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/Shared/JSI/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/Shared/JSI/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/Shared/JSI/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 {
 
@@ -1032,15 +1028,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/Shared/JSI/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/Shared/OInstance.cpp

@@ -380,12 +380,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;
@@ -413,6 +407,7 @@ InstanceImpl::InstanceImpl(
           [[fallthrough]];
 #endif
         }
+        case JSIEngineOverride::Chakra:
         case JSIEngineOverride::ChakraCore:
         default: // TODO: Add other engines once supported
           m_devSettings->jsiRuntimeHolder =
@@ -505,11 +500,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);
       }
 
@@ -520,10 +511,6 @@ 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 (const std::exception &e) {
     m_devSettings->errorCallback(e.what());
   } catch (const winrt::hresult_error &hrerr) {

package/Shared/Shared.vcxitems

@@ -78,7 +78,6 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)AsyncStorage\KeyValueStorage.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)JSI\ByteArrayBuffer.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)JSI\ChakraApi.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)JSI\ChakraCoreRuntime.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)JSI\ChakraRuntime.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)JSI\ChakraRuntimeArgs.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)JSI\ChakraRuntimeFactory.h" />

package/Shared/Shared.vcxitems.filters

@@ -366,9 +366,6 @@
       <Filter>Header Files\JSI</Filter>
     </ClInclude>
     <ClInclude Include="$(MSBuildThisFileDirectory)..\include\Shared\cdebug.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)JSI\ChakraCoreRuntime.h">
-      <Filter>Header Files\JSI</Filter>
-    </ClInclude>
     <ClInclude Include="$(MSBuildThisFileDirectory)InspectorPackagerConnection.h">
       <Filter>Header Files</Filter>
     </ClInclude>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-windows",
-  "version": "0.65.7",
+  "version": "0.65.8",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -25,7 +25,7 @@
     "@react-native-community/cli": "^6.0.0",
     "@react-native-community/cli-platform-android": "^6.0.0",
     "@react-native-community/cli-platform-ios": "^6.0.0",
-    "@react-native-windows/cli": "0.65.2",
+    "@react-native-windows/cli": "0.65.3",
     "@react-native/assets": "1.0.0",
     "@react-native/normalize-color": "1.0.0",
     "@react-native/polyfills": "1.0.0",

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;
-  }
-};

package/Scripts/Microsoft.ChakraCore.ARM64.nuspec

@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  Sample usage:
-
-nuget pack Microsoft.ChakraCore.ARM64.nuspec `
-  -Properties "id=ReactWindows.ChakraCore.ARM64;targetRoot=D:\chakra;repoUrl=https://github.com/microsoft/ChakraCore;repoBranch=master;repoCommit=$(git rev-parse HEAD)" `
-  -Version 1.11.20.0
- -->
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-  <metadata>
-    <!-- i.e.: Microsoft.ChakraCore.vc140.ARM64 -->
-    <id>$id$</id>
-    <version>$version$</version>
-    <authors>Microsoft</authors>
-    <owners>Chakra Team</owners>
-    <licenseUrl>https://github.com/Microsoft/ChakraCore/blob/master/LICENSE.txt</licenseUrl>
-    <projectUrl>https://github.com/Microsoft/ChakraCore</projectUrl>
-    <repository type="git" url="$repoUrl$" branch="$repoBranch$" commit="$repoCommit$" />
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <developmentDependency>true</developmentDependency>
-    <description>ChakraCore is the core part of the Chakra Javascript engine that powers Microsoft Edge.</description>
-    <releaseNotes>https://github.com/Microsoft/ChakraCore/wiki/Roadmap#release-notes</releaseNotes>
-    <copyright>&#169; Microsoft Corporation. All rights reserved.</copyright>
-    <language>en-US</language>
-    <tags>Chakra,ChakraCore,javascript,js,ecmascript,compiler,platform,oss,opensource,native,nativepackage,C++,vc140</tags>
-    <dependencies>
-      <group targetFramework="native" />
-    </dependencies>
-  </metadata>
-  <files>
-    <!--Build-->
-    <file src="Microsoft.ChakraCore.ARM64.targets" target="build\native\$id$.targets"/>
-
-     <!--Lib-->
-    <file src="$targetroot$\arm64_release\ChakraCore.dll" target="lib\native\v140\arm64\release\ChakraCore.dll" />
-    <file src="$targetroot$\arm64_release\ChakraCore.lib" target="lib\native\v140\arm64\release\ChakraCore.lib" />
-    <file src="$targetroot$\arm64_release\ChakraCore.pdb" target="lib\native\v140\arm64\release\ChakraCore.pdb" />
-    <file src="$targetroot$\arm64_release\ch.exe"         target="lib\native\v140\arm64\release\ch.exe" />
-    <file src="$targetroot$\arm64_release\ch.pdb"         target="lib\native\v140\arm64\release\ch.pdb" />
-
-    <!--Copying Release to Debug for now-->
-    <file src="$targetroot$\arm64_release\ChakraCore.dll" target="lib\native\v140\arm64\debug\ChakraCore.dll" />
-    <file src="$targetroot$\arm64_release\ChakraCore.lib" target="lib\native\v140\arm64\debug\ChakraCore.lib" />
-    <file src="$targetroot$\arm64_release\ChakraCore.pdb" target="lib\native\v140\arm64\debug\ChakraCore.pdb" />
-    <file src="$targetroot$\arm64_release\ch.exe"         target="lib\native\v140\arm64\debug\ch.exe" />
-    <file src="$targetroot$\arm64_release\ch.pdb"         target="lib\native\v140\arm64\debug\ch.pdb" />
-
-  </files>
-</package>

package/Scripts/Microsoft.ChakraCore.ARM64.targets

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemDefinitionGroup>
-    <Link>
-      <AdditionalDependencies>$(MSBuildThisFileDirectory)..\..\lib\native\v140\$(Platform)\$(Configuration)\ChakraCore.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <!-- <ClCompile>
-      <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile> -->
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ReferenceCopyLocalPaths Include="$(MSBuildThisFileDirectory)..\..\lib\native\v140\$(Platform)\$(Configuration)\ChakraCore.dll" />
-    <ReferenceCopyLocalPaths Include="$(MSBuildThisFileDirectory)..\..\lib\native\v140\$(Platform)\$(Configuration)\ChakraCore.pdb" />
-  </ItemGroup>
-</Project>

package/Shared/JSI/ChakraCoreRuntime.h

@@ -1,59 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-#pragma once
-
-#include "ChakraRuntime.h"
-
-#include "ChakraCore.h"
-#include "ChakraCoreDebugger.h"
-
-namespace Microsoft::JSI {
-
-class ChakraCoreRuntime : public ChakraRuntime {
- public:
-  ChakraCoreRuntime(ChakraRuntimeArgs &&args) noexcept;
-
-  ~ChakraCoreRuntime() noexcept;
-
-#pragma region ChakraRuntime
-
-  void setupNativePromiseContinuation() noexcept override;
-
-  void startDebuggingIfNeeded() override;
-
-  void stopDebuggingIfNeeded() override;
-
-  std::unique_ptr<const facebook::jsi::Buffer> generatePreparedScript(
-      const std::string &sourceURL,
-      const facebook::jsi::Buffer &sourceBuffer) noexcept override;
-
-  facebook::jsi::Value evaluateJavaScriptSimple(const facebook::jsi::Buffer &buffer, const std::string &sourceURL)
-      override;
-
-  bool evaluateSerializedScript(
-      const facebook::jsi::Buffer &scriptBuffer,
-      const facebook::jsi::Buffer &serializedScriptBuffer,
-      const std::string &sourceURL,
-      JsValueRef *result) override;
-
-#pragma endregion
-
- private:
-  JsErrorCode enableDebugging(
-      JsRuntimeHandle runtime,
-      std::string const &runtimeName,
-      bool breakOnNextLine,
-      uint16_t port,
-      std::unique_ptr<DebugProtocolHandler> &debugProtocolHandler,
-      std::unique_ptr<DebugService> &debugService);
-
-  void ProcessDebuggerCommandQueue();
-
-  static void CALLBACK ProcessDebuggerCommandQueueCallback(void *callbackState);
-
-  std::unique_ptr<DebugProtocolHandler> m_debugProtocolHandler;
-  std::unique_ptr<DebugService> m_debugService;
-};
-
-} // namespace Microsoft::JSI