Remove nagging updateQuery deprecation warning.

Now that fetchMore's updateQuery callback is implemented in terms of the supported/documented cache.updateQuery method, I feel better about allowing fetchMore to continue to take an updateQuery callback. Also, everyone with any ability to migrate from updateQuery to InMemoryCache field policies has presumably already done so, so this warning is less useful now than it was following the release of AC3.
apollographql · Mar 10, 2022 · 387fb97 · 387fb97
1 parent 44ffb78
commit 387fb97
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 65 deletions.
diff --git a/src/__tests__/fetchMore.ts b/src/__tests__/fetchMore.ts
@@ -131,52 +131,6 @@ describe('updateQuery on a query with required and optional variables', () => {
   });
 });
 
-// TODO: Delete this test after removal of updateQuery from fetchMore.
-// This test squashes deprecation notice errors when the suite is run, but not
-// when individual tests are run.
-describe('updateQuery with fetchMore deprecation notice', () => {
-  const query = gql`
-    query thing {
-      entry
-    }
-  `;
-
-  const result = {
-    data: {
-      __typename: 'Query',
-      entry: 1,
-    },
-  };
-
-  const result1 = cloneDeep(result);
-  itAsync('fetchMore warns exactly once', (resolve, reject) => {
-    const spy = jest.spyOn(console, "warn").mockImplementation();
-    const link = mockSingleLink({
-      request: { query },
-      result,
-    }, {
-      request: { query },
-      result: result1,
-    }).setOnError(reject);
-
-    const client = new ApolloClient({
-      link,
-      cache: new InMemoryCache(),
-    });
-
-    const observable = client.watchQuery({query});
-    return observable.fetchMore({updateQuery: (prev) => prev}).then(() => {
-      expect(spy).toHaveBeenCalledTimes(1);
-    }).then(() => {
-      return observable.fetchMore({updateQuery: (prev) => prev});
-    }).then(() => {
-      expect(spy).toHaveBeenCalledTimes(1);
-    }).finally(() => {
-      spy.mockRestore();
-    }).then(resolve, reject);
-  });
-});
-
 describe('fetchMore on an observable query', () => {
   type TCommentData = {
     entry: {

diff --git a/src/core/ObservableQuery.ts b/src/core/ObservableQuery.ts
@@ -53,8 +53,6 @@ export interface UpdateQueryOptions<TVariables> {
   variables?: TVariables;
 }
 
-let warnedAboutUpdateQuery = false;
-
 interface Last<TData, TVariables> {
   result: ApolloQueryResult<TData>;
   variables?: TVariables;
@@ -421,23 +419,6 @@ Did you mean to call refetch(variables) instead of refetch({ variables })?`);
         update: cache => {
           const { updateQuery } = fetchMoreOptions;
           if (updateQuery) {
-            if (__DEV__ &&
-                !warnedAboutUpdateQuery) {
-              invariant.warn(
-    `The updateQuery callback for fetchMore is deprecated, and will be removed
-    in the next major version of Apollo Client.
-
-    Please convert updateQuery functions to field policies with appropriate
-    read and merge functions, or use/adapt a helper function (such as
-    concatPagination, offsetLimitPagination, or relayStylePagination) from
-    @apollo/client/utilities.
-
-    The field policy system handles pagination more effectively than a
-    hand-written updateQuery function, and you only need to define the policy
-    once, rather than every time you call fetchMore.`);
-              warnedAboutUpdateQuery = true;
-            }
-
             cache.updateQuery({
               query: this.options.query,
               variables: this.variables,