Merge branch 'main' into docs-update

apollographql · Oct 3, 2023 · fdf7fd5 · fdf7fd5
2 parents dab7c00 + bc055e0
commit fdf7fd5
Show file tree

Hide file tree

Showing 13 changed files with 5 additions and 26 deletions.
diff --git a/.api-reports/api-report-core.md b/.api-reports/api-report-core.md
@@ -1666,8 +1666,6 @@ class QueryInfo {
     // (undocumented)
     stopped: boolean;
     // (undocumented)
-    subscriptions: Set<ObservableSubscription>;
-    // (undocumented)
     variables?: Record<string, any>;
 }
 

diff --git a/.api-reports/api-report-react.md b/.api-reports/api-report-react.md
@@ -1485,8 +1485,6 @@ class QueryInfo {
     // (undocumented)
     stopped: boolean;
     // (undocumented)
-    subscriptions: Set<Subscription>;
-    // (undocumented)
     variables?: Record<string, any>;
 }
 

diff --git a/.api-reports/api-report-react_components.md b/.api-reports/api-report-react_components.md
@@ -1289,8 +1289,6 @@ class QueryInfo {
     // (undocumented)
     stopped: boolean;
     // (undocumented)
-    subscriptions: Set<Subscription_2>;
-    // (undocumented)
     variables?: Record<string, any>;
 }
 

diff --git a/.api-reports/api-report-react_context.md b/.api-reports/api-report-react_context.md
@@ -1199,8 +1199,6 @@ class QueryInfo {
     // (undocumented)
     stopped: boolean;
     // (undocumented)
-    subscriptions: Set<Subscription>;
-    // (undocumented)
     variables?: Record<string, any>;
 }
 

diff --git a/.api-reports/api-report-react_hoc.md b/.api-reports/api-report-react_hoc.md
@@ -1267,8 +1267,6 @@ class QueryInfo {
     // (undocumented)
     stopped: boolean;
     // (undocumented)
-    subscriptions: Set<Subscription>;
-    // (undocumented)
     variables?: Record<string, any>;
 }
 

diff --git a/.api-reports/api-report-react_hooks.md b/.api-reports/api-report-react_hooks.md
@@ -1413,8 +1413,6 @@ class QueryInfo {
     // (undocumented)
     stopped: boolean;
     // (undocumented)
-    subscriptions: Set<Subscription>;
-    // (undocumented)
     variables?: Record<string, any>;
 }
 

diff --git a/.api-reports/api-report-react_ssr.md b/.api-reports/api-report-react_ssr.md
@@ -1186,8 +1186,6 @@ class QueryInfo {
     // (undocumented)
     stopped: boolean;
     // (undocumented)
-    subscriptions: Set<Subscription>;
-    // (undocumented)
     variables?: Record<string, any>;
 }
 

diff --git a/.api-reports/api-report-testing.md b/.api-reports/api-report-testing.md
@@ -1262,8 +1262,6 @@ class QueryInfo {
     // (undocumented)
     stopped: boolean;
     // (undocumented)
-    subscriptions: Set<Subscription>;
-    // (undocumented)
     variables?: Record<string, any>;
 }
 

diff --git a/.api-reports/api-report-testing_core.md b/.api-reports/api-report-testing_core.md
@@ -1218,8 +1218,6 @@ class QueryInfo {
     // (undocumented)
     stopped: boolean;
     // (undocumented)
-    subscriptions: Set<Subscription>;
-    // (undocumented)
     variables?: Record<string, any>;
 }
 

diff --git a/.api-reports/api-report-utilities.md b/.api-reports/api-report-utilities.md
@@ -1929,8 +1929,6 @@ class QueryInfo {
     // (undocumented)
     stopped: boolean;
     // (undocumented)
-    subscriptions: Set<ObservableSubscription>;
-    // (undocumented)
     variables?: Record<string, any>;
 }
 

diff --git a/.api-reports/api-report.md b/.api-reports/api-report.md
@@ -2039,8 +2039,6 @@ class QueryInfo {
     // (undocumented)
     stopped: boolean;
     // (undocumented)
-    subscriptions: Set<ObservableSubscription>;
-    // (undocumented)
     variables?: Record<string, any>;
 }
 

diff --git a/.changeset/short-owls-breathe.md b/.changeset/short-owls-breathe.md
@@ -0,0 +1,5 @@
+---
+"@apollo/client": patch
+---
+
+Remove some dead code.
diff --git a/src/core/QueryInfo.ts b/src/core/QueryInfo.ts
@@ -9,7 +9,6 @@ import type { ObservableQuery } from "./ObservableQuery.js";
 import { reobserveCacheFirst } from "./ObservableQuery.js";
 import type { QueryListener, MethodKeys } from "./types.js";
 import type { FetchResult } from "../link/core/index.js";
-import type { ObservableSubscription } from "../utilities/index.js";
 import {
   isNonEmptyArray,
   graphQLResultHasError,
@@ -78,7 +77,6 @@ export class QueryInfo {
   listeners = new Set<QueryListener>();
   document: DocumentNode | null = null;
   lastRequestId = 1;
-  subscriptions = new Set<ObservableSubscription>();
   variables?: Record<string, any>;
   networkStatus?: NetworkStatus;
   networkError?: Error | null;
@@ -293,8 +291,6 @@ export class QueryInfo {
       // QueryInfo.prototype.
       this.cancel = QueryInfo.prototype.cancel;
 
-      this.subscriptions.forEach((sub) => sub.unsubscribe());
-
       const oq = this.observableQuery;
       if (oq) oq.stopPolling();
     }