add DEV suffix to didSuspendOrError to better indicate this feature should only affect dev behavior

Author: gnoff

packages/react-reconciler/src/ReactFiberHydrationContext.new.js

@@ -87,7 +87,7 @@ let isHydrating: boolean = false;
 
 // this flag allows for warning supression when we expect there to be mismatches due to
 // earlier mismatches or a suspended fiber.
-let didSuspendOrError: boolean = false;
+let didSuspendOrErrorDEV: boolean = false;
 
 // Hydration errors that were thrown inside this boundary
 let hydrationErrors: Array<mixed> | null = null;
@@ -104,7 +104,7 @@ function warnIfHydrating() {
 
 export function markDidThrowWhileHydratingDEV() {
   if (__DEV__) {
-    didSuspendOrError = true;
+    didSuspendOrErrorDEV = true;
   }
 }
 
@@ -120,7 +120,7 @@ function enterHydrationState(fiber: Fiber): boolean {
   hydrationParentFiber = fiber;
   isHydrating = true;
   hydrationErrors = null;
-  didSuspendOrError = false;
+  didSuspendOrErrorDEV = false;
   return true;
 }
 
@@ -138,7 +138,7 @@ function reenterHydrationStateFromDehydratedSuspenseInstance(
   hydrationParentFiber = fiber;
   isHydrating = true;
   hydrationErrors = null;
-  didSuspendOrError = false;
+  didSuspendOrErrorDEV = false;
   if (treeContext !== null) {
     restoreSuspendedTreeContext(fiber, treeContext);
   }
@@ -203,7 +203,7 @@ function deleteHydratableInstance(
 
 function warnNonhydratedInstance(returnFiber: Fiber, fiber: Fiber) {
   if (__DEV__) {
-    if (didSuspendOrError) {
+    if (didSuspendOrErrorDEV) {
       // Inside a boundary that already suspended. We're currently rendering the
       // siblings of a suspended node. The mismatch may be due to the missing
       // data, so it's probably a false positive.
@@ -454,7 +454,7 @@ function prepareToHydrateHostInstance(
   }
 
   const instance: Instance = fiber.stateNode;
-  const shouldWarnIfMismatchDev = !didSuspendOrError;
+  const shouldWarnIfMismatchDev = !didSuspendOrErrorDEV;
   const updatePayload = hydrateInstance(
     instance,
     fiber.type,
@@ -484,7 +484,7 @@ function prepareToHydrateHostTextInstance(fiber: Fiber): boolean {
 
   const textInstance: TextInstance = fiber.stateNode;
   const textContent: string = fiber.memoizedProps;
-  const shouldWarnIfMismatchDev = !didSuspendOrError;
+  const shouldWarnIfMismatchDev = !didSuspendOrErrorDEV;
   const shouldUpdate = hydrateTextInstance(
     textInstance,
     textContent,
@@ -663,7 +663,7 @@ function resetHydrationState(): void {
   hydrationParentFiber = null;
   nextHydratableInstance = null;
   isHydrating = false;
-  didSuspendOrError = false;
+  didSuspendOrErrorDEV = false;
 }
 
 export function upgradeHydrationErrorsToRecoverable(): void {

packages/react-reconciler/src/ReactFiberHydrationContext.old.js

@@ -87,7 +87,11 @@ let isHydrating: boolean = false;
 
 // this flag allows for warning supression when we expect there to be mismatches due to
 // earlier mismatches or a suspended fiber.
+<<<<<<< packages/react-reconciler/src/ReactFiberHydrationContext.old.js
 let didSuspendOrError: boolean = false;
+=======
+let didSuspendOrErrorDEV: boolean = false;
+>>>>>>> packages/react-reconciler/src/ReactFiberHydrationContext.new.js
 
 // Hydration errors that were thrown inside this boundary
 let hydrationErrors: Array<mixed> | null = null;
@@ -104,7 +108,11 @@ function warnIfHydrating() {
 
 export function markDidThrowWhileHydratingDEV() {
   if (__DEV__) {
+<<<<<<< packages/react-reconciler/src/ReactFiberHydrationContext.old.js
     didSuspendOrError = true;
+=======
+    didSuspendOrErrorDEV = true;
+>>>>>>> packages/react-reconciler/src/ReactFiberHydrationContext.new.js
   }
 }
 
@@ -120,7 +128,11 @@ function enterHydrationState(fiber: Fiber): boolean {
   hydrationParentFiber = fiber;
   isHydrating = true;
   hydrationErrors = null;
+<<<<<<< packages/react-reconciler/src/ReactFiberHydrationContext.old.js
   didSuspendOrError = false;
+=======
+  didSuspendOrErrorDEV = false;
+>>>>>>> packages/react-reconciler/src/ReactFiberHydrationContext.new.js
   return true;
 }
 
@@ -138,7 +150,11 @@ function reenterHydrationStateFromDehydratedSuspenseInstance(
   hydrationParentFiber = fiber;
   isHydrating = true;
   hydrationErrors = null;
+<<<<<<< packages/react-reconciler/src/ReactFiberHydrationContext.old.js
   didSuspendOrError = false;
+=======
+  didSuspendOrErrorDEV = false;
+>>>>>>> packages/react-reconciler/src/ReactFiberHydrationContext.new.js
   if (treeContext !== null) {
     restoreSuspendedTreeContext(fiber, treeContext);
   }
@@ -203,7 +219,11 @@ function deleteHydratableInstance(
 
 function warnNonhydratedInstance(returnFiber: Fiber, fiber: Fiber) {
   if (__DEV__) {
+<<<<<<< packages/react-reconciler/src/ReactFiberHydrationContext.old.js
     if (didSuspendOrError) {
+=======
+    if (didSuspendOrErrorDEV) {
+>>>>>>> packages/react-reconciler/src/ReactFiberHydrationContext.new.js
       // Inside a boundary that already suspended. We're currently rendering the
       // siblings of a suspended node. The mismatch may be due to the missing
       // data, so it's probably a false positive.
@@ -454,7 +474,11 @@ function prepareToHydrateHostInstance(
   }
 
   const instance: Instance = fiber.stateNode;
+<<<<<<< packages/react-reconciler/src/ReactFiberHydrationContext.old.js
   const shouldWarnIfMismatchDev = !didSuspendOrError;
+=======
+  const shouldWarnIfMismatchDev = !didSuspendOrErrorDEV;
+>>>>>>> packages/react-reconciler/src/ReactFiberHydrationContext.new.js
   const updatePayload = hydrateInstance(
     instance,
     fiber.type,
@@ -484,7 +508,11 @@ function prepareToHydrateHostTextInstance(fiber: Fiber): boolean {
 
   const textInstance: TextInstance = fiber.stateNode;
   const textContent: string = fiber.memoizedProps;
+<<<<<<< packages/react-reconciler/src/ReactFiberHydrationContext.old.js
   const shouldWarnIfMismatchDev = !didSuspendOrError;
+=======
+  const shouldWarnIfMismatchDev = !didSuspendOrErrorDEV;
+>>>>>>> packages/react-reconciler/src/ReactFiberHydrationContext.new.js
   const shouldUpdate = hydrateTextInstance(
     textInstance,
     textContent,
@@ -663,7 +691,11 @@ function resetHydrationState(): void {
   hydrationParentFiber = null;
   nextHydratableInstance = null;
   isHydrating = false;
+<<<<<<< packages/react-reconciler/src/ReactFiberHydrationContext.old.js
   didSuspendOrError = false;
+=======
+  didSuspendOrErrorDEV = false;
+>>>>>>> packages/react-reconciler/src/ReactFiberHydrationContext.new.js
 }
 
 export function upgradeHydrationErrorsToRecoverable(): void {