Merge branch 'main' into release-3.4.

Author: benjamn

CHANGELOG.md

@@ -9,6 +9,20 @@ TBD
 ## Documentation
 TBD
 
+## Apollo Client 3.3.4
+
+## Improvements
+
+- Update `ts-invariant` to avoid potential [Content Security Policy](https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP)-violating `Function` fallback, thanks to [a clever new `globalThis` polyfill technique](https://mathiasbynens.be/notes/globalthis). <br/>
+  [@benjamn](https://github.com/benjamn) in [#7414](https://github.com/apollographql/apollo-client/pull/7414)
+
+## Apollo Client 3.3.3
+
+## Bug fixes
+
+- Make the `observer` parameter of `ApolloLink#onError` optional, fixing an unnecessary breaking change for any code that called `onError` directly. <br/>
+  [@benjamn](https://github.com/benjamn) in [#7407](https://github.com/apollographql/apollo-client/pull/7407)
+
 ## Apollo Client 3.3.2
 
 > ⚠️ **Note:** This version of `@apollo/client` contains no behavioral changes since version 3.3.1

docs/package-lock.json

@@ -8,7 +8,7 @@
   },
   "dependencies": {
     "gatsby": "2.27.4",
-    "gatsby-theme-apollo-docs": "4.5.11",
+    "gatsby-theme-apollo-docs": "4.5.12",
     "ink": "^2.7.1",
     "react": "17.0.1",
     "react-dom": "17.0.1",

docs/package.json

@@ -2,10 +2,13 @@
 title: Migrating to Apollo Client 3.0
 ---
 
+import {VideoFrame} from 'gatsby-theme-apollo-docs'
+
 This article walks you through migrating your application to Apollo Client 3.0 from previous versions of Apollo Client. 
 
 To illustrate the migration process, we've also made this video that uses the example app from our [full-stack tutorial](https://www.apollographql.com/docs/tutorial/introduction/) as a starting point, updating it from Apollo client 2.6 to 3.0: 
-<iframe width="560" height="315" src="https://www.youtube.com/embed/dlKzlksOUtU" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
+
+<VideoFrame src="https://www.youtube.com/embed/dlKzlksOUtU" />
 
 ## What’s new in 3.0
 

docs/source/migrating/apollo-client-3-migration.md renamed to docs/source/migrating/apollo-client-3-migration.mdx

@@ -81,7 +81,7 @@
     "optimism": "^0.13.1",
     "prop-types": "^15.7.2",
     "symbol-observable": "^2.0.0",
-    "ts-invariant": "^0.5.1",
+    "ts-invariant": "^0.6.0",
     "tslib": "^1.10.0",
     "zen-observable": "^0.8.14"
   },

package-lock.json

@@ -143,7 +143,7 @@ export class ApolloLink {
 
   protected onError(
     error: any,
-    observer: ZenObservable.Observer<FetchResult>,
+    observer?: ZenObservable.Observer<FetchResult>,
   ): false | void {
     if (observer && observer.error) {
       observer.error(error);