react-native-windows 0.71.7 → 0.72.0-preview.1

package/ReactCommon/Yoga.cpp

@@ -181,10 +181,6 @@ YOGA_EXPORT bool YGNodeIsDirty(YGNodeRef node) {
   return node->isDirty();
 }
 
-YOGA_EXPORT bool YGNodeLayoutGetDidUseLegacyFlag(const YGNodeRef node) {
-  return node->didUseLegacyFlag();
-}
-
 YOGA_EXPORT void YGNodeMarkDirtyAndPropogateToDescendants(
     const YGNodeRef node) {
   return node->markDirtyAndPropogateDownwards();
@@ -194,6 +190,7 @@ int32_t gConfigInstanceCount = 0;
 
 YOGA_EXPORT WIN_EXPORT YGNodeRef YGNodeNewWithConfig(const YGConfigRef config) {
   const YGNodeRef node = new YGNode{config};
+  YGAssert(config != nullptr, "Tried to construct YGNode with null config");
   YGAssertWithConfig(
       config, node != nullptr, "Could not allocate memory for node");
   Event::publish<Event::NodeAllocation>(node, {config});
@@ -221,32 +218,6 @@ YOGA_EXPORT YGNodeRef YGNodeClone(YGNodeRef oldNode) {
   return node;
 }
 
-static YGConfigRef YGConfigClone(const YGConfig &oldConfig) {
-  const YGConfigRef config = new YGConfig(oldConfig);
-  YGAssert(config != nullptr, "Could not allocate memory for config");
-  gConfigInstanceCount++;
-  return config;
-}
-
-static YGNodeRef YGNodeDeepClone(YGNodeRef oldNode) {
-  auto config = YGConfigClone(*oldNode->getConfig());
-  auto node = new YGNode{*oldNode, config};
-  node->setOwner(nullptr);
-  Event::publish<Event::NodeAllocation>(node, {node->getConfig()});
-
-  YGVector vec = YGVector();
-  vec.reserve(oldNode->getChildren().size());
-  YGNodeRef childNode = nullptr;
-  for (auto *item : oldNode->getChildren()) {
-    childNode = YGNodeDeepClone(item);
-    childNode->setOwner(node);
-    vec.push_back(childNode);
-  }
-  node->setChildren(vec);
-
-  return node;
-}
-
 YOGA_EXPORT void YGNodeFree(const YGNodeRef node) {
   if (YGNodeRef owner = node->getOwner()) {
     owner->removeChild(node);
@@ -264,17 +235,6 @@ YOGA_EXPORT void YGNodeFree(const YGNodeRef node) {
   delete node;
 }
 
-static void YGConfigFreeRecursive(const YGNodeRef root) {
-  if (root->getConfig() != nullptr) {
-    gConfigInstanceCount--;
-    delete root->getConfig();
-  }
-  // Delete configs recursively for childrens
-  for (auto *child : root->getChildren()) {
-    YGConfigFreeRecursive(child);
-  }
-}
-
 YOGA_EXPORT void YGNodeFreeRecursiveWithCleanupFunc(
     const YGNodeRef root,
     YGNodeCleanupFunc cleanup) {
@@ -994,11 +954,6 @@ YG_NODE_LAYOUT_RESOLVED_PROPERTY_IMPL(float, Margin, margin);
 YG_NODE_LAYOUT_RESOLVED_PROPERTY_IMPL(float, Border, border);
 YG_NODE_LAYOUT_RESOLVED_PROPERTY_IMPL(float, Padding, padding);
 
-YOGA_EXPORT bool YGNodeLayoutGetDidLegacyStretchFlagAffectLayout(
-    const YGNodeRef node) {
-  return node->getLayout().doesLegacyStretchFlagAffectsLayout();
-}
-
 std::atomic<uint32_t> gCurrentGenerationCount(0);
 
 bool YGLayoutNodeInternal(
@@ -1595,13 +1550,21 @@ static void YGNodeAbsoluteLayoutChild(
       depth,
       generationCount);
 
+  auto trailingMarginOuterSize =
+      YGConfigIsExperimentalFeatureEnabled(
+          node->getConfig(),
+          YGExperimentalFeatureFixAbsoluteTrailingColumnMargin)
+      ? isMainAxisRow ? height : width
+      : width;
+
   if (child->isTrailingPosDefined(mainAxis) &&
       !child->isLeadingPositionDefined(mainAxis)) {
     child->setLayoutPosition(
         node->getLayout().measuredDimensions[dim[mainAxis]] -
             child->getLayout().measuredDimensions[dim[mainAxis]] -
             node->getTrailingBorder(mainAxis) -
-            child->getTrailingMargin(mainAxis, width).unwrap() -
+            child->getTrailingMargin(mainAxis, trailingMarginOuterSize)
+                .unwrap() -
             child->getTrailingPosition(mainAxis, isMainAxisRow ? width : height)
                 .unwrap(),
         leading[mainAxis]);
@@ -1620,6 +1583,22 @@ static void YGNodeAbsoluteLayoutChild(
         (node->getLayout().measuredDimensions[dim[mainAxis]] -
          child->getLayout().measuredDimensions[dim[mainAxis]]),
         leading[mainAxis]);
+  } else if (
+      YGConfigIsExperimentalFeatureEnabled(
+          node->getConfig(),
+          YGExperimentalFeatureAbsolutePercentageAgainstPaddingEdge) &&
+      child->isLeadingPositionDefined(mainAxis)) {
+    child->setLayoutPosition(
+        child->getLeadingPosition(
+                 mainAxis, node->getLayout().measuredDimensions[dim[mainAxis]])
+                .unwrap() +
+            node->getLeadingBorder(mainAxis) +
+            child
+                ->getLeadingMargin(
+                    mainAxis,
+                    node->getLayout().measuredDimensions[dim[mainAxis]])
+                .unwrap(),
+        leading[mainAxis]);
   }
 
   if (child->isTrailingPosDefined(crossAxis) &&
@@ -1628,7 +1607,8 @@ static void YGNodeAbsoluteLayoutChild(
         node->getLayout().measuredDimensions[dim[crossAxis]] -
             child->getLayout().measuredDimensions[dim[crossAxis]] -
             node->getTrailingBorder(crossAxis) -
-            child->getTrailingMargin(crossAxis, width).unwrap() -
+            child->getTrailingMargin(crossAxis, trailingMarginOuterSize)
+                .unwrap() -
             child
                 ->getTrailingPosition(crossAxis, isMainAxisRow ? height : width)
                 .unwrap(),
@@ -1650,6 +1630,23 @@ static void YGNodeAbsoluteLayoutChild(
         (node->getLayout().measuredDimensions[dim[crossAxis]] -
          child->getLayout().measuredDimensions[dim[crossAxis]]),
         leading[crossAxis]);
+  } else if (
+      YGConfigIsExperimentalFeatureEnabled(
+          node->getConfig(),
+          YGExperimentalFeatureAbsolutePercentageAgainstPaddingEdge) &&
+      child->isLeadingPositionDefined(crossAxis)) {
+    child->setLayoutPosition(
+        child->getLeadingPosition(
+                 crossAxis,
+                 node->getLayout().measuredDimensions[dim[crossAxis]])
+                .unwrap() +
+            node->getLeadingBorder(crossAxis) +
+            child
+                ->getLeadingMargin(
+                    crossAxis,
+                    node->getLayout().measuredDimensions[dim[crossAxis]])
+                .unwrap(),
+        leading[crossAxis]);
   }
 }
 
@@ -2540,6 +2537,11 @@ static void YGJustifyMainAxis(
     const YGNodeRef child = node->getChild(i);
     const YGStyle &childStyle = child->getStyle();
     const YGLayout childLayout = child->getLayout();
+    const bool isLastChild = i == collectedFlexItemsValues.endOfLineIndex - 1;
+    // remove the gap if it is the last element of the line
+    if (isLastChild) {
+      betweenMainDim -= gap;
+    }
     if (childStyle.display() == YGDisplayNone) {
       continue;
     }
@@ -3004,9 +3006,6 @@ static void YGNodelayoutImpl(
               collectedFlexItemsValues.sizeConsumedOnCurrentLine;
         }
 
-        if (node->getConfig()->useLegacyStretchBehaviour) {
-          node->setLayoutDidUseLegacyFlag(true);
-        }
         sizeBasedOnContent = !node->getConfig()->useLegacyStretchBehaviour;
       }
     }
@@ -3564,9 +3563,17 @@ static void YGNodelayoutImpl(
       YGNodeAbsoluteLayoutChild(
           node,
           child,
-          availableInnerWidth,
+          YGConfigIsExperimentalFeatureEnabled(
+              node->getConfig(),
+              YGExperimentalFeatureAbsolutePercentageAgainstPaddingEdge)
+              ? node->getLayout().measuredDimensions[YGDimensionWidth]
+              : availableInnerWidth,
           isMainAxisRow ? measureModeMainDim : measureModeCrossDim,
-          availableInnerHeight,
+          YGConfigIsExperimentalFeatureEnabled(
+              node->getConfig(),
+              YGExperimentalFeatureAbsolutePercentageAgainstPaddingEdge)
+              ? node->getLayout().measuredDimensions[YGDimensionHeight]
+              : availableInnerHeight,
           direction,
           config,
           layoutMarkerData,
@@ -4150,13 +4157,6 @@ static void YGRoundToPixelGrid(
   }
 }
 
-static void unsetUseLegacyFlagRecursively(YGNodeRef node) {
-  node->getConfig()->useLegacyStretchBehaviour = false;
-  for (auto child : node->getChildren()) {
-    unsetUseLegacyFlagRecursively(child);
-  }
-}
-
 YOGA_EXPORT void YGNodeCalculateLayoutWithContext(
     const YGNodeRef node,
     const float ownerWidth,
@@ -4241,67 +4241,6 @@ YOGA_EXPORT void YGNodeCalculateLayoutWithContext(
   }
 
   Event::publish<Event::LayoutPassEnd>(node, {layoutContext, &markerData});
-
-  // We want to get rid off `useLegacyStretchBehaviour` from YGConfig. But we
-  // aren't sure whether client's of yoga have gotten rid off this flag or not.
-  // So logging this in YGLayout would help to find out the call sites depending
-  // on this flag. This check would be removed once we are sure no one is
-  // dependent on this flag anymore. The flag
-  // `shouldDiffLayoutWithoutLegacyStretchBehaviour` in YGConfig will help to
-  // run experiments.
-  if (node->getConfig()->shouldDiffLayoutWithoutLegacyStretchBehaviour &&
-      node->didUseLegacyFlag()) {
-    const YGNodeRef nodeWithoutLegacyFlag = YGNodeDeepClone(node);
-    nodeWithoutLegacyFlag->resolveDimension();
-    // Recursively mark nodes as dirty
-    nodeWithoutLegacyFlag->markDirtyAndPropogateDownwards();
-    gCurrentGenerationCount.fetch_add(1, std::memory_order_relaxed);
-    // Rerun the layout, and calculate the diff
-    unsetUseLegacyFlagRecursively(nodeWithoutLegacyFlag);
-    LayoutData layoutMarkerData = {};
-    if (YGLayoutNodeInternal(
-            nodeWithoutLegacyFlag,
-            width,
-            height,
-            ownerDirection,
-            widthMeasureMode,
-            heightMeasureMode,
-            ownerWidth,
-            ownerHeight,
-            true,
-            LayoutPassReason::kInitial,
-            nodeWithoutLegacyFlag->getConfig(),
-            layoutMarkerData,
-            layoutContext,
-            0, // tree root
-            gCurrentGenerationCount.load(std::memory_order_relaxed))) {
-      nodeWithoutLegacyFlag->setPosition(
-          nodeWithoutLegacyFlag->getLayout().direction(),
-          ownerWidth,
-          ownerHeight,
-          ownerWidth);
-      YGRoundToPixelGrid(
-          nodeWithoutLegacyFlag,
-          nodeWithoutLegacyFlag->getConfig()->pointScaleFactor,
-          0.0f,
-          0.0f);
-
-      // Set whether the two layouts are different or not.
-      auto neededLegacyStretchBehaviour =
-          !nodeWithoutLegacyFlag->isLayoutTreeEqualToNode(*node);
-      node->setLayoutDoesLegacyFlagAffectsLayout(neededLegacyStretchBehaviour);
-
-#ifdef DEBUG
-      if (nodeWithoutLegacyFlag->getConfig()->printTree) {
-        YGNodePrint(
-            nodeWithoutLegacyFlag,
-            (YGPrintOptions) (YGPrintOptionsLayout | YGPrintOptionsChildren | YGPrintOptionsStyle));
-      }
-#endif
-    }
-    YGConfigFreeRecursive(nodeWithoutLegacyFlag);
-    YGNodeFreeRecursive(nodeWithoutLegacyFlag);
-  }
 }
 
 YOGA_EXPORT void YGNodeCalculateLayout(
@@ -4325,12 +4264,6 @@ YOGA_EXPORT void YGConfigSetLogger(const YGConfigRef config, YGLogger logger) {
   }
 }
 
-YOGA_EXPORT void YGConfigSetShouldDiffLayoutWithoutLegacyStretchBehaviour(
-    const YGConfigRef config,
-    const bool shouldDiffLayout) {
-  config->shouldDiffLayoutWithoutLegacyStretchBehaviour = shouldDiffLayout;
-}
-
 void YGAssert(const bool condition, const char *message) {
   if (!condition) {
     Log::log(YGNodeRef{nullptr}, YGLogLevelFatal, nullptr, "%s\n", message);

package/Scripts/OfficeReact.Win32.nuspec

@@ -36,6 +36,7 @@
     <file src="$nugetroot$\ARM64\Release\React.Windows.Desktop.Test.DLL\React.Windows.Desktop.Test.**"  target="lib\ship\ARM64"   exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
 
     <file src="$nugetroot$\inc\callinvoker\ReactCommon\CallInvoker.h" target="inc\ReactCommon"/>
+    <file src="$nugetroot$\inc\callinvoker\ReactCommon\SchedulerPriority.h" target="inc\ReactCommon"/>
     <file src="$nugetroot$\inc\runtimeexecutor\ReactCommon\RuntimeExecutor.h" target="inc\ReactCommon"/>
     <file src="$nugetroot$\inc\cxxreact\*" target="inc\cxxreact"/>
     <file src="$nugetroot$\inc\jsi\**\*.*" target="inc\jsi"/>

package/Scripts/Tfs/Layout-MSRN-Headers.ps1

@@ -42,6 +42,7 @@ Copy-Item -Force -Path $ReactNativeRoot\ReactCommon\jsi\jsi\threadsafe.h -Destin
 # Microsoft.ReactNative.CXX project TurboModule files
 New-Item -ItemType Directory -Path $TargetRoot\Microsoft.ReactNative.Cxx\ReactCommon -Force
 Copy-Item -Force -Path $ReactNativeRoot\ReactCommon\callinvoker\ReactCommon\CallInvoker.h -Destination $TargetRoot\Microsoft.ReactNative.Cxx\ReactCommon\
+Copy-Item -Force -Path $ReactNativeRoot\ReactCommon\callinvoker\ReactCommon\SchedulerPriority.h -Destination $TargetRoot\Microsoft.ReactNative.Cxx\ReactCommon\
 Copy-Item -Force -Path $ReactNativeRoot\ReactCommon\react\bridging\CallbackWrapper.h -Destination $TargetRoot\Microsoft.ReactNative.Cxx\ReactCommon\
 Copy-Item -Force -Path $ReactNativeRoot\ReactCommon\react\bridging\LongLivedObject.cpp -Destination $TargetRoot\Microsoft.ReactNative.Cxx\ReactCommon\
 Copy-Item -Force -Path $ReactNativeRoot\ReactCommon\react\bridging\LongLivedObject.h -Destination $TargetRoot\Microsoft.ReactNative.Cxx\ReactCommon\

package/Scripts/rnw-dependencies.ps1

@@ -12,7 +12,12 @@ param(
     [switch]$Enterprise = $false
 )
 
-$Verbose = $PSCmdlet.MyInvocation.BoundParameters["Verbose"].IsPresent;
+$ShellInvocation = ($PSCmdlet.MyInvocation.BoundParameters -ne $null);
+
+$Verbose = $false
+if ($ShellInvocation) {
+    $Verbose = $PSCmdlet.MyInvocation.BoundParameters["Verbose"].IsPresent;
+}
 
 enum CheckId {
     All
@@ -496,7 +501,7 @@ function EnsureChocoForInstall {
     Write-Verbose "Checking for Choco...";
     try {
         $chocoCmd = (Get-Command choco -ErrorAction Stop);
-        if (chocoCmd -ne $null) {
+        if ($chocoCmd -ne $null) {
             Write-Verbose "Choco found.";
             return;
         }
@@ -519,8 +524,9 @@ function IsElevated {
 }
 
 if (!($NoPrompt) -and !(IsElevated)) {
-    Write-Host "rnw-dependencies - this script must run elevated. Exiting.";
-    exit 1;
+    Write-Host "rnw-dependencies - this script must run elevated.";
+    if (!$ShellInvocation) { Read-Host 'Press Enter to exit' }
+    exit 1
 }
 
 $NeedsRerun = 0;
@@ -631,9 +637,11 @@ if ($NeedsRerun -ne 0) {
     } else {
         Write-Warning "Some dependencies are not met. Re-run with -Verbose for details, or use -Install to install them.";
     }
+    if (!$ShellInvocation) { Read-Host 'Press Enter to exit' }
     exit 1;
 } else {
     Write-Host "All mandatory requirements met.";
     $Tags | Out-File $MarkerFile;
+    if (!$ShellInvocation) { Read-Host 'Press Enter to exit' }
     exit 0;
 }

package/Shared/Composition/CompositionSwitcher.interop.h

@@ -10,6 +10,7 @@
 #include <d2d1_1.h>
 #include <d3d11.h>
 #include <d3d11_4.h>
+#include <guid/msoGuid.h>
 #include <winrt/Microsoft.ReactNative.Composition.h>
 #include <winrt/Windows.Graphics.DirectX.Direct3D11.h>
 

package/Shared/DevServerHelper.h

@@ -31,6 +31,7 @@ class DevServerHelper {
       const uint16_t sourceBundlePort,
       const std::string &jsbundle,
       const std::string &platform,
+      const std::string &bundleAppId,
       bool dev,
       bool hot,
       bool inlineSourceMap,
@@ -41,6 +42,12 @@ class DevServerHelper {
       hermesBytecodeVersionQuery = string_format(HermesBytecodeVersionQueryFormat, hermesBytecodeVersion);
     }
 
+    std::string appIdQuery;
+    if (bundleAppId.size() > 0) {
+      static constexpr const char AppIdQueryFormat[] = "&app=%s";
+      appIdQuery = string_format(AppIdQueryFormat, bundleAppId.c_str());
+    }
+
     return string_format(
         BundleUrlFormat,
         GetDeviceLocalHost(sourceBundleHost, sourceBundlePort).c_str(),
@@ -49,7 +56,8 @@ class DevServerHelper {
         dev ? "true" : "false",
         hot ? "true" : "false",
         inlineSourceMap ? "true" : "false",
-        hermesBytecodeVersionQuery.c_str());
+        hermesBytecodeVersionQuery.c_str(),
+        appIdQuery.c_str());
   }
 
   static std::string get_OnChangeEndpointUrl(const std::string &sourceBundleHost, const uint16_t sourceBundlePort) {
@@ -91,7 +99,8 @@ class DevServerHelper {
   }
 
   static constexpr const char DeviceLocalHostFormat[] = "%s:%d";
-  static constexpr const char BundleUrlFormat[] = "http://%s/%s.bundle?platform=%s&dev=%s&hot=%s&inlineSourceMap=%s%s";
+  static constexpr const char BundleUrlFormat[] =
+      "http://%s/%s.bundle?platform=%s&dev=%s&hot=%s&inlineSourceMap=%s%s%s";
   static constexpr const char SourceMapUrlFormat[] = "http://%s/%s.map?platform=%s&dev=%s&hot=%s";
   static constexpr const char LaunchDevToolsCommandUrlFormat[] = "http://%s/launch-js-devtools";
   static constexpr const char OnChangeEndpointUrlFormat[] = "http://%s/onchange";

package/Shared/DevSettings.h

@@ -43,6 +43,7 @@ struct DevSettings {
   std::string sourceBundleHost;
   std::string debugBundlePath;
   std::string platformName{STRING(RN_PLATFORM)};
+  std::string bundleAppId;
   std::function<void()> liveReloadCallback;
   std::function<void(std::string)> errorCallback;
   std::function<void()> waitingForDebuggerCallback;

package/Shared/DevSupportManager.cpp

@@ -246,6 +246,7 @@ void DevSupportManager::EnsureHermesInspector(
 #ifdef HERMES_ENABLE_DEBUGGER
   static std::once_flag once;
   std::call_once(once, [this, &packagerHost, packagerPort]() {
+    // TODO: should we use the bundleAppId as the app param if available?
     std::string packageName("RNW");
     wchar_t fullName[PACKAGE_FULL_NAME_MAX_LENGTH]{};
     UINT32 size = ARRAYSIZE(fullName);
@@ -280,12 +281,21 @@ std::pair<std::string, bool> GetJavaScriptFromServer(
     const uint16_t sourceBundlePort,
     const std::string &jsBundleName,
     const std::string &platform,
+    const std::string &bundleAppId,
     bool dev,
     bool hot,
     bool inlineSourceMap,
     const uint32_t hermesBytecodeVersion) {
   auto bundleUrl = facebook::react::DevServerHelper::get_BundleUrl(
-      sourceBundleHost, sourceBundlePort, jsBundleName, platform, dev, hot, inlineSourceMap, hermesBytecodeVersion);
+      sourceBundleHost,
+      sourceBundlePort,
+      jsBundleName,
+      platform,
+      bundleAppId,
+      dev,
+      hot,
+      inlineSourceMap,
+      hermesBytecodeVersion);
   try {
     return GetJavaScriptFromServerAsync(bundleUrl).get();
   } catch (winrt::hresult_error const &e) {

package/Shared/DevSupportManager.h

@@ -31,6 +31,7 @@ std::pair<std::string, bool> GetJavaScriptFromServer(
     const uint16_t sourceBundlePort,
     const std::string &jsBundleName,
     const std::string &platform,
+    const std::string &bundleAppId,
     bool dev,
     bool hot,
     bool inlineSourceMap,

package/Shared/HermesRuntimeHolder.cpp

@@ -3,38 +3,40 @@
 
 #include "pch.h"
 
-#include <memory>
-#include <mutex>
+#include "HermesRuntimeHolder.h"
 
 #include <JSI/decorator.h>
+#include <crash/verifyElseCrash.h>
 #include <cxxreact/MessageQueueThread.h>
 #include <cxxreact/SystraceSection.h>
 #include <hermes/hermes.h>
-#include "HermesRuntimeHolder.h"
 #include "HermesShim.h"
 
 #if defined(HERMES_ENABLE_DEBUGGER)
 #include <hermes/inspector/chrome/Registration.h>
 #endif
 
+#include <memory>
+#include <mutex>
+
 using namespace facebook;
 using namespace Microsoft::ReactNative;
 
-namespace facebook {
-namespace react {
+namespace React {
+using namespace winrt::Microsoft::ReactNative;
+}
 
-namespace {
+namespace facebook::react {
 
-std::unique_ptr<facebook::hermes::HermesRuntime> makeHermesRuntimeSystraced(bool enableDefaultCrashHandler) {
-  SystraceSection s("HermesExecutorFactory::makeHermesRuntimeSystraced");
-  if (enableDefaultCrashHandler) {
-    return HermesShim::makeHermesRuntimeWithWER();
-  } else {
-    auto runtimeConfig = ::hermes::vm::RuntimeConfig();
-    return HermesShim::makeHermesRuntime(runtimeConfig);
-  }
+React::ReactPropertyId<React::ReactNonAbiValue<std::shared_ptr<HermesRuntimeHolder>>>
+HermesRuntimeHolderProperty() noexcept {
+  static React::ReactPropertyId<React::ReactNonAbiValue<std::shared_ptr<HermesRuntimeHolder>>> propId{
+      L"ReactNative.HermesRuntimeHolder", L"HermesRuntimeHolder"};
+  return propId;
 }
 
+namespace {
+
 #ifdef HERMES_ENABLE_DEBUGGER
 class HermesExecutorRuntimeAdapter final : public facebook::hermes::inspector::RuntimeAdapter {
  public:
@@ -71,10 +73,19 @@ class HermesExecutorRuntimeAdapter final : public facebook::hermes::inspector::R
 };
 #endif
 
+std::shared_ptr<HermesShim> makeHermesShimSystraced(bool enableDefaultCrashHandler) {
+  SystraceSection s("HermesExecutorFactory::makeHermesRuntimeSystraced");
+  if (enableDefaultCrashHandler) {
+    return HermesShim::makeWithWER();
+  } else {
+    return HermesShim::make();
+  }
+}
+
 } // namespace
 
 void HermesRuntimeHolder::crashHandler(int fileDescriptor) noexcept {
-  HermesShim::hermesCrashHandler(*m_hermesRuntime, fileDescriptor);
+  m_hermesShim->dumpCrashData(fileDescriptor);
 }
 
 void HermesRuntimeHolder::teardown() noexcept {
@@ -90,15 +101,9 @@ facebook::react::JSIEngineOverride HermesRuntimeHolder::getRuntimeType() noexcep
 }
 
 std::shared_ptr<jsi::Runtime> HermesRuntimeHolder::getRuntime() noexcept {
-  std::call_once(m_once_flag, [this]() { initRuntime(); });
-
-  if (!m_hermesRuntime)
-    std::terminate();
-
-  // Make sure that the runtime instance is not consumed from multiple threads.
-  if (m_own_thread_id != std::this_thread::get_id())
-    std::terminate();
-
+  std::call_once(m_onceFlag, [this]() { initRuntime(); });
+  VerifyElseCrash(m_hermesRuntime);
+  VerifyElseCrashSz(m_ownThreadId == std::this_thread::get_id(), "Must be accessed from JS thread.");
   return m_hermesRuntime;
 }
 
@@ -109,11 +114,11 @@ HermesRuntimeHolder::HermesRuntimeHolder(
 
 void HermesRuntimeHolder::initRuntime() noexcept {
   auto devSettings = m_weakDevSettings.lock();
-  if (!devSettings)
-    std::terminate();
+  VerifyElseCrash(devSettings);
 
-  m_hermesRuntime = makeHermesRuntimeSystraced(devSettings->enableDefaultCrashHandler);
-  m_own_thread_id = std::this_thread::get_id();
+  m_hermesShim = makeHermesShimSystraced(devSettings->enableDefaultCrashHandler);
+  m_hermesRuntime = m_hermesShim->getRuntime();
+  m_ownThreadId = std::this_thread::get_id();
 
 #ifdef HERMES_ENABLE_DEBUGGER
   if (devSettings->useDirectDebugger) {
@@ -132,5 +137,23 @@ void HermesRuntimeHolder::initRuntime() noexcept {
   errorPrototype.setProperty(*m_hermesRuntime, "jsEngine", "hermes");
 }
 
-} // namespace react
-} // namespace facebook
+std::shared_ptr<HermesRuntimeHolder> HermesRuntimeHolder::loadFrom(
+    React::ReactPropertyBag const &propertyBag) noexcept {
+  return *(propertyBag.Get(HermesRuntimeHolderProperty()));
+}
+
+void HermesRuntimeHolder::storeTo(
+    React::ReactPropertyBag const &propertyBag,
+    std::shared_ptr<HermesRuntimeHolder> const &holder) noexcept {
+  propertyBag.Set(HermesRuntimeHolderProperty(), holder);
+}
+
+void HermesRuntimeHolder::addToProfiling() const noexcept {
+  m_hermesShim->addToProfiling();
+}
+
+void HermesRuntimeHolder::removeFromProfiling() const noexcept {
+  m_hermesShim->removeFromProfiling();
+}
+
+} // namespace facebook::react

package/Shared/HermesRuntimeHolder.h

@@ -8,37 +8,52 @@
 #include <thread>
 
 #include <DevSettings.h>
+#include <ReactPropertyBag.h>
 
 namespace facebook::hermes {
 class HermesRuntime;
 }
 
-namespace facebook {
-namespace react {
+namespace Microsoft::ReactNative {
+class HermesShim;
+}
+
+namespace facebook::react {
+
+class MessageQueueThread;
 
 class HermesRuntimeHolder : public Microsoft::JSI::RuntimeHolderLazyInit {
- public:
+ public: // RuntimeHolderLazyInit implementation.
   std::shared_ptr<facebook::jsi::Runtime> getRuntime() noexcept override;
   facebook::react::JSIEngineOverride getRuntimeType() noexcept override;
-
   void crashHandler(int fileDescriptor) noexcept override;
-
   void teardown() noexcept override;
 
+ public:
   HermesRuntimeHolder(
       std::shared_ptr<facebook::react::DevSettings> devSettings,
       std::shared_ptr<facebook::react::MessageQueueThread> jsQueue) noexcept;
 
+  static std::shared_ptr<HermesRuntimeHolder> loadFrom(
+      winrt::Microsoft::ReactNative::ReactPropertyBag const &propertyBag) noexcept;
+
+  static void storeTo(
+      winrt::Microsoft::ReactNative::ReactPropertyBag const &propertyBag,
+      std::shared_ptr<HermesRuntimeHolder> const &holder) noexcept;
+
+  void addToProfiling() const noexcept;
+  void removeFromProfiling() const noexcept;
+
  private:
   void initRuntime() noexcept;
-  std::shared_ptr<facebook::hermes::HermesRuntime> m_hermesRuntime;
-
-  std::once_flag m_once_flag;
-  std::thread::id m_own_thread_id;
 
+ private:
+  std::shared_ptr<Microsoft::ReactNative::HermesShim> m_hermesShim;
+  std::shared_ptr<facebook::hermes::HermesRuntime> m_hermesRuntime;
+  std::once_flag m_onceFlag{};
+  std::thread::id m_ownThreadId{};
   std::weak_ptr<facebook::react::DevSettings> m_weakDevSettings;
   std::shared_ptr<facebook::react::MessageQueueThread> m_jsQueue;
 };
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react