Full dep/devDep updates to latest versions

package.json

@@ -107,68 +107,68 @@
   },
   "sideEffects": false,
   "devDependencies": {
-    "@types/enzyme": "3.1.17",
+    "@types/enzyme": "3.9.0",
     "@types/enzyme-adapter-react-16": "1.0.5",
     "@types/graphql": "14.0.7",
-    "@types/hoist-non-react-statics": "3.0.1",
+    "@types/hoist-non-react-statics": "3.3.0",
     "@types/invariant": "2.2.29",
-    "@types/jest": "24.0.9",
+    "@types/jest": "24.0.11",
     "@types/lodash.isequal": "4.5.5",
     "@types/object-assign": "4.0.30",
     "@types/prop-types": "15.7.0",
-    "@types/react": "16.4.18",
-    "@types/react-dom": "16.8.0",
-    "@types/react-test-renderer": "16.8.0",
-    "@types/recompose": "0.30.3",
+    "@types/react": "16.8.8",
+    "@types/react-dom": "16.8.2",
+    "@types/react-test-renderer": "16.8.1",
+    "@types/recompose": "0.30.5",
     "@types/zen-observable": "0.8.0",
     "apollo-cache": "1.2.1",
     "apollo-cache-inmemory": "1.5.1",
     "apollo-client": "2.5.1",
-    "apollo-link": "1.2.9",
+    "apollo-link": "1.2.11",
     "babel-core": "6.26.3",
-    "babel-jest": "24.1.0",
+    "babel-jest": "24.5.0",
     "babel-preset-env": "1.7.0",
     "bundlesize": "0.17.1",
     "coveralls": "3.0.3",
-    "danger": "7.0.14",
-    "enzyme": "3.8.0",
-    "enzyme-adapter-react-16": "1.10.0",
+    "danger": "7.0.15",
+    "enzyme": "3.9.0",
+    "enzyme-adapter-react-16": "1.11.2",
     "graphql": "14.1.1",
     "graphql-tag": "2.10.1",
-    "jest": "24.1.0",
-    "jest-junit": "5.2.0",
+    "jest": "24.5.0",
+    "jest-junit": "6.3.0",
     "jsdom": "14.0.0",
     "lodash.includes": "4.3.0",
     "lodash.times": "4.3.2",
     "preact": "8.4.2",
     "preact-compat": "3.18.4",
     "prettier": "1.16.4",
-    "react": "16.5.2",
-    "react-dom": "16.8.1",
-    "react-test-renderer": "16.8.1",
+    "react": "16.8.4",
+    "react-dom": "16.8.4",
+    "react-test-renderer": "16.8.4",
     "recompose": "0.30.0",
     "recursive-rename": "2.0.0",
     "rimraf": "2.6.3",
     "rollup": "1.6.0",
     "rollup-plugin-commonjs": "9.2.1",
     "rollup-plugin-filesize": "6.0.1",
     "rollup-plugin-invariant": "0.4.2",
-    "rollup-plugin-node-resolve": "3.4.0",
+    "rollup-plugin-node-resolve": "4.0.1",
     "rollup-plugin-typescript2": "0.20.1",
     "rollup-plugin-uglify": "6.0.2",
     "ts-jest": "24.0.0",
     "tsc-watch": "2.1.2",
-    "tslint": "5.13.1",
-    "typescript": "3.1.6",
+    "tslint": "5.14.0",
+    "typescript": "3.3.3333",
     "typescript-require": "0.2.10",
-    "zen-observable-ts": "0.8.16"
+    "zen-observable-ts": "0.8.18"
   },
   "dependencies": {
     "apollo-utilities": "^1.2.1",
-    "hoist-non-react-statics": "^3.0.0",
+    "hoist-non-react-statics": "^3.3.0",
     "lodash.isequal": "^4.5.0",
-    "prop-types": "^15.6.0",
-    "ts-invariant": "^0.3.0",
+    "prop-types": "^15.7.2",
+    "ts-invariant": "^0.3.2",
     "tslib": "^1.9.3"
   }
 }

src/mutation-hoc.tsx

