react-native-windows 0.65.5 → 0.65.9

package/CHANGELOG.json

@@ -2,7 +2,91 @@
   "name": "react-native-windows",
   "entries": [
     {
-      "date": "Mon, 11 Oct 2021 15:06:28 GMT",
+      "date": "Mon, 29 Nov 2021 16:12:07 GMT",
+      "tag": "react-native-windows_v0.65.9",
+      "version": "0.65.9",
+      "comments": {
+        "patch": [
+          {
+            "comment": "[0.65] Make ADK dependency optional in dependency script",
+            "author": "jthysell@microsoft.com",
+            "commit": "e914a7396c6c31a1b12910bb705dff4aa2cbe253",
+            "package": "react-native-windows"
+          },
+          {
+            "comment": "Fix C# Module Event invocation",
+            "author": "vmorozov@microsoft.com",
+            "commit": "bce10a2d0aa3c074063a584fb25c0cbd969840ac",
+            "package": "react-native-windows"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Mon, 15 Nov 2021 16:09:31 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": {
+        "patch": [
+          {
+            "comment": "Fix race condition when building customer projects",
+            "author": "dannyvv@microsoft.com",
+            "commit": "b376766f3a64bcdaef810c8d065ddead2e361840",
+            "package": "react-native-windows"
+          },
+          {
+            "comment": "Fix Microsoft.ReactNative.dll version string",
+            "author": "asklar@microsoft.com",
+            "commit": "73ad2b8c3467aaab54fc49e316c219f3a9fc7892",
+            "package": "react-native-windows"
+          },
+          {
+            "comment": "Fix crash when using TextInput.blur()",
+            "author": "30809111+acoates-ms@users.noreply.github.com",
+            "commit": "b2cdb561fc91f81181a1e6d1edf9056dba6e0f01",
+            "package": "react-native-windows"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Wed, 20 Oct 2021 19:14:28 GMT",
+      "tag": "react-native-windows_v0.65.6",
+      "version": "0.65.6",
+      "comments": {
+        "patch": [
+          {
+            "comment": "Fix Arm64 Desktop linker experts due to mangled name mismatches",
+            "author": "dannyvv@microsoft.com",
+            "commit": "2169bb4bc9a4d801b480be9d84638a20a6b4a718",
+            "package": "react-native-windows"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Mon, 11 Oct 2021 15:06:57 GMT",
       "tag": "react-native-windows_v0.65.5",
       "version": "0.65.5",
       "comments": {

package/CHANGELOG.md

@@ -1,18 +1,54 @@
 # Change Log - react-native-windows
 
-This log was last generated on Mon, 11 Oct 2021 15:06:28 GMT and should not be manually modified.
+This log was last generated on Mon, 29 Nov 2021 16:12:07 GMT and should not be manually modified.
 
 <!-- Start content -->
 
-## 0.65.5
+## 0.65.9
 
-Mon, 11 Oct 2021 15:06:28 GMT
+Mon, 29 Nov 2021 16:12:07 GMT
 
 ### Patches
 
-- [0.65] Add ARM64 support to React.Windows.Desktop.Test.DLL (julio.rocha@microsoft.com)
-- Promote 0.65 to legacy (ngerlem@microsoft.com)
+- [0.65] Make ADK dependency optional in dependency script (jthysell@microsoft.com)
+- Fix C# Module Event invocation (vmorozov@microsoft.com)
 
+## 0.65.8
+
+Mon, 15 Nov 2021 16:09:31 GMT
+
+### Patches
+
+- 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
+
+### Patches
+
+- Fix Arm64 Desktop linker experts due to mangled name mismatches (dannyvv@microsoft.com)
+
+## 0.65.5
+
+Mon, 11 Oct 2021 15:06:57 GMT
+
+### Patches
+
+- [0.65] Add ARM64 support to React.Windows.Desktop.Test.DLL (julio.rocha@microsoft.com)
+- Promote 0.65 to legacy (ngerlem@microsoft.com)
+
 ## 0.65.4
 
 Mon, 04 Oct 2021 15:07:05 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/Microsoft.ReactNative/Modules/NativeUIManager.cpp

@@ -163,11 +163,9 @@ struct RootShadowNode final : public ShadowNodeBase {
   }
 
   void AddView(ShadowNode &child, int64_t index) override {
-    auto panel(GetView().as<winrt::Panel>());
-    if (panel != nullptr) {
-      auto childView = static_cast<ShadowNodeBase &>(child).GetView().as<xaml::UIElement>();
-      panel.Children().InsertAt(static_cast<uint32_t>(index), childView);
-    }
+    auto panel(GetView().as<winrt::Microsoft::ReactNative::ReactRootView>());
+    winrt::get_self<winrt::Microsoft::ReactNative::implementation::ReactRootView>(panel)->AddView(
+        static_cast<uint32_t>(index), static_cast<ShadowNodeBase &>(child).GetView().as<xaml::UIElement>());
   }
 };
 

package/Microsoft.ReactNative/ReactRootView.cpp

@@ -304,9 +304,6 @@ void ReactRootView::ShowInstanceLoading() noexcept {
 
 void ReactRootView::EnsureFocusSafeHarbor() noexcept {
   if (!m_focusSafeHarbor) {
-    // focus safe harbor is delayed to be inserted to the visual tree
-    VerifyElseCrash(Children().Size() == 1);
-
     m_focusSafeHarbor = xaml::Controls::ContentControl{};
     m_focusSafeHarbor.Width(0.0);
     m_focusSafeHarbor.IsTabStop(false);
@@ -486,4 +483,32 @@ Windows::Foundation::Size ReactRootView::ArrangeOverride(Windows::Foundation::Si
   return finalSize;
 }
 
+// Maps react-native's view of the root view to the actual UI
+// react-native is unaware that there are non-RN elements within the ReactRootView
+uint32_t ReactRootView::RNIndexToXamlIndex(uint32_t index) noexcept {
+  // If m_focusSafeHarbor exists, it should be at index 0
+  // m_xamlRootView is the next element, followed by any RN content.
+#if DEBUG
+  uint32_t findIndex{0};
+  Assert(!m_focusSafeHarbor || Children().IndexOf(m_focusSafeHarbor, findIndex) && findIndex == 0);
+  Assert(Children().IndexOf(m_xamlRootView, findIndex) && findIndex == (m_focusSafeHarbor ? 1 : 0));
+#endif
+
+  return index + (m_focusSafeHarbor ? 2 : 1);
+}
+
+void ReactRootView::AddView(uint32_t index, xaml::UIElement child) {
+  Children().InsertAt(RNIndexToXamlIndex(index), child);
+}
+
+void ReactRootView::RemoveAllChildren() {
+  const uint32_t numLeft = m_focusSafeHarbor ? 2 : 1;
+  while (Children().Size() > numLeft)
+    Children().RemoveAt(numLeft);
+}
+
+void ReactRootView::RemoveChildAt(uint32_t index) {
+  Children().RemoveAt(RNIndexToXamlIndex(index));
+}
+
 } // namespace winrt::Microsoft::ReactNative::implementation