Fix mutation error leak

apollographql · Oct 14, 2020 · 74e22c2 · 74e22c2
1 parent bd778d1
commit 74e22c2
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 12 deletions.
diff --git a/src/core/ApolloClient.ts b/src/core/ApolloClient.ts
@@ -175,11 +175,11 @@ export class ApolloClient<TCacheShape> implements DataProxy {
       typeof window !== 'undefined' &&
       !(window as any).__APOLLO_CLIENT__;
 
-    if (
-      typeof connectToDevTools === 'undefined'
-        ? defaultConnectToDevTools
-        : connectToDevTools && typeof window !== 'undefined'
-    ) {
+    const shouldConnectToDevTools = typeof connectToDevTools === 'undefined'
+      ? defaultConnectToDevTools
+      : connectToDevTools && typeof window !== 'undefined'
+
+    if (shouldConnectToDevTools) {
       (window as any).__APOLLO_CLIENT__ = this;
     }
 
@@ -234,7 +234,7 @@ export class ApolloClient<TCacheShape> implements DataProxy {
       },
       localState: this.localState,
       assumeImmutableResults,
-      onBroadcast: () => {
+      onBroadcast: shouldConnectToDevTools ? () => {
         if (this.devToolsHookCb) {
           this.devToolsHookCb({
             action: {},
@@ -245,7 +245,7 @@ export class ApolloClient<TCacheShape> implements DataProxy {
             dataWithOptimisticResults: this.cache.extract(true),
           });
         }
-      },
+      } : undefined,
     });
   }
 

diff --git a/src/core/MutationStore.ts b/src/core/MutationStore.ts
@@ -24,11 +24,14 @@ export class MutationStore {
     };
   }
 
-  public markMutationError(mutationId: string, error: Error) {
+  public markMutationError(mutationId: string, error?: Error) {
     const mutation = this.store[mutationId];
     if (mutation) {
       mutation.loading = false;
-      mutation.error = error;
+
+      if (error) {
+        mutation.error = error;
+      }
     }
   }
 

diff --git a/src/core/QueryManager.ts b/src/core/QueryManager.ts
@@ -48,6 +48,8 @@ type QueryWithUpdater = {
   queryInfo: QueryInfo;
 };
 
+const noop = () => undefined;
+
 export class QueryManager<TStore> {
   public cache: ApolloCache<TStore>;
   public link: ApolloLink;
@@ -73,7 +75,7 @@ export class QueryManager<TStore> {
     cache,
     link,
     queryDeduplication = false,
-    onBroadcast = () => undefined,
+    onBroadcast = noop,
     ssrMode = false,
     clientAwareness = {},
     localState,
@@ -252,7 +254,7 @@ export class QueryManager<TStore> {
         },
 
         error(err: Error) {
-          self.mutationStore.markMutationError(mutationId, err);
+          self.mutationStore.markMutationError(mutationId, self.onBroadcast === noop ? undefined : err);
           if (optimisticResponse) {
             self.cache.removeOptimistic(mutationId);
           }
@@ -266,7 +268,7 @@ export class QueryManager<TStore> {
 
         complete() {
           if (error) {
-            self.mutationStore.markMutationError(mutationId, error);
+            self.mutationStore.markMutationError(mutationId, self.onBroadcast === noop ? undefined : error);
           }
 
           if (optimisticResponse) {