@@ -31,7 +31,7 @@ export function withMutation<
   if (typeof mapPropsToOptions !== 'function') mapPropsToOptions = () => options as MutationOpts;
 
   return (
-    WrappedComponent: React.ComponentType<TChildProps & TProps>,
+    WrappedComponent: React.ComponentType<TProps & TChildProps>,
   ): React.ComponentClass<TProps> => {
     const graphQLDisplayName = `${alias}(${getDisplayName(WrappedComponent)})`;
     class GraphQL extends GraphQLBase<TProps, TChildProps> {
@@ -67,7 +67,12 @@ export function withMutation<
                 childProps = operationOptions.props(newResult) as any;
               }
 
-              return <WrappedComponent {...props} {...childProps} />;
+              return (
+                <WrappedComponent
+                  {...props as TProps}
+                  {...childProps as any}
+                />
+              );
             }}
           </Mutation>
         );

src/query-hoc.tsx

@@ -1,5 +1,4 @@
 import * as React from 'react';
-import { ApolloError } from 'apollo-client';
 import { DocumentNode } from 'graphql';
 import hoistNonReactStatics from 'hoist-non-react-statics';
 
@@ -45,7 +44,7 @@ export function withQuery<
   // allow for advanced referential equality checks
   let lastResultProps: TChildProps | void;
   return (
-    WrappedComponent: React.ComponentType<TChildProps & TProps>,
+    WrappedComponent: React.ComponentType<TProps & TChildProps>,
   ): React.ComponentClass<TProps> => {
     const graphQLDisplayName = `${alias}(${getDisplayName(WrappedComponent)})`;
     class GraphQL extends GraphQLBase<TProps, TChildProps> {
@@ -79,7 +78,15 @@ export function withQuery<
                 });
               }
               // if we have skipped, no reason to manage any reshaping
-              if (shouldSkip) return <WrappedComponent {...props} />;
+              if (shouldSkip) {
+                return (
+                  <WrappedComponent
+                    {...props as TProps}
+                    {...{} as TChildProps}
+                  />
+                );
+              }
+
               // the HOC's historically hoisted the data from the execution result
               // up onto the result since it was passed as a nested prop
               // we massage the Query components shape here to replicate that
@@ -95,7 +102,12 @@ export function withQuery<
                 childProps = lastResultProps;
               }
 
-              return <WrappedComponent {...props} {...childProps} />;
+              return (
+                <WrappedComponent
+                  {...props as TProps}
+                  {...childProps as TChildProps}
+                />
+              );
             }}
           </Query>
         );

src/subscription-hoc.tsx

@@ -41,7 +41,7 @@ export function withSubscription<
   // allow for advanced referential equality checks
   let lastResultProps: TChildProps | void;
   return (
-    WrappedComponent: React.ComponentType<TChildProps & TProps>,
+    WrappedComponent: React.ComponentType<TProps & TChildProps>,
   ): React.ComponentClass<TProps> => {
     const graphQLDisplayName = `${alias}(${getDisplayName(WrappedComponent)})`;
     class GraphQL extends GraphQLBase<TProps, TChildProps, { resubscribe: boolean }> {
@@ -85,7 +85,15 @@ export function withSubscription<
                 });
               }
               // if we have skipped, no reason to manage any reshaping
-              if (shouldSkip) return <WrappedComponent {...props} />;
+              if (shouldSkip) {
+                return (
+                  <WrappedComponent
+                    {...props as TProps}
+                    {...{} as TChildProps}
+                  />
+                );
+              }
+
               // the HOC's historically hoisted the data from the execution result
               // up onto the result since it was passed as a nested prop
               // we massage the Query components shape here to replicate that
@@ -101,7 +109,12 @@ export function withSubscription<
                 childProps = lastResultProps;
               }
 
-              return <WrappedComponent {...props} {...childProps} />;
+              return (
+                <WrappedComponent
+                  {...props as TProps}
+                  {...childProps as TChildProps}
+                />
+              );
             }}
           </Subscription>
         );

src/test-utils.tsx

