Move tail hydration mismatch back to hydration context

Fixes an issue where no recoverable error is thrown in this case.

packages/react-dom/src/__tests__/ReactDOMServerPartialHydration-test.internal.js

@@ -538,6 +538,7 @@ describe('ReactDOMServerPartialHydration', () => {
  assertLog([
  'Server rendered',
  'Client rendered',
+ 'Hydration failed because the initial UI does not match what was rendered on the server.',
  'There was an error while hydrating this Suspense boundary. ' +
  'Switched to client rendering.',
  ]);

packages/react-reconciler/src/ReactFiberCompleteWork.js

@@ -141,11 +141,9 @@ import {
  prepareToHydrateHostInstance,
  prepareToHydrateHostTextInstance,
  prepareToHydrateHostSuspenseInstance,
- warnIfUnhydratedTailNodes,
  popHydrationState,
  resetHydrationState,
  getIsHydrating,
- hasUnhydratedTailNodes,
  upgradeHydrationErrorsToRecoverable,
 } from './ReactFiberHydrationContext';
 import {
@@ -866,18 +864,6 @@ function completeDehydratedSuspenseBoundary(
  workInProgress: Fiber,
  nextState: SuspenseState | null,
 ): boolean {
- if (
- hasUnhydratedTailNodes() &&
- (workInProgress.mode & ConcurrentMode) !== NoMode &&
- (workInProgress.flags & DidCapture) === NoFlags
- ) {
- warnIfUnhydratedTailNodes(workInProgress);
- resetHydrationState();
- workInProgress.flags |= ForceClientRender | DidCapture;
-
- return false;
- }
-
  const wasHydrated = popHydrationState(workInProgress);
 
  if (nextState !== null && nextState.dehydrated !== null) {
@@ -1337,7 +1323,6 @@ function completeWork(
  return null;
  }
  case SuspenseComponent: {
- popSuspenseHandler(workInProgress);
  const nextState: null | SuspenseState = workInProgress.memoizedState;
 
  // Special path for dehydrated boundaries. We may eventually move this
@@ -1358,10 +1343,12 @@ function completeWork(
  );
  if (!fallthroughToNormalSuspensePath) {
  if (workInProgress.flags & ForceClientRender) {
+ popSuspenseHandler(workInProgress);
  // Special case. There were remaining unhydrated nodes. We treat
  // this as a mismatch. Revert to client rendering.
  return workInProgress;
  } else {
+ popSuspenseHandler(workInProgress);
  // Did not finish hydrating, either because this is the initial
  // render or because something suspended.
  return null;
@@ -1371,6 +1358,8 @@ function completeWork(
  // Continue with the normal Suspense path.
  }
 
+ popSuspenseHandler(workInProgress);
+
  if ((workInProgress.flags & DidCapture) !== NoFlags) {
  // Something suspended. Re-render with the fallback children.
  workInProgress.lanes = renderLanes;

packages/react-reconciler/src/ReactFiberHydrationContext.js

@@ -893,10 +893,6 @@ function popHydrationState(fiber: Fiber): boolean {
  return true;
 }
 
-function hasUnhydratedTailNodes(): boolean {
- return isHydrating && nextHydratableInstance !== null;
-}
-
 function warnIfUnhydratedTailNodes(fiber: Fiber) {
  let nextInstance = nextHydratableInstance;
  while (nextInstance) {
@@ -952,6 +948,4 @@ export {
  prepareToHydrateHostTextInstance,
  prepareToHydrateHostSuspenseInstance,
  popHydrationState,
- hasUnhydratedTailNodes,
- warnIfUnhydratedTailNodes,
 };