Merge branch 'main' into release-3.7.

README.md

@@ -19,12 +19,11 @@ The Apollo Client API reference can be found at: <br/>
 Learn how to use Apollo Client with self-paced hands-on training on Odyssey, Apollo's official learning platform: <br/>
 [https://odyssey.apollographql.com/](https://odyssey.apollographql.com/)
 
-## Maintainers
+## Apollo Maintainers
 
-- [@benjamn](https://github.com/benjamn) (Apollo)
-- [@brainkim](https://github.com/brainkim) (Apollo)
-- [@jcreighton](https://github.com/jcreighton) (Netflix)
-- [@hwillson](https://github.com/hwillson) (Apollo)
+- [@benjamn](https://github.com/benjamn)
+- [@hwillson](https://github.com/hwillson)
+- [@jpvajda](https://github.com/jpvajda)
 
 ## Who is Apollo?
 

ROADMAP.md

@@ -1,6 +1,6 @@
 # 🔮 Apollo Client Roadmap
 
-**Last updated: April 2022**
+**Last updated: June 2022**
 
 For up to date release notes, refer to the project's [Change Log](https://github.com/apollographql/apollo-client/blob/main/CHANGELOG.md).
 
@@ -12,26 +12,19 @@ For up to date release notes, refer to the project's [Change Log](https://github
 - If you already see an issue that interests you please add a 👍 or a comment so we can measure community interest.
 
 ---
+
 ## 3.7
 
-1. Web Cache and performance improvements through new hooks (useBackgroundQuery, useFragment)
-   - [#8694](https://github.com/apollographql/apollo-client/issues/8694)
-   - [#8236](https://github.com/apollographql/apollo-client/issues/8236)
-2. RefetchQueries not working when using string array after mutation
-   - [#5419](https://github.com/apollographql/apollo-client/issues/5419)
-3. Adding React suspense + data fetching support
-   - [#9627](https://github.com/apollographql/apollo-client/issues/9627)
+- Release 3.7: will focus on cache & performance improvements as well as adding new hooks: `useBackgroundQuery`, `useFragment` See Github [3.7 Milestone](https://github.com/apollographql/apollo-client/milestone/28) for more details.
 
 ## 3.8
 
-- *TBD*
+- Release 3.8 will focus on adding support for `Suspense` & `RefetchQuery` improvements. See Github [3.8 Milestone](https://github.com/apollographql/apollo-client/milestone/30) for more details.
 
 ## 3.9
 
 - *TBD*
 
 ## 4.0
 
-- Full React layer rewrite ([#8245](https://github.com/apollographql/apollo-client/issues/8245))
--  Removal of React from the default `@apollo/client` entry point ([#8190](https://github.com/apollographql/apollo-client/issues/8190))
-- Core APIs to facilitate client/cache persistence (making life simpler for tools like [`apollo3-cache-persist`](https://github.com/apollographql/apollo-cache-persist), for example) ([#8591](https://github.com/apollographql/apollo-client/issues/8591))
+- Release 4.0 will be our next major release of the Client and is still in `pre-planning` phases. See Github [4.0 Milestone](https://github.com/apollographql/apollo-client/milestone/31) for more details.

docs/source/api/link/apollo-link-rest.md

@@ -59,7 +59,7 @@ You can then fetch your data using Apollo Client:
 ```js
 // Invoke the query and log the person's name
 client.query({ query }).then(response => {
-  console.log(response.data.name);
+  console.log(response.data.person.name);
 });
 ```
 

docs/source/data/mutations.mdx

@@ -205,15 +205,15 @@ If you know that your app usually needs to refetch certain queries after a parti
 // Refetches two queries after mutation completes
 const [addTodo, { data, loading, error }] = useMutation(ADD_TODO, {
   refetchQueries: [
-    GET_POST, // DocumentNode object parsed with gql
+    {query: GET_POST}, // DocumentNode object parsed with gql
     'GetComments' // Query name
   ],
 });
 ```
 
 Each element in the `refetchQueries` array is one of the following:
 
-* A `DocumentNode` object parsed with the `gql` function
+* An object referencing `query` (a `DocumentNode` object parsed with the `gql` function) and `variables`
 * The name of a query you've previously executed, as a string (e.g., `GetComments`)
   * To refer to queries by name, make sure each of your app's queries has a _unique_ name.
 

package.json

@@ -94,7 +94,7 @@
     "zen-observable-ts": "^1.2.5"
   },
   "devDependencies": {
-    "@babel/parser": "7.18.0",
+    "@babel/parser": "7.18.4",
     "@graphql-tools/schema": "8.3.13",
     "@rollup/plugin-node-resolve": "11.2.1",
     "@testing-library/react": "12.1.5",
@@ -104,7 +104,7 @@
     "@types/fetch-mock": "7.3.5",
     "@types/glob": "7.2.0",
     "@types/hoist-non-react-statics": "3.3.1",
-    "@types/jest": "27.5.1",
+    "@types/jest": "27.5.2",
     "@types/lodash": "4.14.182",
     "@types/node": "16.11.36",
     "@types/react": "17.0.45",
@@ -127,13 +127,13 @@
     "recast": "0.21.1",
     "resolve": "1.22.0",
     "rimraf": "3.0.2",
-    "rollup": "2.74.1",
+    "rollup": "2.75.5",
     "rollup-plugin-terser": "7.0.2",
     "rxjs": "7.5.5",
     "subscriptions-transport-ws": "0.11.0",
     "terser": "5.13.1",
     "ts-jest": "27.1.5",
-    "ts-node": "10.8.0",
+    "ts-node": "10.8.1",
     "typescript": "4.6.4",
     "wait-for-observables": "1.0.3",
     "whatwg-fetch": "3.6.2"