Update SSR to use hooks and testing utilities from common

apollographql · Nov 6, 2019 · c34e1f5 · c34e1f5
1 parent 540b14f
commit c34e1f5
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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,