[Fizz] Move digest from errorInfo to Error instance

packages/react-dom/src/__tests__/ReactDOMFizzServer-test.js

@@ -92,7 +92,7 @@ describe('ReactDOMFizzServer', () => {
   function expectErrors(errorsArr, toBeDevArr, toBeProdArr) {
     const mappedErrows = errorsArr.map(({error, errorInfo}) => {
       const stack = errorInfo && errorInfo.componentStack;
-      const digest = errorInfo && errorInfo.digest;
+      const digest = error.digest;
       if (stack) {
         return [error.message, digest, normalizeCodeLocInfo(stack)];
       } else if (digest) {
@@ -3230,6 +3230,46 @@ describe('ReactDOMFizzServer', () => {
     );
   });
 
+  it('warns in dev if you access digest from errorInfo in onRecoverableError', async () => {
+    await act(async () => {
+      const {pipe} = ReactDOMFizzServer.renderToPipeableStream(
+        <div>
+          <Suspense fallback={'loading...'}>
+            <AsyncText text={'hello'} />
+          </Suspense>
+        </div>,
+        {
+          onError(error) {
+            return 'a digest';
+          },
+        },
+      );
+      rejectText('hello');
+      pipe(writable);
+    });
+    expect(getVisibleChildren(container)).toEqual(<div>loading...</div>);
+
+    ReactDOMClient.hydrateRoot(
+      container,
+      <div>
+        <Suspense fallback={'loading...'}>hello</Suspense>
+      </div>,
+      {
+        onRecoverableError(error, errorInfo) {
+          expect(() => {
+            expect(errorInfo.digest).toBe('a digest');
+          }).toErrorDev(
+            'Warning: You are accessing "digest" from the errorInfo object passed to onRecoverableError.' +
+              ' This property is deprecated and will be removed in a future version of React.' +
+              ' To access the digest of an Error look for this property on the Error instance itself.',
+            {withoutStack: true},
+          );
+        },
+      },
+    );
+    expect(Scheduler).toFlushWithoutYielding();
+  });
+
   describe('error escaping', () => {
     it('escapes error hash, message, and component stack values in directly flushed errors (html escaping)', async () => {
       window.__outlet = {};

packages/react-reconciler/src/ReactFiberBeginWork.new.js

@@ -2746,6 +2746,7 @@ function updateDehydratedSuspenseComponent(
             'client rendering.',
         );
       }
+      (error: any).digest = digest;
       const capturedValue = createCapturedValue(error, digest, stack);
       return retrySuspenseComponentWithoutHydrating(
         current,

packages/react-reconciler/src/ReactFiberBeginWork.old.js

@@ -2746,6 +2746,7 @@ function updateDehydratedSuspenseComponent(
             'client rendering.',
         );
       }
+      (error: any).digest = digest;
       const capturedValue = createCapturedValue(error, digest, stack);
       return retrySuspenseComponentWithoutHydrating(
         current,

packages/react-reconciler/src/ReactFiberWorkLoop.new.js

@@ -2598,7 +2598,23 @@ function commitRootImpl(
       const recoverableError = recoverableErrors[i];
       const componentStack = recoverableError.stack;
       const digest = recoverableError.digest;
-      onRecoverableError(recoverableError.value, {componentStack, digest});
+      let errorInfo;
+      if (__DEV__) {
+        errorInfo = {
+          componentStack,
+          get digest() {
+            console.error(
+              'You are accessing "digest" from the errorInfo object passed to onRecoverableError.' +
+                ' This property is deprecated and will be removed in a future version of React.' +
+                ' To access the digest of an Error look for this property on the Error instance itself.',
+            );
+            return digest;
+          },
+        };
+      } else {
+        errorInfo = {componentStack, digest};
+      }
+      onRecoverableError(recoverableError.value, errorInfo);
     }
   }
 

packages/react-reconciler/src/ReactFiberWorkLoop.old.js

@@ -2598,7 +2598,23 @@ function commitRootImpl(
       const recoverableError = recoverableErrors[i];
       const componentStack = recoverableError.stack;
       const digest = recoverableError.digest;
-      onRecoverableError(recoverableError.value, {componentStack, digest});
+      let errorInfo;
+      if (__DEV__) {
+        errorInfo = {
+          componentStack,
+          get digest() {
+            console.error(
+              'You are accessing "digest" from the errorInfo object passed to onRecoverableError.' +
+                ' This property is deprecated and will be removed in a future version of React.' +
+                ' To access the digest of an Error look for this property on the Error instance itself.',
+            );
+            return digest;
+          },
+        };
+      } else {
+        errorInfo = {componentStack, digest};
+      }
+      onRecoverableError(recoverableError.value, errorInfo);
     }
   }