Merge branch 'main' into release-3.5.

apollographql · Sep 10, 2021 · fe585d3 · fe585d3
2 parents b61e885 + e0ea45c
commit fe585d3
Show file tree

Hide file tree

Showing 15 changed files with 1,197 additions and 1,406 deletions.
diff --git a/.gitignore b/.gitignore
@@ -59,3 +59,6 @@ docs/public/*
 junit.xml
 
 .rpt2_cache
+
+# Local Netlify folder
+.netlify
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -43,6 +43,13 @@
 - Update `zen-observable-ts` to eliminate transitive dependency on `@types/zen-observable`. <br/>
   [@benjamn](https://github.com/benjamn) in [#8695](https://github.com/apollographql/apollo-client/pull/8695)
 
+## Apollo Client 3.4.11 (not yet released)
+
+### Bug Fixes
+
+- Fix [Vite](https://vitejs.dev) tree-shaking by calling the `checkDEV()` function (at least once) in the module that exports it, `@apollo/client/utilities/globals/index.ts`. <br/>
+  [@benjamn](https://github.com/benjamn) in [#8767](https://github.com/apollographql/apollo-client/pull/8767)
+
 ## Apollo Client 3.4.10
 
 ### Improvements

diff --git a/README.md b/README.md
@@ -22,9 +22,9 @@ Learn how to use Apollo Client with self-paced hands-on training on Odyssey, Apo
 ## Maintainers
 
 - [@benjamn](https://github.com/benjamn) (Apollo)
-- [@hwillson](https://github.com/hwillson) (Apollo)
-- [@jcreighton](https://github.com/jcreighton) (Apollo)
 - [@brainkim](https://github.com/brainkim) (Apollo)
+- [@jcreighton](https://github.com/jcreighton) (Netflix)
+- [@hwillson](https://github.com/hwillson) (Apollo)
 
 ## Who is Apollo?
 

diff --git a/docs/gatsby-config.js b/docs/gatsby-config.js
@@ -1,13 +1,14 @@
 const themeOptions = require('gatsby-theme-apollo-docs/theme-options');
 
 module.exports = {
-  pathPrefix: '/docs/react',
   plugins: [
     {
       resolve: 'gatsby-theme-apollo-docs',
       options: {
         ...themeOptions,
         root: __dirname,
+        pathPrefix: '/docs/react',
+        algoliaIndexName: 'react',
         subtitle: 'Client (React)',
         description: 'A guide to using the Apollo GraphQL Client with React',
         githubRepo: 'apollographql/apollo-client',