Replace duplicate ObservableQueryFields types defined in apollo-client

Changelog.md

@@ -25,10 +25,13 @@
   check for errors is to use the result `errors` property. <br/>
   [@TLadd](https://github.com/TLadd) in [#1983](https://github.com/apollographql/react-apollo/pull/1983)
 - Allow a custom `cache` object to be passed into the test-utils
-  `MockedProvider`.  <br/>
+  `MockedProvider`. <br/>
   [@palmfjord](https://github.com/palmfjord) in [#2254](https://github.com/apollographql/react-apollo/pull/2254)
-- Make the `MockedProvider` `mocks` prop read only.  <br/>
+- Make the `MockedProvider` `mocks` prop read only. <br/>
   [@amacleay](https://github.com/amacleay) in [#2284](https://github.com/apollographql/react-apollo/pull/2284)
+- Remove duplicate `FetchMoreOptions` and `FetchMoreQueryOptions` types, and
+  instead import them from Apollo Client. <br/>
+  [@skovy](https://github.com/skovy) in [#2281](https://github.com/apollographql/react-apollo/pull/2281)
 
 ## 2.1.11 (August 9, 2018)
 

src/Query.tsx

@@ -7,6 +7,8 @@ import ApolloClient, {
   ErrorPolicy,
   ApolloQueryResult,
   NetworkStatus,
+  FetchMoreOptions,
+  FetchMoreQueryOptions,
 } from 'apollo-client';
 import { DocumentNode } from 'graphql';
 import { ZenObservable } from 'zen-observable-ts';
@@ -16,40 +18,17 @@ import { parser, DocumentType, IDocumentDefinition } from './parser';
 const shallowEqual = require('fbjs/lib/shallowEqual');
 const invariant = require('invariant');
 
-// Improved FetchMoreOptions type, need to port them back to Apollo Client
-export interface FetchMoreOptions<TData, TVariables> {
-  updateQuery: (
-    previousQueryResult: TData,
-    options: {
-      fetchMoreResult?: TData;
-      variables: TVariables;
-    },
-  ) => TData;
-}
-
-// Improved FetchMoreQueryOptions type, need to port them back to Apollo Client
-export interface FetchMoreQueryOptions<TVariables, K extends keyof TVariables> {
-  variables: Pick<TVariables, K>;
-}
-
-// XXX open types improvement PR to AC
-// Improved ObservableQuery field types, need to port them back to Apollo Client
 export type ObservableQueryFields<TData, TVariables> = Pick<
   ObservableQuery<TData>,
-  'startPolling' | 'stopPolling' | 'subscribeToMore'
+  'startPolling' | 'stopPolling' | 'subscribeToMore' | 'updateQuery' | 'refetch' | 'variables'
 > & {
-  variables: TVariables;
-  refetch: (variables?: TVariables) => Promise<ApolloQueryResult<TData>>;
   fetchMore: (<K extends keyof TVariables>(
     fetchMoreOptions: FetchMoreQueryOptions<TVariables, K> & FetchMoreOptions<TData, TVariables>,
   ) => Promise<ApolloQueryResult<TData>>) &
     (<TData2, TVariables2, K extends keyof TVariables2>(
       fetchMoreOptions: { query: DocumentNode } & FetchMoreQueryOptions<TVariables2, K> &
         FetchMoreOptions<TData2, TVariables2>,
     ) => Promise<ApolloQueryResult<TData2>>);
-  updateQuery: (
-    mapFn: (previousQueryResult: TData, options: { variables?: TVariables }) => TData,
-  ) => void;
 };
 
 function compact(obj: any) {