Consider all React bottom frame formats

Author: eps1lon

packages/next/src/next-devtools/dev-overlay/shared.ts

@@ -214,9 +214,11 @@ export type DispatcherEvent =
   | RestartServerButtonAction
 
 const REACT_ERROR_STACK_BOTTOM_FRAME_REGEX =
-  // 1st group: v8
-  // 2nd group: SpiderMonkey, JavaScriptCore
-  /\s+(at react-stack-bottom-frame.*)|(react-stack-bottom-frame@.*)/
+  // 1st group: new frame + v8
+  // 2nd group: new frame + SpiderMonkey, JavaScriptCore
+  // 3rd group: old frame + v8
+  // 4th group: old frame + SpiderMonkey, JavaScriptCore
+  /\s+(at Object\.react_stack_bottom_frame.*)|(react_stack_bottom_frame@.*)|(at react-stack-bottom-frame.*)|(react-stack-bottom-frame@.*)/
 
 // React calls user code starting from a special stack frame.
 // The basic stack will be different if the same error location is hit again

packages/next/src/server/patch-error-inspect.ts

@@ -357,9 +357,14 @@ function parseAndSourceMap(
   // doesn't implement the name computation correctly.
   const errorName = computeErrorName(error)
 
-  let idx = unparsedStack.indexOf('react-stack-bottom-frame')
+  let idx = unparsedStack.indexOf('react_stack_bottom_frame')
   if (idx !== -1) {
     idx = unparsedStack.lastIndexOf('\n', idx)
+  } else {
+    idx = unparsedStack.indexOf('react-stack-bottom-frame')
+    if (idx !== -1) {
+      idx = unparsedStack.lastIndexOf('\n', idx)
+    }
   }
   if (idx !== -1 && !showIgnoreListed) {
     // Cut off everything after the bottom frame since it'll be React internals.

test/development/app-dir/owner-stack/owner-stack.test.ts

@@ -10,7 +10,9 @@ function normalizeBrowserConsoleStackTrace(trace: unknown) {
   return (
     trace
       // Removes React's internals i.e. incomplete ignore-listing
-      .split(/at react-stack-bottom-frame.*/m)[0]
+      .split(
+        /at (react-stack-bottom-frame|Object\.react_stack_bottom_frame).*/m
+      )[0]
       // Remove the location `()` part in every line of stack trace;
       .replace(/\(.*\)/g, '')
       // Remove the leading spaces in every line of stack trace;