Merge branch 'main' into docs/update-overview

docs/source/data/queries.mdx

@@ -370,17 +370,17 @@ new ApolloClient({
           options,
           // The original value of options.fetchPolicy, before nextFetchPolicy was
           // applied for the first time.
-          initialPolicy,
+          initialFetchPolicy,
           // The ObservableQuery associated with this client.watchQuery call.
           observable,
         }
       ) {
         // When variables change, the default behavior is to reset
-        // options.fetchPolicy to context.initialPolicy. If you omit this logic,
+        // options.fetchPolicy to context.initialFetchPolicy. If you omit this logic,
         // your nextFetchPolicy function can override this default behavior to
         // prevent options.fetchPolicy from changing in this case.
         if (reason === 'variables-changed') {
-          return initialPolicy;
+          return initialFetchPolicy;
         }
 
         if (

src/core/__tests__/fetchPolicies.ts

@@ -1274,7 +1274,7 @@ describe("nextFetchPolicy", () => {
 
       // The nextFetchPolicy function we provided always returnes cache-first,
       // even when context.reason is variables-changed (which by default
-      // resets the fetchPolicy to context.initialPolicy), so cache-first is
+      // resets the fetchPolicy to context.initialFetchPolicy), so cache-first is
       // still what we see here.
       expect(observable.options.fetchPolicy).toBe("cache-first");
     } else if (count === 3) {