Remove invokeGuardedCallback and replay trick

facebook · Mar 10, 2024 · b8b7566 · b8b7566
1 parent 706d95f
commit b8b7566
Show file tree

Hide file tree

Showing 54 changed files with 253 additions and 1,419 deletions.
diff --git a/fixtures/dom/src/toWarnDev.js b/fixtures/dom/src/toWarnDev.js
@@ -7,11 +7,6 @@ const util = require('util');
 function shouldIgnoreConsoleError(format, args) {
   if (__DEV__) {
     if (typeof format === 'string') {
-      if (format.indexOf('Error: Uncaught [') === 0) {
-        // This looks like an uncaught error from invokeGuardedCallback() wrapper
-        // in development that is reported by jsdom. Ignore because it's noisy.
-        return true;
-      }
       if (format.indexOf('The above error occurred') === 0) {
         // This looks like an error addendum from ReactFiberErrorLogger.
         // Ignore it too.

diff --git a/packages/react-cache/src/__tests__/ReactCacheOld-test.internal.js b/packages/react-cache/src/__tests__/ReactCacheOld-test.internal.js
@@ -12,7 +12,6 @@
 let ReactCache;
 let createResource;
 let React;
-let ReactFeatureFlags;
 let ReactNoop;
 let Scheduler;
 let Suspense;
@@ -27,9 +26,6 @@ describe('ReactCache', () => {
   beforeEach(() => {
     jest.resetModules();
 
-    ReactFeatureFlags = require('shared/ReactFeatureFlags');
-
-    ReactFeatureFlags.replayFailedUnitOfWorkWithInvokeGuardedCallback = false;
     React = require('react');
     Suspense = React.Suspense;
     ReactCache = require('react-cache');

diff --git a/packages/react-dom/src/__tests__/InvalidEventListeners-test.js b/packages/react-dom/src/__tests__/InvalidEventListeners-test.js
@@ -43,7 +43,7 @@ describe('InvalidEventListeners', () => {
     );
     const node = container.firstChild;
 
-    spyOnProd(console, 'error');
+    console.error = jest.fn();
 
     const uncaughtErrors = [];
     function handleWindowError(e) {
@@ -70,18 +70,16 @@ describe('InvalidEventListeners', () => {
       }),
     );
 
-    if (!__DEV__) {
-      expect(console.error).toHaveBeenCalledTimes(1);
-      expect(console.error.mock.calls[0][0]).toEqual(
-        expect.objectContaining({
-          detail: expect.objectContaining({
-            message:
-              'Expected `onClick` listener to be a function, instead got a value of `string` type.',
-          }),
-          type: 'unhandled exception',
+    expect(console.error).toHaveBeenCalledTimes(1);
+    expect(console.error.mock.calls[0][0]).toEqual(
+      expect.objectContaining({
+        detail: expect.objectContaining({
+          message:
+            'Expected `onClick` listener to be a function, instead got a value of `string` type.',
         }),
-      );
-    }
+        type: 'unhandled exception',
+      }),
+    );
   });
 
   it('should not prevent null listeners, at dispatch', async () => {

diff --git a/packages/react-dom/src/__tests__/ReactCompositeComponent-test.js b/packages/react-dom/src/__tests__/ReactCompositeComponent-test.js
@@ -1231,13 +1231,6 @@ describe('ReactCompositeComponent', () => {
         });
       }).toThrow();
     }).toErrorDev([
-      // Expect two errors because invokeGuardedCallback will dispatch an error event,
-      // Causing the warning to be logged again.
-      'Warning: No `render` method found on the RenderTextInvalidConstructor instance: ' +
-        'did you accidentally return an object from the constructor?',
-      'Warning: No `render` method found on the RenderTextInvalidConstructor instance: ' +
-        'did you accidentally return an object from the constructor?',
-      // And then two more because we retry errors.
       'Warning: No `render` method found on the RenderTextInvalidConstructor instance: ' +
         'did you accidentally return an object from the constructor?',
       'Warning: No `render` method found on the RenderTextInvalidConstructor instance: ' +
@@ -1278,14 +1271,6 @@ describe('ReactCompositeComponent', () => {
         });
       }).toThrow();
     }).toErrorDev([
-      // Expect two errors because invokeGuardedCallback will dispatch an error event,
-      // Causing the warning to be logged again.
-      'Warning: No `render` method found on the RenderTestUndefinedRender instance: ' +
-        'you may have forgotten to define `render`.',
-      'Warning: No `render` method found on the RenderTestUndefinedRender instance: ' +
-        'you may have forgotten to define `render`.',
-
-      // And then two more because we retry errors.
       'Warning: No `render` method found on the RenderTestUndefinedRender instance: ' +
         'you may have forgotten to define `render`.',
       'Warning: No `render` method found on the RenderTestUndefinedRender instance: ' +