Merge branch 'main' into release-3.5.

.circleci/config.yml

@@ -3,7 +3,7 @@ version: 2
 jobs:
   Filesize:
     docker:
-      - image: circleci/node:16
+      - image: cimg/node:16.8
     steps:
       - checkout
       - restore_cache:
@@ -26,7 +26,7 @@ jobs:
 
   Tests:
     docker:
-      - image: circleci/node:16
+      - image: cimg/node:16.8
     steps:
       - checkout
       - restore_cache:

CHANGELOG.md

@@ -49,6 +49,16 @@
 - 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.12 (not yet released)
+
+### Bug Fixes
+
+- Improve handling of falsy `existing` and/or `incoming` parameters in `relayStylePagination` field policy helper function. <br/>
+  [@bubba](https://github.com/bubba) and [@benjamn](https://github.com/benjamn) in [#8733](https://github.com/apollographql/apollo-client/pull/8733)
+
+- Associate Apollo context with `React.createContext` (instead of using a local `WeakMap`) again, so multiple copies of `@apollo/client` (uncommon) can share the same context. <br/>
+  [@benjamn](https://github.com/benjamn) in [#8798](https://github.com/apollographql/apollo-client/pull/8798)
+
 ## Apollo Client 3.4.11
 
 ### Bug Fixes

config/resolveModuleIds.ts

@@ -13,7 +13,7 @@ eachFile(distDir, (file, relPath) => new Promise((resolve, reject) => {
     if (
       /\b__DEV__\b/.test(source) &&
       // Ignore modules that reside within @apollo/client/utilities/globals.
-      !relPath.startsWith("utilities/globals/")
+      relPath.split(path.sep, 2).join("/") !== "utilities/globals"
     ) {
       let importsUtilitiesGlobals = false;
 

docs/package.json

@@ -8,7 +8,7 @@
   },
   "dependencies": {
     "gatsby": "2.32.13",
-    "gatsby-theme-apollo-docs": "5.0.0",
+    "gatsby-theme-apollo-docs": "5.0.1",
     "react": "17.0.2",
     "react-dom": "17.0.1",
     "webpack-virtual-modules": "0.4.3"

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

@@ -14,7 +14,7 @@ import { onError } from "@apollo/client/link/error";
 // Log any GraphQL errors or network error that occurred
 const errorLink = onError(({ graphQLErrors, networkError }) => {
   if (graphQLErrors)
-    graphQLErrors.map(({ message, locations, path }) =>
+    graphQLErrors.forEach(({ message, locations, path }) =>
       console.log(
         `[GraphQL error]: Message: ${message}, Location: ${locations}, Path: ${path}`
       )

examples/bundling/no-tree-shaking/rollup-ac2/package.json

@@ -47,6 +47,6 @@
     "rollup-plugin-node-resolve": "5.2.0",
     "rollup-plugin-replace": "2.2.0",
     "rollup-plugin-terser": "7.0.2",
-    "serve": "12.0.0"
+    "serve": "12.0.1"
   }
 }

examples/bundling/no-tree-shaking/rollup-ac3-no-react/package.json

@@ -41,7 +41,7 @@
     "rollup-plugin-node-resolve": "5.2.0",
     "rollup-plugin-replace": "2.2.0",
     "rollup-plugin-terser": "7.0.2",
-    "serve": "12.0.0",
+    "serve": "12.0.1",
     "source-map-explorer": "2.5.2"
   }
 }

examples/bundling/no-tree-shaking/rollup-ac3/package.json

@@ -42,6 +42,6 @@
     "rollup-plugin-node-resolve": "5.2.0",
     "rollup-plugin-replace": "2.2.0",
     "rollup-plugin-terser": "7.0.2",
-    "serve": "12.0.0"
+    "serve": "12.0.1"
   }
 }

examples/bundling/tree-shaking/rollup-ac2/package.json

@@ -48,7 +48,7 @@
     "rollup-plugin-node-resolve": "5.2.0",
     "rollup-plugin-replace": "2.2.0",
     "rollup-plugin-terser": "7.0.2",
-    "serve": "12.0.0",
+    "serve": "12.0.1",
     "source-map-explorer": "2.5.2"
   }
 }

examples/bundling/tree-shaking/rollup-ac3-no-react/package.json

@@ -41,7 +41,7 @@
     "rollup-plugin-node-resolve": "5.2.0",
     "rollup-plugin-replace": "2.2.0",
     "rollup-plugin-terser": "7.0.2",
-    "serve": "12.0.0",
+    "serve": "12.0.1",
     "source-map-explorer": "2.5.2"
   }
 }