Merge branch 'master' into unresolved-entity

Author: mduesterhoeft

CHANGELOG.md

@@ -5,10 +5,13 @@ The version headers in this history reflect the versions of Apollo Server itself
 - [__CHANGELOG for `@apollo/gateway`__](https://github.com/apollographql/apollo-server/blob/master/packages/apollo-gateway/CHANGELOG.md)
 - [__CHANGELOG for `@apollo/federation`__](https://github.com/apollographql/apollo-server/blob/master/packages/apollo-federation/CHANGELOG.md)
 
-### vNext
+### vNEXT
 
-- `apollo-engine-reporting`: Add environment variable `APOLLO_SCHEMA_REPORTING` that can enable schema reporting. If `experimental__schemaReporting` is set it will override the environment variables.
-- `apollo-engine-reporting`: The schema reporting URL has been changed to use the new dedicated sub-domain `https://edge-server-reporting.api.apollographql.com`.
+> The changes noted within this `vNEXT` section have not been released yet.  New PRs and commits which introduce changes should include an entry in this `vNEXT` section as part of their development.  With few exceptions, the format of the entry should follow convention (i.e., prefix with package name, use markdown `backtick formatting` for package names and code, suffix with a link to the change-set à la `[PR #YYY](https://link/pull/YYY)`, etc.).
+  When a release is being prepared, a new header will be (manually) created below and the appropriate changes within that release will be moved into the new section.
+- `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)
 
 ### v2.14.3
 

packages/apollo-federation/CHANGELOG.md

@@ -6,6 +6,10 @@
 
 - _Nothing yet! Stay tuned._
 
+## 0.16.6
+
+- In-house `Maybe` type which was previously imported from `graphql` and has been moved in `v15.1.0`. [#4230](https://github.com/apollographql/apollo-server/pull/4230)
+
 ## 0.16.5
 
 - Remove federation primitives from SDL during composition. This allows for services to report their *full* SDL from the `{ _service { sdl } }` query as opposed to the previously limited SDL without federation definitions. [#4209](https://github.com/apollographql/apollo-server/pull/4209)

packages/apollo-federation/src/composition/types.ts

@@ -5,6 +5,8 @@ import {
   DirectiveDefinitionNode,
 } from 'graphql';
 
+export type Maybe<T> = null | undefined | T;
+
 export type ServiceName = string | null;
 
 export type DefaultRootOperationTypeName =

packages/apollo-federation/src/composition/utils.ts

@@ -31,8 +31,11 @@ import {
   GraphQLDirective,
   OperationTypeNode,
 } from 'graphql';
-import Maybe from 'graphql/tsutils/Maybe';
-import { ExternalFieldDefinition, DefaultRootOperationTypeName } from './types';
+import {
+  ExternalFieldDefinition,
+  DefaultRootOperationTypeName,
+  Maybe,
+} from './types';
 import federationDirectives from '../directives';
 
 export function isStringValueNode(node: any): node is StringValueNode {

packages/apollo-federation/src/composition/validate/sdl/matchingUnions.ts

@@ -1,7 +1,7 @@
 import { GraphQLError, ASTVisitor, UnionTypeDefinitionNode } from 'graphql';
 import { SDLValidationContext } from 'graphql/validation/ValidationContext';
-import Maybe from 'graphql/tsutils/Maybe';
 import xorBy from 'lodash.xorby';
+import { Maybe } from '../../types';
 import { errorWithCode, logServiceAndType } from '../../utils';
 import {
   existedTypeNameMessage,

packages/apollo-federation/src/composition/validate/sdl/uniqueFieldDefinitionNames.ts

@@ -15,7 +15,7 @@ import {
 } from 'graphql';
 import { SDLValidationContext } from 'graphql/validation/ValidationContext';
 import { TypeMap } from 'graphql/type/schema';
-import Maybe from 'graphql/tsutils/Maybe';
+import { Maybe } from '../../types';
 import { diffTypeNodes, logServiceAndType } from '../../utils';
 
 type TypeNodeWithFields = TypeDefinitionWithFields | TypeExtensionWithFields;

packages/apollo-federation/src/composition/validate/sdl/uniqueTypeNamesWithFields.ts

@@ -7,7 +7,7 @@ import {
 } from 'graphql';
 
 import { SDLValidationContext } from 'graphql/validation/ValidationContext';
-import Maybe from 'graphql/tsutils/Maybe';
+import { Maybe } from '../../types';
 import {
   isTypeNodeAnEntity,
   diffTypeNodes,

packages/apollo-gateway/CHANGELOG.md

@@ -6,6 +6,10 @@
 
 - __FIX__: Continue resolving when an `@external` reference cannot be resolved. [#3914](https://github.com/apollographql/apollo-server/pull/3914)
 
+## 0.16.6
+
+- Only changes in the similarly versioned `@apollo/federation` package.
+
 ## 0.16.5
 
 - Only changes in the similarly versioned `@apollo/federation` package.