Revert the .catch() around Thenables in DevTools Suspense cache

facebook · Sep 9, 2021 · 3c3f072 · 3c3f072
1 parent 7c8609d
commit 3c3f072
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 63 deletions.
diff --git a/packages/react-devtools-shared/src/hookNamesCache.js b/packages/react-devtools-shared/src/hookNamesCache.js
@@ -110,51 +110,46 @@ export function loadHookNames(
 
     let didTimeout = false;
 
-    const onSuccess = hookNames => {
-      if (didTimeout) {
-        return;
-      }
-
-      if (__DEBUG__) {
-        console.log('[hookNamesCache] onSuccess() hookNames:', hookNames);
-      }
-
-      if (hookNames) {
-        const resolvedRecord = ((newRecord: any): ResolvedRecord<HookNames>);
-        resolvedRecord.status = Resolved;
-        resolvedRecord.value = hookNames;
-      } else {
-        const notFoundRecord = ((newRecord: any): RejectedRecord);
-        notFoundRecord.status = Rejected;
-        notFoundRecord.value = null;
-      }
-
-      wake();
-    };
-
-    const onError = error => {
-      if (didTimeout) {
-        return;
-      }
-
-      if (__DEBUG__) {
-        console.log('[hookNamesCache] onError()');
-      }
+    loadHookNamesFunction(hooksTree, fetchFileWithCaching).then(
+      function onSuccess(hookNames) {
+        if (didTimeout) {
+          return;
+        }
+
+        if (__DEBUG__) {
+          console.log('[hookNamesCache] onSuccess() hookNames:', hookNames);
+        }
+
+        if (hookNames) {
+          const resolvedRecord = ((newRecord: any): ResolvedRecord<HookNames>);
+          resolvedRecord.status = Resolved;
+          resolvedRecord.value = hookNames;
+        } else {
+          const notFoundRecord = ((newRecord: any): RejectedRecord);
+          notFoundRecord.status = Rejected;
+          notFoundRecord.value = null;
+        }
+
+        wake();
+      },
+      function onError(error) {
+        if (didTimeout) {
+          return;
+        }
 
-      console.error(error);
+        if (__DEBUG__) {
+          console.log('[hookNamesCache] onError()');
+        }
 
-      const thrownRecord = ((newRecord: any): RejectedRecord);
-      thrownRecord.status = Rejected;
-      thrownRecord.value = null;
+        console.error(error);
 
-      wake();
-    };
+        const thrownRecord = ((newRecord: any): RejectedRecord);
+        thrownRecord.status = Rejected;
+        thrownRecord.value = null;
 
-    const thenable = loadHookNamesFunction(hooksTree, fetchFileWithCaching);
-    thenable.then(onSuccess, onError);
-    if (typeof (thenable: any).catch === 'function') {
-      (thenable: any).catch(onError);
-    }
+        wake();
+      },
+    );
 
     // Eventually timeout and stop trying to load names.
     let timeoutID = setTimeout(function onTimeout() {

diff --git a/packages/react-devtools-shared/src/inspectedElementCache.js b/packages/react-devtools-shared/src/inspectedElementCache.js
@@ -116,34 +116,30 @@ export function inspectElement(
       return null;
     }
 
-    const onSuccess = ([inspectedElement: InspectedElementFrontend]) => {
-      const resolvedRecord = ((newRecord: any): ResolvedRecord<InspectedElementFrontend>);
-      resolvedRecord.status = Resolved;
-      resolvedRecord.value = inspectedElement;
-      wake();
-    };
-
-    const onError = error => {
-      if (newRecord.status === Pending) {
-        const rejectedRecord = ((newRecord: any): RejectedRecord);
-        rejectedRecord.status = Rejected;
-        rejectedRecord.value = `Could not inspect element with id "${element.id}". Error thrown:\n${error.message}`;
-        wake();
-      }
-    };
-
-    const thenable = inspectElementMutableSource({
+    inspectElementMutableSource({
       bridge,
       element,
       path,
       rendererID: ((rendererID: any): number),
-    });
-    thenable.then(onSuccess, onError);
+    }).then(
+      ([inspectedElement: InspectedElementFrontend]) => {
+        const resolvedRecord = ((newRecord: any): ResolvedRecord<InspectedElementFrontend>);
+        resolvedRecord.status = Resolved;
+        resolvedRecord.value = inspectedElement;
 
-    if (typeof (thenable: any).catch === 'function') {
-      (thenable: any).catch();
-    }
+        wake();
+      },
 
+      error => {
+        console.error(error);
+
+        const rejectedRecord = ((newRecord: any): RejectedRecord);
+        rejectedRecord.status = Rejected;
+        rejectedRecord.value = `Could not inspect element with id "${element.id}". Error thrown:\n${error.message}`;
+
+        wake();
+      },
+    );
     map.set(element, record);
   }