From c34e1f55e4b5fc2ef9dc3a041856627e9038c2cf Mon Sep 17 00:00:00 2001
From: hwillson <hugh@octonary.com>
Date: Thu, 26 Sep 2019 11:50:37 -0400
Subject: [PATCH] Update SSR to use hooks and testing utilities from common

---
 packages/ssr/src/__tests__/useLazyQuery.test.tsx |  9 ++++++---
 packages/ssr/src/__tests__/useQuery.test.tsx     | 10 ++++++----
 packages/ssr/src/getDataFromTree.ts              |  3 +--
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/packages/ssr/src/__tests__/useLazyQuery.test.tsx b/packages/ssr/src/__tests__/useLazyQuery.test.tsx
index 1f867c1bcf..8aaee74fd6 100644
--- a/packages/ssr/src/__tests__/useLazyQuery.test.tsx
+++ b/packages/ssr/src/__tests__/useLazyQuery.test.tsx
@@ -2,10 +2,13 @@ import React from 'react';
 import { DocumentNode } from 'graphql';
 import gql from 'graphql-tag';
 import { mockSingleLink } from '@apollo/react-testing';
-import { ApolloProvider, useLazyQuery } from '@apollo/react-hooks';
 import { renderToStringWithData } from '@apollo/react-ssr';
-import { ApolloClient } from 'apollo-client';
-import { InMemoryCache } from 'apollo-cache-inmemory';
+import {
+  ApolloClient,
+  InMemoryCache,
+  ApolloProvider,
+  useLazyQuery
+} from '@apollo/react-common';
 
 describe('useLazyQuery Hook SSR', () => {
   const CAR_QUERY: DocumentNode = gql`
diff --git a/packages/ssr/src/__tests__/useQuery.test.tsx b/packages/ssr/src/__tests__/useQuery.test.tsx
index 92537e0a1d..f96c7e28e9 100644
--- a/packages/ssr/src/__tests__/useQuery.test.tsx
+++ b/packages/ssr/src/__tests__/useQuery.test.tsx
@@ -1,12 +1,14 @@
 import React from 'react';
 import { DocumentNode } from 'graphql';
 import gql from 'graphql-tag';
-import { ApolloProvider } from '@apollo/react-common';
 import { MockedProvider, mockSingleLink } from '@apollo/react-testing';
-import { useQuery } from '@apollo/react-hooks';
+import {
+  ApolloProvider,
+  useQuery,
+  ApolloClient,
+  InMemoryCache
+} from '@apollo/react-common';
 import { renderToStringWithData } from '@apollo/react-ssr';
-import { ApolloClient } from 'apollo-client';
-import { InMemoryCache } from 'apollo-cache-inmemory';
 import { render, wait } from '@testing-library/react';
 
 describe('useQuery Hook SSR', () => {
diff --git a/packages/ssr/src/getDataFromTree.ts b/packages/ssr/src/getDataFromTree.ts
index 790633f3ca..ece8be7e92 100644
--- a/packages/ssr/src/getDataFromTree.ts
+++ b/packages/ssr/src/getDataFromTree.ts
@@ -1,6 +1,5 @@
 import React from 'react';
-import { getApolloContext } from '@apollo/react-common';
-import { RenderPromises } from '@apollo/react-hooks';
+import { getApolloContext, RenderPromises } from '@apollo/react-common';
 
 export function getDataFromTree(
   tree: React.ReactNode,