Merge remote-tracking branch 'origin/master' into release-2.15.0

CHANGELOG.md

@@ -16,6 +16,7 @@ The version headers in this history reflect the versions of Apollo Server itself
 - `apollo-engine-reporting`: Add environment variable `APOLLO_SCHEMA_REPORTING` that can enable schema reporting. If `experimental__schemaReporting` is set it will override the environment variable. [PR #4206](https://github.com/apollographql/apollo-server/pull/4206)
 - `apollo-engine-reporting`: The schema reporting URL has been changed to use the new dedicated sub-domain `https://edge-server-reporting.api.apollographql.com`. [PR #4232](https://github.com/apollographql/apollo-server/pull/4232)
 - `apollo-server-core`: Though Apollo Server **is not affected** due to the way it is integrated, in response to [an upstream security advisory for GraphQL Playground](https://github.com/prisma-labs/graphql-playground/security/advisories/GHSA-4852-vrh7-28rf) we have published [the same patch](https://github.com/prisma-labs/graphql-playground/commit/bf1883db538c97b076801a60677733816cb3cfb7) on our `@apollographql/graphql-playground-html` fork and bumped Apollo Server to use it.  Again, this was done out of an **abundance of caution** since the way that Apollo Server utilizes `renderPlaygroundPage` is _not_ vulnerable as it does not allow per-request Playground configuration that could allow interpolation of user-input. [PR #4231](https://github.com/apollographql/apollo-server/pull/4231)
+- `apollo-engine-reporting`: Make Apollo Server throw if schema reporting is enabled for a gateway or federated service. [PR #4246](https://github.com/apollographql/apollo-server/pull/4246)
 
 ### v2.14.3
 

docs/package.json

@@ -6,8 +6,8 @@
     "serve": "gatsby serve"
   },
   "dependencies": {
-    "gatsby": "2.23.1",
-    "gatsby-theme-apollo-docs": "4.2.3",
+    "gatsby": "2.23.3",
+    "gatsby-theme-apollo-docs": "4.2.7",
     "react": "16.13.1",
     "react-dom": "16.13.1"
   }

package.json

@@ -61,13 +61,13 @@
   },
   "devDependencies": {
     "@types/async-retry": "1.4.2",
-    "@types/aws-lambda": "8.10.53",
+    "@types/aws-lambda": "8.10.56",
     "@types/body-parser": "1.19.0",
     "@types/bunyan": "1.8.6",
     "@types/connect": "3.4.33",
     "@types/fast-json-stable-stringify": "2.0.0",
     "@types/hapi": "17.8.8",
-    "@types/ioredis": "4.16.4",
+    "@types/ioredis": "4.16.5",
     "@types/jest": "25.2.3",
     "@types/koa-router": "7.4.1",
     "@types/lodash": "4.14.155",
@@ -83,10 +83,10 @@
     "@types/qs-middleware": "1.0.1",
     "@types/request": "2.48.5",
     "@types/request-promise": "4.1.46",
-    "@types/supertest": "2.0.8",
+    "@types/supertest": "2.0.9",
     "@types/test-listen": "1.1.0",
     "@types/type-is": "1.6.3",
-    "@types/uuid": "7.0.3",
+    "@types/uuid": "7.0.4",
     "@types/ws": "7.2.5",
     "apollo-fetch": "0.7.0",
     "apollo-link": "1.2.14",
@@ -113,7 +113,7 @@
     "js-sha256": "0.9.0",
     "koa": "2.12.0",
     "koa-router": "7.4.0",
-    "lerna": "3.22.0",
+    "lerna": "3.22.1",
     "log4js": "4.5.1",
     "memcached-mock": "0.1.0",
     "mock-req": "0.2.0",