Upgrade graphql packages dependencies

examples/demo/package.json

@@ -10,7 +10,7 @@
         "data-generator-retail": "^3.9.0",
         "fakerest": "^3.0.0",
         "fetch-mock": "~6.3.0",
-        "json-graphql-server": "~2.1.3",
+        "json-graphql-server": "~2.3.0",
         "proxy-polyfill": "^0.3.0",
         "ra-data-fakerest": "^3.9.0",
         "ra-data-graphql-simple": "^3.9.0",

examples/demo/src/dataProvider/graphql.ts

@@ -1,4 +1,4 @@
-import { ApolloQueryResult } from 'apollo-client';
+import { ApolloQueryResult } from '@apollo/client';
 import buildApolloClient, {
     buildQuery as buildQueryFactory,
 } from 'ra-data-graphql-simple';
@@ -55,7 +55,9 @@ const customBuildQuery = (
         if (type === DELETE) {
             return {
                 query: gql`mutation remove${resource}($id: ID!) {
-                    remove${resource}(id: $id)
+                    remove${resource}(id: $id) {
+                        id
+                    }
                 }`,
                 variables: { id: params.id },
                 parseResponse: ({ data }: ApolloQueryResult<any>) => {

packages/ra-data-graphql-simple/package.json

@@ -33,18 +33,17 @@
     },
     "dependencies": {
         "graphql-ast-types-browser": "~1.0.2",
-        "graphql-tag": "^2.10.1",
         "lodash": "~4.17.5",
         "pluralize": "~7.0.0",
         "ra-data-graphql": "^3.11.4"
     },
     "peerDependencies": {
-        "graphql": "^14.1.1",
+        "graphql": "^15.6.0",
         "ra-core": "^3.9.0"
     },
     "devDependencies": {
         "cross-env": "^5.2.0",
-        "graphql": "^14.1.1",
+        "graphql": "^15.6.0",
         "rimraf": "^2.6.3"
     }
 }

packages/ra-data-graphql-simple/src/buildQuery.test.js

@@ -1,4 +1,4 @@
-import gql from 'graphql-tag';
+import { gql } from '@apollo/client';
 import { buildQueryFactory } from './buildQuery';
 
 describe('buildQuery', () => {

packages/ra-data-graphql/package.json

@@ -32,19 +32,17 @@
         "watch": "tsc --outDir esm --module es2015 --watch"
     },
     "dependencies": {
-        "apollo-client": "^2.6.3",
-        "apollo-client-preset": "^1.0.8",
-        "graphql-tag": "^2.10.1",
+        "@apollo/client": "^3.3.19",
         "lodash": "~4.17.5",
         "pluralize": "~7.0.0"
     },
     "peerDependencies": {
-        "graphql": "^14.1.1",
+        "graphql": "^15.6.0",
         "ra-core": "^3.9.0"
     },
     "devDependencies": {
         "cross-env": "^5.2.0",
-        "graphql": "^14.1.1",
+        "graphql": "^15.6.0",
         "rimraf": "^2.6.3"
     }
 }

packages/ra-data-graphql/src/buildApolloClient.js

@@ -1,9 +1,4 @@
-import { ApolloClient } from 'apollo-client';
-import {
-    HttpLink,
-    InMemoryCache,
-    IntrospectionFragmentMatcher,
-} from 'apollo-client-preset';
+import { ApolloClient, HttpLink, InMemoryCache } from '@apollo/client';
 
 export default options => {
     if (!options) {
@@ -14,22 +9,12 @@ export default options => {
     let finalLink = link;
     let finalCache = cache;
 
-    // Create an empty fragment matcher
-    // See: https://github.com/apollographql/apollo-client/issues/3397#issuecomment-421433032
-    const fragmentMatcher = new IntrospectionFragmentMatcher({
-        introspectionQueryResultData: {
-            __schema: {
-                types: [],
-            },
-        },
-    });
-
     if (!link && uri) {
         finalLink = new HttpLink({ uri });
     }
 
     if (!cache) {
-        finalCache = new InMemoryCache({ fragmentMatcher }).restore({});
+        finalCache = new InMemoryCache().restore({});
     }
 
     return new ApolloClient({

packages/ra-data-graphql/src/introspection.js

@@ -1,5 +1,5 @@
 import { getIntrospectionQuery } from 'graphql';
-import gql from 'graphql-tag';
+import { gql } from '@apollo/client';
 import { GET_LIST, GET_ONE } from 'ra-core';
 
 import { ALL_TYPES } from './constants';