Merge pull request #53 from detroitledger/jm-upgrade-apollo-client

Upgrade to Apollo Client 3.x

Author: jessicamcinchak

package.json

@@ -17,16 +17,12 @@
   "author": "Benjamin Chodoroff",
   "license": "MIT",
   "dependencies": {
-    "@apollo/react-components": "3.1.4",
-    "@apollo/react-hooks": "3.1.4",
+    "@apollo/client": "^3.3.12",
     "@bnchdrff/react-user-tour": "^3.0.1",
-    "apollo-boost": "0.4.7",
-    "apollo-client": "2.6.8",
     "axios": "^0.15.3",
     "cross-fetch": "^1.1.1",
     "eslint-plugin-react": "^7.14.3",
     "graphql": "14.5.5",
-    "graphql-tag": "2.10.0",
     "graphql-tools": "^0.9.0",
     "http-proxy-middleware": "^0.20.0",
     "immutability-helper": "^2.0.0",

src/containers/AddGrant.js

@@ -1,7 +1,6 @@
 import React, { useState } from 'react';
 
-import { gql } from 'apollo-boost';
-import { useMutation } from '@apollo/react-hooks';
+import { gql, useMutation } from '@apollo/client';
 import DatePicker from 'react-datepicker';
 
 import { Link } from 'react-router-dom';

src/containers/Grants.js

@@ -2,8 +2,7 @@ import React, { useState } from 'react';
 
 import { Switch, Route, useRouteMatch, useParams } from 'react-router-dom';
 
-import { gql } from 'apollo-boost';
-import { useQuery } from '@apollo/react-hooks';
+import { useQuery, gql } from '@apollo/client';
 
 import Helmet from 'react-helmet';
 

src/containers/OrgNteeTags.js

@@ -2,8 +2,7 @@ import React from 'react';
 
 import { Switch, Route, useRouteMatch, useParams } from 'react-router-dom';
 
-import { gql } from 'apollo-boost';
-import { useQuery } from '@apollo/react-hooks';
+import { useQuery, gql } from '@apollo/client';
 
 import Helmet from 'react-helmet';
 

src/containers/OrganizationSelector.js

@@ -1,5 +1,4 @@
-import { useLazyQuery } from '@apollo/react-hooks';
-import { gql } from 'apollo-boost';
+import { useLazyQuery, gql } from '@apollo/client';
 import PropTypes from 'prop-types';
 import React from 'react';
 

src/containers/Organizations.js

@@ -5,8 +5,7 @@ import { Switch, Route, useRouteMatch, useParams } from 'react-router-dom';
 import { uniq, map, filter, findIndex, sortBy } from 'lodash';
 import moment from 'moment';
 
-import { gql } from 'apollo-boost';
-import { useQuery } from '@apollo/react-hooks';
+import { useQuery, gql } from '@apollo/client';
 
 import Helmet from 'react-helmet';
 

src/containers/SearchResult.js

@@ -1,7 +1,6 @@
 import React from 'react';
 
-import { useQuery } from '@apollo/react-hooks';
-import gql from 'graphql-tag';
+import { useQuery, gql } from '@apollo/client';
 import PropTypes from 'prop-types';
 import { Link } from 'react-router-dom';
 

src/containers/Stats.js

@@ -1,8 +1,7 @@
 import React from 'react';
 import numeral from 'numeral';
 
-import { useQuery } from '@apollo/react-hooks';
-import gql from 'graphql-tag';
+import { useQuery, gql } from '@apollo/client';
 
 import { dollarsFormatter } from '../utils';
 

src/containers/TopLists.js

@@ -1,8 +1,7 @@
 import React from 'react';
 import _ from 'lodash';
 
-import { useQuery } from '@apollo/react-hooks';
-import gql from 'graphql-tag';
+import { useQuery, gql } from '@apollo/client';
 
 import { Col, Row } from 'react-bootstrap';
 

src/index.js

@@ -5,7 +5,7 @@ import { BrowserRouter as Router, Route, Link } from 'react-router-dom';
 
 import { Provider } from 'react-redux';
 
-import { ApolloProvider } from '@apollo/react-hooks';
+import { ApolloProvider } from '@apollo/client';
 
 import configureStore from './store/configureStore';
 

src/network/create-apollo-client.js

@@ -1,9 +1,11 @@
-import ApolloClient from 'apollo-boost';
+import { ApolloClient, InMemoryCache } from '@apollo/client';
+
 import store from 'store/dist/store.modern';
 
 export default (apiUrl) => {
   return new ApolloClient({
     uri: apiUrl,
+    cache: new InMemoryCache(),
     request: (op) =>
       op.setContext({
         headers: {