wip

Author: ljharb

.github/workflows/node.yml

@@ -72,9 +72,12 @@ jobs:
       fail-fast: false
       matrix:
         node-version:
+          - '25'
+          - '22'
           - '18'
           - '4'
         react:
+          - '17'
           - '16.14'
           - '16.13'
           - '16.12'

packages/enzyme-test-suite/test/shared/lifecycles/componentDidCatch.jsx

@@ -2,6 +2,8 @@ import React from 'react';
 import sinon from 'sinon-sandbox';
 import { expect } from 'chai';
 
+import path from 'path';
+
 import { is } from '../../_helpers/version';
 import {
   describeIf,
@@ -251,23 +253,32 @@ export default function describeCDC({
           if (is('>= 17')) {
             expect(info).to.have.property('componentStack');
             expect(info.componentStack).to.match(/at Thrower (.+)\n/);
-          } 
-          // else {
-          var FILE_PATH = __filename.replace(/^.*?(\/build)/, '$1');
-          var inStr = is('>= 17') ? 'at' : 'in';
-          info.componentStack = info.componentStack.replace(/^.*?(\/build)/, '$1');
-          info.componentStack = info.componentStack.replace(/at/g, inStr);
+          }
+          const FILE_PATH = __filename;
+          const MOUNT_WRAPPER_PATH = path.join(
+            FILE_PATH,
+            '../../../../../enzyme-adapter-utils/build/createMountWrapper.js',
+          );
+          info.componentStack = info.componentStack
+            .replace(/^.*?(\/build)/, '$1')
+            .replace(/([^(]+\/[^:]+):\d+:\d+/gm, '$1:$LINE:$COL');
           expect(info).to.deep.equal({
-            componentStack: `
-    ${inStr} Thrower (${FILE_PATH})
-    ${inStr} span (${FILE_PATH})${hasFragments ? '' : `
-    in main (${FILE_PATH})`}
-    ${inStr} div (${FILE_PATH})
-    ${inStr} ErrorBoundary (created by ErrorSFC)
-    ${inStr} ErrorSFC (created by WrapperComponent)
-    ${inStr} WrapperComponent`,
+            componentStack: is('>= 17')
+              ? `
+    at Thrower (${__filename}:$LINE:$COL)
+    at span
+    at div
+    at ErrorBoundary (${FILE_PATH}:$LINE:$COL)
+    at ErrorSFC
+    at WrapperComponent (${MOUNT_WRAPPER_PATH}:$LINE:$COL)`
+              : `
+    in Thrower (${__filename}:$LINE:$COL
+    in span (created by ErrorBoundary)
+    in div (created by ErrorBoundary)
+    in ErrorBoundary (created by ErrorSFC)
+    in ErrorSFC (created by WrapperComponent)
+    in WrapperComponent:$LINE:$COL`,
           });
-          // }
         });
       });
     });