react-native-windows 0.68.0-preview.4 → 0.68.0-preview.5

package/Microsoft.ReactNative/IViewManager.idl

@@ -88,10 +88,18 @@ namespace Microsoft.ReactNative
     )
     void OnPointerEvent(Object view, ReactPointerEventArgs args);
   };
+
+  [webhosthidden]
+  DOC_STRING(
+    "Enables view managers to track when views are"
+    "removed from the shadow tree."
+  )
   interface IViewManagerWithDropViewInstance {
     DOC_STRING(
-        "Enables the view manager to track when the view is "
-        "being removed from the visual tree. "
+        "Invoked when React has removed the view "
+        "from its shadow tree. Note this method call is distinct from "
+        "the XAML Unloaded event, which is asynchronously triggered "
+        "when the view is removed from the UI tree."
     )
     void OnDropViewInstance(XAML_NAMESPACE.FrameworkElement view);
   };

package/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj

@@ -281,6 +281,7 @@
     <ClInclude Include="ReactHost\ReactErrorProvider.h" />
     <ClInclude Include="ReactHost\ReactHost.h" />
     <ClInclude Include="ReactHost\ReactInstanceWin.h" />
+    <ClInclude Include="ReactHost\CrashManager.h" />
     <ClInclude Include="ReactHost\ReactNativeHeaders.h" />
     <ClInclude Include="ReactHost\React_Win.h" />
     <ClInclude Include="ReactCoreInjection.h">
@@ -615,6 +616,7 @@
     <ClCompile Include="ReactHost\ReactErrorProvider.cpp" />
     <ClCompile Include="ReactHost\ReactHost.cpp" />
     <ClCompile Include="ReactHost\ReactInstanceWin.cpp" />
+    <ClCompile Include="ReactHost\CrashManager.cpp" />
     <ClCompile Include="ReactCoreInjection.cpp">
       <DependentUpon>ReactCoreInjection.idl</DependentUpon>
       <SubType>Code</SubType>

package/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj.filters

@@ -40,6 +40,9 @@
     <ClCompile Include="ReactHost\ReactInstanceWin.cpp">
       <Filter>ReactHost</Filter>
     </ClCompile>
+    <ClCompile Include="ReactHost\CrashManager.cpp">
+      <Filter>ReactHost</Filter>
+    </ClCompile>
     <ClCompile Include="ReactSupport.cpp" />
     <ClCompile Include="RedBox.cpp" />
     <ClCompile Include="TestHook.cpp" />
@@ -388,6 +391,9 @@
     <ClInclude Include="ReactHost\ReactInstanceWin.h">
       <Filter>ReactHost</Filter>
     </ClInclude>
+    <ClInclude Include="ReactHost\CrashManager.h">
+      <Filter>ReactHost</Filter>
+    </ClInclude>
     <ClInclude Include="ReactHost\ReactNativeHeaders.h">
       <Filter>ReactHost</Filter>
     </ClInclude>

package/Microsoft.ReactNative/ReactApplication.cpp

@@ -6,6 +6,7 @@
 #include "ReactApplication.g.cpp"
 #include "winrt/Microsoft.ReactNative.h"
 
+#include "CrashManager.h"
 #include "IReactDispatcher.h"
 #include "Modules/LinkingManagerModule.h"
 #include "ReactNativeHost.h"
@@ -40,12 +41,15 @@ ReactApplication::ReactApplication(IInspectable const &outer) noexcept : ReactAp
 #ifndef USE_WINUI3
   Suspending({this, &ReactApplication::OnSuspending});
 
-#if defined _DEBUG && !defined DISABLE_XAML_GENERATED_BREAK_ON_UNHANDLED_EXCEPTION
+#if !defined DISABLE_XAML_GENERATED_BREAK_ON_UNHANDLED_EXCEPTION
   UnhandledException([this](IInspectable const &, UnhandledExceptionEventArgs const &e) {
+#if defined _DEBUG
     if (IsDebuggerPresent()) {
       auto errorMessage = e.Message();
       __debugbreak();
-    }
+    } else
+#endif
+      Mso::React::CrashManager::OnUnhandledException();
   });
 #endif
 #endif

