diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..7535f72b9
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,7 @@
+# We'll let Git's auto-detection algorithm infer if a file is text. If it is,
+# enforce LF line endings regardless of OS or git configurations.
+* text=auto eol=lf
+
+# Isolate binary files in case the auto-detection algorithm fails and
+# marks them as text files (which could brick them).
+*.{png,jpg,jpeg,gif,webp,woff,woff2} binary
diff --git a/modules-js/hapi-common/package.json b/modules-js/hapi-common/package.json
index 2f0b1b735..342cc5b18 100644
--- a/modules-js/hapi-common/package.json
+++ b/modules-js/hapi-common/package.json
@@ -37,7 +37,7 @@
     "@types/hoek": "^4.1.3",
     "@types/jest": "24.x.x",
     "graphql-extensions": "^0.6.0",
-    "@hapi/hapi": ">=20.1.0",
+    "@hapi/hapi": ">=20.1.5",
     "jest": "^24.8.0",
     "rimraf": "^2.6.2",
     "rollbar": "^2.5.1",
diff --git a/modules-js/hapi-next/package.json b/modules-js/hapi-next/package.json
index fdffbed24..b226cf33e 100644
--- a/modules-js/hapi-next/package.json
+++ b/modules-js/hapi-next/package.json
@@ -36,7 +36,7 @@
     "@types/node-fetch": "^2.1.2",
     "@types/react": "^16.8.5",
     "@types/react-dom": "^16.8.4",
-    "@hapi/hapi": ">=20.1.0",
+    "@hapi/hapi": ">=20.1.5",
     "jest": "^24.8.0",
     "rimraf": "^2.6.2",
     "tsc-watch": "^1.0.26",
diff --git a/modules-js/mssql-common/src/mssql-common.ts b/modules-js/mssql-common/src/mssql-common.ts
index 8c70c483d..c65fd7123 100644
--- a/modules-js/mssql-common/src/mssql-common.ts
+++ b/modules-js/mssql-common/src/mssql-common.ts
@@ -48,6 +48,7 @@ export async function createConnectionPool(
       multiSubnetFailover: multiSubnetFailoverVal,
       // @ts-ignore
       packetSize: packet_Size,
+      requestTimeout: 45000,
     },
   };
 
diff --git a/services-js/access-boston/package.json b/services-js/access-boston/package.json
index a6a2c9ce4..722be8bcd 100644
--- a/services-js/access-boston/package.json
+++ b/services-js/access-boston/package.json
@@ -32,9 +32,6 @@
       "<rootDir>/scripts/"
     ]
   },
-  "resolutions": {
-    "graphql": "0.13.2"
-  },
   "dependencies": {
     "@babel/runtime": "^7.6.0",
     "@cityofboston/deploy-tools": "^0.0.0",
@@ -46,7 +43,7 @@
     "@cityofboston/srv-decrypt-env": "^0.0.0",
     "@emotion/core": "^10.0.10",
     "apollo-boost": "^0.4.4",
-    "apollo-server-hapi": "^2.5.0",
+    "apollo-server-hapi": "^3.6.3",
     "boom": "^7.2.0",
     "catbox-redis": "^4.2.2",
     "core-js": "^3.3.0",
@@ -56,7 +53,7 @@
     "emotion": "^10.0.9",
     "emotion-server": "^10.0.9",
     "formik": "^1.4.2",
-    "graphql": "^14.3.0",
+    "graphql": "^16.3.0",
     "hapi": "^17.5.2",
     "hapi-accept-language2": "^2.0.3",
     "hapi-cors": "^1.0.3",
diff --git a/services-js/commissions-app/package.json b/services-js/commissions-app/package.json
index 0206edb80..c5d44300a 100644
--- a/services-js/commissions-app/package.json
+++ b/services-js/commissions-app/package.json
@@ -31,9 +31,6 @@
       "<rootDir>/scripts/"
     ]
   },
-  "resolutions": {
-    "graphql": "0.13.2"
-  },
   "dependencies": {
     "@babel/runtime": "^7.6.0",
     "@cityofboston/form-common": "^0.0.0",
@@ -45,14 +42,14 @@
     "@cityofboston/srv-decrypt-env": "^0.0.0",
     "@emotion/core": "^10.0.10",
     "@types/yup": "^0.26.0",
-    "apollo-server-hapi": "^2.5.0",
+    "apollo-server-hapi": "^3.6.3",
     "boom": "^7.2.0",
     "core-js": "^2.6.4",
     "dataloader": "^1.4.0",
     "dotenv": "^5.0.1",
     "emotion": "^10.0.9",
     "formik": "^1.4.2",
-    "graphql": "^14.3.0",
+    "graphql": "^16.3.0",
     "handlebars": "^4.0.12",
     "@hapi/hapi": ">=20.1.0",
     "hapi-accept-language2": "^2.0.3",
diff --git a/services-js/commissions-search/package.json b/services-js/commissions-search/package.json
index 1d1b9b486..6e83c3a46 100644
--- a/services-js/commissions-search/package.json
+++ b/services-js/commissions-search/package.json
@@ -6,7 +6,7 @@
     "apollo-cache-inmemory": "^1.5.1",
     "apollo-client": "^2.5.1",
     "apollo-link-http": "^1.5.14",
-    "graphql": "^14.3.0",
+    "graphql": "^16.3.0",
     "graphql-tag": "^2.10.1",
     "immutability-helper": "^2.7.1",
     "react": "16.8.5",
diff --git a/services-js/group-mgmt/package.json b/services-js/group-mgmt/package.json
index 5f24a526a..49afef1bc 100644
--- a/services-js/group-mgmt/package.json
+++ b/services-js/group-mgmt/package.json
@@ -22,22 +22,19 @@
       "<rootDir>/scripts/"
     ]
   },
