From 9cf2ee3c04e0bd0458adec8e027f864a2c26ebd9 Mon Sep 17 00:00:00 2001
From: eps1lon <sebastian.silbermann@vercel.com>
Date: Thu, 18 Jul 2024 14:41:13 +0200
Subject: [PATCH] Stop handling hydration errors from unsupported React
 versions

---
 .../component-stack-pseudo-html.tsx           |  2 +-
 .../internal/helpers/hydration-error-info.ts  | 22 ++-----------------
 2 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/packages/next/src/client/components/react-dev-overlay/internal/container/RuntimeError/component-stack-pseudo-html.tsx b/packages/next/src/client/components/react-dev-overlay/internal/container/RuntimeError/component-stack-pseudo-html.tsx
index 58b2e2d199665..6b2c858d6f346 100644
--- a/packages/next/src/client/components/react-dev-overlay/internal/container/RuntimeError/component-stack-pseudo-html.tsx
+++ b/packages/next/src/client/components/react-dev-overlay/internal/container/RuntimeError/component-stack-pseudo-html.tsx
@@ -66,7 +66,7 @@ export function PseudoHtmlDiff({
   firstContent: string
   secondContent: string
   reactOutputComponentDiff: string | undefined
-  hydrationMismatchType: 'tag' | 'text' | 'text-in-tag'
+  hydrationMismatchType: 'tag' | 'text'
 } & React.HTMLAttributes<HTMLPreElement>) {
   const isHtmlTagsWarning = hydrationMismatchType === 'tag'
   const isReactHydrationDiff = !!reactOutputComponentDiff
diff --git a/packages/next/src/client/components/react-dev-overlay/internal/helpers/hydration-error-info.ts b/packages/next/src/client/components/react-dev-overlay/internal/helpers/hydration-error-info.ts
index 5596f7dde95e1..67f93a4ad3070 100644
--- a/packages/next/src/client/components/react-dev-overlay/internal/helpers/hydration-error-info.ts
+++ b/packages/next/src/client/components/react-dev-overlay/internal/helpers/hydration-error-info.ts
@@ -21,35 +21,17 @@ const htmlTagsWarnings = new Set([
   'Warning: In HTML, %s cannot be a descendant of <%s>.\nThis will cause a hydration error.%s',
   'Warning: In HTML, text nodes cannot be a child of <%s>.\nThis will cause a hydration error.',
   "Warning: In HTML, whitespace text nodes cannot be a child of <%s>. Make sure you don't have any extra whitespace between tags on each line of your source code.\nThis will cause a hydration error.",
-  'Warning: Expected server HTML to contain a matching <%s> in <%s>.%s',
-  'Warning: Did not expect server HTML to contain a <%s> in <%s>.%s',
 ])
-const textAndTagsMismatchWarnings = new Set([
-  'Warning: Expected server HTML to contain a matching text node for "%s" in <%s>.%s',
-  'Warning: Did not expect server HTML to contain the text node "%s" in <%s>.%s',
-])
-const textMismatchWarning =
-  'Warning: Text content did not match. Server: "%s" Client: "%s"%s'
 
-export const getHydrationWarningType = (
-  msg: NullableText
-): 'tag' | 'text' | 'text-in-tag' => {
+export const getHydrationWarningType = (msg: NullableText): 'tag' | 'text' => {
   if (isHtmlTagsWarning(msg)) return 'tag'
-  if (isTextInTagsMismatchWarning(msg)) return 'text-in-tag'
   return 'text'
 }
 
 const isHtmlTagsWarning = (msg: NullableText) =>
   Boolean(msg && htmlTagsWarnings.has(msg))
 
-const isTextMismatchWarning = (msg: NullableText) => textMismatchWarning === msg
-const isTextInTagsMismatchWarning = (msg: NullableText) =>
-  Boolean(msg && textAndTagsMismatchWarnings.has(msg))
-
-const isKnownHydrationWarning = (msg: NullableText) =>
-  isHtmlTagsWarning(msg) ||
-  isTextInTagsMismatchWarning(msg) ||
-  isTextMismatchWarning(msg)
+const isKnownHydrationWarning = (msg: NullableText) => isHtmlTagsWarning(msg)
 
 export const getReactHydrationDiffSegments = (msg: NullableText) => {
   if (msg) {