package/Microsoft.ReactNative/ReactHost/CrashManager.cpp

@@ -0,0 +1,109 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#include "CrashManager.h"
+#include "ReactInstanceWin.h"
+
+#include <winrt/Windows.Storage.h>
+
+#include <WerApi.h>
+
+namespace Mso::React {
+
+// When calling SetUnhandledExceptionFilter the previous filter is returned.
+// That should be saved so that if needed it can be called after the new unhandled exception has finished executing.
+// This allows the Windows Error Reporting system to process the error and upload the data for processing.
+static LPTOP_LEVEL_EXCEPTION_FILTER g_previousExceptionFilter = nullptr;
+
+static std::wstring g_logFileName;
+static bool g_WERExceptionFilterWasCalled{false}; // Prevent recursion in the custom handler
+
+/*static*/ std::atomic_uint CrashManager::_regCount{0};
+
+extern "C" LONG WINAPI CustomWERExceptionFilter(LPEXCEPTION_POINTERS const exceptionPointers) {
+  if (g_WERExceptionFilterWasCalled) {
+    return EXCEPTION_EXECUTE_HANDLER;
+  }
+
+  g_WERExceptionFilterWasCalled = true;
+
+  CrashManager::OnUnhandledException();
+
+  return g_previousExceptionFilter(exceptionPointers);
+}
+
+void InternalRegisterCustomHandler() noexcept {
+  // Do this now because by the time we catch the exception we may be in OOM
+#ifndef CORE_ABI // win32 vs uwp file permissions
+  wchar_t currentDirectory[MAX_PATH]{};
+  VerifyElseCrash(!!GetTempPath(MAX_PATH, currentDirectory));
+  g_logFileName = currentDirectory;
+#else
+  g_logFileName = winrt::Windows::Storage::ApplicationData::Current().LocalFolder().Path() + L"\\";
+#endif
+
+  g_logFileName += L"ReactNativeCrashDetails_" + std::to_wstring(GetCurrentProcessId()) + L".txt";
+
+  VerifySucceededElseCrash(::WerRegisterFile(g_logFileName.c_str(), WerRegFileTypeOther, WER_FILE_ANONYMOUS_DATA));
+
+  g_previousExceptionFilter = ::SetUnhandledExceptionFilter(CustomWERExceptionFilter);
+}
+
+void InternalUnregisterCustomHandler() noexcept {
+  VerifySucceededElseCrash(::WerUnregisterFile(g_logFileName.c_str()));
+
+  if (g_previousExceptionFilter) {
+    ::SetUnhandledExceptionFilter(g_previousExceptionFilter);
+    g_previousExceptionFilter = nullptr;
+  }
+}
+
+/*static*/ void CrashManager::OnUnhandledException() noexcept {
+  FILE *f{nullptr};
+  auto err = _wfopen_s(&f, g_logFileName.c_str(), L"w");
+  if (err == 0) {
+    CrashHandler(_fileno(f));
+    fclose(f);
+  }
+}
+
+/*static*/ void CrashManager::CrashHandler(int fileDescriptor) noexcept {
+  ReactInstanceWin::CrashHandler(fileDescriptor);
+
+  // call any other component's static crash handlers here
+}
+
+/*static*/ void CrashManager::RegisterCustomHandler() noexcept {
+  if (_regCount++ == 0) {
+    InternalRegisterCustomHandler();
+  }
+}
+
+/*static*/ void CrashManager::UnregisterCustomHandler() noexcept {
+  if (--_regCount == 0) {
+    InternalUnregisterCustomHandler();
+  }
+}
+
+#if defined(DEBUG)
+/*static*/ std::string CrashManager::TestCollectCrashData() {
+  FILE *f{nullptr};
+  if (tmpfile_s(&f) != 0) {
+    return std::string{};
+  }
+
+  CrashHandler(_fileno(f));
+  const auto sz = (size_t)ftell(f);
+  rewind(f);
+
+  std::string out;
+  out.resize(sz);
+  const auto readsz = fread(&out[0], 1, sz, f);
+  assert(readsz == sz);
+  fclose(f);
+
+  return out;
+}
+#endif
+
+} // namespace Mso::React

package/Microsoft.ReactNative/ReactHost/CrashManager.h

