update turbopack snpashots

vercel · Oct 22, 2024 · 9a4c20b · 9a4c20b
1 parent 3b15866
commit 9a4c20b
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 12 deletions.
diff --git a/packages/next/src/client/components/react-dev-overlay/internal/helpers/stitched-error.ts b/packages/next/src/client/components/react-dev-overlay/internal/helpers/stitched-error.ts
@@ -1,9 +1,7 @@
 import React from 'react'
 import isError from '../../../../../lib/is-error'
 
-const captureOwnerStack = process.env.__NEXT_REACT_OWNER_STACK
-  ? (React as any).captureOwnerStack
-  : () => ''
+const captureOwnerStack = (React as any).captureOwnerStack || (() => '')
 
 const REACT_ERROR_STACK_BOTTOM_FRAME = 'react-stack-bottom-frame'
 const REACT_ERROR_STACK_BOTTOM_FRAME_REGEX = new RegExp(

diff --git a/packages/next/src/client/react-client-callbacks/app-router.ts b/packages/next/src/client/react-client-callbacks/app-router.ts
@@ -13,7 +13,6 @@ export const onCaughtError: HydrationOptions['onCaughtError'] = (
   err,
   errorInfo
 ) => {
-
   // Skip certain custom errors which are not expected to be reported on client
   if (isBailoutToCSRError(err) || isNextRouterError(err)) return
 
@@ -64,14 +63,11 @@ export const onUncaughtError: HydrationOptions['onUncaughtError'] = (
   err,
   errorInfo
 ) => {
-  console.log('onUncaughtError', err, errorInfo)
   // Skip certain custom errors which are not expected to be reported on client
   if (isBailoutToCSRError(err) || isNextRouterError(err)) return
 
   const stitchedError = getReactStitchedError(err)
 
-  console.log('stitchedError', stitchedError)
-
   if (process.env.NODE_ENV === 'development') {
     const componentThatErroredFrame = errorInfo?.componentStack?.split('\n')[1]
 

diff --git a/test/development/app-dir/stitching-errors/stitching-errors.test.ts b/test/development/app-dir/stitching-errors/stitching-errors.test.ts
@@ -1,5 +1,9 @@
 import { nextTestSetup } from 'e2e-utils'
-import { assertHasRedbox, assertNoRedbox } from 'next-test-utils'
+import {
+  assertHasRedbox,
+  assertNoRedbox,
+  waitForAndOpenRuntimeError,
+} from 'next-test-utils'
 
 // TODO: parse the location and assert them in the future
 // Remove the location `()` part in every line of stack trace;
@@ -52,8 +56,8 @@ describe('stitching errors', () => {
     const stackFramesContent = await getStackFramesContent(browser)
     if (process.env.TURBOPACK) {
       expect(stackFramesContent).toMatchInlineSnapshot(`
-        "useErrorHook @ app/browser/uncaught/page.js 
-        Page @ app/browser/uncaught/page.js"
+        "at useErrorHook (app/browser/uncaught/page.js (10:3))
+        at Page (app/browser/uncaught/page.js (14:3))"
       `)
     } else {
       expect(stackFramesContent).toMatchInlineSnapshot(`
@@ -118,6 +122,17 @@ describe('stitching errors', () => {
       return log.message.includes('Error: browser error')
     }).message
 
+    await waitForAndOpenRuntimeError(browser)
+
+    const stackFramesContent = await getStackFramesContent(browser)
+
+    expect(stackFramesContent).toMatchInlineSnapshot(`
+      "at useErrorHook (app/browser/caught/page.js (39:3))
+      at Thrower (app/browser/caught/page.js (29:3))
+      at Inner (app/browser/caught/page.js (23:7))
+      at Page (app/browser/caught/page.js (43:10))"
+    `)
+
     expect(normalizeStackTrace(errorLog)).toMatchInlineSnapshot(`
       "Error: browser error
       at useThrowError 
@@ -146,8 +161,8 @@ describe('stitching errors', () => {
     const stackFramesContent = await getStackFramesContent(browser)
     if (process.env.TURBOPACK) {
       expect(stackFramesContent).toMatchInlineSnapshot(`
-        "useErrorHook @ app/ssr/page.js 
-        Page @ app/ssr/page.js"
+        "at useErrorHook (app/ssr/page.js (8:3))
+        at Page (app/ssr/page.js (12:3))"
       `)
     } else {
       expect(stackFramesContent).toMatchInlineSnapshot(`