Remove invokeGuardedCallback and replay trick

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.

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');

packages/react-devtools-shared/src/__tests__/TimelineProfiler-test.js

@@ -870,15 +870,13 @@ describe('Timeline profiler', () => {
           "--component-render-start-ErrorBoundary",
           "--component-render-stop",
           "--component-render-start-ExampleThatThrows",
-          "--component-render-start-ExampleThatThrows",
           "--component-render-stop",
           "--error-ExampleThatThrows-mount-Expected error",
           "--render-stop",
           "--render-start-32",
           "--component-render-start-ErrorBoundary",
           "--component-render-stop",
           "--component-render-start-ExampleThatThrows",
-          "--component-render-start-ExampleThatThrows",
           "--component-render-stop",
           "--error-ExampleThatThrows-mount-Expected error",
           "--render-stop",
@@ -2161,10 +2159,8 @@ describe('Timeline profiler', () => {
           await waitForAll([
             'ErrorBoundary render',
             'ExampleThatThrows',
-            'ExampleThatThrows',
             'ErrorBoundary render',
             'ExampleThatThrows',
-            'ExampleThatThrows',
             'ErrorBoundary fallback',
           ]);
 

packages/react-dom-bindings/src/events/DOMPluginEventSystem.js

@@ -55,10 +55,6 @@ import {
   enableFloat,
   enableFormActions,
 } from 'shared/ReactFeatureFlags';
-import {
-  invokeGuardedCallbackAndCatchFirstError,
-  rethrowCaughtError,
-} from 'shared/ReactErrorUtils';
 import {createEventListenerWrapperWithPriority} from './ReactDOMEventListener';
 import {
   removeEventListener,
@@ -234,14 +230,25 @@ export const nonDelegatedEvents: Set<DOMEventName> = new Set([
   ...mediaEventTypes,
 ]);
 
+let hasError: boolean = false;
+let caughtError: mixed = null;
+
 function executeDispatch(
   event: ReactSyntheticEvent,
   listener: Function,
   currentTarget: EventTarget,
 ): void {
-  const type = event.type || 'unknown-event';
   event.currentTarget = currentTarget;
-  invokeGuardedCallbackAndCatchFirstError(type, listener, undefined, event);
+  try {
+    listener(event);
+  } catch (error) {
+    if (!hasError) {
+      hasError = true;
+      caughtError = error;
+    } else {
+      // TODO: Make sure this error gets logged somehow.
+    }
+  }
   event.currentTarget = null;
 }
 
@@ -283,7 +290,12 @@ export function processDispatchQueue(
     //  event system doesn't use pooling.
   }
   // This would be a good time to rethrow if any of the event handlers threw.
-  rethrowCaughtError();
+  if (hasError) {
+    const error = caughtError;
+    hasError = false;
+    caughtError = null;
+    throw error;
+  }
 }
 
 function dispatchEventsForPlugins(

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 () => {

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

@@ -202,21 +202,13 @@ describe('ReactBrowserEventEmitter', () => {
       expect(idCallOrder[0]).toBe(CHILD);
       expect(idCallOrder[1]).toBe(PARENT);
       expect(idCallOrder[2]).toBe(GRANDPARENT);
-      expect(errorHandler).toHaveBeenCalledTimes(__DEV__ ? 2 : 1);
+      expect(errorHandler).toHaveBeenCalledTimes(1);
       expect(errorHandler.mock.calls[0][0]).toEqual(
         expect.objectContaining({
           error: expect.any(Error),
           message: 'Handler interrupted',
         }),
       );
-      if (__DEV__) {
-        expect(errorHandler.mock.calls[1][0]).toEqual(
-          expect.objectContaining({
-            error: expect.any(Error),
-            message: 'Handler interrupted',
-          }),
-        );
-      }
     } finally {
       window.removeEventListener('error', errorHandler);
     }

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: ' +