Add gating for prod too

Author: rickhanlonii

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

@@ -424,9 +424,12 @@ export function renderWithHooks<Props, SecondArg>(
     }
   } else {
     ReactCurrentDispatcher.current =
-      current === null || current.memoizedState === null
-        ? HooksDispatcherOnMount
-        : HooksDispatcherOnUpdate;
+      current !== null &&
+      ((enableThrowOnMountForHookMismatch &&
+        (current.mode & ConcurrentMode) !== NoMode) ||
+        current.memoizedState !== null)
+        ? HooksDispatcherOnUpdate
+        : HooksDispatcherOnMount;
   }
 
   let children = Component(props, secondArg);

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

@@ -407,7 +407,9 @@ export function renderWithHooks<Props, SecondArg>(
     // be null during updates and mounts.
     if (
       current !== null &&
-      (enableThrowOnMountForHookMismatch || current.memoizedState !== null)
+      ((enableThrowOnMountForHookMismatch &&
+        (current.mode & ConcurrentMode) !== NoMode) ||
+        current.memoizedState !== null)
     ) {
       ReactCurrentDispatcher.current = HooksDispatcherOnUpdateInDEV;
     } else if (current !== null) {
@@ -422,9 +424,12 @@ export function renderWithHooks<Props, SecondArg>(
     }
   } else {
     ReactCurrentDispatcher.current =
-      current === null || current.memoizedState === null
-        ? HooksDispatcherOnMount
-        : HooksDispatcherOnUpdate;
+      current !== null &&
+      ((enableThrowOnMountForHookMismatch &&
+        (current.mode & ConcurrentMode) !== NoMode) ||
+        current.memoizedState !== null)
+        ? HooksDispatcherOnUpdate
+        : HooksDispatcherOnMount;
   }
 
   let children = Component(props, secondArg);
@@ -484,8 +489,9 @@ export function renderWithHooks<Props, SecondArg>(
   const didRenderTooFewHooks =
     (currentHook !== null && currentHook.next !== null) ||
     (enableThrowOnMountForHookMismatch &&
-      current !== null &&
-      current.memoizedState !== null &&
+      current != null &&
+      (current.mode & ConcurrentMode) !== NoMode &&
+      current.memoizedState != null &&
       workInProgress.memoizedState == null);
 
   renderLanes = NoLanes;