[WIP] prevent refetching skipToken

src/__tests__/__snapshots__/exports.ts.snap

@@ -467,6 +467,7 @@ Array [
   "removeMaskedFragmentSpreads",
   "resultKeyNameFromField",
   "shouldInclude",
+  "skipToken",
   "storeKeyNameFromField",
   "stringifyForDisplay",
   "toQueryResult",

src/core/ObservableQuery.ts

@@ -24,6 +24,7 @@ import {
   getOperationName,
   getQueryDefinition,
   preventUnhandledRejection,
+  skipToken,
   toQueryResult,
 } from "@apollo/client/utilities/internal";
 import { invariant } from "@apollo/client/utilities/invariant";
@@ -1068,6 +1069,13 @@ Did you mean to call refetch(variables) instead of refetch({ variables })?`,
     newOptions: Partial<ObservableQuery.Options<TData, TVariables>>
   ): void {
     const mergedOptions = compact(this.options, newOptions || {});
+    if (skipToken in (newOptions.variables || {})) {
+      Object.assign(
+        mergedOptions.variables,
+        this.options.variables,
+        newOptions.variables
+      );
+    }
     assign(this.options, mergedOptions);
     this.updatePolling();
   }

src/core/QueryManager.ts

@@ -61,6 +61,7 @@ import {
   isNonNullObject,
   makeUniqueId,
   removeDirectivesFromDocument,
+  skipToken,
   toQueryResult,
 } from "@apollo/client/utilities/internal";
 import {
@@ -1295,7 +1296,10 @@ export class QueryManager {
 
     if (include) {
       this.getObservableQueries(include).forEach((oq) => {
-        if (oq.options.fetchPolicy === "cache-only") {
+        if (
+          oq.options.fetchPolicy === "cache-only" ||
+          skipToken in oq.options.variables
+        ) {
           return;
         }
 

src/react/hooks/__tests__/useQuery.test.tsx

@@ -1749,7 +1749,7 @@ describe("useQuery Hook", () => {
       });
 
       await rerender(skipToken);
-
+      // !!! rerenders with `undefined` variables
       await expect(renderStream).toRerenderWithSimilarSnapshot();
 
       client.writeQuery({
@@ -1889,7 +1889,7 @@ describe("useQuery Hook", () => {
     });
 
     await rerender(skipToken);
-
+    // !!! rerenders with `undefined` variables
     await expect(renderStream).toRerenderWithSimilarSnapshot();
 
     client.writeQuery({
@@ -8702,6 +8702,7 @@ describe("useQuery Hook", () => {
         const { fetchPolicy, initialFetchPolicy } = observable.options;
 
         expect(fetchPolicy).toBe(expectedFetchPolicy);
+        // last failing test, should be "cache-and-network", but is "cache-first"
         expect(initialFetchPolicy).toBe(expectedInitialFetchPolicy);
       }