@@ -0,0 +1,25 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#pragma once
+
+#include <atomic>
+
+namespace Mso::React {
+
+class CrashManager final {
+ public:
+  static void RegisterCustomHandler() noexcept;
+  static void UnregisterCustomHandler() noexcept;
+  static void OnUnhandledException() noexcept;
+
+#if defined(DEBUG)
+  static std::string TestCollectCrashData();
+#endif
+
+ private:
+  static void CrashHandler(int fileDescriptor) noexcept;
+  static std::atomic_uint _regCount;
+};
+
+} // namespace Mso::React

package/Microsoft.ReactNative/ReactHost/React.h

@@ -307,6 +307,14 @@ struct ReactOptions {
       bool value) noexcept;
   static bool UseDirectDebugger(winrt::Microsoft::ReactNative::IReactPropertyBag const &properties) noexcept;
 
+  //! Enables the default unhandled exception handler
+  void SetEnableDefaultCrashHandler(bool enable) noexcept;
+  bool EnableDefaultCrashHandler() const noexcept;
+  static void SetEnableDefaultCrashHandler(
+      winrt::Microsoft::ReactNative::IReactPropertyBag const &properties,
+      bool value) noexcept;
+  static bool EnableDefaultCrashHandler(winrt::Microsoft::ReactNative::IReactPropertyBag const &properties) noexcept;
+
   //! Adds registered JS bundle to JSBundles.
   LIBLET_PUBLICAPI ReactOptions &AddRegisteredJSBundle(std::string_view jsBundleId) noexcept;
 

package/Microsoft.ReactNative/ReactHost/ReactHost.cpp

@@ -75,6 +75,14 @@ winrt::Microsoft::ReactNative::IReactPropertyName EnableFabricProperty() noexcep
   return propName;
 }
 
+winrt::Microsoft::ReactNative::IReactPropertyName EnableDefaultCrashHandlerProperty() noexcept {
+  static winrt::Microsoft::ReactNative::IReactPropertyName propName =
+      winrt::Microsoft::ReactNative::ReactPropertyBagHelper::GetName(
+          winrt::Microsoft::ReactNative::ReactPropertyBagHelper::GetNamespace(L"ReactNative.ReactOptions"),
+          L"EnableDefaultCrashHandler");
+  return propName;
+}
+
 //=============================================================================================
 // ReactOptions implementation
 //=============================================================================================
@@ -234,6 +242,25 @@ bool ReactOptions::UseDirectDebugger() const noexcept {
   return winrt::unbox_value_or<bool>(properties.Get(UseDirectDebuggerProperty()), false);
 }
 
+void ReactOptions::SetEnableDefaultCrashHandler(bool enabled) noexcept {
+  Properties.Set(EnableDefaultCrashHandlerProperty(), winrt::box_value(enabled));
+}
+
+bool ReactOptions::EnableDefaultCrashHandler() const noexcept {
+  return EnableDefaultCrashHandler(Properties);
+}
+
+/*static*/ void ReactOptions::SetEnableDefaultCrashHandler(
+    winrt::Microsoft::ReactNative::IReactPropertyBag const &properties,
+    bool value) noexcept {
+  properties.Set(EnableDefaultCrashHandlerProperty(), winrt::box_value(value));
+}
+
+/*static*/ bool ReactOptions::EnableDefaultCrashHandler(
+    winrt::Microsoft::ReactNative::IReactPropertyBag const &properties) noexcept {
+  return winrt::unbox_value_or<bool>(properties.Get(EnableDefaultCrashHandlerProperty()), false);
+}
+
 //=============================================================================================
 // ReactHost implementation
 //=============================================================================================

package/Microsoft.ReactNative/ReactHost/ReactInstanceWin.cpp

@@ -75,6 +75,7 @@
 #include <tuple>
 #include "ChakraRuntimeHolder.h"
 
+#include "CrashManager.h"
 #include "JsiApi.h"
 #include "ReactCoreInjection.h"
 
@@ -193,6 +194,9 @@ struct BridgeUIBatchInstanceCallback final : public facebook::react::InstanceCal
 // ReactInstanceWin implementation
 //=============================================================================================
 