@@ -15,6 +15,7 @@ export interface MockedProviderProps<TSerializedCache = {}> {
   cache?: ApolloCache<TSerializedCache>;
   resolvers?: Resolvers;
   childProps?: object;
+  children?: React.ReactElement;
 }
 
 export interface MockedProviderState {
@@ -47,13 +48,14 @@ export class MockedProvider extends React.Component<MockedProviderProps, MockedP
   }
 
   public render() {
-    const { childProps } = this.props;
-
-    return (
-      <ApolloProvider client={this.state.client}>
-        {React.cloneElement(React.Children.only(this.props.children), { ...childProps })}
-      </ApolloProvider>
-    );
+    const { children, childProps } = this.props;
+    return children
+      ? (
+        <ApolloProvider client={this.state.client}>
+          {React.cloneElement(React.Children.only(children), { ...childProps })}
+        </ApolloProvider>
+      )
+      : null;
   }
 
   public componentWillUnmount() {

src/walkTree.ts

@@ -51,12 +51,12 @@ export function walkTree(
   if (isReactElement(element)) {
     if (typeof element.type === 'function') {
       const Comp = element.type;
-      const props = Object.assign({}, Comp.defaultProps, getProps(element));
       let childContext = context;
       let child;
 
       // Are we are a react class?
       if (isComponentClass(Comp)) {
+        const props = Object.assign({}, Comp.defaultProps, getProps(element));
         const instance = new Comp(props, context);
         // In case the user doesn't pass these to super in the constructor.
         // Note: `Component.props` are now readonly in `@types/react`, so
@@ -104,12 +104,14 @@ export function walkTree(
 
         child = instance.render();
       } else {
+
         // Just a stateless functional
         if (visitor(element, null, newContext, context) === false) {
           return;
         }
 
-        child = Comp(props, context);
+        const FC = Comp as React.FunctionComponent;
+        child = FC(getProps(element), context);
       }
 
       if (child) {

test/client/ApolloProvider.test.tsx

@@ -152,7 +152,7 @@ describe('<ApolloProvider /> Component', () => {
   // });
 
   it('should add the client to the children context', () => {
-    const tree = TestUtils.renderIntoDocument(
+    const tree = TestUtils.renderIntoDocument<React.Component<any, any>>(
       <ApolloProvider client={client}>
         <Child />
         <Child />
@@ -179,7 +179,7 @@ describe('<ApolloProvider /> Component', () => {
   });
 
   it('child component should be able to query new client when props change', () => {
-    const container = TestUtils.renderIntoDocument(
+    const container = TestUtils.renderIntoDocument<React.Component<any, any>>(
       <Container client={client} />,
     ) as React.Component<any, any>;
 

test/client/getDataFromTree.test.tsx

@@ -186,7 +186,9 @@ describe('SSR', () => {
         expect(elementCount).toEqual(2);
       });
 
-      it('function stateless components with React 16.3 context', () => {
+      // `walkTree` is deprecated and will be removed in `react-apollo` 3.0.
+      // It is no longer being updated to work with newer versions of `react`.
+      xit('function stateless components with React 16.3 context', () => {
         if (!React.createContext) {
           // Preact doesn't support createContext yet, see https://github.com/developit/preact/pull/963
           return;
@@ -415,7 +417,9 @@ describe('SSR', () => {
         });
       });
 
-      it('basic classes with React 16.3 context', () => {
+      // `walkTree` is deprecated and will be removed in `react-apollo` 3.0.
+      // It is no longer being updated to work with newer versions of `react`.
+      xit('basic classes with React 16.3 context', () => {
         if (!React.createContext) {
           // Preact doesn't support createContext yet, see https://github.com/developit/preact/pull/963
           return;

test/internal-api/parser.test.ts

@@ -52,8 +52,9 @@ describe('parser', () => {
     const query = `
       query One { user { name } }
     `;
-
-    expect(parser.bind(null, query)).toThrowError(/not a valid GraphQL DocumentNode/);
+    expect(
+      parser.bind(null, query as any)
+    ).toThrowError(/not a valid GraphQL DocumentNode/);
   });
 
   it('should return the name of the operation', () => {