Export Context type from types.ts instead of walkTree.ts.

Changelog.md

@@ -1,5 +1,14 @@
 # Change log
 
+## vNEXT
+
+### Bug Fixes
+
+- Export `Context` type from `types.ts` instead of `walkTree.ts`,
+  to reenable `import { Context } from 'react-apollo'` (which has been
+  broken since 2.4.0). <br/>
+  [@benjamn](https://github.com/benjamn) in [#2825](https://github.com/apollographql/react-apollo/pull/2832)
+
 ## 2.5.1
 
 ### Bug Fixes
@@ -9,7 +18,6 @@
   the created test `ApolloClient` instance.  <br/>
   [@hwillson](https://github.com/hwillson) in [#2825](https://github.com/apollographql/react-apollo/pull/2825)
 
-
 ## 2.5.0
 
 ### Improvements

src/types.ts

@@ -12,6 +12,10 @@ import ApolloClient, {
 } from 'apollo-client';
 import { MutationFn } from './Mutation';
 
+export interface Context {
+  [key: string]: any;
+};
+
 export type OperationVariables = {
   [key: string]: any;
 };
@@ -31,7 +35,7 @@ export interface MutationOpts<TData = any, TGraphQLVariables = OperationVariable
   update?: MutationUpdaterFn<TData>;
   client?: ApolloClient<any>;
   notifyOnNetworkStatusChange?: boolean;
-  context?: Record<string, any>;
+  context?: Context;
   onCompleted?: (data: TData) => void;
   onError?: (error: ApolloError) => void;
   fetchPolicy?: FetchPolicy;
@@ -45,7 +49,7 @@ export interface QueryOpts<TGraphQLVariables = OperationVariables> {
   pollInterval?: number;
   client?: ApolloClient<any>;
   notifyOnNetworkStatusChange?: boolean;
-  context?: Record<string, any>;
+  context?: Context;
   partialRefetch?: boolean;
 }
 

src/walkTree.ts

@@ -1,8 +1,5 @@
 import * as React from 'react';
-
-export interface Context {
-  [key: string]: any;
-}
+import { Context } from './types';
 
 interface PreactElement<P> {
   attributes: P;