+/*static*/ std::mutex ReactInstanceWin::s_registryMutex;
+/*static*/ std::vector<ReactInstanceWin *> ReactInstanceWin::s_instanceRegistry;
+
 ReactInstanceWin::ReactInstanceWin(
     IReactHost &reactHost,
     ReactOptions const &options,
@@ -247,9 +251,48 @@ ReactInstanceWin::ReactInstanceWin(
   // OnInstanceCreated event is raised only after the internal react-native instance is ready and
   // it starts handling JS queue work items.
   m_whenCreated.SetValue();
+
+  if (m_options.EnableDefaultCrashHandler()) {
+    CrashManager::RegisterCustomHandler();
+  }
+
+  {
+    std::scoped_lock lock{s_registryMutex};
+    s_instanceRegistry.push_back(this);
+  }
+}
+
+ReactInstanceWin::~ReactInstanceWin() noexcept {
+  std::scoped_lock lock{s_registryMutex};
+  auto it = std::find(s_instanceRegistry.begin(), s_instanceRegistry.end(), this);
+  if (it != s_instanceRegistry.end()) {
+    s_instanceRegistry.erase(it);
+  }
+
+  if (m_options.EnableDefaultCrashHandler()) {
+    CrashManager::UnregisterCustomHandler();
+  }
+}
+
+void ReactInstanceWin::InstanceCrashHandler(int fileDescriptor) noexcept {
+  if (!m_options.EnableDefaultCrashHandler()) {
+    return;
+  }
+
+  if (m_jsiRuntimeHolder) {
+    m_jsiRuntimeHolder->crashHandler(fileDescriptor);
+  }
+
+  // record additional information that could be useful for debugging crash dumps here
+  // (perhaps properties and settings or clues about the react tree)
 }
 
-ReactInstanceWin::~ReactInstanceWin() noexcept {}
+/*static*/ void ReactInstanceWin::CrashHandler(int fileDescriptor) noexcept {
+  std::scoped_lock lock{s_registryMutex};
+  for (auto &entry : s_instanceRegistry) {
+    entry->InstanceCrashHandler(fileDescriptor);
+  }
+}
 
 void ReactInstanceWin::LoadModules(
     const std::shared_ptr<winrt::Microsoft::ReactNative::NativeModulesProvider> &nativeModulesProvider,

package/Microsoft.ReactNative/ReactHost/ReactInstanceWin.h

@@ -82,6 +82,8 @@ class ReactInstanceWin final : public Mso::ActiveObject<IReactInstanceInternal>
   bool UseDeveloperSupport() const noexcept;
   JSIEngine JsiEngine() const noexcept;
 
+  static void CrashHandler(int fileDescriptor) noexcept;
+
  private:
   friend MakePolicy;
   ReactInstanceWin(
@@ -124,6 +126,8 @@ class ReactInstanceWin final : public Mso::ActiveObject<IReactInstanceInternal>
   void DrainJSCallQueue() noexcept;
   void AbandonJSCallQueue() noexcept;
 
+  void InstanceCrashHandler(int fileDescriptor) noexcept;
+
   struct JSCallEntry {
     std::string ModuleName;
     std::string MethodName;
@@ -185,6 +189,9 @@ class ReactInstanceWin final : public Mso::ActiveObject<IReactInstanceInternal>
 
   std::shared_ptr<Microsoft::JSI::RuntimeHolderLazyInit> m_jsiRuntimeHolder;
   winrt::Microsoft::ReactNative::JsiRuntime m_jsiRuntime{nullptr};
+
+  static std::mutex s_registryMutex; // protects access to s_instanceRegistry
+  static std::vector<ReactInstanceWin *> s_instanceRegistry;
 };
 
 } // namespace Mso::React

package/Microsoft.ReactNative/ReactInstanceSettings.cpp

@@ -99,6 +99,14 @@ void ReactInstanceSettings::DebuggerBreakOnNextLine(bool value) noexcept {
   Mso::React::ReactOptions::SetDebuggerBreakOnNextLine(m_properties, value);
 }
 
+bool ReactInstanceSettings::EnableDefaultCrashHandler() noexcept {
+  return Mso::React::ReactOptions::EnableDefaultCrashHandler(m_properties);
+}
+
+void ReactInstanceSettings::EnableDefaultCrashHandler(bool value) noexcept {
+  Mso::React::ReactOptions::SetEnableDefaultCrashHandler(m_properties, value);
+}
+
 bool ReactInstanceSettings::EnableDeveloperMenu() noexcept {
   return UseDeveloperSupport();
 }

package/Microsoft.ReactNative/ReactInstanceSettings.h

@@ -96,6 +96,9 @@ struct ReactInstanceSettings : ReactInstanceSettingsT<ReactInstanceSettings> {
   bool EnableByteCodeCaching() noexcept;
   void EnableByteCodeCaching(bool value) noexcept;
 
+  bool EnableDefaultCrashHandler() noexcept;
+  void EnableDefaultCrashHandler(bool value) noexcept;
+
   //! Same as UseDeveloperSupport
   bool EnableDeveloperMenu() noexcept;
   void EnableDeveloperMenu(bool value) noexcept;

package/Microsoft.ReactNative/ReactInstanceSettings.idl

@@ -151,6 +151,11 @@ namespace Microsoft.ReactNative
     DOC_DEFAULT("false")
     Boolean EnableByteCodeCaching { get; set; };
 
+    DOC_STRING(
+      "Enables the default unhandled exception handler that logs additional information into a text file for [Windows Error Reporting](https://docs.microsoft.com/windows/win32/wer/windows-error-reporting).")
+    DOC_DEFAULT("false")
+    Boolean EnableDefaultCrashHandler { get; set; };
+
     // Deprecated
     [deprecated(
       "This property has been replaced by @.UseDeveloperSupport. "

package/Microsoft.ReactNative/ReactNativeHost.cpp

@@ -136,6 +136,7 @@ IAsyncAction ReactNativeHost::ReloadInstance() noexcept {
 
   reactOptions.ByteCodeFileUri = to_string(m_instanceSettings.ByteCodeFileUri());
   reactOptions.EnableByteCodeCaching = m_instanceSettings.EnableByteCodeCaching();
+  reactOptions.SetEnableDefaultCrashHandler(m_instanceSettings.EnableDefaultCrashHandler());
   reactOptions.SetJsiEngine(static_cast<Mso::React::JSIEngine>(m_instanceSettings.JSIEngineOverride()));
 
   reactOptions.ModuleProvider = modulesProvider;

package/PropertySheets/External/Microsoft.ReactNative.Common.props

@@ -41,6 +41,9 @@
   <PropertyGroup Label="NuGet" Condition="'$(MSBuildProjectExtension)' == '.vcxproj'">
     <!--See https://docs.microsoft.com/en-us/nuget/reference/msbuild-targets#restore-target-->
     <RestoreUseStaticGraphEvaluation Condition="'$(BuildingInsideVisualStudio)' == 'true'">true</RestoreUseStaticGraphEvaluation>
+
+    <!-- Ensure PackageReference compatibility for any consuming projects/apps -->
+    <ResolveNuGetPackages>false</ResolveNuGetPackages>
   </PropertyGroup>
 
   <Import Project="$(ReactNativeWindowsDir)\PropertySheets\Generated\PackageVersion.g.props" />

package/PropertySheets/External/Microsoft.ReactNative.Uwp.CSharpApp.targets

@@ -46,4 +46,6 @@
   </Target>
 
   <Import Project="$(ReactNativeWindowsDir)\PropertySheets\RequireSolution.targets" />
+
+  <Import Project="$(ReactNativeWindowsDir)\PropertySheets\OutputMSBuildProperties.targets" />
 </Project>

package/PropertySheets/External/Microsoft.ReactNative.Uwp.CppApp.targets

@@ -47,6 +47,7 @@
   <Import Project="$(ReactNativeWindowsDir)\PropertySheets\CppAppConsumeCSharpModule.targets" />
   <Import Project="$(ReactNativeWindowsDir)\PropertySheets\RequireSolution.targets" />
   <Import Project="$(ReactNativeWindowsDir)\PropertySheets\FixupRoslynCscWarnings.targets" />
+  <Import Project="$(ReactNativeWindowsDir)\PropertySheets\OutputMSBuildProperties.targets" />
 
   <ItemDefinitionGroup>
     <Reference>

package/PropertySheets/External/Microsoft.ReactNative.Uwp.CppLib.props

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 
+<!--
   Copyright (c) Microsoft Corporation.
   Licensed under the MIT License.
 

package/PropertySheets/Generated/PackageVersion.g.props

@@ -10,7 +10,7 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ReactNativeWindowsVersion>0.68.0-preview.4</ReactNativeWindowsVersion>
+    <ReactNativeWindowsVersion>0.68.0-preview.5</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
     <ReactNativeWindowsMinor>68</ReactNativeWindowsMinor>
     <ReactNativeWindowsPatch>0</ReactNativeWindowsPatch>

package/PropertySheets/OutputMSBuildProperties.targets

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+  Copyright (c) Microsoft Corporation. All rights reserved.
+ Licensed under the MIT License.. 
+-->
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Target Name="OutputMSBuildProperties" AfterTargets="PrepareForBuild">
+    <PropertyGroup>
+    <!--
+      These are the properties we will report in telemetry. Do NOT add properties that may contain PII.
+      You can add new properties following the format "PropertyName": "$(PropertyName)",
+    -->
+      <MSBuildPropertiesJSON>
+      {
+        "WinUIPackageName": "$(WinUIPackageName)",
+        "WinUIPackageVersion": "$(WinUIPackageVersion)",
+        "WindowsTargetPlatformVersion": "$(WindowsTargetPlatformVersion)",
+        "UseExperimentalNuGet": "$(UseExperimentalNuGet)",
+        "UseHermes": "$(UseHermes)",
+        "UseWinUI3": "$(UseWinUI3)"
+      }
+      </MSBuildPropertiesJSON>
+    </PropertyGroup>
+    <WriteLinesToFile
+        File="$([MSBuild]::NormalizePath($(ProjectDir)\Generated Files))\msbuildproperties.g.json"
+        Overwrite="true"
+        Lines="$(MSBuildPropertiesJSON)" />
+  </Target>
+
+</Project>

package/Shared/DevSettings.h

@@ -89,6 +89,8 @@ struct DevSettings {
   std::function<void()> showDevMenuCallback;
 
   bool inlineSourceMap{true};
+
+  bool enableDefaultCrashHandler{false};
 };
 
 } // namespace react

package/Shared/HermesRuntimeHolder.cpp

@@ -25,10 +25,14 @@ namespace react {
 
 namespace {
 
-std::unique_ptr<facebook::hermes::HermesRuntime> makeHermesRuntimeSystraced(
-    const ::hermes::vm::RuntimeConfig &runtimeConfig) {
+std::unique_ptr<facebook::hermes::HermesRuntime> makeHermesRuntimeSystraced(bool enableDefaultCrashHandler) {
   SystraceSection s("HermesExecutorFactory::makeHermesRuntimeSystraced");
-  return HermesShim::makeHermesRuntime(runtimeConfig);
+  if (enableDefaultCrashHandler) {
+    return HermesShim::makeHermesRuntimeWithWER();
+  } else {
+    auto runtimeConfig = ::hermes::vm::RuntimeConfig();
+    return HermesShim::makeHermesRuntime(runtimeConfig);
+  }
 }
 
 #ifdef HERMES_ENABLE_DEBUGGER
@@ -69,6 +73,10 @@ class HermesExecutorRuntimeAdapter final : public facebook::hermes::inspector::R
 
 } // namespace
 
+void HermesRuntimeHolder::crashHandler(int fileDescriptor) noexcept {
+  HermesShim::hermesCrashHandler(static_cast<facebook::hermes::HermesRuntime &>(*m_runtime), fileDescriptor);
+}
+
 facebook::react::JSIEngineOverride HermesRuntimeHolder::getRuntimeType() noexcept {
   return facebook::react::JSIEngineOverride::Hermes;
 }
@@ -92,8 +100,8 @@ HermesRuntimeHolder::HermesRuntimeHolder(
     : m_devSettings(std::move(devSettings)), m_jsQueue(std::move(jsQueue)) {}
 
 void HermesRuntimeHolder::initRuntime() noexcept {
-  auto runtimeConfig = ::hermes::vm::RuntimeConfig();
-  auto hermesRuntime = makeHermesRuntimeSystraced(runtimeConfig);
+  auto hermesRuntime = makeHermesRuntimeSystraced(m_devSettings->enableDefaultCrashHandler);
+
   facebook::hermes::HermesRuntime &hermesRuntimeRef = *hermesRuntime;
 
   m_runtime = std::move(hermesRuntime);

package/Shared/HermesRuntimeHolder.h

@@ -17,6 +17,8 @@ class HermesRuntimeHolder : public Microsoft::JSI::RuntimeHolderLazyInit {
   std::shared_ptr<facebook::jsi::Runtime> getRuntime() noexcept override;
   facebook::react::JSIEngineOverride getRuntimeType() noexcept override;
 
+  void crashHandler(int fileDescriptor) noexcept override;
+
   HermesRuntimeHolder(
       std::shared_ptr<facebook::react::DevSettings> devSettings,
       std::shared_ptr<facebook::react::MessageQueueThread> jsQueue) noexcept;

package/Shared/HermesShim.cpp

@@ -11,6 +11,8 @@ static decltype(&facebook::hermes::makeHermesRuntime) s_makeHermesRuntime{nullpt
 static decltype(&facebook::hermes::HermesRuntime::enableSamplingProfiler) s_enableSamplingProfiler{nullptr};
 static decltype(&facebook::hermes::HermesRuntime::disableSamplingProfiler) s_disableSamplingProfiler{nullptr};
 static decltype(&facebook::hermes::HermesRuntime::dumpSampledTraceToFile) s_dumpSampledTraceToFile{nullptr};
+static decltype(&facebook::hermes::makeHermesRuntimeWithWER) s_makeHermesRuntimeWithWER{nullptr};
+static decltype(&facebook::hermes::hermesCrashHandler) s_hermesCrashHandler{nullptr};
 
 #if _M_X64
 constexpr const char *makeHermesRuntimeSymbol =
@@ -19,6 +21,9 @@ constexpr const char *enableSamlingProfilerSymbol = "?enableSamplingProfiler@Her
 constexpr const char *disableSamlingProfilerSymbol = "?disableSamplingProfiler@HermesRuntime@hermes@facebook@@SAXXZ";
 constexpr const char *dumpSampledTraceToFileSymbol =
     "?dumpSampledTraceToFile@HermesRuntime@hermes@facebook@@SAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z";
+constexpr const char *makeHermesRuntimeWithWERSymbol =
+    "?makeHermesRuntimeWithWER@hermes@facebook@@YA?AV?$unique_ptr@VHermesRuntime@hermes@facebook@@U?$default_delete@VHermesRuntime@hermes@facebook@@@std@@@std@@XZ";
+constexpr const char *hermesCrashHandlerSymbol = "?hermesCrashHandler@hermes@facebook@@YAXAEAVHermesRuntime@12@H@Z";
 #endif
 
 #if _M_ARM64
@@ -28,6 +33,9 @@ constexpr const char *enableSamlingProfilerSymbol = "?enableSamplingProfiler@Her
 constexpr const char *disableSamlingProfilerSymbol = "?disableSamplingProfiler@HermesRuntime@hermes@facebook@@SAXXZ";
 constexpr const char *dumpSampledTraceToFileSymbol =
     "?dumpSampledTraceToFile@HermesRuntime@hermes@facebook@@SAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z";
+constexpr const char *makeHermesRuntimeWithWERSymbol =
+    "?makeHermesRuntimeWithWER@hermes@facebook@@YA?AV?$unique_ptr@VHermesRuntime@hermes@facebook@@U?$default_delete@VHermesRuntime@hermes@facebook@@@std@@@std@@XZ";
+constexpr const char *hermesCrashHandlerSymbol = "?hermesCrashHandler@hermes@facebook@@YAXAEAVHermesRuntime@12@H@Z";
 #endif
 
 #if _M_IX86
@@ -37,6 +45,9 @@ constexpr const char *enableSamlingProfilerSymbol = "?enableSamplingProfiler@Her
 constexpr const char *disableSamlingProfilerSymbol = "?disableSamplingProfiler@HermesRuntime@hermes@facebook@@SAXXZ";
 constexpr const char *dumpSampledTraceToFileSymbol =
     "?dumpSampledTraceToFile@HermesRuntime@hermes@facebook@@SAXABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z";
+constexpr const char *makeHermesRuntimeWithWERSymbol =
+    "?makeHermesRuntimeWithWER@hermes@facebook@@YA?AV?$unique_ptr@VHermesRuntime@hermes@facebook@@U?$default_delete@VHermesRuntime@hermes@facebook@@@std@@@std@@XZ";
+constexpr const char *hermesCrashHandlerSymbol = "?hermesCrashHandler@hermes@facebook@@YAXAAVHermesRuntime@12@H@Z";
 #endif
 
 static void EnsureHermesLoaded() noexcept {
@@ -59,6 +70,14 @@ static void EnsureHermesLoaded() noexcept {
     s_dumpSampledTraceToFile = reinterpret_cast<decltype(s_dumpSampledTraceToFile)>(
         GetProcAddress(s_hermesModule, dumpSampledTraceToFileSymbol));
     VerifyElseCrash(s_dumpSampledTraceToFile);
+
+    s_makeHermesRuntimeWithWER = reinterpret_cast<decltype(s_makeHermesRuntimeWithWER)>(
+        GetProcAddress(s_hermesModule, makeHermesRuntimeWithWERSymbol));
+    VerifyElseCrash(s_makeHermesRuntimeWithWER);
+
+    s_hermesCrashHandler =
+        reinterpret_cast<decltype(s_hermesCrashHandler)>(GetProcAddress(s_hermesModule, hermesCrashHandlerSymbol));
+    VerifyElseCrash(s_hermesCrashHandler);
   }
 }
 
@@ -82,4 +101,14 @@ void dumpSampledTraceToFile(const std::string &fileName) {
   s_dumpSampledTraceToFile(fileName);
 }
 
+std::unique_ptr<facebook::hermes::HermesRuntime> makeHermesRuntimeWithWER() {
+  EnsureHermesLoaded();
+  return s_makeHermesRuntimeWithWER();
+}
+
+void hermesCrashHandler(facebook::hermes::HermesRuntime &runtime, int fileDescriptor) {
+  EnsureHermesLoaded();
+  s_hermesCrashHandler(runtime, fileDescriptor);
+}
+
 } // namespace Microsoft::ReactNative::HermesShim

package/Shared/HermesShim.h

@@ -15,5 +15,7 @@ std::unique_ptr<facebook::hermes::HermesRuntime> makeHermesRuntime(const hermes:
 void enableSamplingProfiler();
 void disableSamplingProfiler();
 void dumpSampledTraceToFile(const std::string &fileName);
+std::unique_ptr<facebook::hermes::HermesRuntime> makeHermesRuntimeWithWER();
+void hermesCrashHandler(facebook::hermes::HermesRuntime &runtime, int fileDescriptor);
 
 } // namespace Microsoft::ReactNative::HermesShim

package/Shared/JSI/RuntimeHolder.h

@@ -17,6 +17,10 @@ namespace Microsoft::JSI {
 struct RuntimeHolderLazyInit {
   virtual std::shared_ptr<facebook::jsi::Runtime> getRuntime() noexcept = 0;
   virtual facebook::react::JSIEngineOverride getRuntimeType() noexcept = 0;
+
+  // You can call this when a crash happens to attempt recording additional data
+  // The fd supplied is a raw file stream an implementation might write JSON to
+  virtual void crashHandler(int fileDescriptor) noexcept {};
 };
 
 } // namespace Microsoft::JSI

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-windows",
-  "version": "0.68.0-preview.4",
+  "version": "0.68.0-preview.5",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -26,7 +26,7 @@
     "@react-native-community/cli": "^7.0.1",
     "@react-native-community/cli-platform-android": "^7.0.1",
     "@react-native-community/cli-platform-ios": "^7.0.1",
-    "@react-native-windows/cli": "0.68.0-preview.4",
+    "@react-native-windows/cli": "0.68.0-preview.5",
     "@react-native-windows/virtualized-list": "0.68.0-preview.2",
     "@react-native/assets": "1.0.0",
     "@react-native/normalize-color": "2.0.0",