Relay: Remove fbjs/lib/ErrorUtils Dependency

Reviewed By: kassens Differential Revision: D27608944 fbshipit-source-id: 9120f8db8a06f9dd2f5eb01c2faf44ea9d990a33
facebook · Apr 7, 2021 · 5ed076e · 5ed076e
1 parent 1a50269
commit 5ed076e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/packages/relay-runtime/store/RelayPublishQueue.js b/packages/relay-runtime/store/RelayPublishQueue.js
@@ -12,7 +12,6 @@
 
 'use strict';
 
-const ErrorUtils = require('ErrorUtils');
 const RelayReader = require('./RelayReader');
 const RelayRecordSource = require('./RelayRecordSource');
 const RelayRecordSourceMutator = require('../mutations/RelayRecordSourceMutator');
@@ -55,6 +54,10 @@ type PendingUpdater = {|
   +updater: StoreUpdater,
 |};
 
+const applyWithGuard =
+  global.ErrorUtils?.applyWithGuard ??
+  ((callback, context, args, onError, name) => callback.apply(context, args));
+
 /**
  * Coordinates the concurrent modification of a `Store` due to optimistic and
  * non-revertable client updates and server payloads:
@@ -299,7 +302,7 @@ class RelayPublishQueue implements PublishQueue {
           mutator,
           this._getDataID,
         );
-        ErrorUtils.applyWithGuard(
+        applyWithGuard(
           updater,
           null,
           [recordSourceProxy],
@@ -334,7 +337,7 @@ class RelayPublishQueue implements PublishQueue {
     const processUpdate = optimisticUpdate => {
       if (optimisticUpdate.storeUpdater) {
         const {storeUpdater} = optimisticUpdate;
-        ErrorUtils.applyWithGuard(
+        applyWithGuard(
           storeUpdater,
           null,
           [recordSourceProxy],
@@ -355,7 +358,7 @@ class RelayPublishQueue implements PublishQueue {
           selectorData = lookupSelector(source, operation.fragment);
         }
         if (updater) {
-          ErrorUtils.applyWithGuard(
+          applyWithGuard(
             updater,
             null,
             [recordSourceSelectorProxy, selectorData],

diff --git a/packages/relay-runtime/store/__tests__/RelayPublishQueue-test.js b/packages/relay-runtime/store/__tests__/RelayPublishQueue-test.js
@@ -10,7 +10,6 @@
 
 'use strict';
 
-const ErrorUtils = require('ErrorUtils');
 const RelayModernRecord = require('../RelayModernRecord');
 const RelayModernStore = require('../RelayModernStore');
 const RelayPublishQueue = require('../RelayPublishQueue');
@@ -39,11 +38,13 @@ describe('RelayPublishQueue', () => {
   beforeEach(() => {
     jest.resetModules();
 
-    ErrorUtils.applyWithGuard = jest.fn((callback, context, params) => {
-      try {
-        callback.apply(context, params);
-      } catch (guarded) {} // eslint-disable-line lint/no-unused-catch-bindings
-    });
+    global.ErrorUtils = {
+      applyWithGuard: jest.fn((callback, context, params) => {
+        try {
+          callback.apply(context, params);
+        } catch (guarded) {} // eslint-disable-line lint/no-unused-catch-bindings
+      }),
+    };
   });
 
   describe('applyUpdate()/revertUpdate()', () => {

diff --git a/scripts/getBabelOptions.js b/scripts/getBabelOptions.js
@@ -30,7 +30,6 @@ module.exports = function(options) {
         require('./rewrite-modules'),
         {
           map: {
-            ErrorUtils: 'fbjs/lib/ErrorUtils',
             Promise: 'promise-polyfill',
             areEqual: 'fbjs/lib/areEqual',
             invariant: 'fbjs/lib/invariant',