Stabilize catchError CI failures

Author: devjiwonchoi

packages/next/error.js

@@ -9,4 +9,8 @@ try {
   errorModule = {}
 }
 
-module.exports = errorModule
+const ErrorComponent = errorModule.default || errorModule
+
+module.exports = ErrorComponent
+Object.assign(module.exports, errorModule)
+module.exports.default = ErrorComponent

test/e2e/app-dir/catch-error/app/navigation-reset/error/page.tsx

@@ -1,3 +1,5 @@
-export default function Page() {
+export const dynamic = 'force-dynamic'
+
+export default function Page(): never {
   throw new Error('navigation reset test')
 }

test/e2e/app-dir/catch-error/catch-error.test.ts

@@ -91,7 +91,9 @@ describe('app-dir - catchError', () => {
     await browser.waitForElementByCss('#navigation-reset-error')
 
     expect(await browser.elementByCss('#navigation-reset-error').text()).toBe(
-      'navigation reset test'
+      isNextDev
+        ? 'navigation reset test'
+        : 'An error occurred in the Server Components render. The specific message is omitted in production builds to avoid leaking sensitive details. A digest property is included on this error instance which may provide additional details about the nature of the error.'
     )
 
     await browser.elementByCss('#navigation-reset-safe-link').click()

test/e2e/app-dir/errors/index.test.ts

@@ -8,7 +8,12 @@ import stripAnsi from 'strip-ansi'
  */
 function normalizeComponentStack(stack: string): string[] {
   // Match "at ComponentName" patterns, optionally with [Server] tag
-  return stack.match(/at \w+(?:\s+\[Server\])?/g) || []
+  return (stack.match(/at \w+(?:\s+\[Server\])?/g) || []).map((component) =>
+    component.replace(
+      'InnerScrollAndFocusHandlerOld',
+      'InnerScrollAndFocusHandler'
+    )
+  )
 }
 
 describe('app-dir - errors', () => {