From 99da28b9726f1eb0991de8161d17cbbba508aca1 Mon Sep 17 00:00:00 2001
From: Josh Story <story@hey.com>
Date: Tue, 19 Apr 2022 16:28:07 -0700
Subject: [PATCH] Mark hydration as suspending on every thrownException

previously hydration would only be marked as supsending when a genuine error was thrown. This created an opportunity for a hydration mismatch that would warn after which later hydration mismatches would not lead to warnings. By moving the marker check earlier in the thrownException function we get the hydration context to enter the didSuspend state on both error and thrown promise cases which eliminates this gap.
---
 packages/react-reconciler/src/ReactFiberThrow.new.js | 6 ++++--
 packages/react-reconciler/src/ReactFiberThrow.old.js | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/react-reconciler/src/ReactFiberThrow.new.js b/packages/react-reconciler/src/ReactFiberThrow.new.js
index 815cb25ef045f..bf8d83e8f8685 100644
--- a/packages/react-reconciler/src/ReactFiberThrow.new.js
+++ b/packages/react-reconciler/src/ReactFiberThrow.new.js
@@ -444,6 +444,10 @@ function throwException(
     }
   }
 
+  if (getIsHydrating() && sourceFiber.mode & ConcurrentMode) {
+    markDidSuspendWhileHydratingDEV();
+  }
+
   if (
     value !== null &&
     typeof value === 'object' &&
@@ -514,8 +518,6 @@ function throwException(
   } else {
     // This is a regular error, not a Suspense wakeable.
     if (getIsHydrating() && sourceFiber.mode & ConcurrentMode) {
-      markDidSuspendWhileHydratingDEV();
-
       const suspenseBoundary = getNearestSuspenseBoundaryToCapture(returnFiber);
       // If the error was thrown during hydration, we may be able to recover by
       // discarding the dehydrated content and switching to a client render.
diff --git a/packages/react-reconciler/src/ReactFiberThrow.old.js b/packages/react-reconciler/src/ReactFiberThrow.old.js
index ec89f5ab0cd5e..6f7609a4fdeb0 100644
--- a/packages/react-reconciler/src/ReactFiberThrow.old.js
+++ b/packages/react-reconciler/src/ReactFiberThrow.old.js
@@ -444,6 +444,10 @@ function throwException(
     }
   }
 
+  if (getIsHydrating() && sourceFiber.mode & ConcurrentMode) {
+    markDidSuspendWhileHydratingDEV();
+  }
+
   if (
     value !== null &&
     typeof value === 'object' &&
@@ -514,8 +518,6 @@ function throwException(
   } else {
     // This is a regular error, not a Suspense wakeable.
     if (getIsHydrating() && sourceFiber.mode & ConcurrentMode) {
-      markDidSuspendWhileHydratingDEV();
-
       const suspenseBoundary = getNearestSuspenseBoundaryToCapture(returnFiber);
       // If the error was thrown during hydration, we may be able to recover by
       // discarding the dehydrated content and switching to a client render.