-  "resolutions": {
-    "graphql": "0.13.2"
-  },
   "dependencies": {
     "@babel/runtime": "7.1.2",
     "@cityofboston/deploy-tools": "^0.0.0",
     "@cityofboston/hapi-common": "^0.0.0",
     "@cityofboston/srv-decrypt-env": "^0.0.0",
-    "apollo-server-hapi": "^2.5.0",
+    "apollo-server-hapi": "^3.6.3",
     "boom": "^7.2.0",
     "catbox-redis": "^4.2.2",
     "core-js": "^3.3.0",
     "crumb": "^7.1.0",
     "dotenv": "^5.0.1",
     "emotion-server": "^10.0.9",
-    "graphql": "^14.3.0",
+    "graphql": "^16.3.0",
     "hapi": "^17.5.2",
     "hapi-accept-language2": "^2.0.3",
     "hapi-dev-errors": "^3.0.1",
diff --git a/services-js/permit-finder/package.json b/services-js/permit-finder/package.json
index da84fcc2f..222771cf6 100644
--- a/services-js/permit-finder/package.json
+++ b/services-js/permit-finder/package.json
@@ -39,7 +39,7 @@
     "@cityofboston/percy-common": "^0.0.0",
     "@cityofboston/srv-decrypt-env": "^0.0.0",
     "@emotion/core": "^10.0.10",
-    "apollo-server-hapi": "^2.5.0",
+    "apollo-server-hapi": "^3.6.3",
     "autolinker": "^3.0.5",
     "aws-sdk": "^2.245.1",
     "boom": "^7.2.0",
@@ -47,7 +47,7 @@
     "csv-parser": "^2.3.0",
     "date-fns": "^1.29.0",
     "dotenv": "^5.0.1",
-    "graphql": "^14.3.0",
+    "graphql": "^16.3.0",
     "hapi": "^17.5.2",
     "hapi-dev-errors": "^3.0.1",
     "inert": "^5.1.0",
diff --git a/services-js/registry-certs/client/dao/DeathCertificatesDao.ts b/services-js/registry-certs/client/dao/DeathCertificatesDao.ts
index a79f75380..6c62f979d 100644
--- a/services-js/registry-certs/client/dao/DeathCertificatesDao.ts
+++ b/services-js/registry-certs/client/dao/DeathCertificatesDao.ts
@@ -32,7 +32,7 @@ export default class DeathCertificatesDao {
   async search(
     fullQuery: string,
     page: number
-  ): Promise<DeathCertificateSearchResults> {
+  ): Promise<any> /*Promise<DeathCertificateSearchResults>*/ {
     if (fullQuery === this.cacheFullQuery) {
       const results = this.cacheByPage[page];
       if (results) {
@@ -45,21 +45,34 @@ export default class DeathCertificatesDao {
 
     const { query, startYear, endYear } = this.parseQuery(fullQuery);
 
-    const results = await searchDeathCertificates(
-      this.fetchGraphql,
-      query,
-      page,
-      startYear,
-      endYear
-    );
-
-    this.cacheByPage[page] = results;
-
-    results.results.forEach(cert => {
-      this.loader.prime(cert.id, cert);
-    });
-
-    return results;
+    // console.log('DeathCertificateDao > page: ', page);
+    // console.log('DeathCertificateDao > query: ', query);
+
+    try {
+      const results = await searchDeathCertificates(
+        this.fetchGraphql,
+        query,
+        page,
+        startYear,
+        endYear
+      );
+
+      this.cacheByPage[page] = results;
+
+      // eslint-disable-next-line no-console
+      // console.log(
+      //   'DeathCertificateDao > this.cacheByPage: ',
+      //   this.cacheByPage[page]
+      // );
+
+      results.results.forEach(cert => {
+        this.loader.prime(cert.id, cert);
+      });
+
+      return results;
+    } catch (error) {
+      console.log('Error talking to GraphQL endpoint');
+    }
   }
 
   async lookupOrder(
diff --git a/services-js/registry-certs/client/death/search/SearchPage.tsx b/services-js/registry-certs/client/death/search/SearchPage.tsx
index 105806411..6e68a4519 100644
--- a/services-js/registry-certs/client/death/search/SearchPage.tsx
+++ b/services-js/registry-certs/client/death/search/SearchPage.tsx
@@ -56,6 +56,7 @@ class SearchPage extends Component<Props, State> {
 
     if (q) {
       page = parseInt(getParam(query.page, '1'), 10);
+      console.log('SearchPage > q: ', q);
 
       results = await deathCertificatesDao.search(q, page);
     }
diff --git a/services-js/registry-certs/client/queries/search-death-certificates.ts b/services-js/registry-certs/client/queries/search-death-certificates.ts
index 6ab6825c2..c205ce400 100644
--- a/services-js/registry-certs/client/queries/search-death-certificates.ts
+++ b/services-js/registry-certs/client/queries/search-death-certificates.ts
@@ -58,5 +58,13 @@ export default async function searchDeathCertificates(
     QUERY,
     queryVariables
   );
+  // eslint-disable-next-line no-console
+  // console.log(
+  //   'search-death-certificates > searchDeathCertificates: ',
+  //   response.deathCertificates.search,
+  //   response.deathCertificates,
+  //   response
+  // );
+
   return response.deathCertificates.search;
 }
diff --git a/services-js/registry-certs/package.json b/services-js/registry-certs/package.json
index d6bf96375..e65d5b56c 100644
--- a/services-js/registry-certs/package.json
+++ b/services-js/registry-certs/package.json
@@ -25,7 +25,7 @@
     "postdeploy": "ts-node --project ./tsnode.config.json ./scripts/post-deploy",
     "clear-babel-cache": "rm -rf node_modules/.cache/babel-loader",
     "generate-graphql-schema": "mkdir -p graphql && ts2gql server/graphql/index.ts > graphql/schema.graphql",
-    "generate-graphql-types": "npx apollo codegen:generate --includes=\"client/queries/*.ts\" --localSchemaFile=graphql/schema.graphql --target=typescript --outputFlat --no-addTypename client/queries/graphql-types.ts",
+    "generate-graphql-types": "npx apollo client:codegen --includes=\"client/queries/*.ts\" --localSchemaFile=graphql/schema.graphql --target=typescript --outputFlat --no-addTypename client/queries/graphql-types.ts",
     "generate-fixtures": "ts-node --project ./tsnode.config.json ./scripts/generate-fixtures"
   },
   "jest": {
@@ -54,7 +54,7 @@
     "@types/qs": "^6.9.4",
     "@zeit/next-source-maps": "^0.0.4-canary.1",
     "address-rfc2822": "^2.0.3",
-    "apollo-server-hapi": "^2.5.0",
+    "apollo-server-hapi": "^3.6.3",
     "aws-sdk": "^2.100.0",
     "axios": ">=0.21.1",
     "babel-runtime": "^6.26.0",
@@ -66,9 +66,9 @@
     "dotenv": "^5.0.0",
     "formik": "^1.4.2",
     "good": "^8.1.1",
-    "graphql": "^14.3.0",
+    "graphql": "^16.3.0",
     "handlebars": "^4.0.11",
-    "@hapi/hapi": ">=20.1.0",
+    "@hapi/hapi": ">=20.1.5",
     "http-status": "^1.0.1",
     "https-proxy-agent": "^2.0.0",
     "inert": "^5.1.0",
diff --git a/services-js/registry-certs/server/__snapshots__/server.test.ts.snap b/services-js/registry-certs/server/__snapshots__/server.test.ts.snap
index 06e7fd828..0e3686f83 100644
--- a/services-js/registry-certs/server/__snapshots__/server.test.ts.snap
+++ b/services-js/registry-certs/server/__snapshots__/server.test.ts.snap
@@ -6,73 +6,76 @@ Object {
     "__schema": Object {
       "types": Array [
         Object {
-          "name": "Query",
+          "name": "Date",
         },
         Object {
-          "name": "DeathCertificates",
+          "name": "DeathCertificate",
         },
         Object {
           "name": "String",
         },
-        Object {
-          "name": "DeathCertificate",
-        },
         Object {
           "name": "Boolean",
         },
         Object {
-          "name": "DeathCertificateOrder",
+          "name": "DeathCertificateSearch",
         },
         Object {
-          "name": "Float",
+          "name": "Int",
         },
         Object {
           "name": "CertificateOrderItem",
         },
         Object {
-          "name": "Int",
+          "name": "Float",
         },
         Object {
-          "name": "DeathCertificateSearch",
+          "name": "DeathCertificateOrder",
         },
         Object {
-          "name": "Mutation",
+          "name": "DeathCertificates",
         },
         Object {
-          "name": "OrderType",
+          "name": "Query",
         },
         Object {
-          "name": "ChargeOrderResult",
+          "name": "DeathCertificateOrderItemInput",
         },
         Object {
-          "name": "ChargeOrderError",
+          "name": "SubmittedOrder",
         },
         Object {
-          "name": "ChargeOrderErrorCode",
+          "name": "OrderErrorCause",
         },
         Object {
-          "name": "DeleteUploadResult",
+          "name": "OrderError",
+        },
+        Object {
+          "name": "OrderResult",
         },
         Object {
           "name": "BirthCertificateOrderItemInput",
         },
         Object {
-          "name": "OrderResult",
+          "name": "MarriageCertificateOrderItemInput",
         },
         Object {
-          "name": "OrderError",
+          "name": "OrderType",
         },
         Object {
-          "name": "OrderErrorCause",
+          "name": "ChargeOrderErrorCode",
         },
         Object {
-          "name": "SubmittedOrder",
+          "name": "ChargeOrderError",
         },
         Object {
-          "name": "DeathCertificateOrderItemInput",
+          "name": "ChargeOrderResult",
         },
         Object {
-          "name": "MarriageCertificateOrderItemInput",
+          "name": "DeleteUploadResult",
+        },
+        Object {
+          "name": "Mutation",
         },
         Object {
           "name": "__Schema",
@@ -98,9 +101,6 @@ Object {
         Object {
           "name": "__DirectiveLocation",
         },
-        Object {
-          "name": "Date",
-        },
       ],
     },
   },
diff --git a/services-js/registry-certs/server/graphql/__snapshots__/index.test.js.snap b/services-js/registry-certs/server/graphql/__snapshots__/index.test.js.snap
index 91f8298db..d195e497a 100644
--- a/services-js/registry-certs/server/graphql/__snapshots__/index.test.js.snap
+++ b/services-js/registry-certs/server/graphql/__snapshots__/index.test.js.snap
@@ -2,18 +2,18 @@
 
 exports[`schema is generated 1`] = `
 GraphQLSchema {
-  "__allowedLegacyNames": Array [],
   "__validationErrors": undefined,
   "_directives": Array [
-    "@skip",
     "@include",
+    "@skip",
     "@deprecated",
+    "@specifiedBy",
   ],
-  "_implementations": Object {},
+  "_implementationsMap": Object {},
   "_mutationType": "Mutation",
-  "_possibleTypeMap": Object {},
   "_queryType": "Query",
-  "_subscriptionType": null,
+  "_subTypeMap": Object {},
+  "_subscriptionType": undefined,
   "_typeMap": Object {
     "BirthCertificateOrderItemInput": "BirthCertificateOrderItemInput",
     "Boolean": "Boolean",
@@ -49,31 +49,32 @@ GraphQLSchema {
     "__TypeKind": "__TypeKind",
   },
   "astNode": Object {
+    "description": undefined,
     "directives": Array [],
     "kind": "SchemaDefinition",
     "loc": Object {
-      "end": 6280,
-      "start": 6234,
+      "end": 6281,
+      "start": 6235,
     },
     "operationTypes": Array [
       Object {
         "kind": "OperationTypeDefinition",
         "loc": Object {
-          "end": 6263,
-          "start": 6245,
+          "end": 6264,
+          "start": 6246,
         },
         "operation": "mutation",
         "type": Object {
           "kind": "NamedType",
           "loc": Object {
-            "end": 6263,
-            "start": 6255,
+            "end": 6264,
+            "start": 6256,
           },
           "name": Object {
             "kind": "Name",
             "loc": Object {
-              "end": 6263,
-              "start": 6255,
+              "end": 6264,
+              "start": 6256,
             },
             "value": "Mutation",
           },
@@ -82,21 +83,21 @@ GraphQLSchema {
       Object {
         "kind": "OperationTypeDefinition",
         "loc": Object {
-          "end": 6278,
-          "start": 6266,
+          "end": 6279,
+          "start": 6267,
         },
         "operation": "query",
         "type": Object {
           "kind": "NamedType",
           "loc": Object {
-            "end": 6278,
-            "start": 6273,
+            "end": 6279,
+            "start": 6274,
           },
           "name": Object {
             "kind": "Name",
             "loc": Object {
-              "end": 6278,
-              "start": 6273,
+              "end": 6279,
+              "start": 6274,
             },
             "value": "Query",
           },
@@ -104,6 +105,8 @@ GraphQLSchema {
       },
     ],
   },
-  "extensionASTNodes": undefined,
+  "description": undefined,
+  "extensionASTNodes": Array [],
+  "extensions": undefined,
 }
 `;
diff --git a/services-js/registry-certs/server/graphql/index.ts b/services-js/registry-certs/server/graphql/index.ts
index 3fa177129..d46a7864b 100644
--- a/services-js/registry-certs/server/graphql/index.ts
+++ b/services-js/registry-certs/server/graphql/index.ts
@@ -1,7 +1,7 @@
 import fs from 'fs';
 import path from 'path';
 import { GraphQLScalarType, Kind } from 'graphql';
-import { makeExecutableSchema } from 'apollo-server-hapi';
+import { makeExecutableSchema } from '@graphql-tools/schema';
 import Stripe from 'stripe';
 import Rollbar from 'rollbar';
 
@@ -57,7 +57,7 @@ const dateResolvers = {
         return null;
       }
     },
-    serialize(value: Date) {
+    serialize(value: any) {
       return value.toISOString();
     },
   }),
@@ -71,5 +71,5 @@ export default makeExecutableSchema({
     ...deathResolvers,
     ...dateResolvers,
   } as any,
-  allowUndefinedInResolve: false,
+  // allowUndefinedInResolve: false,
 });
diff --git a/services-js/registry-certs/server/server.ts b/services-js/registry-certs/server/server.ts
index faabd3aa2..948e2f451 100644
--- a/services-js/registry-certs/server/server.ts
+++ b/services-js/registry-certs/server/server.ts
@@ -21,7 +21,7 @@ import {
   HeaderKeysOptions,
   rollbarPlugin,
   persistentQueryPlugin,
-  rollbarErrorExtension,
+  // rollbarErrorExtension,
   HapiGraphqlContextFunction,
 } from '@cityofboston/hapi-common';
 
@@ -227,19 +227,25 @@ export async function makeServer({ rollbar }: ServerArgs) {
   const apolloServer = new ApolloServer({
     schema,
     context: contextFunction,
-    extensions: [rollbarErrorExtension(rollbar)],
+    // extensions: [rollbarErrorExtension(rollbar)],
+    // plugins: [rollbarErrorExtension(rollbar)]
   });
 
-  await apolloServer.applyMiddleware({
-    app: server,
-    route: {
-      cors: true,
-      auth:
-        Object.keys(apiKeys).length || process.env.NODE_ENV == 'staging'
-          ? 'apiHeaderKeys'
-          : false,
-    },
-  });
+  try {
+    await apolloServer.start();
+    await apolloServer.applyMiddleware({
+      app: server,
+      route: {
+        cors: true,
+        auth:
+          Object.keys(apiKeys).length || process.env.NODE_ENV == 'staging'
+            ? 'apiHeaderKeys'
+            : false,
+      },
+    });
+  } catch (error) {
+    console.log('Middleware Error: ', error);
+  }
 
   await server.register({
     plugin: persistentQueryPlugin,
diff --git a/yarn.lock b/yarn.lock
index 7c33e7b74..55dcea3ab 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -27,6 +27,25 @@
   dependencies:
     "@ampproject/toolbox-core" "^1.0.1"
 
+"@apollo/protobufjs@1.2.2":
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/@apollo/protobufjs/-/protobufjs-1.2.2.tgz#4bd92cd7701ccaef6d517cdb75af2755f049f87c"
+  integrity sha512-vF+zxhPiLtkwxONs6YanSt1EpwpGilThpneExUN5K3tCymuxNnVq2yojTvnpRjv2QfsEIt/n7ozPIIzBLwGIDQ==
+  dependencies:
+    "@protobufjs/aspromise" "^1.1.2"
+    "@protobufjs/base64" "^1.1.2"
+    "@protobufjs/codegen" "^2.0.4"
+    "@protobufjs/eventemitter" "^1.1.0"
+    "@protobufjs/fetch" "^1.1.0"
+    "@protobufjs/float" "^1.0.2"
+    "@protobufjs/inquire" "^1.1.0"
+    "@protobufjs/path" "^1.1.2"
+    "@protobufjs/pool" "^1.1.0"
+    "@protobufjs/utf8" "^1.1.0"
+    "@types/long" "^4.0.0"
+    "@types/node" "^10.1.0"
+    long "^4.0.0"
+
 "@apollographql/apollo-tools@^0.3.6-alpha.1":
   version "0.3.6"
   resolved "https://registry.yarnpkg.com/@apollographql/apollo-tools/-/apollo-tools-0.3.6.tgz#ac10b170a4f42854d9d2ad14e0635897a6986681"
@@ -41,15 +60,22 @@
   dependencies:
     apollo-env "0.5.1"
 
+"@apollographql/apollo-tools@^0.5.1":
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/@apollographql/apollo-tools/-/apollo-tools-0.5.2.tgz#01750a655731a198c3634ee819c463254a7c7767"
+  integrity sha512-KxZiw0Us3k1d0YkJDhOpVH5rJ+mBfjXcgoRoCcslbgirjgLotKMzOcx4PZ7YTEvvEROmvG7X3Aon41GvMmyGsw==
+
 "@apollographql/graphql-playground-html@1.6.24":
   version "1.6.24"
   resolved "https://registry.yarnpkg.com/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.24.tgz#3ce939cb127fb8aaa3ffc1e90dff9b8af9f2e3dc"
   integrity sha512-8GqG48m1XqyXh4mIZrtB5xOhUwSsh1WsrrsaZQOEYYql3YN9DEu9OOSg0ILzXHZo/h2Q74777YE4YzlArQzQEQ==
 
-"@apollographql/graphql-playground-html@^1.6.6":
-  version "1.6.6"
-  resolved "https://registry.yarnpkg.com/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.6.tgz#022209e28a2b547dcde15b219f0c50f47aa5beb3"
-  integrity sha512-lqK94b+caNtmKFs5oUVXlSpN3sm5IXZ+KfhMxOtr0LR2SqErzkoJilitjDvJ1WbjHlxLI7WtCjRmOLdOGJqtMQ==
+"@apollographql/graphql-playground-html@1.6.29":
+  version "1.6.29"
+  resolved "https://registry.yarnpkg.com/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.29.tgz#a7a646614a255f62e10dcf64a7f68ead41dec453"
+  integrity sha512-xCcXpoz52rI4ksJSdOCxeOCn2DLocxwHf9dVT/Q90Pte1LX+LY+91SFtJF3KXVHH8kEin+g1KKCQPKBjZJfWNA==
+  dependencies:
+    xss "^1.0.8"
 
 "@babel/cli@7.1.5":
   version "7.1.5"
@@ -1965,7 +1991,42 @@
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
-"@hapi/accept@5.0.2", "@hapi/accept@^5.0.1":
+"@graphql-tools/merge@^8.2.1":
+  version "8.2.1"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/merge/-/merge-8.2.1.tgz#bf83aa06a0cfc6a839e52a58057a84498d0d51ff"
+  integrity sha512-Q240kcUszhXiAYudjuJgNuLgy9CryDP3wp83NOZQezfA6h3ByYKU7xI6DiKrdjyVaGpYN3ppUmdj0uf5GaXzMA==
+  dependencies:
+    "@graphql-tools/utils" "^8.5.1"
+    tslib "~2.3.0"
+
+"@graphql-tools/mock@^8.1.2":
+  version "8.5.1"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/mock/-/mock-8.5.1.tgz#379d18eafdcb65486beb8f9247b33b7b693c53aa"
+  integrity sha512-cwwqGs9Rofev1JdMheAseqM/rw1uw4CYb35vv3Kcv2bbyiPF+490xdlHqFeIazceotMFxC60LlQztwb64rsEnw==
+  dependencies:
+    "@graphql-tools/schema" "^8.3.1"
+    "@graphql-tools/utils" "^8.6.0"
+    fast-json-stable-stringify "^2.1.0"
+    tslib "~2.3.0"
+
+"@graphql-tools/schema@^8.0.0", "@graphql-tools/schema@^8.3.1":
+  version "8.3.1"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/schema/-/schema-8.3.1.tgz#1ee9da494d2da457643b3c93502b94c3c4b68c74"
+  integrity sha512-3R0AJFe715p4GwF067G5i0KCr/XIdvSfDLvTLEiTDQ8V/hwbOHEKHKWlEBHGRQwkG5lwFQlW1aOn7VnlPERnWQ==
+  dependencies:
+    "@graphql-tools/merge" "^8.2.1"
+    "@graphql-tools/utils" "^8.5.1"
+    tslib "~2.3.0"
+    value-or-promise "1.0.11"
+
+"@graphql-tools/utils@^8.5.1", "@graphql-tools/utils@^8.6.0":
+  version "8.6.1"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/utils/-/utils-8.6.1.tgz#52c7eb108f2ca2fd01bdba8eef85077ead1bf882"
+  integrity sha512-uxcfHCocp4ENoIiovPxUWZEHOnbXqj3ekWc0rm7fUhW93a1xheARNHcNKhwMTR+UKXVJbTFQdGI1Rl5XdyvDBg==
+  dependencies:
+    tslib "~2.3.0"
+
+"@hapi/accept@5.0.2", "@hapi/accept@^5.0.1", "@hapi/accept@^5.0.2":
   version "5.0.2"
   resolved "https://registry.yarnpkg.com/@hapi/accept/-/accept-5.0.2.tgz#ab7043b037e68b722f93f376afb05e85c0699523"
   integrity sha512-CmzBx/bXUR8451fnZRuZAJRlzgm0Jgu5dltTX/bszmR2lheb9BpyN47Q1RbaGTsvFzn0PXAEs+lXDKfshccYZw==
@@ -1994,7 +2055,14 @@
   dependencies:
     "@hapi/hoek" "9.x.x"
 
-"@hapi/bounce@2.x.x":
+"@hapi/boom@^9.1.0", "@hapi/boom@^9.1.2":
+  version "9.1.4"
+  resolved "https://registry.yarnpkg.com/@hapi/boom/-/boom-9.1.4.tgz#1f9dad367c6a7da9f8def24b4a986fc5a7bd9db6"
+  integrity sha512-Ls1oH8jaN1vNsqcaHVYJrKmgMcKsC1wcp8bujvXrHaAqD2iDYq3HoOwsxwo09Cuda5R5nC0o0IxlrlTuvPuzSw==
+  dependencies:
+    "@hapi/hoek" "9.x.x"
+
+"@hapi/bounce@2.x.x", "@hapi/bounce@^2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@hapi/bounce/-/bounce-2.0.0.tgz#e6ef56991c366b1e2738b2cd83b01354d938cf3d"
   integrity sha512-JesW92uyzOOyuzJKjoLHM1ThiOvHPOLDHw01YV8yh5nCso7sDwJho1h0Ad2N+E62bZyz46TG3xhAi/78Gsct6A==
@@ -2007,7 +2075,7 @@
   resolved "https://registry.yarnpkg.com/@hapi/bourne/-/bourne-2.0.0.tgz#5bb2193eb685c0007540ca61d166d4e1edaf918d"
   integrity sha512-WEezM1FWztfbzqIUbsDzFRVMxSoLy3HugVcux6KDDtTqzPsLE8NDRHfXvev66aH1i2oOKKar3/XDjbvh/OUBdg==
 
-"@hapi/call@8.x.x":
+"@hapi/call@8.x.x", "@hapi/call@^8.0.0":
   version "8.0.1"
   resolved "https://registry.yarnpkg.com/@hapi/call/-/call-8.0.1.tgz#9e64cd8ba6128eb5be6e432caaa572b1ed8cd7c0"
   integrity sha512-bOff6GTdOnoe5b8oXRV3lwkQSb/LAWylvDMae6RgEWWntd0SHtkYbQukDHKlfaYtVnSAgIavJ0kqszF/AIBb6g==
@@ -2023,6 +2091,14 @@
     "@hapi/boom" "9.x.x"
     "@hapi/hoek" "9.x.x"
 
+"@hapi/catbox-memory@^5.0.0":
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/@hapi/catbox-memory/-/catbox-memory-5.0.1.tgz#cb63fca0ded01d445a2573b38eb2688df67f70ac"
+  integrity sha512-QWw9nOYJq5PlvChLWV8i6hQHJYfvdqiXdvTupJFh0eqLZ64Xir7mKNi96d5/ZMUAqXPursfNDIDxjFgoEDUqeQ==
+  dependencies:
+    "@hapi/boom" "9.x.x"
+    "@hapi/hoek" "9.x.x"
+
 "@hapi/catbox@^11.1.1":
   version "11.1.1"
   resolved "https://registry.yarnpkg.com/@hapi/catbox/-/catbox-11.1.1.tgz#d277e2d5023fd69cddb33d05b224ea03065fec0c"
@@ -2076,6 +2152,30 @@
     "@hapi/topo" "5.x.x"
     "@hapi/validate" "^1.1.0"
 
+"@hapi/hapi@>=20.1.5":
+  version "20.2.1"
+  resolved "https://registry.yarnpkg.com/@hapi/hapi/-/hapi-20.2.1.tgz#7482bc28757cb4671623a61bdb5ce920bffc8a2f"
+  integrity sha512-OXAU+yWLwkMfPFic+KITo+XPp6Oxpgc9WUH+pxXWcTIuvWbgco5TC/jS8UDvz+NFF5IzRgF2CL6UV/KLdQYUSQ==
+  dependencies:
+    "@hapi/accept" "^5.0.1"
+    "@hapi/ammo" "^5.0.1"
+    "@hapi/boom" "^9.1.0"
+    "@hapi/bounce" "^2.0.0"
+    "@hapi/call" "^8.0.0"
+    "@hapi/catbox" "^11.1.1"
+    "@hapi/catbox-memory" "^5.0.0"
+    "@hapi/heavy" "^7.0.1"
+    "@hapi/hoek" "^9.0.4"
+    "@hapi/mimos" "^6.0.0"
+    "@hapi/podium" "^4.1.1"
+    "@hapi/shot" "^5.0.5"
+    "@hapi/somever" "^3.0.0"
+    "@hapi/statehood" "^7.0.3"
+    "@hapi/subtext" "^7.0.3"
+    "@hapi/teamwork" "^5.1.0"
+    "@hapi/topo" "^5.0.0"
+    "@hapi/validate" "^1.1.1"
+
 "@hapi/heavy@^7.0.1":
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/@hapi/heavy/-/heavy-7.0.1.tgz#73315ae33b6e7682a0906b7a11e8ca70e3045874"
@@ -2109,6 +2209,14 @@
     "@hapi/hoek" "9.x.x"
     mime-db "1.x.x"
 
+"@hapi/mimos@^6.0.0":
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/@hapi/mimos/-/mimos-6.0.0.tgz#daa523d9c07222c7e8860cb7c9c5501fd6506484"
+  integrity sha512-Op/67tr1I+JafN3R3XN5DucVSxKRT/Tc+tUszDwENoNpolxeXkhrJ2Czt6B6AAqrespHoivhgZBWYSuANN9QXg==
+  dependencies:
+    "@hapi/hoek" "9.x.x"
+    mime-db "1.x.x"
+
 "@hapi/nigel@4.x.x":
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/@hapi/nigel/-/nigel-4.0.2.tgz#8f84ef4bca4fb03b2376463578f253b0b8e863c4"
@@ -2137,7 +2245,7 @@
     "@hapi/teamwork" "5.x.x"
     "@hapi/validate" "1.x.x"
 
-"@hapi/shot@^5.0.1":
+"@hapi/shot@^5.0.1", "@hapi/shot@^5.0.5":
   version "5.0.5"
   resolved "https://registry.yarnpkg.com/@hapi/shot/-/shot-5.0.5.tgz#a25c23d18973bec93c7969c51bf9579632a5bebd"
   integrity sha512-x5AMSZ5+j+Paa8KdfCoKh+klB78otxF+vcJR/IoN91Vo2e5ulXIW6HUsFTCU+4W6P/Etaip9nmdAx2zWDimB2A==
@@ -2153,6 +2261,14 @@
     "@hapi/bounce" "2.x.x"
     "@hapi/hoek" "9.x.x"
 
+"@hapi/somever@^3.0.0":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@hapi/somever/-/somever-3.0.1.tgz#9961cd5bdbeb5bb1edc0b2acdd0bb424066aadcc"
+  integrity sha512-4ZTSN3YAHtgpY/M4GOtHUXgi6uZtG9nEZfNI6QrArhK0XN/RDVgijlb9kOmXwCR5VclDSkBul9FBvhSuKXx9+w==
+  dependencies:
+    "@hapi/bounce" "2.x.x"
+    "@hapi/hoek" "9.x.x"
+
 "@hapi/statehood@^7.0.3":
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/@hapi/statehood/-/statehood-7.0.3.tgz#655166f3768344ed3c3b50375a303cdeca8040d9"
@@ -2179,7 +2295,7 @@
     "@hapi/pez" "^5.0.1"
     "@hapi/wreck" "17.x.x"
 
-"@hapi/teamwork@5.x.x":
+"@hapi/teamwork@5.x.x", "@hapi/teamwork@^5.1.0":
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/@hapi/teamwork/-/teamwork-5.1.0.tgz#7801a61fc727f702fd2196ef7625eb4e389f4124"
   integrity sha512-llqoQTrAJDTXxG3c4Kz/uzhBS1TsmSBa/XG5SPcVXgmffHE1nFtyLIK0hNJHCB3EuBKT84adzd1hZNY9GJLWtg==
@@ -2191,7 +2307,7 @@
   dependencies:
     "@hapi/hoek" "^9.0.0"
 
-"@hapi/validate@1.x.x", "@hapi/validate@^1.1.0":
+"@hapi/validate@1.x.x", "@hapi/validate@^1.1.0", "@hapi/validate@^1.1.1":
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/@hapi/validate/-/validate-1.1.3.tgz#f750a07283929e09b51aa16be34affb44e1931ad"
   integrity sha512-/XMR0N0wjw0Twzq2pQOzPBZlDzkekGcoCtzO314BpIEsbXdYGthQUbxgkGDf4nhk1+IPDAsXqWjMohRQYO06UA==
@@ -2380,6 +2496,11 @@
     "@types/istanbul-reports" "^1.1.1"
     "@types/yargs" "^12.0.9"
 
+"@josephg/resolvable@^1.0.0":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@josephg/resolvable/-/resolvable-1.0.1.tgz#69bc4db754d79e1a2f17a650d3466e038d94a5eb"
+  integrity sha512-CtzORUwWTTOTqfVtHaKRJ0I1kNQd1bpn3sUh8I3nJDVY+5/M/Oe1DnEWzPQvqq/xPIIkzzzIP7mfCoAjFRvDhg==
+
 "@lerna/add@4.0.0":
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/@lerna/add/-/add-4.0.0.tgz#c36f57d132502a57b9e7058d1548b7a565ef183f"
@@ -5095,7 +5216,7 @@ accept-language-parser@^1.4.1:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/accept-language-parser/-/accept-language-parser-1.5.0.tgz#8877c54040a8dcb59e0a07d9c1fde42298334791"
 
-accept@3.x.x, accept@^3.0.2:
+accept@3.x.x:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/accept/-/accept-3.1.3.tgz#29c3e2b3a8f4eedbc2b690e472b9ebbdc7385e87"
   integrity sha512-OgOEAidVEOKPup+Gv2+2wdH2AgVKI9LxsJ4hicdJ6cY0faUuZdZoi56kkXWlHp9qicN1nWQLmW5ZRGk+SBS5xg==
@@ -5537,14 +5658,6 @@ apollo-boost@^0.4.4:
     ts-invariant "^0.4.0"
     tslib "^1.9.3"
 
-apollo-cache-control@0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/apollo-cache-control/-/apollo-cache-control-0.6.0.tgz#df22db28f850ea90a5722f5e92654d30c96e7f91"
-  integrity sha512-66aCF6MHe0/FdD3knphwTv6CCIdb1ZxrMsiRpxP474qqyYVe2jAwBu6aJBn4emffZHZ7i6gp9dY6cPHThjnbKA==
-  dependencies:
-    apollo-server-env "2.3.0"
-    graphql-extensions "0.6.0"
-
 apollo-cache-control@^0.8.4:
   version "0.8.4"
   resolved "https://registry.yarnpkg.com/apollo-cache-control/-/apollo-cache-control-0.8.4.tgz#a3650d5e4173953e2a3af995bea62147f1ffe4d7"
@@ -5620,14 +5733,6 @@ apollo-client@^2.6.4:
     tslib "^1.9.3"
     zen-observable "^0.8.0"
 
-apollo-datasource@0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/apollo-datasource/-/apollo-datasource-0.4.0.tgz#f042641fd2593fa5f4f002fc30d1fb1a20284df8"
-  integrity sha512-6QkgnLYwQrW0qv+yXIf617DojJbGmza2XJXUlgnzrGGhxzfAynzEjaLyYkc8rYS1m82vjrl9EOmLHTcnVkvZAQ==
-  dependencies:
-    apollo-server-caching "0.4.0"
-    apollo-server-env "2.3.0"
-
 apollo-datasource@^0.6.3:
   version "0.6.3"
   resolved "https://registry.yarnpkg.com/apollo-datasource/-/apollo-datasource-0.6.3.tgz#b31e089e52adb92fabb536ab8501c502573ffe13"
@@ -5636,12 +5741,13 @@ apollo-datasource@^0.6.3:
     apollo-server-caching "^0.5.0"
     apollo-server-env "^2.4.3"
 
-apollo-engine-reporting-protobuf@0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/apollo-engine-reporting-protobuf/-/apollo-engine-reporting-protobuf-0.3.0.tgz#2c764c054ff9968387cf16115546e0d5b04ee9f1"
-  integrity sha512-PYowpx/E+TJT/8nKpp3JmJuKh3x1SZcxDF6Cquj0soV205TUpFFCZQMi91i5ACiEp2AkYvM/GDBIrw+rfIwzTg==
+apollo-datasource@^3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/apollo-datasource/-/apollo-datasource-3.3.1.tgz#a1168dd68371930de3ed4245ad12fa8600efe2cc"
+  integrity sha512-Z3a8rEUXVPIZ1p8xrFL8bcNhWmhOmovgDArvwIwmJOBnh093ZpRfO+ESJEDAN4KswmyzCLDAwjsW4zQOONdRUw==
   dependencies:
-    protobufjs "^6.8.6"
+    apollo-server-caching "^3.3.0"
+    apollo-server-env "^4.2.1"
 
 apollo-engine-reporting-protobuf@^0.4.0:
   version "0.4.0"
@@ -5650,18 +5756,6 @@ apollo-engine-reporting-protobuf@^0.4.0:
   dependencies:
     protobufjs "^6.8.6"
 
-apollo-engine-reporting@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/apollo-engine-reporting/-/apollo-engine-reporting-1.1.0.tgz#10def3d3bf3f11ddb24765c19d9c81e30cb9d55c"
-  integrity sha512-Dj0BwgcluHL0QVUaquhAoYoLX9Z4DRP/n2REcIwO8d2iy52r+1wN5QqZLx97dEFh7CjhNjTWeysJzc8XMWKa1Q==
-  dependencies:
-    apollo-engine-reporting-protobuf "0.3.0"
-    apollo-graphql "^0.2.1-alpha.1"
-    apollo-server-core "2.5.0"
-    apollo-server-env "2.3.0"
-    async-retry "^1.2.1"
-    graphql-extensions "0.6.0"
-
 apollo-engine-reporting@^1.4.6:
   version "1.4.6"
   resolved "https://registry.yarnpkg.com/apollo-engine-reporting/-/apollo-engine-reporting-1.4.6.tgz#83af6689c4ab82d1c62c3f5dde7651975508114f"
@@ -5675,15 +5769,6 @@ apollo-engine-reporting@^1.4.6:
     async-retry "^1.2.1"
     graphql-extensions "^0.10.3"
 
-apollo-env@0.4.1-register.1:
-  version "0.4.1-register.1"
-  resolved "https://registry.yarnpkg.com/apollo-env/-/apollo-env-0.4.1-register.1.tgz#e8c94e21a5b3f9c45088dec47862dfe2026111c2"
-  integrity sha512-fg1US7YZ6yW1N0tFq8g4HpCR3eJZmI+rIiHDiknYN9D1MTjvwYdmXYhi7VaPvQ21hV5nMRvfBUMqYXjP+6FsGQ==
-  dependencies:
-    core-js "3.0.0-beta.13"
-    node-fetch "^2.2.0"
-    sha.js "^2.4.11"
-
 apollo-env@0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/apollo-env/-/apollo-env-0.5.0.tgz#7bb979d70f6cf812a112916976b0d3d58f48754e"
@@ -5702,14 +5787,6 @@ apollo-env@0.5.1:
     node-fetch "^2.2.0"
     sha.js "^2.4.11"
 
-apollo-graphql@^0.2.1-alpha.1:
-  version "0.2.1-register.1"
-  resolved "https://registry.yarnpkg.com/apollo-graphql/-/apollo-graphql-0.2.1-register.1.tgz#941dd165a9428c2ea3407ab410f842c4050cea28"
-  integrity sha512-Z2LOuvYomC9CN9K+mpFVcVQu6Ml5PIJlV+YOkGzFq73xeqWg1InxHqI3eEdCEhxTJq6H8rlWT8ATrMS+4sIhqw==
-  dependencies:
-    apollo-env "0.4.1-register.1"
-    lodash.sortby "^4.7.0"
-
 apollo-graphql@^0.3.3:
   version "0.3.3"
   resolved "https://registry.yarnpkg.com/apollo-graphql/-/apollo-graphql-0.3.3.tgz#ce1df194f6e547ad3ce1e35b42f9c211766e1658"
@@ -5789,12 +5866,12 @@ apollo-link@^1.0.6, apollo-link@^1.2.13:
     tslib "^1.9.3"
     zen-observable-ts "^0.8.20"
 
-apollo-server-caching@0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/apollo-server-caching/-/apollo-server-caching-0.4.0.tgz#e82917590d723c0adc1fa52900e79e93ad65e4d9"
-  integrity sha512-GTOZdbLhrSOKYNWMYgaqX5cVNSMT0bGUTZKV8/tYlyYmsB6ey7l6iId3Q7UpHS6F6OR2lstz5XaKZ+T3fDfPzQ==
+apollo-reporting-protobuf@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/apollo-reporting-protobuf/-/apollo-reporting-protobuf-3.3.0.tgz#2fc0f7508e488851eda8a6e7c8cc3b5a156ab44b"
+  integrity sha512-51Jwrg0NvHJfKz7TIGU8+Os3rUAqWtXeKRsRtKYtTeMSBPNhzz8UoGjAB3XyVmUXRE3IRmLtDPDRFL7qbxMI/w==
   dependencies:
-    lru-cache "^5.0.0"
+    "@apollo/protobufjs" "1.2.2"
 
 apollo-server-caching@^0.5.0:
   version "0.5.0"
@@ -5803,31 +5880,12 @@ apollo-server-caching@^0.5.0:
   dependencies:
     lru-cache "^5.0.0"
 
-apollo-server-core@2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-2.5.0.tgz#89fc28ba1018ebf9240bc3cc0c103fe705309023"
-  integrity sha512-7hyQ/Rt0hC38bUfxMQmLNHDBIGEBykFWo9EO0W+3o/cno/SqBKd1KKichrABVv+v+SCvZAUutX6gYS5l3G+ULQ==
+apollo-server-caching@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/apollo-server-caching/-/apollo-server-caching-3.3.0.tgz#f501cbeb820a4201d98c2b768c085f22848d9dc5"
+  integrity sha512-Wgcb0ArjZ5DjQ7ID+tvxUcZ7Yxdbk5l1MxZL8D8gkyjooOkhPNzjRVQ7ubPoXqO54PrOMOTm1ejVhsF+AfIirQ==
   dependencies:
-    "@apollographql/apollo-tools" "^0.3.6-alpha.1"
-    "@apollographql/graphql-playground-html" "^1.6.6"
-    "@types/ws" "^6.0.0"
-    apollo-cache-control "0.6.0"
-    apollo-datasource "0.4.0"
-    apollo-engine-reporting "1.1.0"
-    apollo-server-caching "0.4.0"
-    apollo-server-env "2.3.0"
-    apollo-server-errors "2.3.0"
-    apollo-server-plugin-base "0.4.0"
-    apollo-tracing "0.6.0"
-    fast-json-stable-stringify "^2.0.0"
-    graphql-extensions "0.6.0"
-    graphql-subscriptions "^1.0.0"
-    graphql-tag "^2.9.2"
-    graphql-tools "^4.0.0"
-    graphql-upload "^8.0.2"
-    sha.js "^2.4.11"
-    subscriptions-transport-ws "^0.9.11"
-    ws "^6.0.0"
+    lru-cache "^6.0.0"
 
 apollo-server-core@^2.9.3:
   version "2.9.3"
@@ -5856,13 +5914,31 @@ apollo-server-core@^2.9.3:
     subscriptions-transport-ws "^0.9.11"
     ws "^6.0.0"
 
-apollo-server-env@2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/apollo-server-env/-/apollo-server-env-2.3.0.tgz#f0bf4484a6cc331a8c13763ded56e91beb16ba17"
-  integrity sha512-WIwlkCM/gir0CkoYWPMTCH8uGCCKB/aM074U1bKayvkFOBVO2VgG5x2kgsfkyF05IMQq2/GOTsKhNY7RnUEhTA==
-  dependencies:
-    node-fetch "^2.1.2"
-    util.promisify "^1.0.0"
+apollo-server-core@^3.6.3:
+  version "3.6.3"
+  resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-3.6.3.tgz#6b12ffa1af8bc8799930f72360090834915033d1"
+  integrity sha512-TFJmAlI6vPp1MHOSXqYkE6leAyMekWv/D/3ma11uETkcd3EPjERGmxtTXPJElMVEkOK9BEElYKthCrH7bjYLuw==
+  dependencies:
+    "@apollographql/apollo-tools" "^0.5.1"
+    "@apollographql/graphql-playground-html" "1.6.29"
+    "@graphql-tools/mock" "^8.1.2"
+    "@graphql-tools/schema" "^8.0.0"
+    "@josephg/resolvable" "^1.0.0"
+    apollo-datasource "^3.3.1"
+    apollo-reporting-protobuf "^3.3.0"
+    apollo-server-caching "^3.3.0"
+    apollo-server-env "^4.2.1"
+    apollo-server-errors "^3.3.1"
+    apollo-server-plugin-base "^3.5.1"
+    apollo-server-types "^3.5.1"
+    async-retry "^1.2.1"
+    fast-json-stable-stringify "^2.1.0"
+    graphql-tag "^2.11.0"
+    lodash.sortby "^4.7.0"
+    loglevel "^1.6.8"
+    lru-cache "^6.0.0"
+    sha.js "^2.4.11"
+    uuid "^8.0.0"
 
 apollo-server-env@^2.4.3:
   version "2.4.3"
@@ -5872,16 +5948,23 @@ apollo-server-env@^2.4.3:
     node-fetch "^2.1.2"
     util.promisify "^1.0.0"
 
-apollo-server-errors@2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/apollo-server-errors/-/apollo-server-errors-2.3.0.tgz#700622b66a16dffcad3b017e4796749814edc061"
-  integrity sha512-rUvzwMo2ZQgzzPh2kcJyfbRSfVKRMhfIlhY7BzUfM4x6ZT0aijlgsf714Ll3Mbf5Fxii32kD0A/DmKsTecpccw==
+apollo-server-env@^4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/apollo-server-env/-/apollo-server-env-4.2.1.tgz#ea5b1944accdbdba311f179e4dfaeca482c20185"
+  integrity sha512-vm/7c7ld+zFMxibzqZ7SSa5tBENc4B0uye9LTfjJwGoQFY5xsUPH5FpO5j0bMUDZ8YYNbrF9SNtzc5Cngcr90g==
+  dependencies:
+    node-fetch "^2.6.7"
 
 apollo-server-errors@^2.3.3:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/apollo-server-errors/-/apollo-server-errors-2.3.3.tgz#83763b00352c10dc68fbb0d41744ade66de549ff"
   integrity sha512-MO4oJ129vuCcbqwr5ZwgxqGGiLz3hCyowz0bstUF7MR+vNGe4oe3DWajC9lv4CxrhcqUHQOeOPViOdIo1IxE3g==
 
+apollo-server-errors@^3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/apollo-server-errors/-/apollo-server-errors-3.3.1.tgz#ba5c00cdaa33d4cbd09779f8cb6f47475d1cd655"
+  integrity sha512-xnZJ5QWs6FixHICXHxUfm+ZWqqxrNuPlQ+kj5m6RtEgIpekOPssH/SD9gf2B4HuWV0QozorrygwZnux8POvyPA==
+
 apollo-server-express@^2.9.3:
   version "2.9.3"
   resolved "https://registry.yarnpkg.com/apollo-server-express/-/apollo-server-express-2.9.3.tgz#67573404030c2676be49a7bf97d423b8462e295c"
@@ -5904,22 +5987,15 @@ apollo-server-express@^2.9.3:
     subscriptions-transport-ws "^0.9.16"
     type-is "^1.6.16"
 
-apollo-server-hapi@^2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/apollo-server-hapi/-/apollo-server-hapi-2.5.0.tgz#26130e60768e0893f1a909b548df155afda1bcf9"
-  integrity sha512-DBG2m/tcc+YJUEj/lOdJV7dVFfvdMrjHmNjM7s2k6f5ul+/HZFWqNydGco2wfLQWRm0P8w0vzn8hr37wbs53iA==
+apollo-server-hapi@^3.6.3:
+  version "3.6.3"
+  resolved "https://registry.yarnpkg.com/apollo-server-hapi/-/apollo-server-hapi-3.6.3.tgz#209abb8f8cc0ea5755ca31abd0b4e33e3b0cbe1c"
+  integrity sha512-70/4J24gY2P6Tp9pb6nGwXjogTM9mXXFqxL2oqGw/e8PY20h4ZY/hlDzGIh4PaaQ7b7B5mlnwjwaqQEV2ZgTGw==
   dependencies:
-    "@apollographql/graphql-playground-html" "^1.6.6"
-    accept "^3.0.2"
-    apollo-server-core "2.5.0"
-    boom "^7.1.0"
-    graphql-subscriptions "^1.0.0"
-    graphql-tools "^4.0.0"
-
-apollo-server-plugin-base@0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/apollo-server-plugin-base/-/apollo-server-plugin-base-0.4.0.tgz#38a3c37767043873dd1b07143d4e70eecbb09562"
-  integrity sha512-iD7ARNtwnvHGd1EMPK0CuodM8d8hgDvFwTfIDzJY04QIQ6/KrBFaWhnCXJsy+HMb47GovwBbq67IK6eb2WJgBg==
+    "@hapi/accept" "^5.0.2"
+    "@hapi/boom" "^9.1.2"
+    apollo-server-core "^3.6.3"
+    apollo-server-types "^3.5.1"
 
 apollo-server-plugin-base@^0.6.4:
   version "0.6.4"
@@ -5928,6 +6004,13 @@ apollo-server-plugin-base@^0.6.4:
   dependencies:
     apollo-server-types "^0.2.4"
 
+apollo-server-plugin-base@^3.5.1:
+  version "3.5.1"
+  resolved "https://registry.yarnpkg.com/apollo-server-plugin-base/-/apollo-server-plugin-base-3.5.1.tgz#73fc1591522e36e32eff3d033975333e30cf1a7c"
+  integrity sha512-wgDHz3lLrCqpecDky3z6AOQ0vik0qs0Cya/Ti6n3ESYXJ9MdK3jE/QunATIrOYYJaa+NKl9V7YwU+/bojNfFuQ==
+  dependencies:
+    apollo-server-types "^3.5.1"
+
 apollo-server-types@^0.2.4:
   version "0.2.4"
   resolved "https://registry.yarnpkg.com/apollo-server-types/-/apollo-server-types-0.2.4.tgz#28864900ffc7f9711a859297c143a833fdb6aa43"
@@ -5937,6 +6020,15 @@ apollo-server-types@^0.2.4:
     apollo-server-caching "^0.5.0"
     apollo-server-env "^2.4.3"
 
+apollo-server-types@^3.5.1:
+  version "3.5.1"
+  resolved "https://registry.yarnpkg.com/apollo-server-types/-/apollo-server-types-3.5.1.tgz#73fc8aa82b3175fde3906fa3d6786ee4d3e8c982"
+  integrity sha512-zG7xLl4mmHuZMAYOfjWKHY/IC/GgIkJ3HnYuR7FRrnPpRA9Yt5Kf1M1rjm1Esuqzpb/dt8pM7cX40QaIQObCYQ==
+  dependencies:
+    apollo-reporting-protobuf "^3.3.0"
+    apollo-server-caching "^3.3.0"
+    apollo-server-env "^4.2.1"
+
 apollo-server@^2.9.3:
   version "2.9.3"
   resolved "https://registry.yarnpkg.com/apollo-server/-/apollo-server-2.9.3.tgz#2a79fcee25da0b0673eb70d73839c40c3c4b8cca"
@@ -5948,14 +6040,6 @@ apollo-server@^2.9.3:
     graphql-subscriptions "^1.0.0"
     graphql-tools "^4.0.0"
 
-apollo-tracing@0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/apollo-tracing/-/apollo-tracing-0.6.0.tgz#afc2b9cbea173dc4c315a5d98053797469518083"
-  integrity sha512-OpYPHVBgcQ/HT2WLXJQWwhilzR1rrl01tZeMU2N7yinsp/oyKngF5aUSMtuvX1k/T3abilQo+w10oAQlBCGdPA==
-  dependencies:
-    apollo-server-env "2.3.0"
-    graphql-extensions "0.6.0"
-
 apollo-tracing@^0.8.4:
   version "0.8.4"
   resolved "https://registry.yarnpkg.com/apollo-tracing/-/apollo-tracing-0.8.4.tgz#0117820c3f0ad3aa6daf7bf13ddbb923cbefa6de"
@@ -7674,7 +7758,7 @@ boolbase@^1.0.0, boolbase@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
 
-boom@7.x.x, boom@^7.1.0, boom@^7.2.0:
+boom@7.x.x, boom@^7.2.0:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/boom/-/boom-7.2.0.tgz#2bff24a55565767fde869ec808317eb10c48e966"
   dependencies:
@@ -8939,6 +9023,11 @@ commander@^2.1.0, commander@^2.11.0, commander@^2.14.1, commander@^2.15.1, comma
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"
   integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==
 
+commander@^2.20.3:
+  version "2.20.3"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
+  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
+
 commander@~2.19.0:
   version "2.19.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
@@ -9759,6 +9848,11 @@ cssesc@^3.0.0:
   resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
   integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
 
+cssfilter@0.0.10:
+  version "0.0.10"
+  resolved "https://registry.yarnpkg.com/cssfilter/-/cssfilter-0.0.10.tgz#c6d2672632a2e5c83e013e6864a42ce8defd20ae"
+  integrity sha1-xtJnJjKi5cg+AT5oZKQs6N79IK4=
+
 cssnano-preset-default@^4.0.7:
   version "4.0.7"
   resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-4.0.7.tgz#51ec662ccfca0f88b396dcd9679cdb931be17f76"
@@ -11802,6 +11896,11 @@ fast-json-stable-stringify@^2.0.0:
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
   integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=
 
+fast-json-stable-stringify@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
+  integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
+
 fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.4:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
@@ -13094,13 +13193,6 @@ graphql-config@^2.0.1:
     lodash "^4.17.4"
     minimatch "^3.0.4"
 
-graphql-extensions@0.6.0, graphql-extensions@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/graphql-extensions/-/graphql-extensions-0.6.0.tgz#3ee3aa57fe213f90aec5cd31275f6d04767c6a23"
-  integrity sha512-SshzmbD68fHXRv2q3St29olMOxHDLQ5e9TOh+Tz2BYxinrfhjFaPNcEefiK/vF295wW827Y58bdO11Xmhf8J+Q==
-  dependencies:
-    "@apollographql/apollo-tools" "^0.3.6-alpha.1"
-
 graphql-extensions@^0.10.3:
   version "0.10.3"
   resolved "https://registry.yarnpkg.com/graphql-extensions/-/graphql-extensions-0.10.3.tgz#9e37f3bd26309c40b03a0be0e63e02b3f99d52ea"
@@ -13110,6 +13202,13 @@ graphql-extensions@^0.10.3:
     apollo-server-env "^2.4.3"
     apollo-server-types "^0.2.4"
 
+graphql-extensions@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/graphql-extensions/-/graphql-extensions-0.6.0.tgz#3ee3aa57fe213f90aec5cd31275f6d04767c6a23"
+  integrity sha512-SshzmbD68fHXRv2q3St29olMOxHDLQ5e9TOh+Tz2BYxinrfhjFaPNcEefiK/vF295wW827Y58bdO11Xmhf8J+Q==
+  dependencies:
+    "@apollographql/apollo-tools" "^0.3.6-alpha.1"
+
 graphql-import@^0.7.1:
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/graphql-import/-/graphql-import-0.7.1.tgz#4add8d91a5f752d764b0a4a7a461fcd93136f223"
@@ -13136,6 +13235,13 @@ graphql-tag@^2.10.1, graphql-tag@^2.4.2, graphql-tag@^2.9.2:
   resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.10.1.tgz#10aa41f1cd8fae5373eaf11f1f67260a3cad5e02"
   integrity sha512-jApXqWBzNXQ8jYa/HLkZJaVw9jgwNqZkywa2zfFn16Iv1Zb7ELNHkJaXHR7Quvd5SIGsy6Ny7SUKATgnu05uEg==
 
+graphql-tag@^2.11.0:
+  version "2.12.6"
+  resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.12.6.tgz#d441a569c1d2537ef10ca3d1633b48725329b5f1"
+  integrity sha512-FdSNcu2QQcWnM2VNvSCCDCVS5PpPqpzgFT8+GXzqJuoDd0CBncxCY278u4mhRO7tMgo2JjgJA5aZ+nWSQ/Z+xg==
+  dependencies:
+    tslib "^2.1.0"
+
 graphql-tools@^4.0.0:
   version "4.0.4"
   resolved "https://registry.yarnpkg.com/graphql-tools/-/graphql-tools-4.0.4.tgz#ca08a63454221fdde825fe45fbd315eb2a6d566b"
@@ -13168,13 +13274,6 @@ graphql-upload@^8.0.2:
     http-errors "^1.7.2"
     object-path "^0.11.4"
 
-graphql@^14.3.0:
-  version "14.3.0"
-  resolved "https://registry.yarnpkg.com/graphql/-/graphql-14.3.0.tgz#34dd36faa489ff642bcd25df6c3b4f988a1a2f3e"
-  integrity sha512-MdfI4v7kSNC3NhB7cF8KNijDsifuWO2XOtzpyququqaclO8wVuChYv+KogexDwgP5sp7nFI9Z6N4QHgoLkfjrg==
-  dependencies:
-    iterall "^1.2.2"
-
 graphql@^14.5.3:
   version "14.5.6"
   resolved "https://registry.yarnpkg.com/graphql/-/graphql-14.5.6.tgz#3fa12173b50e6ccdef953c31c82f37c50ef58bec"
@@ -13182,6 +13281,11 @@ graphql@^14.5.3:
   dependencies:
     iterall "^1.2.2"
 
+graphql@^16.3.0:
+  version "16.3.0"
+  resolved "https://registry.yarnpkg.com/graphql/-/graphql-16.3.0.tgz#a91e24d10babf9e60c706919bb182b53ccdffc05"
+  integrity sha512-xm+ANmA16BzCT5pLjuXySbQVFwH3oJctUVdy81w1sV0vBU0KgDdBGtxQOUd5zqOBk/JayAFeG8Dlmeq74rjm/A==
+
 gray-matter@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/gray-matter/-/gray-matter-2.1.1.tgz#3042d9adec2a1ded6a7707a9ed2380f8a17a430e"
@@ -17385,6 +17489,11 @@ loglevel@^1.4.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.1.tgz#e0fc95133b6ef276cdc8887cdaf24aa6f156f8fa"
 
+loglevel@^1.6.8:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.8.0.tgz#e7ec73a57e1e7b419cb6c6ac06bf050b67356114"
+  integrity sha512-G6A/nJLRgWOuuwdNuA6koovfEV1YpqqAG4pRUlFaz3jj2QNZ8M4vBqnVA+HBTmU/AMNUtlOsMmSpF6NyOjztbA==
+
 lolex@^2.2.0, lolex@^2.3.2:
   version "2.7.5"
   resolved "https://registry.yarnpkg.com/lolex/-/lolex-2.7.5.tgz#113001d56bfc7e02d56e36291cc5c413d1aa0733"
@@ -19020,6 +19129,13 @@ node-fetch@^2.0.0, node-fetch@^2.1.2, node-fetch@^2.2.0:
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.5.0.tgz#8028c49fc1191bba56a07adc6e2a954644a48501"
   integrity sha512-YuZKluhWGJwCcUu4RlZstdAxr8bFfOVHakc1mplwHkk8J+tqM1Y5yraYvIUpeX8aY7+crCwiELJq7Vl0o0LWXw==
 
+node-fetch@^2.6.7:
+  version "2.6.7"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
+  integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
+  dependencies:
+    whatwg-url "^5.0.0"
+
 node-forge@0.7.5, node-forge@^0.7.0:
   version "0.7.5"
   resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.7.5.tgz#6c152c345ce11c52f465c2abd957e8639cd674df"
@@ -25678,6 +25794,11 @@ tr46@^2.0.2:
   dependencies:
     punycode "^2.1.1"
 
+tr46@~0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
+  integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=
+
 traverse-chain@~0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/traverse-chain/-/traverse-chain-0.1.0.tgz#61dbc2d53b69ff6091a12a168fd7d433107e40f1"
@@ -25813,6 +25934,11 @@ tslib@^1.9.0, tslib@^1.9.3:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
   integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==
 
+tslib@^2.1.0, tslib@~2.3.0:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01"
+  integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==
+
 tsscmp@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/tsscmp/-/tsscmp-1.0.6.tgz#85b99583ac3589ec4bfef825b5000aa911d605eb"
@@ -26353,6 +26479,11 @@ uuid@3.3.2, uuid@3.x.x, uuid@^3.0.1, uuid@^3.1.0, uuid@^3.2.1, uuid@^3.3.2:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
   integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
 
+uuid@^8.0.0:
+  version "8.3.2"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
+  integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
+
 v8-compile-cache@^2.0.3:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
@@ -26402,6 +26533,11 @@ value-equal@^0.4.0:
   resolved "https://registry.yarnpkg.com/value-equal/-/value-equal-0.4.0.tgz#c5bdd2f54ee093c04839d71ce2e4758a6890abc7"
   integrity sha512-x+cYdNnaA3CxvMaTX0INdTCN8m8aF2uY9BvEqmxuYp8bL09cs/kWVQPVGcA35fMktdOsP69IgU7wFj/61dJHEw==
 
+value-or-promise@1.0.11:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/value-or-promise/-/value-or-promise-1.0.11.tgz#3e90299af31dd014fe843fe309cefa7c1d94b140"
+  integrity sha512-41BrgH+dIbCFXClcSapVs5M6GkENd3gQOJpEfPDNa71LsUGMXDL0jMWpI/Rh7WhX+Aalfz2TTS3Zt5pUsbnhLg==
+
 vary@^1, vary@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
@@ -26688,6 +26824,11 @@ webauth@^1.1.0:
   resolved "https://registry.yarnpkg.com/webauth/-/webauth-1.1.0.tgz#64704f6b8026986605bc3ca629952e6e26fdd100"
   integrity sha1-ZHBPa4AmmGYFvDymKZUubib90QA=
 
+webidl-conversions@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
+  integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=
+
 webidl-conversions@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
@@ -26955,6 +27096,14 @@ whatwg-mimetype@^2.0.0, whatwg-mimetype@^2.1.0:
   resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf"
   integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==
 
+whatwg-url@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
+  integrity sha1-lmRU6HZUYuN2RNNib2dCzotwll0=
+  dependencies:
+    tr46 "~0.0.3"
+    webidl-conversions "^3.0.0"
+
 whatwg-url@^6.4.0:
   version "6.5.0"
   resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-6.5.0.tgz#f2df02bff176fd65070df74ad5ccbb5a199965a8"
@@ -27507,6 +27656,14 @@ xregexp@4.0.0:
   resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.0.0.tgz#e698189de49dd2a18cc5687b05e17c8e43943020"
   integrity sha512-PHyM+sQouu7xspQQwELlGwwd05mXUFqwFYfqPO0cC7x4fxyHnnuetmQr6CjJiafIDoH4MogHb9dOoJzR/Y4rFg==
 
+xss@^1.0.8:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/xss/-/xss-1.0.10.tgz#5cd63a9b147a755a14cb0455c7db8866120eb4d2"
+  integrity sha512-qmoqrRksmzqSKvgqzN0055UFWY7OKx1/9JWeRswwEVX9fCG5jcYRxa/A2DHcmZX6VJvjzHRQ2STeeVcQkrmLSw==
+  dependencies:
+    commander "^2.20.3"
+    cssfilter "0.0.10"
+
 "xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.0, xtend@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"