From 5859a57d378b8bdb8b54cbe6404e0d390766319f Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 8 Oct 2018 22:55:35 +0300 Subject: [PATCH 001/642] Shorten `a-s-p-e-o-r` to `apollo-server-plugin-operation-registry`. --- .../.npmignore | 6 + .../CHANGELOG.md | 4 + .../LICENSE.md | 53 ++++ .../README.md | 1 + .../package.json | 23 ++ .../src/agent.ts | 238 ++++++++++++++++++ .../src/common.ts | 20 ++ .../src/index.ts | 60 +++++ .../src/schema.ts | 32 +++ .../tsconfig.json | 13 + 10 files changed, 450 insertions(+) create mode 100644 packages/apollo-server-plugin-operation-registry/.npmignore create mode 100644 packages/apollo-server-plugin-operation-registry/CHANGELOG.md create mode 100644 packages/apollo-server-plugin-operation-registry/LICENSE.md create mode 100644 packages/apollo-server-plugin-operation-registry/README.md create mode 100644 packages/apollo-server-plugin-operation-registry/package.json create mode 100644 packages/apollo-server-plugin-operation-registry/src/agent.ts create mode 100644 packages/apollo-server-plugin-operation-registry/src/common.ts create mode 100644 packages/apollo-server-plugin-operation-registry/src/index.ts create mode 100644 packages/apollo-server-plugin-operation-registry/src/schema.ts create mode 100644 packages/apollo-server-plugin-operation-registry/tsconfig.json diff --git a/packages/apollo-server-plugin-operation-registry/.npmignore b/packages/apollo-server-plugin-operation-registry/.npmignore new file mode 100644 index 00000000000..a165046d359 --- /dev/null +++ b/packages/apollo-server-plugin-operation-registry/.npmignore @@ -0,0 +1,6 @@ +* +!src/**/* +!dist/**/* +dist/**/*.test.* +!package.json +!README.md diff --git a/packages/apollo-server-plugin-operation-registry/CHANGELOG.md b/packages/apollo-server-plugin-operation-registry/CHANGELOG.md new file mode 100644 index 00000000000..ef45b84f48c --- /dev/null +++ b/packages/apollo-server-plugin-operation-registry/CHANGELOG.md @@ -0,0 +1,4 @@ +# Change Log + +### vNEXT + diff --git a/packages/apollo-server-plugin-operation-registry/LICENSE.md b/packages/apollo-server-plugin-operation-registry/LICENSE.md new file mode 100644 index 00000000000..b1440fbfe74 --- /dev/null +++ b/packages/apollo-server-plugin-operation-registry/LICENSE.md @@ -0,0 +1,53 @@ +Copyright (c) 2018- Meteor Development Group, Inc. + +The following sets forth attribution notices for third party software that may +be contained in portions of this package. + +### `json-stable-stringify` + +``` +This software is released under the MIT license: + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +``` + +### `node-fetch` + +``` +The MIT License (MIT) + +Copyright (c) 2016 David Frank + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +``` diff --git a/packages/apollo-server-plugin-operation-registry/README.md b/packages/apollo-server-plugin-operation-registry/README.md new file mode 100644 index 00000000000..ff839087b35 --- /dev/null +++ b/packages/apollo-server-plugin-operation-registry/README.md @@ -0,0 +1 @@ +# Operation Registry diff --git a/packages/apollo-server-plugin-operation-registry/package.json b/packages/apollo-server-plugin-operation-registry/package.json new file mode 100644 index 00000000000..1d5cf174ee8 --- /dev/null +++ b/packages/apollo-server-plugin-operation-registry/package.json @@ -0,0 +1,23 @@ +{ + "name": "apollo-server-plugin-operation-registry", + "private": true, + "version": "0.0.1", + "description": "Apollo Server operation registry", + "main": "dist/index.js", + "types": "dist/index.d.ts", + "keywords": [], + "author": "Apollo ", + "license": "Copyright (c) Meteor Development Group, Inc.; See LICENSE.md.", + "engines": { + "node": ">=6" + }, + "dependencies": { + "apollo-server-plugin-base": "file:../apollo-server-plugin-base", + "apollo-server-caching": "file:../apollo-server-caching", + "json-stable-stringify": "1.0.1", + "node-fetch": "2.2.0" + }, + "peerDependencies": { + "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0" + } +} diff --git a/packages/apollo-server-plugin-operation-registry/src/agent.ts b/packages/apollo-server-plugin-operation-registry/src/agent.ts new file mode 100644 index 00000000000..7f9b39ab146 --- /dev/null +++ b/packages/apollo-server-plugin-operation-registry/src/agent.ts @@ -0,0 +1,238 @@ +import { getOperationManifestUrl } from './common'; +import { createHash } from 'crypto'; +import fetch, { Response, RequestInit } from 'node-fetch'; +import { KeyValueCache } from 'apollo-server-caching'; + +const DEFAULT_POLL_SECONDS: number = 2; +const SYNC_WARN_TIME_SECONDS: number = 60; + +interface AgentOptions { + debug?: boolean; + pollSeconds?: number; + schemaHash: string; + engine: any; + cache: KeyValueCache; +} + +interface Operation { + signature: string; + document: string; +} + +interface OperationManifest { + version: number; + operations: Array; +} + +type SignatureStore = Set; + +const cacheKey = (signature: string) => `apq:${signature}`; + +export default class Agent { + private timer?: NodeJS.Timer; + private hashedServiceId?: string; + private requestInFlight: boolean = false; + private lastSuccessfulCheck?: Date; + private lastSuccessfulETag?: string; + private lastOperationSignatures: SignatureStore = new Set(); + + constructor(private options: AgentOptions) {} + + private getHashedServiceId(): string { + return (this.hashedServiceId = + this.hashedServiceId || + createHash('sha512') + .update(this.options.engine.serviceID) + .digest('hex')); + } + + private pollSeconds() { + return this.options.pollSeconds || DEFAULT_POLL_SECONDS; + } + + async start() { + // This is what we'll trigger at a regular interval. + const pulse = async () => await this.checkForUpdate(); + + // The first pulse should happen before we start the timer. + await pulse(); + + // Afterward, keep it going. + this.timer = this.timer || setInterval(pulse, this.pollSeconds() * 1000); + } + + private timeSinceLastSuccessfulCheck() { + if (!this.lastSuccessfulCheck) { + // So far back that it's never? + return -Infinity; + } + return new Date().getTime() - this.lastSuccessfulCheck.getTime(); + } + + private warnWhenLossOfSync() { + // This is probably good information to reveal in general, though nice + // to have in development. + if (this.timeSinceLastSuccessfulCheck() > SYNC_WARN_TIME_SECONDS * 1000) { + console.warn( + `WARNING: More than ${SYNC_WARN_TIME_SECONDS} seconds has elapsed since a successful fetch of the manifest. (Last success: ${ + this.lastSuccessfulCheck + })`, + ); + } + } + + private maybeLog(...args: any[]) { + if (this.options.debug) { + console.debug(...args); + } + } + + private async tryUpdate(): Promise { + this.maybeLog('Checking for manifest changes...'); + const manifestUrl = getOperationManifestUrl( + this.getHashedServiceId(), + this.options.schemaHash, + ); + + const fetchOptions: RequestInit = { + // GET is what we request, but keep in mind that, when we include and get + // a match on the `If-None-Match` header we'll get an early return with a + // status code 304. + method: 'GET', + + // More than three times our polling interval be long enough to wait. + timeout: this.pollSeconds() * 3 /* times */ * 1000 /* ms */, + headers: Object.create(null), + }; + + // By saving and providing our last known ETag, we can allow the storage + // provider to return us a `304 Not Modified` header rather than the full + // response. + if (this.lastSuccessfulETag) { + fetchOptions.headers = { 'If-None-Match': this.lastSuccessfulETag }; + } + + let response: Response; + try { + response = await fetch(manifestUrl, fetchOptions); + } catch (err) { + throw new Error( + `Unable to fetch operation manifest for ${ + this.options.schemaHash + } in '${this.options.engine.serviceId}'`, + ); + } + + // When the response indicates that the resource hasn't changed, there's + // no need to do any other work. Returning true indicates that this is + // a successful fetch and that we can be assured the manifest is current. + if (response.status === 304) { + this.maybeLog( + 'The published manifest was the same as the previous attempt.', + ); + return false; + } + + if (!response.ok) { + throw new Error(`Could not fetch manifest ${await response.text()}`); + } + + const contentType = response.headers.get('content-type'); + if (contentType && contentType !== 'application/json') { + throw new Error(`Unexpected 'Content-Type' header: ${contentType}`); + } + + this.updateManifest(await response.json()); + + // Save the ETag of the manifest we just received so we can avoid fetching + // the same manifest again. + const receivedETag = response.headers.get('etag'); + if (receivedETag) { + this.lastSuccessfulETag = JSON.parse(receivedETag); + } + + // True is good! + return true; + } + + public async checkForUpdate() { + // Display a warning message if things have fallen abnormally behind. + this.warnWhenLossOfSync(); + + // Don't check again if we're already in-flight. + if (this.requestInFlight) { + return; + } + + try { + // Prevent other requests from crossing paths. + this.requestInFlight = true; + + // If tryUpdate returns true, we can consider this a success. + if (this.tryUpdate()) { + // Mark this for reporting and monitoring reasons. + this.lastSuccessfulCheck = new Date(); + } + } catch (err) { + // Log the error, but re-throw it so it can bubble up to whoever would + // like to handle it if anyone else has called us (we're public!) + console.error(err); + throw err; + } finally { + // Always wrap mark ourselves as finished, even in the event of an error. + this.requestInFlight = false; + } + } + + public async updateManifest(manifest: OperationManifest) { + if ( + !manifest || + manifest.version !== 1 || + !Array.isArray(manifest.operations) + ) { + throw new Error('Invalid manifest format.'); + } + + const incomingOperations: Map = new Map(); + const replacementSignatures: SignatureStore = new Set(); + + for (const operation of manifest.operations) { + incomingOperations.set(operation.signature, operation.document); + } + + // Loop through each operation in the current manifest. + incomingOperations.forEach((document, signature) => { + // Keep track of each operation in this manifest so we can store it + // for comparison after the next fetch. + replacementSignatures.add(signature); + + // If it it's _not_ in the last fetch, we know it's added. We could + // just set it — which would be less costly, but it's nice to have this + // for debugging. + if (!this.lastOperationSignatures.has(signature)) { + // Newly added operation. + this.maybeLog(`Incoming manifest ADDs: ${signature}`); + this.options.cache.set(cacheKey(signature), document); + } + }); + + // Explicitly purge items which have been removed since our last + // successful fetch of the manifest. + this.lastOperationSignatures.forEach(signature => { + if (!incomingOperations.has(signature)) { + // Remove operations which are no longer present. + this.maybeLog(`Incoming manifest REMOVEs: ${signature}`); + this.options.cache.delete(cacheKey(signature)); + } + }); + + // Save the ones from this fetch, so we know what to remove on the next + // actual update. Particularly important since some cache backings might + // not actually let us look this up again. + this.lastOperationSignatures = replacementSignatures; + } + + check() { + console.log(); + } +} diff --git a/packages/apollo-server-plugin-operation-registry/src/common.ts b/packages/apollo-server-plugin-operation-registry/src/common.ts new file mode 100644 index 00000000000..b7e9b1dcc8a --- /dev/null +++ b/packages/apollo-server-plugin-operation-registry/src/common.ts @@ -0,0 +1,20 @@ +export const pluginName: string = require('../package.json').name; + +const envOverrideOperationManifest = 'APOLLO_OPERATION_MANIFEST_BASE_URL'; + +// Generate and cache our desired operation manifest URL. +const urlOperationManifestBase: string = ((): string => { + const desiredUrl = + process.env[envOverrideOperationManifest] || + 'https://storage.googleapis.com/engine-schema-reg-abernix-query-reg/dev/'; + + // Make sure it has NO trailing slash. + return desiredUrl.replace(/\/$/, ''); +})(); + +export function getOperationManifestUrl( + hashedServiceId: string, + schemaHash: string, +): string { + return [urlOperationManifestBase, hashedServiceId, schemaHash].join('/'); +} diff --git a/packages/apollo-server-plugin-operation-registry/src/index.ts b/packages/apollo-server-plugin-operation-registry/src/index.ts new file mode 100644 index 00000000000..1495c28c138 --- /dev/null +++ b/packages/apollo-server-plugin-operation-registry/src/index.ts @@ -0,0 +1,60 @@ +import * as assert from 'assert'; +import { pluginName } from './common'; +import { + ApolloServerPlugin, + GraphQLServiceContext, + GraphQLRequestListener, +} from 'apollo-server-plugin-base'; +import Agent from './agent'; +import { GraphQLSchema } from 'graphql/type'; +import { generateSchemaHash } from './schema'; +import { KeyValueCache } from 'apollo-server-caching'; + +export default class extends ApolloServerPlugin { + private agent?: Agent; + private cache?: KeyValueCache; + + async serverWillStart({ + schema, + engine, + persistedQueries, + }: GraphQLServiceContext): Promise { + assert.ok(schema instanceof GraphQLSchema); + const schemaHash = await generateSchemaHash(schema); + + if (!engine || !engine.serviceID) { + throw new Error( + `${pluginName}: The Engine API key must be set to use the operation registry.`, + ); + } + + console.log('ENGINE', engine); + + if (!persistedQueries || !persistedQueries.cache) { + throw new Error( + `${pluginName}: Persisted queries must be enabled to use the operation registry.`, + ); + } + + // We use which ever cache store is in place for persisted queries, be that + // the default in-memory store, or other stateful store resource. + const cache = (this.cache = persistedQueries.cache); + + this.agent = new Agent({ schemaHash, engine, cache, debug: true }); + await this.agent.start(); + } + + requestDidStart(): GraphQLRequestListener { + const cache = this.cache; + + if (!this.cache) { + throw new Error('Unable to access required cache.'); + } + + return { + async prepareRequest() { + console.log(cache); + }, + }; + } +} diff --git a/packages/apollo-server-plugin-operation-registry/src/schema.ts b/packages/apollo-server-plugin-operation-registry/src/schema.ts new file mode 100644 index 00000000000..6a32e606d70 --- /dev/null +++ b/packages/apollo-server-plugin-operation-registry/src/schema.ts @@ -0,0 +1,32 @@ +import { pluginName } from './common'; +import { parse } from 'graphql/language'; +import { execute, ExecutionResult } from 'graphql/execution'; +import { getIntrospectionQuery, IntrospectionSchema } from 'graphql/utilities'; +import stableStringify from 'json-stable-stringify'; +import { GraphQLSchema } from 'graphql/type'; +import { createHash } from 'crypto'; + +export async function generateSchemaHash( + schema: GraphQLSchema, +): Promise { + const introspectionQuery = getIntrospectionQuery(); + const documentAST = parse(introspectionQuery); + const result: ExecutionResult = await execute(schema, documentAST); + + if (!result || !result.data || !result.data.__schema) { + throw new Error( + `${pluginName}: Unable to generate server introspection document.`, + ); + } + + const introspectionSchema: IntrospectionSchema = result.data.__schema; + + // It's important that we perform a deterministic stringification here + // since, depending on changes in the underlying `graphql-js` execution + // layer, varying orders of the properties in the introspection + const stringifiedSchema = stableStringify(introspectionSchema); + + return createHash('sha512') + .update(stringifiedSchema) + .digest('hex'); +} diff --git a/packages/apollo-server-plugin-operation-registry/tsconfig.json b/packages/apollo-server-plugin-operation-registry/tsconfig.json new file mode 100644 index 00000000000..f427a6291e0 --- /dev/null +++ b/packages/apollo-server-plugin-operation-registry/tsconfig.json @@ -0,0 +1,13 @@ +{ + "extends": "../../tsconfig.base", + "compilerOptions": { + "rootDir": "./src", + "outDir": "./dist" + }, + "include": ["src/**/*"], + "exclude": ["**/__tests__", "**/__mocks__"], + "references": [ + { "path": "../apollo-server-plugin-base" }, + { "path": "../apollo-server-caching" } + ] +} From cbdf403a48169671b02b142ca176ba6a0c1211c8 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 9 Oct 2018 01:44:48 +0300 Subject: [PATCH 002/642] Remove unused `check` instance method. --- .../src/agent.ts | 27 +++++++++---------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/agent.ts b/packages/apollo-server-plugin-operation-registry/src/agent.ts index 7f9b39ab146..9490b56fd33 100644 --- a/packages/apollo-server-plugin-operation-registry/src/agent.ts +++ b/packages/apollo-server-plugin-operation-registry/src/agent.ts @@ -1,9 +1,13 @@ -import { getOperationManifestUrl } from './common'; -import { createHash } from 'crypto'; +import { + getOperationManifestUrl, + generateServiceIdHash, + getCacheKey, +} from './common'; + import fetch, { Response, RequestInit } from 'node-fetch'; import { KeyValueCache } from 'apollo-server-caching'; -const DEFAULT_POLL_SECONDS: number = 2; +const DEFAULT_POLL_SECONDS: number = 30; const SYNC_WARN_TIME_SECONDS: number = 60; interface AgentOptions { @@ -26,8 +30,6 @@ interface OperationManifest { type SignatureStore = Set; -const cacheKey = (signature: string) => `apq:${signature}`; - export default class Agent { private timer?: NodeJS.Timer; private hashedServiceId?: string; @@ -41,9 +43,7 @@ export default class Agent { private getHashedServiceId(): string { return (this.hashedServiceId = this.hashedServiceId || - createHash('sha512') - .update(this.options.engine.serviceID) - .digest('hex')); + generateServiceIdHash(this.options.engine.serviceID)); } private pollSeconds() { @@ -88,12 +88,13 @@ export default class Agent { } private async tryUpdate(): Promise { - this.maybeLog('Checking for manifest changes...'); const manifestUrl = getOperationManifestUrl( this.getHashedServiceId(), this.options.schemaHash, ); + this.maybeLog(`Checking for manifest changes at ${manifestUrl}`); + const fetchOptions: RequestInit = { // GET is what we request, but keep in mind that, when we include and get // a match on the `If-None-Match` header we'll get an early return with a @@ -212,7 +213,7 @@ export default class Agent { if (!this.lastOperationSignatures.has(signature)) { // Newly added operation. this.maybeLog(`Incoming manifest ADDs: ${signature}`); - this.options.cache.set(cacheKey(signature), document); + this.options.cache.set(getCacheKey(signature), document); } }); @@ -222,7 +223,7 @@ export default class Agent { if (!incomingOperations.has(signature)) { // Remove operations which are no longer present. this.maybeLog(`Incoming manifest REMOVEs: ${signature}`); - this.options.cache.delete(cacheKey(signature)); + this.options.cache.delete(getCacheKey(signature)); } }); @@ -231,8 +232,4 @@ export default class Agent { // not actually let us look this up again. this.lastOperationSignatures = replacementSignatures; } - - check() { - console.log(); - } } From 23903a10137aca8f3d7acd9537a061e844b2d2e2 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 9 Oct 2018 01:56:52 +0300 Subject: [PATCH 003/642] Switch to the `prod` operation manifest bucket. --- packages/apollo-server-plugin-operation-registry/src/common.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/common.ts b/packages/apollo-server-plugin-operation-registry/src/common.ts index b7e9b1dcc8a..f46de7b34c5 100644 --- a/packages/apollo-server-plugin-operation-registry/src/common.ts +++ b/packages/apollo-server-plugin-operation-registry/src/common.ts @@ -6,7 +6,7 @@ const envOverrideOperationManifest = 'APOLLO_OPERATION_MANIFEST_BASE_URL'; const urlOperationManifestBase: string = ((): string => { const desiredUrl = process.env[envOverrideOperationManifest] || - 'https://storage.googleapis.com/engine-schema-reg-abernix-query-reg/dev/'; + 'https://storage.googleapis.com/engine-op-manifest-storage-prod/'; // Make sure it has NO trailing slash. return desiredUrl.replace(/\/$/, ''); From a9429eb043e8968bf23dd23af01f207777f76eeb Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 9 Oct 2018 01:57:14 +0300 Subject: [PATCH 004/642] Remove rogue `console.log` usage. --- packages/apollo-server-plugin-operation-registry/src/index.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/index.ts b/packages/apollo-server-plugin-operation-registry/src/index.ts index 1495c28c138..5d082bed739 100644 --- a/packages/apollo-server-plugin-operation-registry/src/index.ts +++ b/packages/apollo-server-plugin-operation-registry/src/index.ts @@ -28,8 +28,6 @@ export default class extends ApolloServerPlugin { ); } - console.log('ENGINE', engine); - if (!persistedQueries || !persistedQueries.cache) { throw new Error( `${pluginName}: Persisted queries must be enabled to use the operation registry.`, From 739dea60d55d3851e611e7411be967dfe2b16f14 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 9 Oct 2018 01:58:20 +0300 Subject: [PATCH 005/642] Implement the per-request manifest-presence test. With this commit, the first functioning version of operation registry is in place. :tada: --- .../package.json | 1 + .../src/common.ts | 27 ++++++++++++++++ .../src/index.ts | 32 +++++++++++++++---- .../tsconfig.json | 1 + 4 files changed, 54 insertions(+), 7 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/package.json b/packages/apollo-server-plugin-operation-registry/package.json index 1d5cf174ee8..5d450824167 100644 --- a/packages/apollo-server-plugin-operation-registry/package.json +++ b/packages/apollo-server-plugin-operation-registry/package.json @@ -14,6 +14,7 @@ "dependencies": { "apollo-server-plugin-base": "file:../apollo-server-plugin-base", "apollo-server-caching": "file:../apollo-server-caching", + "apollo-engine-reporting": "file:../apollo-engine-reporting", "json-stable-stringify": "1.0.1", "node-fetch": "2.2.0" }, diff --git a/packages/apollo-server-plugin-operation-registry/src/common.ts b/packages/apollo-server-plugin-operation-registry/src/common.ts index f46de7b34c5..080709e01ec 100644 --- a/packages/apollo-server-plugin-operation-registry/src/common.ts +++ b/packages/apollo-server-plugin-operation-registry/src/common.ts @@ -1,7 +1,20 @@ export const pluginName: string = require('../package.json').name; +import { createHash } from 'crypto'; +import { parse } from 'graphql/language'; +import { + hideLiterals, + printWithReducedWhitespace, + sortAST, +} from 'apollo-engine-reporting'; const envOverrideOperationManifest = 'APOLLO_OPERATION_MANIFEST_BASE_URL'; +function formatOperationForHashing(operation: string): string { + return printWithReducedWhitespace( + sortAST(hideLiterals(parse(operation))), + ).trim(); +} + // Generate and cache our desired operation manifest URL. const urlOperationManifestBase: string = ((): string => { const desiredUrl = @@ -12,6 +25,20 @@ const urlOperationManifestBase: string = ((): string => { return desiredUrl.replace(/\/$/, ''); })(); +export const getCacheKey = (signature: string) => `apq:${signature}`; + +export function generateServiceIdHash(serviceId: string): string { + return createHash('sha512') + .update(serviceId) + .digest('hex'); +} + +export function generateOperationHash(operationString: string): string { + return createHash('sha256') + .update(formatOperationForHashing(operationString)) + .digest('hex'); +} + export function getOperationManifestUrl( hashedServiceId: string, schemaHash: string, diff --git a/packages/apollo-server-plugin-operation-registry/src/index.ts b/packages/apollo-server-plugin-operation-registry/src/index.ts index 5d082bed739..88dde8906df 100644 --- a/packages/apollo-server-plugin-operation-registry/src/index.ts +++ b/packages/apollo-server-plugin-operation-registry/src/index.ts @@ -1,5 +1,5 @@ import * as assert from 'assert'; -import { pluginName } from './common'; +import { pluginName, generateOperationHash, getCacheKey } from './common'; import { ApolloServerPlugin, GraphQLServiceContext, @@ -45,13 +45,31 @@ export default class extends ApolloServerPlugin { requestDidStart(): GraphQLRequestListener { const cache = this.cache; - if (!this.cache) { - throw new Error('Unable to access required cache.'); - } - return { - async prepareRequest() { - console.log(cache); + async prepareRequest({ request }) { + if (!cache) { + throw new Error('Unable to access required cache.'); + } + + // XXX This isn't really right and this totally breaks APQ today, but: + // 1) TypeScript seemed to want me to guard against this; and + // 2) I'm not touching persistedQueries today. + if (!request.query) { + throw new Error('Document query was not received.'); + } + + // XXX This needs to utilize a better cache store and persist the + // parsed document to the rest of the request to avoid re-validation. + const hash = generateOperationHash(request.query); + + // Try to fetch the operation from the cache of operations we're + // currently aware of, which has been populated by the operation + // registry. + const cacheFetch = await cache.get(getCacheKey(hash)); + + if (!cacheFetch) { + throw new Error('Execution forbidden.'); + } }, }; } diff --git a/packages/apollo-server-plugin-operation-registry/tsconfig.json b/packages/apollo-server-plugin-operation-registry/tsconfig.json index f427a6291e0..f0386ccd2b5 100644 --- a/packages/apollo-server-plugin-operation-registry/tsconfig.json +++ b/packages/apollo-server-plugin-operation-registry/tsconfig.json @@ -8,6 +8,7 @@ "exclude": ["**/__tests__", "**/__mocks__"], "references": [ { "path": "../apollo-server-plugin-base" }, + { "path": "../apollo-engine-reporting" }, { "path": "../apollo-server-caching" } ] } From 81b754286c2aa3fc7b562e7d7e8d2200ea55ac0c Mon Sep 17 00:00:00 2001 From: James Baxley Date: Mon, 8 Oct 2018 21:38:26 -0400 Subject: [PATCH 006/642] remove private flag from operation-registry --- packages/apollo-server-plugin-operation-registry/package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/package.json b/packages/apollo-server-plugin-operation-registry/package.json index 5d450824167..b303e4ba641 100644 --- a/packages/apollo-server-plugin-operation-registry/package.json +++ b/packages/apollo-server-plugin-operation-registry/package.json @@ -1,6 +1,5 @@ { "name": "apollo-server-plugin-operation-registry", - "private": true, "version": "0.0.1", "description": "Apollo Server operation registry", "main": "dist/index.js", From df0604a7ec50fc7b5befdbbe878d1b812d75f71f Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 11 Oct 2018 15:31:11 +0300 Subject: [PATCH 007/642] Switch to registry pipeline plugins and errors from `apollo-server-errors`. --- .../package.json | 5 +-- .../src/common.ts | 11 ++++++ .../src/index.ts | 35 ++++++++++--------- .../tsconfig.json | 1 + 4 files changed, 33 insertions(+), 19 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/package.json b/packages/apollo-server-plugin-operation-registry/package.json index b303e4ba641..60d8d7d1a61 100644 --- a/packages/apollo-server-plugin-operation-registry/package.json +++ b/packages/apollo-server-plugin-operation-registry/package.json @@ -11,9 +11,10 @@ "node": ">=6" }, "dependencies": { - "apollo-server-plugin-base": "file:../apollo-server-plugin-base", - "apollo-server-caching": "file:../apollo-server-caching", "apollo-engine-reporting": "file:../apollo-engine-reporting", + "apollo-server-caching": "file:../apollo-server-caching", + "apollo-server-errors": "file:../apollo-server-errors", + "apollo-server-plugin-base": "file:../apollo-server-plugin-base", "json-stable-stringify": "1.0.1", "node-fetch": "2.2.0" }, diff --git a/packages/apollo-server-plugin-operation-registry/src/common.ts b/packages/apollo-server-plugin-operation-registry/src/common.ts index 080709e01ec..2fd6c630a41 100644 --- a/packages/apollo-server-plugin-operation-registry/src/common.ts +++ b/packages/apollo-server-plugin-operation-registry/src/common.ts @@ -9,6 +9,17 @@ import { const envOverrideOperationManifest = 'APOLLO_OPERATION_MANIFEST_BASE_URL'; +// XXX This function is not currently invoked when the hashed APQ value +// (`extensions.persistedQuery.sha256Hash`) is set, but would +// be called if we're provided a (string) `query` (so when APQ is a miss, +// or not enabled at all). +// +// Since the `hideLiterals` and `sortAST` methods both require a +// `DocumentNode`, we'll have to call a `parse` here on the `query` string +// and make the necessary transformations. +// +// Lastly, we will remove the `hideLiterals` portion of this once the +// `apollo` CLI properly warns about including/using string literals. function formatOperationForHashing(operation: string): string { return printWithReducedWhitespace( sortAST(hideLiterals(parse(operation))), diff --git a/packages/apollo-server-plugin-operation-registry/src/index.ts b/packages/apollo-server-plugin-operation-registry/src/index.ts index 88dde8906df..481cd6f1d0e 100644 --- a/packages/apollo-server-plugin-operation-registry/src/index.ts +++ b/packages/apollo-server-plugin-operation-registry/src/index.ts @@ -5,6 +5,7 @@ import { GraphQLServiceContext, GraphQLRequestListener, } from 'apollo-server-plugin-base'; +import { ForbiddenError, ApolloError } from 'apollo-server-errors'; import Agent from './agent'; import { GraphQLSchema } from 'graphql/type'; import { generateSchemaHash } from './schema'; @@ -43,32 +44,32 @@ export default class extends ApolloServerPlugin { } requestDidStart(): GraphQLRequestListener { - const cache = this.cache; - + const plugin = this; return { - async prepareRequest({ request }) { - if (!cache) { - throw new Error('Unable to access required cache.'); + async didResolveOperation({ request: { query }, queryHash }) { + // This shouldn't happen under normal operation since `cache` will be + // set in `serverWillStart` and `requestDidStart` (this) comes after. + if (!plugin.cache) { + throw new Error('Unable to access cache.'); } - // XXX This isn't really right and this totally breaks APQ today, but: - // 1) TypeScript seemed to want me to guard against this; and - // 2) I'm not touching persistedQueries today. - if (!request.query) { - throw new Error('Document query was not received.'); - } + const hash = query + ? generateOperationHash(query) // If we received a `query`, hash it! + : queryHash; // Otherwise, we'll use the APQ `queryHash`. - // XXX This needs to utilize a better cache store and persist the - // parsed document to the rest of the request to avoid re-validation. - const hash = generateOperationHash(request.query); + // If the document itself was missing and we didn't receive a + // `queryHash` (the persisted query `sha256Hash` from the APQ + // `extensions`), then we have nothing to work with. + if (!hash) { + throw new ApolloError('No document.'); + } // Try to fetch the operation from the cache of operations we're // currently aware of, which has been populated by the operation // registry. - const cacheFetch = await cache.get(getCacheKey(hash)); - + const cacheFetch = await plugin.cache.get(getCacheKey(hash)); if (!cacheFetch) { - throw new Error('Execution forbidden.'); + throw new ForbiddenError('Execution forbidden'); } }, }; diff --git a/packages/apollo-server-plugin-operation-registry/tsconfig.json b/packages/apollo-server-plugin-operation-registry/tsconfig.json index f0386ccd2b5..c79b735dda4 100644 --- a/packages/apollo-server-plugin-operation-registry/tsconfig.json +++ b/packages/apollo-server-plugin-operation-registry/tsconfig.json @@ -9,6 +9,7 @@ "references": [ { "path": "../apollo-server-plugin-base" }, { "path": "../apollo-engine-reporting" }, + { "path": "../apollo-server-errors" }, { "path": "../apollo-server-caching" } ] } From e995846bb1321b9c75fe94950a0fd1dd6b39dc42 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 11 Oct 2018 20:49:27 +0300 Subject: [PATCH 008/642] Improve the error handling in the event of fetch failures. In particular, the console will be more clear if it's unable to fetch the manifest on server startup and errors in the pulsing after the initial fetch will be logged until the next successful sync. Also cleans up some unnecessary catching which was only helpful during development. --- .../src/agent.ts | 40 ++++++++++++------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/agent.ts b/packages/apollo-server-plugin-operation-registry/src/agent.ts index 9490b56fd33..224c3d880f9 100644 --- a/packages/apollo-server-plugin-operation-registry/src/agent.ts +++ b/packages/apollo-server-plugin-operation-registry/src/agent.ts @@ -55,10 +55,25 @@ export default class Agent { const pulse = async () => await this.checkForUpdate(); // The first pulse should happen before we start the timer. - await pulse(); + try { + await pulse(); + } catch (err) { + console.error( + 'Apollo Server could not begin serving requests immediately because the operation manifest could not be fetched. Attempts will continue to fetch the manifest, but all requests will be forbidden until the manifest is fetched.', + err.message || err, + ); + } - // Afterward, keep it going. - this.timer = this.timer || setInterval(pulse, this.pollSeconds() * 1000); + // Afterward, keep the pulse going. + this.timer = + this.timer || + setInterval(function() { + // Errors in the interval indicate that the manifest might have failed + // to update, but we've still got the seed update so we will continue + // serving based on the previous manifest until we gain sync again. + // These errors will be logged, but not crash the server. + pulse().catch(err => console.error(err.message || err)); + }, this.pollSeconds() * 1000); } private timeSinceLastSuccessfulCheck() { @@ -117,11 +132,13 @@ export default class Agent { try { response = await fetch(manifestUrl, fetchOptions); } catch (err) { - throw new Error( - `Unable to fetch operation manifest for ${ - this.options.schemaHash - } in '${this.options.engine.serviceId}'`, - ); + const ourErrorPrefix = `Unable to fetch operation manifest for ${ + this.options.schemaHash + } in '${this.options.engine.serviceID}': ${err}`; + + err.message = `${ourErrorPrefix}: ${err.message}`; + + throw err; } // When the response indicates that the resource hasn't changed, there's @@ -170,15 +187,10 @@ export default class Agent { this.requestInFlight = true; // If tryUpdate returns true, we can consider this a success. - if (this.tryUpdate()) { + if (await this.tryUpdate()) { // Mark this for reporting and monitoring reasons. this.lastSuccessfulCheck = new Date(); } - } catch (err) { - // Log the error, but re-throw it so it can bubble up to whoever would - // like to handle it if anyone else has called us (we're public!) - console.error(err); - throw err; } finally { // Always wrap mark ourselves as finished, even in the event of an error. this.requestInFlight = false; From 62584fdbe259a255d46c18654a24d481d52f491c Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 11 Oct 2018 20:52:49 +0300 Subject: [PATCH 009/642] Enable the configurability of the `debug` boolean via constructor options. The plugin now accepts: ``` new ...({ debug: true }); ``` ...in order to see output about operations being added or removed from the known manifest. --- .../src/index.ts | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/index.ts b/packages/apollo-server-plugin-operation-registry/src/index.ts index 481cd6f1d0e..a14a11107b1 100644 --- a/packages/apollo-server-plugin-operation-registry/src/index.ts +++ b/packages/apollo-server-plugin-operation-registry/src/index.ts @@ -11,10 +11,18 @@ import { GraphQLSchema } from 'graphql/type'; import { generateSchemaHash } from './schema'; import { KeyValueCache } from 'apollo-server-caching'; +interface Options { + debug?: boolean; +} + export default class extends ApolloServerPlugin { private agent?: Agent; private cache?: KeyValueCache; + constructor(public options: Options) { + super(); + } + async serverWillStart({ schema, engine, @@ -39,7 +47,13 @@ export default class extends ApolloServerPlugin { // the default in-memory store, or other stateful store resource. const cache = (this.cache = persistedQueries.cache); - this.agent = new Agent({ schemaHash, engine, cache, debug: true }); + this.agent = new Agent({ + schemaHash, + engine, + cache, + debug: this.options.debug, + }); + await this.agent.start(); } From f7e8d2ab75088080c8dbb604d15cdb1a1973a426 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Fri, 12 Oct 2018 17:18:39 +0300 Subject: [PATCH 010/642] Change `options` to be entirely optional. --- .../apollo-server-plugin-operation-registry/src/agent.ts | 5 ++++- .../apollo-server-plugin-operation-registry/src/index.ts | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/agent.ts b/packages/apollo-server-plugin-operation-registry/src/agent.ts index 224c3d880f9..0fc408bf107 100644 --- a/packages/apollo-server-plugin-operation-registry/src/agent.ts +++ b/packages/apollo-server-plugin-operation-registry/src/agent.ts @@ -37,8 +37,11 @@ export default class Agent { private lastSuccessfulCheck?: Date; private lastSuccessfulETag?: string; private lastOperationSignatures: SignatureStore = new Set(); + private options: AgentOptions = Object.create(null); - constructor(private options: AgentOptions) {} + constructor(options?: AgentOptions) { + Object.assign(this.options, options); + } private getHashedServiceId(): string { return (this.hashedServiceId = diff --git a/packages/apollo-server-plugin-operation-registry/src/index.ts b/packages/apollo-server-plugin-operation-registry/src/index.ts index a14a11107b1..cd1ca815913 100644 --- a/packages/apollo-server-plugin-operation-registry/src/index.ts +++ b/packages/apollo-server-plugin-operation-registry/src/index.ts @@ -18,9 +18,11 @@ interface Options { export default class extends ApolloServerPlugin { private agent?: Agent; private cache?: KeyValueCache; + private options: Options = Object.create(null); - constructor(public options: Options) { + constructor(options?: Options) { super(); + Object.assign(this.options, options); } async serverWillStart({ From 5e1ba747dcbe50747c3115c5c47d2984d6980d37 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Fri, 12 Oct 2018 23:24:50 +0300 Subject: [PATCH 011/642] (tests) Introduce tests for the operation registry. More to come, but something to start with. --- .../jest.config.js | 3 + .../src/__tests__/agent.test.ts | 195 ++++++++++++++++++ .../src/__tests__/common.test.ts | 7 + .../src/__tests__/index.test.ts | 22 ++ .../src/__tests__/tsconfig.json | 8 + .../src/agent.ts | 21 +- .../src/common.ts | 3 +- .../src/index.ts | 93 --------- 8 files changed, 256 insertions(+), 96 deletions(-) create mode 100644 packages/apollo-server-plugin-operation-registry/jest.config.js create mode 100644 packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts create mode 100644 packages/apollo-server-plugin-operation-registry/src/__tests__/common.test.ts create mode 100644 packages/apollo-server-plugin-operation-registry/src/__tests__/index.test.ts create mode 100644 packages/apollo-server-plugin-operation-registry/src/__tests__/tsconfig.json delete mode 100644 packages/apollo-server-plugin-operation-registry/src/index.ts diff --git a/packages/apollo-server-plugin-operation-registry/jest.config.js b/packages/apollo-server-plugin-operation-registry/jest.config.js new file mode 100644 index 00000000000..a383fbc925f --- /dev/null +++ b/packages/apollo-server-plugin-operation-registry/jest.config.js @@ -0,0 +1,3 @@ +const config = require('../../jest.config.base'); + +module.exports = Object.assign(Object.create(null), config); diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts new file mode 100644 index 00000000000..58b2d224e72 --- /dev/null +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts @@ -0,0 +1,195 @@ +import nock from 'nock'; +import { InMemoryLRUCache, KeyValueCache } from 'apollo-server-caching'; +import { envOverrideOperationManifest, getCacheKey } from '../common'; +import { resolve as urlResolve } from 'url'; +import { createHash } from 'crypto'; + +const fakeBaseUrl = 'https://myfakehost/'; + +const defaultCache = () => new InMemoryLRUCache(); + +const getRequiredAgentOptions = ( + { + cache = defaultCache(), + }: { + cache?: KeyValueCache; + } = { cache: defaultCache() }, +) => ({ + schemaHash: 'abc123', + engine: { serviceID: 'test-service' }, + cache, +}); + +const hashedServiceId = createHash('sha512') + .update('test-service') + .digest('hex'); + +describe('Agent', () => { + describe('Basic', () => { + const Agent = require('../agent').default; + it('instantiates with proper options', () => { + expect(new Agent({ ...getRequiredAgentOptions() })).toBeInstanceOf(Agent); + }); + + it('instantiates with debug enabled', () => { + expect( + new Agent({ ...getRequiredAgentOptions(), debug: true }), + ).toBeInstanceOf(Agent); + }); + + it('fails to instantiate when `schemaHash` is not passed', () => { + const { schemaHash, ...remainingOptions } = getRequiredAgentOptions(); + expect(() => { + // @ts-ignore: Intentionally not passing the parameter we need. + new Agent(remainingOptions); + }).toThrow(/`schemaHash` must be/); + }); + }); + + interface FetchTests { + originalEnvApolloOpManifestBaseUrl?: string; + Agent: typeof import('../agent').default; + agent: import('../agent').default; + cache: KeyValueCache; + instantiateAndStartAgent: Function; + getOperationManifestUrl: typeof import('../common').getOperationManifestUrl; + } + + describe('fetches', function(this: FetchTests) { + beforeAll(() => { + // Override the tests URL with the one we want to mock/nock/test. + this.originalEnvApolloOpManifestBaseUrl = + process.env[envOverrideOperationManifest]; + process.env[envOverrideOperationManifest] = fakeBaseUrl; + + // Reset the modules so they're ready to be imported. + jest.resetModules(); + + // Import what we need and store it on the local scope. + this.Agent = require('../agent').default; + this.getOperationManifestUrl = require('../common').getOperationManifestUrl; + }); + + afterAll(() => { + // Put the environment overrides back how they were. + if (this.originalEnvApolloOpManifestBaseUrl) { + process.env[ + envOverrideOperationManifest + ] = this.originalEnvApolloOpManifestBaseUrl; + } else { + delete process.env[envOverrideOperationManifest]; + } + + // Reset modules again. + jest.resetModules(); + }); + + it('correctly prepared the test environment', () => { + expect(this.getOperationManifestUrl('abc123', 'def456')).toStrictEqual( + urlResolve(fakeBaseUrl, '/abc123/def456'), + ); + }); + + describe('manifest checking and cache populating', () => { + const expectedPath = `/${hashedServiceId}/abc123`; + beforeEach(() => { + nock(fakeBaseUrl) + .get(/.*/) + .reply(200, { + version: 1, + operations: [ + { + signature: + 'ba4573fca2e1491fd54b9f398490531ad6327b00610f2c1216dc8c9c4cfd2993', + document: + 'mutation toggleMovieLike($id:ID!){toggleLike(id:$id){__typename id isLiked}}', + }, + { + signature: + '32a21510374c3c9ad25e06424085c45ccde29bdbdedf8fa806c2bc6a2ffcdf56', + document: '{nooks:books{author}}', + }, + { + signature: + 'c60ac6dfe19ba70dd9d6a29a275fae56296dcbb636eeaab55c3d9b7287c40a47', + document: '{nooks:books{__typename author}}', + }, + ], + }); + + this.cache = new InMemoryLRUCache(); + + this.instantiateAndStartAgent = async () => { + this.agent = new this.Agent({ + ...getRequiredAgentOptions({ cache: this.cache }), + debug: true, + }); + return await this.agent.start(); + }; + }); + + afterEach(() => { + if (this.agent) this.agent.stop(); + }); + + it('fetches the manifest after starting', () => { + const consoleSpy = jest + .spyOn(global.console, 'debug') + .mockImplementation(() => {}); + this.instantiateAndStartAgent(); + expect(consoleSpy).toHaveBeenCalledTimes(1); + expect(consoleSpy).toHaveBeenNthCalledWith( + 1, + `Checking for manifest changes at ${urlResolve( + fakeBaseUrl, + expectedPath, + )}`, + ); + consoleSpy.mockRestore(); + }); + + it('populates the cache', async () => { + const consoleSpy = jest + .spyOn(global.console, 'debug') + .mockImplementation(() => {}); + const cacheSpy = jest.spyOn(this.cache, 'set'); + await this.instantiateAndStartAgent(); + + // There are three operations in the manifest above. + expect(cacheSpy).toHaveBeenCalledTimes(3); + + // 1 + expect( + this.cache.get( + getCacheKey( + 'ba4573fca2e1491fd54b9f398490531ad6327b00610f2c1216dc8c9c4cfd2993', + ), + ), + ).resolves.toStrictEqual( + 'mutation toggleMovieLike($id:ID!){toggleLike(id:$id){__typename id isLiked}}', + ); + + // 2 + expect( + this.cache.get( + getCacheKey( + '32a21510374c3c9ad25e06424085c45ccde29bdbdedf8fa806c2bc6a2ffcdf56', + ), + ), + ).resolves.toStrictEqual('{nooks:books{author}}'); + + // 3 + expect( + this.cache.get( + getCacheKey( + 'c60ac6dfe19ba70dd9d6a29a275fae56296dcbb636eeaab55c3d9b7287c40a47', + ), + ), + ).resolves.toStrictEqual('{nooks:books{__typename author}}'); + + cacheSpy.mockRestore(); + consoleSpy.mockRestore(); + }); + }); + }); +}); diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/common.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/common.test.ts new file mode 100644 index 00000000000..ed2e80c72f4 --- /dev/null +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/common.test.ts @@ -0,0 +1,7 @@ +import * as common from '../common'; + +describe('common', () => { + it('uses the correct cache prefix', () => { + expect(common.getCacheKey('abc123')).toStrictEqual('apq:abc123'); + }); +}); diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/index.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/index.test.ts new file mode 100644 index 00000000000..c2d5de0699a --- /dev/null +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/index.test.ts @@ -0,0 +1,22 @@ +import ApolloServerPlugin from '../'; + +describe.only('Operation registry plugin', () => { + it('will instantiate', () => { + expect(new ApolloServerPlugin()).toBeInstanceOf(ApolloServerPlugin); + }); + + it('will instantiate with debug enabled', () => { + expect( + new ApolloServerPlugin({ + debug: true, + }), + ).toBeInstanceOf(ApolloServerPlugin); + }); + + describe('serverWillStart will launch agent', () => { + it('makes the request', () => { + expect(''); + }); + // jest.spyOn(global.console, 'warn') + }); +}); diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/tsconfig.json b/packages/apollo-server-plugin-operation-registry/src/__tests__/tsconfig.json new file mode 100644 index 00000000000..86b8a49b265 --- /dev/null +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/tsconfig.json @@ -0,0 +1,8 @@ +{ + "extends": "../../../../tsconfig.test.base", + "include": ["**/*"], + "references": [ + { "path": "../../" }, + { "path": "../../../apollo-server-integration-testsuite" } + ] +} diff --git a/packages/apollo-server-plugin-operation-registry/src/agent.ts b/packages/apollo-server-plugin-operation-registry/src/agent.ts index 0fc408bf107..bb1b8a2794e 100644 --- a/packages/apollo-server-plugin-operation-registry/src/agent.ts +++ b/packages/apollo-server-plugin-operation-registry/src/agent.ts @@ -39,8 +39,19 @@ export default class Agent { private lastOperationSignatures: SignatureStore = new Set(); private options: AgentOptions = Object.create(null); - constructor(options?: AgentOptions) { + constructor(options: AgentOptions) { Object.assign(this.options, options); + + if (!this.options.schemaHash) { + throw new Error('`schemaHash` must be passed to the Agent.'); + } + + if ( + typeof this.options.engine !== 'object' || + typeof this.options.engine.serviceID !== 'string' + ) { + throw new Error('`engine.serviceID` must be passed to the Agent.'); + } } private getHashedServiceId(): string { @@ -79,6 +90,12 @@ export default class Agent { }, this.pollSeconds() * 1000); } + public stop() { + if (this.timer) { + clearInterval(this.timer); + } + } + private timeSinceLastSuccessfulCheck() { if (!this.lastSuccessfulCheck) { // So far back that it's never? @@ -163,7 +180,7 @@ export default class Agent { throw new Error(`Unexpected 'Content-Type' header: ${contentType}`); } - this.updateManifest(await response.json()); + await this.updateManifest(await response.json()); // Save the ETag of the manifest we just received so we can avoid fetching // the same manifest again. diff --git a/packages/apollo-server-plugin-operation-registry/src/common.ts b/packages/apollo-server-plugin-operation-registry/src/common.ts index 2fd6c630a41..ea2ece49954 100644 --- a/packages/apollo-server-plugin-operation-registry/src/common.ts +++ b/packages/apollo-server-plugin-operation-registry/src/common.ts @@ -7,7 +7,8 @@ import { sortAST, } from 'apollo-engine-reporting'; -const envOverrideOperationManifest = 'APOLLO_OPERATION_MANIFEST_BASE_URL'; +export const envOverrideOperationManifest = + 'APOLLO_OPERATION_MANIFEST_BASE_URL'; // XXX This function is not currently invoked when the hashed APQ value // (`extensions.persistedQuery.sha256Hash`) is set, but would diff --git a/packages/apollo-server-plugin-operation-registry/src/index.ts b/packages/apollo-server-plugin-operation-registry/src/index.ts deleted file mode 100644 index cd1ca815913..00000000000 --- a/packages/apollo-server-plugin-operation-registry/src/index.ts +++ /dev/null @@ -1,93 +0,0 @@ -import * as assert from 'assert'; -import { pluginName, generateOperationHash, getCacheKey } from './common'; -import { - ApolloServerPlugin, - GraphQLServiceContext, - GraphQLRequestListener, -} from 'apollo-server-plugin-base'; -import { ForbiddenError, ApolloError } from 'apollo-server-errors'; -import Agent from './agent'; -import { GraphQLSchema } from 'graphql/type'; -import { generateSchemaHash } from './schema'; -import { KeyValueCache } from 'apollo-server-caching'; - -interface Options { - debug?: boolean; -} - -export default class extends ApolloServerPlugin { - private agent?: Agent; - private cache?: KeyValueCache; - private options: Options = Object.create(null); - - constructor(options?: Options) { - super(); - Object.assign(this.options, options); - } - - async serverWillStart({ - schema, - engine, - persistedQueries, - }: GraphQLServiceContext): Promise { - assert.ok(schema instanceof GraphQLSchema); - const schemaHash = await generateSchemaHash(schema); - - if (!engine || !engine.serviceID) { - throw new Error( - `${pluginName}: The Engine API key must be set to use the operation registry.`, - ); - } - - if (!persistedQueries || !persistedQueries.cache) { - throw new Error( - `${pluginName}: Persisted queries must be enabled to use the operation registry.`, - ); - } - - // We use which ever cache store is in place for persisted queries, be that - // the default in-memory store, or other stateful store resource. - const cache = (this.cache = persistedQueries.cache); - - this.agent = new Agent({ - schemaHash, - engine, - cache, - debug: this.options.debug, - }); - - await this.agent.start(); - } - - requestDidStart(): GraphQLRequestListener { - const plugin = this; - return { - async didResolveOperation({ request: { query }, queryHash }) { - // This shouldn't happen under normal operation since `cache` will be - // set in `serverWillStart` and `requestDidStart` (this) comes after. - if (!plugin.cache) { - throw new Error('Unable to access cache.'); - } - - const hash = query - ? generateOperationHash(query) // If we received a `query`, hash it! - : queryHash; // Otherwise, we'll use the APQ `queryHash`. - - // If the document itself was missing and we didn't receive a - // `queryHash` (the persisted query `sha256Hash` from the APQ - // `extensions`), then we have nothing to work with. - if (!hash) { - throw new ApolloError('No document.'); - } - - // Try to fetch the operation from the cache of operations we're - // currently aware of, which has been populated by the operation - // registry. - const cacheFetch = await plugin.cache.get(getCacheKey(hash)); - if (!cacheFetch) { - throw new ForbiddenError('Execution forbidden'); - } - }, - }; - } -} From 49e8a3d9cfb398d634c48f31d148537320815640 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 15 Oct 2018 11:35:26 +0300 Subject: [PATCH 012/642] Cleanup tests and file patterns. In terms of not over-exposing and also in terms of not having a test named `index.test.js` (which somewhat implies that it will behave the same to an `index` file which has special meaning), I've moved the primary class into `ApolloServerPluginOperationRegistry.ts`, a file which matches the class's name and can be tested as `ApolloServerPluginOperationRegistry.test.ts`. --- .../ApolloServerPluginOperationRegistry.ts | 98 +++++++++++++++++++ ...polloServerPluginOperationRegistry.test.ts | 17 ++++ .../src/__tests__/agent.test.ts | 2 +- .../src/__tests__/index.test.ts | 22 ----- .../src/index.ts | 1 + 5 files changed, 117 insertions(+), 23 deletions(-) create mode 100644 packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts create mode 100644 packages/apollo-server-plugin-operation-registry/src/__tests__/ApolloServerPluginOperationRegistry.test.ts delete mode 100644 packages/apollo-server-plugin-operation-registry/src/__tests__/index.test.ts create mode 100644 packages/apollo-server-plugin-operation-registry/src/index.ts diff --git a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts new file mode 100644 index 00000000000..ca0fa9145bd --- /dev/null +++ b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts @@ -0,0 +1,98 @@ +import * as assert from 'assert'; +import { pluginName, generateOperationHash, getCacheKey } from './common'; +import { + ApolloServerPlugin, + GraphQLServiceContext, + GraphQLRequestListener, +} from 'apollo-server-plugin-base'; +import { ForbiddenError, ApolloError } from 'apollo-server-errors'; +import Agent from './agent'; +import { GraphQLSchema } from 'graphql/type'; +import { generateSchemaHash } from './schema'; +import { KeyValueCache } from 'apollo-server-caching'; + +interface Options { + debug?: boolean; +} + +export default class ApolloServerPluginOperationRegistry extends ApolloServerPlugin { + private agent?: Agent; + private cache?: KeyValueCache; + private options: Options = Object.create(null); + + constructor(options?: Options) { + super(); + Object.assign(this.options, options); + } + + // Currently, this method is only called by tests to stop the agent. + public _serverWillStop(): void { + this.agent && this.agent.stop(); + } + + async serverWillStart({ + schema, + engine, + persistedQueries, + }: GraphQLServiceContext): Promise { + assert.ok(schema instanceof GraphQLSchema); + const schemaHash = await generateSchemaHash(schema); + + if (!engine || !engine.serviceID) { + throw new Error( + `${pluginName}: The Engine API key must be set to use the operation registry.`, + ); + } + + if (!persistedQueries || !persistedQueries.cache) { + throw new Error( + `${pluginName}: Persisted queries must be enabled to use the operation registry.`, + ); + } + + // We use which ever cache store is in place for persisted queries, be that + // the default in-memory store, or other stateful store resource. + const cache = (this.cache = persistedQueries.cache); + + this.agent = new Agent({ + schemaHash, + engine, + cache, + debug: this.options.debug, + }); + + await this.agent.start(); + } + + requestDidStart(): GraphQLRequestListener { + const plugin = this; + return { + async didResolveOperation({ request: { query }, queryHash }) { + // This shouldn't happen under normal operation since `cache` will be + // set in `serverWillStart` and `requestDidStart` (this) comes after. + if (!plugin.cache) { + throw new Error('Unable to access cache.'); + } + + const hash = query + ? generateOperationHash(query) // If we received a `query`, hash it! + : queryHash; // Otherwise, we'll use the APQ `queryHash`. + + // If the document itself was missing and we didn't receive a + // `queryHash` (the persisted query `sha256Hash` from the APQ + // `extensions`), then we have nothing to work with. + if (!hash) { + throw new ApolloError('No document.'); + } + + // Try to fetch the operation from the cache of operations we're + // currently aware of, which has been populated by the operation + // registry. + const cacheFetch = await plugin.cache.get(getCacheKey(hash)); + if (!cacheFetch) { + throw new ForbiddenError('Execution forbidden'); + } + }, + }; + } +} diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/ApolloServerPluginOperationRegistry.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/ApolloServerPluginOperationRegistry.test.ts new file mode 100644 index 00000000000..9618bc3c784 --- /dev/null +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/ApolloServerPluginOperationRegistry.test.ts @@ -0,0 +1,17 @@ +import ApolloServerPluginOperationRegistry from '../ApolloServerPluginOperationRegistry'; + +describe.only('Operation registry plugin', () => { + it('will instantiate', () => { + expect(new ApolloServerPluginOperationRegistry()).toBeInstanceOf( + ApolloServerPluginOperationRegistry, + ); + }); + + it('will instantiate with debug enabled', () => { + expect( + new ApolloServerPluginOperationRegistry({ + debug: true, + }), + ).toBeInstanceOf(ApolloServerPluginOperationRegistry); + }); +}); diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts index 58b2d224e72..2a4ef257662 100644 --- a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts @@ -148,7 +148,7 @@ describe('Agent', () => { consoleSpy.mockRestore(); }); - it('populates the cache', async () => { + it('populates the manifest store', async () => { const consoleSpy = jest .spyOn(global.console, 'debug') .mockImplementation(() => {}); diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/index.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/index.test.ts deleted file mode 100644 index c2d5de0699a..00000000000 --- a/packages/apollo-server-plugin-operation-registry/src/__tests__/index.test.ts +++ /dev/null @@ -1,22 +0,0 @@ -import ApolloServerPlugin from '../'; - -describe.only('Operation registry plugin', () => { - it('will instantiate', () => { - expect(new ApolloServerPlugin()).toBeInstanceOf(ApolloServerPlugin); - }); - - it('will instantiate with debug enabled', () => { - expect( - new ApolloServerPlugin({ - debug: true, - }), - ).toBeInstanceOf(ApolloServerPlugin); - }); - - describe('serverWillStart will launch agent', () => { - it('makes the request', () => { - expect(''); - }); - // jest.spyOn(global.console, 'warn') - }); -}); diff --git a/packages/apollo-server-plugin-operation-registry/src/index.ts b/packages/apollo-server-plugin-operation-registry/src/index.ts new file mode 100644 index 00000000000..1236ed69122 --- /dev/null +++ b/packages/apollo-server-plugin-operation-registry/src/index.ts @@ -0,0 +1 @@ +export { default } from './ApolloServerPluginOperationRegistry'; From 7a09ec519569a01c657a5b2ad69699fa96ff5b73 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 16 Oct 2018 17:55:10 +0300 Subject: [PATCH 013/642] (op-reg) Expose an async `requestPending` method which can be `await`ed. This is most helpful for testing since many elements of the manifest fetching, including the fetch itself, happen asynchronously and are otherwise difficult to test deterministically. Internally, this changes the `requestInFlight` from a Boolean to a Promise, though that's an implementation detail which should go unnoticed. --- .../src/agent.ts | 36 ++++++++++++------- 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/agent.ts b/packages/apollo-server-plugin-operation-registry/src/agent.ts index bb1b8a2794e..b258af0a574 100644 --- a/packages/apollo-server-plugin-operation-registry/src/agent.ts +++ b/packages/apollo-server-plugin-operation-registry/src/agent.ts @@ -33,7 +33,7 @@ type SignatureStore = Set; export default class Agent { private timer?: NodeJS.Timer; private hashedServiceId?: string; - private requestInFlight: boolean = false; + private requestInFlight: Promise | null = null; private lastSuccessfulCheck?: Date; private lastSuccessfulETag?: string; private lastOperationSignatures: SignatureStore = new Set(); @@ -54,6 +54,10 @@ export default class Agent { } } + async requestPending() { + return this.requestInFlight; + } + private getHashedServiceId(): string { return (this.hashedServiceId = this.hashedServiceId || @@ -199,22 +203,30 @@ export default class Agent { // Don't check again if we're already in-flight. if (this.requestInFlight) { - return; + return this.requestInFlight; } - try { - // Prevent other requests from crossing paths. - this.requestInFlight = true; + const promise = Promise.resolve(); + + // Prevent other requests from crossing paths. + this.requestInFlight = promise; - // If tryUpdate returns true, we can consider this a success. - if (await this.tryUpdate()) { + const resetRequestInFlight = () => (this.requestInFlight = null); + + return promise + .then(() => this.tryUpdate()) + .then(result => { // Mark this for reporting and monitoring reasons. this.lastSuccessfulCheck = new Date(); - } - } finally { - // Always wrap mark ourselves as finished, even in the event of an error. - this.requestInFlight = false; - } + resetRequestInFlight(); + return result; + }) + .catch(err => { + // We don't want to handle any errors, but we do want to erase the + // current Promise reference. + resetRequestInFlight(); + throw err; + }); } public async updateManifest(manifest: OperationManifest) { From 2e993fe72fc8ecf7e70d8ba3e302c79c7f1a4aef Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 16 Oct 2018 18:02:21 +0300 Subject: [PATCH 014/642] (op-reg) Expose a `_timesChecked` property to assist with testing. Knowing, in the most primitive sense possible that the check has been attempted is useful for testing. --- .../apollo-server-plugin-operation-registry/src/agent.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/apollo-server-plugin-operation-registry/src/agent.ts b/packages/apollo-server-plugin-operation-registry/src/agent.ts index b258af0a574..b76307ba4ec 100644 --- a/packages/apollo-server-plugin-operation-registry/src/agent.ts +++ b/packages/apollo-server-plugin-operation-registry/src/agent.ts @@ -35,6 +35,10 @@ export default class Agent { private hashedServiceId?: string; private requestInFlight: Promise | null = null; private lastSuccessfulCheck?: Date; + + // Only exposed for testing. + public _timesChecked: number = 0; + private lastSuccessfulETag?: string; private lastOperationSignatures: SignatureStore = new Set(); private options: AgentOptions = Object.create(null); @@ -133,6 +137,7 @@ export default class Agent { ); this.maybeLog(`Checking for manifest changes at ${manifestUrl}`); + this._timesChecked++; const fetchOptions: RequestInit = { // GET is what we request, but keep in mind that, when we include and get From b193188f7e32d532cec280da863337bf78e81282 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 16 Oct 2018 19:10:50 +0300 Subject: [PATCH 015/642] (op-reg) Switch to Promise-aware loops, even if unnecessary right now. In debugging, it was useful to occasionally `await` the cache operations. I don't believe that we should actually await the cache writes, though that's certainly debatable, but it seemed worth keeping the `for...of` loop, nonetheless. --- .../src/agent.ts | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/agent.ts b/packages/apollo-server-plugin-operation-registry/src/agent.ts index b76307ba4ec..8f1c9c050d0 100644 --- a/packages/apollo-server-plugin-operation-registry/src/agent.ts +++ b/packages/apollo-server-plugin-operation-registry/src/agent.ts @@ -246,12 +246,8 @@ export default class Agent { const incomingOperations: Map = new Map(); const replacementSignatures: SignatureStore = new Set(); - for (const operation of manifest.operations) { - incomingOperations.set(operation.signature, operation.document); - } - - // Loop through each operation in the current manifest. - incomingOperations.forEach((document, signature) => { + for (const { signature, document } of manifest.operations) { + incomingOperations.set(signature, document); // Keep track of each operation in this manifest so we can store it // for comparison after the next fetch. replacementSignatures.add(signature); @@ -264,17 +260,17 @@ export default class Agent { this.maybeLog(`Incoming manifest ADDs: ${signature}`); this.options.cache.set(getCacheKey(signature), document); } - }); + } // Explicitly purge items which have been removed since our last // successful fetch of the manifest. - this.lastOperationSignatures.forEach(signature => { + for (const signature of this.lastOperationSignatures) { if (!incomingOperations.has(signature)) { // Remove operations which are no longer present. this.maybeLog(`Incoming manifest REMOVEs: ${signature}`); this.options.cache.delete(getCacheKey(signature)); } - }); + } // Save the ones from this fetch, so we know what to remove on the next // actual update. Particularly important since some cache backings might From 111eb0b1e001e51605b9923852e3aecfc7ee7e26 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 16 Oct 2018 19:14:40 +0300 Subject: [PATCH 016/642] (op-reg) Generally improve operation registry tests, again! This introduces a number of utility functions which should be useful for more advanced testing cases and also tests: * failed initial requests * operation purging --- .../src/__tests__/agent.test.ts | 453 +++++++++++++----- 1 file changed, 346 insertions(+), 107 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts index 2a4ef257662..f4de7752b02 100644 --- a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts @@ -3,26 +3,69 @@ import { InMemoryLRUCache, KeyValueCache } from 'apollo-server-caching'; import { envOverrideOperationManifest, getCacheKey } from '../common'; import { resolve as urlResolve } from 'url'; import { createHash } from 'crypto'; +import { AgentOptions } from '../agent'; const fakeBaseUrl = 'https://myfakehost/'; const defaultCache = () => new InMemoryLRUCache(); +const genericSchemaHash = 'abc123'; +const genericServiceID = 'test-service'; +const pollSeconds = 60; + +// Utility function for building the required options to pass to the Agent +// constructor. These can be overridden when necessary, but default to the +// generic options above. const getRequiredAgentOptions = ( { cache = defaultCache(), + schemaHash = genericSchemaHash, + serviceID = genericServiceID, + debug = false, }: { cache?: KeyValueCache; - } = { cache: defaultCache() }, -) => ({ - schemaHash: 'abc123', - engine: { serviceID: 'test-service' }, + schemaHash?: string; + serviceID?: string; + debug?: boolean; + } = { + cache: defaultCache(), + schemaHash: genericSchemaHash, + serviceID: genericServiceID, + debug: false, + }, +): AgentOptions => ({ + schemaHash, + engine: { serviceID }, cache, + pollSeconds, + debug, }); -const hashedServiceId = createHash('sha512') - .update('test-service') - .digest('hex'); +interface ManifestRecord { + signature: string; + document: string; +} + +// These get a bit verbose within the tests below, so we use this as a +// sample store to pick and grab from. +const sampleManifestRecords: Record = { + a: { + signature: + 'ba4573fca2e1491fd54b9f398490531ad6327b00610f2c1216dc8c9c4cfd2993', + document: + 'mutation toggleMovieLike($id:ID!){toggleLike(id:$id){__typename id isLiked}}', + }, + b: { + signature: + '32a21510374c3c9ad25e06424085c45ccde29bdbdedf8fa806c2bc6a2ffcdf56', + document: '{nooks:books{author}}', + }, + c: { + signature: + 'c60ac6dfe19ba70dd9d6a29a275fae56296dcbb636eeaab55c3d9b7287c40a47', + document: '{nooks:books{__typename author}}', + }, +}; describe('Agent', () => { describe('Basic', () => { @@ -46,36 +89,33 @@ describe('Agent', () => { }); }); - interface FetchTests { - originalEnvApolloOpManifestBaseUrl?: string; - Agent: typeof import('../agent').default; - agent: import('../agent').default; - cache: KeyValueCache; - instantiateAndStartAgent: Function; - getOperationManifestUrl: typeof import('../common').getOperationManifestUrl; - } + describe('fetches', () => { + let originalEnvApolloOpManifestBaseUrl: string | undefined; + let Agent: typeof import('../agent').default; + let getOperationManifestUrl: typeof import('../common').getOperationManifestUrl; - describe('fetches', function(this: FetchTests) { beforeAll(() => { // Override the tests URL with the one we want to mock/nock/test. - this.originalEnvApolloOpManifestBaseUrl = + originalEnvApolloOpManifestBaseUrl = process.env[envOverrideOperationManifest]; process.env[envOverrideOperationManifest] = fakeBaseUrl; // Reset the modules so they're ready to be imported. jest.resetModules(); - // Import what we need and store it on the local scope. - this.Agent = require('../agent').default; - this.getOperationManifestUrl = require('../common').getOperationManifestUrl; + // Store these on the local scope after we've reset the modules. + Agent = require('../agent').default; + getOperationManifestUrl = require('../common').getOperationManifestUrl; }); afterAll(() => { // Put the environment overrides back how they were. - if (this.originalEnvApolloOpManifestBaseUrl) { + if (originalEnvApolloOpManifestBaseUrl) { process.env[ envOverrideOperationManifest - ] = this.originalEnvApolloOpManifestBaseUrl; + ] = originalEnvApolloOpManifestBaseUrl; + + originalEnvApolloOpManifestBaseUrl = undefined; } else { delete process.env[envOverrideOperationManifest]; } @@ -85,111 +125,310 @@ describe('Agent', () => { }); it('correctly prepared the test environment', () => { - expect(this.getOperationManifestUrl('abc123', 'def456')).toStrictEqual( + expect(getOperationManifestUrl('abc123', 'def456')).toStrictEqual( urlResolve(fakeBaseUrl, '/abc123/def456'), ); }); describe('manifest checking and cache populating', () => { - const expectedPath = `/${hashedServiceId}/abc123`; - beforeEach(() => { - nock(fakeBaseUrl) - .get(/.*/) - .reply(200, { - version: 1, - operations: [ - { - signature: - 'ba4573fca2e1491fd54b9f398490531ad6327b00610f2c1216dc8c9c4cfd2993', - document: - 'mutation toggleMovieLike($id:ID!){toggleLike(id:$id){__typename id isLiked}}', - }, - { - signature: - '32a21510374c3c9ad25e06424085c45ccde29bdbdedf8fa806c2bc6a2ffcdf56', - document: '{nooks:books{author}}', - }, - { - signature: - 'c60ac6dfe19ba70dd9d6a29a275fae56296dcbb636eeaab55c3d9b7287c40a47', - document: '{nooks:books{__typename author}}', - }, - ], - }); - - this.cache = new InMemoryLRUCache(); - - this.instantiateAndStartAgent = async () => { - this.agent = new this.Agent({ - ...getRequiredAgentOptions({ cache: this.cache }), - debug: true, - }); - return await this.agent.start(); - }; - }); + const forCleanup: { + cache?: KeyValueCache; + agent?: import('../agent').default; + }[] = []; + + function createAgent({ ...args } = {}) { + const options = getRequiredAgentOptions({ ...args }); + + // We never actually let the Agent construct its own default cache + // since we need to pluck the cache out to instrument it with spies. + const cache = options.cache; + const agent = new Agent(options); + + // Save all agents and caches we've created so we can properly + // stop them and clean them up. + forCleanup.push({ agent, cache }); + return agent; + } afterEach(() => { - if (this.agent) this.agent.stop(); + if (!nock.isDone()) { + throw new Error('Not all nock interceptors were used!'); + } + + let toCleanup; + while ((toCleanup = forCleanup.shift())) { + if (toCleanup.agent) { + toCleanup.agent.stop(); + } + } }); - it('fetches the manifest after starting', () => { - const consoleSpy = jest - .spyOn(global.console, 'debug') - .mockImplementation(() => {}); - this.instantiateAndStartAgent(); - expect(consoleSpy).toHaveBeenCalledTimes(1); - expect(consoleSpy).toHaveBeenNthCalledWith( - 1, + // Each nock is good for exactly one request! + function nockGoodManifestABC() { + return nockSuccessfulManifestForServiceAndSchema( + genericServiceID, + genericSchemaHash, + [ + sampleManifestRecords.a, + sampleManifestRecords.b, + sampleManifestRecords.c, + ], + ); + } + + function nockGoodManifestAB() { + return nockSuccessfulManifestForServiceAndSchema( + genericServiceID, + genericSchemaHash, + [sampleManifestRecords.a, sampleManifestRecords.b], + ); + } + + function nockGoodManifestA() { + return nockSuccessfulManifestForServiceAndSchema( + genericServiceID, + genericSchemaHash, + [sampleManifestRecords.a], + ); + } + + function expectCacheSpyOperationEach( + spy: jest.SpyInstance, + letters: string[], + ) { + letters.forEach(letter => { + const { signature, document } = sampleManifestRecords[letter]; + expect(spy).toHaveBeenCalledWith(getCacheKey(signature), document); + }); + } + + async function expectCacheHasOperationEach( + cache: KeyValueCache, + letters: string[], + ) { + for (const letter of letters) { + const { signature, document } = sampleManifestRecords[letter]; + await expect( + cache.get(getCacheKey(signature)), + ).resolves.toStrictEqual(document); + } + } + + it('logs debug updates to the manifest on startup', async () => { + nockGoodManifestABC(); + const consoleDebugMock = (console.debug = jest.fn()); + await createAgent({ debug: true }).start(); + + expect(consoleDebugMock.mock.calls[0][0]).toBe( `Checking for manifest changes at ${urlResolve( fakeBaseUrl, - expectedPath, + pathForServiceAndSchema(genericServiceID, genericSchemaHash), )}`, ); - consoleSpy.mockRestore(); + + // Console should indicate the records have been added in order. + expect(consoleDebugMock.mock.calls[1][0]).toBe( + `Incoming manifest ADDs: ${sampleManifestRecords.a.signature}`, + ); + expect(consoleDebugMock.mock.calls[2][0]).toBe( + `Incoming manifest ADDs: ${sampleManifestRecords.b.signature}`, + ); + expect(consoleDebugMock.mock.calls[3][0]).toBe( + `Incoming manifest ADDs: ${sampleManifestRecords.c.signature}`, + ); + + expect(consoleDebugMock.mock.calls.length).toBe(4); + + consoleDebugMock.mockRestore(); }); - it('populates the manifest store', async () => { - const consoleSpy = jest - .spyOn(global.console, 'debug') - .mockImplementation(() => {}); - const cacheSpy = jest.spyOn(this.cache, 'set'); - await this.instantiateAndStartAgent(); + it('populates the manifest store after starting', async () => { + nockGoodManifestABC(); + const cache = defaultCache(); + const cacheSetSpy = jest.spyOn(cache, 'set'); + await createAgent({ cache }).start(); // There are three operations in the manifest above. - expect(cacheSpy).toHaveBeenCalledTimes(3); - - // 1 - expect( - this.cache.get( - getCacheKey( - 'ba4573fca2e1491fd54b9f398490531ad6327b00610f2c1216dc8c9c4cfd2993', - ), - ), - ).resolves.toStrictEqual( - 'mutation toggleMovieLike($id:ID!){toggleLike(id:$id){__typename id isLiked}}', + expect(cacheSetSpy).toHaveBeenCalledTimes(3); + expectCacheSpyOperationEach(cacheSetSpy, ['a', 'b', 'c']); + await expectCacheHasOperationEach(cache, ['a', 'b', 'c']); + + cacheSetSpy.mockRestore(); + }); + + it('starts polling successfully', async () => { + nockGoodManifestABC(); + const cache = defaultCache(); + const cacheSetSpy = jest.spyOn(cache, 'set'); + const cacheDeleteSpy = jest.spyOn(cache, 'delete'); + const agent = createAgent({ cache }); + jest.useFakeTimers(); + await agent.start(); + + // Three additions, no deletions. + expect(cacheSetSpy).toBeCalledTimes(3); + expect(cacheDeleteSpy).toBeCalledTimes(0); + + // Only the initial start-up check should have happened by now. + expect(agent._timesChecked).toBe(1); + + // If it's one millisecond short of our next poll interval, nothing + // should have changed yet. + jest.advanceTimersByTime(pollSeconds * 1000 - 1); + + // Still only one check. + expect(agent._timesChecked).toBe(1); + + // Now, we'll expect another request to go out, so we'll nock it. + nockUnchangedManifestForServiceAndSchema( + genericServiceID, + genericSchemaHash, ); - // 2 - expect( - this.cache.get( - getCacheKey( - '32a21510374c3c9ad25e06424085c45ccde29bdbdedf8fa806c2bc6a2ffcdf56', - ), - ), - ).resolves.toStrictEqual('{nooks:books{author}}'); - - // 3 - expect( - this.cache.get( - getCacheKey( - 'c60ac6dfe19ba70dd9d6a29a275fae56296dcbb636eeaab55c3d9b7287c40a47', - ), - ), - ).resolves.toStrictEqual('{nooks:books{__typename author}}'); - - cacheSpy.mockRestore(); - consoleSpy.mockRestore(); + // If we move forward the last remaining millisecond, we should trigger + // and end up with a successful sync. + jest.advanceTimersByTime(1); + + // While that timer will fire, it will do work async, and we need to + // wait on that work itself. + await agent.requestPending(); + + // Now the times checked should have gone up, and we should log that + // we are looking for an update. Of course, since we're unchanged + // there should be no actual update. + expect(agent._timesChecked).toBe(2); + + expect(cacheSetSpy).toBeCalledTimes(3); + expect(cacheDeleteSpy).toBeCalledTimes(0); + }); + + it('continues polling even after initial failure', async () => { + nockFailedManifestForServiceAndSchema( + genericServiceID, + genericSchemaHash, + ); + const cache = defaultCache(); + const cacheSetSpy = jest.spyOn(cache, 'set'); + const cacheDeleteSpy = jest.spyOn(cache, 'delete'); + const agent = createAgent({ cache }); + jest.useFakeTimers(); + await agent.start(); + + expect(cacheSetSpy).toBeCalledTimes(0); + expect(cacheDeleteSpy).toBeCalledTimes(0); + + // Only the initial start-up check should have happened by now. + expect(agent._timesChecked).toBe(1); + + // If it's one millisecond short of our next poll interval, nothing + // should have changed yet. + jest.advanceTimersByTime(pollSeconds * 1000 - 1); + + // Still only one check. + expect(agent._timesChecked).toBe(1); + + // Now, we'll expect another GOOD request to fulfill, so we'll nock it. + nockGoodManifestABC(); + + // If we move forward the last remaining millisecond, we should trigger + // and end up with a successful sync. + jest.advanceTimersByTime(1); + + // While that timer will fire, it will do work async, and we need to + // wait on that work itself. + await agent.requestPending(); + + // Now the times checked should have gone up. + expect(agent._timesChecked).toBe(2); + expect(cacheSetSpy).toBeCalledTimes(0); + }); + + it('purges operations which are removed from the manifest', async () => { + const cache = defaultCache(); + const cacheSetSpy = jest.spyOn(cache, 'set'); + const cacheDeleteSpy = jest.spyOn(cache, 'delete'); + + // Intentionally not calling start, since we're not testing intervals. + const agent = createAgent({ cache }); + expect(cacheSetSpy).toBeCalledTimes(0); + + nockGoodManifestABC(); // Starting with ABC. + await agent.checkForUpdate(); + expect(agent._timesChecked).toBe(1); + expect(cacheSetSpy).toBeCalledTimes(3); + expect(cacheDeleteSpy).toBeCalledTimes(0); + await expectCacheHasOperationEach(cache, ['a', 'b', 'c']); + + nockGoodManifestAB(); // Just AB in this manifest. + await agent.checkForUpdate(); + expect(agent._timesChecked).toBe(2); + expect(cacheSetSpy).toBeCalledTimes(3); // no new sets. + expect(cacheDeleteSpy).toBeCalledTimes(1); + await expect( + // Ensure that 'C' is gone! + cache.get(getCacheKey(sampleManifestRecords.c.signature)), + ).resolves.toBeUndefined(); + + nockGoodManifestA(); // Just A in this manifest. + await agent.checkForUpdate(); + expect(agent._timesChecked).toBe(3); + expect(cacheSetSpy).toBeCalledTimes(3); // no new sets. + expect(cacheDeleteSpy).toBeCalledTimes(2); // one more deletion + await expect( + // Ensure that 'B' is gone! + cache.get(getCacheKey(sampleManifestRecords.b.signature)), + ).resolves.toBeUndefined(); }); }); }); }); + +function nockBase() { + return nock(fakeBaseUrl); +} + +function nockManifestAtPath(path: string = '') { + return nockBase().get(path); +} + +function hashedServiceId(serviceID: string) { + return createHash('sha512') + .update(serviceID) + .digest('hex'); +} + +function pathForServiceAndSchema(serviceID: string, schemaHash: string) { + return `/${hashedServiceId(serviceID)}/${schemaHash}`; +} + +function nockManifestForServiceAndSchema( + serviceID: string, + schemaHash: string, +) { + return nockManifestAtPath(pathForServiceAndSchema(serviceID, schemaHash)); +} + +function nockSuccessfulManifestForServiceAndSchema( + serviceID: string, + schemaHash: string, + operations: ManifestRecord[], +) { + return nockManifestForServiceAndSchema(serviceID, schemaHash).reply(200, { + version: 1, + operations, + }); +} + +function nockFailedManifestForServiceAndSchema( + serviceID: string, + schemaHash: string, +) { + return nockManifestForServiceAndSchema(serviceID, schemaHash).reply(500); +} + +function nockUnchangedManifestForServiceAndSchema( + serviceID: string, + schemaHash: string, +) { + return nockManifestForServiceAndSchema(serviceID, schemaHash).reply(304); +} From 6328f6dafaa4dd8f9f94b026bb589fa41d068f8e Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 22 Oct 2018 16:29:44 +0300 Subject: [PATCH 017/642] (op-reg) Switch to the more common `pop` and add a comment. I could set the length to zero, but I'd rather not create a new array and stick to the `const`. --- .../src/__tests__/agent.test.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts index f4de7752b02..c2d49bedfa6 100644 --- a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts @@ -156,7 +156,9 @@ describe('Agent', () => { } let toCleanup; - while ((toCleanup = forCleanup.shift())) { + // Loop through the `forCleanup` constant and empty it out by popping + // individual elements off the end and running the appropriate cleanup. + while ((toCleanup = forCleanup.pop())) { if (toCleanup.agent) { toCleanup.agent.stop(); } From acd56d737e714f24b75186f3a2251f4245376551 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 22 Oct 2018 17:13:00 +0300 Subject: [PATCH 018/642] (op-reg) Export the `AgentOptions` type for use. --- packages/apollo-server-plugin-operation-registry/src/agent.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/agent.ts b/packages/apollo-server-plugin-operation-registry/src/agent.ts index 8f1c9c050d0..7cff48db540 100644 --- a/packages/apollo-server-plugin-operation-registry/src/agent.ts +++ b/packages/apollo-server-plugin-operation-registry/src/agent.ts @@ -10,7 +10,7 @@ import { KeyValueCache } from 'apollo-server-caching'; const DEFAULT_POLL_SECONDS: number = 30; const SYNC_WARN_TIME_SECONDS: number = 60; -interface AgentOptions { +export interface AgentOptions { debug?: boolean; pollSeconds?: number; schemaHash: string; From 85359fcf9c0b85e10cee61a37ed9b87e55637eb7 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 5 Nov 2018 17:46:10 -0800 Subject: [PATCH 019/642] Bump version for `apollo-server-plugin-operation-registry` prior to publishing. --- packages/apollo-server-plugin-operation-registry/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/package.json b/packages/apollo-server-plugin-operation-registry/package.json index 60d8d7d1a61..107573c8466 100644 --- a/packages/apollo-server-plugin-operation-registry/package.json +++ b/packages/apollo-server-plugin-operation-registry/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-plugin-operation-registry", - "version": "0.0.1", + "version": "0.0.1-alpha.2", "description": "Apollo Server operation registry", "main": "dist/index.js", "types": "dist/index.d.ts", From 310f3b7298edccb779f808447e20dc30f1ddf87c Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 6 Nov 2018 10:44:42 -0800 Subject: [PATCH 020/642] Merge branch 'master' into HEAD --- .../ApolloServerPluginOperationRegistry.ts | 132 ++++++++---------- ...polloServerPluginOperationRegistry.test.ts | 14 +- .../src/index.ts | 4 +- 3 files changed, 69 insertions(+), 81 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts index ca0fa9145bd..c422ff3678b 100644 --- a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts +++ b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts @@ -15,84 +15,76 @@ interface Options { debug?: boolean; } -export default class ApolloServerPluginOperationRegistry extends ApolloServerPlugin { - private agent?: Agent; - private cache?: KeyValueCache; - private options: Options = Object.create(null); +export default function plugin(options: Options = Object.create(null)) { + let agent: Agent; + let cache: KeyValueCache; - constructor(options?: Options) { - super(); - Object.assign(this.options, options); - } - - // Currently, this method is only called by tests to stop the agent. - public _serverWillStop(): void { - this.agent && this.agent.stop(); - } - - async serverWillStart({ - schema, - engine, - persistedQueries, - }: GraphQLServiceContext): Promise { - assert.ok(schema instanceof GraphQLSchema); - const schemaHash = await generateSchemaHash(schema); + return (): ApolloServerPlugin => ({ + async serverWillStart({ + schema, + engine, + persistedQueries, + }: GraphQLServiceContext): Promise { + assert.ok(schema instanceof GraphQLSchema); + const schemaHash = await generateSchemaHash(schema); - if (!engine || !engine.serviceID) { - throw new Error( - `${pluginName}: The Engine API key must be set to use the operation registry.`, - ); - } + if (!engine || !engine.serviceID) { + throw new Error( + `${pluginName}: The Engine API key must be set to use the operation registry.`, + ); + } - if (!persistedQueries || !persistedQueries.cache) { - throw new Error( - `${pluginName}: Persisted queries must be enabled to use the operation registry.`, - ); - } + if (!persistedQueries || !persistedQueries.cache) { + throw new Error( + `${pluginName}: Persisted queries must be enabled to use the operation registry.`, + ); + } - // We use which ever cache store is in place for persisted queries, be that - // the default in-memory store, or other stateful store resource. - const cache = (this.cache = persistedQueries.cache); + // We currently use which ever store is in place for persisted queries, + // be that the default in-memory store, or other stateful store resource. + // That said, if this backing store ejects items, it should be noted that + // those ejected operations will no longer be permitted! + cache = persistedQueries.cache; - this.agent = new Agent({ - schemaHash, - engine, - cache, - debug: this.options.debug, - }); + agent = new Agent({ + schemaHash, + engine, + cache, + debug: options.debug, + }); - await this.agent.start(); - } + await agent.start(); + }, - requestDidStart(): GraphQLRequestListener { - const plugin = this; - return { - async didResolveOperation({ request: { query }, queryHash }) { - // This shouldn't happen under normal operation since `cache` will be - // set in `serverWillStart` and `requestDidStart` (this) comes after. - if (!plugin.cache) { - throw new Error('Unable to access cache.'); - } + requestDidStart(): GraphQLRequestListener { + return { + async didResolveOperation({ request: { query }, queryHash }) { + // This shouldn't happen under normal operation since `cache` will be + // set in `serverWillStart` and `requestDidStart` (this) comes after. + if (!cache) { + throw new Error('Unable to access cache.'); + } - const hash = query - ? generateOperationHash(query) // If we received a `query`, hash it! - : queryHash; // Otherwise, we'll use the APQ `queryHash`. + const hash = query + ? generateOperationHash(query) // If we received a `query`, hash it! + : queryHash; // Otherwise, we'll use the APQ `queryHash`. - // If the document itself was missing and we didn't receive a - // `queryHash` (the persisted query `sha256Hash` from the APQ - // `extensions`), then we have nothing to work with. - if (!hash) { - throw new ApolloError('No document.'); - } + // If the document itself was missing and we didn't receive a + // `queryHash` (the persisted query `sha256Hash` from the APQ + // `extensions`), then we have nothing to work with. + if (!hash) { + throw new ApolloError('No document.'); + } - // Try to fetch the operation from the cache of operations we're - // currently aware of, which has been populated by the operation - // registry. - const cacheFetch = await plugin.cache.get(getCacheKey(hash)); - if (!cacheFetch) { - throw new ForbiddenError('Execution forbidden'); - } - }, - }; - } + // Try to fetch the operation from the cache of operations we're + // currently aware of, which has been populated by the operation + // registry. + const cacheFetch = await cache.get(getCacheKey(hash)); + if (!cacheFetch) { + throw new ForbiddenError('Execution forbidden'); + } + }, + }; + }, + }); } diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/ApolloServerPluginOperationRegistry.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/ApolloServerPluginOperationRegistry.test.ts index 9618bc3c784..50f3b1b2bfb 100644 --- a/packages/apollo-server-plugin-operation-registry/src/__tests__/ApolloServerPluginOperationRegistry.test.ts +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/ApolloServerPluginOperationRegistry.test.ts @@ -1,17 +1,11 @@ -import ApolloServerPluginOperationRegistry from '../ApolloServerPluginOperationRegistry'; +import plugin from '../ApolloServerPluginOperationRegistry'; describe.only('Operation registry plugin', () => { - it('will instantiate', () => { - expect(new ApolloServerPluginOperationRegistry()).toBeInstanceOf( - ApolloServerPluginOperationRegistry, - ); + it('will instantiate when not called with options', () => { + expect(plugin()()).toHaveProperty('serverWillStart'); }); it('will instantiate with debug enabled', () => { - expect( - new ApolloServerPluginOperationRegistry({ - debug: true, - }), - ).toBeInstanceOf(ApolloServerPluginOperationRegistry); + expect(plugin({ debug: true })()).toHaveProperty('serverWillStart'); }); }); diff --git a/packages/apollo-server-plugin-operation-registry/src/index.ts b/packages/apollo-server-plugin-operation-registry/src/index.ts index 1236ed69122..458120f2c1f 100644 --- a/packages/apollo-server-plugin-operation-registry/src/index.ts +++ b/packages/apollo-server-plugin-operation-registry/src/index.ts @@ -1 +1,3 @@ -export { default } from './ApolloServerPluginOperationRegistry'; +import plugin from './ApolloServerPluginOperationRegistry'; +export default plugin; +module.exports = plugin; From 53f69b89d98a80d6fa238829ba32b9a7773c511f Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 6 Nov 2018 13:56:32 -0800 Subject: [PATCH 021/642] Bump `apollo-server-plugin-operation-registry` to 2.2.0-alpha.3 prior to publishing. --- packages/apollo-server-plugin-operation-registry/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/package.json b/packages/apollo-server-plugin-operation-registry/package.json index 107573c8466..bd561daea95 100644 --- a/packages/apollo-server-plugin-operation-registry/package.json +++ b/packages/apollo-server-plugin-operation-registry/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-plugin-operation-registry", - "version": "0.0.1-alpha.2", + "version": "0.0.1-alpha.3", "description": "Apollo Server operation registry", "main": "dist/index.js", "types": "dist/index.d.ts", From 24ea7c2ace60bdc5889bee46921677a20e4e1fae Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 6 Nov 2018 17:56:08 -0800 Subject: [PATCH 022/642] Bump `apollo-server-plugin-operation-registry` to 2.2.0-alpha.4 prior to publishing. --- packages/apollo-server-plugin-operation-registry/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/package.json b/packages/apollo-server-plugin-operation-registry/package.json index bd561daea95..caad65d676e 100644 --- a/packages/apollo-server-plugin-operation-registry/package.json +++ b/packages/apollo-server-plugin-operation-registry/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-plugin-operation-registry", - "version": "0.0.1-alpha.3", + "version": "0.0.1-alpha.4", "description": "Apollo Server operation registry", "main": "dist/index.js", "types": "dist/index.d.ts", From 8bb51287e4283ee80b04465a51f909a6313945dc Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 6 Nov 2018 18:11:46 -0800 Subject: [PATCH 023/642] Use `schemaHash` as generated by `apollo-server-core`. --- .../src/ApolloServerPluginOperationRegistry.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts index c422ff3678b..4520bacf392 100644 --- a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts +++ b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts @@ -8,7 +8,6 @@ import { import { ForbiddenError, ApolloError } from 'apollo-server-errors'; import Agent from './agent'; import { GraphQLSchema } from 'graphql/type'; -import { generateSchemaHash } from './schema'; import { KeyValueCache } from 'apollo-server-caching'; interface Options { @@ -22,11 +21,11 @@ export default function plugin(options: Options = Object.create(null)) { return (): ApolloServerPlugin => ({ async serverWillStart({ schema, + schemaHash, engine, persistedQueries, }: GraphQLServiceContext): Promise { assert.ok(schema instanceof GraphQLSchema); - const schemaHash = await generateSchemaHash(schema); if (!engine || !engine.serviceID) { throw new Error( From c67a233d8a564513dc3cbf9ac55baa3006ceddae Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 3 Dec 2018 16:48:42 +0200 Subject: [PATCH 024/642] Stop hiding object and list literals during operation signature generation. --- .../src/common.ts | 41 +++++++++++++++---- 1 file changed, 33 insertions(+), 8 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/common.ts b/packages/apollo-server-plugin-operation-registry/src/common.ts index ea2ece49954..c0cede7303a 100644 --- a/packages/apollo-server-plugin-operation-registry/src/common.ts +++ b/packages/apollo-server-plugin-operation-registry/src/common.ts @@ -1,29 +1,54 @@ export const pluginName: string = require('../package.json').name; import { createHash } from 'crypto'; -import { parse } from 'graphql/language'; +import { parse } from 'graphql/language/parser'; +import { visit } from 'graphql/language/visitor'; import { - hideLiterals, - printWithReducedWhitespace, - sortAST, -} from 'apollo-engine-reporting'; + DocumentNode, + IntValueNode, + FloatValueNode, + StringValueNode, +} from 'graphql/language/ast'; +import { printWithReducedWhitespace, sortAST } from 'apollo-engine-reporting'; export const envOverrideOperationManifest = 'APOLLO_OPERATION_MANIFEST_BASE_URL'; +// DUPLICATED FROM https://github.com/apollographql/apollo-tooling/blob/d7429b80/packages/apollo/src/commands/client/push.ts#L29-L48 +// In the same spirit as the similarly named `hideLiterals` function from the +// `apollo-engine-reporting/src/signature.ts` module, we'll do an AST visit +// to redact literals. Developers are strongly encouraged to use the +// `variables` aspect of the which would avoid these being explicitly +// present in the operation manifest at all. The primary area of concern here +// is to avoid sending in-lined literals which might contain sensitive +// information (e.g. API keys, etc.). +export function hideCertainLiterals(ast: DocumentNode): DocumentNode { + return visit(ast, { + IntValue(node: IntValueNode): IntValueNode { + return { ...node, value: '0' }; + }, + FloatValue(node: FloatValueNode): FloatValueNode { + return { ...node, value: '0' }; + }, + StringValue(node: StringValueNode): StringValueNode { + return { ...node, value: '', block: false }; + }, + }); +} + // XXX This function is not currently invoked when the hashed APQ value // (`extensions.persistedQuery.sha256Hash`) is set, but would // be called if we're provided a (string) `query` (so when APQ is a miss, // or not enabled at all). // -// Since the `hideLiterals` and `sortAST` methods both require a +// Since the `hideCertainLiterals` and `sortAST` methods both require a // `DocumentNode`, we'll have to call a `parse` here on the `query` string // and make the necessary transformations. // -// Lastly, we will remove the `hideLiterals` portion of this once the +// Lastly, we will remove the `hideCertainLiterals` portion of this once the // `apollo` CLI properly warns about including/using string literals. function formatOperationForHashing(operation: string): string { return printWithReducedWhitespace( - sortAST(hideLiterals(parse(operation))), + sortAST(hideCertainLiterals(parse(operation))), ).trim(); } From eff44a03653a1452fd50d02c17144bc6e3d8c05a Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 15 Jan 2019 15:38:47 +0200 Subject: [PATCH 025/642] (opreg) Switch to `fast-json-stable-stringify`, same as #2065 / ccba8c87. I've switched this to the same library used by the main repository for consistency and licensing purposes. The local depdendency by the operation registry will actually go away in a future update now that it's supported by the core server implementation. --- packages/apollo-server-plugin-operation-registry/package.json | 2 +- packages/apollo-server-plugin-operation-registry/src/schema.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/package.json b/packages/apollo-server-plugin-operation-registry/package.json index caad65d676e..6c1e4f23636 100644 --- a/packages/apollo-server-plugin-operation-registry/package.json +++ b/packages/apollo-server-plugin-operation-registry/package.json @@ -15,7 +15,7 @@ "apollo-server-caching": "file:../apollo-server-caching", "apollo-server-errors": "file:../apollo-server-errors", "apollo-server-plugin-base": "file:../apollo-server-plugin-base", - "json-stable-stringify": "1.0.1", + "fast-json-stable-stringify": "2.0.0", "node-fetch": "2.2.0" }, "peerDependencies": { diff --git a/packages/apollo-server-plugin-operation-registry/src/schema.ts b/packages/apollo-server-plugin-operation-registry/src/schema.ts index 6a32e606d70..4b858567948 100644 --- a/packages/apollo-server-plugin-operation-registry/src/schema.ts +++ b/packages/apollo-server-plugin-operation-registry/src/schema.ts @@ -2,7 +2,7 @@ import { pluginName } from './common'; import { parse } from 'graphql/language'; import { execute, ExecutionResult } from 'graphql/execution'; import { getIntrospectionQuery, IntrospectionSchema } from 'graphql/utilities'; -import stableStringify from 'json-stable-stringify'; +import stableStringify from 'fast-json-stable-stringify'; import { GraphQLSchema } from 'graphql/type'; import { createHash } from 'crypto'; From ce92dc48b6f69bdf8dcb75825e8c288ce2801999 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 3 Dec 2018 18:17:24 +0200 Subject: [PATCH 026/642] (op-reg): Enable better logging facilities via `loglevel` package. --- .../package.json | 1 + .../ApolloServerPluginOperationRegistry.ts | 49 +++++++++++++++---- .../src/__tests__/agent.test.ts | 35 ++++++++----- .../src/agent.ts | 26 +++++----- 4 files changed, 77 insertions(+), 34 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/package.json b/packages/apollo-server-plugin-operation-registry/package.json index 6c1e4f23636..ec5a3ea5fc5 100644 --- a/packages/apollo-server-plugin-operation-registry/package.json +++ b/packages/apollo-server-plugin-operation-registry/package.json @@ -16,6 +16,7 @@ "apollo-server-errors": "file:../apollo-server-errors", "apollo-server-plugin-base": "file:../apollo-server-plugin-base", "fast-json-stable-stringify": "2.0.0", + "loglevel": "1.6.1", "node-fetch": "2.2.0" }, "peerDependencies": { diff --git a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts index 4520bacf392..756cf2f0417 100644 --- a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts +++ b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts @@ -9,6 +9,7 @@ import { ForbiddenError, ApolloError } from 'apollo-server-errors'; import Agent from './agent'; import { GraphQLSchema } from 'graphql/type'; import { KeyValueCache } from 'apollo-server-caching'; +import loglevel from 'loglevel'; interface Options { debug?: boolean; @@ -18,6 +19,14 @@ export default function plugin(options: Options = Object.create(null)) { let agent: Agent; let cache: KeyValueCache; + // Setup logging facilities, scoped under the appropriate name. + const logger = loglevel.getLogger(`apollo-server:${pluginName}`); + + // Enable debugging if the `debug` option is true. + if (options.debug === true) { + logger.enableAll(); + } + return (): ApolloServerPlugin => ({ async serverWillStart({ schema, @@ -25,18 +34,27 @@ export default function plugin(options: Options = Object.create(null)) { engine, persistedQueries, }: GraphQLServiceContext): Promise { + logger.debug('Initializing operation registry plugin.'); + assert.ok(schema instanceof GraphQLSchema); if (!engine || !engine.serviceID) { - throw new Error( - `${pluginName}: The Engine API key must be set to use the operation registry.`, - ); + const messageEngineConfigurationRequired = + 'The Engine API key must be set to use the operation registry.'; + throw new Error(`${pluginName}: ${messageEngineConfigurationRequired}`); } + logger.debug( + `Operation registry is configured for '${ + engine.serviceID + }'. The schema hash is ${schemaHash}.`, + ); + if (!persistedQueries || !persistedQueries.cache) { - throw new Error( - `${pluginName}: Persisted queries must be enabled to use the operation registry.`, - ); + const messagePersistedQueriesRequired = + 'Persisted queries must be enabled to use the operation registry.'; + logger.error(messagePersistedQueriesRequired); + throw new Error(`${pluginName}: ${messagePersistedQueriesRequired}`); } // We currently use which ever store is in place for persisted queries, @@ -45,11 +63,13 @@ export default function plugin(options: Options = Object.create(null)) { // those ejected operations will no longer be permitted! cache = persistedQueries.cache; + logger.debug('Initializing operation registry agent...'); + agent = new Agent({ schemaHash, engine, cache, - debug: options.debug, + logger, }); await agent.start(); @@ -75,13 +95,24 @@ export default function plugin(options: Options = Object.create(null)) { throw new ApolloError('No document.'); } + logger.debug(`Looking up operation in local registry.`); + // Try to fetch the operation from the cache of operations we're // currently aware of, which has been populated by the operation // registry. const cacheFetch = await cache.get(getCacheKey(hash)); - if (!cacheFetch) { - throw new ForbiddenError('Execution forbidden'); + + // If we have a hit, we'll return immediately, signaling that we're + // not intending to block this request. + if (cacheFetch) { + logger.debug(`Permitting operation found in local registry.`); + return; } + + logger.debug( + `Denying operation since it's missing from the local registry.`, + ); + throw new ForbiddenError('Execution forbidden'); }, }; }, diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts index c2d49bedfa6..b63599d0cb7 100644 --- a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts @@ -21,24 +21,22 @@ const getRequiredAgentOptions = ( cache = defaultCache(), schemaHash = genericSchemaHash, serviceID = genericServiceID, - debug = false, + ...addlOptions }: { cache?: KeyValueCache; schemaHash?: string; serviceID?: string; - debug?: boolean; } = { cache: defaultCache(), schemaHash: genericSchemaHash, serviceID: genericServiceID, - debug: false, }, ): AgentOptions => ({ schemaHash, engine: { serviceID }, cache, pollSeconds, - debug, + ...addlOptions, }); interface ManifestRecord { @@ -218,10 +216,21 @@ describe('Agent', () => { it('logs debug updates to the manifest on startup', async () => { nockGoodManifestABC(); - const consoleDebugMock = (console.debug = jest.fn()); - await createAgent({ debug: true }).start(); - - expect(consoleDebugMock.mock.calls[0][0]).toBe( + const relevantLogs: any = []; + const logger = { + debug: jest.fn().mockImplementation((...args: any[]) => { + if ( + typeof args[0] === 'string' && + (args[0].match(/Checking for manifest changes/) || + args[0].match(/Incoming manifest ADDs/)) + ) { + relevantLogs.push(args); + } + }), + }; + await createAgent({ logger }).start(); + + expect(relevantLogs[0][0]).toBe( `Checking for manifest changes at ${urlResolve( fakeBaseUrl, pathForServiceAndSchema(genericServiceID, genericSchemaHash), @@ -229,19 +238,19 @@ describe('Agent', () => { ); // Console should indicate the records have been added in order. - expect(consoleDebugMock.mock.calls[1][0]).toBe( + expect(relevantLogs[1][0]).toBe( `Incoming manifest ADDs: ${sampleManifestRecords.a.signature}`, ); - expect(consoleDebugMock.mock.calls[2][0]).toBe( + expect(relevantLogs[2][0]).toBe( `Incoming manifest ADDs: ${sampleManifestRecords.b.signature}`, ); - expect(consoleDebugMock.mock.calls[3][0]).toBe( + expect(relevantLogs[3][0]).toBe( `Incoming manifest ADDs: ${sampleManifestRecords.c.signature}`, ); - expect(consoleDebugMock.mock.calls.length).toBe(4); + expect(relevantLogs.length).toBe(4); - consoleDebugMock.mockRestore(); + logger.debug.mockRestore(); }); it('populates the manifest store after starting', async () => { diff --git a/packages/apollo-server-plugin-operation-registry/src/agent.ts b/packages/apollo-server-plugin-operation-registry/src/agent.ts index 7cff48db540..f52799a92a3 100644 --- a/packages/apollo-server-plugin-operation-registry/src/agent.ts +++ b/packages/apollo-server-plugin-operation-registry/src/agent.ts @@ -2,8 +2,11 @@ import { getOperationManifestUrl, generateServiceIdHash, getCacheKey, + pluginName, } from './common'; +import loglevel from 'loglevel'; + import fetch, { Response, RequestInit } from 'node-fetch'; import { KeyValueCache } from 'apollo-server-caching'; @@ -11,7 +14,7 @@ const DEFAULT_POLL_SECONDS: number = 30; const SYNC_WARN_TIME_SECONDS: number = 60; export interface AgentOptions { - debug?: boolean; + logger?: loglevel.Logger; pollSeconds?: number; schemaHash: string; engine: any; @@ -32,6 +35,7 @@ type SignatureStore = Set; export default class Agent { private timer?: NodeJS.Timer; + private log: loglevel.Logger; private hashedServiceId?: string; private requestInFlight: Promise | null = null; private lastSuccessfulCheck?: Date; @@ -41,11 +45,13 @@ export default class Agent { private lastSuccessfulETag?: string; private lastOperationSignatures: SignatureStore = new Set(); - private options: AgentOptions = Object.create(null); + private readonly options: AgentOptions = Object.create(null); constructor(options: AgentOptions) { Object.assign(this.options, options); + this.log = this.options.logger || loglevel.getLogger(pluginName); + if (!this.options.schemaHash) { throw new Error('`schemaHash` must be passed to the Agent.'); } @@ -73,6 +79,8 @@ export default class Agent { } async start() { + this.log.debug('Starting operation registry agent...'); + // This is what we'll trigger at a regular interval. const pulse = async () => await this.checkForUpdate(); @@ -124,19 +132,13 @@ export default class Agent { } } - private maybeLog(...args: any[]) { - if (this.options.debug) { - console.debug(...args); - } - } - private async tryUpdate(): Promise { const manifestUrl = getOperationManifestUrl( this.getHashedServiceId(), this.options.schemaHash, ); - this.maybeLog(`Checking for manifest changes at ${manifestUrl}`); + this.log.debug(`Checking for manifest changes at ${manifestUrl}`); this._timesChecked++; const fetchOptions: RequestInit = { @@ -174,7 +176,7 @@ export default class Agent { // no need to do any other work. Returning true indicates that this is // a successful fetch and that we can be assured the manifest is current. if (response.status === 304) { - this.maybeLog( + this.log.debug( 'The published manifest was the same as the previous attempt.', ); return false; @@ -257,7 +259,7 @@ export default class Agent { // for debugging. if (!this.lastOperationSignatures.has(signature)) { // Newly added operation. - this.maybeLog(`Incoming manifest ADDs: ${signature}`); + this.log.debug(`Incoming manifest ADDs: ${signature}`); this.options.cache.set(getCacheKey(signature), document); } } @@ -267,7 +269,7 @@ export default class Agent { for (const signature of this.lastOperationSignatures) { if (!incomingOperations.has(signature)) { // Remove operations which are no longer present. - this.maybeLog(`Incoming manifest REMOVEs: ${signature}`); + this.log.debug(`Incoming manifest REMOVEs: ${signature}`); this.options.cache.delete(getCacheKey(signature)); } } From 857e7bde6bce169e6fa2102d2de989c8f5d1f8bd Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 24 Jan 2019 14:55:33 +0200 Subject: [PATCH 027/642] (op-reg): Utilize `loglevel-debug` to implement `DEBUG=`-like behavior. This way we will still be able to easily toggle the debugging on with an environment variable, much in the same way that the `DEBUG` environment variable behaves in the https://npm.im/debug module. --- .../apollo-server-plugin-operation-registry/package.json | 1 + .../src/ApolloServerPluginOperationRegistry.ts | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/package.json b/packages/apollo-server-plugin-operation-registry/package.json index ec5a3ea5fc5..3bc811f72ac 100644 --- a/packages/apollo-server-plugin-operation-registry/package.json +++ b/packages/apollo-server-plugin-operation-registry/package.json @@ -17,6 +17,7 @@ "apollo-server-plugin-base": "file:../apollo-server-plugin-base", "fast-json-stable-stringify": "2.0.0", "loglevel": "1.6.1", + "loglevel-debug": "0.0.1", "node-fetch": "2.2.0" }, "peerDependencies": { diff --git a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts index 756cf2f0417..c40675a9d87 100644 --- a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts +++ b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts @@ -10,6 +10,7 @@ import Agent from './agent'; import { GraphQLSchema } from 'graphql/type'; import { KeyValueCache } from 'apollo-server-caching'; import loglevel from 'loglevel'; +import loglevelDebug from 'loglevel-debug'; interface Options { debug?: boolean; @@ -22,7 +23,10 @@ export default function plugin(options: Options = Object.create(null)) { // Setup logging facilities, scoped under the appropriate name. const logger = loglevel.getLogger(`apollo-server:${pluginName}`); - // Enable debugging if the `debug` option is true. + // Support DEBUG environment variable, à la https://npm.im/debug/. + loglevelDebug(logger); + + // And also support the `debug` option, if it's truthy. if (options.debug === true) { logger.enableAll(); } From 6dfaeb52f5dd6833379d01619c49c49ef93762f9 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 3 Dec 2018 18:18:12 +0200 Subject: [PATCH 028/642] (op-reg): Introduce `hashForLogging` to prefix log msgs with the op. hash. The actual operation hash is quite long, so it's helpful to have a shortened version for logging purposes. 8 bytes worth should do the trick for _most_ intents and purposes. --- .../src/ApolloServerPluginOperationRegistry.ts | 18 ++++++++++++++---- .../src/common.ts | 7 +++++++ 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts index c40675a9d87..9a81434d042 100644 --- a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts +++ b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts @@ -1,5 +1,10 @@ import * as assert from 'assert'; -import { pluginName, generateOperationHash, getCacheKey } from './common'; +import { + pluginName, + generateOperationHash, + getCacheKey, + hashForLogging, +} from './common'; import { ApolloServerPlugin, GraphQLServiceContext, @@ -99,7 +104,10 @@ export default function plugin(options: Options = Object.create(null)) { throw new ApolloError('No document.'); } - logger.debug(`Looking up operation in local registry.`); + // The hashes are quite long and it seems we can get by with a substr. + const logHash = hashForLogging(hash); + + logger.debug(`${logHash}: Looking up operation in local registry.`); // Try to fetch the operation from the cache of operations we're // currently aware of, which has been populated by the operation @@ -109,12 +117,14 @@ export default function plugin(options: Options = Object.create(null)) { // If we have a hit, we'll return immediately, signaling that we're // not intending to block this request. if (cacheFetch) { - logger.debug(`Permitting operation found in local registry.`); + logger.debug( + `${logHash}: Permitting operation found in local registry.`, + ); return; } logger.debug( - `Denying operation since it's missing from the local registry.`, + `${logHash}: Denying operation since it's missing from the local registry.`, ); throw new ForbiddenError('Execution forbidden'); }, diff --git a/packages/apollo-server-plugin-operation-registry/src/common.ts b/packages/apollo-server-plugin-operation-registry/src/common.ts index c0cede7303a..03924c0ff5c 100644 --- a/packages/apollo-server-plugin-operation-registry/src/common.ts +++ b/packages/apollo-server-plugin-operation-registry/src/common.ts @@ -82,3 +82,10 @@ export function getOperationManifestUrl( ): string { return [urlOperationManifestBase, hashedServiceId, schemaHash].join('/'); } + +export function hashForLogging(hash: string): string { + if (typeof hash !== 'string') { + return ''; + } + return hash.substring(0, 8); +} From 8299284b1dc4a0c0ae28a332d81e103d7ad4e22a Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Fri, 25 Jan 2019 19:14:47 +0200 Subject: [PATCH 029/642] (op-reg): Also rename `log` => `logger` in the Agent. --- .../src/agent.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/agent.ts b/packages/apollo-server-plugin-operation-registry/src/agent.ts index f52799a92a3..b9e810e460f 100644 --- a/packages/apollo-server-plugin-operation-registry/src/agent.ts +++ b/packages/apollo-server-plugin-operation-registry/src/agent.ts @@ -35,7 +35,7 @@ type SignatureStore = Set; export default class Agent { private timer?: NodeJS.Timer; - private log: loglevel.Logger; + private logger: loglevel.Logger; private hashedServiceId?: string; private requestInFlight: Promise | null = null; private lastSuccessfulCheck?: Date; @@ -50,7 +50,7 @@ export default class Agent { constructor(options: AgentOptions) { Object.assign(this.options, options); - this.log = this.options.logger || loglevel.getLogger(pluginName); + this.logger = this.options.logger || loglevel.getLogger(pluginName); if (!this.options.schemaHash) { throw new Error('`schemaHash` must be passed to the Agent.'); @@ -79,7 +79,7 @@ export default class Agent { } async start() { - this.log.debug('Starting operation registry agent...'); + this.logger.debug('Starting operation registry agent...'); // This is what we'll trigger at a regular interval. const pulse = async () => await this.checkForUpdate(); @@ -138,7 +138,7 @@ export default class Agent { this.options.schemaHash, ); - this.log.debug(`Checking for manifest changes at ${manifestUrl}`); + this.logger.debug(`Checking for manifest changes at ${manifestUrl}`); this._timesChecked++; const fetchOptions: RequestInit = { @@ -176,7 +176,7 @@ export default class Agent { // no need to do any other work. Returning true indicates that this is // a successful fetch and that we can be assured the manifest is current. if (response.status === 304) { - this.log.debug( + this.logger.debug( 'The published manifest was the same as the previous attempt.', ); return false; @@ -259,7 +259,7 @@ export default class Agent { // for debugging. if (!this.lastOperationSignatures.has(signature)) { // Newly added operation. - this.log.debug(`Incoming manifest ADDs: ${signature}`); + this.logger.debug(`Incoming manifest ADDs: ${signature}`); this.options.cache.set(getCacheKey(signature), document); } } @@ -269,7 +269,7 @@ export default class Agent { for (const signature of this.lastOperationSignatures) { if (!incomingOperations.has(signature)) { // Remove operations which are no longer present. - this.log.debug(`Incoming manifest REMOVEs: ${signature}`); + this.logger.debug(`Incoming manifest REMOVEs: ${signature}`); this.options.cache.delete(getCacheKey(signature)); } } From 92a01d270b3db0b840064814a52a02529d047f4d Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Fri, 25 Jan 2019 20:52:11 +0200 Subject: [PATCH 030/642] (op-reg): Rename "cache" references to "store". --- .../ApolloServerPluginOperationRegistry.ts | 20 ++-- .../src/__tests__/agent.test.ts | 108 +++++++++--------- .../src/__tests__/common.test.ts | 2 +- .../src/agent.ts | 8 +- .../src/common.ts | 2 +- 5 files changed, 70 insertions(+), 70 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts index 9a81434d042..ba969049794 100644 --- a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts +++ b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts @@ -2,7 +2,7 @@ import * as assert from 'assert'; import { pluginName, generateOperationHash, - getCacheKey, + getStoreKey, hashForLogging, } from './common'; import { @@ -23,7 +23,7 @@ interface Options { export default function plugin(options: Options = Object.create(null)) { let agent: Agent; - let cache: KeyValueCache; + let store: KeyValueCache; // Setup logging facilities, scoped under the appropriate name. const logger = loglevel.getLogger(`apollo-server:${pluginName}`); @@ -70,14 +70,14 @@ export default function plugin(options: Options = Object.create(null)) { // be that the default in-memory store, or other stateful store resource. // That said, if this backing store ejects items, it should be noted that // those ejected operations will no longer be permitted! - cache = persistedQueries.cache; + store = persistedQueries.cache; logger.debug('Initializing operation registry agent...'); agent = new Agent({ schemaHash, engine, - cache, + store, logger, }); @@ -87,10 +87,10 @@ export default function plugin(options: Options = Object.create(null)) { requestDidStart(): GraphQLRequestListener { return { async didResolveOperation({ request: { query }, queryHash }) { - // This shouldn't happen under normal operation since `cache` will be + // This shouldn't happen under normal operation since `store` will be // set in `serverWillStart` and `requestDidStart` (this) comes after. - if (!cache) { - throw new Error('Unable to access cache.'); + if (!store) { + throw new Error('Unable to access store.'); } const hash = query @@ -109,14 +109,14 @@ export default function plugin(options: Options = Object.create(null)) { logger.debug(`${logHash}: Looking up operation in local registry.`); - // Try to fetch the operation from the cache of operations we're + // Try to fetch the operation from the store of operations we're // currently aware of, which has been populated by the operation // registry. - const cacheFetch = await cache.get(getCacheKey(hash)); + const storeFetch = await store.get(getStoreKey(hash)); // If we have a hit, we'll return immediately, signaling that we're // not intending to block this request. - if (cacheFetch) { + if (storeFetch) { logger.debug( `${logHash}: Permitting operation found in local registry.`, ); diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts index b63599d0cb7..8b3acbdface 100644 --- a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts @@ -1,13 +1,13 @@ import nock from 'nock'; import { InMemoryLRUCache, KeyValueCache } from 'apollo-server-caching'; -import { envOverrideOperationManifest, getCacheKey } from '../common'; +import { envOverrideOperationManifest, getStoreKey } from '../common'; import { resolve as urlResolve } from 'url'; import { createHash } from 'crypto'; import { AgentOptions } from '../agent'; const fakeBaseUrl = 'https://myfakehost/'; -const defaultCache = () => new InMemoryLRUCache(); +const defaultStore = () => new InMemoryLRUCache(); const genericSchemaHash = 'abc123'; const genericServiceID = 'test-service'; @@ -18,23 +18,23 @@ const pollSeconds = 60; // generic options above. const getRequiredAgentOptions = ( { - cache = defaultCache(), + store = defaultStore(), schemaHash = genericSchemaHash, serviceID = genericServiceID, ...addlOptions }: { - cache?: KeyValueCache; + store?: KeyValueCache; schemaHash?: string; serviceID?: string; } = { - cache: defaultCache(), + store: defaultStore(), schemaHash: genericSchemaHash, serviceID: genericServiceID, }, ): AgentOptions => ({ schemaHash, engine: { serviceID }, - cache, + store, pollSeconds, ...addlOptions, }); @@ -128,23 +128,23 @@ describe('Agent', () => { ); }); - describe('manifest checking and cache populating', () => { + describe('manifest checking and store populating', () => { const forCleanup: { - cache?: KeyValueCache; + store?: KeyValueCache; agent?: import('../agent').default; }[] = []; function createAgent({ ...args } = {}) { const options = getRequiredAgentOptions({ ...args }); - // We never actually let the Agent construct its own default cache - // since we need to pluck the cache out to instrument it with spies. - const cache = options.cache; + // We never actually let the Agent construct its own default store + // since we need to pluck the store out to instrument it with spies. + const store = options.store; const agent = new Agent(options); - // Save all agents and caches we've created so we can properly + // Save all agents and stores we've created so we can properly // stop them and clean them up. - forCleanup.push({ agent, cache }); + forCleanup.push({ agent, store }); return agent; } @@ -192,24 +192,24 @@ describe('Agent', () => { ); } - function expectCacheSpyOperationEach( + function expectStoreSpyOperationEach( spy: jest.SpyInstance, letters: string[], ) { letters.forEach(letter => { const { signature, document } = sampleManifestRecords[letter]; - expect(spy).toHaveBeenCalledWith(getCacheKey(signature), document); + expect(spy).toHaveBeenCalledWith(getStoreKey(signature), document); }); } - async function expectCacheHasOperationEach( - cache: KeyValueCache, + async function expectStoreHasOperationEach( + store: KeyValueCache, letters: string[], ) { for (const letter of letters) { const { signature, document } = sampleManifestRecords[letter]; await expect( - cache.get(getCacheKey(signature)), + store.get(getStoreKey(signature)), ).resolves.toStrictEqual(document); } } @@ -255,30 +255,30 @@ describe('Agent', () => { it('populates the manifest store after starting', async () => { nockGoodManifestABC(); - const cache = defaultCache(); - const cacheSetSpy = jest.spyOn(cache, 'set'); - await createAgent({ cache }).start(); + const store = defaultStore(); + const storeSetSpy = jest.spyOn(store, 'set'); + await createAgent({ store }).start(); // There are three operations in the manifest above. - expect(cacheSetSpy).toHaveBeenCalledTimes(3); - expectCacheSpyOperationEach(cacheSetSpy, ['a', 'b', 'c']); - await expectCacheHasOperationEach(cache, ['a', 'b', 'c']); + expect(storeSetSpy).toHaveBeenCalledTimes(3); + expectStoreSpyOperationEach(storeSetSpy, ['a', 'b', 'c']); + await expectStoreHasOperationEach(store, ['a', 'b', 'c']); - cacheSetSpy.mockRestore(); + storeSetSpy.mockRestore(); }); it('starts polling successfully', async () => { nockGoodManifestABC(); - const cache = defaultCache(); - const cacheSetSpy = jest.spyOn(cache, 'set'); - const cacheDeleteSpy = jest.spyOn(cache, 'delete'); - const agent = createAgent({ cache }); + const store = defaultStore(); + const storeSetSpy = jest.spyOn(store, 'set'); + const storeDeleteSpy = jest.spyOn(store, 'delete'); + const agent = createAgent({ store }); jest.useFakeTimers(); await agent.start(); // Three additions, no deletions. - expect(cacheSetSpy).toBeCalledTimes(3); - expect(cacheDeleteSpy).toBeCalledTimes(0); + expect(storeSetSpy).toBeCalledTimes(3); + expect(storeDeleteSpy).toBeCalledTimes(0); // Only the initial start-up check should have happened by now. expect(agent._timesChecked).toBe(1); @@ -309,8 +309,8 @@ describe('Agent', () => { // there should be no actual update. expect(agent._timesChecked).toBe(2); - expect(cacheSetSpy).toBeCalledTimes(3); - expect(cacheDeleteSpy).toBeCalledTimes(0); + expect(storeSetSpy).toBeCalledTimes(3); + expect(storeDeleteSpy).toBeCalledTimes(0); }); it('continues polling even after initial failure', async () => { @@ -318,15 +318,15 @@ describe('Agent', () => { genericServiceID, genericSchemaHash, ); - const cache = defaultCache(); - const cacheSetSpy = jest.spyOn(cache, 'set'); - const cacheDeleteSpy = jest.spyOn(cache, 'delete'); - const agent = createAgent({ cache }); + const store = defaultStore(); + const storeSetSpy = jest.spyOn(store, 'set'); + const storeDeleteSpy = jest.spyOn(store, 'delete'); + const agent = createAgent({ store }); jest.useFakeTimers(); await agent.start(); - expect(cacheSetSpy).toBeCalledTimes(0); - expect(cacheDeleteSpy).toBeCalledTimes(0); + expect(storeSetSpy).toBeCalledTimes(0); + expect(storeDeleteSpy).toBeCalledTimes(0); // Only the initial start-up check should have happened by now. expect(agent._timesChecked).toBe(1); @@ -351,43 +351,43 @@ describe('Agent', () => { // Now the times checked should have gone up. expect(agent._timesChecked).toBe(2); - expect(cacheSetSpy).toBeCalledTimes(0); + expect(storeSetSpy).toBeCalledTimes(0); }); it('purges operations which are removed from the manifest', async () => { - const cache = defaultCache(); - const cacheSetSpy = jest.spyOn(cache, 'set'); - const cacheDeleteSpy = jest.spyOn(cache, 'delete'); + const store = defaultStore(); + const storeSetSpy = jest.spyOn(store, 'set'); + const storeDeleteSpy = jest.spyOn(store, 'delete'); // Intentionally not calling start, since we're not testing intervals. - const agent = createAgent({ cache }); - expect(cacheSetSpy).toBeCalledTimes(0); + const agent = createAgent({ store }); + expect(storeSetSpy).toBeCalledTimes(0); nockGoodManifestABC(); // Starting with ABC. await agent.checkForUpdate(); expect(agent._timesChecked).toBe(1); - expect(cacheSetSpy).toBeCalledTimes(3); - expect(cacheDeleteSpy).toBeCalledTimes(0); - await expectCacheHasOperationEach(cache, ['a', 'b', 'c']); + expect(storeSetSpy).toBeCalledTimes(3); + expect(storeDeleteSpy).toBeCalledTimes(0); + await expectStoreHasOperationEach(store, ['a', 'b', 'c']); nockGoodManifestAB(); // Just AB in this manifest. await agent.checkForUpdate(); expect(agent._timesChecked).toBe(2); - expect(cacheSetSpy).toBeCalledTimes(3); // no new sets. - expect(cacheDeleteSpy).toBeCalledTimes(1); + expect(storeSetSpy).toBeCalledTimes(3); // no new sets. + expect(storeDeleteSpy).toBeCalledTimes(1); await expect( // Ensure that 'C' is gone! - cache.get(getCacheKey(sampleManifestRecords.c.signature)), + store.get(getStoreKey(sampleManifestRecords.c.signature)), ).resolves.toBeUndefined(); nockGoodManifestA(); // Just A in this manifest. await agent.checkForUpdate(); expect(agent._timesChecked).toBe(3); - expect(cacheSetSpy).toBeCalledTimes(3); // no new sets. - expect(cacheDeleteSpy).toBeCalledTimes(2); // one more deletion + expect(storeSetSpy).toBeCalledTimes(3); // no new sets. + expect(storeDeleteSpy).toBeCalledTimes(2); // one more deletion await expect( // Ensure that 'B' is gone! - cache.get(getCacheKey(sampleManifestRecords.b.signature)), + store.get(getStoreKey(sampleManifestRecords.b.signature)), ).resolves.toBeUndefined(); }); }); diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/common.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/common.test.ts index ed2e80c72f4..685c4deae02 100644 --- a/packages/apollo-server-plugin-operation-registry/src/__tests__/common.test.ts +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/common.test.ts @@ -2,6 +2,6 @@ import * as common from '../common'; describe('common', () => { it('uses the correct cache prefix', () => { - expect(common.getCacheKey('abc123')).toStrictEqual('apq:abc123'); + expect(common.getStoreKey('abc123')).toStrictEqual('apq:abc123'); }); }); diff --git a/packages/apollo-server-plugin-operation-registry/src/agent.ts b/packages/apollo-server-plugin-operation-registry/src/agent.ts index b9e810e460f..8117c263ec0 100644 --- a/packages/apollo-server-plugin-operation-registry/src/agent.ts +++ b/packages/apollo-server-plugin-operation-registry/src/agent.ts @@ -1,7 +1,7 @@ import { getOperationManifestUrl, generateServiceIdHash, - getCacheKey, + getStoreKey, pluginName, } from './common'; @@ -18,7 +18,7 @@ export interface AgentOptions { pollSeconds?: number; schemaHash: string; engine: any; - cache: KeyValueCache; + store: KeyValueCache; } interface Operation { @@ -260,7 +260,7 @@ export default class Agent { if (!this.lastOperationSignatures.has(signature)) { // Newly added operation. this.logger.debug(`Incoming manifest ADDs: ${signature}`); - this.options.cache.set(getCacheKey(signature), document); + this.options.store.set(getStoreKey(signature), document); } } @@ -270,7 +270,7 @@ export default class Agent { if (!incomingOperations.has(signature)) { // Remove operations which are no longer present. this.logger.debug(`Incoming manifest REMOVEs: ${signature}`); - this.options.cache.delete(getCacheKey(signature)); + this.options.store.delete(getStoreKey(signature)); } } diff --git a/packages/apollo-server-plugin-operation-registry/src/common.ts b/packages/apollo-server-plugin-operation-registry/src/common.ts index 03924c0ff5c..9f78d5c8bb1 100644 --- a/packages/apollo-server-plugin-operation-registry/src/common.ts +++ b/packages/apollo-server-plugin-operation-registry/src/common.ts @@ -62,7 +62,7 @@ const urlOperationManifestBase: string = ((): string => { return desiredUrl.replace(/\/$/, ''); })(); -export const getCacheKey = (signature: string) => `apq:${signature}`; +export const getStoreKey = (signature: string) => `apq:${signature}`; export function generateServiceIdHash(serviceId: string): string { return createHash('sha512') From b09a01a548232ff632a02e3041ab7307775c495a Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 24 Jan 2019 15:53:51 +0200 Subject: [PATCH 031/642] (op-reg): Update comment on cache limitations to not be cache-specific. --- packages/apollo-server-plugin-operation-registry/src/agent.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/agent.ts b/packages/apollo-server-plugin-operation-registry/src/agent.ts index 8117c263ec0..177a4bc1368 100644 --- a/packages/apollo-server-plugin-operation-registry/src/agent.ts +++ b/packages/apollo-server-plugin-operation-registry/src/agent.ts @@ -275,8 +275,8 @@ export default class Agent { } // Save the ones from this fetch, so we know what to remove on the next - // actual update. Particularly important since some cache backings might - // not actually let us look this up again. + // actual update. Particularly important since a future distributed + // store might not actually let us look this up again. this.lastOperationSignatures = replacementSignatures; } } From e8ed40bcef196834ac390d5dd1761a89c9c71772 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 24 Jan 2019 16:08:33 +0200 Subject: [PATCH 032/642] (op-reg): Use our own in-memory store, rather than sharing the APQ cache. Allowing the APQ cache to be used is setting up users for failure since the APQ cache can be configured to be distributed. This is less than ideal since a portion of a distributed cache store might go offline rendering operations suddenly unable to be executed, despite being previously valid. Because of the turn over of the manifest checking, it could take a full pass in order to re-populate these, and even that would only happen if the manifest was actually changed (since we check the ETag). --- .../src/ApolloServerPluginOperationRegistry.ts | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts index ba969049794..3ded3c37057 100644 --- a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts +++ b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts @@ -13,7 +13,7 @@ import { import { ForbiddenError, ApolloError } from 'apollo-server-errors'; import Agent from './agent'; import { GraphQLSchema } from 'graphql/type'; -import { KeyValueCache } from 'apollo-server-caching'; +import { KeyValueCache, InMemoryLRUCache } from 'apollo-server-caching'; import loglevel from 'loglevel'; import loglevelDebug from 'loglevel-debug'; @@ -66,11 +66,9 @@ export default function plugin(options: Options = Object.create(null)) { throw new Error(`${pluginName}: ${messagePersistedQueriesRequired}`); } - // We currently use which ever store is in place for persisted queries, - // be that the default in-memory store, or other stateful store resource. - // That said, if this backing store ejects items, it should be noted that - // those ejected operations will no longer be permitted! - store = persistedQueries.cache; + // An LRU store with no `maxSize` is effectively an InMemoryStore and + // exactly what we want for this purpose. + store = new InMemoryLRUCache({ maxSize: Infinity }); logger.debug('Initializing operation registry agent...'); From 29f1d514ebf2a0cfaeb0bbde74b796b199d52eb2 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 24 Jan 2019 15:41:21 +0200 Subject: [PATCH 033/642] (op-reg): Mandate storage be an `InMemoryLRUCache`, not any `KeyValueCache`. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It's important that the operation registry utilize a store that's not subject to ejections, which some distributed cache stores might be. Therefore, this changes the typing requirements of the store to be an `InMemoryLRUCache`, which, when unconfigured, has no ejection configured — despite its name. --- .../src/ApolloServerPluginOperationRegistry.ts | 4 ++-- packages/apollo-server-plugin-operation-registry/src/agent.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts index 3ded3c37057..7aa2bc98f5f 100644 --- a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts +++ b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts @@ -13,7 +13,7 @@ import { import { ForbiddenError, ApolloError } from 'apollo-server-errors'; import Agent from './agent'; import { GraphQLSchema } from 'graphql/type'; -import { KeyValueCache, InMemoryLRUCache } from 'apollo-server-caching'; +import { InMemoryLRUCache } from 'apollo-server-caching'; import loglevel from 'loglevel'; import loglevelDebug from 'loglevel-debug'; @@ -23,7 +23,7 @@ interface Options { export default function plugin(options: Options = Object.create(null)) { let agent: Agent; - let store: KeyValueCache; + let store: InMemoryLRUCache; // Setup logging facilities, scoped under the appropriate name. const logger = loglevel.getLogger(`apollo-server:${pluginName}`); diff --git a/packages/apollo-server-plugin-operation-registry/src/agent.ts b/packages/apollo-server-plugin-operation-registry/src/agent.ts index 177a4bc1368..cb59347a0b3 100644 --- a/packages/apollo-server-plugin-operation-registry/src/agent.ts +++ b/packages/apollo-server-plugin-operation-registry/src/agent.ts @@ -8,7 +8,7 @@ import { import loglevel from 'loglevel'; import fetch, { Response, RequestInit } from 'node-fetch'; -import { KeyValueCache } from 'apollo-server-caching'; +import { InMemoryLRUCache } from 'apollo-server-caching'; const DEFAULT_POLL_SECONDS: number = 30; const SYNC_WARN_TIME_SECONDS: number = 60; @@ -18,7 +18,7 @@ export interface AgentOptions { pollSeconds?: number; schemaHash: string; engine: any; - store: KeyValueCache; + store: InMemoryLRUCache; } interface Operation { From 2d660a95425fa640c52c9376aa8c9292900d9ad0 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Fri, 25 Jan 2019 21:16:26 +0200 Subject: [PATCH 034/642] Avoid re-parsing the query by using the `document` from the request pipeline. Its unfortunate this wasn't already in place, though part of the plugin-to-request-pipeline functionality may have crossed wires with the building of this plugin. Either way, this should be a performance win, _especially_ when used with the `documentStore` (which saves parsed/validated documents) which was introduced in the below-referenced PR. Ref: https://github.com/apollographql/apollo-server/pull/2211 --- .../src/ApolloServerPluginOperationRegistry.ts | 10 ++++------ .../src/common.ts | 9 ++++----- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts index 9a81434d042..f519e24f649 100644 --- a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts +++ b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts @@ -1,7 +1,7 @@ import * as assert from 'assert'; import { pluginName, - generateOperationHash, + generateNormalizedDocumentHash, getCacheKey, hashForLogging, } from './common'; @@ -86,16 +86,14 @@ export default function plugin(options: Options = Object.create(null)) { requestDidStart(): GraphQLRequestListener { return { - async didResolveOperation({ request: { query }, queryHash }) { - // This shouldn't happen under normal operation since `cache` will be + async didResolveOperation({ document }) { + // This shouldn't happen under normal operation since `store` will be // set in `serverWillStart` and `requestDidStart` (this) comes after. if (!cache) { throw new Error('Unable to access cache.'); } - const hash = query - ? generateOperationHash(query) // If we received a `query`, hash it! - : queryHash; // Otherwise, we'll use the APQ `queryHash`. + const hash = generateNormalizedDocumentHash(document); // If the document itself was missing and we didn't receive a // `queryHash` (the persisted query `sha256Hash` from the APQ diff --git a/packages/apollo-server-plugin-operation-registry/src/common.ts b/packages/apollo-server-plugin-operation-registry/src/common.ts index 03924c0ff5c..cfadeee6dd7 100644 --- a/packages/apollo-server-plugin-operation-registry/src/common.ts +++ b/packages/apollo-server-plugin-operation-registry/src/common.ts @@ -1,6 +1,5 @@ export const pluginName: string = require('../package.json').name; import { createHash } from 'crypto'; -import { parse } from 'graphql/language/parser'; import { visit } from 'graphql/language/visitor'; import { DocumentNode, @@ -46,9 +45,9 @@ export function hideCertainLiterals(ast: DocumentNode): DocumentNode { // // Lastly, we will remove the `hideCertainLiterals` portion of this once the // `apollo` CLI properly warns about including/using string literals. -function formatOperationForHashing(operation: string): string { +function formatDocumentForHashing(document: DocumentNode): string { return printWithReducedWhitespace( - sortAST(hideCertainLiterals(parse(operation))), + sortAST(hideCertainLiterals(document)), ).trim(); } @@ -70,9 +69,9 @@ export function generateServiceIdHash(serviceId: string): string { .digest('hex'); } -export function generateOperationHash(operationString: string): string { +export function generateNormalizedDocumentHash(document: DocumentNode): string { return createHash('sha256') - .update(formatOperationForHashing(operationString)) + .update(formatDocumentForHashing(document)) .digest('hex'); } From 5eb3cf763bedc17d907e0b5f5756f193a364d64d Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 3 Dec 2018 18:20:17 +0200 Subject: [PATCH 035/642] (op-reg) Only forbid operations if `forbidUnregisteredOperations` is set. Prior to this commit, the mode this variable describes was the default operation for the operation registry plugin. That said, the documentation has already been suggesting that this be set in order to enable this behavior. Having the ability to toggle this behavior is certainly interesting and useful since it helps ease into a full operation manifest mode. While we intend on enabling functionality in Apollo Engine to help guide this transition, for now, the logging facilities (which are improved in recent commits) will allow users to observe the overall behavior of their server in terms of operation execution approval/denial. --- .../src/ApolloServerPluginOperationRegistry.ts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts index 9b12cc1a87f..de0d731216a 100644 --- a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts +++ b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts @@ -19,6 +19,7 @@ import loglevelDebug from 'loglevel-debug'; interface Options { debug?: boolean; + forbidUnregisteredOperations?: boolean; } export default function plugin(options: Options = Object.create(null)) { @@ -119,6 +120,12 @@ export default function plugin(options: Options = Object.create(null)) { return; } + // If the forbidding of operations isn't enabled, we can just return + // since this will only be used for stats. + if (!options.forbidUnregisteredOperations) { + logger.debug(`${logHash}: Not found in local registry. Denying.`); + } + logger.debug( `${logHash}: Denying operation since it's missing from the local registry.`, ); From 48d26ed55b8dbadbc8f151b448385f40a3cc8d42 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 3 Dec 2018 18:10:57 +0200 Subject: [PATCH 036/642] (op-reg): Apply `Object.freeze` to `options` during plugin setup. --- .../src/ApolloServerPluginOperationRegistry.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts index 9b12cc1a87f..03e92e2c249 100644 --- a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts +++ b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts @@ -36,6 +36,11 @@ export default function plugin(options: Options = Object.create(null)) { logger.enableAll(); } + // Options shouldn't be changed after the plugin has been initiated. + // If this proves to be necessary in the future, we can relax this at that + // time depending on the usecase. + Object.freeze(options); + return (): ApolloServerPlugin => ({ async serverWillStart({ schema, From 63e0aad3922c98ff8ea70c84c696cbbbe88d3d51 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 28 Jan 2019 14:36:08 +0200 Subject: [PATCH 037/642] Revert "op-reg: Only forbid operations if `forbidUnregisteredOperations` is set." --- .../src/ApolloServerPluginOperationRegistry.ts | 7 ------- 1 file changed, 7 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts index 4ba6ed2ccd8..03e92e2c249 100644 --- a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts +++ b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts @@ -19,7 +19,6 @@ import loglevelDebug from 'loglevel-debug'; interface Options { debug?: boolean; - forbidUnregisteredOperations?: boolean; } export default function plugin(options: Options = Object.create(null)) { @@ -125,12 +124,6 @@ export default function plugin(options: Options = Object.create(null)) { return; } - // If the forbidding of operations isn't enabled, we can just return - // since this will only be used for stats. - if (!options.forbidUnregisteredOperations) { - logger.debug(`${logHash}: Not found in local registry. Denying.`); - } - logger.debug( `${logHash}: Denying operation since it's missing from the local registry.`, ); From 543f2305544043a07799e120e5588d1e31210b31 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 28 Jan 2019 16:23:43 +0200 Subject: [PATCH 038/642] (op-reg) Forbid operations when `forbidUnregisteredOperations` is enabled. This re-lands 956c8f02bc913afe355f40e9179041167a9b8267 which was a work-in-progress commit which added logging at the correct places, but stopped short of actual enforcement. Prior to this new functionality, unregistered operations were forbidden by default, even if the `forbidUnregisteredOperations` variable which this commit (now) implements was `true` or not. The documentation for the operation registry plugin has always stated that this parameter must be set in order to enable this behavior, so this shouldn't be interpreted as a breaking change - particularly since the previous behavior was an `alpha` release on a pre-1.x version. This commit makes the implementation more flexible by allowing incremental adoption of operation safe-listing since it allows the plugin to be installed and the enforcement operation to be observed via logging (immediately) and hopefully soon via Apollo Engine. Finally, for servers that need to selectively enable enforcement, the `forbidUnregisteredOperations` parameter accepts a predicate function which receives the request's `GraphQLRequestContext` as the first parameter. This will allow implementers to selectively disable the enforcement when, for example, a header is present that identifies the requester as a "super-user" (or other authorized user who is not subject to operation safe-listing). For example: ``` require("apollo-server-plugin-operation-registry")({ // De-structure the request context to get the `headers` map. forbidUnregisteredOperations({ request: { http: { headers } } }) { // If the magic header is in place, allow any unregistered operation. // Of course, additional validation is possible! if (headers.get('x-let-me-in')) { return false; } // Otherwise, enforce it. return true; } }) ``` --- .../ApolloServerPluginOperationRegistry.ts | 69 +++++++++++++++++-- 1 file changed, 63 insertions(+), 6 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts index 4ba6ed2ccd8..81c761220b1 100644 --- a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts +++ b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts @@ -9,6 +9,7 @@ import { ApolloServerPlugin, GraphQLServiceContext, GraphQLRequestListener, + GraphQLRequestContext, } from 'apollo-server-plugin-base'; import { ForbiddenError, ApolloError } from 'apollo-server-errors'; import Agent from './agent'; @@ -17,9 +18,15 @@ import { InMemoryLRUCache } from 'apollo-server-caching'; import loglevel from 'loglevel'; import loglevelDebug from 'loglevel-debug'; +type ForbidUnregisteredOperationsPredicate = ( + requestContext: GraphQLRequestContext, +) => boolean; + interface Options { debug?: boolean; - forbidUnregisteredOperations?: boolean; + forbidUnregisteredOperations?: + | boolean + | ForbidUnregisteredOperationsPredicate; } export default function plugin(options: Options = Object.create(null)) { @@ -90,7 +97,8 @@ export default function plugin(options: Options = Object.create(null)) { requestDidStart(): GraphQLRequestListener { return { - async didResolveOperation({ document }) { + async didResolveOperation(requestContext) { + const document = requestContext.document; // This shouldn't happen under normal operation since `store` will be // set in `serverWillStart` and `requestDidStart` (this) comes after. if (!store) { @@ -125,16 +133,65 @@ export default function plugin(options: Options = Object.create(null)) { return; } + // If the `forbidUnregisteredOperations` option is set explicitly to + // a boolean option, we'll use that option as the default. In the + // event that it is instead a predicate function (which can return + // true or false dynamically based on, for example, the context) then + // we will default to `true` and let the execution of the function + // decide whether not it should be disabled based on an explicit + // return value from the function. In the event of an error, or if + // the function does not return a value, we will fail-safe to + // forbidding unregistered operations. + let forbidUnregisteredOperations: boolean = + typeof options.forbidUnregisteredOperations === 'boolean' + ? options.forbidUnregisteredOperations + : typeof options.forbidUnregisteredOperations !== 'undefined'; + + if (typeof options.forbidUnregisteredOperations === 'function') { + logger.debug( + `${logHash}: Calling 'forbidUnregisteredOperations' predicate function with requestContext...`, + ); + + try { + const predicateResult = options.forbidUnregisteredOperations( + requestContext, + ); + + logger.debug( + `${logHash}: The 'forbidUnregisteredOperations' predicate function returned ${predicateResult}`, + ); + + // If we've received a boolean back from the predicate function, + // we will use that value. However, if we receive no return value + // (indicate a mis-use), then we will resort back to the default + // enforcement mode; an explicit boolean `false` is required to + // disable enforcement when a predicate function is in use. + if (typeof predicateResult === 'boolean') { + forbidUnregisteredOperations = predicateResult; + } + } catch (err) { + // If an error occurs within the forbidUnregisteredOperations + // predicate function, we should assume that the implementor + // had a security-wise intention and remain in enforcement mode. + logger.error( + `${logHash}: An error occurred within the 'forbidUnregisteredOperations' predicate function: ${err}`, + ); + } + } + // If the forbidding of operations isn't enabled, we can just return // since this will only be used for stats. - if (!options.forbidUnregisteredOperations) { - logger.debug(`${logHash}: Not found in local registry. Denying.`); + if (forbidUnregisteredOperations) { + logger.debug( + `${logHash}: Execution denied because 'forbidUnregisteredOperations' was enabled for this request and the operation was not found in the local operation registry.`, + ); + + throw new ForbiddenError('Execution forbidden'); } logger.debug( - `${logHash}: Denying operation since it's missing from the local registry.`, + `${logHash}: Execution permitted because there was no match found in the local operation registry, but 'forbidUnregisteredOperations' was not enabled for this request.`, ); - throw new ForbiddenError('Execution forbidden'); }, }; }, From 3e856c66cf6360fd5a0a003e5981779f3f14716e Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 29 Jan 2019 19:21:30 +0200 Subject: [PATCH 039/642] op-reg: My own editorial on my own debug message. For whatever reason, this sounds better to me now. --- .../src/ApolloServerPluginOperationRegistry.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts index 81c761220b1..671bdbeef2a 100644 --- a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts +++ b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts @@ -190,7 +190,7 @@ export default function plugin(options: Options = Object.create(null)) { } logger.debug( - `${logHash}: Execution permitted because there was no match found in the local operation registry, but 'forbidUnregisteredOperations' was not enabled for this request.`, + `${logHash}: Execution permitted without a matching entry in the local operation registry because 'forbidUnregisteredOperations' was not enabled for this request.`, ); }, }; From 9d6b82a825e118a8b62f668e45cc02cc34970ffe Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 29 Jan 2019 20:35:03 +0200 Subject: [PATCH 040/642] Apply typing suggestions from @martijnwalraven's feedback. I haven't been able to confirm whether this was a win or not though as I'm somewhat suspect that the typing was already inferred in other magical ways. Requesting help! :man-golfing: --- .../src/ApolloServerPluginOperationRegistry.ts | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts index 671bdbeef2a..ad8ae45f1e5 100644 --- a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts +++ b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts @@ -9,7 +9,6 @@ import { ApolloServerPlugin, GraphQLServiceContext, GraphQLRequestListener, - GraphQLRequestContext, } from 'apollo-server-plugin-base'; import { ForbiddenError, ApolloError } from 'apollo-server-errors'; import Agent from './agent'; @@ -18,18 +17,24 @@ import { InMemoryLRUCache } from 'apollo-server-caching'; import loglevel from 'loglevel'; import loglevelDebug from 'loglevel-debug'; -type ForbidUnregisteredOperationsPredicate = ( - requestContext: GraphQLRequestContext, +type FirstArg = F extends (arg: infer A) => any ? A : never; + +export type ForbidUnregisteredOperationsPredicate = ( + requestContext: FirstArg< + GraphQLRequestListener['didResolveOperation'] + >, ) => boolean; -interface Options { +interface Options { debug?: boolean; forbidUnregisteredOperations?: | boolean - | ForbidUnregisteredOperationsPredicate; + | ForbidUnregisteredOperationsPredicate; } -export default function plugin(options: Options = Object.create(null)) { +export default function plugin( + options: Options = Object.create(null), +) { let agent: Agent; let store: InMemoryLRUCache; From 0831e69cca28034697ae62e50d9048198df1b449 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Wed, 30 Jan 2019 13:28:04 +0200 Subject: [PATCH 041/642] Revert "Apply typing suggestions from @martijnwalraven's feedback." (for now). This reverts commit a4e88998636b7e5dd0c3301ea73d6a40016f109d, which we haven't been able to concretely prove has any positive typing benefit (both @martijnwalraven and I are a bit surprised). That said, we don't want to introduce additional typing complexities unnecessarily, but hopefully this commit will serve as an easy reversion (of the reversion!) target if we go in that direction. --- .../src/ApolloServerPluginOperationRegistry.ts | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts index ad8ae45f1e5..671bdbeef2a 100644 --- a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts +++ b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts @@ -9,6 +9,7 @@ import { ApolloServerPlugin, GraphQLServiceContext, GraphQLRequestListener, + GraphQLRequestContext, } from 'apollo-server-plugin-base'; import { ForbiddenError, ApolloError } from 'apollo-server-errors'; import Agent from './agent'; @@ -17,24 +18,18 @@ import { InMemoryLRUCache } from 'apollo-server-caching'; import loglevel from 'loglevel'; import loglevelDebug from 'loglevel-debug'; -type FirstArg = F extends (arg: infer A) => any ? A : never; - -export type ForbidUnregisteredOperationsPredicate = ( - requestContext: FirstArg< - GraphQLRequestListener['didResolveOperation'] - >, +type ForbidUnregisteredOperationsPredicate = ( + requestContext: GraphQLRequestContext, ) => boolean; -interface Options { +interface Options { debug?: boolean; forbidUnregisteredOperations?: | boolean - | ForbidUnregisteredOperationsPredicate; + | ForbidUnregisteredOperationsPredicate; } -export default function plugin( - options: Options = Object.create(null), -) { +export default function plugin(options: Options = Object.create(null)) { let agent: Agent; let store: InMemoryLRUCache; From 7e50c245cb2d5973736222d746bc2e22baa3e17b Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 12 Feb 2019 12:13:23 +0200 Subject: [PATCH 042/642] Accommodate `apollo-server-plugin-operation-registry` with necessary tweaks. The `apollo-server-plugin-operation-registry` was previously a part of a monorepo which was a fork of the `apollo-server` repository which shared all the common packages of that repository, in addition to hosting its own `apollo-server-plugin-operation-registry` and the types which support that package. Its commit history has been preserved by virtue of a `git filter-branch` command, but since that monorepo's root `package.json` hosted the `devDependencies` (as is the setup we have with Lerna), and the root's `types/` directory hosted some hand-crafted typings, there are some additional `devDependencies` and `types` which have brought over from that repository manually to support `apollo-server-plugin-operation-registry`. Finally, the `tsconfig.json`s have been modified to avoid references to packages which are no longer a part of the shared repository and are instead relied on directly from npm. --- .../apollo-server-plugin-operation-registry/package.json | 8 ++++---- .../src/__tests__/tsconfig.json | 1 - .../apollo-server-plugin-operation-registry/tsconfig.json | 7 +------ 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/package.json b/packages/apollo-server-plugin-operation-registry/package.json index 3bc811f72ac..5a143dd96b0 100644 --- a/packages/apollo-server-plugin-operation-registry/package.json +++ b/packages/apollo-server-plugin-operation-registry/package.json @@ -11,10 +11,10 @@ "node": ">=6" }, "dependencies": { - "apollo-engine-reporting": "file:../apollo-engine-reporting", - "apollo-server-caching": "file:../apollo-server-caching", - "apollo-server-errors": "file:../apollo-server-errors", - "apollo-server-plugin-base": "file:../apollo-server-plugin-base", + "apollo-engine-reporting": "0.2.2", + "apollo-server-caching": "0.3.0", + "apollo-server-errors": "2.2.0", + "apollo-server-plugin-base": "0.3.0", "fast-json-stable-stringify": "2.0.0", "loglevel": "1.6.1", "loglevel-debug": "0.0.1", diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/tsconfig.json b/packages/apollo-server-plugin-operation-registry/src/__tests__/tsconfig.json index 86b8a49b265..d7cd9b716cc 100644 --- a/packages/apollo-server-plugin-operation-registry/src/__tests__/tsconfig.json +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/tsconfig.json @@ -3,6 +3,5 @@ "include": ["**/*"], "references": [ { "path": "../../" }, - { "path": "../../../apollo-server-integration-testsuite" } ] } diff --git a/packages/apollo-server-plugin-operation-registry/tsconfig.json b/packages/apollo-server-plugin-operation-registry/tsconfig.json index c79b735dda4..4fcb63fe14f 100644 --- a/packages/apollo-server-plugin-operation-registry/tsconfig.json +++ b/packages/apollo-server-plugin-operation-registry/tsconfig.json @@ -6,10 +6,5 @@ }, "include": ["src/**/*"], "exclude": ["**/__tests__", "**/__mocks__"], - "references": [ - { "path": "../apollo-server-plugin-base" }, - { "path": "../apollo-engine-reporting" }, - { "path": "../apollo-server-errors" }, - { "path": "../apollo-server-caching" } - ] + "references": [] } From 2046c110c2cba1c1bf68b56b0b8ed8b193acf6cb Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 12 Feb 2019 17:11:53 +0200 Subject: [PATCH 043/642] Switch to `apollo-graphql` for providing the signature transformations. As of https://github.com/apollographql/apollo-server/pull/2259, the signature normalization transformations no longer live in `apollo-engine-reporting`. They now live in `apollo-graphql` which allows us to drop a large portion of the dependency tree since `apollo-engine-reporting` currently depends on `apollo-server-core` for its type definitions. We'll use path-based imports at the moment because not everything is exported from the main module of `apollo-graphql` (intentionally). --- .../apollo-server-plugin-operation-registry/package.json | 2 +- .../apollo-server-plugin-operation-registry/src/common.ts | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/package.json b/packages/apollo-server-plugin-operation-registry/package.json index 5a143dd96b0..611318ed066 100644 --- a/packages/apollo-server-plugin-operation-registry/package.json +++ b/packages/apollo-server-plugin-operation-registry/package.json @@ -11,7 +11,7 @@ "node": ">=6" }, "dependencies": { - "apollo-engine-reporting": "0.2.2", + "apollo-graphql": "0.1.0", "apollo-server-caching": "0.3.0", "apollo-server-errors": "2.2.0", "apollo-server-plugin-base": "0.3.0", diff --git a/packages/apollo-server-plugin-operation-registry/src/common.ts b/packages/apollo-server-plugin-operation-registry/src/common.ts index 870c2dd68fc..b97d7cbeab8 100644 --- a/packages/apollo-server-plugin-operation-registry/src/common.ts +++ b/packages/apollo-server-plugin-operation-registry/src/common.ts @@ -7,7 +7,10 @@ import { FloatValueNode, StringValueNode, } from 'graphql/language/ast'; -import { printWithReducedWhitespace, sortAST } from 'apollo-engine-reporting'; +import { + printWithReducedWhitespace, + sortAST, +} from 'apollo-graphql/dist/transforms'; export const envOverrideOperationManifest = 'APOLLO_OPERATION_MANIFEST_BASE_URL'; From ecac482356c4cef264f8b9ac0d4e2067aadc705b Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Fri, 15 Feb 2019 20:46:22 +0200 Subject: [PATCH 044/642] Update LICENSE.md for new `fast-json-stable-stringify`. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As of https://github.com/apollographql/apollo-server/pull/2065, we no longer use `json-stable-stringify`, which pulled in `jsonify` — a dependency which is licensed under a public-domain license which is not agreeable with some organizations. The `fast-json-stable-stringify` license does not rely on `jsonify`. This swaps the package being licensed, but the license itself is the same (MIT). --- packages/apollo-server-plugin-operation-registry/LICENSE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/LICENSE.md b/packages/apollo-server-plugin-operation-registry/LICENSE.md index b1440fbfe74..cbf2ba1600d 100644 --- a/packages/apollo-server-plugin-operation-registry/LICENSE.md +++ b/packages/apollo-server-plugin-operation-registry/LICENSE.md @@ -3,7 +3,7 @@ Copyright (c) 2018- Meteor Development Group, Inc. The following sets forth attribution notices for third party software that may be contained in portions of this package. -### `json-stable-stringify` +### `fast-json-stable-stringify` ``` This software is released under the MIT license: From 4d4b5d77babf422b88bf1706970e6f9c4c7334e3 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Fri, 15 Feb 2019 20:48:48 +0200 Subject: [PATCH 045/642] Add LICENSE.md for `loglevel` (MIT-licensed). --- .../LICENSE.md | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/packages/apollo-server-plugin-operation-registry/LICENSE.md b/packages/apollo-server-plugin-operation-registry/LICENSE.md index cbf2ba1600d..1447ea3f486 100644 --- a/packages/apollo-server-plugin-operation-registry/LICENSE.md +++ b/packages/apollo-server-plugin-operation-registry/LICENSE.md @@ -51,3 +51,30 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ``` + +### `loglevel` + +``` +Copyright (c) 2013 Tim Perry + +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. +``` From f3f50bca9299709dd336b6e0054597160d5a67cd Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Fri, 15 Feb 2019 20:51:24 +0200 Subject: [PATCH 046/642] Add LICENSE.md for `loglevel-debug` (MIT-licensed). --- .../LICENSE.md | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/packages/apollo-server-plugin-operation-registry/LICENSE.md b/packages/apollo-server-plugin-operation-registry/LICENSE.md index 1447ea3f486..926854f7e55 100644 --- a/packages/apollo-server-plugin-operation-registry/LICENSE.md +++ b/packages/apollo-server-plugin-operation-registry/LICENSE.md @@ -78,3 +78,26 @@ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ``` + +### `loglevel-debug` + +``` +Copyright (c) Chen Hsin-Yi + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +``` From a4a19211c7649b10d52246317e1cba25e305f5fd Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Fri, 15 Feb 2019 20:57:28 +0200 Subject: [PATCH 047/642] Switch to non-exact versions of `dependencies`. Since these are no longer packages which are controlled under lerna's exact versioning, we don't need to be exact pinning these anymore. In fact, we should embrace the fact that these can be moved forward on their own! --- .../package.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/package.json b/packages/apollo-server-plugin-operation-registry/package.json index 611318ed066..6df512475c9 100644 --- a/packages/apollo-server-plugin-operation-registry/package.json +++ b/packages/apollo-server-plugin-operation-registry/package.json @@ -11,14 +11,14 @@ "node": ">=6" }, "dependencies": { - "apollo-graphql": "0.1.0", - "apollo-server-caching": "0.3.0", - "apollo-server-errors": "2.2.0", - "apollo-server-plugin-base": "0.3.0", - "fast-json-stable-stringify": "2.0.0", - "loglevel": "1.6.1", - "loglevel-debug": "0.0.1", - "node-fetch": "2.2.0" + "apollo-graphql": "^0.1.0", + "apollo-server-caching": "^0.3.0", + "apollo-server-errors": "^2.2.0", + "apollo-server-plugin-base": "^0.3.0", + "fast-json-stable-stringify": "^2.0.0", + "loglevel": "^1.6.1", + "loglevel-debug": "^0.0.1", + "node-fetch": "^2.2.0" }, "peerDependencies": { "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0" From 479d1eebf95769cc801a399f0a84fea44a754894 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Fri, 15 Feb 2019 20:59:47 +0200 Subject: [PATCH 048/642] plugin-operation-registry: Update to latest semver bases. --- .../apollo-server-plugin-operation-registry/package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/package.json b/packages/apollo-server-plugin-operation-registry/package.json index 6df512475c9..1e5e8c79985 100644 --- a/packages/apollo-server-plugin-operation-registry/package.json +++ b/packages/apollo-server-plugin-operation-registry/package.json @@ -11,14 +11,14 @@ "node": ">=6" }, "dependencies": { - "apollo-graphql": "^0.1.0", - "apollo-server-caching": "^0.3.0", + "apollo-graphql": "^0.1.1", + "apollo-server-caching": "^0.3.1", "apollo-server-errors": "^2.2.0", - "apollo-server-plugin-base": "^0.3.0", + "apollo-server-plugin-base": "^0.3.2", "fast-json-stable-stringify": "^2.0.0", "loglevel": "^1.6.1", "loglevel-debug": "^0.0.1", - "node-fetch": "^2.2.0" + "node-fetch": "^2.3.0" }, "peerDependencies": { "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0" From 7804ec36c9a657c3477b94a558f97a5f5ee279bd Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Fri, 15 Feb 2019 21:05:28 +0200 Subject: [PATCH 049/642] Pin to apollo-graphql@0.1.0. Until the work in https://github.com/apollographql/apollo-tooling/pull/1027 is completed, this will ensure that we can publish this package with the current setup, which I'd rather do for the first time _soon_ rather than _whenever_. --- packages/apollo-server-plugin-operation-registry/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/package.json b/packages/apollo-server-plugin-operation-registry/package.json index 1e5e8c79985..b65915d5c31 100644 --- a/packages/apollo-server-plugin-operation-registry/package.json +++ b/packages/apollo-server-plugin-operation-registry/package.json @@ -11,7 +11,7 @@ "node": ">=6" }, "dependencies": { - "apollo-graphql": "^0.1.1", + "apollo-graphql": "0.1.0", "apollo-server-caching": "^0.3.1", "apollo-server-errors": "^2.2.0", "apollo-server-plugin-base": "^0.3.2", From 3b5180c9c2024ce3139960b122112508d7e132e2 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 21 Feb 2019 13:23:40 +0200 Subject: [PATCH 050/642] Publish - apollo-gateway@0.0.1-alpha.0 - apollo-server-plugin-operation-registry@0.0.1-alpha.5 --- packages/apollo-server-plugin-operation-registry/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/package.json b/packages/apollo-server-plugin-operation-registry/package.json index b65915d5c31..719a3d65073 100644 --- a/packages/apollo-server-plugin-operation-registry/package.json +++ b/packages/apollo-server-plugin-operation-registry/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-plugin-operation-registry", - "version": "0.0.1-alpha.4", + "version": "0.0.1-alpha.5", "description": "Apollo Server operation registry", "main": "dist/index.js", "types": "dist/index.d.ts", From 47c220259cab1f35af6ac0a0137ecdcfbf16cd59 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 21 Feb 2019 13:33:12 +0200 Subject: [PATCH 051/642] op-reg: Bump version to 0.0.1-alpha.6, which is already published. --- packages/apollo-server-plugin-operation-registry/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/package.json b/packages/apollo-server-plugin-operation-registry/package.json index 719a3d65073..b623b800ae3 100644 --- a/packages/apollo-server-plugin-operation-registry/package.json +++ b/packages/apollo-server-plugin-operation-registry/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-plugin-operation-registry", - "version": "0.0.1-alpha.5", + "version": "0.0.1-alpha.6", "description": "Apollo Server operation registry", "main": "dist/index.js", "types": "dist/index.d.ts", From 0c9707b2e97905a541016c0e699acd84e211bf94 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 21 Feb 2019 13:34:33 +0200 Subject: [PATCH 052/642] Publish - apollo-server-plugin-operation-registry@0.0.1-alpha.7 --- packages/apollo-server-plugin-operation-registry/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/package.json b/packages/apollo-server-plugin-operation-registry/package.json index b623b800ae3..740eea1f47c 100644 --- a/packages/apollo-server-plugin-operation-registry/package.json +++ b/packages/apollo-server-plugin-operation-registry/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-plugin-operation-registry", - "version": "0.0.1-alpha.6", + "version": "0.0.1-alpha.7", "description": "Apollo Server operation registry", "main": "dist/index.js", "types": "dist/index.d.ts", From be219502c1dee71cd1e926441ec05a14f5f07764 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Wed, 27 Feb 2019 14:19:42 +0200 Subject: [PATCH 053/642] Drop support for Node.js 6 and update TS compilation targets accordingly. This commit: * Drops testing of Node.js 6. * Updates the `engines` property of the affected packages to suggest using a newer version of Node.js (note this is only an attribute and not enforced by anything in the Node.js runtime). * Changes the compilation target within TypeScript from ES2016 to ES2017. While Node.js 8 does not fully support ES2017, this compat table seems to suggest that it would be unlikely that we'd run into any problems by transpiling to ES2017's native features as I don't expect anything will make use of `SharedArrayBuffer`s or `Atomics`: * https://node.green/#ES2017 --- packages/apollo-server-plugin-operation-registry/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/package.json b/packages/apollo-server-plugin-operation-registry/package.json index 740eea1f47c..944c3a0dc47 100644 --- a/packages/apollo-server-plugin-operation-registry/package.json +++ b/packages/apollo-server-plugin-operation-registry/package.json @@ -8,7 +8,7 @@ "author": "Apollo ", "license": "Copyright (c) Meteor Development Group, Inc.; See LICENSE.md.", "engines": { - "node": ">=6" + "node": ">=8" }, "dependencies": { "apollo-graphql": "0.1.0", From 6a93432c87c2dd5c80e50426354450c3da90dcce Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Tue, 5 Mar 2019 11:29:46 +0000 Subject: [PATCH 054/642] chore(deps): update dependency apollo-graphql to v0.1.1 (#10) --- packages/apollo-server-plugin-operation-registry/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/package.json b/packages/apollo-server-plugin-operation-registry/package.json index 944c3a0dc47..77b26f8ac95 100644 --- a/packages/apollo-server-plugin-operation-registry/package.json +++ b/packages/apollo-server-plugin-operation-registry/package.json @@ -11,7 +11,7 @@ "node": ">=8" }, "dependencies": { - "apollo-graphql": "0.1.0", + "apollo-graphql": "0.1.1", "apollo-server-caching": "^0.3.1", "apollo-server-errors": "^2.2.0", "apollo-server-plugin-base": "^0.3.2", From 5281988bbe949329b190a606ceb8249b02485f1c Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 5 Mar 2019 16:19:48 +0200 Subject: [PATCH 055/642] Switch `apollo-graphql` path-based import to use `lib` rather than `dist`. (#23) Since we've moved the `apollo-graphql` package from `apollo-server` to `apollo-tooling`, it's now subjected to the new TypeScript compilation rules for that repository. (See: https://github.com/apollographql/apollo-tooling/pull/1018) Those compilation rules differ slightly and put their output in the `lib` directory rather than the `dist` directory. In an ideal world, we'd fix that at publish time so the actual `outDir` didn't matter (i.e. we could actually publish from the `dist/` directory, something which `lerna` actually supports!), but for now, changing this import should be good. I'd intentionally not done this before (and instead just pinned the version exactly to a version which I knew was still utilizing the previous `dist/` compilation `outDir`) as we'd been waiting for the first publish to occur from that repository, but that publish has now happened and Renovate has come through and updated it so it's time to make the change more permanently! Follows-up: https://github.com/apollographql/apollo-platform-commercial/pull/10 --- packages/apollo-server-plugin-operation-registry/src/common.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/common.ts b/packages/apollo-server-plugin-operation-registry/src/common.ts index b97d7cbeab8..cf0a47f188c 100644 --- a/packages/apollo-server-plugin-operation-registry/src/common.ts +++ b/packages/apollo-server-plugin-operation-registry/src/common.ts @@ -10,7 +10,7 @@ import { import { printWithReducedWhitespace, sortAST, -} from 'apollo-graphql/dist/transforms'; +} from 'apollo-graphql/lib/transforms'; export const envOverrideOperationManifest = 'APOLLO_OPERATION_MANIFEST_BASE_URL'; From 94eb747a77d19391eca6493e86e5cce63cfc0d2c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Wed, 6 Mar 2019 04:21:48 +0000 Subject: [PATCH 056/642] chore(deps): update dependency apollo-graphql to v0.1.2 (#24) --- packages/apollo-server-plugin-operation-registry/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/package.json b/packages/apollo-server-plugin-operation-registry/package.json index 77b26f8ac95..6312ad3ba07 100644 --- a/packages/apollo-server-plugin-operation-registry/package.json +++ b/packages/apollo-server-plugin-operation-registry/package.json @@ -11,7 +11,7 @@ "node": ">=8" }, "dependencies": { - "apollo-graphql": "0.1.1", + "apollo-graphql": "0.1.2", "apollo-server-caching": "^0.3.1", "apollo-server-errors": "^2.2.0", "apollo-server-plugin-base": "^0.3.2", From f1f49777bb6a30b5ab1fb580a5c2b503902bc0c2 Mon Sep 17 00:00:00 2001 From: Trevor Scheer Date: Tue, 12 Mar 2019 18:22:55 -0700 Subject: [PATCH 057/642] Update operation registry plugin to use manifest v2 * Use shared functions from apollo-graphql for normalization and hashing * Append the v2/ prefix to the operation manifest URL --- .../ApolloServerPluginOperationRegistry.ts | 15 ++--- .../src/__tests__/common.test.ts | 6 ++ .../src/common.ts | 60 +------------------ 3 files changed, 17 insertions(+), 64 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts index 671bdbeef2a..cefb5ee6958 100644 --- a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts +++ b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts @@ -1,16 +1,15 @@ import * as assert from 'assert'; -import { - pluginName, - generateNormalizedDocumentHash, - getStoreKey, - hashForLogging, -} from './common'; +import { pluginName, getStoreKey, hashForLogging } from './common'; import { ApolloServerPlugin, GraphQLServiceContext, GraphQLRequestListener, GraphQLRequestContext, } from 'apollo-server-plugin-base'; +import { + operationHash, + defaultOperationRegistrySignature, +} from 'apollo-graphql'; import { ForbiddenError, ApolloError } from 'apollo-server-errors'; import Agent from './agent'; import { GraphQLSchema } from 'graphql/type'; @@ -105,7 +104,9 @@ export default function plugin(options: Options = Object.create(null)) { throw new Error('Unable to access store.'); } - const hash = generateNormalizedDocumentHash(document); + const hash = operationHash( + defaultOperationRegistrySignature(document), + ); // If the document itself was missing and we didn't receive a // `queryHash` (the persisted query `sha256Hash` from the APQ diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/common.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/common.test.ts index 685c4deae02..66fd1d605ce 100644 --- a/packages/apollo-server-plugin-operation-registry/src/__tests__/common.test.ts +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/common.test.ts @@ -4,4 +4,10 @@ describe('common', () => { it('uses the correct cache prefix', () => { expect(common.getStoreKey('abc123')).toStrictEqual('apq:abc123'); }); + + it('uses the v2 manifest prefix', () => { + expect( + common.getOperationManifestUrl('aServiceId', 'aSchemaHash'), + ).toStrictEqual('v2/aServiceId/aSchemaHash'); + }); }); diff --git a/packages/apollo-server-plugin-operation-registry/src/common.ts b/packages/apollo-server-plugin-operation-registry/src/common.ts index cf0a47f188c..441f561fcd5 100644 --- a/packages/apollo-server-plugin-operation-registry/src/common.ts +++ b/packages/apollo-server-plugin-operation-registry/src/common.ts @@ -1,59 +1,9 @@ export const pluginName: string = require('../package.json').name; import { createHash } from 'crypto'; -import { visit } from 'graphql/language/visitor'; -import { - DocumentNode, - IntValueNode, - FloatValueNode, - StringValueNode, -} from 'graphql/language/ast'; -import { - printWithReducedWhitespace, - sortAST, -} from 'apollo-graphql/lib/transforms'; export const envOverrideOperationManifest = 'APOLLO_OPERATION_MANIFEST_BASE_URL'; -// DUPLICATED FROM https://github.com/apollographql/apollo-tooling/blob/d7429b80/packages/apollo/src/commands/client/push.ts#L29-L48 -// In the same spirit as the similarly named `hideLiterals` function from the -// `apollo-engine-reporting/src/signature.ts` module, we'll do an AST visit -// to redact literals. Developers are strongly encouraged to use the -// `variables` aspect of the which would avoid these being explicitly -// present in the operation manifest at all. The primary area of concern here -// is to avoid sending in-lined literals which might contain sensitive -// information (e.g. API keys, etc.). -export function hideCertainLiterals(ast: DocumentNode): DocumentNode { - return visit(ast, { - IntValue(node: IntValueNode): IntValueNode { - return { ...node, value: '0' }; - }, - FloatValue(node: FloatValueNode): FloatValueNode { - return { ...node, value: '0' }; - }, - StringValue(node: StringValueNode): StringValueNode { - return { ...node, value: '', block: false }; - }, - }); -} - -// XXX This function is not currently invoked when the hashed APQ value -// (`extensions.persistedQuery.sha256Hash`) is set, but would -// be called if we're provided a (string) `query` (so when APQ is a miss, -// or not enabled at all). -// -// Since the `hideCertainLiterals` and `sortAST` methods both require a -// `DocumentNode`, we'll have to call a `parse` here on the `query` string -// and make the necessary transformations. -// -// Lastly, we will remove the `hideCertainLiterals` portion of this once the -// `apollo` CLI properly warns about including/using string literals. -function formatDocumentForHashing(document: DocumentNode): string { - return printWithReducedWhitespace( - sortAST(hideCertainLiterals(document)), - ).trim(); -} - // Generate and cache our desired operation manifest URL. const urlOperationManifestBase: string = ((): string => { const desiredUrl = @@ -72,17 +22,13 @@ export function generateServiceIdHash(serviceId: string): string { .digest('hex'); } -export function generateNormalizedDocumentHash(document: DocumentNode): string { - return createHash('sha256') - .update(formatDocumentForHashing(document)) - .digest('hex'); -} - export function getOperationManifestUrl( hashedServiceId: string, schemaHash: string, ): string { - return [urlOperationManifestBase, hashedServiceId, schemaHash].join('/'); + return [urlOperationManifestBase, 'v2', hashedServiceId, schemaHash].join( + '/', + ); } export function hashForLogging(hash: string): string { From abfafe71fc914cb5ffe9d33028d51fb297bc92d5 Mon Sep 17 00:00:00 2001 From: Trevor Scheer Date: Tue, 12 Mar 2019 18:38:29 -0700 Subject: [PATCH 058/642] Update changelog --- packages/apollo-server-plugin-operation-registry/CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/apollo-server-plugin-operation-registry/CHANGELOG.md b/packages/apollo-server-plugin-operation-registry/CHANGELOG.md index ef45b84f48c..232f1ea08a2 100644 --- a/packages/apollo-server-plugin-operation-registry/CHANGELOG.md +++ b/packages/apollo-server-plugin-operation-registry/CHANGELOG.md @@ -2,3 +2,5 @@ ### vNEXT +- `apollo-server-plugin-operation-registry` + - Update operation registry plugin to use manifest v2 [#32](https://github.com/apollographql/apollo-platform-commercial/pull/32) From e88c1ce9cf19278079473e4867fb8e80a51fb483 Mon Sep 17 00:00:00 2001 From: Trevor Scheer Date: Wed, 13 Mar 2019 06:40:23 -0700 Subject: [PATCH 059/642] Update v2 file name pattern to match proposed changes --- .../src/__tests__/common.test.ts | 4 ++-- .../apollo-server-plugin-operation-registry/src/common.ts | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/common.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/common.test.ts index 66fd1d605ce..949fff6b61d 100644 --- a/packages/apollo-server-plugin-operation-registry/src/__tests__/common.test.ts +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/common.test.ts @@ -5,9 +5,9 @@ describe('common', () => { expect(common.getStoreKey('abc123')).toStrictEqual('apq:abc123'); }); - it('uses the v2 manifest prefix', () => { + it('uses the v2 manifest suffix', () => { expect( common.getOperationManifestUrl('aServiceId', 'aSchemaHash'), - ).toStrictEqual('v2/aServiceId/aSchemaHash'); + ).toStrictEqual('aServiceId/aSchemaHash.v2.json'); }); }); diff --git a/packages/apollo-server-plugin-operation-registry/src/common.ts b/packages/apollo-server-plugin-operation-registry/src/common.ts index 441f561fcd5..6ee44c2afec 100644 --- a/packages/apollo-server-plugin-operation-registry/src/common.ts +++ b/packages/apollo-server-plugin-operation-registry/src/common.ts @@ -26,8 +26,9 @@ export function getOperationManifestUrl( hashedServiceId: string, schemaHash: string, ): string { - return [urlOperationManifestBase, 'v2', hashedServiceId, schemaHash].join( - '/', + return ( + [urlOperationManifestBase, hashedServiceId, schemaHash].join('/') + + '.v2.json' ); } From 7061eb2f9675b0a8c063cf0988080c89e92060ff Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Wed, 13 Mar 2019 18:05:44 +0200 Subject: [PATCH 060/642] Update `apollo-graphql` to latest 0.2.x version. This incorporates the changes from: https://github.com/apollographql/apollo-tooling/pull/1112 ...which provides a new `defaultOperationRegistrySignature` function that will be utilized by both the CLI and this plugin to provide the same normalization. --- packages/apollo-server-plugin-operation-registry/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/package.json b/packages/apollo-server-plugin-operation-registry/package.json index 6312ad3ba07..d98b9b68f5b 100644 --- a/packages/apollo-server-plugin-operation-registry/package.json +++ b/packages/apollo-server-plugin-operation-registry/package.json @@ -11,7 +11,7 @@ "node": ">=8" }, "dependencies": { - "apollo-graphql": "0.1.2", + "apollo-graphql": "0.2.0", "apollo-server-caching": "^0.3.1", "apollo-server-errors": "^2.2.0", "apollo-server-plugin-base": "^0.3.2", From 9f999e27ef3b8c22a7770627c252884cd799d390 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Wed, 13 Mar 2019 19:52:14 +0200 Subject: [PATCH 061/642] Pass the `operationName` to `defaultOperationRegistrySignature`. Start passing the `operationName` to `defaultOperationRegistrySignature`. https://github.com/apollographql/apollo-tooling/pull/1115 If `operationName` is `null`, then the operation is anonymous. However, it's not possible to register anonymous operations from the `apollo` CLI. We could fail early, however, we still want to abide by the desires of `forbidUnregisteredOperations`, so we'll allow this hash be generated anyway. The hash cannot be in the manifest, so this would be okay and allow this code to remain less conditional-y, eventually forbidding the operation when the has is not found and `forbidUnregisteredOperations` is on. --- .../src/ApolloServerPluginOperationRegistry.ts | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts index cefb5ee6958..321b076f70d 100644 --- a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts +++ b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts @@ -105,7 +105,21 @@ export default function plugin(options: Options = Object.create(null)) { } const hash = operationHash( - defaultOperationRegistrySignature(document), + defaultOperationRegistrySignature( + document, + + // XXX The `operationName` is set from the AST, not from the + // request `operationName`. If `operationName` is `null`, + // then the operation is anonymous. However, it's not possible + // to register anonymous operations from the `apollo` CLI. + // We could fail early, however, we still want to abide by the + // desires of `forbidUnregisteredOperations`, so we'll allow + // this hash be generated anyway. The hash cannot be in the + // manifest, so this would be okay and allow this code to remain + // less conditional-y, eventually forbidding the operation when + // the has is not found and `forbidUnregisteredOperations` is on. + requestContext.operationName || '', + ), ); // If the document itself was missing and we didn't receive a From 8a4f7672f8c2b7599263900f85a8c10c6ee1e2ec Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Wed, 13 Mar 2019 19:59:50 +0200 Subject: [PATCH 062/642] Update ApolloServerPluginOperationRegistry.ts --- .../src/ApolloServerPluginOperationRegistry.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts index 321b076f70d..0ec86ecff97 100644 --- a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts +++ b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts @@ -117,7 +117,7 @@ export default function plugin(options: Options = Object.create(null)) { // this hash be generated anyway. The hash cannot be in the // manifest, so this would be okay and allow this code to remain // less conditional-y, eventually forbidding the operation when - // the has is not found and `forbidUnregisteredOperations` is on. + // the hash is not found and `forbidUnregisteredOperations` is on. requestContext.operationName || '', ), ); From bea4089872583d3ff221c65d5a19b0c99a5806e3 Mon Sep 17 00:00:00 2001 From: Trevor Scheer Date: Wed, 13 Mar 2019 17:40:59 -0700 Subject: [PATCH 063/642] Update tests to account for new v2 filename format --- .../src/__tests__/agent.test.ts | 4 ++-- .../src/__tests__/common.test.ts | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts index 8b3acbdface..e5d7aebbc91 100644 --- a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts @@ -124,7 +124,7 @@ describe('Agent', () => { it('correctly prepared the test environment', () => { expect(getOperationManifestUrl('abc123', 'def456')).toStrictEqual( - urlResolve(fakeBaseUrl, '/abc123/def456'), + urlResolve(fakeBaseUrl, '/abc123/def456.v2.json'), ); }); @@ -409,7 +409,7 @@ function hashedServiceId(serviceID: string) { } function pathForServiceAndSchema(serviceID: string, schemaHash: string) { - return `/${hashedServiceId(serviceID)}/${schemaHash}`; + return `/${hashedServiceId(serviceID)}/${schemaHash}.v2.json`; } function nockManifestForServiceAndSchema( diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/common.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/common.test.ts index 949fff6b61d..97ca0f9b69f 100644 --- a/packages/apollo-server-plugin-operation-registry/src/__tests__/common.test.ts +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/common.test.ts @@ -8,6 +8,8 @@ describe('common', () => { it('uses the v2 manifest suffix', () => { expect( common.getOperationManifestUrl('aServiceId', 'aSchemaHash'), - ).toStrictEqual('aServiceId/aSchemaHash.v2.json'); + ).toMatchInlineSnapshot( + `"https://storage.googleapis.com/engine-op-manifest-storage-prod/aServiceId/aSchemaHash.v2.json"`, + ); }); }); From baaf6f9a1a8a1246f9c1cd41c2c39b06a4865b75 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 14 Mar 2019 23:02:39 +0200 Subject: [PATCH 064/642] Publish - apollo-federation@0.1.0-alpha.0 - apollo-gateway@0.1.0-alpha.0 - apollo-server-plugin-operation-registry@0.1.0-alpha.0 --- packages/apollo-server-plugin-operation-registry/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/package.json b/packages/apollo-server-plugin-operation-registry/package.json index d98b9b68f5b..6c5677e8380 100644 --- a/packages/apollo-server-plugin-operation-registry/package.json +++ b/packages/apollo-server-plugin-operation-registry/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-plugin-operation-registry", - "version": "0.0.1-alpha.7", + "version": "0.1.0-alpha.0", "description": "Apollo Server operation registry", "main": "dist/index.js", "types": "dist/index.d.ts", From a846071abd00c89cc8ffc3d3dd4532a3ace5309e Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Fri, 15 Mar 2019 20:30:55 +0200 Subject: [PATCH 065/642] Allow manifest version 2. Forbid manifest version 1. --- packages/apollo-server-plugin-operation-registry/src/agent.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/agent.ts b/packages/apollo-server-plugin-operation-registry/src/agent.ts index cb59347a0b3..0ee7f876f49 100644 --- a/packages/apollo-server-plugin-operation-registry/src/agent.ts +++ b/packages/apollo-server-plugin-operation-registry/src/agent.ts @@ -239,7 +239,7 @@ export default class Agent { public async updateManifest(manifest: OperationManifest) { if ( !manifest || - manifest.version !== 1 || + manifest.version !== 2 || !Array.isArray(manifest.operations) ) { throw new Error('Invalid manifest format.'); From 8af9f0d76523cc796254212580b9e4ce2b6c9544 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Fri, 15 Mar 2019 20:39:51 +0200 Subject: [PATCH 066/642] Publish - apollo-server-plugin-operation-registry@0.1.0-alpha.1 --- packages/apollo-server-plugin-operation-registry/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/package.json b/packages/apollo-server-plugin-operation-registry/package.json index 6c5677e8380..30a39bcf6de 100644 --- a/packages/apollo-server-plugin-operation-registry/package.json +++ b/packages/apollo-server-plugin-operation-registry/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-plugin-operation-registry", - "version": "0.1.0-alpha.0", + "version": "0.1.0-alpha.1", "description": "Apollo Server operation registry", "main": "dist/index.js", "types": "dist/index.d.ts", From cadba6ef5c5252d750a1d8fa58c07a2854525c0a Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 18 Mar 2019 18:40:47 +0200 Subject: [PATCH 067/642] op-reg: The APQ cache is no longer used, so these tests must be adjusted. --- .../src/__tests__/agent.test.ts | 8 ++++---- .../src/__tests__/common.test.ts | 2 +- .../apollo-server-plugin-operation-registry/src/common.ts | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts index e5d7aebbc91..eed6c5210b4 100644 --- a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts @@ -1,5 +1,5 @@ import nock from 'nock'; -import { InMemoryLRUCache, KeyValueCache } from 'apollo-server-caching'; +import { InMemoryLRUCache } from 'apollo-server-caching'; import { envOverrideOperationManifest, getStoreKey } from '../common'; import { resolve as urlResolve } from 'url'; import { createHash } from 'crypto'; @@ -23,7 +23,7 @@ const getRequiredAgentOptions = ( serviceID = genericServiceID, ...addlOptions }: { - store?: KeyValueCache; + store?: InMemoryLRUCache; schemaHash?: string; serviceID?: string; } = { @@ -130,7 +130,7 @@ describe('Agent', () => { describe('manifest checking and store populating', () => { const forCleanup: { - store?: KeyValueCache; + store?: InMemoryLRUCache; agent?: import('../agent').default; }[] = []; @@ -203,7 +203,7 @@ describe('Agent', () => { } async function expectStoreHasOperationEach( - store: KeyValueCache, + store: InMemoryLRUCache, letters: string[], ) { for (const letter of letters) { diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/common.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/common.test.ts index 97ca0f9b69f..d43682b007c 100644 --- a/packages/apollo-server-plugin-operation-registry/src/__tests__/common.test.ts +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/common.test.ts @@ -2,7 +2,7 @@ import * as common from '../common'; describe('common', () => { it('uses the correct cache prefix', () => { - expect(common.getStoreKey('abc123')).toStrictEqual('apq:abc123'); + expect(common.getStoreKey('abc123')).toStrictEqual('abc123'); }); it('uses the v2 manifest suffix', () => { diff --git a/packages/apollo-server-plugin-operation-registry/src/common.ts b/packages/apollo-server-plugin-operation-registry/src/common.ts index 6ee44c2afec..9487e8ff289 100644 --- a/packages/apollo-server-plugin-operation-registry/src/common.ts +++ b/packages/apollo-server-plugin-operation-registry/src/common.ts @@ -14,7 +14,7 @@ const urlOperationManifestBase: string = ((): string => { return desiredUrl.replace(/\/$/, ''); })(); -export const getStoreKey = (signature: string) => `apq:${signature}`; +export const getStoreKey = (signature: string) => `${signature}`; export function generateServiceIdHash(serviceId: string): string { return createHash('sha512') From d9819d28cf525af085ecf67e67bfe5d249e9d6c6 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 18 Mar 2019 18:41:08 +0200 Subject: [PATCH 068/642] op-reg: Ensure that the version 2 manifest format is received. --- .../src/__tests__/agent.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts index eed6c5210b4..0eeb6af4cde 100644 --- a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts @@ -425,7 +425,7 @@ function nockSuccessfulManifestForServiceAndSchema( operations: ManifestRecord[], ) { return nockManifestForServiceAndSchema(serviceID, schemaHash).reply(200, { - version: 1, + version: 2, operations, }); } From d7c7b005ace648fffd5ce34314035c3ed9eb4982 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 21 Mar 2019 16:02:11 +0200 Subject: [PATCH 069/642] Change `package.json` `license` properties to comply with npm requirements. Specifically, using the format indicated here: https://docs.npmjs.com/files/package.json#license --- packages/apollo-server-plugin-operation-registry/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/package.json b/packages/apollo-server-plugin-operation-registry/package.json index 30a39bcf6de..cfca30feca0 100644 --- a/packages/apollo-server-plugin-operation-registry/package.json +++ b/packages/apollo-server-plugin-operation-registry/package.json @@ -6,7 +6,7 @@ "types": "dist/index.d.ts", "keywords": [], "author": "Apollo ", - "license": "Copyright (c) Meteor Development Group, Inc.; See LICENSE.md.", + "license": "SEE LICENSE IN LICENSE.md", "engines": { "node": ">=8" }, From ae16aaf132a59707a1120ff0460e4c28a23866f8 Mon Sep 17 00:00:00 2001 From: Trevor Scheer Date: Tue, 12 Mar 2019 18:22:55 -0700 Subject: [PATCH 070/642] Update operation registry plugin to use manifest v2 * Use shared functions from apollo-graphql for normalization and hashing * Append the v2/ prefix to the operation manifest URL --- .../ApolloServerPluginOperationRegistry.ts | 15 ++--- .../src/__tests__/common.test.ts | 6 ++ .../src/common.ts | 60 +------------------ 3 files changed, 17 insertions(+), 64 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts index 671bdbeef2a..cefb5ee6958 100644 --- a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts +++ b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts @@ -1,16 +1,15 @@ import * as assert from 'assert'; -import { - pluginName, - generateNormalizedDocumentHash, - getStoreKey, - hashForLogging, -} from './common'; +import { pluginName, getStoreKey, hashForLogging } from './common'; import { ApolloServerPlugin, GraphQLServiceContext, GraphQLRequestListener, GraphQLRequestContext, } from 'apollo-server-plugin-base'; +import { + operationHash, + defaultOperationRegistrySignature, +} from 'apollo-graphql'; import { ForbiddenError, ApolloError } from 'apollo-server-errors'; import Agent from './agent'; import { GraphQLSchema } from 'graphql/type'; @@ -105,7 +104,9 @@ export default function plugin(options: Options = Object.create(null)) { throw new Error('Unable to access store.'); } - const hash = generateNormalizedDocumentHash(document); + const hash = operationHash( + defaultOperationRegistrySignature(document), + ); // If the document itself was missing and we didn't receive a // `queryHash` (the persisted query `sha256Hash` from the APQ diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/common.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/common.test.ts index 685c4deae02..66fd1d605ce 100644 --- a/packages/apollo-server-plugin-operation-registry/src/__tests__/common.test.ts +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/common.test.ts @@ -4,4 +4,10 @@ describe('common', () => { it('uses the correct cache prefix', () => { expect(common.getStoreKey('abc123')).toStrictEqual('apq:abc123'); }); + + it('uses the v2 manifest prefix', () => { + expect( + common.getOperationManifestUrl('aServiceId', 'aSchemaHash'), + ).toStrictEqual('v2/aServiceId/aSchemaHash'); + }); }); diff --git a/packages/apollo-server-plugin-operation-registry/src/common.ts b/packages/apollo-server-plugin-operation-registry/src/common.ts index cf0a47f188c..441f561fcd5 100644 --- a/packages/apollo-server-plugin-operation-registry/src/common.ts +++ b/packages/apollo-server-plugin-operation-registry/src/common.ts @@ -1,59 +1,9 @@ export const pluginName: string = require('../package.json').name; import { createHash } from 'crypto'; -import { visit } from 'graphql/language/visitor'; -import { - DocumentNode, - IntValueNode, - FloatValueNode, - StringValueNode, -} from 'graphql/language/ast'; -import { - printWithReducedWhitespace, - sortAST, -} from 'apollo-graphql/lib/transforms'; export const envOverrideOperationManifest = 'APOLLO_OPERATION_MANIFEST_BASE_URL'; -// DUPLICATED FROM https://github.com/apollographql/apollo-tooling/blob/d7429b80/packages/apollo/src/commands/client/push.ts#L29-L48 -// In the same spirit as the similarly named `hideLiterals` function from the -// `apollo-engine-reporting/src/signature.ts` module, we'll do an AST visit -// to redact literals. Developers are strongly encouraged to use the -// `variables` aspect of the which would avoid these being explicitly -// present in the operation manifest at all. The primary area of concern here -// is to avoid sending in-lined literals which might contain sensitive -// information (e.g. API keys, etc.). -export function hideCertainLiterals(ast: DocumentNode): DocumentNode { - return visit(ast, { - IntValue(node: IntValueNode): IntValueNode { - return { ...node, value: '0' }; - }, - FloatValue(node: FloatValueNode): FloatValueNode { - return { ...node, value: '0' }; - }, - StringValue(node: StringValueNode): StringValueNode { - return { ...node, value: '', block: false }; - }, - }); -} - -// XXX This function is not currently invoked when the hashed APQ value -// (`extensions.persistedQuery.sha256Hash`) is set, but would -// be called if we're provided a (string) `query` (so when APQ is a miss, -// or not enabled at all). -// -// Since the `hideCertainLiterals` and `sortAST` methods both require a -// `DocumentNode`, we'll have to call a `parse` here on the `query` string -// and make the necessary transformations. -// -// Lastly, we will remove the `hideCertainLiterals` portion of this once the -// `apollo` CLI properly warns about including/using string literals. -function formatDocumentForHashing(document: DocumentNode): string { - return printWithReducedWhitespace( - sortAST(hideCertainLiterals(document)), - ).trim(); -} - // Generate and cache our desired operation manifest URL. const urlOperationManifestBase: string = ((): string => { const desiredUrl = @@ -72,17 +22,13 @@ export function generateServiceIdHash(serviceId: string): string { .digest('hex'); } -export function generateNormalizedDocumentHash(document: DocumentNode): string { - return createHash('sha256') - .update(formatDocumentForHashing(document)) - .digest('hex'); -} - export function getOperationManifestUrl( hashedServiceId: string, schemaHash: string, ): string { - return [urlOperationManifestBase, hashedServiceId, schemaHash].join('/'); + return [urlOperationManifestBase, 'v2', hashedServiceId, schemaHash].join( + '/', + ); } export function hashForLogging(hash: string): string { From 95e0ef5c3c9bfb0680208fead70cde9eb07c7076 Mon Sep 17 00:00:00 2001 From: Trevor Scheer Date: Tue, 12 Mar 2019 18:38:29 -0700 Subject: [PATCH 071/642] Update changelog --- packages/apollo-server-plugin-operation-registry/CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/apollo-server-plugin-operation-registry/CHANGELOG.md b/packages/apollo-server-plugin-operation-registry/CHANGELOG.md index ef45b84f48c..232f1ea08a2 100644 --- a/packages/apollo-server-plugin-operation-registry/CHANGELOG.md +++ b/packages/apollo-server-plugin-operation-registry/CHANGELOG.md @@ -2,3 +2,5 @@ ### vNEXT +- `apollo-server-plugin-operation-registry` + - Update operation registry plugin to use manifest v2 [#32](https://github.com/apollographql/apollo-platform-commercial/pull/32) From 3af0a04dee57acf7e1cfab516b2905cd428ee4b6 Mon Sep 17 00:00:00 2001 From: Trevor Scheer Date: Wed, 13 Mar 2019 06:40:23 -0700 Subject: [PATCH 072/642] Update v2 file name pattern to match proposed changes --- .../src/__tests__/common.test.ts | 4 ++-- .../apollo-server-plugin-operation-registry/src/common.ts | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/common.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/common.test.ts index 66fd1d605ce..949fff6b61d 100644 --- a/packages/apollo-server-plugin-operation-registry/src/__tests__/common.test.ts +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/common.test.ts @@ -5,9 +5,9 @@ describe('common', () => { expect(common.getStoreKey('abc123')).toStrictEqual('apq:abc123'); }); - it('uses the v2 manifest prefix', () => { + it('uses the v2 manifest suffix', () => { expect( common.getOperationManifestUrl('aServiceId', 'aSchemaHash'), - ).toStrictEqual('v2/aServiceId/aSchemaHash'); + ).toStrictEqual('aServiceId/aSchemaHash.v2.json'); }); }); diff --git a/packages/apollo-server-plugin-operation-registry/src/common.ts b/packages/apollo-server-plugin-operation-registry/src/common.ts index 441f561fcd5..6ee44c2afec 100644 --- a/packages/apollo-server-plugin-operation-registry/src/common.ts +++ b/packages/apollo-server-plugin-operation-registry/src/common.ts @@ -26,8 +26,9 @@ export function getOperationManifestUrl( hashedServiceId: string, schemaHash: string, ): string { - return [urlOperationManifestBase, 'v2', hashedServiceId, schemaHash].join( - '/', + return ( + [urlOperationManifestBase, hashedServiceId, schemaHash].join('/') + + '.v2.json' ); } From 0fbd0892f52fa30a065278896eca3f94314a24b5 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Wed, 13 Mar 2019 18:05:44 +0200 Subject: [PATCH 073/642] Update `apollo-graphql` to latest 0.2.x version. This incorporates the changes from: https://github.com/apollographql/apollo-tooling/pull/1112 ...which provides a new `defaultOperationRegistrySignature` function that will be utilized by both the CLI and this plugin to provide the same normalization. --- packages/apollo-server-plugin-operation-registry/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/package.json b/packages/apollo-server-plugin-operation-registry/package.json index 6312ad3ba07..d98b9b68f5b 100644 --- a/packages/apollo-server-plugin-operation-registry/package.json +++ b/packages/apollo-server-plugin-operation-registry/package.json @@ -11,7 +11,7 @@ "node": ">=8" }, "dependencies": { - "apollo-graphql": "0.1.2", + "apollo-graphql": "0.2.0", "apollo-server-caching": "^0.3.1", "apollo-server-errors": "^2.2.0", "apollo-server-plugin-base": "^0.3.2", From 1cc773fcdd4bf9607257f2de6453482c9e538c1d Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Wed, 13 Mar 2019 19:52:14 +0200 Subject: [PATCH 074/642] Pass the `operationName` to `defaultOperationRegistrySignature`. Start passing the `operationName` to `defaultOperationRegistrySignature`. https://github.com/apollographql/apollo-tooling/pull/1115 If `operationName` is `null`, then the operation is anonymous. However, it's not possible to register anonymous operations from the `apollo` CLI. We could fail early, however, we still want to abide by the desires of `forbidUnregisteredOperations`, so we'll allow this hash be generated anyway. The hash cannot be in the manifest, so this would be okay and allow this code to remain less conditional-y, eventually forbidding the operation when the has is not found and `forbidUnregisteredOperations` is on. --- .../src/ApolloServerPluginOperationRegistry.ts | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts index cefb5ee6958..321b076f70d 100644 --- a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts +++ b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts @@ -105,7 +105,21 @@ export default function plugin(options: Options = Object.create(null)) { } const hash = operationHash( - defaultOperationRegistrySignature(document), + defaultOperationRegistrySignature( + document, + + // XXX The `operationName` is set from the AST, not from the + // request `operationName`. If `operationName` is `null`, + // then the operation is anonymous. However, it's not possible + // to register anonymous operations from the `apollo` CLI. + // We could fail early, however, we still want to abide by the + // desires of `forbidUnregisteredOperations`, so we'll allow + // this hash be generated anyway. The hash cannot be in the + // manifest, so this would be okay and allow this code to remain + // less conditional-y, eventually forbidding the operation when + // the has is not found and `forbidUnregisteredOperations` is on. + requestContext.operationName || '', + ), ); // If the document itself was missing and we didn't receive a From eb2ff70bf56da1a7dfb730bf7ba60a6d326cd9db Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Wed, 13 Mar 2019 19:59:50 +0200 Subject: [PATCH 075/642] Update ApolloServerPluginOperationRegistry.ts --- .../src/ApolloServerPluginOperationRegistry.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts index 321b076f70d..0ec86ecff97 100644 --- a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts +++ b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts @@ -117,7 +117,7 @@ export default function plugin(options: Options = Object.create(null)) { // this hash be generated anyway. The hash cannot be in the // manifest, so this would be okay and allow this code to remain // less conditional-y, eventually forbidding the operation when - // the has is not found and `forbidUnregisteredOperations` is on. + // the hash is not found and `forbidUnregisteredOperations` is on. requestContext.operationName || '', ), ); From 740e32e26b92682c93e2bad00eb5bb3d1e3224b1 Mon Sep 17 00:00:00 2001 From: Trevor Scheer Date: Wed, 13 Mar 2019 17:40:59 -0700 Subject: [PATCH 076/642] Update tests to account for new v2 filename format --- .../src/__tests__/agent.test.ts | 4 ++-- .../src/__tests__/common.test.ts | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts index 8b3acbdface..e5d7aebbc91 100644 --- a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts @@ -124,7 +124,7 @@ describe('Agent', () => { it('correctly prepared the test environment', () => { expect(getOperationManifestUrl('abc123', 'def456')).toStrictEqual( - urlResolve(fakeBaseUrl, '/abc123/def456'), + urlResolve(fakeBaseUrl, '/abc123/def456.v2.json'), ); }); @@ -409,7 +409,7 @@ function hashedServiceId(serviceID: string) { } function pathForServiceAndSchema(serviceID: string, schemaHash: string) { - return `/${hashedServiceId(serviceID)}/${schemaHash}`; + return `/${hashedServiceId(serviceID)}/${schemaHash}.v2.json`; } function nockManifestForServiceAndSchema( diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/common.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/common.test.ts index 949fff6b61d..97ca0f9b69f 100644 --- a/packages/apollo-server-plugin-operation-registry/src/__tests__/common.test.ts +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/common.test.ts @@ -8,6 +8,8 @@ describe('common', () => { it('uses the v2 manifest suffix', () => { expect( common.getOperationManifestUrl('aServiceId', 'aSchemaHash'), - ).toStrictEqual('aServiceId/aSchemaHash.v2.json'); + ).toMatchInlineSnapshot( + `"https://storage.googleapis.com/engine-op-manifest-storage-prod/aServiceId/aSchemaHash.v2.json"`, + ); }); }); From 3374ea057c508e0815f1353f5fe23e59df155c2b Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 14 Mar 2019 23:02:39 +0200 Subject: [PATCH 077/642] Publish - apollo-federation@0.1.0-alpha.0 - apollo-gateway@0.1.0-alpha.0 - apollo-server-plugin-operation-registry@0.1.0-alpha.0 --- packages/apollo-server-plugin-operation-registry/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/package.json b/packages/apollo-server-plugin-operation-registry/package.json index d98b9b68f5b..6c5677e8380 100644 --- a/packages/apollo-server-plugin-operation-registry/package.json +++ b/packages/apollo-server-plugin-operation-registry/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-plugin-operation-registry", - "version": "0.0.1-alpha.7", + "version": "0.1.0-alpha.0", "description": "Apollo Server operation registry", "main": "dist/index.js", "types": "dist/index.d.ts", From 3f7f1cc3522dc7beb3ef312d51451c6e251125ea Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Fri, 15 Mar 2019 20:30:55 +0200 Subject: [PATCH 078/642] Allow manifest version 2. Forbid manifest version 1. --- packages/apollo-server-plugin-operation-registry/src/agent.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/agent.ts b/packages/apollo-server-plugin-operation-registry/src/agent.ts index cb59347a0b3..0ee7f876f49 100644 --- a/packages/apollo-server-plugin-operation-registry/src/agent.ts +++ b/packages/apollo-server-plugin-operation-registry/src/agent.ts @@ -239,7 +239,7 @@ export default class Agent { public async updateManifest(manifest: OperationManifest) { if ( !manifest || - manifest.version !== 1 || + manifest.version !== 2 || !Array.isArray(manifest.operations) ) { throw new Error('Invalid manifest format.'); From 6b67dce9f41f2f93891a2efc0032b11c2d2853a7 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Fri, 15 Mar 2019 20:39:51 +0200 Subject: [PATCH 079/642] Publish - apollo-server-plugin-operation-registry@0.1.0-alpha.1 --- packages/apollo-server-plugin-operation-registry/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/package.json b/packages/apollo-server-plugin-operation-registry/package.json index 6c5677e8380..30a39bcf6de 100644 --- a/packages/apollo-server-plugin-operation-registry/package.json +++ b/packages/apollo-server-plugin-operation-registry/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-plugin-operation-registry", - "version": "0.1.0-alpha.0", + "version": "0.1.0-alpha.1", "description": "Apollo Server operation registry", "main": "dist/index.js", "types": "dist/index.d.ts", From 6beed83387397ad1a375cc7a8d50f1b4c655c959 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 18 Mar 2019 18:40:47 +0200 Subject: [PATCH 080/642] op-reg: The APQ cache is no longer used, so these tests must be adjusted. --- .../src/__tests__/agent.test.ts | 8 ++++---- .../src/__tests__/common.test.ts | 2 +- .../apollo-server-plugin-operation-registry/src/common.ts | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts index e5d7aebbc91..eed6c5210b4 100644 --- a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts @@ -1,5 +1,5 @@ import nock from 'nock'; -import { InMemoryLRUCache, KeyValueCache } from 'apollo-server-caching'; +import { InMemoryLRUCache } from 'apollo-server-caching'; import { envOverrideOperationManifest, getStoreKey } from '../common'; import { resolve as urlResolve } from 'url'; import { createHash } from 'crypto'; @@ -23,7 +23,7 @@ const getRequiredAgentOptions = ( serviceID = genericServiceID, ...addlOptions }: { - store?: KeyValueCache; + store?: InMemoryLRUCache; schemaHash?: string; serviceID?: string; } = { @@ -130,7 +130,7 @@ describe('Agent', () => { describe('manifest checking and store populating', () => { const forCleanup: { - store?: KeyValueCache; + store?: InMemoryLRUCache; agent?: import('../agent').default; }[] = []; @@ -203,7 +203,7 @@ describe('Agent', () => { } async function expectStoreHasOperationEach( - store: KeyValueCache, + store: InMemoryLRUCache, letters: string[], ) { for (const letter of letters) { diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/common.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/common.test.ts index 97ca0f9b69f..d43682b007c 100644 --- a/packages/apollo-server-plugin-operation-registry/src/__tests__/common.test.ts +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/common.test.ts @@ -2,7 +2,7 @@ import * as common from '../common'; describe('common', () => { it('uses the correct cache prefix', () => { - expect(common.getStoreKey('abc123')).toStrictEqual('apq:abc123'); + expect(common.getStoreKey('abc123')).toStrictEqual('abc123'); }); it('uses the v2 manifest suffix', () => { diff --git a/packages/apollo-server-plugin-operation-registry/src/common.ts b/packages/apollo-server-plugin-operation-registry/src/common.ts index 6ee44c2afec..9487e8ff289 100644 --- a/packages/apollo-server-plugin-operation-registry/src/common.ts +++ b/packages/apollo-server-plugin-operation-registry/src/common.ts @@ -14,7 +14,7 @@ const urlOperationManifestBase: string = ((): string => { return desiredUrl.replace(/\/$/, ''); })(); -export const getStoreKey = (signature: string) => `apq:${signature}`; +export const getStoreKey = (signature: string) => `${signature}`; export function generateServiceIdHash(serviceId: string): string { return createHash('sha512') From 5f4e56959708123d62409b8e4ef62402257810e3 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 18 Mar 2019 18:41:08 +0200 Subject: [PATCH 081/642] op-reg: Ensure that the version 2 manifest format is received. --- .../src/__tests__/agent.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts index eed6c5210b4..0eeb6af4cde 100644 --- a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts @@ -425,7 +425,7 @@ function nockSuccessfulManifestForServiceAndSchema( operations: ManifestRecord[], ) { return nockManifestForServiceAndSchema(serviceID, schemaHash).reply(200, { - version: 1, + version: 2, operations, }); } From c4f2919697b611906cba3a91a5aab40eaae228ef Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 21 Mar 2019 16:02:11 +0200 Subject: [PATCH 082/642] Change `package.json` `license` properties to comply with npm requirements. Specifically, using the format indicated here: https://docs.npmjs.com/files/package.json#license --- packages/apollo-server-plugin-operation-registry/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/package.json b/packages/apollo-server-plugin-operation-registry/package.json index 30a39bcf6de..cfca30feca0 100644 --- a/packages/apollo-server-plugin-operation-registry/package.json +++ b/packages/apollo-server-plugin-operation-registry/package.json @@ -6,7 +6,7 @@ "types": "dist/index.d.ts", "keywords": [], "author": "Apollo ", - "license": "Copyright (c) Meteor Development Group, Inc.; See LICENSE.md.", + "license": "SEE LICENSE IN LICENSE.md", "engines": { "node": ">=8" }, From 84d6ba3e8eede0749b00c6b5c38022df310a6107 Mon Sep 17 00:00:00 2001 From: Trevor Scheer Date: Wed, 3 Apr 2019 07:55:13 -0700 Subject: [PATCH 083/642] Publish - apollo-federation@0.1.0-alpha.1 - apollo-gateway@0.1.0-alpha.1 - apollo-server-plugin-operation-registry@0.1.0-alpha.2 --- packages/apollo-server-plugin-operation-registry/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/package.json b/packages/apollo-server-plugin-operation-registry/package.json index cfca30feca0..312e3a869a9 100644 --- a/packages/apollo-server-plugin-operation-registry/package.json +++ b/packages/apollo-server-plugin-operation-registry/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-plugin-operation-registry", - "version": "0.1.0-alpha.1", + "version": "0.1.0-alpha.2", "description": "Apollo Server operation registry", "main": "dist/index.js", "types": "dist/index.d.ts", From ac035de6dbf7afca6bd3d86a31a2bd10081d2ed1 Mon Sep 17 00:00:00 2001 From: James Baxley Date: Sat, 13 Apr 2019 15:33:21 -0400 Subject: [PATCH 084/642] upgrade dependencies and add test for promise returns or resolveReferencE --- packages/apollo-server-plugin-operation-registry/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/package.json b/packages/apollo-server-plugin-operation-registry/package.json index 312e3a869a9..4de52a04bb7 100644 --- a/packages/apollo-server-plugin-operation-registry/package.json +++ b/packages/apollo-server-plugin-operation-registry/package.json @@ -11,7 +11,7 @@ "node": ">=8" }, "dependencies": { - "apollo-graphql": "0.2.0", + "apollo-graphql": "^0.2.1-alpha.1", "apollo-server-caching": "^0.3.1", "apollo-server-errors": "^2.2.0", "apollo-server-plugin-base": "^0.3.2", From 5f6161533b3d48b1b1aaf6b50df41f25219f34c3 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Wed, 17 Apr 2019 11:18:04 -0700 Subject: [PATCH 085/642] Publish - apollo-server-plugin-operation-registry@0.1.0-alpha.3 --- packages/apollo-server-plugin-operation-registry/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/package.json b/packages/apollo-server-plugin-operation-registry/package.json index 312e3a869a9..5b01709c89a 100644 --- a/packages/apollo-server-plugin-operation-registry/package.json +++ b/packages/apollo-server-plugin-operation-registry/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-plugin-operation-registry", - "version": "0.1.0-alpha.2", + "version": "0.1.0-alpha.3", "description": "Apollo Server operation registry", "main": "dist/index.js", "types": "dist/index.d.ts", From 75f29129b075f9402a7bbe7d629b5f5125da8f97 Mon Sep 17 00:00:00 2001 From: Trevor Scheer Date: Wed, 17 Apr 2019 11:50:06 -0700 Subject: [PATCH 086/642] Add `dryRun` option to plugin (#71) Add dryRun option to plugin options --- .../ApolloServerPluginOperationRegistry.ts | 27 ++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts index 0ec86ecff97..2a100a21a60 100644 --- a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts +++ b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts @@ -26,6 +26,7 @@ interface Options { forbidUnregisteredOperations?: | boolean | ForbidUnregisteredOperationsPredicate; + dryRun?: boolean; } export default function plugin(options: Options = Object.create(null)) { @@ -34,6 +35,7 @@ export default function plugin(options: Options = Object.create(null)) { // Setup logging facilities, scoped under the appropriate name. const logger = loglevel.getLogger(`apollo-server:${pluginName}`); + const dryRunPrefix = '[DRYRUN]'; // Support DEBUG environment variable, à la https://npm.im/debug/. loglevelDebug(logger); @@ -43,6 +45,14 @@ export default function plugin(options: Options = Object.create(null)) { logger.enableAll(); } + // Notify about logging as a result of dryRun === true + if (options.dryRun === true) { + logger.enableAll(); + logger.debug( + `${dryRunPrefix} Operation registry logging enabled because options.dryRun is true.`, + ); + } + // Options shouldn't be changed after the plugin has been initiated. // If this proves to be necessary in the future, we can relax this at that // time depending on the usecase. @@ -198,14 +208,25 @@ export default function plugin(options: Options = Object.create(null)) { // since this will only be used for stats. if (forbidUnregisteredOperations) { logger.debug( - `${logHash}: Execution denied because 'forbidUnregisteredOperations' was enabled for this request and the operation was not found in the local operation registry.`, + `${options.dryRun && + dryRunPrefix} ${logHash}: Execution denied because 'forbidUnregisteredOperations' was enabled for this request and the operation was not found in the local operation registry.`, ); - throw new ForbiddenError('Execution forbidden'); + if (!options.dryRun) { + throw new ForbiddenError('Execution forbidden'); + } else { + logger.debug( + `${dryRunPrefix} ${logHash}: Operation ${ + requestContext.operationName + } would have been forbidden.`, + ); + } } logger.debug( - `${logHash}: Execution permitted without a matching entry in the local operation registry because 'forbidUnregisteredOperations' was not enabled for this request.`, + `${logHash}: Execution of operation ${ + requestContext.operationName + } permitted without a matching entry in the local operation registry because 'forbidUnregisteredOperations' was not enabled for this request.`, ); }, }; From bda83a5d2fbc2618b19a7617e7c893547611a0fc Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Wed, 17 Apr 2019 12:03:30 -0700 Subject: [PATCH 087/642] Publish - apollo-server-plugin-operation-registry@0.1.0-alpha.4 --- packages/apollo-server-plugin-operation-registry/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/package.json b/packages/apollo-server-plugin-operation-registry/package.json index 5b01709c89a..fd7aebc4a14 100644 --- a/packages/apollo-server-plugin-operation-registry/package.json +++ b/packages/apollo-server-plugin-operation-registry/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-plugin-operation-registry", - "version": "0.1.0-alpha.3", + "version": "0.1.0-alpha.4", "description": "Apollo Server operation registry", "main": "dist/index.js", "types": "dist/index.d.ts", From 90c2eeba50f95bbf72b038d6f1890f8b9f88853e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Tue, 7 May 2019 18:18:34 +0000 Subject: [PATCH 088/642] chore(deps): update dependency apollo-server-caching to ^0.4.0 (#96) --- packages/apollo-server-plugin-operation-registry/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/package.json b/packages/apollo-server-plugin-operation-registry/package.json index fd7aebc4a14..8746dd251c1 100644 --- a/packages/apollo-server-plugin-operation-registry/package.json +++ b/packages/apollo-server-plugin-operation-registry/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "apollo-graphql": "0.2.0", - "apollo-server-caching": "^0.3.1", + "apollo-server-caching": "^0.4.0", "apollo-server-errors": "^2.2.0", "apollo-server-plugin-base": "^0.3.2", "fast-json-stable-stringify": "^2.0.0", From 18e646173cec26fab7abf8f860bddf097b750f22 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Tue, 7 May 2019 20:16:26 +0000 Subject: [PATCH 089/642] chore(deps): update dependency apollo-server-plugin-base to ^0.4.0 (#97) --- packages/apollo-server-plugin-operation-registry/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/package.json b/packages/apollo-server-plugin-operation-registry/package.json index 8746dd251c1..e96b204e4f1 100644 --- a/packages/apollo-server-plugin-operation-registry/package.json +++ b/packages/apollo-server-plugin-operation-registry/package.json @@ -14,7 +14,7 @@ "apollo-graphql": "0.2.0", "apollo-server-caching": "^0.4.0", "apollo-server-errors": "^2.2.0", - "apollo-server-plugin-base": "^0.3.2", + "apollo-server-plugin-base": "^0.4.0", "fast-json-stable-stringify": "^2.0.0", "loglevel": "^1.6.1", "loglevel-debug": "^0.0.1", From f1479db430a9dfdbd3fc2045cc5b82f5a77371ed Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Fri, 10 May 2019 00:19:45 +0000 Subject: [PATCH 090/642] chore(deps): update dependency apollo-graphql to v0.3.0 (#99) --- packages/apollo-server-plugin-operation-registry/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/package.json b/packages/apollo-server-plugin-operation-registry/package.json index e96b204e4f1..8b5066f1443 100644 --- a/packages/apollo-server-plugin-operation-registry/package.json +++ b/packages/apollo-server-plugin-operation-registry/package.json @@ -11,7 +11,7 @@ "node": ">=8" }, "dependencies": { - "apollo-graphql": "0.2.0", + "apollo-graphql": "0.3.0", "apollo-server-caching": "^0.4.0", "apollo-server-errors": "^2.2.0", "apollo-server-plugin-base": "^0.4.0", From 2cee4a1afc568956c79133486e28fb29502c8dbf Mon Sep 17 00:00:00 2001 From: Trevor Scheer Date: Fri, 10 May 2019 14:19:49 -0700 Subject: [PATCH 091/642] Update enterprise gateway (#100) * Update deps / repo cleanup * Update tooling deps to latest (from federation alphas) * Remove apollo-federation -> @apollo/federation * Miscellaneous repo cleanup * Trim duped code from apollo-server-enterprise --- packages/apollo-server-plugin-operation-registry/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/package.json b/packages/apollo-server-plugin-operation-registry/package.json index 8c7980e58a7..828cb7ed264 100644 --- a/packages/apollo-server-plugin-operation-registry/package.json +++ b/packages/apollo-server-plugin-operation-registry/package.json @@ -11,7 +11,7 @@ "node": ">=8" }, "dependencies": { - "apollo-graphql": "^0.2.1-alpha.1", + "apollo-graphql": "^0.3.0", "apollo-server-caching": "^0.3.1", "apollo-server-errors": "^2.2.0", "apollo-server-plugin-base": "^0.3.2", From 200a69645938d0a1f6e045c3ad1d2dcfdfa4b00e Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 14 May 2019 18:47:28 +0300 Subject: [PATCH 092/642] Remove no longer relevant comment. --- .../src/ApolloServerPluginOperationRegistry.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts index 2a100a21a60..a99a2a5dfd7 100644 --- a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts +++ b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts @@ -132,9 +132,6 @@ export default function plugin(options: Options = Object.create(null)) { ), ); - // If the document itself was missing and we didn't receive a - // `queryHash` (the persisted query `sha256Hash` from the APQ - // `extensions`), then we have nothing to work with. if (!hash) { throw new ApolloError('No document.'); } From 6ad5446ec7ce303800a0efd3d9409a9c32fb1b76 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Fri, 17 May 2019 00:20:42 +0000 Subject: [PATCH 093/642] chore(deps): update dependency apollo-graphql to v0.3.1 (#107) --- packages/apollo-server-plugin-operation-registry/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/package.json b/packages/apollo-server-plugin-operation-registry/package.json index 8b5066f1443..b05e0db77aa 100644 --- a/packages/apollo-server-plugin-operation-registry/package.json +++ b/packages/apollo-server-plugin-operation-registry/package.json @@ -11,7 +11,7 @@ "node": ">=8" }, "dependencies": { - "apollo-graphql": "0.3.0", + "apollo-graphql": "0.3.1", "apollo-server-caching": "^0.4.0", "apollo-server-errors": "^2.2.0", "apollo-server-plugin-base": "^0.4.0", From c6539365e4b4e0a8af6a68def8b780ff293c0f9c Mon Sep 17 00:00:00 2001 From: Chang Wang Date: Tue, 21 May 2019 16:18:15 -0400 Subject: [PATCH 094/642] simplify getRequiredAgentOptions from fn to obj --- .../src/__tests__/agent.test.ts | 41 +++++-------------- 1 file changed, 11 insertions(+), 30 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts index 0eeb6af4cde..83e8fa035d7 100644 --- a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts @@ -13,31 +13,12 @@ const genericSchemaHash = 'abc123'; const genericServiceID = 'test-service'; const pollSeconds = 60; -// Utility function for building the required options to pass to the Agent -// constructor. These can be overridden when necessary, but default to the -// generic options above. -const getRequiredAgentOptions = ( - { - store = defaultStore(), - schemaHash = genericSchemaHash, - serviceID = genericServiceID, - ...addlOptions - }: { - store?: InMemoryLRUCache; - schemaHash?: string; - serviceID?: string; - } = { - store: defaultStore(), - schemaHash: genericSchemaHash, - serviceID: genericServiceID, - }, -): AgentOptions => ({ - schemaHash, - engine: { serviceID }, - store, +const defaultAgentOptions: AgentOptions = { + schemaHash: genericSchemaHash, + engine: { serviceID: genericServiceID }, + store: defaultStore(), pollSeconds, - ...addlOptions, -}); +}; interface ManifestRecord { signature: string; @@ -69,17 +50,17 @@ describe('Agent', () => { describe('Basic', () => { const Agent = require('../agent').default; it('instantiates with proper options', () => { - expect(new Agent({ ...getRequiredAgentOptions() })).toBeInstanceOf(Agent); + expect(new Agent({ ...defaultAgentOptions })).toBeInstanceOf(Agent); }); it('instantiates with debug enabled', () => { - expect( - new Agent({ ...getRequiredAgentOptions(), debug: true }), - ).toBeInstanceOf(Agent); + expect(new Agent({ ...defaultAgentOptions, debug: true })).toBeInstanceOf( + Agent, + ); }); it('fails to instantiate when `schemaHash` is not passed', () => { - const { schemaHash, ...remainingOptions } = getRequiredAgentOptions(); + const { schemaHash, ...remainingOptions } = defaultAgentOptions; expect(() => { // @ts-ignore: Intentionally not passing the parameter we need. new Agent(remainingOptions); @@ -135,7 +116,7 @@ describe('Agent', () => { }[] = []; function createAgent({ ...args } = {}) { - const options = getRequiredAgentOptions({ ...args }); + const options = { ...defaultAgentOptions, ...args }; // We never actually let the Agent construct its own default store // since we need to pluck the store out to instrument it with spies. From 221fdc60c22d4b3b4c570a1714a8c5b7da07b03b Mon Sep 17 00:00:00 2001 From: Chang Wang Date: Tue, 21 May 2019 16:19:29 -0400 Subject: [PATCH 095/642] provide apiKeyHash in default agent option for test --- .../src/__tests__/agent.test.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts index 83e8fa035d7..a1d84e05f3f 100644 --- a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts @@ -11,11 +11,12 @@ const defaultStore = () => new InMemoryLRUCache(); const genericSchemaHash = 'abc123'; const genericServiceID = 'test-service'; +const genericApiKeyHash = 'someapikeyhash123'; const pollSeconds = 60; const defaultAgentOptions: AgentOptions = { schemaHash: genericSchemaHash, - engine: { serviceID: genericServiceID }, + engine: { serviceID: genericServiceID, apiKeyHash: genericApiKeyHash }, store: defaultStore(), pollSeconds, }; From c8ab80ee60f89a78929ea8858387eae54f1a218b Mon Sep 17 00:00:00 2001 From: Chang Wang Date: Tue, 21 May 2019 16:06:31 -0400 Subject: [PATCH 096/642] require engine.apiKeyHash to be in agent options --- .../apollo-server-plugin-operation-registry/src/agent.ts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/packages/apollo-server-plugin-operation-registry/src/agent.ts b/packages/apollo-server-plugin-operation-registry/src/agent.ts index 0ee7f876f49..7af238c90cb 100644 --- a/packages/apollo-server-plugin-operation-registry/src/agent.ts +++ b/packages/apollo-server-plugin-operation-registry/src/agent.ts @@ -62,6 +62,13 @@ export default class Agent { ) { throw new Error('`engine.serviceID` must be passed to the Agent.'); } + + if ( + typeof this.options.engine !== 'object' || + typeof this.options.engine.apiKeyHash !== 'string' + ) { + throw new Error('`engine.apiKeyHash` must be passed to the Agent.'); + } } async requestPending() { From 42c5c9a6592def3874f3ec085333ecef35f053b4 Mon Sep 17 00:00:00 2001 From: Chang Wang Date: Tue, 21 May 2019 16:28:51 -0400 Subject: [PATCH 097/642] rename getOperationManifestUrl -> getLegacyOperationManifestUrl --- .../apollo-server-plugin-operation-registry/src/common.ts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/common.ts b/packages/apollo-server-plugin-operation-registry/src/common.ts index 9487e8ff289..b95f4ca746b 100644 --- a/packages/apollo-server-plugin-operation-registry/src/common.ts +++ b/packages/apollo-server-plugin-operation-registry/src/common.ts @@ -22,13 +22,12 @@ export function generateServiceIdHash(serviceId: string): string { .digest('hex'); } -export function getOperationManifestUrl( - hashedServiceId: string, +export function getLegacyOperationManifestUrl( + hashedGraphId: string, schemaHash: string, ): string { return ( - [urlOperationManifestBase, hashedServiceId, schemaHash].join('/') + - '.v2.json' + [urlOperationManifestBase, hashedGraphId, schemaHash].join('/') + '.v2.json' ); } From 0f8770e35c94f845e235490eac2bc0e092e3f52d Mon Sep 17 00:00:00 2001 From: Chang Wang Date: Tue, 21 May 2019 16:29:07 -0400 Subject: [PATCH 098/642] update call sites to reflect rename --- .../src/__tests__/agent.test.ts | 7 ++++--- .../src/__tests__/common.test.ts | 2 +- .../apollo-server-plugin-operation-registry/src/agent.ts | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts index a1d84e05f3f..d361284ae27 100644 --- a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts @@ -72,7 +72,7 @@ describe('Agent', () => { describe('fetches', () => { let originalEnvApolloOpManifestBaseUrl: string | undefined; let Agent: typeof import('../agent').default; - let getOperationManifestUrl: typeof import('../common').getOperationManifestUrl; + let getLegacyOperationManifestUrl: typeof import('../common').getLegacyOperationManifestUrl; beforeAll(() => { // Override the tests URL with the one we want to mock/nock/test. @@ -85,7 +85,8 @@ describe('Agent', () => { // Store these on the local scope after we've reset the modules. Agent = require('../agent').default; - getOperationManifestUrl = require('../common').getOperationManifestUrl; + getLegacyOperationManifestUrl = require('../common') + .getLegacyOperationManifestUrl; }); afterAll(() => { @@ -105,7 +106,7 @@ describe('Agent', () => { }); it('correctly prepared the test environment', () => { - expect(getOperationManifestUrl('abc123', 'def456')).toStrictEqual( + expect(getLegacyOperationManifestUrl('abc123', 'def456')).toStrictEqual( urlResolve(fakeBaseUrl, '/abc123/def456.v2.json'), ); }); diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/common.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/common.test.ts index d43682b007c..72312883ccd 100644 --- a/packages/apollo-server-plugin-operation-registry/src/__tests__/common.test.ts +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/common.test.ts @@ -7,7 +7,7 @@ describe('common', () => { it('uses the v2 manifest suffix', () => { expect( - common.getOperationManifestUrl('aServiceId', 'aSchemaHash'), + common.getLegacyOperationManifestUrl('aServiceId', 'aSchemaHash'), ).toMatchInlineSnapshot( `"https://storage.googleapis.com/engine-op-manifest-storage-prod/aServiceId/aSchemaHash.v2.json"`, ); diff --git a/packages/apollo-server-plugin-operation-registry/src/agent.ts b/packages/apollo-server-plugin-operation-registry/src/agent.ts index 7af238c90cb..6712abcbe6e 100644 --- a/packages/apollo-server-plugin-operation-registry/src/agent.ts +++ b/packages/apollo-server-plugin-operation-registry/src/agent.ts @@ -1,5 +1,5 @@ import { - getOperationManifestUrl, + getLegacyOperationManifestUrl, generateServiceIdHash, getStoreKey, pluginName, @@ -140,7 +140,7 @@ export default class Agent { } private async tryUpdate(): Promise { - const manifestUrl = getOperationManifestUrl( + const manifestUrl = getLegacyOperationManifestUrl( this.getHashedServiceId(), this.options.schemaHash, ); From 240f9687daeff7a7d55ea46cdbdfb86f64c42839 Mon Sep 17 00:00:00 2001 From: Chang Wang Date: Tue, 21 May 2019 16:41:29 -0400 Subject: [PATCH 099/642] add function to get storage secret url --- .../src/common.ts | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/packages/apollo-server-plugin-operation-registry/src/common.ts b/packages/apollo-server-plugin-operation-registry/src/common.ts index b95f4ca746b..2a21fd33171 100644 --- a/packages/apollo-server-plugin-operation-registry/src/common.ts +++ b/packages/apollo-server-plugin-operation-registry/src/common.ts @@ -4,6 +4,8 @@ import { createHash } from 'crypto'; export const envOverrideOperationManifest = 'APOLLO_OPERATION_MANIFEST_BASE_URL'; +export const envOverrideStorageSecretBaseUrl = 'APOLLO_STORAGE_SECRET_BASE_URL'; + // Generate and cache our desired operation manifest URL. const urlOperationManifestBase: string = ((): string => { const desiredUrl = @@ -14,6 +16,16 @@ const urlOperationManifestBase: string = ((): string => { return desiredUrl.replace(/\/$/, ''); })(); +// Generate and cache our desired storage secret URL. +const urlStorageSecretBase: string = ((): string => { + const desiredUrl = + process.env[envOverrideStorageSecretBaseUrl] || + 'https://storage.googleapis.com/engine-partial-schema-prod/'; + + // Make sure it has NO trailing slash. + return desiredUrl.replace(/\/$/, ''); +})(); + export const getStoreKey = (signature: string) => `${signature}`; export function generateServiceIdHash(serviceId: string): string { @@ -22,6 +34,13 @@ export function generateServiceIdHash(serviceId: string): string { .digest('hex'); } +export function getStorageSecretUrl( + graphId: string, + apiKeyHash: string, +): string { + return `${urlStorageSecretBase}/${graphId}/${apiKeyHash}/storage-secret.json`; +} + export function getLegacyOperationManifestUrl( hashedGraphId: string, schemaHash: string, From 74316dbce9b33daefb8759f74a379ebbb98141af Mon Sep 17 00:00:00 2001 From: Chang Wang Date: Tue, 21 May 2019 16:45:01 -0400 Subject: [PATCH 100/642] add getOperationManifestUrl --- .../apollo-server-plugin-operation-registry/src/common.ts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/packages/apollo-server-plugin-operation-registry/src/common.ts b/packages/apollo-server-plugin-operation-registry/src/common.ts index 2a21fd33171..2d2af7e9f23 100644 --- a/packages/apollo-server-plugin-operation-registry/src/common.ts +++ b/packages/apollo-server-plugin-operation-registry/src/common.ts @@ -41,6 +41,13 @@ export function getStorageSecretUrl( return `${urlStorageSecretBase}/${graphId}/${apiKeyHash}/storage-secret.json`; } +export function getOperationManifestUrl( + graphId: string, + storageSecret: string, +): string { + return `${urlOperationManifestBase}/${graphId}/${storageSecret}/manifest.v2.json`; +} + export function getLegacyOperationManifestUrl( hashedGraphId: string, schemaHash: string, From e63821ed45f32c5bec87320f9c46bc62e01276d7 Mon Sep 17 00:00:00 2001 From: Chang Wang Date: Tue, 21 May 2019 16:58:33 -0400 Subject: [PATCH 101/642] make explicit what the stored etag corresponds to --- .../src/agent.ts | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/agent.ts b/packages/apollo-server-plugin-operation-registry/src/agent.ts index 6712abcbe6e..0170d8e45fc 100644 --- a/packages/apollo-server-plugin-operation-registry/src/agent.ts +++ b/packages/apollo-server-plugin-operation-registry/src/agent.ts @@ -43,7 +43,7 @@ export default class Agent { // Only exposed for testing. public _timesChecked: number = 0; - private lastSuccessfulETag?: string; + private lastSuccessfulManifestETag?: string; private lastOperationSignatures: SignatureStore = new Set(); private readonly options: AgentOptions = Object.create(null); @@ -162,8 +162,10 @@ export default class Agent { // By saving and providing our last known ETag, we can allow the storage // provider to return us a `304 Not Modified` header rather than the full // response. - if (this.lastSuccessfulETag) { - fetchOptions.headers = { 'If-None-Match': this.lastSuccessfulETag }; + if (this.lastSuccessfulManifestETag) { + fetchOptions.headers = { + 'If-None-Match': this.lastSuccessfulManifestETag, + }; } let response: Response; @@ -204,7 +206,7 @@ export default class Agent { // the same manifest again. const receivedETag = response.headers.get('etag'); if (receivedETag) { - this.lastSuccessfulETag = JSON.parse(receivedETag); + this.lastSuccessfulManifestETag = JSON.parse(receivedETag); } // True is good! From 59bab14567a9a25987c455f6734eb501aca83b48 Mon Sep 17 00:00:00 2001 From: Chang Wang Date: Wed, 22 May 2019 11:11:01 -0400 Subject: [PATCH 102/642] include storage secret fetch and store in poll --- .../src/agent.ts | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/packages/apollo-server-plugin-operation-registry/src/agent.ts b/packages/apollo-server-plugin-operation-registry/src/agent.ts index 0170d8e45fc..acc1fd78b2e 100644 --- a/packages/apollo-server-plugin-operation-registry/src/agent.ts +++ b/packages/apollo-server-plugin-operation-registry/src/agent.ts @@ -3,6 +3,7 @@ import { generateServiceIdHash, getStoreKey, pluginName, + getStorageSecretUrl, } from './common'; import loglevel from 'loglevel'; @@ -37,6 +38,7 @@ export default class Agent { private timer?: NodeJS.Timer; private logger: loglevel.Logger; private hashedServiceId?: string; + private storageSecret?: string; private requestInFlight: Promise | null = null; private lastSuccessfulCheck?: Date; @@ -44,6 +46,7 @@ export default class Agent { public _timesChecked: number = 0; private lastSuccessfulManifestETag?: string; + private lastSuccessfulStorageSecretETag?: string; private lastOperationSignatures: SignatureStore = new Set(); private readonly options: AgentOptions = Object.create(null); @@ -139,7 +142,48 @@ export default class Agent { } } + private async fetchAndUpdateStorageSecret(): Promise { + const storageSecretUrl = getStorageSecretUrl( + this.options.engine.serviceId, + this.options.engine.apiKeyHash, + ); + + const response = await fetch(storageSecretUrl, { + method: 'GET', + // More than three times our polling interval be long enough to wait. + timeout: this.pollSeconds() * 3 /* times */ * 1000 /* ms */, + headers: { + 'If-None-Match': this.lastSuccessfulStorageSecretETag || '', + }, + }); + + if (response.status === 304) { + this.logger.debug( + 'The storage secret was the same as the previous attempt.', + ); + return this.storageSecret as 'string'; + } + + if (!response.ok) { + throw new Error( + `Could not fetch storage secret ${await response.text()}`, + ); + } + + const receivedETag = response.headers.get('etag'); + if (receivedETag) { + this.lastSuccessfulManifestETag = JSON.parse(receivedETag); + } + + const storageSecret = await response.json(); + this.storageSecret = storageSecret; + + return storageSecret; + } + private async tryUpdate(): Promise { + await this.fetchAndUpdateStorageSecret(); + const manifestUrl = getLegacyOperationManifestUrl( this.getHashedServiceId(), this.options.schemaHash, From 252fc4c98770645379fb732f4a863ec3d532bdd5 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Wed, 22 May 2019 18:11:46 +0300 Subject: [PATCH 103/642] op-reg: Improve error messaging for the operation registry plugin. (#95) * op-reg: Improve error messaging for the operation registry plugin. * Correct incorrect comment about return value. As pointed out by @trevor-scheer in https://github.com/apollographql/apollo-platform-commercial/pull/95/files#r281749516 --- .../src/agent.ts | 57 +++++++++++-------- 1 file changed, 34 insertions(+), 23 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/agent.ts b/packages/apollo-server-plugin-operation-registry/src/agent.ts index 0ee7f876f49..5f3fc29e8d2 100644 --- a/packages/apollo-server-plugin-operation-registry/src/agent.ts +++ b/packages/apollo-server-plugin-operation-registry/src/agent.ts @@ -89,7 +89,7 @@ export default class Agent { await pulse(); } catch (err) { console.error( - 'Apollo Server could not begin serving requests immediately because the operation manifest could not be fetched. Attempts will continue to fetch the manifest, but all requests will be forbidden until the manifest is fetched.', + 'The operation manifest could not be fetched. Retries will continue, but requests will be forbidden until the manifest is fetched.', err.message || err, ); } @@ -162,33 +162,44 @@ export default class Agent { let response: Response; try { response = await fetch(manifestUrl, fetchOptions); - } catch (err) { - const ourErrorPrefix = `Unable to fetch operation manifest for ${ - this.options.schemaHash - } in '${this.options.engine.serviceID}': ${err}`; - err.message = `${ourErrorPrefix}: ${err.message}`; + // When the response indicates that the resource hasn't changed, there's + // no need to do any other work. Returning false is meant to indicate + // that there wasn't an update, but there was a successful fetch. + if (response.status === 304) { + this.logger.debug( + 'The published manifest was the same as the previous attempt.', + ); + return false; + } - throw err; - } + if (!response.ok) { + const responseText = await response.text(); - // When the response indicates that the resource hasn't changed, there's - // no need to do any other work. Returning true indicates that this is - // a successful fetch and that we can be assured the manifest is current. - if (response.status === 304) { - this.logger.debug( - 'The published manifest was the same as the previous attempt.', - ); - return false; - } + // The response error code only comes in XML, but we don't have an XML + // parser handy, so we'll just match the string. + if (responseText.includes('AccessDenied')) { + throw new Error( + `No manifest found. Ensure this server's schema has been published with 'apollo service:push' and that operations have been registered with 'apollo client:push'.`, + ); + } - if (!response.ok) { - throw new Error(`Could not fetch manifest ${await response.text()}`); - } + // For other unknown errors. + throw new Error(`Unexpected status: ${responseText}`); + } + + const contentType = response.headers.get('content-type'); + if (contentType && contentType !== 'application/json') { + throw new Error(`Unexpected 'Content-Type' header: ${contentType}`); + } + } catch (err) { + const ourErrorPrefix = `Unable to fetch operation manifest for service '${ + this.options.engine.serviceID + }' and schema '${this.options.schemaHash}'. `; + + err.message = `${ourErrorPrefix}: ${err}`; - const contentType = response.headers.get('content-type'); - if (contentType && contentType !== 'application/json') { - throw new Error(`Unexpected 'Content-Type' header: ${contentType}`); + throw err; } await this.updateManifest(await response.json()); From b3097ff5046bbe3cf850361745d4157fc00c1712 Mon Sep 17 00:00:00 2001 From: Chang Wang Date: Wed, 22 May 2019 15:31:34 -0400 Subject: [PATCH 104/642] remove return values from tryUpdate these aren't being used --- .../apollo-server-plugin-operation-registry/src/agent.ts | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/agent.ts b/packages/apollo-server-plugin-operation-registry/src/agent.ts index acc1fd78b2e..9aed5915a27 100644 --- a/packages/apollo-server-plugin-operation-registry/src/agent.ts +++ b/packages/apollo-server-plugin-operation-registry/src/agent.ts @@ -181,7 +181,7 @@ export default class Agent { return storageSecret; } - private async tryUpdate(): Promise { + private async tryUpdate(): Promise { await this.fetchAndUpdateStorageSecret(); const manifestUrl = getLegacyOperationManifestUrl( @@ -232,7 +232,7 @@ export default class Agent { this.logger.debug( 'The published manifest was the same as the previous attempt.', ); - return false; + return; } if (!response.ok) { @@ -252,9 +252,6 @@ export default class Agent { if (receivedETag) { this.lastSuccessfulManifestETag = JSON.parse(receivedETag); } - - // True is good! - return true; } public async checkForUpdate() { From 3bcb46efe8257717ffac52dc646cdd561c4dc82e Mon Sep 17 00:00:00 2001 From: Chang Wang Date: Wed, 22 May 2019 11:59:47 -0400 Subject: [PATCH 105/642] create fetchIfNoneMatch --- .../src/fetchIfNoneMatch.ts | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 packages/apollo-server-plugin-operation-registry/src/fetchIfNoneMatch.ts diff --git a/packages/apollo-server-plugin-operation-registry/src/fetchIfNoneMatch.ts b/packages/apollo-server-plugin-operation-registry/src/fetchIfNoneMatch.ts new file mode 100644 index 00000000000..aac5cb256b2 --- /dev/null +++ b/packages/apollo-server-plugin-operation-registry/src/fetchIfNoneMatch.ts @@ -0,0 +1,35 @@ +import fetch, { Response, RequestInit } from 'node-fetch'; +import { Logger } from 'loglevel'; + +const urlCachedResponseMap: { [url: string]: Response } = {}; + +export async function fetchIfNoneMatch( + url: string, + logger: Logger, + fetchOptions?: RequestInit, +): Promise { + const cachedResponse = urlCachedResponseMap[url]; + const previousEtag = cachedResponse && cachedResponse.headers.get('etag'); + + const response = await fetch(url, { + ...fetchOptions, + headers: { + ...(fetchOptions && fetchOptions.headers), + ...(previousEtag && { 'If-None-Match': previousEtag }), + }, + }); + + if (response.status === 304) { + logger.debug( + `The response for ${url} was the same as the previous attempt.`, + ); + return cachedResponse.clone(); + } + + if (!response.ok) { + throw new Error(`Fetching ${url} failed with ${await response.text()}`); + } + + urlCachedResponseMap[url] = response; + return response.clone(); +} From 706a76465ad50edb6c41a78990bf0a8f706d5876 Mon Sep 17 00:00:00 2001 From: Chang Wang Date: Wed, 22 May 2019 13:40:44 -0400 Subject: [PATCH 106/642] use fetchIfNoneMatch instead of manual caching --- .../src/agent.ts | 81 +++---------------- 1 file changed, 13 insertions(+), 68 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/agent.ts b/packages/apollo-server-plugin-operation-registry/src/agent.ts index 9aed5915a27..1b3710e1e06 100644 --- a/packages/apollo-server-plugin-operation-registry/src/agent.ts +++ b/packages/apollo-server-plugin-operation-registry/src/agent.ts @@ -8,8 +8,9 @@ import { import loglevel from 'loglevel'; -import fetch, { Response, RequestInit } from 'node-fetch'; +import { Response } from 'node-fetch'; import { InMemoryLRUCache } from 'apollo-server-caching'; +import { fetchIfNoneMatch } from './fetchIfNoneMatch'; const DEFAULT_POLL_SECONDS: number = 30; const SYNC_WARN_TIME_SECONDS: number = 60; @@ -45,8 +46,6 @@ export default class Agent { // Only exposed for testing. public _timesChecked: number = 0; - private lastSuccessfulManifestETag?: string; - private lastSuccessfulStorageSecretETag?: string; private lastOperationSignatures: SignatureStore = new Set(); private readonly options: AgentOptions = Object.create(null); @@ -144,37 +143,16 @@ export default class Agent { private async fetchAndUpdateStorageSecret(): Promise { const storageSecretUrl = getStorageSecretUrl( - this.options.engine.serviceId, + this.options.engine.serviceID, this.options.engine.apiKeyHash, ); - const response = await fetch(storageSecretUrl, { + const response = await fetchIfNoneMatch(storageSecretUrl, this.logger, { method: 'GET', // More than three times our polling interval be long enough to wait. timeout: this.pollSeconds() * 3 /* times */ * 1000 /* ms */, - headers: { - 'If-None-Match': this.lastSuccessfulStorageSecretETag || '', - }, }); - if (response.status === 304) { - this.logger.debug( - 'The storage secret was the same as the previous attempt.', - ); - return this.storageSecret as 'string'; - } - - if (!response.ok) { - throw new Error( - `Could not fetch storage secret ${await response.text()}`, - ); - } - - const receivedETag = response.headers.get('etag'); - if (receivedETag) { - this.lastSuccessfulManifestETag = JSON.parse(receivedETag); - } - const storageSecret = await response.json(); this.storageSecret = storageSecret; @@ -192,29 +170,17 @@ export default class Agent { this.logger.debug(`Checking for manifest changes at ${manifestUrl}`); this._timesChecked++; - const fetchOptions: RequestInit = { - // GET is what we request, but keep in mind that, when we include and get - // a match on the `If-None-Match` header we'll get an early return with a - // status code 304. - method: 'GET', - - // More than three times our polling interval be long enough to wait. - timeout: this.pollSeconds() * 3 /* times */ * 1000 /* ms */, - headers: Object.create(null), - }; - - // By saving and providing our last known ETag, we can allow the storage - // provider to return us a `304 Not Modified` header rather than the full - // response. - if (this.lastSuccessfulManifestETag) { - fetchOptions.headers = { - 'If-None-Match': this.lastSuccessfulManifestETag, - }; - } - let response: Response; try { - response = await fetch(manifestUrl, fetchOptions); + response = await fetchIfNoneMatch(manifestUrl, this.logger, { + // GET is what we request, but keep in mind that, when we include and get + // a match on the `If-None-Match` header we'll get an early return with a + // status code 304. + method: 'GET', + + // More than three times our polling interval be long enough to wait. + timeout: this.pollSeconds() * 3 /* times */ * 1000 /* ms */, + }); } catch (err) { const ourErrorPrefix = `Unable to fetch operation manifest for ${ this.options.schemaHash @@ -225,33 +191,12 @@ export default class Agent { throw err; } - // When the response indicates that the resource hasn't changed, there's - // no need to do any other work. Returning true indicates that this is - // a successful fetch and that we can be assured the manifest is current. - if (response.status === 304) { - this.logger.debug( - 'The published manifest was the same as the previous attempt.', - ); - return; - } - - if (!response.ok) { - throw new Error(`Could not fetch manifest ${await response.text()}`); - } - const contentType = response.headers.get('content-type'); if (contentType && contentType !== 'application/json') { throw new Error(`Unexpected 'Content-Type' header: ${contentType}`); } await this.updateManifest(await response.json()); - - // Save the ETag of the manifest we just received so we can avoid fetching - // the same manifest again. - const receivedETag = response.headers.get('etag'); - if (receivedETag) { - this.lastSuccessfulManifestETag = JSON.parse(receivedETag); - } } public async checkForUpdate() { From a7d9b243234b0f97892ed77470fca654f47a447c Mon Sep 17 00:00:00 2001 From: Chang Wang Date: Wed, 22 May 2019 14:31:30 -0400 Subject: [PATCH 107/642] export urlStorageSecretBase --- packages/apollo-server-plugin-operation-registry/src/common.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/common.ts b/packages/apollo-server-plugin-operation-registry/src/common.ts index 2d2af7e9f23..42f1a9c44bf 100644 --- a/packages/apollo-server-plugin-operation-registry/src/common.ts +++ b/packages/apollo-server-plugin-operation-registry/src/common.ts @@ -17,7 +17,7 @@ const urlOperationManifestBase: string = ((): string => { })(); // Generate and cache our desired storage secret URL. -const urlStorageSecretBase: string = ((): string => { +export const urlStorageSecretBase: string = ((): string => { const desiredUrl = process.env[envOverrideStorageSecretBaseUrl] || 'https://storage.googleapis.com/engine-partial-schema-prod/'; From 16b1bdf482deab60550282a25f4563c89474cc65 Mon Sep 17 00:00:00 2001 From: Chang Wang Date: Wed, 22 May 2019 15:09:30 -0400 Subject: [PATCH 108/642] Dont start promise chain with resolved promise `await agent.requestPending()` in agent.test immediately resolves when requestInFlight has a promise that's already resolved. We want to wait for the entire chain to resolve --- .../apollo-server-plugin-operation-registry/src/agent.ts | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/agent.ts b/packages/apollo-server-plugin-operation-registry/src/agent.ts index 1b3710e1e06..1391790711e 100644 --- a/packages/apollo-server-plugin-operation-registry/src/agent.ts +++ b/packages/apollo-server-plugin-operation-registry/src/agent.ts @@ -40,7 +40,7 @@ export default class Agent { private logger: loglevel.Logger; private hashedServiceId?: string; private storageSecret?: string; - private requestInFlight: Promise | null = null; + private requestInFlight: Promise | null = null; private lastSuccessfulCheck?: Date; // Only exposed for testing. @@ -208,15 +208,12 @@ export default class Agent { return this.requestInFlight; } - const promise = Promise.resolve(); - // Prevent other requests from crossing paths. - this.requestInFlight = promise; + this.requestInFlight = this.tryUpdate(); const resetRequestInFlight = () => (this.requestInFlight = null); - return promise - .then(() => this.tryUpdate()) + return this.requestInFlight .then(result => { // Mark this for reporting and monitoring reasons. this.lastSuccessfulCheck = new Date(); From cb0f04cd950f11db4217e9b2858f31fd04c2d253 Mon Sep 17 00:00:00 2001 From: Chang Wang Date: Wed, 22 May 2019 15:16:15 -0400 Subject: [PATCH 109/642] update tests to nock storage secret --- .../src/__tests__/agent.test.ts | 48 ++++++++++++++++++- 1 file changed, 46 insertions(+), 2 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts index d361284ae27..428fc0ed919 100644 --- a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts @@ -1,6 +1,10 @@ import nock from 'nock'; import { InMemoryLRUCache } from 'apollo-server-caching'; -import { envOverrideOperationManifest, getStoreKey } from '../common'; +import { + envOverrideOperationManifest, + envOverrideStorageSecretBaseUrl, + getStoreKey, +} from '../common'; import { resolve as urlResolve } from 'url'; import { createHash } from 'crypto'; import { AgentOptions } from '../agent'; @@ -71,8 +75,11 @@ describe('Agent', () => { describe('fetches', () => { let originalEnvApolloOpManifestBaseUrl: string | undefined; + let originalEnvOverrideStorageSecretBaseUrl: string | undefined; let Agent: typeof import('../agent').default; let getLegacyOperationManifestUrl: typeof import('../common').getLegacyOperationManifestUrl; + let getStorageSecretUrl: typeof import('../common').getStorageSecretUrl; + let urlStorageSecretBase: string; beforeAll(() => { // Override the tests URL with the one we want to mock/nock/test. @@ -80,6 +87,10 @@ describe('Agent', () => { process.env[envOverrideOperationManifest]; process.env[envOverrideOperationManifest] = fakeBaseUrl; + originalEnvOverrideStorageSecretBaseUrl = + process.env[envOverrideStorageSecretBaseUrl]; + process.env[envOverrideStorageSecretBaseUrl] = fakeBaseUrl; + // Reset the modules so they're ready to be imported. jest.resetModules(); @@ -87,6 +98,8 @@ describe('Agent', () => { Agent = require('../agent').default; getLegacyOperationManifestUrl = require('../common') .getLegacyOperationManifestUrl; + getStorageSecretUrl = require('../common').getStorageSecretUrl; + urlStorageSecretBase = require('../common').urlStorageSecretBase; }); afterAll(() => { @@ -100,6 +113,15 @@ describe('Agent', () => { } else { delete process.env[envOverrideOperationManifest]; } + if (originalEnvOverrideStorageSecretBaseUrl) { + process.env[ + envOverrideStorageSecretBaseUrl + ] = originalEnvOverrideStorageSecretBaseUrl; + + originalEnvOverrideStorageSecretBaseUrl = undefined; + } else { + delete process.env[envOverrideStorageSecretBaseUrl]; + } // Reset modules again. jest.resetModules(); @@ -175,6 +197,17 @@ describe('Agent', () => { ); } + function nockStorageSecret() { + return nockBase() + .get( + getStorageSecretUrl(genericServiceID, genericApiKeyHash).replace( + new RegExp(`^${urlStorageSecretBase}`), + '', + ), + ) + .reply(200, '"someStorageSecret"'); + } + function expectStoreSpyOperationEach( spy: jest.SpyInstance, letters: string[], @@ -198,6 +231,7 @@ describe('Agent', () => { } it('logs debug updates to the manifest on startup', async () => { + nockStorageSecret(); nockGoodManifestABC(); const relevantLogs: any = []; const logger = { @@ -237,6 +271,7 @@ describe('Agent', () => { }); it('populates the manifest store after starting', async () => { + nockStorageSecret(); nockGoodManifestABC(); const store = defaultStore(); const storeSetSpy = jest.spyOn(store, 'set'); @@ -251,6 +286,7 @@ describe('Agent', () => { }); it('starts polling successfully', async () => { + nockStorageSecret(); nockGoodManifestABC(); const store = defaultStore(); const storeSetSpy = jest.spyOn(store, 'set'); @@ -274,6 +310,7 @@ describe('Agent', () => { expect(agent._timesChecked).toBe(1); // Now, we'll expect another request to go out, so we'll nock it. + nockStorageSecret(); nockUnchangedManifestForServiceAndSchema( genericServiceID, genericSchemaHash, @@ -297,6 +334,7 @@ describe('Agent', () => { }); it('continues polling even after initial failure', async () => { + nockStorageSecret(); nockFailedManifestForServiceAndSchema( genericServiceID, genericSchemaHash, @@ -320,8 +358,10 @@ describe('Agent', () => { // Still only one check. expect(agent._timesChecked).toBe(1); + expect(storeSetSpy).toBeCalledTimes(0); // Now, we'll expect another GOOD request to fulfill, so we'll nock it. + nockStorageSecret(); nockGoodManifestABC(); // If we move forward the last remaining millisecond, we should trigger @@ -334,7 +374,8 @@ describe('Agent', () => { // Now the times checked should have gone up. expect(agent._timesChecked).toBe(2); - expect(storeSetSpy).toBeCalledTimes(0); + // And store should have been called with operations ABC + expect(storeSetSpy).toBeCalledTimes(3); }); it('purges operations which are removed from the manifest', async () => { @@ -346,6 +387,7 @@ describe('Agent', () => { const agent = createAgent({ store }); expect(storeSetSpy).toBeCalledTimes(0); + nockStorageSecret(); nockGoodManifestABC(); // Starting with ABC. await agent.checkForUpdate(); expect(agent._timesChecked).toBe(1); @@ -353,6 +395,7 @@ describe('Agent', () => { expect(storeDeleteSpy).toBeCalledTimes(0); await expectStoreHasOperationEach(store, ['a', 'b', 'c']); + nockStorageSecret(); nockGoodManifestAB(); // Just AB in this manifest. await agent.checkForUpdate(); expect(agent._timesChecked).toBe(2); @@ -363,6 +406,7 @@ describe('Agent', () => { store.get(getStoreKey(sampleManifestRecords.c.signature)), ).resolves.toBeUndefined(); + nockStorageSecret(); nockGoodManifestA(); // Just A in this manifest. await agent.checkForUpdate(); expect(agent._timesChecked).toBe(3); From 52b9457ce143cffaf4152b2bc6f3fdd37ea85f21 Mon Sep 17 00:00:00 2001 From: Chang Wang Date: Wed, 22 May 2019 15:37:31 -0400 Subject: [PATCH 110/642] extract fetching manifest into private method --- .../src/agent.ts | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/agent.ts b/packages/apollo-server-plugin-operation-registry/src/agent.ts index 1391790711e..05166b13c70 100644 --- a/packages/apollo-server-plugin-operation-registry/src/agent.ts +++ b/packages/apollo-server-plugin-operation-registry/src/agent.ts @@ -159,14 +159,7 @@ export default class Agent { return storageSecret; } - private async tryUpdate(): Promise { - await this.fetchAndUpdateStorageSecret(); - - const manifestUrl = getLegacyOperationManifestUrl( - this.getHashedServiceId(), - this.options.schemaHash, - ); - + private async fetchManifest(manifestUrl: string): Promise { this.logger.debug(`Checking for manifest changes at ${manifestUrl}`); this._timesChecked++; @@ -196,7 +189,20 @@ export default class Agent { throw new Error(`Unexpected 'Content-Type' header: ${contentType}`); } - await this.updateManifest(await response.json()); + return response.json(); + } + + private async tryUpdate(): Promise { + await this.fetchAndUpdateStorageSecret(); + + const legacyManifestUrl = getLegacyOperationManifestUrl( + this.getHashedServiceId(), + this.options.schemaHash, + ); + + const manifest = await this.fetchManifest(legacyManifestUrl); + + await this.updateManifest(manifest); } public async checkForUpdate() { From 74ad9818bd837f3286dc57b2ac1424e0cc89e353 Mon Sep 17 00:00:00 2001 From: Chang Wang Date: Wed, 22 May 2019 15:47:20 -0400 Subject: [PATCH 111/642] try to fetch manifest using storage secret if that fails, fetch the manifest using the legacy url --- .../src/agent.ts | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/agent.ts b/packages/apollo-server-plugin-operation-registry/src/agent.ts index 05166b13c70..75c200bf445 100644 --- a/packages/apollo-server-plugin-operation-registry/src/agent.ts +++ b/packages/apollo-server-plugin-operation-registry/src/agent.ts @@ -4,6 +4,7 @@ import { getStoreKey, pluginName, getStorageSecretUrl, + getOperationManifestUrl, } from './common'; import loglevel from 'loglevel'; @@ -141,7 +142,7 @@ export default class Agent { } } - private async fetchAndUpdateStorageSecret(): Promise { + private async fetchAndUpdateStorageSecret(): Promise { const storageSecretUrl = getStorageSecretUrl( this.options.engine.serviceID, this.options.engine.apiKeyHash, @@ -193,14 +194,25 @@ export default class Agent { } private async tryUpdate(): Promise { - await this.fetchAndUpdateStorageSecret(); + this.logger.debug(`Checking for storageSecret`); + const storageSecret = await this.fetchAndUpdateStorageSecret(); const legacyManifestUrl = getLegacyOperationManifestUrl( this.getHashedServiceId(), this.options.schemaHash, ); - const manifest = await this.fetchManifest(legacyManifestUrl); + const manifest = await (storageSecret + ? this.fetchManifest( + getOperationManifestUrl(this.options.engine.serviceID, storageSecret), + ).catch(reason => { + this.logger.debug( + `Failed to fetch manifest using storage secret. Try using legacy manifest url ${reason.message || + reason}`, + ); + return this.fetchManifest(legacyManifestUrl); + }) + : this.fetchManifest(legacyManifestUrl)); await this.updateManifest(manifest); } From de2ec0f8b479531c95346d1b248422155c0a75da Mon Sep 17 00:00:00 2001 From: Chang Wang Date: Wed, 22 May 2019 16:25:29 -0400 Subject: [PATCH 112/642] fixup: times checked should only increase by 1 per tryUpdate --- packages/apollo-server-plugin-operation-registry/src/agent.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/agent.ts b/packages/apollo-server-plugin-operation-registry/src/agent.ts index 75c200bf445..b5f9981c40c 100644 --- a/packages/apollo-server-plugin-operation-registry/src/agent.ts +++ b/packages/apollo-server-plugin-operation-registry/src/agent.ts @@ -162,7 +162,6 @@ export default class Agent { private async fetchManifest(manifestUrl: string): Promise { this.logger.debug(`Checking for manifest changes at ${manifestUrl}`); - this._timesChecked++; let response: Response; try { @@ -202,6 +201,8 @@ export default class Agent { this.options.schemaHash, ); + this._timesChecked++; + const manifest = await (storageSecret ? this.fetchManifest( getOperationManifestUrl(this.options.engine.serviceID, storageSecret), From 328ece5aba70cd061c9357ee9846bc3bf22102b4 Mon Sep 17 00:00:00 2001 From: Chang Wang Date: Wed, 22 May 2019 16:45:51 -0400 Subject: [PATCH 113/642] export urlOperationManifestBase so it can be used in tests --- packages/apollo-server-plugin-operation-registry/src/common.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/common.ts b/packages/apollo-server-plugin-operation-registry/src/common.ts index 42f1a9c44bf..efecaee82a5 100644 --- a/packages/apollo-server-plugin-operation-registry/src/common.ts +++ b/packages/apollo-server-plugin-operation-registry/src/common.ts @@ -7,7 +7,7 @@ export const envOverrideOperationManifest = export const envOverrideStorageSecretBaseUrl = 'APOLLO_STORAGE_SECRET_BASE_URL'; // Generate and cache our desired operation manifest URL. -const urlOperationManifestBase: string = ((): string => { +export const urlOperationManifestBase: string = ((): string => { const desiredUrl = process.env[envOverrideOperationManifest] || 'https://storage.googleapis.com/engine-op-manifest-storage-prod/'; From 13c4a0480a62fbda7055c600bb54bdc4da31925c Mon Sep 17 00:00:00 2001 From: Chang Wang Date: Wed, 22 May 2019 16:55:30 -0400 Subject: [PATCH 114/642] update test to accomodate for new manifest location --- .../src/__tests__/agent.test.ts | 79 +++++++++++++------ 1 file changed, 54 insertions(+), 25 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts index 428fc0ed919..ac23db76d0b 100644 --- a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts @@ -14,6 +14,7 @@ const fakeBaseUrl = 'https://myfakehost/'; const defaultStore = () => new InMemoryLRUCache(); const genericSchemaHash = 'abc123'; +const genericStorageSecret = 'someStorageSecret'; const genericServiceID = 'test-service'; const genericApiKeyHash = 'someapikeyhash123'; const pollSeconds = 60; @@ -77,9 +78,12 @@ describe('Agent', () => { let originalEnvApolloOpManifestBaseUrl: string | undefined; let originalEnvOverrideStorageSecretBaseUrl: string | undefined; let Agent: typeof import('../agent').default; + let getOperationManifestUrl: typeof import('../common').getOperationManifestUrl; let getLegacyOperationManifestUrl: typeof import('../common').getLegacyOperationManifestUrl; let getStorageSecretUrl: typeof import('../common').getStorageSecretUrl; let urlStorageSecretBase: string; + let urlOperationManifestBase: string; + let genericOperationManifestUrl: string; beforeAll(() => { // Override the tests URL with the one we want to mock/nock/test. @@ -96,10 +100,17 @@ describe('Agent', () => { // Store these on the local scope after we've reset the modules. Agent = require('../agent').default; + getOperationManifestUrl = require('../common').getOperationManifestUrl; getLegacyOperationManifestUrl = require('../common') .getLegacyOperationManifestUrl; getStorageSecretUrl = require('../common').getStorageSecretUrl; urlStorageSecretBase = require('../common').urlStorageSecretBase; + urlOperationManifestBase = require('../common').urlOperationManifestBase; + + genericOperationManifestUrl = getOperationManifestUrl( + genericServiceID, + genericStorageSecret, + ).replace(new RegExp(`^${urlOperationManifestBase}`), ''); }); afterAll(() => { @@ -169,7 +180,7 @@ describe('Agent', () => { }); // Each nock is good for exactly one request! - function nockGoodManifestABC() { + function nockLegacyGoodManifestABC() { return nockSuccessfulManifestForServiceAndSchema( genericServiceID, genericSchemaHash, @@ -181,6 +192,19 @@ describe('Agent', () => { ); } + function nockGoodManifestABCUnderStorageSecret() { + return nockBase() + .get(genericOperationManifestUrl) + .reply(200, { + version: 2, + operations: [ + sampleManifestRecords.a, + sampleManifestRecords.b, + sampleManifestRecords.c, + ], + }); + } + function nockGoodManifestAB() { return nockSuccessfulManifestForServiceAndSchema( genericServiceID, @@ -205,7 +229,7 @@ describe('Agent', () => { '', ), ) - .reply(200, '"someStorageSecret"'); + .reply(200, JSON.stringify(genericStorageSecret)); } function expectStoreSpyOperationEach( @@ -232,7 +256,7 @@ describe('Agent', () => { it('logs debug updates to the manifest on startup', async () => { nockStorageSecret(); - nockGoodManifestABC(); + nockLegacyGoodManifestABC(); const relevantLogs: any = []; const logger = { debug: jest.fn().mockImplementation((...args: any[]) => { @@ -250,29 +274,39 @@ describe('Agent', () => { expect(relevantLogs[0][0]).toBe( `Checking for manifest changes at ${urlResolve( fakeBaseUrl, - pathForServiceAndSchema(genericServiceID, genericSchemaHash), + getOperationManifestUrl(genericServiceID, genericStorageSecret), )}`, ); - // Console should indicate the records have been added in order. expect(relevantLogs[1][0]).toBe( - `Incoming manifest ADDs: ${sampleManifestRecords.a.signature}`, + `Checking for manifest changes at ${urlResolve( + fakeBaseUrl, + getLegacyOperationManifestUrl( + hashedServiceId(genericServiceID), + genericSchemaHash, + ), + )}`, ); + + // Console should indicate the records have been added in order. expect(relevantLogs[2][0]).toBe( - `Incoming manifest ADDs: ${sampleManifestRecords.b.signature}`, + `Incoming manifest ADDs: ${sampleManifestRecords.a.signature}`, ); expect(relevantLogs[3][0]).toBe( + `Incoming manifest ADDs: ${sampleManifestRecords.b.signature}`, + ); + expect(relevantLogs[4][0]).toBe( `Incoming manifest ADDs: ${sampleManifestRecords.c.signature}`, ); - expect(relevantLogs.length).toBe(4); + expect(relevantLogs.length).toBe(5); logger.debug.mockRestore(); }); it('populates the manifest store after starting', async () => { nockStorageSecret(); - nockGoodManifestABC(); + nockGoodManifestABCUnderStorageSecret(); const store = defaultStore(); const storeSetSpy = jest.spyOn(store, 'set'); await createAgent({ store }).start(); @@ -287,7 +321,7 @@ describe('Agent', () => { it('starts polling successfully', async () => { nockStorageSecret(); - nockGoodManifestABC(); + nockGoodManifestABCUnderStorageSecret(); const store = defaultStore(); const storeSetSpy = jest.spyOn(store, 'set'); const storeDeleteSpy = jest.spyOn(store, 'delete'); @@ -311,10 +345,9 @@ describe('Agent', () => { // Now, we'll expect another request to go out, so we'll nock it. nockStorageSecret(); - nockUnchangedManifestForServiceAndSchema( - genericServiceID, - genericSchemaHash, - ); + nockBase() + .get(genericOperationManifestUrl) + .reply(304); // If we move forward the last remaining millisecond, we should trigger // and end up with a successful sync. @@ -335,7 +368,10 @@ describe('Agent', () => { it('continues polling even after initial failure', async () => { nockStorageSecret(); - nockFailedManifestForServiceAndSchema( + nockBase() + .get(genericOperationManifestUrl) + .reply(500); + nockLegacyFailedManifestForServiceAndSchema( genericServiceID, genericSchemaHash, ); @@ -362,7 +398,7 @@ describe('Agent', () => { // Now, we'll expect another GOOD request to fulfill, so we'll nock it. nockStorageSecret(); - nockGoodManifestABC(); + nockGoodManifestABCUnderStorageSecret(); // If we move forward the last remaining millisecond, we should trigger // and end up with a successful sync. @@ -388,7 +424,7 @@ describe('Agent', () => { expect(storeSetSpy).toBeCalledTimes(0); nockStorageSecret(); - nockGoodManifestABC(); // Starting with ABC. + nockLegacyGoodManifestABC(); // Starting with ABC. await agent.checkForUpdate(); expect(agent._timesChecked).toBe(1); expect(storeSetSpy).toBeCalledTimes(3); @@ -457,16 +493,9 @@ function nockSuccessfulManifestForServiceAndSchema( }); } -function nockFailedManifestForServiceAndSchema( +function nockLegacyFailedManifestForServiceAndSchema( serviceID: string, schemaHash: string, ) { return nockManifestForServiceAndSchema(serviceID, schemaHash).reply(500); } - -function nockUnchangedManifestForServiceAndSchema( - serviceID: string, - schemaHash: string, -) { - return nockManifestForServiceAndSchema(serviceID, schemaHash).reply(304); -} From 42b92a8afb57f78c780d69a937b9064340630a66 Mon Sep 17 00:00:00 2001 From: Chang Wang Date: Wed, 22 May 2019 17:14:56 -0400 Subject: [PATCH 115/642] remove a few levels of abstraction in test --- .../src/__tests__/agent.test.ts | 115 ++++++------------ 1 file changed, 40 insertions(+), 75 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts index ac23db76d0b..9bdd2a8f728 100644 --- a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts @@ -180,47 +180,36 @@ describe('Agent', () => { }); // Each nock is good for exactly one request! - function nockLegacyGoodManifestABC() { - return nockSuccessfulManifestForServiceAndSchema( - genericServiceID, - genericSchemaHash, - [ - sampleManifestRecords.a, - sampleManifestRecords.b, - sampleManifestRecords.c, - ], - ); + function nockLegacyGoodManifest( + operations: ManifestRecord[] = [ + sampleManifestRecords.a, + sampleManifestRecords.b, + sampleManifestRecords.c, + ], + ) { + return nockBase() + .get(pathForServiceAndSchema(genericServiceID, genericSchemaHash)) + .reply(200, { + version: 2, + operations, + }); } - function nockGoodManifestABCUnderStorageSecret() { + function nockGoodManifestsUnderStorageSecret( + operations: ManifestRecord[] = [ + sampleManifestRecords.a, + sampleManifestRecords.b, + sampleManifestRecords.c, + ], + ) { return nockBase() .get(genericOperationManifestUrl) .reply(200, { version: 2, - operations: [ - sampleManifestRecords.a, - sampleManifestRecords.b, - sampleManifestRecords.c, - ], + operations, }); } - function nockGoodManifestAB() { - return nockSuccessfulManifestForServiceAndSchema( - genericServiceID, - genericSchemaHash, - [sampleManifestRecords.a, sampleManifestRecords.b], - ); - } - - function nockGoodManifestA() { - return nockSuccessfulManifestForServiceAndSchema( - genericServiceID, - genericSchemaHash, - [sampleManifestRecords.a], - ); - } - function nockStorageSecret() { return nockBase() .get( @@ -256,7 +245,7 @@ describe('Agent', () => { it('logs debug updates to the manifest on startup', async () => { nockStorageSecret(); - nockLegacyGoodManifestABC(); + nockLegacyGoodManifest(); const relevantLogs: any = []; const logger = { debug: jest.fn().mockImplementation((...args: any[]) => { @@ -306,7 +295,7 @@ describe('Agent', () => { it('populates the manifest store after starting', async () => { nockStorageSecret(); - nockGoodManifestABCUnderStorageSecret(); + nockGoodManifestsUnderStorageSecret(); const store = defaultStore(); const storeSetSpy = jest.spyOn(store, 'set'); await createAgent({ store }).start(); @@ -321,7 +310,7 @@ describe('Agent', () => { it('starts polling successfully', async () => { nockStorageSecret(); - nockGoodManifestABCUnderStorageSecret(); + nockGoodManifestsUnderStorageSecret(); const store = defaultStore(); const storeSetSpy = jest.spyOn(store, 'set'); const storeDeleteSpy = jest.spyOn(store, 'delete'); @@ -345,9 +334,7 @@ describe('Agent', () => { // Now, we'll expect another request to go out, so we'll nock it. nockStorageSecret(); - nockBase() - .get(genericOperationManifestUrl) - .reply(304); + nockGetReply(genericOperationManifestUrl, 304); // If we move forward the last remaining millisecond, we should trigger // and end up with a successful sync. @@ -368,12 +355,10 @@ describe('Agent', () => { it('continues polling even after initial failure', async () => { nockStorageSecret(); - nockBase() - .get(genericOperationManifestUrl) - .reply(500); - nockLegacyFailedManifestForServiceAndSchema( - genericServiceID, - genericSchemaHash, + nockGetReply(genericOperationManifestUrl, 500); + nockGetReply( + pathForServiceAndSchema(genericServiceID, genericSchemaHash), + 500, ); const store = defaultStore(); const storeSetSpy = jest.spyOn(store, 'set'); @@ -398,7 +383,7 @@ describe('Agent', () => { // Now, we'll expect another GOOD request to fulfill, so we'll nock it. nockStorageSecret(); - nockGoodManifestABCUnderStorageSecret(); + nockGoodManifestsUnderStorageSecret(); // If we move forward the last remaining millisecond, we should trigger // and end up with a successful sync. @@ -424,7 +409,7 @@ describe('Agent', () => { expect(storeSetSpy).toBeCalledTimes(0); nockStorageSecret(); - nockLegacyGoodManifestABC(); // Starting with ABC. + nockLegacyGoodManifest(); // Starting with ABC. await agent.checkForUpdate(); expect(agent._timesChecked).toBe(1); expect(storeSetSpy).toBeCalledTimes(3); @@ -432,7 +417,10 @@ describe('Agent', () => { await expectStoreHasOperationEach(store, ['a', 'b', 'c']); nockStorageSecret(); - nockGoodManifestAB(); // Just AB in this manifest. + nockLegacyGoodManifest([ + sampleManifestRecords.a, + sampleManifestRecords.b, + ]); // Just AB in this manifest. await agent.checkForUpdate(); expect(agent._timesChecked).toBe(2); expect(storeSetSpy).toBeCalledTimes(3); // no new sets. @@ -443,7 +431,7 @@ describe('Agent', () => { ).resolves.toBeUndefined(); nockStorageSecret(); - nockGoodManifestA(); // Just A in this manifest. + nockLegacyGoodManifest([sampleManifestRecords.a]); // Just A in this manifest. await agent.checkForUpdate(); expect(agent._timesChecked).toBe(3); expect(storeSetSpy).toBeCalledTimes(3); // no new sets. @@ -461,8 +449,10 @@ function nockBase() { return nock(fakeBaseUrl); } -function nockManifestAtPath(path: string = '') { - return nockBase().get(path); +function nockGetReply(relativePath: string, statusCode: number, body?: any) { + return nockBase() + .get(relativePath) + .reply(statusCode, body); } function hashedServiceId(serviceID: string) { @@ -474,28 +464,3 @@ function hashedServiceId(serviceID: string) { function pathForServiceAndSchema(serviceID: string, schemaHash: string) { return `/${hashedServiceId(serviceID)}/${schemaHash}.v2.json`; } - -function nockManifestForServiceAndSchema( - serviceID: string, - schemaHash: string, -) { - return nockManifestAtPath(pathForServiceAndSchema(serviceID, schemaHash)); -} - -function nockSuccessfulManifestForServiceAndSchema( - serviceID: string, - schemaHash: string, - operations: ManifestRecord[], -) { - return nockManifestForServiceAndSchema(serviceID, schemaHash).reply(200, { - version: 2, - operations, - }); -} - -function nockLegacyFailedManifestForServiceAndSchema( - serviceID: string, - schemaHash: string, -) { - return nockManifestForServiceAndSchema(serviceID, schemaHash).reply(500); -} From 536d9d8ead27dd664a41c2d3a4fdc01504446149 Mon Sep 17 00:00:00 2001 From: Chang Wang Date: Wed, 22 May 2019 18:08:25 -0400 Subject: [PATCH 116/642] update fetchIfNoneMatch to return cached status --- .../src/agent.ts | 11 ++++++----- .../src/fetchIfNoneMatch.ts | 9 ++++++--- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/agent.ts b/packages/apollo-server-plugin-operation-registry/src/agent.ts index b5f9981c40c..5d8a2e97e70 100644 --- a/packages/apollo-server-plugin-operation-registry/src/agent.ts +++ b/packages/apollo-server-plugin-operation-registry/src/agent.ts @@ -148,7 +148,7 @@ export default class Agent { this.options.engine.apiKeyHash, ); - const response = await fetchIfNoneMatch(storageSecretUrl, this.logger, { + const [response] = await fetchIfNoneMatch(storageSecretUrl, this.logger, { method: 'GET', // More than three times our polling interval be long enough to wait. timeout: this.pollSeconds() * 3 /* times */ * 1000 /* ms */, @@ -163,9 +163,9 @@ export default class Agent { private async fetchManifest(manifestUrl: string): Promise { this.logger.debug(`Checking for manifest changes at ${manifestUrl}`); - let response: Response; + let responseToReturn: Response; try { - response = await fetchIfNoneMatch(manifestUrl, this.logger, { + let [response] = await fetchIfNoneMatch(manifestUrl, this.logger, { // GET is what we request, but keep in mind that, when we include and get // a match on the `If-None-Match` header we'll get an early return with a // status code 304. @@ -174,6 +174,7 @@ export default class Agent { // More than three times our polling interval be long enough to wait. timeout: this.pollSeconds() * 3 /* times */ * 1000 /* ms */, }); + responseToReturn = response; } catch (err) { const ourErrorPrefix = `Unable to fetch operation manifest for ${ this.options.schemaHash @@ -184,12 +185,12 @@ export default class Agent { throw err; } - const contentType = response.headers.get('content-type'); + const contentType = responseToReturn.headers.get('content-type'); if (contentType && contentType !== 'application/json') { throw new Error(`Unexpected 'Content-Type' header: ${contentType}`); } - return response.json(); + return responseToReturn.json(); } private async tryUpdate(): Promise { diff --git a/packages/apollo-server-plugin-operation-registry/src/fetchIfNoneMatch.ts b/packages/apollo-server-plugin-operation-registry/src/fetchIfNoneMatch.ts index aac5cb256b2..15f9ecc57bf 100644 --- a/packages/apollo-server-plugin-operation-registry/src/fetchIfNoneMatch.ts +++ b/packages/apollo-server-plugin-operation-registry/src/fetchIfNoneMatch.ts @@ -3,11 +3,14 @@ import { Logger } from 'loglevel'; const urlCachedResponseMap: { [url: string]: Response } = {}; +/** + * @returns {[Response, boolean]} The boolean denotes whether the response was cached + */ export async function fetchIfNoneMatch( url: string, logger: Logger, fetchOptions?: RequestInit, -): Promise { +): Promise<[Response, boolean]> { const cachedResponse = urlCachedResponseMap[url]; const previousEtag = cachedResponse && cachedResponse.headers.get('etag'); @@ -23,7 +26,7 @@ export async function fetchIfNoneMatch( logger.debug( `The response for ${url} was the same as the previous attempt.`, ); - return cachedResponse.clone(); + return [cachedResponse.clone(), true]; } if (!response.ok) { @@ -31,5 +34,5 @@ export async function fetchIfNoneMatch( } urlCachedResponseMap[url] = response; - return response.clone(); + return [response.clone(), false]; } From 39dc7f471596854bbac5bb6f2480490537c68c91 Mon Sep 17 00:00:00 2001 From: Chang Wang Date: Wed, 22 May 2019 18:12:56 -0400 Subject: [PATCH 117/642] remove unused private variable --- .../apollo-server-plugin-operation-registry/src/agent.ts | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/agent.ts b/packages/apollo-server-plugin-operation-registry/src/agent.ts index 19f16a50174..2e478e1cd7d 100644 --- a/packages/apollo-server-plugin-operation-registry/src/agent.ts +++ b/packages/apollo-server-plugin-operation-registry/src/agent.ts @@ -40,7 +40,6 @@ export default class Agent { private timer?: NodeJS.Timer; private logger: loglevel.Logger; private hashedServiceId?: string; - private storageSecret?: string; private requestInFlight: Promise | null = null; private lastSuccessfulCheck?: Date; @@ -170,10 +169,7 @@ export default class Agent { throw new Error(`Unexpected status: ${responseText}`); } - const storageSecret = await response.json(); - this.storageSecret = storageSecret; - - return storageSecret; + return await response.json(); } private async fetchManifest(manifestUrl: string): Promise { From e2ed1a791e3db7453f7b97fc25fa50a85cdc8d30 Mon Sep 17 00:00:00 2001 From: Chang Wang Date: Wed, 22 May 2019 18:18:31 -0400 Subject: [PATCH 118/642] edit jsdoc of return values to be more self-evident --- .../src/fetchIfNoneMatch.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/fetchIfNoneMatch.ts b/packages/apollo-server-plugin-operation-registry/src/fetchIfNoneMatch.ts index 15f9ecc57bf..9e768d585f6 100644 --- a/packages/apollo-server-plugin-operation-registry/src/fetchIfNoneMatch.ts +++ b/packages/apollo-server-plugin-operation-registry/src/fetchIfNoneMatch.ts @@ -4,7 +4,7 @@ import { Logger } from 'loglevel'; const urlCachedResponseMap: { [url: string]: Response } = {}; /** - * @returns {[Response, boolean]} The boolean denotes whether the response was cached + * @returns {[Response, wasCached]} */ export async function fetchIfNoneMatch( url: string, From 86173f68f8d1adb56331bdd3770f5f7a4ae32778 Mon Sep 17 00:00:00 2001 From: Chang Wang Date: Fri, 24 May 2019 16:20:33 -0400 Subject: [PATCH 119/642] minor: reason -> err --- .../apollo-server-plugin-operation-registry/src/agent.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/agent.ts b/packages/apollo-server-plugin-operation-registry/src/agent.ts index 2e478e1cd7d..27916cf58e0 100644 --- a/packages/apollo-server-plugin-operation-registry/src/agent.ts +++ b/packages/apollo-server-plugin-operation-registry/src/agent.ts @@ -248,10 +248,10 @@ export default class Agent { const manifest = await (storageSecret ? this.fetchManifest( getOperationManifestUrl(this.options.engine.serviceID, storageSecret), - ).catch(reason => { + ).catch(err => { this.logger.debug( - `Failed to fetch manifest using storage secret. Try using legacy manifest url ${reason.message || - reason}`, + `Failed to fetch manifest using storage secret. Try using legacy manifest url ${err.message || + err}`, ); return this.fetchManifest(legacyManifestUrl); }) From 441823fed284d238d401a36fd80556c5f8866d0a Mon Sep 17 00:00:00 2001 From: Chang Wang Date: Sat, 25 May 2019 12:29:51 -0400 Subject: [PATCH 120/642] avoid recalculating operations when getting cached response --- .../src/agent.ts | 26 +++++++------------ 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/agent.ts b/packages/apollo-server-plugin-operation-registry/src/agent.ts index 27916cf58e0..64d8e095e99 100644 --- a/packages/apollo-server-plugin-operation-registry/src/agent.ts +++ b/packages/apollo-server-plugin-operation-registry/src/agent.ts @@ -172,10 +172,11 @@ export default class Agent { return await response.json(); } - private async fetchManifest(manifestUrl: string): Promise { + private async fetchManifest( + manifestUrl: string, + ): Promise<[OperationManifest, boolean]> { this.logger.debug(`Checking for manifest changes at ${manifestUrl}`); - let responseToReturn: Response; try { let [response, wasCached] = await fetchIfNoneMatch( manifestUrl, @@ -191,17 +192,6 @@ export default class Agent { }, ); - responseToReturn = response; - - // When the response indicates that the resource hasn't changed, there's - // no need to do any other work. - if (wasCached) { - this.logger.debug( - 'The published manifest was the same as the previous attempt.', - ); - return response.json(); - } - if (!response.ok) { const responseText = await response.text(); @@ -221,6 +211,8 @@ export default class Agent { if (contentType && contentType !== 'application/json') { throw new Error(`Unexpected 'Content-Type' header: ${contentType}`); } + + return [await response.json(), wasCached]; } catch (err) { const ourErrorPrefix = `Unable to fetch operation manifest for ${ this.options.schemaHash @@ -230,8 +222,6 @@ export default class Agent { throw err; } - - return responseToReturn.json(); } private async tryUpdate(): Promise { @@ -245,7 +235,7 @@ export default class Agent { this._timesChecked++; - const manifest = await (storageSecret + const [manifest, wasCached] = await (storageSecret ? this.fetchManifest( getOperationManifestUrl(this.options.engine.serviceID, storageSecret), ).catch(err => { @@ -257,6 +247,10 @@ export default class Agent { }) : this.fetchManifest(legacyManifestUrl)); + if (wasCached) { + return; + } + await this.updateManifest(manifest); } From 7944c178e0d8e3548ac8b3e1ea2e4a14cd3b983c Mon Sep 17 00:00:00 2001 From: Chang Wang Date: Fri, 24 May 2019 16:58:31 -0400 Subject: [PATCH 121/642] descope fetchIfNoneMatch to only deal with etag it will always return the response consumers will manually deal with 304 and !response.ok --- .../src/fetchIfNoneMatch.ts | 27 ++++--------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/fetchIfNoneMatch.ts b/packages/apollo-server-plugin-operation-registry/src/fetchIfNoneMatch.ts index 9e768d585f6..3d232312973 100644 --- a/packages/apollo-server-plugin-operation-registry/src/fetchIfNoneMatch.ts +++ b/packages/apollo-server-plugin-operation-registry/src/fetchIfNoneMatch.ts @@ -1,18 +1,12 @@ import fetch, { Response, RequestInit } from 'node-fetch'; -import { Logger } from 'loglevel'; -const urlCachedResponseMap: { [url: string]: Response } = {}; +const urlEtagMap: { [url: string]: string | null } = {}; -/** - * @returns {[Response, wasCached]} - */ export async function fetchIfNoneMatch( url: string, - logger: Logger, fetchOptions?: RequestInit, -): Promise<[Response, boolean]> { - const cachedResponse = urlCachedResponseMap[url]; - const previousEtag = cachedResponse && cachedResponse.headers.get('etag'); +): Promise { + const previousEtag = urlEtagMap[url]; const response = await fetch(url, { ...fetchOptions, @@ -22,17 +16,6 @@ export async function fetchIfNoneMatch( }, }); - if (response.status === 304) { - logger.debug( - `The response for ${url} was the same as the previous attempt.`, - ); - return [cachedResponse.clone(), true]; - } - - if (!response.ok) { - throw new Error(`Fetching ${url} failed with ${await response.text()}`); - } - - urlCachedResponseMap[url] = response; - return [response.clone(), false]; + urlEtagMap[url] = response.headers.get('etag'); + return response; } From 3bed2d1644cba74409c408a2d690e085ecf3ddfe Mon Sep 17 00:00:00 2001 From: Chang Wang Date: Sat, 25 May 2019 12:33:26 -0400 Subject: [PATCH 122/642] update callsites of fetchIfNoneMatch to handle 304 also restore tryUpdate's return value to Promise --- .../src/agent.ts | 145 +++++++++--------- 1 file changed, 74 insertions(+), 71 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/agent.ts b/packages/apollo-server-plugin-operation-registry/src/agent.ts index 64d8e095e99..9e65db13e58 100644 --- a/packages/apollo-server-plugin-operation-registry/src/agent.ts +++ b/packages/apollo-server-plugin-operation-registry/src/agent.ts @@ -42,6 +42,7 @@ export default class Agent { private hashedServiceId?: string; private requestInFlight: Promise | null = null; private lastSuccessfulCheck?: Date; + private storageSecret?: string; // Only exposed for testing. public _timesChecked: number = 0; @@ -147,84 +148,62 @@ export default class Agent { this.options.engine.apiKeyHash, ); - const [response, wasCached] = await fetchIfNoneMatch( - storageSecretUrl, - this.logger, - { - method: 'GET', - // More than three times our polling interval be long enough to wait. - timeout: this.pollSeconds() * 3 /* times */ * 1000 /* ms */, - }, - ); + const response = await fetchIfNoneMatch(storageSecretUrl, { + method: 'GET', + // More than three times our polling interval be long enough to wait. + timeout: this.pollSeconds() * 3 /* times */ * 1000 /* ms */, + }); - if (wasCached) { + if (response.status === 304) { this.logger.debug( 'The storage secret was the same as the previous attempt.', ); + return this.storageSecret; } if (!response.ok) { const responseText = await response.text(); - // For other unknown errors. - throw new Error(`Unexpected status: ${responseText}`); + this.logger.debug(`Could not fetch storage secret ${responseText}`); + return; } - return await response.json(); + this.storageSecret = await response.json(); + + return this.storageSecret; } - private async fetchManifest( - manifestUrl: string, - ): Promise<[OperationManifest, boolean]> { + private async fetchManifest(manifestUrl: string): Promise { this.logger.debug(`Checking for manifest changes at ${manifestUrl}`); - try { - let [response, wasCached] = await fetchIfNoneMatch( - manifestUrl, - this.logger, - { - // GET is what we request, but keep in mind that, when we include and get - // a match on the `If-None-Match` header we'll get an early return with a - // status code 304. - method: 'GET', - - // More than three times our polling interval be long enough to wait. - timeout: this.pollSeconds() * 3 /* times */ * 1000 /* ms */, - }, - ); - - if (!response.ok) { - const responseText = await response.text(); + let response = await fetchIfNoneMatch(manifestUrl, { + // GET is what we request, but keep in mind that, when we include and get + // a match on the `If-None-Match` header we'll get an early return with a + // status code 304. + method: 'GET', - // The response error code only comes in XML, but we don't have an XML - // parser handy, so we'll just match the string. - if (responseText.includes('AccessDenied')) { - throw new Error( - `No manifest found. Ensure this server's schema has been published with 'apollo service:push' and that operations have been registered with 'apollo client:push'.`, - ); - } + // More than three times our polling interval be long enough to wait. + timeout: this.pollSeconds() * 3 /* times */ * 1000 /* ms */, + }); - // For other unknown errors. - throw new Error(`Unexpected status: ${responseText}`); - } + if (!response.ok && response.status !== 304) { + const responseText = await response.text(); - const contentType = response.headers.get('content-type'); - if (contentType && contentType !== 'application/json') { - throw new Error(`Unexpected 'Content-Type' header: ${contentType}`); + // The response error code only comes in XML, but we don't have an XML + // parser handy, so we'll just match the string. + if (responseText.includes('AccessDenied')) { + throw new Error( + `No manifest found. Ensure this server's schema has been published with 'apollo service:push' and that operations have been registered with 'apollo client:push'.`, + ); } - return [await response.json(), wasCached]; - } catch (err) { - const ourErrorPrefix = `Unable to fetch operation manifest for ${ - this.options.schemaHash - } in '${this.options.engine.serviceID}': ${err}`; - - err.message = `${ourErrorPrefix}: ${err}`; - - throw err; + // For other unknown errors. + throw new Error(`Unexpected status: ${responseText}`); } + + return response; } - private async tryUpdate(): Promise { + private async tryUpdate(): Promise { this.logger.debug(`Checking for storageSecret`); const storageSecret = await this.fetchAndUpdateStorageSecret(); @@ -235,23 +214,47 @@ export default class Agent { this._timesChecked++; - const [manifest, wasCached] = await (storageSecret - ? this.fetchManifest( - getOperationManifestUrl(this.options.engine.serviceID, storageSecret), - ).catch(err => { - this.logger.debug( - `Failed to fetch manifest using storage secret. Try using legacy manifest url ${err.message || - err}`, - ); - return this.fetchManifest(legacyManifestUrl); - }) - : this.fetchManifest(legacyManifestUrl)); - - if (wasCached) { - return; + let response: Response; + try { + response = await (storageSecret + ? this.fetchManifest( + getOperationManifestUrl( + this.options.engine.serviceID, + storageSecret, + ), + ).catch(err => { + this.logger.debug( + `Failed to fetch manifest using storage secret. Try using legacy manifest url ${err.message || + err}`, + ); + return this.fetchManifest(legacyManifestUrl); + }) + : this.fetchManifest(legacyManifestUrl)); + + // When the response indicates that the resource hasn't changed, there's + // no need to do any other work. Returning false is meant to indicate + // that there wasn't an update, but there was a successful fetch. + if (response.status === 304) { + return false; + } + + const contentType = response.headers.get('content-type'); + if (contentType && contentType !== 'application/json') { + throw new Error(`Unexpected 'Content-Type' header: ${contentType}`); + } + } catch (err) { + const ourErrorPrefix = `Unable to fetch operation manifest for ${ + this.options.schemaHash + } in '${this.options.engine.serviceID}': ${err}`; + + err.message = `${ourErrorPrefix}: ${err}`; + + throw err; } - await this.updateManifest(manifest); + await this.updateManifest(await response.json()); + // True is good! + return true; } public async checkForUpdate() { From 76364f2705e9874dfd46ed6113a9923360fd6922 Mon Sep 17 00:00:00 2001 From: Chang Wang Date: Sat, 25 May 2019 14:53:03 -0400 Subject: [PATCH 123/642] show which nocks weren't used in error --- .../src/__tests__/agent.test.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts index 9bdd2a8f728..bfba960a321 100644 --- a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts @@ -166,7 +166,9 @@ describe('Agent', () => { afterEach(() => { if (!nock.isDone()) { - throw new Error('Not all nock interceptors were used!'); + throw new Error( + `Not all nock interceptors were used! Pending mocks: ${nock.pendingMocks()}`, + ); } let toCleanup; From 60a90d077471d38586da745f98063e2e09112224 Mon Sep 17 00:00:00 2001 From: Chang Wang Date: Sat, 25 May 2019 14:55:52 -0400 Subject: [PATCH 124/642] genericStorageSecretOperationManifestUrl, genericLegacyOperationManifestUrl --- .../src/__tests__/agent.test.ts | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts index bfba960a321..e08d522fed3 100644 --- a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts @@ -18,6 +18,10 @@ const genericStorageSecret = 'someStorageSecret'; const genericServiceID = 'test-service'; const genericApiKeyHash = 'someapikeyhash123'; const pollSeconds = 60; +const genericLegacyOperationManifestUrl = pathForServiceAndSchema( + genericServiceID, + genericSchemaHash, +); const defaultAgentOptions: AgentOptions = { schemaHash: genericSchemaHash, @@ -83,7 +87,7 @@ describe('Agent', () => { let getStorageSecretUrl: typeof import('../common').getStorageSecretUrl; let urlStorageSecretBase: string; let urlOperationManifestBase: string; - let genericOperationManifestUrl: string; + let genericStorageSecretOperationManifestUrl: string; beforeAll(() => { // Override the tests URL with the one we want to mock/nock/test. @@ -107,7 +111,7 @@ describe('Agent', () => { urlStorageSecretBase = require('../common').urlStorageSecretBase; urlOperationManifestBase = require('../common').urlOperationManifestBase; - genericOperationManifestUrl = getOperationManifestUrl( + genericStorageSecretOperationManifestUrl = getOperationManifestUrl( genericServiceID, genericStorageSecret, ).replace(new RegExp(`^${urlOperationManifestBase}`), ''); @@ -190,7 +194,7 @@ describe('Agent', () => { ], ) { return nockBase() - .get(pathForServiceAndSchema(genericServiceID, genericSchemaHash)) + .get(genericLegacyOperationManifestUrl) .reply(200, { version: 2, operations, @@ -205,7 +209,7 @@ describe('Agent', () => { ], ) { return nockBase() - .get(genericOperationManifestUrl) + .get(genericStorageSecretOperationManifestUrl) .reply(200, { version: 2, operations, @@ -336,7 +340,7 @@ describe('Agent', () => { // Now, we'll expect another request to go out, so we'll nock it. nockStorageSecret(); - nockGetReply(genericOperationManifestUrl, 304); + nockGetReply(genericStorageSecretOperationManifestUrl, 304); // If we move forward the last remaining millisecond, we should trigger // and end up with a successful sync. @@ -357,11 +361,8 @@ describe('Agent', () => { it('continues polling even after initial failure', async () => { nockStorageSecret(); - nockGetReply(genericOperationManifestUrl, 500); - nockGetReply( - pathForServiceAndSchema(genericServiceID, genericSchemaHash), - 500, - ); + nockGetReply(genericStorageSecretOperationManifestUrl, 500); + nockGetReply(genericLegacyOperationManifestUrl, 500); const store = defaultStore(); const storeSetSpy = jest.spyOn(store, 'set'); const storeDeleteSpy = jest.spyOn(store, 'delete'); From ab6b1c1195b0bb3c9e484f7ca87da7f664e769ce Mon Sep 17 00:00:00 2001 From: Chang Wang Date: Sat, 25 May 2019 16:07:57 -0400 Subject: [PATCH 125/642] add tests for failures using new paths --- .../src/__tests__/agent.test.ts | 50 ++++++++++++++++++- 1 file changed, 48 insertions(+), 2 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts index e08d522fed3..754a9473b61 100644 --- a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts @@ -216,7 +216,10 @@ describe('Agent', () => { }); } - function nockStorageSecret() { + function nockStorageSecret( + status = 200, + body: any = JSON.stringify(genericStorageSecret), + ) { return nockBase() .get( getStorageSecretUrl(genericServiceID, genericApiKeyHash).replace( @@ -224,7 +227,7 @@ describe('Agent', () => { '', ), ) - .reply(200, JSON.stringify(genericStorageSecret)); + .reply(status, body); } function expectStoreSpyOperationEach( @@ -444,6 +447,49 @@ describe('Agent', () => { store.get(getStoreKey(sampleManifestRecords.b.signature)), ).resolves.toBeUndefined(); }); + + describe('when fetching the storage secret fails', () => { + it('will fetch the manifest using the legacy url', async () => { + nockStorageSecret(404); + nockLegacyGoodManifest(); + + const store = defaultStore(); + const storeSetSpy = jest.spyOn(store, 'set'); + const storeDeleteSpy = jest.spyOn(store, 'delete'); + const agent = createAgent({ store }); + jest.useFakeTimers(); + await agent.start(); + + // Three additions, no deletions. + expect(storeSetSpy).toBeCalledTimes(3); + expect(storeDeleteSpy).toBeCalledTimes(0); + + // Only the initial start-up check should have happened by now. + expect(agent._timesChecked).toBe(1); + }); + }); + + describe('when fetching the manifest using the storage secret fails', () => { + it('will fallback to fetching the manifest using the legacy url', async () => { + nockStorageSecret(); + nockGetReply(genericStorageSecretOperationManifestUrl, 404); + nockLegacyGoodManifest(); + + const store = defaultStore(); + const storeSetSpy = jest.spyOn(store, 'set'); + const storeDeleteSpy = jest.spyOn(store, 'delete'); + const agent = createAgent({ store }); + jest.useFakeTimers(); + await agent.start(); + + // Three additions, no deletions. + expect(storeSetSpy).toBeCalledTimes(3); + expect(storeDeleteSpy).toBeCalledTimes(0); + + // Only the initial start-up check should have happened by now. + expect(agent._timesChecked).toBe(1); + }); + }); }); }); }); From e9d1962c7a32df01281990316350a78bd3c2a81b Mon Sep 17 00:00:00 2001 From: Chang Wang Date: Wed, 29 May 2019 10:28:59 -0400 Subject: [PATCH 126/642] directly use nockBase --- .../src/__tests__/agent.test.ts | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts index 754a9473b61..4e9e0456738 100644 --- a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts @@ -343,7 +343,7 @@ describe('Agent', () => { // Now, we'll expect another request to go out, so we'll nock it. nockStorageSecret(); - nockGetReply(genericStorageSecretOperationManifestUrl, 304); + nockBase().get(genericStorageSecretOperationManifestUrl).reply(304); // If we move forward the last remaining millisecond, we should trigger // and end up with a successful sync. @@ -364,8 +364,8 @@ describe('Agent', () => { it('continues polling even after initial failure', async () => { nockStorageSecret(); - nockGetReply(genericStorageSecretOperationManifestUrl, 500); - nockGetReply(genericLegacyOperationManifestUrl, 500); + nockBase().get(genericStorageSecretOperationManifestUrl).reply(500); + nockBase().get(genericLegacyOperationManifestUrl).reply(500); const store = defaultStore(); const storeSetSpy = jest.spyOn(store, 'set'); const storeDeleteSpy = jest.spyOn(store, 'delete'); @@ -472,7 +472,7 @@ describe('Agent', () => { describe('when fetching the manifest using the storage secret fails', () => { it('will fallback to fetching the manifest using the legacy url', async () => { nockStorageSecret(); - nockGetReply(genericStorageSecretOperationManifestUrl, 404); + nockBase().get(genericStorageSecretOperationManifestUrl).reply(404); nockLegacyGoodManifest(); const store = defaultStore(); @@ -498,12 +498,6 @@ function nockBase() { return nock(fakeBaseUrl); } -function nockGetReply(relativePath: string, statusCode: number, body?: any) { - return nockBase() - .get(relativePath) - .reply(statusCode, body); -} - function hashedServiceId(serviceID: string) { return createHash('sha512') .update(serviceID) From 5eef3a3362a8cafade25e0ca196b4d99299de0ef Mon Sep 17 00:00:00 2001 From: Chang Wang Date: Wed, 29 May 2019 18:27:38 -0400 Subject: [PATCH 127/642] refactor fetchManifest; don't always try legacy path Addresses https://github.com/apollographql/apollo-platform-commercial/pull/116/files#r288511599 Only retry using the legacy manifest path if the http status code returned is 404 or 403 Update tests to accomodate this change --- .../src/__tests__/agent.test.ts | 8 +- .../src/agent.ts | 96 ++++++++++--------- 2 files changed, 55 insertions(+), 49 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts index 4e9e0456738..8980d3ec822 100644 --- a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts @@ -254,6 +254,7 @@ describe('Agent', () => { it('logs debug updates to the manifest on startup', async () => { nockStorageSecret(); + nockBase().get(genericStorageSecretOperationManifestUrl).reply(404); nockLegacyGoodManifest(); const relevantLogs: any = []; const logger = { @@ -365,7 +366,6 @@ describe('Agent', () => { it('continues polling even after initial failure', async () => { nockStorageSecret(); nockBase().get(genericStorageSecretOperationManifestUrl).reply(500); - nockBase().get(genericLegacyOperationManifestUrl).reply(500); const store = defaultStore(); const storeSetSpy = jest.spyOn(store, 'set'); const storeDeleteSpy = jest.spyOn(store, 'delete'); @@ -415,7 +415,7 @@ describe('Agent', () => { expect(storeSetSpy).toBeCalledTimes(0); nockStorageSecret(); - nockLegacyGoodManifest(); // Starting with ABC. + nockGoodManifestsUnderStorageSecret(); // Starting with ABC. await agent.checkForUpdate(); expect(agent._timesChecked).toBe(1); expect(storeSetSpy).toBeCalledTimes(3); @@ -423,7 +423,7 @@ describe('Agent', () => { await expectStoreHasOperationEach(store, ['a', 'b', 'c']); nockStorageSecret(); - nockLegacyGoodManifest([ + nockGoodManifestsUnderStorageSecret([ sampleManifestRecords.a, sampleManifestRecords.b, ]); // Just AB in this manifest. @@ -437,7 +437,7 @@ describe('Agent', () => { ).resolves.toBeUndefined(); nockStorageSecret(); - nockLegacyGoodManifest([sampleManifestRecords.a]); // Just A in this manifest. + nockGoodManifestsUnderStorageSecret([sampleManifestRecords.a]); // Just A in this manifest. await agent.checkForUpdate(); expect(agent._timesChecked).toBe(3); expect(storeSetSpy).toBeCalledTimes(3); // no new sets. diff --git a/packages/apollo-server-plugin-operation-registry/src/agent.ts b/packages/apollo-server-plugin-operation-registry/src/agent.ts index 9e65db13e58..796ef15f35d 100644 --- a/packages/apollo-server-plugin-operation-registry/src/agent.ts +++ b/packages/apollo-server-plugin-operation-registry/src/agent.ts @@ -172,65 +172,58 @@ export default class Agent { return this.storageSecret; } - private async fetchManifest(manifestUrl: string): Promise { - this.logger.debug(`Checking for manifest changes at ${manifestUrl}`); + private fetchOptions = { + // GET is what we request, but keep in mind that, when we include and get + // a match on the `If-None-Match` header we'll get an early return with a + // status code 304. + method: 'GET', - let response = await fetchIfNoneMatch(manifestUrl, { - // GET is what we request, but keep in mind that, when we include and get - // a match on the `If-None-Match` header we'll get an early return with a - // status code 304. - method: 'GET', - - // More than three times our polling interval be long enough to wait. - timeout: this.pollSeconds() * 3 /* times */ * 1000 /* ms */, - }); + // More than three times our polling interval be long enough to wait. + timeout: this.pollSeconds() * 3 /* times */ * 1000 /* ms */, + }; - if (!response.ok && response.status !== 304) { - const responseText = await response.text(); + private async fetchLegacyManifest(): Promise { + const legacyManifestUrl = getLegacyOperationManifestUrl( + this.getHashedServiceId(), + this.options.schemaHash, + ); + this.logger.debug(`Checking for manifest changes at ${legacyManifestUrl}`); + return fetchIfNoneMatch(legacyManifestUrl, this.fetchOptions); + } - // The response error code only comes in XML, but we don't have an XML - // parser handy, so we'll just match the string. - if (responseText.includes('AccessDenied')) { - throw new Error( - `No manifest found. Ensure this server's schema has been published with 'apollo service:push' and that operations have been registered with 'apollo client:push'.`, - ); - } + private async fetchManifest(): Promise { + this.logger.debug(`Checking for storageSecret`); + const storageSecret = await this.fetchAndUpdateStorageSecret(); - // For other unknown errors. - throw new Error(`Unexpected status: ${responseText}`); + if (!storageSecret) { + this.logger.debug(`No storage secret found`); + return this.fetchLegacyManifest(); } + const storageSecretManifestUrl = getOperationManifestUrl( + this.options.engine.serviceID, + storageSecret, + ); + + this.logger.debug( + `Checking for manifest changes at ${storageSecretManifestUrl}`, + ); + const response = await fetchIfNoneMatch( + storageSecretManifestUrl, + this.fetchOptions, + ); + if (response.status === 404 || response.status === 403) { + return this.fetchLegacyManifest(); + } return response; } private async tryUpdate(): Promise { - this.logger.debug(`Checking for storageSecret`); - const storageSecret = await this.fetchAndUpdateStorageSecret(); - - const legacyManifestUrl = getLegacyOperationManifestUrl( - this.getHashedServiceId(), - this.options.schemaHash, - ); - this._timesChecked++; let response: Response; try { - response = await (storageSecret - ? this.fetchManifest( - getOperationManifestUrl( - this.options.engine.serviceID, - storageSecret, - ), - ).catch(err => { - this.logger.debug( - `Failed to fetch manifest using storage secret. Try using legacy manifest url ${err.message || - err}`, - ); - return this.fetchManifest(legacyManifestUrl); - }) - : this.fetchManifest(legacyManifestUrl)); - + response = await this.fetchManifest(); // When the response indicates that the resource hasn't changed, there's // no need to do any other work. Returning false is meant to indicate // that there wasn't an update, but there was a successful fetch. @@ -238,6 +231,19 @@ export default class Agent { return false; } + if (!response.ok) { + const responseText = await response.text(); + // The response error code only comes in XML, but we don't have an XML + // parser handy, so we'll just match the string. + if (responseText.includes('AccessDenied')) { + throw new Error( + `No manifest found. Ensure this server's schema has been published with 'apollo service:push' and that operations have been registered with 'apollo client:push'.`, + ); + } + // For other unknown errors. + throw new Error(`Unexpected status: ${responseText}`); + } + const contentType = response.headers.get('content-type'); if (contentType && contentType !== 'application/json') { throw new Error(`Unexpected 'Content-Type' header: ${contentType}`); From e28c6887e5767a2d1f2c9e34fa06596c555c495f Mon Sep 17 00:00:00 2001 From: Chang Wang Date: Wed, 29 May 2019 18:29:27 -0400 Subject: [PATCH 128/642] remove faketimers; start->checkForUpdate --- .../src/__tests__/agent.test.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts index 8980d3ec822..0a60adb1dda 100644 --- a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts @@ -457,8 +457,7 @@ describe('Agent', () => { const storeSetSpy = jest.spyOn(store, 'set'); const storeDeleteSpy = jest.spyOn(store, 'delete'); const agent = createAgent({ store }); - jest.useFakeTimers(); - await agent.start(); + await agent.checkForUpdate(); // Three additions, no deletions. expect(storeSetSpy).toBeCalledTimes(3); @@ -479,8 +478,7 @@ describe('Agent', () => { const storeSetSpy = jest.spyOn(store, 'set'); const storeDeleteSpy = jest.spyOn(store, 'delete'); const agent = createAgent({ store }); - jest.useFakeTimers(); - await agent.start(); + await agent.checkForUpdate(); // Three additions, no deletions. expect(storeSetSpy).toBeCalledTimes(3); From 3bdc471a30857d18a6fd961385f7c0a270a5630b Mon Sep 17 00:00:00 2001 From: Chang Wang Date: Wed, 29 May 2019 18:34:44 -0400 Subject: [PATCH 129/642] lintfix --- .../src/__tests__/agent.test.ts | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts index 0a60adb1dda..328741f9c47 100644 --- a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts @@ -254,7 +254,9 @@ describe('Agent', () => { it('logs debug updates to the manifest on startup', async () => { nockStorageSecret(); - nockBase().get(genericStorageSecretOperationManifestUrl).reply(404); + nockBase() + .get(genericStorageSecretOperationManifestUrl) + .reply(404); nockLegacyGoodManifest(); const relevantLogs: any = []; const logger = { @@ -344,7 +346,9 @@ describe('Agent', () => { // Now, we'll expect another request to go out, so we'll nock it. nockStorageSecret(); - nockBase().get(genericStorageSecretOperationManifestUrl).reply(304); + nockBase() + .get(genericStorageSecretOperationManifestUrl) + .reply(304); // If we move forward the last remaining millisecond, we should trigger // and end up with a successful sync. @@ -365,7 +369,9 @@ describe('Agent', () => { it('continues polling even after initial failure', async () => { nockStorageSecret(); - nockBase().get(genericStorageSecretOperationManifestUrl).reply(500); + nockBase() + .get(genericStorageSecretOperationManifestUrl) + .reply(500); const store = defaultStore(); const storeSetSpy = jest.spyOn(store, 'set'); const storeDeleteSpy = jest.spyOn(store, 'delete'); @@ -471,7 +477,9 @@ describe('Agent', () => { describe('when fetching the manifest using the storage secret fails', () => { it('will fallback to fetching the manifest using the legacy url', async () => { nockStorageSecret(); - nockBase().get(genericStorageSecretOperationManifestUrl).reply(404); + nockBase() + .get(genericStorageSecretOperationManifestUrl) + .reply(404); nockLegacyGoodManifest(); const store = defaultStore(); From 21761d961fe3fa039e7d09cf287862ef2fac4f64 Mon Sep 17 00:00:00 2001 From: Chang Wang Date: Thu, 30 May 2019 18:44:04 -0400 Subject: [PATCH 130/642] hardcode `current` tag into default manifest location to be updated in https://github.com/apollographql/apollo-platform-commercial/pull/125 --- packages/apollo-server-plugin-operation-registry/src/common.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/common.ts b/packages/apollo-server-plugin-operation-registry/src/common.ts index efecaee82a5..552959144b5 100644 --- a/packages/apollo-server-plugin-operation-registry/src/common.ts +++ b/packages/apollo-server-plugin-operation-registry/src/common.ts @@ -45,7 +45,7 @@ export function getOperationManifestUrl( graphId: string, storageSecret: string, ): string { - return `${urlOperationManifestBase}/${graphId}/${storageSecret}/manifest.v2.json`; + return `${urlOperationManifestBase}/${graphId}/${storageSecret}/current/manifest.v2.json`; } export function getLegacyOperationManifestUrl( From b4ddee0e944620c19d99438e99fc1f3795b1aa6e Mon Sep 17 00:00:00 2001 From: Chang Wang Date: Thu, 30 May 2019 18:47:18 -0400 Subject: [PATCH 131/642] minor: missing "should" in comment --- packages/apollo-server-plugin-operation-registry/src/agent.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/agent.ts b/packages/apollo-server-plugin-operation-registry/src/agent.ts index 796ef15f35d..5a103009950 100644 --- a/packages/apollo-server-plugin-operation-registry/src/agent.ts +++ b/packages/apollo-server-plugin-operation-registry/src/agent.ts @@ -150,7 +150,7 @@ export default class Agent { const response = await fetchIfNoneMatch(storageSecretUrl, { method: 'GET', - // More than three times our polling interval be long enough to wait. + // More than three times our polling interval should be long enough to wait. timeout: this.pollSeconds() * 3 /* times */ * 1000 /* ms */, }); @@ -178,7 +178,7 @@ export default class Agent { // status code 304. method: 'GET', - // More than three times our polling interval be long enough to wait. + // More than three times our polling interval should be long enough to wait. timeout: this.pollSeconds() * 3 /* times */ * 1000 /* ms */, }; From 440164ae00b5827915aeb4a5957e93ec60812c2f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Fri, 31 May 2019 21:44:31 +0000 Subject: [PATCH 132/642] chore(deps): update dependency apollo-server-plugin-base to ^0.5.0 (#127) --- packages/apollo-server-plugin-operation-registry/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/package.json b/packages/apollo-server-plugin-operation-registry/package.json index b05e0db77aa..41f32c3b00b 100644 --- a/packages/apollo-server-plugin-operation-registry/package.json +++ b/packages/apollo-server-plugin-operation-registry/package.json @@ -14,7 +14,7 @@ "apollo-graphql": "0.3.1", "apollo-server-caching": "^0.4.0", "apollo-server-errors": "^2.2.0", - "apollo-server-plugin-base": "^0.4.0", + "apollo-server-plugin-base": "^0.5.0", "fast-json-stable-stringify": "^2.0.0", "loglevel": "^1.6.1", "loglevel-debug": "^0.0.1", From 30aa188fa6cf89c46643e8bd4faadd350c4decb4 Mon Sep 17 00:00:00 2001 From: Chang Wang Date: Mon, 3 Jun 2019 14:25:05 -0400 Subject: [PATCH 133/642] update path to look up storage secrets https://github.com/apollographql/apollo-platform-commercial/pull/125 --- packages/apollo-server-plugin-operation-registry/src/common.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/common.ts b/packages/apollo-server-plugin-operation-registry/src/common.ts index 552959144b5..d4223b7c601 100644 --- a/packages/apollo-server-plugin-operation-registry/src/common.ts +++ b/packages/apollo-server-plugin-operation-registry/src/common.ts @@ -38,7 +38,7 @@ export function getStorageSecretUrl( graphId: string, apiKeyHash: string, ): string { - return `${urlStorageSecretBase}/${graphId}/${apiKeyHash}/storage-secret.json`; + return `${urlStorageSecretBase}/${graphId}/storage-secret/${apiKeyHash}.json`; } export function getOperationManifestUrl( From d20a13f067b35e9efe78e58ba7244c87f0fe4851 Mon Sep 17 00:00:00 2001 From: Chang Wang Date: Mon, 3 Jun 2019 12:22:52 -0400 Subject: [PATCH 134/642] set registeredOperation and forbiddenOperation on requestContext Those fields were added by https://github.com/apollographql/apollo-server/pull/2768 --- .../src/ApolloServerPluginOperationRegistry.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts index a99a2a5dfd7..cf071ddf621 100644 --- a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts +++ b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts @@ -152,6 +152,9 @@ export default function plugin(options: Options = Object.create(null)) { logger.debug( `${logHash}: Permitting operation found in local registry.`, ); + if (!options.dryRun) { + requestContext.metrics.registeredOperation = true; + } return; } @@ -210,6 +213,7 @@ export default function plugin(options: Options = Object.create(null)) { ); if (!options.dryRun) { + requestContext.metrics.forbiddenOperation = true; throw new ForbiddenError('Execution forbidden'); } else { logger.debug( From 553a80ef48d72eb3d13f7da77dea317db731c38f Mon Sep 17 00:00:00 2001 From: Chang Wang Date: Tue, 4 Jun 2019 17:53:03 -0400 Subject: [PATCH 135/642] set metrics regardless of whether is dryRun --- .../src/ApolloServerPluginOperationRegistry.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts index cf071ddf621..82902f4cec7 100644 --- a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts +++ b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts @@ -152,9 +152,7 @@ export default function plugin(options: Options = Object.create(null)) { logger.debug( `${logHash}: Permitting operation found in local registry.`, ); - if (!options.dryRun) { - requestContext.metrics.registeredOperation = true; - } + requestContext.metrics.registeredOperation = true; return; } @@ -212,8 +210,8 @@ export default function plugin(options: Options = Object.create(null)) { dryRunPrefix} ${logHash}: Execution denied because 'forbidUnregisteredOperations' was enabled for this request and the operation was not found in the local operation registry.`, ); + requestContext.metrics.forbiddenOperation = true; if (!options.dryRun) { - requestContext.metrics.forbiddenOperation = true; throw new ForbiddenError('Execution forbidden'); } else { logger.debug( From adc3e2936f26e59e2625bfaaf54cb9db1648c33b Mon Sep 17 00:00:00 2001 From: Chang Wang Date: Thu, 6 Jun 2019 20:55:38 -0400 Subject: [PATCH 136/642] version bump --- packages/apollo-server-plugin-operation-registry/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/package.json b/packages/apollo-server-plugin-operation-registry/package.json index 41f32c3b00b..18dda7e9efc 100644 --- a/packages/apollo-server-plugin-operation-registry/package.json +++ b/packages/apollo-server-plugin-operation-registry/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-plugin-operation-registry", - "version": "0.1.0-alpha.4", + "version": "0.2.0-alpha.0", "description": "Apollo Server operation registry", "main": "dist/index.js", "types": "dist/index.d.ts", From c884ae88693290f3f00d53bdbdff8613c1c901e7 Mon Sep 17 00:00:00 2001 From: Chang Wang Date: Thu, 30 May 2019 15:16:30 -0400 Subject: [PATCH 137/642] add tag awareness to plugin --- .../src/ApolloServerPluginOperationRegistry.ts | 3 +++ packages/apollo-server-plugin-operation-registry/src/agent.ts | 2 ++ packages/apollo-server-plugin-operation-registry/src/common.ts | 3 ++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts index 82902f4cec7..11244f9a22c 100644 --- a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts +++ b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts @@ -27,11 +27,13 @@ interface Options { | boolean | ForbidUnregisteredOperationsPredicate; dryRun?: boolean; + schemaTag?: string; } export default function plugin(options: Options = Object.create(null)) { let agent: Agent; let store: InMemoryLRUCache; + let schemaTag = options.schemaTag || process.env.ENGINE_SCHEMA_TAG || ''; // Setup logging facilities, scoped under the appropriate name. const logger = loglevel.getLogger(`apollo-server:${pluginName}`); @@ -96,6 +98,7 @@ export default function plugin(options: Options = Object.create(null)) { agent = new Agent({ schemaHash, + schemaTag, engine, store, logger, diff --git a/packages/apollo-server-plugin-operation-registry/src/agent.ts b/packages/apollo-server-plugin-operation-registry/src/agent.ts index 5a103009950..71c30b43c1f 100644 --- a/packages/apollo-server-plugin-operation-registry/src/agent.ts +++ b/packages/apollo-server-plugin-operation-registry/src/agent.ts @@ -22,6 +22,7 @@ export interface AgentOptions { schemaHash: string; engine: any; store: InMemoryLRUCache; + schemaTag?: string; } interface Operation { @@ -203,6 +204,7 @@ export default class Agent { const storageSecretManifestUrl = getOperationManifestUrl( this.options.engine.serviceID, storageSecret, + this.options.schemaTag, ); this.logger.debug( diff --git a/packages/apollo-server-plugin-operation-registry/src/common.ts b/packages/apollo-server-plugin-operation-registry/src/common.ts index d4223b7c601..4bd25cd8360 100644 --- a/packages/apollo-server-plugin-operation-registry/src/common.ts +++ b/packages/apollo-server-plugin-operation-registry/src/common.ts @@ -44,8 +44,9 @@ export function getStorageSecretUrl( export function getOperationManifestUrl( graphId: string, storageSecret: string, + schemaTag?: string, ): string { - return `${urlOperationManifestBase}/${graphId}/${storageSecret}/current/manifest.v2.json`; + return `${urlOperationManifestBase}/${graphId}/${storageSecret}/${schemaTag}/manifest.v2.json`; } export function getLegacyOperationManifestUrl( From 1633539ce1b36521b9f817fb8ef6397d12af3455 Mon Sep 17 00:00:00 2001 From: Chang Wang Date: Thu, 30 May 2019 15:38:24 -0400 Subject: [PATCH 138/642] test: assert manifest will be fetched from tag --- .../src/__tests__/agent.test.ts | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts index 328741f9c47..f6770239186 100644 --- a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts @@ -56,6 +56,11 @@ const sampleManifestRecords: Record = { }, }; +const manifest = (...operations: ManifestRecord[]) => ({ + version: 2, + operations, +}); + describe('Agent', () => { describe('Basic', () => { const Agent = require('../agent').default; @@ -496,6 +501,33 @@ describe('Agent', () => { expect(agent._timesChecked).toBe(1); }); }); + + describe.only('When given a schemaTag', () => { + const schemaTag = 'master'; + const getOperationManifestRelativeUrl = ( + ...args: Parameters + ) => + getOperationManifestUrl(...args).replace( + new RegExp(`^${urlOperationManifestBase}`), + '', + ); + + it('fetches manifests for the corresponding schema tag', async () => { + nockStorageSecret(); + const agent = createAgent({ schemaTag }); + const nockedManifest = nockBase() + .get( + getOperationManifestRelativeUrl( + genericServiceID, + genericStorageSecret, + schemaTag, + ), + ) + .reply(200, manifest(sampleManifestRecords.a)); + await agent.checkForUpdate(); + expect(nockedManifest.isDone()).toBe(true); + }); + }); }); }); }); From 685131ab9c876751535a42c74434ad523dfe0a0d Mon Sep 17 00:00:00 2001 From: Chang Wang Date: Thu, 30 May 2019 16:00:36 -0400 Subject: [PATCH 139/642] Don't try to fetch from legacy location if schemaTag isn't specified --- .../src/agent.ts | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/agent.ts b/packages/apollo-server-plugin-operation-registry/src/agent.ts index 71c30b43c1f..ea63c5bf627 100644 --- a/packages/apollo-server-plugin-operation-registry/src/agent.ts +++ b/packages/apollo-server-plugin-operation-registry/src/agent.ts @@ -198,6 +198,9 @@ export default class Agent { if (!storageSecret) { this.logger.debug(`No storage secret found`); + if (this.options.schemaTag) { + throw new Error(`No storage secret found, can't fetch manifest`); + } return this.fetchLegacyManifest(); } @@ -214,7 +217,12 @@ export default class Agent { storageSecretManifestUrl, this.fetchOptions, ); - if (response.status === 404 || response.status === 403) { + + if ( + (response.status === 404 || response.status === 403) && + // fetching a manifest associated with a schema tag is not supported in legacy + !this.options.schemaTag + ) { return this.fetchLegacyManifest(); } return response; From ee59bc3b7e33a7383cb2bd1197916f3f4e5c8ada Mon Sep 17 00:00:00 2001 From: Chang Wang Date: Tue, 4 Jun 2019 12:55:17 -0400 Subject: [PATCH 140/642] remove .only on describe --- .../src/__tests__/agent.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts index f6770239186..a0f9753471e 100644 --- a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts @@ -502,7 +502,7 @@ describe('Agent', () => { }); }); - describe.only('When given a schemaTag', () => { + describe('When given a schemaTag', () => { const schemaTag = 'master'; const getOperationManifestRelativeUrl = ( ...args: Parameters From 80512f368c22e3e6ec3b66222a51e636bf47045c Mon Sep 17 00:00:00 2001 From: Chang Wang Date: Tue, 4 Jun 2019 12:56:30 -0400 Subject: [PATCH 141/642] default to 'current' schemaTag --- .../src/ApolloServerPluginOperationRegistry.ts | 3 ++- packages/apollo-server-plugin-operation-registry/src/common.ts | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts index 11244f9a22c..5a7fb9938c7 100644 --- a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts +++ b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts @@ -33,7 +33,8 @@ interface Options { export default function plugin(options: Options = Object.create(null)) { let agent: Agent; let store: InMemoryLRUCache; - let schemaTag = options.schemaTag || process.env.ENGINE_SCHEMA_TAG || ''; + let schemaTag = + options.schemaTag || process.env.ENGINE_SCHEMA_TAG || 'current'; // Setup logging facilities, scoped under the appropriate name. const logger = loglevel.getLogger(`apollo-server:${pluginName}`); diff --git a/packages/apollo-server-plugin-operation-registry/src/common.ts b/packages/apollo-server-plugin-operation-registry/src/common.ts index 4bd25cd8360..4ba0bdac27a 100644 --- a/packages/apollo-server-plugin-operation-registry/src/common.ts +++ b/packages/apollo-server-plugin-operation-registry/src/common.ts @@ -44,7 +44,7 @@ export function getStorageSecretUrl( export function getOperationManifestUrl( graphId: string, storageSecret: string, - schemaTag?: string, + schemaTag: string = 'current', ): string { return `${urlOperationManifestBase}/${graphId}/${storageSecret}/${schemaTag}/manifest.v2.json`; } From 04d02e768eb363f27dbc59bf25d72f1c16501bf4 Mon Sep 17 00:00:00 2001 From: Chang Wang Date: Thu, 6 Jun 2019 14:10:35 -0400 Subject: [PATCH 142/642] do not pick up process.env.ENGINE_SCHEMA_TAG --- .../src/ApolloServerPluginOperationRegistry.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts index 5a7fb9938c7..c72e2fc88e2 100644 --- a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts +++ b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts @@ -33,8 +33,7 @@ interface Options { export default function plugin(options: Options = Object.create(null)) { let agent: Agent; let store: InMemoryLRUCache; - let schemaTag = - options.schemaTag || process.env.ENGINE_SCHEMA_TAG || 'current'; + let schemaTag = options.schemaTag || 'current'; // Setup logging facilities, scoped under the appropriate name. const logger = loglevel.getLogger(`apollo-server:${pluginName}`); From 3623363139746199a8bd3decee95f075354cb982 Mon Sep 17 00:00:00 2001 From: Chang Wang Date: Thu, 6 Jun 2019 14:25:01 -0400 Subject: [PATCH 143/642] Don't fail unrecoverably if manifest or storage secret not found --- .../src/agent.ts | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/agent.ts b/packages/apollo-server-plugin-operation-registry/src/agent.ts index ea63c5bf627..48e6a9c4069 100644 --- a/packages/apollo-server-plugin-operation-registry/src/agent.ts +++ b/packages/apollo-server-plugin-operation-registry/src/agent.ts @@ -37,6 +37,8 @@ interface OperationManifest { type SignatureStore = Set; +const manifestNotFoundMessage = `No manifest found. Ensure this server's schema has been published with 'apollo service:push' and that operations have been registered with 'apollo client:push'.`; + export default class Agent { private timer?: NodeJS.Timer; private logger: loglevel.Logger; @@ -184,6 +186,10 @@ export default class Agent { }; private async fetchLegacyManifest(): Promise { + this.logger.debug(`Fetching legacy manifest.`); + if (this.options.schemaTag !== 'current') { + this.logger.warn(`The legacy manifest contains operations registered for the "current" tag, but the specified schema tag is "${this.options.schemaTag}".`); + } const legacyManifestUrl = getLegacyOperationManifestUrl( this.getHashedServiceId(), this.options.schemaHash, @@ -197,10 +203,7 @@ export default class Agent { const storageSecret = await this.fetchAndUpdateStorageSecret(); if (!storageSecret) { - this.logger.debug(`No storage secret found`); - if (this.options.schemaTag) { - throw new Error(`No storage secret found, can't fetch manifest`); - } + this.logger.warn(`No storage secret found`); return this.fetchLegacyManifest(); } @@ -218,11 +221,8 @@ export default class Agent { this.fetchOptions, ); - if ( - (response.status === 404 || response.status === 403) && - // fetching a manifest associated with a schema tag is not supported in legacy - !this.options.schemaTag - ) { + if (response.status === 404 || response.status === 403) { + this.logger.warn(manifestNotFoundMessage); return this.fetchLegacyManifest(); } return response; @@ -247,7 +247,7 @@ export default class Agent { // parser handy, so we'll just match the string. if (responseText.includes('AccessDenied')) { throw new Error( - `No manifest found. Ensure this server's schema has been published with 'apollo service:push' and that operations have been registered with 'apollo client:push'.`, + manifestNotFoundMessage, ); } // For other unknown errors. From 346889d79c3569f8168d588db4c54f438785281f Mon Sep 17 00:00:00 2001 From: Chang Wang Date: Thu, 6 Jun 2019 14:34:50 -0400 Subject: [PATCH 144/642] schemaTag no longer optional --- packages/apollo-server-plugin-operation-registry/src/agent.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/agent.ts b/packages/apollo-server-plugin-operation-registry/src/agent.ts index 48e6a9c4069..7fa088364cc 100644 --- a/packages/apollo-server-plugin-operation-registry/src/agent.ts +++ b/packages/apollo-server-plugin-operation-registry/src/agent.ts @@ -22,7 +22,7 @@ export interface AgentOptions { schemaHash: string; engine: any; store: InMemoryLRUCache; - schemaTag?: string; + schemaTag: string; } interface Operation { From 85cec6b3209371b07c025325bec28c6c2e9820ed Mon Sep 17 00:00:00 2001 From: Chang Wang Date: Thu, 6 Jun 2019 16:06:00 -0400 Subject: [PATCH 145/642] Include warnings in relevant logs --- .../src/__tests__/agent.test.ts | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts index a0f9753471e..bc0dfe42d93 100644 --- a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts @@ -274,6 +274,15 @@ describe('Agent', () => { relevantLogs.push(args); } }), + warn: jest.fn().mockImplementation((...args: any[]) => { + if ( + typeof args[0] === 'string' && + (args[0].match(/Checking for manifest changes/) || + args[0].match(/Incoming manifest ADDs/)) + ) { + relevantLogs.push(args); + } + }), }; await createAgent({ logger }).start(); From 19542b86de08c2f457606566416d564f025af3a1 Mon Sep 17 00:00:00 2001 From: Chang Wang Date: Thu, 6 Jun 2019 16:14:37 -0400 Subject: [PATCH 146/642] Include tag and new manifest location in err message --- .../src/agent.ts | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/agent.ts b/packages/apollo-server-plugin-operation-registry/src/agent.ts index 7fa088364cc..40bd1d76994 100644 --- a/packages/apollo-server-plugin-operation-registry/src/agent.ts +++ b/packages/apollo-server-plugin-operation-registry/src/agent.ts @@ -37,7 +37,7 @@ interface OperationManifest { type SignatureStore = Set; -const manifestNotFoundMessage = `No manifest found. Ensure this server's schema has been published with 'apollo service:push' and that operations have been registered with 'apollo client:push'.`; +const callToAction = `Ensure this server's schema has been published with 'apollo service:push' and that operations have been registered with 'apollo client:push'.`; export default class Agent { private timer?: NodeJS.Timer; @@ -188,7 +188,11 @@ export default class Agent { private async fetchLegacyManifest(): Promise { this.logger.debug(`Fetching legacy manifest.`); if (this.options.schemaTag !== 'current') { - this.logger.warn(`The legacy manifest contains operations registered for the "current" tag, but the specified schema tag is "${this.options.schemaTag}".`); + this.logger.warn( + `The legacy manifest contains operations registered for the "current" tag, but the specified schema tag is "${ + this.options.schemaTag + }".`, + ); } const legacyManifestUrl = getLegacyOperationManifestUrl( this.getHashedServiceId(), @@ -222,7 +226,11 @@ export default class Agent { ); if (response.status === 404 || response.status === 403) { - this.logger.warn(manifestNotFoundMessage); + this.logger.warn( + `No manifest found for tag "${ + this.options.schemaTag + }" at ${storageSecretManifestUrl}. ${callToAction}`, + ); return this.fetchLegacyManifest(); } return response; @@ -246,9 +254,7 @@ export default class Agent { // The response error code only comes in XML, but we don't have an XML // parser handy, so we'll just match the string. if (responseText.includes('AccessDenied')) { - throw new Error( - manifestNotFoundMessage, - ); + throw new Error(`No manifest found. ${callToAction}`); } // For other unknown errors. throw new Error(`Unexpected status: ${responseText}`); From 1343c6028f039250b8ba6f6be690b94bb98f65ff Mon Sep 17 00:00:00 2001 From: Chang Wang Date: Thu, 6 Jun 2019 16:17:17 -0400 Subject: [PATCH 147/642] provide default schemaTag in test AgentOptions --- .../src/__tests__/agent.test.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts index bc0dfe42d93..d1af491a8d1 100644 --- a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts @@ -28,6 +28,7 @@ const defaultAgentOptions: AgentOptions = { engine: { serviceID: genericServiceID, apiKeyHash: genericApiKeyHash }, store: defaultStore(), pollSeconds, + schemaTag: 'current', }; interface ManifestRecord { From 49deadb27e04fa5fb02e28613878d71057de68fd Mon Sep 17 00:00:00 2001 From: Chang Wang Date: Fri, 7 Jun 2019 16:35:08 -0400 Subject: [PATCH 148/642] bump version --- packages/apollo-server-plugin-operation-registry/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/package.json b/packages/apollo-server-plugin-operation-registry/package.json index 18dda7e9efc..24391b3fbd2 100644 --- a/packages/apollo-server-plugin-operation-registry/package.json +++ b/packages/apollo-server-plugin-operation-registry/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-plugin-operation-registry", - "version": "0.2.0-alpha.0", + "version": "0.2.0-alpha.1", "description": "Apollo Server operation registry", "main": "dist/index.js", "types": "dist/index.d.ts", From f9954e6ddce66b8cec43693d283d9f00a0d62b2f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Wed, 12 Jun 2019 02:21:02 +0000 Subject: [PATCH 149/642] chore(deps): update dependency apollo-graphql to v0.3.2 (#141) --- packages/apollo-server-plugin-operation-registry/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/package.json b/packages/apollo-server-plugin-operation-registry/package.json index 24391b3fbd2..f61264dd8ec 100644 --- a/packages/apollo-server-plugin-operation-registry/package.json +++ b/packages/apollo-server-plugin-operation-registry/package.json @@ -11,7 +11,7 @@ "node": ">=8" }, "dependencies": { - "apollo-graphql": "0.3.1", + "apollo-graphql": "0.3.2", "apollo-server-caching": "^0.4.0", "apollo-server-errors": "^2.2.0", "apollo-server-plugin-base": "^0.5.0", From 436f20dc50607fe2e8de9cb3f5d4ca49783c937f Mon Sep 17 00:00:00 2001 From: Chang Wang Date: Tue, 18 Jun 2019 14:05:51 -0400 Subject: [PATCH 150/642] update changelog (#136) --- .../apollo-server-plugin-operation-registry/CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/packages/apollo-server-plugin-operation-registry/CHANGELOG.md b/packages/apollo-server-plugin-operation-registry/CHANGELOG.md index 232f1ea08a2..b7922b4ca5e 100644 --- a/packages/apollo-server-plugin-operation-registry/CHANGELOG.md +++ b/packages/apollo-server-plugin-operation-registry/CHANGELOG.md @@ -2,5 +2,13 @@ ### vNEXT +### 0.2.0 + +- Per-tag operation manifests can now be fetched for each tag that has a schema and registered operations. [PR #135](https://github.com/apollographql/apollo-platform-commercial/pull/135) +- Manifest storage path structure updated to `/${graphId}/${storageSecret}/${schemaTag}/manifest.v2.json`. The storage secret is fetched automatically using your API key. No longer uses schema hash. [PR #116](https://github.com/apollographql/apollo-platform-commercial/pull/116) +- Metrics on forbidden and registered operations are now reported to Engine [PR #132](https://github.com/apollographql/apollo-platform-commercial/pull/132) + +### 0.1.0 + - `apollo-server-plugin-operation-registry` - Update operation registry plugin to use manifest v2 [#32](https://github.com/apollographql/apollo-platform-commercial/pull/32) From db3fcfaaf09d42ea31c2759904f6ffabb67a9309 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 25 Jun 2019 22:13:32 +0000 Subject: [PATCH 151/642] chore(deps): update dependency apollo-graphql to v0.3.3 (#153) --- packages/apollo-server-plugin-operation-registry/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/package.json b/packages/apollo-server-plugin-operation-registry/package.json index f61264dd8ec..b650b32f23b 100644 --- a/packages/apollo-server-plugin-operation-registry/package.json +++ b/packages/apollo-server-plugin-operation-registry/package.json @@ -11,7 +11,7 @@ "node": ">=8" }, "dependencies": { - "apollo-graphql": "0.3.2", + "apollo-graphql": "0.3.3", "apollo-server-caching": "^0.4.0", "apollo-server-errors": "^2.2.0", "apollo-server-plugin-base": "^0.5.0", From e2354d66ef597b865f92a528699f40330e5ba773 Mon Sep 17 00:00:00 2001 From: Adam Zionts Date: Wed, 26 Jun 2019 18:00:24 -0700 Subject: [PATCH 152/642] Some clean-up of safe-listing dry run feature --- .../ApolloServerPluginOperationRegistry.ts | 40 +++++++++++++------ 1 file changed, 27 insertions(+), 13 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts index c72e2fc88e2..3ebfbd1cdbe 100644 --- a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts +++ b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts @@ -53,6 +53,13 @@ export default function plugin(options: Options = Object.create(null)) { logger.debug( `${dryRunPrefix} Operation registry logging enabled because options.dryRun is true.`, ); + if (options.forbidUnregisteredOperations) { + logger.info( + `${dryRunPrefix} Allowing all operations since options.dryRun is true. \ +Operations will still be reported to Apollo trace warehouse as forbidden \ +for observability purposes, but all operations will be permitted.`, + ); + } } // Options shouldn't be changed after the plugin has been initiated. @@ -171,7 +178,9 @@ export default function plugin(options: Options = Object.create(null)) { let forbidUnregisteredOperations: boolean = typeof options.forbidUnregisteredOperations === 'boolean' ? options.forbidUnregisteredOperations - : typeof options.forbidUnregisteredOperations !== 'undefined'; + : typeof options.forbidUnregisteredOperations === 'function' + ? true + : false; if (typeof options.forbidUnregisteredOperations === 'function') { logger.debug( @@ -194,6 +203,10 @@ export default function plugin(options: Options = Object.create(null)) { // disable enforcement when a predicate function is in use. if (typeof predicateResult === 'boolean') { forbidUnregisteredOperations = predicateResult; + } else { + logger.warn( + `${logHash} Predicate function did not return a boolean response. Got ${predicateResult}`, + ); } } catch (err) { // If an error occurs within the forbidUnregisteredOperations @@ -205,16 +218,23 @@ export default function plugin(options: Options = Object.create(null)) { } } - // If the forbidding of operations isn't enabled, we can just return - // since this will only be used for stats. - if (forbidUnregisteredOperations) { + // If the user explicitly set forbidUnregisteredOperations to either `true` or a function, and the operation + // should be forbidden, we report it within metrics as forbidden, even though we may be running in dryRun mode. + if ( + forbidUnregisteredOperations && + options.forbidUnregisteredOperations + ) { logger.debug( - `${options.dryRun && - dryRunPrefix} ${logHash}: Execution denied because 'forbidUnregisteredOperations' was enabled for this request and the operation was not found in the local operation registry.`, + `${logHash} Reporting operation as forbidden to Apollo trace warehouse.`, ); - requestContext.metrics.forbiddenOperation = true; + } + + if (forbidUnregisteredOperations) { if (!options.dryRun) { + logger.debug( + `${logHash}: Execution denied because 'forbidUnregisteredOperations' was enabled for this request and the operation was not found in the local operation registry.`, + ); throw new ForbiddenError('Execution forbidden'); } else { logger.debug( @@ -224,12 +244,6 @@ export default function plugin(options: Options = Object.create(null)) { ); } } - - logger.debug( - `${logHash}: Execution of operation ${ - requestContext.operationName - } permitted without a matching entry in the local operation registry because 'forbidUnregisteredOperations' was not enabled for this request.`, - ); }, }; }, From 977c5a58be408c58992986f4f1d5a96847aca253 Mon Sep 17 00:00:00 2001 From: Adam Zionts Date: Wed, 26 Jun 2019 18:13:26 -0700 Subject: [PATCH 153/642] Rename confusing variable This variable was named `forbidUnregisteredOperation`, but it could actually be the result of a custom predicate function that could make up its own mind about whether an operation should be forbidden. Moreover, the behavior of the plugin depends not only on this rather prescriptive sounding variable, but also on whether we are running in dryRun mode or not. --- .../src/ApolloServerPluginOperationRegistry.ts | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts index 3ebfbd1cdbe..554ee904f47 100644 --- a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts +++ b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts @@ -175,7 +175,7 @@ for observability purposes, but all operations will be permitted.`, // return value from the function. In the event of an error, or if // the function does not return a value, we will fail-safe to // forbidding unregistered operations. - let forbidUnregisteredOperations: boolean = + let shouldForbidOperation: boolean = typeof options.forbidUnregisteredOperations === 'boolean' ? options.forbidUnregisteredOperations : typeof options.forbidUnregisteredOperations === 'function' @@ -202,7 +202,7 @@ for observability purposes, but all operations will be permitted.`, // enforcement mode; an explicit boolean `false` is required to // disable enforcement when a predicate function is in use. if (typeof predicateResult === 'boolean') { - forbidUnregisteredOperations = predicateResult; + shouldForbidOperation = predicateResult; } else { logger.warn( `${logHash} Predicate function did not return a boolean response. Got ${predicateResult}`, @@ -220,17 +220,14 @@ for observability purposes, but all operations will be permitted.`, // If the user explicitly set forbidUnregisteredOperations to either `true` or a function, and the operation // should be forbidden, we report it within metrics as forbidden, even though we may be running in dryRun mode. - if ( - forbidUnregisteredOperations && - options.forbidUnregisteredOperations - ) { + if (shouldForbidOperation && options.forbidUnregisteredOperations) { logger.debug( `${logHash} Reporting operation as forbidden to Apollo trace warehouse.`, ); requestContext.metrics.forbiddenOperation = true; } - if (forbidUnregisteredOperations) { + if (shouldForbidOperation) { if (!options.dryRun) { logger.debug( `${logHash}: Execution denied because 'forbidUnregisteredOperations' was enabled for this request and the operation was not found in the local operation registry.`, From a0f5cc6fdb39f86ba2db7485a0475e3385e66379 Mon Sep 17 00:00:00 2001 From: Adam Zionts Date: Thu, 27 Jun 2019 08:44:46 -0700 Subject: [PATCH 154/642] Allow operation registry to function sans PQ Previously, the operation registry safe-listing feature required persisted queries to function as the two features shared a cache. Now that the features have different caches, we need not throw an error if persisted queries is disabled when setting up the operation registry plugin --- .../src/ApolloServerPluginOperationRegistry.ts | 8 -------- 1 file changed, 8 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts index c72e2fc88e2..f9cc8406982 100644 --- a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts +++ b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts @@ -65,7 +65,6 @@ export default function plugin(options: Options = Object.create(null)) { schema, schemaHash, engine, - persistedQueries, }: GraphQLServiceContext): Promise { logger.debug('Initializing operation registry plugin.'); @@ -83,13 +82,6 @@ export default function plugin(options: Options = Object.create(null)) { }'. The schema hash is ${schemaHash}.`, ); - if (!persistedQueries || !persistedQueries.cache) { - const messagePersistedQueriesRequired = - 'Persisted queries must be enabled to use the operation registry.'; - logger.error(messagePersistedQueriesRequired); - throw new Error(`${pluginName}: ${messagePersistedQueriesRequired}`); - } - // An LRU store with no `maxSize` is effectively an InMemoryStore and // exactly what we want for this purpose. store = new InMemoryLRUCache({ maxSize: Infinity }); From e49b20e98de1c1994203c884c04b2c8f333fee34 Mon Sep 17 00:00:00 2001 From: Evans Hauser Date: Thu, 6 Jun 2019 16:55:53 -0700 Subject: [PATCH 155/642] op-reg: add hooks for plugin lifecycle This adds hooks into the lifecycle of the operation registry * onManifestUpdate(newManifest, oldManifest) * onUnregisteredOperation(operation) * onForbiddenOperation(operation) --- .../src/ApolloServerPluginOperationRegistry.ts | 16 +++++++++++++++- .../src/agent.ts | 9 +++++++-- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts index f9cc8406982..56cf41b9b8f 100644 --- a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts +++ b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts @@ -11,7 +11,7 @@ import { defaultOperationRegistrySignature, } from 'apollo-graphql'; import { ForbiddenError, ApolloError } from 'apollo-server-errors'; -import Agent from './agent'; +import Agent, { OperationManifest } from './agent'; import { GraphQLSchema } from 'graphql/type'; import { InMemoryLRUCache } from 'apollo-server-caching'; import loglevel from 'loglevel'; @@ -28,6 +28,12 @@ interface Options { | ForbidUnregisteredOperationsPredicate; dryRun?: boolean; schemaTag?: string; + onUnregisteredOperation?: (requestContext: GraphQLRequestContext) => void; + onForbiddenOperation?: (requestContext: GraphQLRequestContext) => void; + onManifestUpdate?: ( + newManifest: OperationManifest, + oldManifest: OperationManifest, + ) => void; } export default function plugin(options: Options = Object.create(null)) { @@ -94,6 +100,7 @@ export default function plugin(options: Options = Object.create(null)) { engine, store, logger, + onManifestUpdate: options.onManifestUpdate, }); await agent.start(); @@ -149,6 +156,10 @@ export default function plugin(options: Options = Object.create(null)) { ); requestContext.metrics.registeredOperation = true; return; + } else { + if (options.onUnregisteredOperation) { + options.onUnregisteredOperation(requestContext); + } } // If the `forbidUnregisteredOperations` option is set explicitly to @@ -206,6 +217,9 @@ export default function plugin(options: Options = Object.create(null)) { ); requestContext.metrics.forbiddenOperation = true; + if (options.onForbiddenOperation) { + options.onForbiddenOperation(requestContext); + } if (!options.dryRun) { throw new ForbiddenError('Execution forbidden'); } else { diff --git a/packages/apollo-server-plugin-operation-registry/src/agent.ts b/packages/apollo-server-plugin-operation-registry/src/agent.ts index 40bd1d76994..7c8eb02a446 100644 --- a/packages/apollo-server-plugin-operation-registry/src/agent.ts +++ b/packages/apollo-server-plugin-operation-registry/src/agent.ts @@ -11,6 +11,7 @@ import loglevel from 'loglevel'; import { Response } from 'node-fetch'; import { InMemoryLRUCache } from 'apollo-server-caching'; +import { GraphQLRequestContext } from 'apollo-server-plugin-base'; import { fetchIfNoneMatch } from './fetchIfNoneMatch'; const DEFAULT_POLL_SECONDS: number = 30; @@ -23,14 +24,18 @@ export interface AgentOptions { engine: any; store: InMemoryLRUCache; schemaTag: string; + onManifestUpdate?: ( + newManifest: OperationManifest, + oldManifest: OperationManifest, + ) => void; } -interface Operation { +export interface Operation { signature: string; document: string; } -interface OperationManifest { +export interface OperationManifest { version: number; operations: Array; } From 02fc20cf59c141c8045556a10c36b77eb94f0456 Mon Sep 17 00:00:00 2001 From: Evans Hauser Date: Tue, 25 Jun 2019 15:04:54 -0700 Subject: [PATCH 156/642] call willManifestUpdate once on failure and updates --- .../ApolloServerPluginOperationRegistry.ts | 11 +++-- .../src/agent.ts | 47 ++++++++++++++----- 2 files changed, 42 insertions(+), 16 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts index 56cf41b9b8f..a40790354c2 100644 --- a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts +++ b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts @@ -16,6 +16,7 @@ import { GraphQLSchema } from 'graphql/type'; import { InMemoryLRUCache } from 'apollo-server-caching'; import loglevel from 'loglevel'; import loglevelDebug from 'loglevel-debug'; +import { PromiseOrValue } from 'graphql/jsutils/PromiseOrValue'; type ForbidUnregisteredOperationsPredicate = ( requestContext: GraphQLRequestContext, @@ -30,10 +31,10 @@ interface Options { schemaTag?: string; onUnregisteredOperation?: (requestContext: GraphQLRequestContext) => void; onForbiddenOperation?: (requestContext: GraphQLRequestContext) => void; - onManifestUpdate?: ( - newManifest: OperationManifest, - oldManifest: OperationManifest, - ) => void; + willUpdateManifest?: ( + newManifest?: OperationManifest, + oldManifest?: OperationManifest, + ) => PromiseOrValue; } export default function plugin(options: Options = Object.create(null)) { @@ -100,7 +101,7 @@ export default function plugin(options: Options = Object.create(null)) { engine, store, logger, - onManifestUpdate: options.onManifestUpdate, + willUpdateManifest: options.willUpdateManifest, }); await agent.start(); diff --git a/packages/apollo-server-plugin-operation-registry/src/agent.ts b/packages/apollo-server-plugin-operation-registry/src/agent.ts index 7c8eb02a446..ae2d10e55d3 100644 --- a/packages/apollo-server-plugin-operation-registry/src/agent.ts +++ b/packages/apollo-server-plugin-operation-registry/src/agent.ts @@ -11,8 +11,8 @@ import loglevel from 'loglevel'; import { Response } from 'node-fetch'; import { InMemoryLRUCache } from 'apollo-server-caching'; -import { GraphQLRequestContext } from 'apollo-server-plugin-base'; import { fetchIfNoneMatch } from './fetchIfNoneMatch'; +import { PromiseOrValue } from 'graphql/jsutils/PromiseOrValue'; const DEFAULT_POLL_SECONDS: number = 30; const SYNC_WARN_TIME_SECONDS: number = 60; @@ -24,10 +24,10 @@ export interface AgentOptions { engine: any; store: InMemoryLRUCache; schemaTag: string; - onManifestUpdate?: ( - newManifest: OperationManifest, - oldManifest: OperationManifest, - ) => void; + willUpdateManifest?: ( + newManifest?: OperationManifest, + oldManifest?: OperationManifest, + ) => PromiseOrValue; } export interface Operation { @@ -56,6 +56,7 @@ export default class Agent { public _timesChecked: number = 0; private lastOperationSignatures: SignatureStore = new Set(); + private lastManifest?: OperationManifest; private readonly options: AgentOptions = Object.create(null); constructor(options: AgentOptions) { @@ -106,8 +107,14 @@ export default class Agent { try { await pulse(); } catch (err) { + // Update the manifest to trigger `onManifestUpdate(newManifest: undefined, oldManifest: undefined)` + this.updateManifest(); console.error( - 'The operation manifest could not be fetched. Retries will continue, but requests will be forbidden until the manifest is fetched.', + `The operation manifest could not be fetched. Retries will continue.${ + this.lastManifest + ? '' + : ' Requests will be forbidden until the manifest is fetched.' + }`, err.message || err, ); } @@ -313,19 +320,37 @@ export default class Agent { }); } - public async updateManifest(manifest: OperationManifest) { + public async updateManifest(manifest?: OperationManifest) { if ( - !manifest || - manifest.version !== 2 || - !Array.isArray(manifest.operations) + manifest && + (manifest.version !== 2 || !Array.isArray(manifest.operations)) ) { throw new Error('Invalid manifest format.'); } + const returnedManifest = + (await (this.options.willUpdateManifest && + this.options.willUpdateManifest(manifest, this.lastManifest))) || + manifest; + + if (returnedManifest && !Array.isArray(returnedManifest.operations)) { + throw new Error( + "Invalid manifest format. Manifest's operations must be an array", + ); + } + + if (returnedManifest) { + this.updateOperationStore(returnedManifest.operations); + } + + this.lastManifest = manifest; + } + + private updateOperationStore(operations: OperationManifest['operations']) { const incomingOperations: Map = new Map(); const replacementSignatures: SignatureStore = new Set(); - for (const { signature, document } of manifest.operations) { + for (const { signature, document } of operations) { incomingOperations.set(signature, document); // Keep track of each operation in this manifest so we can store it // for comparison after the next fetch. From 083787cab01c1307807307b5e440f9dc22f67b9a Mon Sep 17 00:00:00 2001 From: Evans Hauser Date: Tue, 25 Jun 2019 15:09:24 -0700 Subject: [PATCH 157/642] layout test structure --- .../src/__tests__/agent.test.ts | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts index d1af491a8d1..f51757bf8a9 100644 --- a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts @@ -539,6 +539,28 @@ describe('Agent', () => { }); }); }); + + describe('manifest lifecycle', () => { + describe('willUpdateManifest', () => { + describe("called with undefined arguments when can't fetch first time", () => {}); + describe('called with manifest retrieved from gcs', () => {}); + describe('uses returned manifest', () => {}); + describe('not called again when manifest remains same', () => {}); + describe('called with previous manifest when updated', () => {}); + }); + }); + }); + + describe('operation lifecycle hooks', () => { + describe('onUnregisterOperation', () => { + describe('called when unregistered operation received', () => {}); + describe('not called when registered operation received', () => {}); + }); + describe('onForbiddenOperation', () => { + describe('called when unregistered operation received and forbidden', () => {}); + describe('not called when unregistered operation received and unforbidden', () => {}); + describe('not called when registered operation received', () => {}); + }); }); }); From 52ec850c96b7c1b93779c5e76d77498bc914a007 Mon Sep 17 00:00:00 2001 From: Evans Hauser Date: Tue, 2 Jul 2019 09:35:13 -0700 Subject: [PATCH 158/642] add changelog --- packages/apollo-server-plugin-operation-registry/CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/apollo-server-plugin-operation-registry/CHANGELOG.md b/packages/apollo-server-plugin-operation-registry/CHANGELOG.md index b7922b4ca5e..0687c64c468 100644 --- a/packages/apollo-server-plugin-operation-registry/CHANGELOG.md +++ b/packages/apollo-server-plugin-operation-registry/CHANGELOG.md @@ -2,6 +2,8 @@ ### vNEXT +- Add lifecycle hooks: willUpdateManifest, onUnregisteredOperation, onForbiddenOperation [PR #158](https://github.com/apollographql/apollo-platform-commercial/pull/158) + ### 0.2.0 - Per-tag operation manifests can now be fetched for each tag that has a schema and registered operations. [PR #135](https://github.com/apollographql/apollo-platform-commercial/pull/135) From a0729dfa60ac9fbe8a8938f9f7e94cc435a87d94 Mon Sep 17 00:00:00 2001 From: Evans Hauser Date: Tue, 2 Jul 2019 17:53:02 -0700 Subject: [PATCH 159/642] add willUpdateManfest tests --- .../src/__tests__/agent.test.ts | 425 +++++++++++++----- 1 file changed, 325 insertions(+), 100 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts index f51757bf8a9..b6534655905 100644 --- a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts @@ -7,7 +7,7 @@ import { } from '../common'; import { resolve as urlResolve } from 'url'; import { createHash } from 'crypto'; -import { AgentOptions } from '../agent'; +import { AgentOptions, OperationManifest } from '../agent'; const fakeBaseUrl = 'https://myfakehost/'; @@ -84,7 +84,7 @@ describe('Agent', () => { }); }); - describe('fetches', () => { + describe('with manifest', () => { let originalEnvApolloOpManifestBaseUrl: string | undefined; let originalEnvOverrideStorageSecretBaseUrl: string | undefined; let Agent: typeof import('../agent').default; @@ -123,6 +123,51 @@ describe('Agent', () => { ).replace(new RegExp(`^${urlOperationManifestBase}`), ''); }); + // Each nock is good for exactly one request! + function nockLegacyGoodManifest( + operations: ManifestRecord[] = [ + sampleManifestRecords.a, + sampleManifestRecords.b, + sampleManifestRecords.c, + ], + ) { + return nockBase() + .get(genericLegacyOperationManifestUrl) + .reply(200, { + version: 2, + operations, + }); + } + + function nockGoodManifestsUnderStorageSecret( + operations: ManifestRecord[] = [ + sampleManifestRecords.a, + sampleManifestRecords.b, + sampleManifestRecords.c, + ], + ) { + return nockBase() + .get(genericStorageSecretOperationManifestUrl) + .reply(200, { + version: 2, + operations, + }); + } + + function nockStorageSecret( + status = 200, + body: any = JSON.stringify(genericStorageSecret), + ) { + return nockBase() + .get( + getStorageSecretUrl(genericServiceID, genericApiKeyHash).replace( + new RegExp(`^${urlStorageSecretBase}`), + '', + ), + ) + .reply(status, body); + } + afterAll(() => { // Put the environment overrides back how they were. if (originalEnvApolloOpManifestBaseUrl) { @@ -148,6 +193,42 @@ describe('Agent', () => { jest.resetModules(); }); + const forCleanup: { + store?: InMemoryLRUCache; + agent?: import('../agent').default; + }[] = []; + + function createAgent({ ...args }: Partial = {}) { + const options = { ...defaultAgentOptions, ...args }; + + // We never actually let the Agent construct its own default store + // since we need to pluck the store out to instrument it with spies. + const store = options.store; + const agent = new Agent(options); + + // Save all agents and stores we've created so we can properly + // stop them and clean them up. + forCleanup.push({ agent, store }); + return agent; + } + + afterEach(() => { + if (!nock.isDone()) { + throw new Error( + `Not all nock interceptors were used! Pending mocks: ${nock.pendingMocks()}`, + ); + } + + let toCleanup; + // Loop through the `forCleanup` constant and empty it out by popping + // individual elements off the end and running the appropriate cleanup. + while ((toCleanup = forCleanup.pop())) { + if (toCleanup.agent) { + toCleanup.agent.stop(); + } + } + }); + it('correctly prepared the test environment', () => { expect(getLegacyOperationManifestUrl('abc123', 'def456')).toStrictEqual( urlResolve(fakeBaseUrl, '/abc123/def456.v2.json'), @@ -155,87 +236,6 @@ describe('Agent', () => { }); describe('manifest checking and store populating', () => { - const forCleanup: { - store?: InMemoryLRUCache; - agent?: import('../agent').default; - }[] = []; - - function createAgent({ ...args } = {}) { - const options = { ...defaultAgentOptions, ...args }; - - // We never actually let the Agent construct its own default store - // since we need to pluck the store out to instrument it with spies. - const store = options.store; - const agent = new Agent(options); - - // Save all agents and stores we've created so we can properly - // stop them and clean them up. - forCleanup.push({ agent, store }); - return agent; - } - - afterEach(() => { - if (!nock.isDone()) { - throw new Error( - `Not all nock interceptors were used! Pending mocks: ${nock.pendingMocks()}`, - ); - } - - let toCleanup; - // Loop through the `forCleanup` constant and empty it out by popping - // individual elements off the end and running the appropriate cleanup. - while ((toCleanup = forCleanup.pop())) { - if (toCleanup.agent) { - toCleanup.agent.stop(); - } - } - }); - - // Each nock is good for exactly one request! - function nockLegacyGoodManifest( - operations: ManifestRecord[] = [ - sampleManifestRecords.a, - sampleManifestRecords.b, - sampleManifestRecords.c, - ], - ) { - return nockBase() - .get(genericLegacyOperationManifestUrl) - .reply(200, { - version: 2, - operations, - }); - } - - function nockGoodManifestsUnderStorageSecret( - operations: ManifestRecord[] = [ - sampleManifestRecords.a, - sampleManifestRecords.b, - sampleManifestRecords.c, - ], - ) { - return nockBase() - .get(genericStorageSecretOperationManifestUrl) - .reply(200, { - version: 2, - operations, - }); - } - - function nockStorageSecret( - status = 200, - body: any = JSON.stringify(genericStorageSecret), - ) { - return nockBase() - .get( - getStorageSecretUrl(genericServiceID, genericApiKeyHash).replace( - new RegExp(`^${urlStorageSecretBase}`), - '', - ), - ) - .reply(status, body); - } - function expectStoreSpyOperationEach( spy: jest.SpyInstance, letters: string[], @@ -541,25 +541,250 @@ describe('Agent', () => { }); describe('manifest lifecycle', () => { + function generateWillUpdateManifest( + operations?: OperationManifest['operations'], + ) { + return jest.fn( + ( + newManifest?: OperationManifest, + oldManifest?: OperationManifest, + ) => { + const manifest = newManifest || oldManifest; + return ( + (operations && { version: 2, operations }) || + manifest || { version: 2, operations: [] } + ); + }, + ); + } + describe('willUpdateManifest', () => { - describe("called with undefined arguments when can't fetch first time", () => {}); - describe('called with manifest retrieved from gcs', () => {}); - describe('uses returned manifest', () => {}); - describe('not called again when manifest remains same', () => {}); - describe('called with previous manifest when updated', () => {}); - }); - }); - }); + it("receives undefined arguments when can't fetch first time", async () => { + nockStorageSecret(404); + nockBase() + .get(genericLegacyOperationManifestUrl) + .reply(500); + const mock = generateWillUpdateManifest(); + const store = defaultStore(); + const storeSetSpy = jest.spyOn(store, 'set'); + const storeDeleteSpy = jest.spyOn(store, 'delete'); - describe('operation lifecycle hooks', () => { - describe('onUnregisterOperation', () => { - describe('called when unregistered operation received', () => {}); - describe('not called when registered operation received', () => {}); - }); - describe('onForbiddenOperation', () => { - describe('called when unregistered operation received and forbidden', () => {}); - describe('not called when unregistered operation received and unforbidden', () => {}); - describe('not called when registered operation received', () => {}); + const agent = createAgent({ + willUpdateManifest: mock, + store, + }); + await agent.start(); + expect(mock).toHaveBeenCalledTimes(1); + expect(mock).toHaveBeenCalledWith(undefined, undefined); + + // no additions, no deletions. + expect(storeSetSpy).toBeCalledTimes(0); + expect(storeDeleteSpy).toBeCalledTimes(0); + }); + it('receives manifest retrieved from gcs', async () => { + nockStorageSecret(); + nockGoodManifestsUnderStorageSecret(); + const mock = generateWillUpdateManifest(); + const store = defaultStore(); + const storeSetSpy = jest.spyOn(store, 'set'); + const storeDeleteSpy = jest.spyOn(store, 'delete'); + + const agent = createAgent({ + willUpdateManifest: mock, + store, + }); + await agent.start(); + expect(mock).toHaveBeenCalledTimes(1); + expect(mock).toHaveBeenCalledWith( + { + version: 2, + operations: [ + sampleManifestRecords.a, + sampleManifestRecords.b, + sampleManifestRecords.c, + ], + }, + undefined, + ); + + // Three additions, no deletions. + expect(storeSetSpy).toBeCalledTimes(3); + expect(storeDeleteSpy).toBeCalledTimes(0); + }); + it('uses returned manifest to enforce safelist', async () => { + nockStorageSecret(); + nockGoodManifestsUnderStorageSecret(); + const mock = generateWillUpdateManifest([sampleManifestRecords.a]); + const store = defaultStore(); + const storeSetSpy = jest.spyOn(store, 'set'); + const storeDeleteSpy = jest.spyOn(store, 'delete'); + + const agent = createAgent({ + willUpdateManifest: mock, + store, + }); + await agent.start(); + expect(mock).toHaveBeenCalledTimes(1); + expect(mock).toHaveBeenCalledWith( + { + version: 2, + operations: [ + sampleManifestRecords.a, + sampleManifestRecords.b, + sampleManifestRecords.c, + ], + }, + undefined, + ); + expect(mock).toReturnWith({ + version: 2, + operations: [sampleManifestRecords.a], + }); + + // One additions, no deletions. + expect(storeSetSpy).toBeCalledTimes(1); + expect(storeDeleteSpy).toBeCalledTimes(0); + }); + it('is not called again when manifest remains same', async () => { + nockStorageSecret(); + nockGoodManifestsUnderStorageSecret(); + + const mock = generateWillUpdateManifest(); + const store = defaultStore(); + const storeSetSpy = jest.spyOn(store, 'set'); + const storeDeleteSpy = jest.spyOn(store, 'delete'); + + const agent = createAgent({ + willUpdateManifest: mock, + store, + }); + jest.useFakeTimers(); + await agent.start(); + expect(mock).toHaveBeenCalledTimes(1); + expect(mock).toHaveBeenCalledWith( + { + version: 2, + operations: [ + sampleManifestRecords.a, + sampleManifestRecords.b, + sampleManifestRecords.c, + ], + }, + undefined, + ); + // Three additions, no deletions. + expect(storeSetSpy).toBeCalledTimes(3); + expect(storeDeleteSpy).toBeCalledTimes(0); + + // If it's one millisecond short of our next poll interval, nothing + // should have changed yet. + jest.advanceTimersByTime(pollSeconds * 1000 - 1); + + // Still only one check. + expect(agent._timesChecked).toBe(1); + + // Now, we'll expect another request to go out, so we'll nock it. + nockStorageSecret(); + nockBase() + .get(genericStorageSecretOperationManifestUrl) + .reply(304); + + // If we move forward the last remaining millisecond, we should trigger + // and end up with a successful sync. + jest.advanceTimersByTime(1); + + // While that timer will fire, it will do work async, and we need to + // wait on that work itself. + await agent.requestPending(); + + // Now the times checked should have gone up. + expect(agent._timesChecked).toBe(2); + + // the agent should not have been called again + expect(mock).toHaveBeenCalledTimes(1); + expect(mock).toHaveBeenCalledWith( + { + version: 2, + operations: [ + sampleManifestRecords.a, + sampleManifestRecords.b, + sampleManifestRecords.c, + ], + }, + undefined, + ); + // Three additions, no deletions. + expect(storeSetSpy).toBeCalledTimes(3); + expect(storeDeleteSpy).toBeCalledTimes(0); + }); + + it('receives previous manifest when updated', async () => { + nockStorageSecret(); + nockGoodManifestsUnderStorageSecret(); + + const mock = generateWillUpdateManifest(); + const store = defaultStore(); + const storeSetSpy = jest.spyOn(store, 'set'); + const storeDeleteSpy = jest.spyOn(store, 'delete'); + + const agent = createAgent({ + willUpdateManifest: mock, + store, + }); + jest.useFakeTimers(); + await agent.start(); + expect(mock).toHaveBeenCalledTimes(1); + expect(mock).toHaveBeenCalledWith( + { + version: 2, + operations: [ + sampleManifestRecords.a, + sampleManifestRecords.b, + sampleManifestRecords.c, + ], + }, + undefined, + ); + // Three additions, no deletions. + expect(storeSetSpy).toBeCalledTimes(3); + expect(storeDeleteSpy).toBeCalledTimes(0); + + // If it's one millisecond short of our next poll interval, nothing + // should have changed yet. + jest.advanceTimersByTime(pollSeconds * 1000 - 1); + + // Still only one check. + expect(agent._timesChecked).toBe(1); + + // Now, we'll expect another request to go out, so we'll nock it. + nockStorageSecret(); + nockGoodManifestsUnderStorageSecret([sampleManifestRecords.a]); + + // If we move forward the last remaining millisecond, we should trigger + // and end up with a successful sync. + jest.advanceTimersByTime(1); + + // While that timer will fire, it will do work async, and we need to + // wait on that work itself. + await agent.requestPending(); + + expect(mock).toHaveBeenCalledTimes(2); + expect(mock).toHaveBeenCalledWith( + { version: 2, operations: [sampleManifestRecords.a] }, + { + version: 2, + operations: [ + sampleManifestRecords.a, + sampleManifestRecords.b, + sampleManifestRecords.c, + ], + }, + ); + // Three additions, two deletions. + expect(storeSetSpy).toBeCalledTimes(3); + expect(storeDeleteSpy).toBeCalledTimes(2); + }); + }); }); }); }); From aa50374b6cf6f08d0e9d9bc7c24d3d6d588f46ef Mon Sep 17 00:00:00 2001 From: Evans Hauser Date: Wed, 3 Jul 2019 11:16:19 -0700 Subject: [PATCH 160/642] Add tests for on(Forbidden|Unregistered)Operation --- ...polloServerPluginOperationRegistry.test.ts | 252 ++++++++++++++++++ 1 file changed, 252 insertions(+) diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/ApolloServerPluginOperationRegistry.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/ApolloServerPluginOperationRegistry.test.ts index 50f3b1b2bfb..c420a76294e 100644 --- a/packages/apollo-server-plugin-operation-registry/src/__tests__/ApolloServerPluginOperationRegistry.test.ts +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/ApolloServerPluginOperationRegistry.test.ts @@ -1,4 +1,36 @@ import plugin from '../ApolloServerPluginOperationRegistry'; +import { ApolloServerBase, ForbiddenError } from 'apollo-server-core'; +import { + defaultOperationRegistrySignature, + operationHash, +} from 'apollo-graphql'; +import gql from 'graphql-tag'; +import { print } from 'graphql'; + +const typeDefs = gql` + type Query { + hello: String + } +`; + +const query = gql` + query HelloFam { + hello + } +`; + +const normalizedQueryDocument = defaultOperationRegistrySignature( + query, + 'HelloFam', +); +const queryHash = operationHash(normalizedQueryDocument); + +// In order to expose will start and +class ApolloServerMock extends ApolloServerBase { + public async willStart() { + return super.willStart(); + } +} describe.only('Operation registry plugin', () => { it('will instantiate when not called with options', () => { @@ -8,4 +40,224 @@ describe.only('Operation registry plugin', () => { it('will instantiate with debug enabled', () => { expect(plugin({ debug: true })()).toHaveProperty('serverWillStart'); }); + + // These tests depend on the behavior of willUpdateManifest to update the + // operation safelist + describe('operation lifecycle hooks', () => { + describe('onUnregisterOperation', () => { + it('is called when unregistered operation received', async () => { + const mock = jest.fn(requestContext => { + expect(requestContext).toMatchObject({ + request: { + operationName: 'HelloFam', + }, + }); + }); + const server = new ApolloServerMock({ + typeDefs, + mockEntireSchema: true, + engine: { + apiKey: 'server:not-a-service:not-an-apikey', + }, + plugins: [ + plugin({ + willUpdateManifest: () => { + return { + version: 2, + operations: [], + }; + }, + onUnregisteredOperation: mock, + })(), + ], + }); + await server.willStart(); + const result = await server.executeOperation({ + query: print(query), + operationName: 'HelloFam', + }); + expect(result.data).toBeDefined(); + expect(result.errors).not.toBeDefined(); + expect(result.data && result.data.hello).toBeDefined(); + expect(mock).toHaveBeenCalledTimes(1); + await server.stop(); + }); + + it('is not called when registered operation received', async () => { + const mock = jest.fn(); + const server = new ApolloServerMock({ + typeDefs, + mockEntireSchema: true, + engine: { + apiKey: 'server:not-a-service:not-an-apikey', + }, + plugins: [ + plugin({ + willUpdateManifest: () => { + return { + version: 2, + operations: [ + { + document: normalizedQueryDocument, + signature: queryHash, + }, + ], + }; + }, + onUnregisteredOperation: mock, + })(), + ], + }); + await server.willStart(); + const result = await server.executeOperation({ + query: print(query), + operationName: 'HelloFam', + }); + expect(result.data).toBeDefined(); + expect(result.errors).not.toBeDefined(); + expect(result.data && result.data.hello).toBeDefined(); + expect(mock).toHaveBeenCalledTimes(0); + await server.stop(); + }); + }); + + describe('onForbiddenOperation', () => { + it('is called when unregistered operation received and forbidden', async () => { + const mock = jest.fn(requestContext => { + expect(requestContext).toMatchObject({ + request: { + operationName: 'HelloFam', + }, + }); + }); + const forbidUnregisteredOperations = jest.fn(requestContext => { + expect(requestContext).toMatchObject({ + request: { + operationName: 'HelloFam', + }, + }); + return true; + }); + + const server = new ApolloServerMock({ + typeDefs, + mockEntireSchema: true, + engine: { + apiKey: 'server:not-a-service:not-an-apikey', + }, + plugins: [ + plugin({ + willUpdateManifest: () => { + return { + version: 2, + operations: [], + }; + }, + forbidUnregisteredOperations, + onForbiddenOperation: mock, + })(), + ], + }); + await server.willStart(); + const result = await server.executeOperation({ + query: print(query), + operationName: 'HelloFam', + }); + expect(result.data).not.toBeDefined(); + expect(result.errors).toBeDefined(); + expect(result.errors).toHaveLength(1); + expect(result.errors && result.errors[0].message).toContain( + 'forbidden', + ); + expect(mock).toHaveBeenCalledTimes(1); + expect(forbidUnregisteredOperations).toHaveBeenCalledTimes(1); + await server.stop(); + }); + + it('is not called when unregistered operation received and unforbidden', async () => { + const mock = jest.fn(requestContext => { + expect(requestContext).toMatchObject({ + request: { + operationName: 'HelloFam', + }, + }); + }); + const forbidUnregisteredOperations = jest.fn(requestContext => { + expect(requestContext).toMatchObject({ + request: { + operationName: 'HelloFam', + }, + }); + return false; + }); + const server = new ApolloServerMock({ + typeDefs, + mockEntireSchema: true, + engine: { + apiKey: 'server:not-a-service:not-an-apikey', + }, + plugins: [ + plugin({ + willUpdateManifest: () => { + return { + version: 2, + operations: [], + }; + }, + forbidUnregisteredOperations, + onForbiddenOperation: mock, + })(), + ], + }); + await server.willStart(); + const result = await server.executeOperation({ + query: print(query), + operationName: 'HelloFam', + }); + expect(result.data).toBeDefined(); + expect(result.errors).not.toBeDefined(); + expect(result.data && result.data.hello).toBeDefined(); + expect(mock).toHaveBeenCalledTimes(0); + expect(forbidUnregisteredOperations).toHaveBeenCalledTimes(1); + await server.stop(); + }); + + it('is not called when registered operation received', async () => { + const mock = jest.fn(); + const server = new ApolloServerMock({ + typeDefs, + mockEntireSchema: true, + engine: { + apiKey: 'server:not-a-service:not-an-apikey', + }, + plugins: [ + plugin({ + willUpdateManifest: () => { + return { + version: 2, + operations: [ + { + document: normalizedQueryDocument, + signature: queryHash, + }, + ], + }; + }, + onForbiddenOperation: mock, + })(), + ], + }); + await server.willStart(); + const result = await server.executeOperation({ + query: print(query), + operationName: 'HelloFam', + }); + expect(result.data).toBeDefined(); + expect(result.errors).not.toBeDefined(); + expect(result.data && result.data.hello).toBeDefined(); + expect(mock).toHaveBeenCalledTimes(0); + await server.stop(); + }); + }); + }); }); From d36025f56ea81cc9b98421e9d2c80049bdf42ffd Mon Sep 17 00:00:00 2001 From: Chang Wang Date: Thu, 4 Jul 2019 10:25:52 -0400 Subject: [PATCH 161/642] Don't enable logging if debug is explicitly false --- .../src/ApolloServerPluginOperationRegistry.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts index f9cc8406982..ad1f7c988a7 100644 --- a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts +++ b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts @@ -48,7 +48,7 @@ export default function plugin(options: Options = Object.create(null)) { } // Notify about logging as a result of dryRun === true - if (options.dryRun === true) { + if (options.dryRun === true && options.debug !== false) { logger.enableAll(); logger.debug( `${dryRunPrefix} Operation registry logging enabled because options.dryRun is true.`, From b8b84cb68e6ba9647ec1e1776e91222939a1e74d Mon Sep 17 00:00:00 2001 From: Chang Wang Date: Thu, 4 Jul 2019 10:30:25 -0400 Subject: [PATCH 162/642] update changelog --- packages/apollo-server-plugin-operation-registry/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/apollo-server-plugin-operation-registry/CHANGELOG.md b/packages/apollo-server-plugin-operation-registry/CHANGELOG.md index b7922b4ca5e..7923161aa70 100644 --- a/packages/apollo-server-plugin-operation-registry/CHANGELOG.md +++ b/packages/apollo-server-plugin-operation-registry/CHANGELOG.md @@ -1,6 +1,7 @@ # Change Log ### vNEXT +- Don't enable logging if debug was explicitly set to false even if dryRun is set to true [PR #159](https://github.com/apollographql/apollo-platform-commercial/pull/159) ### 0.2.0 From c427ad82c9436e20f7031c340805663b99caf39f Mon Sep 17 00:00:00 2001 From: Chang Wang Date: Mon, 8 Jul 2019 13:22:05 -0700 Subject: [PATCH 163/642] Publish - apollo-gateway-enterprise@0.1.0-alpha.9 - apollo-server-plugin-operation-registry@0.2.1-alpha.0 --- packages/apollo-server-plugin-operation-registry/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/package.json b/packages/apollo-server-plugin-operation-registry/package.json index b650b32f23b..3421d56a3c1 100644 --- a/packages/apollo-server-plugin-operation-registry/package.json +++ b/packages/apollo-server-plugin-operation-registry/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-plugin-operation-registry", - "version": "0.2.0-alpha.1", + "version": "0.2.1-alpha.0", "description": "Apollo Server operation registry", "main": "dist/index.js", "types": "dist/index.d.ts", From 1b64d9248cf9ad94d32d8b4592227b935d3ea46a Mon Sep 17 00:00:00 2001 From: Chang Wang Date: Mon, 8 Jul 2019 13:30:37 -0700 Subject: [PATCH 164/642] update changelog to reflect publish --- .../apollo-server-plugin-operation-registry/CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/CHANGELOG.md b/packages/apollo-server-plugin-operation-registry/CHANGELOG.md index 7923161aa70..324735b247f 100644 --- a/packages/apollo-server-plugin-operation-registry/CHANGELOG.md +++ b/packages/apollo-server-plugin-operation-registry/CHANGELOG.md @@ -1,6 +1,9 @@ # Change Log -### vNEXT +### vNEXT + + +### 0.2.1 - Don't enable logging if debug was explicitly set to false even if dryRun is set to true [PR #159](https://github.com/apollographql/apollo-platform-commercial/pull/159) ### 0.2.0 From a56e2f363858b2b8a707beed84f82e18961f319f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 16 Jul 2019 17:36:05 +0000 Subject: [PATCH 165/642] chore(deps): update dependency apollo-server-caching to ^0.5.0 (#167) --- packages/apollo-server-plugin-operation-registry/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/package.json b/packages/apollo-server-plugin-operation-registry/package.json index 3421d56a3c1..473c5d54a79 100644 --- a/packages/apollo-server-plugin-operation-registry/package.json +++ b/packages/apollo-server-plugin-operation-registry/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "apollo-graphql": "0.3.3", - "apollo-server-caching": "^0.4.0", + "apollo-server-caching": "^0.5.0", "apollo-server-errors": "^2.2.0", "apollo-server-plugin-base": "^0.5.0", "fast-json-stable-stringify": "^2.0.0", From f1804246027532dddc2cffbf479330d6552518ef Mon Sep 17 00:00:00 2001 From: Evans Hauser Date: Wed, 24 Jul 2019 16:39:31 -0700 Subject: [PATCH 166/642] surround observability hooks in promise --- .../src/ApolloServerPluginOperationRegistry.ts | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts index a40790354c2..996f6d5d51d 100644 --- a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts +++ b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts @@ -159,7 +159,11 @@ export default function plugin(options: Options = Object.create(null)) { return; } else { if (options.onUnregisteredOperation) { - options.onUnregisteredOperation(requestContext); + new Promise(() => { + if (options.onUnregisteredOperation) { + options.onUnregisteredOperation(requestContext); + } + }); } } @@ -219,7 +223,11 @@ export default function plugin(options: Options = Object.create(null)) { requestContext.metrics.forbiddenOperation = true; if (options.onForbiddenOperation) { - options.onForbiddenOperation(requestContext); + new Promise(() => { + if (options.onForbiddenOperation) { + options.onForbiddenOperation(requestContext); + } + }); } if (!options.dryRun) { throw new ForbiddenError('Execution forbidden'); From fee1ef8a79cc7d98e563110f6296a0d9c3319f06 Mon Sep 17 00:00:00 2001 From: Evans Hauser Date: Wed, 31 Jul 2019 11:29:33 -0700 Subject: [PATCH 167/642] Add readme for operation registry plugin [AP-606] (#178) * create readme for operation registry plugin * Update packages/apollo-server-plugin-operation-registry/README.md Co-Authored-By: Jesse Rosenberger * Update packages/apollo-server-plugin-operation-registry/README.md Co-Authored-By: Jesse Rosenberger * Update packages/apollo-server-plugin-operation-registry/README.md Co-Authored-By: Jesse Rosenberger * use new, simpler gateway configuration --- .../README.md | 87 +++++++++++++++++- .../img/clients-page.png | Bin 0 -> 231147 bytes 2 files changed, 86 insertions(+), 1 deletion(-) create mode 100644 packages/apollo-server-plugin-operation-registry/img/clients-page.png diff --git a/packages/apollo-server-plugin-operation-registry/README.md b/packages/apollo-server-plugin-operation-registry/README.md index ff839087b35..ec5a49c8858 100644 --- a/packages/apollo-server-plugin-operation-registry/README.md +++ b/packages/apollo-server-plugin-operation-registry/README.md @@ -1 +1,86 @@ -# Operation Registry +# Operation Registry Plugin + +The operation registry plugin is the interface into the Apollo Platform's **operation registry** and enables operation **safelisting**, which allows selective execution based on the operation. Safelisting eliminates the risk of unexpected operations that could cause downtime from being run against a graph. + +In order to enable safelisting, follow the [step by step guide in the Apollo docs](https://www.apollographql.com/docs/platform/operation-registry/). These steps describe how to extract and upload operations defined within client applications to the [Apollo Graph Manager](https://engine.apollographql.com) using the Apollo CLI. Once operations have been registered, this plugin for Apollo Server fetches the manifest of these operations from the [Apollo Graph Manager](https://engine.apollographql.com) and forbids the execution of any operations that are not in that manifest. + +### Usage + +The following example shows basic usage of the plugin with Apollo Server. First, add the plugin to your project's `package.json`: + +```bash +npm install apollo-server-plugin-operation-registry +``` + +Then, ensure Apollo Server has access to an [API key](https://www.apollographql.com/docs/platform/operation-registry/#6-start-apollo-server-with-apollo-engine-enabled), for example as the `ENGINE_API_KEY` environment variable: + +```bash +ENGINE_API_KEY= npm start +``` + +Next, enable the plugin by adding it to the `plugins` parameter to the Apollo Server options: + +```js +const server = new ApolloServer({ + typeDefs, + resolvers, + subscriptions: false, + plugins: [ + require("apollo-server-plugin-operation-registry")({ + forbidUnregisteredOperations: true + }) + ] +}); +``` + +
With federation, the setup follows the same `plugins` configuration: + +```js +const { ApolloServer } = require("apollo-server"); +const { ApolloGateway } = require("@apollo/gateway"); + +const gateway = new ApolloGateway({ + serviceList: [ /* services */ ], +}); + +const server = new ApolloServer({ + gateway, + subscriptions: false, + plugins: [ + require("apollo-server-plugin-operation-registry")({ + forbidUnregisteredOperations: true + }) + ] +}); + +server.listen().then(({ url }) => { + console.log(`🚀 Server ready at ${url}`); +}); +``` +
+ +#### Schema Tag/Variant + +Clients can register their operations to specific tags/variants, so the plugin contains the `schemaTag` field to specify which tag/variant to pull operation manifests from. + +```js +const server = new ApolloServer({ + plugins: [ + require("apollo-server-plugin-operation-registry")({ + schemaTag: "overrideTag" + }) + ] +}); +``` + + +### Metrics + +The plugin will transmit metrics regarding unregistered operations which can be viewed within [the Apollo Graph Manager](https://engine.apollographql.com). The following example shows the unregistered operations sent by a particular client: + +

+ The clients page showing unregistered operations +

diff --git a/packages/apollo-server-plugin-operation-registry/img/clients-page.png b/packages/apollo-server-plugin-operation-registry/img/clients-page.png new file mode 100644 index 0000000000000000000000000000000000000000..b504dd7d658c993bf1c77a266e04660615a29551 GIT binary patch literal 231147 zcmeEuXIN9w)+QiDR6qqpKmkQSq$$0FpduaV9hFWX0Ro|irXYg!4gr-WT}o)7iqebJ zKthuiAoLEQOt|-(8TH=zxWDK5_`#Etle5oWd$0Abca?KOG}II*E-_ppARwSneEvj} zfPk!+fPi@YA}Rixd})$a0)k85ZRO=P6y@bvG@LomQ+HbUCaP=p3w& zWZxx1sR%CFt;m%Z6?7YK?#60q>`rHc-S4kG^Du-!dTzRXwof`tkPK*;Q_-29btG0w z`(inE@kB0HG_-8tv^M~&>v^x;vQ-uk3$-;3b1uB%P_YJJjoXW9A`eNmxO%zY|JFMK zs&#+j%z#^wBo=;@NB&oz``|7|%3HHA4a= zQAPN0SDNGGq_TX&jjXT8dvC6Sa7s5!oMh7HR=K*GB#GbQ38HtK0wunH79Z-4Q{H6v zPAs9~K3p2|yYZ7G$i~-z$Y|=Ku^-twAt4L#laF!t{5||ahhskImJ)Ciay`CwpOCRh zSA!7ZFZEJJlsMea%JF(C30;%UPYR$vnJnR9)8&W66M@$*2CQEt`7BoxdCh`yR5tu7 z^=1Ik$A|YBlmawa2=4{V{=9BOt4$OqN2?*EO?G?*=GP;a@QG=GY49?I9Oz^3L!y{h zJR<}ZemTu5i6p__O4g0_2{7Ld9PiXJ@dg8?0v)NnZ`5C!44_@V?0%E*-6c8suxmzd zLiX=md(Iyn^gPn?`6JDsK^BVVT>buIvNUbVv(%))pI$HAGzueQzeyeZ>$UTv&WG5C zw28-w>|GvR6e@gH7q=*so0iNSzOL#E3t!`E+hfbMR#No>9zk8@SDR)6tt7u-)tY1j~LP$vKa=K*OUj93&E{zS^<26MT62= zg&*$-US>#%e~OlskVB~AB!9fT1i0kef#RglDpEiAD4^4-5L~QPFz^Mej49(a5s?+q za*F|$t+GmmrNK>OCy44`o^;!$YD39OkK!cY?n_a*dpoau0LM1RKMuXNC3b=-u22MA z`A&+a=%KF_%%nfOX>}9$NYX*n=84cI|8)k3N8;w&sYR;RePs)C+gsar%zb8FnpZo) zof0E{t5EAJw@Fi?dcRmpmS^gF8qFIH>ra$_Gk8?UUkK56HEJI28D1QY8%El{WTa#K z)J>U^W;hAy?=vd21jt=K?bK}aCokmBqVRrR!bThG>Q&~DGJ!LHW| zv#5>u8&Mk3a`9THa>%T>uK0w@XHgPy9ydEDPpM`rQs0&ydN){Z&#xXpDjL>MQ&sca zn8BFTq}y1_INx~fAv`gv%e6}xs4rqxIS1qzm##)sb&f?;oi4t@MlCuu&Wx(GsGM}w z3E(7ECB@Q)(k}7U=)Fe*`QBERh_oVFa3K-7RK3>ey#$@_X=d)>PiIRWxFdZ%>~- z(|IQK0rJlD`uH{Z4@t~mmU*87&~nfSnNz&eX4S4cd|zzCb%Xi(5w#LEO~?Rs0=ubd zzw&i<_`R8!nV3B`s$R;(I#+FdK3bz) zn)4ov%OT44liU|AAg3A6TK85*eiyEa1=`g2mf`Z#%Mx@3e1-@c7MX{qIX@DAjQvW^ zTz#VKqB0kH7$Sra(8eQ{qfdas0n`ehfp+VCaqLJ!Y@D}2tBKp3LNIfu?=6$`ih4j` zXAq3hiSa2T2(&p--k_Z!*ia4v@6TuRZ1emuns9(M>^P5xm71WRqi4}HbFb!j(A^cF zv6HO3bDXl;9R^lRr!z4oGB#9PFgE}4$Vkp5uoO4CX^ddmfL zG!dSjC^NJ&fYvKr0~CJIEs^m&JrGCM)Lb|u6CP~d**t6t1XDtoH)RI!FOk$c;zc#H_Voy zxl*>?rJJ$4xfD5yIhWNV(%NMN#@K;g9=eVd#XeA6AUFgAOp6eobiK3vEi2TYuGjUe zc#rXBt;=R9ZjM?nQ7^f;#@J!WWmWPdf2+6^VO*13RBZ}agkXUyNu%Jyn!TMekt2|C zZF{}P&TxT|ROJkCvQ7XKKFzzfTIOZ2XFA!7klB3sLw>n=T45=og9$5BbkMz2`Rr}z zw05yC2osaYL3LQ=!v{?`Imv2R=bW=0_3M)z7ihKSAiF?@NbiMCoXQ=&p0(^_X7JUn zEA@6=R!^6a2)-VCXr^o$QE#xPyXUZipkG4;vj#Ia^g?AeKka9%wjQS^ri)8+cr)EJ zSSLBnI?5kH4ud{TGKE`3gufTN-cv;*`;#yyi*P;r27%J`yxTQ|EZu28duK>hZBCqs zPD3~ZcdM!iG_V(B$1V|k)A&$IeS7|XOrM7e`;S9{k#;!% zKtM!ltF7;%uc{($4szgqWdV9^$?NXmi08Wm1d{IJ_>T^jF0WYJ9qfT%ad)Y^|M-PC z{`1+_e0N#?@e>z-)Lng54HkKjvn7iVuORQkyV93fSXd;TEv&>fpFI1o%kf82cWqo; z9L4$g+}zxF-2`|+&enX7#Kgq-9`f_?^Yh?;!2|XHy1a7d0fJfoImrJW=ZPiQ+}YOA z#TEo)IUD!YYmlpp)ZM#hH~K$+|D30#yY2tI6A=7gV&MhkJ3GVoi1#7izq`!E*6ROp z+1Z(YUiJ^U{&_pev%$nQY~3yG4W8IKSOUTLsYyTL7Z#NK$9?|g)c>97Z8obakkHT=rML%*<29~XFCVWx+SuQBKft8>F5f}J z0SWUz6%`eoF)+7|rJ?*R2XqC$_x`#d`s+EnbGCPlr^L=QwG$1#4cCX6yt7-Hqo-`-xf?2P9TzL_=(El@cB4(kqtYn=V` zsRLp30<(wM;)KP4oE&mvEb!N_Uz>dj%hO01Y~7- zIV}e*y*py=d@z^LxzLxfwOw`V%73qL__ON@{`Qup4W}nKe!Ic@*sC{h+6WXFRoHVf zxD00-43t@QN4Ljtpt}|)p*U4w?Zz_%FV`szud#m12SyIB-Q_3-Av+7p1aI`SR`=Pq zYat;a?Uj!lU!JS%jb_B9w`xt{c5z&eCN(a$^uqRuf}jb>IQiD_+fSLr&2~ON4V?{Q z1U`pLbAepym%&nwg_x-Eg3W?d3H15)fytMR4?yOqr^mZZ`XCu>TXyu!eC8gktxyzs z?X7;M@&$6JrLJQJX2#A{VSh>5HqCX{xvr2lPFXEP%W;nA9FyfKp zRHF+b^!@v2Gv8yK;UW_*MiF2vzh%esKvIfKtsJ%fY*of$oNc4Qg*DV_Jq}2I=~A?L zYk2!eiMi!Otp}ujwIhy8d8XyVT#v+BY-D7l_VI#KJg*00Hj;@rt#p1jWa<&6kS}(2Mdk#mXO7KbzXb%4|MV}QSl<@pa+XzRt|X72pLJRvp-{3OTCX*=8_0d!|^a_B}`hd%&XClPg>N|F=^*Ns9Cu0hDNI{iTRWQq$yT1{=@xqKD#SKjbKwTnA7oP) zivWgIqz@M|w6p5)C}yqf+_2HY$nUvrLoa9($-}W)*g5HYY9e^^w26%QUHm0C!_$-F zr=4-kQl8rEs>%1LWRAYt1eFV~m@ykw0^v>8CfSb{jX-reX4$p_*{WroXV; zv~t3?mq!QUSwMKrOg`?}4an3YFP#~9>+HDc$vIFGAKOq+M67c;PRr}=-1i#!&0f}+ ztk>z!u0udZoHR7<6~QqXC)DcS6~B+I2>*l@g+Ef@Xi+;y`qUhvq~W|_kK~w`7#?*f zS+P)t=ichLX1UD^4?Lb}krctO$YL{@+!q-^-&yZ5=$6uYQE~=3d1~0k^=@X{6Kv;t4OBt2@Yy zjlyh|m)27_l4q?a>QWuU$X<;x5(|lb{NiBt&Arj%9sZDU-|2!YLK$i^l(1MHP;dPA znG$-37V+~CZvC3SN+5Ez3EiKijKSJ=r-}_QHQ>!6+LXlv6Am1&fsglax~)3=WDw=m zEl8}?5#C=ZxJX6iW@?2sD1!rr3vBoLHfLAEN0;s=h)l>p3!gZIL}oMZ#$8v{n&(vy z3s2Zzw^0mxU#T!KS7TZ^urdH>-%u>YVzaE-+zXF^KE9@&!B%4D@reB-+3Y6lCE5p7 zYGOJ5#(HGd>vClcZp$ODynYrezIpS;g?X+sp%T3^ju25$xI#hUy5e@U?}WrI*H<0P zr>yXjQQnFK6jeV9qF}Vb^!ET|s^Q0rZ!AU+4qoS4cKFkAGDp9v{Ko`c8)|_Y3a{^p zNk1y4>fAUFcv;ek`C(f%o;ypLA7u%}d=ATPt_n9KlYX9=o?iZi_eTzW3RXOK@7^s_ ztt~<>uZ-FF9B!A)bp}&0^FDg?XmhJqrZe%8d8TTLu=CE4o-*FCfM*^Wtg?ExUQ>Lp z{BY|Dvb$e;j<=B2Xd;QV#_V~WvjM8rCxck4-)n6_$Ju@Z7&7iA7tpMvJkBAmSc0-# zw#tc#w%ilxy!Uz+q9{qv@u@IRab(=V0=ItPY`@5a==?RwmCond~Ox7`_#GoArj`_AaYtxifh#WajN>Ocsxr@C)6^z5GFF zc}A>Fs&ho_wTpuNY~K~<>@GcbkcZ`EUtLCwA^0k zb@jS z1##@wgm{hfaWrA6PjAJ(G0(}|4P42R{S;6-v-Olc#w$t?ib#;ECoQBpE-_%JgS;iC z;kz504U8osB*}6<%@!WHtx@_#ySk#9I2p5z%GNuLUJB%ke(%HB9l$6J=7 z;BYBHh)T7TaK%&IHEISx)i#f`?pVwm(5yEy@sbaUf2PiFIRMKZov2a4Yz=1X%JVzVJ}0N7 z?5T{p!ApB@u4XWPpS5p3ia+cPb&0iP8h^qdjgP2m*=G^Syoyjt-V%PB>jD{NIT@0XXudlof#U+Xt%jP~ z%7@s@#5dZlT>AH98EOYj7#c$s*PNPX- zd6cd0phGGMZ`Frx^*XMatp{ixTk zEHgEtWXVqf%JH68(yNEgB+R^RQl%U}E{P(|0wh-#z?^?&n^vx<34G!^-0;j5UmzOY z+p;t89KRnj>cPzstTdYQ(q9|L-pZjU+vbZ@(i2~cnbGVB$U*s^OX(s(L59G9Aj-KhDmoXrWZwJgK56wvz{Ja!mDq_ohx20Y=@ z+f!rT9jgXAG@4=NO>10oxiktHmnaC*eNU<>>gn!l$Qr`!=1`~h4PV9@a$&5VEAlb3 z-woH0vI$sEn6hDIZ-H&@>c}yNaYU6oC(;|z7{Hy_Y%pL+&_o+KUymZLn6t2KHe*YeODYE`i$merb=cD6GXV)b;Dvr^VmY^P1Jy+9+<|1H(`&X5ZaW>!KY452v-dJte$TQGto; z=oaYTxj=g5YPWF_K1Q{X9plt18l4sycZmU{Ef;LVU=D)!kMZFx`eQj$4xXbs;~52~ zR(9ACey5!AVWih8x)PM&wOXyYLEOzlKJDj=diE#aP&btG5b`EyMxcn4FIM%4D z=8Ll`cvRTCp1Wqrh&<0&j-hr$Rd-xy0-i>94kKoX6d@u}ONk$sx6LlG5-B#S?4f<* zdU)TcqJW29+M?~M(KOm%RT3b)tISt7dkF#va&~n5T4s2-y=WeY;xVcyA8jw9W#Y5y zPG)0?BV19$ zWmr6Qiqgmx$BG~F!6G9ac|84HQ7|7!sKTY5-d86&cI?5+3d8O8A z=2_n+lJ)Pc;JJ ziq#Ey_b&21Ef;FpuDf*C-q6kjR&E;)iF=^4>5`f@^Xpu1!s5tFp6axIXe>_O67V17 zt5S$ae83}N4CfgqKIfE9e9;s)Ff?m?9$_XRWTs_tU&){gf5m!kvhU=c>^dsFh#hnO zZ1=wqGy$0F9Ir5*JKJ>*d|L9vMM#Y9y!c4AQGo<6*TP%#k@GCU&rgQ@YVB@LetY%# zi67|)c)1k#ZZ)5$HiX1SihfgY857kWlJn(yftO3#^Vdz`bNtdpmML{2;^N~)J7?bW z<%+n3m#gn`>(^`NW=MUna<)X1Ecy6aF%5%kcjZ{)6m1Iuk`$X z+ao5tF?U4&7jCB-EOnFo&$E7@OB%vsBE^gu{{iSJ;laVoL`{wKe9%+HgI>MI_)Vcd zZ})FdWlHZ1^p>2R`OgPE&>84;V_UwQ4|)w}pr@A*6Z0Q{o)%s%kg3SC{{Zyj@SxXF zlbU+ve7RE2KyRz&k=^;ASA6EDhvsH2&iB)kGX_#d!}buRqYLS4ng=+Bo+wi@C ze^mBAS6P38264uJgImT#_-YQMZvJ1gpdOqWA7%aRnZu`CE80g0{{lRJu%4gaPPLcA zP5M7@z)_mK%2%e_jwNMk=U|)sm+@aXb!6Ch9PIz*`;(AR<;XX0o+zp)ZDP0PXa6$$ zp4#hCH^>FV?XfYSyhpfFHFQe4G9+2qz#CyY5J32q1gWmvc}0&SRw; zeC%2Bp=jpI&KiY03g)jk{xnqoEj?N5;{KFe^&c(m8!>&Fq7OCX-jf(y#UKFB9xoHU zcvPa|H`kh;jxRHgB5umb%Wo}nQ+H9_d-39hW|iYd8m=4B)~($={%SCBwvv*P>$h&% zuO8lyhMA1s_+y=(vpRNoH(Y#RDA>JOt3Ty^;1-@GLrL?2X)K`pm$Qo3rj>Vr_1dQ1ez%kN)qe z%RSP6U{a&lovDM{A`iq{NQ*k-*&Th>fyMCGwPqLuG~-3wCgMURy`f*n&>T z==!yE=v_t;hgf_$yMr}CdVU)`oYs1>S$4F3yoawsMXDr;s}h|QhNi(T@S0Vq1o>`% z8qWfbd-hi;#^6iuGY(tWDlw*q5_kWC^M^%V2W%X$RepQA@*)G}JuP_e=r_06R`ncF7pvyTd3LY1N(5`IfFC7UjB>DgJ$1CVSMJ&!qI;(B_zXOrH}t!*_+16)`3r z#J4T5KhHQ970k5#_7nfJKU9iEk9cfN6Nz-nK8%llm7(okwBG-hlFIUuFYIX_*XK&4) z0&3W+;myB%mPBrrIT^&xU%Pf~cO*nH#1xs{{w*xri~YD}EhP$ugPfdr;u8~^iPibX z$NXUE@5{Dc>{rQ$BPUnX6feK{?DsQgOP>lR!ZWD0kQmOa<{gPb0Sp`mxb0HGUu@ld zr2L-ta#RW#)g#N=(2lN#la4rQbv{QJ7tFd}5y~VH^U2cIRkvl$_=wweA&~LMj~}Bc z51jd3d@I{S$Z@}WG`}_Sg@ohpnfJ)MnzW7T-73Ov{$Vq+jY#5cTpkqU+CYy+i&=Jr6m{8cvmme^g(j@XUi%6mzKVT`y?ZlfCQ3WrH{e9s7N zcV_)Yc1o6Zt|tG^9%lvd!Rk0-`J}jhvy=v(;;pa8On7Cz{-IQgPhK3HAV68KnuDBS z?fb*K8|xAGBqfbg9hT)PeRYfU?@+TJJxDNi4smHXx`gj1h}AQNDh8-D9_L!8!HtSc z%ARGbraa)%EBd;oaJ*ipk|I7-zuK3Pb4$we$qhbJ?gTTZx8(v^ol+^JA0~aQ6Sa$s z4OVM#OlLg+l`~71tPe=&j9HEksUq=(!uIrmoX~KIdzpzY3nPladdsgg+=(Z3BnBm5 zQrfFGZOp`54J>=A^-IDcs2Lf#>`GrBIE%Tj`|*rV^o8ZG#p#KS&o3C@hDwS}5V{q> z(Yp-pMdnJ?ll&I%2J`h~RMXGOji3f5PJB5yVIk2b*91{f?ttzImzUu(^Olwq#2TWZ zTSvZpk{~mL834fo^Cco8ViOlfLDgKtH|ub_DDwrOLK6ws5RaV8$IC~DSocx;d8kMO zmE!T?jspo1kLube^wv(`S=z{Z9&{ZB8m}uftnS|hJLT*4BixvgdGx+&2_9SXqhfQ^ z)YmP#64Naw#>6U)jzjtCrcvR4X7>Cr2~ee=t)#yKd{H_Q$%bN2D`N@s9_Mw>iP~zb z>np^JqJuEBNx$j*>2YOOnvfRhm0Hwd?@j?>FDBhbR~R&5QCc2o@3*Eu`-mRbdDEcQ z=94$>_`bob0QiAIz^9N7&V|Y1$@*K@HeWo1t9vC^?0f! z0amCfIMdVzq*<9iwg-l28|am`?hM0*E2~6mvO<%EaLZs$gHkEpHTJXmH}-pb(aOo~ zd}IzV!3>BQ8z!i*UN;QvyG+L&TRPXF2#y&|HN_6>DfP7us8hs|Y+*V>`5LA#bxGi~ zi(kkO7Z~s`JSo)9jV>FJ?uALArQPZZjPmA2Ju;G(Q-p!BA`_lQhLu2bA0bEa?T}WB z{>%{PeDXJ>BqSay{1T8~zk)6Mzmpq?hnpfq%zRCD6F;tAKHd8)ipe3|dj)D>YfwK> zt#NA@^QJ_(-`0C}x%r!&qErmNuJQ44f9c%QBGm?_gE(*V()^u+@jYorp3^x@pRl73 z)}gYKCtJI2;3Rn?N7SH4=9GUJ+Ot}{@#g0jry0R?R_oJc>4w9l zPR&npBoY`e{X)ahaoEc5EO1Kl+RyhIwii&C_I7acU;8M{7P)y0_fx&PBfP$i)kHWH zvX#O!otvM1u=i8fv&~&Uq+obwHDKpBSl4|72(nR}&C|(mzsy%3`+#M?b16C(qJ;TCT1o48$ULCw@X3ESOF3a= z%Cb9INUN~3Cq-7P2UphH@U=-T=Sdam+nq7Ni)*pXJ!Ds~pnw0cOWWOtTpAE4K2Qyw@LO6(kpVBL4}baJ7NVlE4jD_cY{`&gF(PFd;E?RIGLgEM;M(c&tbAaS)~eo~;^^ep zwOZ3EM}MAA6Fa4ysjA@Z0)I`4b+3xEl>bvhekl<{NO;Cv8{8E;A=Ui}KIj&gr=zO7 znG@(2 zn}t*qgW#SpS;fv~Qs?goahAb-+KApm zamP`li-Cir6uKMJL|+A9z17nsZOs6R8-Sv^9=JDdH#Tgj%wS1BZ~*W5zL6Hg`hTgl zJM!$A6r1`W-JK6Vzex(M0w?fpVzw8Bn`;$gvMcgWm4ea@*2U|bXoVj;ID~{KE;>YW zb=KXsZVg|lSc{N8lD$OB9Xl@?tSVeingm8|TLshNz4~l>jKyew*5~v)99Uyqn3QYB zkZZ%q1&g%_sa=7+HhC(PJ%$lj`=Z7eB{U>mblZ9HEh!FOjawTjY39v0t*i0b-BpL% z4bA>+3M?J4&!4OBEsuM+^>N@Y!T&xKH6zA1VJJL%mi*FOX&9?66TZ1r3O)8bqYT;w ziTr%!)PuwPeb)K5qy;^;b^R8X0E_GRUdm7{{-aWX#9$P-)==Cy5b3Lu!p=||9vUjp zYH;sEil7s$7$aSOB)w!2dmB1hYN;Bs9?MdMJFtN`McsWnPG@-lM@j8<4U}56zcykp z!IS`p3#tdNT#i8pjYYF(7zLuJq>jE+KYAT`v_4)beBop+!L%G~E`vL|-2e4e1~)TK zMI4ihaIj%PLKC7=Ps#1@CwdN!T-Q9qN=#+?B< zNXlCyAU!cON`yqSLQP2=VX(dUA!P0k6JH~mcwcaU6Z@0U<4wMv@8hKPDMe;AOeGs^ z+AGM`1m9U2H^TR{rqB0fDDWXnm4hV;bys3N-r&pqbKD*4qvW!7qif6MYA{6N^3=EK zuJ$_jJ~`XLsuJxYO}5T)(bn+JsS$>9Wb~rpyl2zVL4}2D0&jxV!A)zhy!Fv2Tp6SS z#}1a{pQMTK)u}qydbdwM6&@*gypSr`P3pT{!Z90ggJ%}spj+zNc?12yJhD%yt9@f^ zFW0K$E!JAKGY>n4Oj8X+NmPI;!I^p@A|TO1i*^m1Cf7~(ika33FW%`ti-wUrgaQK8 zf0{p@6sA)@U&Gl4HDS#aB083I@}C3-Q7{N@d-fYjO9%>T3p=1@FD;o26{p*@uaA~l zwNLuyPzEe{w{z)c#@=xg=Qck?RzSzatzX2a?c7W#2l3&FaaqzNKFp6EF91l1IAHlj zcWL#uzdmknusY(rOvf8}10N}BW+_|ShFN=Mq@uD!ilE1b%8CNWJw9`2JRE?`9OV`l z&+>*O(*iGFqE$-bk~nZFMQc6+TXH0OWKug=RpQ>~HmE%w}4E1HX|9?Cmjco{%x4uDF44SbiSb;`D?MjKXc3mdaUkPwCLA_$ocV z(ffoKRJ)tJy)dLqq!Q`X6mYOh8qz;+<%e%4t*!~fSFVv}UPJW_pB1QV2fu`*3ZLc> zuHbvY+uqKT5^*$}wiaxefkwWXGI`BjTkI>#xh3tbk7u)#xFknc&mcZv&B2W%P(Y9P zJZ`mGxn{w-J2fXx1CCzrVbYBsSg*J^5p9l#-3at z?dZ+$b)HN`{%+`hIq|c@)Jh_HyoZYZbz5a!JR=(`;NBx;GON<_^amG z-o=3x`2@W$`Y+N>8|X~@0Va@R3K3M}OkNz6hy^qW6Bp^%nl@fF(V$_K3 zmST)qmNPBA@G{TAN@e@*C$!z@a;NGI&r#>Oe)JG868ov?#9-cvv|ICJ9>Ki4>9yu7 zOPRuWQ}E+)`+CF^fpR|kQO#%2Em)mLqf}%*{RV6Oe!BN=JI5w2mJ^Z&Sa}jSoscBf z&FsGZNn1o)^5naQ$9z)GGUj>U2&xiDcjJat1dQ=?0e-r?b=r<$m5#xudfKvkrQzdC zn}ipN;}NU%tqj%7`S=G*HoyPmn5%P}yjDm5g!!-{CL9tc3ar|kDllKFO8gABEA|o z>L+Jg78l)Q9S)aI4sB)?$@6s|iBSGpn$e$iN@{Sd#wS`{7zzSr4VjqJSq4s%t?OkH zqI7vu5b>DS%R*IaeWx+h92v72ulSxXYJNI+6voZG^}$Uh#&;MLA2I3CH|A&7kA;>v zIhDFE+KpBNifMSS--kEnb^f3eR(7SXMBd(V`c;1+*kS<;Qu=XeZgw1>^lFWAwD~;? zC#pvRSr)sG&-^0l(Kh{g(&b{k9?qe~Jt2h=Vab$V@Clz>{!#&ybS2VKxTR0##D;1V z0h%0>-lpGk6J8P2C}5ie_m>kRDzoS6VbPNl!(O}tjgGJyS1Gz2kK)ncS8%&51E}zg zg_2T!cFYJvCTMV>f!Q;4PV&!E6sEK>DkExhV5Ggje&s1s6V@G3`*f@2fT?zP?fWzXeR@!8xs1uQ+R3v%Sa6B>J(+yM9m&xIFe4ij z3&%fnQbQ58bZbEH_x1WmRz=i}xM*pdr!%n6e)Gtly_jXZ8F1r(;}kbRT0~~-@zxk> zK!$%LEa8QWdhAnWz4i!m_V)2gll0XS5BRr~Pw}!1m|ezAyNkE}Xq7v{cTu>K((Pu^ znLW(#-P;u1MGU9$3T$t zz(?ryTe18@gA+bv7A*w_r7k}V1st^QaO!f891iDGvj>81zQjqKw>=AS&cVA-7QV0EP- z#7bK4i-s<#>5x3HVA33_ylXF_K_yxu_)2v3Rzlm+)6TgTKyf)Hst;PT#xF2$7S`Hl z9@Re>#@dq#@N{V39NOLIF%pbA@!_jXp}kC55oA=c65Bw>8w2&JQGUB=Y1zN#+a7J1 zKi7gSIzoD-Yv*gWdk%gv{o(p9tR-Q>Lr2JR+V|AF!X8~>6rL_>+Zj()y=a$fp%j3H z>s)Y{JQg*D9_+YPTWa_U4Cz1ha2Uz?oP>0vtnP6=YMAGK$Toi(|Bh8*Wq(^-Pp*f^)$-hg7e&Zz7jTuD>cWNeShPydy&CqH2|r|tD@16Q7(`!!0>zB zXFpwbnB(DY1GslREc~|AgR=xYzB{=6DV-Vj8N9~qj9Fto1ht4=jCi{&@l^0a$wF8jb@fJ38Tso!7e-XPpHEPhco{Jl$Aufnl#TE#c2oel-A)O zOaAU@L$Pn^*FBe6=`BAquz zg2o;&N9+$XnSnGMI|>tcVw}hD&+?5-m4&ZN{W|S{sqe3-(;tlUSxIlkKze|6pMHIC zQ+QWnGvEhb73i>t#a6_13-t+ud*nue;l-+fYw12>9b*eu0Yry-&)cJaSauG>Ah%Ed zNXVa(M|!||gm`pn%EQtha>C%;|Jn(mPT2hsdVI=6*L^f3mcr~c@5;EpJdlwO(CU^Q z=AYEt!`dbknp7%oe;O?pNwEhw`1|{BwuV(-_c+R2MwO|nrM|n)lTqluP*G?&G6l)i zWXl2v3q!nmeRoq{IypK<8oxTc@~BC7Tn}By?&Xf%HMw3V@oe>`H;n6I{?l>_x z&J{*j&dfU$NspV|lDze5(oSQfEKZ2f&Y?%R=MVwBeJ`Qh)^-xQKPn>3=(W*5)RGrB zyIm^?7H_kt!+KAnPS)U51x6OLRMLPr zkJD~UrcKn{{+0gS&2RZ@=uHf$cK=OTZuf}q+<^kycZC_#B z$w13amcpLe?k`l-ABpcNx3i9r)o5qAznS4|xF4w%+;-7nFW#O%22PR~_Oe&E&d?I^ zT-gZFvhE)kEG6$U_i&IF4juTfIDX($y!bhhnE=2f7cU9ZAfE_g=lZ-qA0EMJK;WX7= z*#442E=SlXG?}e12`x_NQr1FYJZ>|(wSC4cARWX|DRk~gtmTjQBw2>EhNW+?bykW1 zPNzC2ma>g%2tVIguW|x_9d6aer(gQb>KXH)$d@9p30C!jfvwl>Y68AC-1o7JvqC&AE-A^ke&%nj?P64BSp zp7H?`_amoX*p0zIwT6Csdm#%{+^N#O-czx>KW&+>LJIZOyHVRZU;Fg;Fq`=XzA>qp zF5=UlZ15tBV+F}!qTi~zIY%cKh%y0U1)O75h-hD~4$ZU(nHFyJ$Zl=e|7NB6gShF` zv}%krGeyJ}->be7+n*g<-V<23rLx99SLvF%;q$TZ z7d>Uj@|d{@xWh!mPD4-F9>p#bk@C8<3_Dr?gazWt_!Qa^%?;6=;+51C@kNG+$3VmZ zgI?nVx`ZEHJi}IKk=lL&?cMhBK!!t3R#j6fy|5j;1DaT=8rS%Ct<%!SC`ch+>`0Y+ zl7w%FjqJ%G;4r&=`sCF%arJV)vc2MpkkzW=O2!-s=N7PJTnGtw{PnHW153&H zUDvCQu(3`EsE>@_NIOAFBC4R{54}vrD*JkaH(+Gf*|HyUX-z0$Vs+ts<3;W&P&$gmX$e(FkLa{4XYZJ#@=Aio( zQeXhbYiiSX0SCkB!;s*$Gh%0c0VaUqE^iv(;>Es1@ET>u+I-c%@MZO}cK0B3J*`Qz z0a&Ol|Fb#`J46{XncZDZsB7ZU_f|CvIR{&TFkBt>%Oib*;nBD2i~+=#kk+*x9U{C1 z>{7>zvN?^Q+xiyxj8xa|fC>=iYuI`mn52#{g*{vxtcPLpk+-$uBP>K3`Z#k>*A0^iGtM{+cQm5>Yhk8%P-n{oa z(>r4h9$X(sKR$kXn!LOZJ=zyH$~MNh4%@$^;1>a*G=ikPbCB{&sRO~y z5hMNRCMJWL8a4bg`;f1=)UG9Zr`a!@wzp#o!Cm$ZH^HV(PEHU?P;sED^(WF^q08dm z6TK=x(3^nHP#KYJ>0F(%8uImLIVm5~M)xIg!+YX%)zG4$`*@(=V7T9F!#FN-=T6_m z#gB8}q%h@b#h~7~7ccte+28B;rO-R0g00hQe}CtMe=Y4u3Fc!gB@Zy?W-+-{SXc=u*a7itqxQ)=`BZxq&fT6dI;r+bL3)q2O!P|g)qb>$GK8S4!zH{ft@)5SjEA97GV57`g6C%cSuHbKT zS-8}$oj~MlzVWhwJ zby4PyAPjY(l>N7ctZ#11D6Xg7lIY~OCUu5$N4GTVnbDk2O(pMr7ix8_r+QELJN+ae zqQ9siEP3IU?%(w*KR?h#Vp8JgFhil`W|3#!y9!AInzPov7PtQFMr*5B z{dt#vo}CRRXu^&;WuE_t1%bc7RTg(2QupQee}ygo<}gwMPuRe%QKo;d@E>ON&sFP@ z^_$wEpDN+{+pPX|{<5nV@$ZVct>Afn3-49Y3;3>7Yroc_e;wvuCS1)byDsi_Yw`SN zH)N--;ITHHkO}cubJqVCi%UGKCbIpn&+r`Zd^PWFI$|Pf{T%_$I1x+h**>eZhX1|D zsYXPvh90CDU3e|{_o*YU$T-F#PR5?r|6sXUCh@k4!Lhw0_3E24xVf&$Vd zBCXO50;06i-5`zhkkTcgbW2G$!w^GvOLun+12gmx|HpIQ-*=9l^Zmbfty!!Io@e&# zeeXN3``VA7PxWA(X*cA4t-b8OxOoE4MKAZ*U4EhUt1`HW{_+7(go9mWio7z&Xlti? z^XgT`lc#jXKUfNW-yL1rzrj39D$Y}4ZaD4njgbDnJI?4Lt@oz|KNR_fh6vFeU}3#4 zcX`1;t}%P1Ad+2mQEN#?^o!TZ(}?bHhp9gOT*)$-OqiI(|JE(KEVW1p+lEH`HlaqL zhsi9ze#NJ2EEgOde%*_dkul0UA@OxHOaN!a-UsJ@18HJzIuEt1yX6T<`8|rF?F^rx zs+!k>ag>*mWBsCgf0~1RS#O`z*5i9xk`kShO^#E;bXZz$1_uO`t0`LP&y>mgx)%!iHIw}Z#nh&=^5sDOg7!af zGE|Ewv^?Mj&bd1~)u%4}ot)V%9@nqz@BAV)pBk}%JFt)zFK7!k4xZ1{*!>C?1vE-B zE?V&-7{YcApb7DnD!a}Wn|OcI5vSiid76&Fi>IL;B}dJQ23@~=$Ip8}e%>SJljoMa zjMUerPd5gYe=)j0XJ|3`!4G)h`P`Tw07<>~S@a(QFH&`T7`;TWabNMJz|8mE-|8ok zl4z+5>Vl0U>qF0Z{@Jsz>hnpqKn}Hb<-qD7`%4V|^FFKDpFHFK02Lk9S>GJotg85G zT7m}PgUU_eLV3C+#oCk<6x4yOtwn}FW{i%5V|2&!s_HoxmkLl^p##91k+CeAQUIU9 zK(J!6uvddjBFEc#*PS9Q^1)-+3>|=GWK=2K+*TdD{E;pOl%so0o54PRj$$LG>C2=d z{>SZT!3{mdgYOy#_#0zq_T`wT6(T_Ex#e6fXFmf_S5v|!l!-zmn(z|>VFo&M9G!as z&QRl2)wcEPb`YVOxc%O`hgHv~ux9=UG`2Ji-ZAQeIrpA}dtspK=jN3c@Pd+Tr=sUm zbKz=CCjhb%+5f#D@Qv10;y`liN4jr6!g{v4j9H_y%Nn&?F*t4L4s@&!1N>$o>KX5Dm~L{ZLO?KLa?}Vz}pB!~p2- zSCbT0HKUu1tIBF-U8D2v&nfe^*Zd~FL}RD#k8O9V)Z;ZnvtnSp z2~{69>wC7vZI;}(&^Y0UreSySWr}_E>(D~)QKNkHQbBBYXTkgYI!j>+2H(DyCr-VU z3r5JY%wh?zc$sY``tX>6#?N0ji27m_gM*#sM3D<)^!+dD!Y|(zr@Ry;q?j~CrB+*2 ze4c`ep376%bS_!(t8PGn(cHUzXwwbQeRKoMKzFn=5x0@*HgE;os*&LzYV_H*yIXfjdRxz+sv^ESDuZ1|B?(5e8Ghzgg3;pDb=mwOa)m!^HCxCpbs?Zhq zYYfm)9D5+w`>k&1vV$DUx%w_n z2iYbx+LSotYW0U(Z_cW}uYL0_VHj=>s#VqmSskEF7?F_uNOQKBP0OCCtOFHp+>-OENyNoBh+SM^Y0DO?;!b;=$%DvXkLlQ(&l#EC50Lr|=+f#4==#?;H z?*_QtOx!#Z!F$OS#m*Y;uQE1U>p`094XJ+uDoiEyny);DRoTCFUQnI%Ux-mO=7Krc zber!aUGw6z;#O9_d4+aYx*#Mb`+eDiDci#!ZOHBqQBtj99jM=?*sUIQE8zrCRY~52 z0_*deTMG7>?cKFOehC?omPz&hzc`mX3+RXZR^CWh7V^;j1TL)STMV=t^p32ow>MW- zR+)&nacO@S22{nQ=6dSH#k^!ibM_P zUb8DFQ`HOz$G@AYbu3VNZmbE`svhAG1Gr;`1~gH-6n^7+b&vyo{!QEvK0=nLV!Fn; zq^rn0IttDv_ytcM@t7P^ARL98M$+aSULcfcmYMw{<-0eie}0^*ZUh_S&KspZ29%0! z&V^nA6?Jo-@9DttpJn!BLGRe7n-{N=j$eXMgb5~6Al$;4rYkUbr|sig4sNMA4p?JS zCBDr1VQLh;%zkww79UXzUwXD3N2&IA+?6q4yT`zcUG&hfhTBs=+qp{Kz zr{>xx_C4z}p8k*J<=P9=j%)1_$kpIjt1P=WL7&wshE43^xVa;T9`I12b3B8con)dw zJF=mv{T>NdviS)UawCoOj*MiNN%95v%K^sf#p;Swfl{6&&2x$>!WO| zM}WnZ&EpT)Ga<8}NA!H;sxmc=gKtI<;Pb^{l*zJ6j{YH=N;$x5h}C z#$^tTkiynz6MKArR0xJHJaBs~XIkMf#m)EI2ar_U>svUcBqcsMHo zTD@-rI)_goj3KG1NpDrEMn1!cW*kay?)E&jfLebrtI3zE=kO>4!YSz8&4pB;W;9Zn zI0&$1v0o%9U8j->xRgSX1N?SV#&J`Prr_mBw-vaEa~Kj1zV;XqxGttP{k_qyNu3B2 zHzG1Z=t}1GCCBSjx8v>#Pv`~Dr`U#Z-YoDa-jt2xz1H|XRyO@ zG=t*mPq(L_r18r24B+9haw=ox0bIv^6{m#>5X^{nBKKV@>oDlXoF?FziAyuOS^&uM z3VW#?0Y9Kwu-t6qX%c59QUxG#GV;M9fnG2A;=XsxB%Y9qg$!5}i6WCZZ~(mW5+5$) z+cuJrGuuFga)8mvEgr*`DFC_Z(@$&r%OdJ{qWa z*ko7Xb?&OdKh8NI_Q&jyBAjZv!A0jn~ zx=PuZx5v1;fB1;kYyR4q^x({XAerIUI2?$(jNa)@Q+i1i)yifWb>j~gnmtT-2}cLdsP!0s8b z!lU0RO(ZRzRshOtisRN<4^v5{sJ`I9n5r%;QC!ncz=q3Z}Y-bnUb`x?&0bUsm(1cQ!|Y&vO(Dl(eBSusJJ&L+Hv+UgT4GEt|RaFZ~jHH8mmErf`A9jOtph zt7mE=x1&wO+UMWx)}PE<$Z!fCNJqT*{=xM{ef`_d3{HjZXeWb zEPt-sVU@UvmxjEGO{wt!dgYR*Hd5`SVww#I#-TI2TP|v09^zOF$I}T>YGgs5=Crg) z!_X->&;SfAL_%r0%n-xf-F?{4pevHv^`UWV0FEOG8I~Ap(xbci&o7Q;xJ-I33$lj4 zIPl^Zb#>)fl?cLb!QOSB8P^yr7w3i*cWXwi&LK|S4~#&GBfs1xB%=xN$K?3G++D@gXr%ag2 zX%_x=#!9)(ece&c%d2KC)kN>vAiK8RTDPzwZ~XO`JwXo-49E~?mAf-tT=nWw zZ1MyLKGjWpDsNQMr=Z^D1gq6-uHx6jLgF2r4CysD8s^KC1Mw(FPGcoav<%Ra?bgP5 z%fp0X;a?SJHrae2`V%%!802>g_REnrUA&xW6a8e93}E(-Wqz#4rn!faANcU|=!+OE zjiQVWmfQO`s_JxaN>=M)X04rFruyM5G}u$FUqjI1SUYFgm|?~CQ$0tg%SpO;_^ut+ z9wr3gs6FlrK7Df&oHXMVxiqi>GV~oNzBB#BmgR^6YvQ$s$=!*U5zo6Zmoz%QhS4p*kXzFD@Z;yb z7O&{3s9UW3EovC?k|nAM6^rf9=MWJE_7s6F;L3-hTF@F6e+vep=9yGm7RLbF6b=5o zoG&-9jPBhGR*P0y(lCkc|E3Ne;xR0a%rv6&c3a-7wO-+}oN6HDEKm*5q(-IR+7*3# z*{r&)TTS|y|J>MZjJbm9Ip|!VPqz|n#p^-|WVQj$tr5P@2Dp>m?CV?Yu?VJc5@n`@ zyK()vueB?l9!0A9$8PyOUacye;G5n-hsk;?w{4=JAAK%Z3(Hz)azL}$HTObwdIW9fN! z>AxBJtWTl0TyP4Hrb0{2*jds0;=OjpE>ykoV_l3(y*~2(C9O9e1>2bD@X$9o*mh)` zK2Zi6aUd~*b!jLKWbh{7bGzuj4+9SuAm}^~=B545*8-!UD4?)S)4drdkM=|a?MWm7 zdbz(#J-kU@CQ*ne;@(!KU^&EcrpWHuoJff^Z0NhOp?GR&3+^=vV@T@F=diF=O~zfj zV1oviz3xB`TC9b7qce>lJ^5TK+GE-JhI^p4Ue-h!)S*?9X@M^@#D}-X|COKH-2EC3YcX_*_*)lBr$rJ#X)^ z@Z%?!>$HbTkKH}$e?Uy>(eEgY^v2iO@>Vg*pW_V*g#;^ZEHd2@T4(bMt8yt>t_+1>ct>kpf`*u=n7YG*8C7;fF1X8UvZ`+qu+B06C3M-nd ze5>tn?;))##!p9`Z24R;YWb^aj5AnqSTpT{=uBzyNYplo!3>X-YV^m5iU?plm zT$BDk$^5(0{pa&pIQrh(0SnC!G>87l0%3yq4E7fHG z{wxjK0`GZA4>8><{h=f@MDp$4{Z3)_N|Cwm#t&H#9;auxCagx?FQA4Kp6+=F@s0jC z44mz!@V&1HFr#}-bZ9kfPX!Yd!&BqbN@x$VUuSDQc$l86T*1hw%A6xUm3ex#A#Bsz zZ0S_W`}pM2g<09ha4p0b%v}U+U2*BJZl(Sx}yz>=kw}lytH#FBP{$#6>>+)5rmK?*I2u4adsbZAog6Q`H6)g}WT%!ERr) zUS9?H1ri=qL-83YRZ~los&@S%AUVWN>VCuONW#o${5uPtm!NtLGbWlXCptCmd|l1B z;2fL5Vpz1PrD*{Z{@`ZByaz#c%#FvMT=*r>qc4QHb&lqlGr^{Xp@^?sUppF6OA|aK zWEp}@cZr-JB)!K*@GGjW0vCGtps%6LN*{#h=$9H z)-Qa*)j?+w0!N832bGNo2Dq)d>25dAJujng2}lj-j6@gtSr2<|7P?~s%73CmZ{CaP zkdJ(gGVWqZPOj#~c^J`QEkDF2IOp1iL**IUQfI&s`^Mf#CM{o;^s$uZRm{l)ht=wN zcdDH&p;d7fOvWwny{73m~HkUHeog zY`5NjKE@=9@TeJJYq-P#d?tkje~RdN2dl25!%}UBD@bGYm$fs+qmZ7_l8= z!L%@m@9fvLtbGbS~cf%iH?r#{ZvpW(U#BV_dY$ z#osADBLqCt(tS)8ooQd@^pc18_~1we1IQ!*_c}yP1p(ImbfiENW97$oeYEaJkG-9h zY;+BJ!L%VNfQWc{L>*o6AcM1Gv<9MxR}w*vJJkB7+SJer@5{SdW*S5?gO0R!CTEbT z6Hv1}KIif?#`9rem!RZzLc2>?G`iB0)`4^DUE=_(Moj!L*231&QM4VqI~|J5|1mwr zsM@q{RrdhjRU@>t%5d!6D`aq_BI9UHC^nYROtPfkX~i}lvn(_e=V62m7KWFo|2(0* z?ZI%Y`ygk5GFRf}{=|B)?=8Ftx>b~Jl&P7`UaQmtFRM1&dXrw(heTX`?ja2SN3;a|q87|?j6CoDfR!590>i^%3_n&R)jrt@~g|8=<0%B+k0d;LO*Cf0A_rdx(; zR~MioeIJby>8lG!7~Lhla)b4Y6~5JK^_AMl{yX6^;!dq?(tPiN>&uBn(032xT@(Q9 zo90IOmGOlU!F>HU!Y~P2NTpxWg1@`@{Z_<=bOYCln?bZ@gJ$taxj?p|p+F5qtDji| z^vsrl;k9nTJJyB%!$g>=+I#%XPkZB?ZM)t4AKHx)a`K$uwR`XJ+=uC0)>K!^ND7mg z@Om?ff&INBTQ+p86%YES^NR+7$^&M2A0?>ji~WqGx3mP@(!9(kty=5mA0bytw1)Is z{dHf&&;yR_pr6Dymlu?CrfEGdSXFvT(A$uc^J-spwV(raPL@TjRXg{$PH8D%%O2#Q zJ%Lv-^tFBCVVwhb2 z7$->4&z3`GoGq>0TdaFU8njyT>=JRzm?3e6jxnpW>_jk7cMiuVYFim}A) zzRjv-_J2>-Pp?oBGi!n6kU|?ovDU0r1{D@piWT_5ugvoS*O@!zmYUz#VB;A9sj{49 zw}-%0$(D1y6fWddWa%_bP{;>9kMUP2zB6`uHZfkBGOrY8H0qlYpS|l-T{E8#U${=Z zgV#XkT)7IBD+rF)0^5Pw+B)?6=oj>V1~vOgN}JvjOB-lDBU$w%;P&ZVeursX?4=_- zLp@&Znf5DmeCG2Ky?e;u-xuq?v@CeJ=GlKK zS)Inwo}M_C%ua#`6z2|PF&K0I&r2X%Oh+gQ&3=ujCX#~0x4K-Ba zZz1#G#)s|F#DX}TwExu>c9U9cIDisLkxz33uDYc1ScMO;U5uz29_%m9cNIWGR12s4 z=G<`2Bh(ItVDY7l&zVTBUG4w|zg{Dv4Nj`0#2q)A#U#CW8{^{?Jmb#G8ib z5YrOBgjkS-t#+M$!F|>FEPZkop3rKhdlL7ohAM9c;B3b%YluH5j5slqYD#;4pgULf z8QaVA>Q!Yz4sZKSrEC|gz=ALgQZ9ItFr#yorFdkG1g3oG?fk*RLEVN@YzyltdGT#k z-AD6^FC;xo3}P5#+Z97}UBzNF!S5YmudEINRebp@RaS1MeKa+S95jGlxCB zOo^VI5W91zkl`fOyGLxtOnMjKZumBZCEVIpaNTZ7A)1YC97fX+^|wU9{}`&@pEP+$ zQ>n_#5)j1j@IC-TH7U{}8t!=scY?y;?aI=uW_Yr60u{!St8HyNJVcHZ64-7Z;nXsu>NU(lzTj6D_d*JcT|9Sv}maIC{DR!-# z3u}zU0`dqEX4hTMGT&pyd1j4iNJJFJ5jtLF*vUW$)Lk6oPiCqvQ<6h-?1W zgfY5YUZ=`z1X;@cq6K+Fn+|^1K00`21ax91Qi6hs;Rzn?h}q4r!n`mAlR@LNS!+-- zdD;?t((O+Ae+X=~*B_aO1_YGwkfuuNzKP~Tc~iHwD%h|aD>D1Zeu&-{EQU;Ic4%_B zou#Di1zzHaML8F(O_i~(|1iWEV_o!pERCE z=tlVaVGC2(VV^0#IUM$+Q|Kvi32(60A^X)&5;@08uCsk{nKJ47d&=ZzG63sl$i&pD z@8ZihRCH*dS5tfH6a8Sg$mcU=*{c|3?>%6w9 z#QtTpRNiEwdK<-ao1@u8BwW_nIxGj>rYls-d6VG42a~`>HX{YpyGK zhrMZ14-{@0qx_pU;>$-nD#lZns}*bw;}eV%?j^8ku*HX&2BwzicxyA^%L`J^i!IgO zj5?t!)8$71(hQH9UaY^&z;Na8;^08FubiJZQWm!a%7t$=?bvM7DBsi?Arvg9?WW%E zNWW5!`-j338KBwk=o-q^V%e`!6*n>(s8!Ix`QwvMVt{CoXXxMlRk8gc+X8Cna>+cw z&aWGTwfVUW&PToWk!+3n?LA{8Ep6S3FV^cJWu_Y@?uensL6VMITFF?O0f-+*Cv3jG zFJ72TUAow6W5GfR+1eFbDO;04NO-4obpdCn6CR8(K(ygO_BE~)-LxAnA-o$=*Rj=X$d3gn0R zN3lS`@Pvwu3`zLST%~NnRjpT6q_G~@DuWDgSXPWy>GtCO8TZJ0+uTQon(^aKE4r|9yxp4sIPilY204aI&OxK@bMpxy$)J9IL@6|+EN#vkj6wf&r<|P zQKzfbn-sA|;owE($Z(?ulQ}U;8qcag4cASg4)8Hux0RzU?#J}6MIgmv>WmpL%z}t1168{humhD)dvSB8aaCIsy$B zx^+TV&Hq$xFJpdMoA%!3e_4jbD;lb$6p1Hf$Yy#CsP$O+lob&bZ<&}}>L?A|D#i($ z%X0Q}V8H#3=`raTh?OkeoA9a;Mz=@(DUchm>8jV+Aq0_3s;qCGIkp1FRC)(X6<%(K z%0G7=a7dv%ucP$j%KxHKKlR)fmyk_8K)dcluf5#=6g9Y@05&HOY+diy1m|9k#ibd* z^0TY$*76A#vJuPK((xR|BtG{kn=@`#3}t5AfRi%~S*N?7=xuS2{qQ7v(mOwjaoX&shEqYV)r95} zv!1S}D{2)cDaM@d3n1pnqV%Z}As^U`4&sXy(xK;;U;Q^1Vm8V!`;WHoWZ3HC3Ly3$ zFl*PgBy$4%U#FYCCkjxP7hPrXmNF0E76*}pCFXehEJgJO!}-ScPx78004FuI9cArk z@WgR>xSsgAXohOPUq0=SO&S7AOJ1t?o^-XhOH8O=0cUqTA7B`~7_}VV1?6hx(VQQ_ zvO7V`2Z7W{G^^|nqh=RrzV{vxF{|CM(twQm)Rdix2u)be@remE{3k4)O8aE#dhWb# zd5`!d6^bpE=|9t|fHpwPM}qOMp}R3cus?60`2% zwP`o!t7Kvmb=Ug>0s@O`TY0zTyY&-NEHBS-s$CB7bv)N(>kEUr-n4aguFMV5+C2Q2 zE$WZGR=HtkX-U==Iynx^sg(^}OMFdWU|`x}x?E>mSv+{$0Ec9>b*H4>PcqGg#Q3sT zZ#Ai8+kLpXM^UTAJ(Rm<66Z+RnVZ{#*$Y6r!K~#XYhS=4##0C8>Kwl)j>s{xZ9C7S zZs21#$fby^4yNh)%gGa_xgBkX%cZz&|5yr*W1g6wMSwziSSc>?uapN^SOf&f0JtQW zx!jF;!cN4>^}|$crh1yNmr$~x8=>5QTy0^r?%Rri?rtn!jHAv&;tGyX|GPvhp@YIN zcR+tSgpu`F07#m=p`oGAF{NJkX>s^Z@8_lePnFT!Bl@o@J36 zQw@ehv)BaXOj^=2quW-U70#@wEp*bcpMoF&;T?C)yVMTv{nZQpcfzQ!0;`)+nUTV>EH`sK)i&l&p8O);X)EhO^C}Rc- zW2^Z=bOphzcRTuFB@R7SY$?Z_zIA>wWQ?HK!WyhQ*=_Bl3?DLHP9X=lU&b{lx=tkQ zz6@4Wn7!&KGxfzdmds(T-)~!q_`tT?G!5S6G$j7ha&tW?bwu4CEqo_PTKrj>=Fh!u ziS{`rddiPi=wGb%EC%|M3q*lbJmH|m3oI1Wpxr#0Raq(xK3_r9NPNc^a5@l_N3PBSqFP7aJL$i#|d3nCDx`Kr3@i{2JZ-lKsX2cO0XBuFY(< zcWJ5Z1-lt`tuy3UMy_a{>=`+RHlK6b2_vM+{iy+9(%w^y)hW+!5T3jD##(7$65_(H zE?rw0AW=PHDd-1&sV^M^j@4oVme0rt9Cc3K_NH;`xDhMnTw07NoyQ%WOc>i0eKDu? z$v)beyM@23iGF$lqSRGE9^B;^4yKn@l^Cbu}@McZ4tZah?>~JCy?vv-Y6^_);E(g5iu5~7`08E7vqSsI#n}+kgLr-D5-N$^+ zu&{7#*Np2X{pk@6gwV;}l=cRc5We!Xer-EGwBl}7b)?RzEd)~W5|d3KE}?YZ{C+w9vHbtoJtpHJDe)KKLn4Qn;+L@ zA`WAdXE@C{e~{7z2y#s3zDgL*-bY3(7_8-A62#f6`KD$Sm z=lPr!uo>b%2A)YvNxeS{ri~^VyF~GeMVVMRux@sQk%%C)+(00WrMG$Wr-g-lSxe## zg8|*i%YrQT+LNZnpUBsglti3ea&Na6TomRx<(~IP{ z*D*x|HvL=tzUWE22!q8eNfVYGc@h@mP|>8;R#&Tm2uK|f)+IVE9>Q6#if7on-`2ak zwn;que_Q}-=5ETH8Ly0mc`sg66pP$c4Lk#9f5{YB#h24Un3zTfcb=sr1_1!%bLv#r zV~J6lQM4E)tchWfHg_zH)I{xiR|0D4^v9^?oX5s1VPttPgpk=U!+%zxub;gA zZcQdM4p*wyE$gEZ*G~)VUHS0AkdmK;_lY-P_{m$V2TOO+4raIuE-sJv0$)20PS)rFc zB3=H^m<1{+>ssWfUj>hDmGww9S*ur}ZJ))6;!PX|f@KG_EZu;bDBZ4_Ny*C`f1E)} z9kR541on%~w2`qJCzdN9L5~h*f~WahJ?C*lY06U))qxN}WMtOtTcq zu|#ghJ$#2u{OhLwqv-$(9rS5LGjrZ^a7gVywK%=hO;mDhi**4CV)`zJA|mLCt7DN= zgbVp9rDlfYsuYD#OdJc$MHwpuj#-SSE6)sk0Lc0R)&qNj*60A-%?=UU%IjA&kq)%9 z0exqN&*WN|804_7-oEWh5!M}OG|{2{YiVXB(VxPmL(;fQTIVZFZMD~8z?Imk^BO^W z8Z~^Wg%jv=1>+)gYx>&lIl0)hI_N@-?k?%>XNAy8V?PA~JNN$JOj{Mu`-0Q&sq|xZ z1E{mpPHp~uuY%ZSNl>b);;vn}gl>p;Xe}g8tJ(kos4nGs*!^I|LU zxBpF^0fn?GfMy2r92}*IpO46jh=e0b9@^M+~A$S2a>L@g5)mVb(+j8%| zc|SjXGW@kzt6uh^o{-odsw1&Fk>OTT$0gv0Iy@_s zF)A*s@B6U5HnebgEGK>6I>xZ>?ZH>6XHK#sk@}4H&eM_ax}s*VWTmqNCoI0=A4Z7l zHd)7@P^;O}&s0jONS;L?5ERfH*@rG%e|j3fF?XR2vqYr$n7c~0jyFi)4FW;%L`Z`-l7j7-h3)Ukfq`D;Ah z7(PwTJE{f}`*=tViBZ`5JVsX~oKKP@xAimaVfdbrs*oUCW+j8u#D|@q87+kfd^$}p zd>2snIeUlQ9uQLo;xWbPdnsipt6~jan$*AE)G78+u7L$(Zqcf+O8oFg?svse76ADf zD}xg)bojd+RYTO2ZGr0)*L2P+W9VEdR{1sI`+{tw-``g4Z(F7ibG3@Ew=L@I?v>c( zx#Li#o9ga#Jq8d1He^l-oo*^Zxz}k68eXaZ#{U6f>;-K&RQSAYBv%W}mB?We>h)Ci z#S8`pr6jz;_v5p`)V=;;+>$953UIO4H4OpzTBGTY)ipx z2Y1<5<2#KPHkLZlV=Dvj0^Np)$;{3#E?ecr{Ji?uQi1|amd=f2nDR?fe-E0fxzQWc z>PMxjV;?M1R>4C8cetb=wpO6qF-klKaf#q&T5p`iLM|&3C!OFywt*Cr<-v!jjDs?jl7;qW5ITiTb)q+mwlJhIXf_n359pJb_}` zeWU*A_}Lna*nHD4?j3HQoKPkcGG4!6j3PM73WZGm_k}Cx_ttD&G(t#i3}^;9S!uS8 zRA8D<V5|PlB-rG05FgG0BrK@WV+Mv z8Rr{V-0l5pYudA5NnOG5#u57E5qY7e&t9g6t6k20N8$`@$UH^U#i+rKCI5}I4*txA zwlpuq zpVJVv)AdO6m!ch+sT)wh)@^6M&5H?X7GGJCapqg%2)0wY~`@4Uc>_-1=K ztzyL@54eEd5TUkwK3Hkqj99h%Vrg+WP()nIc{C#KXo5|064ufp)<>W>U<#GfR=y zk>ADNQx}o?=uh`1eU9iOl2(+JeUO?(d>KBF5_KmChG70}z4J(Vg|WI^UZq^@GeO4_ zC!|0TM!WJRBK*quz@l!zCByYbPrmJv4lCk0o1t#tVo?9Z99!!~j{&u<;@dy~R&P-qX7d zNWGS{YbqKV{FR1NwTOibkRlW~97Jz8+KdO!ZrC!F-iAUZ=^~DzKpvj@VK$4J%X+eK zXM{bCcd_4>G;g)0q1vA9INXJlpMum|fDz*2o8a|rwpU&g=OLvXcCoQ^lJV`)kI9VE z1q6jka$x!6L$<7{jmSH#lGvx0wk$XQ%)64YA!|_f*R*5G9OymhZ_S6}pq|H7GLIEnL9m^`ZH^ zPxhS#v?IdfQkbQUI~m2jEGEA)8a?&lxdoc}z}(7c^)#&Q)!&u?C?1q* z`|qcgdByR*)+X3?bJ&sFXH@vX+}q`g%kL!lFqCXc@z}Dnc13c8)8B8+6D)TN-32u} zUgC?N)lLS|q0ilj93mZWVo+s;YUKzm<6BGE)LK2~zfBiotJB(x0ytUeq_@iVCnsmN zcL`<{{B_}zArs?;O#?xic(J=+<3A(wKjM?W*OmZSGBaMu2AdkX4I3NTJG8Q(fivVr z=iZzfp5051xd}!Oe&=mHSL-w(kJo|J@UhG!3X7A}de`E?##4>J?O5Bn;dP_jBQ5PZ zhnE|KHv6V&#Nj|R7qX%2eml_TtDsN+9YPF%lTAzycB8tkE-AZ6gHv^&fxA?7jCef* z$_8ZdOp`O*r^@k7u@%ILZmv7?t#gA^OThonp=I$?n1ZF?3R=^ikGO>>ZEK=w% z0?yO-4i7=ku6x*PQ*7d@s_pn@`{q2v{H;qa_6nv+1t$9UgWFvld`w5~bgk%M=Hv{# zE=x^WTvkOp3qAiP-nhpj2#T#)MZ3yYa6MI6J!15k-R7rB@1t7}`@5cA9KdYTt_$g|gCwL}-gVo4uyCe4zu8x*s#z(fLvLyy0_Q63SnB$WXRDnO zHNjd_0-L&4s@`v996UmTx4*^XZ$A9`z5xQ^4yZ4`)sv)I_!S$HN{DhCl)EVN!nI?- ztFMyp09EH0TUY%%63aUp( zI;FOF+v7Om!T9Y*jvbx4-Y$aDm>*Zhs$`i2PWqx4J~nN>voSdPde&3GPc+RG@!5Hv z+yZh5bn!2)ubU{-Q}?8#q}WP;2>4$f5JD;|2TZ5vSvnoB&)x+?Q_4^Y6J^MQxCeQ! z0u~gg$5{H+gPSK-tol;g)(&jN7AY6Z@oJ83bg5TQ-afnB)YF=T-fDMq_BTZa z*fOf!z#_`%r!IM&toZ7P0EX9)F6Kor02RhJGyum{a@aXJ*U5fxK9IhW$<`657euq@ zN#{CgA_?LL^=b-ub!%E7&s@?G@e`cB+Vb@QE}>4Zy?y~;%xa=VIa#-tC1n&88rh0y zSFd*`(S^F^y=AgbwU{U|JieM+Kbs@7kzo2XnN_fXK@fx9`=D)>uKYGl`1)AN?Y zJF>2aBUet1dSAQbhE)va+b#p4vLgM#${u;{`c_z3SW@Ad!<#@YiSzXOCNdpAnDm z8P)13tqL7+h?7|k(v_0*+_8>3EYnAt%9NQs9)A>h6=PP<4JNk5g1$uwip_BNf zP8d~1{hyG4(`8=rL3&9e05;h`ehe4>w79t9N~n5ts|Uy}_YqqS_G3Fz>GXYFab3=0 zn5?nju62Z2st6ygGRM({0)Y~b_B048CK}v~ z|F)X!tt#iAuCRt}(l~2Q>+NC`c)|597~WlTSu8Pk4($)Pf8Tu?EOH8Mmtt{r_=AT<`9o zkl8(6u;3l3Af8nPhf zb6&&v6FtD#?SkqcZ4|@M`Bvh%Az2V#-~sCR8xZ|(YL+3$!)#{qLJ_;MaY1`YEpjWS zbm6$lUy3P8@IDclkAbap_~CtYo{_(w^+V3nl!U_w^qr z1jc8P;`nMN?&z)FSm)jqd$srS8>uC<=`dH;MrzHR&d40Fve=XG9Z9kn0F9ud5e z_^xp-@9tJ~Uv2o(di$3C#^&o!8t_z&BkL;f{lnL%VVlL*3K4Er-9ntXpn)bH7h$fX zn=m?XSPHhOf{?p*u$`580AsS+M`wpGLQAV$*-o3e10%L27Q)u4?kx7~4EQW{#~+$N z4qISb7pso5YtZX@{a48f;Hi)p-^QiB7v)L@qfKV>+}F67>EdYz1*zPYOq%Su!8jeB zBg2OSiKJK<;@DwATN45ap8>Su!c@*C3=dMjq;s$#ub0hZW&H!hH$J%UTJ7obtCjuJ zU*jf-3ZxJ6jq*W8+ZutCUDbZ;!9to*yGYgH=|?@H?h8G%g{o;H@N)Kw8HR?#$L~1n z>NdmIB-J2~MO}|<*x-H8aU1#7Rap9= z89zpE`el{pxza-bR-qfL=S>pksG#7sn~*(}4kDOy{wf@{R4N<4ZJJ6L8cJdtcJ`*v zc(1_)RY3Wa{)3lko6|89rAW4TJ*En{ZxEuMC;U0ga(JD6NfY_lncnx0z32|DZhtQh zRYB|f)~^dVP008@@okXH!lxf8y@wSU_pY>2(eED}h^iAh5HHg+)ReOHCXchl&?@1e z#}-`l)}SH&MC&6|!*%NPR%W0loim-cc+ZE>)dlIOx{<|Z`)54p zM-8~s(PO^bO~5b^elN0%H80e zCnv+>4kqP-CBggknD1@ijrfkvjn~+aP+Nt1Xih?rPrkR&PUiJ+EJjZLdk}UbOE2L> zVQxT{Z;HlyE{0zu!hbCkz-O7;^CnKXmqN7IXnfa9t4&?fHbIZT8dZNub2QT(0za^O|-&7WjNba{))vu$VRs|nhXF_ zO+ZvECzfO4^nkPI)XX_Q@jt02~F+_5i$d26D` z0O(}>Y?yN4orIOTlo=b#q+uj-eQ1H^E0BIFX7JZ&#wg51GTPv48?dfgRFuNgdwalqL3~CWqRX%gf6z9oLEJ zG+5>1!fsa>5s@ca-wWKf0MW2wn`<$8Z!PCiF1WHm0|vU9L9+p83|rD03ssbmdXW*|IGom``GVL%8tD+`?C?e*1MsW)AQ_} zSco@SV9P9=ZcuJN(|b2-#rX9P>5ooS4CE=z`5r`+E7;u<2iI#5%Y(9#{)4H?D%Zg z9e;bCN`1gxeKXnAMXWm=QUJZj*Q3VTtH>Sxdd+qM(2JuV+}w0J$4_TcC);|MWRLCH zY|$ZYlagq)Lc0!aJ{al!Lp*(t6cI}S07%SheRqxDHhnk=DyK$Z2G06)#K$KMF5`-Q zi7W)?hih$)gZv?zEGC+4dX0v7q#&nw4OQCDR5zzEH|0Xj#|jD?@R>c_#pJHXVSLQ@ zMT02NTTNDyP-+y_-&t#M*{Zf;)scD3>Z;WCvSWBm0yaJ#&5J<`y@yJzwUp1`N2D{= zHM_W(4%VsFZrFgE>NqVgg)b6kL|gZyz`a}Xu?xvbXO&tkhplc*{uMG#OdMy(Z&UQ= zfxC^ZKVS(`{!i@sPq1zH3&bEzH!ZF8rb-SCKZK%3+-^@UPB#7Dp9jY2goKVKa+oD+_xx+4Yxz-`_Pe#|PfUB`bxn0B2RuCU zmfHynNY0+Y7Jfitwije#$84SiglW(l>h*21mPzX2q5asWwciH#zg@!O1hBMNX9T|g z$u|D)=Ngiq&7N{N)*jlIte5Qgt%l7v-TE?M3V`sVvSiwZp5E;@iDS@dUF&7qS9sb% zzhfnWI6F7@wAIy6h`gPr&Lm_jR<YSk1v1dW&LiJNQ`Th0l z6e6+h+TawlKmTunvKj?3sHP^V3@rVs9v}O{9~(k$+gKkM7}!3OKJS|fAX;qSta3e6 z1dqF0)kpC~+s%C!X1ljyya7O-fQg({Sy_kQ8X+CjWcYo6>nq>ZW1VIrwSQTRZhruX zU++HzoOGFg+m*Al2p#BiKsJ}K%S=&r4unyaPAd?=0|6<@2-MWn`BZDl_uy?Pu39nO zlKe4bGb0qPE>b2n$h{SrV*$?Q&jgpat&=B%{%xTw;sd!GO&xE=|28)XGN0?Ag)bK_ z2R;~VYz{p%J%XP!%2vyj2y@dI+i1Kqh_z(tIrBC}#DVB_?Rvf9?qU=6UwABh@>lrf z&*Ak$i2%?$PTpGvrqAp*OIKz+H;Ea?rwTp@!`!`t27TNXmHw+$_@DR9?}VO6x5K^# z$CcR6koM_Tk1(iB#Wd-6YZCM08&=)u;!EY!0fYsPsFzqsD`P-t%3YN>88f&!s6wm6 zW>l_jG^NQ7y9~de+5elg3v5rt!0E`?YR2miNl8h}IJ;d>*0=J>4(h4ccz_loY$vfk z5P=O_ee~B5?tgw@rcwFUJr^eY7W*N#4cK(tukVE;kx30z`nI>%U=V2gG6n%c~*$0a3jpfkox;JX3#*BA8g3hQ9x9L-#-SO!TE zbL^q?XbEdej)!V+n#O|q;Equ)o`f)0>?7DbW{o4yO`@m>xNCDiuusRONIQXtU;I}X zwgiEnhqrO~%rdF9!O)G<@nB$QtYeSn8(FT7(p6HP?B-?Xe;H-~bwP_Tpiz=I;@zoL37y?C^*O@QN1|D7|T&4^}D0u6ys(geQyt)fN^Ox z*Uk;!MSKPyL!sC=xQHOk7~2H^at8&iNvGR4{IRMiAoCH$(Y$GSvZ(&;;l^Nq*s+CS z?}=CV33)lYEpZ@op7(%H{sS@}ys~x1fH*aSawQ|_h2;*QNcK8|I(#<#c>u4H{ zhq7Bxp+-;lagP}4i`Y3%qQ{vv=t|qlK3AN|n6rNA-N@TBzHx zA+d$?pJ?!|6@&^ktcHUy?iDCJCZ|Ie5Vwr3eg9rWL`+9e!t4<#=_E#+kzt9$9J`Kc z9~8YXX@~q4L*(UPV zL{Xk2fz4bE*|Iz1wiassuKF#tS`20czhXmAissw9}n>8RH zAZf0WS>tQ&%Yub^bZ8M}vw;6ztnQ=RU#IBJ3qSHAq@kSXrp@#E^>(Ic`elF8afH%0 zB#tM0ANtJW3q&WJs7>}7r-mH^tt50Bym{o_gNIM6!CU-QZVI;1fKCiLA!~8QE6H&Q zk@9%Vb4sdsIx!G#dZ%P{BlO8N@91Ya3}res?iwA!-IBEgYQ8}-5B-~`eh=?SI2BSH zYi|^QZ?`oHrnPlG`{p;~U1rg7YhJ5j|G?jy2D6cIy4@4?@>0lE$nZI3yDQAuH80H5|T77lcsmQ`TX1xbTR<325r_3$`Xxr=xyIL;_)nBynmRyDwx^ZP6(`#aw7TsZ-gJmH z3>(;`%4zCD-|hd*1NeCi3sycI$~9Es)Dro2ZVH{C(@I*?E=AVpO-bDGa+Df;N;KY3 zXw|qgT7i+sUQo#X5j>nEX}nu~M!V%qi=(2QoUAw8i-yTnnCe&SYV}dhI%(_D3H$Si zM_7u&Aen1V;I#who%4CG{o(BIc?_CWFu=)uDJVcos8(%#DaUF)kMF$2_G+g#q{L|o zO=rB;+Elp+-|Tp6GBbOaUaQgPqyzdrmEvT#|KjU|6W?;!5Qc5Tb&-ln{e`Vq9T2Iz znG7rJAxTN*!u_zzcWJagBo4nk6Buq(!s0!>k`4?Gb{zBnuU29wkLr2aHh6LKlzGHk z1PZF3=57jBNYo9osfjyl-LFIvt~m`?k!MX5e(4h?UJbbMK~{x-{u#!KqO9c7Ur zAtarOeNRRA*&rkmj8}lRQPEYBf1p{E(fP97D3?GU2|K(4R};|$J0d070ag*nQSC-T zpllR`r_9r7d|yl2+WN-g25n8s+(3;N(lM$j)4nA^nI$Y*7VEsK3hr?=Bq!uh)+KO1 zn60_nkj~cQF&ks2Bkk_}wIX<*G0j!5BIs)pHI{{Pq3=+VVg2fCtbKdF4)4UEm`KZ1 zw+D(hDYdD#N?KFk)Up9Nc&2pMGe~s4e&FH|7vc)ZRNCDC{cx3kvmueg*l+l zIKJT3gae0(`$F=FG(;S|Fy=Ve6hY&BI)s6=)B5lApu6!|LYc`#M2d|CS6q6cr- z0HUV1FRd?R@H7q+g}Vw1ba6L+DvMtU5l&?QyrlZh6l^!EO-)+Y6jj0cUVZ0UaJHQS zp2O@*E__=}Hvs8o2b~DHJzk|X#DJ|>b)F635S=7 zPYCk|z>3&i?MJk zdR6y03M$>MD@w~g_oCcEv3jNUH|ekVDaC>_$5cBRiY7#U)rY^%BYHq{LXat=+Vpy* zutYwr1dmIzSPwH-_8G+Y(OXt)mDSq1>=ToN#~dIa>eJlFAc>KqN2kk?E|Tp2S!<+P zMfA_W0=u!;mkR=jt;#vu(D_IHVzQcF9LA?F)Om|Kmd98=XX8j8=3w+6SWFg^o@`HL z!)~rXIGTXFHkLjSc8E`(_(gMkHChixs6ITXkrEP3e@ zXwL&wVS&317nY0_{MX2q_L@B%wBA7U_0i${47Yz=bWL5|N`veC52Jo9Y4F>!HG`p_ z!CpNNeiW5FiyTQP8J;ugU1W?lAXljT^tvn6`y;?;NZaBSH>K97#oUOEF;MVl6^+RU z;g{>!j13=#)8_>Zg$``D*k#?Me&UMXq0ZLy?&=6(x2V^Lc37&(yno#tM=6x)CPYLf z@KqwztO-ZddD!3V_*n=Eqgn1lxK_P;$BgQht_Vyi~m z$jxJiJ4r&JEBVK?_B$SFT)Nl_ zfjcqU+RNf}a)cjPSymfs?gNxho@U&&m>3ek4|xCH!rtXuxL<97Q9$L{R?;5RZvNi> z(9kP&z<&2W-{iqqY4#H~nDE*Tro(p=Xoe}Jn+cTn6pBp^yvm07s#kb|F z)hGMKH!=u!EpvzVBsuYkKLNQ1D*W5&Tdw}J>p&$v{<~y)WM1HrGt`f$ljZLD>ugJ> zsR{+^OrA`;L^287cl|0XH*e4h=wEG)cyo(aaoxfCk7J-2({HcwR`Qxh8+&J_qC0${ za!01+Cve5jN@fx4t}C6x+wE*!FNJ?P-fH4snpt4?aq@+3gIbZUlE6BJ8KV(UJtQ7m zRnz-Ex7%4YCLV+H2$lL;Z>VZ(RlFNtuv#S_?vi$^N3duzkL|cz{c~b>mh4J)kfUUR zn^d6W**4BrZ3j%-stFCnY_(z(>BUt<_%~!8_qYceILk9yYax}aWDs)hPgT*~^`+R0 zax&}>zwVmB3-F^-PSwUu$*E?w@?{Ys>mYK1c#Z^BMfK<6k90#nj((YXKplq z=3W^&rsR%mVZ??;`T7#xLl;1Y>w|&hz*<*W0Xg^VbTo_Q2`~NYQ`ihT0|SE_kPua3 zuwp`Tyfj<$oKkychI0iGD2FKFWf41aHlo&A+jzPQKpI}_UW+OGft9-#;Z`JFGx-)N zc&JR=)vHh7Kc?_vpsxsa0<-l8Inm`DjNYG0yaT%*9lRdQ>Gfs)DWyRB6`OM-j+NI? zmc}(}M4?6@LRz#qy!|mcr6{Y&YLQM^>6Ds?HR>t7z|BKD=T{q*vd$@im61H|7qgk% z9LZOIjFre5(L!vD!nb02jry}lxZhVLC7~I+us|!uq*LD4oE#jz>|(#jtYlA5SpzAK zV9+Z<=8JXKoCmU9h|aXbdJe z8c|8IBR~3duzT`0b=j4gigag3i>!oZl60(a#lD#!??cU9)CN zaVV4!=jL=mhZJ1L43*l}9-a+F18;9JSoV@G_2wN758X=(H;_yT+)r z2;w}y<_l31Q7yHv>1ytt8ox8;!mIfD(tS6)Kh+^@yJ)K@KP1Deu0nQ{&qe2W`^n)H zzt1D1!xTg-)IjJ?JQjb8$(kswZVmZ5p+QO0Eu4Ua!L!>3h(o}>=a=|I6O;zdMbhM( zM|HYw-h!dR_>8*5EH^13`2A6-!zQ+a8QSd)56WDv z%iGkBCYFUQBPR zWT9|hsjZY{6j?kS{bxScWJ_De3UWqG}V7?gW~Cf%Tp_efWTv=0=2ja8ks2-z#5tC#PZPX zk)C@b&7tUnhHqCgqq?O9geE(W5yEL*8Lpq{kA84X?H!7b+xyEgCWw$AEGV*uW3zi^ zvtqIK!i)AeByi{;Z&&NSze=?&>iN#5<{$G&Xj}dwot;l;7*qpDn?ARO?eP$~%pe@n z3~mq*RtPHH9#oCb$@(>1nurfRJ=i8c9fiZUrbOpZ7&S{;k~I~{j<;u}Kx)#2#L`ih zHj)7pr{$3hU#nB)V0UuQfYyP9w8RNe@T#C4 zW+>|AT(s-%Xfn&L-QeN8zh(K%8PlpwOP7#drxF1S7JdE2^8oqW(;}+j9{hwZ6W$gh zXfyZ$lOzyOSINahjbKBKg;Iwm*9#mVumAY^_ZM-(7XWO7%=|Z}gEu*-%SQ<;Tcj63 z?gMv!_?-QcWf#Hz81js&*i7{Px@Ao`<)YE--px$Cwxp}7%b9`6AMC8PY?GxQS!gXy z=S0<{jD_ih_AN~lJHK9I2Cp4U+`xuLmrN!PAJ%5oNfpgG6ggq(kG|raT|;4In(}AV zU5bQgd;3PY8yc=uR0Ya%cx`=iWPWd%9=46i0sQG3u1l{xxck`+@}uPIe-ZJ!WC-L8 zVb)N*kgFb`?tg!F=ay)+E@=7DI`M2Ue1;>}Zn5`BIy6&e%gWyp5XzBEESlBq6UKXU zfK>K&Q8?|Ne&bpcGKB_>9e1#`-1DB+O*ks6@2d2=DJG8VqR^LoLbJu&6a6AH^}HSC zwo$}qQUSpc?|?yz0XB_9u4oj@ZvjZR^qp|rrygbP+gyjQt3r>dmZQFWd9KRpjHPFE zRp1?GW{Q5RmF6fF%xPOsp?oo0bJ)KofoXMauhZ&!`y=CV&v2sq6<}V3jJhk!?)5r187Xr5w(cS;-$d+^g$e@s_TUtz34C z?AvBJ*g$6Lr9plYU!CEqam91L>PL5Qs&NtU8ob~hy(bUCw%A(4%b~|`^eSHNQRXZk z19=jgdiN=`tN<6y3uEJ?v_@TvQB%Ky9erCMV}d zD zO_7@@(t#-HAdM9mR1}1gOfT;Y8|~kKY+(mLsrB?%E3rU8Mno77`TDPnM;^`u=1qA@ zc4~2kvTcUcu0a9sVCVv||M#?JrZ}UQ`ht3&YHD`v^*lc*q%Vj!Aom|{*livd^IjfB zJpzh6tiNm{CH%x87CKQQ27~6Kcc)sbTdWZ6&@FU~)`F@SdM-Ue(P$UGmIihGdc=Ky zuOIgV_hKPza}etDXFlSTt6KRSt>G`pOW!4oVCb_4gkE>L(r!{4E`7t&&JZ|nzCG~3 zXn59uEA>s5J5Yi#E$}&c5R$Usb`S* z=;tA+z1Ary*YitrJ2UQ%LZOIAJ;RQEI1ilU5C%}D4*QZ`l&$tBiykCIubi`(#^7){ zN`JAMCwfx1qD#!k`K1BnE`@kyUs00ZahCo@r~U@lmn8S$Pk1R$uYDS}aL@F2n`Y*+ z`HqQn1ID<$E z5zbjP9BOuqQx@$R@P(eBL5Yw?#NpsEFqDMbg$=OHVzWQ+lIC)8_i2QqTEY6!6=LGI z!m7iv(wg3MPPn}Nh7D!;jWDHK{0V#0LX^`WZ1qslA?p{CG78%}7-G2La`St42KeEK zPVqT`uQX26#qr8rCM@M=c-ZWAlGBlG$DeQq}+#X03&?}!Y>5dd_WNTQy#B!7IzFm=jp<0l01fS+!v;7ih;@cE zIYMk2kUvq&Ua<*TbC{qA@b7oZkjt2(?N6~}NeDJGO*NQ8q8ZgXSH#E1)&ej|A_fI6 z_p>;J-L9II1A$unf3_;A>07=ed9jub|Le0K?@A-|CA8 zNdO~R6g7tF-)ZW8ZTvq?F3JLgHVvEOpXvX0kAGeYGUGjQOOerYlOy_#>*QY;Hy`X% z0o<7LM;1f)zxVE6e)uE-?Loa<79(%=|K44`GfA;kIbB4P+UveKbl{ z@OQ4qAGEc9dwHUZz=RBOG#(^`+%0DL`y-;hc;IwnD5NSs_m3wIm-zle+*}f3ZO(*I9+}fWvB>m1hZtyzq??f{H(r#cKKz>`DRD$yNG5+Um zd;@^>3VIa1^|xXCx6A+6hL&P;@i->@!BpL?-Rxi@-(UBxSABA{H7;RY=RheUB>apq zto$kZU*G=v?nyUVhTON+$M281F~qLm`sgR#TbQ@W_!oGgQd_@Cjab zq{?m&xQ%vN_}PPf7e72p_U@X``ZeCywXAts!Xp`|m$lrka2lReO+`^||G7)d?rry8 z3a{GoB4=YMyqIY=nws^5e><{(&-Mr;_7|OpThG^;zxdjd0J{-B4HZeBBbsD$AU z5ru?=*H$;nMrt+qG@8rugl{B^0aKr!B0tnQ( z*(k43?1H4tRVmgeDi#asYSbDw5cAkec^TeR7FO+_n69;Yf>6J=_ zk_gb(I2u>oIk3`bLm<%9+abg=h95ZN7>`>$aotKus&=msbsVXTZZj+(B z9q100#{W9NVwz$9r4@&mkX+buEY{OxfdFtbfTUw$2^-Jpnnw>ezTRD_t&VEiEHyW=!rA#8CjNp8*23d`e6~0?Sl_)f98mo>R8fzQ?=s#>wi&1$riW z&B}>4o8650vX$VY%~46~Lodg<&YhFGw37oHXqw-f-b7J+dO$yy!P>q5cw}ZN3=a$>F6TJFrKO9zBO~STU!DJkAgT zT=-L#FU{`#dalftAfSRRd2GSjX+{sh823v9QTqHF$&n7H^p8ndbdOI`E@k#>BFdTh ztW=BU=%9dyZYG7_QB}2IimotmB8E9LsGHESrR4P;z0JAILX4N$vPr5=yzONhty|+` zk)s=Qu?X&m5(}g|*7_dP+x|;iqv$cN97WG!Xrp6|^Vug?zIl6;l$Js$3sAyDs+i_2yhn;aGvHu4iA9GurndqDI}GDpTu;hT!iq z8FgBLg47^7F|;-d5oz3esh!v4cr=%i<6Ac)Y0fB9Wv+VF{R8m}7tUMku?mb$q&78G z{q@(oC?k2Y;#1Z3Wl&b@^#Y#^=NZsiS88WhuB>f{w|u45-1;;%J7lG5;rcn7#dzFl zrzZvDr$>}*FxKevLxS2ZeS{yf(y#r&+1V)LwreCVwH#IF5-0MH!#VCAh188t&1fH30 zWHld&C!Ndg=sGI5_b{q+G5pcNW*8EClCM+t3*1cj`_#4LwP0hX>(0mtPkfoVG9^NM zIy$z)bq*s#({L9`sYLK#fbn5&ROz1f=ljR`)^GbBXGlIB1yMR5Z3fQWq1v9M@{)P2 z*;T?|-C0tU%oA3?W3SDeG?;sxHQ=bmAl-m~WR11EO_dWfP%fNWA?`|Zm=HDWxo*Yj zuI-R`!uo#ukC*3kJML;ds})1bCCFqc;bzeAP=_h|s?N?| zn|T3F9*a(OR__J%zML!p`BaZz%qiHul{sCApH%C|pgx8vNA)EzC+@u^*K*yCky?|M z)I8i%D!aRO*iS#>vgOaz652as-C+6bbhrWl@mjgz7Jbd<(d)=;6% z#=+em&!vTY?CMv?(BvxLM7lUx79Ka%C{#pQUCe3lqJyTPa(oy=7#)pFIS zm}d5LhKT1%*RZSIX1t)NdtFIQlO2v#rD?0{#7Nlg(m9CPXxDABHQZdS`Av(VuRO-&%Svr$)W`=J;&evkL5G44c?tUfnbp$&r*+ zd%z>RHO71bv$bXflxzM$#OjoTZc{y}1^xzr^bKu*eA7*yCs&~%&-1YV)FlBK_XD56 zNQEwFo5OZ$fX!!m77_lnxka&25yO0_+P^QwHQk#{v&pyg4C zv$>0(Bvp#K0&`c{bD#56SkjEk`g%^(8{-`4Sxm;C81el$RbB68uy9b|4J3<_<|?bG zA`-{QQp-<%SnF9d@_0oMDKO(&8usGUDK_pJCLLS8x%&F`WHGKn%B#fa7dww86beU4 zN5c}!7v)j_ffoakj;(yrLdLS92YA;^<$KSpwbG__dJ;dM%NI^d-v+6?`S!M^$Z1u< zrcVel@{8}huX?@Ns~KsJ^i5}-FWQo*XlRv>9ioL<)(}%pwQc#XLvuT>L90{Ej*-LE z?{rAvVU-Y*isC&;_5fl~WyJS^oRvi2o;XBu9327}8Yyj?c*I;1nPTU9i*!I4b`e6Q z`Zsis&m?@@2M}MfEfyLd#uh3zXsQgeu8iJ*4M0*{mliJ%JK}Vsu)6Av%B(nh8{qB- z(dHwwN9>GVYA--WSJTcgo&H(Nkefm8T;%cR+~o*Io@ac*a~{t-(Fe;VESWxfiJ~Z^aJOty@t&d|LWo7M-znB6oO^IyL6Y;Qa`)#%n3UF$k?vmRy{#Z}9-4$Gi4w zJ@2ULb+?D#?OVV>vk#|EO&VOPTisok-5L7Qt>jns-ANG%5llmbu&eFg$}E7*6^2K1`kBvaGqrfIdL<#4YU^gZUx^yZrhDdpvgS zq2loi995Sl5n0Zktf^JpQ60aq7MjEQr?GPp@P8PwZXv!|tKK<6#_m4-Xfs)z{%F0) zcQ38DZFTJUSA$5PwVngo4x1J^SD=@46~$R3P2VPzYPIE}@+LD*CQ7%|eYer;BTN*O zK3Q(<3p)DA1&2ZkMPb!%Y`lBSN5ZQZR25IIs^nkcDnsYzHHG?22Rxz-wWSZqJFL*) zQ3QMh@5}HGQT%vB1j|mog)>jH$bf`+7Oq+KlcA?#jGJd*n>^(gvKM>xrS6xcGk3K> z+OU$jrm|YHm9y?qmn&-cEMfq5w*jVG}M3)Ko)NqIoDC%((nsszGiW^vfz4Grs&?Uzp?eElv8$9OM!(^{S@haT zOkm1s(WmNkAJY`vtYNHuw1*~T%&@oBEkxlAhUHN0-HltLM3XTTb z?;mR^j0UUq#b|*c8sZ=5lWCDyjAPSGt}MuK&s?N>(>hjb{10VFPkGF7ZAw|LCvFNI|WAM8jLzOvboOkq@_B6>om%R*;u4>P2EGZyL3?6p7&>N{0s zkUHQ0j{%DFhDE_2A{b9w$|9`KfTq%oQm zt=^}nEJhT!d|t6{24iK{2lbviUt9LdXF(4xFo^p1?{8RzSIfd;vGeN-4}%F9neLoA z9*m6+PPq^Z7}z+l@c+Q`+hE8(w-R|(XOgGz#v22UBCK%XNydAP*NO#Z5jid&?GsFJ?4?49xwbL1TL|8Y4nEau^eoaH8eqRD z;7e!wgH#DHI8ryA$;ho`#mKYY$45gzr#n$Wc)c^C{<0SCrz3T0SdaOaDc!9W+YYK~ z+!w)^)^lnsKODN@pAf;1n3XN!Wf%sANTB^}(E>N|6hOu2NFjeTs%NNjc)-GxXhc{_ zZ%6(1dN{*#EC4hN9wF>2Qmf0uV7J7=&pv{U4=1p?B4-!-nKuYN@;FYk{3Im%YCgL+ zgpAcA0)At&BXV~{Gww2s>GYy}IlyBf=XSnQcE?}p`peFzgdJ{9+#mZwm;N(f{P9w> zQ?6onAE=J2Y-AjcL}6{HW{%Q_R`2FwG*|M8&I2?qlP4J(4=eN%@3>PfgHBofQ(`;fP#4vrS-t#Bemp zux<7@-?x%gyLtB*eSbElH!XLdq7aY*fpnh`84 z<_a6!QIBkJ65n9rbyzg5me{;Ej16i6X<(Yx9!oU=$!D{0oLeqVDT#vSENwvzPg@%L z68XeEoc0U}{7G20?hBnCoKM4;5><7q4VAXyS=ZG1T=(d;s=8$yfyzi^WJz#_x*#*$>d=sfGvCFYr2G?=py*{-)G%JP%fOSubM4{g3jD*%=i0+h zT-%!~E|DMinZ^P1%CRv1T|Y}xcMIJ8iRKC=r^M!p^cEI`2&5yBwz83&I9_#V{b?cN zuzopck-Ijr+zYWNebj&p;U0yt-vbuJp5S!d7^AMXx8o>Sq@@i-MAxp^8iPA$aNIN_ zI#`GCPDG*K4giLo8Qq;IEV}~CYzKztUy-v-`)|}Nlp!=2L}O7viPni@v)7O!+1X&Bo`h=vuCAHB7iFZgIR(h{P*Lve( z#4v~?`nfSOywmGs?HVfbX}rk1uGg|lzh>w|uk+8xW2isyTE2r7g`~xQ8>xxv1L_5H zJDCx5XyQNpGurWejIbr_Z(1oGajn!{S-f0;Dpc$eL3lk$+H{=q-&M~azMUU0eiYA( zPxXCQzs63*_(_AleG?8oOdiU19!A7s$!KDFs47G{c~V` ze4dVLeRwv3D5g9Z)fRQ7CjDDXKy^B5oA>lk=_yH7LYunx(l`X=O z-M-%N03b8BK{KO6-{_B=t#K5EQpElmdlSUL5A5GN6(Kt0M&%iC`u#Zpr8>sf7R<}R zw@}~MI9xOsNhw_p+kKBm_rhDvPVPa(+h0ru}vC z<}hgzj?SXyscaH^p;vnr>8Z8T_TDq`P$^jD>9p=S;nj`FwrP>9A=(G=`@3~6PDw-M ztBKw>6;N?$2v`SIyKd^`$G@Uqf({RX_$jfT^S}=W$S<>T2XUD$T)?N%?A?T>h7*kK zvw*qbSxL?u7XKOCZ?{aB?RtAuz9*cTw93fcQqx&Jjt_LwbB)DoHR4|t(?v?MxVe>! z_1EMA4;}x9d0W&Zx|k#Oud{v!u@$|YYDfKyk5|AoI}_uy{s9~LFAE6hD}}4yJ|o|N4;zh#o4` zaD8_k|K7uYTnZ`!vAc9dgUA0D|C;ta)~sxU`QiW2%m3W)K@9LQ!~rCv?&1w`DWEFMo1w*Q(&wpY72%N2{8ySWJs7lPG&*dvETd=p4!bv1ZqM+jCWVwN5blkfh2;#>T7Z@tmgY z!Dv9((q3O+MFTo%O)QYAs6JKcRc8rC1@v~^MS!}g)c6wojYA*fpXbdYl^y6E6m;5M z0fWBjkn;Fa(?BKj*;HvmK>!DS?zu*+*TpR*eY<_`kc#QH76O1 zpUfs@0LXz7rBTa!US=v2+ePZ74)(Oj(FQnFMqKE=hp4gL7F+Hd*xjNSPe%*9=^5K( z-dJ$2v=_MIl;gj4`*h#kF#Nm2T?hZ6lPES<9j^Z<^6Q(nFk^R085tiKq^*fc_cgOh_WN8kjCFO1@9vE%eFtj|6REJi zPN7kud7)8SU7%An&%On-ZHx*a^LPR${2K8RP9?-gQk)TCu@8x@6e zjnii2LwW@{Ofvq+*8$aQ9>;Z411S+@Ftc^eYwaP2rB)<>I%I>M?AdZ?OAEo9^Mjbu zu{WCvMA_etqdDe1y9U6V_KIKs!;|T25enP>jEF^rsEwOHUSB?x2!?}WQQ6Rl>w6s35iCfDlC#Nzs`A#pOyg$v+ zdv5u@S$|;hy2>4_9aqTm0$P0IE!_0+Mc)I|20}vXvg588-6PMnagL5bNbN&fO^Vq{ z55N6kKlyl~YGjElna6E~Mu4e=qo%*t=%twEW)FQO9sQgtQHiUkeYbM4ZEd`kH$Kv!wwe@;e4m&O;EyTmS4j^|sddlT^toXZ&4U(DGd3K2 zsOP%i%T>vaDA2CxoFKt5WSG7s*jIu0`Wj8pH==m=5_frVeo9Ii1a!OAv0No4(t{fm zQp{5i3s9=}iM#o9eaN>Ez1l{Vnb7-RaMLM>ew+=&Jl?aIbINTH@Y#4CV;J8}^mk60 zAA-v74aN5*t4hBY3#8FVOGpG7r*Of@%x7winaS6ce<(kZdCe$fUQ~eTWC~J%ahdJK zZ3OT?d(3hH(5+(vRbJNjBo?~Qo&`kWIm!t zyHt@f3C!J7ECvK(TNls>AoY>nwuwb7k;9T)FXTE^mXUvTbAtj>lWRP(n#*j|x!rF4 zQe61SN3;jca@>r`C*@vinb@TUI}Yx!5Vh@7vIh7-6s2g;LvR5@_e6zvo0z-FH}r!h zh(O%t=uLFD&kfar*QId=5!o>!IzHVK0q@(2>#L7@sDmj@PbT=PQ{6m2^Ik~YCXp(F zLIJ1_^(;G?*FjBzUXuboWAd}6(A!tB^k7;bHzM}tE-5;}DrOZf%TG!D$WJL-PWqW+ z!<(Hg%2Klyfl|;Q={aDB7JqlBK9CSYKqajoNMH$2&QsTojpvDW1?(L2(ToTjN}D4a zNwJA!n(rrvAP$atxmzx(RDWqhLB-Vn!`@p4MEP%Rqtb#RDgpu$1|TinWzgLXN_TgQ zibzUIgLES>bP7m!3^8=a(4FT8?)^M}alhx?=ll6KFf;eu_pjDk*LAJ6`a6sFrO|8d zn!1o0)tRirP^>qnl7tNuz{#ajWc@=t?z9pHO-(n97D+$dT6`A8J#TRdlNNn8K)zcR zfT&WWf3JFJJ#1=9yEU3NJI>9xWtKJWaC0#soM14!El;BozBBz)C`DszXuIyLTCaD8 ztSgWEsVDz!M1ndXe0gs=2Icct9n|D1oEG?8`wk$S7yUT`FKcuN&7{TbL zBN(paI#Xwe^KB7dC#oyPy6?cbr3+u9_cPEPuQ^P32o~SH^vg)|E?2}5Dg+RMfmXZS zvE_Xw64_-XU*W%_3t@Q#iF>Dw!3KJ3kqH1s9D)DXdmj_%Tj|`%dD3$OS_0=XcdpNu z&kV74C`u#WbW1i!OT$iJfYTqH`y|ZwBsKUtYd*St3CbEuv7WJQgq;>C`Q7`c@XmJu2)lbp-LCYgVrD&lAbQsf7PhT!!3Fb8Hd0O~x z*_Bcygm4tctbYNdnVA!<;`Jv4_uS>`DzPc515Nzs+9PtqM6f-=(Q8i)8PCOSQ8JJa z1KZp652I1{R@>I1q_t(Ihe%NYg~`!_Mn0zd$S(Lk`rzxm>h<@N_*9^fP2zdKkdEo8uSa( zZI6K4_W~ZO!HuLwS2kb+Rz5ZYL(Q{U=%5sn$cKXtORY6NvEeQfFWkW-j}l6F9PU%Q zX3QNpt%kezjq#^&Ua!1VfNUy2mGO4&n8R>=bUs z!~}omBRi-yFh^7SHx04ai1;Kd1bZ2Kb%lD0&)46$q{5kIwO32<8Fhn!#TXkLD}`I` zN!m`v8(qPuUaLk$xT3EvR%CNp0tjC}v1q+-ala?NesASCM%xB`jHdH@8qY_j!$aXw zTccFruP^Ptz0hzfvIBNXWcJe~&bh^KV!tw6A0xR_0-0~z!p@6twK8jDn{=md_;d$Q z`AML1Z zmyC~YYwQSdcH+@_?yL>he0@!|S^i#*O3^5xq*{rgKI1cq!tBU=WxX2jMZ0Q;IJe&p znJ@uj^xKrl1|&To+tk!!r|}eg8nvVfw<^%gGNwd#a0SBn^E8pu zgLfD;&1KJBIvQd~5fB5308pk_v&(4ZzEmV@T%3D`mRA3&Znj8FSqmf(TvXTetbS^;aufr`JZ zka88vRdr|F9eK=(=@e;Rtp~5zlTnNU-S5gxon=-#-`*4B=l8^n7E&j+((I4bD!>24 zY|OzrE?HBq?;u2u*>XeE`C#R3f9h&s?M3|K16#w@nrN^-0TuM@St6TI=Y>O>scP*@ z#VAPx`s!2F`^G#HZ!T@^=X`$U(yxa@_x;X1n2d6s;7XjmzB0o6buq}l+>bQ2|**QHxC=#HnA<+}8xcVAY?t+Vi;vJ^=l?=Cm-uutVI0wBu#rlDmhF_euvq-|h@ z#bkaYsX_0wY(soQK})H~?lx!*_uiChB~1S&3em+VC7W7g!|w37k*o*#M_Et+i0~n= z!+NYpK2e11Nn1FzHDKMx+DAecrK_D;qBzYeij9bPXNAO@TVg3g4Kdc0v!x6TPF~qRoXx`3$4b#2=A>L=qJ5Ik%->n&>xe`+e2s$Yz0+A<~pHTKiZ2O z>+9nB$OP2pMPwf(y+AH z%|kTWo}S=A)*MJux_S^}mG%mVv&{$x5s7Tno9_jfsJxZ6GP%JSfX|yOw&-GZyp^q# z@4HV5~(P2aP<*9ha>YIxJZR{WtRa z`g9L^WGfXVj_iJt6uKP53v<#3x=I3ep4=TmAUu97kt(-HT3!ss*hqafSbUp7WCQ_0*Y5b|IJjOxJ=cHaY+#?<=sBD=^pNQMNqbWpiNSqF2`on zTj7n#?65JULQJyz*_LH&aNpwD;OS|n<1okkjufBmpjwTqiqSxU*Fa7`{|Z~hSYRhS zXW+&WRLkA?J)YPlcTnV^!8H(z%3!VtigN1u%rEyOjd!x@Tq*86@oq62N<&l7Jv6e0 zHX{jGR>%CGZ`7Vd;FW$$yTT?NRY{wUZbf!r=0MG=kJotJj!lCfP=`VLn^Smy?}Gn@ z=D5lKO%dRz4-kKov`1bX(LwV|`|hV7J9k^3-K+8WRZ1E5EZZq)XlN=m0$gQ5&cT@6 z{s6n%b3nN{8V3DpzyA}3LMpxxDr~*jg=4n*=)#cgv;LdLgVfO!=7vsS@i<__qscse z_+JFQ%Vol+rf%5}-#XY`modY$irTjwa!YRKyl>@l;6&sy3S|pgo%~iLY2nK z1&s>68pJ#QOg6}1lYGQwuMXOs7K2_BO2AX>NZynC1HuO949Jp0*L3+6t@^*Sa`nnQ zl;70-l-#x-q&OA7*rTvRAUaTOmZw+GNPNJEC5205aRLJCh&x21Z8|}Bgc++(c#QZp zeusZoG4(T)E0~{iLtd7hYxIw-vwwXm_!%-Y+yqz>^u8fLnzYP(w7H*RPIYy3{)$@%8XW@m*v&ndUfKkoeM_8tBB z8z*z_dGtGraT)!cT+>K%m(r2e`l&O3jYQGWF$2nROaA0RfVatdbIC&S4DOr^JCtzI z!I!)K8>Aq01LiR;WNZ;FpE);^+Ws}7=+b8YaUqMlJ(D@dW8qg)mp^z45v{3(`qko0 zvKP;lpQODNJ5KM!zXo+avqLz`&8k)D|2CO-B@O%I>cYo})9<18LbFp@9r9Oa=c4LT zJknwj{#cKmbwp%|wF+^Qx$6|TTcx=toN3nxAK(DGp!`J1Cwp_4a7fuvCH2YHdS3K% zEIW}fmg$BYk~iBzi8g>v1+_S%tNQbWDs^6q)S8(WIp{>QN8!b2=C8(=D&~ElaT&6DQUknGYyo) zp-Mf=U5SlAE$~(0BKRGh{9~YknNdtPRXygoyjBYOdn$(-5J4{W8bQGw%xbE7Ji1Ya zraaB+2k(YfH{>t8 z|9N0%lqZLJR|9Z|Te1yf)%%KJG)uNMPgTSz26AmZx z7e)y;a<6R{;UUDlDaiShgR?wW|9bbm@K|m8#`%tGPfr?r7x5m_U~lK@k2pK@-a8g~ zOiKGX6EN=4YkXF)Kg#q0j?p4+uTxiEAMRUXiF5UL*}NnQb^dF? zl3F1@LCKHvgxEM5od0U_T-C=(R_EfqK4Q<}JCoJ%q@5P= zAmhQF`1QdB+`+Ba_*FyXTztn3h(m8FrfK>)4(2a%1IROoN+N2npCye#b!TjuE=p*K{rfA0zZ9RFUxR7nxhrIP!P;eA$e!)vt>chT{$H)8qy>rHry zPntY45J%9V+{V`*h_uS{#A0C6Q-Avhi zO*Zg<$Wr^`-uPXSZ)!FR1-bn-!`J5s0h#*=|K{jZfBC=9(LXMEIU;vSK(gpoua4GV zyY2704Z3-^YX9cb@M~lFpZ;tV@|?1B-5tjJV`l!oB=}VjQX}W{{1hg;es3@iM3Br? zHXn+9r{<_;XMsN088c?m`V75%7O1QWZ5H!{eTIt+@{v*EO4|qZK@I({CFO%CXm=i6 zX5X{{XHrMu&1_ok++_KV4#e!GsqLHZ&(7RPH_V2hpo> zy)VJfCkJ%w4Jiole^J;P6G0a=<8%Rnz{0 z-#7N2BtLyD#dlKWR%`?nIp*2TFyY-aO>D-h1YlGqd{X(-9m2;XuDel(gL(7`ZoEUY z%}Fn>rhDTqyZvd|?kba^f!V4yfLoM7ILN+(B%oIYcBpJoKCk1WQZwaoKTzxY? zalrR1!GlwffW=hXrDdTlt{oD0^7_jIN|-??d{+nngXICeyGC#0DI{aV+(3na>SkYV>jv=nL)2pd-@t=kUfj5*ezgl3V3u5gPS}My4u_Tadp9zox@2}ZzLq7CN?Q^;Bbeoe&w{Is$4%IX$HUnrrDG# z9y2pu93ZMpphlzJN}4WWRPy^wJcfj=ll=xG^Q~t=K~kvb=;dGa)sRMj%)VTinWcQc zjZUNF3$xLXD#!?0QBAKdaoJloknjm|Re|+anTT%e6IBiqZxhVfABfaQu9_Rc%?|4**p!pG@7zl!rvf=dRQ9ow@47nIzxD9?diG z!7Q~4r&Jo0PQ3Bk?f8je2;hz4D~0M{f4q^ndxy!#*IGZlrROHC<2wo@U? z#b&>w%j^g2vZ0T9?O_oJXCz@#;udzaT=r{)cB4@j=f$<@MW!Paon1z4BfT3{7DWh4 z93I;vk$Do6ZWphjxb>pB8Rk@0A$sks<&_F9mxQ883}_(G%Jj;o@?S~B!pdIOdhNm+ zn&V`Ea|>Ze4ho}@c>-J1`$-%(dbL5T1TKpURACe&Tt8Xp?`9|`#XjP;Z5a$XJ=$)q zaXVS7+J9edIsLur_*iXwzf$LC0A{X0EhogJtt~uT@01?pXFN+D`nSS zOkZ(~N2@_vx*$nVowC!857Y60)h=HHG7OXM5uR`|@E@mt#(bH{V=h}S6=B8aVS-fG z5Klt65pX1Y#WQ=n&G2{KQcx0gka+Cjkr020pgS22SUT-NO6OJvV}f|H1a?6c=uxQC z&wRet92Fbg*|g66Ll6*MtRhEkwg+t=4ES1uk|Rgwl|N*2jrBrNPpP-|_QDmYaa%LK z(hGZ?9bq2&Y(rBa^12CvQnU*5{4{yEewvFeJ>2XI8=y?ROAZ^%BgQQq^td-wBcbJ9S=T^gYWHE^`4uO9jhKCqAdfh+&oX8znr(8r238`D;GM zd*RM@tHMJ$Dyeqaxb_Ki=jkBVw@`bXW~`{}QcGA`97vrv-(8zF%)eD9bSws7yVR!f z&NchMDAXcq1q`vpb*=OW8m%9F5Ur>_2a&}S&M#@U9vPEoAfv512x7Rg*lST^j5uA> zSFMIu?s`;+=@0Ca@MwvVUJ%6nOt2C@-Wel0D~P$q3mUG4Wkd7YD)tE1DwfW}p3A5^ z@2!#JyShFDC?0_N9;<-tiE(w8mnLdOx~)$@PJD^LI_POAk|m${%%Cf_@NEM*htoFD zj~Yfh(-QD^N6^N^*6g!pBO!jub7Hv1TqS zy*i$lY)`X{>PRk+eXrN|db)Gnv9KO=()BgCYKA}8rRj2K~> z60 z-ZN$`aGPn&v>X$PmEn@OSL=Etnh9F48*U0TZx4N+jWiaulF-Q$Sj3@LZ2dgluvUS9 z#b+4FVm#UggISi|cC*Lhv-o!{0Q=9F1&eGv1xSIY!)CCHrNSKYo9jC7=h>7wb} zKw2Kzya$E*Ao36a4P15j@^z|zUkc{5UiV0Yq#-w`F zEBv$$4i-CF=LDnE%4BIe!lTRd2>z)O;MCR7u06VP68`BwZ(#Rm4mC@~7GU;oeZ`|! zp#tR%BZ7ORodCCNy>@6-xjt3@ssw8HG*nU5&zuQVz#gfzsFiRygQifXHG@u1#6N-J zyhumU7)zOm$?4dC#Gb_BG!%;L0VzF02MR$gHO6k9rT|&mQSFo9W3GS^z;)+8IxSKdt-t zP1Y4jPr_)yuw*_G`*iG%BQezkj?mq5E#d_TvG}vrL_b(9!IR$b{O^ zOX$}Bt7f}Gcv=GV!9uiRO&t0olQ9Skx=gGFZO^Y+Ca`dcKv%ywZ%$wYidp*@S@I@F z!36(((7eFytagK}#nGtuVDbtr*B3Witgf8geXg_<6Ano4)<)mZHRTyvHRjrpw45t{ z3Iw`$G%oRLwQP4y$vD>W;5tt>)n-1 zR+EZ#iUdb-!Kh-G)NOp@)&0)UF=vx3d7_x3(4YyX*}&T8ms*vV`JYCAWVT08y7iMk zVBu-5JzRSlO72o7apcCkRAmcyPN;h4Oxz6N=3TnybofZUzO-@XCEXK2#jS=^%Lhr2XbU>eS)BEEi)OI zZgS4lAn3#9)j4c@Q4K<00uvav*BQs9RNQHInmkS#jkB(!Xp(O%QJW_)^LaiRKjA0? ze{uv0Ws@`?r5l%OHkKp_I!FzaaD$K9#jJC^8~YvuWd+LpU;9rSCIy?nc9|d!Iq$sR zFXYvg{c+&7`Sxf%hW=6yMnrP58`U2|;b49+uHGNRX7N>0!?|^sp6~1N-l;}=oG(Dq zhlKkFgcNM6_gjW0_I^;BjZIQ`6T39-zYpr%H~p>tQ1K$QL5gtKT(P|KJ3W<4NP9zI zhl@;2AKF=eeBr!!@O4MLdzEW(Z$bPzB=ot|6EzZ2YGq57MVeh?Hd<_yd|Q3>xQhHn zOxTyS&A`k{1!xQ%PZm7-cZIefurVFz0 zT|xc$ZDoK}NH3jIn`FhI7BjhxOmTKEh+Y@B>U)*0}fQZj>t6*x%5vhF)`9b!~1r7_^2D=iQYAr z1)3z=neOi_dZ)hoXnkKpYPD==*>rMky+k%s7KJOVB<*ebKO=C@MdWw=JJC~+#j5M2 zwf?sR8j%442tM{k2Mt|fn#*6>|9M+a@5W5A0AYVeyU45S#}Dw5QfTkS42+AM+%~#0 z!2e#_jY6b)uJ-!>4PJuG{TSdd*kAq|eCICxB@Q#A1N2+}yvzR`#(%t$x`ZS?JhA)d zc>MeJuKll34B#+Thr@s8Nc{CPb=a3UOp-9sb;s}8B`^Qnx=-pzM9*t~9UJ?{wEz2l zH$Q+Pb5hS`|K=6`x-Ng!CB)?inuh*ghv5I)(0UDQjmG?a)jAVo$$0eL=#rkh*GGNk zGGQX`o#`Ki7Qw)HMqvzzd;o^~!K~bZPgwu&4{%r55X?9_t@zo0 zG2RRy(IW8c=f6PY|L`;SRl$tEyd}r?C&d1r)(5{om~owF?~txP{k2B}e|miYW!mC; zehyq8kpFPqyU8Hc`vaBHB-2Q@u|GsYHb1)_U|Iq#)hIZzO<#Hbx zrRw+CN4&1j=qkte&AJn?B0x#lH^$BJJT7Fb;QA^v+K|f;_Sj zwcMGslU((3RZSP2U5Qd(qxp#3v1jauFUvX+1BpU)nuC1Q?6a97>9rz&j-5QCA-5#p z>}rvi2Z8Qi86Q4rR`Z}OW?Zf0|8piw5PztCE^xVwr-^CDV6(g@X= zS1LT#Xjk8xjBr_~X?e6d$n|s?Z$_&&)0Ji4!z!2j7u>rmAu?GgsHqIl`i2wV>BR)@{%57n(7e#=+pva@ zvOwLjb_q!j?ANBEYt4s1j45vqpMb044qoD)-&JWEgle7vQ6e6^Iu_P`1%=uyh5-3; z@q>SZp|PnzW%oVkFif6OuB}h6{j&OjY|_i}LwOu?Elj~(H*HVDon0@ot2VfK(sD2mRrQuSJ*wVF(hKf3R!^Wbhb5y}k zqI+3z8%&Uhl%1uo&}bNj}*|k z37=b3af%M*s6GLab0ik;>43Q+L=^}Bpxq)*gSn-~V1t)1WkTOs1)2w6R9*a!z$HB! zE`6Z0!mlbeRot!^vj{C*%oG#!o9uK?#W$+}Y^gu~zo_ND%Ejq0hZM6ORi_ zpyv1&?Z`V(r7xZLmsW@ZzW)Zme4kuVdMLiHjd0L@iwXbNu8|TTxF-uD&DJ+XKRJ#r zchd0w{DTtY4t1rat&db^9|D~$MXCI3#l=p8kVq}sdG~}yosgBC*$ofUI}9&xB0D%Z zKxaP6iW+4`R#XZk4LrAV5mTcIlYRaGyrT*e>G@E0Z^Fg=o1XoM1nXV3ZP*5$y~A8r z+=Y3q13*`7Hr{|Nptxl^EmOH9SB@O@5@`eCNtek6PM71&>8HoA^b4k20Cj63LON+^ zZbrl6VZUtxHRBg;)2rsCq(px@;e@1+CI2bk;_dB6JxXXfm}M$Oi%A}}yuZZSlXqQ? zKm~B#)3+Km)oReLv)w`aE4-#+ueo2}RI_Sctrl;@F(__WSP&J2}D2|b; zN(L+{@^)>{XZL(}l1rD`YUxdW$ZeQ74hN6&0UYN^3hfJrZZio~V~&wssPRk=yv`Ft z02QgxzgtNgMY^fa%iltLi-yJWizdBBrr`x6NGz9VblKCwxb?8$1jn~Yw zkXTsI$8y-9ny;HXKLlh;$?bHNe)8kmk3c4ysBBr#Rct<4ldD&~^_nqW4PuJGwl^74 z-nyNVqPx4oR9DE(!GXVBGsK`r*4}wLr0EpyFsmRvu4ceN$OYIPRFa^x2j}PKR4vkv zX%8Qfq)Y=qM$`CQ^<7}{g3M{ARL?+dM8@oxp+ zjT50EYcNyuooP}~+`d27bQ6;{&jK-uL+8sKR;^Mmqk1)qs`v3!Ej&wsW3*yqcTekH zH82BY=UZnw?QMSPwDCDWTbQg2i>)Y1RH^_Vg~OBxoD(y zOnaZe7trZ(ilt;y`^dhnC!JT8n!Ov$e8p9@zv5Sty;c(;zNcAj-r%odQy@1k{FeUJ z_GHDKuZs9KTmsAH-I;{H3r8n$8`Yy}MO~t9&O{*an zenbc8r1*4IQKNPSEE3*#`M1Jk@F!o%J00>-Xx+*Y%63l)r&AE+qf<8|BDF}K*y&#> z!*-7|WGV47?m)SP+t?zrv1+|gxbqUHEdKbwmiugAwj!S@oI1%e>8CQNjz#1X z?zm^WHnM23qrL9}vn#-6hJo_xRI@>ZqU4*=@9Vsqol12ly?F;iyN=VQ1Qz|j=hg2$ zQYgTWIAR?@1uGc00#^C>wsh4~Cu=}~7vjXen<1S^TBkqJSaecQVs0;g+C zQd6N;T8XLw#~Ct}U*mm_(n)GQhKbVVGuG9fEZpKza-7vSlTO!^%NEynQ4iUo+0h|U z5?D`@ARHS*#!=wd$gep>-UvLu0kVVzvRUH_^j29lG^9kG@->TaF$o~A8_07vJ8bBe zO$}U#c+Tc5A>9xf!(}B=?^4ronMh7Pm;FZ=cr}XKYHeW$%l+8c7vKEd&z#jN9{3o^ zQA}&$IOZv&|KMG3acEw$iQJy+dscQ%{v(Gxscy<1?ka?Ausbw-wZzO^48pj^lDNowU zevr)d89FNe{s5*IB7+rr*5N2bzoth@Qc|G!_%Z*wu|e7%%TwN~qwZ?1e{Ur(7@l-% z68k-STz4vAa+|k=v}|oY%@oh-n#aZ-zAWJ-fWo&8-Q5`&32@rj6KLazyu)&ou&|`E z>-6j&QBWLndz`=Dr&XjGo}Rw#;X}x-{Px^mbiYWKORU^tjQq?e^C)3n5OIU%)Kx^W zd{<39{9dGXd3mc-yN4740>VO*Bu~)i&mZzJP{*iM;$_f4+DwzDz^ko>1Fa-b6boub zob8?v^26E5NuyK}x1|`-AZ5vUxjmcr}ODtNfz|0ox6@tjJV)MqAlRAUkh z4iZ6)2=ll52?@yOW2Gbv3_mjDD$^RoR|)rkNCR(WC^vU;AYyyX^dAQ)ID5O$*|Do? z6qP#l)$eym0yg=RD9?y(Q{*3?x-ycc_ky<@t>IMA0uKC~u87dL=?@Y;aWgb?jY~vm zG}*bvj`f@W_*Px#tp~;MpRr!FtL#un?p-apKaFT2zvjJyYJEs`S||1F9Q$?e=hDn7 z^P}bG*Ot|WY{kRg|2+=r$T|6X`L#oxa^CaW|Ka-u_sZyYREM&SO)BQ1J4;+e{;~Xj zzibIbyq^(aqQZLJ!UG>nU8#=Kv6I>j>PEp~ef@o5>?sH>ANn5;eC4)9J}AJ@+#$D% zbj9K@y#B2h=$oTMAL_x#{maGspAo^k5588}Q^p~G{X2hs^y&j;ACVtc)qI=~kH`39 z6BwVo`Eq;xPZm|F2$7vC#4%{e4eLIAwH>ZXcmXdB>X8uxsyc zSKr7t+Bp;Qym9S~=Tko~O@+pxI=k)lANtSFVkv`wny;}NFk5hCYW~yh|MNmHQN;Dq zpRK2r8+Y&D$L>uu?-Y;gYL$D-?(i5(3Nii(>9OwbxxM)s)#kedu<| z{@}TE-Lix2Rw0XW%DJY;meoL(Ow;mN;k$;iLr4F!Q?!9h1bv z7H6@Um(M56Hi*?`-L+rXuH?7;>UkD&BVJ@(Bn&~ zU_g6cXqHShV>EM)pMJoqo>A?Z|6e=g@72)4hgkZ0VXw1BBdT?%W<+Ox|NP$9Na<&F zd}2N_RK@J^ZZqdJ@X$D!|Jy8pRdyss+UyOL&2jxg;!`gyCfnn&&+$FkGOyCa07v=;AGRy;k#(+c0{M1 zB)rw5`pAg#e^Afz z-E_zxyT|mCwlIt)qBEC_?KuV7vr*n7lhH?}lY8{2dmFyTb|%^#!xq6=3!&~i^Avk& zkpt{}r@JmZB_}?2ipR&doiFO2Di^xuu2a`_<8{Wc^6!vi7H1AO{`xh&_f_Yyz#;{4 zIhs&lTpbLh-D;`Ds)d0{;kn<*MmbValixD0-fb}jqs_gTlG&xL(3^Cs$SAkc$l!eY zQ{&DFd}$r8g%nt;YClbKm;=`3Az9*6zis9Q8KE84{vc|y&N-_;gb%R-z{W@}Dm z0`|ft7QSP&iS`^cSWQlMjO;kyS)H09J!Nva=YDL5@%?+UoroFwam_`m!!U#mUPX&m zcC0%e9q^68fPqTsc{&ob@bCl1x@aBD&^qv)!$OCXPOn`My00&1U9}L(jLX5&=jg1I zgFK#-sRhluZxnitKtAKTTID(>$c1ZRZ&+CdjMSkfuFrbWak+=C8PT zctHp9mhLz0Z{^Jo1po5E>bB+skEI8`>o0d@g zwx2X!Cato8Qo=pm)M3=#ZfIBy{ryPc)ZzVJO6WEAt1#SyEK?IBVyeRm?JZFpngBs< z&jd~K3xB7@HxDT9Cl(bYxG!r|Z%#+o+AEtQ@CNEuT9z$W9Hq|L}ZGO*xA(hOB7JaAIQOVJ>4{DzZ~7#)k_glgF;| z`iJQxRp=J<^tLi8a~9c0X&2H6;|D@jx@&19Sj4<(NaG>2yrxT?dXI!&s{@er2~`BW zcl{-my(j= zPAvQ}U(Mz57_oow$Zn$#_lUv9OK&^Xq?Ld!e%>9(!WBH)Wy2+Y7ao_jL zmwL~d@!mW;ref)lX=}OnkE9CWBmcoUxNeKQPRW92>rK$z6?4^PP(EWV%TCK?skO;B zXM3&^hg;DifU4CRsj?`JWtG`E3&nLAVc*V=J!+R77T3yeDUo!mq2wbW^)FaQ+@F!% zcL}9hB*JxYy>wRuMn=a0ia;<#22>vbK(DbjdA>WG%$Si3k-nX8g*RVTLsV9{7j*#JaUaYMq z?CpD_?e`(r=x7KAwJYW|-%-$q8G4&<`1agy+O;B^y7;-OW9wP&O|?iH5g1)s8i^sj zQ9l}>*3Vd}fLhMX!&kz1lj^=9B_$nMLz5O`*{uh{d{$bg{)O<6K{{F*&|i@zYe*zC zWTkIT5Sfxli~o$|ZKFQSW!j+$<{TYOQX_>EwCCQfix;Sji?0i-+wu zs;6}LmLs7>u@6{OAkC@d)vEru@=5AMi`EpKa)OE&y$ z%6_rkX+VS;Q+v9uM6_hlUx@z9v*z8NV4PW;^WM~%i-W?B!A6r>@~_M($Imt8iE<|q zifnh-AI%No=#!|(t9Bwx6so*(%du2IJ+mFgKg<$`n^VQa1pGI~*#oisepSTwa9>G= z^+3ot^$raM8QI&m-E!sB1@{QWY(bneL)|xGPL`BvaPiQP$%}Qq6r}Rhmtsr)ixec) z&?t@ElCO289k*z0R1Q`qWFp5(M(gVR3aLWX-nWD(m@`vq#Vh{g7DoFSnyj-+McI5d z!-SQVvz7u{~`4OSJKXNo%yh^$7J(@9g(7+fLxmLk7i{Xmh=P zv@4nMC%xo-u9TJ%ozAJyolWDVND0x93BMmXl=4<141+dsaJ6KqPQQAT#d4}gMxl+9 zzuVi)y*=gBew=gghkAH_gt$3+i)iM0jFIe})3Gh=t=34s??r8_5#?p2*|Ot|9>p^E z$4V}4c<`}U*f0sJY~0h~g_5=5(P^Zzg`Rihs)l1!m^$N!`&Jpl$ra*VQCFaunavu> z&U!>u=j+XUwj*0j?L*3Xjxi?;@nTUs^tBf_JOhs=?mI>vWu}UdsuxyfE9NCG#>H1^ zbG&@@N?M~+fDXZya*$47O@~Uk#=b!@nd_{~tXcDcJlW4w*9zp^#=8bZY%B760zqs6_8Eo{Ex& zH7BtEI$#atgar?ksGgfMw+5SkXDm-3;O$Tj%M^;@QY%~~lQzE-A@=F4KWH4yiSNI& z6;Gu}$>{_XEG1)-LoU*fNp$JvAmzHgDqg4q{fbVV_JhpYDsW8Jf9t%*{O@T8i*2gjaQ!jE%a)g;l+^1w8S+QFGRD}Orp@#8Gp>9B9uE#&l`}mX57lV7H1@)1jgP}8caLg z4d^Z8&x`Y4rI=-?%$##>YaZjO#7aJ4(<+TgScI4yKB}J*xNcAD^pIoA-Ae%g8)I^&FN)f0T6IHF=<$9{qZ2ABpB>+ z_B53$Aoi>LIKp>5)Gw>>WP)yVRN3!2aQOTpk$-kqf)GuAxtCjh-+unf{H|7neMi^z zxtdBtp3~Q1u_?={m|w8vV}#4szc-H>ZC>uOF>LtuP5Hyek4d88ZHhwNu7@{4X>n9O z7CS|C^+%Gi+#iho}V}>2n2fcU#H9K9)2g!Q2oZ2ZIbxo zAT=(>(&O2t%*;%7%gwuiBz#_=wBmR1s6PCSM%t_AsLQJhaK-yEb`MYX(ja)YqrY&3 zTU+3x{f4ps8CAFNdSUSq`-p_5Eg``?CZ)M|cCnX<#S!iEtGDjxcf=y$;51FuJ51%W zX?n%P*iD_Z=hrqsCr`1mBk1M5rlxF9I&#BfSS{+s@~gZ$2^Cc^r+Y!yty|qZ-s|I> zI?z0xvWukY;Yt&~LDndzA9}0ypNon^mAr=m(ASr*<-WxsuTa0Uxyd9fFK4P}x7wG> z1`?K0=oKX3OJ8+@XKN0BGA;Ggm?@I9WuChy98&zcU>1n8!2y(;;6^{h#GvYIA$vvt z^Lxp?=?=knQSr+l0$fS+dS*~jSlPMU|JG6WQ10d}EFq8&R-m(JZY!Tg;;~DNfzvil zh`e^^+pSA9WlqM6$)I~?k4;c}XCe340}XV?4LlI64ydcksg9x!is$utb7f~mJ?l-} zZ(m<4V2pbZ#UgX-K=!Gb#t4|5Sz0J*J zsds$|axZq*>m%IG&n!sJqZuX8(B$${R3jFl6!)LAzHiE}IWOt@aK3paqxh)yjB#Sc zPO;|D6eh&Uq4%3Z_< z)_bF_$o2u^@*#U7$@#gTrdS!p0(*156;QWyJkT{N|%KQvoW!>ZIbs; ztwgNu2n88v*6y@U78ei~5^Ji`MG=Uyi*-O$`SkH)0Sjh(*y1-vJI;8QX&g``i|Yj>IN=Aa2nqbJv=sihyY5q2d~74~q@EvxOv zGfSGNMOsxm{=I0-U7OaNNOGNu*{&qza%0SjgEb%W&aoLE5{f0e?d~SOdyXe@GKS-M zx1u4YLHow1+Z1|Q^Gu{s3qY{)Iyo(OYmjYHZNJFvNkS59uG+hcb8qLt9v6~Ez`gcb z)M@WlpGj7mf_gE>5Z61G1O~{?Se^HfIuRm_I(f7=f%c8vsF1kUzxhSDRW;W!(m);* zxpUBQu}jTxLLwokY$$8&p&6HLL*YC%?W$RGu~R#1xKXtjT4ul(BtQ>5+}dCLw%NY% zIWVyIMD!zK`Hu#}{rGjMCU)9dh%-+oh`bZr&j*)8`Pw`} z-!)tk0(Idipu2gX%cqIdqC7ogKcFms%)!wVF6FCpHMd^k7%v>-L|&L*0|CK`FH=AX zB<2Ye1-!kaR6Gffy?AZJjpxzQvQR2BBiAHv!r1DagLg-AKb@ImD;&wK25u=uhOb2ny7h{s=8bn#W3+6mcV z3+O4tJDi!UJ_r{d-t56VrR-?Fu_4KkUj%-<6{!tf=W*7;?;o`z++3WaJlyh_28 z0w@KMv{61mybl2l5YM7R#SI&OoZz*$%J%kGaqGA3MGLCCe3(8#k04y+%NC$gmhr@v zsPox9$T&#MM5atXU+unl_4@x|>#F0L{Jy`Gh$y0hfTRj4E#09gAl+R`#~9rs6+}|H zMu>DwYUBu!?i?^uN^0cj_&t8=YyAG(OCGoT++fg$_TN5 zcM9}O-gLe3vetb?gP%PW=P&1J!qPbF+$#D1RTJ28@87>ayS!{Ipebf(NX-(1Czj8m z$T&Yz5=R?zJ~=A%~3Cpmkm`hda-c| zM+-J)2>_FmZtM@Iri^FD) z$Ljf?uD-7vYMZWeFEBtH%s@Q6ZWY?1vPl(E1+zHAhp-L2I*^+Z(xGz`4ZXSUwc>9a;@;zc5dY#)+U+nt7nMlhXy zv1ZZnA)f-boC|2}w9tfKwRfyhA)1xUO3%x2(kN&sxFbZ4DmSd!6&n;Swd-zqc> z-ZZ48O=p)2nkQ~fS}bt{zcMoNE$Q5OtUadEBtB|B%;_;>B8tAbS(o8|9EQunfi@OlCUzmv;w$HoG7kwb-bR%X`uX8chccG3x z`zsU>pT0Spf^=U-%u4_1#j2TzNk~i>?OAYw!-JoGxbNp77eqwcq$HH6c+yx51nfA?>69lY_y&*tTntouND~#r`YIeCnT>LrXC;x3pZOh#% z6SmD~Z@s!h98Rm<6_(P|@AG?~zA?S_bXDa2dl^C!S;^gLpNk=e+OX?&2!!2IHwCp* zoN1cZX+4qu!G_NxG!-|H9gH1G?yQz&+_=uvrCA!t;6|rCwPcohSEuzARVAc$G_rJ; zdZKcm$ykhZ?>Yg&K;pQ{{_&#b%(JEfAw!L)b_Cv(tXii0l^R)JB%Zy`co{7zsEg8i z6me^hcj7~4TfbaSv#l+VpKkh4kT}VyxL-K#$Z^=~cf7st4e3r^T?Q(Jg6Wf`rn_sS z9oQUlGBT1tb(Li;Iy%~Z;k)v%vZK8$S45skhZ6KUc>HiR`s>%{klmnDz9?ncO^BnT z>ribx&l%qXzwLXj*9R9DD2HJ|)sAFF>utuIg4d8gYJPSESgx3hgCFo4@Sywm509R_ zUa$zI!Gz0(LIXbiD0lcJlNoItFI^x1+em*-kIu#sN3x7a1P#hibrDc&V6E*ecCI)w zD+_;Bc{Z_c!f;#H|Lvgnk@Nk0O;~;>gW=P*eGrDzF!G8AcKXJE6aMy!cl#Fyg@L!`0PQbK8bRXuSmRxP_EX5D4@Jt^Vn^6o?d`|E|=gMn&Qe0^TMrT#dh zy^nZhPM2ZbJ{vY`qgh;c*mT~X(2$2;zP>uQ$><~QeZ zYWf{&$)HX*CVWx8US_`Ovzp+HK_iC4Zf@q%1;so!1n6};553Q8Y)yp?3=HzS_n$(u zY-^udSlH|Ddo6`B3hqw0AU3QCsu~Ultvzh*=Or(VONO&&VG440(1QyJCH5u9)f-|f z2=Lr$D~_jp=}psKa0gvPNQgx9Wy}Vs)$~Uctf!G4nU8z_LJU2=Y-qMMVLJ1IDCLJ8 zE#U!|iCweFfIspCcCuIZG_~`6*`^H^4V`Wt+7maH}nDpz)9lZ)em;~L>H z5^>_2fQE6ol$I8My|QUDEo9*-^{MAsMZD2@^!i**n#VQu0*&5iZx#RA51k}F7tM-$ zUPHHhX#reKO$t0_&E@SwhOe$0(}auEaM3^`W&sY; zybsz8H1=+6n7NK``kV&mq>_iP_$Yosf$QI2T^zFYh&-q>oDn@dMqL1qRSo4d6PU-U2kyB!U@1VoL!fxyp#UG9>KYQ?E?q0L`jV z$GlDfLk-6g%B)t?c|cq>ch=j|YySwjDjDJip*pG)vT`Vfob0#mve)Hbct&oRcy_$@ zIqqniU0KO<1x@DqrJm@PRx!|>wb4ei>YFV=xLl&reWq$EwtL?VXqb+MVZ46q^V#>< z03$Z32249Ai0$G+g{iix^Wt*tN4~Znw--A09}x-J3~6}qA4?NSh|QVfPzwk3%k&6M zW<$uN8*4^J20J+$N=-b7$lb^QeuRkH!08A8BVVA>*+$18qFcGk*@5-0V|HLpF%vyZuKl>lxFghh zARlMKc|8!H)>{w1-?Xf9#zVb_fco9To{5j@$qM9lZNyXpUc=e=%LbiCkQ0o#RXD~~ z3HHhnGww-6TQ4Tlhh@9>WOm>C2ZAv&nS-jrRjMAZdiOKQ&4c&(x4uh8yVth) zTvS|5EqoCm$vW`)CA0AEq--SJ`%GTj^^;t^>W`vQ9N(uliLTWy+X|odpT+6ZZ?R>K zuMLAQC%T>jFg&eM(0Fsggp4+k-;KRgxTwwSyH z;DZK8m0QEk=-7#3jX(Z%T-n@uOnf^&-S#WuV{N?D?rzA3fn24B^X~4YmNx5gf399e zXGSFY}r;gT`XJ@Oe0ZM!B^-EsY!x;T(sIeF-5Z|l12TzllMVbClk)n*~Yh;NIc zkJjWYW>_1Vq$k!Y)Z)-*ny8ypPwNtR4~rRd8NTKtwMNa_7u=T>DnETYF@8emc3O`b z4=o0W?5_~9ty&zq#2=uAh=DNcx%BpHX^q_%;IS$KSOW((3SOwb`<86*M4H#f$%&i3 z`OGXiRJB*}IO-@3T>kR1lih$(P@3)$m781D13J3KJPBzA>_k~T+f%pm>YR1-gYoI8 zZCjY>K18?vHG^ct5qXGup6g!-ipnT)kC_*?S-T6>KhE%WFm|tAgJbX7>3-hq(O+Kr z$MpS|*X1PM+TC@odK)7SzpmHSnqkHEO*c>AcHP;l)4l{Qu;0`WdN_kRjz#yC>lFC5 z_vh|BkZS;o)?+LO&rMZHeKHoUCqsVL1TwOD4nT^Q#>_VV)D6Ygu}FfFz` z>U#fho<%)>LEhCAR#;W7YA%Yuv|(Djm*#U!b3^PHH~U;1p4>3=6U{A_O9EgeIf)@%>q0wYe1y0Ql`2Pk6Z8Blsy!jztuFAQ!q97DH|CjUqZ{($#jfraq z*SZ2_AN`6F`ro3pOQ%bJXbk0@^Y|rC<%>;($9c^_^Rc6KkM^RHKl4wE{MW}u20XW+ z3fX!P75C2@;IF^U3i|mYS?92S`^KMBIX~Cx#EA%jW3qWxnCg#j0=C@GPyRh@J@&>~ z4CbNUkLCM+ANciO1%6x*hyr%){`e}t!dn35qb7%0v(Rvt^p78>W4|(H0GlxAyK8K+ zH4!=c;EyL77jcVUz@{dz-WOnKS?u-2$^PHO{xxo(CNEyBxmbhIsdW+Y1W_1Gf2m99 z`+q<&cK5Ju@bP_pL|@bY?oY%}J3F=mf(cnf!E+hLb?e*jO9f=j2(P%g)y%6nvDnC# zR5$huJpX-as@~!)2&(@W3r}Y2th3}ZJ;gt!uRQ=8jyF0vLcPA@D*8=@hKe=l`R@-M zsf!n@hFNQr`E58C6&i0%uzX$qV`8y1Z$37HBpQk%*cRsB0`T#aTDM?|vEm(3hm_wQ zwpGUJsES)ttyYL#Q?ItIu!6%zIzt`Hiacfse}4yHN_V2fCn~(LNDJ%zf&2K};$lXS z>%Az7G4~b7H?80H=zla;G$WdWA8<7mZ^ zKp|%-04)r5eb@Hu-Yu0E_jdv^p@KjxpY!ql_TsTR|1JBcv}JE#VyU1Jn%Iy#5>5Vi zMQra%K}zch*aGxML?$TFc-kuqeN6qVej8MGDQ`&pu^>|7L7DQ5Ba*>(^UCy8B7Dpo zZlKXw$6qF|kpY*U+*La^IZBK`D;bra83X_kv}tH=zm6G%J1vJj2EcWW`@9BB z&;fmnvsTzU+Hn_bp?&4slWsA)AC|3fv}R@i=xOKn@5jEl!JQ|?vZkS}jsPT65q#?Y z&`rd2)rs3`_!23=Svy|=flj|PIS@R0D(5}f8M5&{Y4+5?OSqW+;oN&Bg0{GNaV$pp z*+l|AT3V7Vxnz8{Gm)yFTrM3ufpogyi`b`eo8QBAiXxS|rz^=i@{n*w^qTd!-f?8Z z!h*?}$c%ohcAPISC7#|(akgXUCpyLL zr)m(F)AO$hlxM#CFk)$$>_Mh-h8%%0D%pGT^Q+rHco*ckN#Xyx#lPsdKqFIB5^=(N zdCI=l!1iRqYM#og1c*tm)n42@J!-?{29I*%N2F|LsIa}b$HOZ+f4%yxzMubF$Sln) z*p>S4Ecf60Z$Si$Ku5N5+<>douM02Yw1u8w&TZj^I?d75Q$(GzjH!NCMK~x9J`f)i z6vPBeF-LFk1hz;$`cc@CQc6!-^hX|2wWHx=O$siFD?Q(C-H8|!- zMTsUMr`ETt{wOmj(LKQ0t*F|b+*dw+5|?<=HDG8idbCHlK3zt3e(vpdm~qlG-(J=S z@KC=GqOH3Ds4{e_8p~A^`>Dl(pvkN}_io}L5QTw}PH1f5fPjS|vkGDM`p8C~_njK9 z>^k)9L=k@nR)6o-Cj|6)M&$?_>%2%4c1J-aypK49q@0+@{bA)LIBtt6G$&`-`NRb2 zUy-ADU)eNLll9gcm3nUqnunPi^Xhg!M;*pvuG{yY4Ob)CHK=$(bY{3y=AKsh$r84| zXuvJ*iEwz<${8;zK=dQ8@QZEh$uv?W@TO8mtU#s1@nC&v4Zc9MJO}UrwU)1N=|6PS z7pBJr=W;A(WpfpSIqe{}D^^tJ-|$J47H=|(@KL=$ao3_rV0sEK4%grEbGZ^ctAR^& zU?KK+Z*kA;u0BS`gdZO&pEa^Y#k1c{e49nA0Tjf^~=8?;RuI6<>}D^IS` za9#rvU87m}e4q*cAR6~)K-EKvR_?+)ZdwW+U*DG^V!a}<580Y)Q_ggGzzrU!p$$7D z>0s(=vKTr~40e^Q4{~1POTX}~Rf0Wr40XRSe*WSGMRMc7HVY-c+kHnp^K7+4QVh;y z7PV)ghpez8(MA1{=&Cmc%PPW?%+r7-c%fZZ1Jxd)7CUvzbq_bH7b^8^jH2uKojht* zvxw8mhx1kmegqu@lMYNsbWSmb+9k(SNYnj(>bK6nG3S46pU4ATAXtPE>d6L!3B+f* zg-0Zbb&omu2%@?;%F15kUOGw$v!2T7U!)qAkeh#dy=~hCA4><+KK5we z&@3{)+Nt;9Fl!bxCu#=iX*KTq8yXnu#_dmPxoix)RZNihy&~Z!{DAK1sx>kRS^PAN zGB3<|39E}!inWasX5O0=k}6W0X)!>@ooh%|X4cnY+)V4j%@)+PHkucOk)@58UQY8_;n_ov;22L+W*i83?x)ZM*sw$B4X@j_=C6M+T zM2e@Y@4Kvod$}2BAPzfXS5C}nWF|)`urOBIE`(`iSMKRgH03zu8fcWuJEkO7;%05i zB!ef%`g__aV^iG^YZ_gK!x39W8p>deTrchC8|OF9ovrAWW^i&3zv8r_ks>mQ+ZWT+ zA!USd&9x>3!^c~!ha-jW$C}&hY)&_8A|%qhBLZ*NH?HKB-JC4p3HRFN5`K@nYJ)Zw zJM)_tlm9}h-doZw;+ps5_#bxLN{^UdiX$1aV`jihn@xJH(+KJslgUu6Nk>5#n%)WGBZ?DLI8;ruAV@4 z&9~*0V4+x6FppZW?6hVXTdJz|c=S0cWSNquLZ^?cGTYb77Is4|X9~~9I+dgE{U09h zX=7qzMT%5-%=I)8bJ6#B`18J3iDmn>mm*Om#$@5tVjnDJ#}9y-mD3V@-3ySwfX+=e zfWcEpAOpBpB1&_T$Tq^dSYw(z|EMrxq`>?}R|x~<>2@1Ut7>1}yGLo>SQi^8u(tV$ z2~csc7)v+MnLS?Z1UT$hY4Kh1oFxIYNC|GSsrKS~QXt>Vfe_?s<2vS|fql~BO`U*D z9!#4{tBucM>d(kc(bP@=OOT69xSFFd8Jo%YjJ$}Va#sq-FKn&AXy-L4{e>!iAYr~Z zB$SC3eUsc5hZd5@mFp^ME23CsBAb@PNf>MBCI{B6GdHK!iu0`~XI^bGu|yRm~=;lYR5O@igz{5UT{6UIt62h%iZN)6>Vfq7PI$ z^<+{{G+?2Pk{A}0fJfAag3Pn3A1T& z`Ia|s>TF)r@5z`#b0~9H00)%5msEyIQy$6rL|V$|$JTZC4M{vc)w|ICh|@ce-Z?pUp6u!WkpBNqomQW(x#Go%hfYM;vAkw#V;PljsL)Fw!4D;2__`^^H zj_qa;{&32u$^K;(u%sT)WV0}$QWC`puJ9dF);8xk%2ry!sDexN2o4$tA z%lfqkO^}1>Fdzr#JOwAP@)q>*@hMn*>vc6xCBRl%NxLOHX~WB_m!?nICp?bt{EYHV zkDf1e1mYSj(kO<;LC7Cf`3$Sl`hc;jAoP2eJ+d>R%TXJ!#4CG9iXk$j&GUfmv~OEv z^UCP+d+)|RtD8PMcs2mlR-RFG_L6xEhXL_O8g!oS^J$%(1cT zg8!Ao`6mkyS&8>auc~_da%|69>2Wnx7ZrbeiOI;e6j&=n8UsD7?VXy-36Flyyh1cH zz9D;Z^lCTpNudzrs;gR&?TGnP(yx0ed_k$A zo7=MusE@F6eNh&}Q;QTvu*~_dKJ-%wIQ}k1@R0Tb!=7^ND7bp@q<1h&F;D3$wV0_p zH7r$@ajTo#)p_@+^g*~_h!DEn9#{C_aW9)rF*cIbi7yI^8Ybh@rTp?FPlLI8j=Iw_57Yo)GIUrd)~+9VX!GNU*FaM_Q_ouI3FCy_NcBZ z{i&~Hq24z}C@yMFGP-mMpbA8NM@?ti3maeCd2C!WerdKYGwAbzRrS`LjI4F)2`gMaR4-vY}OFhaK9&5f4}eku*RK_jTKIlHg~6h z(wDPFxquyO(CTyr;r{w~NOMrc_XlK5YFBRFM9PcL%i3*Qp}`dhI{k7@s`vbob#z6Mk*WF@2DePwVOgcNs83$#ck= zn$+g8n0536$4s~3*@mlFIw)B~qv>ePg`2g#dt0t{B?qrg7(^!ErTzzizz&>4nmJ6Xnv&Rw!+(|;f#*pHX0dbq^;|G0U_6Xl7X0>)caJRTJ388tXqWIMY1;;JGI}SUNBV^L{=i zw!63g$UE6zy~uNZZ+M)4zj^c6z1zpK$#Pu0)4wf^|N2FZB?ab165q40t)MZ?9%W=> zHHT{jTJB602qfN3oY87jtOSfu+qTsY^d`qvZz_;58Q!rLoGw1VTx0UT8Zm9{1j3NJ z?(xH?FRt<4aK9!*>+_FMl|#w)S8d|&rK@_0<(RHjnhwgDsqR2SC-lQD zd-r)GI`W8Yc<&;-uYVjq9naLMcpGuM>9E_DJ#kdbWh40Bi1oc^u?(~gp7=zPlHUeu zFdU^XDD_l^SY!7v6%?d~zuyplxFEl}M}I?Mn`D!%<^KnTz127FeiexEp9SAyV0mhc zLMDp9Z(ixkC8->MnHWe(8k8onqqNL7w}2LB7|w8Na}!8XV&9St=Xo* zlwGz90|^HcMg0}NRV>Wk7fpGj;Fosx%BKwdr}2b^jVRSBr+NV# zIZ05>c;kM;K3rbV=Vt1QkX)-pOVisMpa)%7@9Yma+6w9PE&k`D0aAhobjbSz`NI_h zCP}H2R}8wgRYzQVpOfzKBvp1A)PES9qx_;c|KY{%UfmEW_F(of$8lYHu~=_QTZUW4 z7eOHpquABQYny3#8=&Q?xO&ytOl84SC%J1La%rK(i%hfgaOyA#^AqFu`DQ%s$JpiI z5%R2O5~XKuQVMS#Jnrw?q3Q56tut&jcDZri0OA4}UViicvY*^;!w7aI##h zp0P2^DJz&#@4Z|U28F0;l${Eo0C&E!p6ycEwZ0vy0Qg7ej-BDJ^u`0%MJ5QJpmdjV z9i>o$I<|Yp-2tGw-fm+v>}k$T7s;Y@re?O(pR<+K>~vVhnJ@b%#v3u`XZYIy71eD2 zT=Vy_3=ta00+z|XP9uNuwguG;d9-j+SxMMNihH4ExA)elJ~WfteJ`pSL6|+|lsLWt zYBK@?yQ6(a%h;mM+^9u?@yU@RH73Kmj(3Wl^|65*=zXEl%WcL#xrBdH@sT3f?o4h_ zksLSc{ncX5_hn2tC!-{thlL6D(2|>#|3+BA>M<^{nGnpD*P1_VcnjqMI`TzvT9Tv6nF`#6A>)|LAD zw;b!!wH!W8_Yoo8>Ii^^pletwDrtiVJY&smLD7ceE#|t z5GIr*_xR0sry!q_rUT>@q0@_i{M?J?Kn%xR{ER(vR_HUJ`Kp$$Hn4*3HhvP(vqI!x z(JVjr%FXuZwc1q{fAk{r$In6dylUO1(3w?gpPVKfyuO6UP5P2ZtTv z5*G}{H+Soo0n?G;c4NJEoE;m_Xg^Pbob%9BZPFlQ^}K`ur3PQw_>WHjs^h)7A|W7W z0Nvd*(I$ZyEQGPlKj&#z0c|2`-m%7nWE-i zz8v5F^obq;#T`N*5L}awD*59ffwn{iIMiZ zWGA*6(Ij)7ERFK2JgjrED-ouwLQj{N#^Dz`b|tm_z|Q__7yo<&ELdlR!j!lGS6<-9fwpJ*K* z+$HZeb}Sc(N0B`NO5%3<^)@e0DDD3Uw11o)O4uxvy%9g%se$oCKEhQ|QHe}RDQvsX z(46H|#Z{y+)hex)RSFrI>yL(P;Fsz=gd5T@E&qg%W-0`Gxh*!koLdZ$tgUqHEAE7A7uw>xnsEa#>M!Q-_f17l!Pm4|AI&=N`|~f_Szjd| zA8>F1N<_!(mA%9Jhf5`kqX~K|Rg6r=kTx{LD9=vQ1Ie%P$2W?je^gLA4(Qgq1)jfX zGjo6e@UonTf(fgA1|=!Oc>NW@}1|j?RZ#`!o-96@8)q8LgieJ)NUI zrTkKI+_mp1whnT}#nu9FcR2x(xI+Ha4IX)oy$;deckqw77k9a`AiZ_0q82Jg9`u=O zxv2M5%LMDOR0bA8=pNAaEvsQ$u9HS)us&I97`8oe!wibzk?64^b#$`0`9WFG*ZbbL zs1bWt^!N=$#T)Mo(;H~v=u@N>#J1rIiqZ7ukemt-zw1tMzdJ%@%tc> zmi?)dB8@aPik1L1yP=_G93c1BsCe7_`#R8=;Z+DnW%!p14cBX`U8++E>$J#)$HFiA zIrP5>eN!O`PrD{Ha3AaYWU+u3Va^6SMVAVj;Jte{)tTcZx*lSjs>M2t*fg{0;kkuI z099DIg$fza2N-C>&VYr2+q~PcItz90x=EY%Zlx@qj=$VvEOjO3bT&?058VL{M z=uks~Nm^kCY*X2I@q%m&P@fIH((!zz3dg)xzn_g-mv3OcpL*gb2QFw%OAB5$ za9n<%R3zgLQ6TM%`{Hl9Ryf)f(!$J}E;(}baaJn}=zOrkLMum*{xgercUT&{vicO74RC^1MprOP;z=@A=B+>Cd zCXPZhK#-ycgHnvAt93}DxKAyrvnd>UZAg3N<;#v-I}BnlU{>rWJ8{<$?{t*?Jl5_N zCq?kEwsyHaD?~KT-o`Jg#3b9~a8ICX81sS}Vr)B=q^=}&mZi_NK6J)yt%k1-bb)XB zZ9~=Tqq|&opjF_AeL>VIjDm1PJ|8-AVC{N_INcl%;i&R)MWlK8zz?9~)6Ri<55^3J z#=O~K8r5~^_>2Fx&HpZZ;(n8N+7k_ZsZvZMuZp(jsvv>4+q)s~R=r<`zf|-q5d4cwVAL@xIuVbaq~`VN9FKRAr{dHO%$SU75(h zd!IYcqEk;3waEN*&w>Yk=Y2)8^Jnhoc(M;NKRWxCK?+*OT(=(cf>8xHFsPc{KC;0q zGh{V0@<$^uBsyxaGufOQ9>$c8Dt_@`xImwDH@>iCTXim1rGy2ZpYEQh(t;WLlu`lk zmf>XVk;y7~G{@;***X~Uo0nOXHLMJ9lOdk4P-aT7jd@BYCS@Gs9Mz%U;KIYbp{qN? z{{*~!mzrgBI*)-DG!=k2AGK)=-ENR3>FZeU!Ic&lcEour*~Y@%~Dn}rUl#RF`Txyzb^ z1|9Ns$C#1W9ct}*GL*MD+!gxDQ{H&fv)W!xbUF!p=jheXk>KC1dm&KV>=t(D_M-H- z-MkSzBDOQW={--f^CcbZ9+gxSl|}3Z!z`or(7E?pXUPg&n}b|aNoHL^lEvY)w5z_d zbeO8ns#y5uEJqBxu8KL8>}++?s)T==WV8)F0iEnar|s7-FgK)aZSkDVVBO6u^O5N_ z+%sR^vNTy6`?z;o*pLoy7pO56v}$OX8^~r?a1&^x)e;lrT8(ms`!lH?N$PamYMIR_ z9W`gwB4E5{P#~El=Q?i@I;iZ+^unM)fd_)Vbr_%S3P>J?UW{YewGgjoKU6ioP*;NQA;T)`Su!oC|w=A@l!v%@7k62gJ(yn*0#aH!AtSu zJCpn5oR=wN&63q(ud1kLES#XHFNpGzwF~Y&X;hr4)4oryHPz^j#di!<$Nmsr&xNY( z{fx*iIY0=PEw^p#*86%Xgf`TP>4g8F$@?d;`r9u6{0Q?CYBW$#b&|V&j+tr9V*`>$ ziqNNJt51Y1ZfJ4RB-OT3p^lNi7OW3uy@ zwkUM!5={9B0x9LOM+*3Cn%zm2;<{}txATXqPRC*ly4-A#{(~y1!uzl5(8cy=Nj0a3 zn?5~$!tpGNl$MU_51md%!<>zLVww6_$6G~e;Tvcze`1|k? z*rFs3J85WK+%%kXG%EW*XS31gCpWDpBhHz+C{$LxX0Ef|EM&et)$TgFSC22`2%YOba4=r?a+1fI7nGM| z=cAL&Vy<3_wSoM}2PLj>MLMcL;WcKbU-e@L$D+qbqTKpkW|_bf4+4|Uw9|LDvr28w z-~2G(QkHI-)!oNJ90g(?ALT^4;Pa$8Ny=j*^Q>sh7%f@l zWrBo;IJtNoeMFfer?Mc9dP)@2Kd#811$_uQ&9hr_-Ls>kqMh~w*O4{u5~qUhcWw=P zxkpvlaCeY&yr*USS{7N!hprI;rHW+wxW^nd@a0z*D5eR(aFDUg6Mar`*DMl~J?BUD zwW?hTQY$AWBdVk&fl?xfReQ75qa%>7at|I$S9vPk{!>wVb^;*AQjnJZJju=Iw|;o& zM%@@U>!88CGL&$q{ktODr&1=C^NBn09;`tM^P}69JvfhvEt`6lnUF1~X-P zTx1w~cv~5h1N|8U{pYn8@7PG$)|hgAS6}fM!n7BXMVlA+g02WwSiaAEq+oo| zfbaZuO3HNKWv%~czGP znP7nR#Fz`tB_gf$7*!bf?`g%l1!q3q@LQWmVeu~ zM_AuN@o>jhPAKCWv!Y-|Ty> zJ^_jDERAcdP~Op7x|3FI^wwoxX_1;Cdis>6WBWdPORma_uKGhnME!^KY7g+I4mX!v zBa9)}os3|?O&3u1U}v+zi>;B@bPc4;6@cH(i#uDu$o^*7qAnuap*x z$I!jVpH6uIKb%$1x3<~L6f$fP#lh+$=?+F+sw{zSWa1WOv5zC+9aKm@9i~Y*`+S8S zS9@6U&Ka-xRF%6nwU5ze@9L8F+GgR?RnLOz4xY}Pk>rwT&-l*CVheTsj_HG01yIsB zqBl}Bi+w&RTOo|er6E2!qG!37!N{|T_BJIxyYtx{Dw0{9M_&eh&)qb#KBDupsTLLS z*^bI5zLUfG875E5iY(jb{7m@uD?_fcWwc3G=F!m$^^djB63asu)(4|#!%WUu6K@M5 z9xnEpBrJ7*gL)FpPPSZuVwfpvR3;|iFF$LQQeG`^fb3ri-C$tW^=>ciIgP_O*zm>r zy<*QC(*g_eW*SOGI7~CHCM@j&N<#+)O*T>|$eELr0W!;I7CRIn8e*5*p&L8n z|6jO{=I*ITAT4LsHS4thQ1VRU&gX+`CSZj}+dn*;sj^aw=I6jTP&UM72q);?C)trz~~? zl1z%F`}LQ0qiOq1YBb zExPX-fpnyH>8HhSlGtNA@j!`v?-i~)h&|Fl_IW;e$LW|2iJe9xuN~`2hm*=vKO~cm z0E(>g&v@FT(wDwe@r~oeoY!F z5J>lHb7n6pvH^*5kax`Tpo!2CSLb`m2mu}i^N9HZTWk=r^g~&)qtI2oM|5dNB+gtx zh-(*Xyi0#V=>gDuJ0@SRvJ+$N(SgfGUDx|cl_va`^B#b6J2X8=9JV28kHBsXyW3h_ za6$ERF5;ia%Uz*y-(y6X7%g@1O;xpA%Z*eivn~v|Gv~hL_rC>G$qd#v*yz5_sR`#nFSF zt1=(hq=COp-`g{|Ju3$OLKEMGhfRNPk?%sW3NbZ4HNLqBwms;n`$3a0jK?ioe-c)| z>@xkkwhOU3?%uijrm+MwE=(f&)i3HwKQw`qwP$TzPn4^t%CG;fra`*pU?{tlWO)5| z#hQ;9jrxN5Qq2V!9ly!xl*l)tAfR`%&g~tg#+0{_A-^ii5bNU#3t4(j4@t(ar9*%F zzgOt!Zryidz16k|kSu6oW8>&=YX2wf@sCIj9TUNKk%H;kX+~GH>B>*Wjhd|c7Od*C z4{FX+gdN#D^jV93Xn6hePCq`q+s5{Qtxi_f7#1!gicWar{t#uNTfK@)Xds(1TX|^T zeeyNXl3{kz>~=p4gO+L?lbrIsSqUW@O&wm15s#0=ToH;Xj&Fv4U23k<9EC@3l* z=!`+$N{msB4z|!0JyfO><00mHu0pYWqLrsy@lklF+BwFGGVE8Wir4S8{b2}-U@n+fwWXxMpP#57oz8l1A^CzL&Dn<)`@Nmx*<8pW(uwgs#}gUWrTBwLEprHDtEx zH+pZn{kAp5>AY}LJXJ-K$_ioVt~tkt;oszqT2`+|iGkS!ymw+)3@gqv{E;~dX&=%8 z&+mzfiVmK=WmEa6bx&Z`N6(vk&8*wt@pzf(2djwK-O*5Keb=S+YU1Ut6b?k)z6z3f zP5U>ERbo->;@OJnEujbbP}2j=z9E4on?6jP)UOsJPIn(y7-u8{fpio?-Tz2kvXLN| zg9+F7%yOT9v~U=#T57YXQ|+;lL@#G&-n)Imkths;Czc5-O~5T4FWN>J0jjlSb;r-l z-PfkDIBmZ*6whKR#lmC02H#F}`X;b2leoLMx8kT$rDWh z7pJ${!7RFWLsvRGbY*@2<&syys7)lzRBgvaU__~-hR-QF+2Q+^a-xV&@Vc0tmTgjX zq3j)Y7HD_w=JSUP$KuiZUO_K|in9zazzhnL{DUx8*R`$XgqJEqpRU97GfStu&yJms zPSPw(2XPN!N!6csmwOngC%9vsELBk($?$dJshqB8R+E-hOz9Wg3-ENE=};k(lX0v9 z7x!}K@QS0n5ML+3&{I0s;`PDOm-?QpaO{i!PKUn^sgmc7q;;cf&i*6lu3o_dq}JS^`=p(* zUg>KSwHJ|7uxHgOP5VgYp7Bz%(xwGMK=Fw4c8aLiUILZqH}G=nsM8c>v29t?46|l& zCkiYKK1kztjyo0c&L`1JHXi%E~3VRE&xXe8m57W%p$oMV@T12*GYT_l|i_#+sFX4woDqXrvg-s(|9eB|G1^TPNyr z`swia_?_Wr@9Dn9`!uw({Mzr_H9AnjVz_*2dH)ubv$pBKY*7l%i|MAs!FiR9N{|ibYP!`RvCxN{Lcdc zG`%AG+QnX1lM394!*XKQz9Wet^90TEYeZJ^jP5ahTw9jM^!nO~(3*c7)Y;WQgy@Uz z?|X$tNjzZK70tIf86@auZJvBG=Sb zcR8weUvGs)MLcS^_Yt#7AM$mUXGX<*WcCNrPgFQd&ZFj zuG#{D^b0}~W^ES#(ue-(T=&}|wL`0lMBJV5=<}#+@WGO&D6Zc`oV};#w5+V4+7^2_ zbG8=(cpQb!7$%Py{1K;lYd)I~1gd78$uMD71ts^<$rldiUtZ)X!QViQCs2Oi1o7ih z>RM1TXQDtU)cp2cxy^};Ed5Q8Sf4YqCYYESb83TxKQz*twhj0647bj)eSP~1(xD~v zvSK7%eVO1`L9cz0=`I|qQl|5ww$8Fk;bhgO42<56FbE2_@TpO?w$!T3t~;wIFz7R& zcec`~ZcDZKRjBiIoOo`N^)e^s;Yc-w)94EG4g5(StzVxZb|b-_OqNVJUhL8|85)H~ zaY<=(#6QYed!BSI=wAAX_fk=2)=>6KQ02x1!jLWLX3tA`9lPtNG-CELM9I}DT*-80 zo_Ts1GrXONm=&L}WG2BJ=d7Kqlqr3fsmvWxd932LVC&ShPqN99*?mc1skeNE zy3OjF281&=&PTG1U`p^$DMCI?pPt-^Q8Nn%|D_!MpWh)y;i4((G>8v^u%@xcORk5l z{T7e7Ibov@awCdKIWD?^!ekT>8cGvzrImRqU%Y;Cwf$pOfysQ_hRP(1wViG}A87oZ zU};TFVzc{kHy)?)D7JgP@fKYv`a&UsY_W3SqCLvg+GH6G;Z=7#ud7~{w&;tQ6MZ;U z8Qx2CzDAA;9b^cRUf%D~mmgd_G()coJp5ebXuq}%ICGnTNrkIm%|#U9-2^tn>^F(# z9s!mIL<7DxG)NKBn#%>tNycnib*<@4@`gkPaF6-<19B zw8ftjT3A^=Dsp+A*0rKm48&?VeFl*!+FZ}~RwP8~d*4Fuzu*jBrW{r@kRomiA?pkO zLIipQY6y=~Sc(4bg7A%rF^bl!#gexJR?{T}!8>-+Wj$Aq=A)>Y@4Ip>@i6QEGDuhM)>x8QR_ zAlxPNCPq+|sVIH_^?<}#K}g|NP9Qon+VH@p0X5>zjpJ38xc7f^0epG8g&lA!yz&F= zKiLt%MpiQA{W|0&0QnUhP=syU#ysu(LexmVP`~`EVJdsW zuUa$nPC4N(!+qBH{3)myb}rrD5Z&?FF&6o!s`S&8HcWBojhXw_LsPirs99Sg@aybJ zO`q0Zl@z#h;kO6-1yWS&=dK4nU~7~8hd2aU1FZH8GGCXSg#SfN;ps}C_^;26f0&iO zz34yvqpJam#wr|N?fc`m!T$XxFGmiq{5pI8P!a#WAm()LS@w*XIJCJ z*2{hk7mm!ny?*{zamBxWRJWl1mcQUOGSYV6CBm+LbzTsbnl7Sc~upM%ao-yXX_fystSY!Q1lo>~Vcjo`` z31~4;HJeaEmiza*s%IBd;3}}p(ht}a56-BhXKw^bGyll|6hjjVeAxL_1^l-b^GX3za(S1chUmW!SS_&FLROO*R?eElzc03DFHWmNuitSZ`L~z; z@;50LV7<|zB&Emyd)4XIKY)4QotBxq_WKB(nPR_1ZeYM_eP5Q-pSkk;*T8cGjl9#; z)xVFy#S4BwwydrenE)2w#`+!W(;B_AZ0d>$4;-1bzg?ceU~XNpdb=M`?XjJkZ&am@ zNS5TuREdcm%F$MME6)S2f6S^D$4p3k`Qiu=5L2dbjZK}CiqHHxt$xwbXo*?4utVS4 zO9&z9&k-q6o*o+JaN6j+;o0-n+nWVaI#;r^U-OvgS!pxyQ1g*OlRMlc*8OSMgt^U3 zWtxi_2Y^!Q3e>DmZe z;g)-LjDW-V16$K}nR0s|*Tq1g2}mh|HJA)pWKyR$<&8JNj+J3#Zg021X~jLtPwl@X zuMH*7KgjOVOL*y|rMPZyQn zNACOfZ9;oy6E{1|M2i#a;A#kyCe|oEi?GId4wd@5Hz(s79YQCoVJg&f-L!*}Hw(%A zo?m@jW*Iz`Z=kIldH3qF+a{*Bik8N|0KgK%PD_MeD-pSIb|dtwrD%P<#OKn^FtIH6 zKBlv*w~6zI>WebXFZ=x~TB~DIgV`D?5v*!+o4t~^$QEtKsvXmZK55Eq%y(H;p*9)5 zKb9tJQwnExq%8qAc%(^Q)f7;aui`SD@-+hc}p$2cB1yc`K; z4T^f0GoToMcs_kd7b*eMx`tYPbt98n-i#vfGXc9+#)l{lefjS<2g*n9HdmjF?&di6 z{IUUn9W3^u*({2q6Iay0nC$zbhj5v8+jS3pa?E!A()H)(3oE|H3H{g}F^%b!IOqm9 zlSIfjcx*56J!`$luJh>wZR*idUXikt)C(NJ$v%$9GrlzDU6aTuuioqV{DE7};+))=ci-5rP|agGL0e6(sTpVCAn zbiUb-uy7x^EvAjmQ&lTd*#bnoJk>B!5q$pV8v4ZbLClAMJxZeCcGI=3s+Hx6yaC8} z$sW`CZ(mrP6$VlhT0=<@^CGZ!Q2PJ!Z0#0ODBb7R3*^?_VEt zTquVOU*-?5?Px90^6sYJSPeh##B#sSepA?2AI*o!7lcQa$BIfv(}~-KiaX-3?0L57 z*+{t8Lj$Tj3jND~)57&e-&%O6I|gLyEt`Y?I1|sPO|TDiJt|k@%i_M2U7OC z>)%UZIK7%@3nasTRNN$6yh0Ay= zWG`{Ny@?>qGTpK+W*g~(jblU^iTE5=*ROvjEp=T3?*Z#FL%#?tlv#rmcbW@S%L7uW zIvbQcd+lvn@8(F;JQ5}*>bk?zboh)sZzPXgJlT84z_Uj*{1EUzZNin2Kb;G*ynaSm z;xrmbAHD{VD@CaqKye;iA31WaF-PX~7%Htf-I$M znyxUnJD-w**QE@c^4!VSxt?q*en-@B(n#F%`7r>y$24!_Mxg5kgnj$7 zF87Ak!uK2C%`eXJJ^f7Njw`5I#y{zW?R#(5V3NwvjxcKK9=)OBr!pk3%z=9^O!l9ni3!s<(MrXeCoX zX(GIMk&>2d*+8H;FFiZ)>QJqT0z0mL6lhq?O)kUs?pXd6d+IRS;z2qKI)W^A-vWq-?$QU6M z#)R9BGp&wj&R}Z6aNvv>@0GAZBHClpLf_2I39#Scbp`Je~5#FG#pF;C0Q}JB;Q=5FIl#^oz-HF2w;L^RDq5)o@-Vtuc@NNL1z0$0jmvE0t*DEd|2Pr(EgX zViN_MHzKdGGOSpM+E#R!DlX7p>YPb!*(hL@+s)z7UlDQ6T93G%rT#F2PwcIYf(K={ z`t&Tse<^8OtoLLhTFq&0=IfKZ0Eek3FPCHd3ueg(cy*;f8MX?l7zNNhQMoFc?5{7+ zlPZ^*cP!fi3jw9Aps%0*So0dIs&!NR5?+VQ2{b<+V_F&e-o+d~UTy<@;ROi6ooZ1` zrPYs}#NG+f-Xk}9XQGdrq6=Qp#w2Htx~tsJ=h`)CT-0K?p|6rTN;Oh)DquwAR{gO3 z6gB_WDS2)jVMD4+z&OgqFtr?vfe5$?kZ3gg!IT(Yg7fE64dA5iQ+X7@V30**8zlPexis2G$e zFObiGw%vasD}fLE23Qvl!LQrQH> zkYd!EIu4LZzy{6o~?FZ)qQLW#IlQ^0Q_?3blEcVw=3B6P$D~VndDawCB*(jFkt=)A+8lM$u-`ow_NwHj z_pr|BKEotTsub-Czd}gx>&v{i#Ejxl`|EgjLMH&9Yw4bzDPh98UWzcyp2iRa=ORp z+LM>)AN5|@idHZCLoGTPi{dmxUX@<8T$FF-PB z)xn_$-g^93YHl@NsD-pP&VO{xraF+2IqQ4B1~Tk|-><9H^{d50q7J2>O%va|k!` zMz%(BWqK3}4~tIhZyzhOs>*YrlfrAINS*7Cd^e?B^6cw!!hk6G_u)K!3qTQq4+SBN zj_!YLBcc>=JLwTd6M=$4s^RkPxOybDfbWMi>F0?&#+dJVrfT9f4(P^53C< zGAz#sfjvxNL(s_Dp6{$mZdhfAFl}Pp)6NR-R*LBOK!#gR7!qZx4EcuCYF714mByi~ z>?_YLl`S;kIZ(%N>)f?g*0OKPCroJvM>Wtgr(P@N@;C%k4*|E3!0(wgRXlk^TLm;Rf`}?l)=uCNq>MX|5wT z%Wa1{1(Q>d(6Q1?lWgf(Kvf?rpGWX+`Jq4Zn#uYPi~8>DZDQuftdege%IrUVAM&Dq zXd1|j1*cUW46L$88S+_nTWkA3)(@qXS0`(rA50Y7ARbOoSHQl4Hj9e4?rlL{bWM;tT5P^Em^^Q=86k3{IiCyH*^;b- zkGkgx_N_!#JI*MMeEyoz_EIFA)5psujIHUqdg8Y+JO7b5pTiDcwlVi|7?CS_BMMsV zkrV5GkZ$q5XA=1qI$f6?>u=OGJLc4WIRaVV|B82D?6zk%iI-;{M)d8(OXA|ZI7m7J z09XS@Ms1!8kk!DoRBZ>=JvqjCwVRrjbVNl> zLM%C)76y0plGpsEbeUWu;7PwNd2v201;72{P-llhH0B@>AOl{kf|M|tk?g%wp(+Z=rPuz@q zdD<3=hVuf|`AlVr?m3Bh{WkRK#x-^XJxX)&f*erlALJY;sxWtv`%+#rtrgDZpo8kB zrG#|%xsuEbJ%f${My=uv#c*b&;xI%K z+sJetF<6F!IuJhK7ogW>P?TP{rnh>t8hNx@aRg)>NQT;81Iy8?Vgnt2`W&RXDb|IG zD!{SC34+fHzPi+v6|J5y?`%&wcIBj>bENHAF%Xzu;d)-MozPstjV?&C&t`ZbwR_R} zTUs%3;danCRpd)4YXCa>H(nJWXYZuse05&v#!}Nxm&8{6$JV5HCv}NmLGUm4v7aXi zMSWuo#l-KplivhEoV-_WlDOM{ERtsLOJceiyWXqPu%DLL=v@k7A+W$m(3$1(FJCDt zPVtF?UVr3o*3EBs|G%)oGbiimR|Z?4^&y7I7Ycsmzx*2}^epqm+7WoWz^H1~_14l^ zJdDDg0MJuOs>~c2ev@T^q6AMbfhmhaMCt$J`t?Q6>Rud(-}74@J)UUZKJ(00WHJR~llJbXS;ar*8B zh0U{lxtMIh@29q_mh-7;_H8$1a>Vwn6BmpAbFi<*UHuDFEih7m>A4fvhpYgLH^R$ z{sF!+I1z1u1sZF3hLh)%BHDBKF?JM2pvR!snxi2^MQ6bcSq;DHq@JD2#-{ZyW5k7n z8OqYrl*^6h=ZnM%M?9p@ofBq`GJUz| z0WGKbb@?*9A!SznD1|V+s7$*`R}MD~`A*cr%|jMD_|koy_{_aa7mcgk=97X+fObqR zUYM%B^TW&J$BHLi(4{j&cTqO$C$limGhn%0OcHYz4*bJ!o$}(<`kngkY!+_2Po0^6 zoqE9gy4tjwERpq1urqt~<*HW2G>oNb6+y5W3zX zj|lh&2|Xz>OOyO=pq}u6-4lPlm%?>(LCw?0n=I66cl~Ot2qeS~RcQibbh}CyF!$#_ zTSMUw9B%RC{J<}H7n$a@&NjyFzF!3nsnS5)lkqTywLXSd*AwEO%``b9JI&~Qlk0Hs& z+CJ1`IzES3%o7~lPS2WeQ1p@@uJf4if=NKF3$|4JB#I-|)%v+^W7kW#hg+GIL(aAv zA(g0IhRf=H{t#r8bF^l)6cqonwa?x*8#SP#2wtna-WBngk>$KP&G&PEdojgJX~TLA zigm^-Y?R!{U1D?@@)5)ONEmJj-S08|UdE_q5M`Vjugl8ySt6O?i`TY3s{N7Gm zSgFN?x>6WpjSFr-eq#agJ-5)=_C(PB-EA=!oq=o(Ca!p7gw|KmiIs?~o@iZ&kYea6 zYR>nILdQ;`=UfDSDiUzVw=eIh%r%X@pPS1W3>S2kw;9e)y3YNv7iQf1x~WYg3Pw|< zjI$)mkS%#RaPppB&Qs_obM=QEhSsHm%CGY6F;U4JBZ16 zo?5@*qA(jK@U|cu7S5(|PxoF_R9I6erJC9CaJIK`+mkcCK878V}CUL&3Z*`t;*)@`LTDQVW$XpvqdNcL28*P;<=rgvtf&-8I>?&>brS zUzwsU`0gUG4j5GPHTD`EtsUAK*8M35C)VDY`2Jl^13r}|a>=l(G8fQoV0_^|id?c| zf1AeQ$LFzdQP{nMdKrazSIkb;QC zWW2l(#`#mSwA%S8(z_?#@irXH+bOo2EJt56+nIk`W6YQhML>r@Y3t;@m-S-*dpiikR9YF2ZE0i z`=$;bY?1fVwZ`&WeE6bpIG?P$TwKTb5lV_eUyF;vJ{Wj_^O)JShR?lFoK@!k(w zp7N9;_7Z#yS=^m0tNb7)-s|g{H1}PXmIQNAC1z}ix?odsdU4jxo80_#+RUb_2}rZAx!W6G zKA?@aD-dz8`1!820OdoX9~oY;GlkH<2Ig{)WhAG8`S&!IePpzKuS*oLfgU*cHvs5^a+2>4UG_(xGH5FrELUouOr#IQ zXLjkG`s6a@-e>XIY?MDy!}Vcps3f0;3)oD_Z`|U%vk%sWg66>!i5}mNa(hXqJWrT% z9*bDF9)3s;s8i>49MEykAD`9Aa5KOjduY^n?Uka0JP~4hTV*`5xSJdX;DsL3CnF=? zX_WxJr*M-Cyd?VO;H3}TB*_D@s$J^B(%(OB2)HIWU`v8mqNltzB5ejX3nZ>l{CU^^ zL|Aoy2Wvq%Vkij+zzr~Z%Bh)%8K}qjDNojaEL}ddq-(!-*OyhfsOq403bMcTt;cYp z-;K+#BF6iGd=#49o#H37B07d{>(qrz1f4sQSmybnK;+9kR0~xYt9O5obNg#_WySr7 zNUkZCnk%h@s?YMmCyDmv((!3v8Jnx8hl|uJlGfm2rU0kuL)PlsJV`~gsrkAB&kNEc zVb_bfA!GLT;WKTaZ0=50F~RXw6UpO(_qtSi;gQ*(ifC$Gj?Sfu_&K18d}ZUN#tGhY zv>$1@?+afUb09>C8rC}p++2;Pv)u#JW%njT#eLflcZNa@1-w2vm+=33jsiwv z-xh+J`EY%<*KWO5e*4}XZdFX{l<)KlvW+*RixywQGrKa)0(MHDAFHw(qw3~0kR~rqLpf-}V z5vr4(a3I%rdxF8>T$Sk?<Mx`L#cSazP}OW&q`K9+|w1qL9_f^Nwu<`QSMSl^aSk@Ou~+qdHTAyz2oAe zzG**a3}WmLSR30!$GGnMOv~UUzUR{;m9|n(UU2e{h%UCBbhJP9pP#>#9HD%pt7|>X zRrCk$_5{dvH5!269|T~2l05-q>+r#@mCZzLW=C`!1 zVVoxrDzX3UWsgK*Ia=XJV^kA`zD#`w(fe-L)n2T^2gw<`^)(t`g?H&Xr~52)i_kPr zRh@iL(nwM~-i5pr$Mg7x2)E$foVsTx)o3JEl^tR0eOD*)s-HAYhWBk<9}MSE(4$F_ zbQwhtLrg}J`OmpQV|E_ePn4$aeoSh6%H@2E)7d0~ZnnLDwgtYu@O_Qfw$31(?d8fB znqReDzfrE@jv&>Qon;kE*_FH4AM&pKS05$K=M^=@wB6GW7jt*=wBOio1pMW!4-BOT zvee87(#0)sNNAdL-zPl+LWlMto54)=#PLcS4Kc8a%Ur3a`}aM2p+|WwE0{WQF4CKv zPH0a2I9?X7kbPj;!~uy?(=Uv1~Q=Ui(4p5Vh8q=Vnv)oaQXXQ z=_hSR%-UH&I|c#veIX>G`-a+{xKB#}%3HmJdq``hmF}S%zXLL=APuk5UT?-qZC@FKXvsh)N))J(c{ZLW>Oz|e^ny06KwX2ouWjc` z^gWL}UU+YBZ&xtIZmaFs#jb>ggkLEjihELglPnq+99>itnwOiEb*Z5GLa4)3HM?Jx zCl&6lZMII1j(n*(V!FPfXtk}Lj$&xx70KGCI2Yp>J&jN zN4TB-O*PEbqn={9+Oin_NlxKaovD68b&JDYl&cE@3pTC7@!tKX>UyfAKOo3diHc-- zzYy4T!t0&}rraw(xuDfFl^D`{(vtvHSW}OEfE=4|1OrYYX0@dup=m0^xE}|iPaf!j z>)qaB&3(XAZktfgA%G6^(dJuW`@!1Im8-48m)tiODw$$Rv^JQjf~#R0qn@6BvuC$1FSb#oA#>d{kMxUxSv4={0N zoDX6(D)SADCtRM$9KZ`Kx<`HUzn0tZ&%O6MGMV@*ATV&80Eixm2KW*DBe0?4kJhw+ z%%-?Q5X$UUfGw%W2UjT}62z?*N)b@c_K-cRI8Fg)NeH{~{UUFeyxc*iBC7_>&SC_G zqgUH&fVJ6sn#GEk5rby-<}souNEO9|;Cg|x3(goxhC>SY-qjBHGz*mz;tw|hK<(T~ z_P9o4-+{QjVnGVJ=ik#%*ClB43`6f*U$Gkb;V5_*?sID<+j_PwT2H9wB|1u&j zei|T6iw2Yx8TRJT*!j27xQ41y4SL$mbNzbS{6TQ%JfFEDPk|xeiq&9qYw+kX#E#{K z2JJg%Ebd%jk0Unp|4c>y{N#d&)nk0DxjdQca-VvVovT%(J_ozbX;=nJXq*B{q-1YhScWWH1x#QGNt zp}d)i3LgI@BWmEua{cQr7RMRcaB&E0gdQk979-l&9osaNHIA^*dJADU%Kd0AbZ$gW zMZc@q^yJiD8F&9=)on=eSzgpW>-+Lo?CCs?yp$$#-70n+Kde)-r@vMIy1Cc`J z3kh<3zWq*nJK14EDYwU;YB6g7CRSvXvlAY7QlJ{ot06(Pn_f`Z=FGFVxd3>yXhw>l z9!c2(*bcVwFpOdL6Tg)BftD}Fkv}3V+eaiXHx+H^O^KC5um5@){EXf`aw4bvhzzSR z6j<3z5ZP2)C`&om+@=vy&gMqV)j1F=rye8-yG>NC2)TVqe|_OdKvv+QQ8ST3x>i57 zKI`Zpxg0t;fcTQ{%!>;JfN}wwcX>H+Z}y{=BH&w}nhuXK);5z5cH8GXp{}%x5;v)b ziZ~=c)>Lfs_wxZ-Du0?sLoB`~&b#T^*L(ec6o&NKqjGCv!@JwMWxTarn70<2zKvh) zGSpO%NEU^SuTn<)PA%=dIo!rqKhcGq7>hWM!#oPuR27Ku18MG*{nydd>qVPxYIRD4 z>qV}<1`;&unLx$cFNJm13vE6}!BuJ=Yqm%O{b+U*Er9oAqhOEQKHS5YRu&#>_XZuK zt8Lz^;R=uASP!RLWC~ZNZVFg~^B-SzM+aSZ7|#f+x|c6=iUkFx5$t<2GZB`gEoRG< z0hY91;0-tC76@&WaeGick|yfV-MMDK1Je~D!@XGRRbvbYfjC@J5iH{6p7VRekHhVh z?;FV^jLCvF^^@=E*nAG%_-3j~O0Ce+>?WmwF81ijhE77R(;x{K_tMu163%+^$GqyN z1pc-jMLTcbs(}(He~xZJIF`y=>Uh^P4JiGflw>#9N>st&hEkiDN`-3ETt9&gxfx|E ze=UV4vC>9~o9#Trj+bPb3ox~O(GobSnYw-D1g2W;@oIi@=vR1~BG8Axq(Zplr7*ExO9wP=xvVEkg8O+LqNB^rrb@B7>&n8+L-AdA03{y8H zHDX0kaJvyQh+1E@SLTw|kCM17pJ&(u^`a-+YZc;;=kGUSkC#-0w&5k=H!`aC+%pg2 zH&#ZH>*Sl(CL4^FgzdOtGy+jbC}=DUDZ1vonFZv|9TDBHb{ZbnO4TCk*X)1Fm7|pz ziAnYz&pL$fxX;f6PC|@nv|*_5hg2B_W$Dn6%W;-oX(T)Pd4?>bw?}~5rPokZ!8WGn zXZ3UKSokk^*dEkP->xg9!WKB&-{R7of=4b6l{AzoIhpse`uiTLd*IzoJ0pu20rp`; zazL;PlpLD+B?4-JT&@|&Q2NrBTl|yO!*J=+ZAnKhtxVM$=Z)keequ3yo z+@B=ySt$3vfV^q-`2!D^YrRl+;08CGrl$ zvk%sale85y@=~j;E{kfo?{8s^n@$ilE;@U>WomfRP<6r>9#f%~LnHF7{O{j_X)4Y9 zuUy`R%~AA=G>E?sSp{@Y&*q1;u%S9)B;}j$C(b~@><^&_V?hg!8RB&TZm$Q>C{W5{`LiF9o9nr@*<9qR#}J~C8-j=@_@z6}jAt^B9gsX3i8 zP!EW!XlsodK)ISf8i>`jwQ9@#qMG|l5)(`jI zJIyYTDPdz6-+=GLy#56VpS*feWxNDb!DPvvl}Q%*Crik?U#>Gy#Gn7{bb@Hd{kco? zFn9gW-Bc%~v#RQ^YxH94bH8fd!~JTpe>Uk~Fzi#oY<y(U-O};-8@aus73ji-mcpAMhEtB^4x7MA#TT1nmj6W#(w2=J24;b-j^g>I3 zEah*j?teTc|LHD30iUKB!APP_n7;6 z?=%dNPxVaXYRs8<1&XNii!QWLlC^{ zz_`XxVpVdw5Ju-R8(lClH(mj`1NR+uw!QH7Jn5}20FRvmh>UkaeoaynSaT`@SFO6D z{viS>%+3p3EI4OF7IzxqPFz4pKw$U6<9j2j6yMG6xiX>3;JFg!pEe;7m<5B;qhh4s zK}XxupBWXO49w+(b68z5sPIZ1$}?(%MFT;`$}NnU7E9&WLRj8NeiVQXcg(_Qls2PR z|CM>-eLOWgU&F&#iHDE3wZ0QSPqI@fZ=S;^vaKd&jD|zHc!2jImSi4%6MSz;^x4hn$$xz9@QrKKk2tk&IMe_R7z9Bo1LwBOhzI6c} z-iogMP&yTbT@Xv(B%b`w-Ka=TZ6&}e>!uqV+xe=GerHLs2zZZhqWeXT8%q%Jgr1#> zlWf9yyd>88>gCtMz)>W{d}-13;?YC|7v!c=G-u9{(gy}<=E@h^KP82jt)C(p7}A;j zl*uQIgpy5i33p|4kMw#w8!Bm)(cKAiWm6(dlXrcHisn^tkn?MJNW8ub0s=dFrPOP! z^*}x#P1+8Y@%P~->wQjbuYf62{5_EK>1p&akdMW5=IeVa1+4=Xbxt{c%jh8X!(~y_ z!q8^4Zif=bs{3J}n=c}RE7|jTlO2dQa$Kz3*_c;4+gI(%~&F^mH&3%nAjc`3^WP#{$hq0TFA>L`+PGuN;os1EuNj(=O|GGEgqkir5v`ZwzdP^EiMv^DW+$ z)v3nr7Xgt~YBRCj*D#3Wn4=3XEHXALh9+AAWG75ts!6V^+0em34@=AJ6uB$`+MZ!Q4ILTOTQ{m%eK4-dRB z4oBVg3?X^U1M+yBwKl;-ZEYV1O7?n`^KN7oD(JTYCS7RvBgL?U~~J|H!U@)+P)`)2t=ICW6nFDlsSX)w8I!*&&BgxP%JbS zk<+%g)t=nza?{$<)olTbupDwG8&qPryZH*fh{gNRcfN&Ab z{lWXFB4#aNc_*As|HKGCvx%~kf5)~oRA~g*{1${mUjnW~19434K>Xr(|CVS|RhHeb z%R(J|B`i&jv<^WvGo6~Rm~gkGmG|V%AmWNzyZ|3974>Kwb|9;wh>G9x{={~Z3uAV- z@4?~WOO5RmoOae$L`3%L)OQ7(O}{jyjM|0wc4MXE_+T2L53#J`d(OQQP;?B3k$kPo z>XVr5H?kG7uq;~74;zjr=LXikq|ntM zjy*WluEGHQ!z8oFB-tH&>H0kzZR?tB&jA-Lpon!0lR}8{#7-hql#|w?#A)8vePJwS zSpsmXR|>!LxX*SJxpN)CG2I``GvaXPoebJfD?OlCg2THv7&OE3LUaatr4o za^~hO>rGDKo}Tr2?+f#_N}E30){l713!E+I4V9uLL$B{`5Z07Kiinb$p16wNcPcl> z-QIfgW%IG-UV~cQs*tdejy(tTe+<-T@h`Hr0Kz72(UwdK?Jzx#LXbSel}x@*Qt73d zn%|A;+CYA;+2}2#6?*PnHERm2YvG07aI+Ymj)17#PA6wH-*Cp2!WgEi!wT=bEmOM4 znGun1M@ZM5*&F8^260(Lm>%la7cb0m#CJ=j;$Vo4H^D~Lh@A8={OSbTe|%L{y#@lo^+~fn@3OpTcQ!-$ zyjmT!GCgQVHg7t#wSVMIhg>f|fJ5IC*R1IxOsg5<^cqGc)@lpQK4-8y&FyS5qR=F^ zpthya)P^A1TLNpl0CcbRLj2QgV_Bm9sp;w0enSyp%6n}NV+Km)`1{pe92$S*_M}~{ zDVVnVX$^*IF$~CqHR8n7s0BVjJXNANHM=t`;#he;CN<)X-reA0boe->*MRmI%sLu8 z61?v-7<3IuLzPIGt~sceCTu_3796e?U)g?vemkZcAik41&t?htcj@OxS^*WQ;)Efb zz!_pWc&YK}g0byTanjaFMluSs`-8I5#?UnM>T^)Fdq)trz4Zcq;JWtgx5KBHwbea6 zdJ%hq&!(3zU&>A9OYc6}hvbtDxcbh^0oF)RJ%AINcO~hHmODTk?#h7B4Py2mcV1;$ z@2|@Es(nbOJdV1&4N-YF^V+0tPa}~XOIO7Dw$!{Fr=_36&~}{2WiT%2I^2JrelSnM z6>oosU;;DZ5SFp$JXZTwjks{J$J z{kOHdj*wNLALIn77p*U0gX3SizSz+dbeIx@w{H6pURbdt+g)mZ+;Eb}@7kzjme_W~ z&a2=+h3_lT`IwK>a6$fD(7hNSA;H*mHe6yP0AuJ9x%vHz!b2kQFPowQfd%PVUAp;} z{#8``88MTVL_2eD&14e3p}AhH*bRks^~4KB=X^8ZZ^s4-s!^>PxD3^YJlx@=QqvO@ z|CaIAYV^FT+pLjgu5o;4U_ zvs`vtO&i=aMcGn$WHmn7XacEIKe=Me*XvUsWv&#Ve41)4-N*aOVVz!o#+N30VnJ&w zKdJ?>lOWppmA=2cGH$X2*dBBtgw-<(KH$U$6HCi_ZuoOwDP9YV3>y)(H6Z*3vmGgq z(alze#y)UgA~boH*ajK9deeh{`8oi+cN3*m9B$y~cfM`J7ZEF_zC51+%Uc*o@iCzi z^a#>MNkrOO6JRx9E6jlFTws$Wkr!J8S7{;GgKA*n1ap-pgt$z$QMcreH|ngP9OUsx zRJ4uM#7()a+yJqKXZ1TNi&0)Y@*FC%1n1fU{wnPpotl@NCZ&`1jmeuLZO&kaSjiz* z4h+&hG8lEx8JAtFA~s0cc({8t{2&3?T1LV5~2$^HGl~JTd@b)QbCgy45K5IL?+3Mlph5kR_^J8YvX?ILB{j#MRs^Hv8 zSsqfQ<_DA76R}WZ@fin&0E|~j-t{GP8}SJFv5;P85VhS>Q1Lk&(}^k&68`B2z-kF= z6)9DIt<=;J-Upy1&42x1a> z750$qO?9a3kTZnlb6%^UbgB*s%iUgwd*xZ#)+5vYN6ctz{eN20hF$Dg1^ z#uKYmjSz*K6zhzApPqWhN|cn2(q*t3^_WNl^#Oe-WC$iK;5ct_OfEqveW4u|?|pBTuR& z%znJZne8+Tmb6c}Pmb8sCH9Z&u6T_YtO#0kgpa`$2he2M^@jt_3)IIEN>#~JSgZR_ zruE@dt2lMgX$(y6Ul2EE9vBa^8tq-ugh0ryc2w=a=#=7UgeU2Mw zr5nC~1-D$uPR}F{jpcNo@@heJFl79C_A#$U)R%A)%otVY3L2@cojF zYdms%B6jj&R(6IO*DQKCN%%7&x(legzH3U`G?Y7qCyX(BR$aL!sdn!z#799OswPWJ z!;m3#H;S7spKEGrvTJxk;xC!>6CwnFK{7pSsm~48aqEHHNtiw%Ya_qabhe_k#90ZQ%_6-J2TC)a{RU6VYM0E2nBcre_X7gpZ)`Nk}Q5aDn`7){rwe*9=a;PF(sk|?Z3Uesmv z&Iq20nS9c>D)H8YO_OfCx>ogLgI=^l(^oO$beKTq;mK;PsbS^n-5xdSt$i3SFr*cU zR(*4Y%3Qm%YHbL0T$nbp{v%**+`YMiJ}M6xw$^x{X{j1-r=SDz)Xmi?buJx&jCN<; z8M(kcIUg3VCcJ5h39sFbAH(4+O2Kwx^}{ACNFcAuHbBJGQ^cS67`@Z=Bm1eSDY2%I zhha~ImxQcY1#JZ*DOs8NtFx08OE;Yve;!F3JQSb+9mXx2=vdRc>9O%jgq`aBBB5JK z;~@J@x*N;Op*URyK5|}XLx`=U_oW*3L_@6%#iyQu2${_EB$V?VY$=clMc>`6`)G&w zC~9OX5>8v&F)e*G|F(@j1QwX}&{-=$1XN~@c;>*Z5wH2x?_JgdmzYPr7zx(MdC}xX z_Btz`58G8!98{Z_h_s`^FfXp|2pg(r2ztwxEf|fj8T2C-sGGJVy-_l@-n+TC4fp(q zyd3K7e742e9nB;~4v!4kz0_`XOyv97o!I3jfV^6>4w3NQWzZ9X;p~;b=NK_fHuZ7M zfm*s~euaD~&xL3GYdNbUVN)z`uJp+nIU#fJ8L@fIT@xr!iIV2p51lz%xX*z%M zcLp_v#FBP9Q~Z?{>F0=cXh{veu6ytBXsm%JHD=p*wYg@8g}t|EL|ecUZcyf0l|NOX zUC3eDkGlp0)yi)cV+tvGV?$<)(0S5&6zf;}G(VZq)sLu`WHJ?!-U>;wSI%qL{>C9u zVWyX@zQ<|#m6J>`7O|y)p+{b**46?N+yrs%+lJ6O7BYP(s=b%2kB41ZL<=99S7DD; z*q8ESCmW9zI6(Ub*_?we=+(6JjEO1;S6z=+58!02Bs}NRlyyASz+_oodhoI6R<~o( zxCQO&6}q>m0wATTp7F%6<_0zANLtSHEkrW32qY%fz1i1@5YF`#U2{1Xp*NLS3d2-3 zt&}vLeA3D+#U#Lb9E4PE_Esgo28>}3@x`L1;6)b*b@%@v?!DvLUjO&;W479=ZU;45 zMeWwCn4LDYYj@ZLwO5R4kG2%8z16H0dqzU5t-VJOL|Z!|Y6U^Qx1RUseOf)=@%!ud zk4F%3zwZ6Kp4aobJVyr`H~O5;wOB{V#l?MY;C4dEP2eQic45;%CHD&NLPWgWOv%Vr zmE%jg_}MFDdKeLpzLg7;cD%DVZ{w3&zdWYXm4Pl`-WU6*+oJw}US{)I4lGAac z0w-W&_uZ4*?>^ORSBo7?M5-<9`4H?o?_O7~fjciyDD4JTNU#p3Jn zWG0EIyrp=;L8mUzYi^_`Uw_ zs=-==EZujx&8i}b`_?A{2`B|L{x~Ix?R1+@diN8;9~8NQ^zj4{-Y)k6&pd4|uIeq= zmt8t12m)Vc{i*v2P}U51e6|x_iVi!*P8ui|Ne>|0W8nMfEOo1^DWg?yJf~ zp+`^Y%oIP5E;-#?+OE7sc6(Zmm~z5u4^22DqQzYw*h2`rs`^TK(tnNeks8dbW}gpv z7vAJ0qsR%-HF*t1i3R%NQr~Cg-{fA0N+BOrTNK~x>c8c)+7uGrvPVRAXYB-MUNXHG zpDgQj@8ZhL#=r~v3jvs!GV3l%-T`EAmMDRoYRG*SmNetf@Iq{M2ul=6;DGf~pxY8r zO}j&`PPzvF2+uagFgic^tfBd#gZMd1$VbCd-c5>^)LY~xmEbT_G1QBu>bTkX>L_Cj zGFPLmj}?>s_;p5^@Jh6|fEXmbNaA}@+CXYDL(qVL^J>Y3jDVmvCDHtNmw8I!n0sy* zn|sJEo(HH!$4%S~Qb(n|kdsf$quGrDh zJs$Q3o_@6wgvlp6?IJ6fbX*^<_;Z+p2bx%YK5cc2E$uxu`kV0wH6tO4UB!6Pmy zR?eMVuT}5aUS_~qG__onuvzLb#h<@xyGZ4-h<;U8Z!2loyTZKX>M&>ZiIx~Ez!low zrjH(e#HrR+q1|*yO5GQkI$EbbG;vL3Xbqv~&-6Gg#TrxaBrQhu@p}KUziaA#tQH}i zMpm&Qt)A^kJ8eeUT;Gangr;&YBdhJMKccIz_~BV8hnxv-0(yO=`!%OXy%D{4{R15- zyBtlvWWl6d{{QR)pj?aQu#Jk7x~y5YOExv3DCfC(tzYSwFL5qCv*Ps5l-Mtl4gNHJ zDc9UbE#8NwW-6PHw}*tEkJJ8CuOmZ(as^2&4VU(J+}7RuRO}3;zBLz{juHmmBK59bA$DnJKu3-%Z))Tm6@Z30e zko4+ z+M;>iYln1W>y($w_lnjo>zJ`Q4Gc)#ZbTpb{7IP=h5JZ1f9;#AtwBb#47M-^`v{!- zPMmSISKGq$$$priAs#~&J&4-Vvisq=hB+_pUN;UNJz}zD~ zAFq8&{cesLUYVChRJ6|Li5locd;WZQCO$!U59an38WgDc!^^1UdsJ_ z8Jb^NKUvp;vbx{LeSQAMI;5$?q!;pVe+%*W=>FW*(R|zR+E4MkE`>F9-cUrh%}6B< z3|;p4?1)1SeVz07Cm;vOOq}r&M35$zjO&?|C)-X-?pY~5APN}EWyO9ome0C#vv43i zJi#i@WxoQZ*4O;GqSkNLKh%9?fc|o3X9@TGi?e9mz2K7hj`Me;Cn@)n!k?exCd~%^ zOS^cZ-N-auIO}#Oe0TkNe<-eH;dqK~%c^kwsREUxA;Ia5lhq$bQBaJ>2+}uV+#i(n z^sXy>8b9QTr5x03!DAiB23^S!D|RbU^8PXOhc;AmwJkq-PPzNxe8rQW^HZ0cJ{gzu zGnr$b)ui-{vXu|&#kZ!urmDjDU?yB5;Gax21+{ivps!oGwDTegj>mWcpcQt}T-fX) zE2cWebHYbm<&5wQ{FJjH)r3xtMx3j4cPo+@7Rw|$tAvr*n|(EOXAI^{6r7~{I(*e1 z&){-Jq;F{0cBW`(r5`1`($kjhQTtAr%3rlI(POJw7Gb$oZLXSNQk#9VweO9%j0p;h zRE=F4=KiFP#Mlp1ttSV3tVX$-Xaf;_Q3NsLP?k{po?)6XWhJssYq>E2vRr4Ow=(J?_sQ>(KrB+Ia$Y?G5i|5ZHk1;*ee3eORFs(D$uc90Qg>=Uju?9XH zbKE0kmap9Bfke>jf&z3*3TAI((RV9G@{)jzn#)Yfg<6;C=>0rB*eETA)g^rvt{t82 zPOGMHG({_THX!2WM-y{W`<<-^_~O1wm?*FI z<$x!tcI_LoZ+Hwmx^28+4ap%4$!KcXw`rd*cFsz=o`T&;4$xd1M0Uv5r%C>$eqg1x z-rj2@cax=rXv4t8nO5lOs)0d6PN~ri&Z)Vskn%FKH8R z@_L5Xsc)~>PS9plJM0?3@q;%tQe~!zcRkt1U;u7;En%1F%o@Y0GHHZ3f!%&FfWOxX z3BnyOV&?LigbcL~|GH=F&m&%aK!SV;!_8g$X-mmdZDi%}I22B0YB{gXHQma?_Ig^C zQP~HSNeqa%4xOLx%`6aexNAP)O@#5@D+$Ej90yar)5%hT_Kfo(IMBC0U&1E+;}HGz z%S`=@=r3((y`ezW({kJjuaB05A+8ZrW4X$1MgAB7fym;}pj_asBwEXSa8g4zWK9ujFz1P|kEvd#n@q_JqiH*FO19 zH!g?&=a2q7dURZom)_&_<;A!g{Jq5-&;)Z6XU`}jpnfRe}3$gHg}Srm&9#1HllJ8}XL{5^KCF8l zlbf}mcq3&t4oen!zd6^tNH@rh|8E=qSpM9!V;69q>AHmSNb5C>7Mp=&uOtldL! zKQHaC9Sb+&^d+*sDOj0~oq1)a3Qrz^nz9zb+_THdtj3)(@Pmc=TKNXNPQ-Z=JAVD* z^32EOmhF5+i9<0!xuErRX7ltceZXjy|2Yop`CQOPEu(cXRU#clNBMtovS}i*?jh$Z?K- zDNJ9MLzvWI-+|eQPI;N`W#hi8SpvJf)9~e23;J;mhUL#K&bEHz8N>)T>)(?Rz22} zTd-dt5nFigQT18A$nKiKD7BoW@27Lanv1R6cI5g!XqDsSQgj6jR8-FKFIs-}g>DC@ z7H3u=_Np5eO*|8=O8xQq+9)-;27)?ZKJ1_(eBP3mhM}~G!++D=+7W^N zP6LG4t`=+9;C+|)t%;;Fx4Wm4jk|MUFErbhnO0+!n(Fi{zn8IR8BM!r5AJM{Gzy{8 zSl9LI=0&+g&T;9glFZKB4x`J+x~ftvaUHQ!QERT6mdd(z#h37vz&2M>d&mgNc76gu zPCwIr*JB<=)pA?X3I$Ok>4K^m|>#6=P8smwUcsmO-1@ z<|p#9>09is80qNRZ!I;OFGfi2!ts|X)$SUjD{ZbA^{Wzq$O0Tc^qD%?b>t66QY?M8 zXZJ=1h3)R+cei?PXy@o^u_WWisuHFo<>%%~6~kGp@zey&NtR1a)}uxK?lfDD>T6pO zZ1TVh3!TWG45@IuBvoczj;Gmfet%PutC+6NK7FKC0$Z1RQL{a-<4cj+fJ-HvKlEhOQ<_I8|z%z_I08}MnIa^KRD^D z>h*{CBO#-IAn=#T|Gh$J1H;b+QNT_EPLzw7(cFk)Bk^P} zM7wT#aGI+l%%SJL?bN&|cTGL^n@+XW+158wQPKQ5CPxyrs3A}81w8G2-3iGsP^8B( zh(R)jnRwr3Mgu2a%iz-a&chE`OOr(vC0ZlpkW*JVVV((-mEpAAf1Z5cKTIdOUiLAu zTPPYO4mWS2&Mi-TJ;8I(}~M z6f1P!w~Lf|4L?`VV81%MN&2iVkzUL>=Pu^=erL-f!d5esguI%2WK(VrX`2L8vimo# zUc5MlYObQ#`^T#<(vHS$JJoqrcF=SUs8NOzq$(KVL}KpZ7h)W^xpu?P&q;sJ_V0d$ zW4rue4816C!?q%hEf)XwdVppe;uVeEdX_`rQEsoc4pkI-G(=0|Zj>ow$sGrhm!ggFpyHTgxuq8$`#HNv$#pHed zth?Eakjc#An{w{#)bRYF4Bm3l#K2q~vD=%8X#sJChN7W4>BqTt&Hc7>cxjr{dW=Zv zLCaR$>stn)1_}1MSmrka!U#{45SHQ8P=Wf#472YRwcSxaSYw+*_uNgRRjGknf5>Z@?udhy*F+7g&*tU$tzItld$ zaNZX5-bx7c2Dab^&1ym~-WwpAH4}<>`v?6z|3sb&qo;aKb|+RgdtcFu>rQmgU`|&L z%Yfpfk{>o;%pc~vz~TpZgHWf<7l>muC~0(_mZ831wT4`Zh^Ct%`;iU7xBhWN+3+7? zfxp&}aPa;B4X>N1+ZF}c3qp=~VuNm)p>sI@aQj$_nDc{fH@$3dY3vv;bY;hl4M6Ow z?GaX~CuuZb*Z~Z4kJ%>PE=mHCG9>}q+(OGk?V!2->FCXk&hhYYYGJ+l=gKTK*JF!} z>}SV42%fR-Yvth!J(KWrEY6Z>_l~fO=;#Rzt()o%{b;8^CCaIyZmIS+avo?E>V;?8)X?LTa9(6oXLWQb4`gqmI0TGuS+nxBJuzQ7^M zhwL#KLABjd7a{aIa;qnbtcq3y-}-@m`|E$#Z_t{Yj;?6l8*T&TfY9$b!mc&On7b-w z50O((vBt&M&34RL5}zBVNCR^@6p{U!!;HO<1J&10FV9p2*;q$E&0!%LTFUgGazl}aM3--y?$eW9H8CbO_eT zGWhzo)va~1dV>9|Q+t|xL>fi&uZMN4 z1mDzgBh5SvUgGa=&q%$n|I*TXn%fdB+qGCcmQEP~~ z#-r~@tk|k)w^_+RcqH1@wrw?Wkk2QDyQgvsqF9KnFs8iXWgyHdVjlmF9?sJmXcX`J`mu^Rs%v=slGiITwj&f6#edM3a;m zCBkW1;{1%1347Hb=3)R*-l!GpX)XRz#4veL_f~4`t**qz0NO`W6=%U*$3>p0tg$4q zwMOwHW`Qv-lQY(sd*-%nRdEO1H9L7Yst(Y;+v#8o>;~+^2P+5_{Ag~}259yv-7f($ zSNGE)%;ugE63d?spNS0DMAlHEAFp>3&o8-S1Mx1R%*OrC5AnUI7{ zxuvJOUAYR?Q8aE|U$!ZcxG};$CtW)0yA;5127&1#Og}ywfK6HVN&cgfbPpTiM+J-X zWN-SHsS!CqsmxrD8VKdr%Xr7+o^r8{dF>R-P?6AsnM2uA_XcWgn~ci7lG5->^NS;8 zO0V+II*cw&4V!O2-A{1+fExBU_?E)VEcc2$+LCo)RFFNiiEf2^@ZH#bLbR1!-&QH_ z|6I@i`!|6KM(31Ho_vr(ma2@N0*lX2HC}6I`){i8-xp5~DNvL9Bjl$o6A#4uyKD1G z&u6AoeC@J#K~y=+yzd1OA5XPoFZ;nrA7liSX|!)GLzHj->Z_b}nS%ZDY02zm0h@j2M;D+er!^RD<$@cn+58K?zLuAj}E{dlljvd&Y``-Q`{4Q>13 zp%r!*Wj1ezLUlC3?=6;ydE7VhiB28f-zMqiL zzh{92%}iI4@KHt>XDDM==WRYPYwE#~{C-w^Ws zswR>Rb@26T;iIo^hO~>zBBTpimw?j5>dN4g+ai9$ClbW1;krde(=UlvU1!wFJjQ*b zfTX=ed+gwb_4^N>fW%;GB*_EAN{;HwR&6U}O2g!x3ulwHqa3+uG3F}VdOAY(jEl7H z-v|@9R_zUM=BjNytV@>l)fY0Uk35q*b^gZ?wB8DQjc%QKmCkZ-L`-ah#u3C8S>mhL zfb6XDsZAVT7G5*tvY?waCH}r|dD)qSPQPxt1zalds0jIl%SA>KKu&MGrydX&wQJvu z$BEmYYfY6++BIImYtxA~6LG%C@woHk(rpBLmfE~_A0SpI$j+)33myMcOgE=HS#Z2~ zUJww4PMCT|&>pSA7LHxo)r{g)9o#OW|*|(jp4_<0AE^fHxg3^iK!B`Yogg}H+7T@ ziuLu*b)<2b`|afkh-Lap?l7l75I0E@W%fizZ`&PviTjAnB&Teh+>MPse=;l+V4<48 zg@-3WZ0o3$-{y0y>d+&_i26I!uapRK&%HxSZd`_6S`oG9PM;)LR4N0O_?9%BTxi$;N!&T3w26>7)sZS-X=wGT~7 zlylb~{LsW~EN-+fZm`^wH!&NngbHeLa~}C|^l?DxJ{~a({dlWb)IzEIbg3u|~ zbusFFZMKTqQ2{lwj}U_sJ2rCm8#2X06F%)%qWlrj^p02&hj#+2wO#i~NaoOHmGuQZ zOOOM};EbQ`*wwBBbYLyGR)?rnS1H8;4vyzd5Vej?`fGxtKtI4~Avuof(DB4Z_pW=^ z{aV9PE>k6>NBFgo69yzBz5Y76jk!O04d8|9P`MtzaJMNSU@77>VbBLA4x-~fx7EX! z(hYBMYbNk%%5Ev8^Ev#uAp;K1W4R?}N5_X3)$Q`1FJCLjcDX2Ypk|+=_Q;%U!30A4 z)Ex!Iak;A=$$n0EdKccA(ECAbOU)%S?ZhoNKWvpxqs;^2r0$FfW2ABQt?i z_c{!<>VbLv;n~sl0b9{*?{ey3BMiNvojlzI}p1JS=J+^#7}5F5ploBmaVw z2K&=@CV3eNJg`!4EUx{tJXtLBeUkUazC9P%>H_71z%uq;KFC6cb6M>Ej%#UVg zo^jm`_>3+68~amYrF?uRyNUC|)ZF)|H=M@$u2HcNq4ZXZg2kl$Q+ld1NwF~s*OYH##g8i+nyFiMV<@P$Th^G$r$4@k z>YE6&ig^Bf+29rQ?_=T~1-)*y-O1hbeozT3%O~xL7h#C{q-OtRkbj#rbon)Tu8x>uCq1a zNMX88oTMUp?ao)d_8j8_3Rc<_zR z*#{2jRviU``Z}8)L2o@(k6?;?NvK0>=zl%+r;Jy+TC&*feP(Nu6BF-XzW#UJfQuGt3%qG$&h_<3`!|qJMN@KiYw#IIbcBPMO!t$PCs*f;oIV@Vx*l1zMiJP9K zIvOquk7A+Sh&w{wORof)2f6WRq)0GKeZG~Q87DldP$?uG0ExIaum!Y|eDzx$X4H-_99@0oPLicy zIheYyF`+<02Va-^IOX>nKeJSFBB+Zyv##b^zcBOcV&pHuFDgx$$(I=hSA-mAjrH4F*~SNUQ510jn~l;9oDKG72m>etp?Qc`rDtK5 zgbHfP?3IYw-NWXfH^g7sH>{#Qp)a7)9>_+7A3-0Y5!u>OTWG;8$@(VM-jr@7-@%?N zkcPPIZGQijs+YDaG(jeggV_U<~zp#YNjeHrKF zE4g&V=pj%e{gq1~t3q(a{x;My6fEHq#5|2&lCEHvy-9o3MX~}11&!F{ z^OtRka_K6}sXmwI1hAFxa1#DJ>1_URvFFTWC@PV2-)&Jnsah$f?d<6tu?QIneNg4f z<%HZ)NoKftY4e5ciJu`&?TSEk7P!IWaV6>YB?Dra>!&UW>%WWnetz4jn~mlrM%7Xn zn0X~bSJlV42&bexUT6)Wvh+th@;|ppFxM4s9DbTCVWOEMxvp_#)X<}0+d~P*JM9s|EKFi+f*ia9zu=lYt|r~yW&bcG z%H!ZiC~(+PKcp#639NMWv6h`_4h*$2fLKfZ<`Hr!A<+BtXmq@9U%c<&oX{qm$FTX@ z5Ao-J0&DOJ)PfdHR#weX7p4rQBn7ZOE|NcWi+pc#(cMfq@#ILC$ZsEPQWxkHIasN7$4U_Wf14``9NtGafp|e&O48n3p!?eGYZ$jql>Q?-tL&=Z)i>MDe&+ zpSD3Dj{mwn?Kd@YhlY~2I0cT2_@k6+@alVLF57Qyx>Wf`5H9Q7tlux28~E!>sR})S z_BOivD6m1nlnfON3^HGsrmD@^|3iH%X?aCzR4o zyy~Gn_c=!?MJ$ z%Lsf>P}V69uN2+B!3>fcSs<0|gUB%lt0bbz8 zb2+g8hnbxYo-6p2)&Wn3gA3rtWGw~5%u{s*e-QKem+qrJ3v{NUpa15)!*KLNMz{n)gTQ%3WEDz-vmXNl4yg1b6T!|q;)2^{*4@U1sf5h&lptb9wXJjKM6P$)2W z?B^lPG6RE`M?_Ay9b8+_;~Ig2X4b-|%XvFT*))FgO zlt~)nmaDNvW`hjuau@e6U5e}hZ6L%o_Fj4xm;Goqwd_HYQ)`a>(R2QSDRm~CX?_r1 zGZ-^*G1M$*^X^15gZ%cbg#jl%;qU-GHorNoJakE|fN7nK*=+WI5Y{;U~vJ0-fx4WbSo%0CtJknN&Tcy&@0Q1eNBboE&U#}wd z_|K^Z?QGq241M|cq%z5GWM?5q^O~#0m0NeWJqu+Ns$>fPK?zX`q719o2y$XJJ?N9e zag|z3&n;-jKp8kD$OJriz$BB~*SORVM65xTS4HMy9soX#5Qi|QEe2XnYG-&|-6tOI zV*()XUtT1;>`{)CO`FeyE3UP%i^;v+aR%)iH{SWdf{>2X)ocUCL&uo;`mMWSm(Xjm zM`G-r!x4(XG#J9*JsEw#*5d+*0#9|spF+|eOVNN{>J{#Pzata)MlhzX1HmJ}C6%{8 zlh)V;0(QRVhM{nBw!Qhmb1j~NUmiRV`GRD?U-n{suvbLqEIqw0iGBS(nAVFDU5B)e zfbWM`-sIf~s5m|M7_qUb>p}+S2F7DW3aA(51diI`aPj`IyS71~J)^3)1(7Si5B6e%CE6eeuOMFU0aTUBDf5`Ra z?QdlZ{sFa+gLCD^xt`io&6JnXJZa24-N-9uz;2qo_z`)_y8Mi=mRhW!>19qwCT?QV zA33!3m2-X_mG*;Y)J5e8?Zt~qytDV|t>jjQ?|ED9th#*vdfVEy%r8aOIu+;>tMEk& z^8jPjsD1ow%{5dxc<+CYpM|3K?ko)Df#ftwuYJbs`g)4A=ZkH~bR^wf0$|X?Q6hU% ztAAYg@Sc0`YuRVb4g|k@8BXui?=ebQ&XlH#+UHl;^bUko`1eYgNF?6(45nR|!FAo( z^>LS-Z)RYHOi6_-$-`#C0DZ?Lf3(pZ7-Czlw{fkk4L48i9b*5!sFV5HbAppNA#1cp zX!6WXU^**jz2pb1NsEgz8I;tLWo|RauWJ3+ANq2B#nxuXM}KgUgDSYd(E>$cO@34P zrl4typ=0d*`X5(jiekgIOaFm1jq$EfgB$-f;SQF!?q8!Rtg>-yT~WEz0fX zJ=u8O+hy^ZVZ(#q4oQkdPyp#oiGe`8=3WJ>?Urfiw65qW`q)k)O%W1R0r<{{nM63o z)KUC8sn5!yiniK`NkSKBEq|F1+>acOKL$x=9K)s&q{805KOw~BUCw4#q+GBKM=d~k z-pIk$x)nfB@J7ostc3R~X#=I{eWlZRO9>L(khbUCayT( zR`555G0*DVWHH;ZyD!i2E{X?iM!u)Y-ghyGPt^gA*Mh90)vs;)tw(ZDX}LW0^0rZqX5}X**d~`?vgNoI<>P!f%FQCzP5fA1B6vRg>4Tz=c-QnthhFggz+alz4 z0zvU0MhdwHvM(4~|8lF&uL$EO_z3sFH2UUi?c zrMf9~ag&=>YbjdBd!^;sQAXg66qSL#`|j?A?#nj0;i!cc8~VUQ{7IcH3t$^mj&nrH z=yfMV7aLbOu6MATjb+7p#sPGyH9mwb3Ug;nz&tVJkdGVT>%`y5SOw-&e~NFL^p_3lSpYt{TJlfNGFcx+3a270J6#&3I(KAT8t8z0cXQzz+@1Nree5ZR9+zZZiF6u!s zRpYMie*l2Q;+~YYsnt@YWPb-F5qRD`$ipa3Q;WsG!;j`#{mOdXu1N z0ky!Qb~9WBa1rg0i^fzKFqtdy#Cg{gzm<6lDUY2RdJSQdwO0dqraC~u z+%YZEj_Mma5m^b6FOKd{uQ&Tryr(!^j~qNt-XIjb?!`y*>1jg}z2Pk4wp_0gtKI-r zx6m$4AoqdxZh!t-8<9$d+x>!Nw41%H|Jmm^$l z$^uLsXO_C&aFy#8>kk$bL)cfxyv;{A;7j+a9gzc012>qNGX)IGT5d8-0EY3fe{tJ& z{qO{>1#Dt8jum$2dNnwPB=)xA97Zb)A@Q&Az;`+}UwolG{e9EoWlzuYU;vEmSMRDP zR#)a4B#xBpvKcI0z@056N%n)`;sh=cPG z_B-T*r1^xON2)z`m)UvHf4U=~-_ziwxzkuhrOfxuraqwGA>Hi`E`mrnFMPMlciLUy zF#pn4-nV>zfC&TTu?Q?51hPHVsx$NDiHSe)(CFq!RyTCgcd0PXe-=IKJEzrZBgC5^Fo-%FbCMTzpi%>J4n zTqDYK@w=MkPD;kZ4_^8s|D*&ZClTc%PiT%%kEH=guRxM^({cJ6*5KB&{w*A zPuR;11EZu~d}y4&dbKJf=_Fb*=_LMbG^hcPmAH8E!``#La71|5F47+DI6pAWEX`*g zj3sD#_3LomyD}zOLy+pJOt)rPyfWvnDk0T}CxnYw=a{}g_vv>W&5^SJGsY>hd8>*O}| zVywjveW4qd`Gpy;aO5-x)a!_E)11)HaR}JSR!%EHZJVOfuE-vcUsjr@e49m2l;_n_ zX>i&87XszMATKfl_$21Os}B8FUc#^M&ePey9r~Hq@*P~w2LmDnj@!TlSVPN+G38+0 z#_xfib}l%A2DVTxdIyi7U;q977XES{h{%`_f`tAagdTWzmd1X#whEih|E+Zg+YoeS z|4McnY3lZWhftJKK>VsROKQ{mmm-D(55TJeI_#wnVou=K@%xvyM?&^Xy}F1oKZIKU z&n?!DR=D?aLGbsk4GP>xaOi6ySPwMh@Fh>s8Lhjl836}>^Yn70uxHl^d+mduRZ!O1 zYyKBS=IE4J*#0fB{yhkPAqaZ0^qDRDZ|mZ>=izt<#{B z(g9i+K{=a|G1Zaa>at`KeJe#i?TJtn{MRh};VieHl4DGlWMtGttd7Mkm&{=dk=9&+ zDScSO-G`uU;-Sb zf28()=a5CN(11MQ63>A9R>w%WN4UNAv)moYME+laIqjsti2^$S@q4Z#)6}8pw)F%1 z6G!AZYMJ-;0g~IZT`Bv5e>pUV;0KHlIB5Rn2mtX7^CU`P-Vx8Ojs(%Tv1Xmz`u=)z zmzyvACIM-S0Jf!A*l?6l$Yh1rx-*q$+{eVT zwV7u<2vY@(1I}FS`>Jvf_x2%HJn6jl^ey-qEQ;rr=b9@Dh(2sR?lgK47N+)`+jf7T zm97N2YH5Lrv|U!=_srQB_RoNzGZ#*rdl%=^&+fig|1^ZA@YLMh1Eezmx?iI7>CPv@ zeHfC$D;~r_QQoWP<_9X{45Wn{HVfV6dh{h6Hr1Dq7^*Fw&9cZlwKBv~tOSY~-3`k4wmG+0GxvB3 z49Fa3`D5ec_cnEy#q))Wkt=VWKC?VLY@lvhoYur|xVBqcCoU35uOpB0d997a-;Ecw@e>b<|nv z{q8juhR4<=C@eU{S9%W-o~~gfcRdS1W?Q>f`%}6#c{x*aYW{Jz>U3MoEq1?Q029>j zwT1QpdGYjS?R^APNi7IT+Gq`a#1j5}?W$Rd|vddDttg;DA-g_llz@*~Zl#YO5om!#<^n3-%|8tu6 z22Fy5Wrl8nM`e-xqnYzeA`VXrjY{twi4W1)7bR|tIkm59UU7w?Pt9xAJ?iY&inTga zTK&dn%sz%ytQ&Vt_(zC$>gaIA7Zinkl!M?4#QXV!=MG3R6MRR8iFI)p{{?xo{=tX6lVf-sLYL4_1L|1Ln=c=apZ37D6*1&b`^uw(A)x9O`dGBHKM!@LylFay#nZYYi`=7 z#iIkB>W0NoTif2c;JL#Ng8xBd&mm)HibmTt?a?E6*fv8|0_EE3NQT}a5|h#HI58uQ zf46=EACPHd=OS3#uoZrcO|0>B%@9=9*R7Il)&QV_I=f;;`EHF7hcb~0e9xd^%>6W5 zaIhAKvK|OCwr$8RWi7 zIfl}?6cA5G$P18(y}m2o$uMr%p<}U0olSqFY3|AQN6eRb;Jd3(wE6`G1$;+=ny|1O zS@)cfi2#fLZfAciZLRpd#hv-NZ-4;WvM(V72*BLiDCEj$k~Y#uk5|9&9i4XCX?o{9 zyU}u4T{frAB4O=sy zzlr@R-&28f>{J21q|ao?J6;IQV)wxXg5`GDh{*SH2Fn^{O?c1*V{-$aQ@w=QXBn?z z@55h|yRCPD&4)`<`ku!v@}r3G*F4SPr(y3DRMSz6e7Z`h%%pckqVxR`Q_p5otJ)PK z&d21Y`RNY94K3xI)TgHnCQ2~oOyp$m%a;%`7G1LQZ8iQS%Dy9%{)f!-~KeVyX%YfS!8DMfv1b2d$VKSwb`7L->a`y;9J9!dWVmYrEX zZswYsb_DxS=$DfC6H1RL$1r9qEM_PZsXX1hCpIVeFUs5int!~^J*$GkuL9H)#T+jI z{OSAnbfy1i>UuHf-1l|Bwy?$TbR*ojA%X4>_VxTY6MeBBQns?wM6r{Tv`9q|)0f4t zH$w`joD&TsxEA-7c%6LxqKAEn602@V;yPL-HyjUbn}(Z0MjDHjb^x?IHM`!>LPZ=G zlu|Py06hT}Em7g}E-idCf-I@Rr+?W=5v8AR(i^7H@HyNC4P9RtDwQ9z9|yK*N%yVU zTOIB^SF{L=JjM00wQQO{#cC>yF42C$b+((y76WL#ESHAYq7Myjz!%87F>UdL{g%gq~ma%d=U&M4^>0ifKLz3&C{E$%247N`I$; z{DnM{UKIXhpBG4%L5#Z{nxPnoyY2&JzK4F@7pJ2VBXFTTR-huS`Fe23NN*oR`(9{H z)6o6-=f;021O19D7(&7<&6wWGe!*c^K+^7>Ig0#6vHS5taRQ~7`=0turxJAWYKDF9 zNkX^WY8Ks7#z+(lF1cataKFB$^-52+tD-M_9Va)nqPA8$WX3Zn z0*QS{>HQNLLOBn4*QXCHZbGIYlQG2vdij`oEGq~<>2p;k3^zOX5 zVEdi3QT$gNC{I;^0PW9)tE!Y0^m0t73Wt@?_6GtBObq_81^uSf?b*q}flsd1>h2OW ze)LC=mapE90Fs<}=JGz#(|1LSmq6KOVj$L?A_DP7T1;;f%IO%J6f%C<3AGMC#_Sih zv(xWcX1l7-a%{jYXHNx!re0(&lm<9%QO(*D!=Wu3KJB-^=P1g0|hQ}sW zgJxSN>7yTNyZg1^q zn)kxvTKhF6=`z!PxUiX6caD?O*t@r^K}!S^vkj0%D1CI5kQ9Dn=**Z#D_{yQjw1|2 z;v37(%?hH$NZYlKlY;G z{SNWJ^~-@_F(50E@Om<0B%m54#`LFHyvDvD3MJhfm5geG;e9fTXMbmP>!XN>m{M*W z^?xYm|BJCV4}@~@{(vtPNvO13yCRaUtl4vA--?iR6vn>q%a9bU$Qol`vyOcqlVso5 zVFshZV2r_FFqZex{rr2V>Q{I4qt&U3HtQp8&L z6J{W3h0=&sIa1_%bw&jdE?!!{8fufl_r1z*F1`=rIaLlkOgA6v$-1i5v;bRg=C`ck z8xo?z1T6T=mIt3R7;^vd%OqV$S{MEO%pj@BM%Q#LzauV;Lz*`oC$9A@vlF{t ztF{jrASFH)<+oEg)pv1LXwOmu(TqfE19=T`u{^g{VP@U74Vmit!Q--3nG7cdZef#d zi-ViJLa>%BKyA;UOuqdsFEebu|7cosEjj8W@U`ghlT9Px`I)p>y z9dP-fj_{B3*71giKL=8=;kK}5u+F@2UlaO)Pufz!2pF}SN}TVp9Wfw?F|aN+6(q}> zsVW_nuMcFHFWONy0xi&V|43>2DeYIKM>=L2Lykh`g>iCT(*rmggg>F`Brb3$OZi?{ zr!=7`;d>szWHa=fpft9=5#ZmV^o`Kt{tMNM*c$h2s_n{rTrEZd!1X|jOy^zoGZcbBN_>{D4>1F@g2s zBLnwnSn9^#PY{}k4bz}}3&vwWg{C+7{N{zxEdVsRrSJt-(J@+xex&lQxr0h5jD1D_ zahbm`ASJpcXzCmHwf1eCgF%ts*c||bfPhj+svsk%)cbUxqkapyCOy6UJu0$Xv4y#p< zX6-wCzb3O!ucRRNk{p21NX%|jF9G_Uv0{_Xi=K&MoN$c$cM+AW9bIjM|{Rvb!^r9f041_cT}Z1#?ta|&ASO`APTF0V|R3Tv||VSt=it&y@XSzN;Yb9zj&H}k7QUsI0X zJo3cU8*iFP9T$z7Kjpo$cbOrcKgoMX5>6ZavY!WFh8iafm%oP%sh6dgYd^)`DHZvp zIYUkK3Lr^OxPirY@(yAf6$Tsfrs)|N8U;?UT`$UhEZ(*`e_1=EL~*At(>TI)XKuDz8v3{8xI?^LtQ#dIrKX7h)z)I zGeK`6&mAv1{4Kc?r*pAm1D=3gt5>jRpG1b|1X+^;hV4!gjlhI3Y@S@-)#5k?$+#c0 zTkiN|rYcO=5{i#I9v6zfXIV$@e2dJv#YE z{jRoC@#tlM;3$mJWvA3x3m5^hT-a26p;_PH%NxXb>`oi_u^$Te>(WDz<#+9#0ZCS^ z1bK;Yo(y6pP_o-1SH?3)WX74Z_)q5?m%>g2l2&8Ob>;Y9oVgMg!QLeNg{$DN?96Bs z@GC=j{Zdgg-lc!%g#rUY=F~oq1kDdl;K7%3gAXcG8@FOyuMCjhE^EIf4uUtXynHR~ zx^N%l%KoI&X=IMqI?B6$mBppWxWSijt#(>kc7}=eLWOYEUy>C!n;*L8OD#Bs!zu3k zft2@vP99{uey+dS8?Dn7FWR{Ky`WFP~udhWjpZu)X zs?6Ok&MNOA)&iwtV2Cw!T~43H4|D$S|2%vuM%M3OD<*!UuVQSN)KIEd?Qsf68YQ}R z)_XqKSUkaX-Mqmoi}(kE{FU1tS@^2T4t4j~CNNzW%B!%y`6fjn#G=rsg!=?}J5C@; z)PElc-s9{sJiI}?Eb#uwmLNZyeY55_dX4}BO(to^bn*F3= zf)rW5qf{X9!O)0p;00sLRT1ZLS>tMO*z*@JlB~LWQq9p_S1^Y>Xy28ZF%a8r!{Hol zE?DzURf?RiPF`OMKZ~SmB3DP`8(3FPbAF&|!Gn^lqNQqF?T282L^^1VhL9-CyZtTG zO0$IEi5#7hn;Q#_9Gb75D9;Va`=aqy3WqAkG2wK}V=*)#I+DoXyBdiCLI)g6HrV!Y zjZEAA?iDFoo2A#)7nlQ70M?RCR3G5k(w^0=an^mw#t9{6{2Y+&)JilCmk&DRt~@lhjM#8N)ulOMnCvL$ z6R(42rg&bm>*&`-r(YB_8>A`|_bUxuin;z;19Ft?u{lA*MD9X*Y>e8Y4<#7a*tc4+ zS;lC1pm%MkCwyEa_qAp)rio{b9Sq}NT)b@*;>EslO4G1=kpU5%B2@{Po=I7cB;YG7 z*FB6<-P0k$AwbXr1>M2?wnU#b=1|E)a3%R+;r(%gi2qGYK0ZMK3*P>WX5(Kg#RrR& zPauPLA#?jLXnpFf*Rv{|u`bYZvpg^N*p{Zg!z%kroFu4|qaeUXicSg{kW~DB-^i!J zh2!>$KQz8LbS0mv*(C~?+Mf4Cj~}D~^gvc%wo*nV*Hl7Rur8@+)J=vN-~5#+xKaPA z3~$tCv#E$pw_Rkupneo!?hRSZJwKjh)tDfG3(BSe8wr4p8Fh~t zkSnYDJeH-{%>PjUfKpJP$T<{-WUdo3%8R41AXF&5aGhyrJsWG@dlDv$;&dZR^f^;` zO%7jIj%b^?REL!2xa0Sz{eTeISj;qF5}BOY=!xxqoVaDQIwgg#pucKS<3(d!9sp;h zmj;JT>D%t(3Xx^Of(53H4O8Io>l{ZNUjEx{=fQp(0mGTjw9tc1gnlP=T9alfMlW@n~NIdSudO}(aquf>8aVOam*i)nFCSj zr^`d#r~UTtmC?x=YNPx?*NKYUzn%O zBG2uYNMC}NMKbdC-SPwt#3QgmF;`D;)V6pT+0?#B0>4}*1Si{7W}vGaooO)w~@~_lPy4voD{J1jS{q9ON%)XBmtuy4^S2pfnN6o;-hwMG_ z`ry%b`cG=@|L1irQ07#BhBUYtUm099?ovfm!kt4)du{J1R`#?nFF1>E@Sc9`YO}Zevf_!o?r%0l&R|m0sUD{_ zY24P`dV1T{vn+?mQAFRlIe+J;reWR0%ZHM})e`Ih3&kn2{wS*N-gh?AQ^F3LZb{T7WZ!L-+FE;GD)QOm^k@~w5>0d6@IW>Ap^$Sfx4~k#1oe3O zTgN0qULLz8I^eC6BTD6tH>2#0G;`0`*!0wx zZ{P^}+CDx~_K#o*snEcDDbl_&e{VE4ah`+#Pc-xkr*@E2?2RJ!gv_%(lz47WNin+h zFF$-Wf?M{6It`+DLF{B^Ru8>1HrsE8+~(Y+uTuX5xBtiM`IP|RPU+ZZQfe(yln689 z6)!UKp~IP%YSB#A`8PgA@aT9;Od>zOIMZ1qEXVfP)X9*N z8CVPV4K8H22d_#C01g(za8DU~WJ7@?3+?}EJ)YjxxTNN}Fm*~aU|Sp=0`UgX%QM}) z{^qip1Tt@OIA3YtWfW5bn#Lv2M<-%+oGBaNr7qO>-~v9-JmHY@`An56PCEr(YzFGX zb)$aPtd=K&%h^c-%uU+@AxTn=yxK|5;g<-)kMq*Nw!+5EDu+ppk5-pvhUj@${k6Ps zw!K?TYs-y#`CtS4^MiMVlE04WrqW+ZH6nM96>W5pTe*6%Z03P0e;4rRLGR8Ua&|#w zA{@PLLM%-}s_wvOAbryF4-bZmp2Kzd^n?kp~L$qcwBPjW0q% zGyDxj6}%~+Y^9)UP7_sq?CCPT{ipF?yljkS8EF8*b+sT;5tm9%# zz~8RKCqd3xPsq(;(^#Uq3U~E9ga{Qq4Mz~1`nK#zXtxe z#>JCO-mfQuUlM-<-cmj(4MwF}>WpWFZ(#O!8nsfTkS7VEU56(k+K|@i3L^;J6x1B& ze}DGBbSginQJnQOIUgUl#jzjx87%V`dy|LrvWmqw;$e9Q?OCo8-DV|n)9fAgO*8v2kAAW0cC zmzZ7r->rPbF*mQ6^k(K4($BAV?{UAN2T;ulgG}ph{O_x4bIi>%CR~C4|KR530z9pU zyEPsU{&|LeDUx@)kGXjjGr|GC%>I83Hvj!oj>a)JZ^L;$>))^GPiHMO?wFfr0|#yX z%FPQsd8N*8{mHY`?|=)2UY6H&DZjP*&r-Qc>C&YdX+bIdVM<}8@IcT1N3#y5VTdnmv?D&AwtHO$n*k*T>iY{4?bKrGH$a zr-QWVhr|i)M`Z%Z1bd7A?=NTP6i2RB=(Z0x&e9AT$%;sns<@wQNH!iw_Kk_ zW^cTYFL2D0YaQvaxqu1N#xjm;uH=1ou0&g~n+5<7M_mqTO?nKAAlA=}PXrGk*S!Fyj0)rc}uYSTlz_ z)GqrEH<#aSZt;Qt;`>9r4n+A5((zi9!YHlVSu*TtXd^tds*-pdjeKg?dY*w^;n)6ltvd_i77%cjbk$==m>vh zxD0?a`5ebfW3!ZB-)ktorhEn+@ZRUk<5mQ5K{J-;-4n055#8;mnly0aK=Og^^8k*Z z%~t@^M)9)Xj_NVnN82tovJkv`0;GzfJ5!Vkmd_I@7xaFG?HGI_5VV!`HfPY&u!CBO)pK} zAeD?i4{I#V*TE-CL^oJ|ePTb-5YH;l%1wB;d;fB>H(PUqRR`K;&b0M9uy2-}%BNc% z93eohlz^SZ>U2XxzdOHh6X`Hw7&p^s9_m>A(Kx%o=)%D@1UeOH1*#N|eG7bk9~&Y> z#e;%VEf2_>&AMre7$m#QGQ9j)w?4#S;N3Q>-kk1|(zSDYbP$>$@Er zOSYiy#Pq02z(guPgbUWRpEbJe$_*@yZYjR{jVxL2u*FQ4%<=ZJ^XYR-m$RxU)o^or z*|fQFYY2e=92dGA0d_tSOyL89kvU>)sb%?Ki1ix0W;*q1tkh9|JVX223i4JWeZ57o z--D$wq6<>u@{eaf25}dFPVa?O0sdMB-El&K(#$kJF5K++dCQ44Q!IQz`jqZZ$H`#>rLK@a+;{)LqVjcwrPdo*K}ovbQ6RD3y$u% z*X|s8o^9`-5}Myt=$?4J0$RBmqLU+4WdegXm^hrvZ$114WV0`f>Di%SwDFx~Zxp_< z__0Z1Uy$b356-Hinbf-dbW}ra`=^nX{-PAq-!`85)mKZeSr7DCQ@-0 zJ}lsdO1f4;pM{0Z17w1JmwL-^W=y$Nq9Z(=#@cZ(perlH<_il9g}7>Kn^8ZWpT=|} zERBN`136F#EQ!t6s#Pj-WJ?8+^FhHtKnlby68nR!%DGFsGF7h`d}z}oU|wUkiuX6# zAl#Ds;ZOEb5~#%MD(XtV*7qECioUZh0JcaYkyvxZpuvj|%9qk+{SDk3_uw_Oczl=k zvT`G#kq{DdxewY6Cr#Nza1a2`%VoueSNu{wn;-Z^rE2Zs zpR4njFO=Q13t2Uv6b zuDeeZP7<+yR@9UHs-#uSk+aIMgc%TPT6ILC4TIK?rn4K1QsW4CDiLY>{rLj10~K(^{S9&NGH$ zZ}x|CdxkUhC6TK=iNbFV1r16}CS688!2|1IM!HNJ8$}y_N2)fcDyHFFPioTipX}Kj zP725!hnbWlAMU6K4v3ir1W)I0<+r28!M7-~c=N|;V+H8z9p@uke|?{;y`z+7SpTG` zG>1)ZzCBqKT&g)L^;|cdzFO%4jI{XVc{&sIxFO z`J8QlqdEt8#Yyx?$-^=Mq*}yg*~>m85dBCT3WyNjjNprnr6?Q zoV4v*`!=J|@+>%uVh6$Vt~Lodv+U>Mcpp(}CPJ|a@b$X2h-+;ejGrSkNW~pLtTyg; zpYL=~3H0B|oZ0BD3$lGjRs^-eS2`1sETIJY>N;x=h+ z?E*pfjXc>ZQJ2_6;B~5bgg%Q_;((m7VTFGN7wK{w$GtRVhFewAH4T zKa}B;*q>@W#d{PBIMt&L0{dh~fD-uXAreiM>S=~O|IXRiCH&j?Z(iY>OSv7Xz7t0)w6SroUc;}q0>VO>Gz+_QiDf$$Ua|4tTlt0YdijA=eW4EBiKu>?$ zcsy|~+daLZA%|#xh2QXA`&%~N<4_ht>*{o9>A}q9(cHu&#;uZCRdq$8yaVDGw*(?f zbY~B4b98-H)^zId9;Jf}@;4vR>G#Bif7-K?^{1sYydN+;|&avWH8R?zY z^@noLMEd0tm)fmBs8o2!-mawmOhxJ@o)q^G5GhrzHhpcT4p856Fi=Jppfd`N^NPiF zJ>uBZKeJiQu-Na_ncRF>%6Ew$SrJNN=!mRH`m{bNcyR5Iw65^FpT?qDkFMZRZo>M3 z0jkE?SyvxnVZQ6VPpEK2uBzojY!+#K)Lf1ND26|(YcBcN>e5WXdG+L6SymAQi*jO; zB)o6yuA*9}I+9#M2z;UOzC#34?wB|=^OgSCCv&ro96a>66_}{OCy)$seh9B6pW3Q= zcqN?}#*>t~F~@i?C!`MxZUyW0ATpB}WYU8~T#Ab{0Yz>cSo=gT=H62=`*Bo%AAV)@ zx7{o0??hYPwCPp)D0v2P`3HQuJH*-kP9sXD@z}vD7bp#qh3)dk!$PRFz`1jSoo5*j z^G1tD?k|rzKT*Bs?>dU^s_XFjp$g$_J~f;o<=Y~w7SvY*B>MEU@G9l@Ock8(udfS) zoyGx-$iEK*(Q%ZjQ4wl0Q&MIv%6*?kIRKlVKS+e8Bwi`ag(?CTgSu#jlhU9BX7hCJmq*;c~)PkRVKSk68x_R4-NrCO?!W#soHO7gC5c)& z@TflpS%5uQ(D+ADyiY-QD}dGvr|w#%OTzZEk?$6;CqBGhi1Q*0U_n8G`uPK1m^l-d z$)kd^1g$3Po7Sq@#0rBfNUhfdZF>^Lbr?=q_kMV=$t!fd@NT`RYF!|7 zN$c+6^m|tg%%SdNG5O4Vk0u@^KDTR|?ql#q=qYp``ru7B2C2xZH$x`zM zfgg{b5vOY83STX8ll6Gwoy|Mh+0@J@PydV0f|>(`2&@f!npb7PTMvOuQJ6oo*o2hM z4=B%4&iT0eY9Nc~tT2duAZq4E?Z02%?0#mk!#2c@_U9?Oi8k6FKmDTQ*V=e|7_V+* zv^GmPJW^2Xf0U3*t7_eNYDWY+25e!?$btF8OZ(*pA?szhnEmi&N2NXgOTRn%Kkt=9&C-GpKQgTC+4A zeveYGupO|t5{7MXRJ|Zz1`iOY>F?(I`4itgmBLxo9Kat>yb^cTeq@pr$9#%5u;_v_ ziv`0mo9@>K@af%WXSnUx0@}I_Hd-RS&jDlLd!dc3uUyt!%i^W@G+Zg$tEMuyp(h1~ z@W|pvm*tS$go9iJ9WTyo(Kxdc&G^_4W(&dySZLe*pLED z;H7lDkzEV3-!D8_*e?CRn?Aa>9y^sJ;$JeL^3PQW=k?Rv#%q91-O{)cTymCqCq-+| zQR6j@1(viGA9^BPn}#3=`6(KT)8O=C(|Fo-**G?-SX5;iwt+Ea+-TrwU1e#d9j`%> zrzNbZ$tzUuz*GDn*K}#)eS^pLhK;}T?loh-ox9H=Qlj7(qkR^Q)*Im(QTLNB{mT(C zo#CFW6%hscYQW-D6QFijw}!v-Sewnfv))APw_{o#mpLCfRwM1b%A=^Ly5a+Y6d%Rv z75T{3mu%rTaIo*@TPFZ=>OdezbZbOdjxQmi4dKF7@6>!2pdkY4-Y=rtANtK3dgl1_ z@wZJtX!(GZ4@Gox+v^?a3DVxoYQ)RVKnY<0)F%9;2O-*N*IXli=j%y?MW@LT5~=7; zSdV@r&2KKt$s{ZLgQ zT?Qe<1woJ9VVlO|K*IV;Ro%w@Rt8Mx+Sk^(0f3BU6b^T(T@vmSIXWP{+L$3*<+@^2 z=U%j&nD0mrzKxV^9j^zP)HtlC_~*Z!rw>m><7z!8nVrUq?RW!Glfj~}2h~gdt57Lb zttg1?mWLE%Da%V(U#MFNyh0l{ov)*jA7eAO74R|N!Ee@^XGt>)qnts4u`cSUh zYVxnZmH(?}fW$MDn@Pf~GC|yOzh8!{IEw0Bz7AA~L1Bt_+(OVqEVhcL)pDlk)Nq40 zf8f3t<7vP#1#W)0-T|5eY^*o7(XJZdXPI*Tc(LJAx3SI`ocQ!WVc#9ZqJdFtu6NtM=<6_-4a=Dr$gYHDu>uq6zCB|QN+c{R-)B|jPDC4+>j z$|Eo+^=Tbrm5)U#UJ@Pb)o}z5f%VGO>8{=|7wYyeZS7TpVVtLLEcG2k)pC0Gzh%mn zp(Fp>4J8=OorDz48@P}jv}=v*pO#nzm>FOhubsmKvemoXjv9Lil;4vKaO-MHBH2EN zAz36`E^=^iFv)Cl$vmv3M?x0Y9!t5+T0Zxzc1E{Xmrl+`$?j*!Dy*IIU)^n~fRO2t z@&hm4u}G?KEsvQ2D-@Wbdtcs6m3?JVKtiwa@mC%dTB`$Q8n9^&D6yW|`X~DnHc4yp^Doy@6b^mjXR>~J` z9d8Ace=ec_dBFl`NQ||GV}iFzY^dyZ7=w8lU{51Ci4=9Jsc^J9dqvuJ)ec)Vp4n=f z{PvistOgLj@k7`FP#F_a`gxtcmsC1U8s_6!_WdR%`X*@5M%U3jY*TYBc6wu@M_5IA z?(>T`F`~ASr_tUoH@udHU(u_x8>m}VT%Xd^8o&mh{n>RdM}=Y_qulns)K!@Az)KI)A3uMG-D7#Y{!!`0pBo9_mKmer4gjp$7GD-yz*Tq-q!e!&6fRP-NqNL+rAo`` zwBYu(aDXOc(t156S0r#-VYonF)u<6Dchy+jPM2EPUpE+WU+HIQry*X%Sg{g7bcA@U@F`8%Bfk;*Fw)J{C zPw5ruCTQ|3uZ8w-vZciQ_@%Wj#zVK(68=x|e`mm-<~I6)RpCv(Y+~$+FhMT>SbU<` zj`XRz232T43&dp>oupbV=k0n@kqE2->=U;VfyN@jcu)!^#pyVp1#zB~i`Q(Iu1prgG zxJ1=l{Wll7u7}4Q34JY}E$0#wm2V%7E5m8%vGMjibtSpVZ@?R+N$GowL)i_?_R}t2 zQ=n|K+D~LO&-JIGt5qXTA1(JBbq(9}XtOxyM20B&A5=@)03`oX=`>nkpIia% zlP)mNZx*xr-7;)QDWcgff|68Rgb!KY<=w#Mbm_sv5u=hI)_K4{>pq+ z=i&8!vM2|ZS{$f==TfWx0zJ)YY zdE?yej_Wo<4+?m+kBpdikkQYA|Fo^y2yH&A5K&H)vV%fZ`?j{r7Q5BLmqdCGO4$ezel z#C@PDt$rn7EYfkutz?V#(#_wopS;cb^E>YU{2&Wbt}^vY0=(pHuROdHwEdRGEB}2Km>xfO-@yQ8-Iz(Sa#-O=cu{1v}hRaH&KHE!b@=Aco;h8C>Omt5aYr?0I{G0~e;I3#1^XCxt`Yei- z*Yle1LsR2iDY3r{o@=OW}L&(iC2O@NSl}j6bC9 z+O8*wKB>;J5&z&-O8wlWqi{VD+g0w>Owvdrb(v|c9e1<5f0L2*k5%>GRxVS+00iy2 zRGa?hr`v|phDMgOGNOk>L8_jBI1O2-t$%B??jE&|ndxPL zyA56FO65-!5P|XPrpCy_2~pcSUkWoO$MzTvy6nRlIL1EKryxAqz#uZX>*lEnm5_r6 z)rpVL$Mn$0$kMK{vZ7bs8vS8^JFXv#1+Ax2F#QP@72ltlv%2_G!#V0)6cq2~dxYg< z%dJ#;`q^aWYsT^O%VQr--Qyr&bOWX)wMA^Zxd9?_ypXwc7qHOQ!d_#BozAgO$^ zRMKhYs-vV+Jow!~?%m+@i%Z)1KmCUP&;!06n}{~uw*3zP|D$^d{r&V8ADtyY``0s= zDcrSUtbe^Ei6E5+Kt%S#L)HLrgA)cpw%+aR?kWe`Igu|rht=LcMf&7D^!b!aCjY;Q zWNIkSvap-pUjF%IeYfJmnuN9An*`^%Z*7`Dv@wr1rHL9~Iyj&Dp34c*=!jB&r}IWWKgQJ zDCP46+LNW@JoC?+Hzrt5ugf9=F)_vZe2ZVC zsdpDj8dq46XD_8ao4NDzGxy^P-@O31={9#s&UThF0#Ok4P^atOY-wg%60Yd$imH+M zLT05@f3<3%7dbPS@V?VShNsQ)pGxw-7D|)3LLyI9+PVgCml zCdx(iczp=;alm5DrxE3ZZsyWUt#g^Ebw%_-Yw!N?hfe#)R||sZu9OgL+eeo_9!dw@ zQ3H}uzHMPQ;`wRZHALyYC>vJ?Xcwnk$l((EQ7)qGDEC}}A=iizACz+X_{cbSPjh#b zea-Kq!$eM#=O)%I?a>wPCxNHr59@hUAAlA6^F6$U0FsD}hk3K57QGf5U(ahKNo{<_ zwxOFnVLS5!yz>=TqTJYMsw)BxE=zfcJ-J(xkq#UEXmT}EhY9Cn_2k>q@3`16vroBH zbte$1l)>`1KWhKA1qhu3&Pu;ddv!C9L3`y0wYYkr{1+to{qO1U??tex*iFh~|G?mb z^cVnr&`1`ux88A7nvX0^b?y**8W`B&a$Z^rya}W%NywgqdyFw3uX&{&qdH^6-!u`o zSv*XOE}vh<0d4DJ55Qtm4ISGWeu>|x>r;!8^?b#t^9>`&53-W8_V(z!c&CXn^*z}s zT?yAmmojynjKogw&$dQ&b;a`Lx_$kF=l3Q9D%pcN*}cv%Nhb~b=g*&A9`RoFJ(M`~ zJx&UcYa1^?=RO4mcct>ynjd{d3%7Off|}BTmn!Br9v#^NW4tUdH0Vs0xo69gd-aEp z%2mH@$%_5Z6GY3NjAWI&DNN^YU|4DiE1mU@ zrK-MAt$L{^A+F;3oBDpKkadkNLM*a6jrH;q-~xR(cOZeO{OR?t_u*;ann`2YMG7aN zsouVtOATZEURf*sKriBxV=E>Gz>_)$6d?RSVnae2d{3>q&>-iyvR}LNg^DL%cemBM zyq|T0`6-+b8ZjU1PSC8(qmWPOem9UZz~?;=XmCC(+s;FG%io)16cfqdw8JH;y1Q;u`66DOwCdx$I&Y63+330-tWCX6-5}!p zdu=ei7^!0HWOz^VC%0hCnq@KgP9VQDYgK=`Pv6N;{2!zZ_~Wa`d9Li=B+tuTfPI0@9)^}X-M_F-y%n|nsBcBkFegK<v$1HfmkvdRt}h+|$c!(t)fc&;XqYh z)zxF9yD)W3QB`{(xcc?D4ti{57cWCO-*mex`s%)Jff5v4(QWp|>Kh)lAY^jBYyB;g zq04$jwa4ePu?tw}fX(dgjF{sJ$2|FCYo~y5xeh(+84&_Rh)88O> zLb*!e#2cORh{9Sf-BSk-aT;KO4vbLKv%SAmB-x$YlbHL=U(G=Ek;8P>`@WAUvR0*4 zuG6FPVnykb`TfblsjdtImSej)iAjMUAk_4l5}vSZ5`#Z+ZX*En6<zXJEWG%r!Ye6g|0_A>DkPxb0X(_NVbUyke^-)8VpCbldpVBDzt;%x zF=1aq0d7IOfOBC15dYGjx1ed8zgU*;3YXImvyu#~aT>03=dwi#9u#5>%$oNxx6sU; z;~e>mgLAO6EJBXR(%Pg+7*t@V{T=hfbaM4H?l8g{->}8wHl-NebZ0P#^nPr0+4RWkI za8a&oQ`p_4-F57Kh`w@QI=Hba!`17{eaZ%i`09zd-qR+DhyvIfmiEkpkDAF}ZOOCG z0auVc6sDO+=75W_b5P3<-p`xvuLBT@avGfhFBKhsbV{vW+ZmtE$^RqgkcaX~kd1ps z%{4P0N$nc-6*hAK`^;vcIK=wfPWoIDmZ}RBvd;q$MM925AngK`A!%;|uzk1^;-64a zH02(~_2vO7WY1%Uk*Gy`i=U|63bR&3hZo9oqeGMl!Ojm=d3665cnT6d^3C=7wh ze;V$6ESK?tvIi~!dr?+%%y{zCx+q=t`sq!XFJ`!wR#m(^i`HP%eG0%jdr5-tL2((K z9hz-ue>hkwG>}xdH=jV&m6|2l%FODc(OEE3;f|xX2R}o{cPA!{;Ur`l?~&{kpppgr zHky|zK`-$rI0#Tm-RL{9%>1TgyGN{gAtIMXm!=M?KxACBcM-SPgV3PQkAS`<0r0j|I)t0&E&CCOy z{@d3Zh#i~6s^I=qTlVGR`=vQv_`%`ec6obt2k-7K{mfEw<}ISXF*3EHTdOjMVx<&s ziXw*^AQc8W<|=FDSBlcB(X}*X>APE%lBXzqLkkUV0%TiiGw7L10yluPl5$+~slfhy zyhHSQ>H~u62bKWhLdkGOu(@&hllcApo}JS~$tWiB``%j=pL7)t?}ByGtq*Jb2OlX0 zP6tL6n<6Y$n~D+v!=x|FGKft@is_j;cO~OmaKTyj&0@AR^yCrVSD`xtOWm1{IC}D| zG^8i1O%pF9w^|ywnn>0{I~od!FkBRi^~FFitBpbP6#^C&T0DpAiTj)1krKbj?zCl! z>>V&zr}$ew?$ivkUgU2zS88y)MGhqs;^#FNx{6xEJJ%#Lfr(JXN4S|WuMYc@B&EXPChMHJ!8Mc4PSqa z`mF-|2l>N_E!{O-3bVYwr{-GM$o7&@pTl4l3>9wss?=3k+sC)yo3ax|jJWr~f7$p= zn*Irrv|F-;saE*?k-cQaG+^h3R&ffkANSo}F@C3XTgsVoTIV+lbb-UO9h6G|F$dnv z5Pvg4qP5O8v55ydi9GwD)H6O^Owpz9!hjQN6&qyitkVGSj*?{)KUb>z&5_ewv`!pN z9^CrWT!THFnOcNQ*;lBFd2$1!d4u;4`Wzepvj-VtH&!GNhI%*O^=@;Z{hd zXT4)5S`;Eq(Vg1pqh5L0*=A<{MT2IusPQC&!YCR{hwYBnba6$tyCB9w;sqXt+GuaLsac=F7e+4Oq?sRCbceM zCFs4H1i(J&sa)Qp@@pRAD}{ZVH8R;dKj?6&scqJwwqi%`Zdx>b>;;u|j*t6~R>P!S zy@Np@mN|>^C%OKo)1HKP)7}oXI?!w5 zOXj;jc~U<$t7TN%)JMALyoG1d)oNHWizr*TZq&%zRfYWia_`T*u`|-L)%s!+_=|nl zEFOoCj{jC(15>UnPt7b(4M>9xZEI(bAm0QJ%~?}9wv#+W&1MN9eF+XcJB3PADn^?o zF5ps}n8ZUN34LkE-kNaPW{;4d)Re%cW{EdTO;@p+OXud(jUkeydPprS|w;dBxDCCd9-Z`h8!Nv=#zrWel)g!e%6YUDWA$2 z?;pcO>kx5NvnRc?Oi&;GM38{a@38|TnG2p(>FBjjx1B8%NXxbx2yD2m@v{4#v6%wz zaW&Ub${D$~)T!!ET&U1zdJkdKKQPTsqq^ldR($o?XN-z&IXP2WvuoTLjc;=-+k`)G zMcdFht)dZ_le>pyp$3qQdiU&bk=Z2Pl|#T=Wb*A85O#_B4S;jE^iNtEGOmqjSqx+y zVLbD=iBrC!IC=S9Aet6bNmN0s4fAiPVR+}#C-t4dZrR~-Xxvxz07tf7v}HR4qv=zmao)`Mgb#o)5bCj_$7f+ zuhB=4WkTL(<$2(iT8{&%p=;0r;JuF)8nn_+mU#L*4()0Jd$T9lt?^I9jd}k0`Kw|0 z=H@7QyAwlwCN-iAl2r+cC#WZW3%n|t;y3t})3oCt(WS@c*=+y)rB(7&;+Bb5-KL`O z*=qgFCHaFiwTL?3*HqQhnngy`yy3^Y z!KT{Shd$}lC@Djb_)hU;YjRgc(s1(o=`ss#(oKs*qvFXM(qbTL(apMqRAj{UT7Jo$ zOVH+e$!y6O3h<#5-RO~=YeAB(jBM*9JQ7>ca8cN#)3eeX8S$G~Gz*6^tiUYkf&_UI zF4wmMB*hd7m{p*5pu&91fxhp$s+R&|rSy50hUJ6k6-Y!sA=NGUJeyDFdrj>trPw(ef46%=(z!C!fs~hU%bab4gT>%};h(qswY>`qR&3`1B%zK{}vE zbb$VvU#gfZh3)Y`9CL3Lp?j$AvG4I#93f#%zq|C|_$X?o3;p%*>u z^QqRb@4U}+QCBNc0+Qq1+E+-1SvY8|l^6Pb_E+7jj?oqo;=T(Fz=9|WnOV2>0br$R z8peu$Edhd?34q9~_&q&MjTOnlb?ix%HcXxDJ~UPA=pIg`@Oa^DZR?k62LbKAsY#vi z2HWfh=FrA$SQ51vh9I{9M`l5MINGP+eII93*}z&6ff)M*?D(g>Q=*$m(sheMF>xiP-dGYl8pa3qrBhr{Q zmBWAN+jS3;xi6|9&4Ni{YCrV_brFf6U|CrTO?sSLZI@awVw)Ve3EvLhA5f2V9yC2l zgHnmrcp5rT70(purr$=h$Fhc8y43>eyBq>ATggYa;RsgofZ{kIbB))5){8S*N8*F1 zYP6h)f47)p5rs#psd3nZJWtuNOPeSi>M<@4oUFLgyB?HHtPxeJ0Mzxyc{t)q?ak{e$q z9)Ke^16;_5HA)|FWgBeTvyY~$y$IuNHCw2)+7(Qs3)F@Z$rya3lon8dDAh0){o+?s zJh_4?WGA&5VUi=lK38^Z5n!5F9g+Ut0{lLHRh(&F+I#X{Hw3<#@QRUlvi=LYrXH_i zFd1>Yl{q&+Dee7(^jfq>n2#$M`M!mj^;;F{`=Mv!etL}N>!$42!j}f2uW4ezNxZKi zS_>|MvFc9YVIrW}{oC^#f!TUBUhdErE5Xy!yeZ%tx+xpAeJVE=vHS*oQ{y`Ie(M!l zP;m^Euy`H%8s|Q^lNaPtV6*T7Dr=R-WOB1HwX(=Rwn1Wci51thoOq|lur#qmh7v!8 znyh>=;9WxQNff+#)DHq9v^-Egk#9;}b>v7!;uGM7b&Dq=>>|+2FW$eyV%lg~(r+0% zi(D0ZR7|`Rm_P*I5Mm3MG9A+LtR`D6EAV`mt&9`a|6_ZFf#GamQAoCPfOhh<{NrIK zQG&Mw8n#_>f;*k*$$c#Ra3n=3f@J`l_Kg2Q@%`scYadIs2e3;YDb@f3f-V!$d-XGB zIB^_#))<)fme(RYdjl(dkFLs4*KYr9+B+roVTH-=|6%Vv!P56-AmTAV>%4gdPYTM3;ghy?2yeBfU2pJ#<1Z(g_fHfDrg5xYu4R+~3*z@42q? z$1A}k@4Pef&OGxxcY*cApEaKqsL1Y}1kBLo%}KuGA#6VW;+k-`&diNSV zko~Gw>fj-SJcCa;gsT(f)Wry(ru@$_J(#`FcP*)QcaMs1K@C<3H)=ZHg=mH5GMO$( z+SVbW_w>=&MTrBE;;CSt-A64$gRzFtq1FkTn%&mr?wo;95Bg$_?*M8Oo)<4VxYV?X zjKVx@HdGR0y2y^?zpt1c4)`RE4U<3m(TqQ{+heZnwRQ)#+~VWJbQ2N}l;GB|nl^Oo z&t^^b=U#W3jIOFr#XF4&G2PbAhpMROQ0`z)U?jqCMNcMr?s;Efar32H!+vmid5~9G z(Sl-Gzf&^Z#Jby*j7y-b-P^J1a|b}4Pgb8wciiT%{h_>$3ui^u9gDNVbsEg1JUhsgO zvR~qY)efs6A+b_1e6!q9*jFn&wi~@3!rMj}4$-0l_Y$d{&=(EFucGq!m4swx>45L=q+)r{!B*SwKQ=*`ef*{`6rXRMAoVg3JW$FWNbV-ps2Q| z6%N6LQbpo69)1gA2pFr@FwPaWIBHt+K@Re2;6a>4zH9HIF=p$9<7b&^U?w!k8cNr# zV{+56Z81Zo@I4)3r6==AbfxVZ2lTK=NOUQrd!|}=L2R7nn-c?hYcdB+APe)fRAzJ3 z4dU}JFX+SinoJ$(b2pToRPV)B!P^n^on|vgOqc-S+Y^s4ms++Qtb( zvMlC@omhIV-GyJJ_kAH=4Q=cvFL;b`_FXNT2Yk;R@0i%ElcByg)?d3O=)B~TL$0+H z+TNgmz9@kynBAW$@!Z=cMWNhY@66L3^ly#e(8`5b?TL~$ufHWM&7C^q)3%53^z_WP z@AjOx6H$lG#BNvilxKeZk~c6>BaXe)Td^g4=gv2i;7VktOUjw3S~d^oiBDI!mR??Y zUyXSk*es;y$+Ev+ytLO}f2}@b42i_uLaqT`NUBz#E5Rb9gTH)$@L`{zt^VTV}WLueyM8pwzf0H1T{J z&J8TbGBS(%)AFj0HmWiQPyH7BE{{YCpuD1co)*Ku&dmpw+9yLHxVbGih)Qjc{eiMv zVG9MFgazU1=t6^$mix)PO>I}gx&4!`$#e6Rq)^2R?VX0KmMmp%bRe0DoUz2rT;7HKQ%-wHrN4FQ+g5}uU1+w$;0M`}*v!ctmqBxR8O8TmW@?-M z@7)ATRCv-7tCK7A><1?{`!03VA~Oh(?8(t(Ps4$wk}H`u1V_N~M{LM@@(DVfojpJJ zlI{HHLb2tj>i&*XLaELgPAIW*rUzkO@Mg0?tCK|aG&T2>6_TuUzB(VF<5~E9i12i0 zai+(XN&5Xd3H*6FDbH$d!$5>UIv{QWndjy7^kiPKCqP*lwYs4j*I(;~0B~RoY^^y1 zK-15KD&{_zRj+;8iRA0Rs-dl6eo$Tz94|KlNYRz-W9%`m}Dk zY-jZ126heCPr@JU`{}03&l)>5*P7%VyGh22q|#MRICO&G zMV;$M;)h@NSjTnE_UoL(TZegTQX=m2e|HG}731`2TXc;5n5gTqtG;|$S?B*6d8NA& zX?)x#$lHiD$lDERgh}YQcKn`yUZ=d~yd+$v>Bf?ja3iS^Z) z_#HfCOGN<4=OHXVxjbnCH)HQm_#BS@k--XLBnV#CDUVd7H2qaNJc5c~{CKh|;0(QI zV&X#}bQIAsoBo@ftF@*SVgI+B2LV2D73T6ZN51^4#Fa^8xuR*a#zdSYKqx9^D_+|& z0!v)31%%2t5jvpI^S0^P`u)FCkH5apm`?-%$Q<)+N`Q67?6K>>@;vth1at1&aO8JG zy%(Fj=IxWAtm<8`mxae?6XhGJx#;z$i#s;ZlvW5vs${mnQ#eWT9Ki@nhN9<|R}$yZ zXAR81Z;3C-WGYW)#OoKYXPLgY5Z-saD}StyL80_ALGUXiLN>mxc%AtraZa@rA1(9G z!llP&s*ZOkr6d8OIU&^Yj#iY>{(JP0x;d)zQZ+{c0KQC7&ert(S6i({+ zc<>0G^VgH({q3CZg(?`Z9iNZiJg7NaW&*q2Qat&KLHqYpF7=Z%$}~rD2c57{>(;v> z;he{++kS`Yx7A}fM=E8!SP<_U{sZ`ix0UtrkbbG6WI{tOfK~*QKh~dR82t_aFI+4BWaaI*GHMrf;o392Z+;$ENY)96x zy0%kgW1$tLRJ|~a$S>CG(XNvMdWF2sOAb18{hvk?g)tT za1wa`N#!f(oSP0i;H}eQ6rHG$`K`6m7i?=~{L6dJY28XaM!oZ8kRu2D zBW?e?!||^u83@cLlg|wve>RV;d53SoJ^?tDALxH=5=U?NpTCK}*f&3bK5{llIrm!= zf4h=*>^Vkf4?fqczYBo`6LD*oF*3`khXC#42ZNDuLI8<>sMV3_SLs9|XEt}G5;t59 zEwI7{JaYV5VF26}d2L1sfQrr)B#X84Fpy`(pRR14vsT2%mRg2`?8<|TOAb@MSA|{q zzm$~a0cyxowOrlMByzhY+J;|eX#YA8Z3Fq5Y+0y1;ujbw1;FJ(!xBS}uP8z8M4Ckv zI)DXwaU$Ic%biE=x!PN5@8%<#;uh$pGgQT;T?tdovpbDIYw_w6=KU$Dd+2re ziy?)gO}sM1SD!#>E%d{S){yR}Z>x77{>h%`zWc^~cOddy$#-L80Hjf_HGp2>-!{Io zUf=LjulAk$Uem0d`Fq2|B}du&rNrgU4klb`fS2Ja94SrjwWcBL!fQakB6m_-8&5|G zVn5lH-kkmOchMEbK7vqI#h}lhZz1hG=odJg9F`U}YfZKQzTzHid2o7g#_AeCYaZfSw=N9`EA&Dp?u6bgGB{K^SlFPc7>{$ z%JU{M?`?C4nOrgR96YsR&s{gqdNJy^^jUQ+Arh3cRAm7O>DiyVzbKU{o_Ih@sz&!A zpasx-s8h586Sl6wKi=1Ugrjc1c(^(~2Smi3`@c=U6C6RHn%)%5REgVhS{9Q{y!Lvd zD&0qZHrNOIC_AD}2eo_#)GW;kv$9n&k)>lU?H-Xj34$JJ05u=}m~KdB(22vkF-E{o zyT<*y<2+5{7F?yJxW@d@waBOK6;eNss=tqCQ$WkD{>%5Sn@QnS0`^6@rPerNWIiz7 z{(NOkWNJYYIwLpMkYK;meXV_Sd+j2`*JO|f6mpl(kdp^{vV5(wFBUo9QRTlU>QsY@ z%AWc7hBeVyL6?530unp>_DRHp zN%QK8)v}&{tlIFHy1Ub8lnfcD@klQ!$JLVDbkIuYc6v{4yc{O$r5OH0(S`~)@*u|R9L?GfZgWXnQ2j)Zfd~F0@THHyR1swSL5cMdF4;i0J|em9VgaR`i zGH7;ua3Ldh<4Av;5OVITPt!uUU#htj)fGNiT&`N78rjZ#Q5uWwth$uiA=KHRqD_sQFV3xK1ijj6=o zK>cMvNFK0O^h?{Lc1k^Z^+0w}CF@!4qNeE~O^DIu)L;4?J3=<)!$a$NQ=M$Cha9k= zn_wZMdK3MdqFInVk%RBtEk3dgkKxwV_x(|;c;zFCP2kcS z&OsGAWBpEqS^h%g&HMzH{>|F-6k=HiI2m)Ut=y+*{K?#c zUr%8Nc!7pqgZn9#1H2*PZi4fpxrJoUMQwo?NhGl95YEn1x56y+W_Q(&F~PRC1aq|p z)*-ge02s9Pb9|QBG~jAi*;7I`<+7l;z0t>=P;xKFjI&W%Hz)|->B^BMe;><#g?+%B9y-e%M7)Xm zQ8w%Cw)N;M@n%(D;%&nc09&m)i;GtD++L*)wW_)ci?YlD6i4UW#4y^z7^!@0P}gHU z2ZSQsjA)Htppt|Ostsvb;tDFsE-7fLtqU>HIbUB0K|1?@_$hLLD3%YbZ!+3CH`R)K zA?3O{Ua_4uCQBlKqn6ZGWZlPES3IWC0izYLWCVa2sNjJ5h$ler%y(qQqT;~3lO9vY ze4^kpyR^=l=xOk3A$r8AY44<8is9@sK0((4GACbOx6if@_*@w*G3QcIkkauZ?n9T+ zKj%@+NFt&mf8P<1H&>!93>`FNTH5GO@<6s)H^|BSaf+1Gu9qE%y+Aam`7>%QdTBa^ ze>j?L0O*k{C<0#ZG57_9Sk2{cuQY=l$c>U zX>>F|{?+q~C)IMaxkdoWSV12Apq1317LJo;&h5ZM-0I0Q4C+>&DIzZXE6bgjVL1S9 zm!1uiu-c94CQ>Rk`>|U8+UFbJDVjtNB;(fSk34cC#ENZCkTNOyCnQ6S)s$J3VkqYU zrs9O9X}ZZ>h}3h2Q!6crV#ISO)`T3^{t37u3x!kbIgdgk zk&bPu=#B|kG`~w$ju3^ibITKqDB?J9SiDZh5PvGQXUyt`uGOq9TIVYCO z9S_}JaDKKq@T8LBqMY1qixmtW@M;gX8glA494^cPMVg36-K%rEq-Mj7MrgHA9|m{E zA4{xi-w9YKHUA|;LJAC423mm%NjNyc$=U^;9gUq2C4Nx}t86g3rWD$up4b0JIifn} zt|eeonj`c4fiTkmF(_$G3<nnRDsPVx9ts~=bdeeo%$*wl_!UO} zlulyL!7L+Qt0LseOeMfyz!EIzP}})GnhOOBLeoG!>Pr4wjU2z1Orn zX@I(``>E*vw%~2jgeBJAvP4p!X*ZgAi(rb5>1eUiV zvKjNJcfpa#h}R9}V&GetRa%dTjAlJz3vI)7k|a+9hYY|7kA0NP!e!jMAn-|J zP|sZuL3HMleA^&dYJ}IJiU?k5<70ZloN2%g&l%03-jDTwENkF{mT=vOy22unje0_t zR;7}@wKl0#D;LR4r!&-R@bk|^V?RNbnfGI}G^h1ynO~q!mm0kxj)1975?=}BS zAP)zi-txhY577Aa3LR`7KCbGq=^t)2tnM!!8+x^$t1CD#Joq@^>Ol1~1H6yPOR4ju zL`3|&U;nIS6F}`HR#(0Z&Dtfn;~BKPOdkBOqOy|q!o_o>owbi5U;cUh`E%c-l=EF| zHyIx>v5h>M$N5^UP?dNp8zd89MARwvJ zR`YN)eJOn>Jh02jzISfV9_2yd4|(Gn=gOd%yl;WCPUQMZI zrt)qt++#LrL}6DYz2%kSSjBd$+;`q@D#nXEdzlX1CMmoB2W^pbX|nlNp@}G@+y;|| zOXORZMEMh~ep$h#YD^E>XsSHaem$M12p5GdJ`dqHS4Q^MYu3P)DsJ%B>mSHPko0;Z zLPv6p-J-YKsFgpu53s^&9Z@B8kl`}B#Qro6{@1uy5!yx;{rP2NWNEdXLb_Yh;UC0A2^y4Q+l89Wi`tO)wLc7KmqEz9LbfB$Ai|Fw z7NtLc)1j|j;9Q}n=&GAWf#sXpuN^K?>IWr#V^%8Z3J!?OB{X@b!}Qw4+U6jPOjMoA zd8*G!*9;rn8KZf{xgXH0-4L=K{%qV$&82HHGnYWCHqu3bALPGIqD1#Wn($Uo|KEV> zf8`?5FETpgie6m}tn&iy$MolI&|1o$r6fpicJJ0!-!D^k@I^Ea6{wcjTkvb|C#r&pJc&AKP@~gWx)M!2&}r=ezVje3YJ=(Rs=4 z#V=gge`@02fBS!p#rN#D(-tJZdD*^{>Y*%iUwYVc`DXI*HK2|G4BURw=i_>@-WfN8 z*j>6Z?pXf#8?AQO+mvKPRaIyrm+&w$iV$DAqm%PLrE9?7#DK;2VE31e|H0XvG6hUI z#&`Wklm`BtlRWn8b=@GI73Weo_#fuc-P2&o{lCWkU*EIdbIjwDD2|#MihB;781xv$ z>g{VHcke7NE_uk4Gf1p`iw>X@<<`|5h2fTlN~b|YrnE>Ea#6@;G|U5gu!TW^BQ+qE z8N0yS{{W&Vu8%6n`f9KT68i1gfu+_Xd7*3J7Gk|S z3=-~UW3<_xI!x(Gfc;Z*2e0quyG-zLN9RUGtQ`)_!n(rilqijI%Df{?`hU&d1YP}B znMtFW)`5~_b&-+eom2~HO9&DipmQ53b z#0F|6d7heDfip#MU^K6BQDC)OHB)(FJ2TMB2m-X!0Y`%!C4Wt_6#e?W^Fr3z!ghNp zb1rVxLn>LSd6y&7Nnv{3Y3(8Cn#31*J1%&fyLg^S+XAn%zMji+`RA7MCoOdf3}VhV zT?rqW4M`rvg(7rZ8_U;cr+2i4jgiaM%DqvZ8xtfUjCWskz*_7;*GLsnmD#R-+F-b) zT4FV1;6)B>#55%?OFR!@mcO*bS*8#6D8>r#lm_I%frr$T~UI5FhDw@de10dT6;al!d7^FsS9&ByYJq3N|0SHlub z+Y9UKeFEu4kTS@VWEVtVefPjp2;M%B;Wg>8mAtCrwT)7RBv~GcX^0(D+)S`kS~AVn;Jy=S;(sErZkSIq>y-?kPjqyAL{#% zl;>&%9>{`#�b9a)4Hd|8nq5eBeQ)?yz%B2%`@iIpCep3okSm6jxX8c8W*GZFx2KF1?4vsqNGA@$X;)Y6#(Wm z)OUECcHZlyYWll|h}syK4^+HvquGaco0tPN$TnZOM2UDZO{I8=ZkG=c4Coz%n;`8F zvZ0|o;mymFiww)zeG!#T=)w3O0a#U&_MHc#E~SA}9M2UrOFcA-Hntm|GBo);Xn8~( zdc|{VQ4&F3eAekJ3m3D}{->^-2U@~*Yhln>?7g;_UTMNyS8lSakn%O&>8wWy?hh6V zO!^?*w~Nhs4@EqHZF0onX2;QYl%e7Ks?@Hlyu=R>w`^sk)E1ov5`hN23jk9J;I;&ef-1FtOs**%@PZkl)(;sS|Ecnh{uM0zN5y!t)g#C z#(uh$O+upP=}ySyU!Jw6K-JlY^25mS^Om#P$;WYbn1!J;wz>)2iFaJOB#?g?AeU`g zlDs{P8v6XZGM;+KM)SV8z!{|XIC00uQ;$r-LfAqE3y=|0Z-&cLP5do>Vi}Fr%|v&7 ztpg=$Bw))%GUMBOJAN!3B616TnanK_t)Fh-c*Q@2Gs*U9Y#?cYZt3Tf%W_8M*+||gp^lsfZkIB(4*96M9 zrh&b;t@faWt-IzW3cFkKv26P_q)DS2YXw6-#7K@%1Zx3Oibu4FfA^X~nNq76m54PbCI3B{ii_H>)>aT?2o^S5{^;u&=sHSVeI zxM|ZZSBCOuL>+aG&0%cQ?PRr0jpyz^;G3dr^H3mBFh0>{CZ(~TG zC3M*=Xsk0YM!1d6c#_a<#9=X3&_=)*Qya_{S`)FXGjYq8N8GnC#NRds&til@@2UJk_V?ndNRS4HkuLuTIM2Tpf*e-aqT|8h>&{Xdk+> zfO=;?JNCh#?MD3O`c+Z&)Iya@_n13?kv5=EW*N1GXaFfPqt~rmTKwTa14)jKs;5tK z8G<$5zfSwes+i}KK9mFbA%!PZA>x=4E78RnoEJmUWVgQK_tVo;tpkNDliPOs zZe3FhKvmD_hTj!8uso(3;9LtVdM#v13*6du=Qnk|VxQ`chMh%XRDsNO+>qW%lrEHpMLwb@ziB5!qhGULs+6Sn zmFtLu#PY}c#8F9}+*q7?u7$B%VLhT2Hjo#|sl!c1(?izn^5r!R-=X%K66suf4pPJ^ z{KV_g$dX(wImFe2k>|6S&@P_Cp`ALXk3co9Yu-A4d~mO;GCp{J0dc-Tgp$X`Mm9k# zny$OkupzZtGFpk|)^OF+*=Ajn7Jv0@HI0g@oe1%?S<&iL=g#W|ww=mY?O9kK?-bbr zGPpIGZ@@8lK9Pv!GWsURk_dNvi|E}~+j-evJO&&e&s<;&X#qh)yx}7Q-Q-vy29oyz z$u0+DB$iFq4dfuf7!Fvc{Yiy+*zM$}f~Q6^WI2Fuc(hSV%=hIiWL|2KP%Nij8%^JM zJxG+(jr7YPGe0_B4Oj>BPq%2%J-qp%<;tCW(%m!wP%|-s44_6mNSdGr^m}zg^#a>V zW|<0ap)M-yVu~?6__{`H?oxkRAk7A>Xp;4@92*}+C4@t#;LocELZMo-O}a(SnMKyU z!xDm4!yS(5l^~RBAr5Pa;KF?q)cN=pgT_9>y={vd@^E*b+I~l++|l|yx6M)E3U5m3 zzzQP%K&Q+Jolw1VzgFgzg?F{}ZNu+HKBjg%37vJ$LxNmZ!aLV_E=8out2g!sJ|uRe zIXoOay~h}_<7KlHb8(9${&9R|QwK(-(Rbqhr*HjNZs13-uKUcNcbsz>_{|SD>m&b2 zhrNVQ@_hQSl9Qlbs2WJ`q5bnYd^L*nxoJyGuda1Pk$D_*$_QMKFJIt!#*z<1x_p9I zxnlX03^25NP>B%eaNSDul73wuoNp{}SDUP8!M!WycD5p)Zt-v-UPomBHIFQftdevOQ-!O2k03(|7YSUhw)lQMwmy4ZkEFCW>#2@fo+cBW z-qLk2xgyF7O?`&KS)w}<+}K2khx(I=?STUSEe#%?j(n&mX2 zfZJGqxcuVPRn7Ary>N)a56nTroLU1F2n$tAu)b}|PGi?Rc8f|DcfOn~w3;afo;0&G zw&+b=Nzu}>$%lW8$h5;#Hxq@XM~df#ZANO0BS#KM7ac`yti@K~=7OIPJGob;G}o%l zf~j#s{*It0rNS;g(r5RcJFv4kfD6^5ZerPa4-K@Z20OgNDf7>q0e}d= z2m;#EcORY6@@8R?-<%bOT5YZ7YLzNRY`B|uP1(&@yxw)Ra#_hehz>r^h#Ii5MqFIS-v;Q zFOs_nEEia}I4_R$wkT%t3ddl*8AMn;Ay#h7GSJ4g16hS9T1{lzOn>?Ax788K0@0pL zCRfbXsZ6U*IC&+wn?DA0m{-!aSt0*Gheuf zMrP@*6Y^14Cij#r#{pSgs^Rt-HnVF;kQqat5UB2Z=ugvlFuDY(WpI!j(JSm9 zTi8$g_KvE7UbE`?IZ;fhi5*1B^~ZAX4#eyh&*^Q|#Gc$B)yuLnj1oZ*RYc?|e`A z+iUYzYDUVL^c%0SJo~1 zNbMS4aY$ob@Y7vB9Hc%{?}N}lalW*?tA$!7F#)y;6A;GzjCYavB0}7Q*ZM=%0M4o@ zwAPmmii?Yv*=Zq7l#a$ko9ugnjXq5Q^T!ondp)W<+SP3Ioq{jAeOa;A=`Gono4G@d zMbYbYZNptQRRi}UI5n(iY#+0{+2;yg@{IFp7jVvjng`MzM91@psw3jMdWN^3z^$#W zh-JXzyDOwK--igRJS;aQSl~;0Ox~+_*40BV8kww)-sd%IyhW=`&u38I23Q zW_HOTU@ZV%V_m8M7$ql(VC-R@ZXJ3rnhMsH)q;8)icO__;b@Xu1sc{{VFEAx{wH_Hi+torO z)~nLuT`ANy)%yVg%FTjp6_4XZin%T>RY+uUqXe?x5&h&D!h3{+^c}k^&hUl)4S`N6 ziz>=0A%V#~a9Rjqf7bl+EgHQ`>>tz8cn&QeQyclOuN#NshoCt#UmR{SZ&S%BK&%hH)_{A%D)vW*B^|| zPoQtRhWeOPVUhQCD{wWi_z#zNg7+-ss_}VPZ&O*u&tne~Qc+Wy__uQ`wtGc8A3`|u z*Jt!`mQ&mAQ|=o)&P)3f@&~slk$ayKcwLkU`Z||%zHR;!92cx0ML3|IHxlHQ#vV1Q zzchH20j7g|)38=}sfwJU&~)PJ*yBCj2u`gDbgF8$vaH%av(is3Q;Ad8soA+9URo2J zOIgOcB;+(KL#6wxs`b-19~$_${hVS0=U{957Hou3dx9eHa%2K=<*9D@ay^Ad;!2kmFlM4w4@MK@eNQqSJj@A$!swzaB1lbiN zy<7AgKKXJ4z`@8*5aaE!JN!V_@)c6E57~K2SM-LnG~?b$01CBk{Qs@E%w8~6izg9P%ZWm` z6l|IvV`wJ6z_V6DZDD5f1gn2cYD zHu$nVVUA?lGX45@ZsWt4f22{w!t1E&AsC9iu(Mw5ddCIQSCU?0P1P{%Mf73YM zq%NQ7AKwgRSY~*$YCcE)kJ|*ppmb&%$BCUX)lo`J+&_Mfl^QoEN@%R=LnwT=mCFtw^tkxIb>u_`4PVdc~M?QkhwarcbAf;rO=auFZI_<*m&?jXbw*)%9rJv`FeR(`3*OLr%+${YtFOXUd_C;}YVQ2chY0!G#BL zk>+FmeCtVXJg*n|P%t!?(78>`t*WezPY}9H>|9l@dUSUvJrcvEQR!KjA|I>yo|>{rAD`lx6(#3Q3``;?xxg*dj!(-6@aFUm*#TKVW+y$Z0>D zwC4J+4U16%r)n&xHQ9oAN;hzN)a7=QX{~XEjl_k7r*+%4%I@+1@pwg~xoYw3G1cFH z^uS^Nh~1<#s7Dc!1oqcC0`Vi@OdN0jvqz&Tf;pLlM_{pHe+#Q2XseT}tYO}j1Ohl( zt-c(b%FiGE>#7682155-|GPu&rwFM(Pr`+OzMb9AZxJSBkfHHSHI;kA0?xSkNR=Dl z)EFYFE~rsrkqadJ@2}0e>FT07?twJJoT_d$EICIT=L6j0p7F-6O>)Kb1n;>(MN3Ic zC)UCt!0g(62ix)V9WBtZkK$(JitP<`wwsi&+fMKxF>c>~9m4AL*kv>I5@LyLK^4kf z_&>}mN?z~TdnIoDi@8v7o3U~k-Nx|yyeUeCvv2!$;5tJCQ0ghnW~@gLJoH=KdKwq3dB zSNYRZUUAoSZXKLiYcKb+pGjO-(*DtSt=jVKdIJ+yz926xP&)DiGtQPVRiirD}bzg|7i@Fno+bdA1woH-t18KTiZH(2QUd?=ea1$ z0|=VR$NY(o)*ydoLjRA`|JeV2pIKmfd3TUXKUx_KHqK?Pz${DNcz2%Vb275k0s{ix z^Ofu-txwi+ONDC6$#!3<{`Te^vkXVNl}4Y?5lZ!C@3RHW@&D@1I*gOjR3fRstvFlIHsWp$s71w}> zWvZlpp8n=hRTV!(pxGEA{Q9bhz4q3D$MddqMJuNv(}-f@wzy7-ihY%h?|WPG%UV+H+^$Isjd)%klcme|Q+T)fwMn zmMU3@v5gYF|AyE&oO{*l)^R!Znz%=obGb|R5K+G2qfgSLI6A+;KseWfyy-6j`b(qM z!yCNbbNzy6v`Wp1G4Yj7%q|5fp0M5=RGCQ)q^+Oay3(3pvORij8a%b9m#-}zGW7rM zW6HMx5tA5sq3QgPd0LTH{0q6-t1YnluLpCct=p?VUA8#`E1ht|%N19H6DPh-e-S4A z=QAV~cIgyi*6BdSkEzobMY5Vi@HOUI?vk2z9DaHYG%Zj* zilm%L^!Q^)`G9CSM&G^ak5{V_H8n4+DT1EozaYk1fF)+}g695+E&bx-FLn(mB)mlu zl-O#jT)wR4ob$>86oW?vMol*y7hWFxIKP^_A^Hl4&bCy$VQ#3Teee{LE-)4OQH|a5 zD~&9@z^?ivgq31vEb00H^X;o(jjT&1c)H|768NG6zphiZ5hW<71epAx&Hc}N#3$=7 z_3t3LGgaX4!nn1*yFZKQWC(z&nRSc*aOZz47nZ~LT|OdGNivr5#!zoIa;o>Sja(CN z_#!f+(-5~oZA5ae=&O&RWIj1iQ1eSVN8~Yh-zT8aH`wsi=zP6zt* z=WbV4@5z};qCc8KYAFfp0j+K+SGhzc|YIodtTfg%?_T*AVLX_EWeKqT;pJ-M@% z{myf1;&5E*481dUD+%F;L7Y@Ssq|ng${Xz%3f8JS^3`ufn7e=HDs8jc{`|&<&tHVG z>Bv1!l)&@x!+?sR9H7G+x7k39S3{-?3~&}MD|PA?J=QltQMMGji;T?E0@+#BTus>; zEbJ8^smR9gL%4t%?Wv8Zm%FFon-uh7LDL*+O|7SkZ&5T-lYQ9Z z@xte72iM;%i`2bY{AuqHwp`&e2?Css_u$zYF-8pQr8u_CgxoS9;Hy?YZ$6rn-x^<8 z=K@F%wQ|KYn>UI3?UOEEJ+V-#pYfEd@ z4$Ldv$q25YI2;~rV1kHQa+g3yp6sebOU zTRXSJj2QOB3TT^kWtelgTtoXQXIgOKQ(#Q^$k_;U6ru!k>R!a!C7ft|AkpO zUyiFO6z=QbzDc$-n+QdC5Yl>~V06>yT8crWo?ax-+-wQ#Hj&HI7LNCZEZqdj&BeBJ zdJ5ZvTiF^L#S4P=3HPaK1g$4nUu!j}0_!?R*LplA=iPETnkv^U3H|-v1Gy$8$@btF zN19!iL@uqGE~6fbjuCvKUMhv!_kFFXw5uvH-so8Rw)Z32s(=>(XQ_`JSiMc}NzKlT zlpfez5qwcZrmKECx@(Z1L(~*;6#?m)rUDS!S(>=TL7deUqXKy+%aNP@G`*3)cIOVp zkrP->G!nn1YiF9Ayhrsd7gW}&g0L=HWRK-DMKvSy#HWAw$F4ODKI7e~gflxWYs0#! z^*oshXZNo2r7K4Cazyt3VGFdPt;{#UAU1YASf48GZOO@oyhDAJ3D_p(O%TQgYFESB zwp=D>6r;CCF3_fE7wHGIJ!deMQ-)+~XTGWec|WpOAQ|#N*KL!zQljVp1aWsAYEVB} zT6EzafZv12BXG4M)P$cHx->KM#zc{(sb*v-MFzv&m4@RG+|G$l=!Ni4Pth%94d~f8 z*cMGTC^e3MWJ+;@I~nZ{YXFmGc!9wri)^Aqwfn6Xz9UvMMQk9AnI!*atjzQNLvn`e zK&&%N?jlDcYoY|Vqh6=cLmtg41w>-4KDIlS!lZRqLoSl@8tuU_XEpY05Xd;T(BXO$r^c(WGHi$cF6o++NkN;i0}bQoyV7}f9#EDvhioR8*n zs=4q!cKh-42MziARY%Xdf(tP^rd1AAYDi+j9#gq=SlM557J7tXMT5uFRd*Ash@8W z4LLJcOlF1ygo#DBwEI}WPbc;&SYkzG0xWr3jEG1|t1-(%${9~i#O7<4D6rwJxWB!> zsM3}4*s8Jv0`jxZf<~&l@?TH2C$_$)6|)F8ZDIYw@}28C6%JeO zfJIYG{N3+jKC-j0Ay)8Kj^U}SRK?JTFC?hDhs%PyYPdD+#({8K2&YB?E4d;lk5%8k zTiE>C!Xh`?SM!S`NTqFw7dH=Im@r!qv;X!4NE%lQpgZ#X%cEZ;jJN~iL5+h3;!Hhw zfT0sTz7%njiSnYSlP_=7;d$Hl9>~umcldpOaxD8pxl$wr-2RLv86XORXirz%Iw%zKp)Ro~do;iga&qT1& z$6W$$Q?u3!2P+fz%N?;1P@U&ooB(MuREqwL9BvveOR}0T2;aJ$gcMBLY*323Q2iL0 zMjZ2$Zg|FXM99YVB<6`E7H>aZ)KeC53aLCpbF;={*6wrJeQe36)Rkf`0U=I)!Cr!* zfz{X?GnsDMi~MIKZ%jH}%?_k_BH^`Mg<`MFL50MuVe5B1@0ctC`xg0Nl=|5I>o$L; z17kQ)C>V4JeFqy&vAe(Sx*P_AtfAP4@2NQ~2)C5ZzPgBCU~gRVWd{rFi+gYJ31evu z@8?fpQ)dsI7yl9Uim~YP`D*dsUYFp>A1DOmt%ziqK;d?$R-&9j<2H-Lbotna04p*( zJX2vi-TchlbcUyow*!cUI*nYIkD!i`DmFO_nJG&)Ctb8+p^W0zq3Hy=e}Mvw^JX#L zc_$jh-7q38z9>N*xW*hPWPZLgZO86e77k6mY3*2=3v9}bc?HNt??0+gI}RFzrEu87b$Nv*7@34# zne$VJeOnn0m5P*Mp(`r@C&yl_hxn|b07e`@4#&$uDqnt-N$t zEwm)ognL8)(kIu)sj&zpdx;Y>&Eu-iIe{!Up&wyUq$l}K6D2jUb}`!s!0TapWR?)Y z0)*Fa7m*jOU}R{CVS?AGOBS|ah0>8%KPD9tL!WJCG8c#j>u@}u#qszy-lf`|B+6O_7%3Z7Y4HeKs_EsMte{cJ$a(K(sPuq%t?qCkpS7XI-1xT`)**?eirCsUgP}{SRFG9KfjJ07MI8B%;FHX)+BH-zv zquqe4(lDeg^7PuiISVQ7BFY0IU0f>Xb%)l=?d84@k>-}icwlf8GvZr%CFP!pZM)_H zWJRd`UEQv_$NIVVv3@N)|6A8YfwFjv%+|IHU2?0uE0Ibt{SR5 zv+Lt^Ymj)Egksrrwt-tEFAG#IWvdi3Hz^uE*lryt`;_q7?B8QkO$lo|4QmZw8om~E zk_){Lz*?!!nWwu@)%)IySGLpM_(cGqkuA(>pui*;&%N8JB|MBx8axFisOBYYeJ^lp zYKk~6vl~7nbE>eg)hdiWQ}bL-cVW9CAu`=5i?HX{=U zXo)wz0j17ji0S-rs*i_wwL>4lJbn5lj1AKyIwT z2nvzRgZ5%ec~JOMO5+X6aIi-ySbxCJ0Otsz7tUif5bFhZBe*PsP9$6x6S5fHEiR92 zDL!^?7Bl?!>HX~UYW}v29-f8*os|_yCxu(wo>k8D5-pRO^-`)addgC)`l-nr^TWYz0N6yJl_MdfcC`vbjXx-ZR{{6A8IJtH=k^hFX_C} zAuLmd5^Rg>;~X+-3MtPc-zun4V^h9?Q3(<0CyAw_8{@c3M}=QLUE35SO=leY&d=XA zl-QBzYMlVFF_ELDS7~-S@tetpKr|YL40lbI{`Bpgg6syXDWcMD@@@G*9nq^_aAtdP zg^db_4*~WQo`Nx~-u`-ly$eK5p;!+^$I&GduAvrbD3$b^HRF-WqJ}w49PvC35<}`a zv3F9GQ<2JWB*IM4 zWW19&mRPm4k*Oq4a;#y8ZztF&>0Wny+!P0r1XUnCU~V*1y1X?*`*DdywZZ&SktZEE zcZ3DkZc6`f$`ElB&Cu|J;p4UFmG91_Tw+J$P8ipK$4$T<{2bGN%1oVN@&=+-&2Kle zzh;znIEDhU&_~f*mt}Aj_I9_nUQi!t^!4;QXfX8ohvVFke{4d(YF~^Zc-G)!xFGU~ z%N0J{{yPoz?^n{wAOa8Gcw_MVKmPa8uShwZKV^?VO{TZYuu|k57ccow?I0j}bynB3 zJ&v2;?e~9}5#!^NQwe_v>5#O)t3IBp_FW_hBMV%FQ%?S#J~+}LhhO{T4JayRE7zg# z{(JL{0Dp;YK=0a*V=1|R_r>2gD@_P`rE~nj%=zPS>u=RX??!GQYGo6t&+?ZRKtb)j z562Z;e(xP$Vti;^@7K!w-%DY^I*e*Y42-|`hxa(Cb`6ZlS+s!q`0xfl0c^J$?oThD zKmI=-&piqkGdCljynMVj#kdbkkI*NAVvnxFe!JD*Z(^nBk9vsGnQqDB*Z6%jr0|UQ z*Ee2}9KY!C;RlyhI&*8bIQ`8$!_g~>v9HW^GP!K8e7r+16fbd2&uZuX^6qYPEOU$O z^kRDpv|XI__KR<}60QzX4*!WIN6C&qY`&OeJlX=^M<>Ws!FpTgX+Az!yd>h(N1W$4 zqGwWmFXAdpvO$8TF#sIfa9uA2f3Jvx_|X28bWFhnKA!+;Ft%A`l1|pXFHho(U^PTO>k16u$tJ2k!$ufF_?+&7l%@Qg#OUs$ zpoy2+FX3#2p6F3=NsXR>r2xwXknfenRh=}}9!XoX8)50H(m&Vf7-OD`EfcDK`V8As z^BdX{-;#42lzGNqCFu{M7e`9<0Na5R?&Qk+0xlM1+8)YUTD7k!(-h8UdMi->Fd_KY z_??2BXbakcUk@Qp6}YoRAB9NZ4X?f5!3iN#t;9?>{sbk4fZB#P4b8MHzBQ9SU1Sq) z1y9Ka^VX>>cvf=j1dT-UG(poAUC2Ytbp@bm?+iK3e(R!_QmU6umHvN(y>~pD>;FIA zg|>>GI<3+g9jMy7wl1SqYt{%_d+#kmwK}xa-lAq(L?!k}sM>o5A-0r=6$BCa-THo? z@98=3&*Sm?4{i0zeP8!=zh2MRb4+h9bQ)P>b~41iLEKVEo!@UU*J-Emd^jg!mH+z% zQT}n-KEN$wZoHi4&obZ1R+J5cr&H)SimQUQY}*W=H*1Gw>eZMFC)%&YycEp3h%qm37XAT9ucum0xKCa_R_y;NUzx zmLmW!zVIn1zdLzhf;w6{H&7N}dW7Z;)DSvjQI9?3rY4V)v-EJTJIMeJ*C9+~8ME?+ z5XbC3jzW;sU^m8W*z)&~O=0{T@sLsoDzlf?8 zBIDUc3p**d76IvLYZJWUlD}Q`XxLgSvSJhTp+=YAlu-tPPpm`i7*!MS%uiW|1akAP=RmyGbc1G>i$5hF$?a_KX<6_~|pb{uR zHPsj?2JwM|Q1}%K(iD)Rw>tqjP|Y%}bk(4!bh}u1+36&S=BT!%R}=FrP>ntK>gVt- z2+(Z2KXgyu`iXr=%e2g|bZ`fB=`g5!pRP2t2ef2ZK@^UE` z7`tgxx2t;{6v%2`k$v+mvyo70@4X;RJ`cA48)g_z>yL;7cJ0BG+%*)05rEGL$Cu0;(P?Bv=+=Ia8C$`qhr@`6yT^p6_K zVI%X{=Rio=(Qu_LCMQ<9mp+!q#}Sa9#Fn{k-%%#W|D1Zor=%Gd$s*idRhr{W1@M9- zYW?K>Be+pJU4CIg!8d($li0=SV$q!{l?Y#W)Cs*JjUild% zA;`=DFr8ZmMIb}S?WG{CmI0~}8-e&+L)|lxQJmP+>75X&1NA~pu3={bAU&ux6Q5HG9o3yQftiwIe8$(Rm(hiD@|CvXeqf@{Qa>We z8-fSPxUYW%G*;hN6@v2YW4<2=>T&tE4Q`Li?CvDHMCFfNfkDhV6K=e|s^l@?%Gkbl zmGb-1uI&9sUz*l-gg!c-s2@~Q4ZYtwow`R@BEGJm(nWK0d~z}(%n0Aq`D5Jm&i`<{ z079^PnEM%X;ipwkXImoq*&dIS1Q0K&0nn)Rvs;J~$+!T3Kkn?X#;uX0u`&CQ+p6W< zC1OuTZMJc*$-RjUgL;#TOFOnWb+`s9(PR26<0vuWiz&EFi@m^1NSMwybZ{-b4l`bF?~zs%uJV~`SwxV zj&W}#u2i?$^WoA6g?(v!yFIir@eDVp*(zC_BOIQ^FB3dCggrSey1UEdrc}13B68_qe@>iwIr);*9D)d5<6Mw%Rek0)LRMlZ?f00W;kMN)$dK*&Ad36`y<$<{f= zI61%7Q7xu!&d(A~at0mxtF;}S!sX&h63{puCF%fekTNHzP=Yoehf|n1+gVG} zJkf$y3MXE-e#!Y38luu0hx!aHSy;^9C~z6hcY%!7GDP z0NwVs!56`))GKJbw6iM|zu%Aw%p!MFQQQx#F$g>8kW>W#IQRCV>w}IPy`^`oW8zT! zNapcBKbFR$J@f_rz@$7tT@kuo9$);p8yRxl}n zK)$*DMK@0(uPLbmqfo29y=*XlQe4R=M`imVB6<>9>(|$Hs-zI@$YpY2V%yb(LAEzp z))>1qj6PKfffJqZR|lCDuh{kCu+fST>%}2V1-O9Xp4ru9Q#{8e>ikWRW)+FrQQCgJ zHcy~#1E}BHgSBIYzzH9G(0_{rIvLCnOQab+bLF=J-Jh1m>}2yF2@ap6JD023t@>3- zp}r3Wdp~3P7-!(s$NjJ~CpWt@QPw>(;bM7);C4&6lEdkjhSTr%!b?MV%qw{wFI z>`S;1YLw;?y{K63$VK&iZwHr)75a-_f!5BQi6tMEqz?E@56zs!Ew;r`Q5FSfBhLx~ zd^vb<`@v_CArbaDJBwg$KvETJqrri469&}?@M>qC9rW`5Dh@_{U=uf7Jd|&;e$Vo) zU=L8!1#EA_;2Y7yu~J%WIvJ@UM^g$lzN~h4gF-_4agCZ2v+4LLFQ6K=BIdPkE%VLowSa}J zg<*-wbszlDS$7EKZgs%i+R>~M4(XNJ^XPa$zSiD91IP?Yao+Oi)(~(|`#>{s@rQUjp)$}&A{)*Y>H+7~(xn@;h4Mj|~pzb+6 z@y7+d#<%TyLGS;Zdv?B&rEj3wVK6rlkfX?;%uZGYh6nCFl61c0)9Z(27BnE(A9opa zv{9H^zHN-Kt{4m|x5qvJs{YwK0=f#07w=FqA@;Y~>?2(|Ht|}-C|}CHPXKOGQFpyL zR!Ywhfne`OpQ<5mUAg({U3{#Otj|Uq2xe>zszGuC1NfwO29E8(n9l1e4)cK_R*v8}-5QYe|?P?PW{Y_T+3} zv7kwLk|e6QoN|%h*gPatK}UjIe>Z1wXS?6=WK@L}&SGF=Sb8Psej$@)+Tm1%F!De} z7CD4vts1dPm2l;1)*5KdRaY7nDsuz7$)p;peST6KHut6Y+?~Z758YgU4W zJieg%hz4*qjWDMcr#UNYu5{%W(d#85)KJj{;BXWpQ+p=1@|9jEmF!BUt2QqEdbY3Y zHq15RKbob}#)FjptW{!Cx2P$xb$@Nm=un?#CSDkh5wq=D*XOLdABdceilqE@AON}~ z*zwEtV+N>um@OtU=lg>`Ysa!P1}v*MKX%j4vRmtS4aDsbcDwii8YU>8|75FJ3SI_b z6U$vV!rZ{fVVpar5ss*In~Is?e4ohF8kGbvjPA5n1P~2b<*lpUQ~lo;QNallk_&iT zw}pKrU4_=k(B^lS{t#3`S}%FZ4JRQ6)hZrW>(U%eCWj=#8ppgsJZL|#H?0hm7XZdZ zgV-*`|IYrSfFy8i@E85kx+0TOwbiNGHQsN9VR)d)=zv}ciHo@r@d%i|Wwf$Oa}N!h zx*bqGI{Y@9q6Yy?KWboX;xcuxh_n07VmqTawL*%a=#mssrsQdbvMp6Y>nLkjS1Zk?WXTGc>~HQBaCQzX z@Y`%JPi25>guGV=Cb6O4T!?`wTa!k z-mUKND}#{J*xDIrbkcE3P+Hpg2)QY|Y(fUDl|&BY=f~q>!9VQne40@MLwFKYLZl*{;S`bEl3gq>FT8mp>9h#wAU z&^of4JLeDfT9t&i79&^@A&CQv!M~<(VrPM3L(MaFUi??*qrCOUX^KU7cJv=c{{T2= zxTaGluij93ZwY-OK0XoNxvxqFTqZgai$C=~@MRCjkG@d&CW7s6wGO8pa^0J#OuLXQ z(BC%jh(-A3t4#%+V{-61uEwjXt2k&Z=%adv7_qOW!+9w2+?C)i6l zI>gPaw8f4nBNNZBZM*8IJLX^Ie=35~hw1mrGywj5nA@%+f<8O)OyI@wp0_#{VpwQ{Zg$H zaJ6&6wIdg%tlzZ0y`l=Y?H0g~xVd}ZAZhlQX+Y(Wz$o3Na`?0PFzs8((Bd#c2pH?b zkwZ@**Yg7N1z;k|uR*CP*MdTJ$6z`VLB=O5+_rz-PW_Y#^nkw0mF;@@GNfUdT**7+ z17fwah-?<=)!eaq;DK<;-x@4i8H0D!Oc@?giWc&sN-)k2^>5YF5~oLwxuAtgFkcoN zhl^ZEUgIgtW>$Z_J(jz?6Gr_>8U+lS z&5UTOON3~q)4`9x zV8F)g@SLLOe6obw$ekCe-*E(-Mg~i#!E-BtlDE}bwx~98w6)B>=Zuas z%zn5cHx49$x)x|dD_Gmu)(6w>ZQ1^znoqb9a8sQsNM-Mn5^OBFID!QPr}4M9?;wbh z;z?@&5R|8dzcdr*(x{Mf$k|^E%+e0_`8OAU>?uoo-aRKWk4)go%l1s|YkQlE8W67bd~suIA9_;%bKw1gX-55b+(i8(+ax2VWxiz>&u?S)LX9-0c7 z;QV|gy3G&wJA1F{P~?3Bw{0AT$`a}TdP|sL%wPj?D@AEf#t?c{DP({)#ml-kU&n>t z#e9&4{*qkgc&k8)xD1qT3+cXczK@EEB3ug?svcJbuOsWoJ*H9!P$vvu<}MrIY127+ z&YQYVw1QrL#aDPZh0jmv1^8UP9G8U6&5kT{ejNBQdbffNO>8Zuq+x>9XVm1dC-)I{ z>wSNCHlNA?Ds9J;m?R+uMoqv^2%ADf2&}VJp(~Kh%Dms1Oj?yw%Ov|LGih4ZJ0?8p zS)Is`D|6#N+4bSvzM_TW*J~24`cwZQLn>SU(MOe=0+&F8#SZTW4eDF7vdsNL0N3jP zq`dcv7wzwR=X6A))nm)}uR2#J#|cWjfk0K4M)eI|LcY#8fqv_LZ(tCnmB7;5*}&jL@XY_Ao*S7m zxF6PjJ(^QIQ9#D`!LmiVAooBX3xocY^w`TnZH^>`Bw_XOQ)lvmW}bgyjZlrg7D{+x z9_^Po5^scbpV^pLSn95e8`e}VvamoA7nZqBU=sPPRN_E^!!jd)&r#}y-k|F)>*J!2 z8B}(H3)52QcX{JH>an(Ejvv>dke;!D*(l13KuxG(F@v_SnFz+#oUR;ViIKcw7G7wQ zYE~fKw^tI5QQY5U4%kjea<;5N@OiO6PFV#kkH^u2^;72-^Etb-QT|J@x#}6?t|PJQ zVKh%q23b^*I1PIx-zZo=R^l_xk7YQE_x6Mtw>2t6M}azrgiJ(mZ}0b{9rINiFU-Kk z1F$7V#%%je>%m-2kpW{_&D}}a@~tn3Vu_SN7fe}M?_A3V{z|jOB)?VbOBZ+_-8{q0 z^Ks@r-J`rm7tN$;s?1vA`A}}IS$)$7XT35l77wKT0z&CZk6h7Cs~)EWU{>?cD`kwb z+;qP{f3CnY!2Bez9&0A}8`KeF*dVFA!gj}(eZ6c6;XHyH73CZit292@mg=j}QX1T2 zUAiE}`YJ`sa5@D5qpH=`CQ-Q2gC9Bg%Vw=RKcaL>pLc(WgSVZ^-FA9?#>7dE;4@h5 zN*QbAhFG=uYttqO@#b_GB?|BiZj%OiZMG7XY$kRD;pkH^C%evTaZbZ=^Bc1Y&Gzzs zpPkNZ(6fXa(W1R_KH)-70a_D6`Us1VBBLR``?~C!myO=)Q`0ye2AdHbuXN)2^1q1sVxfJV&UO_k9_%l!xTj%jfngi^7Yj0k z3_!aN!$*M*8_o^yO})Yhka1l)UpwV*PSG*a26V{sB-a6619CdGNL!N&AQbPt!7ZQ8 z7|KR)u^e@rJE_YFXFpk6|E!~~#M@Bf+d`WX8?Ur0wrm0KgPP?rHN|nG0=HAyTUnTq zzE@q{-rG-n{-h~laN_DzEw5HZw#liXEu1O2qS$)qXX%d0E6o%!+A@CpQFrRjQU$nj zmN`#09teCrq60CJh+g-O4vw%lEL=p{S&Ne@{}@^}{`nJw1M#_twJ4Hj`Ku+otGw;e zEvK~EXp`^$953#9`*p#^syT`qKSFtiy9`2w z!A$Neck)d)))JAsD}Y*XY$BYv=bnAXV>Wruobzo-`=x@1+Q7Wb7LYJ6CkMdhQZ##k zVB6%CpNX4}t&F}6THU1aGkUTnl}_LA@7lk!yDT0I$2Ntz1T|Ujamf3tJxciEOzz+F zO_Or4PP&0n0%3pN1Zy25dof>qZ|6!IV2>@yQDsDgIkDp_r-HA6YEgm!(Z3Q?XjF1t zmd@W&3xp!uzVHshL&Tb_Jz90nPxS;S^jg=}B&9MIaZZl(*IoL{MBtD~gXh)RMUvN> z!$zh1i)JAs-IRcub5zSRP4cr?5cTlmaeyDKMNYMmy6fWtU~SJe5SfzFJKllCIf(aL zk+0~-1~$BK-ARDqGQfbKxcL(J9%{rRjvp`*Fl|mHNN4i;8ngk+atNHlK90M-y{=-` zKTj|1X}ewN(n{kg4_4aXH-($yLJwyV(Rn(k#?2Ykxo+xRq_3-E214#zqM*|y(--xA zQ^zajD=Vu%eM&f!eNLRU=bDQ`jbBU;s3x-KHH>JF^WjsV-dn{jyl$Tw*TvnB2;uV6 zOgPVu5%#hhd+(@V1VlO$4wkt)^(FG~dL4a@6qhA%>z$+VL_HSohKuWUMoO=xD3jlR ziR1QjMXk}a9`29AABwX|E?TiZ-_QQVkW#mto_@BYB12J_AM8a+pp+ELnlP0?X*YE; z1;iKK;rTr zou`6NILSsY&9^IcJZJtfR$)V7CZ;%^FHoMj;JGvOOli`7aeP@4)d_gk<*8N*?LP z!wb7{xozedT>Yf>hSoQ6`BXg47rpT9;9Lo7x=GZXyDv`Zn8n(9oA3H5Vv|L!_QyCz zE7Ex4^jp&a=w7MyK@0DGJp`aFnO-nOQ76;(Z$8?sGDDCn8Zw>62&0R%sRg2aRNif> zXtzMfc>Y33Z`5GL|{ynmUg!8W(HpXhyD?rC;qnS!x1WSpvQ(| z=+OB$IXaiXsTah(jA@^zYJ+sYy^l`Imxm@=gV)^*VYIODw3yFf7a1z5Xhpn5j?ryLvX6IIb5agV9vLW1OB>nS_JG-!D4R$>lM@Pkr-{JcNYU!eMRwUIaoS;Av*~?=A_a)sFZ@XUyqxTLXVv{`u2J#{t*5 z(9(*w$N8A@_tmzb+9Xv*qx4(;@b$B1{95jc2Z5;{r~ilf0HF9^=}+N^0_%96G;67G95hO9F&ItG(>~q*v1&e+{w2?4By)ihLO^$StNtz0o)V z7~8>$gg2M<^kwY?#8r3sU9PBC2(V@kd}IBeoF$-{QZ8D*L*3Vso8L^p_vl^hftq?+ zcg_cM^wR@WyQDPf`V6a@kV%aS!nm-pcmavnDy|bnT)W@8&@eOCqi3xNRROYarjP!9 zqo{}9){o@1$y(u7?aY{WHtzzngZBR>R=u%2F4#?Is~QoTtyy8~V~n0zlG&b!x-{JR z%4u))#h$17%F~(6jo!wVe|S&)mtyfe%zY2vTun^M)8BXzE1>>dt^rWwMfhiB%1_Vc z6?!g=``E3^YAydcko}B7Cv)>Hvc$ah8r!#!YerJFg1#&60S=j$Rh9W)Sk10per%yr zjINYUSCtwD z=xe?G{QLwa`Dh=#$$D{%hxX0$>u<6T3CiG$^h>L&u1is`@~r%pNHR>=XTHf=(leyp zXShYLH465j?c#)2<^cEEv}vE<+nxfyZ@>SnglqrA#^!c2&>i12P1KAPa!GaXT|aoG z0e2r`lL?tE1B}PiPdFO=0YRBIu5Rez)W>um+H~(1d+v1@97$&FcPgaVHC);^x23M2 z(bDx2UyZcjwmV4(oKRatx16&@;fPC2MK@j}>x`}&rW9>!jO&iOpL%NOBZV%y!*Q@= z$7_D{jMv21>_#6!tx4F!Pz9AAI4KLq)P{qBgexma&XQjflfKhzj#5U_&b@|cN^N&v zk1EOlmKua4phAuC(Wj;I*+YcsQ=84GNxZqiogb9avd-2+5y zZ_2sNNiw7QVVz8#_V&A2S)bdrtAJt61@GneSMPXhau6mAh0N-15|fHbJ3SZL94EeN zuptPqA{$$*BCje2e&5Qt7t5`~!yS1s7T7wkMK|iCDEE2?pO7c3d6@ ziPd&V8zqtV%|lk=Wd^FP=qCjydX??E?6MXLr8+jU^mY&rb83dI7Y`OLT<|n*(MjPq z?#316AD3(<*4Gh_6%*1qe?LF|Q%EYGIQyeB8O`R7ttN*GfXW+bH55un03AdOysFzC zCtkbdpPRvOsGU(iY9RC&5zEBE7{61@HXd3;n^XRvyy9Y^^cY~QS&d52m%8hcfzEHV z7Ze7s?5bCzK+Nsw?Ng_cO4NxF<@2ASx*wh#*k5=YR#%;?_Nh+l4yMKd-0q6(>j(E{ z0*a-#2NONxTmj;PZm;0n*3GG=txA3~*$nYhZb)~>{;CS=uJa*}O_*{mp3B7|uvnE%s77;)BDoSjbi&!Ht5pDGFV|GI?c6*etN(Z;XD2vxZ zX$Roypeqw27v5u6wfsp>TB|Z8-KyioaqDUYiBb)&I`O|{D2=N4b0T@`a+UOS?_cq0`* zRjqZCPOkzfo6~xEo1&P!+MJt~`aQ+kAKvlY$-r70vWVQ>h?F{?A@(Y|{Q~NF__VPm zPnGR8)gez@n{Cgvyh-hFA~CTj%HFF4e|Di)a5)EEn1W9An2}Iou7cUaED%%WbtHqh zC)s0oz$~iFnB(;!gEv0>#CWuAl6}SY26MrRg2#Tp(XShZ*-?}# zIC!C?7az}HTR}mLK=4?|&edVnHPOEdi0Rc!eWEbERMMAK!sbHfD#AmI5O7Z6b@Ka4 zP~JU0;(8I3QuGHlXf_$y`{Aef$3!D0SsRW`$+eR5*_aU8O-ZOn*Hj=xKa{!5J0hI;+zLRVW4*OI93sZ2X)+#4O{WP)qWIm5!UnI}PB<`}ikx?M z!D;T2ZQ>s@Pav(uqJcrYke;oer{UY3664|VGHYK)=5_DX#M2gtXKA@QP{XoQKKdQh zC7B1?6J@zs(PvEXGWJ|`NItNl)vB1OSiSFuvrMY@PxdLO&*?b` zC?#=uDn%lHYcFrG5>X~uwJOnF(f6L9)Y9#KsamYwD}`$xR!{e^)8A>&gTXSW0&ppP zuryxwvO1B=qH>87^9oyNCWA;_+39+=s`Y^Mq}Sji`3SE6&kHXsNJCjXv)nP7X!%v! zLX_!s%kVCGypp5IVW%E^P9p)|l&eh-xc_NR;Z(M;)sD>raO>tkKqKzcx2ex$K^QlLUA$y|TA7?DPZ3^|T{EaA*Ep`4S61c3fTD7ZC+6veI)J zamCnfgIH;LcC?K>?95M&BQ6O@+aS`^dE(C0J?msNHNhBjVx7EuyX!f-F9^jeMe|*$ zGQK2eYS%jHYr%;vbKBqAi4>=7YN8~(fNYp{7pY2d&OxL4d~b(=wkFafn|N^5tBAt?W%+AKP z9N4FOa_pMzWp>c&q2eB@%^u2DRRx%M(=f7HA`35V8 z_tm;GBmszd-!V4DOKR|#mUn<58BrZUKnPv(Z-xI~WykD&uAa__H6`z%_j2IEgGyVh zWBdAqOq1=v@||vzC>;%)!{9jw2KQRKiA;*$K_#HK)#z&%x2;>8SfnqUx7DmnmpV_d zR=2PAa1;Cyyp)%>DdAp>ag=c{Sn?lY5u%kt0KTT4uFrgT{Zu-WoS=bGsTyZr3Rg<_+69?Er1@xt;i zucNAq3D69(bBkYr)Q5+i?17o#uFTl-09nWB5KNQ;44JV}UCuWDKE_bq$AC%^}+`JARraFX~Dhbxt< zu?tR8m~#Z#Vg6CBG8p}5kb!O5`(+Ciol+}NyWULWRN5hLU$1({2E%YPL@Sw_53D;X z>@ATD6NK(Px65h&!J*($p)bC$EmoB<8r4x<%{VLNu`}^d5AK%H&Ve$>uFGdlGQ~7D zg)OpGj(X%}2+w#=EZwj@AZ({qVuTmPQs6&7EF1XY2_w0*M7`93SEvKY=J%xp{)f-+ z93ss15E11?B*!?L;xMOzBFnqt*zMdD`iHGwMyzba$Ji1&lFoSv&4AJhtoFp3o%_t! zK0swG*m3)Z60z+!Muz@s}P z-(AQ^Jbyb{(fJE^O9pAAXMf#X(!LnHgv``xtr|f-N4z3sjuOGHwnTGueS)B|{v`q9 z8~g*#Qp4}hYOq!Is$j8l(lDbY#q+i9VpL_;@mnPnE_PXEiRiRcus1D{TU`0=xHZpx7XW zRcYxk!chL7Ikt8sX0>CqaDbc_)Vhj=X-RK-4~1;i$g{8h>=QV>rZ_Iz(Y+Q;JM;UZU3)3f(}u5LNV)lE=JBPIy1R7d*JLpEbyR8!*J`Z>{4UaRO_ z$QfA&KJ5QcSMO(->5 zf>gZk>>O~kaIg|}Qp)!7p-!wS7DH#mck@5k8~rB==sy?uS8@5#@&t=e#Do1k1?=^( zOsn!&1+iG`+d)oj7Jj`_>k~Y6q2AsVk+1(3kW+Nmdu#rL?onQ=w`dLOL@9%nFD9hnsblqGK;lp%q#mIp7Z zp6>V{=^1+XtKqeQ6{4El+Z=|WD)ZtFxb*^U8ec}EbcViw(f33`RL=c@--iVK7y9TF zB{fVCTEJu$k`18Yis@W#!8QvjzA+|yYOSsRps@d!=t_bs$G$l&{ndy7t5%Ik(9-!y zFK7ub+GhH@#5orBLm=y}U3c<`5?kBIu?ljb-lH)-PD1=eKXYbG`CclW>PbfzurN=|GR(x zEbQeaF8_=^ztFjVdGh@qD>?l!pnL7VAN%ja{(rwx{!affAY+{rD*k^Q+W%V2Y5<@L zAsv()JNCc7=U@L7@N3W4Y3~L#u>N0b`{&O{z`PG1bZB(!*#E1D{w`tu`4!g;5IVqn zpfG*zUrYPnZ^MGjL#MYDsQkzNwY2}^+mGvj;D-5-!=3j3_k%Sk2rIAeXHqX7`}f`X z=Sq+MRL%c5v`u?vKE*4><@-P2t^ZtWu6tpHXqdVf5gM)Y?sTQbIsV=ZIbJ8U%SV7u zu7(T_xS^1Dyo4$791`(l;5=*|92Q(eVURn8z??ex>JOM0!CPWz$UgsTddE-%KOz0@TPI1isj zbYZ%_&D@xeR&u3L=EV0KWCraxxTSIL!U2;N4HV8i9?+$zx5qXwKq0w} zRzU%T;iQ`Y!@|Q;UiKHluNHhFhPH%xiqA{sf40^6q!VoC0B^3x$qfthZ>{Emd>>eo z;z(iTgdOs6R8e;t>T!PZv9W<>uZ8_>r-8DEa$n5rzYcvhz5xf#fhk+8;x_FA3vkE1 zdso(ni%I~o@`KA&QKY!{)1jV{J5CtfvvOyV`j(=rC{=8nxR;TfDtC zX1aDR#ts^!o+y~Y!i(NQ2_q9f0D1#d60rITNTnp^;4N0Cv&(_`%!TH+vKiL_xzH&d zofMuAY&4_P0{ne%b~&F!T83rr4idwYYL1G#N1Oc(Qn_nc0c_1JxF@UN46%3O~K22(Zd-Fe%wr%Gip*Ekd?^z8DmIiWdO2Ys-bL zidwa5;ON#^CY7vO-g`m{7{z>7eu#j16H|a5Ym5sEES$iXCxIRX+#k?O845v$=Kf0t zd`6`;`o&Llkm6%V?ONLtlO>G)_dATfUW-=1sscI1Yeg5juj2E5bRyu#-g0(VwW-VgJ6~0`d|6nP~F0;ahZ=Q3PBq{uyUa?Qajol( zJ)a>?Shx4&eI~yoU}mSDv9D$Q^Yx7tSwRJJ>8vjROIj;4XvU_0b8%deZ6if9Reo5A z-#8x*7+JLoMR#+WT&N8w+_`Ysf5NxcbHVXQ-EAKMB*)MLcG|^jOnZ-y=-R_hG;MB> zgNv&(fY$*JyXLW9>UOw~s&TpF2PacE^o216i^`C2LJ0-TRK4%PQ}$r>WQOdxvwc0O z#syFp6V?(l3l+^~B@}wn!l%kxBpszc(ta=*RSINklA{BWx+`zk^x;e1(89`>M5nGw zC^K^0vE~?k>YU^tLXK8)OM1^K9g_Rgw2yQsx zNQ+WMFF#%%=?%_BP^h{9C2IxMByQW|G4;~n*MU=O1{~v{knn2xf4?2FZ)aJpB1fr` z0eMt31-S5gqJ8tuZ>5?0Rn&B-AZCh>VEeKWek!^P>KagKvPF|aWJbw2l-^#K^ z0g1E9%h?u9d*)6*S61ec$|<$no*xp;x^|XLu3)HO&C7FjBET5#UU9J1B&`bs-P4cOIqM8oh$*m@YRpe&04&JE6(#q+L^HyMy^-m4SqTY! zMe+f^DUV6(CNhxlRluTDw<0-6^4SVBUw*&!$h0a&&M(Z@Pc;bMD-O7d1B_$O()R~5 zPJ8}8sLsbsq=%4($J`0!4E#46&WynuN9lLYio?!3Ev@-BCK8ItrFu%;4gd-xrl_$7fN+Ovy*dTt^vQ zNlxn)Cx^7^!@ zb-(6T`1F@D$~_54^FnI42_(Jx*Ey!_O%t-W?WYbjWbzYxVeWpzmN*9HdDxRV-)W7L z1E5;(#4;W)8G~hg9Q(w?*1bXi`vx9n3IfEA zu4CUk;?DV(qpT%t>dWhV%$fCvMZac@P@8ei)%NUDRr*V@n++6_dby*)3LLO~OU+up zUF!hswMH9e3G@K2hf|OOD|U!eky0zNy6R-<7s@I(RL^jA9d6x|uFfXy$OV`*iI801 zk{#vht#Crd6~TG(n359vh`=wg+__+~)aGDsjv2 zkAo;6&++wWMM*0dDM@yl4O9AA>CpZ&Xt>D1%3(AMS$y`R62!c}v~4@J%td?-j;9P; z`T+4m^XoA;JZHYYIt^KqxD12z)_-`F$*0F76R;dlkjv)muUDZ=4un=mJu7rsE@K_2 zaN$ogc3@dQ%Ew#3o<*evoMX|3E*tRFhrizJeqTa+L4hE%OaFfHoqlj%S=>nSAfCFk?>)u4(9X*dSAsm$t|9rGNfm*v0fg#G?nI5(aeS!) z#$sp#d#>HO(!u1j#P66s&!ziu~ajz~i7 zEkk->&&+{zwa@l%my;|4v59U>hyfRslfBpuyETko18oXDV8k+BlOGWJ3@~Mc1!T0j ziPdD}1GzgnY(X^Toqda_uDJtEGFhe~t;LgeesYiaE{mkzSdT~WN(5?v2koWL9h z_RI4gznn6MNwKcw?@{;N{_+9SJ$olB{q{fWR>#hF zCbcS>WnDa$p3ij6erK1DSsw=Qk$^$J%8M7SG|5*^4P6xMp6Yu~CkJkECT6M8>PcR! zbsm>jnwXL+uL<6R+p`8kAP}6$j%1(wsVu7j)sgI=5BrvH7{#+LGDu)T#>-MR``53< zut#j4=5lAE|4AjA2L^-&@3+6+`Sc|y`Gv+2X1FSI)C5fk;$Hl#zdc{2Hw|x3C5+|N zGB_@=w6sP;MQlEoyw#SQGs2q}qKo3RGsa&pDI?;00lPU3TV81^-1073dr)9SA!tVy z0ry)|)MKm;by6(Vwm(mn(PIM-twF{_L+R6E^JHN}fUD)~u<<$558w+sy9W;ZK)EdX z=#z*Qpa(tJ3O@^}gE^f%oYka@<$gPFV1#LY5TRx}mfwz%1R{8^n#s8AEi>P}8>?U{ zRqKqefZR+n<}e=&VUs@h@i<_J=@xg#0>+JkPzX$VLI>COc4}jE5h|l}!V@}{gc^p; z2PN-TBUj4IYvaP!iY93le8sx(qU zj;y=RZReAWezVVn_=I_{_#kWUl@hk_b@%rXF4?0-eVr$ZiuGN>b~2V^-S_;@*mza& zct^yPDJiY+pX3_ANVPCDs-$osCqrqn#%}u*u}9eH9D<~1naHjQro(@$JO3^Pg|lgxPSyNuNn>glA|ipTi&hvPxJ<=e5=|v zH|f?BvyONn?o^+HB`UHEFL~^9*g>0#0|J^Dc({cS=DvCJ$4=q#gXFR|={J^j5Fp9H z9f}`aTG1Zc<{=$t#F!c4L%9RrvWyo_qqf3jr7kghWTUp+L57$OD2f69MJMtA-36ZH zB77A4`1m$9ft1yN%2luGN?D3Dk{hXi^?C;c?s z>JGl%@CMj2Cji0Y3+{*yBqR~MBQJHY?2edtf+|5(_HXS!qCl7t7;=L5IWf}-K|S0A0Gx&JCFtL%zZf2no((&ZW9 zy4_Shc23LI`VkwGmXPLm!@dGO49-+nj(K;J2NXGsKhjYuU~kjL=3D#qwLZmzsVlt{ z0DwQ5dvMAI0`)eLI%+tu_ldk#9Eo%M^;{JlOFB2D$UF2)ME022vyL+-hDVUrmPg#kS+D(!InaC|} zSBXNZ9+j$=p~y9F(tYG8-lLAOitH_8Me}{`<(k}o_{sK zUn{zFD*g%@kSqic+xWysHv5>cl3|^ul-HFOnu++!9jj>A+*9h-oHX2W=DBf=eN^tF zghvq!V4ch*Qa1Y)lju)*MbMv=_kfoAyIC&{pzfVnyc=$s*Clzs7HC-KMTxb=Rv#dg zg#z1ks5>{G@Y3SK{`AM_w>KYRCD)=%2Xq9A6_)_MO@cUs5mmNo~rGIS`o z`kmy;$;*?q3eVwnxbb1p`W7G(C{17kyK{{dcjp)IxOyTS8{De6<^6O0+1?7oqWUY! zd9sY>36tDx2!rM?tm{BJ%$g>R%-n&6e3-9pANIg<>WPnD@o&Y_9|1SSo<{V>aO~B4s<|XI0nR`laNd z)PzFrQb~G~32g4p9_@RG=@wQeXLNI5vTJ|UEy5F?{nR)Ul5&M(%_t5}&V zZ$2e<-zB0RC+VO9lOmDx(It(~*mY!Y6PC-JJmuG`wueGXD;E!hf=pTZ;mL>WoYK!? zgQ*l9G4Qhg83|mXq?4hkD~9qkbtAoBILAKAFm2q4Cq!G1QK1g+K4np0HJ9n6)Y#a# zxGUW>K?lNCP$**a^_AQ~QO=&j?~9S1!;Y-G`=;;^f*AU8=^q(QKE%+LNQ#9xYK?ax z35p`_E5DMpZol9w;HywEcztS%{``0+PbPMMP|(S$KSN11_i+Ut9Q-XeCj^x zyxHx4*ESy9S$DDPC(wai=U9X1mitPvB~gAEygIAy#q-Fz?o8~_*Tcx$xHUk9|K1$^ zu%a*5eN;>0GNCwt)_GVldy3u-{G&wy9Wt0#OT2qVun85=DRsrtZ}n|r2>SKe2@Q&> zHzV6iPQ?}Q(j>|Fi@8SYgwQpEuln(a!iu<>t2%V(cM#sAk8RjF!gsCD?FsWL}wDv(sc%+CYjh% z;a-dD9A!~YUZ43EXWNe2>4+S_zeUcviT#i~Io>;^6LMwSDqg&4yR1BSUq>m}saAye_esnn;-e& zAOhPDq<_00H;a@vUn(3x~1NY+#_3sXmBe zF#Zi4{JoJeM-0Hg+Vk{$-TedhBrp9>VciCy|5B)WR!x!K zqU~wC1p*f3Pon5DVy})N)Br-%&8^Lg#$~}7Wln!slKKTQUUiPN0n8C@(-BQ6<<&Jm ze)mt5;UW|5MA!tEkyiBv8xM1Vdzid03ZSixpIg;Px|eJJDOk5a z9b;aPR=1EB{FkyB%uCM7-{veb5wa7uNE~?;*%p~lsNtzcnVWt^++2h|gyXwd9g>An zW;MPB=3h+oJX64QLdIOAi~QFNyyoG@gay<2qZ9aqZ4kByBI*$FFl4f#d1tWX`NcuE zCubz@R(>i>>YTmtnp?GIYcue}xDxfOj+my6VYo|$lC}zw}0G9=p@J)aBGv0s0TE9ja@~42UmI1JG`bE$7X4YCFFLznOzeTG9R50gn zfhDXZfdJErXLmx`+qo%)m^e0Fns`hJyjWCZQfXi!1-ro-JebC{ZPK2^`}+T5@4KU# z%EE641RPXEMPX1WDuPH;s&rHok*0tmU8ED5lu$#_u_GY8gH&ljLhm3-?({RRReTUvh z)xf}IdpJY8gD%-H&OXr}x)7ON#Ma)pQS$NpmlA-_X>Ta{u9oLLC~9RWa97+#XosYk z-e-stQTAbxAUW-fj*0G!eti}GRy<9{{Q0VOstt`;)Ylso z_M&BLJKCA*wxX3MBb3_=l*-V!~&y>jp`p|BDcyO zwv8Ge3ze$V?T*C;y-K`~Vdb|IO%7>6>hM|aZMm-8E{T(TIefvCMsf z86}9za)uun6^KKydJ4K?Mk!`+d-N{X6ZKtU%n-_HIMlo3B6dGdr>WYO^^5|)X=Y5i zsJ~)~%pEw$wI{=2aE0Lwl&hQ%1xaq%nGRGp#ks)=G5>L!s8rV;?~$2Ul(#oMX{ONh zK$O6}j$r){Q>-P4Vx~L!CUrNE4%^LLAgI|GM5Ei)eHfsRdrT_8I)_y3XwV((pV$~NiL{f|7bT-NY~tAS z(L>J;PS@0g$M#(=G?dI{v5FN-V-~5Dg6+)&CByiy=sL#iN!dIcwv|!t(N36^_~jfnL1S}TROUij z>qkvX(fh?9+4<%-#n}6EESiv}3-*|l%-yqh+XEq6x44oG1MRTUt#Qb{$wfj?EXrIN ziHNP0DRB_=>A3Quh&3A>_IcG26(E0O7go4tss zbbcns+fS@D;=3%a&V-ji1`qbPYl|(ejvqAJ>vYC(XRy~^YyP;76gS@vd~`nJE&B|n zNZz5TZqW!)%ppb&Az;(>&BQutbYsV!{ov&(*)35Q%&9x{O7O@aTlo5u^+dc5U z&bL0)dOF0JrD@dZc9@H%btlMkSyi1zBZdm|JqXe^(L_bhfnb#wYy>RmgKg$pot)~I ztz)W|T@tCJmmfsF%T{>u0-`4UhUtP-@(eAt(#>jjL^sC#47&{3jH&xc)WfygI*C|z60Nz%F-pvhoX(X{XZNKA@fX}2qfIjw>@A@N=->sQHG1Dy`3%srp zj6Gwy8hEYqPv|H)QN~r%Wx71^{I02p)Q#7ZVTw+g=t}c~&U$2#26ZL82HRy*@0MKJ$iB$}y#j{~+j}2g z9x^F?kV(WrLbjGMkuHrpY33Akp}EP7Sc3zwlo;m!Xi0XoJ$a`e-g6Acu0BUZXI={~ zwbvKL>TPftj9X7Su^7EsiG9HlFOfGD7h-cZ1$rV@+NmOF+b0h8LHosr)^LF;lyNZU z!7zPNG-?H92P))|2)qxIldkIo#L!~`t>#d=`M2Xy|1+S%&nuVE`t_1 z#u5`+5C%16jXLgX=qQjIe3#qxMi)b1M~h#nSJyx0lMQ0N{V^0;tElx*z`V;Jau(lv8+ zMgrc=!y`VhGw5$8g43*Ik(7&edIC;)pkI>VeXNr&S@J1a8pp0x5yKPQ;n7qR#o&M+P4j zCz239F6 zH6xIhi+)h${p+%*R~dSV_SIREjG1s^+IPn@XTvc9X3eqt($DPNk8`pttTgRj9qy|1 z?@|0TsPF&O0&srP*^d7UMb+mjpi}bXn+f=3l)oNzlYpQ|{>FcajQ=$+U z7@a@8{vOf)KoGx-BhZs=>D9tZzV3uK_AJO>Zg0IY_oc^uy6ga=6}A0@yIdRB({o2P zoL3`gL+g-i63~%=6$*It+~$4WUpV6o4CT-j5RlXMKneKvMB8);AXuobmgyStHxbtD z)0ovy&)yt!TS-4ItlLu}n8^aRf>7hCjh3sf3BYeg4T!nSF(=61nw)sf((HPOfcTa$ zIq5BrSF@$g7s0Jls{UR1WOY|utB8r_pHF{$y}y+yEP)5vu0KMYB6}V!2QHCDmrYq; zpu|6r*Q69%BC`84sI2VmJvO6wio8{|uiRHLMn=X+qYBryaIMt{vP^Lies2d7RK3=9 z1XU_i=+=80xWBl@SiZ8HZVXX~#QE*1WvZV(H`NxYdOSSVF6!SB)^BWD3_IF zwiLSD@0r{nnGs0nDXHwGnBe3qXMi_A^q>H11qJY`t*{McF&J=Qi@oexx+>YQ@hUuv zCyvyYw`rZUD6}2-02}ypza;^~&48Ob@Nc113+A5M!gY&qUaiOz0($3r(9RF2&urkIM}UO$$oy%R zpI)>;<%=nSO=q|cMZb=OsID2%tdP0VjIHCuR1VMelOOZn%lQ)$E7nV#QwWoC;*>Rf ze@&X~4YYA&Z=h0XO%#Z>Xc@zAhd&Ve5LNKt{EY)_VZgkoCB3yjp}h!n#%zQ=X5m#O zlR3kVWn6sS1qfz02Ntw9>UnQMIUu>j4Yy)zYo@5I_-v1v9qxN&oUwp$V z63Ln`d#faFZHoL(5$lkpk<7nue~l#~SxW8cO`*wftvcs5U@!IBpYjDom06)gHyAzo z18#O&0@@O~HuRWfVXfSWyhy%2Ri;P@lYpSG<~1ZFcYJIXc5`d1)zIm1MDm_f1is{f;kil{j|e-w_YAhEXWzpe<33-|6)wO=GQ!3grAzcMnvjw3UKM1Pj7EmzD#z7%IhnQDKh>oL=s|40=}rWedX`HKG=8p&xa>|Tb#q9zy^@+UUvn^ zBmceLeARupu~-vUr=*}?>>Ra9ApKb_ImRRnQq&@Xv$6RmMVbtUP797yxfkkVD$}A) z;cBcys_nM7m$OVi(fOtgJeG4zXE)J^7Y_sBhUjA%2BibGJ#Mqi zsM<|cVQ=M>b%}E6Xo;CPpH+7(AJ9!-Hdo1tyvelh6Ww6l=DcBV7{NbiTXniC?jp!_ zi2#;uw>{gVg-rPis<$hHE}>HNSDtC4)MC>@+JSK(K_8g-8oCX;WN|3C=xQcQn_GiU zUArf<0#n^}l&E(&*!e~UPrXsesj+U;a&9Kt`B)#y%Lw3EM%g4-&kYt;^*`H{pY5s5 zKXhtQ{@nI3h)&eL$wMJ*^lIncbVobVF32>M z)YaADugKg5-m?{6q~{ChDwJ@@tT%9ob9hQh_LWm-6^U_xlM%2hS3TrBDAhZZ85?w= zYjj79%++~hwh*vvlRzmnt>-EN$M5s>9k|E{g?GViGnf~Q-`=%ZMtfXgzk)7nP0i3r z>MiExr>c_MJVIQ5F7>&i=x;|{uo6oWwQAv(=OkSGqH#n|%pt9>DLDQDpc(o0A3hxl z9J4E+*|tyKR;W+AldLo>u!^$jn!8PA2$=CH-labooU=6J&vbTp*+E8&mpLpelSOG@ zOq+JjRoyJW8#DF1S(glA%}g@*YfzMklU3IZ!#7qMjS*sdW|Q6P3McrrABbNk1d?Sj zginSP5Wa{JEX@I-OY;NSQx$$%=-&u!_i_n-?{>?9i@_l-N#&KvR)>9a-W?LtfzN;% z@>N}{uV&=M$O@D+l|F&P#s8r69o$teDw4>>is31M_@jbBr^H2cDkGRe@ijeuIY6+} zZ{1M}6OycZaZ>R99?)UM)|VvX|L9Vt>f{RDVHOVQUZK~-c2@r|I9%79W^A#(-~}I9 zJri(-SaTl8kr2#uZuma5!W9sRb)u?sAX_Z`I@xfdvI_d>Tf-$ck`9O~dA9G2>}H-k z@J(nxHhOfdx5sD3#5Lo`nuWU6D;uUfC_IbsYvi@XX5LFDulwdz&2lk8rR@7|Bl8Rd z0oESApR2sPq`>Mha5L=)7Rbl)W@gT0obNLAos;k};Cu3}|FeI>me zMnd>R1z4r5@Oi|V$HJIpVDKpgf6CcY3tVC#92CfXC7nhuf;6sBAf3T-JMLDxe_F_n z?KxS!W&}Sq=QmQNuz)d9bAWK06gA-o;By9?y~+rSGSvLg)C_njYPb{l<-6W=Z-h5E z)$r{md0p(dzfBh1Nz=0L(N`;l%q@s^^Vxfz^CkU-^G)=OYbuo|S~WWyey3$d51C$6S3{~jTHPur?9Nub0I845g~ zVt(_3SxbE9tO_qUFO8k?nwz3ond9Ta>`#AG2&w$$l6z~Cs%zh3`nvkldUfR1t-unz zWD85p#hdu!z_RlH@Cjy$@dFY))cnTtLq#+wYmFlh#FC_((2qnX z-&7*4m)6!Qjig!}o>Ur^?M`6s7o~219JK@Mc9NwG6BDV~guUGr!Asg?q z!<*6E+siC`MiVx8>0;Y{ZHBttBq8~NseV(~)D0iI!JK>VD7+sE_v)|mKj5yzySblY znr9O*_$>Tp*4rgEZ@FpO>@^U!co4YI$|!iE13wA)ucL3%#@T9qI|{xu4%ErgREu7$ znT(`}#EkRIH#yF%ev<%(&eC5vl{D*gl<((?RB4AX;mT1Sm5wXTz(BRwoS#e4@0x+Q z)5&qh(=u)kO#CMt^m>3f_Xxrg4+t#93qv>u;>=oObR&S>{ z87}z(s(GbroLx}^w%E~Z->3OJhqd{V^+BwQJdx_R(*exk+M^s&Q9A^Wa}KTcLIile zU1S?vdsc>bwJ)Qcu<~K&fadkX^fo9FJr6**;6C>?9`7!sv2|;cGwyZ>d1t_1(+SeCH_=wd~y5b** zbdl#OlYomD`f^^`ZqdkMfq4<6o+lNVdGDZ4Nb}od8$s;NVt#706b;=Y?vz0>PI2bo z5(u`95`X%s@X)uIG45B?Rr;$`X#X#(v?M)fI~IU#D+t`nK}7~WWoWlfKE!66N%%r3 zQ0+Z7rCv{TVwYaAmfc0o7DDr;j<<%Zy~WUI1JSito}QCe#UAO{kvm#|>_2PWofw`Y zF;6YEB-^30p&sc*6{3Y+n7s-S4lQZp%3|&Jz7>~XR2SdOn8LU2dDaeil#@6Ltz;LA zAIO`zy3drc2xftAv_IV%#9+xLXe20PD9K!8+0Xk{y>&hjVcl)w<+Ft6-An*0IK;ji zKeF)xgFuf9p+tv6WUzu!Ja1+dmT9YpmiFx(YWpDYGBx4Qd=!wnIAF zaKW7k3zpZOekEW^OU*q{`8w_Gtb*Sbkxdb*JVRym{aIKKzf<7XFj>>PWR<6wZ-7mp z&vkC}m$5sfF@lCq$v?u3nVK^V_kKEi@~8&FUeKN|@@GKBd~WRssNPnIC!IvGu|B#j zlBE&O3uiVbdrRuBKH@Rp4xHx0PxHD;%D^f& z-u3jKPM!^M&bmrj=iow2AnG=+)yW=a zN3Yp1Y(EzBD>YD_N_YWeyVp90FvJ)^mw&}eC>wKMOva_{z2cs4wpRPOMm%yWm3EZ2 z=biCu27^Yd7HX_vpUj*;K_qWDePTN_XC|gk` zW?6QCwB`?YuFfH+%xrtV-mf6Hz*Y85dyz&j8p3yh?;nt|$v-fjj~bi*{Mi55!8QB3+Htt~jRCp?tSur% z*6LA8;a6*{iJ-Zo(qaG_)O6peb}i|&g0F5ZWnRqiu;R%o1pkjPmhxR7Z@ByCqaR(2 zs0XIc{6``Y=8s|19_Hw!a>+FRf6pt>kWnW+9B0V$FB8F^3yZ%F)Jl&4ERpyJ@xaW_ z9ZY{;-9IPqVRPEY3e#(#!(=kosWzHlC+kfz`$V=O>ILuwjWUU)7S*6%fUkD0zrBiB zJ%_Ps>X2S(Y)PI3aWZ}HjZb-1>oKdwie^A+G^uS@GH&zsrimv^eb)=AX|%CZ-*dqN z=}rKdcpk`1XG3_e8Dtw(q^|l@hD>(Ep1a!p>gjjn0`v=QdpVQgyV{k?IM-dKx;*f>5WvDf{Y%U!|RTf!yw|!O( zpXxu#Ma@}~TU#ZCiI|Sc(vF=R8ZCrnsV7S|lsEycsd2yh_c;mep~dYkrNKfW^OJ=u z{d;f2y6bjsj{18zUrT0f{{HZAAEpm$1^#1`%00HWcgpNebH0H80&I;r9(hSZj7!+* zhEs)w>>5aSG$JDdN;oNM-Q`;V4OyGzC16Vq7j@xqrnQt6vDSF0kWS620(043b^C7U z;(~N*lzcn@W9rwM#bm+$^_Ta-ORd1p__Eu*sW*7MRwnyW^;ys#&2)S@lgz)n%K%iY zHJmS8vU9#Q)|JhoAxvV~&-XuICm>eGp4f2pOBxlQGq0t?e4tpxEw-J`beLbDnRzhC=Hw!jE}*zXUU z--z%3CS>{H^vFGT@H1q|dp*I+WewN{8Ry;%nxx_t=1sxT!pw?p%@oj;6?I^$?KTkK zPxgIL(*`X<3zq}`UV2{LNU?f5|21Br#%*!sgYRCW){4!B@T;kTE6m^Dl&`u0zd;jL z`lNq++o*TcIPeSsDoeJkFnTBz|wjZ=HZO}(Y~U47Q0{VuEB#&Hujo^F3)Z;Z*H3;?W#!wqaSR96HPNTH=A`?~o0E z4aEbD({AgdYklexWc@FXhIIc5cXBTu{H(UL4L0~b{BqVLz#}pYN-kd3_L`}AAI2YE zw+fqob%9VovpA;Ka2FHx_IpYD5)ue{7~8f;Y}7!4urp5!s`nP-5kLn=O^Y((iUWcu zDoA+iIPKM}u9m#5_6)B^gRjxOQg;(r_y!v+Q<1UZP%*~`LFMsW;!JadN`(YKa zmdJ$)vna24sx%tmHs`{=+}m?0cVvTWt6zlLiv>rmd6Zm8w3yEK z>$aOeXhDg+Y+ef1hwD^$hRQj~Rk*e$=<9TB4zgHGwGH-x?guo;KU9eN4kT;$Ay4#_i1yLU+<1RSLNnCc2qT5A+fW3al?(v_Q)MY zxJbxfv-dJAAUQeNcV+pK*ZkbfjeTe!L0mzOT@5>XuJojj5QL1ZQk4JwV z{O39)#G8iqQW`}n$bVRziG@6I0YkOdSs=3cX7f_%o^5z*=G2#P&{379fM)!LkOh{r zUh!Ga13j3{Yi6_GQ|gk)*g z%$J8-W&XO4MgjHiPjIxF-vDRsBwz)r-SU(WAKMLEW*K;!)qZ>6MJvE=?TS;;iUv^LSXK9JhADqHMhE`Aht-epI*&hU8G))YLgi1!aEiK>cf^<7fg9He1EjJQ3wjAbB5>?OXa`c7 z%@u&mwu6~z;t=HL^*KQ;b&v;?7YTYKjgfgqr>Bd(H(>WoyvL<&d#hjBk5=E~^r;R3 zDtyTf$=*cvHEit<0ZmN%a^MvIu1UVSt&TG0gH-F9@5^;FPS|3^TFtT$AJfv}qoZtRPa zy)~nmo!HwIE|#D9o`rxd0g&2*a7WoM1;3L&&;SqUA!!v5> zxRI)~s>n3*=C+a8zo!&@E1(__N?^D10_i)-v9gfY_GpAgl(3;$fm|m3bSVnwsRp9) z%*CP;EjP9y`Ee2!J41>V=rAwQbs}ym+SEUqk%h1M<&AxypWpFiZ|$P2!*H?wdWin4IxArggV9O=;!{z!>!bt-DyUTC#9>|zpyqCwVwd#jCF%Xi+{Eg$=s0_Hj(z8E! zwSkXhbo@Ko$jQR(2@4r<7H0eRO88sg65W%h*Ll>YJ0u0}i z4%_PJGGah61S?a09Y<<+ooeG>n@6&CUO=w*zU;Q>o6M$C4Os1AgFat8(xLCYjx{yU z3V2c9y`OJjUUtv4bA7Ph^)IsHV|$q+Sq0U>?I=NG;p;D8g8meVCaWr2ML<~~un>L1U);vJZ?Rit|IIylO}jx`8x+&7^PfdS z_*}3x4}37upxx(W8J8^MZm_LDs*VuWyJ3fN;HeAVZY)V&C(j2+8IcSsYi!??LKS#X z`1uxf8!Ixk;X7|O*F+SK%Exibd#^{WMB3fTxLD%AP*GGj8V$Pd+addKpt0$oKe2Wf zx<(Z%$2+OCrJzjTQQ=Zc?>wpfOrcNrA8!40qfB&rf3?B`$|ec=YUS|+Uz$y*~2CU={>?E(xe9745*CqDWx%WE>C%}RRL?V-&WuxKU z3hbKGwsdu;fC4-Y4RcF23 z(rC;@?c>L;EN-9or%dxoM$)bSrAB`@BW_ZqkUOge3tD|Q4Uz> z&=(obQc8_8##TogSAl%Fh#iFJSw5@a0v-+dJ8~fVdA9wvy5e5cWHA&hI-x2?)S7G3g4LUrTmge3+s?;n}_mM{$zh)CT zx!*dWxN5lA>&>daSBjh89u+bgLY5AsL`gy0tM2064Ph|loBI@_aLKaTix8V^1Fy*$18cvCZ&1YGIwATGWZW1ujeMc<&Ayc__BsY8 z@ln!F1DBL4<#s~l_cP`Bl+qt$Lko_JPUYT?cC1P7|X4)^jB%dOUu#PTuFhKuS2Omf&8$GwSZXYXZ85W+U=_Ooiu8>O3JY@n<$x`H-CI8Ak#OkX54G^E-)NHQuJFG2Mc5Ijd|~NX z>+FE~fPOz8dKpfRy&R~ryPoAn=+l3M5QanvBES|5Tmmu)D(wczvi>IG^_l0d0*RmX zlVF*yOzVS;j1n|R*?nP2*c%=uFmbXpAT_k}4Nj=ev8+Slz~xm`4wvl(biRfPU1E{Y zcuuVKSG!*&g0dB|1XVbpG^o5tSR-!0WoPqo6PR9v@ zBX0q7ETxq+T*?Rgg{__|+@#T`gVfDZ4FQO0e{Q)A2rDmgr%Tv%Dx zY4ucn5~jGjo%gy?v(4asnqk9-4^wod^a<}uUc%2k>&_=fDw>+;NqIAKd2L?Z^6Bu5 z&ro#0sBhV99zl8Y{y67$v}TGY&X*L;`2GTs0M@MOZTy8~zm@j{t@hJ(+ihx@%F9xc zV}FFZ?^3(7J)n`wlED1GYHO&@oUWmb7ah%`i7O&Q67ORS`$&Po87Fyjk z<`rf17%lT~WBIWXibr0TeUl2VgnXZ$D0`n$rBqbr8mEvXsz2%vav8ZE^{6}6aCYh{ z96inh2)ZIe{DbZ|X}E@1j7Y`Xd4+kjF6a|7sREK#rkNv#om$S8)Jqgl$p3mukMohsE z^~K~J{9vlbaM%;QmgP4h!z)`{EjLQ)Ew79DD74=`CDD- zbE^egrUg4jXNS1ETqgZ_D-BMELd_aghL+3KB86?$BK?=A$|McFx|3=$#kY^o4UOMN zujcShc(q66L+x$kH$X-nuR5x?V)T-%cWkd~e_<}@+Sdb}zOuPfcW-RTw^ifD+B;CtU z+FS6>Xb49H_iw*Ri>oSM)%EfCDDSL}`m(Fvym(ZB}|L2IT01c(ms^#59ZRIeXp1CK2v$&#(R%PX7;5&)1)OPow7y?o{~I;P?e-C?y+RzDoBZ5 z#9iy|1Rv8#a00qr@p^Fby^8ni(Qs;r(gE>Vlj_Y*ZD~X)hl=5b|4csWM)PTuJMh(y zWF%@K$fH1S-CRdO1bI6KQE8rFn*2a#q0Tso!oY=-B_~_>k~PD93?$3UO{8owZNbLI z`8Q$ug)Su{dd(9^l9Y{Sv~Io$s@%cZ@-CJ`j?!D0-VPegMdAvxBp%9*k1Qkl2JV4S zj%=s-o)8Ysotehx+8K_K-tPDqZ~QHS_uGY`zQsY1mbKXI6)$26&jacTJ*%$mK1aWu zLe7<2A#2cM| z#CFf);scD9?6(CDZp=N>+Hc*tzdYJrL&iN>(M9mKqoC0kru!Px&-DS_t+9<7@_D`B z-}RjDJ`K`L>5XNW9e~?)$0+IY_RG7t9N*Z0ZfvFdzEA`nD>V`7R)=i5!-gD^*3#E4 z34I1Iccbae*Ara0^-ZK{yK6T4xPNTO0dciqY|P+`!yK#}FVN^rhk;%9MCdrdB%yL8 z-tluIgpFMi!X4VkCEuv$Ea*!lWJ4Q^T07ve9zuhw+0!DVU8 zY|FFH2P){*-6+ur(tnMTatSMgi}7XqqJ;J|lTOLsXBF9O!&?354H5efTyVcU}^yFgY^TgjxO!slVI2+nTFP=*V+*Zb|@oU;cJLfI8 ze76N-Hye1cB|ce)31JAk`5#XD+^zKAFR~S#edOP(Hn%kR*2<~b^&{1Xi!ZJH#C_0J zDP0@I)iD2Yd_hl>{L5DQ4YB*zA5U%rwCv7^@W~%mtDlyrzyF!85%^Kb6#3;1+f=>> zZwtzGMs?jDovt=>7=WxS1zE;5)B9r;%%dzi!)_#TNPH^k-l2bE`ROzBVWqI3`Se~;e7F&=vvVnoOdAat_B0s?2LgG!?(*0Eapui zKE?W@&zD7(^XD6%MExxI{*9LA$nTy@K>xSqGTCx>%XhvR(9H^S15-5F1|^8e_V|t0 z?dZY@YialS;sxx+3rIXTYMM3P^xDd}944zL?3IdB+Ok@^x8>#d)ARAImBPl`lG%69X|sw@kh$31kxFV7#F{ZbcW?fV)(Kbb&9&OlGgS-mcf-NHL*r{6N`9#n|lqmW+;8d4I~$@b6P=7+jw zC<_1=0S~p39Siu4f94sMnLI!2Zvc+uyq7Ou&dz^Ty#M=%c-VetWDu7o~~uYaYM@VxnrX2HU2n&+oi?RUBwB?Nr|Gp7tsW0LpHrrIU0UU>bk zP+GDNaKJ)ykB^V{ZK(P!Y@kARzui=Ald)b-=Jt9DEaP5#)l|jZbC&A~6)wPODZ=Rw zq3=K&H#?np0Ed2du|2Lr4G>VVhpZ=$|NM)&kJ!^vRNk>Xem2vU2!vSPx}12lagJ_w z#LJV9m>HQ5vh0rgQ=UBA8A`UfaroO|;uaI_GkBe*uu=KLJ?-m0Hv7KgO@XXeRyXeI zZxT*c6#2QgCJ8}Ov{ZI~{e6GZ(lDFgJ(J|U*WMi~8$JtMwt}t~yJMmHkq~HUz6lX_lb5yclW&?$d%Pj zQS#%zSBhwjspUbL>fK=#*)g!{*wOaeG|LySoPYuf=8c=r$EpNr*PB3$D-@Z74CC|O z5H-$~WMk6S%Qw*jhFgNtF4Li?rne=Xnk~!5G9JILp4V3VK1B-jXU`(qat3kjhE8>S z?=$({8NS8|0zmLd_rzaFf8awlZfA}KkI?m>) zACxQA8>H!@F&Um#ED`JXQq#Gh^$v7V7{7Vbf1~lIPt{CX-lA|Wb>MR)fZv_?)j&x8IYB{j%`pSimTUE*)_0ne zJA?j{22uhf57!<{_^z<7pj(w+9A$mm;bXc&=N^u))Fy%Ib#hxaO*sVbzjB$It3oB8K)f1iaPpNe`X0C4z) zKmL2a_=%VK@t;cCR9TbV-T5ERDgWA*e)!xaz~_|UEdE+3{*NCXIsg!|aD#~LAAbD% z!}{xo?*RW`f)xAyABXk7`EZ_+`V$R!x4ExLU;8r3+Xa6np+XJl zfsK==&4&bOpT*Z}c|Ttnx5V$WvbnWY+Q0trCOw?9T9b>nIZgAGwUm8>KicRozWVQh zD1AIQTa{B=^gP}}@5eId`}gVUloG~DtY_@Zrt$8(vc9XHOQ!sK-e&r zFDLi9OWhuZ8xFtr5h=}|c*#;7<@VTgxj%NQBUZEpaMhDN?wf}42f&Om; ztc>uoIkma-)XQq(PilWG`7LSp-}fy0UOfb7S4iBNQ~!wBIs5Q6<&Tt!mxNt>ibY7v z*;rAl(4~);x*vGh)!fAV)G2jjl6KqM`-}{xHr`He-0c0Cb>qPbL8gZ+MNsjWpCnt{ zM-pfyJ@ZAjG*e{OMOSmzhU!a5^i>RbX=&z@fXjxe7skZAY4G||{7ql|&lAUef&Q9C zy}?sttY~`l$B%d79}}vJnoRBtA6h8KK3NIV$?M&IAFy@0UdBiA>u`l@*qQ6kujE>H z#|jYrFR4!ZO3Qa`KQyN9{CRti(~gTkivXZ^p;cs}=Y8YKSG5U?*)f_hG3#KS0>v{Y z7STm|etWQJ-~h?X?GPinCKkSVM0lgLhVM-0a%DHt0XsDv?^ylSi&W`)0KPL3qId&q z@S$hTMQ!=fF}vquX+O@b(pNfoOEr|)!lw%#vTvJ>ug5{bKZMDZ4^DIXrX6J1r7t*I5-h|fYOT`ld?JEU&eDH3oL-t4&wpI@ag zaZrjo5@k)>A_dOX5ivs2E*8;@#9Dq}qzolAAEK_70sgdVQNrON3Q1=nsNDsEc$kdv&mhkiCqsBM zUpC+;a8Xo`t?CNXArgdj6F%Y-RxJeMB*spX<>R{*=M59YSUeiO=l9z6$iZ(5h5~(8lDvRrTSVB6H_>s*GRaj%-)bGDlPteK zhBteSqb#jQVL7Bl|1Q5pd`t-B&;6Wo`~K@om2~Ly#^L!qk7VyIyy$r|S}`lXGX$c; zIjRx}ka4Qg!~#J6SX zD0(>b$2v_5T^i9PMooK2y)9CZ5VEm~X5bbv3EIt&8@4zsRb5k?`wGypk(}~AYT1a$ z49#8HDXb-~qSSqHJ7uTbEDaD_CI-X(ngB%5-d6CER@3wFT~{<;Q2EV&52idXVI#Ob zQO(-<1PN;gvXsbkkaiyyg^zd%79+870bTeRYWcJ5R0BbowkyVpLGCDE?mYvU4WJ@6 zKnjmR25YY0j?O&`+dk|Jvq{l+?hf&4EzP%ocFUCjBs;l2Q{W(J+`Kqa)op>qnKx(o z&qbmp2_C%VrG(8bHe1yD+=%j$YH@&@?A}t6azs~lB6SeDH*7~r&7aWD#mOr??75U} zQdApJo&O{;q{fMDDoK)q0CU#NBTE7Rrc_nFq-y>3J-gc#2L>%Zw^$o*D2e3~t8<^Z z#w1EQp^?!2@NT%(1ANIm?9|4*ry)+3SS!-_g6TMu5d`$wy*t|Yq9tj>r&EPlU_pk- zN-GgsA-k(@+EFV1$I#npF8`!#5o>>;n&esHX}hfL?1_RsM{PSYY0snZn$ zk~Qnw@d)Q$?XBrt{S`u(m!vag^+PYz6qX6D-K z7kxTo#xcPyIroN{3%UFvgkkaaBbAMC)bhu*EswUN{qB@nnE#bG>*g>2RL}ulh7kp| zN!C>fr~|7{kJj)F%3;QG68@5zeOpeS+~L+-!W8W$Dbik1%$fD;lGEAqw`n*emPGSk zUwg?k8y-(9IMw?1?spFBv zTH_1e#7d~okd^%2I+nPXKs2u?fbd}#!2v9WJk*-tl#SPodj-Gh!?c9=1#76f6p3Vn zmH3Fsv2;Zt#7JMFP0>oZegi2ZO*r(2_wse%UgTj*Z7r*8{bw7LrO zS0YA@H=I9N;kq||UJhd1u`O*1J4fw?xHs!LAY}NtbndAt7Z!5y4tL#TTV#JQN&bt4 z5M*OXPay7Ha^rCS>RdmToKtgbHf9tU_J1U-%Sl>yCAe%7hw5u)BsVPmlldK7CuC2> z{ zOsAw`gHX=;wZ6}&K$SwQXeYELPrur=E>;91WMe0AGJ-HjI?6IsZ93{rmS-7*-I9dw zjatbiEBarJlW-!~AsFQSaV71+?b!knEej@#wu7H6+WgJ|g>PZMPck@Zus(xQu(y4QC{3eBuyiP433#&?O z9vTX*Ne>oc%7{Z|9rF*gIs>5H+QH%z6_6C8D%p)Po8R_8eNfuIaa#H-#oA(zvJ1`g zGc>H}f1Dhr7uSB-X@lvPQ^izKD(85K4({sH1GhLsU9jYTn!2 zMXhXeNwow7Hd@SQg{wDN`=Pv@#PI&Z7nl_vj9N5XA&iA(jn6~IwkKP4R#23EqleWb z@Zv8=vOGk@l9sHYJCB%N&x=V~ue-&2C5Aqigdmk~Dv%PGoP`al2cXdeFQY)(E&I^z zZpA$WduJE4(;HRToDB0WAILYv>L;e_Fg*(KwR_2t=37_6Mc*l3GeXz=;!vATGq^WQ#jrgI(3P4hYD%PQb9?K^~<@X{(n9s=J`yVH1CA|5lVxCS5O-kzyFrf40aAhlDTjfSJzAEO zy+=*D1@1*ZP=|pJPrNL{I>Ts|eV09uUht3_&%G*N*MbnQ9Z!b;{z|Z}Hw-cDl1!{* zv#ue_OtbK%7%TXL;7X2}je+cbQP=6{zMOmZ(d~d7wy%oy+Z`;FEE*&o+Rw~+j02~q z=!;rTWj=kyrt(VdbkN8@2TBeu^_rU?CeA~Spo$_y*GAnY zm{xMwL-f0ICmt3UZ=~&N+^nkd>$mXdy5iZxS&9uR$}_j-E46u8dJlhC@}LpE7hYl= zI0@rdA3*7Nhsm5vDrXO1v5H*BcW8*!uCnTLLjk1v! zko#Mu1Xl-BDt9-Vin&p zSw-O8CB9_mq_%DR&ha>NK zdQT}0gI(E^lA)mGU#(MyiQq)zuxM*rMMf66`J_~}LgmjeEA;7Tg8WjgyonPc#yf8l zQGx@YJmFzlL~l0sT#V%}a|(F$2)Zhgp7?>Euuu`txZX8y>cWA<(;jg=4!4yNP1 zwrIUCH100w;p!HREzoNpaBw)p<@w=7_3Brff&<paca3wW=69ua(8@@ktaZ#j8xl9@#wTAqY|rBGu5!t7O(Yxg+>$kojq*m=t6r1s#! z2POsLHmpn>)W-}r_9Q1{LcA#GT&RZeryvKaUq0HraujY?Ilg}1t$J~}pic1V^Po_+ z=HT$z7@PQKaP#y!5)z*YSv3>=R6Li?I9euVoEIXBp4PPOSrWEJYO-}EpBw2I`Z~e| zGjfxI5D-;)?0myDHkt0Es(8#;NwCIZ#L;ulTUe$mb5ZsW3(9;e5TcZ~dJ9%eH#Y_r zzxv2IHo-zZPL$!HS-Lq7t`-aIw7o0QfO^Y&*)G`3fv)u3(D%kC5I#`2D9u zg1x$=)lW(}@)XTt+O>Zt=4)IN;Bm1lp)pQy6_uVOJsb*)pk><;^rr=H$6$y`; zTB%0!;24fMMgy>V>u8jA7yp+1adjjd^Pg#~pEBF@MYO)6k?yjB+ggqi$+O(&uT;&4 ziv_8f)`p+;O_($rEyGf~{Fmy9`-_R!0%tcd5asZ7nR%$Zao6_oj$_4)*Tau0>r!JE zRSe9P8u&#IT~cz<>hpTdEd`+OL_ERCQYkAB9zuikm+x)9*(1aePoN|$&?`)i zj}EZ%p7gfH=@JI~{Y0A^wI2-xR=o zv^X!M+S;_tY}!EKZ7!2wFZ9XmATY*o8UVvN+5Job9NA+)y8Y5xcIS`eU-%4?qjExp zg~0%xcVcM%-rKUYqSPgx9Me9%j@_%_*7H`9+1xp%lxT)6Y`C0Hq8_xoDWj)cF;|#F z755;cWsM?1cI-0{Yi{nWV^a#llrf`o?b`djgZj?;ms3W3(4CAbAgf8S3;98MCZ6J) zp@_3QSU$QNZ7g)|2#Lp}Oq;I6gaZL;D(-ms(<&W)`#;U|S5yZr1!UfB$&(e>Jgz&vlY+ ztepW#AFfRjT8YPG-yT~1$Xq($6|eg}eZ`sO8(A46Tpz9Eryn2du^QSPHkJJJUMy*$ z4OwKe7xk|b{q5cI<^%f^9e&gA^wjDhtemAAY*#JqkpERZN*jm`PI<$%+}|pw9ek?| zVq-z-&kZYL;2**+PzR7Lzt9S-9OQpudY0`}6&)=854T$RdEsC)Lv4R|t>wJe%*L=O zpm6?wVt+ZYRh!v0T}srRDUb#S(2}-jCLQz9516wb+m^OOBMnI({FDOA=^?%wvn9Ni zCCahcQ|Q;{=H1s>K}CI=#8l6pfP|;sMc6)cHj8WixYRh zYHJfW#A~9ByIDoLu?n{LvwHBaXWVzKr23??*>*nDDXOc(sUxN8P6YI9bZT~rRmA*g zPGY#vM@g!>=SB+qBTNH!Xt z6|B%1FVJhxJbP)7Fa)UJeCL6sQ2#A?Z^INSqx8)X4V_O;y<#Yo9lB4ZHc-5vlnltl z;Mfljf78raKd`tU6l|PR5PoE=7xY?bbp~m-5gj?CcL%DXZ&m0ltKzKkoL1&NncRA1 zYiTtT`n5;fmUDw3*1{HJkZ~bX-nCq750UJ){Jc7m8xL8Q7y@MEkE`;qvp3(oBT3q) z_JWAj$=JqgP$2*0@|x(4bOvW0%D#PxI}VXE^%_AzPztL2)cL2tsi$05YtDH_z)i?` zkaY=NoMy(~H{+1#Z?kbbM9LJpc&5;$_n^4ZwIUZ>$N8++&FQ0*^T_~hqZ|TeSq~Z{ zjAC|>_aV1VaR&Z(|GX$}QTn17LVs$wRkGebX7-kI=5Yb;iscv;2^;JxI zQXi5vim?%6-tnY&4Q?wk58F8M%F@CFTglSiJH100{ZL90euS?U5T4tG?G%_T;B?vh{@EF^=&Gf<9`Z3)Iy}!&VHv>l{brL3rl)E zM)k8x&}Tlno28fxttW(+`~}51LmjVi^pr5Nr47z7?@B~Yx>j8Ii|jGvV=;buGwSwS zn$N33f}y)D#G@h((VAY)1rSTv4izW5B6&W40K8z24ES>0M&xl0qY39j;An05IM2h1 z{Rs<B<_ zAT~PSv8CpRf0BhYK)}}2+n~N@HGHtNIDh7jfY`-8&r^9>3UNzXD#IUQx|#Vg056Dg%ejZuJ&_m%vf5WT zC5MD&7UkpPpu23Td`QU>SbWX^AYBd^8WzHw)m*zTh{{{N&Bz4mF?Wk-P2}(_9ggmO zM7-LiUforS4utc!6ucDWwU<%Gx!V+Ct1SFQ|@K(XvL~l_ApBWZs<7Ezldf?Nu16`a0V!&sq+Yp@H7x55S^bpI~HF z&v=qV)IINT*Z!6HLqbiaMi?q%eJg1F^Qw$HEX8*^1K94@lO|@>TeQ>d_jsfl5)Rog zRh^z|f#L#sCc($1j@V5nJ-vxBbK=QI?bE*Y*>p=3Bth%w=vzIf-zy23$)2pNo^8eM zBO+Qd6&;KBH@I9Y8l)LDmAgoBZkT$&Ap@!}c7w)*_9Yuzu?jh$e5e7nNTBA-#9vTs zZGHi)4d=dWbI)wJn#drl5g_kXD)Dmyr8Qq2rov{#Y=P7r@Q&@i#S_&(nS4s+fNk~t^r*|4_0=k{z4fmL zTV<17(4C;W&O2K_IZ(0yidn3CB~#$D8o>Ea;;9$4=*kwVs-Pj8S19ef8?Ajr_c(N4 zVGAF}F?p-}U_pVTqi%nD=7{gSpoIaRaFcaOs`#S^Ol%vt^eYoJO*}7}VDwLRXQ9F; z9g=oKyr?$4$Wo}+$BG>yyWu69F+V>8}R+~k~yb;KYkRz41PZiJi&M7#t? zZTGe#1eM^WVNRG{-b8_ja%(e9re53b8cXg|c$Sr(jo+e?*mO8wBi^C)0Keg>;()0~ z(kE&KMuS56;aSuCTdvlcp%p^h8sb#Kl$CHF^NbGrccwNczi|0UVv>?oH9`uEL2htZ zomQ?36cKF;A7m3(L3e@9G72E@y`oM$C>FqSfyf_a8B_`i=CR3op)Z{#6U+UKZsh93 zd&SvjdpTJGIjUuWZ$!Rpk19L5bc4Rc!Ir-AD}>!s@Ne)8Tu5rW+p@#wv@}|RG0N>r zPTNO~WxPR!o;}4u$&Ok`n-O87h7$ZAjsqfw=8^W!EAw{jZJBFYS4OvYEKDY%ioJ<= zX@k*2Gh!VmSkypwF5y*iyV>^RKs_&%MCiDUS{o-#MSH zX6wa$DLR9=Lm)}rKXl5^{rRNNx#K5Jq`Z``8HwnzC8j+SwIp9ZeE1|?jVTq@AdFG~ zhb))6WWpB9(;M;hx>nryXA@b>ep3JWCV#aY2G~NQHt$O+z_o83@-vOakk0eqAoctr zO|G0hPfl%O`o=Fbg1u)T?b@5;Gd4q3B~jwmR;6DdwuEqj53F1LR}}H+#R}^oSImdC!;s2wsANZ{%+2RY&aL+^as#_NT`cStBKyj zPscx;ajcyLP1K|T0c0c8v#x+AS>;he+ZIjK%$}XR#vhIxC?C4K^$#;!8johh+u1sj zR>icjOl}@bDe}be6ViCT`jYL<*IIyM3?j>kiPXS+>T<&SWQo075}|E`{nd<9x~pY4 z(R%;MX(`*mGCqP##h6_~hy9niDa$V%VNXWhH$=OS17lg$uVU%eX{mFsA7is^^Ii%) zbn9dzayMrzv`>R-`3K!hR4gArUMcVAeDI-*CSZo zU8lb?;W)D+aEM9AUR2+EQDOtN^gbity{7kY^GWd_+q~DU8K5AYRP8yTvyPD&4(YMCTW~X2oLp$0FbCEgQ8wJ zmVY6=?>*VVMj1DD!U#RuYp9BW_!KJD;n$=Ip`D)EF1fWHc*uJ+ps~c>l|@WV z^wd2#_r@g8vuO$#Q=Y|jkZSNwG!uXNf~rfGVPmX3vaYM*v19*a-vINg2e>INF z#*EIKTTcs(uks2VO{gz!!E|KFMU#b5L4 z12{$3r_WJ&_2F*i;KL>6-K+N5PKG?0GOpjrkYdvL6l2q=VTNS=w3W*#J zEr|~d#gt@bu2tSEec!F%J^odC=dOyPcX;!3dyDxKH;T&XO*VYAC$&&D+z9|I_jar_(Cs!c);d4KUCE1_z$Xy(d zAMZ)Ue->^>cRhdJhT-U@TlUZyquJf^ocLic_x?RCt7?{R=&a-F=j=^n%yR}V)$n;D zE@`f#J^E=`1ha=B-4Hxo%KbRuM!u3+!tCh42(L{kVvYN~j_}5#frzoY>jeMsvvx42 z9HU8=os3(t1hEGx%*D~-m##|2^`tL+B}0OSr^%kLm(4y`po}^PMcS|dvQH>DpuAJ< z<%9bX9K==!SBmIofeUq{tTC@bbtC`|&m3MAojQ`iT=AC*RC{quRl#I~WU<@B8Kj9ozW?0fa*a_N}%=3iedqss-hyVU^ZlT9amH dCajUQzDhzd Date: Wed, 31 Jul 2019 11:36:27 -0700 Subject: [PATCH 168/642] Publish - apollo-gateway-enterprise@0.1.0-alpha.10 - apollo-server-plugin-operation-registry@0.2.1 --- packages/apollo-server-plugin-operation-registry/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/package.json b/packages/apollo-server-plugin-operation-registry/package.json index 473c5d54a79..d03437cabf1 100644 --- a/packages/apollo-server-plugin-operation-registry/package.json +++ b/packages/apollo-server-plugin-operation-registry/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-plugin-operation-registry", - "version": "0.2.1-alpha.0", + "version": "0.2.1", "description": "Apollo Server operation registry", "main": "dist/index.js", "types": "dist/index.d.ts", From 5497c39e31251d9f235fc7c8ec4168efdb37e4a3 Mon Sep 17 00:00:00 2001 From: Evans Hauser Date: Wed, 31 Jul 2019 11:43:25 -0700 Subject: [PATCH 169/642] update readme image link --- packages/apollo-server-plugin-operation-registry/CHANGELOG.md | 4 ++++ packages/apollo-server-plugin-operation-registry/README.md | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/CHANGELOG.md b/packages/apollo-server-plugin-operation-registry/CHANGELOG.md index 324735b247f..ef525ade1c2 100644 --- a/packages/apollo-server-plugin-operation-registry/CHANGELOG.md +++ b/packages/apollo-server-plugin-operation-registry/CHANGELOG.md @@ -2,8 +2,12 @@ ### vNEXT +### 0.2.2 + +- update readme image ### 0.2.1 + - Don't enable logging if debug was explicitly set to false even if dryRun is set to true [PR #159](https://github.com/apollographql/apollo-platform-commercial/pull/159) ### 0.2.0 diff --git a/packages/apollo-server-plugin-operation-registry/README.md b/packages/apollo-server-plugin-operation-registry/README.md index ec5a49c8858..e8a62747660 100644 --- a/packages/apollo-server-plugin-operation-registry/README.md +++ b/packages/apollo-server-plugin-operation-registry/README.md @@ -80,7 +80,7 @@ The plugin will transmit metrics regarding unregistered operations which can be

The clients page showing unregistered operations

From 2cfb6b7a824d80f43319ac524f49529f7220676b Mon Sep 17 00:00:00 2001 From: Evans Hauser Date: Wed, 31 Jul 2019 11:46:31 -0700 Subject: [PATCH 170/642] Publish - apollo-server-plugin-operation-registry@0.2.2 --- packages/apollo-server-plugin-operation-registry/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/package.json b/packages/apollo-server-plugin-operation-registry/package.json index d03437cabf1..5fdfb31dd37 100644 --- a/packages/apollo-server-plugin-operation-registry/package.json +++ b/packages/apollo-server-plugin-operation-registry/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-plugin-operation-registry", - "version": "0.2.1", + "version": "0.2.2", "description": "Apollo Server operation registry", "main": "dist/index.js", "types": "dist/index.d.ts", From 7f2037c048ab3d10fe738cd747dd1fe0ad78da2b Mon Sep 17 00:00:00 2001 From: Jason Zukewich Date: Tue, 6 Aug 2019 16:44:46 -0700 Subject: [PATCH 171/642] Update error message for operations not in the operation registry (#170) * update message * Add operationHash to extensions * update CHANGELOG * safelist => operation registry * Add exception message * Add npx to command * Add link to docs in error --- .../CHANGELOG.md | 5 ++++- .../src/ApolloServerPluginOperationRegistry.ts | 11 ++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/CHANGELOG.md b/packages/apollo-server-plugin-operation-registry/CHANGELOG.md index ef525ade1c2..a3e882365da 100644 --- a/packages/apollo-server-plugin-operation-registry/CHANGELOG.md +++ b/packages/apollo-server-plugin-operation-registry/CHANGELOG.md @@ -1,6 +1,9 @@ # Change Log -### vNEXT +### vNEXT + +- Update error message for operations that are not in the operation registry [PR #170](https://github.com/apollographql/apollo-platform-commercial/pull/170) + ### 0.2.2 diff --git a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts index e7a77986485..a9513d0705d 100644 --- a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts +++ b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts @@ -224,7 +224,16 @@ for observability purposes, but all operations will be permitted.`, logger.debug( `${logHash}: Execution denied because 'forbidUnregisteredOperations' was enabled for this request and the operation was not found in the local operation registry.`, ); - throw new ForbiddenError('Execution forbidden'); + const error = new ForbiddenError( + 'Execution forbidden: Operation not found in operation registry', + ); + Object.assign(error.extensions, { + operationHash: hash, + exception: { + message: `Please register your operation with \`npx apollo client:push --tag="${schemaTag}"\`. See https://www.apollographql.com/docs/platform/operation-registry/ for more details.`, + }, + }); + throw error; } else { logger.debug( `${dryRunPrefix} ${logHash}: Operation ${ From c48be7c21fb4489304bbd60299e0dbab8fd57008 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 19 Aug 2019 17:46:46 +0300 Subject: [PATCH 172/642] Update ApolloServerPluginOperationRegistry.test.ts --- .../src/__tests__/ApolloServerPluginOperationRegistry.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/ApolloServerPluginOperationRegistry.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/ApolloServerPluginOperationRegistry.test.ts index 50f3b1b2bfb..8b65a036b24 100644 --- a/packages/apollo-server-plugin-operation-registry/src/__tests__/ApolloServerPluginOperationRegistry.test.ts +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/ApolloServerPluginOperationRegistry.test.ts @@ -1,6 +1,6 @@ import plugin from '../ApolloServerPluginOperationRegistry'; -describe.only('Operation registry plugin', () => { +describe('Operation registry plugin', () => { it('will instantiate when not called with options', () => { expect(plugin()()).toHaveProperty('serverWillStart'); }); From 6725ab1002e42630e8ca149b78301b6e3c813e77 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 17 Oct 2019 14:28:47 +0300 Subject: [PATCH 173/642] Adjust Prettier forcefulness (#222) * chore(deps): update dependency prettier to v1.18.2 * Apply the same Prettier changes that were applied to Apollo Server For more information see: https://github.com/apollographql/apollo-server/commit/55312289116d * Introduce an `.editorconfig`. Commit message mostly lifted from apollographql/apollo-server@29e563df544. Follow up on c743c8584d20ac2c74cacf8fee7fa6bd, which removed Prettier, with some simple rules in a format that's understood by most editors and some opinionated code formatters (like Prettier). This should help keep less obvious things - like tabs vs spaces and CRLF vs LF - from working their way into the codebase, but stops short of making more destructive formatting changes. * Allow destructive formatting forced by an update to `prettier`. --- .../src/ApolloServerPluginOperationRegistry.ts | 8 ++------ .../src/agent.ts | 16 ++++------------ 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts index a9513d0705d..413e35746b3 100644 --- a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts +++ b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts @@ -84,9 +84,7 @@ for observability purposes, but all operations will be permitted.`, } logger.debug( - `Operation registry is configured for '${ - engine.serviceID - }'. The schema hash is ${schemaHash}.`, + `Operation registry is configured for '${engine.serviceID}'. The schema hash is ${schemaHash}.`, ); // An LRU store with no `maxSize` is effectively an InMemoryStore and @@ -236,9 +234,7 @@ for observability purposes, but all operations will be permitted.`, throw error; } else { logger.debug( - `${dryRunPrefix} ${logHash}: Operation ${ - requestContext.operationName - } would have been forbidden.`, + `${dryRunPrefix} ${logHash}: Operation ${requestContext.operationName} would have been forbidden.`, ); } } diff --git a/packages/apollo-server-plugin-operation-registry/src/agent.ts b/packages/apollo-server-plugin-operation-registry/src/agent.ts index 40bd1d76994..30133c9dbb9 100644 --- a/packages/apollo-server-plugin-operation-registry/src/agent.ts +++ b/packages/apollo-server-plugin-operation-registry/src/agent.ts @@ -138,9 +138,7 @@ export default class Agent { // to have in development. if (this.timeSinceLastSuccessfulCheck() > SYNC_WARN_TIME_SECONDS * 1000) { console.warn( - `WARNING: More than ${SYNC_WARN_TIME_SECONDS} seconds has elapsed since a successful fetch of the manifest. (Last success: ${ - this.lastSuccessfulCheck - })`, + `WARNING: More than ${SYNC_WARN_TIME_SECONDS} seconds has elapsed since a successful fetch of the manifest. (Last success: ${this.lastSuccessfulCheck})`, ); } } @@ -189,9 +187,7 @@ export default class Agent { this.logger.debug(`Fetching legacy manifest.`); if (this.options.schemaTag !== 'current') { this.logger.warn( - `The legacy manifest contains operations registered for the "current" tag, but the specified schema tag is "${ - this.options.schemaTag - }".`, + `The legacy manifest contains operations registered for the "current" tag, but the specified schema tag is "${this.options.schemaTag}".`, ); } const legacyManifestUrl = getLegacyOperationManifestUrl( @@ -227,9 +223,7 @@ export default class Agent { if (response.status === 404 || response.status === 403) { this.logger.warn( - `No manifest found for tag "${ - this.options.schemaTag - }" at ${storageSecretManifestUrl}. ${callToAction}`, + `No manifest found for tag "${this.options.schemaTag}" at ${storageSecretManifestUrl}. ${callToAction}`, ); return this.fetchLegacyManifest(); } @@ -265,9 +259,7 @@ export default class Agent { throw new Error(`Unexpected 'Content-Type' header: ${contentType}`); } } catch (err) { - const ourErrorPrefix = `Unable to fetch operation manifest for ${ - this.options.schemaHash - } in '${this.options.engine.serviceID}': ${err}`; + const ourErrorPrefix = `Unable to fetch operation manifest for ${this.options.schemaHash} in '${this.options.engine.serviceID}': ${err}`; err.message = `${ourErrorPrefix}: ${err}`; From ccba860f44d37ceb817c6294819495ad2d2a9eb0 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 17 Oct 2019 14:45:33 +0300 Subject: [PATCH 174/642] Remove memory leak from guaranteed unresolved/unrejected Promise. I question whether or not we want to actually guarantee async execution of this method and not give the opportunity to the user to actually make it block if they'd like to, but we certainly should ensure that Promises should not be created on every request and never resolve or reject, which seems like a prime avenue for a DoS via memory leak. I'm committing this because I stumbled across it and I feared it getting out, but would appreciate eyes on it from @evans, if he has the time! --- .../ApolloServerPluginOperationRegistry.ts | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts index faf36365df1..fcaf8144d35 100644 --- a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts +++ b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts @@ -163,11 +163,11 @@ for observability purposes, but all operations will be permitted.`, requestContext.metrics.registeredOperation = true; return; } else { - if (options.onUnregisteredOperation) { - new Promise(() => { - if (options.onUnregisteredOperation) { - options.onUnregisteredOperation(requestContext); - } + // If defined, this method should not block, whether async or not. + if (typeof options.onUnregisteredOperation === 'function') { + const onUnregisteredOperation = options.onUnregisteredOperation; + Promise.resolve().then(() => { + onUnregisteredOperation(requestContext); }); } } @@ -231,11 +231,12 @@ for observability purposes, but all operations will be permitted.`, `${logHash} Reporting operation as forbidden to Apollo trace warehouse.`, ); requestContext.metrics.forbiddenOperation = true; - if (options.onForbiddenOperation) { - new Promise(() => { - if (options.onForbiddenOperation) { - options.onForbiddenOperation(requestContext); - } + + // If defined, this method should not block, whether async or not. + if (typeof options.onForbiddenOperation === 'function') { + const onForbiddenOperation = options.onForbiddenOperation; + Promise.resolve().then(() => { + onForbiddenOperation(requestContext); }); } } From 12b4a190c8a08391ca600ec822353ef7bacf5c29 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 17 Oct 2019 15:50:45 +0300 Subject: [PATCH 175/642] Release - apollo-server-plugin-operation-registry@0.2.3-alpha.0 --- packages/apollo-server-plugin-operation-registry/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/package.json b/packages/apollo-server-plugin-operation-registry/package.json index 5fdfb31dd37..1f25f2568f7 100644 --- a/packages/apollo-server-plugin-operation-registry/package.json +++ b/packages/apollo-server-plugin-operation-registry/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-plugin-operation-registry", - "version": "0.2.2", + "version": "0.2.3-alpha.0", "description": "Apollo Server operation registry", "main": "dist/index.js", "types": "dist/index.d.ts", From bee35b2d798a21d8c2ca602ed92656dd204319c8 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 17 Oct 2019 15:53:02 +0300 Subject: [PATCH 176/642] op-reg: Update `apollo-graphql` to latest 0.3.4. (#224) --- packages/apollo-server-plugin-operation-registry/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/package.json b/packages/apollo-server-plugin-operation-registry/package.json index 5fdfb31dd37..494473f31f4 100644 --- a/packages/apollo-server-plugin-operation-registry/package.json +++ b/packages/apollo-server-plugin-operation-registry/package.json @@ -11,7 +11,7 @@ "node": ">=8" }, "dependencies": { - "apollo-graphql": "0.3.3", + "apollo-graphql": "0.3.4", "apollo-server-caching": "^0.5.0", "apollo-server-errors": "^2.2.0", "apollo-server-plugin-base": "^0.5.0", From 126eb400fa986de89a2f2898a974b5a6503d046b Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 5 Nov 2019 21:08:59 +0200 Subject: [PATCH 177/642] Release - apollo-server-plugin-operation-registry@0.2.3-alpha.1 --- packages/apollo-server-plugin-operation-registry/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/package.json b/packages/apollo-server-plugin-operation-registry/package.json index e4fd3dca25a..ad410a2c14e 100644 --- a/packages/apollo-server-plugin-operation-registry/package.json +++ b/packages/apollo-server-plugin-operation-registry/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-plugin-operation-registry", - "version": "0.2.3-alpha.0", + "version": "0.2.3-alpha.1", "description": "Apollo Server operation registry", "main": "dist/index.js", "types": "dist/index.d.ts", From 9ecfba9b065d55228314c08a2105bf0a8c69fb05 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 5 Nov 2019 22:14:36 +0200 Subject: [PATCH 178/642] =?UTF-8?q?chore(deps):=20update=20dependency=20ap?= =?UTF-8?q?ollo-server-plugin-base=20to=20^0.6=E2=80=A6=20(#168)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit My attempt. --- packages/apollo-server-plugin-operation-registry/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/package.json b/packages/apollo-server-plugin-operation-registry/package.json index e4fd3dca25a..464667c8783 100644 --- a/packages/apollo-server-plugin-operation-registry/package.json +++ b/packages/apollo-server-plugin-operation-registry/package.json @@ -14,7 +14,7 @@ "apollo-graphql": "0.3.4", "apollo-server-caching": "^0.5.0", "apollo-server-errors": "^2.2.0", - "apollo-server-plugin-base": "^0.5.0", + "apollo-server-plugin-base": "^0.6.0", "fast-json-stable-stringify": "^2.0.0", "loglevel": "^1.6.1", "loglevel-debug": "^0.0.1", From 7794e408ee0bd4d642f331101f8ff01b232740a8 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 14 Nov 2019 02:29:51 +0200 Subject: [PATCH 179/642] =?UTF-8?q?op-ref:=20Prevent=20the=20polling=20tim?= =?UTF-8?q?er=20from=20keeping=20the=20event=20loop=20ac=E2=80=A6=20(#223)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * op-ref: Prevent the polling timer from keeping the event loop active. I have a slight hunch that this was the reason for the need to introduce the `--forceExit` flag to `jest` which I removed in cbb095540960510176554dcced3 of @evans' #158. I hope I'm right, but I'd rather remove the source than introduce the flag that might mask the occurrence of such event-loop dragging on customer's implementations (e.g. preventing their server from shutting down gracefully). * Add changelog entry --- .../apollo-server-plugin-operation-registry/CHANGELOG.md | 4 +++- .../apollo-server-plugin-operation-registry/src/agent.ts | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/CHANGELOG.md b/packages/apollo-server-plugin-operation-registry/CHANGELOG.md index a3e882365da..a1baeb38e23 100644 --- a/packages/apollo-server-plugin-operation-registry/CHANGELOG.md +++ b/packages/apollo-server-plugin-operation-registry/CHANGELOG.md @@ -2,8 +2,10 @@ ### vNEXT -- Update error message for operations that are not in the operation registry [PR #170](https://github.com/apollographql/apollo-platform-commercial/pull/170) +### 0.2.3 +- Prevent the polling timer from keeping the event loop active [PR #223](https://github.com/apollographql/apollo-platform-commercial/pull/223) +- Update error message for operations that are not in the operation registry [PR #170](https://github.com/apollographql/apollo-platform-commercial/pull/170) ### 0.2.2 diff --git a/packages/apollo-server-plugin-operation-registry/src/agent.ts b/packages/apollo-server-plugin-operation-registry/src/agent.ts index 30133c9dbb9..b27c526149e 100644 --- a/packages/apollo-server-plugin-operation-registry/src/agent.ts +++ b/packages/apollo-server-plugin-operation-registry/src/agent.ts @@ -117,6 +117,11 @@ export default class Agent { // These errors will be logged, but not crash the server. pulse().catch(err => console.error(err.message || err)); }, this.pollSeconds() * 1000); + + // Prevent the Node.js event loop from remaining active (and preventing, + // e.g. process shutdown) by calling `unref` on the `Timeout`. For more + // information, see https://nodejs.org/api/timers.html#timers_timeout_unref. + this.timer.unref(); } public stop() { From 9b15115f057aff87b1e923be99381b737a8bc690 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Fri, 15 Nov 2019 12:56:54 +0200 Subject: [PATCH 180/642] =?UTF-8?q?Revert=20"Add=20lifecycle=20hooks:=20wi?= =?UTF-8?q?llUpdateManifest,=20onUnregisteredO=E2=80=A6=20(#245)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CHANGELOG.md | 5 +- .../package.json | 2 +- .../ApolloServerPluginOperationRegistry.ts | 26 +- ...polloServerPluginOperationRegistry.test.ts | 252 ----------- .../src/__tests__/agent.test.ts | 413 ++++-------------- .../src/agent.ts | 46 +- 6 files changed, 95 insertions(+), 649 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/CHANGELOG.md b/packages/apollo-server-plugin-operation-registry/CHANGELOG.md index 252cdc22c6f..a1baeb38e23 100644 --- a/packages/apollo-server-plugin-operation-registry/CHANGELOG.md +++ b/packages/apollo-server-plugin-operation-registry/CHANGELOG.md @@ -6,15 +6,14 @@ - Prevent the polling timer from keeping the event loop active [PR #223](https://github.com/apollographql/apollo-platform-commercial/pull/223) - Update error message for operations that are not in the operation registry [PR #170](https://github.com/apollographql/apollo-platform-commercial/pull/170) -- Add lifecycle hooks: `willUpdateManifest`, `onUnregisteredOperation`, and `onForbiddenOperation`. [PR #158](https://github.com/apollographql/apollo-platform-commercial/pull/158) ### 0.2.2 -- Update `README` image. +- update readme image ### 0.2.1 -- Don't enable logging if debug was explicitly set to `false` even if `dryRun` is set to `true`. [PR #159](https://github.com/apollographql/apollo-platform-commercial/pull/159) +- Don't enable logging if debug was explicitly set to false even if dryRun is set to true [PR #159](https://github.com/apollographql/apollo-platform-commercial/pull/159) ### 0.2.0 diff --git a/packages/apollo-server-plugin-operation-registry/package.json b/packages/apollo-server-plugin-operation-registry/package.json index d015d97e166..464667c8783 100644 --- a/packages/apollo-server-plugin-operation-registry/package.json +++ b/packages/apollo-server-plugin-operation-registry/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-plugin-operation-registry", - "version": "0.2.3-alpha.1", + "version": "0.2.3-alpha.0", "description": "Apollo Server operation registry", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts index fcaf8144d35..413e35746b3 100644 --- a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts +++ b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts @@ -11,12 +11,11 @@ import { defaultOperationRegistrySignature, } from 'apollo-graphql'; import { ForbiddenError, ApolloError } from 'apollo-server-errors'; -import Agent, { OperationManifest } from './agent'; +import Agent from './agent'; import { GraphQLSchema } from 'graphql/type'; import { InMemoryLRUCache } from 'apollo-server-caching'; import loglevel from 'loglevel'; import loglevelDebug from 'loglevel-debug'; -import { PromiseOrValue } from 'graphql/jsutils/PromiseOrValue'; type ForbidUnregisteredOperationsPredicate = ( requestContext: GraphQLRequestContext, @@ -29,12 +28,6 @@ interface Options { | ForbidUnregisteredOperationsPredicate; dryRun?: boolean; schemaTag?: string; - onUnregisteredOperation?: (requestContext: GraphQLRequestContext) => void; - onForbiddenOperation?: (requestContext: GraphQLRequestContext) => void; - willUpdateManifest?: ( - newManifest?: OperationManifest, - oldManifest?: OperationManifest, - ) => PromiseOrValue; } export default function plugin(options: Options = Object.create(null)) { @@ -106,7 +99,6 @@ for observability purposes, but all operations will be permitted.`, engine, store, logger, - willUpdateManifest: options.willUpdateManifest, }); await agent.start(); @@ -162,14 +154,6 @@ for observability purposes, but all operations will be permitted.`, ); requestContext.metrics.registeredOperation = true; return; - } else { - // If defined, this method should not block, whether async or not. - if (typeof options.onUnregisteredOperation === 'function') { - const onUnregisteredOperation = options.onUnregisteredOperation; - Promise.resolve().then(() => { - onUnregisteredOperation(requestContext); - }); - } } // If the `forbidUnregisteredOperations` option is set explicitly to @@ -231,14 +215,6 @@ for observability purposes, but all operations will be permitted.`, `${logHash} Reporting operation as forbidden to Apollo trace warehouse.`, ); requestContext.metrics.forbiddenOperation = true; - - // If defined, this method should not block, whether async or not. - if (typeof options.onForbiddenOperation === 'function') { - const onForbiddenOperation = options.onForbiddenOperation; - Promise.resolve().then(() => { - onForbiddenOperation(requestContext); - }); - } } if (shouldForbidOperation) { diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/ApolloServerPluginOperationRegistry.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/ApolloServerPluginOperationRegistry.test.ts index 751c9089f26..8b65a036b24 100644 --- a/packages/apollo-server-plugin-operation-registry/src/__tests__/ApolloServerPluginOperationRegistry.test.ts +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/ApolloServerPluginOperationRegistry.test.ts @@ -1,36 +1,4 @@ import plugin from '../ApolloServerPluginOperationRegistry'; -import { ApolloServerBase, ForbiddenError } from 'apollo-server-core'; -import { - defaultOperationRegistrySignature, - operationHash, -} from 'apollo-graphql'; -import gql from 'graphql-tag'; -import { print } from 'graphql'; - -const typeDefs = gql` - type Query { - hello: String - } -`; - -const query = gql` - query HelloFam { - hello - } -`; - -const normalizedQueryDocument = defaultOperationRegistrySignature( - query, - 'HelloFam', -); -const queryHash = operationHash(normalizedQueryDocument); - -// In order to expose will start and -class ApolloServerMock extends ApolloServerBase { - public async willStart() { - return super.willStart(); - } -} describe('Operation registry plugin', () => { it('will instantiate when not called with options', () => { @@ -40,224 +8,4 @@ describe('Operation registry plugin', () => { it('will instantiate with debug enabled', () => { expect(plugin({ debug: true })()).toHaveProperty('serverWillStart'); }); - - // These tests depend on the behavior of willUpdateManifest to update the - // operation safelist - describe('operation lifecycle hooks', () => { - describe('onUnregisterOperation', () => { - it('is called when unregistered operation received', async () => { - const mock = jest.fn(requestContext => { - expect(requestContext).toMatchObject({ - request: { - operationName: 'HelloFam', - }, - }); - }); - const server = new ApolloServerMock({ - typeDefs, - mockEntireSchema: true, - engine: { - apiKey: 'server:not-a-service:not-an-apikey', - }, - plugins: [ - plugin({ - willUpdateManifest: () => { - return { - version: 2, - operations: [], - }; - }, - onUnregisteredOperation: mock, - })(), - ], - }); - await server.willStart(); - const result = await server.executeOperation({ - query: print(query), - operationName: 'HelloFam', - }); - expect(result.data).toBeDefined(); - expect(result.errors).not.toBeDefined(); - expect(result.data && result.data.hello).toBeDefined(); - expect(mock).toHaveBeenCalledTimes(1); - await server.stop(); - }); - - it('is not called when registered operation received', async () => { - const mock = jest.fn(); - const server = new ApolloServerMock({ - typeDefs, - mockEntireSchema: true, - engine: { - apiKey: 'server:not-a-service:not-an-apikey', - }, - plugins: [ - plugin({ - willUpdateManifest: () => { - return { - version: 2, - operations: [ - { - document: normalizedQueryDocument, - signature: queryHash, - }, - ], - }; - }, - onUnregisteredOperation: mock, - })(), - ], - }); - await server.willStart(); - const result = await server.executeOperation({ - query: print(query), - operationName: 'HelloFam', - }); - expect(result.data).toBeDefined(); - expect(result.errors).not.toBeDefined(); - expect(result.data && result.data.hello).toBeDefined(); - expect(mock).toHaveBeenCalledTimes(0); - await server.stop(); - }); - }); - - describe('onForbiddenOperation', () => { - it('is called when unregistered operation received and forbidden', async () => { - const mock = jest.fn(requestContext => { - expect(requestContext).toMatchObject({ - request: { - operationName: 'HelloFam', - }, - }); - }); - const forbidUnregisteredOperations = jest.fn(requestContext => { - expect(requestContext).toMatchObject({ - request: { - operationName: 'HelloFam', - }, - }); - return true; - }); - - const server = new ApolloServerMock({ - typeDefs, - mockEntireSchema: true, - engine: { - apiKey: 'server:not-a-service:not-an-apikey', - }, - plugins: [ - plugin({ - willUpdateManifest: () => { - return { - version: 2, - operations: [], - }; - }, - forbidUnregisteredOperations, - onForbiddenOperation: mock, - })(), - ], - }); - await server.willStart(); - const result = await server.executeOperation({ - query: print(query), - operationName: 'HelloFam', - }); - expect(result.data).not.toBeDefined(); - expect(result.errors).toBeDefined(); - expect(result.errors).toHaveLength(1); - expect(result.errors && result.errors[0].message).toContain( - 'forbidden', - ); - expect(mock).toHaveBeenCalledTimes(1); - expect(forbidUnregisteredOperations).toHaveBeenCalledTimes(1); - await server.stop(); - }); - - it('is not called when unregistered operation received and unforbidden', async () => { - const mock = jest.fn(requestContext => { - expect(requestContext).toMatchObject({ - request: { - operationName: 'HelloFam', - }, - }); - }); - const forbidUnregisteredOperations = jest.fn(requestContext => { - expect(requestContext).toMatchObject({ - request: { - operationName: 'HelloFam', - }, - }); - return false; - }); - const server = new ApolloServerMock({ - typeDefs, - mockEntireSchema: true, - engine: { - apiKey: 'server:not-a-service:not-an-apikey', - }, - plugins: [ - plugin({ - willUpdateManifest: () => { - return { - version: 2, - operations: [], - }; - }, - forbidUnregisteredOperations, - onForbiddenOperation: mock, - })(), - ], - }); - await server.willStart(); - const result = await server.executeOperation({ - query: print(query), - operationName: 'HelloFam', - }); - expect(result.data).toBeDefined(); - expect(result.errors).not.toBeDefined(); - expect(result.data && result.data.hello).toBeDefined(); - expect(mock).toHaveBeenCalledTimes(0); - expect(forbidUnregisteredOperations).toHaveBeenCalledTimes(1); - await server.stop(); - }); - - it('is not called when registered operation received', async () => { - const mock = jest.fn(); - const server = new ApolloServerMock({ - typeDefs, - mockEntireSchema: true, - engine: { - apiKey: 'server:not-a-service:not-an-apikey', - }, - plugins: [ - plugin({ - willUpdateManifest: () => { - return { - version: 2, - operations: [ - { - document: normalizedQueryDocument, - signature: queryHash, - }, - ], - }; - }, - onForbiddenOperation: mock, - })(), - ], - }); - await server.willStart(); - const result = await server.executeOperation({ - query: print(query), - operationName: 'HelloFam', - }); - expect(result.data).toBeDefined(); - expect(result.errors).not.toBeDefined(); - expect(result.data && result.data.hello).toBeDefined(); - expect(mock).toHaveBeenCalledTimes(0); - await server.stop(); - }); - }); - }); }); diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts index b6534655905..d1af491a8d1 100644 --- a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts @@ -7,7 +7,7 @@ import { } from '../common'; import { resolve as urlResolve } from 'url'; import { createHash } from 'crypto'; -import { AgentOptions, OperationManifest } from '../agent'; +import { AgentOptions } from '../agent'; const fakeBaseUrl = 'https://myfakehost/'; @@ -84,7 +84,7 @@ describe('Agent', () => { }); }); - describe('with manifest', () => { + describe('fetches', () => { let originalEnvApolloOpManifestBaseUrl: string | undefined; let originalEnvOverrideStorageSecretBaseUrl: string | undefined; let Agent: typeof import('../agent').default; @@ -123,51 +123,6 @@ describe('Agent', () => { ).replace(new RegExp(`^${urlOperationManifestBase}`), ''); }); - // Each nock is good for exactly one request! - function nockLegacyGoodManifest( - operations: ManifestRecord[] = [ - sampleManifestRecords.a, - sampleManifestRecords.b, - sampleManifestRecords.c, - ], - ) { - return nockBase() - .get(genericLegacyOperationManifestUrl) - .reply(200, { - version: 2, - operations, - }); - } - - function nockGoodManifestsUnderStorageSecret( - operations: ManifestRecord[] = [ - sampleManifestRecords.a, - sampleManifestRecords.b, - sampleManifestRecords.c, - ], - ) { - return nockBase() - .get(genericStorageSecretOperationManifestUrl) - .reply(200, { - version: 2, - operations, - }); - } - - function nockStorageSecret( - status = 200, - body: any = JSON.stringify(genericStorageSecret), - ) { - return nockBase() - .get( - getStorageSecretUrl(genericServiceID, genericApiKeyHash).replace( - new RegExp(`^${urlStorageSecretBase}`), - '', - ), - ) - .reply(status, body); - } - afterAll(() => { // Put the environment overrides back how they were. if (originalEnvApolloOpManifestBaseUrl) { @@ -193,42 +148,6 @@ describe('Agent', () => { jest.resetModules(); }); - const forCleanup: { - store?: InMemoryLRUCache; - agent?: import('../agent').default; - }[] = []; - - function createAgent({ ...args }: Partial = {}) { - const options = { ...defaultAgentOptions, ...args }; - - // We never actually let the Agent construct its own default store - // since we need to pluck the store out to instrument it with spies. - const store = options.store; - const agent = new Agent(options); - - // Save all agents and stores we've created so we can properly - // stop them and clean them up. - forCleanup.push({ agent, store }); - return agent; - } - - afterEach(() => { - if (!nock.isDone()) { - throw new Error( - `Not all nock interceptors were used! Pending mocks: ${nock.pendingMocks()}`, - ); - } - - let toCleanup; - // Loop through the `forCleanup` constant and empty it out by popping - // individual elements off the end and running the appropriate cleanup. - while ((toCleanup = forCleanup.pop())) { - if (toCleanup.agent) { - toCleanup.agent.stop(); - } - } - }); - it('correctly prepared the test environment', () => { expect(getLegacyOperationManifestUrl('abc123', 'def456')).toStrictEqual( urlResolve(fakeBaseUrl, '/abc123/def456.v2.json'), @@ -236,6 +155,87 @@ describe('Agent', () => { }); describe('manifest checking and store populating', () => { + const forCleanup: { + store?: InMemoryLRUCache; + agent?: import('../agent').default; + }[] = []; + + function createAgent({ ...args } = {}) { + const options = { ...defaultAgentOptions, ...args }; + + // We never actually let the Agent construct its own default store + // since we need to pluck the store out to instrument it with spies. + const store = options.store; + const agent = new Agent(options); + + // Save all agents and stores we've created so we can properly + // stop them and clean them up. + forCleanup.push({ agent, store }); + return agent; + } + + afterEach(() => { + if (!nock.isDone()) { + throw new Error( + `Not all nock interceptors were used! Pending mocks: ${nock.pendingMocks()}`, + ); + } + + let toCleanup; + // Loop through the `forCleanup` constant and empty it out by popping + // individual elements off the end and running the appropriate cleanup. + while ((toCleanup = forCleanup.pop())) { + if (toCleanup.agent) { + toCleanup.agent.stop(); + } + } + }); + + // Each nock is good for exactly one request! + function nockLegacyGoodManifest( + operations: ManifestRecord[] = [ + sampleManifestRecords.a, + sampleManifestRecords.b, + sampleManifestRecords.c, + ], + ) { + return nockBase() + .get(genericLegacyOperationManifestUrl) + .reply(200, { + version: 2, + operations, + }); + } + + function nockGoodManifestsUnderStorageSecret( + operations: ManifestRecord[] = [ + sampleManifestRecords.a, + sampleManifestRecords.b, + sampleManifestRecords.c, + ], + ) { + return nockBase() + .get(genericStorageSecretOperationManifestUrl) + .reply(200, { + version: 2, + operations, + }); + } + + function nockStorageSecret( + status = 200, + body: any = JSON.stringify(genericStorageSecret), + ) { + return nockBase() + .get( + getStorageSecretUrl(genericServiceID, genericApiKeyHash).replace( + new RegExp(`^${urlStorageSecretBase}`), + '', + ), + ) + .reply(status, body); + } + function expectStoreSpyOperationEach( spy: jest.SpyInstance, letters: string[], @@ -539,253 +539,6 @@ describe('Agent', () => { }); }); }); - - describe('manifest lifecycle', () => { - function generateWillUpdateManifest( - operations?: OperationManifest['operations'], - ) { - return jest.fn( - ( - newManifest?: OperationManifest, - oldManifest?: OperationManifest, - ) => { - const manifest = newManifest || oldManifest; - return ( - (operations && { version: 2, operations }) || - manifest || { version: 2, operations: [] } - ); - }, - ); - } - - describe('willUpdateManifest', () => { - it("receives undefined arguments when can't fetch first time", async () => { - nockStorageSecret(404); - nockBase() - .get(genericLegacyOperationManifestUrl) - .reply(500); - const mock = generateWillUpdateManifest(); - const store = defaultStore(); - const storeSetSpy = jest.spyOn(store, 'set'); - const storeDeleteSpy = jest.spyOn(store, 'delete'); - - const agent = createAgent({ - willUpdateManifest: mock, - store, - }); - await agent.start(); - expect(mock).toHaveBeenCalledTimes(1); - expect(mock).toHaveBeenCalledWith(undefined, undefined); - - // no additions, no deletions. - expect(storeSetSpy).toBeCalledTimes(0); - expect(storeDeleteSpy).toBeCalledTimes(0); - }); - it('receives manifest retrieved from gcs', async () => { - nockStorageSecret(); - nockGoodManifestsUnderStorageSecret(); - const mock = generateWillUpdateManifest(); - const store = defaultStore(); - const storeSetSpy = jest.spyOn(store, 'set'); - const storeDeleteSpy = jest.spyOn(store, 'delete'); - - const agent = createAgent({ - willUpdateManifest: mock, - store, - }); - await agent.start(); - expect(mock).toHaveBeenCalledTimes(1); - expect(mock).toHaveBeenCalledWith( - { - version: 2, - operations: [ - sampleManifestRecords.a, - sampleManifestRecords.b, - sampleManifestRecords.c, - ], - }, - undefined, - ); - - // Three additions, no deletions. - expect(storeSetSpy).toBeCalledTimes(3); - expect(storeDeleteSpy).toBeCalledTimes(0); - }); - it('uses returned manifest to enforce safelist', async () => { - nockStorageSecret(); - nockGoodManifestsUnderStorageSecret(); - const mock = generateWillUpdateManifest([sampleManifestRecords.a]); - const store = defaultStore(); - const storeSetSpy = jest.spyOn(store, 'set'); - const storeDeleteSpy = jest.spyOn(store, 'delete'); - - const agent = createAgent({ - willUpdateManifest: mock, - store, - }); - await agent.start(); - expect(mock).toHaveBeenCalledTimes(1); - expect(mock).toHaveBeenCalledWith( - { - version: 2, - operations: [ - sampleManifestRecords.a, - sampleManifestRecords.b, - sampleManifestRecords.c, - ], - }, - undefined, - ); - expect(mock).toReturnWith({ - version: 2, - operations: [sampleManifestRecords.a], - }); - - // One additions, no deletions. - expect(storeSetSpy).toBeCalledTimes(1); - expect(storeDeleteSpy).toBeCalledTimes(0); - }); - it('is not called again when manifest remains same', async () => { - nockStorageSecret(); - nockGoodManifestsUnderStorageSecret(); - - const mock = generateWillUpdateManifest(); - const store = defaultStore(); - const storeSetSpy = jest.spyOn(store, 'set'); - const storeDeleteSpy = jest.spyOn(store, 'delete'); - - const agent = createAgent({ - willUpdateManifest: mock, - store, - }); - jest.useFakeTimers(); - await agent.start(); - expect(mock).toHaveBeenCalledTimes(1); - expect(mock).toHaveBeenCalledWith( - { - version: 2, - operations: [ - sampleManifestRecords.a, - sampleManifestRecords.b, - sampleManifestRecords.c, - ], - }, - undefined, - ); - // Three additions, no deletions. - expect(storeSetSpy).toBeCalledTimes(3); - expect(storeDeleteSpy).toBeCalledTimes(0); - - // If it's one millisecond short of our next poll interval, nothing - // should have changed yet. - jest.advanceTimersByTime(pollSeconds * 1000 - 1); - - // Still only one check. - expect(agent._timesChecked).toBe(1); - - // Now, we'll expect another request to go out, so we'll nock it. - nockStorageSecret(); - nockBase() - .get(genericStorageSecretOperationManifestUrl) - .reply(304); - - // If we move forward the last remaining millisecond, we should trigger - // and end up with a successful sync. - jest.advanceTimersByTime(1); - - // While that timer will fire, it will do work async, and we need to - // wait on that work itself. - await agent.requestPending(); - - // Now the times checked should have gone up. - expect(agent._timesChecked).toBe(2); - - // the agent should not have been called again - expect(mock).toHaveBeenCalledTimes(1); - expect(mock).toHaveBeenCalledWith( - { - version: 2, - operations: [ - sampleManifestRecords.a, - sampleManifestRecords.b, - sampleManifestRecords.c, - ], - }, - undefined, - ); - // Three additions, no deletions. - expect(storeSetSpy).toBeCalledTimes(3); - expect(storeDeleteSpy).toBeCalledTimes(0); - }); - - it('receives previous manifest when updated', async () => { - nockStorageSecret(); - nockGoodManifestsUnderStorageSecret(); - - const mock = generateWillUpdateManifest(); - const store = defaultStore(); - const storeSetSpy = jest.spyOn(store, 'set'); - const storeDeleteSpy = jest.spyOn(store, 'delete'); - - const agent = createAgent({ - willUpdateManifest: mock, - store, - }); - jest.useFakeTimers(); - await agent.start(); - expect(mock).toHaveBeenCalledTimes(1); - expect(mock).toHaveBeenCalledWith( - { - version: 2, - operations: [ - sampleManifestRecords.a, - sampleManifestRecords.b, - sampleManifestRecords.c, - ], - }, - undefined, - ); - // Three additions, no deletions. - expect(storeSetSpy).toBeCalledTimes(3); - expect(storeDeleteSpy).toBeCalledTimes(0); - - // If it's one millisecond short of our next poll interval, nothing - // should have changed yet. - jest.advanceTimersByTime(pollSeconds * 1000 - 1); - - // Still only one check. - expect(agent._timesChecked).toBe(1); - - // Now, we'll expect another request to go out, so we'll nock it. - nockStorageSecret(); - nockGoodManifestsUnderStorageSecret([sampleManifestRecords.a]); - - // If we move forward the last remaining millisecond, we should trigger - // and end up with a successful sync. - jest.advanceTimersByTime(1); - - // While that timer will fire, it will do work async, and we need to - // wait on that work itself. - await agent.requestPending(); - - expect(mock).toHaveBeenCalledTimes(2); - expect(mock).toHaveBeenCalledWith( - { version: 2, operations: [sampleManifestRecords.a] }, - { - version: 2, - operations: [ - sampleManifestRecords.a, - sampleManifestRecords.b, - sampleManifestRecords.c, - ], - }, - ); - // Three additions, two deletions. - expect(storeSetSpy).toBeCalledTimes(3); - expect(storeDeleteSpy).toBeCalledTimes(2); - }); - }); - }); }); }); diff --git a/packages/apollo-server-plugin-operation-registry/src/agent.ts b/packages/apollo-server-plugin-operation-registry/src/agent.ts index 4c9e3a880dc..b27c526149e 100644 --- a/packages/apollo-server-plugin-operation-registry/src/agent.ts +++ b/packages/apollo-server-plugin-operation-registry/src/agent.ts @@ -12,7 +12,6 @@ import loglevel from 'loglevel'; import { Response } from 'node-fetch'; import { InMemoryLRUCache } from 'apollo-server-caching'; import { fetchIfNoneMatch } from './fetchIfNoneMatch'; -import { PromiseOrValue } from 'graphql/jsutils/PromiseOrValue'; const DEFAULT_POLL_SECONDS: number = 30; const SYNC_WARN_TIME_SECONDS: number = 60; @@ -24,18 +23,14 @@ export interface AgentOptions { engine: any; store: InMemoryLRUCache; schemaTag: string; - willUpdateManifest?: ( - newManifest?: OperationManifest, - oldManifest?: OperationManifest, - ) => PromiseOrValue; } -export interface Operation { +interface Operation { signature: string; document: string; } -export interface OperationManifest { +interface OperationManifest { version: number; operations: Array; } @@ -56,7 +51,6 @@ export default class Agent { public _timesChecked: number = 0; private lastOperationSignatures: SignatureStore = new Set(); - private lastManifest?: OperationManifest; private readonly options: AgentOptions = Object.create(null); constructor(options: AgentOptions) { @@ -107,14 +101,8 @@ export default class Agent { try { await pulse(); } catch (err) { - // Update the manifest to trigger `onManifestUpdate(newManifest: undefined, oldManifest: undefined)` - this.updateManifest(); console.error( - `The operation manifest could not be fetched. Retries will continue.${ - this.lastManifest - ? '' - : ' Requests will be forbidden until the manifest is fetched.' - }`, + 'The operation manifest could not be fetched. Retries will continue, but requests will be forbidden until the manifest is fetched.', err.message || err, ); } @@ -317,37 +305,19 @@ export default class Agent { }); } - public async updateManifest(manifest?: OperationManifest) { + public async updateManifest(manifest: OperationManifest) { if ( - manifest && - (manifest.version !== 2 || !Array.isArray(manifest.operations)) + !manifest || + manifest.version !== 2 || + !Array.isArray(manifest.operations) ) { throw new Error('Invalid manifest format.'); } - const returnedManifest = - (await (this.options.willUpdateManifest && - this.options.willUpdateManifest(manifest, this.lastManifest))) || - manifest; - - if (returnedManifest && !Array.isArray(returnedManifest.operations)) { - throw new Error( - "Invalid manifest format. Manifest's operations must be an array", - ); - } - - if (returnedManifest) { - this.updateOperationStore(returnedManifest.operations); - } - - this.lastManifest = manifest; - } - - private updateOperationStore(operations: OperationManifest['operations']) { const incomingOperations: Map = new Map(); const replacementSignatures: SignatureStore = new Set(); - for (const { signature, document } of operations) { + for (const { signature, document } of manifest.operations) { incomingOperations.set(signature, document); // Keep track of each operation in this manifest so we can store it // for comparison after the next fetch. From 7f9e6cd56b9a2617d578a39c5309164f0a29c666 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Fri, 15 Nov 2019 15:10:02 +0200 Subject: [PATCH 181/642] CHANGELOG.md changes. --- .../CHANGELOG.md | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/CHANGELOG.md b/packages/apollo-server-plugin-operation-registry/CHANGELOG.md index a1baeb38e23..33603713d7a 100644 --- a/packages/apollo-server-plugin-operation-registry/CHANGELOG.md +++ b/packages/apollo-server-plugin-operation-registry/CHANGELOG.md @@ -1,19 +1,17 @@ # Change Log -### vNEXT - -### 0.2.3 +### vNEXT (Currently `alpha` tag) - Prevent the polling timer from keeping the event loop active [PR #223](https://github.com/apollographql/apollo-platform-commercial/pull/223) - Update error message for operations that are not in the operation registry [PR #170](https://github.com/apollographql/apollo-platform-commercial/pull/170) ### 0.2.2 -- update readme image +- Update `README` image. ### 0.2.1 -- Don't enable logging if debug was explicitly set to false even if dryRun is set to true [PR #159](https://github.com/apollographql/apollo-platform-commercial/pull/159) +- Don't enable logging if `debug` was explicitly set to `false` even if `dryRun` is set to `true`. [PR #159](https://github.com/apollographql/apollo-platform-commercial/pull/159) ### 0.2.0 @@ -24,4 +22,4 @@ ### 0.1.0 - `apollo-server-plugin-operation-registry` - - Update operation registry plugin to use manifest v2 [#32](https://github.com/apollographql/apollo-platform-commercial/pull/32) +- Update operation registry plugin to use manifest v2 [#32](https://github.com/apollographql/apollo-platform-commercial/pull/32) From f1e781d935f31ba56e2230793a0c4a09ff08a2be Mon Sep 17 00:00:00 2001 From: Evans Hauser Date: Thu, 6 Jun 2019 16:55:53 -0700 Subject: [PATCH 182/642] op-reg: add hooks for plugin lifecycle This adds hooks into the lifecycle of the operation registry * onManifestUpdate(newManifest, oldManifest) * onUnregisteredOperation(operation) * onForbiddenOperation(operation) --- .../src/ApolloServerPluginOperationRegistry.ts | 16 +++++++++++++++- .../src/agent.ts | 9 +++++++-- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts index 413e35746b3..62f627bd124 100644 --- a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts +++ b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts @@ -11,7 +11,7 @@ import { defaultOperationRegistrySignature, } from 'apollo-graphql'; import { ForbiddenError, ApolloError } from 'apollo-server-errors'; -import Agent from './agent'; +import Agent, { OperationManifest } from './agent'; import { GraphQLSchema } from 'graphql/type'; import { InMemoryLRUCache } from 'apollo-server-caching'; import loglevel from 'loglevel'; @@ -28,6 +28,12 @@ interface Options { | ForbidUnregisteredOperationsPredicate; dryRun?: boolean; schemaTag?: string; + onUnregisteredOperation?: (requestContext: GraphQLRequestContext) => void; + onForbiddenOperation?: (requestContext: GraphQLRequestContext) => void; + onManifestUpdate?: ( + newManifest: OperationManifest, + oldManifest: OperationManifest, + ) => void; } export default function plugin(options: Options = Object.create(null)) { @@ -99,6 +105,7 @@ for observability purposes, but all operations will be permitted.`, engine, store, logger, + onManifestUpdate: options.onManifestUpdate, }); await agent.start(); @@ -154,6 +161,10 @@ for observability purposes, but all operations will be permitted.`, ); requestContext.metrics.registeredOperation = true; return; + } else { + if (options.onUnregisteredOperation) { + options.onUnregisteredOperation(requestContext); + } } // If the `forbidUnregisteredOperations` option is set explicitly to @@ -218,6 +229,9 @@ for observability purposes, but all operations will be permitted.`, } if (shouldForbidOperation) { + if (options.onForbiddenOperation) { + options.onForbiddenOperation(requestContext); + } if (!options.dryRun) { logger.debug( `${logHash}: Execution denied because 'forbidUnregisteredOperations' was enabled for this request and the operation was not found in the local operation registry.`, diff --git a/packages/apollo-server-plugin-operation-registry/src/agent.ts b/packages/apollo-server-plugin-operation-registry/src/agent.ts index b27c526149e..861a14391be 100644 --- a/packages/apollo-server-plugin-operation-registry/src/agent.ts +++ b/packages/apollo-server-plugin-operation-registry/src/agent.ts @@ -11,6 +11,7 @@ import loglevel from 'loglevel'; import { Response } from 'node-fetch'; import { InMemoryLRUCache } from 'apollo-server-caching'; +import { GraphQLRequestContext } from 'apollo-server-plugin-base'; import { fetchIfNoneMatch } from './fetchIfNoneMatch'; const DEFAULT_POLL_SECONDS: number = 30; @@ -23,14 +24,18 @@ export interface AgentOptions { engine: any; store: InMemoryLRUCache; schemaTag: string; + onManifestUpdate?: ( + newManifest: OperationManifest, + oldManifest: OperationManifest, + ) => void; } -interface Operation { +export interface Operation { signature: string; document: string; } -interface OperationManifest { +export interface OperationManifest { version: number; operations: Array; } From c2a7584c01a380099b8c8da3cf62fd7ceffacdd4 Mon Sep 17 00:00:00 2001 From: Evans Hauser Date: Tue, 25 Jun 2019 15:04:54 -0700 Subject: [PATCH 183/642] call willManifestUpdate once on failure and updates --- .../ApolloServerPluginOperationRegistry.ts | 11 +++-- .../src/agent.ts | 47 ++++++++++++++----- 2 files changed, 42 insertions(+), 16 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts index 62f627bd124..30417a5af05 100644 --- a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts +++ b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts @@ -16,6 +16,7 @@ import { GraphQLSchema } from 'graphql/type'; import { InMemoryLRUCache } from 'apollo-server-caching'; import loglevel from 'loglevel'; import loglevelDebug from 'loglevel-debug'; +import { PromiseOrValue } from 'graphql/jsutils/PromiseOrValue'; type ForbidUnregisteredOperationsPredicate = ( requestContext: GraphQLRequestContext, @@ -30,10 +31,10 @@ interface Options { schemaTag?: string; onUnregisteredOperation?: (requestContext: GraphQLRequestContext) => void; onForbiddenOperation?: (requestContext: GraphQLRequestContext) => void; - onManifestUpdate?: ( - newManifest: OperationManifest, - oldManifest: OperationManifest, - ) => void; + willUpdateManifest?: ( + newManifest?: OperationManifest, + oldManifest?: OperationManifest, + ) => PromiseOrValue; } export default function plugin(options: Options = Object.create(null)) { @@ -105,7 +106,7 @@ for observability purposes, but all operations will be permitted.`, engine, store, logger, - onManifestUpdate: options.onManifestUpdate, + willUpdateManifest: options.willUpdateManifest, }); await agent.start(); diff --git a/packages/apollo-server-plugin-operation-registry/src/agent.ts b/packages/apollo-server-plugin-operation-registry/src/agent.ts index 861a14391be..4c9e3a880dc 100644 --- a/packages/apollo-server-plugin-operation-registry/src/agent.ts +++ b/packages/apollo-server-plugin-operation-registry/src/agent.ts @@ -11,8 +11,8 @@ import loglevel from 'loglevel'; import { Response } from 'node-fetch'; import { InMemoryLRUCache } from 'apollo-server-caching'; -import { GraphQLRequestContext } from 'apollo-server-plugin-base'; import { fetchIfNoneMatch } from './fetchIfNoneMatch'; +import { PromiseOrValue } from 'graphql/jsutils/PromiseOrValue'; const DEFAULT_POLL_SECONDS: number = 30; const SYNC_WARN_TIME_SECONDS: number = 60; @@ -24,10 +24,10 @@ export interface AgentOptions { engine: any; store: InMemoryLRUCache; schemaTag: string; - onManifestUpdate?: ( - newManifest: OperationManifest, - oldManifest: OperationManifest, - ) => void; + willUpdateManifest?: ( + newManifest?: OperationManifest, + oldManifest?: OperationManifest, + ) => PromiseOrValue; } export interface Operation { @@ -56,6 +56,7 @@ export default class Agent { public _timesChecked: number = 0; private lastOperationSignatures: SignatureStore = new Set(); + private lastManifest?: OperationManifest; private readonly options: AgentOptions = Object.create(null); constructor(options: AgentOptions) { @@ -106,8 +107,14 @@ export default class Agent { try { await pulse(); } catch (err) { + // Update the manifest to trigger `onManifestUpdate(newManifest: undefined, oldManifest: undefined)` + this.updateManifest(); console.error( - 'The operation manifest could not be fetched. Retries will continue, but requests will be forbidden until the manifest is fetched.', + `The operation manifest could not be fetched. Retries will continue.${ + this.lastManifest + ? '' + : ' Requests will be forbidden until the manifest is fetched.' + }`, err.message || err, ); } @@ -310,19 +317,37 @@ export default class Agent { }); } - public async updateManifest(manifest: OperationManifest) { + public async updateManifest(manifest?: OperationManifest) { if ( - !manifest || - manifest.version !== 2 || - !Array.isArray(manifest.operations) + manifest && + (manifest.version !== 2 || !Array.isArray(manifest.operations)) ) { throw new Error('Invalid manifest format.'); } + const returnedManifest = + (await (this.options.willUpdateManifest && + this.options.willUpdateManifest(manifest, this.lastManifest))) || + manifest; + + if (returnedManifest && !Array.isArray(returnedManifest.operations)) { + throw new Error( + "Invalid manifest format. Manifest's operations must be an array", + ); + } + + if (returnedManifest) { + this.updateOperationStore(returnedManifest.operations); + } + + this.lastManifest = manifest; + } + + private updateOperationStore(operations: OperationManifest['operations']) { const incomingOperations: Map = new Map(); const replacementSignatures: SignatureStore = new Set(); - for (const { signature, document } of manifest.operations) { + for (const { signature, document } of operations) { incomingOperations.set(signature, document); // Keep track of each operation in this manifest so we can store it // for comparison after the next fetch. From 53ee1019e929a03435b881edb0670b974d6fe32e Mon Sep 17 00:00:00 2001 From: Evans Hauser Date: Tue, 25 Jun 2019 15:09:24 -0700 Subject: [PATCH 184/642] layout test structure --- .../src/__tests__/agent.test.ts | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts index d1af491a8d1..f51757bf8a9 100644 --- a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts @@ -539,6 +539,28 @@ describe('Agent', () => { }); }); }); + + describe('manifest lifecycle', () => { + describe('willUpdateManifest', () => { + describe("called with undefined arguments when can't fetch first time", () => {}); + describe('called with manifest retrieved from gcs', () => {}); + describe('uses returned manifest', () => {}); + describe('not called again when manifest remains same', () => {}); + describe('called with previous manifest when updated', () => {}); + }); + }); + }); + + describe('operation lifecycle hooks', () => { + describe('onUnregisterOperation', () => { + describe('called when unregistered operation received', () => {}); + describe('not called when registered operation received', () => {}); + }); + describe('onForbiddenOperation', () => { + describe('called when unregistered operation received and forbidden', () => {}); + describe('not called when unregistered operation received and unforbidden', () => {}); + describe('not called when registered operation received', () => {}); + }); }); }); From 70bb8197d807f89df44fb0a0b41160fb1b31c173 Mon Sep 17 00:00:00 2001 From: Evans Hauser Date: Tue, 2 Jul 2019 09:35:13 -0700 Subject: [PATCH 185/642] add changelog --- packages/apollo-server-plugin-operation-registry/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/apollo-server-plugin-operation-registry/CHANGELOG.md b/packages/apollo-server-plugin-operation-registry/CHANGELOG.md index 33603713d7a..f738f4d0998 100644 --- a/packages/apollo-server-plugin-operation-registry/CHANGELOG.md +++ b/packages/apollo-server-plugin-operation-registry/CHANGELOG.md @@ -2,6 +2,7 @@ ### vNEXT (Currently `alpha` tag) +- Add lifecycle hooks: `willUpdateManifest`, `onUnregisteredOperation`, and `onForbiddenOperation`. [PR #158](https://github.com/apollographql/apollo-platform-commercial/pull/158) - Prevent the polling timer from keeping the event loop active [PR #223](https://github.com/apollographql/apollo-platform-commercial/pull/223) - Update error message for operations that are not in the operation registry [PR #170](https://github.com/apollographql/apollo-platform-commercial/pull/170) From 94dbb91421e263abf4af50691b75d71436388ba9 Mon Sep 17 00:00:00 2001 From: Evans Hauser Date: Tue, 2 Jul 2019 17:53:02 -0700 Subject: [PATCH 186/642] add willUpdateManfest tests --- .../src/__tests__/agent.test.ts | 425 +++++++++++++----- 1 file changed, 325 insertions(+), 100 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts index f51757bf8a9..b6534655905 100644 --- a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts @@ -7,7 +7,7 @@ import { } from '../common'; import { resolve as urlResolve } from 'url'; import { createHash } from 'crypto'; -import { AgentOptions } from '../agent'; +import { AgentOptions, OperationManifest } from '../agent'; const fakeBaseUrl = 'https://myfakehost/'; @@ -84,7 +84,7 @@ describe('Agent', () => { }); }); - describe('fetches', () => { + describe('with manifest', () => { let originalEnvApolloOpManifestBaseUrl: string | undefined; let originalEnvOverrideStorageSecretBaseUrl: string | undefined; let Agent: typeof import('../agent').default; @@ -123,6 +123,51 @@ describe('Agent', () => { ).replace(new RegExp(`^${urlOperationManifestBase}`), ''); }); + // Each nock is good for exactly one request! + function nockLegacyGoodManifest( + operations: ManifestRecord[] = [ + sampleManifestRecords.a, + sampleManifestRecords.b, + sampleManifestRecords.c, + ], + ) { + return nockBase() + .get(genericLegacyOperationManifestUrl) + .reply(200, { + version: 2, + operations, + }); + } + + function nockGoodManifestsUnderStorageSecret( + operations: ManifestRecord[] = [ + sampleManifestRecords.a, + sampleManifestRecords.b, + sampleManifestRecords.c, + ], + ) { + return nockBase() + .get(genericStorageSecretOperationManifestUrl) + .reply(200, { + version: 2, + operations, + }); + } + + function nockStorageSecret( + status = 200, + body: any = JSON.stringify(genericStorageSecret), + ) { + return nockBase() + .get( + getStorageSecretUrl(genericServiceID, genericApiKeyHash).replace( + new RegExp(`^${urlStorageSecretBase}`), + '', + ), + ) + .reply(status, body); + } + afterAll(() => { // Put the environment overrides back how they were. if (originalEnvApolloOpManifestBaseUrl) { @@ -148,6 +193,42 @@ describe('Agent', () => { jest.resetModules(); }); + const forCleanup: { + store?: InMemoryLRUCache; + agent?: import('../agent').default; + }[] = []; + + function createAgent({ ...args }: Partial = {}) { + const options = { ...defaultAgentOptions, ...args }; + + // We never actually let the Agent construct its own default store + // since we need to pluck the store out to instrument it with spies. + const store = options.store; + const agent = new Agent(options); + + // Save all agents and stores we've created so we can properly + // stop them and clean them up. + forCleanup.push({ agent, store }); + return agent; + } + + afterEach(() => { + if (!nock.isDone()) { + throw new Error( + `Not all nock interceptors were used! Pending mocks: ${nock.pendingMocks()}`, + ); + } + + let toCleanup; + // Loop through the `forCleanup` constant and empty it out by popping + // individual elements off the end and running the appropriate cleanup. + while ((toCleanup = forCleanup.pop())) { + if (toCleanup.agent) { + toCleanup.agent.stop(); + } + } + }); + it('correctly prepared the test environment', () => { expect(getLegacyOperationManifestUrl('abc123', 'def456')).toStrictEqual( urlResolve(fakeBaseUrl, '/abc123/def456.v2.json'), @@ -155,87 +236,6 @@ describe('Agent', () => { }); describe('manifest checking and store populating', () => { - const forCleanup: { - store?: InMemoryLRUCache; - agent?: import('../agent').default; - }[] = []; - - function createAgent({ ...args } = {}) { - const options = { ...defaultAgentOptions, ...args }; - - // We never actually let the Agent construct its own default store - // since we need to pluck the store out to instrument it with spies. - const store = options.store; - const agent = new Agent(options); - - // Save all agents and stores we've created so we can properly - // stop them and clean them up. - forCleanup.push({ agent, store }); - return agent; - } - - afterEach(() => { - if (!nock.isDone()) { - throw new Error( - `Not all nock interceptors were used! Pending mocks: ${nock.pendingMocks()}`, - ); - } - - let toCleanup; - // Loop through the `forCleanup` constant and empty it out by popping - // individual elements off the end and running the appropriate cleanup. - while ((toCleanup = forCleanup.pop())) { - if (toCleanup.agent) { - toCleanup.agent.stop(); - } - } - }); - - // Each nock is good for exactly one request! - function nockLegacyGoodManifest( - operations: ManifestRecord[] = [ - sampleManifestRecords.a, - sampleManifestRecords.b, - sampleManifestRecords.c, - ], - ) { - return nockBase() - .get(genericLegacyOperationManifestUrl) - .reply(200, { - version: 2, - operations, - }); - } - - function nockGoodManifestsUnderStorageSecret( - operations: ManifestRecord[] = [ - sampleManifestRecords.a, - sampleManifestRecords.b, - sampleManifestRecords.c, - ], - ) { - return nockBase() - .get(genericStorageSecretOperationManifestUrl) - .reply(200, { - version: 2, - operations, - }); - } - - function nockStorageSecret( - status = 200, - body: any = JSON.stringify(genericStorageSecret), - ) { - return nockBase() - .get( - getStorageSecretUrl(genericServiceID, genericApiKeyHash).replace( - new RegExp(`^${urlStorageSecretBase}`), - '', - ), - ) - .reply(status, body); - } - function expectStoreSpyOperationEach( spy: jest.SpyInstance, letters: string[], @@ -541,25 +541,250 @@ describe('Agent', () => { }); describe('manifest lifecycle', () => { + function generateWillUpdateManifest( + operations?: OperationManifest['operations'], + ) { + return jest.fn( + ( + newManifest?: OperationManifest, + oldManifest?: OperationManifest, + ) => { + const manifest = newManifest || oldManifest; + return ( + (operations && { version: 2, operations }) || + manifest || { version: 2, operations: [] } + ); + }, + ); + } + describe('willUpdateManifest', () => { - describe("called with undefined arguments when can't fetch first time", () => {}); - describe('called with manifest retrieved from gcs', () => {}); - describe('uses returned manifest', () => {}); - describe('not called again when manifest remains same', () => {}); - describe('called with previous manifest when updated', () => {}); - }); - }); - }); + it("receives undefined arguments when can't fetch first time", async () => { + nockStorageSecret(404); + nockBase() + .get(genericLegacyOperationManifestUrl) + .reply(500); + const mock = generateWillUpdateManifest(); + const store = defaultStore(); + const storeSetSpy = jest.spyOn(store, 'set'); + const storeDeleteSpy = jest.spyOn(store, 'delete'); - describe('operation lifecycle hooks', () => { - describe('onUnregisterOperation', () => { - describe('called when unregistered operation received', () => {}); - describe('not called when registered operation received', () => {}); - }); - describe('onForbiddenOperation', () => { - describe('called when unregistered operation received and forbidden', () => {}); - describe('not called when unregistered operation received and unforbidden', () => {}); - describe('not called when registered operation received', () => {}); + const agent = createAgent({ + willUpdateManifest: mock, + store, + }); + await agent.start(); + expect(mock).toHaveBeenCalledTimes(1); + expect(mock).toHaveBeenCalledWith(undefined, undefined); + + // no additions, no deletions. + expect(storeSetSpy).toBeCalledTimes(0); + expect(storeDeleteSpy).toBeCalledTimes(0); + }); + it('receives manifest retrieved from gcs', async () => { + nockStorageSecret(); + nockGoodManifestsUnderStorageSecret(); + const mock = generateWillUpdateManifest(); + const store = defaultStore(); + const storeSetSpy = jest.spyOn(store, 'set'); + const storeDeleteSpy = jest.spyOn(store, 'delete'); + + const agent = createAgent({ + willUpdateManifest: mock, + store, + }); + await agent.start(); + expect(mock).toHaveBeenCalledTimes(1); + expect(mock).toHaveBeenCalledWith( + { + version: 2, + operations: [ + sampleManifestRecords.a, + sampleManifestRecords.b, + sampleManifestRecords.c, + ], + }, + undefined, + ); + + // Three additions, no deletions. + expect(storeSetSpy).toBeCalledTimes(3); + expect(storeDeleteSpy).toBeCalledTimes(0); + }); + it('uses returned manifest to enforce safelist', async () => { + nockStorageSecret(); + nockGoodManifestsUnderStorageSecret(); + const mock = generateWillUpdateManifest([sampleManifestRecords.a]); + const store = defaultStore(); + const storeSetSpy = jest.spyOn(store, 'set'); + const storeDeleteSpy = jest.spyOn(store, 'delete'); + + const agent = createAgent({ + willUpdateManifest: mock, + store, + }); + await agent.start(); + expect(mock).toHaveBeenCalledTimes(1); + expect(mock).toHaveBeenCalledWith( + { + version: 2, + operations: [ + sampleManifestRecords.a, + sampleManifestRecords.b, + sampleManifestRecords.c, + ], + }, + undefined, + ); + expect(mock).toReturnWith({ + version: 2, + operations: [sampleManifestRecords.a], + }); + + // One additions, no deletions. + expect(storeSetSpy).toBeCalledTimes(1); + expect(storeDeleteSpy).toBeCalledTimes(0); + }); + it('is not called again when manifest remains same', async () => { + nockStorageSecret(); + nockGoodManifestsUnderStorageSecret(); + + const mock = generateWillUpdateManifest(); + const store = defaultStore(); + const storeSetSpy = jest.spyOn(store, 'set'); + const storeDeleteSpy = jest.spyOn(store, 'delete'); + + const agent = createAgent({ + willUpdateManifest: mock, + store, + }); + jest.useFakeTimers(); + await agent.start(); + expect(mock).toHaveBeenCalledTimes(1); + expect(mock).toHaveBeenCalledWith( + { + version: 2, + operations: [ + sampleManifestRecords.a, + sampleManifestRecords.b, + sampleManifestRecords.c, + ], + }, + undefined, + ); + // Three additions, no deletions. + expect(storeSetSpy).toBeCalledTimes(3); + expect(storeDeleteSpy).toBeCalledTimes(0); + + // If it's one millisecond short of our next poll interval, nothing + // should have changed yet. + jest.advanceTimersByTime(pollSeconds * 1000 - 1); + + // Still only one check. + expect(agent._timesChecked).toBe(1); + + // Now, we'll expect another request to go out, so we'll nock it. + nockStorageSecret(); + nockBase() + .get(genericStorageSecretOperationManifestUrl) + .reply(304); + + // If we move forward the last remaining millisecond, we should trigger + // and end up with a successful sync. + jest.advanceTimersByTime(1); + + // While that timer will fire, it will do work async, and we need to + // wait on that work itself. + await agent.requestPending(); + + // Now the times checked should have gone up. + expect(agent._timesChecked).toBe(2); + + // the agent should not have been called again + expect(mock).toHaveBeenCalledTimes(1); + expect(mock).toHaveBeenCalledWith( + { + version: 2, + operations: [ + sampleManifestRecords.a, + sampleManifestRecords.b, + sampleManifestRecords.c, + ], + }, + undefined, + ); + // Three additions, no deletions. + expect(storeSetSpy).toBeCalledTimes(3); + expect(storeDeleteSpy).toBeCalledTimes(0); + }); + + it('receives previous manifest when updated', async () => { + nockStorageSecret(); + nockGoodManifestsUnderStorageSecret(); + + const mock = generateWillUpdateManifest(); + const store = defaultStore(); + const storeSetSpy = jest.spyOn(store, 'set'); + const storeDeleteSpy = jest.spyOn(store, 'delete'); + + const agent = createAgent({ + willUpdateManifest: mock, + store, + }); + jest.useFakeTimers(); + await agent.start(); + expect(mock).toHaveBeenCalledTimes(1); + expect(mock).toHaveBeenCalledWith( + { + version: 2, + operations: [ + sampleManifestRecords.a, + sampleManifestRecords.b, + sampleManifestRecords.c, + ], + }, + undefined, + ); + // Three additions, no deletions. + expect(storeSetSpy).toBeCalledTimes(3); + expect(storeDeleteSpy).toBeCalledTimes(0); + + // If it's one millisecond short of our next poll interval, nothing + // should have changed yet. + jest.advanceTimersByTime(pollSeconds * 1000 - 1); + + // Still only one check. + expect(agent._timesChecked).toBe(1); + + // Now, we'll expect another request to go out, so we'll nock it. + nockStorageSecret(); + nockGoodManifestsUnderStorageSecret([sampleManifestRecords.a]); + + // If we move forward the last remaining millisecond, we should trigger + // and end up with a successful sync. + jest.advanceTimersByTime(1); + + // While that timer will fire, it will do work async, and we need to + // wait on that work itself. + await agent.requestPending(); + + expect(mock).toHaveBeenCalledTimes(2); + expect(mock).toHaveBeenCalledWith( + { version: 2, operations: [sampleManifestRecords.a] }, + { + version: 2, + operations: [ + sampleManifestRecords.a, + sampleManifestRecords.b, + sampleManifestRecords.c, + ], + }, + ); + // Three additions, two deletions. + expect(storeSetSpy).toBeCalledTimes(3); + expect(storeDeleteSpy).toBeCalledTimes(2); + }); + }); }); }); }); From 7bc86cef33d6028bd5f819cfb12b1c0be38a31d0 Mon Sep 17 00:00:00 2001 From: Evans Hauser Date: Wed, 3 Jul 2019 11:16:19 -0700 Subject: [PATCH 187/642] Add tests for on(Forbidden|Unregistered)Operation --- ...polloServerPluginOperationRegistry.test.ts | 252 ++++++++++++++++++ 1 file changed, 252 insertions(+) diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/ApolloServerPluginOperationRegistry.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/ApolloServerPluginOperationRegistry.test.ts index 8b65a036b24..751c9089f26 100644 --- a/packages/apollo-server-plugin-operation-registry/src/__tests__/ApolloServerPluginOperationRegistry.test.ts +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/ApolloServerPluginOperationRegistry.test.ts @@ -1,4 +1,36 @@ import plugin from '../ApolloServerPluginOperationRegistry'; +import { ApolloServerBase, ForbiddenError } from 'apollo-server-core'; +import { + defaultOperationRegistrySignature, + operationHash, +} from 'apollo-graphql'; +import gql from 'graphql-tag'; +import { print } from 'graphql'; + +const typeDefs = gql` + type Query { + hello: String + } +`; + +const query = gql` + query HelloFam { + hello + } +`; + +const normalizedQueryDocument = defaultOperationRegistrySignature( + query, + 'HelloFam', +); +const queryHash = operationHash(normalizedQueryDocument); + +// In order to expose will start and +class ApolloServerMock extends ApolloServerBase { + public async willStart() { + return super.willStart(); + } +} describe('Operation registry plugin', () => { it('will instantiate when not called with options', () => { @@ -8,4 +40,224 @@ describe('Operation registry plugin', () => { it('will instantiate with debug enabled', () => { expect(plugin({ debug: true })()).toHaveProperty('serverWillStart'); }); + + // These tests depend on the behavior of willUpdateManifest to update the + // operation safelist + describe('operation lifecycle hooks', () => { + describe('onUnregisterOperation', () => { + it('is called when unregistered operation received', async () => { + const mock = jest.fn(requestContext => { + expect(requestContext).toMatchObject({ + request: { + operationName: 'HelloFam', + }, + }); + }); + const server = new ApolloServerMock({ + typeDefs, + mockEntireSchema: true, + engine: { + apiKey: 'server:not-a-service:not-an-apikey', + }, + plugins: [ + plugin({ + willUpdateManifest: () => { + return { + version: 2, + operations: [], + }; + }, + onUnregisteredOperation: mock, + })(), + ], + }); + await server.willStart(); + const result = await server.executeOperation({ + query: print(query), + operationName: 'HelloFam', + }); + expect(result.data).toBeDefined(); + expect(result.errors).not.toBeDefined(); + expect(result.data && result.data.hello).toBeDefined(); + expect(mock).toHaveBeenCalledTimes(1); + await server.stop(); + }); + + it('is not called when registered operation received', async () => { + const mock = jest.fn(); + const server = new ApolloServerMock({ + typeDefs, + mockEntireSchema: true, + engine: { + apiKey: 'server:not-a-service:not-an-apikey', + }, + plugins: [ + plugin({ + willUpdateManifest: () => { + return { + version: 2, + operations: [ + { + document: normalizedQueryDocument, + signature: queryHash, + }, + ], + }; + }, + onUnregisteredOperation: mock, + })(), + ], + }); + await server.willStart(); + const result = await server.executeOperation({ + query: print(query), + operationName: 'HelloFam', + }); + expect(result.data).toBeDefined(); + expect(result.errors).not.toBeDefined(); + expect(result.data && result.data.hello).toBeDefined(); + expect(mock).toHaveBeenCalledTimes(0); + await server.stop(); + }); + }); + + describe('onForbiddenOperation', () => { + it('is called when unregistered operation received and forbidden', async () => { + const mock = jest.fn(requestContext => { + expect(requestContext).toMatchObject({ + request: { + operationName: 'HelloFam', + }, + }); + }); + const forbidUnregisteredOperations = jest.fn(requestContext => { + expect(requestContext).toMatchObject({ + request: { + operationName: 'HelloFam', + }, + }); + return true; + }); + + const server = new ApolloServerMock({ + typeDefs, + mockEntireSchema: true, + engine: { + apiKey: 'server:not-a-service:not-an-apikey', + }, + plugins: [ + plugin({ + willUpdateManifest: () => { + return { + version: 2, + operations: [], + }; + }, + forbidUnregisteredOperations, + onForbiddenOperation: mock, + })(), + ], + }); + await server.willStart(); + const result = await server.executeOperation({ + query: print(query), + operationName: 'HelloFam', + }); + expect(result.data).not.toBeDefined(); + expect(result.errors).toBeDefined(); + expect(result.errors).toHaveLength(1); + expect(result.errors && result.errors[0].message).toContain( + 'forbidden', + ); + expect(mock).toHaveBeenCalledTimes(1); + expect(forbidUnregisteredOperations).toHaveBeenCalledTimes(1); + await server.stop(); + }); + + it('is not called when unregistered operation received and unforbidden', async () => { + const mock = jest.fn(requestContext => { + expect(requestContext).toMatchObject({ + request: { + operationName: 'HelloFam', + }, + }); + }); + const forbidUnregisteredOperations = jest.fn(requestContext => { + expect(requestContext).toMatchObject({ + request: { + operationName: 'HelloFam', + }, + }); + return false; + }); + const server = new ApolloServerMock({ + typeDefs, + mockEntireSchema: true, + engine: { + apiKey: 'server:not-a-service:not-an-apikey', + }, + plugins: [ + plugin({ + willUpdateManifest: () => { + return { + version: 2, + operations: [], + }; + }, + forbidUnregisteredOperations, + onForbiddenOperation: mock, + })(), + ], + }); + await server.willStart(); + const result = await server.executeOperation({ + query: print(query), + operationName: 'HelloFam', + }); + expect(result.data).toBeDefined(); + expect(result.errors).not.toBeDefined(); + expect(result.data && result.data.hello).toBeDefined(); + expect(mock).toHaveBeenCalledTimes(0); + expect(forbidUnregisteredOperations).toHaveBeenCalledTimes(1); + await server.stop(); + }); + + it('is not called when registered operation received', async () => { + const mock = jest.fn(); + const server = new ApolloServerMock({ + typeDefs, + mockEntireSchema: true, + engine: { + apiKey: 'server:not-a-service:not-an-apikey', + }, + plugins: [ + plugin({ + willUpdateManifest: () => { + return { + version: 2, + operations: [ + { + document: normalizedQueryDocument, + signature: queryHash, + }, + ], + }; + }, + onForbiddenOperation: mock, + })(), + ], + }); + await server.willStart(); + const result = await server.executeOperation({ + query: print(query), + operationName: 'HelloFam', + }); + expect(result.data).toBeDefined(); + expect(result.errors).not.toBeDefined(); + expect(result.data && result.data.hello).toBeDefined(); + expect(mock).toHaveBeenCalledTimes(0); + await server.stop(); + }); + }); + }); }); From c1adecbcae957d95a63448069173db6a73584539 Mon Sep 17 00:00:00 2001 From: Evans Hauser Date: Wed, 24 Jul 2019 16:39:31 -0700 Subject: [PATCH 188/642] surround observability hooks in promise --- .../src/ApolloServerPluginOperationRegistry.ts | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts index 30417a5af05..8972a2fa582 100644 --- a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts +++ b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts @@ -164,7 +164,11 @@ for observability purposes, but all operations will be permitted.`, return; } else { if (options.onUnregisteredOperation) { - options.onUnregisteredOperation(requestContext); + new Promise(() => { + if (options.onUnregisteredOperation) { + options.onUnregisteredOperation(requestContext); + } + }); } } @@ -231,7 +235,11 @@ for observability purposes, but all operations will be permitted.`, if (shouldForbidOperation) { if (options.onForbiddenOperation) { - options.onForbiddenOperation(requestContext); + new Promise(() => { + if (options.onForbiddenOperation) { + options.onForbiddenOperation(requestContext); + } + }); } if (!options.dryRun) { logger.debug( From 671c9b2b2cb3d665fabd0b95c9d3dc3263f654ea Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 17 Oct 2019 14:45:33 +0300 Subject: [PATCH 189/642] Remove memory leak from guaranteed unresolved/unrejected Promise. I question whether or not we want to actually guarantee async execution of this method and not give the opportunity to the user to actually make it block if they'd like to, but we certainly should ensure that Promises should not be created on every request and never resolve or reject, which seems like a prime avenue for a DoS via memory leak. Of course, these should be garbage collected eventually, but we can avoid creating them that way. --- .../ApolloServerPluginOperationRegistry.ts | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts index 8972a2fa582..9eb7c3b3502 100644 --- a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts +++ b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts @@ -163,11 +163,11 @@ for observability purposes, but all operations will be permitted.`, requestContext.metrics.registeredOperation = true; return; } else { - if (options.onUnregisteredOperation) { - new Promise(() => { - if (options.onUnregisteredOperation) { - options.onUnregisteredOperation(requestContext); - } + // If defined, this method should not block, whether async or not. + if (typeof options.onUnregisteredOperation === 'function') { + const onUnregisteredOperation = options.onUnregisteredOperation; + Promise.resolve().then(() => { + onUnregisteredOperation(requestContext); }); } } @@ -234,11 +234,11 @@ for observability purposes, but all operations will be permitted.`, } if (shouldForbidOperation) { - if (options.onForbiddenOperation) { - new Promise(() => { - if (options.onForbiddenOperation) { - options.onForbiddenOperation(requestContext); - } + // If defined, this method should not block, whether async or not. + if (typeof options.onForbiddenOperation === 'function') { + const onForbiddenOperation = options.onForbiddenOperation; + Promise.resolve().then(() => { + onForbiddenOperation(requestContext); }); } if (!options.dryRun) { From 27931c24971d32d856985e1d8ba7c6e3f720d380 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Fri, 22 Nov 2019 18:57:16 +0200 Subject: [PATCH 190/642] op-reg: Rename internal usage of signature and hash to match public-facing manifest. --- .../ApolloServerPluginOperationRegistry.ts | 75 +++++++++++-------- .../src/common.ts | 2 +- 2 files changed, 43 insertions(+), 34 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts index fcaf8144d35..249d6e63635 100644 --- a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts +++ b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts @@ -1,5 +1,5 @@ import * as assert from 'assert'; -import { pluginName, getStoreKey, hashForLogging } from './common'; +import { pluginName, getStoreKey, signatureForLogging } from './common'; import { ApolloServerPlugin, GraphQLServiceContext, @@ -7,8 +7,15 @@ import { GraphQLRequestContext, } from 'apollo-server-plugin-base'; import { - operationHash, - defaultOperationRegistrySignature, + /** + * We alias these to different names entirely since the user-facing values + * which are present in their manifest (signature and document) are probably + * the most important concepts to rally around right now, in terms of + * approachability to the implementor. A future version of the + * `apollo-graphql` package should rename them to make this more clear. + */ + operationHash as operationSignature, + defaultOperationRegistrySignature as defaultOperationRegistryNormalization, } from 'apollo-graphql'; import { ForbiddenError, ApolloError } from 'apollo-server-errors'; import Agent, { OperationManifest } from './agent'; @@ -122,43 +129,45 @@ for observability purposes, but all operations will be permitted.`, throw new Error('Unable to access store.'); } - const hash = operationHash( - defaultOperationRegistrySignature( - document, - - // XXX The `operationName` is set from the AST, not from the - // request `operationName`. If `operationName` is `null`, - // then the operation is anonymous. However, it's not possible - // to register anonymous operations from the `apollo` CLI. - // We could fail early, however, we still want to abide by the - // desires of `forbidUnregisteredOperations`, so we'll allow - // this hash be generated anyway. The hash cannot be in the - // manifest, so this would be okay and allow this code to remain - // less conditional-y, eventually forbidding the operation when - // the hash is not found and `forbidUnregisteredOperations` is on. - requestContext.operationName || '', - ), + const normalizedDocument = defaultOperationRegistryNormalization( + document, + + // XXX The `operationName` is set from the AST, not from the + // request `operationName`. If `operationName` is `null`, + // then the operation is anonymous. However, it's not possible + // to register anonymous operations from the `apollo` CLI. + // We could fail early, however, we still want to abide by the + // desires of `forbidUnregisteredOperations`, so we'll allow + // this signature to be generated anyway. It could not be in the + // manifest, so this would be okay and allow this code to remain + // less conditional-y, eventually forbidding the operation when + // the signature is absent and `forbidUnregisteredOperations` is on. + requestContext.operationName || '', ); - if (!hash) { + const signature = operationSignature(normalizedDocument); + + if (!signature) { throw new ApolloError('No document.'); } - // The hashes are quite long and it seems we can get by with a substr. - const logHash = hashForLogging(hash); + // The signatures are quite long so we truncate to a prefix of it. + const logSignature = signatureForLogging(signature); - logger.debug(`${logHash}: Looking up operation in local registry.`); + logger.debug( + `${logSignature}: Looking up operation in local registry.`, + ); // Try to fetch the operation from the store of operations we're // currently aware of, which has been populated by the operation // registry. - const storeFetch = await store.get(getStoreKey(hash)); + const storeFetch = await store.get(getStoreKey(signature)); // If we have a hit, we'll return immediately, signaling that we're // not intending to block this request. if (storeFetch) { logger.debug( - `${logHash}: Permitting operation found in local registry.`, + `${logSignature}: Permitting operation found in local registry.`, ); requestContext.metrics.registeredOperation = true; return; @@ -190,7 +199,7 @@ for observability purposes, but all operations will be permitted.`, if (typeof options.forbidUnregisteredOperations === 'function') { logger.debug( - `${logHash}: Calling 'forbidUnregisteredOperations' predicate function with requestContext...`, + `${logSignature}: Calling 'forbidUnregisteredOperations' predicate function with requestContext...`, ); try { @@ -199,7 +208,7 @@ for observability purposes, but all operations will be permitted.`, ); logger.debug( - `${logHash}: The 'forbidUnregisteredOperations' predicate function returned ${predicateResult}`, + `${logSignature}: The 'forbidUnregisteredOperations' predicate function returned ${predicateResult}`, ); // If we've received a boolean back from the predicate function, @@ -211,7 +220,7 @@ for observability purposes, but all operations will be permitted.`, shouldForbidOperation = predicateResult; } else { logger.warn( - `${logHash} Predicate function did not return a boolean response. Got ${predicateResult}`, + `${logSignature} Predicate function did not return a boolean response. Got ${predicateResult}`, ); } } catch (err) { @@ -219,7 +228,7 @@ for observability purposes, but all operations will be permitted.`, // predicate function, we should assume that the implementor // had a security-wise intention and remain in enforcement mode. logger.error( - `${logHash}: An error occurred within the 'forbidUnregisteredOperations' predicate function: ${err}`, + `${logSignature}: An error occurred within the 'forbidUnregisteredOperations' predicate function: ${err}`, ); } } @@ -228,7 +237,7 @@ for observability purposes, but all operations will be permitted.`, // should be forbidden, we report it within metrics as forbidden, even though we may be running in dryRun mode. if (shouldForbidOperation && options.forbidUnregisteredOperations) { logger.debug( - `${logHash} Reporting operation as forbidden to Apollo trace warehouse.`, + `${logSignature} Reporting operation as forbidden to Apollo trace warehouse.`, ); requestContext.metrics.forbiddenOperation = true; @@ -244,13 +253,13 @@ for observability purposes, but all operations will be permitted.`, if (shouldForbidOperation) { if (!options.dryRun) { logger.debug( - `${logHash}: Execution denied because 'forbidUnregisteredOperations' was enabled for this request and the operation was not found in the local operation registry.`, + `${logSignature}: Execution denied because 'forbidUnregisteredOperations' was enabled for this request and the operation was not found in the local operation registry.`, ); const error = new ForbiddenError( 'Execution forbidden: Operation not found in operation registry', ); Object.assign(error.extensions, { - operationHash: hash, + operationSignature: signature, exception: { message: `Please register your operation with \`npx apollo client:push --tag="${schemaTag}"\`. See https://www.apollographql.com/docs/platform/operation-registry/ for more details.`, }, @@ -258,7 +267,7 @@ for observability purposes, but all operations will be permitted.`, throw error; } else { logger.debug( - `${dryRunPrefix} ${logHash}: Operation ${requestContext.operationName} would have been forbidden.`, + `${dryRunPrefix} ${logSignature}: Operation ${requestContext.operationName} would have been forbidden.`, ); } } diff --git a/packages/apollo-server-plugin-operation-registry/src/common.ts b/packages/apollo-server-plugin-operation-registry/src/common.ts index 4ba0bdac27a..a9dda2383ef 100644 --- a/packages/apollo-server-plugin-operation-registry/src/common.ts +++ b/packages/apollo-server-plugin-operation-registry/src/common.ts @@ -58,7 +58,7 @@ export function getLegacyOperationManifestUrl( ); } -export function hashForLogging(hash: string): string { +export function signatureForLogging(hash: string): string { if (typeof hash !== 'string') { return ''; } From 420e01e74c684a2b71325552dc44c8b2413ceb85 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Fri, 22 Nov 2019 18:59:35 +0200 Subject: [PATCH 191/642] Adjust tests to support testing multiple arguments and adjust assertions. I'm not actually certain that the `expect` assertions inside of the `jest.jn` calls were actually being exercised before, but in an effort to support testing multiple arguments, I'll switch to using the Jest matchers which are meant for asserting calls to methods (i.e. `toHaveBeenCalledWith`). --- ...polloServerPluginOperationRegistry.test.ts | 78 ++++++++----------- 1 file changed, 32 insertions(+), 46 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/ApolloServerPluginOperationRegistry.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/ApolloServerPluginOperationRegistry.test.ts index 751c9089f26..00ea3d26682 100644 --- a/packages/apollo-server-plugin-operation-registry/src/__tests__/ApolloServerPluginOperationRegistry.test.ts +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/ApolloServerPluginOperationRegistry.test.ts @@ -46,13 +46,7 @@ describe('Operation registry plugin', () => { describe('operation lifecycle hooks', () => { describe('onUnregisterOperation', () => { it('is called when unregistered operation received', async () => { - const mock = jest.fn(requestContext => { - expect(requestContext).toMatchObject({ - request: { - operationName: 'HelloFam', - }, - }); - }); + const onUnregisteredOperation = jest.fn(); const server = new ApolloServerMock({ typeDefs, mockEntireSchema: true, @@ -67,7 +61,7 @@ describe('Operation registry plugin', () => { operations: [], }; }, - onUnregisteredOperation: mock, + onUnregisteredOperation, })(), ], }); @@ -79,12 +73,19 @@ describe('Operation registry plugin', () => { expect(result.data).toBeDefined(); expect(result.errors).not.toBeDefined(); expect(result.data && result.data.hello).toBeDefined(); - expect(mock).toHaveBeenCalledTimes(1); + expect(onUnregisteredOperation).toHaveBeenCalledTimes(1); + expect(onUnregisteredOperation).toHaveBeenCalledWith( + expect.objectContaining({ + request: expect.objectContaining({ + operationName: 'HelloFam', + }), + }), + ); await server.stop(); }); it('is not called when registered operation received', async () => { - const mock = jest.fn(); + const onUnregisteredOperation = jest.fn(); const server = new ApolloServerMock({ typeDefs, mockEntireSchema: true, @@ -104,7 +105,7 @@ describe('Operation registry plugin', () => { ], }; }, - onUnregisteredOperation: mock, + onUnregisteredOperation, })(), ], }); @@ -116,28 +117,17 @@ describe('Operation registry plugin', () => { expect(result.data).toBeDefined(); expect(result.errors).not.toBeDefined(); expect(result.data && result.data.hello).toBeDefined(); - expect(mock).toHaveBeenCalledTimes(0); + expect(onUnregisteredOperation).toHaveBeenCalledTimes(0); await server.stop(); }); }); describe('onForbiddenOperation', () => { it('is called when unregistered operation received and forbidden', async () => { - const mock = jest.fn(requestContext => { - expect(requestContext).toMatchObject({ - request: { - operationName: 'HelloFam', - }, - }); - }); - const forbidUnregisteredOperations = jest.fn(requestContext => { - expect(requestContext).toMatchObject({ - request: { - operationName: 'HelloFam', - }, - }); - return true; - }); + const onForbiddenOperation = jest.fn(); + + // Returning true from this predicate enables the enforcement. + const forbidUnregisteredOperations = jest.fn(() => true); const server = new ApolloServerMock({ typeDefs, @@ -154,7 +144,7 @@ describe('Operation registry plugin', () => { }; }, forbidUnregisteredOperations, - onForbiddenOperation: mock, + onForbiddenOperation, })(), ], }); @@ -169,27 +159,23 @@ describe('Operation registry plugin', () => { expect(result.errors && result.errors[0].message).toContain( 'forbidden', ); - expect(mock).toHaveBeenCalledTimes(1); + expect(onForbiddenOperation).toHaveBeenCalledTimes(1); + expect(onForbiddenOperation).toHaveBeenCalledWith( + expect.objectContaining({ + request: expect.objectContaining({ + operationName: 'HelloFam', + }), + }), + ); expect(forbidUnregisteredOperations).toHaveBeenCalledTimes(1); await server.stop(); }); it('is not called when unregistered operation received and unforbidden', async () => { - const mock = jest.fn(requestContext => { - expect(requestContext).toMatchObject({ - request: { - operationName: 'HelloFam', - }, - }); - }); - const forbidUnregisteredOperations = jest.fn(requestContext => { - expect(requestContext).toMatchObject({ - request: { - operationName: 'HelloFam', - }, - }); - return false; - }); + const onForbiddenOperation = jest.fn(); + + // Returning true from this predicate enables the enforcement. + const forbidUnregisteredOperations = jest.fn(() => false); const server = new ApolloServerMock({ typeDefs, mockEntireSchema: true, @@ -205,7 +191,7 @@ describe('Operation registry plugin', () => { }; }, forbidUnregisteredOperations, - onForbiddenOperation: mock, + onForbiddenOperation, })(), ], }); @@ -217,7 +203,7 @@ describe('Operation registry plugin', () => { expect(result.data).toBeDefined(); expect(result.errors).not.toBeDefined(); expect(result.data && result.data.hello).toBeDefined(); - expect(mock).toHaveBeenCalledTimes(0); + expect(onForbiddenOperation).toHaveBeenCalledTimes(0); expect(forbidUnregisteredOperations).toHaveBeenCalledTimes(1); await server.stop(); }); From 21bb8d8abebbcd4bb3e3bb3d31ad3cf04819af0d Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Fri, 22 Nov 2019 19:01:00 +0200 Subject: [PATCH 192/642] Switch from using `graphql`'s `PromiseOrValue` to our `ValueOrPromise`. I don't believe this was intentionally done, but more than likely auto-complete. --- packages/apollo-server-plugin-operation-registry/src/agent.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/agent.ts b/packages/apollo-server-plugin-operation-registry/src/agent.ts index d00c36a1576..f607bae9ecf 100644 --- a/packages/apollo-server-plugin-operation-registry/src/agent.ts +++ b/packages/apollo-server-plugin-operation-registry/src/agent.ts @@ -12,7 +12,7 @@ import loglevel from 'loglevel'; import { Response } from 'node-fetch'; import { InMemoryLRUCache } from 'apollo-server-caching'; import { fetchIfNoneMatch } from './fetchIfNoneMatch'; -import { PromiseOrValue } from 'graphql/jsutils/PromiseOrValue'; +import { ValueOrPromise } from "apollo-server-plugin-base"; const DEFAULT_POLL_SECONDS: number = 30; const SYNC_WARN_TIME_SECONDS: number = 60; @@ -27,7 +27,7 @@ export interface AgentOptions { willUpdateManifest?: ( newManifest?: OperationManifest, oldManifest?: OperationManifest, - ) => PromiseOrValue; + ) => ValueOrPromise; } export interface Operation { From 0c9d0978805b129ada6777a4a8059f9035630412 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Fri, 22 Nov 2019 19:02:08 +0200 Subject: [PATCH 193/642] Add 2nd argument to `on(Forbidden|Unregistered)Operation` with op details. This ensures that the `signature` that was calculated and the `normalizedDocument` that the `signature` is based on is available in the new observability hooks, so they can be compared against the same value in the published operation manifest. --- .../ApolloServerPluginOperationRegistry.ts | 25 ++++++++++++++++--- ...polloServerPluginOperationRegistry.test.ts | 14 +++++++++++ 2 files changed, 35 insertions(+), 4 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts index 249d6e63635..27b5fd574a3 100644 --- a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts +++ b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts @@ -29,6 +29,11 @@ type ForbidUnregisteredOperationsPredicate = ( requestContext: GraphQLRequestContext, ) => boolean; +interface OperationRegistryRequestContext { + signature: string; + normalizedDocument: string; +} + interface Options { debug?: boolean; forbidUnregisteredOperations?: @@ -36,8 +41,14 @@ interface Options { | ForbidUnregisteredOperationsPredicate; dryRun?: boolean; schemaTag?: string; - onUnregisteredOperation?: (requestContext: GraphQLRequestContext) => void; - onForbiddenOperation?: (requestContext: GraphQLRequestContext) => void; + onUnregisteredOperation?: ( + requestContext: GraphQLRequestContext, + operationRegistryRequestContext: OperationRegistryRequestContext, + ) => void; + onForbiddenOperation?: ( + requestContext: GraphQLRequestContext, + operationRegistryRequestContext: OperationRegistryRequestContext, + ) => void; willUpdateManifest?: ( newManifest?: OperationManifest, oldManifest?: OperationManifest, @@ -176,7 +187,10 @@ for observability purposes, but all operations will be permitted.`, if (typeof options.onUnregisteredOperation === 'function') { const onUnregisteredOperation = options.onUnregisteredOperation; Promise.resolve().then(() => { - onUnregisteredOperation(requestContext); + onUnregisteredOperation(requestContext, { + signature, + normalizedDocument, + }); }); } } @@ -245,7 +259,10 @@ for observability purposes, but all operations will be permitted.`, if (typeof options.onForbiddenOperation === 'function') { const onForbiddenOperation = options.onForbiddenOperation; Promise.resolve().then(() => { - onForbiddenOperation(requestContext); + onForbiddenOperation(requestContext, { + signature, + normalizedDocument, + }); }); } } diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/ApolloServerPluginOperationRegistry.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/ApolloServerPluginOperationRegistry.test.ts index 00ea3d26682..1a9bd67cf3d 100644 --- a/packages/apollo-server-plugin-operation-registry/src/__tests__/ApolloServerPluginOperationRegistry.test.ts +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/ApolloServerPluginOperationRegistry.test.ts @@ -75,11 +75,18 @@ describe('Operation registry plugin', () => { expect(result.data && result.data.hello).toBeDefined(); expect(onUnregisteredOperation).toHaveBeenCalledTimes(1); expect(onUnregisteredOperation).toHaveBeenCalledWith( + // First argument: request pipeline context. expect.objectContaining({ request: expect.objectContaining({ operationName: 'HelloFam', }), }), + + // Second argument: operation registry context. + expect.objectContaining({ + signature: expect.stringMatching(/^[a-f0-9]+$/), + normalizedDocument: expect.stringMatching(/^query HelloFam/) + }), ); await server.stop(); }); @@ -161,11 +168,18 @@ describe('Operation registry plugin', () => { ); expect(onForbiddenOperation).toHaveBeenCalledTimes(1); expect(onForbiddenOperation).toHaveBeenCalledWith( + // First argument: request pipeline context. expect.objectContaining({ request: expect.objectContaining({ operationName: 'HelloFam', }), }), + + // Second argument: operation registry context. + expect.objectContaining({ + signature: expect.stringMatching(/^[a-f0-9]+$/), + normalizedDocument: expect.stringMatching(/^query HelloFam/) + }), ); expect(forbidUnregisteredOperations).toHaveBeenCalledTimes(1); await server.stop(); From a1f132d1435fdc2b4f2f70f9bf57bde921510ab3 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Fri, 22 Nov 2019 19:04:40 +0200 Subject: [PATCH 194/642] Rename `document` to specify its source and avoid overlap/overloading. --- .../src/ApolloServerPluginOperationRegistry.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts index 27b5fd574a3..9bb2692e694 100644 --- a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts +++ b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts @@ -133,7 +133,7 @@ for observability purposes, but all operations will be permitted.`, requestDidStart(): GraphQLRequestListener { return { async didResolveOperation(requestContext) { - const document = requestContext.document; + const documentFromRequestContext = requestContext.document; // This shouldn't happen under normal operation since `store` will be // set in `serverWillStart` and `requestDidStart` (this) comes after. if (!store) { @@ -141,7 +141,7 @@ for observability purposes, but all operations will be permitted.`, } const normalizedDocument = defaultOperationRegistryNormalization( - document, + documentFromRequestContext, // XXX The `operationName` is set from the AST, not from the // request `operationName`. If `operationName` is `null`, From 9375fcea6c1199a19f7bf7d448e20f5ffef488d4 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Sat, 23 Nov 2019 14:38:03 +0200 Subject: [PATCH 195/642] Rename `hash to `signature` in the type arg for `signatureForLogging`. Follows-up previous work. --- .../apollo-server-plugin-operation-registry/src/common.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/common.ts b/packages/apollo-server-plugin-operation-registry/src/common.ts index a9dda2383ef..371834ad399 100644 --- a/packages/apollo-server-plugin-operation-registry/src/common.ts +++ b/packages/apollo-server-plugin-operation-registry/src/common.ts @@ -58,9 +58,9 @@ export function getLegacyOperationManifestUrl( ); } -export function signatureForLogging(hash: string): string { - if (typeof hash !== 'string') { +export function signatureForLogging(signature: string): string { + if (typeof signature !== 'string') { return ''; } - return hash.substring(0, 8); + return signature.substring(0, 8); } From fba8a7ea79c441a58f4613356d444337a03b195d Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Sat, 23 Nov 2019 15:15:01 +0200 Subject: [PATCH 196/642] Change addl. use of `graphql-js` `PromiseOrValue` to our own `ValueOrPromise`. Same spirit as referenced commit. Ref: 1fe29a58f59e31b16b3be8e5fd80dcf8d2c06e43 --- .../src/ApolloServerPluginOperationRegistry.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts index 9bb2692e694..416ecdcd49f 100644 --- a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts +++ b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts @@ -23,7 +23,7 @@ import { GraphQLSchema } from 'graphql/type'; import { InMemoryLRUCache } from 'apollo-server-caching'; import loglevel from 'loglevel'; import loglevelDebug from 'loglevel-debug'; -import { PromiseOrValue } from 'graphql/jsutils/PromiseOrValue'; +import { ValueOrPromise } from 'apollo-server-plugin-base'; type ForbidUnregisteredOperationsPredicate = ( requestContext: GraphQLRequestContext, @@ -52,7 +52,7 @@ interface Options { willUpdateManifest?: ( newManifest?: OperationManifest, oldManifest?: OperationManifest, - ) => PromiseOrValue; + ) => ValueOrPromise; } export default function plugin(options: Options = Object.create(null)) { From a32b6eb1d1337df62292f6411a04a2516d28c0e7 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Sat, 23 Nov 2019 15:17:37 +0200 Subject: [PATCH 197/642] Update incorrect method name in comment. This was still using the old name of `onManifestUpdate`! Ref: https://github.com/apollographql/apollo-platform-commercial/pull/246/files#r346821528 --- packages/apollo-server-plugin-operation-registry/src/agent.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/agent.ts b/packages/apollo-server-plugin-operation-registry/src/agent.ts index f607bae9ecf..0c444276a49 100644 --- a/packages/apollo-server-plugin-operation-registry/src/agent.ts +++ b/packages/apollo-server-plugin-operation-registry/src/agent.ts @@ -107,7 +107,7 @@ export default class Agent { try { await pulse(); } catch (err) { - // Update the manifest to trigger `onManifestUpdate(newManifest: undefined, oldManifest: undefined)` + // Update the manifest to trigger `willUpdateManifest(newManifest: undefined, oldManifest: undefined)` this.updateManifest(); console.error( `The operation manifest could not be fetched. Retries will continue.${ From c2f74a246e6509a3f27b1540522956c348654e52 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Sat, 23 Nov 2019 15:20:15 +0200 Subject: [PATCH 198/642] Await the `this.updateManifest` method to ensure it completes. --- packages/apollo-server-plugin-operation-registry/src/agent.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/agent.ts b/packages/apollo-server-plugin-operation-registry/src/agent.ts index 0c444276a49..e4e91851b05 100644 --- a/packages/apollo-server-plugin-operation-registry/src/agent.ts +++ b/packages/apollo-server-plugin-operation-registry/src/agent.ts @@ -108,7 +108,7 @@ export default class Agent { await pulse(); } catch (err) { // Update the manifest to trigger `willUpdateManifest(newManifest: undefined, oldManifest: undefined)` - this.updateManifest(); + await this.updateManifest(); console.error( `The operation manifest could not be fetched. Retries will continue.${ this.lastManifest From d9dac89730d1cc65656f18e965c3a6094abbfa69 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Sat, 23 Nov 2019 15:35:55 +0200 Subject: [PATCH 199/642] Remove unused `import` `ForbiddenError`. --- .../src/__tests__/ApolloServerPluginOperationRegistry.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/ApolloServerPluginOperationRegistry.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/ApolloServerPluginOperationRegistry.test.ts index 1a9bd67cf3d..3868091b504 100644 --- a/packages/apollo-server-plugin-operation-registry/src/__tests__/ApolloServerPluginOperationRegistry.test.ts +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/ApolloServerPluginOperationRegistry.test.ts @@ -1,5 +1,5 @@ import plugin from '../ApolloServerPluginOperationRegistry'; -import { ApolloServerBase, ForbiddenError } from 'apollo-server-core'; +import { ApolloServerBase } from 'apollo-server-core'; import { defaultOperationRegistrySignature, operationHash, From 490bcf893ddaeeda80f4d350af139bf761917b89 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Sat, 23 Nov 2019 15:41:02 +0200 Subject: [PATCH 200/642] Alias names for internal use which matches external terminology. Same as df28d8578767cf6bdcf885eba9a02a03154c4f95, except for within the tests. Essentially, let's use common terminology with the publicly facing manifest, just to have common terminology. We should rename the exports from the `apollo-graphql` package eventually. --- .../ApolloServerPluginOperationRegistry.test.ts | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/ApolloServerPluginOperationRegistry.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/ApolloServerPluginOperationRegistry.test.ts index 3868091b504..97c60e4cc40 100644 --- a/packages/apollo-server-plugin-operation-registry/src/__tests__/ApolloServerPluginOperationRegistry.test.ts +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/ApolloServerPluginOperationRegistry.test.ts @@ -1,8 +1,15 @@ import plugin from '../ApolloServerPluginOperationRegistry'; import { ApolloServerBase } from 'apollo-server-core'; import { - defaultOperationRegistrySignature, - operationHash, + /** + * We alias these to different names entirely since the user-facing values + * which are present in their manifest (signature and document) are probably + * the most important concepts to rally around right now, in terms of + * approachability to the implementor. A future version of the + * `apollo-graphql` package should rename them to make this more clear. + */ + defaultOperationRegistrySignature as defaultOperationRegistryNormalization, + operationHash as operationSignature, } from 'apollo-graphql'; import gql from 'graphql-tag'; import { print } from 'graphql'; @@ -19,11 +26,11 @@ const query = gql` } `; -const normalizedQueryDocument = defaultOperationRegistrySignature( +const normalizedQueryDocument = defaultOperationRegistryNormalization( query, 'HelloFam', ); -const queryHash = operationHash(normalizedQueryDocument); +const queryHash = operationSignature(normalizedQueryDocument); // In order to expose will start and class ApolloServerMock extends ApolloServerBase { From af8b799897e9135ccd0a7f01acb60279360f101f Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 25 Nov 2019 20:30:45 +0200 Subject: [PATCH 201/642] Unreference the polling timer; Same as landed in #223. While we don't have a currently exposed ability to shut-down the server automatically using `.stop` when it receives `process.on('exit')` or similar, we can `unref` the timer to ensure that it doesn't keep the event loop active. This is more of a pronounced problem in tests, but we can address it eventually with proper shutdown hooks provided by Apollo Server itself. --- .../apollo-server-plugin-operation-registry/src/agent.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/apollo-server-plugin-operation-registry/src/agent.ts b/packages/apollo-server-plugin-operation-registry/src/agent.ts index e4e91851b05..0b12e0d5751 100644 --- a/packages/apollo-server-plugin-operation-registry/src/agent.ts +++ b/packages/apollo-server-plugin-operation-registry/src/agent.ts @@ -129,6 +129,11 @@ export default class Agent { // These errors will be logged, but not crash the server. pulse().catch(err => console.error(err.message || err)); }, this.pollSeconds() * 1000); + + // Prevent the Node.js event loop from remaining active (and preventing, + // e.g. process shutdown) by calling `unref` on the `Timeout`. For more + // information, see https://nodejs.org/api/timers.html#timers_timeout_unref. + this.timer.unref(); } public stop() { From b24920a4e330e52fd94f3a1da33056a85395a34a Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 25 Nov 2019 20:30:50 +0200 Subject: [PATCH 202/642] Partially merge conditional branches of overlapping concern. NB: Suggesting side-by-side review. As I pointed out in https://github.com/apollographql/apollo-platform-commercial/pull/246#discussion_r346820147. The existing logic here was branching, re-converging and then branching again for the same `shouldForbidOperation` symbol's truthiness. This creates a fork in logic which seems to be for semantic reasoning, but is not. It also made a merge conflict resolution for this branch particularly unfriendly. Anyhow, it's unnecessary to have this separation and this code should read more linearly without it. --- .../ApolloServerPluginOperationRegistry.ts | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts index 416ecdcd49f..819e28a5fc7 100644 --- a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts +++ b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts @@ -249,25 +249,25 @@ for observability purposes, but all operations will be permitted.`, // If the user explicitly set forbidUnregisteredOperations to either `true` or a function, and the operation // should be forbidden, we report it within metrics as forbidden, even though we may be running in dryRun mode. - if (shouldForbidOperation && options.forbidUnregisteredOperations) { - logger.debug( - `${logSignature} Reporting operation as forbidden to Apollo trace warehouse.`, - ); - requestContext.metrics.forbiddenOperation = true; - - // If defined, this method should not block, whether async or not. - if (typeof options.onForbiddenOperation === 'function') { - const onForbiddenOperation = options.onForbiddenOperation; - Promise.resolve().then(() => { - onForbiddenOperation(requestContext, { - signature, - normalizedDocument, + if (shouldForbidOperation) { + if (options.forbidUnregisteredOperations) { + logger.debug( + `${logSignature} Reporting operation as forbidden to Apollo trace warehouse.`, + ); + requestContext.metrics.forbiddenOperation = true; + + // If defined, this method should not block, whether async or not. + if (typeof options.onForbiddenOperation === 'function') { + const onForbiddenOperation = options.onForbiddenOperation; + Promise.resolve().then(() => { + onForbiddenOperation(requestContext, { + signature, + normalizedDocument, + }); }); - }); + } } - } - if (shouldForbidOperation) { if (!options.dryRun) { logger.debug( `${logSignature}: Execution denied because 'forbidUnregisteredOperations' was enabled for this request and the operation was not found in the local operation registry.`, From 80f08fc3a043d8b549c9a6b4582abcb735d59f41 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 25 Nov 2019 20:30:53 +0200 Subject: [PATCH 203/642] Return early if `shouldForbidOperation` is set. This avoids a very tall, indented block of `if (shouldForbidOperation)` which previously represented the remaining logic in this function with a block which returns early if the opposite is true (i.e. `if (!shouldForbidOperation) return;`). This makes the code easier to reason about, to me. --- .../ApolloServerPluginOperationRegistry.ts | 84 +++++++++++-------- 1 file changed, 47 insertions(+), 37 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts index 819e28a5fc7..bc8dcd0b7aa 100644 --- a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts +++ b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts @@ -247,47 +247,57 @@ for observability purposes, but all operations will be permitted.`, } } - // If the user explicitly set forbidUnregisteredOperations to either `true` or a function, and the operation - // should be forbidden, we report it within metrics as forbidden, even though we may be running in dryRun mode. - if (shouldForbidOperation) { - if (options.forbidUnregisteredOperations) { - logger.debug( - `${logSignature} Reporting operation as forbidden to Apollo trace warehouse.`, - ); - requestContext.metrics.forbiddenOperation = true; - - // If defined, this method should not block, whether async or not. - if (typeof options.onForbiddenOperation === 'function') { - const onForbiddenOperation = options.onForbiddenOperation; - Promise.resolve().then(() => { - onForbiddenOperation(requestContext, { - signature, - normalizedDocument, - }); - }); - } - } + // Whether we're in dryRun mode or not, the decision as to whether + // or not we'll be forbidding execution has already been decided. + // Therefore, we'll return early and avoid nesting this entire + // remaining 30+ line block in a `if (shouldForbidOperation)` fork. + if (!shouldForbidOperation) { + return; + } - if (!options.dryRun) { - logger.debug( - `${logSignature}: Execution denied because 'forbidUnregisteredOperations' was enabled for this request and the operation was not found in the local operation registry.`, - ); - const error = new ForbiddenError( - 'Execution forbidden: Operation not found in operation registry', - ); - Object.assign(error.extensions, { - operationSignature: signature, - exception: { - message: `Please register your operation with \`npx apollo client:push --tag="${schemaTag}"\`. See https://www.apollographql.com/docs/platform/operation-registry/ for more details.`, - }, + // If the user explicitly set `forbidUnregisteredOperations` to either + // `true` or a (predicate) function which returns `true` we'll + // report it within metrics as forbidden, even though we may be + // running in `dryRun` mode. This allows the user to incrementally + // go through their code-base and ensure that they've reached + // an "inbox zero" - so to speak - of operations needing registration. + if (options.forbidUnregisteredOperations) { + logger.debug( + `${logSignature} Reporting operation as forbidden to Apollo trace warehouse.`, + ); + requestContext.metrics.forbiddenOperation = true; + + // If defined, this method should not block, whether async or not. + if (typeof options.onForbiddenOperation === 'function') { + const onForbiddenOperation = options.onForbiddenOperation; + Promise.resolve().then(() => { + onForbiddenOperation(requestContext, { + signature, + normalizedDocument, + }); }); - throw error; - } else { - logger.debug( - `${dryRunPrefix} ${logSignature}: Operation ${requestContext.operationName} would have been forbidden.`, - ); } } + + if (!options.dryRun) { + logger.debug( + `${logSignature}: Execution denied because 'forbidUnregisteredOperations' was enabled for this request and the operation was not found in the local operation registry.`, + ); + const error = new ForbiddenError( + 'Execution forbidden: Operation not found in operation registry', + ); + Object.assign(error.extensions, { + operationSignature: signature, + exception: { + message: `Please register your operation with \`npx apollo client:push --tag="${schemaTag}"\`. See https://www.apollographql.com/docs/platform/operation-registry/ for more details.`, + }, + }); + throw error; + } else { + logger.debug( + `${dryRunPrefix} ${logSignature}: Operation ${requestContext.operationName} would have been forbidden.`, + ); + } }, }; }, From 4a1ac0ddb4010d0ea9c9b77224c6cf0336a58c7b Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 25 Nov 2019 20:30:57 +0200 Subject: [PATCH 204/642] Reduce height of tall conditionals by returning early. At this stage, we're in a mode of enforcement only. Dry-run is ruled out and there is no chance of a predicate decision changing. Therefore, some slight tweaks in the ordering of operations here should make the code easier to reason about since it avoids the need to remember how many forks of logic we're inside. To summarize this change which Git will make difficult to read: This change moves the `logger.debug` for `dryRun` mode above the actual enforcement (i.e. non-`dryRun`!) section and have it `return`, rather than having a tall `if (!options.dryRun)` with many lines of logic when there are no remaining forks of logic in the function after it that need to be considered. --- .../ApolloServerPluginOperationRegistry.ts | 31 ++++++++++--------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts index bc8dcd0b7aa..ccb032d73e6 100644 --- a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts +++ b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts @@ -279,25 +279,26 @@ for observability purposes, but all operations will be permitted.`, } } - if (!options.dryRun) { - logger.debug( - `${logSignature}: Execution denied because 'forbidUnregisteredOperations' was enabled for this request and the operation was not found in the local operation registry.`, - ); - const error = new ForbiddenError( - 'Execution forbidden: Operation not found in operation registry', - ); - Object.assign(error.extensions, { - operationSignature: signature, - exception: { - message: `Please register your operation with \`npx apollo client:push --tag="${schemaTag}"\`. See https://www.apollographql.com/docs/platform/operation-registry/ for more details.`, - }, - }); - throw error; - } else { + if (options.dryRun) { logger.debug( `${dryRunPrefix} ${logSignature}: Operation ${requestContext.operationName} would have been forbidden.`, ); + return; } + + logger.debug( + `${logSignature}: Execution denied because 'forbidUnregisteredOperations' was enabled for this request and the operation was not found in the local operation registry.`, + ); + const error = new ForbiddenError( + 'Execution forbidden: Operation not found in operation registry', + ); + Object.assign(error.extensions, { + operationSignature: signature, + exception: { + message: `Please register your operation with \`npx apollo client:push --tag="${schemaTag}"\`. See https://www.apollographql.com/docs/platform/operation-registry/ for more details.`, + }, + }); + throw error; }, }; }, From 1b1f7b1528d746445dbfdda766e4de8d5c57a1e0 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 25 Nov 2019 20:31:01 +0200 Subject: [PATCH 205/642] Use function name of mocked function for variable holding its mock. Rather than using `mock`, this makes it more clear what mocked function is being used. It also avoids the need to map it in the object that we're passing to the plugin's constructor options since the shorthand works. Also matches the pattern used elsewhere in the file. --- .../__tests__/ApolloServerPluginOperationRegistry.test.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/ApolloServerPluginOperationRegistry.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/ApolloServerPluginOperationRegistry.test.ts index 97c60e4cc40..be8fbfae535 100644 --- a/packages/apollo-server-plugin-operation-registry/src/__tests__/ApolloServerPluginOperationRegistry.test.ts +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/ApolloServerPluginOperationRegistry.test.ts @@ -230,7 +230,7 @@ describe('Operation registry plugin', () => { }); it('is not called when registered operation received', async () => { - const mock = jest.fn(); + const onForbiddenOperation = jest.fn(); const server = new ApolloServerMock({ typeDefs, mockEntireSchema: true, @@ -250,7 +250,7 @@ describe('Operation registry plugin', () => { ], }; }, - onForbiddenOperation: mock, + onForbiddenOperation, })(), ], }); @@ -262,7 +262,7 @@ describe('Operation registry plugin', () => { expect(result.data).toBeDefined(); expect(result.errors).not.toBeDefined(); expect(result.data && result.data.hello).toBeDefined(); - expect(mock).toHaveBeenCalledTimes(0); + expect(onForbiddenOperation).toHaveBeenCalledTimes(0); await server.stop(); }); }); From 26d4999040457b342e2dce01048a4da4b1b14c5c Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 25 Nov 2019 20:31:04 +0200 Subject: [PATCH 206/642] Export the `OperationRegistryRequestContext` type for consumers. Follows-up on fbb36b7a3b3a8004f5057e542e2a0e9bf596b35a. --- .../src/ApolloServerPluginOperationRegistry.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts index ccb032d73e6..695bb55136f 100644 --- a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts +++ b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts @@ -29,7 +29,7 @@ type ForbidUnregisteredOperationsPredicate = ( requestContext: GraphQLRequestContext, ) => boolean; -interface OperationRegistryRequestContext { +export interface OperationRegistryRequestContext { signature: string; normalizedDocument: string; } From 216fed8bcf6fed9ae40310ee41c5636897c85c3d Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 25 Nov 2019 20:31:08 +0200 Subject: [PATCH 207/642] Use the typings from `Options` to resolve `any`-typed callbacks in tests. The `onUnregisteredOptions` and `onForbiddenOperation` hooks weren't properly typed in the mocked tests, which was allowing them to have the incorrect type arguments. This wouldn't be a problem with in-lined definitions of these options - since that would be inferred from the parent object literal's definition, but for tests where we assign the function to a variable first, it is problematic. --- .../src/ApolloServerPluginOperationRegistry.ts | 2 +- .../__tests__/ApolloServerPluginOperationRegistry.test.ts | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts index 695bb55136f..0bb1ee27be8 100644 --- a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts +++ b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts @@ -34,7 +34,7 @@ export interface OperationRegistryRequestContext { normalizedDocument: string; } -interface Options { +export interface Options { debug?: boolean; forbidUnregisteredOperations?: | boolean diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/ApolloServerPluginOperationRegistry.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/ApolloServerPluginOperationRegistry.test.ts index be8fbfae535..8dbcd62a138 100644 --- a/packages/apollo-server-plugin-operation-registry/src/__tests__/ApolloServerPluginOperationRegistry.test.ts +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/ApolloServerPluginOperationRegistry.test.ts @@ -1,4 +1,4 @@ -import plugin from '../ApolloServerPluginOperationRegistry'; +import plugin, { Options } from '../ApolloServerPluginOperationRegistry'; import { ApolloServerBase } from 'apollo-server-core'; import { /** @@ -53,7 +53,7 @@ describe('Operation registry plugin', () => { describe('operation lifecycle hooks', () => { describe('onUnregisterOperation', () => { it('is called when unregistered operation received', async () => { - const onUnregisteredOperation = jest.fn(); + const onUnregisteredOperation: Options['onUnregisteredOperation'] = jest.fn(); const server = new ApolloServerMock({ typeDefs, mockEntireSchema: true, @@ -99,7 +99,7 @@ describe('Operation registry plugin', () => { }); it('is not called when registered operation received', async () => { - const onUnregisteredOperation = jest.fn(); + const onUnregisteredOperation: Options['onUnregisteredOperation'] = jest.fn(); const server = new ApolloServerMock({ typeDefs, mockEntireSchema: true, From 78d78364c68e4c4d8c3a363251b1951c5ffd25cc Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 25 Nov 2019 20:31:12 +0200 Subject: [PATCH 208/642] Well beyond the rule of threes: set the re-used `apiKey` to a constant. Even more so because I just had to change a typo in its pattern which used `server:` rather than the `service:` prefix. :smile: --- .../ApolloServerPluginOperationRegistry.test.ts | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/ApolloServerPluginOperationRegistry.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/ApolloServerPluginOperationRegistry.test.ts index 8dbcd62a138..5fb875a2156 100644 --- a/packages/apollo-server-plugin-operation-registry/src/__tests__/ApolloServerPluginOperationRegistry.test.ts +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/ApolloServerPluginOperationRegistry.test.ts @@ -51,6 +51,9 @@ describe('Operation registry plugin', () => { // These tests depend on the behavior of willUpdateManifest to update the // operation safelist describe('operation lifecycle hooks', () => { + const graphId = 'test-service'; + const apiKey = `service:${graphId}:not-an-api-key`; + describe('onUnregisterOperation', () => { it('is called when unregistered operation received', async () => { const onUnregisteredOperation: Options['onUnregisteredOperation'] = jest.fn(); @@ -58,7 +61,7 @@ describe('Operation registry plugin', () => { typeDefs, mockEntireSchema: true, engine: { - apiKey: 'server:not-a-service:not-an-apikey', + apiKey, }, plugins: [ plugin({ @@ -104,7 +107,7 @@ describe('Operation registry plugin', () => { typeDefs, mockEntireSchema: true, engine: { - apiKey: 'server:not-a-service:not-an-apikey', + apiKey, }, plugins: [ plugin({ @@ -147,7 +150,7 @@ describe('Operation registry plugin', () => { typeDefs, mockEntireSchema: true, engine: { - apiKey: 'server:not-a-service:not-an-apikey', + apiKey, }, plugins: [ plugin({ @@ -201,7 +204,7 @@ describe('Operation registry plugin', () => { typeDefs, mockEntireSchema: true, engine: { - apiKey: 'server:not-a-service:not-an-apikey', + apiKey, }, plugins: [ plugin({ @@ -235,7 +238,7 @@ describe('Operation registry plugin', () => { typeDefs, mockEntireSchema: true, engine: { - apiKey: 'server:not-a-service:not-an-apikey', + apiKey, }, plugins: [ plugin({ From 1abb6c6817ea38883e682747ca0978d441025e54 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 25 Nov 2019 20:31:16 +0200 Subject: [PATCH 209/642] To allow tests to shutdown quickly, use `sendReportsImmediately`. Since the operation registry is now using the `engine` options from the `ApolloServer` constructor in order to get its API key, we are effectively instantiating Engine Reporting and its agent. Since we're running in a test environment, those transmissions are fake, but without setting this option, they are still trying to be batch transmitted at a preset interval. In the Jest test environment, this just causes the tests to not finish as quickly as Jest expects them to, and it spews warnings about open file handles. This should make that slightly better, though it would be ideal if we never actually instantiated engine agent for reporting purposes (though we want it for `apiKeyHash` receiving purposes. --- .../__tests__/ApolloServerPluginOperationRegistry.test.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/ApolloServerPluginOperationRegistry.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/ApolloServerPluginOperationRegistry.test.ts index 5fb875a2156..de3596d8454 100644 --- a/packages/apollo-server-plugin-operation-registry/src/__tests__/ApolloServerPluginOperationRegistry.test.ts +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/ApolloServerPluginOperationRegistry.test.ts @@ -62,6 +62,7 @@ describe('Operation registry plugin', () => { mockEntireSchema: true, engine: { apiKey, + sendReportsImmediately: true, }, plugins: [ plugin({ @@ -108,6 +109,7 @@ describe('Operation registry plugin', () => { mockEntireSchema: true, engine: { apiKey, + sendReportsImmediately: true, }, plugins: [ plugin({ @@ -151,6 +153,7 @@ describe('Operation registry plugin', () => { mockEntireSchema: true, engine: { apiKey, + sendReportsImmediately: true, }, plugins: [ plugin({ @@ -205,6 +208,7 @@ describe('Operation registry plugin', () => { mockEntireSchema: true, engine: { apiKey, + sendReportsImmediately: true, }, plugins: [ plugin({ @@ -239,6 +243,7 @@ describe('Operation registry plugin', () => { mockEntireSchema: true, engine: { apiKey, + sendReportsImmediately: true, }, plugins: [ plugin({ From b0eb0b1fa4e025e3d03e43e8237bb10f3c13cfd2 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 25 Nov 2019 20:31:20 +0200 Subject: [PATCH 210/642] De-compose manifest mocking functions into a test helper for (soon!) re-use. In a follow-up commit, we'll introduce the manifest fetching to the `ApolloServerPluginOperationRegistry.test.ts` file so it can mock the states of manifests for testing. This allows that file to exercise tests related to observability functions like `onUnregisteredOperation` and `onForbiddenOperation` in way that doesn't rely on mixing concerns from `willUpdateManifest`. Avoiding `willUpdateManifest` is particularly important since we're not completely in agreement as to how that method should work as the current implementation would expose our internal manifest format to the implementing user in a less-than-ideal way. It's possible that some other internal test methods could be introduced that allow us to control the state of the internal manifest dynamically (but in a controlled fashion; e.g. `operationAllow('query Name { field }')`), but until we build that, it seems reasonable to test different manifest conditions in the same way across our different test files for this plugin (i.e. `agent.test.ts` and `ApolloServerPluginOperationRegistry.test.ts`). --- .../src/__tests__/agent.test.ts | 302 ++++++++++-------- .../src/__tests__/helpers.test-helpers.ts | 119 +++++++ .../src/common.ts | 2 + 3 files changed, 282 insertions(+), 141 deletions(-) create mode 100644 packages/apollo-server-plugin-operation-registry/src/__tests__/helpers.test-helpers.ts diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts index b6534655905..c0a56b90217 100644 --- a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts @@ -4,32 +4,26 @@ import { envOverrideOperationManifest, envOverrideStorageSecretBaseUrl, getStoreKey, + fakeTestBaseUrl, } from '../common'; import { resolve as urlResolve } from 'url'; -import { createHash } from 'crypto'; import { AgentOptions, OperationManifest } from '../agent'; - -const fakeBaseUrl = 'https://myfakehost/'; - -const defaultStore = () => new InMemoryLRUCache(); - -const genericSchemaHash = 'abc123'; -const genericStorageSecret = 'someStorageSecret'; -const genericServiceID = 'test-service'; -const genericApiKeyHash = 'someapikeyhash123'; -const pollSeconds = 60; -const genericLegacyOperationManifestUrl = pathForServiceAndSchema( +import { + defaultAgentOptions, + nockBase, + genericLegacyOperationManifestUrl, + genericStorageSecret, + genericApiKeyHash, genericServiceID, + defaultStore, + nockStorageSecretOperationManifest, + nockStorageSecret, + nockGoodManifestsUnderStorageSecret, + nockLegacyGoodManifest, genericSchemaHash, -); - -const defaultAgentOptions: AgentOptions = { - schemaHash: genericSchemaHash, - engine: { serviceID: genericServiceID, apiKeyHash: genericApiKeyHash }, - store: defaultStore(), - pollSeconds, - schemaTag: 'current', -}; + hashedServiceId, + defaultTestAgentPollSeconds, +} from './helpers.test-helpers'; interface ManifestRecord { signature: string; @@ -90,8 +84,6 @@ describe('Agent', () => { let Agent: typeof import('../agent').default; let getOperationManifestUrl: typeof import('../common').getOperationManifestUrl; let getLegacyOperationManifestUrl: typeof import('../common').getLegacyOperationManifestUrl; - let getStorageSecretUrl: typeof import('../common').getStorageSecretUrl; - let urlStorageSecretBase: string; let urlOperationManifestBase: string; let genericStorageSecretOperationManifestUrl: string; @@ -99,11 +91,11 @@ describe('Agent', () => { // Override the tests URL with the one we want to mock/nock/test. originalEnvApolloOpManifestBaseUrl = process.env[envOverrideOperationManifest]; - process.env[envOverrideOperationManifest] = fakeBaseUrl; + process.env[envOverrideOperationManifest] = fakeTestBaseUrl; originalEnvOverrideStorageSecretBaseUrl = process.env[envOverrideStorageSecretBaseUrl]; - process.env[envOverrideStorageSecretBaseUrl] = fakeBaseUrl; + process.env[envOverrideStorageSecretBaseUrl] = fakeTestBaseUrl; // Reset the modules so they're ready to be imported. jest.resetModules(); @@ -113,8 +105,6 @@ describe('Agent', () => { getOperationManifestUrl = require('../common').getOperationManifestUrl; getLegacyOperationManifestUrl = require('../common') .getLegacyOperationManifestUrl; - getStorageSecretUrl = require('../common').getStorageSecretUrl; - urlStorageSecretBase = require('../common').urlStorageSecretBase; urlOperationManifestBase = require('../common').urlOperationManifestBase; genericStorageSecretOperationManifestUrl = getOperationManifestUrl( @@ -123,51 +113,6 @@ describe('Agent', () => { ).replace(new RegExp(`^${urlOperationManifestBase}`), ''); }); - // Each nock is good for exactly one request! - function nockLegacyGoodManifest( - operations: ManifestRecord[] = [ - sampleManifestRecords.a, - sampleManifestRecords.b, - sampleManifestRecords.c, - ], - ) { - return nockBase() - .get(genericLegacyOperationManifestUrl) - .reply(200, { - version: 2, - operations, - }); - } - - function nockGoodManifestsUnderStorageSecret( - operations: ManifestRecord[] = [ - sampleManifestRecords.a, - sampleManifestRecords.b, - sampleManifestRecords.c, - ], - ) { - return nockBase() - .get(genericStorageSecretOperationManifestUrl) - .reply(200, { - version: 2, - operations, - }); - } - - function nockStorageSecret( - status = 200, - body: any = JSON.stringify(genericStorageSecret), - ) { - return nockBase() - .get( - getStorageSecretUrl(genericServiceID, genericApiKeyHash).replace( - new RegExp(`^${urlStorageSecretBase}`), - '', - ), - ) - .reply(status, body); - } - afterAll(() => { // Put the environment overrides back how they were. if (originalEnvApolloOpManifestBaseUrl) { @@ -231,7 +176,7 @@ describe('Agent', () => { it('correctly prepared the test environment', () => { expect(getLegacyOperationManifestUrl('abc123', 'def456')).toStrictEqual( - urlResolve(fakeBaseUrl, '/abc123/def456.v2.json'), + urlResolve(fakeTestBaseUrl, '/abc123/def456.v2.json'), ); }); @@ -259,11 +204,17 @@ describe('Agent', () => { } it('logs debug updates to the manifest on startup', async () => { - nockStorageSecret(); - nockBase() - .get(genericStorageSecretOperationManifestUrl) - .reply(404); - nockLegacyGoodManifest(); + nockStorageSecret(genericServiceID, genericApiKeyHash); + nockStorageSecretOperationManifest( + genericServiceID, + genericStorageSecret, + 404, + ); + nockLegacyGoodManifest([ + sampleManifestRecords.a, + sampleManifestRecords.b, + sampleManifestRecords.c, + ]); const relevantLogs: any = []; const logger = { debug: jest.fn().mockImplementation((...args: any[]) => { @@ -289,14 +240,14 @@ describe('Agent', () => { expect(relevantLogs[0][0]).toBe( `Checking for manifest changes at ${urlResolve( - fakeBaseUrl, + fakeTestBaseUrl, getOperationManifestUrl(genericServiceID, genericStorageSecret), )}`, ); expect(relevantLogs[1][0]).toBe( `Checking for manifest changes at ${urlResolve( - fakeBaseUrl, + fakeTestBaseUrl, getLegacyOperationManifestUrl( hashedServiceId(genericServiceID), genericSchemaHash, @@ -321,8 +272,16 @@ describe('Agent', () => { }); it('populates the manifest store after starting', async () => { - nockStorageSecret(); - nockGoodManifestsUnderStorageSecret(); + nockStorageSecret(genericServiceID, genericApiKeyHash); + nockGoodManifestsUnderStorageSecret( + genericServiceID, + genericStorageSecret, + [ + sampleManifestRecords.a, + sampleManifestRecords.b, + sampleManifestRecords.c, + ], + ); const store = defaultStore(); const storeSetSpy = jest.spyOn(store, 'set'); await createAgent({ store }).start(); @@ -336,8 +295,16 @@ describe('Agent', () => { }); it('starts polling successfully', async () => { - nockStorageSecret(); - nockGoodManifestsUnderStorageSecret(); + nockStorageSecret(genericServiceID, genericApiKeyHash); + nockGoodManifestsUnderStorageSecret( + genericServiceID, + genericStorageSecret, + [ + sampleManifestRecords.a, + sampleManifestRecords.b, + sampleManifestRecords.c, + ], + ); const store = defaultStore(); const storeSetSpy = jest.spyOn(store, 'set'); const storeDeleteSpy = jest.spyOn(store, 'delete'); @@ -354,16 +321,18 @@ describe('Agent', () => { // If it's one millisecond short of our next poll interval, nothing // should have changed yet. - jest.advanceTimersByTime(pollSeconds * 1000 - 1); + jest.advanceTimersByTime(defaultTestAgentPollSeconds * 1000 - 1); // Still only one check. expect(agent._timesChecked).toBe(1); // Now, we'll expect another request to go out, so we'll nock it. - nockStorageSecret(); - nockBase() - .get(genericStorageSecretOperationManifestUrl) - .reply(304); + nockStorageSecret(genericServiceID, genericApiKeyHash); + nockStorageSecretOperationManifest( + genericServiceID, + genericStorageSecret, + 304, + ); // If we move forward the last remaining millisecond, we should trigger // and end up with a successful sync. @@ -383,10 +352,12 @@ describe('Agent', () => { }); it('continues polling even after initial failure', async () => { - nockStorageSecret(); - nockBase() - .get(genericStorageSecretOperationManifestUrl) - .reply(500); + nockStorageSecret(genericServiceID, genericApiKeyHash); + nockStorageSecretOperationManifest( + genericServiceID, + genericStorageSecret, + 500, + ); const store = defaultStore(); const storeSetSpy = jest.spyOn(store, 'set'); const storeDeleteSpy = jest.spyOn(store, 'delete'); @@ -402,15 +373,23 @@ describe('Agent', () => { // If it's one millisecond short of our next poll interval, nothing // should have changed yet. - jest.advanceTimersByTime(pollSeconds * 1000 - 1); + jest.advanceTimersByTime(defaultTestAgentPollSeconds * 1000 - 1); // Still only one check. expect(agent._timesChecked).toBe(1); expect(storeSetSpy).toBeCalledTimes(0); // Now, we'll expect another GOOD request to fulfill, so we'll nock it. - nockStorageSecret(); - nockGoodManifestsUnderStorageSecret(); + nockStorageSecret(genericServiceID, genericApiKeyHash); + nockGoodManifestsUnderStorageSecret( + genericServiceID, + genericStorageSecret, + [ + sampleManifestRecords.a, + sampleManifestRecords.b, + sampleManifestRecords.c, + ], + ); // If we move forward the last remaining millisecond, we should trigger // and end up with a successful sync. @@ -435,19 +414,28 @@ describe('Agent', () => { const agent = createAgent({ store }); expect(storeSetSpy).toBeCalledTimes(0); - nockStorageSecret(); - nockGoodManifestsUnderStorageSecret(); // Starting with ABC. + nockStorageSecret(genericServiceID, genericApiKeyHash); + nockGoodManifestsUnderStorageSecret( + genericServiceID, + genericStorageSecret, + [ + sampleManifestRecords.a, + sampleManifestRecords.b, + sampleManifestRecords.c, + ], + ); // Starting with ABC. await agent.checkForUpdate(); expect(agent._timesChecked).toBe(1); expect(storeSetSpy).toBeCalledTimes(3); expect(storeDeleteSpy).toBeCalledTimes(0); await expectStoreHasOperationEach(store, ['a', 'b', 'c']); - nockStorageSecret(); - nockGoodManifestsUnderStorageSecret([ - sampleManifestRecords.a, - sampleManifestRecords.b, - ]); // Just AB in this manifest. + nockStorageSecret(genericServiceID, genericApiKeyHash) + nockGoodManifestsUnderStorageSecret( + genericServiceID, + genericStorageSecret, + [sampleManifestRecords.a, sampleManifestRecords.b], + ); // Just AB in this manifest. await agent.checkForUpdate(); expect(agent._timesChecked).toBe(2); expect(storeSetSpy).toBeCalledTimes(3); // no new sets. @@ -457,8 +445,12 @@ describe('Agent', () => { store.get(getStoreKey(sampleManifestRecords.c.signature)), ).resolves.toBeUndefined(); - nockStorageSecret(); - nockGoodManifestsUnderStorageSecret([sampleManifestRecords.a]); // Just A in this manifest. + nockStorageSecret(genericServiceID, genericApiKeyHash) + nockGoodManifestsUnderStorageSecret( + genericServiceID, + genericStorageSecret, + [sampleManifestRecords.a] + ); // Just A in this manifest. await agent.checkForUpdate(); expect(agent._timesChecked).toBe(3); expect(storeSetSpy).toBeCalledTimes(3); // no new sets. @@ -471,8 +463,12 @@ describe('Agent', () => { describe('when fetching the storage secret fails', () => { it('will fetch the manifest using the legacy url', async () => { - nockStorageSecret(404); - nockLegacyGoodManifest(); + nockStorageSecret(genericServiceID, genericApiKeyHash, 404); + nockLegacyGoodManifest([ + sampleManifestRecords.a, + sampleManifestRecords.b, + sampleManifestRecords.c, + ]); const store = defaultStore(); const storeSetSpy = jest.spyOn(store, 'set'); @@ -491,11 +487,13 @@ describe('Agent', () => { describe('when fetching the manifest using the storage secret fails', () => { it('will fallback to fetching the manifest using the legacy url', async () => { - nockStorageSecret(); - nockBase() - .get(genericStorageSecretOperationManifestUrl) - .reply(404); - nockLegacyGoodManifest(); + nockStorageSecret(genericServiceID, genericApiKeyHash); + nockStorageSecretOperationManifest(genericServiceID, genericStorageSecret, 404) + nockLegacyGoodManifest([ + sampleManifestRecords.a, + sampleManifestRecords.b, + sampleManifestRecords.c, + ]); const store = defaultStore(); const storeSetSpy = jest.spyOn(store, 'set'); @@ -523,7 +521,7 @@ describe('Agent', () => { ); it('fetches manifests for the corresponding schema tag', async () => { - nockStorageSecret(); + nockStorageSecret(genericServiceID, genericApiKeyHash); const agent = createAgent({ schemaTag }); const nockedManifest = nockBase() .get( @@ -560,7 +558,7 @@ describe('Agent', () => { describe('willUpdateManifest', () => { it("receives undefined arguments when can't fetch first time", async () => { - nockStorageSecret(404); + nockStorageSecret(genericServiceID, genericApiKeyHash, 404); nockBase() .get(genericLegacyOperationManifestUrl) .reply(500); @@ -582,8 +580,16 @@ describe('Agent', () => { expect(storeDeleteSpy).toBeCalledTimes(0); }); it('receives manifest retrieved from gcs', async () => { - nockStorageSecret(); - nockGoodManifestsUnderStorageSecret(); + nockStorageSecret(genericServiceID, genericApiKeyHash); + nockGoodManifestsUnderStorageSecret( + genericServiceID, + genericStorageSecret, + [ + sampleManifestRecords.a, + sampleManifestRecords.b, + sampleManifestRecords.c, + ] + ); const mock = generateWillUpdateManifest(); const store = defaultStore(); const storeSetSpy = jest.spyOn(store, 'set'); @@ -612,8 +618,16 @@ describe('Agent', () => { expect(storeDeleteSpy).toBeCalledTimes(0); }); it('uses returned manifest to enforce safelist', async () => { - nockStorageSecret(); - nockGoodManifestsUnderStorageSecret(); + nockStorageSecret(genericServiceID, genericApiKeyHash); + nockGoodManifestsUnderStorageSecret( + genericServiceID, + genericStorageSecret, + [ + sampleManifestRecords.a, + sampleManifestRecords.b, + sampleManifestRecords.c, + ] + ); const mock = generateWillUpdateManifest([sampleManifestRecords.a]); const store = defaultStore(); const storeSetSpy = jest.spyOn(store, 'set'); @@ -646,8 +660,16 @@ describe('Agent', () => { expect(storeDeleteSpy).toBeCalledTimes(0); }); it('is not called again when manifest remains same', async () => { - nockStorageSecret(); - nockGoodManifestsUnderStorageSecret(); + nockStorageSecret(genericServiceID, genericApiKeyHash); + nockGoodManifestsUnderStorageSecret( + genericServiceID, + genericStorageSecret, + [ + sampleManifestRecords.a, + sampleManifestRecords.b, + sampleManifestRecords.c, + ] + ); const mock = generateWillUpdateManifest(); const store = defaultStore(); @@ -678,13 +700,13 @@ describe('Agent', () => { // If it's one millisecond short of our next poll interval, nothing // should have changed yet. - jest.advanceTimersByTime(pollSeconds * 1000 - 1); + jest.advanceTimersByTime(defaultTestAgentPollSeconds * 1000 - 1); // Still only one check. expect(agent._timesChecked).toBe(1); // Now, we'll expect another request to go out, so we'll nock it. - nockStorageSecret(); + nockStorageSecret(genericServiceID, genericApiKeyHash); nockBase() .get(genericStorageSecretOperationManifestUrl) .reply(304); @@ -719,8 +741,16 @@ describe('Agent', () => { }); it('receives previous manifest when updated', async () => { - nockStorageSecret(); - nockGoodManifestsUnderStorageSecret(); + nockStorageSecret(genericServiceID, genericApiKeyHash); + nockGoodManifestsUnderStorageSecret( + genericServiceID, + genericStorageSecret, + [ + sampleManifestRecords.a, + sampleManifestRecords.b, + sampleManifestRecords.c, + ] + ); const mock = generateWillUpdateManifest(); const store = defaultStore(); @@ -751,14 +781,18 @@ describe('Agent', () => { // If it's one millisecond short of our next poll interval, nothing // should have changed yet. - jest.advanceTimersByTime(pollSeconds * 1000 - 1); + jest.advanceTimersByTime(defaultTestAgentPollSeconds * 1000 - 1); // Still only one check. expect(agent._timesChecked).toBe(1); // Now, we'll expect another request to go out, so we'll nock it. - nockStorageSecret(); - nockGoodManifestsUnderStorageSecret([sampleManifestRecords.a]); + nockStorageSecret(genericServiceID, genericApiKeyHash); + nockGoodManifestsUnderStorageSecret( + genericServiceID, + genericStorageSecret, + [sampleManifestRecords.a], + ); // If we move forward the last remaining millisecond, we should trigger // and end up with a successful sync. @@ -788,17 +822,3 @@ describe('Agent', () => { }); }); }); - -function nockBase() { - return nock(fakeBaseUrl); -} - -function hashedServiceId(serviceID: string) { - return createHash('sha512') - .update(serviceID) - .digest('hex'); -} - -function pathForServiceAndSchema(serviceID: string, schemaHash: string) { - return `/${hashedServiceId(serviceID)}/${schemaHash}.v2.json`; -} diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/helpers.test-helpers.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/helpers.test-helpers.ts new file mode 100644 index 00000000000..e75d1a8a70e --- /dev/null +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/helpers.test-helpers.ts @@ -0,0 +1,119 @@ +import { createHash } from 'crypto'; +import { AgentOptions } from "../agent"; +import { + getStorageSecretUrl, + urlStorageSecretBase, + getOperationManifestUrl, + urlOperationManifestBase, + fakeTestBaseUrl, +} from '../common'; +import nock from 'nock'; +import { InMemoryLRUCache } from "apollo-server-caching"; +import { Operation, OperationManifest } from "../ApolloServerPluginOperationRegistry"; + +export const defaultStore = () => new InMemoryLRUCache(); + +export const genericSchemaHash = 'abc123'; +export const genericStorageSecret = 'someStorageSecret'; +export const genericServiceID = 'test-service'; +export const genericApiKeyHash = 'someapikeyhash123'; +export const defaultTestAgentPollSeconds = 60; +export const genericLegacyOperationManifestUrl = pathForServiceAndSchema( + genericServiceID, + genericSchemaHash, +); + +export const defaultAgentOptions: AgentOptions = { + schemaHash: genericSchemaHash, + engine: { serviceID: genericServiceID, apiKeyHash: genericApiKeyHash }, + store: defaultStore(), + pollSeconds: defaultTestAgentPollSeconds, + schemaTag: 'current', +}; + +// Each nock is good for exactly one request! +export function nockLegacyGoodManifest(operations: Operation[]): nock.Scope { + return nockBase() + .get(genericLegacyOperationManifestUrl) + .reply(200, { + version: 2, + operations, + }); +} + +export function nockGoodManifestsUnderStorageSecret( + graphId: string, + storageSecret: string, + operations: Operation[], +): nock.Scope { + return nockStorageSecretOperationManifest(graphId, storageSecret, 200, { + version: 2, + operations, + }); +} + +export function getStorageSecretPath( + graphId: string, + apiKeyHash: string, +) { + return getStorageSecretUrl(graphId, apiKeyHash).replace( + new RegExp(`^${urlStorageSecretBase}`), + '', + ); +} + +export function nockStorageSecret( + graphId: string, + apiKeyHash: string, + status = 200, + body: string = JSON.stringify(genericStorageSecret), +) { + // Strip off the host for testing purposes with `nock`. + return nockBase() + .get(getStorageSecretPath(graphId, apiKeyHash)) + .reply(status, body); +} + +export function getOperationManifestPath( + graphId: string, + storageSecret: string, +): string { + // Strip off the host for testing purposes with `nock`. + return getOperationManifestUrl( + graphId, + storageSecret, + ).replace(new RegExp(`^${urlOperationManifestBase}`), ''); +} + +export function nockStorageSecretOperationManifest( + graphId: string, + storageSecret: string, + status = 200, + body?: OperationManifest, +) { + return nockBase() + .get(getOperationManifestPath(graphId, storageSecret)) + .reply(status, body); +} + + +export function nockBase() { + return nock(fakeTestBaseUrl); +} + +export function hashApiKey(apiKey: string): string { + return createHash('sha512') + .update(apiKey) + .digest('hex'); +} + +export function hashedServiceId(serviceID: string): string { + return createHash('sha512') + .update(serviceID) + .digest('hex'); +} + +function pathForServiceAndSchema(serviceID: string, schemaHash: string): string { + return `/${hashedServiceId(serviceID)}/${schemaHash}.v2.json`; +} + diff --git a/packages/apollo-server-plugin-operation-registry/src/common.ts b/packages/apollo-server-plugin-operation-registry/src/common.ts index 371834ad399..436c2b1001b 100644 --- a/packages/apollo-server-plugin-operation-registry/src/common.ts +++ b/packages/apollo-server-plugin-operation-registry/src/common.ts @@ -6,6 +6,8 @@ export const envOverrideOperationManifest = export const envOverrideStorageSecretBaseUrl = 'APOLLO_STORAGE_SECRET_BASE_URL'; +export const fakeTestBaseUrl = 'https://myfakehost/'; + // Generate and cache our desired operation manifest URL. export const urlOperationManifestBase: string = ((): string => { const desiredUrl = From 3ba345c922d1d2462e7159b4d83a9abc2962e9ee Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 25 Nov 2019 20:31:24 +0200 Subject: [PATCH 211/642] Move Operation and OperationManifest to plugin file. --- .../src/ApolloServerPluginOperationRegistry.ts | 12 +++++++++++- .../src/__tests__/agent.test.ts | 15 +++++++-------- .../src/agent.ts | 11 +---------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts index 0bb1ee27be8..df1caa71a20 100644 --- a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts +++ b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts @@ -18,7 +18,7 @@ import { defaultOperationRegistrySignature as defaultOperationRegistryNormalization, } from 'apollo-graphql'; import { ForbiddenError, ApolloError } from 'apollo-server-errors'; -import Agent, { OperationManifest } from './agent'; +import Agent from './agent'; import { GraphQLSchema } from 'graphql/type'; import { InMemoryLRUCache } from 'apollo-server-caching'; import loglevel from 'loglevel'; @@ -34,6 +34,16 @@ export interface OperationRegistryRequestContext { normalizedDocument: string; } +export interface Operation { + signature: string; + document: string; +} + +export interface OperationManifest { + version: number; + operations: Array; +} + export interface Options { debug?: boolean; forbidUnregisteredOperations?: diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts index c0a56b90217..9dc1a085070 100644 --- a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts @@ -7,7 +7,7 @@ import { fakeTestBaseUrl, } from '../common'; import { resolve as urlResolve } from 'url'; -import { AgentOptions, OperationManifest } from '../agent'; +import { AgentOptions } from '../agent'; import { defaultAgentOptions, nockBase, @@ -24,15 +24,14 @@ import { hashedServiceId, defaultTestAgentPollSeconds, } from './helpers.test-helpers'; - -interface ManifestRecord { - signature: string; - document: string; -} +import { + Operation, + OperationManifest, +} from "../ApolloServerPluginOperationRegistry"; // These get a bit verbose within the tests below, so we use this as a // sample store to pick and grab from. -const sampleManifestRecords: Record = { +const sampleManifestRecords: Record = { a: { signature: 'ba4573fca2e1491fd54b9f398490531ad6327b00610f2c1216dc8c9c4cfd2993', @@ -51,7 +50,7 @@ const sampleManifestRecords: Record = { }, }; -const manifest = (...operations: ManifestRecord[]) => ({ +const manifest = (...operations: Operation[]) => ({ version: 2, operations, }); diff --git a/packages/apollo-server-plugin-operation-registry/src/agent.ts b/packages/apollo-server-plugin-operation-registry/src/agent.ts index 0b12e0d5751..6f12d8edfc3 100644 --- a/packages/apollo-server-plugin-operation-registry/src/agent.ts +++ b/packages/apollo-server-plugin-operation-registry/src/agent.ts @@ -13,6 +13,7 @@ import { Response } from 'node-fetch'; import { InMemoryLRUCache } from 'apollo-server-caching'; import { fetchIfNoneMatch } from './fetchIfNoneMatch'; import { ValueOrPromise } from "apollo-server-plugin-base"; +import { OperationManifest } from "./ApolloServerPluginOperationRegistry"; const DEFAULT_POLL_SECONDS: number = 30; const SYNC_WARN_TIME_SECONDS: number = 60; @@ -30,16 +31,6 @@ export interface AgentOptions { ) => ValueOrPromise; } -export interface Operation { - signature: string; - document: string; -} - -export interface OperationManifest { - version: number; - operations: Array; -} - type SignatureStore = Set; const callToAction = `Ensure this server's schema has been published with 'apollo service:push' and that operations have been registered with 'apollo client:push'.`; From 1290233fe82e1ee169f6c2581527aa757fb18a9b Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 25 Nov 2019 20:31:32 +0200 Subject: [PATCH 212/642] De-globalize variables in test file. These variables are only used by a portion of the tests, so it seems to make sense to scope them accordingly. I had originally started introducing a block of tests which needed to declare their own `typeDefs` and was thwarted by these globals. I'm no longer sure my follow-up commit absolutely necessitates this change, but it seems best to couple tests with their variables. --- ...polloServerPluginOperationRegistry.test.ts | 51 ++++++++++--------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/ApolloServerPluginOperationRegistry.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/ApolloServerPluginOperationRegistry.test.ts index de3596d8454..7ca6ba220c8 100644 --- a/packages/apollo-server-plugin-operation-registry/src/__tests__/ApolloServerPluginOperationRegistry.test.ts +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/ApolloServerPluginOperationRegistry.test.ts @@ -13,31 +13,7 @@ import { } from 'apollo-graphql'; import gql from 'graphql-tag'; import { print } from 'graphql'; - -const typeDefs = gql` - type Query { - hello: String - } -`; - -const query = gql` - query HelloFam { - hello - } -`; - -const normalizedQueryDocument = defaultOperationRegistryNormalization( - query, - 'HelloFam', -); -const queryHash = operationSignature(normalizedQueryDocument); - -// In order to expose will start and -class ApolloServerMock extends ApolloServerBase { - public async willStart() { - return super.willStart(); - } -} +import { hashApiKey } from "./helpers.test-helpers"; describe('Operation registry plugin', () => { it('will instantiate when not called with options', () => { @@ -53,6 +29,31 @@ describe('Operation registry plugin', () => { describe('operation lifecycle hooks', () => { const graphId = 'test-service'; const apiKey = `service:${graphId}:not-an-api-key`; + const hashedApiKey = hashApiKey(apiKey); + const typeDefs = gql` + type Query { + hello: String + } + `; + + const query = gql` + query HelloFam { + hello + } + `; + + const normalizedQueryDocument = defaultOperationRegistryNormalization( + query, + 'HelloFam', + ); + const queryHash = operationSignature(normalizedQueryDocument); + + // In order to expose will start and + class ApolloServerMock extends ApolloServerBase { + public async willStart() { + return super.willStart(); + } + } describe('onUnregisterOperation', () => { it('is called when unregistered operation received', async () => { From 767827c8db077f881d005d1f281aa8151383ad93 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 25 Nov 2019 20:31:39 +0200 Subject: [PATCH 213/642] Use a more manageable method for overriding our production manifest host. The initial implementation of the host mocking, which I personally was responsible for creating, has outgrown its usefulness, particularly as a single known manifest location has grown into a multi-fetch water-fall approach for locating a server's corresponding manifest. What was once a seemingly reasonable approach for temporarily overriding the manifest host - which invoked a `jest.resetModules()` call after overriding a sole `process.env` variable (which is captured inside a memoized function to avoid excessive expensive calls to `process.env`), has now evolved to an elaborate dance of avoiding normal `import` statements. While this approach still worked, it was difficult to debug since the dependency graph for this application has also increased in complexity. This should avoid the need to continue this dance, by merely leveraging `process.env.NODE_ENV === 'test'` - a variable set automatically by Jest and (most? all?) other test runners. --- .../src/__tests__/agent.test.ts | 95 +++---------------- .../src/__tests__/common.test.ts | 2 +- .../src/common.ts | 8 +- 3 files changed, 22 insertions(+), 83 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts index 9dc1a085070..8f28256133b 100644 --- a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts @@ -1,33 +1,25 @@ import nock from 'nock'; import { InMemoryLRUCache } from 'apollo-server-caching'; -import { - envOverrideOperationManifest, - envOverrideStorageSecretBaseUrl, - getStoreKey, - fakeTestBaseUrl, -} from '../common'; import { resolve as urlResolve } from 'url'; -import { AgentOptions } from '../agent'; import { defaultAgentOptions, - nockBase, - genericLegacyOperationManifestUrl, - genericStorageSecret, - genericApiKeyHash, genericServiceID, - defaultStore, - nockStorageSecretOperationManifest, + genericStorageSecret, nockStorageSecret, - nockGoodManifestsUnderStorageSecret, + nockBase, nockLegacyGoodManifest, genericSchemaHash, hashedServiceId, + nockGoodManifestsUnderStorageSecret, + defaultStore, defaultTestAgentPollSeconds, + nockStorageSecretOperationManifest, + genericApiKeyHash, + genericLegacyOperationManifestUrl, } from './helpers.test-helpers'; -import { - Operation, - OperationManifest, -} from "../ApolloServerPluginOperationRegistry"; +import Agent, { AgentOptions } from "../agent"; +import { Operation, OperationManifest } from "../ApolloServerPluginOperationRegistry"; +import { fakeTestBaseUrl, getLegacyOperationManifestUrl, getStoreKey, getOperationManifestUrl, urlOperationManifestBase } from "../common"; // These get a bit verbose within the tests below, so we use this as a // sample store to pick and grab from. @@ -78,65 +70,6 @@ describe('Agent', () => { }); describe('with manifest', () => { - let originalEnvApolloOpManifestBaseUrl: string | undefined; - let originalEnvOverrideStorageSecretBaseUrl: string | undefined; - let Agent: typeof import('../agent').default; - let getOperationManifestUrl: typeof import('../common').getOperationManifestUrl; - let getLegacyOperationManifestUrl: typeof import('../common').getLegacyOperationManifestUrl; - let urlOperationManifestBase: string; - let genericStorageSecretOperationManifestUrl: string; - - beforeAll(() => { - // Override the tests URL with the one we want to mock/nock/test. - originalEnvApolloOpManifestBaseUrl = - process.env[envOverrideOperationManifest]; - process.env[envOverrideOperationManifest] = fakeTestBaseUrl; - - originalEnvOverrideStorageSecretBaseUrl = - process.env[envOverrideStorageSecretBaseUrl]; - process.env[envOverrideStorageSecretBaseUrl] = fakeTestBaseUrl; - - // Reset the modules so they're ready to be imported. - jest.resetModules(); - - // Store these on the local scope after we've reset the modules. - Agent = require('../agent').default; - getOperationManifestUrl = require('../common').getOperationManifestUrl; - getLegacyOperationManifestUrl = require('../common') - .getLegacyOperationManifestUrl; - urlOperationManifestBase = require('../common').urlOperationManifestBase; - - genericStorageSecretOperationManifestUrl = getOperationManifestUrl( - genericServiceID, - genericStorageSecret, - ).replace(new RegExp(`^${urlOperationManifestBase}`), ''); - }); - - afterAll(() => { - // Put the environment overrides back how they were. - if (originalEnvApolloOpManifestBaseUrl) { - process.env[ - envOverrideOperationManifest - ] = originalEnvApolloOpManifestBaseUrl; - - originalEnvApolloOpManifestBaseUrl = undefined; - } else { - delete process.env[envOverrideOperationManifest]; - } - if (originalEnvOverrideStorageSecretBaseUrl) { - process.env[ - envOverrideStorageSecretBaseUrl - ] = originalEnvOverrideStorageSecretBaseUrl; - - originalEnvOverrideStorageSecretBaseUrl = undefined; - } else { - delete process.env[envOverrideStorageSecretBaseUrl]; - } - - // Reset modules again. - jest.resetModules(); - }); - const forCleanup: { store?: InMemoryLRUCache; agent?: import('../agent').default; @@ -706,9 +639,11 @@ describe('Agent', () => { // Now, we'll expect another request to go out, so we'll nock it. nockStorageSecret(genericServiceID, genericApiKeyHash); - nockBase() - .get(genericStorageSecretOperationManifestUrl) - .reply(304); + nockStorageSecretOperationManifest( + genericServiceID, + genericStorageSecret, + 304, + ); // If we move forward the last remaining millisecond, we should trigger // and end up with a successful sync. diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/common.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/common.test.ts index 72312883ccd..e1b77154327 100644 --- a/packages/apollo-server-plugin-operation-registry/src/__tests__/common.test.ts +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/common.test.ts @@ -9,7 +9,7 @@ describe('common', () => { expect( common.getLegacyOperationManifestUrl('aServiceId', 'aSchemaHash'), ).toMatchInlineSnapshot( - `"https://storage.googleapis.com/engine-op-manifest-storage-prod/aServiceId/aSchemaHash.v2.json"`, + `"https://myfakehost/aServiceId/aSchemaHash.v2.json"`, ); }); }); diff --git a/packages/apollo-server-plugin-operation-registry/src/common.ts b/packages/apollo-server-plugin-operation-registry/src/common.ts index 436c2b1001b..febb52f58e7 100644 --- a/packages/apollo-server-plugin-operation-registry/src/common.ts +++ b/packages/apollo-server-plugin-operation-registry/src/common.ts @@ -12,7 +12,9 @@ export const fakeTestBaseUrl = 'https://myfakehost/'; export const urlOperationManifestBase: string = ((): string => { const desiredUrl = process.env[envOverrideOperationManifest] || - 'https://storage.googleapis.com/engine-op-manifest-storage-prod/'; + process.env['NODE_ENV'] === 'test' + ? fakeTestBaseUrl + : 'https://storage.googleapis.com/engine-op-manifest-storage-prod/'; // Make sure it has NO trailing slash. return desiredUrl.replace(/\/$/, ''); @@ -22,7 +24,9 @@ export const urlOperationManifestBase: string = ((): string => { export const urlStorageSecretBase: string = ((): string => { const desiredUrl = process.env[envOverrideStorageSecretBaseUrl] || - 'https://storage.googleapis.com/engine-partial-schema-prod/'; + process.env['NODE_ENV'] === 'test' + ? fakeTestBaseUrl + : 'https://storage.googleapis.com/engine-partial-schema-prod/'; // Make sure it has NO trailing slash. return desiredUrl.replace(/\/$/, ''); From 02c80d75860a572579874be154a3f7b534e4c0d2 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 25 Nov 2019 20:31:43 +0200 Subject: [PATCH 214/642] Rejigger tests to not use `willUpdateManifest`. As allured to in 4c70889bb2dde0ba4f884297a7396f95d60adc2d, this changes the tests to not leverage `willUpdateManifest`, which is a slightly contested implementation that we're not certain will stay around. Instead, this leverages the same mechanism that `agent.test.ts` uses which was enabled by the changes in the aforementioned commit, without mixing concerns. And as a recap, here's more words from my other commit message which probably belonged here anyway: It's possible that some other internal test methods could be introduced that allow us to control the state of the internal manifest dynamically (but in a controlled fashion; e.g. `operationAllow('query Name { field }')`), but until we build that, it seems reasonable to test different manifest conditions in the same way across our different test files for this plugin (i.e. `agent.test.ts` and `ApolloServerPluginOperationRegistry.test.ts`). --- ...polloServerPluginOperationRegistry.test.ts | 88 ++++++++++--------- 1 file changed, 46 insertions(+), 42 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/ApolloServerPluginOperationRegistry.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/ApolloServerPluginOperationRegistry.test.ts index 7ca6ba220c8..842663349a2 100644 --- a/packages/apollo-server-plugin-operation-registry/src/__tests__/ApolloServerPluginOperationRegistry.test.ts +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/ApolloServerPluginOperationRegistry.test.ts @@ -13,7 +13,12 @@ import { } from 'apollo-graphql'; import gql from 'graphql-tag'; import { print } from 'graphql'; -import { hashApiKey } from "./helpers.test-helpers"; +import { + hashApiKey, + nockStorageSecret, + nockGoodManifestsUnderStorageSecret, + genericStorageSecret, +} from './helpers.test-helpers'; describe('Operation registry plugin', () => { it('will instantiate when not called with options', () => { @@ -58,6 +63,12 @@ describe('Operation registry plugin', () => { describe('onUnregisterOperation', () => { it('is called when unregistered operation received', async () => { const onUnregisteredOperation: Options['onUnregisteredOperation'] = jest.fn(); + nockStorageSecret(graphId, hashedApiKey); + nockGoodManifestsUnderStorageSecret( + graphId, + genericStorageSecret, + [ /* Intentionally empty! */ ], + ); const server = new ApolloServerMock({ typeDefs, mockEntireSchema: true, @@ -67,12 +78,6 @@ describe('Operation registry plugin', () => { }, plugins: [ plugin({ - willUpdateManifest: () => { - return { - version: 2, - operations: [], - }; - }, onUnregisteredOperation, })(), ], @@ -105,6 +110,17 @@ describe('Operation registry plugin', () => { it('is not called when registered operation received', async () => { const onUnregisteredOperation: Options['onUnregisteredOperation'] = jest.fn(); + nockStorageSecret(graphId, hashedApiKey); + nockGoodManifestsUnderStorageSecret( + graphId, + genericStorageSecret, + [ + { + document: normalizedQueryDocument, + signature: queryHash, + }, + ], + ); const server = new ApolloServerMock({ typeDefs, mockEntireSchema: true, @@ -114,17 +130,6 @@ describe('Operation registry plugin', () => { }, plugins: [ plugin({ - willUpdateManifest: () => { - return { - version: 2, - operations: [ - { - document: normalizedQueryDocument, - signature: queryHash, - }, - ], - }; - }, onUnregisteredOperation, })(), ], @@ -148,7 +153,12 @@ describe('Operation registry plugin', () => { // Returning true from this predicate enables the enforcement. const forbidUnregisteredOperations = jest.fn(() => true); - + nockStorageSecret(graphId, hashedApiKey); + nockGoodManifestsUnderStorageSecret( + graphId, + genericStorageSecret, + [ /* Intentionally empty! */ ], + ); const server = new ApolloServerMock({ typeDefs, mockEntireSchema: true, @@ -158,12 +168,6 @@ describe('Operation registry plugin', () => { }, plugins: [ plugin({ - willUpdateManifest: () => { - return { - version: 2, - operations: [], - }; - }, forbidUnregisteredOperations, onForbiddenOperation, })(), @@ -204,6 +208,12 @@ describe('Operation registry plugin', () => { // Returning true from this predicate enables the enforcement. const forbidUnregisteredOperations = jest.fn(() => false); + nockStorageSecret(graphId, hashedApiKey); + nockGoodManifestsUnderStorageSecret( + graphId, + genericStorageSecret, + [ /* Intentionally empty! */ ], + ); const server = new ApolloServerMock({ typeDefs, mockEntireSchema: true, @@ -213,12 +223,6 @@ describe('Operation registry plugin', () => { }, plugins: [ plugin({ - willUpdateManifest: () => { - return { - version: 2, - operations: [], - }; - }, forbidUnregisteredOperations, onForbiddenOperation, })(), @@ -239,6 +243,17 @@ describe('Operation registry plugin', () => { it('is not called when registered operation received', async () => { const onForbiddenOperation = jest.fn(); + nockStorageSecret(graphId, hashedApiKey); + nockGoodManifestsUnderStorageSecret( + graphId, + genericStorageSecret, + [ + { + document: normalizedQueryDocument, + signature: queryHash, + }, + ], + ); const server = new ApolloServerMock({ typeDefs, mockEntireSchema: true, @@ -248,17 +263,6 @@ describe('Operation registry plugin', () => { }, plugins: [ plugin({ - willUpdateManifest: () => { - return { - version: 2, - operations: [ - { - document: normalizedQueryDocument, - signature: queryHash, - }, - ], - }; - }, onForbiddenOperation, })(), ], From c10fb88b14a80880a69baff55ba4f59d71e4b480 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 25 Nov 2019 20:31:55 +0200 Subject: [PATCH 215/642] Remove newly introduced `willUpdateManifest` method, for now. Removes the `willUpdateManifest` method which was originally introduced in https://github.com/apollographql/apollo-platform-commercial/pull/158, until we can come to a better agreement as to how it should work. While the idea of this method was to give user's control over what to do in the case of an unavailable manifest, the implementation exposes the exact format of the manifest to the user, preventing us from iterating on it. It also leaves the exercise of generating and updating the manifest to the user, which honestly, if documented using this approach would potentially introduce many additional complexities to deployment processes and severely undermine the value of the feature. Some things which we may want to introduce first are: - The ability to fail-safe or fail-secure on server startup when the manifest is not available. - The ability to fail-safe or fail-secure after a specified interval of manifest unavailability. For example, when the manifest cannot be fetched for a specific time, switch to a particular mode of operation. - A CDN for our manifests to reduce the likelihood of the manifest being unavailable. - Since this extends to other artifacts which are hosted in our cloud, potentially, a more blanket recommendation that consumers setup an on-premise artifact cache and potentially use a Varnish (or other) proxy as an in-between store for artifacts that are hosted in our cloud. As it stands right now though, there is a lack of agreement on a best practice here that doesn't heavily rely on being locked into our manifest format. Further, as far as I'm aware, nobody is actually implementing this method and no customer (other than "us") has specifically asked for this ability (even if we _think_ it might be what they need). --- .../CHANGELOG.md | 4 +- .../ApolloServerPluginOperationRegistry.ts | 6 - .../src/__tests__/agent.test.ts | 285 ------------------ .../src/agent.ts | 42 +-- 4 files changed, 8 insertions(+), 329 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/CHANGELOG.md b/packages/apollo-server-plugin-operation-registry/CHANGELOG.md index f738f4d0998..13b86df661f 100644 --- a/packages/apollo-server-plugin-operation-registry/CHANGELOG.md +++ b/packages/apollo-server-plugin-operation-registry/CHANGELOG.md @@ -2,9 +2,9 @@ ### vNEXT (Currently `alpha` tag) -- Add lifecycle hooks: `willUpdateManifest`, `onUnregisteredOperation`, and `onForbiddenOperation`. [PR #158](https://github.com/apollographql/apollo-platform-commercial/pull/158) +- Add lifecycle hooks: `onUnregisteredOperation`, and `onForbiddenOperation`. [PR #158](https://github.com/apollographql/apollo-platform-commercial/pull/158) [PR #251](https://github.com/apollographql/apollo-platform-commercial/pull/251) [PR #TODO](https://github.com/apollographql/apollo-platform-commercial/pull/TODO) - Prevent the polling timer from keeping the event loop active [PR #223](https://github.com/apollographql/apollo-platform-commercial/pull/223) -- Update error message for operations that are not in the operation registry [PR #170](https://github.com/apollographql/apollo-platform-commercial/pull/170) +- Update error message for operations that are not in the operation registry. [PR #170](https://github.com/apollographql/apollo-platform-commercial/pull/170) ### 0.2.2 diff --git a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts index c5f4f5182af..31073baa97d 100644 --- a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts +++ b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts @@ -23,7 +23,6 @@ import { GraphQLSchema } from 'graphql/type'; import { InMemoryLRUCache } from 'apollo-server-caching'; import loglevel from 'loglevel'; import loglevelDebug from 'loglevel-debug'; -import { ValueOrPromise } from 'apollo-server-plugin-base'; type ForbidUnregisteredOperationsPredicate = ( requestContext: GraphQLRequestContext, @@ -59,10 +58,6 @@ export interface Options { requestContext: GraphQLRequestContext, operationRegistryRequestContext: OperationRegistryRequestContext, ) => void; - willUpdateManifest?: ( - newManifest?: OperationManifest, - oldManifest?: OperationManifest, - ) => ValueOrPromise; } export default function plugin(options: Options = Object.create(null)) { @@ -134,7 +129,6 @@ for observability purposes, but all operations will be permitted.`, engine, store, logger, - willUpdateManifest: options.willUpdateManifest, }); await agent.start(); diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts index 8f28256133b..26e5e3b44eb 100644 --- a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts @@ -469,290 +469,5 @@ describe('Agent', () => { }); }); }); - - describe('manifest lifecycle', () => { - function generateWillUpdateManifest( - operations?: OperationManifest['operations'], - ) { - return jest.fn( - ( - newManifest?: OperationManifest, - oldManifest?: OperationManifest, - ) => { - const manifest = newManifest || oldManifest; - return ( - (operations && { version: 2, operations }) || - manifest || { version: 2, operations: [] } - ); - }, - ); - } - - describe('willUpdateManifest', () => { - it("receives undefined arguments when can't fetch first time", async () => { - nockStorageSecret(genericServiceID, genericApiKeyHash, 404); - nockBase() - .get(genericLegacyOperationManifestUrl) - .reply(500); - const mock = generateWillUpdateManifest(); - const store = defaultStore(); - const storeSetSpy = jest.spyOn(store, 'set'); - const storeDeleteSpy = jest.spyOn(store, 'delete'); - - const agent = createAgent({ - willUpdateManifest: mock, - store, - }); - await agent.start(); - expect(mock).toHaveBeenCalledTimes(1); - expect(mock).toHaveBeenCalledWith(undefined, undefined); - - // no additions, no deletions. - expect(storeSetSpy).toBeCalledTimes(0); - expect(storeDeleteSpy).toBeCalledTimes(0); - }); - it('receives manifest retrieved from gcs', async () => { - nockStorageSecret(genericServiceID, genericApiKeyHash); - nockGoodManifestsUnderStorageSecret( - genericServiceID, - genericStorageSecret, - [ - sampleManifestRecords.a, - sampleManifestRecords.b, - sampleManifestRecords.c, - ] - ); - const mock = generateWillUpdateManifest(); - const store = defaultStore(); - const storeSetSpy = jest.spyOn(store, 'set'); - const storeDeleteSpy = jest.spyOn(store, 'delete'); - - const agent = createAgent({ - willUpdateManifest: mock, - store, - }); - await agent.start(); - expect(mock).toHaveBeenCalledTimes(1); - expect(mock).toHaveBeenCalledWith( - { - version: 2, - operations: [ - sampleManifestRecords.a, - sampleManifestRecords.b, - sampleManifestRecords.c, - ], - }, - undefined, - ); - - // Three additions, no deletions. - expect(storeSetSpy).toBeCalledTimes(3); - expect(storeDeleteSpy).toBeCalledTimes(0); - }); - it('uses returned manifest to enforce safelist', async () => { - nockStorageSecret(genericServiceID, genericApiKeyHash); - nockGoodManifestsUnderStorageSecret( - genericServiceID, - genericStorageSecret, - [ - sampleManifestRecords.a, - sampleManifestRecords.b, - sampleManifestRecords.c, - ] - ); - const mock = generateWillUpdateManifest([sampleManifestRecords.a]); - const store = defaultStore(); - const storeSetSpy = jest.spyOn(store, 'set'); - const storeDeleteSpy = jest.spyOn(store, 'delete'); - - const agent = createAgent({ - willUpdateManifest: mock, - store, - }); - await agent.start(); - expect(mock).toHaveBeenCalledTimes(1); - expect(mock).toHaveBeenCalledWith( - { - version: 2, - operations: [ - sampleManifestRecords.a, - sampleManifestRecords.b, - sampleManifestRecords.c, - ], - }, - undefined, - ); - expect(mock).toReturnWith({ - version: 2, - operations: [sampleManifestRecords.a], - }); - - // One additions, no deletions. - expect(storeSetSpy).toBeCalledTimes(1); - expect(storeDeleteSpy).toBeCalledTimes(0); - }); - it('is not called again when manifest remains same', async () => { - nockStorageSecret(genericServiceID, genericApiKeyHash); - nockGoodManifestsUnderStorageSecret( - genericServiceID, - genericStorageSecret, - [ - sampleManifestRecords.a, - sampleManifestRecords.b, - sampleManifestRecords.c, - ] - ); - - const mock = generateWillUpdateManifest(); - const store = defaultStore(); - const storeSetSpy = jest.spyOn(store, 'set'); - const storeDeleteSpy = jest.spyOn(store, 'delete'); - - const agent = createAgent({ - willUpdateManifest: mock, - store, - }); - jest.useFakeTimers(); - await agent.start(); - expect(mock).toHaveBeenCalledTimes(1); - expect(mock).toHaveBeenCalledWith( - { - version: 2, - operations: [ - sampleManifestRecords.a, - sampleManifestRecords.b, - sampleManifestRecords.c, - ], - }, - undefined, - ); - // Three additions, no deletions. - expect(storeSetSpy).toBeCalledTimes(3); - expect(storeDeleteSpy).toBeCalledTimes(0); - - // If it's one millisecond short of our next poll interval, nothing - // should have changed yet. - jest.advanceTimersByTime(defaultTestAgentPollSeconds * 1000 - 1); - - // Still only one check. - expect(agent._timesChecked).toBe(1); - - // Now, we'll expect another request to go out, so we'll nock it. - nockStorageSecret(genericServiceID, genericApiKeyHash); - nockStorageSecretOperationManifest( - genericServiceID, - genericStorageSecret, - 304, - ); - - // If we move forward the last remaining millisecond, we should trigger - // and end up with a successful sync. - jest.advanceTimersByTime(1); - - // While that timer will fire, it will do work async, and we need to - // wait on that work itself. - await agent.requestPending(); - - // Now the times checked should have gone up. - expect(agent._timesChecked).toBe(2); - - // the agent should not have been called again - expect(mock).toHaveBeenCalledTimes(1); - expect(mock).toHaveBeenCalledWith( - { - version: 2, - operations: [ - sampleManifestRecords.a, - sampleManifestRecords.b, - sampleManifestRecords.c, - ], - }, - undefined, - ); - // Three additions, no deletions. - expect(storeSetSpy).toBeCalledTimes(3); - expect(storeDeleteSpy).toBeCalledTimes(0); - }); - - it('receives previous manifest when updated', async () => { - nockStorageSecret(genericServiceID, genericApiKeyHash); - nockGoodManifestsUnderStorageSecret( - genericServiceID, - genericStorageSecret, - [ - sampleManifestRecords.a, - sampleManifestRecords.b, - sampleManifestRecords.c, - ] - ); - - const mock = generateWillUpdateManifest(); - const store = defaultStore(); - const storeSetSpy = jest.spyOn(store, 'set'); - const storeDeleteSpy = jest.spyOn(store, 'delete'); - - const agent = createAgent({ - willUpdateManifest: mock, - store, - }); - jest.useFakeTimers(); - await agent.start(); - expect(mock).toHaveBeenCalledTimes(1); - expect(mock).toHaveBeenCalledWith( - { - version: 2, - operations: [ - sampleManifestRecords.a, - sampleManifestRecords.b, - sampleManifestRecords.c, - ], - }, - undefined, - ); - // Three additions, no deletions. - expect(storeSetSpy).toBeCalledTimes(3); - expect(storeDeleteSpy).toBeCalledTimes(0); - - // If it's one millisecond short of our next poll interval, nothing - // should have changed yet. - jest.advanceTimersByTime(defaultTestAgentPollSeconds * 1000 - 1); - - // Still only one check. - expect(agent._timesChecked).toBe(1); - - // Now, we'll expect another request to go out, so we'll nock it. - nockStorageSecret(genericServiceID, genericApiKeyHash); - nockGoodManifestsUnderStorageSecret( - genericServiceID, - genericStorageSecret, - [sampleManifestRecords.a], - ); - - // If we move forward the last remaining millisecond, we should trigger - // and end up with a successful sync. - jest.advanceTimersByTime(1); - - // While that timer will fire, it will do work async, and we need to - // wait on that work itself. - await agent.requestPending(); - - expect(mock).toHaveBeenCalledTimes(2); - expect(mock).toHaveBeenCalledWith( - { version: 2, operations: [sampleManifestRecords.a] }, - { - version: 2, - operations: [ - sampleManifestRecords.a, - sampleManifestRecords.b, - sampleManifestRecords.c, - ], - }, - ); - // Three additions, two deletions. - expect(storeSetSpy).toBeCalledTimes(3); - expect(storeDeleteSpy).toBeCalledTimes(2); - }); - }); - }); }); }); diff --git a/packages/apollo-server-plugin-operation-registry/src/agent.ts b/packages/apollo-server-plugin-operation-registry/src/agent.ts index 6f12d8edfc3..93cc3a8d26e 100644 --- a/packages/apollo-server-plugin-operation-registry/src/agent.ts +++ b/packages/apollo-server-plugin-operation-registry/src/agent.ts @@ -12,7 +12,6 @@ import loglevel from 'loglevel'; import { Response } from 'node-fetch'; import { InMemoryLRUCache } from 'apollo-server-caching'; import { fetchIfNoneMatch } from './fetchIfNoneMatch'; -import { ValueOrPromise } from "apollo-server-plugin-base"; import { OperationManifest } from "./ApolloServerPluginOperationRegistry"; const DEFAULT_POLL_SECONDS: number = 30; @@ -25,10 +24,6 @@ export interface AgentOptions { engine: any; store: InMemoryLRUCache; schemaTag: string; - willUpdateManifest?: ( - newManifest?: OperationManifest, - oldManifest?: OperationManifest, - ) => ValueOrPromise; } type SignatureStore = Set; @@ -47,7 +42,6 @@ export default class Agent { public _timesChecked: number = 0; private lastOperationSignatures: SignatureStore = new Set(); - private lastManifest?: OperationManifest; private readonly options: AgentOptions = Object.create(null); constructor(options: AgentOptions) { @@ -98,14 +92,8 @@ export default class Agent { try { await pulse(); } catch (err) { - // Update the manifest to trigger `willUpdateManifest(newManifest: undefined, oldManifest: undefined)` - await this.updateManifest(); console.error( - `The operation manifest could not be fetched. Retries will continue.${ - this.lastManifest - ? '' - : ' Requests will be forbidden until the manifest is fetched.' - }`, + 'The operation manifest could not be fetched. Retries will continue, but requests will be forbidden until the manifest is fetched.', err.message || err, ); } @@ -308,37 +296,19 @@ export default class Agent { }); } - public async updateManifest(manifest?: OperationManifest) { + public async updateManifest(manifest: OperationManifest) { if ( - manifest && - (manifest.version !== 2 || !Array.isArray(manifest.operations)) + !manifest || + manifest.version !== 2 || + !Array.isArray(manifest.operations) ) { throw new Error('Invalid manifest format.'); } - const returnedManifest = - (await (this.options.willUpdateManifest && - this.options.willUpdateManifest(manifest, this.lastManifest))) || - manifest; - - if (returnedManifest && !Array.isArray(returnedManifest.operations)) { - throw new Error( - "Invalid manifest format. Manifest's operations must be an array", - ); - } - - if (returnedManifest) { - this.updateOperationStore(returnedManifest.operations); - } - - this.lastManifest = manifest; - } - - private updateOperationStore(operations: OperationManifest['operations']) { const incomingOperations: Map = new Map(); const replacementSignatures: SignatureStore = new Set(); - for (const { signature, document } of operations) { + for (const { signature, document } of manifest.operations) { incomingOperations.set(signature, document); // Keep track of each operation in this manifest so we can store it // for comparison after the next fetch. From df715ddac74df788ca37fabb08dcaba1e8c4e9b9 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 25 Nov 2019 22:01:50 +0200 Subject: [PATCH 216/642] Release - apollo-server-plugin-operation-registry@0.3.0-alpha.0 --- packages/apollo-server-plugin-operation-registry/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/package.json b/packages/apollo-server-plugin-operation-registry/package.json index 464667c8783..1255943a8f1 100644 --- a/packages/apollo-server-plugin-operation-registry/package.json +++ b/packages/apollo-server-plugin-operation-registry/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-plugin-operation-registry", - "version": "0.2.3-alpha.0", + "version": "0.3.0-alpha.0", "description": "Apollo Server operation registry", "main": "dist/index.js", "types": "dist/index.d.ts", From 400cd0e20b5fe25754c5a8c370463fad999964e1 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 25 Nov 2019 22:12:40 +0200 Subject: [PATCH 217/642] Update `fakeTesetBaseUrl` to a more recognizable hostname. Just in case it leaks somewhere and someone wants to know what it is quickly! --- .../src/__tests__/common.test.ts | 2 +- packages/apollo-server-plugin-operation-registry/src/common.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/common.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/common.test.ts index e1b77154327..6b5bb2c22f0 100644 --- a/packages/apollo-server-plugin-operation-registry/src/__tests__/common.test.ts +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/common.test.ts @@ -9,7 +9,7 @@ describe('common', () => { expect( common.getLegacyOperationManifestUrl('aServiceId', 'aSchemaHash'), ).toMatchInlineSnapshot( - `"https://myfakehost/aServiceId/aSchemaHash.v2.json"`, + `"https://fake-host-for-apollo-op-reg-tests/aServiceId/aSchemaHash.v2.json"`, ); }); }); diff --git a/packages/apollo-server-plugin-operation-registry/src/common.ts b/packages/apollo-server-plugin-operation-registry/src/common.ts index febb52f58e7..d0a46f7c3eb 100644 --- a/packages/apollo-server-plugin-operation-registry/src/common.ts +++ b/packages/apollo-server-plugin-operation-registry/src/common.ts @@ -6,7 +6,7 @@ export const envOverrideOperationManifest = export const envOverrideStorageSecretBaseUrl = 'APOLLO_STORAGE_SECRET_BASE_URL'; -export const fakeTestBaseUrl = 'https://myfakehost/'; +export const fakeTestBaseUrl = 'https://fake-host-for-apollo-op-reg-tests/'; // Generate and cache our desired operation manifest URL. export const urlOperationManifestBase: string = ((): string => { From 23055e9ce091b8fac46be5c71a116c927d381234 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Wed, 11 Dec 2019 22:36:11 +0200 Subject: [PATCH 218/642] Use a special environment variable for testing rather than `NODE_ENV`. When I introduced 4313dee912fe1ddbe0b1a2cb46192c86f23c4dea in #259, it was in an effort to simplify the testing story for mocking a memoized global function within the operation registry's `common.ts` functionality. While I think that works still makes sense, my use of a check of whether the `process.env.NODE_ENV` variable was set to `test` or not (a mode that Jest, and many other test runners, sets automatically) is problematic for anyone who actually tests their own application's connectivity with our cloud service since it changes the URL that we poll to a test-only host that allows us to test network functionality by mocking specific URLs behavior (that tool is called `nock`!). This mostly keeps the behavior that the above commit introduced, but changes it to leverage a special environment variable that is only true within our infrastructure's tests by virtue of a `setupFiles` property in the `jest.config.js`. In order to do that, I had to augment the way that `setupFiles` was set since we only need this environment variable on this one package but current inherit from the root `jest.config.base.js` of this monorepo. I also chose that approach since I suspect, eventually, this code will no longer live in this monorepo, but will become a part of a different home, though will still necessitate that override to pass its test suite! --- .../jest.config.js | 9 ++++++++- .../src/__tests__/jestSetup.ts | 12 ++++++++++++ .../src/common.ts | 6 ++++-- 3 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 packages/apollo-server-plugin-operation-registry/src/__tests__/jestSetup.ts diff --git a/packages/apollo-server-plugin-operation-registry/jest.config.js b/packages/apollo-server-plugin-operation-registry/jest.config.js index a383fbc925f..2a992d8c278 100644 --- a/packages/apollo-server-plugin-operation-registry/jest.config.js +++ b/packages/apollo-server-plugin-operation-registry/jest.config.js @@ -1,3 +1,10 @@ const config = require('../../jest.config.base'); -module.exports = Object.assign(Object.create(null), config); +const packageSpecificSetupFiles = ['/src/__tests__/jestSetup.ts']; + +const setupFiles = (Array.isArray(config.setupFiles) + ? config.setupFiles + : [] +).concat(packageSpecificSetupFiles); + +module.exports = Object.assign(Object.create(null), config, { setupFiles }); diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/jestSetup.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/jestSetup.ts new file mode 100644 index 00000000000..8a162b690c5 --- /dev/null +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/jestSetup.ts @@ -0,0 +1,12 @@ +// Since we memoize the environment variables which are used to control the +// override variables for the manifest location (in an effort to avoid the +// costly checking of `process.env` on each check; a notable production +// performance win), it's difficult to temporarily override those in Jest mocks +// without needing to carefully call `jest.resetModules` on anything they might +// have touched.We set this in order to allow a more simplified approach to +// testing. While we could have (and previously did) leverage a check against +// the `process.env.NODE_ENV === 'test' variable, this is problematic because +// customer's tests would also have that set. Using this environment variable +// allows us to make sure we're only running in the test suite for this plugin, +// and not implementors' tests. +process.env['__APOLLO_OPERATION_REGISTRY_TESTS__'] = 'true'; diff --git a/packages/apollo-server-plugin-operation-registry/src/common.ts b/packages/apollo-server-plugin-operation-registry/src/common.ts index d0a46f7c3eb..82c6445ccef 100644 --- a/packages/apollo-server-plugin-operation-registry/src/common.ts +++ b/packages/apollo-server-plugin-operation-registry/src/common.ts @@ -12,7 +12,8 @@ export const fakeTestBaseUrl = 'https://fake-host-for-apollo-op-reg-tests/'; export const urlOperationManifestBase: string = ((): string => { const desiredUrl = process.env[envOverrideOperationManifest] || - process.env['NODE_ENV'] === 'test' + // See src/__tests__/jestSetup.ts for more details on this env. variable. + process.env['__APOLLO_OPERATION_REGISTRY_TESTS__'] === 'true' ? fakeTestBaseUrl : 'https://storage.googleapis.com/engine-op-manifest-storage-prod/'; @@ -24,7 +25,8 @@ export const urlOperationManifestBase: string = ((): string => { export const urlStorageSecretBase: string = ((): string => { const desiredUrl = process.env[envOverrideStorageSecretBaseUrl] || - process.env['NODE_ENV'] === 'test' + // See src/__tests__/jestSetup.ts for more details on this env. variable. + process.env['__APOLLO_OPERATION_REGISTRY_TESTS__'] === 'true' ? fakeTestBaseUrl : 'https://storage.googleapis.com/engine-partial-schema-prod/'; From 03122b6fab9ce05c269b0c6a527a78a9a3b11427 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Wed, 11 Dec 2019 23:00:58 +0200 Subject: [PATCH 219/642] Release - apollo-server-plugin-operation-registry@0.3.0-alpha.1 --- packages/apollo-server-plugin-operation-registry/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/package.json b/packages/apollo-server-plugin-operation-registry/package.json index 1255943a8f1..77752b6a8f6 100644 --- a/packages/apollo-server-plugin-operation-registry/package.json +++ b/packages/apollo-server-plugin-operation-registry/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-plugin-operation-registry", - "version": "0.3.0-alpha.0", + "version": "0.3.0-alpha.1", "description": "Apollo Server operation registry", "main": "dist/index.js", "types": "dist/index.d.ts", From 3edfaed12600db104016d86fab60ec253455f7e2 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 10 Feb 2020 19:45:09 +0200 Subject: [PATCH 220/642] typings: Accept `null` for DataLoader return types in RedisCache. I encountered this when trying to land #3553, which updates to DataLoader v2. These type errors were previous masked by a scope problem which resulted in `this.loader` being `any`-typed inside the callback that's passed to `DataLoader`'s first parameter (`batchLoadFn`). Fixing that by leveraging the locally scoped variable revealed that the type for the loader instance itself is incorrect since `mget` will return `null` for a key if it is not present in the cache. This adjusts the typings to fix both of those. --- packages/apollo-server-cache-redis/src/RedisCache.ts | 4 ++-- packages/apollo-server-cache-redis/src/RedisClusterCache.ts | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/apollo-server-cache-redis/src/RedisCache.ts b/packages/apollo-server-cache-redis/src/RedisCache.ts index b45998dea98..22fe9a1977f 100644 --- a/packages/apollo-server-cache-redis/src/RedisCache.ts +++ b/packages/apollo-server-cache-redis/src/RedisCache.ts @@ -11,13 +11,13 @@ export class RedisCache implements TestableKeyValueCache { ttl: 300, }; - private loader: DataLoader; + private loader: DataLoader; constructor(options?: RedisOptions) { const client = new Redis(options); this.client = client; - this.loader = new DataLoader(keys => this.client.mget(keys), { + this.loader = new DataLoader(keys => client.mget(...keys), { cache: false, }); } diff --git a/packages/apollo-server-cache-redis/src/RedisClusterCache.ts b/packages/apollo-server-cache-redis/src/RedisClusterCache.ts index 79bd73c83f0..401799a9d52 100644 --- a/packages/apollo-server-cache-redis/src/RedisClusterCache.ts +++ b/packages/apollo-server-cache-redis/src/RedisClusterCache.ts @@ -12,14 +12,14 @@ export class RedisClusterCache implements KeyValueCache { ttl: 300, }; - private loader: DataLoader; + private loader: DataLoader; constructor(nodes: ClusterNode[], options?: ClusterOptions) { - this.client = new Redis.Cluster(nodes, options); + const client = this.client = new Redis.Cluster(nodes, options); this.loader = new DataLoader( (keys = []) => - Promise.all(keys.map(key => this.client.get(key).catch(() => null))), + Promise.all(keys.map(key => client.get(key).catch(() => null))), { cache: false }, ); } From 06ca1d29bad397ea0188c326b132fc934198f854 Mon Sep 17 00:00:00 2001 From: Trevor Scheer Date: Tue, 3 Mar 2020 11:06:41 -0800 Subject: [PATCH 221/642] changelog: Kick-off v2.12.0 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 02b187d6177..c6a72c1e7cd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ 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) +### v2.12.0 + ### v2.11.0 - The range of accepted `peerDepedencies` versions for `graphql` has been widened to include `graphql@^15.0.0-rc.2` so as to accommodate the latest release-candidate of the `graphql@15` package, and an intention to support it when it is finally released on the `latest` npm tag. While this change will subdue peer dependency warnings for Apollo Server packages, many dependencies from outside of this repository will continue to raise similar warnings until those packages own `peerDependencies` are updated. It is unlikely that all of those packages will update their ranges prior to the final version of `graphql@15` being released, but if everything is working as expected, the warnings can be safely ignored. [PR #3825](https://github.com/apollographql/apollo-server/pull/3825) From 06c3267d27f72d2cbf071bdbfc98886a0250fb06 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 20 Feb 2020 20:34:46 +0200 Subject: [PATCH 222/642] Adjust deceiving error message about previous schemas and falling back. This message was being issued when a new server starts up, prior to ever having a schema, when a storage secret (or any other artifact) can't be fetched from GCS (or any error within `updateServiceDefinitions`) despite the fact that there may be no `previousSchema`. While I could use `previousSchema` to change the error message, I don't think that it's this methods concern to decide what happens in the event of an error. I think it's only this methods concern to actually do the update, if it is in fact successful. --- packages/apollo-gateway/src/index.ts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/apollo-gateway/src/index.ts b/packages/apollo-gateway/src/index.ts index a34db0a362d..10f14e250d6 100644 --- a/packages/apollo-gateway/src/index.ts +++ b/packages/apollo-gateway/src/index.ts @@ -305,10 +305,7 @@ export class ApolloGateway implements GraphQLService { try { result = await this.updateServiceDefinitions(this.config); } catch (e) { - this.logger.warn( - 'Error checking for schema updates. Falling back to existing schema.', - e, - ); + this.logger.warn('Error checking for schema updates.', e); return; } From 1655f4ba23040d5d574184cb68c1b2d0bad74628 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 20 Feb 2020 21:15:03 +0200 Subject: [PATCH 223/642] Throw when updating the schema doesn't fail as expected. Currently, we log the error and just return without throwing which causes `load` (one of two places where `updateComposition` is called to not actually fail and follow-up logic then suggests "Gateway successfully loaded schema", even though that cannot be true. The nice thing about this change (in addition to allowing someone to `catch` an error from `ApolloGateway.prototype.load`) is that this should bubble all the way up to the place where we currently call `load` within Apollo Server's constructor, and stop the server from starting in this failure condition: https://github.com/apollographql/apollo-server/blob/7dcee80ff33061c0911458d593ebbca5a9c73939/packages/apollo-server-core/src/ApolloServer.ts#L366 The other place we call `updateComposition` is within a `setTimeout`. That particular case is less troublesome since it will retry on the next interval. --- packages/apollo-gateway/src/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-gateway/src/index.ts b/packages/apollo-gateway/src/index.ts index 10f14e250d6..41b3732c7a6 100644 --- a/packages/apollo-gateway/src/index.ts +++ b/packages/apollo-gateway/src/index.ts @@ -306,7 +306,7 @@ export class ApolloGateway implements GraphQLService { result = await this.updateServiceDefinitions(this.config); } catch (e) { this.logger.warn('Error checking for schema updates.', e); - return; + throw e; } if ( From 827cba28a2aace2d82fd58e40e9319f6fa175ebc Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 20 Feb 2020 21:27:04 +0200 Subject: [PATCH 224/642] Adjust error message wording to be more concise. --- packages/apollo-gateway/src/loadServicesFromRemoteEndpoint.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/apollo-gateway/src/loadServicesFromRemoteEndpoint.ts b/packages/apollo-gateway/src/loadServicesFromRemoteEndpoint.ts index a11840c7911..829716ff8c4 100644 --- a/packages/apollo-gateway/src/loadServicesFromRemoteEndpoint.ts +++ b/packages/apollo-gateway/src/loadServicesFromRemoteEndpoint.ts @@ -29,7 +29,8 @@ export async function getServiceDefinitionsFromRemoteEndpoint({ const serviceDefinitions: ServiceDefinition[] = (await Promise.all( serviceList.map(({ name, url, dataSource }) => { if (!url) { - throw new Error(`Tried to load schema from ${name} but no url found`); + throw new Error( + `Tried to load schema for '${name}' but no 'url' was specified.`); } const request: GraphQLRequest = { From 7250bfed0fc969abd0337581e41630454a3dc233 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 20 Feb 2020 22:13:54 +0200 Subject: [PATCH 225/642] Move "previous" variables closer to where they are used. No need to have them so far away from their usage and to even do these assignments at all when there are already escape routes that exit this code path. --- packages/apollo-gateway/src/index.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/apollo-gateway/src/index.ts b/packages/apollo-gateway/src/index.ts index 41b3732c7a6..2c6a446ee97 100644 --- a/packages/apollo-gateway/src/index.ts +++ b/packages/apollo-gateway/src/index.ts @@ -296,10 +296,6 @@ export class ApolloGateway implements GraphQLService { this.engineConfig = options.engine; } - const previousSchema = this.schema; - const previousServiceDefinitions = this.serviceDefinitions; - const previousCompositionMetadata = this.compositionMetadata; - let result: Await>; this.logger.debug('Loading configuration for gateway'); try { @@ -318,6 +314,10 @@ export class ApolloGateway implements GraphQLService { return; } + const previousSchema = this.schema; + const previousServiceDefinitions = this.serviceDefinitions; + const previousCompositionMetadata = this.compositionMetadata; + if (previousSchema) { this.logger.info('Gateway config has changed, updating schema'); } From c1ee91e93fe7aca024eaec90a3863552f34ad77f Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 20 Feb 2020 22:19:34 +0200 Subject: [PATCH 226/642] Align error messages with consistent terminology and add clarity. * Refer to the thing we are processing consistently as "schema definitions". * Also make them generally more factual. --- packages/apollo-gateway/src/index.ts | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/packages/apollo-gateway/src/index.ts b/packages/apollo-gateway/src/index.ts index 2c6a446ee97..eb238f22afc 100644 --- a/packages/apollo-gateway/src/index.ts +++ b/packages/apollo-gateway/src/index.ts @@ -297,11 +297,11 @@ export class ApolloGateway implements GraphQLService { } let result: Await>; - this.logger.debug('Loading configuration for gateway'); + this.logger.debug('Checking service definitions...'); try { result = await this.updateServiceDefinitions(this.config); } catch (e) { - this.logger.warn('Error checking for schema updates.', e); + this.logger.warn('Error checking for changes to service defintions:', e); throw e; } @@ -310,7 +310,7 @@ export class ApolloGateway implements GraphQLService { JSON.stringify(this.serviceDefinitions) === JSON.stringify(result.serviceDefinitions) ) { - this.logger.debug('No change in service definitions since last check'); + this.logger.debug('No change in service definitions since last check.'); return; } @@ -319,7 +319,7 @@ export class ApolloGateway implements GraphQLService { const previousCompositionMetadata = this.compositionMetadata; if (previousSchema) { - this.logger.info('Gateway config has changed, updating schema'); + this.logger.info("New service definitions were found."); } this.compositionMetadata = result.compositionMetadata; @@ -332,9 +332,8 @@ export class ApolloGateway implements GraphQLService { this.onSchemaChangeListeners.forEach(listener => listener(this.schema!)); } catch (e) { this.logger.error( - 'Error notifying schema change listener of update to schema.', - e, - ); + "An error was thrown from an 'onSchemaChange' listener. " + + "The schema will still update: ", e); } if (this.experimental_didUpdateComposition) { From c3fb481105ffeae657463011d03ee479a29b4e46 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Fri, 21 Feb 2020 16:06:02 +0200 Subject: [PATCH 227/642] logging: Raise severity from `warn` to `error` for what is certainly an error. --- packages/apollo-gateway/src/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-gateway/src/index.ts b/packages/apollo-gateway/src/index.ts index eb238f22afc..d29af62bfff 100644 --- a/packages/apollo-gateway/src/index.ts +++ b/packages/apollo-gateway/src/index.ts @@ -301,7 +301,7 @@ export class ApolloGateway implements GraphQLService { try { result = await this.updateServiceDefinitions(this.config); } catch (e) { - this.logger.warn('Error checking for changes to service defintions:', e); + this.logger.error("Error checking for changes to service definitions", e); throw e; } From e1d97d33e29143ea60576be90468c652c3b81815 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 24 Feb 2020 22:09:37 +0200 Subject: [PATCH 228/642] Switch to using single argument logger usage and serialization. Rely on `message` only if it's present, and fall back to serialization methods which might exist on the prototype otherwise (e.g. `toJSON`, `toString`). Also, switch to a single parameter usage of the logging facility. While `console.log` supports it, its certainly possible that the logger will _not_, and will need that positional parameter for something else. --- packages/apollo-gateway/src/index.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/apollo-gateway/src/index.ts b/packages/apollo-gateway/src/index.ts index d29af62bfff..cf4626028ac 100644 --- a/packages/apollo-gateway/src/index.ts +++ b/packages/apollo-gateway/src/index.ts @@ -301,7 +301,10 @@ export class ApolloGateway implements GraphQLService { try { result = await this.updateServiceDefinitions(this.config); } catch (e) { - this.logger.error("Error checking for changes to service definitions", e); + this.logger.error( + "Error checking for changes to service definitions: " + + (e && e.message || e) + ); throw e; } From da06fa8d453c2f939fc9a3de86db48100dab1554 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 24 Feb 2020 22:23:14 +0200 Subject: [PATCH 229/642] gateway: Trap unhandled promise rejections in polling. While successful `updateComposition` invocations were working properly, failed invocations (including GCS access errors, network hiccups and just general configuration mistakes) were currently cluttering the logs with warnings of unhandled promise rejections. While those unhandled rejections did include the actual error messages, this adjusts them to be caught and logged in a structured manner with our `logger`, sparing our logs from those unnecessarily verbose (and scary!) messages. --- packages/apollo-gateway/src/index.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/apollo-gateway/src/index.ts b/packages/apollo-gateway/src/index.ts index cf4626028ac..cfd7e033017 100644 --- a/packages/apollo-gateway/src/index.ts +++ b/packages/apollo-gateway/src/index.ts @@ -414,8 +414,12 @@ export class ApolloGateway implements GraphQLService { private startPollingServices() { if (this.pollingTimer) clearInterval(this.pollingTimer); - this.pollingTimer = setInterval(() => { - this.updateComposition(); + this.pollingTimer = setInterval(async () => { + try { + await this.updateComposition(); + } catch (err) { + this.logger.error(err && err.message || err); + } }, this.experimental_pollInterval || 10000); // Prevent the Node.js event loop from remaining active (and preventing, From 88b87ea4257425eb0566e434cc66ce8c02c17c4a Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 24 Feb 2020 22:27:27 +0200 Subject: [PATCH 230/642] Remove incorrect comment about typings being an appropriate assertion. Adjusting the typings only works for users of TypeScript. On the other hand, this is a one-time assertion which happens at instantiation time which could save a JavaScript developer from the pain of not knowing what's going on! There might be typing improvements to be had, but claiming it as an alternate approach to handling this isn't correct. The typings can still be improved, of course. --- packages/apollo-server-core/src/ApolloServer.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/apollo-server-core/src/ApolloServer.ts b/packages/apollo-server-core/src/ApolloServer.ts index 6c21d422fc1..96bd943069a 100644 --- a/packages/apollo-server-core/src/ApolloServer.ts +++ b/packages/apollo-server-core/src/ApolloServer.ts @@ -186,7 +186,6 @@ export class ApolloServerBase { } = config; if (gateway && (modules || schema || typeDefs || resolvers)) { - // TODO: this could be handled by adjusting the typings to keep gateway configs and non-gateway configs seprate. throw new Error( 'Cannot define both `gateway` and any of: `modules`, `schema`, `typeDefs`, or `resolvers`', ); From 846e59ef01dfb26e2a56db9afb7fad90b1d0f3d2 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 24 Feb 2020 22:30:34 +0200 Subject: [PATCH 231/642] typings: Remove `any` type! --- packages/apollo-server-core/src/ApolloServer.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-core/src/ApolloServer.ts b/packages/apollo-server-core/src/ApolloServer.ts index 96bd943069a..5f3e5b0e1ea 100644 --- a/packages/apollo-server-core/src/ApolloServer.ts +++ b/packages/apollo-server-core/src/ApolloServer.ts @@ -422,7 +422,7 @@ export class ApolloServerBase { }); } - let constructedSchema; + let constructedSchema: GraphQLSchema; if (schema) { constructedSchema = schema; } else if (modules) { From ee4c9acf14df3b5985d6230fdecaabfc327b0b2c Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 24 Feb 2020 23:59:33 +0200 Subject: [PATCH 232/642] Use the same fetch response handling for the waterfall of GCS requests. Overall, the success/failure behavior should be expected to be similar for all of these requests, as they all access the same GCS store. --- .../src/loadServicesFromStorage.ts | 67 ++++++++++++++++--- 1 file changed, 59 insertions(+), 8 deletions(-) diff --git a/packages/apollo-gateway/src/loadServicesFromStorage.ts b/packages/apollo-gateway/src/loadServicesFromStorage.ts index 89d8f5bf260..48a294e8a28 100644 --- a/packages/apollo-gateway/src/loadServicesFromStorage.ts +++ b/packages/apollo-gateway/src/loadServicesFromStorage.ts @@ -50,6 +50,55 @@ function getStorageSecretUrl(graphId: string, apiKeyHash: string): string { return `${urlStorageSecretBase}/${graphId}/storage-secret/${apiKeyHash}.json`; } +function fetchApolloGcs( + fetcher: typeof fetch, + ...args: Parameters +): ReturnType { + const [input, init] = args; + + // Used in logging. + const url = typeof input === 'object' && input.url || input; + + return fetcher(input, init) + .catch(fetchError => { + throw new Error( + "Cannot access Apollo Graph Manager storage: " + fetchError) + }) + .then(async (response) => { + // If the fetcher has a cache and has implemented ETag validation, then + // a 304 response may be returned. Either way, we will return the + // non-JSON-parsed version and let the caller decide if that's important + // to their needs. + if (response.ok || response.status === 304) { + return response; + } + + // We won't make any assumptions that the body is anything but text, to + // avoid parsing errors in this unknown condition. + const body = await response.text(); + + // Google Cloud Storage returns an `application/xml` error under error + // conditions. We'll special-case our known errors, and resort to + // printing the body for others. + if (response.headers.get('content-type') === 'application/xml') { + if ( + response.status === 403 && + body.includes("AccessDenied") && + body.includes("Anonymous caller does not have storage.objects.get") + ) { + throw new Error( + "Unable to authenticate with Apollo Graph Manager storage " + + "while fetching " + url); + } + } + + // Normally, we'll try to keep the logs clean with errors we expect. + // If it's not a known error, reveal the full body for debugging. + throw new Error( + "Could not communicate with Apollo Graph Manager storage: " + body); + }); +}; + export async function getServiceDefinitionsFromStorage({ graphId, apiKeyHash, @@ -66,9 +115,9 @@ export async function getServiceDefinitionsFromStorage({ // fetch the storage secret const storageSecretUrl = getStorageSecretUrl(graphId, apiKeyHash); - const secret: string = await fetcher(storageSecretUrl).then(response => - response.json(), - ); + // The storage secret is a JSON string (e.g. `"secret"`). + const secret: string = + await fetchApolloGcs(fetcher, storageSecretUrl).then(res => res.json()); if (!graphVariant) { graphVariant = 'current'; @@ -76,17 +125,19 @@ export async function getServiceDefinitionsFromStorage({ const baseUrl = `${urlPartialSchemaBase}/${secret}/${graphVariant}/v${federationVersion}`; - const response = await fetcher(`${baseUrl}/composition-config-link`); + const compositionConfigResponse = + await fetchApolloGcs(fetcher, `${baseUrl}/composition-config-link`); - if (response.status === 304) { + if (compositionConfigResponse.status === 304) { return { isNewSchema: false }; } - const linkFileResult: LinkFileResult = await response.json(); + const linkFileResult: LinkFileResult = await compositionConfigResponse.json(); - const compositionMetadata: CompositionMetadata = await fetcher( + const compositionMetadata: CompositionMetadata = await fetchApolloGcs( + fetcher, `${urlPartialSchemaBase}/${linkFileResult.configPath}`, - ).then(response => response.json()); + ).then(res => res.json()); // It's important to maintain the original order here const serviceDefinitions = await Promise.all( From d8c682b3039aa3200fecb1f1d6bcce48829817de Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 25 Feb 2020 00:02:18 +0200 Subject: [PATCH 233/642] Do not prefix potentially the same error object on every request. Sometimes, the error object which is being caught here is in fact not a misconfiguration of server options, but rather an error which was thrown in a promise chain. By appending the "Invalid options provided to ApolloServer" string to the error object's `message` property in this method that is called on _every_ request to the server (`runHttpQuery`), we're risking appending the same prefix to the same error over and over (i.e. "a: a: a: a: a: b"). While this prefix may have been true at one point, it is no longer possible to enforce in a world where the schema is obtained asynchronously. --- packages/apollo-server-core/src/ApolloServer.ts | 9 +-------- packages/apollo-server-core/src/runHttpQuery.ts | 4 ---- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/packages/apollo-server-core/src/ApolloServer.ts b/packages/apollo-server-core/src/ApolloServer.ts index 5f3e5b0e1ea..bc49d591033 100644 --- a/packages/apollo-server-core/src/ApolloServer.ts +++ b/packages/apollo-server-core/src/ApolloServer.ts @@ -788,14 +788,7 @@ export class ApolloServerBase { } public async executeOperation(request: GraphQLRequest) { - let options; - - try { - options = await this.graphQLServerOptions(); - } catch (e) { - e.message = `Invalid options provided to ApolloServer: ${e.message}`; - throw new Error(e); - } + const options = await this.graphQLServerOptions(); if (typeof options.context === 'function') { options.context = (options.context as () => never)(); diff --git a/packages/apollo-server-core/src/runHttpQuery.ts b/packages/apollo-server-core/src/runHttpQuery.ts index 633c50daacd..c9d2d3ed0df 100644 --- a/packages/apollo-server-core/src/runHttpQuery.ts +++ b/packages/apollo-server-core/src/runHttpQuery.ts @@ -127,10 +127,6 @@ export async function runHttpQuery( // the normal options provided by the user, such as: formatError, // debug. Therefore, we need to do some unnatural things, such // as use NODE_ENV to determine the debug settings - e.message = `Invalid options provided to ApolloServer: ${e.message}`; - if (!debugDefault) { - e.warning = `To remove the stacktrace, set the NODE_ENV environment variable to production if the options creation can fail`; - } return throwHttpGraphQLError(500, [e], { debug: debugDefault }); } if (options.debug === undefined) { From c473f8896e6bcb7a26920c0691032c6a8748f0dc Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 27 Feb 2020 00:02:33 +0200 Subject: [PATCH 234/642] Ensure the `executor` is set in gateway mode after failed `load` recoveries. Previously, if the initial call to `load` failed, but its intention (fetching a federated schema configuration in managed federation) is eventually accomplished via a subsequent fetch (via setInterval polling), the `executor` would not be set. This resulted in a continued failure even if the `schema` was eventually set since federated `schema`s require the Gateway's `executor` to do pull off their much more complex (remote!) execution strategy! The solution was simple since `executor` was already present on the actual `ApolloGateway`, but that required exposing that property as a valid type to access from the interface that `ApolloGateway` implements: `GraphQLService`. I don't see why a `GraphQLService` wouldn't have an executor, so it seemed appropriate to add, particularly since our only `GraphQLService` is the `ApolloGateway` class itself. --- .../apollo-server-core/src/ApolloServer.ts | 12 ++++++++---- packages/apollo-server-core/src/types.ts | 14 +++++++++++++- .../src/ApolloServer.ts | 18 +++++++++++------- 3 files changed, 32 insertions(+), 12 deletions(-) diff --git a/packages/apollo-server-core/src/ApolloServer.ts b/packages/apollo-server-core/src/ApolloServer.ts index bc49d591033..da4b31b0eec 100644 --- a/packages/apollo-server-core/src/ApolloServer.ts +++ b/packages/apollo-server-core/src/ApolloServer.ts @@ -416,10 +416,14 @@ export class ApolloServerBase { } : undefined; - return gateway.load({ engine: engineConfig }).then(config => { - this.requestOptions.executor = config.executor; - return config.schema; - }); + // Set the executor whether the gateway 'load' call succeeds or not. + // If the schema becomes available eventually (after a setInterval retry) + // this executor will still be necessary in order to be able to support + // a federated schema! + this.requestOptions.executor = gateway.executor; + + return gateway.load({ engine: engineConfig }) + .then(config => config.schema); } let constructedSchema: GraphQLSchema; diff --git a/packages/apollo-server-core/src/types.ts b/packages/apollo-server-core/src/types.ts index 6eeb844a07f..ea23bd0a906 100644 --- a/packages/apollo-server-core/src/types.ts +++ b/packages/apollo-server-core/src/types.ts @@ -5,7 +5,13 @@ import { IMocks, GraphQLParseOptions, } from 'graphql-tools'; -import { ValueOrPromise, GraphQLExecutor } from 'apollo-server-types'; +import { + ValueOrPromise, + GraphQLExecutor, + GraphQLExecutionResult, + WithRequired, + GraphQLRequestContext, +} from 'apollo-server-types'; import { ConnectionContext } from 'subscriptions-transport-ws'; // The types for `ws` use `export = WebSocket`, so we'll use the // matching `import =` to bring in its sole export. @@ -87,6 +93,12 @@ export interface GraphQLService { engine?: GraphQLServiceEngineConfig; }): Promise; onSchemaChange(callback: SchemaChangeCallback): Unsubscriber; + executor( + requestContext: WithRequired< + GraphQLRequestContext, + 'document' | 'queryHash' | 'operationName' | 'operation' + >, + ): ValueOrPromise; } // This configuration is shared between all integrations and should include diff --git a/packages/apollo-server-integration-testsuite/src/ApolloServer.ts b/packages/apollo-server-integration-testsuite/src/ApolloServer.ts index 05219c78d8b..7e5ba8fcbae 100644 --- a/packages/apollo-server-integration-testsuite/src/ApolloServer.ts +++ b/packages/apollo-server-integration-testsuite/src/ApolloServer.ts @@ -116,9 +116,11 @@ const schema = new GraphQLSchema({ const makeGatewayMock = ({ optionsSpy = _options => {}, unsubscribeSpy = () => {}, + executor = () => ({}), }: { optionsSpy?: (_options: any) => void; unsubscribeSpy?: () => void; + executor?: GraphQLExecutor; } = {}) => { const eventuallyAssigned = { resolveLoad: null as ({ schema, executor }) => void, @@ -134,6 +136,7 @@ const makeGatewayMock = ({ }); const mockedGateway: GraphQLService = { + executor, load: options => { optionsSpy(options); return mockedLoadResults; @@ -354,13 +357,13 @@ export function testApolloServer( }); it("accepts a gateway's schema and calls its executor", async () => { - const { gateway, triggers } = makeGatewayMock(); - const executor = jest.fn(); executor.mockReturnValue( Promise.resolve({ data: { testString: 'hi - but federated!' } }), ); + const { gateway, triggers } = makeGatewayMock({ executor }); + triggers.resolveLoad({ schema, executor }); const { url: uri } = await createApolloServer({ @@ -2833,13 +2836,13 @@ export function testApolloServer( }), }); - const { gateway, triggers } = makeGatewayMock(); - const executor = req => (req.source as string).match(/1/) ? Promise.resolve({ data: { testString1: 'hello' } }) : Promise.resolve({ data: { testString2: 'aloha' } }); + const { gateway, triggers } = makeGatewayMock({ executor }); + triggers.resolveLoad({ schema: makeQueryTypeWithField('testString1'), executor, @@ -2895,7 +2898,6 @@ export function testApolloServer( }); it('waits until gateway has resolved a schema to respond to queries', async () => { - const { gateway, triggers } = makeGatewayMock(); const wait = ms => new Promise(resolve => setTimeout(resolve, ms)); let resolveExecutor; const executor = () => @@ -2905,6 +2907,8 @@ export function testApolloServer( }; }); + const { gateway, triggers } = makeGatewayMock({ executor }); + triggers.resolveLoad({ schema, executor }); const { url: uri } = await createApolloServer({ gateway, @@ -2941,8 +2945,6 @@ export function testApolloServer( }), }); - const { gateway, triggers } = makeGatewayMock(); - const makeEventuallyResolvingPromise = val => { let resolver; const promise = new Promise( @@ -2968,6 +2970,8 @@ export function testApolloServer( ? p2 : p3; + const { gateway, triggers } = makeGatewayMock({ executor }); + triggers.resolveLoad({ schema: makeQueryTypeWithField('testString1'), executor, From a30bee772ed15b05d07c8fc56e4857ad5cd89f1d Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 27 Feb 2020 00:36:33 +0200 Subject: [PATCH 235/642] Ensure that initial gateway `load` failures trap the downstream error. In particular, this blocks any rejected promises which may come from GCS load prior to returning them to the `schemaDerivedData` promise (which is where the `initSchema` method assigns the result to). Failure to do this results in the server middleware sending the error directly to the client. --- .../apollo-server-core/src/ApolloServer.ts | 12 ++++- .../src/ApolloServer.ts | 47 ++++++++++++++++++- 2 files changed, 57 insertions(+), 2 deletions(-) diff --git a/packages/apollo-server-core/src/ApolloServer.ts b/packages/apollo-server-core/src/ApolloServer.ts index da4b31b0eec..b4c352256fe 100644 --- a/packages/apollo-server-core/src/ApolloServer.ts +++ b/packages/apollo-server-core/src/ApolloServer.ts @@ -423,7 +423,17 @@ export class ApolloServerBase { this.requestOptions.executor = gateway.executor; return gateway.load({ engine: engineConfig }) - .then(config => config.schema); + .then(config => config.schema) + .catch(err => { + // We intentionally do not re-throw the exact error from the gateway + // configuration as it may contain implementation details and this + // error will propogate to the client. We will, however, log the error + // for observation in the logs. + const message = "This data graph lacks a valid configuration."; + console.error(message + " " + (err && err.message || err)); + throw new Error( + message + " More details may be available in the server logs."); + }); } let constructedSchema: GraphQLSchema; diff --git a/packages/apollo-server-integration-testsuite/src/ApolloServer.ts b/packages/apollo-server-integration-testsuite/src/ApolloServer.ts index 7e5ba8fcbae..d782758448e 100644 --- a/packages/apollo-server-integration-testsuite/src/ApolloServer.ts +++ b/packages/apollo-server-integration-testsuite/src/ApolloServer.ts @@ -124,15 +124,19 @@ const makeGatewayMock = ({ } = {}) => { const eventuallyAssigned = { resolveLoad: null as ({ schema, executor }) => void, + rejectLoad: null as (err: Error) => void, triggerSchemaChange: null as (newSchema) => void, }; const mockedLoadResults = new Promise<{ schema: GraphQLSchema; executor: GraphQLExecutor; - }>(resolve => { + }>((resolve, reject) => { eventuallyAssigned.resolveLoad = ({ schema, executor }) => { resolve({ schema, executor }); }; + eventuallyAssigned.rejectLoad = (err: Error) => { + reject(err); + }; }); const mockedGateway: GraphQLService = { @@ -379,6 +383,47 @@ export function testApolloServer( expect(executor).toHaveBeenCalled(); }); + it("rejected load promise acts as an error boundary", async () => { + const executor = jest.fn(); + executor.mockResolvedValueOnce( + { data: { testString: 'should not get this' } } + ); + + executor.mockRejectedValueOnce( + { errors: [{errorWhichShouldNot: "ever be triggered"}] } + ); + + const consoleErrorSpy = + jest.spyOn(console, 'error').mockImplementation(); + + const { gateway, triggers } = makeGatewayMock({ executor }); + + triggers.rejectLoad(new Error("load error which should be masked")); + + const { url: uri } = await createApolloServer({ + gateway, + subscriptions: false, + }); + + const apolloFetch = createApolloFetch({ uri }); + const result = await apolloFetch({ query: '{testString}' }); + + expect(result.data).toBeUndefined(); + expect(result.errors).toContainEqual( + expect.objectContaining({ + extensions: expect.objectContaining({ + code: "INTERNAL_SERVER_ERROR", + }), + message: "This data graph lacks a valid configuration. " + + "More details may be available in the server logs." + }) + ); + expect(consoleErrorSpy).toHaveBeenCalledWith( + "This data graph lacks a valid configuration. " + + "load error which should be masked"); + expect(executor).not.toHaveBeenCalled(); + }); + it('uses schema over resolvers + typeDefs', async () => { const typeDefs = gql` type Query { From 99229fe1218324973029eba70c84978b08f79897 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 27 Feb 2020 00:08:41 +0200 Subject: [PATCH 236/642] Allow other middleware (e.g. Playground) when initial Gateway load fails. Another approach to this would be to throw an error here, but this is our only opportunity to allow the server to recover after initial failure. On the one hand, this approach is more graceful, but on the other hand, perhaps we actually want initial failure (after timeouts elapse) to not bind the other middleware. Either way, the server doesn't just `process.exit` right now, and with certain non-Node.js environments, it may be worthwhile to operate in this mode. --- packages/apollo-server-core/src/ApolloServer.ts | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/packages/apollo-server-core/src/ApolloServer.ts b/packages/apollo-server-core/src/ApolloServer.ts index b4c352256fe..c5bab2dea9e 100644 --- a/packages/apollo-server-core/src/ApolloServer.ts +++ b/packages/apollo-server-core/src/ApolloServer.ts @@ -573,7 +573,20 @@ export class ApolloServerBase { } protected async willStart() { - const { schema, schemaHash } = await this.schemaDerivedData; + try { + var { schema, schemaHash } = await this.schemaDerivedData; + } catch (err) { + // The `schemaDerivedData` can throw if the Promise it points to does not + // resolve with a `GraphQLSchema`. As errors from `willStart` are start-up + // errors, other Apollo middleware after us will not be called, including + // our health check, CORS, etc. + // + // Returning here allows the integration's other Apollo middleware to + // function properly in the event of a failure to obtain the data graph + // configuration from the gateway's `load` method during initialization. + return; + } + const service: GraphQLServiceContext = { schema: schema, schemaHash: schemaHash, From f878c7fbd662d6e7d815a8a7a4658ee4e0cdaea6 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 27 Feb 2020 22:54:36 +0200 Subject: [PATCH 237/642] Ensure the `executor` is still set on `ApolloServer` when `load` rejects. Because we want the actual executor to work when a schema might eventually become available, as it may when `onSchemaChange` hooks eventually succeed. --- .../src/__tests__/gateway/executor.test.ts | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/packages/apollo-gateway/src/__tests__/gateway/executor.test.ts b/packages/apollo-gateway/src/__tests__/gateway/executor.test.ts index 9d73387ab14..ef2675ad928 100644 --- a/packages/apollo-gateway/src/__tests__/gateway/executor.test.ts +++ b/packages/apollo-gateway/src/__tests__/gateway/executor.test.ts @@ -6,6 +6,7 @@ import * as books from '../__fixtures__/schemas/books'; import * as inventory from '../__fixtures__/schemas/inventory'; import * as product from '../__fixtures__/schemas/product'; import * as reviews from '../__fixtures__/schemas/reviews'; +import { ApolloServer } from "apollo-server"; describe('ApolloGateway executor', () => { it('validates requests prior to execution', async () => { @@ -35,4 +36,24 @@ describe('ApolloGateway executor', () => { 'Variable "$first" got invalid value "3"; Expected type Int.', ); }); + + it('still sets the ApolloServer executor on load rejection', async () => { + jest.spyOn(console, 'error').mockImplementation(); + + const gateway = new ApolloGateway({ + // Empty service list will throw, which is what we want. + serviceList: [], + }); + + const server = new ApolloServer({ + gateway, + subscriptions: false, + }); + + // Ensure the throw happens to maintain the correctness of this test. + await expect( + server.executeOperation({ query: '{ __typename }' })).rejects.toThrow(); + + expect(server.requestOptions.executor).toStrictEqual(gateway.executor); + }); }); From 4f2fbffe6e2f41a960e958c255055c70d72241f8 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 27 Feb 2020 22:55:20 +0200 Subject: [PATCH 238/642] Expect the expected errors, rather than swallowing them. --- .../src/__tests__/gateway/lifecycle-hooks.test.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/apollo-gateway/src/__tests__/gateway/lifecycle-hooks.test.ts b/packages/apollo-gateway/src/__tests__/gateway/lifecycle-hooks.test.ts index 3b3f31dd692..267c15cc984 100644 --- a/packages/apollo-gateway/src/__tests__/gateway/lifecycle-hooks.test.ts +++ b/packages/apollo-gateway/src/__tests__/gateway/lifecycle-hooks.test.ts @@ -56,9 +56,7 @@ describe('lifecycle hooks', () => { experimental_didFailComposition, }); - try { - await gateway.load(); - } catch {} + await expect(gateway.load()).rejects.toThrowError(); const callbackArgs = experimental_didFailComposition.mock.calls[0][0]; expect(callbackArgs.serviceList).toHaveLength(1); From 03038e34d005aa1d7e23b1c8da3728cd5805d4df Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 3 Mar 2020 12:19:03 -0800 Subject: [PATCH 239/642] Update packages/apollo-gateway/src/__tests__/gateway/executor.test.ts Co-Authored-By: Trevor Scheer --- packages/apollo-gateway/src/__tests__/gateway/executor.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-gateway/src/__tests__/gateway/executor.test.ts b/packages/apollo-gateway/src/__tests__/gateway/executor.test.ts index ef2675ad928..7e8a7490f64 100644 --- a/packages/apollo-gateway/src/__tests__/gateway/executor.test.ts +++ b/packages/apollo-gateway/src/__tests__/gateway/executor.test.ts @@ -54,6 +54,6 @@ describe('ApolloGateway executor', () => { await expect( server.executeOperation({ query: '{ __typename }' })).rejects.toThrow(); - expect(server.requestOptions.executor).toStrictEqual(gateway.executor); + expect(server.requestOptions.executor).toBe(gateway.executor); }); }); From 4d4ab5b8219449d34e01d854371d141fdfea8b33 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 3 Mar 2020 17:07:16 -0800 Subject: [PATCH 240/642] Update packages/apollo-gateway/src/loadServicesFromStorage.ts Co-Authored-By: Trevor Scheer --- .../src/loadServicesFromStorage.ts | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/packages/apollo-gateway/src/loadServicesFromStorage.ts b/packages/apollo-gateway/src/loadServicesFromStorage.ts index 48a294e8a28..e42f1aed2fa 100644 --- a/packages/apollo-gateway/src/loadServicesFromStorage.ts +++ b/packages/apollo-gateway/src/loadServicesFromStorage.ts @@ -80,16 +80,15 @@ function fetchApolloGcs( // Google Cloud Storage returns an `application/xml` error under error // conditions. We'll special-case our known errors, and resort to // printing the body for others. - if (response.headers.get('content-type') === 'application/xml') { - if ( - response.status === 403 && - body.includes("AccessDenied") && - body.includes("Anonymous caller does not have storage.objects.get") - ) { - throw new Error( - "Unable to authenticate with Apollo Graph Manager storage " + - "while fetching " + url); - } + if ( + response.headers.get('content-type') === 'application/xml' && + response.status === 403 && + body.includes("AccessDenied") && + body.includes("Anonymous caller does not have storage.objects.get") + ) { + throw new Error( + Unable to authenticate with Apollo Graph Manager storage " + + "while fetching " + url); } // Normally, we'll try to keep the logs clean with errors we expect. From 0a50943e7e2173b0aa6c9d976e7b7cd5a345d65c Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Wed, 4 Mar 2020 07:41:10 -0800 Subject: [PATCH 241/642] Revert "Update packages/apollo-gateway/src/loadServicesFromStorage.ts" This reverts commit 4d4ab5b8219449d34e01d854371d141fdfea8b33. --- .../src/loadServicesFromStorage.ts | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/packages/apollo-gateway/src/loadServicesFromStorage.ts b/packages/apollo-gateway/src/loadServicesFromStorage.ts index e42f1aed2fa..48a294e8a28 100644 --- a/packages/apollo-gateway/src/loadServicesFromStorage.ts +++ b/packages/apollo-gateway/src/loadServicesFromStorage.ts @@ -80,15 +80,16 @@ function fetchApolloGcs( // Google Cloud Storage returns an `application/xml` error under error // conditions. We'll special-case our known errors, and resort to // printing the body for others. - if ( - response.headers.get('content-type') === 'application/xml' && - response.status === 403 && - body.includes("AccessDenied") && - body.includes("Anonymous caller does not have storage.objects.get") - ) { - throw new Error( - Unable to authenticate with Apollo Graph Manager storage " + - "while fetching " + url); + if (response.headers.get('content-type') === 'application/xml') { + if ( + response.status === 403 && + body.includes("AccessDenied") && + body.includes("Anonymous caller does not have storage.objects.get") + ) { + throw new Error( + "Unable to authenticate with Apollo Graph Manager storage " + + "while fetching " + url); + } } // Normally, we'll try to keep the logs clean with errors we expect. From 554e20c6ff7bf952020de99ab9f352ff9c1a83f9 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 3 Mar 2020 17:07:16 -0800 Subject: [PATCH 242/642] Re-apply 4d4ab5b8: apollo-gateway/src/loadServicesFromStorage.ts To correct the syntax error. Co-Authored-By: Trevor Scheer --- .../apollo-gateway/src/loadServicesFromStorage.ts | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/packages/apollo-gateway/src/loadServicesFromStorage.ts b/packages/apollo-gateway/src/loadServicesFromStorage.ts index 48a294e8a28..79ef860b656 100644 --- a/packages/apollo-gateway/src/loadServicesFromStorage.ts +++ b/packages/apollo-gateway/src/loadServicesFromStorage.ts @@ -80,16 +80,15 @@ function fetchApolloGcs( // Google Cloud Storage returns an `application/xml` error under error // conditions. We'll special-case our known errors, and resort to // printing the body for others. - if (response.headers.get('content-type') === 'application/xml') { - if ( - response.status === 403 && - body.includes("AccessDenied") && - body.includes("Anonymous caller does not have storage.objects.get") - ) { + if ( + response.headers.get('content-type') === 'application/xml' && + response.status === 403 && + body.includes("AccessDenied") && + body.includes("Anonymous caller does not have storage.objects.get") + ) { throw new Error( "Unable to authenticate with Apollo Graph Manager storage " + "while fetching " + url); - } } // Normally, we'll try to keep the logs clean with errors we expect. From a75a366d1ad5a0404b96d08b04e0bc1a14808db2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 6 Mar 2020 01:14:20 +0000 Subject: [PATCH 243/642] chore(deps): update dependency gatsby-theme-apollo-docs to v4.0.13 (#3856) Co-authored-by: WhiteSource Renovate --- docs/package-lock.json | 278 +++++++++++++++++++++++++---------------- docs/package.json | 2 +- 2 files changed, 170 insertions(+), 110 deletions(-) diff --git a/docs/package-lock.json b/docs/package-lock.json index 085581d9fa8..7ee058e28cb 100644 --- a/docs/package-lock.json +++ b/docs/package-lock.json @@ -1889,9 +1889,9 @@ "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" }, "@babel/types": { - "version": "7.8.6", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.6.tgz", - "integrity": "sha512-wqz7pgWMIrht3gquyEFPVXeXCti72Rm8ep9b5tQKz9Yg9LzJA3HxosF1SB3Kc81KD1A3XBkkVYtJvCKS2Z/QrA==", + "version": "7.8.7", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.7.tgz", + "integrity": "sha512-k2TreEHxFA4CjGkL+GYjRyx35W0Mr7DP5+9q6WMkyKXB+904bYmG40syjMFV0oLlhhFCwWl0vA0DyzTDkwAiJw==", "requires": { "esutils": "^2.0.2", "lodash": "^4.17.13", @@ -2061,9 +2061,9 @@ } }, "@babel/plugin-transform-typescript": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.8.3.tgz", - "integrity": "sha512-Ebj230AxcrKGZPKIp4g4TdQLrqX95TobLUWKd/CwG7X1XHUH1ZpkpFvXuXqWbtGRWb7uuEWNlrl681wsOArAdQ==", + "version": "7.8.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.8.7.tgz", + "integrity": "sha512-7O0UsPQVNKqpHeHLpfvOG4uXmlw+MOxYvUv6Otc9uH5SYMIxvF6eBdjkWvC3f9G+VXe0RsNExyAQBeTRug/wqQ==", "requires": { "@babel/helper-create-class-features-plugin": "^7.8.3", "@babel/helper-plugin-utils": "^7.8.3", @@ -2369,9 +2369,9 @@ } }, "@emotion/cache": { - "version": "10.0.27", - "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-10.0.27.tgz", - "integrity": "sha512-Zp8BEpbMunFsTcqAK4D7YTm3MvCp1SekflSLJH8lze2fCcSZ/yMkXHo8kb3t1/1Tdd3hAqf3Fb7z9VZ+FMiC9w==", + "version": "10.0.29", + "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-10.0.29.tgz", + "integrity": "sha512-fU2VtSVlHiF27empSbxi1O2JFdNWZO+2NFHfwO0pxgTep6Xa3uGb+3pVKfLww2l/IBGLNEZl5Xf/++A4wAYDYQ==", "requires": { "@emotion/sheet": "0.9.4", "@emotion/stylis": "0.8.5", @@ -2403,9 +2403,9 @@ } }, "@emotion/hash": { - "version": "0.7.4", - "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.7.4.tgz", - "integrity": "sha512-fxfMSBMX3tlIbKUdtGKxqB1fyrH6gVrX39Gsv3y8lRYKUqlgDt3UMqQyGnR1bQMa2B8aGnhLZokZgg8vT0Le+A==" + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.8.0.tgz", + "integrity": "sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==" }, "@emotion/is-prop-valid": { "version": "0.8.7", @@ -2421,11 +2421,11 @@ "integrity": "sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw==" }, "@emotion/serialize": { - "version": "0.11.15", - "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-0.11.15.tgz", - "integrity": "sha512-YE+qnrmGwyR+XB5j7Bi+0GT1JWsdcjM/d4POu+TXkcnrRs4RFCCsi3d/Ebf+wSStHqAlTT2+dfd+b9N9EO2KBg==", + "version": "0.11.16", + "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-0.11.16.tgz", + "integrity": "sha512-G3J4o8by0VRrO+PFeSc3js2myYNOXVJ3Ya+RGVxnshRYgsvErfAOglKAiy1Eo1vhzxqtUvjCyS5gtewzkmvSSg==", "requires": { - "@emotion/hash": "0.7.4", + "@emotion/hash": "0.8.0", "@emotion/memoize": "0.7.4", "@emotion/unitless": "0.7.5", "@emotion/utils": "0.11.3", @@ -2618,9 +2618,9 @@ } }, "@babel/types": { - "version": "7.8.6", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.6.tgz", - "integrity": "sha512-wqz7pgWMIrht3gquyEFPVXeXCti72Rm8ep9b5tQKz9Yg9LzJA3HxosF1SB3Kc81KD1A3XBkkVYtJvCKS2Z/QrA==", + "version": "7.8.7", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.7.tgz", + "integrity": "sha512-k2TreEHxFA4CjGkL+GYjRyx35W0Mr7DP5+9q6WMkyKXB+904bYmG40syjMFV0oLlhhFCwWl0vA0DyzTDkwAiJw==", "requires": { "esutils": "^2.0.2", "lodash": "^4.17.13", @@ -3916,14 +3916,14 @@ } }, "babel-plugin-emotion": { - "version": "10.0.28", - "resolved": "https://registry.npmjs.org/babel-plugin-emotion/-/babel-plugin-emotion-10.0.28.tgz", - "integrity": "sha512-h25EMmPxYVNOgsEkGIjCv2Ok+HzW/e/b5lf2v2U17T9k6y6g0ku3TG9b+jy94ZrqMh+b/njRF4uOQrwVr28QfQ==", + "version": "10.0.29", + "resolved": "https://registry.npmjs.org/babel-plugin-emotion/-/babel-plugin-emotion-10.0.29.tgz", + "integrity": "sha512-7Jpi1OCxjyz0k163lKtqP+LHMg5z3S6A7vMBfHnF06l2unmtsOmFDzZBpGf0CWo1G4m8UACfVcDJiSiRuu/cSw==", "requires": { "@babel/helper-module-imports": "^7.0.0", - "@emotion/hash": "0.7.4", + "@emotion/hash": "0.8.0", "@emotion/memoize": "0.7.4", - "@emotion/serialize": "^0.11.15", + "@emotion/serialize": "^0.11.16", "babel-plugin-macros": "^2.0.0", "babel-plugin-syntax-jsx": "^6.18.0", "convert-source-map": "^1.5.0", @@ -5205,9 +5205,9 @@ "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=" }, "clipboard": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.4.tgz", - "integrity": "sha512-Vw26VSLRpJfBofiVaFb/I8PVfdI1OxKcYShe6fm0sP/DtmiWQNCjhM/okTvdCo0G+lMMm1rMYbk4IK4x1X+kgQ==", + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.6.tgz", + "integrity": "sha512-g5zbiixBRk/wyKakSwCKd7vQXDjFnAMGHoEyBogG/bw9kTD9GvdAvaoRR1ALcEzt3pVKxZR0pViekPMIS0QyGg==", "optional": true, "requires": { "good-listener": "^1.2.2", @@ -9393,21 +9393,26 @@ } }, "gatsby-plugin-emotion": { - "version": "4.1.22", - "resolved": "https://registry.npmjs.org/gatsby-plugin-emotion/-/gatsby-plugin-emotion-4.1.22.tgz", - "integrity": "sha512-XG9YpkyUgbTHs/Uq7W6tDVDVQ2XHlj9rHPhCYiZHlJTdrJIHhviousHZ8+vEI/h0FQ4oW/Hs0CuX2gi5SlvWSQ==", + "version": "4.1.23", + "resolved": "https://registry.npmjs.org/gatsby-plugin-emotion/-/gatsby-plugin-emotion-4.1.23.tgz", + "integrity": "sha512-SP3hGbyj2Kq42iIS9tDR6aZMvBsbH7GhPizfmr+1L1KxYjFedjd3U/gWa346wJbvtiwnSkeoLZKMUATX4w1VCA==", "requires": { "@babel/runtime": "^7.7.6", "@emotion/babel-preset-css-prop": "^10.0.23" }, "dependencies": { "@babel/runtime": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.4.tgz", - "integrity": "sha512-neAp3zt80trRVBI1x0azq6c57aNBqYZH8KhMm3TaB7wEI5Q4A2SHfBHE8w9gOhI/lrqxtEbXZgQIrHP+wvSGwQ==", + "version": "7.8.7", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.7.tgz", + "integrity": "sha512-+AATMUFppJDw6aiR5NVPHqIQBlV/Pj8wY/EZH+lmvRdUo9xBaz/rF3alAwFJQavvKfeOlPE7oaaDHVbcySbCsg==", "requires": { - "regenerator-runtime": "^0.13.2" + "regenerator-runtime": "^0.13.4" } + }, + "regenerator-runtime": { + "version": "0.13.4", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.4.tgz", + "integrity": "sha512-plpwicqEzfEyTQohIKktWigcLzmNStMGwbOUbykx51/29Z3JOGYldaaNGK7ngNXV+UcoqvIMmloZ48Sr74sd+g==" } } }, @@ -9421,19 +9426,24 @@ }, "dependencies": { "@babel/runtime": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.4.tgz", - "integrity": "sha512-neAp3zt80trRVBI1x0azq6c57aNBqYZH8KhMm3TaB7wEI5Q4A2SHfBHE8w9gOhI/lrqxtEbXZgQIrHP+wvSGwQ==", + "version": "7.8.7", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.7.tgz", + "integrity": "sha512-+AATMUFppJDw6aiR5NVPHqIQBlV/Pj8wY/EZH+lmvRdUo9xBaz/rF3alAwFJQavvKfeOlPE7oaaDHVbcySbCsg==", "requires": { - "regenerator-runtime": "^0.13.2" + "regenerator-runtime": "^0.13.4" } + }, + "regenerator-runtime": { + "version": "0.13.4", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.4.tgz", + "integrity": "sha512-plpwicqEzfEyTQohIKktWigcLzmNStMGwbOUbykx51/29Z3JOGYldaaNGK7ngNXV+UcoqvIMmloZ48Sr74sd+g==" } } }, "gatsby-plugin-mdx": { - "version": "1.0.74", - "resolved": "https://registry.npmjs.org/gatsby-plugin-mdx/-/gatsby-plugin-mdx-1.0.74.tgz", - "integrity": "sha512-mN+68a1qmsNEC6zDDUFCbEUJ2a/1E7S7tlidFUy7doOAMVYkpvfJBpBI3IPoGHiIaOIreo0jj7BRDI6NA9nlxQ==", + "version": "1.0.75", + "resolved": "https://registry.npmjs.org/gatsby-plugin-mdx/-/gatsby-plugin-mdx-1.0.75.tgz", + "integrity": "sha512-CMjAk8EbQh7uufWenUG4yQJ7fa7Jitp8txJmlIwxm4+xgKlrMvmJ9fg5PhDFlCjG8t09mxoJt8dlh8izJZXQwg==", "requires": { "@babel/core": "^7.7.5", "@babel/generator": "^7.7.4", @@ -9473,9 +9483,9 @@ }, "dependencies": { "@babel/types": { - "version": "7.8.6", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.6.tgz", - "integrity": "sha512-wqz7pgWMIrht3gquyEFPVXeXCti72Rm8ep9b5tQKz9Yg9LzJA3HxosF1SB3Kc81KD1A3XBkkVYtJvCKS2Z/QrA==", + "version": "7.8.7", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.7.tgz", + "integrity": "sha512-k2TreEHxFA4CjGkL+GYjRyx35W0Mr7DP5+9q6WMkyKXB+904bYmG40syjMFV0oLlhhFCwWl0vA0DyzTDkwAiJw==", "requires": { "esutils": "^2.0.2", "lodash": "^4.17.13", @@ -9556,12 +9566,17 @@ }, "dependencies": { "@babel/runtime": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.4.tgz", - "integrity": "sha512-neAp3zt80trRVBI1x0azq6c57aNBqYZH8KhMm3TaB7wEI5Q4A2SHfBHE8w9gOhI/lrqxtEbXZgQIrHP+wvSGwQ==", + "version": "7.8.7", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.7.tgz", + "integrity": "sha512-+AATMUFppJDw6aiR5NVPHqIQBlV/Pj8wY/EZH+lmvRdUo9xBaz/rF3alAwFJQavvKfeOlPE7oaaDHVbcySbCsg==", "requires": { - "regenerator-runtime": "^0.13.2" + "regenerator-runtime": "^0.13.4" } + }, + "regenerator-runtime": { + "version": "0.13.4", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.4.tgz", + "integrity": "sha512-plpwicqEzfEyTQohIKktWigcLzmNStMGwbOUbykx51/29Z3JOGYldaaNGK7ngNXV+UcoqvIMmloZ48Sr74sd+g==" } } }, @@ -9616,13 +9631,18 @@ }, "dependencies": { "@babel/runtime": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.4.tgz", - "integrity": "sha512-neAp3zt80trRVBI1x0azq6c57aNBqYZH8KhMm3TaB7wEI5Q4A2SHfBHE8w9gOhI/lrqxtEbXZgQIrHP+wvSGwQ==", + "version": "7.8.7", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.7.tgz", + "integrity": "sha512-+AATMUFppJDw6aiR5NVPHqIQBlV/Pj8wY/EZH+lmvRdUo9xBaz/rF3alAwFJQavvKfeOlPE7oaaDHVbcySbCsg==", "requires": { - "regenerator-runtime": "^0.13.2" + "regenerator-runtime": "^0.13.4" } }, + "regenerator-runtime": { + "version": "0.13.4", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.4.tgz", + "integrity": "sha512-plpwicqEzfEyTQohIKktWigcLzmNStMGwbOUbykx51/29Z3JOGYldaaNGK7ngNXV+UcoqvIMmloZ48Sr74sd+g==" + }, "unist-util-visit": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.4.1.tgz", @@ -9651,6 +9671,44 @@ } } }, + "gatsby-remark-code-titles": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/gatsby-remark-code-titles/-/gatsby-remark-code-titles-1.1.0.tgz", + "integrity": "sha512-RuNqziXi99eBIj5NJP0TgdzAxzWFL+ArGRb3961Ff9Tto/nCvmyqR1qySaWKXtkOgeqoVUlqAFNUCyEAyNuc8w==", + "requires": { + "query-string": "~6.0.0", + "unist-util-visit": "~1.3.0" + }, + "dependencies": { + "query-string": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/query-string/-/query-string-6.0.0.tgz", + "integrity": "sha1-i485RHtz6CkNb141gXeSGOkXEUI=", + "requires": { + "decode-uri-component": "^0.2.0", + "strict-uri-encode": "^2.0.0" + } + }, + "strict-uri-encode": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz", + "integrity": "sha1-ucczDHBChi9rFC3CdLvMWGbONUY=" + }, + "unist-util-is": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-2.1.3.tgz", + "integrity": "sha512-4WbQX2iwfr/+PfM4U3zd2VNXY+dWtZsN1fLnWEi2QQXA4qyDYAZcDMfXUX0Cu6XZUHHAO9q4nyxxLT4Awk1qUA==" + }, + "unist-util-visit": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.3.1.tgz", + "integrity": "sha512-0fdB9EQJU0tho5tK0VzOJzAQpPv2LyLZ030b10GxuzAWEfvd54mpY7BMjQ1L69k2YNvL+SvxRzH0yUIehOO8aA==", + "requires": { + "unist-util-is": "^2.1.1" + } + } + } + }, "gatsby-remark-copy-linked-files": { "version": "2.1.37", "resolved": "https://registry.npmjs.org/gatsby-remark-copy-linked-files/-/gatsby-remark-copy-linked-files-2.1.37.tgz", @@ -9667,11 +9725,11 @@ }, "dependencies": { "@babel/runtime": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.4.tgz", - "integrity": "sha512-neAp3zt80trRVBI1x0azq6c57aNBqYZH8KhMm3TaB7wEI5Q4A2SHfBHE8w9gOhI/lrqxtEbXZgQIrHP+wvSGwQ==", + "version": "7.8.7", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.7.tgz", + "integrity": "sha512-+AATMUFppJDw6aiR5NVPHqIQBlV/Pj8wY/EZH+lmvRdUo9xBaz/rF3alAwFJQavvKfeOlPE7oaaDHVbcySbCsg==", "requires": { - "regenerator-runtime": "^0.13.2" + "regenerator-runtime": "^0.13.4" } }, "cheerio": { @@ -9709,6 +9767,11 @@ "@types/node": "*" } }, + "regenerator-runtime": { + "version": "0.13.4", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.4.tgz", + "integrity": "sha512-plpwicqEzfEyTQohIKktWigcLzmNStMGwbOUbykx51/29Z3JOGYldaaNGK7ngNXV+UcoqvIMmloZ48Sr74sd+g==" + }, "unist-util-visit": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.4.1.tgz", @@ -9740,9 +9803,9 @@ } }, "gatsby-remark-prismjs": { - "version": "3.3.31", - "resolved": "https://registry.npmjs.org/gatsby-remark-prismjs/-/gatsby-remark-prismjs-3.3.31.tgz", - "integrity": "sha512-n6tczCq/w5LazZ5yk9UXu/6YjyLR7p1rQbBxqgkOL1xEFRmQcK5BwFhcpmCh5OKiqWBvqLDJq561UIFL0jcI/A==", + "version": "3.3.32", + "resolved": "https://registry.npmjs.org/gatsby-remark-prismjs/-/gatsby-remark-prismjs-3.3.32.tgz", + "integrity": "sha512-n/9VLOs5xNOgGQj4m1//PVmvQLEgbmLPqQo5/Hmuw4b+x76KFHfZGVrvwUHpSB0/yCrv6UCykOFI5J8ZxPXjkg==", "requires": { "@babel/runtime": "^7.7.6", "parse-numeric-range": "^0.0.2", @@ -9750,31 +9813,18 @@ }, "dependencies": { "@babel/runtime": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.4.tgz", - "integrity": "sha512-neAp3zt80trRVBI1x0azq6c57aNBqYZH8KhMm3TaB7wEI5Q4A2SHfBHE8w9gOhI/lrqxtEbXZgQIrHP+wvSGwQ==", + "version": "7.8.7", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.7.tgz", + "integrity": "sha512-+AATMUFppJDw6aiR5NVPHqIQBlV/Pj8wY/EZH+lmvRdUo9xBaz/rF3alAwFJQavvKfeOlPE7oaaDHVbcySbCsg==", "requires": { - "regenerator-runtime": "^0.13.2" + "regenerator-runtime": "^0.13.4" } }, - "unist-util-visit": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.4.1.tgz", - "integrity": "sha512-AvGNk7Bb//EmJZyhtRUnNMEpId/AZ5Ph/KUpTI09WHQuDZHKovQ1oEv3mfmKpWKtoMzyMC4GLBm1Zy5k12fjIw==", - "requires": { - "unist-util-visit-parents": "^2.0.0" - } - } - } - }, - "gatsby-remark-prismjs-title": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/gatsby-remark-prismjs-title/-/gatsby-remark-prismjs-title-1.0.0.tgz", - "integrity": "sha512-VKAw7LGAbzyDlztUfhOri+jDTjLyOPCJCNgkdt2+61+SP8M9wYzzma8NvVyzHP7J9hx0jcYq8F50XQH5dE42ow==", - "requires": { - "unist-util-visit": "~1.4.0" - }, - "dependencies": { + "regenerator-runtime": { + "version": "0.13.4", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.4.tgz", + "integrity": "sha512-plpwicqEzfEyTQohIKktWigcLzmNStMGwbOUbykx51/29Z3JOGYldaaNGK7ngNXV+UcoqvIMmloZ48Sr74sd+g==" + }, "unist-util-visit": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.4.1.tgz", @@ -9816,17 +9866,22 @@ }, "dependencies": { "@babel/runtime": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.4.tgz", - "integrity": "sha512-neAp3zt80trRVBI1x0azq6c57aNBqYZH8KhMm3TaB7wEI5Q4A2SHfBHE8w9gOhI/lrqxtEbXZgQIrHP+wvSGwQ==", + "version": "7.8.7", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.7.tgz", + "integrity": "sha512-+AATMUFppJDw6aiR5NVPHqIQBlV/Pj8wY/EZH+lmvRdUo9xBaz/rF3alAwFJQavvKfeOlPE7oaaDHVbcySbCsg==", "requires": { - "regenerator-runtime": "^0.13.2" + "regenerator-runtime": "^0.13.4" } }, "bluebird": { "version": "3.7.2", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" + }, + "regenerator-runtime": { + "version": "0.13.4", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.4.tgz", + "integrity": "sha512-plpwicqEzfEyTQohIKktWigcLzmNStMGwbOUbykx51/29Z3JOGYldaaNGK7ngNXV+UcoqvIMmloZ48Sr74sd+g==" } } }, @@ -9981,9 +10036,9 @@ } }, "gatsby-theme-apollo-core": { - "version": "3.0.9", - "resolved": "https://registry.npmjs.org/gatsby-theme-apollo-core/-/gatsby-theme-apollo-core-3.0.9.tgz", - "integrity": "sha512-P6Y+uB25VdX72cfsjRb6r1aJYAG2Wnqrgq/goXbaADliikfoJIV41Ld5v1IdH15KFGD0AMHdNFt9y93Q90uiYg==", + "version": "3.0.10", + "resolved": "https://registry.npmjs.org/gatsby-theme-apollo-core/-/gatsby-theme-apollo-core-3.0.10.tgz", + "integrity": "sha512-vXh1Yu1H2mdDCtuoc6UVGhXLwxXzN4YmWgnweEW+e1ZQYH1WKYQhMM/XjuUQUxXz0aI34y7IZeL3rvXUiDhh9Q==", "requires": { "@apollo/space-kit": "2.15.0", "@emotion/core": "^10.0.7", @@ -10002,9 +10057,9 @@ } }, "gatsby-theme-apollo-docs": { - "version": "4.0.10", - "resolved": "https://registry.npmjs.org/gatsby-theme-apollo-docs/-/gatsby-theme-apollo-docs-4.0.10.tgz", - "integrity": "sha512-w0kc1c1JI5JuxwyE3AhGEUwftGoaPXhFXeWFWp+QezvHs8YENzpI0pByQrC4Y6iqU09GuTuOktlc/Hi9pObcdQ==", + "version": "4.0.13", + "resolved": "https://registry.npmjs.org/gatsby-theme-apollo-docs/-/gatsby-theme-apollo-docs-4.0.13.tgz", + "integrity": "sha512-584b21cJmmT/7WyEoSKgxLRJUtRsLrapQWThxRUN8+pQMn4rv+jzAfkOwwNf1l7ahbKRWrA1Gnb/hF0bmaOuAw==", "requires": { "@mdx-js/mdx": "^1.1.0", "@mdx-js/react": "^1.0.27", @@ -10013,14 +10068,14 @@ "gatsby-plugin-segment-js": "^3.0.1", "gatsby-remark-autolink-headers": "^2.0.16", "gatsby-remark-check-links": "^2.1.0", + "gatsby-remark-code-titles": "^1.1.0", "gatsby-remark-copy-linked-files": "^2.0.12", "gatsby-remark-mermaid": "^1.2.0", "gatsby-remark-prismjs": "^3.2.8", - "gatsby-remark-prismjs-title": "^1.0.0", "gatsby-remark-rewrite-relative-links": "^1.0.7", "gatsby-source-filesystem": "^2.0.29", "gatsby-source-git": "^1.0.1", - "gatsby-theme-apollo-core": "^3.0.9", + "gatsby-theme-apollo-core": "^3.0.10", "gatsby-transformer-remark": "^2.6.30", "js-yaml": "^3.13.1", "prismjs": "^1.15.0", @@ -10063,11 +10118,11 @@ }, "dependencies": { "@babel/runtime": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.4.tgz", - "integrity": "sha512-neAp3zt80trRVBI1x0azq6c57aNBqYZH8KhMm3TaB7wEI5Q4A2SHfBHE8w9gOhI/lrqxtEbXZgQIrHP+wvSGwQ==", + "version": "7.8.7", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.7.tgz", + "integrity": "sha512-+AATMUFppJDw6aiR5NVPHqIQBlV/Pj8wY/EZH+lmvRdUo9xBaz/rF3alAwFJQavvKfeOlPE7oaaDHVbcySbCsg==", "requires": { - "regenerator-runtime": "^0.13.2" + "regenerator-runtime": "^0.13.4" } }, "bluebird": { @@ -10204,6 +10259,11 @@ "xtend": "^4.0.1" } }, + "regenerator-runtime": { + "version": "0.13.4", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.4.tgz", + "integrity": "sha512-plpwicqEzfEyTQohIKktWigcLzmNStMGwbOUbykx51/29Z3JOGYldaaNGK7ngNXV+UcoqvIMmloZ48Sr74sd+g==" + }, "remark-parse": { "version": "6.0.3", "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-6.0.3.tgz", @@ -15671,9 +15731,9 @@ } }, "proxy-from-env": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.0.0.tgz", - "integrity": "sha1-M8UDmPcOp+uW0h97gXYwpVeRx+4=" + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" }, "prr": { "version": "1.0.1", @@ -16754,9 +16814,9 @@ } }, "@babel/types": { - "version": "7.8.6", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.6.tgz", - "integrity": "sha512-wqz7pgWMIrht3gquyEFPVXeXCti72Rm8ep9b5tQKz9Yg9LzJA3HxosF1SB3Kc81KD1A3XBkkVYtJvCKS2Z/QrA==", + "version": "7.8.7", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.7.tgz", + "integrity": "sha512-k2TreEHxFA4CjGkL+GYjRyx35W0Mr7DP5+9q6WMkyKXB+904bYmG40syjMFV0oLlhhFCwWl0vA0DyzTDkwAiJw==", "requires": { "esutils": "^2.0.2", "lodash": "^4.17.13", @@ -19872,9 +19932,9 @@ } }, "vfile": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/vfile/-/vfile-4.0.2.tgz", - "integrity": "sha512-yhoTU5cDMSsaeaMfJ5g0bUKYkYmZhAh9fn9TZicxqn+Cw4Z439il2v3oT9S0yjlpqlI74aFOQCt3nOV+pxzlkw==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/vfile/-/vfile-4.0.3.tgz", + "integrity": "sha512-lREgT5sF05TQk68LO6APy0In+TkFGnFEgKChK2+PHIaTrFQ9oHCKXznZ7VILwgYVBcl0gv4lGATFZBLhi2kVQg==", "requires": { "@types/unist": "^2.0.0", "is-buffer": "^2.0.0", @@ -19896,9 +19956,9 @@ "integrity": "sha512-sSFdyCP3G6Ka0CEmN83A2YCMKIieHx0EDaj5IDP4g1pa5ZJ4FJDvpO0WODLxo4LUX4oe52gmSCK7Jw4SBghqxA==" }, "vfile-message": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-2.0.2.tgz", - "integrity": "sha512-gNV2Y2fDvDOOqq8bEe7cF3DXU6QgV4uA9zMR2P8tix11l1r7zju3zry3wZ8sx+BEfuO6WQ7z2QzfWTvqHQiwsA==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-2.0.3.tgz", + "integrity": "sha512-qQg/2z8qnnBHL0psXyF72kCjb9YioIynvyltuNKFaUhRtqTIcIMP3xnBaPzirVZNuBrUe1qwFciSx2yApa4byw==", "requires": { "@types/unist": "^2.0.0", "unist-util-stringify-position": "^2.0.0" diff --git a/docs/package.json b/docs/package.json index 3015a90ab59..1d8e7335bf0 100644 --- a/docs/package.json +++ b/docs/package.json @@ -7,7 +7,7 @@ }, "dependencies": { "gatsby": "2.19.23", - "gatsby-theme-apollo-docs": "4.0.10", + "gatsby-theme-apollo-docs": "4.0.13", "react": "16.13.0", "react-dom": "16.13.0" } From 81a72e237460e6a8bf2912cf0b6436ef7f0dc9d3 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 5 Mar 2020 17:19:13 -0800 Subject: [PATCH 244/642] Add comment to preserve concern about typings from @trevor-scheer. Ref: https://github.com/apollographql/apollo-server/pull/3811#discussion_r387381605 --- packages/apollo-server-core/src/types.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/apollo-server-core/src/types.ts b/packages/apollo-server-core/src/types.ts index ea23bd0a906..ddd1652c9bd 100644 --- a/packages/apollo-server-core/src/types.ts +++ b/packages/apollo-server-core/src/types.ts @@ -93,6 +93,8 @@ export interface GraphQLService { engine?: GraphQLServiceEngineConfig; }): Promise; onSchemaChange(callback: SchemaChangeCallback): Unsubscriber; + // Note: The `TContext` typing here is not conclusively behaving as we expect: + // https://github.com/apollographql/apollo-server/pull/3811#discussion_r387381605 executor( requestContext: WithRequired< GraphQLRequestContext, From 140090520fdee1a65734b6099448f268ed6ffaa4 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Fri, 6 Mar 2020 12:04:08 -0800 Subject: [PATCH 245/642] Change error message to not include word "lacks". No particular reason, but I just didn't enjoy the previous wording (my own!). --- packages/apollo-server-core/src/ApolloServer.ts | 2 +- .../apollo-server-integration-testsuite/src/ApolloServer.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/apollo-server-core/src/ApolloServer.ts b/packages/apollo-server-core/src/ApolloServer.ts index c5bab2dea9e..6d225b4c6cf 100644 --- a/packages/apollo-server-core/src/ApolloServer.ts +++ b/packages/apollo-server-core/src/ApolloServer.ts @@ -429,7 +429,7 @@ export class ApolloServerBase { // configuration as it may contain implementation details and this // error will propogate to the client. We will, however, log the error // for observation in the logs. - const message = "This data graph lacks a valid configuration."; + const message = "This data graph is missing a valid configuration."; console.error(message + " " + (err && err.message || err)); throw new Error( message + " More details may be available in the server logs."); diff --git a/packages/apollo-server-integration-testsuite/src/ApolloServer.ts b/packages/apollo-server-integration-testsuite/src/ApolloServer.ts index d782758448e..176033dd152 100644 --- a/packages/apollo-server-integration-testsuite/src/ApolloServer.ts +++ b/packages/apollo-server-integration-testsuite/src/ApolloServer.ts @@ -414,12 +414,12 @@ export function testApolloServer( extensions: expect.objectContaining({ code: "INTERNAL_SERVER_ERROR", }), - message: "This data graph lacks a valid configuration. " + + message: "This data graph is missing a valid configuration. " + "More details may be available in the server logs." }) ); expect(consoleErrorSpy).toHaveBeenCalledWith( - "This data graph lacks a valid configuration. " + + "This data graph is missing a valid configuration. " + "load error which should be masked"); expect(executor).not.toHaveBeenCalled(); }); From 5dc847a0724ab8266eb2b8ce3e1c0e56db13b2c5 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Fri, 6 Mar 2020 14:12:02 -0800 Subject: [PATCH 246/642] Add more helpful error message and docs link to `fetchApolloGcs`. --- packages/apollo-gateway/src/loadServicesFromStorage.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/apollo-gateway/src/loadServicesFromStorage.ts b/packages/apollo-gateway/src/loadServicesFromStorage.ts index 79ef860b656..e1577a7e39a 100644 --- a/packages/apollo-gateway/src/loadServicesFromStorage.ts +++ b/packages/apollo-gateway/src/loadServicesFromStorage.ts @@ -88,7 +88,10 @@ function fetchApolloGcs( ) { throw new Error( "Unable to authenticate with Apollo Graph Manager storage " + - "while fetching " + url); + "while fetching " + url + ". Ensure that the API key is " + + "configured properly and that a federated service has been " + + "pushed. For details, see " + + "https://go.apollo.dev/g/resolve-access-denied."); } // Normally, we'll try to keep the logs clean with errors we expect. From 3d3ed9def1670c680a4739f620dc3258c511e8ab Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Fri, 6 Mar 2020 14:27:10 -0800 Subject: [PATCH 247/642] Remove CHANGELOG.md annotations for pre-release version designators. These have been released! --- packages/apollo-federation/CHANGELOG.md | 2 +- packages/apollo-gateway/CHANGELOG.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/apollo-federation/CHANGELOG.md b/packages/apollo-federation/CHANGELOG.md index a4f2d9e93dc..3d3f38a8eae 100644 --- a/packages/apollo-federation/CHANGELOG.md +++ b/packages/apollo-federation/CHANGELOG.md @@ -1,6 +1,6 @@ # CHANGELOG for `@apollo/federation` -## 0.13.2 (pre-release; `@next` tag) +## 0.13.2 - Only changes in the similarly versioned `@apollo/gateway` package. diff --git a/packages/apollo-gateway/CHANGELOG.md b/packages/apollo-gateway/CHANGELOG.md index 7cfaed85024..563535733be 100644 --- a/packages/apollo-gateway/CHANGELOG.md +++ b/packages/apollo-gateway/CHANGELOG.md @@ -1,6 +1,6 @@ # CHANGELOG for `@apollo/gateway` -## 0.13.2 (pre-release; `@next` tag) +## 0.13.2 - __BREAKING__: The behavior and signature of `RemoteGraphQLDataSource`'s `didReceiveResponse` method has been changed. No changes are necessary _unless_ your implementation has overridden the default behavior of this method by either extending the class and overriding the method or by providing `didReceiveResponse` as a parameter to the `RemoteGraphQLDataSource`'s constructor options. Implementations which have provided their own `didReceiveResponse` using either of these methods should view the PR linked here for details on what has changed. [PR #3743](https://github.com/apollographql/apollo-server/pull/3743) - __NEW__: Setting the `apq` option to `true` on the `RemoteGraphQLDataSource` will enable the use of [automated persisted queries (APQ)](https://www.apollographql.com/docs/apollo-server/performance/apq/) when sending queries to downstream services. Depending on the complexity of queries sent to downstream services, this technique can greatly reduce the size of the payloads being transmitted over the network. Downstream implementing services must also support APQ functionality to participate in this feature (Apollo Server does by default unless it has been explicitly disabled). As with normal APQ behavior, a downstream server must have received and registered a query once before it will be able to serve an APQ request. [#3744](https://github.com/apollographql/apollo-server/pull/3744) From 264547c24c3dc9ee28bdd8a55aabf99804ee1f2c Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Fri, 6 Mar 2020 14:30:42 -0800 Subject: [PATCH 248/642] Add CHANGELOG.md for #3811. --- CHANGELOG.md | 3 +++ packages/apollo-federation/CHANGELOG.md | 4 ++++ packages/apollo-gateway/CHANGELOG.md | 8 +++++++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c6a72c1e7cd..794801e7fc8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,9 @@ The version headers in this history reflect the versions of Apollo Server itself ### v2.12.0 +- `apollo-server-core`: When operating in gateway mode using the `gateway` property of the Apollo Server constructor options, the failure to initialize a schema during initial start-up, e.g. connectivity problems, will no longer result in the federated executor from being assigned when the schema eventually becomes available. This precludes a state where the gateway may never become available to serve federated requests, even when failure conditions are no longer present. [PR #3811](https://github.com/apollographql/apollo-server/pull/3811) +- `apollo-server-core`: Prevent a condition which prefixed an error message on each request when the initial gateway initialization resulted in a Promise-rejection which was memoized and re-prepended with `Invalid options provided to ApolloServer:` on each request. [PR #3811](https://github.com/apollographql/apollo-server/pull/3811) + ### v2.11.0 - The range of accepted `peerDepedencies` versions for `graphql` has been widened to include `graphql@^15.0.0-rc.2` so as to accommodate the latest release-candidate of the `graphql@15` package, and an intention to support it when it is finally released on the `latest` npm tag. While this change will subdue peer dependency warnings for Apollo Server packages, many dependencies from outside of this repository will continue to raise similar warnings until those packages own `peerDependencies` are updated. It is unlikely that all of those packages will update their ranges prior to the final version of `graphql@15` being released, but if everything is working as expected, the warnings can be safely ignored. [PR #3825](https://github.com/apollographql/apollo-server/pull/3825) diff --git a/packages/apollo-federation/CHANGELOG.md b/packages/apollo-federation/CHANGELOG.md index 3d3f38a8eae..d78c53f24bc 100644 --- a/packages/apollo-federation/CHANGELOG.md +++ b/packages/apollo-federation/CHANGELOG.md @@ -1,5 +1,9 @@ # CHANGELOG for `@apollo/federation` +## 0.14.0 + +- Only changes in the similarly versioned `@apollo/gateway` package. + ## 0.13.2 - Only changes in the similarly versioned `@apollo/gateway` package. diff --git a/packages/apollo-gateway/CHANGELOG.md b/packages/apollo-gateway/CHANGELOG.md index 563535733be..b29578cbd08 100644 --- a/packages/apollo-gateway/CHANGELOG.md +++ b/packages/apollo-gateway/CHANGELOG.md @@ -1,4 +1,10 @@ -# CHANGELOG for `@apollo/gateway` +# CHANGELOG for `@apollo/gatewae` + +## 0.14.0 (pre-release; `@next` tag) + +- Several previously unhandled Promise rejection errors stemming from, e.g. connectivity, failures when communicating with Apollo Graph Manager within asynchronous code are now handled. [PR #3811](https://github.com/apollographql/apollo-server/pull/3811) +- Provide a more helpful error message when encountering expected errors. [PR #3811](https://github.com/apollographql/apollo-server/pull/3811) +- General improvements and clarity to error messages and logging. [PR #3811](https://github.com/apollographql/apollo-server/pull/3811) ## 0.13.2 From e784b31b72a9e7e5116bff2eb7892a65741315d8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 7 Mar 2020 00:16:11 +0000 Subject: [PATCH 249/642] chore(deps): update dependency @apollographql/apollo-tools to v0.4.4 (#3863) Co-authored-by: Renovate Bot --- package-lock.json | 54 ++++++++++++++++++++++++++++++++++++++++------- package.json | 2 +- 2 files changed, 47 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index d67407fcd67..303c463bfc4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -252,11 +252,51 @@ } }, "@apollographql/apollo-tools": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/@apollographql/apollo-tools/-/apollo-tools-0.4.3.tgz", - "integrity": "sha512-CtC1bmohB1owdGMT2ZZKacI94LcPAZDN2WvCe+4ZXT5d7xO5PHOAb70EP/LcFbvnS8QI+pkYRSCGFQnUcv9efg==", + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/@apollographql/apollo-tools/-/apollo-tools-0.4.4.tgz", + "integrity": "sha512-kldvB9c+vzimel4yEktlkB08gaJ5DQn9ZuIfFf1kpAw+++5hFwYRWTyKgOhF9LbOWNWGropesYC7WwLja2erhQ==", "requires": { - "apollo-env": "^0.6.1" + "apollo-env": "^0.6.2" + }, + "dependencies": { + "@types/node-fetch": { + "version": "2.5.5", + "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.5.tgz", + "integrity": "sha512-IWwjsyYjGw+em3xTvWVQi5MgYKbRs0du57klfTaZkv/B24AEQ/p/IopNeqIYNy3EsfHOpg8ieQSDomPcsYMHpA==", + "requires": { + "@types/node": "*", + "form-data": "^3.0.0" + } + }, + "apollo-env": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/apollo-env/-/apollo-env-0.6.2.tgz", + "integrity": "sha512-Vb/doL1ZbzkNDJCQ6kYGOrphRx63rMERYo3MT2pzm2pNEdm6AK60InMgJaeh3RLK3cjGllOXFAgP8IY+m+TaEg==", + "requires": { + "@types/node-fetch": "2.5.5", + "core-js": "^3.0.1", + "node-fetch": "^2.2.0", + "sha.js": "^2.4.11" + } + }, + "combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "requires": { + "delayed-stream": "~1.0.0" + } + }, + "form-data": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.0.tgz", + "integrity": "sha512-CKMFDglpbMi6PyN+brwB9Q/GOw0eAnsrEZDgcsH5Krhz5Od/haKHAX0NmQfha2zPPz0JpWzA7GJHGSnvCRLWsg==", + "requires": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + } + } } }, "@apollographql/graphql-playground-html": { @@ -4762,8 +4802,7 @@ "asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", - "dev": true + "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" }, "atob": { "version": "2.1.2", @@ -6385,8 +6424,7 @@ "delayed-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", - "dev": true + "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=" }, "delegates": { "version": "1.0.0", diff --git a/package.json b/package.json index db049b5db6b..9efa021001d 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "node": ">=6" }, "dependencies": { - "@apollographql/apollo-tools": "0.4.3", + "@apollographql/apollo-tools": "0.4.4", "@apollo/federation": "file:packages/apollo-federation", "@apollo/gateway": "file:packages/apollo-gateway", "apollo-cache-control": "file:packages/apollo-cache-control", From 67532a542fed412d6214c77addc8e48d3351964f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 7 Mar 2020 10:14:59 +0000 Subject: [PATCH 250/642] chore(deps): update dependency @types/express to v4.17.3 (#3870) Co-authored-by: Renovate Bot --- package-lock.json | 14 +++++++++++++- packages/apollo-server-express/package.json | 2 +- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 303c463bfc4..6af63564468 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4471,7 +4471,7 @@ "@types/accepts": "^1.3.5", "@types/body-parser": "1.19.0", "@types/cors": "^2.8.4", - "@types/express": "4.17.2", + "@types/express": "4.17.3", "accepts": "^1.3.5", "apollo-server-core": "file:packages/apollo-server-core", "apollo-server-types": "file:packages/apollo-server-types", @@ -4483,6 +4483,18 @@ "parseurl": "^1.3.2", "subscriptions-transport-ws": "^0.9.16", "type-is": "^1.6.16" + }, + "dependencies": { + "@types/express": { + "version": "4.17.3", + "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.3.tgz", + "integrity": "sha512-I8cGRJj3pyOLs/HndoP+25vOqhqWkAZsWMEmq1qXy/b/M3ppufecUwaK2/TVDVxcV61/iSdhykUjQQ2DLSrTdg==", + "requires": { + "@types/body-parser": "*", + "@types/express-serve-static-core": "*", + "@types/serve-static": "*" + } + } } }, "apollo-server-fastify": { diff --git a/packages/apollo-server-express/package.json b/packages/apollo-server-express/package.json index 53468b214ae..ed759059c79 100644 --- a/packages/apollo-server-express/package.json +++ b/packages/apollo-server-express/package.json @@ -30,7 +30,7 @@ "@types/accepts": "^1.3.5", "@types/body-parser": "1.19.0", "@types/cors": "^2.8.4", - "@types/express": "4.17.2", + "@types/express": "4.17.3", "accepts": "^1.3.5", "apollo-server-core": "file:../apollo-server-core", "apollo-server-types": "file:../apollo-server-types", From 351922ae2e94d83c3bd2967d667c0a501dfdb0ef Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 7 Mar 2020 11:14:57 +0000 Subject: [PATCH 251/642] chore(deps): update dependency @types/aws-lambda to v8.10.46 (#3869) Co-authored-by: Renovate Bot --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6af63564468..ec500ec1f66 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3526,9 +3526,9 @@ } }, "@types/aws-lambda": { - "version": "8.10.45", - "resolved": "https://registry.npmjs.org/@types/aws-lambda/-/aws-lambda-8.10.45.tgz", - "integrity": "sha512-qoELSb2Pt2QRpC/9Egw7BlQMQM+3SUAsTr8Z6FoSVR86ffX3qU5pPVgtM6BTfWcIWfTaKZta0ARlYAOHE1tauA==" + "version": "8.10.46", + "resolved": "https://registry.npmjs.org/@types/aws-lambda/-/aws-lambda-8.10.46.tgz", + "integrity": "sha512-88E4Hlypo3AE40wslm7N4n09lCIJwgYJm5wsaA3/Vib1xqjC/ANePTaPRpPdj9NzBSpw7Tgon58qGMYEArx4oA==" }, "@types/babel__core": { "version": "7.1.0", diff --git a/package.json b/package.json index 9efa021001d..5726a79ffb8 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ }, "devDependencies": { "@types/async-retry": "1.4.1", - "@types/aws-lambda": "8.10.45", + "@types/aws-lambda": "8.10.46", "@types/body-parser": "1.19.0", "@types/connect": "3.4.33", "@types/fast-json-stable-stringify": "2.0.0", From f73f5ad5b5c80760e77b894d4ada9d9d6ef53a4e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 7 Mar 2020 12:16:08 +0000 Subject: [PATCH 252/642] chore(deps): update dependency gatsby to v2.19.32 (#3871) Co-authored-by: Renovate Bot --- docs/package-lock.json | 1089 +++++++++++++++++++++------------------- docs/package.json | 2 +- 2 files changed, 564 insertions(+), 527 deletions(-) diff --git a/docs/package-lock.json b/docs/package-lock.json index 7ee058e28cb..eddacacfdc7 100644 --- a/docs/package-lock.json +++ b/docs/package-lock.json @@ -2007,9 +2007,9 @@ "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" }, "@babel/types": { - "version": "7.8.6", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.6.tgz", - "integrity": "sha512-wqz7pgWMIrht3gquyEFPVXeXCti72Rm8ep9b5tQKz9Yg9LzJA3HxosF1SB3Kc81KD1A3XBkkVYtJvCKS2Z/QrA==", + "version": "7.8.7", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.7.tgz", + "integrity": "sha512-k2TreEHxFA4CjGkL+GYjRyx35W0Mr7DP5+9q6WMkyKXB+904bYmG40syjMFV0oLlhhFCwWl0vA0DyzTDkwAiJw==", "requires": { "esutils": "^2.0.2", "lodash": "^4.17.13", @@ -2087,12 +2087,19 @@ } }, "@babel/polyfill": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.8.3.tgz", - "integrity": "sha512-0QEgn2zkCzqGIkSWWAEmvxD7e00Nm9asTtQvi7HdlYvMhjy/J38V/1Y9ode0zEJeIuxAI0uftiAzqc7nVeWUGg==", + "version": "7.8.7", + "resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.8.7.tgz", + "integrity": "sha512-LeSfP9bNZH2UOZgcGcZ0PIHUt1ZuHub1L3CVmEyqLxCeDLm4C5Gi8jRH8ZX2PNpDhQCo0z6y/+DIs2JlliXW8w==", "requires": { "core-js": "^2.6.5", - "regenerator-runtime": "^0.13.2" + "regenerator-runtime": "^0.13.4" + }, + "dependencies": { + "regenerator-runtime": { + "version": "0.13.4", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.4.tgz", + "integrity": "sha512-plpwicqEzfEyTQohIKktWigcLzmNStMGwbOUbykx51/29Z3JOGYldaaNGK7ngNXV+UcoqvIMmloZ48Sr74sd+g==" + } } }, "@babel/preset-env": { @@ -2240,6 +2247,22 @@ "regenerator-runtime": "^0.13.2" } }, + "@babel/runtime-corejs3": { + "version": "7.8.7", + "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.8.7.tgz", + "integrity": "sha512-sc7A+H4I8kTd7S61dgB9RomXu/C+F4IrRr4Ytze4dnfx7AXEpCrejSNpjx7vq6y/Bak9S6Kbk65a/WgMLtg43Q==", + "requires": { + "core-js-pure": "^3.0.0", + "regenerator-runtime": "^0.13.4" + }, + "dependencies": { + "regenerator-runtime": { + "version": "0.13.4", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.4.tgz", + "integrity": "sha512-plpwicqEzfEyTQohIKktWigcLzmNStMGwbOUbykx51/29Z3JOGYldaaNGK7ngNXV+UcoqvIMmloZ48Sr74sd+g==" + } + } + }, "@babel/template": { "version": "7.8.3", "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.3.tgz", @@ -2860,9 +2883,9 @@ "integrity": "sha1-zR6FU2M60xhcPy8jns/10mQ+krY=" }, "@types/debug": { - "version": "0.0.29", - "resolved": "https://registry.npmjs.org/@types/debug/-/debug-0.0.29.tgz", - "integrity": "sha1-oeUUrfvZLwOiJLpU1pMRHb8fN1Q=" + "version": "0.0.30", + "resolved": "https://registry.npmjs.org/@types/debug/-/debug-0.0.30.tgz", + "integrity": "sha512-orGL5LXERPYsLov6CWs3Fh6203+dXzJkR7OnddIr2514Hsecwc8xRpzCapshBbKFImCsvS/mk6+FWiN5LyZJAQ==" }, "@types/eslint-visitor-keys": { "version": "1.0.0", @@ -2880,9 +2903,9 @@ "integrity": "sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==" }, "@types/get-port": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/@types/get-port/-/get-port-0.0.4.tgz", - "integrity": "sha1-62u3Qj2fiItjJmDcfS/T5po1ZD4=" + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/@types/get-port/-/get-port-3.2.0.tgz", + "integrity": "sha512-TiNg8R1kjDde5Pub9F9vCwZA/BNW9HeXP5b9j7Qucqncy/McfPZ6xze/EyBdXS5FhMIGN6Fx3vg75l5KHy3V1Q==" }, "@types/glob": { "version": "7.1.1", @@ -2904,6 +2927,11 @@ "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.4.tgz", "integrity": "sha512-8+KAKzEvSUdeo+kmqnKrqgeE+LcA0tjYWFY7RPProVYwnqDjukzO+3b6dLD56rYX5TdWejnEOLJYOIeh4CXKuA==" }, + "@types/lodash": { + "version": "4.14.149", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.149.tgz", + "integrity": "sha512-ijGqzZt/b7BfzcK9vTrS6MFljQRPn5BFWOx8oE0GYxribu6uV+aA9zZuXI1zc/etK9E8nrgdoF2+LgUw7+9tJQ==" + }, "@types/mdast": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.3.tgz", @@ -2918,9 +2946,12 @@ "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==" }, "@types/mkdirp": { - "version": "0.3.29", - "resolved": "https://registry.npmjs.org/@types/mkdirp/-/mkdirp-0.3.29.tgz", - "integrity": "sha1-fyrX7FX5FEgvybHsS7GuYCjUYGY=" + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/@types/mkdirp/-/mkdirp-0.5.2.tgz", + "integrity": "sha512-U5icWpv7YnZYGsN4/cmh3WD2onMY0aJIiTE6+51TwJCttdHvtCYmkBNOobHlXwrJRL0nkH9jH4kD+1FAdMN4Tg==", + "requires": { + "@types/node": "*" + } }, "@types/node": { "version": "12.12.7", @@ -2968,15 +2999,24 @@ "@types/node": "*" } }, + "@types/rimraf": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@types/rimraf/-/rimraf-2.0.3.tgz", + "integrity": "sha512-dZfyfL/u9l/oi984hEXdmAjX3JHry7TLWw43u1HQ8HhPv6KtfxnrZ3T/bleJ0GEvnk9t5sM7eePkgMqz3yBcGg==", + "requires": { + "@types/glob": "*", + "@types/node": "*" + } + }, "@types/tinycolor2": { "version": "1.4.2", "resolved": "https://registry.npmjs.org/@types/tinycolor2/-/tinycolor2-1.4.2.tgz", "integrity": "sha512-PeHg/AtdW6aaIO2a+98Xj7rWY4KC1E6yOy7AFknJQ7VXUGNrMlyxDFxJo7HqLtjQms/ZhhQX52mLVW/EX3JGOw==" }, "@types/tmp": { - "version": "0.0.32", - "resolved": "https://registry.npmjs.org/@types/tmp/-/tmp-0.0.32.tgz", - "integrity": "sha1-DTyzECL4Qn6ljACK8yuA2hJspOM=" + "version": "0.0.33", + "resolved": "https://registry.npmjs.org/@types/tmp/-/tmp-0.0.33.tgz", + "integrity": "sha1-EHPEvIJHVK49EM+riKsCN7qWTk0=" }, "@types/unist": { "version": "2.0.3", @@ -3002,11 +3042,11 @@ } }, "@typescript-eslint/eslint-plugin": { - "version": "2.21.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.21.0.tgz", - "integrity": "sha512-b5jjjDMxzcjh/Sbjuo7WyhrQmVJg0WipTHQgXh5Xwx10uYm6nPWqN1WGOsaNq4HR3Zh4wUx4IRQdDkCHwyewyw==", + "version": "2.22.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.22.0.tgz", + "integrity": "sha512-BvxRLaTDVQ3N+Qq8BivLiE9akQLAOUfxNHIEhedOcg8B2+jY8Rc4/D+iVprvuMX1AdezFYautuGDwr9QxqSxBQ==", "requires": { - "@typescript-eslint/experimental-utils": "2.21.0", + "@typescript-eslint/experimental-utils": "2.22.0", "eslint-utils": "^1.4.3", "functional-red-black-tree": "^1.0.1", "regexpp": "^3.0.0", @@ -3014,30 +3054,30 @@ } }, "@typescript-eslint/experimental-utils": { - "version": "2.21.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.21.0.tgz", - "integrity": "sha512-olKw9JP/XUkav4lq0I7S1mhGgONJF9rHNhKFn9wJlpfRVjNo3PPjSvybxEldvCXnvD+WAshSzqH5cEjPp9CsBA==", + "version": "2.22.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.22.0.tgz", + "integrity": "sha512-sJt1GYBe6yC0dWOQzXlp+tiuGglNhJC9eXZeC8GBVH98Zv9jtatccuhz0OF5kC/DwChqsNfghHx7OlIDQjNYAQ==", "requires": { "@types/json-schema": "^7.0.3", - "@typescript-eslint/typescript-estree": "2.21.0", + "@typescript-eslint/typescript-estree": "2.22.0", "eslint-scope": "^5.0.0" } }, "@typescript-eslint/parser": { - "version": "2.21.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.21.0.tgz", - "integrity": "sha512-VrmbdrrrvvI6cPPOG7uOgGUFXNYTiSbnRq8ZMyuGa4+qmXJXVLEEz78hKuqupvkpwJQNk1Ucz1TenrRP90gmBg==", + "version": "2.22.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.22.0.tgz", + "integrity": "sha512-FaZKC1X+nvD7qMPqKFUYHz3H0TAioSVFGvG29f796Nc5tBluoqfHgLbSFKsh7mKjRoeTm8J9WX2Wo9EyZWjG7w==", "requires": { "@types/eslint-visitor-keys": "^1.0.0", - "@typescript-eslint/experimental-utils": "2.21.0", - "@typescript-eslint/typescript-estree": "2.21.0", + "@typescript-eslint/experimental-utils": "2.22.0", + "@typescript-eslint/typescript-estree": "2.22.0", "eslint-visitor-keys": "^1.1.0" } }, "@typescript-eslint/typescript-estree": { - "version": "2.21.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.21.0.tgz", - "integrity": "sha512-NC/nogZNb9IK2MEFQqyDBAciOT8Lp8O3KgAfvHx2Skx6WBo+KmDqlU3R9KxHONaijfTIKtojRe3SZQyMjr3wBw==", + "version": "2.22.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.22.0.tgz", + "integrity": "sha512-2HFZW2FQc4MhIBB8WhDm9lVFaBDy6h9jGrJ4V2Uzxe/ON29HCHBTj3GkgcsgMWfsl2U5as+pTOr30Nibaw7qRQ==", "requires": { "debug": "^4.1.1", "eslint-visitor-keys": "^1.1.0", @@ -3367,12 +3407,9 @@ "integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==" }, "ansi-escapes": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.0.tgz", - "integrity": "sha512-EiYhwo0v255HUL6eDyuLrXEkTi7WwVCLAw+SeOQ7M7qdun1z1pum4DEm/nuqIVbPvi9RPPc9k9LbyBv6H0DwVg==", - "requires": { - "type-fest": "^0.8.1" - } + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz", + "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==" }, "ansi-html": { "version": "0.0.7", @@ -3406,6 +3443,11 @@ "normalize-path": "^2.1.1" } }, + "application-config-path": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/application-config-path/-/application-config-path-0.1.0.tgz", + "integrity": "sha1-GTxfCoZUGkxm+6Hi3DhYM2LqXo8=" + }, "aproba": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", @@ -3758,9 +3800,9 @@ } }, "electron-to-chromium": { - "version": "1.3.364", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.364.tgz", - "integrity": "sha512-V6hyxQ9jzt6Jy6w8tAv4HHKhIaVS6psG/gmwtQ+2+itdkWMHJLHJ4m1sFep/fWkdKvfJcPXuywfnECRzfNa7gw==" + "version": "1.3.372", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.372.tgz", + "integrity": "sha512-77a4jYC52OdisHM+Tne7dgWEvQT1FoNu/jYl279pP88ZtG4ZRIPyhQwAKxj6C2rzsyC1OwsOds9JlZtNncSz6g==" } } }, @@ -3995,9 +4037,9 @@ } }, "babel-plugin-remove-graphql-queries": { - "version": "2.7.23", - "resolved": "https://registry.npmjs.org/babel-plugin-remove-graphql-queries/-/babel-plugin-remove-graphql-queries-2.7.23.tgz", - "integrity": "sha512-SvWLivXtbeExS0eUPrRpg8EYiDPcOlzaO/vePcdmW2X8GBC1miezXS+RYPYyt4r9Z0Cg0ZQe58ggssF/8ym3rg==" + "version": "2.7.24", + "resolved": "https://registry.npmjs.org/babel-plugin-remove-graphql-queries/-/babel-plugin-remove-graphql-queries-2.7.24.tgz", + "integrity": "sha512-uyYSTt2ikv4QhPC1HSt5WnP9sJFCOytrN119NpXQtGL9AiXNGghrELnY4BxhDuJtw/Wjrw20eED1+BJLzfMs7Q==" }, "babel-plugin-syntax-jsx": { "version": "6.18.0", @@ -4010,9 +4052,9 @@ "integrity": "sha512-eqj0hVcJUR57/Ug2zE1Yswsw4LhuqqHhD+8v120T1cl3kjg76QwtyBrdIk4WVwK+lAhBJVYCd/v+4nc4y+8JsA==" }, "babel-preset-gatsby": { - "version": "0.2.29", - "resolved": "https://registry.npmjs.org/babel-preset-gatsby/-/babel-preset-gatsby-0.2.29.tgz", - "integrity": "sha512-asJV/UMq7riYiY4ZhMi83Mbhwwtkvhp9gmmJgJJSJyAWw/tTgAmYan6Udpco3P4Kvd91lj+f8kzXJHT0G2sdwQ==", + "version": "0.2.31", + "resolved": "https://registry.npmjs.org/babel-preset-gatsby/-/babel-preset-gatsby-0.2.31.tgz", + "integrity": "sha512-2PhWjAli3hXcK0ASieOQZgiU4b6THA5/OWJSz5ZM3snmf1oqlWqhRJfzj6RXu2BkwvoGI5Hu9krEcVEgZKGTeQ==", "requires": { "@babel/plugin-proposal-class-properties": "^7.7.4", "@babel/plugin-proposal-nullish-coalescing-operator": "^7.7.4", @@ -4026,16 +4068,31 @@ "babel-plugin-dynamic-import-node": "^2.3.0", "babel-plugin-macros": "^2.8.0", "babel-plugin-transform-react-remove-prop-types": "^0.4.24", - "gatsby-core-utils": "^1.0.28" + "gatsby-core-utils": "^1.0.30" }, "dependencies": { "@babel/runtime": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.4.tgz", - "integrity": "sha512-neAp3zt80trRVBI1x0azq6c57aNBqYZH8KhMm3TaB7wEI5Q4A2SHfBHE8w9gOhI/lrqxtEbXZgQIrHP+wvSGwQ==", + "version": "7.8.7", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.7.tgz", + "integrity": "sha512-+AATMUFppJDw6aiR5NVPHqIQBlV/Pj8wY/EZH+lmvRdUo9xBaz/rF3alAwFJQavvKfeOlPE7oaaDHVbcySbCsg==", "requires": { - "regenerator-runtime": "^0.13.2" + "regenerator-runtime": "^0.13.4" } + }, + "gatsby-core-utils": { + "version": "1.0.30", + "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.0.30.tgz", + "integrity": "sha512-+WYFxf9dT4u67vecXdROe9iF2jzPKoTVbWI3FYLCcNANY2Y/vEec11vhG5FnBHdLpgmD3cnLPdhCAileKWBldA==", + "requires": { + "ci-info": "2.0.0", + "configstore": "^5.0.0", + "node-object-hash": "^2.0.0" + } + }, + "regenerator-runtime": { + "version": "0.13.4", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.4.tgz", + "integrity": "sha512-plpwicqEzfEyTQohIKktWigcLzmNStMGwbOUbykx51/29Z3JOGYldaaNGK7ngNXV+UcoqvIMmloZ48Sr74sd+g==" } } }, @@ -4780,16 +4837,16 @@ } }, "electron-to-chromium": { - "version": "1.3.364", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.364.tgz", - "integrity": "sha512-V6hyxQ9jzt6Jy6w8tAv4HHKhIaVS6psG/gmwtQ+2+itdkWMHJLHJ4m1sFep/fWkdKvfJcPXuywfnECRzfNa7gw==" + "version": "1.3.372", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.372.tgz", + "integrity": "sha512-77a4jYC52OdisHM+Tne7dgWEvQT1FoNu/jYl279pP88ZtG4ZRIPyhQwAKxj6C2rzsyC1OwsOds9JlZtNncSz6g==" } } }, "caniuse-lite": { - "version": "1.0.30001030", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001030.tgz", - "integrity": "sha512-QGK0W4Ft/Ac+zTjEiRJfwDNATvS3fodDczBXrH42784kcfqcDKpEPfN08N0HQjrAp8He/Jw8QiSS9QRn7XAbUw==" + "version": "1.0.30001032", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001032.tgz", + "integrity": "sha512-8joOm7BwcpEN4BfVHtfh0hBXSAPVYk+eUIcNntGtMkUWy/6AKRCDZINCLe3kB1vHhT2vBxBF85Hh9VlPXi/qjA==" }, "caseless": { "version": "0.12.0", @@ -5494,30 +5551,30 @@ } }, "configstore": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.2.tgz", - "integrity": "sha512-vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz", + "integrity": "sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==", "requires": { - "dot-prop": "^4.1.0", + "dot-prop": "^5.2.0", "graceful-fs": "^4.1.2", - "make-dir": "^1.0.0", - "unique-string": "^1.0.0", - "write-file-atomic": "^2.0.0", - "xdg-basedir": "^3.0.0" + "make-dir": "^3.0.0", + "unique-string": "^2.0.0", + "write-file-atomic": "^3.0.0", + "xdg-basedir": "^4.0.0" }, "dependencies": { "make-dir": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz", - "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.0.2.tgz", + "integrity": "sha512-rYKABKutXa6vXTXhoV18cBE7PaewPXHe/Bdq4v+ZLMhxbWApkFFplT0LcbMW+6BbjnQXzZ/sAvSE/JdguApG5w==", "requires": { - "pify": "^3.0.0" + "semver": "^6.0.0" } }, - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" } } }, @@ -5691,6 +5748,11 @@ } } }, + "core-js-pure": { + "version": "3.6.4", + "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.6.4.tgz", + "integrity": "sha512-epIhRLkXdgv32xIUFaaAry2wdxZYBi6bgM7cB136dzzXXa+dFyRLTZeLUJxnd8ShrmyVXBub63n2NHo2JAt8Cw==" + }, "core-util-is": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", @@ -5827,9 +5889,9 @@ } }, "crypto-random-string": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz", - "integrity": "sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4=" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz", + "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==" }, "css-b64-images": { "version": "0.2.5", @@ -5922,43 +5984,13 @@ "integrity": "sha1-XxrUPi2O77/cME/NOaUhZklD4+s=" }, "css-selector-tokenizer": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.1.tgz", - "integrity": "sha512-xYL0AMZJ4gFzJQsHUKa5jiWWi2vH77WVNg7JYRyewwj6oPh4yb/y6Y9ZCw9dsj/9UauMhtuxR+ogQd//EdEVNA==", + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.2.tgz", + "integrity": "sha512-yj856NGuAymN6r8bn8/Jl46pR+OC3eEvAhfGYDUe7YPtTPAYrSSw4oAniZ9Y8T5B92hjhwTBLUen0/vKPxf6pw==", "requires": { - "cssesc": "^0.1.0", - "fastparse": "^1.1.1", - "regexpu-core": "^1.0.0" - }, - "dependencies": { - "jsesc": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", - "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=" - }, - "regexpu-core": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz", - "integrity": "sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=", - "requires": { - "regenerate": "^1.2.1", - "regjsgen": "^0.2.0", - "regjsparser": "^0.1.4" - } - }, - "regjsgen": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz", - "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=" - }, - "regjsparser": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz", - "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=", - "requires": { - "jsesc": "~0.5.0" - } - } + "cssesc": "^3.0.0", + "fastparse": "^1.1.2", + "regexpu-core": "^4.6.0" } }, "css-tree": { @@ -5983,9 +6015,9 @@ "integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==" }, "cssesc": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-0.1.0.tgz", - "integrity": "sha1-yBSQPkViM3GgR3tAEJqq++6t27Q=" + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", + "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==" }, "cssnano": { "version": "4.1.10", @@ -6386,6 +6418,11 @@ "resolved": "https://registry.npmjs.org/dataloader/-/dataloader-1.4.0.tgz", "integrity": "sha512-68s5jYdlvasItOJnCuI2Q9s4q98g0pCyL3HrcKJu8KNugUl8ahgmZYg38ysLTgQjjXX3H8CJLkAvWrclWfcalw==" }, + "date-fns": { + "version": "2.10.0", + "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.10.0.tgz", + "integrity": "sha512-EhfEKevYGWhWlZbNeplfhIU/+N+x0iCIx7VzKlXma2EdQyznVlZhCptXUY+BegNpPW2kjdx15Rvq503YcXXrcA==" + }, "debug": { "version": "3.2.6", "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", @@ -6618,27 +6655,34 @@ } } }, - "devcert-san": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/devcert-san/-/devcert-san-0.3.3.tgz", - "integrity": "sha1-qnckR0Gy2DF3HAEfIu4l45atS6k=", + "devcert": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/devcert/-/devcert-1.1.0.tgz", + "integrity": "sha512-ppyIBJueMMisYvJABaXESY10CwEm1pUXoLOm6TeBO2bbDUQE8ZjJPNADlu31I2InL7hduSgratzRG/dHUDF41w==", "requires": { "@types/configstore": "^2.1.1", - "@types/debug": "^0.0.29", - "@types/get-port": "^0.0.4", - "@types/glob": "^5.0.30", - "@types/mkdirp": "^0.3.29", - "@types/node": "^7.0.11", - "@types/tmp": "^0.0.32", - "command-exists": "^1.2.2", + "@types/debug": "^0.0.30", + "@types/get-port": "^3.2.0", + "@types/glob": "^5.0.34", + "@types/lodash": "^4.14.92", + "@types/mkdirp": "^0.5.2", + "@types/node": "^8.5.7", + "@types/rimraf": "^2.0.2", + "@types/tmp": "^0.0.33", + "application-config-path": "^0.1.0", + "command-exists": "^1.2.4", "configstore": "^3.0.0", - "debug": "^2.6.3", - "eol": "^0.8.1", - "get-port": "^3.0.0", - "glob": "^7.1.1", + "debug": "^3.1.0", + "eol": "^0.9.1", + "get-port": "^3.2.0", + "glob": "^7.1.2", + "lodash": "^4.17.4", "mkdirp": "^0.5.1", - "tmp": "^0.0.31", - "tslib": "^1.6.0" + "password-prompt": "^1.0.4", + "rimraf": "^2.6.2", + "sudo-prompt": "^8.2.0", + "tmp": "^0.0.33", + "tslib": "^1.10.0" }, "dependencies": { "@types/glob": { @@ -6652,22 +6696,84 @@ } }, "@types/node": { - "version": "7.10.9", - "resolved": "https://registry.npmjs.org/@types/node/-/node-7.10.9.tgz", - "integrity": "sha512-usSpgoUsRtO5xNV5YEPU8PPnHisFx8u0rokj1BPVn/hDF7zwUDzVLiuKZM38B7z8V2111Fj6kd4rGtQFUZpNOw==" + "version": "8.10.59", + "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.59.tgz", + "integrity": "sha512-8RkBivJrDCyPpBXhVZcjh7cQxVBSmRk9QM7hOketZzp6Tg79c0N8kkpAIito9bnJ3HCVCHVYz+KHTEbfQNfeVQ==" }, - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "configstore": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.2.tgz", + "integrity": "sha512-vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw==", "requires": { - "ms": "2.0.0" + "dot-prop": "^4.1.0", + "graceful-fs": "^4.1.2", + "make-dir": "^1.0.0", + "unique-string": "^1.0.0", + "write-file-atomic": "^2.0.0", + "xdg-basedir": "^3.0.0" } }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + "crypto-random-string": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz", + "integrity": "sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4=" + }, + "dot-prop": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz", + "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==", + "requires": { + "is-obj": "^1.0.0" + } + }, + "is-obj": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", + "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=" + }, + "make-dir": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz", + "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==", + "requires": { + "pify": "^3.0.0" + } + }, + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" + }, + "rimraf": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", + "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", + "requires": { + "glob": "^7.1.3" + } + }, + "unique-string": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz", + "integrity": "sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=", + "requires": { + "crypto-random-string": "^1.0.0" + } + }, + "write-file-atomic": { + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgz", + "integrity": "sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==", + "requires": { + "graceful-fs": "^4.1.11", + "imurmurhash": "^0.1.4", + "signal-exit": "^3.0.2" + } + }, + "xdg-basedir": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz", + "integrity": "sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ=" } } }, @@ -6792,11 +6898,11 @@ } }, "dot-prop": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz", - "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.2.0.tgz", + "integrity": "sha512-uEUyaDKoSQ1M4Oq8l45hSE26SnTxL6snNnqvK/VWx5wJhmff5z0FUVJDKDanor/6w3kzE3i7XZOk+7wC0EXr1A==", "requires": { - "is-obj": "^1.0.0" + "is-obj": "^2.0.0" } }, "dotenv": { @@ -7002,9 +7108,9 @@ "integrity": "sha512-jDgnJaF/Btomk+m3PZDTTCb5XIIIX3zYItnCRfF73zVgvinLoRomuhi75Y4su0PtQxWz4v66XnLLckyvyJTOIQ==" }, "eol": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/eol/-/eol-0.8.1.tgz", - "integrity": "sha1-3vwyJJkMfspzuzRGGlbPncJHYdA=" + "version": "0.9.1", + "resolved": "https://registry.npmjs.org/eol/-/eol-0.9.1.tgz", + "integrity": "sha512-Ds/TEoZjwggRoz/Q2O7SE3i4Jm66mqTDfmdHdq/7DKVk3bro9Q8h6WdXKdPqFLMoqxrDK5SVRzHVPOS6uuGtrg==" }, "errno": { "version": "0.1.7", @@ -7408,9 +7514,9 @@ } }, "eslint-plugin-react": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.18.3.tgz", - "integrity": "sha512-Bt56LNHAQCoou88s8ViKRjMB2+36XRejCQ1VoLj716KI1MoE99HpTVvIThJ0rvFmG4E4Gsq+UgToEjn+j044Bg==", + "version": "7.19.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.19.0.tgz", + "integrity": "sha512-SPT8j72CGuAP+JFbT0sJHOB80TX/pu44gQ4vXH/cq+hQTiY2PuZ6IHkqXJV6x1b28GDdo1lbInjKUrrdUf0LOQ==", "requires": { "array-includes": "^3.1.1", "doctrine": "^2.1.0", @@ -7420,8 +7526,10 @@ "object.fromentries": "^2.0.2", "object.values": "^1.1.1", "prop-types": "^15.7.2", - "resolve": "^1.14.2", - "string.prototype.matchall": "^4.0.2" + "resolve": "^1.15.1", + "semver": "^6.3.0", + "string.prototype.matchall": "^4.0.2", + "xregexp": "^4.3.0" }, "dependencies": { "doctrine": { @@ -7487,6 +7595,11 @@ "path-parse": "^1.0.6" } }, + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + }, "string.prototype.trimleft": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz", @@ -7535,12 +7648,12 @@ "integrity": "sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==" }, "espree": { - "version": "6.1.2", - "resolved": "https://registry.npmjs.org/espree/-/espree-6.1.2.tgz", - "integrity": "sha512-2iUPuuPP+yW1PZaMSDM9eyVf8D5P0Hi8h83YtZ5bPc/zHYjII5khoixIUTMO794NOY8F/ThF1Bo8ncZILarUTA==", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/espree/-/espree-6.2.0.tgz", + "integrity": "sha512-Xs8airJ7RQolnDIbLtRutmfvSsAe0xqMMAantCN/GMoqf81TFbeI1T7Jpd56qYu1uuh32dOG5W/X9uO+ghPXzA==", "requires": { "acorn": "^7.1.0", - "acorn-jsx": "^5.1.0", + "acorn-jsx": "^5.2.0", "eslint-visitor-keys": "^1.1.0" } }, @@ -7884,16 +7997,6 @@ "chardet": "^0.7.0", "iconv-lite": "^0.4.24", "tmp": "^0.0.33" - }, - "dependencies": { - "tmp": { - "version": "0.0.33", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", - "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", - "requires": { - "os-tmpdir": "~1.0.2" - } - } } }, "extglob": { @@ -8883,9 +8986,9 @@ } }, "gatsby": { - "version": "2.19.23", - "resolved": "https://registry.npmjs.org/gatsby/-/gatsby-2.19.23.tgz", - "integrity": "sha512-mg9ezE9uy0qzv9jpU9OXsOlO1zl0/rggHxtvhiEuvHu+LQogKFfLpffheclmFaLCYXGIjxzZriYnO1LmhoxeWw==", + "version": "2.19.32", + "resolved": "https://registry.npmjs.org/gatsby/-/gatsby-2.19.32.tgz", + "integrity": "sha512-YzAvkTwyh9uxytCqP/utinFstEpz+COEWS39t3PvlcAimuWIsmwDlgK/5CMb3KSkavEeIuuBRADfbInapEbpWQ==", "requires": { "@babel/code-frame": "^7.5.5", "@babel/core": "^7.7.5", @@ -8907,8 +9010,8 @@ "babel-loader": "^8.0.6", "babel-plugin-add-module-exports": "^0.3.3", "babel-plugin-dynamic-import-node": "^2.3.0", - "babel-plugin-remove-graphql-queries": "^2.7.23", - "babel-preset-gatsby": "^0.2.29", + "babel-plugin-remove-graphql-queries": "^2.7.24", + "babel-preset-gatsby": "^0.2.31", "better-opn": "1.0.0", "better-queue": "^3.8.10", "bluebird": "^3.7.2", @@ -8924,10 +9027,11 @@ "core-js": "^2.6.11", "cors": "^2.8.5", "css-loader": "^1.0.1", + "date-fns": "^2.10.0", "debug": "^3.2.6", "del": "^5.1.0", "detect-port": "^1.3.0", - "devcert-san": "^0.3.3", + "devcert": "^1.0.2", "dotenv": "^8.2.0", "eslint": "^6.7.2", "eslint-config-react-app": "^5.1.0", @@ -8946,13 +9050,13 @@ "flat": "^4.1.0", "fs-exists-cached": "1.0.0", "fs-extra": "^8.1.0", - "gatsby-cli": "^2.9.0", - "gatsby-core-utils": "^1.0.28", - "gatsby-graphiql-explorer": "^0.2.34", - "gatsby-link": "^2.2.29", - "gatsby-plugin-page-creator": "^2.1.40", - "gatsby-react-router-scroll": "^2.1.22", - "gatsby-telemetry": "^1.1.49", + "gatsby-cli": "^2.10.2", + "gatsby-core-utils": "^1.0.30", + "gatsby-graphiql-explorer": "^0.2.35", + "gatsby-link": "^2.2.30", + "gatsby-plugin-page-creator": "^2.1.42", + "gatsby-react-router-scroll": "^2.1.23", + "gatsby-telemetry": "^1.1.51", "glob": "^7.1.6", "got": "8.3.2", "graphql": "^14.5.8", @@ -8966,6 +9070,7 @@ "jest-worker": "^24.9.0", "json-loader": "^0.5.7", "json-stringify-safe": "^5.0.1", + "latest-version": "5.1.0", "lodash": "^4.17.15", "lokijs": "^1.5.8", "md5": "^2.2.1", @@ -8985,8 +9090,8 @@ "parseurl": "^1.3.3", "physical-cpu-count": "^2.0.0", "pnp-webpack-plugin": "^1.5.0", - "postcss-flexbugs-fixes": "^3.3.1", - "postcss-loader": "^2.1.6", + "postcss-flexbugs-fixes": "^4.2.0", + "postcss-loader": "^3.0.0", "prompts": "^2.3.0", "prop-types": "^15.7.2", "raw-loader": "^0.5.1", @@ -9022,11 +9127,11 @@ }, "dependencies": { "@babel/runtime": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.4.tgz", - "integrity": "sha512-neAp3zt80trRVBI1x0azq6c57aNBqYZH8KhMm3TaB7wEI5Q4A2SHfBHE8w9gOhI/lrqxtEbXZgQIrHP+wvSGwQ==", + "version": "7.8.7", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.7.tgz", + "integrity": "sha512-+AATMUFppJDw6aiR5NVPHqIQBlV/Pj8wY/EZH+lmvRdUo9xBaz/rF3alAwFJQavvKfeOlPE7oaaDHVbcySbCsg==", "requires": { - "regenerator-runtime": "^0.13.2" + "regenerator-runtime": "^0.13.4" } }, "ansi-regex": { @@ -9064,41 +9169,15 @@ } } }, - "configstore": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz", - "integrity": "sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==", - "requires": { - "dot-prop": "^5.2.0", - "graceful-fs": "^4.1.2", - "make-dir": "^3.0.0", - "unique-string": "^2.0.0", - "write-file-atomic": "^3.0.0", - "xdg-basedir": "^4.0.0" - } - }, "core-js": { "version": "2.6.11", "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz", "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==" }, - "crypto-random-string": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz", - "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==" - }, - "dot-prop": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.2.0.tgz", - "integrity": "sha512-uEUyaDKoSQ1M4Oq8l45hSE26SnTxL6snNnqvK/VWx5wJhmff5z0FUVJDKDanor/6w3kzE3i7XZOk+7wC0EXr1A==", - "requires": { - "is-obj": "^2.0.0" - } - }, "gatsby-cli": { - "version": "2.9.0", - "resolved": "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-2.9.0.tgz", - "integrity": "sha512-aK8yDAt5S8pj/l/+RHMO2UJeBpsUARmAhC5lDh1dhfRfqdlKXwuAIStw8PY+aLpKAd/oyunvqI0D2y4BH3+eNA==", + "version": "2.10.2", + "resolved": "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-2.10.2.tgz", + "integrity": "sha512-TAwdMptYEKIWC93MHn3Vr+UZMOCxiAp3qN17+depCm2lmYq9O4DgtQi8FPHIZfivIJjAhQ1TOYXl9890YclfLg==", "requires": { "@babel/code-frame": "^7.5.5", "@babel/runtime": "^7.7.6", @@ -9115,8 +9194,8 @@ "execa": "^3.4.0", "fs-exists-cached": "^1.0.0", "fs-extra": "^8.1.0", - "gatsby-core-utils": "^1.0.28", - "gatsby-telemetry": "^1.1.49", + "gatsby-core-utils": "^1.0.30", + "gatsby-telemetry": "^1.1.51", "hosted-git-info": "^3.0.2", "ink": "^2.6.0", "ink-spinner": "^3.0.1", @@ -9150,6 +9229,16 @@ } } }, + "gatsby-core-utils": { + "version": "1.0.30", + "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.0.30.tgz", + "integrity": "sha512-+WYFxf9dT4u67vecXdROe9iF2jzPKoTVbWI3FYLCcNANY2Y/vEec11vhG5FnBHdLpgmD3cnLPdhCAileKWBldA==", + "requires": { + "ci-info": "2.0.0", + "configstore": "^5.0.0", + "node-object-hash": "^2.0.0" + } + }, "get-caller-file": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz", @@ -9171,11 +9260,6 @@ "number-is-nan": "^1.0.0" } }, - "is-obj": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz", - "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==" - }, "lru-cache": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", @@ -9184,26 +9268,16 @@ "yallist": "^3.0.2" } }, - "make-dir": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.0.2.tgz", - "integrity": "sha512-rYKABKutXa6vXTXhoV18cBE7PaewPXHe/Bdq4v+ZLMhxbWApkFFplT0LcbMW+6BbjnQXzZ/sAvSE/JdguApG5w==", - "requires": { - "semver": "^6.0.0" - }, - "dependencies": { - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" - } - } - }, "node-fetch": { "version": "2.6.0", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz", "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==" }, + "regenerator-runtime": { + "version": "0.13.4", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.4.tgz", + "integrity": "sha512-plpwicqEzfEyTQohIKktWigcLzmNStMGwbOUbykx51/29Z3JOGYldaaNGK7ngNXV+UcoqvIMmloZ48Sr74sd+g==" + }, "require-main-filename": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", @@ -9222,14 +9296,6 @@ "ansi-regex": "^4.1.0" } }, - "unique-string": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz", - "integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==", - "requires": { - "crypto-random-string": "^2.0.0" - } - }, "wrap-ansi": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", @@ -9264,22 +9330,6 @@ } } }, - "write-file-atomic": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz", - "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==", - "requires": { - "imurmurhash": "^0.1.4", - "is-typedarray": "^1.0.0", - "signal-exit": "^3.0.2", - "typedarray-to-buffer": "^3.1.5" - } - }, - "xdg-basedir": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz", - "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==" - }, "yallist": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", @@ -9325,27 +9375,32 @@ } }, "gatsby-graphiql-explorer": { - "version": "0.2.34", - "resolved": "https://registry.npmjs.org/gatsby-graphiql-explorer/-/gatsby-graphiql-explorer-0.2.34.tgz", - "integrity": "sha512-r3JW4NPC69kRV8VTlDYrR9E9ROyw3Po4qKB5C067fE0bRhtU3DTSSf6MT+C97XS+JqKEZAaub0unptB//gnaCw==", + "version": "0.2.35", + "resolved": "https://registry.npmjs.org/gatsby-graphiql-explorer/-/gatsby-graphiql-explorer-0.2.35.tgz", + "integrity": "sha512-y0ec6zLeaWwCus7xQnOS5dMX4Fu+//H6LLwPjODqnXAtnx2pT8MI5VYnYDqhMLHk32VEXYxhPJRvxg7VMkn18g==", "requires": { "@babel/runtime": "^7.7.6" }, "dependencies": { "@babel/runtime": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.4.tgz", - "integrity": "sha512-neAp3zt80trRVBI1x0azq6c57aNBqYZH8KhMm3TaB7wEI5Q4A2SHfBHE8w9gOhI/lrqxtEbXZgQIrHP+wvSGwQ==", + "version": "7.8.7", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.7.tgz", + "integrity": "sha512-+AATMUFppJDw6aiR5NVPHqIQBlV/Pj8wY/EZH+lmvRdUo9xBaz/rF3alAwFJQavvKfeOlPE7oaaDHVbcySbCsg==", "requires": { - "regenerator-runtime": "^0.13.2" + "regenerator-runtime": "^0.13.4" } + }, + "regenerator-runtime": { + "version": "0.13.4", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.4.tgz", + "integrity": "sha512-plpwicqEzfEyTQohIKktWigcLzmNStMGwbOUbykx51/29Z3JOGYldaaNGK7ngNXV+UcoqvIMmloZ48Sr74sd+g==" } } }, "gatsby-link": { - "version": "2.2.29", - "resolved": "https://registry.npmjs.org/gatsby-link/-/gatsby-link-2.2.29.tgz", - "integrity": "sha512-Yl6CIseRSaF9oLgcaLc4e95al2IQ4fHxMjKQtKRZEH4sFk0BIcLaVfqPwwWBdUK0rGkyNXqNs5lATBWqmg1FwA==", + "version": "2.2.30", + "resolved": "https://registry.npmjs.org/gatsby-link/-/gatsby-link-2.2.30.tgz", + "integrity": "sha512-fGUzQBHcARIYBVMno2qkyOykcxVdANLQpQ1R0kg8b6AEVjxReB+aUlXhq25nJkW4Z2E9Dhn32Xv4mk6znteNig==", "requires": { "@babel/runtime": "^7.7.6", "@types/reach__router": "^1.2.6", @@ -9353,42 +9408,62 @@ }, "dependencies": { "@babel/runtime": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.4.tgz", - "integrity": "sha512-neAp3zt80trRVBI1x0azq6c57aNBqYZH8KhMm3TaB7wEI5Q4A2SHfBHE8w9gOhI/lrqxtEbXZgQIrHP+wvSGwQ==", + "version": "7.8.7", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.7.tgz", + "integrity": "sha512-+AATMUFppJDw6aiR5NVPHqIQBlV/Pj8wY/EZH+lmvRdUo9xBaz/rF3alAwFJQavvKfeOlPE7oaaDHVbcySbCsg==", "requires": { - "regenerator-runtime": "^0.13.2" + "regenerator-runtime": "^0.13.4" } + }, + "regenerator-runtime": { + "version": "0.13.4", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.4.tgz", + "integrity": "sha512-plpwicqEzfEyTQohIKktWigcLzmNStMGwbOUbykx51/29Z3JOGYldaaNGK7ngNXV+UcoqvIMmloZ48Sr74sd+g==" } } }, "gatsby-page-utils": { - "version": "0.0.39", - "resolved": "https://registry.npmjs.org/gatsby-page-utils/-/gatsby-page-utils-0.0.39.tgz", - "integrity": "sha512-lDrrenBnh5HR/9mgfhePPvCt2KueccbQu/KPYkBKlwz0hcZ/xl28cgit0Bj9Ijqx7XTMxBd2gtgvgB2QNd8jmA==", + "version": "0.0.41", + "resolved": "https://registry.npmjs.org/gatsby-page-utils/-/gatsby-page-utils-0.0.41.tgz", + "integrity": "sha512-Nu9kSxwRpNSMvUFsu34qD5BA1w94FkkEZc1I5RaiUwHrdE1Ga6mMSJ8Ob+4Yb3pI50eRHvYdtUtfLJW6s8XMQg==", "requires": { "@babel/runtime": "^7.7.6", "bluebird": "^3.7.2", "chokidar": "3.3.0", "fs-exists-cached": "^1.0.0", - "gatsby-core-utils": "^1.0.28", + "gatsby-core-utils": "^1.0.30", "glob": "^7.1.6", "lodash": "^4.17.15", "micromatch": "^3.1.10" }, "dependencies": { "@babel/runtime": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.4.tgz", - "integrity": "sha512-neAp3zt80trRVBI1x0azq6c57aNBqYZH8KhMm3TaB7wEI5Q4A2SHfBHE8w9gOhI/lrqxtEbXZgQIrHP+wvSGwQ==", + "version": "7.8.7", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.7.tgz", + "integrity": "sha512-+AATMUFppJDw6aiR5NVPHqIQBlV/Pj8wY/EZH+lmvRdUo9xBaz/rF3alAwFJQavvKfeOlPE7oaaDHVbcySbCsg==", "requires": { - "regenerator-runtime": "^0.13.2" + "regenerator-runtime": "^0.13.4" } }, "bluebird": { "version": "3.7.2", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" + }, + "gatsby-core-utils": { + "version": "1.0.30", + "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.0.30.tgz", + "integrity": "sha512-+WYFxf9dT4u67vecXdROe9iF2jzPKoTVbWI3FYLCcNANY2Y/vEec11vhG5FnBHdLpgmD3cnLPdhCAileKWBldA==", + "requires": { + "ci-info": "2.0.0", + "configstore": "^5.0.0", + "node-object-hash": "^2.0.0" + } + }, + "regenerator-runtime": { + "version": "0.13.4", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.4.tgz", + "integrity": "sha512-plpwicqEzfEyTQohIKktWigcLzmNStMGwbOUbykx51/29Z3JOGYldaaNGK7ngNXV+UcoqvIMmloZ48Sr74sd+g==" } } }, @@ -9511,31 +9586,36 @@ } }, "gatsby-plugin-page-creator": { - "version": "2.1.40", - "resolved": "https://registry.npmjs.org/gatsby-plugin-page-creator/-/gatsby-plugin-page-creator-2.1.40.tgz", - "integrity": "sha512-jwY8LTOOobrKUr1ph+/IHAHDuzjSrXsAu2YBqZg7wc/J6gre0YAgOU2yAxY34CadE34jieISO3FDIyHMii3vPg==", + "version": "2.1.42", + "resolved": "https://registry.npmjs.org/gatsby-plugin-page-creator/-/gatsby-plugin-page-creator-2.1.42.tgz", + "integrity": "sha512-pes5AXpm1ulmhe7UOUtfRAD9/5QTnNVP1edZQFW9jCvy/7Du29lthhsP1ptBWORkdu+1UDbBvQJh+W+9mBPkKQ==", "requires": { "@babel/runtime": "^7.7.6", "bluebird": "^3.7.2", "fs-exists-cached": "^1.0.0", - "gatsby-page-utils": "^0.0.39", + "gatsby-page-utils": "^0.0.41", "glob": "^7.1.6", "lodash": "^4.17.15", "micromatch": "^3.1.10" }, "dependencies": { "@babel/runtime": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.4.tgz", - "integrity": "sha512-neAp3zt80trRVBI1x0azq6c57aNBqYZH8KhMm3TaB7wEI5Q4A2SHfBHE8w9gOhI/lrqxtEbXZgQIrHP+wvSGwQ==", + "version": "7.8.7", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.7.tgz", + "integrity": "sha512-+AATMUFppJDw6aiR5NVPHqIQBlV/Pj8wY/EZH+lmvRdUo9xBaz/rF3alAwFJQavvKfeOlPE7oaaDHVbcySbCsg==", "requires": { - "regenerator-runtime": "^0.13.2" + "regenerator-runtime": "^0.13.4" } }, "bluebird": { "version": "3.7.2", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" + }, + "regenerator-runtime": { + "version": "0.13.4", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.4.tgz", + "integrity": "sha512-plpwicqEzfEyTQohIKktWigcLzmNStMGwbOUbykx51/29Z3JOGYldaaNGK7ngNXV+UcoqvIMmloZ48Sr74sd+g==" } } }, @@ -9591,9 +9671,9 @@ "integrity": "sha512-54REIMe79qFBAwpcnWHBkvEE9CKoEVkefF9rDXai0k642r91SZ4UeWFuAmsegPG+sPVub7tHfHu/2LVXK1I9kg==" }, "gatsby-react-router-scroll": { - "version": "2.1.22", - "resolved": "https://registry.npmjs.org/gatsby-react-router-scroll/-/gatsby-react-router-scroll-2.1.22.tgz", - "integrity": "sha512-VSwDrfiUL//eOVqtzBImxDZSQ7PbS4As8IWOP093tOS+r6ddLiSINGW7CewI/0CdYEKwIVGF5fHMWJWgg3gvEQ==", + "version": "2.1.23", + "resolved": "https://registry.npmjs.org/gatsby-react-router-scroll/-/gatsby-react-router-scroll-2.1.23.tgz", + "integrity": "sha512-yUCWzRYUDgvr3xy5GAYd08gToBfE84SX3zvHWgPunVeL4OfwsYh6eei6GtYbLIjq77bvegd2SZkSujQ4Vgm/Gg==", "requires": { "@babel/runtime": "^7.7.6", "scroll-behavior": "^0.9.10", @@ -9601,13 +9681,18 @@ }, "dependencies": { "@babel/runtime": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.4.tgz", - "integrity": "sha512-neAp3zt80trRVBI1x0azq6c57aNBqYZH8KhMm3TaB7wEI5Q4A2SHfBHE8w9gOhI/lrqxtEbXZgQIrHP+wvSGwQ==", + "version": "7.8.7", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.7.tgz", + "integrity": "sha512-+AATMUFppJDw6aiR5NVPHqIQBlV/Pj8wY/EZH+lmvRdUo9xBaz/rF3alAwFJQavvKfeOlPE7oaaDHVbcySbCsg==", "requires": { - "regenerator-runtime": "^0.13.2" + "regenerator-runtime": "^0.13.4" } }, + "regenerator-runtime": { + "version": "0.13.4", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.4.tgz", + "integrity": "sha512-plpwicqEzfEyTQohIKktWigcLzmNStMGwbOUbykx51/29Z3JOGYldaaNGK7ngNXV+UcoqvIMmloZ48Sr74sd+g==" + }, "warning": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/warning/-/warning-3.0.0.tgz", @@ -9919,9 +10004,9 @@ } }, "gatsby-telemetry": { - "version": "1.1.49", - "resolved": "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-1.1.49.tgz", - "integrity": "sha512-NLT843FVp3pt1gjJ/vsclgw6h7pIKDF9l8sWBFiIrJUjiwGqCVC+emylbuK8MFE8Js989SP40piqvgo+orEl3g==", + "version": "1.1.51", + "resolved": "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-1.1.51.tgz", + "integrity": "sha512-34SvdYWn/nJTYMiof9rAgvlcYqpzDbadfF1egMR3Kv+7dTBN5UVkeGfjUixsaD+sg6PVA+06CC5TMz8WQXCBWA==", "requires": { "@babel/code-frame": "^7.5.5", "@babel/runtime": "^7.7.6", @@ -9930,7 +10015,7 @@ "configstore": "^5.0.0", "envinfo": "^7.5.0", "fs-extra": "^8.1.0", - "gatsby-core-utils": "^1.0.28", + "gatsby-core-utils": "^1.0.30", "git-up": "4.0.1", "is-docker": "2.0.0", "lodash": "^4.17.15", @@ -9943,11 +10028,11 @@ }, "dependencies": { "@babel/runtime": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.4.tgz", - "integrity": "sha512-neAp3zt80trRVBI1x0azq6c57aNBqYZH8KhMm3TaB7wEI5Q4A2SHfBHE8w9gOhI/lrqxtEbXZgQIrHP+wvSGwQ==", + "version": "7.8.7", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.7.tgz", + "integrity": "sha512-+AATMUFppJDw6aiR5NVPHqIQBlV/Pj8wY/EZH+lmvRdUo9xBaz/rF3alAwFJQavvKfeOlPE7oaaDHVbcySbCsg==", "requires": { - "regenerator-runtime": "^0.13.2" + "regenerator-runtime": "^0.13.4" } }, "bluebird": { @@ -9955,43 +10040,14 @@ "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" }, - "configstore": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz", - "integrity": "sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==", - "requires": { - "dot-prop": "^5.2.0", - "graceful-fs": "^4.1.2", - "make-dir": "^3.0.0", - "unique-string": "^2.0.0", - "write-file-atomic": "^3.0.0", - "xdg-basedir": "^4.0.0" - } - }, - "crypto-random-string": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz", - "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==" - }, - "dot-prop": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.2.0.tgz", - "integrity": "sha512-uEUyaDKoSQ1M4Oq8l45hSE26SnTxL6snNnqvK/VWx5wJhmff5z0FUVJDKDanor/6w3kzE3i7XZOk+7wC0EXr1A==", + "gatsby-core-utils": { + "version": "1.0.30", + "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.0.30.tgz", + "integrity": "sha512-+WYFxf9dT4u67vecXdROe9iF2jzPKoTVbWI3FYLCcNANY2Y/vEec11vhG5FnBHdLpgmD3cnLPdhCAileKWBldA==", "requires": { - "is-obj": "^2.0.0" - } - }, - "is-obj": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz", - "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==" - }, - "make-dir": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.0.2.tgz", - "integrity": "sha512-rYKABKutXa6vXTXhoV18cBE7PaewPXHe/Bdq4v+ZLMhxbWApkFFplT0LcbMW+6BbjnQXzZ/sAvSE/JdguApG5w==", - "requires": { - "semver": "^6.0.0" + "ci-info": "2.0.0", + "configstore": "^5.0.0", + "node-object-hash": "^2.0.0" } }, "node-fetch": { @@ -9999,39 +10055,15 @@ "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz", "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==" }, - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + "regenerator-runtime": { + "version": "0.13.4", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.4.tgz", + "integrity": "sha512-plpwicqEzfEyTQohIKktWigcLzmNStMGwbOUbykx51/29Z3JOGYldaaNGK7ngNXV+UcoqvIMmloZ48Sr74sd+g==" }, "source-map": { "version": "0.7.3", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==" - }, - "unique-string": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz", - "integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==", - "requires": { - "crypto-random-string": "^2.0.0" - } - }, - "write-file-atomic": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz", - "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==", - "requires": { - "imurmurhash": "^0.1.4", - "is-typedarray": "^1.0.0", - "signal-exit": "^3.0.2", - "typedarray-to-buffer": "^3.1.5" - } - }, - "xdg-basedir": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz", - "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==" } } }, @@ -11128,9 +11160,9 @@ } }, "hosted-git-info": { - "version": "2.8.7", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.7.tgz", - "integrity": "sha512-ChkjQtKJ3GI6SsI4O5jwr8q8EPrWCnxuc4Tbx+vRI5x6mDOpjKKltNo1lRlszw3xwgTOSns1ZRBiMmmwpcvLxg==" + "version": "2.8.8", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz", + "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==" }, "hpack.js": { "version": "2.1.6", @@ -11213,9 +11245,9 @@ } }, "http-cache-semantics": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.0.4.tgz", - "integrity": "sha512-Z2EICWNJou7Tr9Bd2M2UqDJq3A9F2ePG9w3lIpjoyuSyXFP9QbniJVu3XQYytuw5ebmG7dXSXO9PgAjJG8DDKA==" + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz", + "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==" }, "http-deceiver": { "version": "1.2.7", @@ -11474,6 +11506,15 @@ "yoga-layout-prebuilt": "^1.9.3" }, "dependencies": { + "ansi-escapes": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz", + "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==", + "optional": true, + "requires": { + "type-fest": "^0.11.0" + } + }, "ansi-regex": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", @@ -11579,6 +11620,12 @@ "has-flag": "^4.0.0" } }, + "type-fest": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz", + "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==", + "optional": true + }, "wrap-ansi": { "version": "6.2.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", @@ -11617,9 +11664,9 @@ } }, "inquirer": { - "version": "7.0.5", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.0.5.tgz", - "integrity": "sha512-6Z5cP+LAO0rzNE7xWjWtT84jxKa5ScLEGLgegPXeO3dGeU8lNe5Ii7SlXH6KVtLGlDuaEhsvsFjrjWjw8j5lFg==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.0.6.tgz", + "integrity": "sha512-7SVO4h+QIdMq6XcqIqrNte3gS5MzCCKZdsq9DO4PJziBFNYzP3PGFbDjgadDb//MCahzgjCxvQ/O2wa7kx9o4w==", "requires": { "ansi-escapes": "^4.2.1", "chalk": "^3.0.0", @@ -11636,6 +11683,14 @@ "through": "^2.3.6" }, "dependencies": { + "ansi-escapes": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz", + "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==", + "requires": { + "type-fest": "^0.11.0" + } + }, "ansi-regex": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", @@ -11712,6 +11767,11 @@ "requires": { "has-flag": "^4.0.0" } + }, + "type-fest": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz", + "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==" } } }, @@ -12100,9 +12160,9 @@ } }, "is-obj": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", - "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz", + "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==" }, "is-object": { "version": "1.0.1", @@ -13067,12 +13127,6 @@ "wrap-ansi": "^5.0.0" }, "dependencies": { - "ansi-escapes": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz", - "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==", - "optional": true - }, "cli-cursor": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz", @@ -14712,6 +14766,15 @@ "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz", "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=" }, + "password-prompt": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/password-prompt/-/password-prompt-1.1.2.tgz", + "integrity": "sha512-bpuBhROdrhuN3E7G/koAju0WjVw9/uQOG5Co5mokNj0MiOSBVZS1JTwM4zl55hu0WFmIEFvO9cU9sJQiBIYeIA==", + "requires": { + "ansi-escapes": "^3.1.0", + "cross-spawn": "^6.0.5" + } + }, "path-browserify": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz", @@ -14922,9 +14985,9 @@ } }, "electron-to-chromium": { - "version": "1.3.364", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.364.tgz", - "integrity": "sha512-V6hyxQ9jzt6Jy6w8tAv4HHKhIaVS6psG/gmwtQ+2+itdkWMHJLHJ4m1sFep/fWkdKvfJcPXuywfnECRzfNa7gw==" + "version": "1.3.372", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.372.tgz", + "integrity": "sha512-77a4jYC52OdisHM+Tne7dgWEvQT1FoNu/jYl279pP88ZtG4ZRIPyhQwAKxj6C2rzsyC1OwsOds9JlZtNncSz6g==" }, "postcss-value-parser": { "version": "3.3.1", @@ -14982,28 +15045,11 @@ } }, "postcss-flexbugs-fixes": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-3.3.1.tgz", - "integrity": "sha512-9y9kDDf2F9EjKX6x9ueNa5GARvsUbXw4ezH8vXItXHwKzljbu8awP7t5dCaabKYm18Vs1lo5bKQcnc0HkISt+w==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-4.2.0.tgz", + "integrity": "sha512-QRE0n3hpkxxS/OGvzOa+PDuy4mh/Jg4o9ui22/ko5iGYOG3M5dfJabjnAZjTdh2G9F85c7Hv8hWcEDEKW/xceQ==", "requires": { - "postcss": "^6.0.1" - }, - "dependencies": { - "postcss": { - "version": "6.0.23", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz", - "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==", - "requires": { - "chalk": "^2.4.1", - "source-map": "^0.6.1", - "supports-color": "^5.4.0" - } - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" - } + "postcss": "^7.0.26" } }, "postcss-load-config": { @@ -15016,30 +15062,25 @@ } }, "postcss-loader": { - "version": "2.1.6", - "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-2.1.6.tgz", - "integrity": "sha512-hgiWSc13xVQAq25cVw80CH0l49ZKlAnU1hKPOdRrNj89bokRr/bZF2nT+hebPPF9c9xs8c3gw3Fr2nxtmXYnNg==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-3.0.0.tgz", + "integrity": "sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==", "requires": { "loader-utils": "^1.1.0", - "postcss": "^6.0.0", + "postcss": "^7.0.0", "postcss-load-config": "^2.0.0", - "schema-utils": "^0.4.0" + "schema-utils": "^1.0.0" }, "dependencies": { - "postcss": { - "version": "6.0.23", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz", - "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==", + "schema-utils": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz", + "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==", "requires": { - "chalk": "^2.4.1", - "source-map": "^0.6.1", - "supports-color": "^5.4.0" + "ajv": "^6.1.0", + "ajv-errors": "^1.0.0", + "ajv-keywords": "^3.1.0" } - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" } } }, @@ -15084,23 +15125,10 @@ "node-releases": "^1.1.50" } }, - "dot-prop": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.2.0.tgz", - "integrity": "sha512-uEUyaDKoSQ1M4Oq8l45hSE26SnTxL6snNnqvK/VWx5wJhmff5z0FUVJDKDanor/6w3kzE3i7XZOk+7wC0EXr1A==", - "requires": { - "is-obj": "^2.0.0" - } - }, "electron-to-chromium": { - "version": "1.3.364", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.364.tgz", - "integrity": "sha512-V6hyxQ9jzt6Jy6w8tAv4HHKhIaVS6psG/gmwtQ+2+itdkWMHJLHJ4m1sFep/fWkdKvfJcPXuywfnECRzfNa7gw==" - }, - "is-obj": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz", - "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==" + "version": "1.3.372", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.372.tgz", + "integrity": "sha512-77a4jYC52OdisHM+Tne7dgWEvQT1FoNu/jYl279pP88ZtG4ZRIPyhQwAKxj6C2rzsyC1OwsOds9JlZtNncSz6g==" }, "postcss-selector-parser": { "version": "3.1.2", @@ -15172,9 +15200,9 @@ } }, "electron-to-chromium": { - "version": "1.3.364", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.364.tgz", - "integrity": "sha512-V6hyxQ9jzt6Jy6w8tAv4HHKhIaVS6psG/gmwtQ+2+itdkWMHJLHJ4m1sFep/fWkdKvfJcPXuywfnECRzfNa7gw==" + "version": "1.3.372", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.372.tgz", + "integrity": "sha512-77a4jYC52OdisHM+Tne7dgWEvQT1FoNu/jYl279pP88ZtG4ZRIPyhQwAKxj6C2rzsyC1OwsOds9JlZtNncSz6g==" }, "postcss-value-parser": { "version": "3.3.1", @@ -15194,19 +15222,6 @@ "postcss-selector-parser": "^3.0.0" }, "dependencies": { - "dot-prop": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.2.0.tgz", - "integrity": "sha512-uEUyaDKoSQ1M4Oq8l45hSE26SnTxL6snNnqvK/VWx5wJhmff5z0FUVJDKDanor/6w3kzE3i7XZOk+7wC0EXr1A==", - "requires": { - "is-obj": "^2.0.0" - } - }, - "is-obj": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz", - "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==" - }, "postcss-selector-parser": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz", @@ -15438,9 +15453,9 @@ } }, "electron-to-chromium": { - "version": "1.3.364", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.364.tgz", - "integrity": "sha512-V6hyxQ9jzt6Jy6w8tAv4HHKhIaVS6psG/gmwtQ+2+itdkWMHJLHJ4m1sFep/fWkdKvfJcPXuywfnECRzfNa7gw==" + "version": "1.3.372", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.372.tgz", + "integrity": "sha512-77a4jYC52OdisHM+Tne7dgWEvQT1FoNu/jYl279pP88ZtG4ZRIPyhQwAKxj6C2rzsyC1OwsOds9JlZtNncSz6g==" }, "postcss-value-parser": { "version": "3.3.1", @@ -15527,9 +15542,9 @@ } }, "electron-to-chromium": { - "version": "1.3.364", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.364.tgz", - "integrity": "sha512-V6hyxQ9jzt6Jy6w8tAv4HHKhIaVS6psG/gmwtQ+2+itdkWMHJLHJ4m1sFep/fWkdKvfJcPXuywfnECRzfNa7gw==" + "version": "1.3.372", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.372.tgz", + "integrity": "sha512-77a4jYC52OdisHM+Tne7dgWEvQT1FoNu/jYl279pP88ZtG4ZRIPyhQwAKxj6C2rzsyC1OwsOds9JlZtNncSz6g==" } } }, @@ -15559,13 +15574,6 @@ "cssesc": "^3.0.0", "indexes-of": "^1.0.1", "uniq": "^1.0.1" - }, - "dependencies": { - "cssesc": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", - "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==" - } } }, "postcss-svgo": { @@ -15977,11 +15985,6 @@ "resolved": "https://registry.npmjs.org/address/-/address-1.0.3.tgz", "integrity": "sha512-z55ocwKBRLryBs394Sm3ushTtBeg6VAeuku7utSoSnsJKvKcnXFIyC6vh27n3rXyxSgkJBBCAvyOn7gSUcTYjg==" }, - "ansi-escapes": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz", - "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==" - }, "ansi-styles": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", @@ -16159,14 +16162,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=" - }, - "tmp": { - "version": "0.0.33", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", - "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", - "requires": { - "os-tmpdir": "~1.0.2" - } } } }, @@ -18794,23 +18789,10 @@ "node-releases": "^1.1.50" } }, - "dot-prop": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.2.0.tgz", - "integrity": "sha512-uEUyaDKoSQ1M4Oq8l45hSE26SnTxL6snNnqvK/VWx5wJhmff5z0FUVJDKDanor/6w3kzE3i7XZOk+7wC0EXr1A==", - "requires": { - "is-obj": "^2.0.0" - } - }, "electron-to-chromium": { - "version": "1.3.364", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.364.tgz", - "integrity": "sha512-V6hyxQ9jzt6Jy6w8tAv4HHKhIaVS6psG/gmwtQ+2+itdkWMHJLHJ4m1sFep/fWkdKvfJcPXuywfnECRzfNa7gw==" - }, - "is-obj": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz", - "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==" + "version": "1.3.372", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.372.tgz", + "integrity": "sha512-77a4jYC52OdisHM+Tne7dgWEvQT1FoNu/jYl279pP88ZtG4ZRIPyhQwAKxj6C2rzsyC1OwsOds9JlZtNncSz6g==" }, "postcss-selector-parser": { "version": "3.1.2", @@ -18829,6 +18811,11 @@ "resolved": "https://registry.npmjs.org/stylis/-/stylis-3.5.0.tgz", "integrity": "sha512-pP7yXN6dwMzAR29Q0mBrabPCe0/mNO1MSr93bhay+hcZondvMMTpeGyd8nbhYJdyperNT2DRxONQuUGcJr5iPw==" }, + "sudo-prompt": { + "version": "8.2.5", + "resolved": "https://registry.npmjs.org/sudo-prompt/-/sudo-prompt-8.2.5.tgz", + "integrity": "sha512-rlBo3HU/1zAJUrkY6jNxDOC9eVYliG6nS4JA8u8KAshITd07tafMc/Br7xQwCSseXwJ2iCcHCE8SNWX3q8Z+kw==" + }, "supports-color": { "version": "5.5.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", @@ -19072,11 +19059,11 @@ } }, "tmp": { - "version": "0.0.31", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz", - "integrity": "sha1-jzirlDjhcxXl29izZX6L+yd65Kc=", + "version": "0.0.33", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", + "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", "requires": { - "os-tmpdir": "~1.0.1" + "os-tmpdir": "~1.0.2" } }, "to-array": { @@ -19397,11 +19384,11 @@ } }, "unique-string": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz", - "integrity": "sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz", + "integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==", "requires": { - "crypto-random-string": "^1.0.0" + "crypto-random-string": "^2.0.0" } }, "unist-builder": { @@ -19656,6 +19643,19 @@ "which": "^1.2.9" } }, + "crypto-random-string": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz", + "integrity": "sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4=" + }, + "dot-prop": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz", + "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==", + "requires": { + "is-obj": "^1.0.0" + } + }, "execa": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz", @@ -19670,6 +19670,11 @@ "strip-eof": "^1.0.0" } }, + "is-obj": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", + "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=" + }, "lru-cache": { "version": "4.1.5", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", @@ -19723,6 +19728,14 @@ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.3.1.tgz", "integrity": "sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ==" }, + "unique-string": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz", + "integrity": "sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=", + "requires": { + "crypto-random-string": "^1.0.0" + } + }, "widest-line": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-2.0.1.tgz", @@ -19754,6 +19767,21 @@ } } } + }, + "write-file-atomic": { + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgz", + "integrity": "sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==", + "requires": { + "graceful-fs": "^4.1.11", + "imurmurhash": "^0.1.4", + "signal-exit": "^3.0.2" + } + }, + "xdg-basedir": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz", + "integrity": "sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ=" } } }, @@ -20586,13 +20614,14 @@ } }, "write-file-atomic": { - "version": "2.4.3", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgz", - "integrity": "sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz", + "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==", "requires": { - "graceful-fs": "^4.1.11", "imurmurhash": "^0.1.4", - "signal-exit": "^3.0.2" + "is-typedarray": "^1.0.0", + "signal-exit": "^3.0.2", + "typedarray-to-buffer": "^3.1.5" } }, "ws": { @@ -20606,15 +20635,23 @@ "integrity": "sha1-R0tQhlrzpJqcRlfwWs0UVFj3fYI=" }, "xdg-basedir": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz", - "integrity": "sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ=" + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz", + "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==" }, "xmlhttprequest-ssl": { "version": "1.5.5", "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz", "integrity": "sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=" }, + "xregexp": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-4.3.0.tgz", + "integrity": "sha512-7jXDIFXh5yJ/orPn4SXjuVrWWoi4Cr8jfV1eHv9CixKSbU+jY4mxfrBwAuDvupPNKpMUY+FeIqsVw/JLT9+B8g==", + "requires": { + "@babel/runtime-corejs3": "^7.8.3" + } + }, "xstate": { "version": "4.7.3", "resolved": "https://registry.npmjs.org/xstate/-/xstate-4.7.3.tgz", diff --git a/docs/package.json b/docs/package.json index 1d8e7335bf0..f1bc66be4c7 100644 --- a/docs/package.json +++ b/docs/package.json @@ -6,7 +6,7 @@ "serve": "gatsby serve" }, "dependencies": { - "gatsby": "2.19.23", + "gatsby": "2.19.32", "gatsby-theme-apollo-docs": "4.0.13", "react": "16.13.0", "react-dom": "16.13.0" From 6597e396c788dd079a76711bbb5d08d1d96daf8f Mon Sep 17 00:00:00 2001 From: Paulo Rezende <38743434+pauloedurezende@users.noreply.github.com> Date: Tue, 10 Mar 2020 08:22:18 -0300 Subject: [PATCH 253/642] apollo-server: Disable "x-powered-by" header (#3821) Do not include the Express-default `x-powered-by: express` header. Co-authored-by: Jesse Rosenberger --- CHANGELOG.md | 1 + packages/apollo-server/src/index.ts | 2 ++ 2 files changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 794801e7fc8..b3c52302aa6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ The version headers in this history reflect the versions of Apollo Server itself - `apollo-server-core`: When operating in gateway mode using the `gateway` property of the Apollo Server constructor options, the failure to initialize a schema during initial start-up, e.g. connectivity problems, will no longer result in the federated executor from being assigned when the schema eventually becomes available. This precludes a state where the gateway may never become available to serve federated requests, even when failure conditions are no longer present. [PR #3811](https://github.com/apollographql/apollo-server/pull/3811) - `apollo-server-core`: Prevent a condition which prefixed an error message on each request when the initial gateway initialization resulted in a Promise-rejection which was memoized and re-prepended with `Invalid options provided to ApolloServer:` on each request. [PR #3811](https://github.com/apollographql/apollo-server/pull/3811) +- `apollo-server-express`: Disable the automatic inclusion of the `x-powered-by: express` header. [PR #3821](https://github.com/apollographql/apollo-server/pull/3821) ### v2.11.0 diff --git a/packages/apollo-server/src/index.ts b/packages/apollo-server/src/index.ts index 3911fbd1d3a..19e25bafc77 100644 --- a/packages/apollo-server/src/index.ts +++ b/packages/apollo-server/src/index.ts @@ -97,6 +97,8 @@ export class ApolloServer extends ApolloServerBase { // object, so we have to create it. const app = express(); + app.disable('x-powered-by'); + // provide generous values for the getting started experience super.applyMiddleware({ app, From 50ae02d4cf196dde13482a50cd1c44ab1fe5c19e Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 10 Mar 2020 16:33:46 +0200 Subject: [PATCH 254/642] Release - apollo-server-plugin-operation-registry@0.3.0 --- packages/apollo-server-plugin-operation-registry/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/package.json b/packages/apollo-server-plugin-operation-registry/package.json index 77752b6a8f6..2681e4f92fa 100644 --- a/packages/apollo-server-plugin-operation-registry/package.json +++ b/packages/apollo-server-plugin-operation-registry/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-plugin-operation-registry", - "version": "0.3.0-alpha.1", + "version": "0.3.0", "description": "Apollo Server operation registry", "main": "dist/index.js", "types": "dist/index.d.ts", From 945dd297feb818b90d7bde3f77759061a2ce2135 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 10 Mar 2020 22:15:13 +0000 Subject: [PATCH 255/642] chore(deps): update dependency gatsby-theme-apollo-docs to v4.0.14 (#3879) Co-authored-by: Renovate Bot --- docs/package-lock.json | 123 +++++++++++++++++++++-------------------- docs/package.json | 2 +- 2 files changed, 63 insertions(+), 62 deletions(-) diff --git a/docs/package-lock.json b/docs/package-lock.json index eddacacfdc7..3f52d801e4e 100644 --- a/docs/package-lock.json +++ b/docs/package-lock.json @@ -2431,9 +2431,9 @@ "integrity": "sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==" }, "@emotion/is-prop-valid": { - "version": "0.8.7", - "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-0.8.7.tgz", - "integrity": "sha512-OPkKzUeiid0vEKjZqnGcy2mzxjIlCffin+L2C02pdz/bVlt5zZZE2VzO0D3XOPnH0NEeF21QNKSXiZphjr4xiQ==", + "version": "0.8.8", + "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz", + "integrity": "sha512-u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA==", "requires": { "@emotion/memoize": "0.7.4" } @@ -2470,12 +2470,12 @@ } }, "@emotion/styled-base": { - "version": "10.0.28", - "resolved": "https://registry.npmjs.org/@emotion/styled-base/-/styled-base-10.0.28.tgz", - "integrity": "sha512-bLYVsPlFZ3SIR9YQsuFiJ9mML76ZLnsAfbkwBFbdMTCJ/0I+xgv+SG/QYHiLvGUUohjNVPeneYUyTUkcKndWxg==", + "version": "10.0.30", + "resolved": "https://registry.npmjs.org/@emotion/styled-base/-/styled-base-10.0.30.tgz", + "integrity": "sha512-pjAZxjnDzLQ5F0Wv3DgTLvg8pw4bMSABP9GHDdCaDjZak/8Il5mQRLs15h9AKC95E8QG1NEr11GfHO1SGYV5ZA==", "requires": { "@babel/runtime": "^7.5.5", - "@emotion/is-prop-valid": "0.8.7", + "@emotion/is-prop-valid": "0.8.8", "@emotion/serialize": "^0.11.15", "@emotion/utils": "0.11.3" } @@ -2868,9 +2868,9 @@ } }, "@types/classnames": { - "version": "2.2.9", - "resolved": "https://registry.npmjs.org/@types/classnames/-/classnames-2.2.9.tgz", - "integrity": "sha512-MNl+rT5UmZeilaPxAVs6YaPC2m6aA8rofviZbhbxpPpl61uKodfdQVsBtgJGTqGizEf02oW3tsVe7FYB8kK14A==" + "version": "2.2.10", + "resolved": "https://registry.npmjs.org/@types/classnames/-/classnames-2.2.10.tgz", + "integrity": "sha512-1UzDldn9GfYYEsWWnn/P4wkTlkZDH7lDb0wBMGbtIQc9zXEQq7FlKBdZUn6OBqD8sKZZ2RQO2mAjGpXiDGoRmQ==" }, "@types/color-name": { "version": "1.1.1", @@ -9366,11 +9366,12 @@ } }, "gatsby-core-utils": { - "version": "1.0.28", - "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.0.28.tgz", - "integrity": "sha512-XWKR9Rk2v6iQkmBsTLCdI3adyC9PCh1s5BQ85nlGitlgcVVQq98jZlQdcy0v9mJOrTuce0uf5RqkeGDWFLekoA==", + "version": "1.0.31", + "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.0.31.tgz", + "integrity": "sha512-QvyAaC2nK+34giEPn2eMMkruvzyz4cD3+68RFV9A71HDuLU7FTgnhahyV8QmqZdjK2zVnhEIs2rGuf4weEuu1g==", "requires": { "ci-info": "2.0.0", + "configstore": "^5.0.0", "node-object-hash": "^2.0.0" } }, @@ -9468,9 +9469,9 @@ } }, "gatsby-plugin-emotion": { - "version": "4.1.23", - "resolved": "https://registry.npmjs.org/gatsby-plugin-emotion/-/gatsby-plugin-emotion-4.1.23.tgz", - "integrity": "sha512-SP3hGbyj2Kq42iIS9tDR6aZMvBsbH7GhPizfmr+1L1KxYjFedjd3U/gWa346wJbvtiwnSkeoLZKMUATX4w1VCA==", + "version": "4.1.24", + "resolved": "https://registry.npmjs.org/gatsby-plugin-emotion/-/gatsby-plugin-emotion-4.1.24.tgz", + "integrity": "sha512-lTsfH7HV1RAB13pQOnzRyZ5hMv/m0jqJDW4rcJ3hB6UKmnrD9DAMuGT6A7FuReg16LI+jyLA1O9mCL6booNPIQ==", "requires": { "@babel/runtime": "^7.7.6", "@emotion/babel-preset-css-prop": "^10.0.23" @@ -9492,9 +9493,9 @@ } }, "gatsby-plugin-less": { - "version": "3.0.19", - "resolved": "https://registry.npmjs.org/gatsby-plugin-less/-/gatsby-plugin-less-3.0.19.tgz", - "integrity": "sha512-eFylv8g4qcymrtLjN0ctHkpA9fywYmz0x1DrjwS+OBCft4fSkhAQk8Exx6HmGkeolog/RtdDEI4XRRh6T6dAVA==", + "version": "3.0.20", + "resolved": "https://registry.npmjs.org/gatsby-plugin-less/-/gatsby-plugin-less-3.0.20.tgz", + "integrity": "sha512-jVPuTZdMB/GQteB9wUJgD0BQqDcBpP6fxRwxzGAoj5tj9Nvt+TuzXOwBIybxg0cvVOTGE3upsk2vtgKoxy8EoQ==", "requires": { "@babel/runtime": "^7.7.6", "less-loader": "^5.0.0" @@ -9516,9 +9517,9 @@ } }, "gatsby-plugin-mdx": { - "version": "1.0.75", - "resolved": "https://registry.npmjs.org/gatsby-plugin-mdx/-/gatsby-plugin-mdx-1.0.75.tgz", - "integrity": "sha512-CMjAk8EbQh7uufWenUG4yQJ7fa7Jitp8txJmlIwxm4+xgKlrMvmJ9fg5PhDFlCjG8t09mxoJt8dlh8izJZXQwg==", + "version": "1.0.78", + "resolved": "https://registry.npmjs.org/gatsby-plugin-mdx/-/gatsby-plugin-mdx-1.0.78.tgz", + "integrity": "sha512-iB8AN/MGBu8vtYM9UJHx5HwkVhDwk748iAnWHlnM1rwuV5bO8hqCpQ8nBg1VCDo8sf9HRP5Vo1P1TfWurxF1Tg==", "requires": { "@babel/core": "^7.7.5", "@babel/generator": "^7.7.4", @@ -9535,7 +9536,7 @@ "escape-string-regexp": "^1.0.5", "eval": "^0.1.4", "fs-extra": "^8.1.0", - "gatsby-core-utils": "^1.0.28", + "gatsby-core-utils": "^1.0.31", "gray-matter": "^4.0.2", "json5": "^2.1.1", "loader-utils": "^1.2.3", @@ -9638,9 +9639,9 @@ } }, "gatsby-plugin-react-helmet": { - "version": "3.1.22", - "resolved": "https://registry.npmjs.org/gatsby-plugin-react-helmet/-/gatsby-plugin-react-helmet-3.1.22.tgz", - "integrity": "sha512-eG57C7Rm84dOpaFYxqQsKSzP0ge/6SnAEsPH5JcAcJ7vETtn3rCS6SB8qs+Nk/jhziAjdGjBw3CSJnOkg/QUJA==", + "version": "3.1.23", + "resolved": "https://registry.npmjs.org/gatsby-plugin-react-helmet/-/gatsby-plugin-react-helmet-3.1.23.tgz", + "integrity": "sha512-l6OomFCfggJ6IG8XOw0WuCqbTnVrqtMRxA/O5qbCpXH7K9JxjE406vUM8To0dVjoaCiSvRZU/Dz0vU0wEWe0UQ==", "requires": { "@babel/runtime": "^7.7.6" }, @@ -9704,9 +9705,9 @@ } }, "gatsby-remark-autolink-headers": { - "version": "2.1.24", - "resolved": "https://registry.npmjs.org/gatsby-remark-autolink-headers/-/gatsby-remark-autolink-headers-2.1.24.tgz", - "integrity": "sha512-8cVIE0UEYPo9BcTdVNwDF3phYvRJ2jfFNK0VXt2y1uJelfczjPwBDl7sL6GaHEA7WPPok5Ac7ZRI4jgYI84tPw==", + "version": "2.1.25", + "resolved": "https://registry.npmjs.org/gatsby-remark-autolink-headers/-/gatsby-remark-autolink-headers-2.1.25.tgz", + "integrity": "sha512-E8L+3Ub49/v8K5jOcaHmjul0vG50EQdqGFVKrmspEJrHhgDkSascayAtiCdpMbxIPEnuRP35nnu2dYqGaaxSIw==", "requires": { "@babel/runtime": "^7.7.6", "github-slugger": "^1.2.1", @@ -9795,9 +9796,9 @@ } }, "gatsby-remark-copy-linked-files": { - "version": "2.1.37", - "resolved": "https://registry.npmjs.org/gatsby-remark-copy-linked-files/-/gatsby-remark-copy-linked-files-2.1.37.tgz", - "integrity": "sha512-ZDmItZzATXnUlU5jywcFs3ujIpE47DxrisFnolR7RdLo9pMRIqWvt/HFnBGPEaMng8S8+VuvM9SZtCNZMmnRYg==", + "version": "2.1.39", + "resolved": "https://registry.npmjs.org/gatsby-remark-copy-linked-files/-/gatsby-remark-copy-linked-files-2.1.39.tgz", + "integrity": "sha512-jwNGPgS3e7sjvsbcZukZdGN3mfgnzPR4U3C0RRdiiDgJbk5qnVM8n0InUtecHmBNHE+JZho48Okl5zk0gIh+bw==", "requires": { "@babel/runtime": "^7.7.6", "cheerio": "^1.0.0-rc.3", @@ -9888,9 +9889,9 @@ } }, "gatsby-remark-prismjs": { - "version": "3.3.32", - "resolved": "https://registry.npmjs.org/gatsby-remark-prismjs/-/gatsby-remark-prismjs-3.3.32.tgz", - "integrity": "sha512-n/9VLOs5xNOgGQj4m1//PVmvQLEgbmLPqQo5/Hmuw4b+x76KFHfZGVrvwUHpSB0/yCrv6UCykOFI5J8ZxPXjkg==", + "version": "3.3.33", + "resolved": "https://registry.npmjs.org/gatsby-remark-prismjs/-/gatsby-remark-prismjs-3.3.33.tgz", + "integrity": "sha512-9ob5zaJuAXYUrO3NCjn0332b7HbEZ7IBzwkZbOvabgPXPryoPY9kmriiY49Y0GmYi9nOWc6RL58Aj6YnTe3v3w==", "requires": { "@babel/runtime": "^7.7.6", "parse-numeric-range": "^0.0.2", @@ -9929,9 +9930,9 @@ } }, "gatsby-source-filesystem": { - "version": "2.1.48", - "resolved": "https://registry.npmjs.org/gatsby-source-filesystem/-/gatsby-source-filesystem-2.1.48.tgz", - "integrity": "sha512-m1RIYDoV9rhMe2p0ZJA1ae4IIX+iIJCMpNnQiQVtTf+mfihiWyDAdi4lsWzJUxPt8FQwDgUG7GzY3sAoGctvzQ==", + "version": "2.1.51", + "resolved": "https://registry.npmjs.org/gatsby-source-filesystem/-/gatsby-source-filesystem-2.1.51.tgz", + "integrity": "sha512-j0FlGCy//9a45jPJ/q1MGDK9ViZ/wEQThSwsIjTU6/tNwV2GY0p8dcVGRtUZblYdbWOv8J7WhTA6t3QKLHEzgQ==", "requires": { "@babel/runtime": "^7.7.6", "better-queue": "^3.8.10", @@ -9939,7 +9940,7 @@ "chokidar": "3.3.0", "file-type": "^12.4.0", "fs-extra": "^8.1.0", - "gatsby-core-utils": "^1.0.28", + "gatsby-core-utils": "^1.0.31", "got": "^8.3.2", "md5-file": "^3.2.3", "mime": "^2.4.4", @@ -10089,9 +10090,9 @@ } }, "gatsby-theme-apollo-docs": { - "version": "4.0.13", - "resolved": "https://registry.npmjs.org/gatsby-theme-apollo-docs/-/gatsby-theme-apollo-docs-4.0.13.tgz", - "integrity": "sha512-584b21cJmmT/7WyEoSKgxLRJUtRsLrapQWThxRUN8+pQMn4rv+jzAfkOwwNf1l7ahbKRWrA1Gnb/hF0bmaOuAw==", + "version": "4.0.14", + "resolved": "https://registry.npmjs.org/gatsby-theme-apollo-docs/-/gatsby-theme-apollo-docs-4.0.14.tgz", + "integrity": "sha512-hptn26w5o8MOA5iH6NZ00KrWdUzPRXUiCgJzh1J4+ggqCtypGixU5uXJIwR/ka9WRUJtQWz9uaJ47XlPnhTMUw==", "requires": { "@mdx-js/mdx": "^1.1.0", "@mdx-js/react": "^1.0.27", @@ -10122,13 +10123,13 @@ } }, "gatsby-transformer-remark": { - "version": "2.6.53", - "resolved": "https://registry.npmjs.org/gatsby-transformer-remark/-/gatsby-transformer-remark-2.6.53.tgz", - "integrity": "sha512-Gg5d93B20cE0xp5q3ieuVwn4CaYDBBImw1SpQCySixUo43yjdQIWfwkSePYDaKNPzaICdRyy/7+X2bbZP43e5w==", + "version": "2.6.56", + "resolved": "https://registry.npmjs.org/gatsby-transformer-remark/-/gatsby-transformer-remark-2.6.56.tgz", + "integrity": "sha512-WJ0FW95fpGYVBwAKYK+ddEvr7b1Wj3ot2BLSgzhcVGn1dHrih+y89NI6XwHs8bHmRhWaVNSF21fdvDC2bYlZ0w==", "requires": { "@babel/runtime": "^7.7.6", "bluebird": "^3.7.2", - "gatsby-core-utils": "^1.0.28", + "gatsby-core-utils": "^1.0.31", "gray-matter": "^4.0.2", "hast-util-raw": "^4.0.0", "hast-util-to-html": "^4.0.1", @@ -13228,9 +13229,9 @@ "integrity": "sha1-81ypHEk/e3PaDgdJUwTxezH4fuU=" }, "magic-string": { - "version": "0.25.6", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.6.tgz", - "integrity": "sha512-3a5LOMSGoCTH5rbqobC2HuDNRtE2glHZ8J7pK+QZYppyWA36yuNpsX994rIY2nCuyP7CZYy7lQq/X2jygiZ89g==", + "version": "0.25.7", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz", + "integrity": "sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==", "requires": { "sourcemap-codec": "^1.4.4" } @@ -13387,9 +13388,9 @@ } }, "mdast-util-to-string": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-1.0.8.tgz", - "integrity": "sha512-GBracya0dOzckEEizUBzfrkWRLCHMsppuU97LPUriY9kWnYyGFWTx4VDW+sUcj2LneBz/Tp1aYp3aUCibzjtWg==" + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-1.1.0.tgz", + "integrity": "sha512-jVU0Nr2B9X3MU4tSK7JP1CMkSvOj7X5l/GboG1tKRw52lLF1x2Ju92Ms9tNetCcbfX3hzlM73zYo2NKkWSfF/A==" }, "mdast-util-toc": { "version": "3.1.0", @@ -13510,9 +13511,9 @@ }, "dependencies": { "crypto-random-string": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-3.1.0.tgz", - "integrity": "sha512-Tip3yGB+bA7B0W8E4K4mNf2rZhu5r2G5Tb89/utEl5tP1QuLjTF/S9a1b8ifDrR4ORc9Utf6tscpSEtBY3YcPQ==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-3.2.0.tgz", + "integrity": "sha512-8vPu5bsKaq2uKRy3OL7h1Oo7RayAWB8sYexLKAqvCXVib8SxgbmoF1IN4QMKjBv8uI8mp5gPPMbiRah25GMrVQ==", "requires": { "type-fest": "^0.8.1" } @@ -17186,9 +17187,9 @@ } }, "rollup-plugin-babel": { - "version": "4.3.3", - "resolved": "https://registry.npmjs.org/rollup-plugin-babel/-/rollup-plugin-babel-4.3.3.tgz", - "integrity": "sha512-tKzWOCmIJD/6aKNz0H1GMM+lW1q9KyFubbWzGiOG540zxPPifnEAHTZwjo0g991Y+DyOZcLqBgqOdqazYE5fkw==", + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/rollup-plugin-babel/-/rollup-plugin-babel-4.4.0.tgz", + "integrity": "sha512-Lek/TYp1+7g7I+uMfJnnSJ7YWoD58ajo6Oarhlex7lvUce+RCKRuGRSgztDO3/MF/PuGKmUL5iTHKf208UNszw==", "requires": { "@babel/helper-module-imports": "^7.0.0", "rollup-pluginutils": "^2.8.1" @@ -17231,9 +17232,9 @@ }, "dependencies": { "acorn": { - "version": "5.7.3", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz", - "integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==" + "version": "5.7.4", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz", + "integrity": "sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==" }, "estree-walker": { "version": "0.5.2", diff --git a/docs/package.json b/docs/package.json index f1bc66be4c7..e486d4d90ba 100644 --- a/docs/package.json +++ b/docs/package.json @@ -7,7 +7,7 @@ }, "dependencies": { "gatsby": "2.19.32", - "gatsby-theme-apollo-docs": "4.0.13", + "gatsby-theme-apollo-docs": "4.0.14", "react": "16.13.0", "react-dom": "16.13.0" } From 2562ad370b954f1b45188b77ba4b53202e98db0f Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Wed, 11 Mar 2020 22:12:03 +0200 Subject: [PATCH 256/642] =?UTF-8?q?Fail=20to=20compose=20when=20a=20servic?= =?UTF-8?q?e's=20federated=20SDL=20cannot=20be=20retrie=E2=80=A6=20(#3867)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Previously, when attempting to compose a schema from a downstream service in unmanaged mode, the unavailability of a service would not cause composition to fail. Given a condition when the remaining downstream services are still composable (e.g. they do not depend on the unavailable service and it does not depend on them), this could still render a valid, but unintentionally partial schema. While a partial schema is in many ways fine, it will cause any client's queries against that now-missing part of the graph to suddenly become queries which will no longer validate, despite the fact that they may have previously been designed to fail gracefully during degradation of the service. Rather than simply logging errors with `console.error` in those conditions, we will now `throw` the errors. Thanks to changes in the upstream invokers' error handling (e.g.https://github.com/apollographql/apollo-server/pull/3811), this `throw`-ing will now prevent unintentionally serving an incomplete graph. --- packages/apollo-gateway/CHANGELOG.md | 4 + .../loadServicesFromRemoteEndpoint.test.ts | 35 ++++++++ .../src/loadServicesFromRemoteEndpoint.ts | 87 +++++++++---------- 3 files changed, 79 insertions(+), 47 deletions(-) create mode 100644 packages/apollo-gateway/src/__tests__/loadServicesFromRemoteEndpoint.test.ts diff --git a/packages/apollo-gateway/CHANGELOG.md b/packages/apollo-gateway/CHANGELOG.md index b29578cbd08..62905b09b48 100644 --- a/packages/apollo-gateway/CHANGELOG.md +++ b/packages/apollo-gateway/CHANGELOG.md @@ -6,6 +6,10 @@ - Provide a more helpful error message when encountering expected errors. [PR #3811](https://github.com/apollographql/apollo-server/pull/3811) - General improvements and clarity to error messages and logging. [PR #3811](https://github.com/apollographql/apollo-server/pull/3811) +## 0.14.0 (pre-release; `@next` tag) + +- During composition, the unavailability of a downstream service in unmanaged federation mode will no longer result in a partially composed schema which merely lacks the types provided by the downed service. This prevents unexpected validation errors for clients querying a graph which lacks types which were merely unavailable during the initial composition but were intended to be part of the graph. [PR #3867](https://github.com/apollographql/apollo-server/pull/3867) + ## 0.13.2 - __BREAKING__: The behavior and signature of `RemoteGraphQLDataSource`'s `didReceiveResponse` method has been changed. No changes are necessary _unless_ your implementation has overridden the default behavior of this method by either extending the class and overriding the method or by providing `didReceiveResponse` as a parameter to the `RemoteGraphQLDataSource`'s constructor options. Implementations which have provided their own `didReceiveResponse` using either of these methods should view the PR linked here for details on what has changed. [PR #3743](https://github.com/apollographql/apollo-server/pull/3743) diff --git a/packages/apollo-gateway/src/__tests__/loadServicesFromRemoteEndpoint.test.ts b/packages/apollo-gateway/src/__tests__/loadServicesFromRemoteEndpoint.test.ts new file mode 100644 index 00000000000..2adf87141cc --- /dev/null +++ b/packages/apollo-gateway/src/__tests__/loadServicesFromRemoteEndpoint.test.ts @@ -0,0 +1,35 @@ +import { getServiceDefinitionsFromRemoteEndpoint } from '../loadServicesFromRemoteEndpoint'; +import { mockLocalhostSDLQuery } from './integration/nockMocks'; +import { RemoteGraphQLDataSource } from '../datasources'; +import nock = require('nock'); + +describe('getServiceDefinitionsFromRemoteEndpoint', () => { + it('errors when no URL was specified', async () => { + const serviceSdlCache = new Map(); + const dataSource = new RemoteGraphQLDataSource({ url: '' }); + const serviceList = [{ name: 'test', dataSource }]; + await expect( + getServiceDefinitionsFromRemoteEndpoint({ + serviceList, + serviceSdlCache, + }), + ).rejects.toThrowError( + "Tried to load schema for 'test' but no 'url' was specified.", + ); + }); + + it('throws when the downstream service returns errors', async () => { + const serviceSdlCache = new Map(); + const host = 'http://host-which-better-not-resolve'; + const url = host + '/graphql'; + + const dataSource = new RemoteGraphQLDataSource({ url }); + const serviceList = [{ name: 'test', url, dataSource }]; + await expect( + getServiceDefinitionsFromRemoteEndpoint({ + serviceList, + serviceSdlCache, + }), + ).rejects.toThrowError(/^Couldn't load service definitions for "test" at http:\/\/host-which-better-not-resolve\/graphql: request to http:\/\/host-which-better-not-resolve\/graphql failed, reason: getaddrinfo ENOTFOUND/); + }); +}); diff --git a/packages/apollo-gateway/src/loadServicesFromRemoteEndpoint.ts b/packages/apollo-gateway/src/loadServicesFromRemoteEndpoint.ts index 829716ff8c4..e9a7d8ca4c6 100644 --- a/packages/apollo-gateway/src/loadServicesFromRemoteEndpoint.ts +++ b/packages/apollo-gateway/src/loadServicesFromRemoteEndpoint.ts @@ -26,58 +26,51 @@ export async function getServiceDefinitionsFromRemoteEndpoint({ let isNewSchema = false; // for each service, fetch its introspection schema - const serviceDefinitions: ServiceDefinition[] = (await Promise.all( - serviceList.map(({ name, url, dataSource }) => { - if (!url) { - throw new Error( - `Tried to load schema for '${name}' but no 'url' was specified.`); - } + const promiseOfServiceList = serviceList.map(({ name, url, dataSource }) => { + if (!url) { + throw new Error( + `Tried to load schema for '${name}' but no 'url' was specified.`); + } - const request: GraphQLRequest = { - query: 'query GetServiceDefinition { _service { sdl } }', - http: { - url, - method: 'POST', - headers: new Headers(headers), - }, - }; + const request: GraphQLRequest = { + query: 'query GetServiceDefinition { _service { sdl } }', + http: { + url, + method: 'POST', + headers: new Headers(headers), + }, + }; - return dataSource - .process({ request, context: {} }) - .then(({ data, errors }) => { - if (data && !errors) { - const typeDefs = data._service.sdl as string; - const previousDefinition = serviceSdlCache.get(name); - // this lets us know if any downstream service has changed - // and we need to recalculate the schema - if (previousDefinition !== typeDefs) { - isNewSchema = true; - } - serviceSdlCache.set(name, typeDefs); - return { - name, - url, - typeDefs: parse(typeDefs), - }; + return dataSource + .process({ request, context: {} }) + .then(({ data, errors }): ServiceDefinition => { + if (data && !errors) { + const typeDefs = data._service.sdl as string; + const previousDefinition = serviceSdlCache.get(name); + // this lets us know if any downstream service has changed + // and we need to recalculate the schema + if (previousDefinition !== typeDefs) { + isNewSchema = true; } + serviceSdlCache.set(name, typeDefs); + return { + name, + url, + typeDefs: parse(typeDefs), + }; + } - // XXX handle local errors better for local development - if (errors) { - errors.forEach(console.error); - } + throw new Error(errors?.map(e => e.message).join("\n")); + }) + .catch(err => { + const errorMessage = + `Couldn't load service definitions for "${name}" at ${url}` + + (err && err.message ? ": " + err.message || err : ""); - return false; - }) - .catch(error => { - console.warn( - `Encountered error when loading ${name} at ${url}: ${error.message}`, - ); - return false; - }); - }), - ).then(serviceDefinitions => - serviceDefinitions.filter(Boolean), - )) as ServiceDefinition[]; + throw new Error(errorMessage); + }); + }); + const serviceDefinitions = await Promise.all(promiseOfServiceList); return { serviceDefinitions, isNewSchema } } From 0976506800e6fa2549c4cf64ee525f5d89931e24 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 12 Mar 2020 14:44:13 +0200 Subject: [PATCH 257/642] =?UTF-8?q?gateway:=20Warn=20when=20both=20local?= =?UTF-8?q?=20and=20remote=20configurations=20are=20pre=E2=80=A6=20(#3868)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To help address the configuration when a local configuration is provided and one is also available in the cloud, warn the user of the dual-configuration to avoid what is a common unintended mode of operation. --- packages/apollo-gateway/CHANGELOG.md | 1 + .../integration/networkRequests.test.ts | 56 +++++++++++++++++++ packages/apollo-gateway/src/index.ts | 50 ++++++++++++++--- 3 files changed, 100 insertions(+), 7 deletions(-) diff --git a/packages/apollo-gateway/CHANGELOG.md b/packages/apollo-gateway/CHANGELOG.md index 62905b09b48..fa7fecbeda1 100644 --- a/packages/apollo-gateway/CHANGELOG.md +++ b/packages/apollo-gateway/CHANGELOG.md @@ -5,6 +5,7 @@ - Several previously unhandled Promise rejection errors stemming from, e.g. connectivity, failures when communicating with Apollo Graph Manager within asynchronous code are now handled. [PR #3811](https://github.com/apollographql/apollo-server/pull/3811) - Provide a more helpful error message when encountering expected errors. [PR #3811](https://github.com/apollographql/apollo-server/pull/3811) - General improvements and clarity to error messages and logging. [PR #3811](https://github.com/apollographql/apollo-server/pull/3811) +- Warn of a possible misconfiguration when local service configuration is provided (via `serviceList` or `localServiceList`) and a remote Apollo Graph Manager configuration is subsequently found as well. [PR #3868](https://github.com/apollographql/apollo-server/pull/3868) ## 0.14.0 (pre-release; `@next` tag) diff --git a/packages/apollo-gateway/src/__tests__/integration/networkRequests.test.ts b/packages/apollo-gateway/src/__tests__/integration/networkRequests.test.ts index ddd11d60b61..c3908780c7a 100644 --- a/packages/apollo-gateway/src/__tests__/integration/networkRequests.test.ts +++ b/packages/apollo-gateway/src/__tests__/integration/networkRequests.test.ts @@ -11,8 +11,11 @@ import { graphId, mockImplementingServices, mockRawPartialSchema, + mockCompositionConfigLink, } from './nockMocks'; +import loadServicesFromStorage = require("../../loadServicesFromStorage"); + // This is a nice DX hack for GraphQL code highlighting and formatting within the file. // Anything wrapped within the gql tag within this file is just a string, not an AST. const gql = String.raw; @@ -94,6 +97,59 @@ it('Extracts service definitions from remote storage', async () => { expect(gateway.schema!.getType('User')!.description).toBe('This is my User'); }); +it.each([ + ['warned', 'present'], + ['not warned', 'absent'], +])('conflicting configurations are %s about when %s', async (_word, mode) => { + const isConflict = mode === 'present'; + const spyConsoleWarn = jest.spyOn(console, 'warn'); + let blockerResolve: () => void; + const blocker = new Promise(resolve => (blockerResolve = resolve)); + const original = loadServicesFromStorage.getServiceDefinitionsFromStorage; + const spyGetServiceDefinitionsFromStorage = jest + .spyOn(loadServicesFromStorage, 'getServiceDefinitionsFromStorage') + .mockImplementationOnce(async (...args) => { + try { + return await original(...args); + } catch (e) { + throw e; + } finally { + setImmediate(blockerResolve); + } + }); + + mockStorageSecretSuccess(); + if (isConflict) { + mockCompositionConfigLinkSuccess(); + mockCompositionConfigsSuccess([service.implementingServicePath]); + mockImplementingServicesSuccess(service); + mockRawPartialSchemaSuccess(service); + } else { + mockCompositionConfigLink().reply(403); + } + + mockLocalhostSDLQuery({ url: service.federatedServiceURL }).reply(200, { + data: { _service: { sdl: service.federatedServiceSchema } }, + }); + + const gateway = new ApolloGateway({ + serviceList: [ + { name: 'accounts', url: `${service.federatedServiceURL}/graphql` }, + ], + }); + + await gateway.load({ engine: { apiKeyHash, graphId } }); + await blocker; // Wait for the definitions to be "fetched". + + (isConflict + ? expect(spyConsoleWarn) + : expect(spyConsoleWarn).not + ).toHaveBeenCalledWith(expect.stringMatching( + /A local gateway service list is overriding an Apollo Graph Manager managed configuration/)); + spyGetServiceDefinitionsFromStorage.mockRestore(); + spyConsoleWarn.mockRestore(); +}); + it('Rollsback to a previous schema when triggered', async () => { // Init mockStorageSecretSuccess(); diff --git a/packages/apollo-gateway/src/index.ts b/packages/apollo-gateway/src/index.ts index cfd7e033017..e6cc0f211ab 100644 --- a/packages/apollo-gateway/src/index.ts +++ b/packages/apollo-gateway/src/index.ts @@ -152,6 +152,15 @@ type RequestContext = WithRequired< 'document' | 'queryHash' >; +// Local state to track whether particular UX-improving warning messages have +// already been emitted. This is particularly useful to prevent recurring +// warnings of the same type in, e.g. repeating timers, which don't provide +// additional value when they are repeated over and over during the life-time +// of a server. +type WarnedStates = { + remoteWithLocalConfig?: boolean; +}; + export class ApolloGateway implements GraphQLService { public schema?: GraphQLSchema; protected serviceMap: DataSourceCache = Object.create(null); @@ -164,6 +173,7 @@ export class ApolloGateway implements GraphQLService { private serviceDefinitions: ServiceDefinition[] = []; private compositionMetadata?: CompositionMetadata; private serviceSdlCache = new Map(); + private warnedStates: WarnedStates = Object.create(null); private fetcher: typeof fetch = fetcher.defaults({ cacheManager: new HttpRequestCache(), @@ -465,6 +475,38 @@ export class ApolloGateway implements GraphQLService { protected async loadServiceDefinitions( config: GatewayConfig, ): ReturnType { + // This helper avoids the repetition of options in the two cases this method + // is invoked below. It is a helper, rather than an options object, since it + // depends on the presence of `this.engineConfig`, which is guarded against + // further down in this method in two separate places. + const getRemoteConfig = (engineConfig: GraphQLServiceEngineConfig) => { + return getServiceDefinitionsFromStorage({ + graphId: engineConfig.graphId, + apiKeyHash: engineConfig.apiKeyHash, + graphVariant: engineConfig.graphVariant, + federationVersion: + (config as ManagedGatewayConfig).federationVersion || 1, + fetcher: this.fetcher, + }); + }; + + if (isLocalConfig(config) || isRemoteConfig(config)) { + if (this.engineConfig && !this.warnedStates.remoteWithLocalConfig) { + // Only display this warning once per start-up. + this.warnedStates.remoteWithLocalConfig = true; + // This error helps avoid common misconfiguration. + // We don't await this because a local configuration should assume + // remote is unavailable for one reason or another. + getRemoteConfig(this.engineConfig).then(() => { + this.logger.warn( + "A local gateway service list is overriding an Apollo Graph " + + "Manager managed configuration. To use the managed " + + "configuration, do not specifiy a service list locally.", + ); + }).catch(() => {}); // Don't mind errors if managed config is missing. + } + } + if (isLocalConfig(config)) { return { isNewSchema: false }; } @@ -490,13 +532,7 @@ export class ApolloGateway implements GraphQLService { ); } - return getServiceDefinitionsFromStorage({ - graphId: this.engineConfig.graphId, - apiKeyHash: this.engineConfig.apiKeyHash, - graphVariant: this.engineConfig.graphVariant, - federationVersion: config.federationVersion || 1, - fetcher: this.fetcher - }); + return getRemoteConfig(this.engineConfig); } // XXX Nothing guarantees that the only errors thrown or returned in From 4db401dffd49e00d6351d53461fb0da63f676f52 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 12 Mar 2020 18:49:30 +0200 Subject: [PATCH 258/642] Update proxy-configuration.md --- docs/source/proxy-configuration.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/source/proxy-configuration.md b/docs/source/proxy-configuration.md index cb9da46c1c4..17e2d0cc60c 100644 --- a/docs/source/proxy-configuration.md +++ b/docs/source/proxy-configuration.md @@ -91,13 +91,13 @@ Of course, a custom namespace can also be provided as well. For more details on Depending on the proxy communication, it may be necessary to extend the default "root" certificates which Node.js trusts to include a certificate provided by the proxy administrator. These certificates will usually allow the proxy to handle SSL/TLS traffic and permits the proxy to analyze such traffic. -This can be done [via Node.js' `NODE_EXTRA_CA_CERTS_FILE` environment variable](https://nodejs.org/api/cli.html#cli_node_extra_ca_certs_file): +This can be done [via Node.js' `NODE_EXTRA_CA_CERTS` environment variable](https://nodejs.org/api/cli.html#cli_node_extra_ca_certs_file): 1. The appropriate certificate (i.e. PEM file) must be present on the file-system where the server is running. -2. Start the server with the `NODE_EXTRA_CA_CERTS_FILE` environment variable set to that path, combined with the existing proxy configuration variables which were explained above: +2. Start the server with the `NODE_EXTRA_CA_CERTS` environment variable set to that path, combined with the existing proxy configuration variables which were explained above: ```shell - $ NODE_EXTRA_CA_CERTS_FILE=/full/path/to/certificate.pem \ + $ NODE_EXTRA_CA_CERTS=/full/path/to/certificate.pem \ GLOBAL_AGENT_HTTP_PROXY=http://proxy:3128/ \ node index.js ``` From 01519bdb471e2684cfccbf275d88a8435c2bf50a Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 12 Mar 2020 20:06:49 +0200 Subject: [PATCH 259/642] docs: Document new `fetcher` on `@apollo/gateway`. (#3886) * docs: Document new `fetcher` on `@apollo/gateway`. Follows-up: https://github.com/apollographql/apollo-server/pull/3783 Follows-up: https://github.com/apollographql/apollo-server/pull/3829 * Update apollo-gateway.mdx * Update docs/source/api/apollo-gateway.mdx Co-Authored-By: Trevor Scheer Co-authored-by: Trevor Scheer --- docs/source/api/apollo-gateway.mdx | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/docs/source/api/apollo-gateway.mdx b/docs/source/api/apollo-gateway.mdx index 5f5d070430c..10dff47d87f 100644 --- a/docs/source/api/apollo-gateway.mdx +++ b/docs/source/api/apollo-gateway.mdx @@ -103,6 +103,30 @@ example of using `ApolloGateway`, see [Implementing a federated graph](/federati If `true`, the gateway logs startup messages, along with the query plan for each incoming request. The default value is `false`. + + * `fetcher`: `typeof fetch` + + When specified, overrides the default + [Fetch API](https://fetch.spec.whatwg.org/#fetch-api) implementation + which is used when communicating with downstream services. By default, + [`make-fetch-happen`](https://npm.im/make-fetch-happen) is used with its + own defaults. Another compliant implementation can be provided + (e.g. [`node-fetch`](https://npm.im/node-fetch) by setting + `fetcher: require('node-fetch')`) or different [default options for + `make-fetch-happen`](https://www.npmjs.com/package/make-fetch-happen#extra-options) + can be defined entirely. E.g.: + + ```javascript + const gateway = new ApolloGateway({ + /* ... */ + fetcher: require('make-fetch-happen').defaults({ + onRetry() { + console.log('we will retry!') + }, + }), + /* ... */ + }); + ``` * `experimental_approximateQueryPlanStoreMiB`: `number` From 6123a9be75d8eb5a8496f1ecc942d5456a6bc24a Mon Sep 17 00:00:00 2001 From: Ali Zeaiter Date: Thu, 12 Mar 2020 19:15:13 +0100 Subject: [PATCH 260/642] Update unions-interfaces.md (#3887) Fix a typo --- docs/source/schema/unions-interfaces.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/schema/unions-interfaces.md b/docs/source/schema/unions-interfaces.md index a3a94858de6..805cc0f5db8 100644 --- a/docs/source/schema/unions-interfaces.md +++ b/docs/source/schema/unions-interfaces.md @@ -61,7 +61,7 @@ server.listen().then(({ url }) => { }); ``` -A possible query for these result could appear as follows. This query demonstrates the need for the `__resolveType`, since it requests different data depending on the types, +A possible query for these results could appear as follows. This query demonstrates the need for the `__resolveType`, since it requests different data depending on the types, ```graphql { From 602622dfeb83a332481e10990a94ee5a5d555b0c Mon Sep 17 00:00:00 2001 From: Stephen Barlow Date: Wed, 26 Feb 2020 17:14:23 -0800 Subject: [PATCH 261/642] WIP updates to Resolvers article --- docs/source/data/data.md | 226 ++++++++++++++++++++++++--------------- 1 file changed, 137 insertions(+), 89 deletions(-) diff --git a/docs/source/data/data.md b/docs/source/data/data.md index 524dcf59d1c..fd91c0c0588 100644 --- a/docs/source/data/data.md +++ b/docs/source/data/data.md @@ -1,35 +1,110 @@ --- -title: Fetching data with resolvers -sidebar_title: Resolvers +title: Resolvers --- -GraphQL is the best way to work with data from **any** back-end that your product needs. It is not a mapping of your database, but rather a graph of the data sources and shapes your product is made of. Resolvers are the key to this graph. Each resolver represents a single field, and can be used to fetch data from any source(s) you may have. +Whenever Apollo Server receives a GraphQL query, it needs to know how to populate each field included in that query. To accomplish this, it uses resolvers. -Resolvers provide the instructions for turning a GraphQL operation into data. Resolvers are organized into a one to one mapping to the fields in a GraphQL schema. This section describes resolvers' organization, every field's default resolver, and their signature. +**A resolver is a function that's responsible for populating the data for a single field in your schema.** It can populate that data in any way you define, such as by fetching data from a back-end database or a third-party API. -## The resolver map +If you _don't_ define a resolver for a particular field, Apollo Server automatically defines a [default resolver](#default-resolvers) for it. -In order to respond to queries, a schema needs to have resolve functions for all fields. This collection of functions is called the "resolver map". This map relates the schema fields and types to a function. +## Defining a resolver -```js +### Base syntax -const { gql } = require('apollo-server'); -const { find, filter } = require('lodash'); +Let's say our server defines the following (very short) schema: + +```graphql +type Query { + numberSix: Int! # Should always return the number 6 when queried + numberSeven: Int! # Should always return 7 +} +``` -const schema = gql` - type Book { - title: String - author: Author +We want to define resolvers for the `numberSix` and `numberSeven` fields of the `Query` type so that they always return `6` and `7` when they're queried. + +Those resolver definitions look like this: + +```js +const resolvers = { + Query: { + numberSix() { + return 6; + }, + numberSeven() { + return 7; + } } +}; +``` + +#### As this example shows: + +* You define all of your server's resolvers in a single JavaScript object (named `resolvers` above). This object is also known as your **resolver map**. +* The resolver map has top-level fields that correspond to your schema's types (such as `Query`). +* Each resolver belongs to whichever type its corresponding field belongs to. + +### Handling arguments + +Now let's say our server defines the following (slightly longer) schema: + +```graphql +type User { + id: ID! + name: String +} - type Author { - books: [Book] +type Query { + user(id: ID!): User +} +``` + +With this schema, we want the `user` field of the `Query` type to fetch a user by its `id`. + +To achieve this, our server needs access to user data. For this example, assume our server defines the following hardcoded array: + +```js +const users = [ + { + id: '1', + name: 'Elizabeth Bennet' + }, + { + id: '2', + name: 'Fitzwilliam Darcy' } +]; +``` + +Now we can define a resolver for the `user` field, like so: + +```js +const { find } = require('lodash'); - type Query { - author: Author +const resolvers = { + Query: { + user(parent, args, context, info) { + return find(users, { id: args.id }); + } } -`; +} +``` + +#### As this example shows: + +* A resolver can optionally accept four positional arguments: `(parent, args, context, info)`. + + _[Learn more about these arguments](#arguments)_ +* The `args` argument is an object that contains all _GraphQL_ arguments that were provided for the field by the GraphQL operation. + +> Notice that this example _doesn't_ define resolvers for `User` fields (`id` and `name`). That's because the [default resolver](#default-resolvers) that Apollo Server creates for each of these fields does the right thing: obtain the value directly from the object returned by the `user` resolver. + +### Chaining resolvers + +TODO + +```js +const { find, filter } = require('lodash'); const resolvers = { Query: { @@ -49,29 +124,18 @@ With the resolver map above, the query, `{ author { books } }`, will call the `Q Note that you don't have to put all of your resolvers in one object. Refer to the ["modularizing resolvers"](#modularizing-resolvers) section to learn how to combine multiple resolver maps into one. -## Resolver type signature - -In addition to the parent resolvers' value, resolvers receive a couple more arguments. The full resolver function signature contains four positional arguments: `(parent, args, context, info)` and can return an object or [Promise](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Using_promises). Once a promise resolves, then the children resolvers will continue executing. This is useful for fetching data from a backend. - -The resolver parameters generally follow this naming convention and are described in detail: - -1. `parent`: The object that contains the result returned from the resolver on the parent field, or, in the case of a top-level `Query` field, the `rootValue` passed from the server configuration. This argument enables the nested nature of GraphQL queries. -2. `args`: An object with the arguments passed into the field in the query. For example, if the field was called with `query{ key(arg: "you meant") }`, the `args` object would be: `{ "arg": "you meant" }`. -3. `context`: This is an object shared by all resolvers in a particular query, and is used to contain per-request state, including authentication information, dataloader instances, and anything else that should be taken into account when resolving the query. Read [this section](#context-argument) for an explanation of when and how to use context. -4. `info`: This argument contains information about the execution state of the query, including the field name, path to the field from the root, and more. It's only documented in the [GraphQL.js source code](https://github.com/graphql/graphql-js/blob/c82ff68f52722c20f10da69c9e50a030a1f218ae/src/type/definition.js#L489-L500), but is extended with additional functionality by other modules, like [`apollo-cache-control`](https://github.com/apollographql/apollo-server/tree/master/packages/apollo-cache-control). +## Arguments -In addition to returning GraphQL defined [scalars](/schema/schema/#scalar-types), you can return [custom scalars](/schema/scalars-enums/) for special use cases, such as JSON or big integers. +Resolver functions take the following positional arguments, in order: -### Resolver results +| Argument | Description | +|---|---| +| `parent` |

The result returned by the resolver of this field's _parent_ field.

See [The `parent` argument](#the-parent-argument) for more information. | +| `args` |

An object that contains all GraphQL arguments provided for this field.

For example, when executing `query{ user(id: "4") }`, the `args` object passed to the `user` resolver is `{ "id": "4" }`. | +| `context` |

An object shared across all resolvers that are executing for a particular operation. Use this to share per-operation state, including authentication information, dataloader instances, and anything else to track across resolvers.

See [The `context` argument](#the-context-argument) for more information. | +| `info` |

Contains information about the operation's execution state, including the field name, the path to the field from the root, and more.

Its core fields are listed in the [GraphQL.js source code](https://github.com/graphql/graphql-js/blob/master/src/type/definition.js#L917-L928), and it is extended with additional functionality by other modules, like [`apollo-cache-control`](https://github.com/apollographql/apollo-server/tree/master/packages/apollo-cache-control). | -Resolvers in GraphQL can return different kinds of results which are treated differently: - -1. `null` or `undefined` - this indicates the object could not be found. If your schema says that field is _nullable_, then the result will have a `null` value at that position. If the field is `non-null`, the result will "bubble up" to the nearest nullable field and that result will be set to `null`. This is to ensure that the API consumer never gets a `null` value when they were expecting a result. -2. An array - this is only valid if the schema indicates that the result of a field should be a list. The sub-selection of the query will run once for every item in this array. -3. A promise - resolvers often do asynchronous actions like fetching from a database or backend API, so they can return promises. This can be combined with arrays, so a resolver can return a promise that resolves to an array, or an array of promises, and both are handled correctly. -4. A scalar or object value - a resolver can also return any other kind of value, which doesn't have any special meaning but is simply passed down into any nested resolvers, as described in the next section. - -### Parent argument +### The `parent` argument The first argument to every resolver, `parent`, can be a bit confusing at first, but it makes sense when you consider what a GraphQL query looks like: @@ -96,9 +160,12 @@ Every GraphQL query is a tree of function calls in the server. So the `parent` c 3. `parent` in `Post.title` and `Post.author` will be one item from the `posts` result array. 4. `parent` in `Author.name` is the result from the above `Post.author` call. +For resolvers of top-level fields with no parent (such as fields of `Query`), this value is obtained from the `rootValue` function passed to [Apollo Server's constructor](/api/apollo-server/#apolloserver). + + Every resolver function is called according to the nesting of the query. To understand this transition from query to resolvers from another perspective, read this [blog post](https://blog.apollographql.com/graphql-explained-5844742f195e#.fq5jjdw7t). -### Context argument +### The `context` argument The context is how you access your shared connections and fetchers in resolvers to get data. @@ -137,14 +204,34 @@ context: async () => ({ } ``` +## Return values + +A resolver function's return value is treated differently by Apollo Server depending on its type: + +| Type | Description | +|---|---| +| Scalar / object |

A resolver can return a single value or an object, as shown in [Defining a resolver](#defining-a-resolver). This return value is passed down to any nested resolvers via the `parent` argument. | +| `Array` |

Return an array if and only if your schema indicates that the resolver's associated field contains a list.

After you return an array, Apollo Server executes nested resolvers for each item in the array. | +| `null` / `undefined` |

Indicates that the value for the field could not be found.

If your schema indicates that this resolver's field is nullable, then the operation result has a `null` value at the field's position.

If this resolver's field is _not_ nullable, Apollo Server sets the field's _parent_ to `null`. If necessary, this process continues up the resolver chain until it reaches a field that _is_ nullable. This ensures that a response never includes a `null` value for a non-nullable field. | +| [`Promise`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Using_promises) |

Resolvers often perform asynchronous actions, such as fetching from a database or back-end API. To support this, a resolver can return a promise that resolves to any other supported return type. | + + ## Default resolvers -Explicit resolvers are not needed for every type, since Apollo Server provides a [default](https://github.com/graphql/graphql-js/blob/69d90c601ad5a6f49c06b4ebbc8c73d51ef03566/src/execution/execute.js#L1264-L1278) that can perform two actions depending on the contents of `parent`: +If you don't define a resolver for a particular schema field, Apollo Server defines a [default resolver](https://github.com/graphql/graphql-js/blob/master/src/execution/execute.js#L1181-L1199) for it. -1. Return the property from `parent` with the relevant field name -2. Calls a function on `parent` with the relevant field name and provide the remaining resolver parameters as arguments +The default resolver function uses the following logic: -For the following schema, the `title` field of `Book` would not need a resolver if the result of the `books` resolver provided a list of objects that already contained a `title` field. +```mermaid +graph TB; + parent("Does the parent argument have a
property with this resolver's exact name?"); + parent--No-->null("Return undefined"); + parent--Yes-->function("Is that property's value a function?"); + function--No-->return("Return the property's value"); + function--Yes-->call("Call the function and
return its return value"); +``` + +As an example, consider the following schema excerpt: ```graphql type Book { @@ -156,8 +243,12 @@ type Author { } ``` +If the resolver for the `books` field returns an array of objects that each contain a `title` field, then you can use a default resolver for the `title` field. The default resolver will correctly return `parent.title`. + ## Modularizing resolvers +TODO + We can accomplish the same modularity with resolvers by passing around multiple resolver objects and combining them together with Lodash's `merge` or other equivalent: ```js @@ -201,7 +292,9 @@ server.listen().then(({ url }) => { }); ``` -## Monitoring your resolvers +## Monitoring resolvers + +TODO As with all code, the performance of individual resolvers will be dependent on the workload embedded within them. The actual resolvers invoked by a client's request will depend on the operation itself. GraphQL allows the avoidance of most costly fields when their return data is not necessary by not including them in the request, but it's still important to understand what those computationally costly fields are. @@ -217,48 +310,3 @@ const server = new ApolloServer({ tracing: true, }); ``` - -## Sending queries - -Once your resolver map is complete, it's time to start testing out your queries in GraphQL Playground. - -### Naming operations - -When sending the queries and mutations in the above examples, we've used either `query { ... }` or `mutation { ... }` respectively. While this is fine, and particularly convenient when running queries by hand, it makes sense to name the operation in order to quickly identify operations during debugging or to aggregate similar operations together for application performance metrics, for example, when using [Apollo Graph Manager](https://engine.apollographql.com/) to monitor an API. - -Operations can be named by placing an identifier after the `query` or `mutation` keyword, as we've done with `HomeBookListing` here: - -```graphql -query HomeBookListing { - getBooks { - title - } -} -``` - -### Queries with variables - -In the examples above, we've used static strings as values for both queries and mutations. This is a great shortcut when running "one-off" operations, but GraphQL also provides the ability to pass variables as arguments and avoid the need for clients to dynamically manipulate operations at run-time. - -By defining a map of variables on the root `query` or `mutation` operation, which are sent from the client, variables can be used (and re-used) within the types and fields themselves. - -For example, with a slight change to the mutation we used in the previous step, we enable the client to pass `title` and `author` variables alongside the operation itself. We can also provide defaults for those variables for when they aren't explicitly set: - -```graphql -mutation HomeQuickAddBook($title: String, $author: String = "Anonymous") { - addBook(title: $title, author: $author) { - title - } -} -``` - -GraphQL clients, like [Apollo Client](https://www.apollographql.com/docs/react/), take care of sending the variables to the server separate from the operation itself: - -```json -{ - "query": "...", - "variables": { "title": "Green Eggs and Ham", "author": "Dr. Seuss" } -} -``` - -This functionality is also supported by tools like GraphQL Playground. From 3b63ce20f7ecab0b76fed39e109c0a02766862f1 Mon Sep 17 00:00:00 2001 From: Stephen Barlow Date: Thu, 27 Feb 2020 14:43:54 -0800 Subject: [PATCH 262/642] Getting Resolvers article nice and fancy --- docs/source/data/{data.md => data.mdx} | 221 +++++++++++++++---------- 1 file changed, 138 insertions(+), 83 deletions(-) rename docs/source/data/{data.md => data.mdx} (57%) diff --git a/docs/source/data/data.md b/docs/source/data/data.mdx similarity index 57% rename from docs/source/data/data.md rename to docs/source/data/data.mdx index fd91c0c0588..9191af0e2b3 100644 --- a/docs/source/data/data.md +++ b/docs/source/data/data.mdx @@ -1,7 +1,12 @@ --- title: Resolvers +description: Execute GraphQL operations --- +import { + ExpansionPanel, +} from 'gatsby-theme-apollo-docs/src/components/expansion-panel'; + Whenever Apollo Server receives a GraphQL query, it needs to know how to populate each field included in that query. To accomplish this, it uses resolvers. **A resolver is a function that's responsible for populating the data for a single field in your schema.** It can populate that data in any way you define, such as by fetching data from a back-end database or a third-party API. @@ -40,9 +45,9 @@ const resolvers = { #### As this example shows: -* You define all of your server's resolvers in a single JavaScript object (named `resolvers` above). This object is also known as your **resolver map**. -* The resolver map has top-level fields that correspond to your schema's types (such as `Query`). -* Each resolver belongs to whichever type its corresponding field belongs to. +* You define all of your server's resolvers in a single JavaScript object (named `resolvers` above). This object is called the **resolver map**. +* The resolver map has top-level fields that correspond to your schema's types (such as `Query` above). +* Each resolver function belongs to whichever type its corresponding field belongs to. ### Handling arguments @@ -94,46 +99,146 @@ const resolvers = { * A resolver can optionally accept four positional arguments: `(parent, args, context, info)`. - _[Learn more about these arguments](#arguments)_ + _[Learn more about these arguments](#resolver-arguments)_ * The `args` argument is an object that contains all _GraphQL_ arguments that were provided for the field by the GraphQL operation. -> Notice that this example _doesn't_ define resolvers for `User` fields (`id` and `name`). That's because the [default resolver](#default-resolvers) that Apollo Server creates for each of these fields does the right thing: obtain the value directly from the object returned by the `user` resolver. +> Notice that this example _doesn't_ define resolvers for `User` fields (`id` and `name`). That's because the [default resolver](#default-resolvers) that Apollo Server creates for each of these fields does the right thing: it obtains the value directly from the object returned by the `user` resolver. -### Chaining resolvers +## Passing resolvers to Apollo Server -TODO +After you define all of your resolvers, you pass them them to the constructor of `ApolloServer`, along with your schema's definition. -```js -const { find, filter } = require('lodash'); +The following example defines a hardcoded data set, a schema, and a resolver map. It then initializes an `ApolloServer` instance, passing the schema and resolvers to it. + + + +```javascript +const { ApolloServer, gql } = require('apollo-server'); + +// Hardcoded data store +const books = [ + { + title: 'Harry Potter and the Chamber of Secrets', + author: 'J.K. Rowling', + }, + { + title: 'Jurassic Park', + author: 'Michael Crichton', + }, +]; +// Schema definition +const typeDefs = gql` + type Book { + title: String + author: String + } + + type Query { + books: [Book] + } +`; + +// Resolver map const resolvers = { Query: { - author(parent, args, context, info) { - return find(authors, { id: args.id }); - }, - }, - Author: { - books(author) { - return filter(books, { author: author.name }); - }, + books() { + return books; + } }, }; + +// Pass schema definition and resolvers to the +// ApolloServer constructor +const server = new ApolloServer({ typeDefs, resolvers }); + +// Launch the server +server.listen().then(({ url }) => { + console.log(`🚀 Server ready at ${url}`); +}); ``` -With the resolver map above, the query, `{ author { books } }`, will call the `Query.author` resolver first and pass its result to `Author.books`. The query result will contain the return value of `Author.books` nested under `data.author.books`. + + +Note that you can define your resolvers across as many different files and objects as you want, as long as you merge all of them into a single resolver map that's passed to the `ApolloServer` constructor. + +## Chaining resolvers + +Whenever a query asks for a field that contains an object type, the query _also_ asks for _at least one field_ of that object (if it didn't, there would be no reason to include the object in the query). A query always "bottoms out" on fields that contain either a scalar or a list of scalars. + +Therefore, whenever your server _resolves_ a field that contains an object type, it always then resolves one or more fields of that object. Those subfields might in turn _also_ contain object types. Depending on your schema, this object-field pattern can continue to an arbitrary depth, creating what's called a **resolver chain**. + +### Example + +Let's say our server defines the following schema: + +```graphql +# A library has books +type Library { + books: [Book!] +} + +# A book has a title and authors +type Book { + title: String! + authors: [Author!] +} -Note that you don't have to put all of your resolvers in one object. Refer to the ["modularizing resolvers"](#modularizing-resolvers) section to learn how to combine multiple resolver maps into one. +# An author has a name +type Author { + name: String! +} -## Arguments +type Query { + libraries: [Library] +} +``` + +Here's a valid query against that schema: + +```graphql +query { + libraries { + books { + authors { + name + } + } + } +} +``` + +The resulting resolver chain for this query matches the structure of the query itself: + +```mermaid +graph LR; + libraries("Query.libraries()") --> books("Library.books()"); + books --> authors("Book.authors()"); + authors --> name("Author.name()"); +``` + +These resolvers execute in the order shown above and pass their return value to the next resolver in the chain, via the [`parent` argument](#resolver-arguments). + +If we update our query to also ask for each book's `title`, the resolver chain looks like this: + +```mermaid +graph LR; + libraries("Query.libraries()") --> books("Library.books()"); + books --> title("Book.title()"); + books --> authors("Book.authors()"); + authors --> name("Author.name()"); +``` + +## Resolver arguments Resolver functions take the following positional arguments, in order: | Argument | Description | |---|---| -| `parent` |

The result returned by the resolver of this field's _parent_ field.

See [The `parent` argument](#the-parent-argument) for more information. | -| `args` |

An object that contains all GraphQL arguments provided for this field.

For example, when executing `query{ user(id: "4") }`, the `args` object passed to the `user` resolver is `{ "id": "4" }`. | -| `context` |

An object shared across all resolvers that are executing for a particular operation. Use this to share per-operation state, including authentication information, dataloader instances, and anything else to track across resolvers.

See [The `context` argument](#the-context-argument) for more information. | -| `info` |

Contains information about the operation's execution state, including the field name, the path to the field from the root, and more.

Its core fields are listed in the [GraphQL.js source code](https://github.com/graphql/graphql-js/blob/master/src/type/definition.js#L917-L928), and it is extended with additional functionality by other modules, like [`apollo-cache-control`](https://github.com/apollographql/apollo-server/tree/master/packages/apollo-cache-control). | +| `parent` |

The result returned by the resolver of this field's _parent_ field.

See [The `parent` argument](#the-parent-argument) for more information.

| +| `args` |

An object that contains all GraphQL arguments provided for this field.

For example, when executing `query{ user(id: "4") }`, the `args` object passed to the `user` resolver is `{ "id": "4" }`.

| +| `context` |

An object shared across all resolvers that are executing for a particular operation. Use this to share per-operation state, including authentication information, dataloader instances, and anything else to track across resolvers.

See [The `context` argument](#the-context-argument) for more information.

| +| `info` |

Contains information about the operation's execution state, including the field name, the path to the field from the root, and more.

Its core fields are listed in the [GraphQL.js source code](https://github.com/graphql/graphql-js/blob/master/src/type/definition.js#L917-L928), and it is extended with additional functionality by other modules, like [`apollo-cache-control`](https://github.com/apollographql/apollo-server/tree/master/packages/apollo-cache-control).

| ### The `parent` argument @@ -210,10 +315,10 @@ A resolver function's return value is treated differently by Apollo Server depen | Type | Description | |---|---| -| Scalar / object |

A resolver can return a single value or an object, as shown in [Defining a resolver](#defining-a-resolver). This return value is passed down to any nested resolvers via the `parent` argument. | -| `Array` |

Return an array if and only if your schema indicates that the resolver's associated field contains a list.

After you return an array, Apollo Server executes nested resolvers for each item in the array. | -| `null` / `undefined` |

Indicates that the value for the field could not be found.

If your schema indicates that this resolver's field is nullable, then the operation result has a `null` value at the field's position.

If this resolver's field is _not_ nullable, Apollo Server sets the field's _parent_ to `null`. If necessary, this process continues up the resolver chain until it reaches a field that _is_ nullable. This ensures that a response never includes a `null` value for a non-nullable field. | -| [`Promise`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Using_promises) |

Resolvers often perform asynchronous actions, such as fetching from a database or back-end API. To support this, a resolver can return a promise that resolves to any other supported return type. | +| Scalar / object |

A resolver can return a single value or an object, as shown in [Defining a resolver](#defining-a-resolver). This return value is passed down to any nested resolvers via the `parent` argument.

| +| `Array` |

Return an array if and only if your schema indicates that the resolver's associated field contains a list.

After you return an array, Apollo Server executes nested resolvers for each item in the array.

| +| `null` / `undefined` |

Indicates that the value for the field could not be found.

If your schema indicates that this resolver's field is nullable, then the operation result has a `null` value at the field's position.

If this resolver's field is _not_ nullable, Apollo Server sets the field's _parent_ to `null`. If necessary, this process continues up the resolver chain until it reaches a field that _is_ nullable. This ensures that a response never includes a `null` value for a non-nullable field.

| +| [`Promise`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Using_promises) |

Resolvers often perform asynchronous actions, such as fetching from a database or back-end API. To support this, a resolver can return a promise that resolves to any other supported return type.

| ## Default resolvers @@ -231,7 +336,7 @@ graph TB; function--Yes-->call("Call the function and
return its return value"); ``` -As an example, consider the following schema excerpt: +As an example, consider the following schema excerpt: ```graphql type Book { @@ -245,63 +350,13 @@ type Author { If the resolver for the `books` field returns an array of objects that each contain a `title` field, then you can use a default resolver for the `title` field. The default resolver will correctly return `parent.title`. -## Modularizing resolvers - -TODO - -We can accomplish the same modularity with resolvers by passing around multiple resolver objects and combining them together with Lodash's `merge` or other equivalent: - -```js -// comment.js -const resolvers = { - Comment: { ... } -} - -export resolvers; -``` - -```js -// post.js -const { merge } = require('lodash'); - -const Comment = require('./comment'); -const resolvers = merge({ - Post: { ... } -}, Comment.resolvers); - -export resolvers; -``` - -```js -// schema.js -const { merge } = require('lodash'); -const Post = require('./post.js'); - -// Merge all of the resolver objects together -const resolvers = merge({ - Query: { ... } -}, Post.resolvers); - -const server = new ApolloServer({ - typeDefs, - resolvers, -}); - -server.listen().then(({ url }) => { - console.log(`🚀 Server ready at ${url}`) -}); -``` - -## Monitoring resolvers - -TODO - -As with all code, the performance of individual resolvers will be dependent on the workload embedded within them. The actual resolvers invoked by a client's request will depend on the operation itself. GraphQL allows the avoidance of most costly fields when their return data is not necessary by not including them in the request, but it's still important to understand what those computationally costly fields are. +## Monitoring resolver performance -It's recommended that you use a tool which can track field-level metrics within a data graph, aggregate them, and help you understand the performance of your data graph over time. Apollo Graph Manager integrates with Apollo Server and offers performance analysis, error tracking and schema management features. For more information, read our article about [monitoring a graph's performance](https://www.apollographql.com/docs/graph-manager/performance/). +As with all code, a resolver's performance depends on its logic. It's important to understand which of your schema's fields are computationally expensive or otherwise slow to resolve, so that you can either improve their performance or make sure you only query them when necessary. -In local development, using the `tracing: true` option to Apollo Server will enable a tracing panel +[Apollo Graph Manager](https://www.apollographql.com/docs/graph-manager/) integrates directly with Apollo Server to provide field-level metrics that help you understand the performance of your data graph over time. For more information, see [Analyzing performance](https://www.apollographql.com/docs/graph-manager/performance/). +While developing locally, you can provide `tracing: true` to the `ApolloServer` constructor to enable a tracing panel: ```javascript const server = new ApolloServer({ From 8f4cbcac11207b6032d8c16dd1d871ff163b0e75 Mon Sep 17 00:00:00 2001 From: Stephen Barlow Date: Thu, 27 Feb 2020 16:06:55 -0800 Subject: [PATCH 263/642] Ready for initial review --- docs/source/data/data.mdx | 78 +++++++++++++-------------------------- 1 file changed, 26 insertions(+), 52 deletions(-) diff --git a/docs/source/data/data.mdx b/docs/source/data/data.mdx index 9191af0e2b3..b73ea40bfa9 100644 --- a/docs/source/data/data.mdx +++ b/docs/source/data/data.mdx @@ -1,13 +1,13 @@ --- title: Resolvers -description: Execute GraphQL operations +description: How Apollo Server processes GraphQL operations --- import { ExpansionPanel, } from 'gatsby-theme-apollo-docs/src/components/expansion-panel'; -Whenever Apollo Server receives a GraphQL query, it needs to know how to populate each field included in that query. To accomplish this, it uses resolvers. +Apollo Server needs to know how to populate data for every field in your schema so that it can respond to requests for that data. To accomplish this, it uses resolvers. **A resolver is a function that's responsible for populating the data for a single field in your schema.** It can populate that data in any way you define, such as by fetching data from a back-end database or a third-party API. @@ -26,7 +26,7 @@ type Query { } ``` -We want to define resolvers for the `numberSix` and `numberSeven` fields of the `Query` type so that they always return `6` and `7` when they're queried. +We want to define resolvers for the `numberSix` and `numberSeven` fields of the root `Query` type so that they always return `6` and `7` when they're queried. Those resolver definitions look like this: @@ -64,9 +64,9 @@ type Query { } ``` -With this schema, we want the `user` field of the `Query` type to fetch a user by its `id`. +We want to be able to query the `user` field to fetch a user by its `id`. -To achieve this, our server needs access to user data. For this example, assume our server defines the following hardcoded array: +To achieve this, our server needs access to user data. For this contrived example, assume our server defines the following hardcoded array: ```js const users = [ @@ -81,6 +81,8 @@ const users = [ ]; ``` +> To learn how to fetch data from an external source (like a database or REST API), see [Data sources](./data-sources/). + Now we can define a resolver for the `user` field, like so: ```js @@ -162,11 +164,11 @@ server.listen().then(({ url }) => { Note that you can define your resolvers across as many different files and objects as you want, as long as you merge all of them into a single resolver map that's passed to the `ApolloServer` constructor. -## Chaining resolvers +## Resolver chains Whenever a query asks for a field that contains an object type, the query _also_ asks for _at least one field_ of that object (if it didn't, there would be no reason to include the object in the query). A query always "bottoms out" on fields that contain either a scalar or a list of scalars. -Therefore, whenever your server _resolves_ a field that contains an object type, it always then resolves one or more fields of that object. Those subfields might in turn _also_ contain object types. Depending on your schema, this object-field pattern can continue to an arbitrary depth, creating what's called a **resolver chain**. +Therefore, whenever Apollo Server _resolves_ a field that contains an object type, it always then resolves one or more fields of that object. Those subfields might in turn _also_ contain object types. Depending on your schema, this object-field pattern can continue to an arbitrary depth, creating what's called a **resolver chain**. ### Example @@ -208,7 +210,7 @@ query { } ``` -The resulting resolver chain for this query matches the structure of the query itself: +The resulting resolver chain for this query matches the hierarchical structure of the query itself: ```mermaid graph LR; @@ -217,7 +219,7 @@ graph LR; authors --> name("Author.name()"); ``` -These resolvers execute in the order shown above and pass their return value to the next resolver in the chain, via the [`parent` argument](#resolver-arguments). +These resolvers execute in the order shown above, passing their return value to the next resolver in the chain via the [`parent` argument](#resolver-arguments). If we update our query to also ask for each book's `title`, the resolver chain looks like this: @@ -229,58 +231,30 @@ graph LR; authors --> name("Author.name()"); ``` +When a chain "diverges" like this, each subchain executes in parallel. + ## Resolver arguments Resolver functions take the following positional arguments, in order: | Argument | Description | |---|---| -| `parent` |

The result returned by the resolver of this field's _parent_ field.

See [The `parent` argument](#the-parent-argument) for more information.

| +| `parent` |

The return value of the resolver for this field's parent (i.e., the previous resolver in the [resolver chain](#resolver-chains)).

For resolvers of top-level fields with no parent (such as fields of `Query`), this value is obtained from the `rootValue` function passed to [Apollo Server's constructor](/api/apollo-server/#apolloserver).

| | `args` |

An object that contains all GraphQL arguments provided for this field.

For example, when executing `query{ user(id: "4") }`, the `args` object passed to the `user` resolver is `{ "id": "4" }`.

| | `context` |

An object shared across all resolvers that are executing for a particular operation. Use this to share per-operation state, including authentication information, dataloader instances, and anything else to track across resolvers.

See [The `context` argument](#the-context-argument) for more information.

| | `info` |

Contains information about the operation's execution state, including the field name, the path to the field from the root, and more.

Its core fields are listed in the [GraphQL.js source code](https://github.com/graphql/graphql-js/blob/master/src/type/definition.js#L917-L928), and it is extended with additional functionality by other modules, like [`apollo-cache-control`](https://github.com/apollographql/apollo-server/tree/master/packages/apollo-cache-control).

| -### The `parent` argument - -The first argument to every resolver, `parent`, can be a bit confusing at first, but it makes sense when you consider what a GraphQL query looks like: - -```graphql -query { - getAuthor(id: 5){ - name - posts { - title - author { - name # this will be the same as the name above - } - } - } -} -``` - -Every GraphQL query is a tree of function calls in the server. So the `parent` contains the result of parent resolver, in this case: - -1. `parent` in `Query.getAuthor` will be whatever the server configuration passed for `rootValue`. -2. `parent` in `Author.name` and `Author.posts` will be the result from `getAuthor`, likely an Author object from the backend. -3. `parent` in `Post.title` and `Post.author` will be one item from the `posts` result array. -4. `parent` in `Author.name` is the result from the above `Post.author` call. - -For resolvers of top-level fields with no parent (such as fields of `Query`), this value is obtained from the `rootValue` function passed to [Apollo Server's constructor](/api/apollo-server/#apolloserver). - - -Every resolver function is called according to the nesting of the query. To understand this transition from query to resolvers from another perspective, read this [blog post](https://blog.apollographql.com/graphql-explained-5844742f195e#.fq5jjdw7t). - ### The `context` argument -The context is how you access your shared connections and fetchers in resolvers to get data. +The `context` argument is useful for passing things that any resolver might need, like [authentication scope](https://blog.apollographql.com/authorization-in-graphql-452b1c402a9), database connections, and custom fetch functions. If you're using [dataloaders to batch requests](/data/data-sources/#what-about-dataloader) across resolvers, you can attach them to the `context` as well. -The `context` is the third argument passed to every resolver. It is useful for passing things that any resolver may need, like [authentication scope](https://blog.apollographql.com/authorization-in-graphql-452b1c402a9), database connections, and custom fetch functions. Additionally, if you're using [dataloaders to batch requests](/data/data-sources/#what-about-dataloader) across resolvers, you can attach them to the `context` as well. +**Resolvers should never modify the `context` argument.** This ensures consistency across all resolvers and prevents unexpected errors. -As a best practice, `context` should be the same for all resolvers, no matter the particular query or mutation, and resolvers should never modify it. This ensures consistency across resolvers, and helps increase development velocity. - -To provide a `context` to your resolvers, add a `context` object to the Apollo Server constructor. This constructor gets called with every request, so you can set the context based off the details of the request (like HTTP headers). +To provide a `context` to your resolvers, add a `context` initialization function to the `ApolloServer` constructor. This function is called with every request, so you can set the context based on the request's details (such as HTTP headers). ```js + +// Constructor const server = new ApolloServer({ typeDefs, resolvers, @@ -289,22 +263,22 @@ const server = new ApolloServer({ }) })); -// resolver -(parent, _, context) => { +// Example resolver +(parent, args, context, info) => { if(context.authScope !== ADMIN) throw AuthenticationError('not admin'); - ... + // Proceed } ``` -The context can also be created asynchronously, allowing database connections and other operations to complete. +Context initialization can be asynchronous, allowing database connections and other operations to complete: ```js context: async () => ({ db: await client.connect(), }) -// resolver -(parent, _, context) => { +// Resolver +(parent, args, context, info) => { return context.db.query('SELECT * FROM table_name'); } ``` @@ -323,7 +297,7 @@ A resolver function's return value is treated differently by Apollo Server depen ## Default resolvers -If you don't define a resolver for a particular schema field, Apollo Server defines a [default resolver](https://github.com/graphql/graphql-js/blob/master/src/execution/execute.js#L1181-L1199) for it. +If you don't define a resolver for a particular schema field, Apollo Server defines a default resolver for it ([see the source](https://github.com/graphql/graphql-js/blob/master/src/execution/execute.js#L1181-L1199)). The default resolver function uses the following logic: From 61f13418ba05c20b22ab0e6cef16ca118b24208f Mon Sep 17 00:00:00 2001 From: Stephen Barlow Date: Thu, 27 Feb 2020 16:46:41 -0800 Subject: [PATCH 264/642] Add actual code for the libraries example --- docs/source/data/data.mdx | 119 +++++++++++++++++++++++++++++++++++--- 1 file changed, 111 insertions(+), 8 deletions(-) diff --git a/docs/source/data/data.mdx b/docs/source/data/data.mdx index b73ea40bfa9..42cfa05819f 100644 --- a/docs/source/data/data.mdx +++ b/docs/source/data/data.mdx @@ -175,15 +175,16 @@ Therefore, whenever Apollo Server _resolves_ a field that contains an object typ Let's say our server defines the following schema: ```graphql -# A library has books +# A library has a branch and books type Library { + branch: String! books: [Book!] } -# A book has a title and authors +# A book has a title and author type Book { title: String! - authors: [Author!] + author: Author! } # An author has a name @@ -202,7 +203,7 @@ Here's a valid query against that schema: query { libraries { books { - authors { + author { name } } @@ -215,20 +216,122 @@ The resulting resolver chain for this query matches the hierarchical structure o ```mermaid graph LR; libraries("Query.libraries()") --> books("Library.books()"); - books --> authors("Book.authors()"); - authors --> name("Author.name()"); + books --> author("Book.author()"); + author --> name("Author.name()"); ``` These resolvers execute in the order shown above, passing their return value to the next resolver in the chain via the [`parent` argument](#resolver-arguments). +Here's a code sample that can resolve the query above with this resolver chain (note that it requires the `lodash` library in addition to `apollo-server`): + + + +```javascript +const { ApolloServer, gql } = require('apollo-server'); +const { filter } = require('lodash'); + +const libraries = [ + { + 'branch': 'downtown' + }, + { + 'branch': 'riverside' + }, +]; + +// The branch field of a book indicates which library has it in stock +const books = [ + { + title: 'Harry Potter and the Chamber of Secrets', + author: 'J.K. Rowling', + branch: 'riverside' + }, + { + title: 'Jurassic Park', + author: 'Michael Crichton', + branch: 'downtown' + }, +]; + +// Schema definition +const typeDefs = gql` + +# A library has a branch and books + type Library { + branch: String! + books: [Book!] + } + + # A book has a title and author + type Book { + title: String! + author: [Author!] + } + + # An author has a name + type Author { + name: String! + } + + type Query { + libraries: [Library] + } +`; + +// Resolver map +const resolvers = { + Query: { + libraries() { + + // Return our hardcoded array of libraries + return libraries; + } + }, + Library: { + books(parent) { + + // Filter the hardcoded array of books to only include + // books that are located at the correct branch + return filter(books, { branch: parent.branch }); + } + }, + Book: { + + // The parent resolver (Library.books) returns an object with the + // author's name in the "author" field. Return a JSON object containing + // the name, because this field expects an object. + author(parent) { + return { + name: parent.author + }; + } + } + + // Because Book.author returns an object with a "name" field, + // Apollo Server's default resolver for Author.name will work. + // We don't need to define one. +}; + +// Pass schema definition and resolvers to the +// ApolloServer constructor +const server = new ApolloServer({ typeDefs, resolvers }); + +// Launch the server +server.listen().then(({ url }) => { + console.log(`🚀 Server ready at ${url}`); +}); +``` + + + If we update our query to also ask for each book's `title`, the resolver chain looks like this: ```mermaid graph LR; libraries("Query.libraries()") --> books("Library.books()"); books --> title("Book.title()"); - books --> authors("Book.authors()"); - authors --> name("Author.name()"); + books --> author("Book.author()"); + author --> name("Author.name()"); ``` When a chain "diverges" like this, each subchain executes in parallel. From 7a0228980b25525411773e1724a740c8341c9640 Mon Sep 17 00:00:00 2001 From: Stephen Barlow Date: Fri, 13 Mar 2020 12:22:41 -0700 Subject: [PATCH 265/642] Incorporate feedback from abernix --- docs/source/data/data.mdx | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/docs/source/data/data.mdx b/docs/source/data/data.mdx index 42cfa05819f..a5df93920b8 100644 --- a/docs/source/data/data.mdx +++ b/docs/source/data/data.mdx @@ -86,12 +86,10 @@ const users = [ Now we can define a resolver for the `user` field, like so: ```js -const { find } = require('lodash'); - const resolvers = { Query: { user(parent, args, context, info) { - return find(users, { id: args.id }); + return users.find(user => user.id === args.id); } } } @@ -108,7 +106,7 @@ const resolvers = { ## Passing resolvers to Apollo Server -After you define all of your resolvers, you pass them them to the constructor of `ApolloServer`, along with your schema's definition. +After you define all of your resolvers, you pass them to the constructor of `ApolloServer` (as the `resolvers` property), along with your schema's definition (as the `typeDefs` property). The following example defines a hardcoded data set, a schema, and a resolver map. It then initializes an `ApolloServer` instance, passing the schema and resolvers to it. @@ -222,13 +220,12 @@ graph LR; These resolvers execute in the order shown above, passing their return value to the next resolver in the chain via the [`parent` argument](#resolver-arguments). -Here's a code sample that can resolve the query above with this resolver chain (note that it requires the `lodash` library in addition to `apollo-server`): +Here's a code sample that can resolve the query above with this resolver chain: ```javascript const { ApolloServer, gql } = require('apollo-server'); -const { filter } = require('lodash'); const libraries = [ { @@ -273,6 +270,7 @@ const typeDefs = gql` name: String! } + # Queries can fetch a list of libraries type Query { libraries: [Library] } @@ -292,7 +290,7 @@ const resolvers = { // Filter the hardcoded array of books to only include // books that are located at the correct branch - return filter(books, { branch: parent.branch }); + return books.filter(book => book.branch === parent.branch); } }, Book: { @@ -324,7 +322,22 @@ server.listen().then(({ url }) => { -If we update our query to also ask for each book's `title`, the resolver chain looks like this: +If we now update our query to also ask for each book's `title`: + +```graphql{4} +query { + libraries { + books { + title + author { + name + } + } + } +} +``` + +Then the resolver chain looks like this: ```mermaid graph LR; @@ -351,7 +364,7 @@ Resolver functions take the following positional arguments, in order: The `context` argument is useful for passing things that any resolver might need, like [authentication scope](https://blog.apollographql.com/authorization-in-graphql-452b1c402a9), database connections, and custom fetch functions. If you're using [dataloaders to batch requests](/data/data-sources/#what-about-dataloader) across resolvers, you can attach them to the `context` as well. -**Resolvers should never modify the `context` argument.** This ensures consistency across all resolvers and prevents unexpected errors. +**Resolvers should never destructively modify the `context` argument.** This ensures consistency across all resolvers and prevents unexpected errors. To provide a `context` to your resolvers, add a `context` initialization function to the `ApolloServer` constructor. This function is called with every request, so you can set the context based on the request's details (such as HTTP headers). @@ -373,6 +386,8 @@ const server = new ApolloServer({ } ``` +> The fields of the object passed to your `context` function differ if you're using middleware besides Express. [See the API reference for details.](/api/apollo-server/#apolloserver) + Context initialization can be asynchronous, allowing database connections and other operations to complete: ```js From 5832434c8b8051f1d5b3109f981abca2a4dee9ea Mon Sep 17 00:00:00 2001 From: Stephen Barlow Date: Fri, 13 Mar 2020 12:24:13 -0700 Subject: [PATCH 266/642] Update URL for resolvers article --- docs/gatsby-config.js | 2 +- docs/source/data/{data.mdx => resolvers.mdx} | 0 docs/static/_redirects | 2 ++ 3 files changed, 3 insertions(+), 1 deletion(-) rename docs/source/data/{data.mdx => resolvers.mdx} (100%) diff --git a/docs/gatsby-config.js b/docs/gatsby-config.js index e082ea64225..93bd28d0f49 100644 --- a/docs/gatsby-config.js +++ b/docs/gatsby-config.js @@ -29,7 +29,7 @@ module.exports = { 'schema/creating-directives', ], 'Fetching Data': [ - 'data/data', + 'data/resolvers', 'data/data-sources', 'data/errors', 'data/file-uploads', diff --git a/docs/source/data/data.mdx b/docs/source/data/resolvers.mdx similarity index 100% rename from docs/source/data/data.mdx rename to docs/source/data/resolvers.mdx diff --git a/docs/static/_redirects b/docs/static/_redirects index 4862a66cda3..15785216dad 100644 --- a/docs/static/_redirects +++ b/docs/static/_redirects @@ -1,5 +1,7 @@ / /docs/apollo-server/ +/docs/apollo-server/data/data/ /docs/apollo-server/data/resolvers/ + /docs/apollo-server/federation/core-concepts/ /docs/apollo-server/federation/entities/ /docs/apollo-server/federation/advanced-features/ /docs/apollo-server/federation/entities/ /docs/apollo-server/federation/concerns/ /docs/apollo-server/federation/introduction/#separation-of-concerns From 08ef06f25846b4524150b13616f8a8f719c71911 Mon Sep 17 00:00:00 2001 From: Stephen Barlow Date: Fri, 13 Mar 2020 12:43:47 -0700 Subject: [PATCH 267/642] Fix broken links --- docs/source/api/graphql-tools.md | 2 +- docs/source/getting-started.md | 2 +- docs/source/why-apollo-server.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/source/api/graphql-tools.md b/docs/source/api/graphql-tools.md index 95ebec4e2b9..f115e9eb818 100644 --- a/docs/source/api/graphql-tools.md +++ b/docs/source/api/graphql-tools.md @@ -61,7 +61,7 @@ const jsSchema = makeExecutableSchema({ - `typeDefs` is a required argument and should be a GraphQL schema language string or array of GraphQL schema language strings or a function that takes no arguments and returns an array of GraphQL schema language strings. The order of the strings in the array is not important, but it must include a schema definition. -- `resolvers` is an optional argument _(empty object by default)_ and should be an object that follows the pattern explained in the [resolvers documentation](/data/data/). +- `resolvers` is an optional argument _(empty object by default)_ and should be an object that follows the pattern explained in the [resolvers documentation](/data/resolvers/). - `logger` is an optional argument, which can be used to print errors to the server console that are usually swallowed by GraphQL. The `logger` argument should be an object with a `log` function, eg. `const logger = { log: e => console.log(e) }` diff --git a/docs/source/getting-started.md b/docs/source/getting-started.md index e66baa314b5..7cbb4eb6a2d 100644 --- a/docs/source/getting-started.md +++ b/docs/source/getting-started.md @@ -228,5 +228,5 @@ Apollo Server. Check out the following resources to learn more about the basics of schemas, resolvers, and deployment: * [Schema basics](/schema/schema/) -* [Fetching data with resolvers](/data/data/) +* [Resolvers](/data/resolvers/) * [Deploying with Heroku](/deployment/heroku/) diff --git a/docs/source/why-apollo-server.md b/docs/source/why-apollo-server.md index 8b4ae82f5d8..e3ab574288b 100644 --- a/docs/source/why-apollo-server.md +++ b/docs/source/why-apollo-server.md @@ -40,7 +40,7 @@ server.listen().then(({ url }) => { }); ``` -In the example above, we are describing the shapes of our data, how they relate to each other, and how to fetch what our client needs from our data source. Apollo Server uses simple functions called [resolvers](/data/data/) to bring to life the schema described in SDL type definitions. When a request comes in to `/graphql`, Apollo Server will translate that request into what it takes to execute the query, will run the resolvers for you to load your data, and return the result in JSON so your app can render it out easily! +In the example above, we are describing the shapes of our data, how they relate to each other, and how to fetch what our client needs from our data source. Apollo Server uses simple functions called [resolvers](/data/resolvers/) to bring to life the schema described in SDL type definitions. When a request comes in to `/graphql`, Apollo Server will translate that request into what it takes to execute the query, will run the resolvers for you to load your data, and return the result in JSON so your app can render it out easily! Apollo Server takes care of every step of translating the query your client asks for into the data it needs. It is designed to give you maximum control over how you load the data while taking care of everything else for you! You don't need to worry about parsing the request, validating the query, delivering the response, or even profiling your app. Instead, all you have to do is describe the shape of your data and how to find it; Apollo Server does the rest! 💪 From c7bc65669005f79f5e1ee5706d9a149fde046522 Mon Sep 17 00:00:00 2001 From: Stephen Barlow Date: Thu, 27 Feb 2020 18:03:15 -0800 Subject: [PATCH 268/642] WIP on breaking up implementing services and the gateway --- docs/gatsby-config.js | 3 +- docs/source/api/apollo-gateway.mdx | 2 +- .../{implementing.md => gateway.md} | 178 +----------------- .../federation/implementing-services.md | 155 +++++++++++++++ docs/source/federation/introduction.mdx | 59 +++--- 5 files changed, 196 insertions(+), 201 deletions(-) rename docs/source/federation/{implementing.md => gateway.md} (62%) create mode 100644 docs/source/federation/implementing-services.md diff --git a/docs/gatsby-config.js b/docs/gatsby-config.js index 93bd28d0f49..7cb38ecd0db 100644 --- a/docs/gatsby-config.js +++ b/docs/gatsby-config.js @@ -37,7 +37,8 @@ module.exports = { ], 'Apollo Federation': [ 'federation/introduction', - 'federation/implementing', + 'federation/implementing-services', + 'federation/gateway', 'federation/entities', 'federation/value-types', 'federation/errors', diff --git a/docs/source/api/apollo-gateway.mdx b/docs/source/api/apollo-gateway.mdx index 10dff47d87f..d8778823efd 100644 --- a/docs/source/api/apollo-gateway.mdx +++ b/docs/source/api/apollo-gateway.mdx @@ -7,7 +7,7 @@ description: Apollo Gateway API reference ## `ApolloGateway` The core class of Apollo Server's federated gateway implementation. For an -example of using `ApolloGateway`, see [Implementing a federated graph](/federation/implementing/). +example of using `ApolloGateway`, see [The federated gateway](/federation/gateway/). ### `constructor(options)`: `ApolloGateway` diff --git a/docs/source/federation/implementing.md b/docs/source/federation/gateway.md similarity index 62% rename from docs/source/federation/implementing.md rename to docs/source/federation/gateway.md index 3a7bbadecc0..0a4a4612bf8 100644 --- a/docs/source/federation/implementing.md +++ b/docs/source/federation/gateway.md @@ -1,182 +1,12 @@ --- -title: Implementing services and the gateway +title: The federated gateway --- -An Apollo Federation architecture consists of: - -* A collection of **implementing services** that each define a distinct GraphQL schema -* A **gateway** that composes the distinct schemas into a **federated data graph** and executes queries across the services in the graph - -```mermaid -graph BT; - webapp(Web app); - iosapp(iOS app); - gateway([Gateway]); - serviceA[Products service]; - serviceB[Reviews service]; - serviceC[Inventory service]; - webapp & iosapp -.- gateway; - gateway --- serviceA & serviceB & serviceC; - class webapp,iosapp tertiary; -``` - -Apollo Server provides libraries for acting both as an implementing service and as a gateway, but these components can be implemented in any language and framework. - -Let's look at how to get a federated graph up and running. We'll start by preparing an existing implementing service for federation, and then we'll set up a gateway in front of it. - -## Defining an implementing service - -> To be part of a federated graph, an implementing service must conform to the [Apollo Federation specification](/federation/federation-spec/), which exposes the service's capabilities to the gateway, as well as to tools like Apollo Graph Manager. - -Converting an existing schema into an implementing service is the first step in building a federated graph. To start, here's a *non-federated* Apollo Server setup: - -```javascript:title=index.js -const { ApolloServer, gql } = require('apollo-server'); - -const typeDefs = gql` - type Query { - me: User - } - - type User { - id: ID! - username: String - } -`; - -const resolvers = { - Query: { - me() { - return { id: "1", username: "@ava" } - } - } -}; - -const server = new ApolloServer({ - typeDefs, - resolvers, -}); - -server.listen(4001).then(({ url }) => { - console.log(`🚀 Server ready at ${url}`); -}); -``` - -This should look familiar if you've [set up Apollo Server](/getting-started/) before. If it doesn't, we recommend you familiarize yourself with the basics before jumping into federation. - -Now, let's convert this to an implementing service. The first step is to install the `@apollo/federation` package in our project: - -```shell -npm install @apollo/federation -``` - -### Defining an entity - -As part of our federated architecture, we want _other_ implementing services to be able to extend the `User` type this service defines. To enable this, we add the `@key` directive to the `User` type's definition to designate it as an **entity**: - -```js:title=index.js -const { ApolloServer, gql } = require('apollo-server'); -const { buildFederatedSchema } = require('@apollo/federation'); - -const typeDefs = gql` - type Query { - me: User - } - - type User @key(fields: "id") { - id: ID! - username: String - } -`; -``` - -The `@key` directive tells other services which field(s) of the `User` type to use -to uniquely identify a particular instance. In this case, services should use the -single field `id`. - -Next, we add a **reference resolver** for the `User` type. A reference resolver tells the gateway how to fetch an entity by its `@key` fields: - -```js:title=index.js -const resolvers = { - Query: { - me() { - return { id: "1", username: "@ava" } - } - }, - User: { - __resolveReference(user, { fetchUserById }){ - return fetchUserById(user.id) - } - } -}; -``` - -We would then define the `fetchUserById` function to obtain the appropriate `User` -from our backing data store. - -> [Learn more about entities](./entities/) - -### Generating a federated schema - -Finally, we use the `buildFederatedSchema` function from the `@apollo/federation` package to augment our schema definition with federation support. We provide the result of this function to the `ApolloServer` constructor: - -```js:title=index.js -const server = new ApolloServer({ - schema: buildFederatedSchema([{ typeDefs, resolvers }]) -}); - -server.listen(4001).then(({ url }) => { - console.log(`🚀 Server ready at ${url}`); -}); -``` - -The server is now ready to act as an implementing service in a federated data graph! - -### Full example - -Here are the snippets above combined (again, note that for this sample to be complete, - you must define the `fetchUserById` function for your data source): - -```js:title=index.js -const { ApolloServer, gql } = require('apollo-server'); -const { buildFederatedSchema } = require('@apollo/federation'); - -const typeDefs = gql` - type Query { - me: User - } - - type User @key(fields: "id") { - id: ID! - username: String - } -`; - -const resolvers = { - Query: { - me() { - return { id: "1", username: "@ava" } - } - }, - User: { - __resolveReference(user, { fetchUserById }){ - return fetchUserById(user.id) - } - } -} - -const server = new ApolloServer({ - schema: buildFederatedSchema([{ typeDefs, resolvers }]) -}); - -server.listen(4001).then(({ url }) => { - console.log(`🚀 Server ready at ${url}`); -}); -``` +After you set up at least one federation-ready [implementing service](./implementing-services/), you can configure up a **federated gateway** to sit in front of it. -## Defining the gateway +## Setup -Now that we have a federation-ready implementing service, we can set up a federated **gateway** to sit in front of it. First, let's install the necessary packages: +First, let's install the necessary packages: ```shell npm install @apollo/gateway apollo-server graphql diff --git a/docs/source/federation/implementing-services.md b/docs/source/federation/implementing-services.md new file mode 100644 index 00000000000..fe9d1ab53f9 --- /dev/null +++ b/docs/source/federation/implementing-services.md @@ -0,0 +1,155 @@ +--- +title: Implementing services +--- + +This article describes how to create an **implementing service** for a federated data graph using Apollo Server. + +## Defining an implementing service + +> To be part of a federated graph, an implementing service must conform to the [Apollo Federation specification](/federation/federation-spec/), which exposes the service's capabilities to the gateway, as well as to tools like Apollo Graph Manager. + +Converting an existing schema into an implementing service is the first step in building a federated graph. To start, here's a *non-federated* Apollo Server setup: + +```javascript:title=index.js +const { ApolloServer, gql } = require('apollo-server'); + +const typeDefs = gql` + type Query { + me: User + } + + type User { + id: ID! + username: String + } +`; + +const resolvers = { + Query: { + me() { + return { id: "1", username: "@ava" } + } + } +}; + +const server = new ApolloServer({ + typeDefs, + resolvers, +}); + +server.listen(4001).then(({ url }) => { + console.log(`🚀 Server ready at ${url}`); +}); +``` + +This should look familiar if you've [set up Apollo Server](/getting-started/) before. If it doesn't, we recommend you familiarize yourself with the basics before jumping into federation. + +Now, let's convert this to an implementing service. The first step is to install the `@apollo/federation` package in our project: + +```shell +npm install @apollo/federation +``` + +### Defining an entity + +As part of our federated architecture, we want _other_ implementing services to be able to extend the `User` type this service defines. To enable this, we add the `@key` directive to the `User` type's definition to designate it as an **entity**: + +```js:title=index.js +const { ApolloServer, gql } = require('apollo-server'); +const { buildFederatedSchema } = require('@apollo/federation'); + +const typeDefs = gql` + type Query { + me: User + } + + type User @key(fields: "id") { + id: ID! + username: String + } +`; +``` + +The `@key` directive tells other services which field(s) of the `User` type to use +to uniquely identify a particular instance. In this case, services should use the +single field `id`. + +Next, we add a **reference resolver** for the `User` type. A reference resolver tells the gateway how to fetch an entity by its `@key` fields: + +```js:title=index.js +const resolvers = { + Query: { + me() { + return { id: "1", username: "@ava" } + } + }, + User: { + __resolveReference(user, { fetchUserById }){ + return fetchUserById(user.id) + } + } +}; +``` + +We would then define the `fetchUserById` function to obtain the appropriate `User` +from our backing data store. + +> [Learn more about entities](./entities/) + +### Generating a federated schema + +Finally, we use the `buildFederatedSchema` function from the `@apollo/federation` package to augment our schema definition with federation support. We provide the result of this function to the `ApolloServer` constructor: + +```js:title=index.js +const server = new ApolloServer({ + schema: buildFederatedSchema([{ typeDefs, resolvers }]) +}); + +server.listen(4001).then(({ url }) => { + console.log(`🚀 Server ready at ${url}`); +}); +``` + +The server is now ready to act as an implementing service in a federated data graph! + +### Full example + +Here are the snippets above combined (again, note that for this sample to be complete, + you must define the `fetchUserById` function for your data source): + +```js:title=index.js +const { ApolloServer, gql } = require('apollo-server'); +const { buildFederatedSchema } = require('@apollo/federation'); + +const typeDefs = gql` + type Query { + me: User + } + + type User @key(fields: "id") { + id: ID! + username: String + } +`; + +const resolvers = { + Query: { + me() { + return { id: "1", username: "@ava" } + } + }, + User: { + __resolveReference(user, { fetchUserById }){ + return fetchUserById(user.id) + } + } +} + +const server = new ApolloServer({ + schema: buildFederatedSchema([{ typeDefs, resolvers }]) +}); + +server.listen(4001).then(({ url }) => { + console.log(`🚀 Server ready at ${url}`); +}); +``` diff --git a/docs/source/federation/introduction.mdx b/docs/source/federation/introduction.mdx index 74c8e5ae767..00a8914eaec 100644 --- a/docs/source/federation/introduction.mdx +++ b/docs/source/federation/introduction.mdx @@ -22,6 +22,28 @@ implement _only_ the part of your data graph that it should be responsible for. This way, your organization can represent an enterprise-scale data graph as a collection of separately maintained GraphQL services. +## Architecture + +An Apollo Federation architecture consists of: + +* A collection of **implementing services** that each define a distinct GraphQL schema +* A **gateway** that composes the distinct schemas into a **federated data graph** and executes queries across the services in the graph + +```mermaid +graph BT; + webapp(Web app); + iosapp(iOS app); + gateway([Gateway]); + serviceA[Products service]; + serviceB[Reviews service]; + serviceC[Inventory service]; + webapp & iosapp -.- gateway; + gateway --- serviceA & serviceB & serviceC; + class webapp,iosapp tertiary; +``` + +Apollo Server provides libraries for acting both as an implementing service and as a gateway, but these components can be implemented in any language and framework. + ## Core principles ### Incremental adoption @@ -65,10 +87,9 @@ The difference is that now, each service defines the types and fields that it is The result is the best of both worlds: an implementation that keeps all the code for a given feature in a single service and separated from unrelated concerns, and a product-centric schema with rich types that reflects the natural way an application developer would want to consume the graph. -## Apollo Server implementation +## Apollo Server libraries -Apollo Server supports Apollo Federation via two open-source extensions: -`@apollo/federation` and `@apollo/gateway`. +Apollo Server supports Apollo Federation via two open-source extension libraries: * `@apollo/federation` provides primitives that your implementing services use to make their individual GraphQL schemas composable. * `@apollo/gateway` enables you to set up an instance of Apollo Server as a **gateway** that distributes incoming GraphQL operations across one or more implementing services. @@ -76,7 +97,7 @@ Apollo Server supports Apollo Federation via two open-source extensions: ## Federated schema example Let's look at an example. Below, we define the schema for a basic e-commerce -application as three _federated_ schemas, each of which can be implemented as +application as three _federated_ schemas, each of which is implemented as a standalone GraphQL service: ```graphql:title=accounts @@ -158,31 +179,19 @@ That’s it! With Apollo Federation, schemas and resolvers live in your implementing services. The gateway serves only to plan and execute GraphQL operations across those implementing services. -In addition to running a gateway with a static list of services, Apollo -Gateway can also operate in _managed federation_ mode where Apollo Graph -Manager acts as the source of truth for the underlying services' SDL. This mode of operation enables multiple -teams working on a data graph to help them coordinate when underlying -services change using federation-aware tooling. For more information, read about -[managed federation](https://www.apollographql.com/docs/graph-manager/federation/) -in Apollo Graph Manager. +### Managed federation -## Query examples +In addition to running a gateway with a static list of services, Apollo Gateway can operate in **managed federation** mode, where [Apollo Graph Manager](https://www.apollographql.com/docs/graph-manager/) acts as the source of truth for each implementing service's schema. -Now we can execute GraphQL operations against our composed schema just as if it -were implemented as a monolithic service: +This mode enables multiple teams working on a data graph to coordinate when and how underlying services change. For more information, read [Managing a federated graph](https://www.apollographql.com/docs/graph-manager/federation/). -```graphql -# a query that the gateway can resolve by calling only the products service -query { - topProducts { - upc - name - } -} -``` +## Query example + +Now we can execute GraphQL operations against our composed schema just as if it +were implemented as a single, monolithic service: ```graphql -# a query that the gateway must call all three services to fully resolve +# A query that the gateway resolves by calling all three services query { me { username @@ -197,4 +206,4 @@ query { } ``` -Next, you can [clone a demo schema](https://github.com/apollographql/federation-demo) or [check out the CodeSandbox demo in your browser](https://codesandbox.io/s/v368r9ml47). +Next, learn how to [define an implementing service](./implementing-services/). From 2bf659aaee60d4aa7b08ee269a1062ff3759698b Mon Sep 17 00:00:00 2001 From: Stephen Barlow Date: Fri, 6 Mar 2020 15:08:08 -0800 Subject: [PATCH 269/642] Abstract federation diagram, gateway improvements --- .../diagrams/federation-architecture.mdx | 12 ++++ docs/source/api/apollo-gateway.mdx | 2 +- docs/source/federation/gateway.md | 66 +++++++++---------- ...-services.md => implementing-services.mdx} | 22 +++++-- docs/source/federation/introduction.mdx | 15 +---- 5 files changed, 63 insertions(+), 54 deletions(-) create mode 100644 docs/shared/diagrams/federation-architecture.mdx rename docs/source/federation/{implementing-services.md => implementing-services.mdx} (80%) diff --git a/docs/shared/diagrams/federation-architecture.mdx b/docs/shared/diagrams/federation-architecture.mdx new file mode 100644 index 00000000000..413b33c45dc --- /dev/null +++ b/docs/shared/diagrams/federation-architecture.mdx @@ -0,0 +1,12 @@ +```mermaid +graph BT; + webapp(Web app); + iosapp(iOS app); + gateway([Gateway]); + serviceA[Products service]; + serviceB[Reviews service]; + serviceC[Inventory service]; + webapp & iosapp -.- gateway; + gateway --- serviceA & serviceB & serviceC; + class webapp,iosapp tertiary; +``` diff --git a/docs/source/api/apollo-gateway.mdx b/docs/source/api/apollo-gateway.mdx index d8778823efd..4bc25991967 100644 --- a/docs/source/api/apollo-gateway.mdx +++ b/docs/source/api/apollo-gateway.mdx @@ -7,7 +7,7 @@ description: Apollo Gateway API reference ## `ApolloGateway` The core class of Apollo Server's federated gateway implementation. For an -example of using `ApolloGateway`, see [The federated gateway](/federation/gateway/). +example of using `ApolloGateway`, see [The gateway](/federation/gateway/). ### `constructor(options)`: `ApolloGateway` diff --git a/docs/source/federation/gateway.md b/docs/source/federation/gateway.md index 0a4a4612bf8..24e81e9a7f8 100644 --- a/docs/source/federation/gateway.md +++ b/docs/source/federation/gateway.md @@ -1,8 +1,10 @@ --- -title: The federated gateway +title: The gateway --- -After you set up at least one federation-ready [implementing service](./implementing-services/), you can configure up a **federated gateway** to sit in front of it. +After you set up at least one federation-ready [implementing service](./implementing-services/), you can configure a **gateway** to sit in front of your services. The gateway **composes** the individual schemas of your services into a federated data graph and then executes incoming operations across those services. + +The `@apollo/gateway` package extends Apollo Server's functionality, enabling it to act as a gateway for an Apollo Federation architecture. ## Setup @@ -12,19 +14,18 @@ First, let's install the necessary packages: npm install @apollo/gateway apollo-server graphql ``` -Now we can set up an `ApolloServer` instance that acts as a gateway to our underlying -implementing services: +The `@apollo/gateway` package includes the [`ApolloGateway` class](/api/apollo-gateway/). To configure Apollo Sever to act as a gateway, you pass an instance of `ApolloGateway` to the `ApolloServer` constructor, like so: ```js const { ApolloServer } = require('apollo-server'); -const { ApolloGateway } = require("@apollo/gateway"); +const { ApolloGateway } = require('@apollo/gateway'); -// Initialize an ApolloGateway instance and pass it an array of implementing -// service names and URLs +// Initialize an ApolloGateway instance and pass it an array of +// your implementing service names and URLs const gateway = new ApolloGateway({ serviceList: [ { name: 'accounts', url: 'http://localhost:4001' }, - // more services + // Define additional services here ], }); @@ -46,29 +47,21 @@ In the above example, we provide the `serviceList` configuration option to the of our implementing services. You can specify any string value for `name`, which is used primarily for query planner output, error messages, and logging. -> In production, we recommend configuring the gateway in a managed mode, which relies on static files rather than introspection. For details on how to use the [Apollo schema registry](https://www.apollographql.com/docs/graph-manager/schema-registry/) to support this workflow, see [the Graph Manager documentation](https://www.apollographql.com/docs/graph-manager/federation/). +> In production, we recommend running the gateway in a **managed mode**, which relies on static files rather than introspection. For details, see the [Apollo Graph Manager documentation](https://www.apollographql.com/docs/graph-manager/federation/). -On startup, the gateway fetches each implementing service's capabilities and composes -a federated data graph. It accepts incoming requests and creates query plans that query the graph's implementing services. +On startup, the gateway fetches each implementing service's schema from its `url` and composes those schemas into a single federated data graph. It then begins accepting incoming requests and creates query plans for them that execute across one or more services. > If there are any composition errors, the `new ApolloServer` call throws an exception > with a list of [validation errors](/federation/errors/). -### Securing implementing services +## Customizing requests and responses -Due to the power and flexibility of federation's `_entities` field, **only the gateway should be accessible by GraphQL clients**. Individual implementing services -should **not** be accessible. Make sure to implement firewall rules, access control -lists, or other measures to ensure that individual implementing services can -be accessed only via the gateway. +The gateway can modify the details of an incoming request before executing it across your implementing services. For example, your services might all use the same authorization token to associate an incoming request with a particular user. The gateway can add that token to each operation it sends to your services. -## Sharing context across services +Similarly, the gateway can modify the details of its response to a client, based on the result of each implementing service. ### Customizing incoming requests -If you have an existing set of services, you've probably already -implemented some form of authentication to associate each request with a user, or -you require that some information be passed to each service via request headers. The `@apollo/gateway` package enables you to reuse Apollo Server's context feature to customize which information is sent to implementing services. - The following example demonstrates passing user information from the gateway to each implementing service via the `user-id` HTTP header: @@ -125,15 +118,23 @@ The `buildService` function enables us to customize the requests that are sent t ### Customizing outgoing responses -Similarly, the `didReceiveResponse` callback allows us to inspect an implementing -service's `response` in order to modify the `context`. The lifecycle of a request to -a federated server involves a number of responses, multiple of which might contain -headers that should be passed back to the client. +The `didReceiveResponse` callback of the `RemoteGraphQLDataSource` class enables the gatway to inspect each implementing service's result to modify the `context` before sending a final response to the client. Suppose our implementing services all use the `Server-Id` header to uniquely identify themselves in a response. We want the gateway's `Server-Id` header to include _all_ of these returned values. In this case, we can tell the gateway to aggregate the various server IDs into a single, comma-separated list in its response: -Flowchart demonstrating willSendResponse usage +```mermaid +sequenceDiagram; + Client->>Gateway: Send GraphQL operation + Gateway->>Gateway: Generate query plan for operation + loop For each operation in the query plan + Gateway->>Implementing Services: Send the operation to the applicable service + Implementing Services->>Gateway: Respond with result and Server-Id header + Gateway->>Gateway: Add the returned Server-Id to the shared context + end + Gateway->>Gateway: Add all returned Server-Ids to the response header + Gateway->>Client: Send operation response +``` To implement this behavior, we define a `didReceiveResponse` callback and an `ApolloServerPlugin` in our gateway: @@ -202,15 +203,10 @@ To learn more about `buildService` and `RemoteGraphQLDataSource`, see the [API d ## Implementing custom directives -> Note: Apollo Server does not currently support executable directives, however they are supported by the gateway. +The `@apollo/gateway` library provides limited support for custom directives that are implemented by your implementing services. To use this feature, there are a few requirements that must be met in order to compose a valid graph: -The gateway currently provides limited support for custom, service-level directives. To use this feature, there are a few requirements that must be met in order to compose a valid graph: - -* Directives can only implement executable locations. Executable directive locations are documented in the [spec](https://graphql.github.io/graphql-spec/June2018/#ExecutableDirectiveLocation). -> The following locations are considered valid to the gateway: QUERY, MUTATION, SUBSCRIPTION, FIELD, FRAGMENT\_DEFINITION, FRAGMENT\_SPREAD, INLINE\_FRAGMENT -* Directives must be implemented by *every* service that's part of the graph. It's acceptable for a service to do nothing with a particular directive, but a directive definition must exist within every service's schema. +* Custom directives can only be used in **executable locations**, as defined in the [GraphQL specification](https://graphql.github.io/graphql-spec/June2018/#ExecutableDirectiveLocation). +* Custom directives must be implemented by *every* implementing service in the data graph. It's acceptable for a service to do nothing with a particular directive, but a directive definition must exist within every service's schema. * Directive definitions must be identical across all services. A directive definition is identical if its name, arguments and their types, and locations are all the same. -## Managing a federated graph - -With Apollo Federation, teams are able to move quickly as they build out their GraphQL services. However, distributed systems introduce complexities that require special tooling and coordination across teams to safely roll out changes. [Apollo Graph Manager](https://engine.apollographql.com) provides solutions to problems like schema change validation, graph update coordination, and metrics collection. For more information on Graph Manager see [Managed federation](https://www.apollographql.com/docs/graph-manager/federation/). +>Apollo Server does not currently support executable directives, however they are supported by the gateway. diff --git a/docs/source/federation/implementing-services.md b/docs/source/federation/implementing-services.mdx similarity index 80% rename from docs/source/federation/implementing-services.md rename to docs/source/federation/implementing-services.mdx index fe9d1ab53f9..8599974c1d3 100644 --- a/docs/source/federation/implementing-services.md +++ b/docs/source/federation/implementing-services.mdx @@ -2,6 +2,8 @@ title: Implementing services --- +import FederationArchitecture from '../../shared/diagrams/federation-architecture.mdx'; + This article describes how to create an **implementing service** for a federated data graph using Apollo Server. ## Defining an implementing service @@ -52,7 +54,7 @@ npm install @apollo/federation ### Defining an entity -As part of our federated architecture, we want _other_ implementing services to be able to extend the `User` type this service defines. To enable this, we add the `@key` directive to the `User` type's definition to designate it as an **entity**: +As part of our federated architecture, we want _other_ implementing services to be able to extend the `User` type this service defines. To enable this, we add the `@key` directive to the `User` type's definition to designate it as an [entity](./entities/): ```js:title=index.js const { ApolloServer, gql } = require('apollo-server'); @@ -91,8 +93,7 @@ const resolvers = { }; ``` -We would then define the `fetchUserById` function to obtain the appropriate `User` -from our backing data store. +(This example requires defining the `fetchUserById` function to obtain the appropriate `User` from our backing data store.) > [Learn more about entities](./entities/) @@ -112,10 +113,9 @@ server.listen(4001).then(({ url }) => { The server is now ready to act as an implementing service in a federated data graph! -### Full example +### Combined example -Here are the snippets above combined (again, note that for this sample to be complete, - you must define the `fetchUserById` function for your data source): +Here are the snippets above combined (again, note that for this sample to be complete, you must define the `fetchUserById` function for your data source): ```js:title=index.js const { ApolloServer, gql } = require('apollo-server'); @@ -153,3 +153,13 @@ server.listen(4001).then(({ url }) => { console.log(`🚀 Server ready at ${url}`); }); ``` + +## Securing implementing services + +Because of the power and flexibility of Apollo Federation's `_entities` field, your implementing services should **not** be directly accessible by clients. Instead, only your [gateway](./gateway/) should have access to your implementing serivces. Clients then communicate with the gateway: + + + +Make sure to implement any necessary firewall rules, access control +lists, or other measures to ensure that individual implementing services can +be accessed only via the gateway. diff --git a/docs/source/federation/introduction.mdx b/docs/source/federation/introduction.mdx index 00a8914eaec..9c908603781 100644 --- a/docs/source/federation/introduction.mdx +++ b/docs/source/federation/introduction.mdx @@ -4,6 +4,8 @@ sidebar_title: Overview description: Implement a single data graph across multiple services --- +import FederationArchitecture from '../../shared/diagrams/federation-architecture.mdx'; + To get the most out of GraphQL, your organization should expose a [single data graph](https://principledgraphql.com/integrity#1-one-graph) that provides a unified interface for querying all of your backing data sources. This @@ -29,18 +31,7 @@ An Apollo Federation architecture consists of: * A collection of **implementing services** that each define a distinct GraphQL schema * A **gateway** that composes the distinct schemas into a **federated data graph** and executes queries across the services in the graph -```mermaid -graph BT; - webapp(Web app); - iosapp(iOS app); - gateway([Gateway]); - serviceA[Products service]; - serviceB[Reviews service]; - serviceC[Inventory service]; - webapp & iosapp -.- gateway; - gateway --- serviceA & serviceB & serviceC; - class webapp,iosapp tertiary; -``` + Apollo Server provides libraries for acting both as an implementing service and as a gateway, but these components can be implemented in any language and framework. From c1c695e173535695bc3712d32e27d101e8b9c152 Mon Sep 17 00:00:00 2001 From: Stephen Barlow Date: Mon, 9 Mar 2020 15:36:12 -0700 Subject: [PATCH 270/642] Gateway/Services split ready for review --- .../federation/{gateway.md => gateway.mdx} | 55 ++++++++++++------- .../federation/implementing-services.mdx | 3 +- 2 files changed, 37 insertions(+), 21 deletions(-) rename docs/source/federation/{gateway.md => gateway.mdx} (71%) diff --git a/docs/source/federation/gateway.md b/docs/source/federation/gateway.mdx similarity index 71% rename from docs/source/federation/gateway.md rename to docs/source/federation/gateway.mdx index 24e81e9a7f8..bc3a35214c1 100644 --- a/docs/source/federation/gateway.md +++ b/docs/source/federation/gateway.mdx @@ -1,7 +1,12 @@ --- -title: The gateway +title: "Apollo Federation: The gateway" +sidebar_title: "The gateway" --- +import { + ExpansionPanel, +} from 'gatsby-theme-apollo-docs/src/components/expansion-panel'; + After you set up at least one federation-ready [implementing service](./implementing-services/), you can configure a **gateway** to sit in front of your services. The gateway **composes** the individual schemas of your services into a federated data graph and then executes incoming operations across those services. The `@apollo/gateway` package extends Apollo Server's functionality, enabling it to act as a gateway for an Apollo Federation architecture. @@ -58,12 +63,15 @@ On startup, the gateway fetches each implementing service's schema from its `url The gateway can modify the details of an incoming request before executing it across your implementing services. For example, your services might all use the same authorization token to associate an incoming request with a particular user. The gateway can add that token to each operation it sends to your services. -Similarly, the gateway can modify the details of its response to a client, based on the result of each implementing service. +Similarly, the gateway can modify the details of its response to a client, based on the result returned by each implementing service. + +### Customizing requests -### Customizing incoming requests +In the following example, each incoming request to the gateway includes an `Authorization` header. The gateway sets the shared `context` for an operation by pulling the value of that header and using it to fetch the associated user's ID. -The following example demonstrates passing user information from the gateway -to each implementing service via the `user-id` HTTP header: +After adding the `userId` to the shared `context` object, the gateway can then add that value to a header that it includes in its requests to each implementing service. + + ```javascript const { ApolloServer } = require('apollo-server'); @@ -114,29 +122,34 @@ server.listen().then(({ url }) => { }); ``` + + The `buildService` function enables us to customize the requests that are sent to our implementing services. In this example, we return a custom `RemoteGraphQLDataSource`. The datasource allows us to modify the outgoing request with information from the Apollo Server `context` before it's sent. Here, we add the `user-id` header to pass an authenticated user ID to downstream services. -### Customizing outgoing responses +### Customizing responses -The `didReceiveResponse` callback of the `RemoteGraphQLDataSource` class enables the gatway to inspect each implementing service's result to modify the `context` before sending a final response to the client. +Let's say that whenever our implementing services return an operation result to the gateway, they include a `Server-Id` header in the response. The value of the header uniquely identifies the service in our graph. -Suppose our implementing services all use the `Server-Id` header to uniquely -identify themselves in a response. We want the gateway's `Server-Id` header to include _all_ of these returned values. In this case, we can tell the gateway to aggregate the various server IDs into a single, comma-separated list in its response: +When the gateway then responds to a client, we want _its_ `Server-Id` header to include the identifier for _every_ service that contributed to the response. In this case, we can tell the gateway to aggregate the various server IDs into a single, comma-separated list. + +The flow for processing a single operation from a client application then looks like this: ```mermaid sequenceDiagram; - Client->>Gateway: Send GraphQL operation - Gateway->>Gateway: Generate query plan for operation + Client app->>Gateway: Sends GraphQL operation + Gateway->>Gateway: Generates query plan for operation loop For each operation in the query plan - Gateway->>Implementing Services: Send the operation to the applicable service - Implementing Services->>Gateway: Respond with result and Server-Id header - Gateway->>Gateway: Add the returned Server-Id to the shared context + Gateway->>Implementing Services: Sends the operation to the applicable service + Implementing Services->>Gateway: Responds with result and Server-Id header + Gateway->>Gateway: Adds the returned Server-Id to the shared context end - Gateway->>Gateway: Add all returned Server-Ids to the response header - Gateway->>Client: Send operation response + Gateway->>Gateway: Adds all Server-Ids in the shared context to the response header + Gateway->>Client app: Sends operation response ``` - To implement this behavior, we define a `didReceiveResponse` callback and an `ApolloServerPlugin` in our gateway: +To implement this flow, we can use the `didReceiveResponse` callback of the `RemoteGraphQLDataSource` class to inspect each implementing service's result as it comes in. We can add the `Server-Id` to the shared `context` in this callback, then pull the full list from the `context` when sending the final response to the client. + + ```javascript const { ApolloServer } = require('apollo-server'); @@ -199,14 +212,16 @@ server.listen().then(({ url }) => { }); ``` + + To learn more about `buildService` and `RemoteGraphQLDataSource`, see the [API docs](/api/apollo-gateway/). ## Implementing custom directives -The `@apollo/gateway` library provides limited support for custom directives that are implemented by your implementing services. To use this feature, there are a few requirements that must be met in order to compose a valid graph: +The `@apollo/gateway` library provides limited support for custom [directives](/schema/directives/) that are implemented by your implementing services. Directives must meet all of the following criteria to be compatible with the gateway: * Custom directives can only be used in **executable locations**, as defined in the [GraphQL specification](https://graphql.github.io/graphql-spec/June2018/#ExecutableDirectiveLocation). -* Custom directives must be implemented by *every* implementing service in the data graph. It's acceptable for a service to do nothing with a particular directive, but a directive definition must exist within every service's schema. -* Directive definitions must be identical across all services. A directive definition is identical if its name, arguments and their types, and locations are all the same. +* Your custom directives must be defined by *every* implementing service in your data graph, even if not all of your services use them. +* Directive definitions must be identical across all of your service schemas. Directive definitions are identical if their names, locations, arguments, and argument types are all identical. >Apollo Server does not currently support executable directives, however they are supported by the gateway. diff --git a/docs/source/federation/implementing-services.mdx b/docs/source/federation/implementing-services.mdx index 8599974c1d3..045b21cab7c 100644 --- a/docs/source/federation/implementing-services.mdx +++ b/docs/source/federation/implementing-services.mdx @@ -1,5 +1,6 @@ --- -title: Implementing services +title: "Apollo Federation: Implementing services" +sidebar_title: Implementing services --- import FederationArchitecture from '../../shared/diagrams/federation-architecture.mdx'; From 507832daa631fb877fbcae0771aef422780f8690 Mon Sep 17 00:00:00 2001 From: Stephen Barlow Date: Thu, 12 Mar 2020 14:51:12 -0700 Subject: [PATCH 271/642] Incorporate feedback from abernix, minus one item --- docs/source/federation/gateway.mdx | 28 +++++++++++++--------------- docs/static/_redirects | 1 + 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/docs/source/federation/gateway.mdx b/docs/source/federation/gateway.mdx index bc3a35214c1..e5cd2808503 100644 --- a/docs/source/federation/gateway.mdx +++ b/docs/source/federation/gateway.mdx @@ -73,30 +73,26 @@ After adding the `userId` to the shared `context` object, the gateway can then a -```javascript +```javascript{4-10,17-19,28-35} const { ApolloServer } = require('apollo-server'); const { ApolloGateway, RemoteGraphQLDataSource } = require('@apollo/gateway'); -// highlight-start class AuthenticatedDataSource extends RemoteGraphQLDataSource { willSendRequest({ request, context }) { - // pass the user's id from the context to underlying services + // Pass the user's id from the context to underlying services // as a header called `user-id` request.http.headers.set('user-id', context.userId); } } -// highlight-end const gateway = new ApolloGateway({ serviceList: [ { name: 'products', url: 'http://localhost:4001' }, - // other services + // List other services here ], - // highlight-start buildService({ name, url }) { return new AuthenticatedDataSource({ url }); }, - // highlight-end }); const server = new ApolloServer({ @@ -106,13 +102,11 @@ const server = new ApolloServer({ subscriptions: false, context: ({ req }) => { - // get the user token from the headers + // Get the user token from the headers const token = req.headers.authorization || ''; - - // try to retrieve a user with the token + // Try to retrieve a user with the token const userId = getUserId(token); - - // add the user to the context + // Add the user ID to the context return { userId }; }, }); @@ -124,6 +118,8 @@ server.listen().then(({ url }) => { +> The fields of the object passed to your `context` function differ if you're using middleware besides Express. [See the API reference for details.](/docs/apollo-server/api/apollo-server/#apolloserver) + The `buildService` function enables us to customize the requests that are sent to our implementing services. In this example, we return a custom `RemoteGraphQLDataSource`. The datasource allows us to modify the outgoing request with information from the Apollo Server `context` before it's sent. Here, we add the `user-id` header to pass an authenticated user ID to downstream services. ### Customizing responses @@ -195,7 +191,7 @@ const server = new ApolloServer({ return { willSendResponse({ context, response }) { // Append our final result to the outgoing response headers - response.http.headers.append( + response.http.headers.set( 'Server-Id', context.serverIds.join(',') ); @@ -214,14 +210,16 @@ server.listen().then(({ url }) => { +> In this example, multiple calls to `didReceiveResponse` are `push`ing a value onto the shared `context.serverIds` array. The order of these calls cannot be guaranteed. If you write logic that modifies the shared `context` object, make sure that modifications are not destructive, and that the order of modifications doesn't matter. + To learn more about `buildService` and `RemoteGraphQLDataSource`, see the [API docs](/api/apollo-gateway/). ## Implementing custom directives +>Apollo Server does **not** currently support executable directives, however they are supported by the gateway. This guidance is provided primarily for architectures that use the `@apollo/gateway` library in combination with implementing services that do _not_ use Apollo Server. + The `@apollo/gateway` library provides limited support for custom [directives](/schema/directives/) that are implemented by your implementing services. Directives must meet all of the following criteria to be compatible with the gateway: * Custom directives can only be used in **executable locations**, as defined in the [GraphQL specification](https://graphql.github.io/graphql-spec/June2018/#ExecutableDirectiveLocation). * Your custom directives must be defined by *every* implementing service in your data graph, even if not all of your services use them. * Directive definitions must be identical across all of your service schemas. Directive definitions are identical if their names, locations, arguments, and argument types are all identical. - ->Apollo Server does not currently support executable directives, however they are supported by the gateway. diff --git a/docs/static/_redirects b/docs/static/_redirects index 15785216dad..0d1caf0e89a 100644 --- a/docs/static/_redirects +++ b/docs/static/_redirects @@ -2,6 +2,7 @@ /docs/apollo-server/data/data/ /docs/apollo-server/data/resolvers/ +/docs/apollo-server/federation/implementing/ /docs/apollo-server/federation/implementing-services/ /docs/apollo-server/federation/core-concepts/ /docs/apollo-server/federation/entities/ /docs/apollo-server/federation/advanced-features/ /docs/apollo-server/federation/entities/ /docs/apollo-server/federation/concerns/ /docs/apollo-server/federation/introduction/#separation-of-concerns From a0580eaa5ea90f31e8785c6607022bbfd4153499 Mon Sep 17 00:00:00 2001 From: Stephen Barlow Date: Thu, 12 Mar 2020 16:14:10 -0700 Subject: [PATCH 272/642] Get that custom directives section spiffy --- docs/source/federation/gateway.mdx | 52 +++++++++++++++++++++++++++--- 1 file changed, 47 insertions(+), 5 deletions(-) diff --git a/docs/source/federation/gateway.mdx b/docs/source/federation/gateway.mdx index e5cd2808503..87508b8e595 100644 --- a/docs/source/federation/gateway.mdx +++ b/docs/source/federation/gateway.mdx @@ -216,10 +216,52 @@ To learn more about `buildService` and `RemoteGraphQLDataSource`, see the [API d ## Implementing custom directives ->Apollo Server does **not** currently support executable directives, however they are supported by the gateway. This guidance is provided primarily for architectures that use the `@apollo/gateway` library in combination with implementing services that do _not_ use Apollo Server. +The `@apollo/gateway` library supports the use of custom [directives](/schema/directives/) in your implementing service schemas. This support differs depending on whether a given directive is a **type system directive** or an **executable directive**. -The `@apollo/gateway` library provides limited support for custom [directives](/schema/directives/) that are implemented by your implementing services. Directives must meet all of the following criteria to be compatible with the gateway: +### Type system directives -* Custom directives can only be used in **executable locations**, as defined in the [GraphQL specification](https://graphql.github.io/graphql-spec/June2018/#ExecutableDirectiveLocation). -* Your custom directives must be defined by *every* implementing service in your data graph, even if not all of your services use them. -* Directive definitions must be identical across all of your service schemas. Directive definitions are identical if their names, locations, arguments, and argument types are all identical. +Type system directives are directives that are applied to one of [these locations](http://spec.graphql.org/June2018/#TypeSystemDirectiveLocation). These directives are _not_ used within operations, but rather are applied to locations within the schema itself. + +The `@deprecated` directive below is an example of a type system directive: + +```graphql +directive @deprecated( + reason: String = "No longer supported" +) on FIELD_DEFINITION | ENUM_VALUE + +type ExampleType { + newField: String + oldField: String @deprecated(reason: "Use `newField`.") +} +``` + +At composition time, `ApolloGateway` strips all definitions _and_ uses of type system directives from your composed schema. This has no effect on your implementing service schemas, which retain this information. + +Effectively, the gateway supports type system directives by _ignoring_ them, making them the responsibility of the implementing services that define them. + +### Executable directives + +Executable directives are directives that are applied to one of [these locations](http://spec.graphql.org/June2018/#ExecutableDirectiveLocation). These directives are _defined_ in your schema, but they're _used_ in operations that are sent by clients. + +>**Although the `@apollo/gateway` library supports executable directives, Apollo Server itself does not**. This guidance is provided primarily for architectures that use the `@apollo/gateway` library in combination with implementing services that do _not_ use Apollo Server. + +Here's an example of an executable directive definition: + +```graphql +# Uppercase this field's value (assuming it's a string) +directive @uppercase on FIELD +``` + +And here's an example of a query that uses that directive: + +```graphql +query { + users { + name @uppercase + } +} +``` + +At composition time, `ApolloGateway` makes sure that **all of your implementing services define the exact same set of executable directives**. If any service is missing a definition, or if definitions differ in their locations, arguments, or argument types, a composition error occurs. + +> Note that different implementing services _can_ use different logic to handle the same executable directive, but this is not recommended. From d4d9bc3d4de76611fdc6325bec0b9e3860faf605 Mon Sep 17 00:00:00 2001 From: Stephen Barlow Date: Thu, 12 Mar 2020 16:17:46 -0700 Subject: [PATCH 273/642] Fix broken link --- docs/source/federation/gateway.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/federation/gateway.mdx b/docs/source/federation/gateway.mdx index 87508b8e595..c9f4bafcac6 100644 --- a/docs/source/federation/gateway.mdx +++ b/docs/source/federation/gateway.mdx @@ -118,7 +118,7 @@ server.listen().then(({ url }) => { -> The fields of the object passed to your `context` function differ if you're using middleware besides Express. [See the API reference for details.](/docs/apollo-server/api/apollo-server/#apolloserver) +> The fields of the object passed to your `context` function differ if you're using middleware besides Express. [See the API reference for details.](/api/apollo-server/#apolloserver) The `buildService` function enables us to customize the requests that are sent to our implementing services. In this example, we return a custom `RemoteGraphQLDataSource`. The datasource allows us to modify the outgoing request with information from the Apollo Server `context` before it's sent. Here, we add the `user-id` header to pass an authenticated user ID to downstream services. From b740ffb0d8aa514f0819d90cf2c0a85e2b46ffb8 Mon Sep 17 00:00:00 2001 From: Stephen Barlow Date: Fri, 13 Mar 2020 14:27:49 -0700 Subject: [PATCH 274/642] Incorporate feedback from trevor-scheer --- docs/source/federation/gateway.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/federation/gateway.mdx b/docs/source/federation/gateway.mdx index c9f4bafcac6..c7d7db48746 100644 --- a/docs/source/federation/gateway.mdx +++ b/docs/source/federation/gateway.mdx @@ -264,4 +264,4 @@ query { At composition time, `ApolloGateway` makes sure that **all of your implementing services define the exact same set of executable directives**. If any service is missing a definition, or if definitions differ in their locations, arguments, or argument types, a composition error occurs. -> Note that different implementing services _can_ use different logic to handle the same executable directive, but this is not recommended. +> It's strongly recommended that all of your implementing services also use the exact same _logic_ for a given executable directive. Otherwise, operations might produce inconsistent or confusing results for clients. From 659082ea2b09c67579ee2a3cfc875bd89a34a979 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 14 Mar 2020 08:13:53 +0000 Subject: [PATCH 275/642] chore(deps): update dependency @types/ioredis to v4.14.9 (#3891) Co-authored-by: Renovate Bot --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index ec500ec1f66..9da063a5c72 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3721,9 +3721,9 @@ "integrity": "sha512-TZDqvFW4nQwL9DVSNJIJu4lPLttKgzRF58COa7Vs42Ki/MrhIqUbeIw0MWn4kGLiZLXB7oCBibm7nkSjPkzfKQ==" }, "@types/ioredis": { - "version": "4.14.8", - "resolved": "https://registry.npmjs.org/@types/ioredis/-/ioredis-4.14.8.tgz", - "integrity": "sha512-ww38Psb0jj/8h9UYjRuT9RYF46E5O3j+03XSEBx6OQvCIkgPV52kF8DshVLh8DMSZs3fEjeoEzmyM3KP9n53tQ==", + "version": "4.14.9", + "resolved": "https://registry.npmjs.org/@types/ioredis/-/ioredis-4.14.9.tgz", + "integrity": "sha512-yNdzppM6vY4DYqXCnt4A3PXArxsMWeJCYxFlyl4AJKrNSGMEAP9TPcXR+8Q6zh9glcCtxmwMQhi4pwdqqHH3OA==", "dev": true, "requires": { "@types/node": "*" diff --git a/package.json b/package.json index 5726a79ffb8..7faae6f3d21 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,7 @@ "@types/connect": "3.4.33", "@types/fast-json-stable-stringify": "2.0.0", "@types/hapi": "17.8.7", - "@types/ioredis": "4.14.8", + "@types/ioredis": "4.14.9", "@types/jest": "24.9.1", "@types/koa-router": "7.4.0", "@types/lodash": "4.14.149", From 38ad4386a9585d249d24eb74aa6adac9ff0758f8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 14 Mar 2020 09:12:47 +0000 Subject: [PATCH 276/642] chore(deps): update dependency gatsby to v2.19.43 (#3892) Co-authored-by: Renovate Bot --- docs/package-lock.json | 1801 +++++++++++++++++++++++++--------------- docs/package.json | 2 +- 2 files changed, 1124 insertions(+), 679 deletions(-) diff --git a/docs/package-lock.json b/docs/package-lock.json index 3f52d801e4e..9eab4e70914 100644 --- a/docs/package-lock.json +++ b/docs/package-lock.json @@ -2096,9 +2096,9 @@ }, "dependencies": { "regenerator-runtime": { - "version": "0.13.4", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.4.tgz", - "integrity": "sha512-plpwicqEzfEyTQohIKktWigcLzmNStMGwbOUbykx51/29Z3JOGYldaaNGK7ngNXV+UcoqvIMmloZ48Sr74sd+g==" + "version": "0.13.5", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", + "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==" } } }, @@ -2257,9 +2257,9 @@ }, "dependencies": { "regenerator-runtime": { - "version": "0.13.4", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.4.tgz", - "integrity": "sha512-plpwicqEzfEyTQohIKktWigcLzmNStMGwbOUbykx51/29Z3JOGYldaaNGK7ngNXV+UcoqvIMmloZ48Sr74sd+g==" + "version": "0.13.5", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", + "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==" } } }, @@ -2725,6 +2725,102 @@ "strip-ansi": "^3" } }, + "@pmmmwh/react-refresh-webpack-plugin": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.2.0.tgz", + "integrity": "sha512-rjdNzcWroULJeD/Y0+eETy9LhM7c5tbPF+wqT5G680rwDkh3iothIPEqGAuEE2WJlXEaAq293aO6ySzsIU518Q==", + "requires": { + "ansi-html": "^0.0.7", + "error-stack-parser": "^2.0.4", + "html-entities": "^1.2.1", + "lodash.debounce": "^4.0.8", + "react-dev-utils": "^9.1.0" + }, + "dependencies": { + "ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==" + }, + "browserslist": { + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.7.0.tgz", + "integrity": "sha512-9rGNDtnj+HaahxiVV38Gn8n8Lr8REKsel68v1sPFfIGEK6uSXTY3h9acgiT1dZVtOOUtifo/Dn8daDQ5dUgVsA==", + "requires": { + "caniuse-lite": "^1.0.30000989", + "electron-to-chromium": "^1.3.247", + "node-releases": "^1.1.29" + } + }, + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + }, + "detect-port-alt": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/detect-port-alt/-/detect-port-alt-1.1.6.tgz", + "integrity": "sha512-5tQykt+LqfJFBEYaDITx7S7cR7mJ/zQmLXZ2qt5w04ainYZw6tBf9dBunMjVeVOdYVRUzUOE4HkY5J7+uttb5Q==", + "requires": { + "address": "^1.0.1", + "debug": "^2.6.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + }, + "react-dev-utils": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-9.1.0.tgz", + "integrity": "sha512-X2KYF/lIGyGwP/F/oXgGDF24nxDA2KC4b7AFto+eqzc/t838gpSGiaU8trTqHXOohuLxxc5qi1eDzsl9ucPDpg==", + "requires": { + "@babel/code-frame": "7.5.5", + "address": "1.1.2", + "browserslist": "4.7.0", + "chalk": "2.4.2", + "cross-spawn": "6.0.5", + "detect-port-alt": "1.1.6", + "escape-string-regexp": "1.0.5", + "filesize": "3.6.1", + "find-up": "3.0.0", + "fork-ts-checker-webpack-plugin": "1.5.0", + "global-modules": "2.0.0", + "globby": "8.0.2", + "gzip-size": "5.1.1", + "immer": "1.10.0", + "inquirer": "6.5.0", + "is-root": "2.1.0", + "loader-utils": "1.2.3", + "open": "^6.3.0", + "pkg-up": "2.0.0", + "react-error-overlay": "^6.0.3", + "recursive-readdir": "2.2.2", + "shell-quote": "1.7.2", + "sockjs-client": "1.4.0", + "strip-ansi": "5.2.0", + "text-table": "0.2.0" + } + }, + "react-error-overlay": { + "version": "6.0.6", + "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.6.tgz", + "integrity": "sha512-Yzpno3enVzSrSCnnljmr4b/2KUQSMZaPuqmS26t9k4nW7uwJk6STWmH9heNjPuvqUTO3jOSPkHoKgO4+Dw7uIw==" + }, + "strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "requires": { + "ansi-regex": "^4.1.0" + } + } + } + }, "@reach/router": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/@reach/router/-/router-1.3.3.tgz", @@ -3042,11 +3138,11 @@ } }, "@typescript-eslint/eslint-plugin": { - "version": "2.22.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.22.0.tgz", - "integrity": "sha512-BvxRLaTDVQ3N+Qq8BivLiE9akQLAOUfxNHIEhedOcg8B2+jY8Rc4/D+iVprvuMX1AdezFYautuGDwr9QxqSxBQ==", + "version": "2.23.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.23.0.tgz", + "integrity": "sha512-8iA4FvRsz8qTjR0L/nK9RcRUN3QtIHQiOm69FzV7WS3SE+7P7DyGGwh3k4UNR2JBbk+Ej2Io+jLAaqKibNhmtw==", "requires": { - "@typescript-eslint/experimental-utils": "2.22.0", + "@typescript-eslint/experimental-utils": "2.23.0", "eslint-utils": "^1.4.3", "functional-red-black-tree": "^1.0.1", "regexpp": "^3.0.0", @@ -3054,30 +3150,30 @@ } }, "@typescript-eslint/experimental-utils": { - "version": "2.22.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.22.0.tgz", - "integrity": "sha512-sJt1GYBe6yC0dWOQzXlp+tiuGglNhJC9eXZeC8GBVH98Zv9jtatccuhz0OF5kC/DwChqsNfghHx7OlIDQjNYAQ==", + "version": "2.23.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.23.0.tgz", + "integrity": "sha512-OswxY59RcXH3NNPmq+4Kis2CYZPurRU6mG5xPcn24CjFyfdVli5mySwZz/g/xDbJXgDsYqNGq7enV0IziWGXVQ==", "requires": { "@types/json-schema": "^7.0.3", - "@typescript-eslint/typescript-estree": "2.22.0", + "@typescript-eslint/typescript-estree": "2.23.0", "eslint-scope": "^5.0.0" } }, "@typescript-eslint/parser": { - "version": "2.22.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.22.0.tgz", - "integrity": "sha512-FaZKC1X+nvD7qMPqKFUYHz3H0TAioSVFGvG29f796Nc5tBluoqfHgLbSFKsh7mKjRoeTm8J9WX2Wo9EyZWjG7w==", + "version": "2.23.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.23.0.tgz", + "integrity": "sha512-k61pn/Nepk43qa1oLMiyqApC6x5eP5ddPz6VUYXCAuXxbmRLqkPYzkFRKl42ltxzB2luvejlVncrEpflgQoSUg==", "requires": { "@types/eslint-visitor-keys": "^1.0.0", - "@typescript-eslint/experimental-utils": "2.22.0", - "@typescript-eslint/typescript-estree": "2.22.0", + "@typescript-eslint/experimental-utils": "2.23.0", + "@typescript-eslint/typescript-estree": "2.23.0", "eslint-visitor-keys": "^1.1.0" } }, "@typescript-eslint/typescript-estree": { - "version": "2.22.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.22.0.tgz", - "integrity": "sha512-2HFZW2FQc4MhIBB8WhDm9lVFaBDy6h9jGrJ4V2Uzxe/ON29HCHBTj3GkgcsgMWfsl2U5as+pTOr30Nibaw7qRQ==", + "version": "2.23.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.23.0.tgz", + "integrity": "sha512-pmf7IlmvXdlEXvE/JWNNJpEvwBV59wtJqA8MLAxMKLXNKVRC3HZBXR/SlZLPWTCcwOSg9IM7GeRSV3SIerGVqw==", "requires": { "debug": "^4.1.1", "eslint-visitor-keys": "^1.1.0", @@ -3587,9 +3683,12 @@ "integrity": "sha1-FziZ0//Rx9k4PkR5Ul2+J4yrXys=" }, "array-union": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", - "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==" + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", + "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", + "requires": { + "array-uniq": "^1.0.1" + } }, "array-uniq": { "version": "1.0.3", @@ -3672,10 +3771,9 @@ "integrity": "sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==" }, "arrify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz", - "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==", - "optional": true + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", + "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=" }, "asap": { "version": "2.0.6", @@ -3787,23 +3885,6 @@ "num2fraction": "^1.2.2", "postcss": "^7.0.26", "postcss-value-parser": "^4.0.2" - }, - "dependencies": { - "browserslist": { - "version": "4.9.1", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.9.1.tgz", - "integrity": "sha512-Q0DnKq20End3raFulq6Vfp1ecB9fh8yUNV55s8sekaDDeqBaCtWlRHCUdaWyUeSSBJM7IbM6HcsyaeYqgeDhnw==", - "requires": { - "caniuse-lite": "^1.0.30001030", - "electron-to-chromium": "^1.3.363", - "node-releases": "^1.1.50" - } - }, - "electron-to-chromium": { - "version": "1.3.372", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.372.tgz", - "integrity": "sha512-77a4jYC52OdisHM+Tne7dgWEvQT1FoNu/jYl279pP88ZtG4ZRIPyhQwAKxj6C2rzsyC1OwsOds9JlZtNncSz6g==" - } } }, "aws-sign2": { @@ -4037,9 +4118,9 @@ } }, "babel-plugin-remove-graphql-queries": { - "version": "2.7.24", - "resolved": "https://registry.npmjs.org/babel-plugin-remove-graphql-queries/-/babel-plugin-remove-graphql-queries-2.7.24.tgz", - "integrity": "sha512-uyYSTt2ikv4QhPC1HSt5WnP9sJFCOytrN119NpXQtGL9AiXNGghrELnY4BxhDuJtw/Wjrw20eED1+BJLzfMs7Q==" + "version": "2.7.25", + "resolved": "https://registry.npmjs.org/babel-plugin-remove-graphql-queries/-/babel-plugin-remove-graphql-queries-2.7.25.tgz", + "integrity": "sha512-kQZnj1SszxhlOvaNIGA7sw0bcdHyWpLDBy+1MBNYblGes7eUjfUeshzRd5ffJ9WMaKgXz4tyKDzAygjnpPaPZg==" }, "babel-plugin-syntax-jsx": { "version": "6.18.0", @@ -4052,9 +4133,9 @@ "integrity": "sha512-eqj0hVcJUR57/Ug2zE1Yswsw4LhuqqHhD+8v120T1cl3kjg76QwtyBrdIk4WVwK+lAhBJVYCd/v+4nc4y+8JsA==" }, "babel-preset-gatsby": { - "version": "0.2.31", - "resolved": "https://registry.npmjs.org/babel-preset-gatsby/-/babel-preset-gatsby-0.2.31.tgz", - "integrity": "sha512-2PhWjAli3hXcK0ASieOQZgiU4b6THA5/OWJSz5ZM3snmf1oqlWqhRJfzj6RXu2BkwvoGI5Hu9krEcVEgZKGTeQ==", + "version": "0.2.35", + "resolved": "https://registry.npmjs.org/babel-preset-gatsby/-/babel-preset-gatsby-0.2.35.tgz", + "integrity": "sha512-zylN9yeFB2WJJUt4mndkbHu1yhZVNKIgc0lUEgO1BZYeH2Rhj0zBMmP7zzR1dpxvryI96+etn2raIvnW+TTXeA==", "requires": { "@babel/plugin-proposal-class-properties": "^7.7.4", "@babel/plugin-proposal-nullish-coalescing-operator": "^7.7.4", @@ -4068,7 +4149,7 @@ "babel-plugin-dynamic-import-node": "^2.3.0", "babel-plugin-macros": "^2.8.0", "babel-plugin-transform-react-remove-prop-types": "^0.4.24", - "gatsby-core-utils": "^1.0.30" + "gatsby-core-utils": "^1.0.33" }, "dependencies": { "@babel/runtime": { @@ -4080,9 +4161,9 @@ } }, "gatsby-core-utils": { - "version": "1.0.30", - "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.0.30.tgz", - "integrity": "sha512-+WYFxf9dT4u67vecXdROe9iF2jzPKoTVbWI3FYLCcNANY2Y/vEec11vhG5FnBHdLpgmD3cnLPdhCAileKWBldA==", + "version": "1.0.33", + "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.0.33.tgz", + "integrity": "sha512-eQkOQumfbMLdbKJN0E1dlnBjAKWAzexxuNdpL88yCIaqHGOMogGTmAmhG1Hs0sz9bMrNPxuIgEyDNQe3IDfJXw==", "requires": { "ci-info": "2.0.0", "configstore": "^5.0.0", @@ -4090,9 +4171,9 @@ } }, "regenerator-runtime": { - "version": "0.13.4", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.4.tgz", - "integrity": "sha512-plpwicqEzfEyTQohIKktWigcLzmNStMGwbOUbykx51/29Z3JOGYldaaNGK7ngNXV+UcoqvIMmloZ48Sr74sd+g==" + "version": "0.13.5", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", + "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==" } } }, @@ -4579,12 +4660,20 @@ } }, "browserslist": { - "version": "3.2.8", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-3.2.8.tgz", - "integrity": "sha512-WHVocJYavUwVgVViC0ORikPHQquXwVh939TaelZ4WDqpWgTX/FsGhl/+P4qBUAGcRvtOgDgC+xftNWWp2RUTAQ==", + "version": "4.9.1", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.9.1.tgz", + "integrity": "sha512-Q0DnKq20End3raFulq6Vfp1ecB9fh8yUNV55s8sekaDDeqBaCtWlRHCUdaWyUeSSBJM7IbM6HcsyaeYqgeDhnw==", "requires": { - "caniuse-lite": "^1.0.30000844", - "electron-to-chromium": "^1.3.47" + "caniuse-lite": "^1.0.30001030", + "electron-to-chromium": "^1.3.363", + "node-releases": "^1.1.50" + }, + "dependencies": { + "electron-to-chromium": { + "version": "1.3.376", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.376.tgz", + "integrity": "sha512-cv/PYVz5szeMz192ngilmezyPNFkUjuynuL2vNdiqIrio440nfTDdc0JJU0TS2KHLSVCs9gBbt4CFqM+HcBnjw==" + } } }, "buffer": { @@ -4824,29 +4913,12 @@ "caniuse-lite": "^1.0.0", "lodash.memoize": "^4.1.2", "lodash.uniq": "^4.5.0" - }, - "dependencies": { - "browserslist": { - "version": "4.9.1", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.9.1.tgz", - "integrity": "sha512-Q0DnKq20End3raFulq6Vfp1ecB9fh8yUNV55s8sekaDDeqBaCtWlRHCUdaWyUeSSBJM7IbM6HcsyaeYqgeDhnw==", - "requires": { - "caniuse-lite": "^1.0.30001030", - "electron-to-chromium": "^1.3.363", - "node-releases": "^1.1.50" - } - }, - "electron-to-chromium": { - "version": "1.3.372", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.372.tgz", - "integrity": "sha512-77a4jYC52OdisHM+Tne7dgWEvQT1FoNu/jYl279pP88ZtG4ZRIPyhQwAKxj6C2rzsyC1OwsOds9JlZtNncSz6g==" - } } }, "caniuse-lite": { - "version": "1.0.30001032", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001032.tgz", - "integrity": "sha512-8joOm7BwcpEN4BfVHtfh0hBXSAPVYk+eUIcNntGtMkUWy/6AKRCDZINCLe3kB1vHhT2vBxBF85Hh9VlPXi/qjA==" + "version": "1.0.30001035", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001035.tgz", + "integrity": "sha512-C1ZxgkuA4/bUEdMbU5WrGY4+UhMFFiXrgNAfxiMIqWgFTWfv/xsZCS2xEHT2LMq7xAZfuAnu6mcqyDl0ZR6wLQ==" }, "caseless": { "version": "0.12.0", @@ -5141,11 +5213,11 @@ "integrity": "sha512-gpaBrMAizVEANOpfZp/EEUixTXDyGt7DFzdK5hU+UbWt/J0lB0w20ncZj59Z9a93xHb9u12zF5BS6i9RKbtg4w==" }, "cli-cursor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", - "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz", + "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=", "requires": { - "restore-cursor": "^3.1.0" + "restore-cursor": "^2.0.0" } }, "cli-spinners": { @@ -6419,9 +6491,9 @@ "integrity": "sha512-68s5jYdlvasItOJnCuI2Q9s4q98g0pCyL3HrcKJu8KNugUl8ahgmZYg38ysLTgQjjXX3H8CJLkAvWrclWfcalw==" }, "date-fns": { - "version": "2.10.0", - "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.10.0.tgz", - "integrity": "sha512-EhfEKevYGWhWlZbNeplfhIU/+N+x0iCIx7VzKlXma2EdQyznVlZhCptXUY+BegNpPW2kjdx15Rvq503YcXXrcA==" + "version": "2.11.0", + "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.11.0.tgz", + "integrity": "sha512-8P1cDi8ebZyDxUyUprBXwidoEtiQAawYPGvpfb+Dg0G6JrQ+VozwOmm91xYC0vAv1+0VmLehEPb+isg4BGUFfA==" }, "debug": { "version": "3.2.6", @@ -6581,6 +6653,115 @@ "p-map": "^3.0.0", "rimraf": "^3.0.0", "slash": "^3.0.0" + }, + "dependencies": { + "@nodelib/fs.stat": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz", + "integrity": "sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==" + }, + "array-union": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", + "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==" + }, + "braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "requires": { + "fill-range": "^7.0.1" + } + }, + "dir-glob": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", + "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", + "requires": { + "path-type": "^4.0.0" + } + }, + "fast-glob": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.2.tgz", + "integrity": "sha512-UDV82o4uQyljznxwMxyVRJgZZt3O5wENYojjzbaGEGZgeOxkLFf+V4cnUD+krzb2F72E18RhamkMZ7AdeggF7A==", + "requires": { + "@nodelib/fs.stat": "^2.0.2", + "@nodelib/fs.walk": "^1.2.3", + "glob-parent": "^5.1.0", + "merge2": "^1.3.0", + "micromatch": "^4.0.2", + "picomatch": "^2.2.1" + } + }, + "fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "requires": { + "to-regex-range": "^5.0.1" + } + }, + "glob-parent": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz", + "integrity": "sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==", + "requires": { + "is-glob": "^4.0.1" + } + }, + "globby": { + "version": "10.0.2", + "resolved": "https://registry.npmjs.org/globby/-/globby-10.0.2.tgz", + "integrity": "sha512-7dUi7RvCoT/xast/o/dLN53oqND4yk0nsHkhRgn9w65C4PofCLOoJ39iSOg+qVDdWQPIEj+eszMHQ+aLVwwQSg==", + "requires": { + "@types/glob": "^7.1.1", + "array-union": "^2.1.0", + "dir-glob": "^3.0.1", + "fast-glob": "^3.0.3", + "glob": "^7.1.3", + "ignore": "^5.1.1", + "merge2": "^1.2.3", + "slash": "^3.0.0" + } + }, + "ignore": { + "version": "5.1.4", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.4.tgz", + "integrity": "sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A==" + }, + "is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==" + }, + "micromatch": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz", + "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==", + "requires": { + "braces": "^3.0.1", + "picomatch": "^2.0.5" + } + }, + "picomatch": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.1.tgz", + "integrity": "sha512-ISBaA8xQNmwELC7eOjqFKMESB2VIqt4PPDD0nsS95b/9dZXvVKOlz9keMSnoGGKcOHXfTvDD6WMaRoSc9UuhRA==" + }, + "slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==" + }, + "to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "requires": { + "is-number": "^7.0.0" + } + } } }, "delayed-stream": { @@ -6788,11 +6969,27 @@ } }, "dir-glob": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", - "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz", + "integrity": "sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==", "requires": { - "path-type": "^4.0.0" + "arrify": "^1.0.1", + "path-type": "^3.0.0" + }, + "dependencies": { + "path-type": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz", + "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", + "requires": { + "pify": "^3.0.0" + } + }, + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" + } } }, "dns-equal": { @@ -7232,10 +7429,55 @@ "v8-compile-cache": "^2.0.3" }, "dependencies": { + "ansi-escapes": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz", + "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==", + "requires": { + "type-fest": "^0.11.0" + }, + "dependencies": { + "type-fest": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz", + "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==" + } + } + }, "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==" + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==" + }, + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "cli-cursor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", + "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", + "requires": { + "restore-cursor": "^3.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, "debug": { "version": "4.1.1", @@ -7245,6 +7487,19 @@ "ms": "^2.1.1" } }, + "emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" + }, + "figures": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz", + "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==", + "requires": { + "escape-string-regexp": "^1.0.5" + } + }, "glob-parent": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz", @@ -7254,13 +7509,18 @@ } }, "globals": { - "version": "12.3.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-12.3.0.tgz", - "integrity": "sha512-wAfjdLgFsPZsklLJvOBUBmzYE8/CwhEqSBEMRXA3qxIiNtyqvjYurAtIfDh6chlEPUfmTY3MnZh5Hfh4q0UlIw==", + "version": "12.4.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz", + "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==", "requires": { "type-fest": "^0.8.1" } }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" + }, "ignore": { "version": "4.0.6", "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", @@ -7275,27 +7535,133 @@ "resolve-from": "^4.0.0" } }, - "regexpp": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz", - "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==" - }, - "resolve-from": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==" - }, - "semver": { + "inquirer": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.1.0.tgz", + "integrity": "sha512-5fJMWEmikSYu0nv/flMc475MhGbB7TSPd/2IpFV4I4rMklboCH2rQjYY5kKiYGHqUF9gvaambupcJFFG9dvReg==", + "requires": { + "ansi-escapes": "^4.2.1", + "chalk": "^3.0.0", + "cli-cursor": "^3.1.0", + "cli-width": "^2.0.0", + "external-editor": "^3.0.3", + "figures": "^3.0.0", + "lodash": "^4.17.15", + "mute-stream": "0.0.8", + "run-async": "^2.4.0", + "rxjs": "^6.5.3", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0", + "through": "^2.3.6" + }, + "dependencies": { + "chalk": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "requires": { + "ansi-regex": "^5.0.0" + } + } + } + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" + }, + "mimic-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==" + }, + "mute-stream": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", + "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==" + }, + "onetime": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz", + "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==", + "requires": { + "mimic-fn": "^2.1.0" + } + }, + "regexpp": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz", + "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==" + }, + "resolve-from": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==" + }, + "restore-cursor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", + "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", + "requires": { + "onetime": "^5.1.0", + "signal-exit": "^3.0.2" + } + }, + "semver": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" }, + "string-width": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", + "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" + }, + "dependencies": { + "strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "requires": { + "ansi-regex": "^5.0.0" + } + } + } + }, "strip-ansi": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", "requires": { "ansi-regex": "^4.1.0" + }, + "dependencies": { + "ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==" + } + } + }, + "supports-color": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "requires": { + "has-flag": "^4.0.0" } }, "v8-compile-cache": { @@ -7648,13 +8014,20 @@ "integrity": "sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==" }, "espree": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/espree/-/espree-6.2.0.tgz", - "integrity": "sha512-Xs8airJ7RQolnDIbLtRutmfvSsAe0xqMMAantCN/GMoqf81TFbeI1T7Jpd56qYu1uuh32dOG5W/X9uO+ghPXzA==", + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-6.2.1.tgz", + "integrity": "sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==", "requires": { - "acorn": "^7.1.0", + "acorn": "^7.1.1", "acorn-jsx": "^5.2.0", "eslint-visitor-keys": "^1.1.0" + }, + "dependencies": { + "acorn": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.1.tgz", + "integrity": "sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==" + } } }, "esprima": { @@ -7722,11 +8095,11 @@ "integrity": "sha512-Rv+u8MLHNOdMjTAFeT3nCjHn2aGlx435FP/sDHNaRhDEMwyI/aB22Kj2qIN8R0cw3z28psEQLYwxVKLsKrMgWg==" }, "eventsource": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-0.1.6.tgz", - "integrity": "sha1-Cs7ehJ7X3RzMMsgRuxG5RNTykjI=", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz", + "integrity": "sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==", "requires": { - "original": ">=0.0.5" + "original": "^1.0.0" } }, "evp_bytestokey": { @@ -7778,6 +8151,11 @@ "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz", "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==" }, + "mimic-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==" + }, "npm-run-path": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", @@ -7786,6 +8164,14 @@ "path-key": "^3.0.0" } }, + "onetime": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz", + "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==", + "requires": { + "mimic-fn": "^2.1.0" + } + }, "p-finally": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-2.0.1.tgz", @@ -8178,9 +8564,9 @@ "integrity": "sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==" }, "figures": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz", - "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz", + "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=", "requires": { "escape-string-regexp": "^1.0.5" } @@ -8214,9 +8600,9 @@ "optional": true }, "filesize": { - "version": "3.5.11", - "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.5.11.tgz", - "integrity": "sha512-ZH7loueKBoDb7yG9esn1U+fgq7BzlzW6NRi5/rMdxIZ05dj7GFD/Xc5rq2CDt5Yq86CyfSYVyx4242QQNZbx1g==" + "version": "3.6.1", + "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.6.1.tgz", + "integrity": "sha512-7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg==" }, "fill-range": { "version": "4.0.0", @@ -8386,6 +8772,47 @@ "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=" }, + "fork-ts-checker-webpack-plugin": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-1.5.0.tgz", + "integrity": "sha512-zEhg7Hz+KhZlBhILYpXy+Beu96gwvkROWJiTXOCyOOMMrdBIRPvsBpBqgTI4jfJGrJXcqGwJR8zsBGDmzY0jsA==", + "requires": { + "babel-code-frame": "^6.22.0", + "chalk": "^2.4.1", + "chokidar": "^2.0.4", + "micromatch": "^3.1.10", + "minimatch": "^3.0.4", + "semver": "^5.6.0", + "tapable": "^1.0.0", + "worker-rpc": "^0.1.0" + }, + "dependencies": { + "chokidar": { + "version": "2.1.8", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz", + "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==", + "requires": { + "anymatch": "^2.0.0", + "async-each": "^1.0.1", + "braces": "^2.3.2", + "fsevents": "^1.2.7", + "glob-parent": "^3.1.0", + "inherits": "^2.0.3", + "is-binary-path": "^1.0.0", + "is-glob": "^4.0.0", + "normalize-path": "^3.0.0", + "path-is-absolute": "^1.0.0", + "readdirp": "^2.2.1", + "upath": "^1.1.1" + } + }, + "normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==" + } + } + }, "form-data": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", @@ -8986,9 +9413,9 @@ } }, "gatsby": { - "version": "2.19.32", - "resolved": "https://registry.npmjs.org/gatsby/-/gatsby-2.19.32.tgz", - "integrity": "sha512-YzAvkTwyh9uxytCqP/utinFstEpz+COEWS39t3PvlcAimuWIsmwDlgK/5CMb3KSkavEeIuuBRADfbInapEbpWQ==", + "version": "2.19.43", + "resolved": "https://registry.npmjs.org/gatsby/-/gatsby-2.19.43.tgz", + "integrity": "sha512-lrEENBE907oLptB4rrXAx1ahqxNoI4fjgJdK1zQobEKwgkTSjyNX0YRlWQ+4+2VdgaDjw25ZBGglsk0leifmTA==", "requires": { "@babel/code-frame": "^7.5.5", "@babel/core": "^7.7.5", @@ -8999,9 +9426,10 @@ "@hapi/joi": "^15.1.1", "@mikaelkristiansson/domready": "^1.0.10", "@pieh/friendly-errors-webpack-plugin": "1.7.0-chalk-2", + "@pmmmwh/react-refresh-webpack-plugin": "^0.2.0", "@reach/router": "^1.3.1", - "@typescript-eslint/eslint-plugin": "^2.11.0", - "@typescript-eslint/parser": "^2.11.0", + "@typescript-eslint/eslint-plugin": "^2.23.0", + "@typescript-eslint/parser": "^2.23.0", "address": "1.1.2", "autoprefixer": "^9.7.3", "axios": "^0.19.0", @@ -9010,13 +9438,13 @@ "babel-loader": "^8.0.6", "babel-plugin-add-module-exports": "^0.3.3", "babel-plugin-dynamic-import-node": "^2.3.0", - "babel-plugin-remove-graphql-queries": "^2.7.24", - "babel-preset-gatsby": "^0.2.31", + "babel-plugin-remove-graphql-queries": "^2.7.25", + "babel-preset-gatsby": "^0.2.35", "better-opn": "1.0.0", "better-queue": "^3.8.10", "bluebird": "^3.7.2", - "browserslist": "3.2.8", - "cache-manager": "^2.10.1", + "browserslist": "^4.9.1", + "cache-manager": "^2.11.1", "cache-manager-fs-hash": "^0.0.7", "chalk": "^2.4.2", "chokidar": "3.3.0", @@ -9050,13 +9478,13 @@ "flat": "^4.1.0", "fs-exists-cached": "1.0.0", "fs-extra": "^8.1.0", - "gatsby-cli": "^2.10.2", - "gatsby-core-utils": "^1.0.30", + "gatsby-cli": "^2.10.10", + "gatsby-core-utils": "^1.0.33", "gatsby-graphiql-explorer": "^0.2.35", "gatsby-link": "^2.2.30", - "gatsby-plugin-page-creator": "^2.1.42", + "gatsby-plugin-page-creator": "^2.1.45", "gatsby-react-router-scroll": "^2.1.23", - "gatsby-telemetry": "^1.1.51", + "gatsby-telemetry": "^1.1.55", "glob": "^7.1.6", "got": "8.3.2", "graphql": "^14.5.8", @@ -9098,7 +9526,8 @@ "react-dev-utils": "^4.2.3", "react-error-overlay": "^3.0.0", "react-hot-loader": "^4.12.18", - "redux": "^4.0.4", + "react-refresh": "^0.7.0", + "redux": "^4.0.5", "redux-thunk": "^2.3.0", "semver": "^5.7.1", "shallow-compare": "^1.2.2", @@ -9175,9 +9604,9 @@ "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==" }, "gatsby-cli": { - "version": "2.10.2", - "resolved": "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-2.10.2.tgz", - "integrity": "sha512-TAwdMptYEKIWC93MHn3Vr+UZMOCxiAp3qN17+depCm2lmYq9O4DgtQi8FPHIZfivIJjAhQ1TOYXl9890YclfLg==", + "version": "2.10.10", + "resolved": "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-2.10.10.tgz", + "integrity": "sha512-J7geHpblEho35R47fRTl9QTygfk1FKxfsoNjtXbU1yzSWLAa2Qi46GyeJOxwbGeC1oQ+KhlPDuk6lFXjQ69OPw==", "requires": { "@babel/code-frame": "^7.5.5", "@babel/runtime": "^7.7.6", @@ -9194,8 +9623,8 @@ "execa": "^3.4.0", "fs-exists-cached": "^1.0.0", "fs-extra": "^8.1.0", - "gatsby-core-utils": "^1.0.30", - "gatsby-telemetry": "^1.1.51", + "gatsby-core-utils": "^1.0.33", + "gatsby-telemetry": "^1.1.55", "hosted-git-info": "^3.0.2", "ink": "^2.6.0", "ink-spinner": "^3.0.1", @@ -9209,7 +9638,7 @@ "progress": "^2.0.3", "prompts": "^2.3.0", "react": "^16.8.0", - "redux": "^4.0.4", + "redux": "^4.0.5", "resolve-cwd": "^2.0.0", "semver": "^6.3.0", "signal-exit": "^3.0.2", @@ -9230,9 +9659,9 @@ } }, "gatsby-core-utils": { - "version": "1.0.30", - "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.0.30.tgz", - "integrity": "sha512-+WYFxf9dT4u67vecXdROe9iF2jzPKoTVbWI3FYLCcNANY2Y/vEec11vhG5FnBHdLpgmD3cnLPdhCAileKWBldA==", + "version": "1.0.33", + "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.0.33.tgz", + "integrity": "sha512-eQkOQumfbMLdbKJN0E1dlnBjAKWAzexxuNdpL88yCIaqHGOMogGTmAmhG1Hs0sz9bMrNPxuIgEyDNQe3IDfJXw==", "requires": { "ci-info": "2.0.0", "configstore": "^5.0.0", @@ -9274,9 +9703,9 @@ "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==" }, "regenerator-runtime": { - "version": "0.13.4", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.4.tgz", - "integrity": "sha512-plpwicqEzfEyTQohIKktWigcLzmNStMGwbOUbykx51/29Z3JOGYldaaNGK7ngNXV+UcoqvIMmloZ48Sr74sd+g==" + "version": "0.13.5", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", + "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==" }, "require-main-filename": { "version": "1.0.1", @@ -9392,9 +9821,9 @@ } }, "regenerator-runtime": { - "version": "0.13.4", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.4.tgz", - "integrity": "sha512-plpwicqEzfEyTQohIKktWigcLzmNStMGwbOUbykx51/29Z3JOGYldaaNGK7ngNXV+UcoqvIMmloZ48Sr74sd+g==" + "version": "0.13.5", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", + "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==" } } }, @@ -9417,22 +9846,22 @@ } }, "regenerator-runtime": { - "version": "0.13.4", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.4.tgz", - "integrity": "sha512-plpwicqEzfEyTQohIKktWigcLzmNStMGwbOUbykx51/29Z3JOGYldaaNGK7ngNXV+UcoqvIMmloZ48Sr74sd+g==" + "version": "0.13.5", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", + "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==" } } }, "gatsby-page-utils": { - "version": "0.0.41", - "resolved": "https://registry.npmjs.org/gatsby-page-utils/-/gatsby-page-utils-0.0.41.tgz", - "integrity": "sha512-Nu9kSxwRpNSMvUFsu34qD5BA1w94FkkEZc1I5RaiUwHrdE1Ga6mMSJ8Ob+4Yb3pI50eRHvYdtUtfLJW6s8XMQg==", + "version": "0.0.44", + "resolved": "https://registry.npmjs.org/gatsby-page-utils/-/gatsby-page-utils-0.0.44.tgz", + "integrity": "sha512-6N6+nptFpiFsjmOmPF7T/go9Hcd+5vhkhmArx5yRsJOv8kDs6LBOLh/d+mxRqT0Y3iQoXjUP5loy6li4syn4Hw==", "requires": { "@babel/runtime": "^7.7.6", "bluebird": "^3.7.2", "chokidar": "3.3.0", "fs-exists-cached": "^1.0.0", - "gatsby-core-utils": "^1.0.30", + "gatsby-core-utils": "^1.0.33", "glob": "^7.1.6", "lodash": "^4.17.15", "micromatch": "^3.1.10" @@ -9452,9 +9881,9 @@ "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" }, "gatsby-core-utils": { - "version": "1.0.30", - "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.0.30.tgz", - "integrity": "sha512-+WYFxf9dT4u67vecXdROe9iF2jzPKoTVbWI3FYLCcNANY2Y/vEec11vhG5FnBHdLpgmD3cnLPdhCAileKWBldA==", + "version": "1.0.33", + "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.0.33.tgz", + "integrity": "sha512-eQkOQumfbMLdbKJN0E1dlnBjAKWAzexxuNdpL88yCIaqHGOMogGTmAmhG1Hs0sz9bMrNPxuIgEyDNQe3IDfJXw==", "requires": { "ci-info": "2.0.0", "configstore": "^5.0.0", @@ -9462,9 +9891,9 @@ } }, "regenerator-runtime": { - "version": "0.13.4", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.4.tgz", - "integrity": "sha512-plpwicqEzfEyTQohIKktWigcLzmNStMGwbOUbykx51/29Z3JOGYldaaNGK7ngNXV+UcoqvIMmloZ48Sr74sd+g==" + "version": "0.13.5", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", + "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==" } } }, @@ -9587,14 +10016,14 @@ } }, "gatsby-plugin-page-creator": { - "version": "2.1.42", - "resolved": "https://registry.npmjs.org/gatsby-plugin-page-creator/-/gatsby-plugin-page-creator-2.1.42.tgz", - "integrity": "sha512-pes5AXpm1ulmhe7UOUtfRAD9/5QTnNVP1edZQFW9jCvy/7Du29lthhsP1ptBWORkdu+1UDbBvQJh+W+9mBPkKQ==", + "version": "2.1.45", + "resolved": "https://registry.npmjs.org/gatsby-plugin-page-creator/-/gatsby-plugin-page-creator-2.1.45.tgz", + "integrity": "sha512-mW5qfJ2C6U522wx63fZRTN2jCKG9FC/jkEmq4B0z5J/SOA9zPAlVvowjQAAW0+oGbEqwfIveSM+hIPwv1J7npA==", "requires": { "@babel/runtime": "^7.7.6", "bluebird": "^3.7.2", "fs-exists-cached": "^1.0.0", - "gatsby-page-utils": "^0.0.41", + "gatsby-page-utils": "^0.0.44", "glob": "^7.1.6", "lodash": "^4.17.15", "micromatch": "^3.1.10" @@ -9614,9 +10043,9 @@ "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" }, "regenerator-runtime": { - "version": "0.13.4", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.4.tgz", - "integrity": "sha512-plpwicqEzfEyTQohIKktWigcLzmNStMGwbOUbykx51/29Z3JOGYldaaNGK7ngNXV+UcoqvIMmloZ48Sr74sd+g==" + "version": "0.13.5", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", + "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==" } } }, @@ -9690,9 +10119,9 @@ } }, "regenerator-runtime": { - "version": "0.13.4", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.4.tgz", - "integrity": "sha512-plpwicqEzfEyTQohIKktWigcLzmNStMGwbOUbykx51/29Z3JOGYldaaNGK7ngNXV+UcoqvIMmloZ48Sr74sd+g==" + "version": "0.13.5", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", + "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==" }, "warning": { "version": "3.0.0", @@ -10005,9 +10434,9 @@ } }, "gatsby-telemetry": { - "version": "1.1.51", - "resolved": "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-1.1.51.tgz", - "integrity": "sha512-34SvdYWn/nJTYMiof9rAgvlcYqpzDbadfF1egMR3Kv+7dTBN5UVkeGfjUixsaD+sg6PVA+06CC5TMz8WQXCBWA==", + "version": "1.1.55", + "resolved": "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-1.1.55.tgz", + "integrity": "sha512-6J0y+WaXLV9iMJnT8XZgK4GeFlN0pY17LHqfYhDHaTteAZTOsCgh28yJPXkKQEN+M2ahmKkq4buD1xSveT5r7A==", "requires": { "@babel/code-frame": "^7.5.5", "@babel/runtime": "^7.7.6", @@ -10016,7 +10445,7 @@ "configstore": "^5.0.0", "envinfo": "^7.5.0", "fs-extra": "^8.1.0", - "gatsby-core-utils": "^1.0.30", + "gatsby-core-utils": "^1.0.33", "git-up": "4.0.1", "is-docker": "2.0.0", "lodash": "^4.17.15", @@ -10042,9 +10471,9 @@ "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" }, "gatsby-core-utils": { - "version": "1.0.30", - "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.0.30.tgz", - "integrity": "sha512-+WYFxf9dT4u67vecXdROe9iF2jzPKoTVbWI3FYLCcNANY2Y/vEec11vhG5FnBHdLpgmD3cnLPdhCAileKWBldA==", + "version": "1.0.33", + "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.0.33.tgz", + "integrity": "sha512-eQkOQumfbMLdbKJN0E1dlnBjAKWAzexxuNdpL88yCIaqHGOMogGTmAmhG1Hs0sz9bMrNPxuIgEyDNQe3IDfJXw==", "requires": { "ci-info": "2.0.0", "configstore": "^5.0.0", @@ -10057,9 +10486,9 @@ "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==" }, "regenerator-runtime": { - "version": "0.13.4", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.4.tgz", - "integrity": "sha512-plpwicqEzfEyTQohIKktWigcLzmNStMGwbOUbykx51/29Z3JOGYldaaNGK7ngNXV+UcoqvIMmloZ48Sr74sd+g==" + "version": "0.13.5", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", + "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==" }, "source-map": { "version": "0.7.3", @@ -10507,25 +10936,21 @@ } }, "global-modules": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz", - "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz", + "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==", "requires": { - "global-prefix": "^1.0.1", - "is-windows": "^1.0.1", - "resolve-dir": "^1.0.0" + "global-prefix": "^3.0.0" } }, "global-prefix": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz", - "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz", + "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==", "requires": { - "expand-tilde": "^2.0.2", - "homedir-polyfill": "^1.0.1", - "ini": "^1.3.4", - "is-windows": "^1.0.1", - "which": "^1.2.14" + "ini": "^1.3.5", + "kind-of": "^6.0.2", + "which": "^1.3.1" } }, "globals": { @@ -10534,88 +10959,23 @@ "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==" }, "globby": { - "version": "10.0.2", - "resolved": "https://registry.npmjs.org/globby/-/globby-10.0.2.tgz", - "integrity": "sha512-7dUi7RvCoT/xast/o/dLN53oqND4yk0nsHkhRgn9w65C4PofCLOoJ39iSOg+qVDdWQPIEj+eszMHQ+aLVwwQSg==", - "requires": { - "@types/glob": "^7.1.1", - "array-union": "^2.1.0", - "dir-glob": "^3.0.1", - "fast-glob": "^3.0.3", - "glob": "^7.1.3", - "ignore": "^5.1.1", - "merge2": "^1.2.3", - "slash": "^3.0.0" + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/globby/-/globby-8.0.2.tgz", + "integrity": "sha512-yTzMmKygLp8RUpG1Ymu2VXPSJQZjNAZPD4ywgYEaG7e4tBJeUQBO8OpXrf1RCNcEs5alsoJYPAMiIHP0cmeC7w==", + "requires": { + "array-union": "^1.0.1", + "dir-glob": "2.0.0", + "fast-glob": "^2.0.2", + "glob": "^7.1.2", + "ignore": "^3.3.5", + "pify": "^3.0.0", + "slash": "^1.0.0" }, "dependencies": { - "@nodelib/fs.stat": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz", - "integrity": "sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==" - }, - "braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", - "requires": { - "fill-range": "^7.0.1" - } - }, - "fast-glob": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.2.tgz", - "integrity": "sha512-UDV82o4uQyljznxwMxyVRJgZZt3O5wENYojjzbaGEGZgeOxkLFf+V4cnUD+krzb2F72E18RhamkMZ7AdeggF7A==", - "requires": { - "@nodelib/fs.stat": "^2.0.2", - "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.0", - "merge2": "^1.3.0", - "micromatch": "^4.0.2", - "picomatch": "^2.2.1" - } - }, - "fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", - "requires": { - "to-regex-range": "^5.0.1" - } - }, - "glob-parent": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz", - "integrity": "sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==", - "requires": { - "is-glob": "^4.0.1" - } - }, - "is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==" - }, - "micromatch": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz", - "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==", - "requires": { - "braces": "^3.0.1", - "picomatch": "^2.0.5" - } - }, - "picomatch": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.1.tgz", - "integrity": "sha512-ISBaA8xQNmwELC7eOjqFKMESB2VIqt4PPDD0nsS95b/9dZXvVKOlz9keMSnoGGKcOHXfTvDD6WMaRoSc9UuhRA==" - }, - "to-regex-range": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "requires": { - "is-number": "^7.0.0" - } + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" } } }, @@ -10827,11 +11187,12 @@ "integrity": "sha512-zGEOVKFM5sVPPrYs7J5/hYEw2Pof8KCyOwyhG8sAF26mCAeUFAcYPu1mwB7hhpIP29zOIBaDqwuHdLp0jvZXjw==" }, "gzip-size": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-3.0.0.tgz", - "integrity": "sha1-VGGI6b3DN/Zzdy+BZgRks4nc5SA=", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-5.1.1.tgz", + "integrity": "sha512-FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA==", "requires": { - "duplexer": "^0.1.1" + "duplexer": "^0.1.1", + "pify": "^4.0.1" } }, "handle-thing": { @@ -11388,9 +11749,9 @@ "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=" }, "ignore": { - "version": "5.1.4", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.4.tgz", - "integrity": "sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A==" + "version": "3.3.10", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz", + "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==" }, "image-size": { "version": "0.5.5", @@ -11398,6 +11759,11 @@ "integrity": "sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=", "optional": true }, + "immer": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/immer/-/immer-1.10.0.tgz", + "integrity": "sha512-O3sR1/opvCDGLEVcvrGTMtLac8GJ5IwZC4puPrLuRj3l7ICKvkmA0vGuU9OW8mV9WIBRnaxp5GJh9IEAaNOoYg==" + }, "import-cwd": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz", @@ -11532,6 +11898,12 @@ "color-convert": "^2.0.1" } }, + "arrify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz", + "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==", + "optional": true + }, "astral-regex": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", @@ -11548,6 +11920,15 @@ "supports-color": "^7.1.0" } }, + "cli-cursor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", + "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", + "optional": true, + "requires": { + "restore-cursor": "^3.1.0" + } + }, "color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", @@ -11581,6 +11962,31 @@ "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", "optional": true }, + "mimic-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "optional": true + }, + "onetime": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz", + "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==", + "optional": true, + "requires": { + "mimic-fn": "^2.1.0" + } + }, + "restore-cursor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", + "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", + "optional": true, + "requires": { + "onetime": "^5.1.0", + "signal-exit": "^3.0.2" + } + }, "slice-ansi": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz", @@ -11665,114 +12071,37 @@ } }, "inquirer": { - "version": "7.0.6", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.0.6.tgz", - "integrity": "sha512-7SVO4h+QIdMq6XcqIqrNte3gS5MzCCKZdsq9DO4PJziBFNYzP3PGFbDjgadDb//MCahzgjCxvQ/O2wa7kx9o4w==", + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.0.tgz", + "integrity": "sha512-scfHejeG/lVZSpvCXpsB4j/wQNPM5JC8kiElOI0OUTwmc1RTpXr4H32/HOlQHcZiYl2z2VElwuCVDRG8vFmbnA==", "requires": { - "ansi-escapes": "^4.2.1", - "chalk": "^3.0.0", - "cli-cursor": "^3.1.0", + "ansi-escapes": "^3.2.0", + "chalk": "^2.4.2", + "cli-cursor": "^2.1.0", "cli-width": "^2.0.0", "external-editor": "^3.0.3", - "figures": "^3.0.0", - "lodash": "^4.17.15", - "mute-stream": "0.0.8", - "run-async": "^2.4.0", - "rxjs": "^6.5.3", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0", + "figures": "^2.0.0", + "lodash": "^4.17.12", + "mute-stream": "0.0.7", + "run-async": "^2.2.0", + "rxjs": "^6.4.0", + "string-width": "^2.1.0", + "strip-ansi": "^5.1.0", "through": "^2.3.6" }, "dependencies": { - "ansi-escapes": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz", - "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==", - "requires": { - "type-fest": "^0.11.0" - } - }, "ansi-regex": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==" - }, - "ansi-styles": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", - "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", - "requires": { - "@types/color-name": "^1.1.1", - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", - "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" - }, - "emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" - }, - "is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" - }, - "string-width": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", - "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", - "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" - } + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==" }, "strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", - "requires": { - "ansi-regex": "^5.0.0" - } - }, - "supports-color": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", - "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", "requires": { - "has-flag": "^4.0.0" + "ansi-regex": "^4.1.0" } - }, - "type-fest": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz", - "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==" } } }, @@ -12271,9 +12600,9 @@ "integrity": "sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==" }, "is-root": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-root/-/is-root-1.0.0.tgz", - "integrity": "sha1-B7bCM7w5TNnQK6FclmvWZg1jQtU=" + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-root/-/is-root-2.1.0.tgz", + "integrity": "sha512-AGOriNp96vNBd3HtU+RzFEc75FfR5ymiYv8E553I71SCeXBiMsVDUtdio1OEFvrPyLIQ9tVR5RxXIFe5PUFjMg==" }, "is-ssh": { "version": "1.3.1", @@ -13006,6 +13335,11 @@ "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=" }, + "lodash.debounce": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", + "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=" + }, "lodash.deburr": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/lodash.deburr/-/lodash.deburr-4.1.0.tgz", @@ -13126,42 +13460,6 @@ "ansi-escapes": "^3.2.0", "cli-cursor": "^2.1.0", "wrap-ansi": "^5.0.0" - }, - "dependencies": { - "cli-cursor": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz", - "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=", - "optional": true, - "requires": { - "restore-cursor": "^2.0.0" - } - }, - "mimic-fn": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz", - "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==", - "optional": true - }, - "onetime": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz", - "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=", - "optional": true, - "requires": { - "mimic-fn": "^1.0.0" - } - }, - "restore-cursor": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz", - "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=", - "optional": true, - "requires": { - "onetime": "^2.0.0", - "signal-exit": "^3.0.2" - } - } } }, "loglevel": { @@ -13446,6 +13744,13 @@ "map-age-cleaner": "^0.1.1", "mimic-fn": "^2.0.0", "p-is-promise": "^2.0.0" + }, + "dependencies": { + "mimic-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==" + } } }, "memory-fs": { @@ -13525,6 +13830,11 @@ "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=" }, + "microevent.ts": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/microevent.ts/-/microevent.ts-0.1.1.tgz", + "integrity": "sha512-jo1OfR4TaEwd5HOrt5+tAZ9mqT4jmpNAusXtyfNzqVm9uiSYFZlKM1wYL4oU7azZW/PxQW53wM0S6OR1JHNa2g==" + }, "micromatch": { "version": "3.1.10", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", @@ -13573,9 +13883,9 @@ } }, "mimic-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==" + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz", + "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==" }, "mimic-response": { "version": "1.0.1", @@ -13818,9 +14128,9 @@ "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=" }, "mute-stream": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", - "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==" + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz", + "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=" }, "name-all-modules-plugin": { "version": "1.0.1", @@ -13974,9 +14284,9 @@ "integrity": "sha512-VZR0zroAusy1ETZMZiGeLkdu50LGjG5U1KHZqTruqtTyQ2wfWhHG2Ow4nsUbfTFGlaREgNHcCWoM/OzEm6p+NQ==" }, "node-releases": { - "version": "1.1.50", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.50.tgz", - "integrity": "sha512-lgAmPv9eYZ0bGwUYAKlr8MG6K4CvWliWqnkcT2P8mMAgVrH3lqfBPorFlxiG1pHQnqmavJZ9vbMXUTNyMLbrgQ==", + "version": "1.1.52", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.52.tgz", + "integrity": "sha512-snSiT1UypkgGt2wxPqS6ImEUICbNCMb31yaxWrOLXjhlt2z2/IBpaOxzONExqSm4y5oLnAqjjRWu+wsDzK5yNQ==", "requires": { "semver": "^6.3.0" }, @@ -14361,11 +14671,11 @@ } }, "onetime": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz", - "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz", + "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=", "requires": { - "mimic-fn": "^2.1.0" + "mimic-fn": "^1.0.0" } }, "open": { @@ -14887,6 +15197,54 @@ "find-up": "^3.0.0" } }, + "pkg-up": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-2.0.0.tgz", + "integrity": "sha1-yBmscoBZpGHKscOImivjxJoATX8=", + "requires": { + "find-up": "^2.1.0" + }, + "dependencies": { + "find-up": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", + "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", + "requires": { + "locate-path": "^2.0.0" + } + }, + "locate-path": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", + "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", + "requires": { + "p-locate": "^2.0.0", + "path-exists": "^3.0.0" + } + }, + "p-limit": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", + "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", + "requires": { + "p-try": "^1.0.0" + } + }, + "p-locate": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", + "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", + "requires": { + "p-limit": "^1.1.0" + } + }, + "p-try": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", + "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=" + } + } + }, "pnp-webpack-plugin": { "version": "1.6.4", "resolved": "https://registry.npmjs.org/pnp-webpack-plugin/-/pnp-webpack-plugin-1.6.4.tgz", @@ -14975,21 +15333,6 @@ "postcss-value-parser": "^3.0.0" }, "dependencies": { - "browserslist": { - "version": "4.9.1", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.9.1.tgz", - "integrity": "sha512-Q0DnKq20End3raFulq6Vfp1ecB9fh8yUNV55s8sekaDDeqBaCtWlRHCUdaWyUeSSBJM7IbM6HcsyaeYqgeDhnw==", - "requires": { - "caniuse-lite": "^1.0.30001030", - "electron-to-chromium": "^1.3.363", - "node-releases": "^1.1.50" - } - }, - "electron-to-chromium": { - "version": "1.3.372", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.372.tgz", - "integrity": "sha512-77a4jYC52OdisHM+Tne7dgWEvQT1FoNu/jYl279pP88ZtG4ZRIPyhQwAKxj6C2rzsyC1OwsOds9JlZtNncSz6g==" - }, "postcss-value-parser": { "version": "3.3.1", "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", @@ -15116,21 +15459,6 @@ "vendors": "^1.0.0" }, "dependencies": { - "browserslist": { - "version": "4.9.1", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.9.1.tgz", - "integrity": "sha512-Q0DnKq20End3raFulq6Vfp1ecB9fh8yUNV55s8sekaDDeqBaCtWlRHCUdaWyUeSSBJM7IbM6HcsyaeYqgeDhnw==", - "requires": { - "caniuse-lite": "^1.0.30001030", - "electron-to-chromium": "^1.3.363", - "node-releases": "^1.1.50" - } - }, - "electron-to-chromium": { - "version": "1.3.372", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.372.tgz", - "integrity": "sha512-77a4jYC52OdisHM+Tne7dgWEvQT1FoNu/jYl279pP88ZtG4ZRIPyhQwAKxj6C2rzsyC1OwsOds9JlZtNncSz6g==" - }, "postcss-selector-parser": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz", @@ -15190,21 +15518,6 @@ "uniqs": "^2.0.0" }, "dependencies": { - "browserslist": { - "version": "4.9.1", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.9.1.tgz", - "integrity": "sha512-Q0DnKq20End3raFulq6Vfp1ecB9fh8yUNV55s8sekaDDeqBaCtWlRHCUdaWyUeSSBJM7IbM6HcsyaeYqgeDhnw==", - "requires": { - "caniuse-lite": "^1.0.30001030", - "electron-to-chromium": "^1.3.363", - "node-releases": "^1.1.50" - } - }, - "electron-to-chromium": { - "version": "1.3.372", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.372.tgz", - "integrity": "sha512-77a4jYC52OdisHM+Tne7dgWEvQT1FoNu/jYl279pP88ZtG4ZRIPyhQwAKxj6C2rzsyC1OwsOds9JlZtNncSz6g==" - }, "postcss-value-parser": { "version": "3.3.1", "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", @@ -15443,21 +15756,6 @@ "postcss-value-parser": "^3.0.0" }, "dependencies": { - "browserslist": { - "version": "4.9.1", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.9.1.tgz", - "integrity": "sha512-Q0DnKq20End3raFulq6Vfp1ecB9fh8yUNV55s8sekaDDeqBaCtWlRHCUdaWyUeSSBJM7IbM6HcsyaeYqgeDhnw==", - "requires": { - "caniuse-lite": "^1.0.30001030", - "electron-to-chromium": "^1.3.363", - "node-releases": "^1.1.50" - } - }, - "electron-to-chromium": { - "version": "1.3.372", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.372.tgz", - "integrity": "sha512-77a4jYC52OdisHM+Tne7dgWEvQT1FoNu/jYl279pP88ZtG4ZRIPyhQwAKxj6C2rzsyC1OwsOds9JlZtNncSz6g==" - }, "postcss-value-parser": { "version": "3.3.1", "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", @@ -15530,23 +15828,6 @@ "caniuse-api": "^3.0.0", "has": "^1.0.0", "postcss": "^7.0.0" - }, - "dependencies": { - "browserslist": { - "version": "4.9.1", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.9.1.tgz", - "integrity": "sha512-Q0DnKq20End3raFulq6Vfp1ecB9fh8yUNV55s8sekaDDeqBaCtWlRHCUdaWyUeSSBJM7IbM6HcsyaeYqgeDhnw==", - "requires": { - "caniuse-lite": "^1.0.30001030", - "electron-to-chromium": "^1.3.363", - "node-releases": "^1.1.50" - } - }, - "electron-to-chromium": { - "version": "1.3.372", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.372.tgz", - "integrity": "sha512-77a4jYC52OdisHM+Tne7dgWEvQT1FoNu/jYl279pP88ZtG4ZRIPyhQwAKxj6C2rzsyC1OwsOds9JlZtNncSz6g==" - } } }, "postcss-reduce-transforms": { @@ -16008,14 +16289,6 @@ "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz", "integrity": "sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I=" }, - "cli-cursor": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz", - "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=", - "requires": { - "restore-cursor": "^2.0.0" - } - }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -16039,8 +16312,16 @@ "resolved": "https://registry.npmjs.org/detect-port-alt/-/detect-port-alt-1.1.3.tgz", "integrity": "sha1-pNLwYddXoDTs83xRQmCph1DysTE=", "requires": { - "address": "^1.0.1", - "debug": "^2.6.0" + "address": "^1.0.1", + "debug": "^2.6.0" + } + }, + "eventsource": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-0.1.6.tgz", + "integrity": "sha1-Cs7ehJ7X3RzMMsgRuxG5RNTykjI=", + "requires": { + "original": ">=0.0.5" } }, "external-editor": { @@ -16053,12 +16334,39 @@ "tmp": "^0.0.33" } }, - "figures": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz", - "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=", + "filesize": { + "version": "3.5.11", + "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.5.11.tgz", + "integrity": "sha512-ZH7loueKBoDb7yG9esn1U+fgq7BzlzW6NRi5/rMdxIZ05dj7GFD/Xc5rq2CDt5Yq86CyfSYVyx4242QQNZbx1g==" + }, + "global-modules": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz", + "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==", "requires": { - "escape-string-regexp": "^1.0.5" + "global-prefix": "^1.0.1", + "is-windows": "^1.0.1", + "resolve-dir": "^1.0.0" + } + }, + "global-prefix": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz", + "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=", + "requires": { + "expand-tilde": "^2.0.2", + "homedir-polyfill": "^1.0.1", + "ini": "^1.3.4", + "is-windows": "^1.0.1", + "which": "^1.2.14" + } + }, + "gzip-size": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-3.0.0.tgz", + "integrity": "sha1-VGGI6b3DN/Zzdy+BZgRks4nc5SA=", + "requires": { + "duplexer": "^0.1.1" } }, "inquirer": { @@ -16118,6 +16426,11 @@ } } }, + "is-root": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-root/-/is-root-1.0.0.tgz", + "integrity": "sha1-B7bCM7w5TNnQK6FclmvWZg1jQtU=" + }, "lru-cache": { "version": "4.1.5", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", @@ -16127,36 +16440,49 @@ "yallist": "^2.1.2" } }, - "mimic-fn": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz", - "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==" + "minimatch": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz", + "integrity": "sha1-Kk5AkLlrLbBqnX3wEFWmKnfJt3Q=", + "requires": { + "brace-expansion": "^1.0.0" + } }, "ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" }, - "mute-stream": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz", - "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=" + "recursive-readdir": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.1.tgz", + "integrity": "sha1-kO8jHQd4xc4JPJpI105cVCLROpk=", + "requires": { + "minimatch": "3.0.3" + } }, - "onetime": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz", - "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=", + "shell-quote": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.6.1.tgz", + "integrity": "sha1-9HgZSczkAmlxJ0MOo7PFR29IF2c=", "requires": { - "mimic-fn": "^1.0.0" + "array-filter": "~0.0.0", + "array-map": "~0.0.0", + "array-reduce": "~0.0.0", + "jsonify": "~0.0.0" } }, - "restore-cursor": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz", - "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=", + "sockjs-client": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.1.4.tgz", + "integrity": "sha1-W6vjhrd15M8U51IJEUUmVAFsixI=", "requires": { - "onetime": "^2.0.0", - "signal-exit": "^3.0.2" + "debug": "^2.6.6", + "eventsource": "0.1.6", + "faye-websocket": "~0.11.0", + "inherits": "^2.0.1", + "json3": "^3.3.2", + "url-parse": "^1.1.8" } }, "supports-color": { @@ -16210,9 +16536,9 @@ } }, "react-hot-loader": { - "version": "4.12.19", - "resolved": "https://registry.npmjs.org/react-hot-loader/-/react-hot-loader-4.12.19.tgz", - "integrity": "sha512-p8AnA4QE2GtrvkdmqnKrEiijtVlqdTIDCHZOwItkI9kW51bt5XnQ/4Anz8giiWf9kqBpEQwsmnChDCAFBRyR/Q==", + "version": "4.12.20", + "resolved": "https://registry.npmjs.org/react-hot-loader/-/react-hot-loader-4.12.20.tgz", + "integrity": "sha512-lPlv1HVizi0lsi+UFACBJaydtRYILWkfHAC/lyCs6ZlAxlOZRQIfYHDqiGaRvL/GF7zyti+Qn9XpnDAUvdFA4A==", "requires": { "fast-levenshtein": "^2.0.6", "global": "^4.3.0", @@ -16253,6 +16579,11 @@ "scheduler": "^0.18.0" } }, + "react-refresh": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.7.2.tgz", + "integrity": "sha512-u5l7fhAJXecWUJzVxzMRU2Zvw8m4QmDNHlTrT5uo3KBlYBhmChd7syAakBoay1yIiVhx/8Fi7a6v6kQZfsw81Q==" + }, "react-side-effect": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/react-side-effect/-/react-side-effect-1.2.0.tgz", @@ -16425,21 +16756,11 @@ } }, "recursive-readdir": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.1.tgz", - "integrity": "sha1-kO8jHQd4xc4JPJpI105cVCLROpk=", + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz", + "integrity": "sha512-nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg==", "requires": { - "minimatch": "3.0.3" - }, - "dependencies": { - "minimatch": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz", - "integrity": "sha1-Kk5AkLlrLbBqnX3wEFWmKnfJt3Q=", - "requires": { - "brace-expansion": "^1.0.0" - } - } + "minimatch": "3.0.4" } }, "redux": { @@ -17096,6 +17417,30 @@ "requires": { "expand-tilde": "^2.0.0", "global-modules": "^1.0.0" + }, + "dependencies": { + "global-modules": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz", + "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==", + "requires": { + "global-prefix": "^1.0.1", + "is-windows": "^1.0.1", + "resolve-dir": "^1.0.0" + } + }, + "global-prefix": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz", + "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=", + "requires": { + "expand-tilde": "^2.0.2", + "homedir-polyfill": "^1.0.1", + "ini": "^1.3.4", + "is-windows": "^1.0.1", + "which": "^1.2.14" + } + } } }, "resolve-from": { @@ -17117,11 +17462,11 @@ } }, "restore-cursor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", - "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz", + "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=", "requires": { - "onetime": "^5.1.0", + "onetime": "^2.0.0", "signal-exit": "^3.0.2" } }, @@ -17446,9 +17791,9 @@ "integrity": "sha512-PLSp6f5XdhvjCCCO8OjavRfzkSGL3Qmdm7P82bxyU8HDDDBhDV3UckRaYcRa/NDNTYt8YBpzjoLWHUAejmOjLg==" }, "scroll-behavior": { - "version": "0.9.11", - "resolved": "https://registry.npmjs.org/scroll-behavior/-/scroll-behavior-0.9.11.tgz", - "integrity": "sha512-Eo32cg2uFiQwEiJXHHoTfXLybTlyA1O3ZOIiTz8EqRWie+ExL+7l8PcejhKT+5QmRtykXSlsTRVDC3BVB3S/bg==", + "version": "0.9.12", + "resolved": "https://registry.npmjs.org/scroll-behavior/-/scroll-behavior-0.9.12.tgz", + "integrity": "sha512-18sirtyq1P/VsBX6O/vgw20Np+ngduFXEMO4/NDFXabdOKBL2kjPVUpz1y0+jm99EWwFJafxf5/tCyMeXt9Xyg==", "requires": { "dom-helpers": "^3.4.0", "invariant": "^2.2.4" @@ -17722,15 +18067,9 @@ "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=" }, "shell-quote": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.6.1.tgz", - "integrity": "sha1-9HgZSczkAmlxJ0MOo7PFR29IF2c=", - "requires": { - "array-filter": "~0.0.0", - "array-map": "~0.0.0", - "array-reduce": "~0.0.0", - "jsonify": "~0.0.0" - } + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.2.tgz", + "integrity": "sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg==" }, "side-channel": { "version": "1.0.2", @@ -17846,9 +18185,9 @@ "integrity": "sha512-/ekMoM4NJ59ivGSfKapeG+FWtrmWvA1p6FBZwXrqojw90vJu8lBmrTxCMuBCydKtkaUe2zt4PlxeTKpjwMbyig==" }, "slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==" + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz", + "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=" }, "slice-ansi": { "version": "2.1.0", @@ -18127,31 +18466,16 @@ } }, "sockjs-client": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.1.4.tgz", - "integrity": "sha1-W6vjhrd15M8U51IJEUUmVAFsixI=", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.4.0.tgz", + "integrity": "sha512-5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g==", "requires": { - "debug": "^2.6.6", - "eventsource": "0.1.6", - "faye-websocket": "~0.11.0", - "inherits": "^2.0.1", + "debug": "^3.2.5", + "eventsource": "^1.0.7", + "faye-websocket": "~0.11.1", + "inherits": "^2.0.3", "json3": "^3.3.2", - "url-parse": "^1.1.8" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" - } + "url-parse": "^1.4.3" } }, "sort-keys": { @@ -18780,21 +19104,6 @@ "postcss-selector-parser": "^3.0.0" }, "dependencies": { - "browserslist": { - "version": "4.9.1", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.9.1.tgz", - "integrity": "sha512-Q0DnKq20End3raFulq6Vfp1ecB9fh8yUNV55s8sekaDDeqBaCtWlRHCUdaWyUeSSBJM7IbM6HcsyaeYqgeDhnw==", - "requires": { - "caniuse-lite": "^1.0.30001030", - "electron-to-chromium": "^1.3.363", - "node-releases": "^1.1.50" - } - }, - "electron-to-chromium": { - "version": "1.3.372", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.372.tgz", - "integrity": "sha512-77a4jYC52OdisHM+Tne7dgWEvQT1FoNu/jYl279pP88ZtG4ZRIPyhQwAKxj6C2rzsyC1OwsOds9JlZtNncSz6g==" - }, "postcss-selector-parser": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz", @@ -20091,9 +20400,9 @@ }, "dependencies": { "acorn": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.0.tgz", - "integrity": "sha512-gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw==" + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz", + "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==" }, "eslint-scope": { "version": "4.0.3", @@ -20168,14 +20477,6 @@ "yargs": "12.0.5" }, "dependencies": { - "array-union": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", - "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", - "requires": { - "array-uniq": "^1.0.1" - } - }, "chokidar": { "version": "2.1.8", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz", @@ -20237,14 +20538,6 @@ "rimraf": "^2.6.3" } }, - "eventsource": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz", - "integrity": "sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==", - "requires": { - "original": "^1.0.0" - } - }, "get-caller-file": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz", @@ -20328,29 +20621,6 @@ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" }, - "sockjs-client": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.4.0.tgz", - "integrity": "sha512-5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g==", - "requires": { - "debug": "^3.2.5", - "eventsource": "^1.0.7", - "faye-websocket": "~0.11.1", - "inherits": "^2.0.3", - "json3": "^3.3.2", - "url-parse": "^1.4.3" - }, - "dependencies": { - "debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", - "requires": { - "ms": "^2.1.1" - } - } - } - }, "supports-color": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", @@ -20566,6 +20836,14 @@ "errno": "~0.1.7" } }, + "worker-rpc": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/worker-rpc/-/worker-rpc-0.1.1.tgz", + "integrity": "sha512-P1WjMrUB3qgJNI9jfmpZ/htmBEjFh//6l/5y8SD9hg1Ef5zTTVVoRjTrTEzPrNBQvmhMxkoTsjOXN10GWU7aCg==", + "requires": { + "microevent.ts": "~0.1.1" + } + }, "wrap-ansi": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", @@ -20626,9 +20904,9 @@ } }, "ws": { - "version": "7.2.1", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.2.1.tgz", - "integrity": "sha512-sucePNSafamSKoOqoNfBd8V0StlkzJKL2ZAhGQinCfNQ+oacw+Pk7lcdAElecBF2VkLNZRiIb5Oi1Q5lVUVt2A==" + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.2.3.tgz", + "integrity": "sha512-HTDl9G9hbkNDk98naoR/cHDws7+EyYMOdL1BmjsZXRUjf7d+MficC4B7HLUPlSiho0vg+CWKrGIt/VJBd1xunQ==" }, "x-is-string": { "version": "0.1.0", @@ -20690,9 +20968,9 @@ } }, "yargs": { - "version": "13.3.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz", - "integrity": "sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==", + "version": "13.3.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz", + "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==", "requires": { "cliui": "^5.0.0", "find-up": "^3.0.0", @@ -20703,7 +20981,7 @@ "string-width": "^3.0.0", "which-module": "^2.0.0", "y18n": "^4.0.0", - "yargs-parser": "^13.1.1" + "yargs-parser": "^13.1.2" }, "dependencies": { "ansi-regex": { @@ -20732,9 +21010,9 @@ } }, "yargs-parser": { - "version": "13.1.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz", - "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==", + "version": "13.1.2", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz", + "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==", "requires": { "camelcase": "^5.0.0", "decamelize": "^1.2.0" @@ -20785,10 +21063,48 @@ "strip-bom": "^4.0.0" }, "dependencies": { + "ansi-escapes": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz", + "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==", + "requires": { + "type-fest": "^0.11.0" + } + }, "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==" + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==" + }, + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "cli-cursor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", + "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", + "requires": { + "restore-cursor": "^3.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, "debug": { "version": "4.1.1", @@ -20798,23 +21114,152 @@ "ms": "^2.1.1" } }, + "emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" + }, + "figures": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz", + "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==", + "requires": { + "escape-string-regexp": "^1.0.5" + } + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" + }, + "inquirer": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.1.0.tgz", + "integrity": "sha512-5fJMWEmikSYu0nv/flMc475MhGbB7TSPd/2IpFV4I4rMklboCH2rQjYY5kKiYGHqUF9gvaambupcJFFG9dvReg==", + "requires": { + "ansi-escapes": "^4.2.1", + "chalk": "^3.0.0", + "cli-cursor": "^3.1.0", + "cli-width": "^2.0.0", + "external-editor": "^3.0.3", + "figures": "^3.0.0", + "lodash": "^4.17.15", + "mute-stream": "0.0.8", + "run-async": "^2.4.0", + "rxjs": "^6.5.3", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0", + "through": "^2.3.6" + }, + "dependencies": { + "chalk": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "requires": { + "ansi-regex": "^5.0.0" + } + } + } + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" + }, + "mimic-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==" + }, + "mute-stream": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", + "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==" + }, + "onetime": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz", + "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==", + "requires": { + "mimic-fn": "^2.1.0" + } + }, + "restore-cursor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", + "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", + "requires": { + "onetime": "^5.1.0", + "signal-exit": "^3.0.2" + } + }, "semver": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" }, + "string-width": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", + "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" + }, + "dependencies": { + "strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "requires": { + "ansi-regex": "^5.0.0" + } + } + } + }, "strip-ansi": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", "requires": { "ansi-regex": "^4.1.0" + }, + "dependencies": { + "ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==" + } } }, "strip-bom": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz", "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==" + }, + "supports-color": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "requires": { + "has-flag": "^4.0.0" + } + }, + "type-fest": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz", + "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==" } } }, diff --git a/docs/package.json b/docs/package.json index e486d4d90ba..8f25769430f 100644 --- a/docs/package.json +++ b/docs/package.json @@ -6,7 +6,7 @@ "serve": "gatsby serve" }, "dependencies": { - "gatsby": "2.19.32", + "gatsby": "2.19.43", "gatsby-theme-apollo-docs": "4.0.14", "react": "16.13.0", "react-dom": "16.13.0" From c4baaec21aa406d2a130a76243ee5402d826bbf6 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 10 Mar 2020 16:20:08 +0200 Subject: [PATCH 277/642] Switch multi-argument `logger` pattern to single parameter invocations. Will consider supporting this if I can confirm all loggers support it. --- packages/apollo-gateway/src/index.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/apollo-gateway/src/index.ts b/packages/apollo-gateway/src/index.ts index e6cc0f211ab..0b37a0af12b 100644 --- a/packages/apollo-gateway/src/index.ts +++ b/packages/apollo-gateway/src/index.ts @@ -346,7 +346,7 @@ export class ApolloGateway implements GraphQLService { } catch (e) { this.logger.error( "An error was thrown from an 'onSchemaChange' listener. " + - "The schema will still update: ", e); + "The schema will still update: " + (e && e.message || e)); } if (this.experimental_didUpdateComposition) { @@ -588,7 +588,11 @@ export class ApolloGateway implements GraphQLService { // is returning a non-native `Promise` (e.g. Bluebird, etc.). Promise.resolve( this.queryPlanStore.set(queryPlanStoreKey, queryPlan), - ).catch(err => this.logger.warn('Could not store queryPlan', err)); + ).catch(err => + this.logger.warn( + 'Could not store queryPlan' + ((err && err.messsage) || err), + ), + ); } } From 8a19ecc72b940914d02cf4083bb69e3980e18433 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 10 Mar 2020 16:23:41 +0200 Subject: [PATCH 278/642] Decompose `GatewayConfigBase` into types in preparation for `logger`. The `logger` will be mutually exclusive to the `debug` property, which means we'll need to (essentially) XOR them in the types with `never` types, which cannot be done with an `interface`. --- packages/apollo-gateway/src/index.ts | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/packages/apollo-gateway/src/index.ts b/packages/apollo-gateway/src/index.ts index 0b37a0af12b..b5847805138 100644 --- a/packages/apollo-gateway/src/index.ts +++ b/packages/apollo-gateway/src/index.ts @@ -46,8 +46,9 @@ import { fetch } from 'apollo-server-env'; export type ServiceEndpointDefinition = Pick; -interface GatewayConfigBase { - debug?: boolean; +type LoggerConfig = { debug?: boolean; } + +type GatewayConfigBase = { // TODO: expose the query plan in a more flexible JSON format in the future // and remove this config option in favor of `exposeQueryPlan`. Playground // should cutover to use the new option when it's built. @@ -63,17 +64,17 @@ interface GatewayConfigBase { experimental_approximateQueryPlanStoreMiB?: number; experimental_autoFragmentization?: boolean; fetcher?: typeof fetch; -} +} & LoggerConfig; -interface RemoteGatewayConfig extends GatewayConfigBase { +type RemoteGatewayConfig = GatewayConfigBase & { serviceList: ServiceEndpointDefinition[]; introspectionHeaders?: HeadersInit; } -interface ManagedGatewayConfig extends GatewayConfigBase { +type ManagedGatewayConfig = GatewayConfigBase & { federationVersion?: number; } -interface LocalGatewayConfig extends GatewayConfigBase { +type LocalGatewayConfig = GatewayConfigBase & { localServiceList: ServiceDefinition[]; } From 780d7f4d204ae644ca2f0d6fd2d877e285afbde0 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 10 Mar 2020 16:25:06 +0200 Subject: [PATCH 279/642] gateway: Introduce `Logger` type and expose on `logger` config. This is a mutually exclusive option to `debug` which enables logging of our default logger when one is not provided by the user. --- packages/apollo-gateway/src/index.ts | 31 +++++++++++++++-------- packages/apollo-server-types/src/index.ts | 8 ++++++ 2 files changed, 29 insertions(+), 10 deletions(-) diff --git a/packages/apollo-gateway/src/index.ts b/packages/apollo-gateway/src/index.ts index b5847805138..788018beae4 100644 --- a/packages/apollo-gateway/src/index.ts +++ b/packages/apollo-gateway/src/index.ts @@ -7,6 +7,7 @@ import { import { GraphQLExecutionResult, GraphQLRequestContext, + Logger, WithRequired, } from 'apollo-server-types'; import { InMemoryLRUCache } from 'apollo-server-caching'; @@ -19,7 +20,7 @@ import { } from 'graphql'; import { GraphQLSchemaValidationError } from 'apollo-graphql'; import { composeAndValidate, ServiceDefinition } from '@apollo/federation'; -import loglevel, { Logger } from 'loglevel'; +import loglevel from 'loglevel'; import loglevelDebug from 'loglevel-debug'; import { buildQueryPlan, buildOperationContext } from './buildQueryPlan'; @@ -46,7 +47,10 @@ import { fetch } from 'apollo-server-env'; export type ServiceEndpointDefinition = Pick; -type LoggerConfig = { debug?: boolean; } +// debug and logger are mutually exclusive options. +type LoggerConfig = + | { debug?: boolean; logger?: never; } + | { debug?: never; logger?: Logger; } type GatewayConfigBase = { // TODO: expose the query plan in a more flexible JSON format in the future @@ -166,7 +170,7 @@ export class ApolloGateway implements GraphQLService { public schema?: GraphQLSchema; protected serviceMap: DataSourceCache = Object.create(null); protected config: GatewayConfig; - protected logger: Logger; + private logger: Logger; protected queryPlanStore?: InMemoryLRUCache; private engineConfig: GraphQLServiceEngineConfig | undefined; private pollingTimer?: NodeJS.Timer; @@ -214,15 +218,22 @@ export class ApolloGateway implements GraphQLService { ...config, }; - // Setup logging facilities, scoped under the appropriate name. - this.logger = loglevel.getLogger(`apollo-gateway:`); + // Setup logging facilities + if (this.config.logger) { + this.logger = this.config.logger; + } else { + // If the user didn't prvoide their own logger, we'll initialize one. + const loglevelLogger = loglevel.getLogger(`apollo-gateway:`); - // Support DEBUG environment variable, à la https://npm.im/debug/. - loglevelDebug(this.logger); + // Support DEBUG environment variable, à la https://npm.im/debug/. + loglevelDebug(loglevelLogger); - // And also support the `debug` option, if it's truthy. - if (this.config.debug === true) { - this.logger.enableAll(); + // And also support the `debug` option, if it's truthy. + if (this.config.debug === true) { + loglevelLogger.enableAll(); + } + + this.logger = loglevelLogger; } if (isLocalConfig(this.config)) { diff --git a/packages/apollo-server-types/src/index.ts b/packages/apollo-server-types/src/index.ts index 68b52128309..9010346d946 100644 --- a/packages/apollo-server-types/src/index.ts +++ b/packages/apollo-server-types/src/index.ts @@ -107,3 +107,11 @@ export type GraphQLExecutionResult = { errors?: ReadonlyArray; extensions?: Record; }; + +export type Logger = { + // Ordered from least-severe to most-severe. + debug(message?: any): void; + info(message?: any): void; + warn(message?: any): void; + error(message?: any): void; +} From 39913c3afa963f9d8906c584b2fb339c45271e79 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 10 Mar 2020 16:55:34 +0200 Subject: [PATCH 280/642] tests: test various popular loggers: log4js, winston, bunyan, loglevel. --- package-lock.json | 400 ++++++++++++++++++ package.json | 5 + .../src/__tests__/integration/logger.test.ts | 122 ++++++ 3 files changed, 527 insertions(+) create mode 100644 packages/apollo-gateway/src/__tests__/integration/logger.test.ts diff --git a/package-lock.json b/package-lock.json index 9da063a5c72..168ebc4b711 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3592,6 +3592,15 @@ "integrity": "sha512-PH7bfkt1nu4pnlxz+Ws+wwJJF1HE12W3ia+Iace2JT7q56DLH3hbyjOJyNHJYRxk3PkKaC36fHfHKyeG1rMgCA==", "dev": true }, + "@types/bunyan": { + "version": "1.8.6", + "resolved": "https://registry.npmjs.org/@types/bunyan/-/bunyan-1.8.6.tgz", + "integrity": "sha512-YiozPOOsS6bIuz31ilYqR5SlLif4TBWsousN2aCWLi5233nZSX19tFbcQUPdR7xJ8ypPyxkCGNxg0CIV5n9qxQ==", + "dev": true, + "requires": { + "@types/node": "*" + } + }, "@types/caseless": { "version": "0.12.2", "resolved": "https://registry.npmjs.org/@types/caseless/-/caseless-0.12.2.tgz", @@ -4798,6 +4807,15 @@ "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==", "dev": true }, + "async": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", + "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", + "dev": true, + "requires": { + "lodash": "^4.17.14" + } + }, "async-limiter": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz", @@ -5207,6 +5225,18 @@ "integrity": "sha1-y5T662HIaWRR2zZTThQi+U8K7og=", "dev": true }, + "bunyan": { + "version": "1.8.12", + "resolved": "https://registry.npmjs.org/bunyan/-/bunyan-1.8.12.tgz", + "integrity": "sha1-8VDw9nSKvdcq6uhPBEA74u8RN5c=", + "dev": true, + "requires": { + "dtrace-provider": "~0.8", + "moment": "^2.10.6", + "mv": "~2", + "safe-json-stringify": "~1" + } + }, "busboy": { "version": "0.3.1", "resolved": "https://registry.npmjs.org/busboy/-/busboy-0.3.1.tgz", @@ -5575,6 +5605,16 @@ "object-visit": "^1.0.0" } }, + "color": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/color/-/color-3.0.0.tgz", + "integrity": "sha512-jCpd5+s0s0t7p3pHQKpnJ0TpQKKdleP71LWcA0aqiljpiuAkOSUFN/dyH8ZwF0hRmFlrIuRhufds1QyEP9EB+w==", + "dev": true, + "requires": { + "color-convert": "^1.9.1", + "color-string": "^1.5.2" + } + }, "color-convert": { "version": "1.9.3", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", @@ -5588,6 +5628,38 @@ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" }, + "color-string": { + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.3.tgz", + "integrity": "sha512-dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw==", + "dev": true, + "requires": { + "color-name": "^1.0.0", + "simple-swizzle": "^0.2.2" + } + }, + "colornames": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/colornames/-/colornames-1.1.1.tgz", + "integrity": "sha1-+IiQMGhcfE/54qVZ9Qd+t2qBb5Y=", + "dev": true + }, + "colors": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz", + "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==", + "dev": true + }, + "colorspace": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/colorspace/-/colorspace-1.1.2.tgz", + "integrity": "sha512-vt+OoIP2d76xLhjwbBaucYlNSpPsrJWPlBTtwCpQKIu6/CSMutyzX93O/Do0qzpH3YoHEes8YEFXyZ797rEhzQ==", + "dev": true, + "requires": { + "color": "3.0.x", + "text-hex": "1.0.x" + } + }, "columnify": { "version": "1.5.4", "resolved": "https://registry.npmjs.org/columnify/-/columnify-1.5.4.tgz", @@ -6280,6 +6352,12 @@ "resolved": "https://registry.npmjs.org/dataloader/-/dataloader-1.4.0.tgz", "integrity": "sha512-68s5jYdlvasItOJnCuI2Q9s4q98g0pCyL3HrcKJu8KNugUl8ahgmZYg38ysLTgQjjXX3H8CJLkAvWrclWfcalw==" }, + "date-format": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/date-format/-/date-format-3.0.0.tgz", + "integrity": "sha512-eyTcpKOcamdhWJXj56DpQMo1ylSQpcGtGKXcU0Tb97+K56/CF5amAqqqNj0+KvA0iw2ynxtHWFsPDSClCxe48w==", + "dev": true + }, "dateformat": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz", @@ -6498,6 +6576,17 @@ "wrappy": "1" } }, + "diagnostics": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/diagnostics/-/diagnostics-1.1.1.tgz", + "integrity": "sha512-8wn1PmdunLJ9Tqbx+Fx/ZEuHfJf4NKSN2ZBj7SJC/OWRWha843+WsTjqMe1B5E3p28jqBlp+mJ2fPVxPyNgYKQ==", + "dev": true, + "requires": { + "colorspace": "1.1.x", + "enabled": "1.0.x", + "kuler": "1.0.x" + } + }, "dicer": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/dicer/-/dicer-0.3.0.tgz", @@ -6539,6 +6628,25 @@ "is-obj": "^1.0.0" } }, + "dtrace-provider": { + "version": "0.8.8", + "resolved": "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.8.tgz", + "integrity": "sha512-b7Z7cNtHPhH9EJhNNbbeqTcXB8LGFFZhq1PGgEvpeHlzd36bhbdTWoE/Ba/YguqpBSlAPKnARWhVlhunCMwfxg==", + "dev": true, + "optional": true, + "requires": { + "nan": "^2.14.0" + }, + "dependencies": { + "nan": { + "version": "2.14.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz", + "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==", + "dev": true, + "optional": true + } + } + }, "duplexer": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz", @@ -6610,6 +6718,15 @@ "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", "dev": true }, + "enabled": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/enabled/-/enabled-1.0.2.tgz", + "integrity": "sha1-ll9lE9LC0cX0ZStkouM5ZGf8L5M=", + "dev": true, + "requires": { + "env-variable": "0.0.x" + } + }, "encodeurl": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", @@ -6638,6 +6755,12 @@ "integrity": "sha512-6u0VYSCo/OW6IoD5WCLLy9JUGARbamfSavcNXry/eu8aHVFei6CD3Sw+VGX5alea1i9pgPHW0mbu6Xj0uBh7gA==", "dev": true }, + "env-variable": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/env-variable/-/env-variable-0.0.6.tgz", + "integrity": "sha512-bHz59NlBbtS0NhftmR8+ExBEekE7br0e01jw+kk0NDro7TtZzBYZ5ScGPs3OmwnpyfHTHOtr1Y6uedCdrIldtg==", + "dev": true + }, "envinfo": { "version": "7.5.0", "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.5.0.tgz", @@ -7302,6 +7425,12 @@ "bser": "^2.0.0" } }, + "fecha": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fecha/-/fecha-2.3.3.tgz", + "integrity": "sha512-lUGBnIamTAwk4znq5BcqsDaxSmZ9nDVJaij6NvRt/Tg4R69gERA+otPKbS86ROw9nxVMw2/mp1fnaiWqbs6Sdg==", + "dev": true + }, "figgy-pudding": { "version": "3.5.1", "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz", @@ -7386,6 +7515,12 @@ "integrity": "sha512-qFlJnOBWDfIaunF54/lBqNKmXOI0HqNhu+mHkLmbaBXlS71PUd9OjFOdyevHt/aHoHB1+eW7eKHgRKOG5aHSpw==", "dev": true }, + "flatted": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.1.tgz", + "integrity": "sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg==", + "dev": true + }, "flush-write-stream": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz", @@ -11891,6 +12026,15 @@ } } }, + "kuler": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/kuler/-/kuler-1.0.1.tgz", + "integrity": "sha512-J9nVUucG1p/skKul6DU3PUZrhs0LPulNaeUOox0IyXDi8S4CztTHs1gQphhuZmzXG7VOQSf6NJfKuzteQLv9gQ==", + "dev": true, + "requires": { + "colornames": "^1.1.1" + } + }, "left-pad": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/left-pad/-/left-pad-1.3.0.tgz", @@ -12058,6 +12202,69 @@ "resolved": "https://registry.npmjs.org/lodash.xorby/-/lodash.xorby-4.7.0.tgz", "integrity": "sha1-nBmm+fBjputT3QPBtocXmYAUY9c=" }, + "log4js": { + "version": "6.1.2", + "resolved": "https://registry.npmjs.org/log4js/-/log4js-6.1.2.tgz", + "integrity": "sha512-knS4Y30pC1e0n7rfx3VxcLOdBCsEo0o6/C7PVTGxdVK+5b1TYOSGQPn9FDcrhkoQBV29qwmA2mtkznPAQKnxQg==", + "dev": true, + "requires": { + "date-format": "^3.0.0", + "debug": "^4.1.1", + "flatted": "^2.0.1", + "rfdc": "^1.1.4", + "streamroller": "^2.2.3" + }, + "dependencies": { + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "rfdc": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.1.4.tgz", + "integrity": "sha512-5C9HXdzK8EAqN7JDif30jqsBzavB7wLpaubisuQIGHWf2gUXSpzy6ArX/+Da8RjFpagWsCn+pIgxTMAmKw9Zug==", + "dev": true + } + } + }, + "logform": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/logform/-/logform-2.1.2.tgz", + "integrity": "sha512-+lZh4OpERDBLqjiwDLpAWNQu6KMjnlXH2ByZwCuSqVPJletw0kTWJf5CgSNAUKn1KUkv3m2cUz/LK8zyEy7wzQ==", + "dev": true, + "requires": { + "colors": "^1.2.1", + "fast-safe-stringify": "^2.0.4", + "fecha": "^2.3.3", + "ms": "^2.1.1", + "triple-beam": "^1.3.0" + }, + "dependencies": { + "fast-safe-stringify": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz", + "integrity": "sha512-Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA==", + "dev": true + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + } + } + }, "loglevel": { "version": "1.6.4", "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.4.tgz", @@ -12745,6 +12952,13 @@ "integrity": "sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==", "dev": true }, + "moment": { + "version": "2.24.0", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz", + "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==", + "dev": true, + "optional": true + }, "move-concurrently": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz", @@ -12781,6 +12995,44 @@ "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=", "dev": true }, + "mv": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz", + "integrity": "sha1-rmzg1vbV4KT32JN5jQPB6pVZtqI=", + "dev": true, + "optional": true, + "requires": { + "mkdirp": "~0.5.1", + "ncp": "~2.0.0", + "rimraf": "~2.4.0" + }, + "dependencies": { + "glob": { + "version": "6.0.4", + "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz", + "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=", + "dev": true, + "optional": true, + "requires": { + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "2 || 3", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, + "rimraf": { + "version": "2.4.5", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz", + "integrity": "sha1-7nEM5dk6j9uFb7Xqj/Di11k0sto=", + "dev": true, + "optional": true, + "requires": { + "glob": "^6.0.1" + } + } + } + }, "mz": { "version": "2.7.0", "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz", @@ -12824,6 +13076,13 @@ "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", "dev": true }, + "ncp": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz", + "integrity": "sha1-GVoh1sRuNh0vsSgbo4uR6d9727M=", + "dev": true, + "optional": true + }, "needle": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/needle/-/needle-2.4.0.tgz", @@ -13274,6 +13533,12 @@ "wrappy": "1" } }, + "one-time": { + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/one-time/-/one-time-0.0.4.tgz", + "integrity": "sha1-+M33eISCb+Tf+T46nMN7HkSAdC4=", + "dev": true + }, "onetime": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz", @@ -14308,6 +14573,13 @@ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" }, + "safe-json-stringify": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.2.0.tgz", + "integrity": "sha512-gH8eh2nZudPQO6TytOvbxnuhYBOvDBBLW52tz5q6X58lJcd/tkmqFR+5Z9adS8aJtURSXWThWy/xJtJwixErvg==", + "dev": true, + "optional": true + }, "safe-regex": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", @@ -14490,6 +14762,23 @@ "resolved": "https://registry.npmjs.org/simple-lru-cache/-/simple-lru-cache-0.0.2.tgz", "integrity": "sha1-1ZzDoZPBpdAyD4Tucy9uRxPlEd0=" }, + "simple-swizzle": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz", + "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=", + "dev": true, + "requires": { + "is-arrayish": "^0.3.1" + }, + "dependencies": { + "is-arrayish": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz", + "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==", + "dev": true + } + } + }, "sisteransi": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.3.tgz", @@ -14779,6 +15068,12 @@ "figgy-pudding": "^3.5.1" } }, + "stack-trace": { + "version": "0.0.10", + "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz", + "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=", + "dev": true + }, "stack-utils": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-1.0.2.tgz", @@ -14847,6 +15142,40 @@ "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==", "dev": true }, + "streamroller": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-2.2.3.tgz", + "integrity": "sha512-AegmvQsscTRhHVO46PhCDerjIpxi7E+d2GxgUDu+nzw/HuLnUdxHWr6WQ+mVn/4iJgMKKFFdiUwFcFRDvcjCtw==", + "dev": true, + "requires": { + "date-format": "^2.1.0", + "debug": "^4.1.1", + "fs-extra": "^8.1.0" + }, + "dependencies": { + "date-format": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/date-format/-/date-format-2.1.0.tgz", + "integrity": "sha512-bYQuGLeFxhkxNOF3rcMtiZxvCBAquGzZm6oWA1oZ0g2THUzivaRhv8uOhdr19LmoobSOLoIAxeUK2RdbM8IFTA==", + "dev": true + }, + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + } + } + }, "streamsearch": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz", @@ -15201,6 +15530,12 @@ "integrity": "sha512-wiBrwC1EhBelW12Zy26JeOUkQ5mRu+5o8rpsJk5+2t+Y5vE7e842qtZDQ2g1NpX/29HdyFeJ4nSIhI47ENSxlQ==", "dev": true }, + "text-hex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz", + "integrity": "sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==", + "dev": true + }, "thenify": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.0.tgz", @@ -15384,6 +15719,12 @@ "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=", "dev": true }, + "triple-beam": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/triple-beam/-/triple-beam-1.3.0.tgz", + "integrity": "sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw==", + "dev": true + }, "ts-invariant": { "version": "0.4.4", "resolved": "https://registry.npmjs.org/ts-invariant/-/ts-invariant-0.4.4.tgz", @@ -15826,6 +16167,65 @@ "execa": "^1.0.0" } }, + "winston": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/winston/-/winston-3.2.1.tgz", + "integrity": "sha512-zU6vgnS9dAWCEKg/QYigd6cgMVVNwyTzKs81XZtTFuRwJOcDdBg7AU0mXVyNbs7O5RH2zdv+BdNZUlx7mXPuOw==", + "dev": true, + "requires": { + "async": "^2.6.1", + "diagnostics": "^1.1.1", + "is-stream": "^1.1.0", + "logform": "^2.1.1", + "one-time": "0.0.4", + "readable-stream": "^3.1.1", + "stack-trace": "0.0.x", + "triple-beam": "^1.3.0", + "winston-transport": "^4.3.0" + } + }, + "winston-transport": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/winston-transport/-/winston-transport-4.3.0.tgz", + "integrity": "sha512-B2wPuwUi3vhzn/51Uukcao4dIduEiPOcOt9HJ3QeaXgkJ5Z7UwpBzxS4ZGNHtrxrUvTwemsQiSys0ihOf8Mp1A==", + "dev": true, + "requires": { + "readable-stream": "^2.3.6", + "triple-beam": "^1.2.0" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "wordwrap": { "version": "0.0.3", "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", diff --git a/package.json b/package.json index 7faae6f3d21..fff62faa5eb 100644 --- a/package.json +++ b/package.json @@ -61,6 +61,7 @@ "@types/async-retry": "1.4.1", "@types/aws-lambda": "8.10.46", "@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.7", @@ -89,6 +90,7 @@ "apollo-link-persisted-queries": "0.2.2", "azure-functions-ts-essentials": "1.3.2", "body-parser": "1.19.0", + "bunyan": "1.8.12", "codecov": "3.6.5", "connect": "3.7.0", "deep-freeze": "0.0.1", @@ -108,6 +110,7 @@ "js-sha256": "0.9.0", "koa": "2.11.0", "lerna": "3.20.2", + "log4js": "6.1.2", "memcached-mock": "0.1.0", "mock-req": "0.2.0", "nock": "10.0.6", @@ -121,6 +124,8 @@ "test-listen": "1.1.0", "ts-jest": "24.3.0", "typescript": "3.8.3", + "winston": "3.2.1", + "winston-transport": "4.3.0", "ws": "6.2.1" }, "jest": { diff --git a/packages/apollo-gateway/src/__tests__/integration/logger.test.ts b/packages/apollo-gateway/src/__tests__/integration/logger.test.ts new file mode 100644 index 00000000000..0af299a5a95 --- /dev/null +++ b/packages/apollo-gateway/src/__tests__/integration/logger.test.ts @@ -0,0 +1,122 @@ +import { ApolloGateway } from '../..'; +import { Logger } from "apollo-server-types"; +import { PassThrough } from "stream"; + +import * as winston from "winston"; +import WinstonTransport from 'winston-transport'; +import * as bunyan from "bunyan"; +import * as loglevel from "loglevel"; +import * as log4js from "log4js"; + +const LOWEST_LOG_LEVEL = "debug"; + +const KNOWN_DEBUG_MESSAGE = "Checking service definitions..."; + +async function triggerKnownDebugMessage(logger: Logger) { + // Trigger a known error. + // This is a bit britle since it merely leverages a known debug log + // message outside of the constructor, but it seemed worth testing + // the compatibility with `ApolloGateway` itself rather than genericly. + // The error does not matter, so it is caught and ignored. + await new ApolloGateway({ logger }).load().catch(_e => {}); +} + +describe("logger", () => { + it("works with 'winston'", async () => { + const sink = jest.fn(); + const transport = new class extends WinstonTransport { + constructor() { + super({ + format: winston.format.json(), + }); + } + + log(info: any) { + sink(info); + } + }; + + const logger = winston.createLogger({ level: 'debug' }).add(transport); + + await triggerKnownDebugMessage(logger); + + expect(sink).toHaveBeenCalledWith(expect.objectContaining({ + level: LOWEST_LOG_LEVEL, + message: KNOWN_DEBUG_MESSAGE, + })); + }); + + it("works with 'bunyan'", async () => { + const sink = jest.fn(); + + // Bunyan uses streams for its logging implementations. + const writable = new PassThrough(); + writable.on("data", data => sink(JSON.parse(data.toString()))); + + const logger = bunyan.createLogger({ + name: "test-logger-bunyan", + streams: [{ + level: LOWEST_LOG_LEVEL, + stream: writable, + }] + }); + + await triggerKnownDebugMessage(logger); + + expect(sink).toHaveBeenCalledWith(expect.objectContaining({ + level: bunyan.DEBUG, + msg: KNOWN_DEBUG_MESSAGE, + })); + }); + + it("works with 'loglevel'", async () => { + const sink = jest.fn(); + + const logger = loglevel.getLogger("test-logger-loglevel") + logger.methodFactory = (_methodName, level): loglevel.LoggingMethod => + (message) => sink({ level, message }); + + // The `setLevel` method must be called after overwriting `methodFactory`. + // This is an intentional API design pattern of the loglevel package: + // https://www.npmjs.com/package/loglevel#writing-plugins + logger.setLevel(loglevel.levels.DEBUG); + + await triggerKnownDebugMessage(logger); + + expect(sink).toHaveBeenCalledWith({ + level: loglevel.levels.DEBUG, + message: KNOWN_DEBUG_MESSAGE, + }); + }); + + it("works with 'log4js'", async () => { + const sink = jest.fn(); + + log4js.configure({ + appenders: { + custom: { + type: { + configure: () => + (loggingEvent: log4js.LoggingEvent) => sink(loggingEvent) + } + } + }, + categories: { + default: { + appenders: ['custom'], + level: LOWEST_LOG_LEVEL, + } + } + }); + + const logger = log4js.getLogger(); + logger.level = LOWEST_LOG_LEVEL; + + await triggerKnownDebugMessage(logger); + + expect(sink).toHaveBeenCalledWith(expect.objectContaining({ + level: log4js.levels.DEBUG, + data: [KNOWN_DEBUG_MESSAGE], + })); + }); +}); From ff203056863ee83e64b5ba9a39d76e468e5f917d Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Fri, 13 Mar 2020 21:42:16 +0200 Subject: [PATCH 281/642] Add optional `logger` to `GraphQLServiceContext` and `GraphQLRequestContext`. A follow-up commit will make these required! --- packages/apollo-server-types/src/index.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/apollo-server-types/src/index.ts b/packages/apollo-server-types/src/index.ts index 9010346d946..90b80a72de6 100644 --- a/packages/apollo-server-types/src/index.ts +++ b/packages/apollo-server-types/src/index.ts @@ -19,6 +19,7 @@ export type WithRequired = T & Required>; type Mutable = { -readonly [P in keyof T]: T[P] }; export interface GraphQLServiceContext { + logger?: Logger; schema: GraphQLSchema; schemaHash: string; engine: { @@ -62,6 +63,8 @@ export interface GraphQLRequestContext> { readonly request: GraphQLRequest; readonly response?: GraphQLResponse; + logger?: Logger; + readonly context: TContext; readonly cache: KeyValueCache; From a9f1d67afa7615a77b13b009c52f4f840a738d68 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Fri, 13 Mar 2020 21:41:28 +0200 Subject: [PATCH 282/642] Introduce optional `logger` property for `apollo-engine-reporting`. This is a more granular part of a larger project to introduce the concept of a `logger` to various parts of the Apollo Server stack - including `ApolloGateway` and `ApolloServer`. Since this extension is most always initiated by `ApolloServer` itself, this will generally be a property that is inherited by the configuration that `ApolloServer` provides. The intention is: if someone provides a `logger` at the `ApolloServer` level, we will propagate it down to various sub-components, including the `apollo-engine-reporting` extension. --- packages/apollo-engine-reporting/src/agent.ts | 29 ++++++++++++++----- .../apollo-engine-reporting/src/extension.ts | 5 +++- .../src/treeBuilder.ts | 7 +++-- 3 files changed, 31 insertions(+), 10 deletions(-) diff --git a/packages/apollo-engine-reporting/src/agent.ts b/packages/apollo-engine-reporting/src/agent.ts index d3b0be2d1c4..574e94d4c84 100644 --- a/packages/apollo-engine-reporting/src/agent.ts +++ b/packages/apollo-engine-reporting/src/agent.ts @@ -12,7 +12,7 @@ import { fetch, RequestAgent, Response } from 'apollo-server-env'; import retry from 'async-retry'; import { EngineReportingExtension } from './extension'; -import { GraphQLRequestContext } from 'apollo-server-types'; +import { GraphQLRequestContext, Logger } from 'apollo-server-types'; import { InMemoryLRUCache } from 'apollo-server-caching'; import { defaultEngineReportingSignature } from 'apollo-graphql'; @@ -185,6 +185,13 @@ export interface EngineReportingOptions { * Creates the client information for operation traces. */ generateClientInfo?: GenerateClientInfo; + + /** + * A logger interface to be used for output and errors. When not provided + * it will default to the server's own `logger` implementation and use + * `console` when that is not available. + */ + logger?: Logger; } export interface AddTraceArgs { @@ -209,6 +216,7 @@ const serviceHeaderDefaults = { // to the Engine server. export class EngineReportingAgent { private options: EngineReportingOptions; + private logger: Logger = console; private apiKey: string; private reports: { [schemaHash: string]: FullTracesReport } = Object.create( null, @@ -226,6 +234,7 @@ export class EngineReportingAgent { public constructor(options: EngineReportingOptions = {}) { this.options = options; + if (options.logger) this.logger = options.logger; this.apiKey = options.apiKey || process.env.ENGINE_API_KEY || ''; if (!this.apiKey) { throw new Error( @@ -236,7 +245,7 @@ export class EngineReportingAgent { // Since calculating the signature for Engine reporting is potentially an // expensive operation, we'll cache the signatures we generate and re-use // them based on repeated traces for the same `queryHash`. - this.signatureCache = createSignatureCache(); + this.signatureCache = createSignatureCache({ logger: this.logger }); this.sendReportsImmediately = options.sendReportsImmediately; if (!this.sendReportsImmediately) { @@ -353,7 +362,9 @@ export class EngineReportingAgent { await Promise.resolve(); if (this.options.debugPrintReports) { - console.log(`Engine sending report: ${JSON.stringify(report.toJSON())}`); + this.logger.debug( + `Engine sending report: ${JSON.stringify(report.toJSON())}`, + ); } const protobufError = FullTracesReport.verify(report); @@ -430,7 +441,7 @@ export class EngineReportingAgent { ); } if (this.options.debugPrintReports) { - console.log(`Engine report: status ${response.status}`); + this.logger.debug(`Engine report: status ${response.status}`); } } @@ -516,7 +527,7 @@ export class EngineReportingAgent { if (this.options.reportErrorFunction) { this.options.reportErrorFunction(err); } else { - console.error(err.message); + this.logger.error(err.message); } }); } @@ -529,7 +540,11 @@ export class EngineReportingAgent { } } -function createSignatureCache(): InMemoryLRUCache { +function createSignatureCache({ + logger, +}: { + logger: Logger; +}): InMemoryLRUCache { let lastSignatureCacheWarn: Date; let lastSignatureCacheDisposals: number = 0; return new InMemoryLRUCache({ @@ -558,7 +573,7 @@ function createSignatureCache(): InMemoryLRUCache { ) { // Log the time that we last displayed the message. lastSignatureCacheWarn = new Date(); - console.warn( + logger.warn( [ 'This server is processing a high number of unique operations. ', `A total of ${lastSignatureCacheDisposals} records have been `, diff --git a/packages/apollo-engine-reporting/src/extension.ts b/packages/apollo-engine-reporting/src/extension.ts index 0fd804df7f7..a9199e88fd4 100644 --- a/packages/apollo-engine-reporting/src/extension.ts +++ b/packages/apollo-engine-reporting/src/extension.ts @@ -1,4 +1,4 @@ -import { GraphQLRequestContext, WithRequired } from 'apollo-server-types'; +import { GraphQLRequestContext, WithRequired, Logger } from 'apollo-server-types'; import { Request, Headers } from 'apollo-server-env'; import { GraphQLResolveInfo, @@ -30,6 +30,7 @@ const clientVersionHeaderKey = 'apollographql-client-version'; // Its public methods all implement the GraphQLExtension interface. export class EngineReportingExtension implements GraphQLExtension { + private logger: Logger = console; private treeBuilder: EngineReportingTreeBuilder; private explicitOperationName?: string | null; private queryString?: string; @@ -46,12 +47,14 @@ export class EngineReportingExtension this.options = { ...options, }; + if (options.logger) this.logger = options.logger; this.addTrace = addTrace; this.generateClientInfo = options.generateClientInfo || defaultGenerateClientInfo; this.treeBuilder = new EngineReportingTreeBuilder({ rewriteError: options.rewriteError, + logger: this.logger, }); } diff --git a/packages/apollo-engine-reporting/src/treeBuilder.ts b/packages/apollo-engine-reporting/src/treeBuilder.ts index 448c180f81c..90854a45d64 100644 --- a/packages/apollo-engine-reporting/src/treeBuilder.ts +++ b/packages/apollo-engine-reporting/src/treeBuilder.ts @@ -9,7 +9,7 @@ import { PersistedQueryNotFoundError, PersistedQueryNotSupportedError, } from 'apollo-server-errors'; -import { InvalidGraphQLRequestError } from 'apollo-server-types'; +import { InvalidGraphQLRequestError, Logger } from 'apollo-server-types'; function internalError(message: string) { return new Error(`[internal apollo-server error] ${message}`); @@ -17,6 +17,7 @@ function internalError(message: string) { export class EngineReportingTreeBuilder { private rootNode = new Trace.Node(); + private logger: Logger = console; public trace = new Trace({ root: this.rootNode }); public startHrTime?: [number, number]; private stopped = false; @@ -26,9 +27,11 @@ export class EngineReportingTreeBuilder { private rewriteError?: (err: GraphQLError) => GraphQLError | null; public constructor(options: { + logger?: Logger; rewriteError?: (err: GraphQLError) => GraphQLError | null; }) { this.rewriteError = options.rewriteError; + if (options.logger) this.logger = options.logger; } public startTiming() { @@ -137,7 +140,7 @@ export class EngineReportingTreeBuilder { if (specificNode) { node = specificNode; } else { - console.warn( + this.logger.warn( `Could not find node with path ${path.join( '.', )}; defaulting to put errors on root node.`, From eadcc6b4687f2530d304855fb8089b2fafb9d8b9 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Fri, 13 Mar 2020 21:45:40 +0200 Subject: [PATCH 283/642] Introduce optional `logger` for `ApolloServer` class. In general, Apollo Server itself does very little outputting of messages (either informational or otherwise) to its console. Historically, Apollo Server has simply used various `console` facilities (i.e. `console.log`) to output such messages. Using `console` methods does get the point across quite well in development, though it's less ideal for production environments which often demand a more structured approach to capturing their log messages across various stacks. For example, in containerized environments logs are often siphoned into various centralized log facilities and/or third party log providers (e.g. Datadog, Loggly, etc.). Many users are already using existing loggers (like [`winston`], [`log4js`], [`bunyan`] and more) to report messages from their resolvers by exposing those logger implementations on their "context" using the `context` property to the `ApolloServer` constructor options. However, exposing a logger on the `context` doesn't allow Apollo Server to use it for its own important messaging and users should be able to opt into getting Apollo's own messages in the same log facilities. Apollo Server will continue to be relatively quiet for now, but various sub-components (e.g. Gateway, Engine Reporting) are already outputting more and more important messages and warnings which deserve to get attention. Therefore, this introduces a relatively generic `logger` property to `ApolloServer` which will be made available on the `GraphQLRequestContext` that is already passed around in many places internally, received by various Gateway compoments, and also exposed to plugins, allowing well-considered plugins to utilize the same centralized log sink. This should also allow granular logging at various levels, including scoped or tagged logging, since the request pipeline could be used to create a sub-instance of a logger. For example, different components can accept their own `logger` property which, when set, will override any more-parent `logger` and allow logs to be sorted according to user preference. Apollo Engine will be the first-subcomponent to get this treatment. Similarly, for logger implementations that support the notion of creating a sub-logger from an existing logger, the plugin life-cycle hooks can be used to create a user-specific logger in the `requestDidStart` life-cycle. This can be helpful in applying a user-id tag to all log messages which happened within the scope of a particular request. If the same logger should be made available to resolvers via exposure on the `context, such plugin implementation on `requestDidStart` should also augment the already-created `context` with the scoped-logger. --- package-lock.json | 8 ++ packages/apollo-server-core/package.json | 1 + .../apollo-server-core/src/ApolloServer.ts | 49 ++++++- .../src/__tests__/logger.test.ts | 134 ++++++++++++++++++ .../apollo-server-core/src/graphqlOptions.ts | 3 + .../apollo-server-core/src/requestPipeline.ts | 18 ++- .../apollo-server-core/src/runHttpQuery.ts | 6 + packages/apollo-server-core/src/types.ts | 1 + 8 files changed, 208 insertions(+), 12 deletions(-) create mode 100644 packages/apollo-server-core/src/__tests__/logger.test.ts diff --git a/package-lock.json b/package-lock.json index 168ebc4b711..ac29c9f70b3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4458,9 +4458,17 @@ "graphql-tag": "^2.9.2", "graphql-tools": "^4.0.0", "graphql-upload": "^8.0.2", + "loglevel": "^1.6.7", "sha.js": "^2.4.11", "subscriptions-transport-ws": "^0.9.11", "ws": "^6.0.0" + }, + "dependencies": { + "loglevel": { + "version": "1.6.7", + "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.7.tgz", + "integrity": "sha512-cY2eLFrQSAfVPhCgH1s7JI73tMbg9YC3v3+ZHVW67sBS7UxWzNEk/ZBbSfLykBWHp33dqqtOv82gjhKEi81T/A==" + } } }, "apollo-server-env": { diff --git a/packages/apollo-server-core/package.json b/packages/apollo-server-core/package.json index 1f666b46952..474b8d1d585 100644 --- a/packages/apollo-server-core/package.json +++ b/packages/apollo-server-core/package.json @@ -42,6 +42,7 @@ "graphql-tag": "^2.9.2", "graphql-tools": "^4.0.0", "graphql-upload": "^8.0.2", + "loglevel": "^1.6.7", "sha.js": "^2.4.11", "subscriptions-transport-ws": "^0.9.11", "ws": "^6.0.0" diff --git a/packages/apollo-server-core/src/ApolloServer.ts b/packages/apollo-server-core/src/ApolloServer.ts index 6d225b4c6cf..d29b3d3390c 100644 --- a/packages/apollo-server-core/src/ApolloServer.ts +++ b/packages/apollo-server-core/src/ApolloServer.ts @@ -4,6 +4,7 @@ import { GraphQLParseOptions, } from 'graphql-tools'; import { Server as HttpServer } from 'http'; +import loglevel from 'loglevel'; import { execute, GraphQLSchema, @@ -68,6 +69,7 @@ import { import { Headers } from 'apollo-server-env'; import { buildServiceDefinition } from '@apollographql/apollo-tools'; +import { Logger } from "apollo-server-types"; const NoIntrospection = (context: ValidationContext) => ({ Field(node: FieldDefinitionNode) { @@ -131,6 +133,7 @@ type SchemaDerivedData = { }; export class ApolloServerBase { + private logger: Logger; public subscriptionsPath?: string; public graphqlPath: string = '/graphql'; public requestOptions: Partial> = Object.create(null); @@ -185,6 +188,28 @@ export class ApolloServerBase { ...requestOptions } = config; + // Setup logging facilities + if (config.logger) { + this.logger = config.logger; + } else { + // If the user didn't prvoide their own logger, we'll initialize one. + const loglevelLogger = loglevel.getLogger("apollo-server"); + + // We don't do much logging in Apollo Server right now. There's a notion + // of a `debug` flag, but it doesn't so much besides change stack traces + // in some error messages, but it would be odd for it to not introduce + // debug or higher level errors (which includes `info`, if we happen to + // start introducing those. We'll default to `warn` as a sensible default + // of things you'd probably want to be alerted to. + if (this.config.debug === true) { + loglevelLogger.setLevel(loglevel.levels.DEBUG); + } else { + loglevelLogger.setLevel(loglevel.levels.WARN); + } + + this.logger = loglevelLogger; + } + if (gateway && (modules || schema || typeDefs || resolvers)) { throw new Error( 'Cannot define both `gateway` and any of: `modules`, `schema`, `typeDefs`, or `resolvers`', @@ -267,7 +292,7 @@ export class ApolloServerBase { if (uploads !== false && !forbidUploadsForTesting) { if (this.supportsUploads()) { if (!runtimeSupportsUploads) { - printNodeFileUploadsMessage(); + printNodeFileUploadsMessage(this.logger); throw new Error( '`graphql-upload` is no longer supported on Node.js < v8.5.0. ' + 'See https://bit.ly/gql-upload-node-6.', @@ -288,8 +313,13 @@ export class ApolloServerBase { } } - // Normalize the legacy option maskErrorDetails. if (engine && typeof engine === 'object') { + // Use the `ApolloServer` logger unless a more granular logger is set. + if (!engine.logger) { + engine.logger = this.logger; + } + + // Normalize the legacy option maskErrorDetails. if (engine.maskErrorDetails && engine.rewriteError) { throw new Error("Can't set both maskErrorDetails and rewriteError!"); } else if ( @@ -318,7 +348,9 @@ export class ApolloServerBase { if (this.engineServiceId) { const { EngineReportingAgent } = require('apollo-engine-reporting'); this.engineReportingAgent = new EngineReportingAgent( - typeof engine === 'object' ? engine : Object.create(null), + typeof engine === 'object' ? engine : Object.create({ + logger: this.logger, + }), ); // Don't add the extension here (we want to add it later in generateSchemaDerivedData). } @@ -430,7 +462,7 @@ export class ApolloServerBase { // error will propogate to the client. We will, however, log the error // for observation in the logs. const message = "This data graph is missing a valid configuration."; - console.error(message + " " + (err && err.message || err)); + this.logger.error(message + " " + (err && err.message || err)); throw new Error( message + " More details may be available in the server logs."); }); @@ -534,7 +566,7 @@ export class ApolloServerBase { // their own gateway or running a federated service on its own. Nonetheless, in // the likely case it was accidental, we warn users that they should only report // metrics from the Gateway. - console.warn( + this.logger.warn( "It looks like you're running a federated schema and you've configured your service " + 'to report metrics to Apollo Graph Manager. You should only configure your Apollo gateway ' + 'to report metrics to Apollo Graph Manager.', @@ -588,6 +620,7 @@ export class ApolloServerBase { } const service: GraphQLServiceContext = { + logger: this.logger, schema: schema, schemaHash: schemaHash, engine: { @@ -795,6 +828,7 @@ export class ApolloServerBase { return { schema, + logger: this.logger, plugins: this.plugins, documentStore, extensions, @@ -822,6 +856,7 @@ export class ApolloServerBase { } const requestCtx: GraphQLRequestContext = { + logger: this.logger, request, context: options.context || Object.create(null), cache: options.cache!, @@ -836,8 +871,8 @@ export class ApolloServerBase { } } -function printNodeFileUploadsMessage() { - console.error( +function printNodeFileUploadsMessage(logger: Logger) { + logger.error( [ '*****************************************************************', '* *', diff --git a/packages/apollo-server-core/src/__tests__/logger.test.ts b/packages/apollo-server-core/src/__tests__/logger.test.ts new file mode 100644 index 00000000000..5355ffa1a62 --- /dev/null +++ b/packages/apollo-server-core/src/__tests__/logger.test.ts @@ -0,0 +1,134 @@ +import { ApolloServerBase } from '../..'; +import { Logger } from "apollo-server-types"; +import { PassThrough } from "stream"; +import gql from "graphql-tag"; + +import * as winston from "winston"; +import WinstonTransport from 'winston-transport'; +import * as bunyan from "bunyan"; +import * as loglevel from "loglevel"; +import * as log4js from "log4js"; + +const LOWEST_LOG_LEVEL = "debug"; + +const KNOWN_DEBUG_MESSAGE = "The request has started."; + +async function triggerLogMessage(loggerToUse: Logger) { + await (new ApolloServerBase({ + typeDefs: gql` + type Query { + field: String! + } + `, + logger: loggerToUse, + plugins: [ + { + requestDidStart({ logger }) { + logger.debug(KNOWN_DEBUG_MESSAGE); + } + } + ] + })).executeOperation({ + query: '{ field }' + }); +} + +describe("logger", () => { + it("works with 'winston'", async () => { + const sink = jest.fn(); + const transport = new class extends WinstonTransport { + constructor() { + super({ + format: winston.format.json(), + }); + } + + log(info: any) { + sink(info); + } + }; + + const logger = winston.createLogger({ level: 'debug' }).add(transport); + + await triggerLogMessage(logger); + + expect(sink).toHaveBeenCalledWith(expect.objectContaining({ + level: LOWEST_LOG_LEVEL, + message: KNOWN_DEBUG_MESSAGE, + })); + }); + + it("works with 'bunyan'", async () => { + const sink = jest.fn(); + + // Bunyan uses streams for its logging implementations. + const writable = new PassThrough(); + writable.on("data", data => sink(JSON.parse(data.toString()))); + + const logger = bunyan.createLogger({ + name: "test-logger-bunyan", + streams: [{ + level: LOWEST_LOG_LEVEL, + stream: writable, + }] + }); + + await triggerLogMessage(logger); + + expect(sink).toHaveBeenCalledWith(expect.objectContaining({ + level: bunyan.DEBUG, + msg: KNOWN_DEBUG_MESSAGE, + })); + }); + + it("works with 'loglevel'", async () => { + const sink = jest.fn(); + + const logger = loglevel.getLogger("test-logger-loglevel") + logger.methodFactory = (_methodName, level): loglevel.LoggingMethod => + (message) => sink({ level, message }); + + // The `setLevel` method must be called after overwriting `methodFactory`. + // This is an intentional API design pattern of the loglevel package: + // https://www.npmjs.com/package/loglevel#writing-plugins + logger.setLevel(loglevel.levels.DEBUG); + + await triggerLogMessage(logger); + + expect(sink).toHaveBeenCalledWith({ + level: loglevel.levels.DEBUG, + message: KNOWN_DEBUG_MESSAGE, + }); + }); + + it("works with 'log4js'", async () => { + const sink = jest.fn(); + + log4js.configure({ + appenders: { + custom: { + type: { + configure: () => + (loggingEvent: log4js.LoggingEvent) => sink(loggingEvent) + } + } + }, + categories: { + default: { + appenders: ['custom'], + level: LOWEST_LOG_LEVEL, + } + } + }); + + const logger = log4js.getLogger(); + logger.level = LOWEST_LOG_LEVEL; + + await triggerLogMessage(logger); + + expect(sink).toHaveBeenCalledWith(expect.objectContaining({ + level: log4js.levels.DEBUG, + data: [KNOWN_DEBUG_MESSAGE], + })); + }); +}); diff --git a/packages/apollo-server-core/src/graphqlOptions.ts b/packages/apollo-server-core/src/graphqlOptions.ts index b9abdd0f949..e6da70d37b0 100644 --- a/packages/apollo-server-core/src/graphqlOptions.ts +++ b/packages/apollo-server-core/src/graphqlOptions.ts @@ -17,12 +17,14 @@ import { ValueOrPromise, GraphQLResponse, GraphQLRequestContext, + Logger, } from 'apollo-server-types'; /* * GraphQLServerOptions * * - schema: an executable GraphQL schema used to fulfill requests. + * - (optional) logger: a `Logger`-compatible implementation to be used for server-level messages. * - (optional) formatError: Formatting function applied to all errors before response is sent * - (optional) rootValue: rootValue passed to GraphQL execution, or a function to resolving the rootValue from the DocumentNode * - (optional) context: the context passed to GraphQL execution @@ -40,6 +42,7 @@ export interface GraphQLServerOptions< TRootValue = any > { schema: GraphQLSchema; + logger?: Logger; formatError?: (error: GraphQLError) => GraphQLFormattedError; rootValue?: ((parsedQuery: DocumentNode) => TRootValue) | TRootValue; context?: TContext | (() => never); diff --git a/packages/apollo-server-core/src/requestPipeline.ts b/packages/apollo-server-core/src/requestPipeline.ts index 786ade95b37..3d41fc9243b 100644 --- a/packages/apollo-server-core/src/requestPipeline.ts +++ b/packages/apollo-server-core/src/requestPipeline.ts @@ -108,6 +108,11 @@ export async function processGraphQLRequest( config: GraphQLRequestPipelineConfig, requestContext: Mutable>, ): Promise { + // For legacy reasons, this exported method may exist without a `logger` on + // the context. We'll need to make sure we account for that, even though + // all of our own machinery will certainly set it now. + const logger = requestContext.logger || console; + let cacheControlExtension: CacheControlExtension | undefined; const extensionStack = initializeExtensionStack(); (requestContext.context as any)._extensionStack = extensionStack; @@ -215,9 +220,9 @@ export async function processGraphQLRequest( try { requestContext.document = await config.documentStore.get(queryHash); } catch (err) { - console.warn( - 'An error occurred while attempting to read from the documentStore.', - err, + logger.warn( + 'An error occurred while attempting to read from the documentStore. ' + + (err && err.messsage) || err, ); } } @@ -274,7 +279,10 @@ export async function processGraphQLRequest( Promise.resolve( config.documentStore.set(queryHash, requestContext.document), ).catch(err => - console.warn('Could not store validated document.', err), + logger.warn( + 'Could not store validated document. ' + + (err && err.message) || err + ) ); } } @@ -341,7 +349,7 @@ export async function processGraphQLRequest( } : Object.create(null), ), - ).catch(console.warn); + ).catch(logger.warn); } let response: GraphQLResponse | null = await dispatcher.invokeHooksUntilNonNull( diff --git a/packages/apollo-server-core/src/runHttpQuery.ts b/packages/apollo-server-core/src/runHttpQuery.ts index c9d2d3ed0df..4e8f32e7f8c 100644 --- a/packages/apollo-server-core/src/runHttpQuery.ts +++ b/packages/apollo-server-core/src/runHttpQuery.ts @@ -161,6 +161,7 @@ export async function runHttpQuery( const config = { schema: options.schema, + logger: options.logger, rootValue: options.rootValue, context: options.context || {}, validationRules: options.validationRules, @@ -250,6 +251,11 @@ export async function processHTTPRequest( // in ApolloServer#graphQLServerOptions, before runHttpQuery is invoked). const context = cloneObject(options.context); return { + // While `logger` is guaranteed by internal Apollo Server usage of + // this `processHTTPRequest` method, this method has been publicly + // exported since perhaps as far back as Apollo Server 1.x. Therefore, + // for compatibility reasons, we'll default to `console`. + logger: options.logger || console, request, response: { http: { diff --git a/packages/apollo-server-core/src/types.ts b/packages/apollo-server-core/src/types.ts index ddd1652c9bd..c62191384c1 100644 --- a/packages/apollo-server-core/src/types.ts +++ b/packages/apollo-server-core/src/types.ts @@ -68,6 +68,7 @@ type BaseConfig = Pick< | 'tracing' | 'dataSources' | 'cache' + | 'logger' >; export type Unsubscriber = () => void; From 0929c2f17a2f0fa4b7e05b5dff55384d9c3fcb11 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 16 Mar 2020 19:57:07 +0200 Subject: [PATCH 284/642] To support Node.js 6, use older version of `log4js` for testing. We're only testing the interface compatibility here, so the latest version isn't really necessary. Though this would be great to update! --- package-lock.json | 55 +++++++++++-------- package.json | 2 +- .../src/__tests__/integration/logger.test.ts | 3 + .../src/__tests__/logger.test.ts | 3 + renovate.json5 | 4 ++ 5 files changed, 42 insertions(+), 25 deletions(-) diff --git a/package-lock.json b/package-lock.json index ac29c9f70b3..9ca389b2b49 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6361,9 +6361,9 @@ "integrity": "sha512-68s5jYdlvasItOJnCuI2Q9s4q98g0pCyL3HrcKJu8KNugUl8ahgmZYg38ysLTgQjjXX3H8CJLkAvWrclWfcalw==" }, "date-format": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/date-format/-/date-format-3.0.0.tgz", - "integrity": "sha512-eyTcpKOcamdhWJXj56DpQMo1ylSQpcGtGKXcU0Tb97+K56/CF5amAqqqNj0+KvA0iw2ynxtHWFsPDSClCxe48w==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/date-format/-/date-format-2.1.0.tgz", + "integrity": "sha512-bYQuGLeFxhkxNOF3rcMtiZxvCBAquGzZm6oWA1oZ0g2THUzivaRhv8uOhdr19LmoobSOLoIAxeUK2RdbM8IFTA==", "dev": true }, "dateformat": { @@ -12211,16 +12211,16 @@ "integrity": "sha1-nBmm+fBjputT3QPBtocXmYAUY9c=" }, "log4js": { - "version": "6.1.2", - "resolved": "https://registry.npmjs.org/log4js/-/log4js-6.1.2.tgz", - "integrity": "sha512-knS4Y30pC1e0n7rfx3VxcLOdBCsEo0o6/C7PVTGxdVK+5b1TYOSGQPn9FDcrhkoQBV29qwmA2mtkznPAQKnxQg==", + "version": "4.5.1", + "resolved": "https://registry.npmjs.org/log4js/-/log4js-4.5.1.tgz", + "integrity": "sha512-EEEgFcE9bLgaYUKuozyFfytQM2wDHtXn4tAN41pkaxpNjAykv11GVdeI4tHtmPWW4Xrgh9R/2d7XYghDVjbKKw==", "dev": true, "requires": { - "date-format": "^3.0.0", + "date-format": "^2.0.0", "debug": "^4.1.1", - "flatted": "^2.0.1", + "flatted": "^2.0.0", "rfdc": "^1.1.4", - "streamroller": "^2.2.3" + "streamroller": "^1.0.6" }, "dependencies": { "debug": { @@ -15151,31 +15151,38 @@ "dev": true }, "streamroller": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-2.2.3.tgz", - "integrity": "sha512-AegmvQsscTRhHVO46PhCDerjIpxi7E+d2GxgUDu+nzw/HuLnUdxHWr6WQ+mVn/4iJgMKKFFdiUwFcFRDvcjCtw==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-1.0.6.tgz", + "integrity": "sha512-3QC47Mhv3/aZNFpDDVO44qQb9gwB9QggMEE0sQmkTAwBVYdBRWISdsywlkfm5II1Q5y/pmrHflti/IgmIzdDBg==", "dev": true, "requires": { - "date-format": "^2.1.0", - "debug": "^4.1.1", - "fs-extra": "^8.1.0" + "async": "^2.6.2", + "date-format": "^2.0.0", + "debug": "^3.2.6", + "fs-extra": "^7.0.1", + "lodash": "^4.17.14" }, "dependencies": { - "date-format": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/date-format/-/date-format-2.1.0.tgz", - "integrity": "sha512-bYQuGLeFxhkxNOF3rcMtiZxvCBAquGzZm6oWA1oZ0g2THUzivaRhv8uOhdr19LmoobSOLoIAxeUK2RdbM8IFTA==", - "dev": true - }, "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", + "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", "dev": true, "requires": { "ms": "^2.1.1" } }, + "fs-extra": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", + "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", + "dev": true, + "requires": { + "graceful-fs": "^4.1.2", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" + } + }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", diff --git a/package.json b/package.json index fff62faa5eb..249c5bcb45a 100644 --- a/package.json +++ b/package.json @@ -110,7 +110,7 @@ "js-sha256": "0.9.0", "koa": "2.11.0", "lerna": "3.20.2", - "log4js": "6.1.2", + "log4js": "4.5.1", "memcached-mock": "0.1.0", "mock-req": "0.2.0", "nock": "10.0.6", diff --git a/packages/apollo-gateway/src/__tests__/integration/logger.test.ts b/packages/apollo-gateway/src/__tests__/integration/logger.test.ts index 0af299a5a95..7632fc80810 100644 --- a/packages/apollo-gateway/src/__tests__/integration/logger.test.ts +++ b/packages/apollo-gateway/src/__tests__/integration/logger.test.ts @@ -6,6 +6,9 @@ import * as winston from "winston"; import WinstonTransport from 'winston-transport'; import * as bunyan from "bunyan"; import * as loglevel from "loglevel"; +// We are testing an older version of `log4js` which uses older ECMAScript +// in order to still support testing on Node.js 6. +// This should be updated when bump the semver major for AS3. import * as log4js from "log4js"; const LOWEST_LOG_LEVEL = "debug"; diff --git a/packages/apollo-server-core/src/__tests__/logger.test.ts b/packages/apollo-server-core/src/__tests__/logger.test.ts index 5355ffa1a62..a4a34b45b30 100644 --- a/packages/apollo-server-core/src/__tests__/logger.test.ts +++ b/packages/apollo-server-core/src/__tests__/logger.test.ts @@ -7,6 +7,9 @@ import * as winston from "winston"; import WinstonTransport from 'winston-transport'; import * as bunyan from "bunyan"; import * as loglevel from "loglevel"; +// We are testing an older version of `log4js` which uses older ECMAScript +// in order to still support testing on Node.js 6. +// This should be updated when bump the semver major for AS3. import * as log4js from "log4js"; const LOWEST_LOG_LEVEL = "debug"; diff --git a/renovate.json5 b/renovate.json5 index 4c2abb7dd6f..f22ff3bbc07 100644 --- a/renovate.json5 +++ b/renovate.json5 @@ -32,6 +32,10 @@ "packageNames": ["@koa/cors"], "allowedVersions": "<3" }, + { + "packageNames": ["log4js"], + "allowedVersions": "<5" + }, { "packageNames": ["hapi", "@types/hapi"], "allowedVersions": "<18" From 2d43a7403564294e485f6ea781d2adc55c7651b5 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Fri, 13 Mar 2020 21:46:51 +0200 Subject: [PATCH 285/642] ResponseCache: when available, use `requestContext.logger` to log. --- .../src/ApolloServerPluginResponseCache.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/apollo-server-plugin-response-cache/src/ApolloServerPluginResponseCache.ts b/packages/apollo-server-plugin-response-cache/src/ApolloServerPluginResponseCache.ts index f942d49ca6b..bd78388e3ed 100644 --- a/packages/apollo-server-plugin-response-cache/src/ApolloServerPluginResponseCache.ts +++ b/packages/apollo-server-plugin-response-cache/src/ApolloServerPluginResponseCache.ts @@ -222,6 +222,8 @@ export default function plugin( }, async willSendResponse(requestContext) { + const logger = requestContext.logger || console; + if (!isGraphQLQuery(requestContext)) { return; } @@ -295,13 +297,13 @@ export default function plugin( // InMemoryLRUCache synchronously). cache .set(key, serializedValue, { ttl: overallCachePolicy!.maxAge }) - .catch(console.warn); + .catch(logger.warn); } const isPrivate = overallCachePolicy.scope === CacheScope.Private; if (isPrivate) { if (!options.sessionId) { - console.warn( + logger.warn( 'A GraphQL response used @cacheControl or setCacheHint to set cache hints with scope ' + "Private, but you didn't define the sessionId hook for " + 'apollo-server-plugin-response-cache. Not caching.', From 827a1b4bda24b5ad3ff749a877c7d48b8dbfed4f Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Fri, 13 Mar 2020 21:46:51 +0200 Subject: [PATCH 286/642] gateway: when set, log using `requestContext.logger` in `executeQueryPlan`. --- packages/apollo-gateway/src/executeQueryPlan.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/apollo-gateway/src/executeQueryPlan.ts b/packages/apollo-gateway/src/executeQueryPlan.ts index cb499dfdbd0..d6f9cb8d49a 100644 --- a/packages/apollo-gateway/src/executeQueryPlan.ts +++ b/packages/apollo-gateway/src/executeQueryPlan.ts @@ -202,6 +202,7 @@ async function executeFetch( _path: ResponsePath, traceNode: Trace.QueryPlanNode.FetchNode | null, ): Promise { + const logger = context.requestContext.logger || console; const service = context.serviceMap[fetch.serviceName]; if (!service) { throw new Error(`Couldn't find service with name "${fetch.serviceName}"`); @@ -351,7 +352,7 @@ async function executeFetch( // supports that, but there's not a no-deps base64 implementation. traceBuffer = Buffer.from(traceBase64, 'base64'); } catch (err) { - console.error( + logger.error( `error decoding base64 for federated trace from ${fetch.serviceName}: ${err}`, ); traceParsingFailed = true; @@ -362,7 +363,7 @@ async function executeFetch( const trace = Trace.decode(traceBuffer); traceNode.trace = trace; } catch (err) { - console.error( + logger.error( `error decoding protobuf for federated trace from ${fetch.serviceName}: ${err}`, ); traceParsingFailed = true; From 80a12d89ea1ae9a0892f4a81d9213eddf95ca965 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Fri, 13 Mar 2020 21:48:56 +0200 Subject: [PATCH 287/642] Make `logger` required on `GraphQLServiceContext` + `GraphQLRequestContext`. As promised in 62e99d76. --- packages/apollo-server-types/src/index.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/apollo-server-types/src/index.ts b/packages/apollo-server-types/src/index.ts index 90b80a72de6..fb19ab68854 100644 --- a/packages/apollo-server-types/src/index.ts +++ b/packages/apollo-server-types/src/index.ts @@ -19,7 +19,7 @@ export type WithRequired = T & Required>; type Mutable = { -readonly [P in keyof T]: T[P] }; export interface GraphQLServiceContext { - logger?: Logger; + logger: Logger; schema: GraphQLSchema; schemaHash: string; engine: { @@ -63,7 +63,7 @@ export interface GraphQLRequestContext> { readonly request: GraphQLRequest; readonly response?: GraphQLResponse; - logger?: Logger; + logger: Logger; readonly context: TContext; readonly cache: KeyValueCache; From ea3ecf00619f4a42b50b5433fba456e109a1038c Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 16 Mar 2020 21:19:33 +0200 Subject: [PATCH 288/642] Update CHANGELOG.md --- packages/apollo-gateway/CHANGELOG.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/packages/apollo-gateway/CHANGELOG.md b/packages/apollo-gateway/CHANGELOG.md index fa7fecbeda1..e73594426cc 100644 --- a/packages/apollo-gateway/CHANGELOG.md +++ b/packages/apollo-gateway/CHANGELOG.md @@ -6,9 +6,6 @@ - Provide a more helpful error message when encountering expected errors. [PR #3811](https://github.com/apollographql/apollo-server/pull/3811) - General improvements and clarity to error messages and logging. [PR #3811](https://github.com/apollographql/apollo-server/pull/3811) - Warn of a possible misconfiguration when local service configuration is provided (via `serviceList` or `localServiceList`) and a remote Apollo Graph Manager configuration is subsequently found as well. [PR #3868](https://github.com/apollographql/apollo-server/pull/3868) - -## 0.14.0 (pre-release; `@next` tag) - - During composition, the unavailability of a downstream service in unmanaged federation mode will no longer result in a partially composed schema which merely lacks the types provided by the downed service. This prevents unexpected validation errors for clients querying a graph which lacks types which were merely unavailable during the initial composition but were intended to be part of the graph. [PR #3867](https://github.com/apollographql/apollo-server/pull/3867) ## 0.13.2 From 61f912de18abbbacb2acfb20a248b88149ccdf47 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 16 Mar 2020 21:20:47 +0200 Subject: [PATCH 289/642] Release - @apollo/federation@0.14.0-alpha.0 - @apollo/gateway@0.14.0-alpha.0 - apollo-server-azure-functions@2.12.0-alpha.0 - apollo-server-cloud-functions@2.12.0-alpha.0 - apollo-server-cloudflare@2.12.0-alpha.0 - apollo-server-core@2.12.0-alpha.0 - apollo-server-express@2.12.0-alpha.0 - apollo-server-fastify@2.12.0-alpha.0 - apollo-server-hapi@2.12.0-alpha.0 - apollo-server-integration-testsuite@2.12.0-alpha.0 - apollo-server-koa@2.12.0-alpha.0 - apollo-server-lambda@2.12.0-alpha.0 - apollo-server-micro@2.12.0-alpha.0 - apollo-server-testing@2.12.0-alpha.0 - apollo-server@2.12.0-alpha.0 --- packages/apollo-federation/package.json | 2 +- packages/apollo-gateway/package.json | 2 +- packages/apollo-server-azure-functions/package.json | 2 +- packages/apollo-server-cloud-functions/package.json | 2 +- packages/apollo-server-cloudflare/package.json | 2 +- packages/apollo-server-core/package.json | 2 +- packages/apollo-server-express/package.json | 2 +- packages/apollo-server-fastify/package.json | 2 +- packages/apollo-server-hapi/package.json | 2 +- packages/apollo-server-integration-testsuite/package.json | 2 +- packages/apollo-server-koa/package.json | 2 +- packages/apollo-server-lambda/package.json | 2 +- packages/apollo-server-micro/package.json | 2 +- packages/apollo-server-testing/package.json | 2 +- packages/apollo-server/package.json | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/packages/apollo-federation/package.json b/packages/apollo-federation/package.json index 5e0f8c8e2eb..6bc7cb66426 100644 --- a/packages/apollo-federation/package.json +++ b/packages/apollo-federation/package.json @@ -1,6 +1,6 @@ { "name": "@apollo/federation", - "version": "0.13.2", + "version": "0.14.0-alpha.0", "description": "Apollo Federation Utilities", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-gateway/package.json b/packages/apollo-gateway/package.json index afb50536e78..4c9117ec64c 100644 --- a/packages/apollo-gateway/package.json +++ b/packages/apollo-gateway/package.json @@ -1,6 +1,6 @@ { "name": "@apollo/gateway", - "version": "0.13.2", + "version": "0.14.0-alpha.0", "description": "Apollo Gateway", "author": "opensource@apollographql.com", "main": "dist/index.js", diff --git a/packages/apollo-server-azure-functions/package.json b/packages/apollo-server-azure-functions/package.json index eb569b7eed8..f6b8930117e 100644 --- a/packages/apollo-server-azure-functions/package.json +++ b/packages/apollo-server-azure-functions/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-azure-functions", - "version": "2.11.0", + "version": "2.12.0-alpha.0", "description": "Production-ready Node.js GraphQL server for Azure Functions", "keywords": [ "GraphQL", diff --git a/packages/apollo-server-cloud-functions/package.json b/packages/apollo-server-cloud-functions/package.json index e07a8d0c305..25607fc4b43 100644 --- a/packages/apollo-server-cloud-functions/package.json +++ b/packages/apollo-server-cloud-functions/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-cloud-functions", - "version": "2.11.0", + "version": "2.12.0-alpha.0", "description": "Production-ready Node.js GraphQL server for Google Cloud Functions", "keywords": [ "GraphQL", diff --git a/packages/apollo-server-cloudflare/package.json b/packages/apollo-server-cloudflare/package.json index 835cb36ad94..ffcdf28f40f 100644 --- a/packages/apollo-server-cloudflare/package.json +++ b/packages/apollo-server-cloudflare/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-cloudflare", - "version": "2.11.0", + "version": "2.12.0-alpha.0", "description": "Production-ready Node.js GraphQL server for Cloudflare workers", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-core/package.json b/packages/apollo-server-core/package.json index 1f666b46952..be38b512cc2 100644 --- a/packages/apollo-server-core/package.json +++ b/packages/apollo-server-core/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-core", - "version": "2.11.0", + "version": "2.12.0-alpha.0", "description": "Core engine for Apollo GraphQL server", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-express/package.json b/packages/apollo-server-express/package.json index ed759059c79..b41eb440035 100644 --- a/packages/apollo-server-express/package.json +++ b/packages/apollo-server-express/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-express", - "version": "2.11.0", + "version": "2.12.0-alpha.0", "description": "Production-ready Node.js GraphQL server for Express and Connect", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-fastify/package.json b/packages/apollo-server-fastify/package.json index d55f19ddbd1..5c088ade513 100644 --- a/packages/apollo-server-fastify/package.json +++ b/packages/apollo-server-fastify/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-fastify", - "version": "2.11.0", + "version": "2.12.0-alpha.0", "description": "Production-ready Node.js GraphQL server for Fastify", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-hapi/package.json b/packages/apollo-server-hapi/package.json index aa4d6dad16a..01befb01cc5 100644 --- a/packages/apollo-server-hapi/package.json +++ b/packages/apollo-server-hapi/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-hapi", - "version": "2.11.0", + "version": "2.12.0-alpha.0", "description": "Production-ready Node.js GraphQL server for Hapi", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-integration-testsuite/package.json b/packages/apollo-server-integration-testsuite/package.json index d37ad357d0d..0d4a17ddcdf 100644 --- a/packages/apollo-server-integration-testsuite/package.json +++ b/packages/apollo-server-integration-testsuite/package.json @@ -1,7 +1,7 @@ { "name": "apollo-server-integration-testsuite", "private": true, - "version": "2.11.0", + "version": "2.12.0-alpha.0", "description": "Apollo Server Integrations testsuite", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-koa/package.json b/packages/apollo-server-koa/package.json index fcb19526726..82095f8e03a 100644 --- a/packages/apollo-server-koa/package.json +++ b/packages/apollo-server-koa/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-koa", - "version": "2.11.0", + "version": "2.12.0-alpha.0", "description": "Production-ready Node.js GraphQL server for Koa", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-lambda/package.json b/packages/apollo-server-lambda/package.json index 1d9ac1319ab..756af5fc18f 100644 --- a/packages/apollo-server-lambda/package.json +++ b/packages/apollo-server-lambda/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-lambda", - "version": "2.11.0", + "version": "2.12.0-alpha.0", "description": "Production-ready Node.js GraphQL server for AWS Lambda", "keywords": [ "GraphQL", diff --git a/packages/apollo-server-micro/package.json b/packages/apollo-server-micro/package.json index e5b2ea588ad..898ecd7f205 100644 --- a/packages/apollo-server-micro/package.json +++ b/packages/apollo-server-micro/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-micro", - "version": "2.11.0", + "version": "2.12.0-alpha.0", "description": "Production-ready Node.js GraphQL server for Micro", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-testing/package.json b/packages/apollo-server-testing/package.json index 818f758fa75..dd6ca0f4e16 100644 --- a/packages/apollo-server-testing/package.json +++ b/packages/apollo-server-testing/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-testing", - "version": "2.11.0", + "version": "2.12.0-alpha.0", "description": "Test utils for apollo-server", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server/package.json b/packages/apollo-server/package.json index a30247b5344..7f5bcd9a680 100644 --- a/packages/apollo-server/package.json +++ b/packages/apollo-server/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server", - "version": "2.11.0", + "version": "2.12.0-alpha.0", "description": "Production ready GraphQL Server", "author": "opensource@apollographql.com", "main": "dist/index.js", From fea6f15f6363748fdbcda2390fb070a8e6e8e82e Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 17 Mar 2020 13:39:11 +0200 Subject: [PATCH 290/642] Fix all the spelling mistakes. You'd think I dictated these using Siri or something. Thanks, @trevor-scheer. Co-Authored-By: Trevor Scheer --- .../apollo-gateway/src/__tests__/integration/logger.test.ts | 4 ++-- packages/apollo-gateway/src/index.ts | 2 +- packages/apollo-server-core/src/ApolloServer.ts | 4 ++-- packages/apollo-server-core/src/runHttpQuery.ts | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/apollo-gateway/src/__tests__/integration/logger.test.ts b/packages/apollo-gateway/src/__tests__/integration/logger.test.ts index 7632fc80810..690c046d421 100644 --- a/packages/apollo-gateway/src/__tests__/integration/logger.test.ts +++ b/packages/apollo-gateway/src/__tests__/integration/logger.test.ts @@ -17,9 +17,9 @@ const KNOWN_DEBUG_MESSAGE = "Checking service definitions..."; async function triggerKnownDebugMessage(logger: Logger) { // Trigger a known error. - // This is a bit britle since it merely leverages a known debug log + // This is a bit brittle since it merely leverages a known debug log // message outside of the constructor, but it seemed worth testing - // the compatibility with `ApolloGateway` itself rather than genericly. + // the compatibility with `ApolloGateway` itself rather than generically. // The error does not matter, so it is caught and ignored. await new ApolloGateway({ logger }).load().catch(_e => {}); } diff --git a/packages/apollo-gateway/src/index.ts b/packages/apollo-gateway/src/index.ts index 788018beae4..fbb219cd08c 100644 --- a/packages/apollo-gateway/src/index.ts +++ b/packages/apollo-gateway/src/index.ts @@ -222,7 +222,7 @@ export class ApolloGateway implements GraphQLService { if (this.config.logger) { this.logger = this.config.logger; } else { - // If the user didn't prvoide their own logger, we'll initialize one. + // If the user didn't provide their own logger, we'll initialize one. const loglevelLogger = loglevel.getLogger(`apollo-gateway:`); // Support DEBUG environment variable, à la https://npm.im/debug/. diff --git a/packages/apollo-server-core/src/ApolloServer.ts b/packages/apollo-server-core/src/ApolloServer.ts index d29b3d3390c..e56fba35136 100644 --- a/packages/apollo-server-core/src/ApolloServer.ts +++ b/packages/apollo-server-core/src/ApolloServer.ts @@ -192,11 +192,11 @@ export class ApolloServerBase { if (config.logger) { this.logger = config.logger; } else { - // If the user didn't prvoide their own logger, we'll initialize one. + // If the user didn't provide their own logger, we'll initialize one. const loglevelLogger = loglevel.getLogger("apollo-server"); // We don't do much logging in Apollo Server right now. There's a notion - // of a `debug` flag, but it doesn't so much besides change stack traces + // of a `debug` flag, but it doesn't do much besides change stack traces // in some error messages, but it would be odd for it to not introduce // debug or higher level errors (which includes `info`, if we happen to // start introducing those. We'll default to `warn` as a sensible default diff --git a/packages/apollo-server-core/src/runHttpQuery.ts b/packages/apollo-server-core/src/runHttpQuery.ts index 4e8f32e7f8c..c229fe87cf7 100644 --- a/packages/apollo-server-core/src/runHttpQuery.ts +++ b/packages/apollo-server-core/src/runHttpQuery.ts @@ -253,7 +253,7 @@ export async function processHTTPRequest( return { // While `logger` is guaranteed by internal Apollo Server usage of // this `processHTTPRequest` method, this method has been publicly - // exported since perhaps as far back as Apollo Server 1.x. Therefore, + // exported since perhaps as far back as Apollo Server 1.x. Therefore, // for compatibility reasons, we'll default to `console`. logger: options.logger || console, request, From 2461e9829fc327a2d49aaaad03fc971f23718bea Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 17 Mar 2020 16:15:27 +0200 Subject: [PATCH 291/642] Add CHANGELOG for #3894. --- CHANGELOG.md | 4 ++++ packages/apollo-gateway/CHANGELOG.md | 1 + 2 files changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b3c52302aa6..53f8dea105e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,10 @@ 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) +### v2.13.0 + +- `apollo-server-core`: Support providing a custom logger implementation (e.g. [`winston`](https://npm.im/winston), [`bunyan`](https://npm.im/bunyan), etc.) to capture server console messages. Though there has historically been limited output from Apollo Server, some messages are important to capture in the larger context of production logging facilities or can benefit from using more advanced structure, like JSON-based logging. This also introduces a `logger` property to the `GraphQLRequestContext` that is exposed to plugins, making it possible for plugins to leverage the same server-level logger, and allowing implementors to create request-specific log contexts, if desired. When not provided, these will still output to `console`. [PR #3894](https://github.com/apollographql/apollo-server/pull/3894) + ### v2.12.0 - `apollo-server-core`: When operating in gateway mode using the `gateway` property of the Apollo Server constructor options, the failure to initialize a schema during initial start-up, e.g. connectivity problems, will no longer result in the federated executor from being assigned when the schema eventually becomes available. This precludes a state where the gateway may never become available to serve federated requests, even when failure conditions are no longer present. [PR #3811](https://github.com/apollographql/apollo-server/pull/3811) diff --git a/packages/apollo-gateway/CHANGELOG.md b/packages/apollo-gateway/CHANGELOG.md index e73594426cc..6700d4de5d6 100644 --- a/packages/apollo-gateway/CHANGELOG.md +++ b/packages/apollo-gateway/CHANGELOG.md @@ -7,6 +7,7 @@ - General improvements and clarity to error messages and logging. [PR #3811](https://github.com/apollographql/apollo-server/pull/3811) - Warn of a possible misconfiguration when local service configuration is provided (via `serviceList` or `localServiceList`) and a remote Apollo Graph Manager configuration is subsequently found as well. [PR #3868](https://github.com/apollographql/apollo-server/pull/3868) - During composition, the unavailability of a downstream service in unmanaged federation mode will no longer result in a partially composed schema which merely lacks the types provided by the downed service. This prevents unexpected validation errors for clients querying a graph which lacks types which were merely unavailable during the initial composition but were intended to be part of the graph. [PR #3867](https://github.com/apollographql/apollo-server/pull/3867) +- Support providing a custom logger implementation (e.g. [`winston`](https://npm.im/winston), [`bunyan`](https://npm.im/bunyan), etc.) to capture gateway-sourced console output. This allows the use of existing, production logging facilities or the possibiltiy to use advanced structure in logging, such as console output which is encapsulated in JSON. The same PR that introduces this support also introduces a `logger` property to the `GraphQLRequestContext` that is exposed to `GraphQLDataSource`s and Apollo Server plugins, making it possible to attach additional properties (as supported by the logger implementation) to specific requests, if desired, by leveraging custom implementations in those components respectively. When not provided, these will still output to `console`. [PR #3894](https://github.com/apollographql/apollo-server/pull/3894) ## 0.13.2 From 6a5402f5e34aeaf5332a87e214fba55ff09879df Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 17 Mar 2020 16:51:21 +0200 Subject: [PATCH 292/642] docs: Explain `logger` on `ApolloServer` and `EngineReportingOptions`. --- docs/source/api/apollo-server.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/docs/source/api/apollo-server.md b/docs/source/api/apollo-server.md index 4dac689d772..c5ba9fc92a6 100644 --- a/docs/source/api/apollo-server.md +++ b/docs/source/api/apollo-server.md @@ -68,6 +68,12 @@ new ApolloServer({ | AWS Lambda | {
  event: [`APIGatewayProxyEvent`](https://github.com/DefinitelyTyped/DefinitelyTyped/blob/50adc95acf873e714256074311353232fcc1b5ed/types/aws-lambda/index.d.ts#L78-L92),
  context: [`LambdaContext`](https://github.com/DefinitelyTyped/DefinitelyTyped/blob/50adc95acf873e714256074311353232fcc1b5ed/types/aws-lambda/index.d.ts#L510-L534)
} | | Micro | { req: [`MicroRequest`](https://github.com/apollographql/apollo-server/blob/c356bcf3f2864b8d2fcca0add455071e0606ef46/packages/apollo-server-micro/src/types.ts#L3-L5), res: [`ServerResponse`](https://github.com/DefinitelyTyped/DefinitelyTyped/blob/50adc95acf873e714256074311353232fcc1b5ed/types/node/v10/http.d.ts#L145-L158) } | + * `logger`: `Logger` + + A logging implementation to be used in place of `console`. The implementation must provide the methods which satisfy the requirements of [the `Logger` interface](https://github.com/apollographql/apollo-server/blob/80a12d89ea1ae9a0892f4a81d9213eddf95ca965/packages/apollo-server-types/src/index.ts#L114-L121) (i.e. it must provide `debug`, `info`, `warn` and `error` methods). When a custom logger is provided, it will receive all levels of logging and it is up to the logger itself to determine how it wishes to handle each level. When a custom logger is _not_ provided, Apollo Server will default to outputting `warn` and `error` levels unless `debug: true` is specified, in which case it will output all log levels (i.e. `debug` through `error`). + + Additionally, this `logger` will be made available on the `GraphQLRequestContext` and available to plugins. This allows a plugin to, e.g., augment the logger on a per-request basis within the `requestDidStart` life-cycle hook. + * `rootValue`: <`Any`> | <`Function`> A value or function called with the parsed `Document`, creating the root value passed to the graphql executor. The function is useful if you wish to provide a different root value based on the query operation type. @@ -337,6 +343,10 @@ addMockFunctionsToSchema({ a service. You can also specify an API key with the `ENGINE_API_KEY` environment variable, although the `apiKey` option takes precedence. +* `logger`: `Logger` + + By default, this will inherit from the `logger` provided to `ApolloServer` which defaults to `console` when not provided. If specified within the `EngineReportingOptions` it can be used to send engine reporting to a separate logger. If provided, the implementation must provide the methods which satisfy the requirements of [the `Logger` interface](https://github.com/apollographql/apollo-server/blob/80a12d89ea1ae9a0892f4a81d9213eddf95ca965/packages/apollo-server-types/src/index.ts#L114-L121) (i.e. it must provide `debug`, `info`, `warn` and `error` methods). + * `calculateSignature`: (ast: DocumentNode, operationName: string) => string Specify the function for creating a signature for a query. From f6ba2dea9b4f7c8aa602cad66398685d8bdbc3a2 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 17 Mar 2020 20:58:22 +0200 Subject: [PATCH 293/642] Kinda revert "Decompose `GatewayConfigBase` into types in prep..." This reverts the decomposition introduced by commit 8a19ecc72b940914d02cf4083bb69e3980e18433, but also maintains the bit that was added right after it in 780d7f4d204ae644ca2f0d. Specifically, I misjudged with the direction I was headed. While my intent was to have `debug` and `logger` be mutually exclusive, it turns out that in order to preserve the existing behavior, I need to make sure that `debug: true` is the thing that puts the default logger (`loglevel`) into the appropriate level where it still prints out various legacy messages. cc @trevor-scheer --- packages/apollo-gateway/src/index.ts | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/packages/apollo-gateway/src/index.ts b/packages/apollo-gateway/src/index.ts index fbb219cd08c..64f6ca18e46 100644 --- a/packages/apollo-gateway/src/index.ts +++ b/packages/apollo-gateway/src/index.ts @@ -47,12 +47,9 @@ import { fetch } from 'apollo-server-env'; export type ServiceEndpointDefinition = Pick; -// debug and logger are mutually exclusive options. -type LoggerConfig = - | { debug?: boolean; logger?: never; } - | { debug?: never; logger?: Logger; } - -type GatewayConfigBase = { +interface GatewayConfigBase { + debug?: boolean; + logger?: Logger; // TODO: expose the query plan in a more flexible JSON format in the future // and remove this config option in favor of `exposeQueryPlan`. Playground // should cutover to use the new option when it's built. @@ -68,17 +65,17 @@ type GatewayConfigBase = { experimental_approximateQueryPlanStoreMiB?: number; experimental_autoFragmentization?: boolean; fetcher?: typeof fetch; -} & LoggerConfig; +} -type RemoteGatewayConfig = GatewayConfigBase & { +interface RemoteGatewayConfig extends GatewayConfigBase { serviceList: ServiceEndpointDefinition[]; introspectionHeaders?: HeadersInit; } -type ManagedGatewayConfig = GatewayConfigBase & { +interface ManagedGatewayConfig extends GatewayConfigBase { federationVersion?: number; } -type LocalGatewayConfig = GatewayConfigBase & { +interface LocalGatewayConfig extends GatewayConfigBase { localServiceList: ServiceDefinition[]; } From 603608d606f72485726114b82a94b0be35b34cce Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 17 Mar 2020 21:40:43 +0200 Subject: [PATCH 294/642] docs: Explain `logger` on `ApolloGateway` in the API reference. --- docs/source/api/apollo-gateway.mdx | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/docs/source/api/apollo-gateway.mdx b/docs/source/api/apollo-gateway.mdx index 4bc25991967..1cf5ee6e4d2 100644 --- a/docs/source/api/apollo-gateway.mdx +++ b/docs/source/api/apollo-gateway.mdx @@ -99,13 +99,20 @@ example of using `ApolloGateway`, see [The gateway](/federation/gateway/). }); ``` + * `logger`: `Logger` + + A logging implementation to be used in place of `console`. The implementation must provide the methods which satisfy the requirements of [the `Logger` interface](https://github.com/apollographql/apollo-server/blob/80a12d89ea1ae9a0892f4a81d9213eddf95ca965/packages/apollo-server-types/src/index.ts#L114-L121) (i.e. it must provide `debug`, `info`, `warn` and `error` methods). When a custom logger is provided, it will receive all levels of logging and it is up to the logger itself to determine how it wishes to handle each level. When a custom logger is _not_ provided, Gateway will default to outputting `warn` and `error` levels unless `debug: true` is specified, in which case it will output all log levels (i.e. `debug` through `error`). + + Additionally, this `logger` will be made available on the `GraphQLRequestContext` and available to plugins. This allows a plugin to, e.g., augment the logger on a per-request basis within the `requestDidStart` life-cycle hook. + + * `debug`: `Boolean` If `true`, the gateway logs startup messages, along with the query plan for each incoming request. The default value is `false`. - + * `fetcher`: `typeof fetch` - + When specified, overrides the default [Fetch API](https://fetch.spec.whatwg.org/#fetch-api) implementation which is used when communicating with downstream services. By default, From fefe7ff40ae64118110d09949a8787a02ad16d0c Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 17 Mar 2020 21:45:01 +0200 Subject: [PATCH 295/642] Apply counter-intuitive severity to `debugPrintReports` messages. In terms of verbosity, and as the name of this option suggests, the output when `debugPrintReports` is enabled is is either an "info" or a "debug" level message. However, we are using `warn` here for compatibility reasons since the `debugPrintReports` flag pre-dated the existence of log-levels and changing this to also require `debug: true` (in addition to `debugPrintReports`) just to reach the level of verbosity to produce the output would be a breaking change. The "warn" level is on by default. There is a similar theory and comment applied below. cc @trevor-scheer --- packages/apollo-engine-reporting/src/agent.ts | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/packages/apollo-engine-reporting/src/agent.ts b/packages/apollo-engine-reporting/src/agent.ts index 574e94d4c84..6d62aee56bd 100644 --- a/packages/apollo-engine-reporting/src/agent.ts +++ b/packages/apollo-engine-reporting/src/agent.ts @@ -362,7 +362,15 @@ export class EngineReportingAgent { await Promise.resolve(); if (this.options.debugPrintReports) { - this.logger.debug( + // In terms of verbosity, and as the name of this option suggests, this + // message is either an "info" or a "debug" level message. However, + // we are using `warn` here for compatibility reasons since the + // `debugPrintReports` flag pre-dated the existence of log-levels and + // changing this to also require `debug: true` (in addition to + // `debugPrintReports`) just to reach the level of verbosity to produce + // the output would be a breaking change. The "warn" level is on by + // default. There is a similar theory and comment applied below. + this.logger.warn( `Engine sending report: ${JSON.stringify(report.toJSON())}`, ); } @@ -441,7 +449,15 @@ export class EngineReportingAgent { ); } if (this.options.debugPrintReports) { - this.logger.debug(`Engine report: status ${response.status}`); + // In terms of verbosity, and as the name of this option suggests, this + // message is either an "info" or a "debug" level message. However, + // we are using `warn` here for compatibility reasons since the + // `debugPrintReports` flag pre-dated the existence of log-levels and + // changing this to also require `debug: true` (in addition to + // `debugPrintReports`) just to reach the level of verbosity to produce + // the output would be a breaking change. The "warn" level is on by + // default. There is a similar theory and comment applied above. + this.logger.warn(`Engine report: status ${response.status}`); } } From b32e1d1b3eef27cd4a6710aaa62b996a728b725d Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 17 Mar 2020 22:32:08 +0200 Subject: [PATCH 296/642] docs: Note presence of `logger` in plugins' lifecycle hooks. --- docs/source/integrations/plugins.md | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/docs/source/integrations/plugins.md b/docs/source/integrations/plugins.md index 0400c487195..2ab21962324 100644 --- a/docs/source/integrations/plugins.md +++ b/docs/source/integrations/plugins.md @@ -269,6 +269,15 @@ const server = new ApolloServer({ The `requestDidStart` event fires whenever Apollo Server begins fulfilling a GraphQL request. +```typescript +requestDidStart?( + requestContext: WithRequired< + GraphQLRequestContext, + 'request' | 'context' | 'logger' + > +): GraphQLRequestListener | void; +``` + This function can optionally return an object that includes functions for responding to request lifecycle events that might follow `requestDidStart`. @@ -318,7 +327,7 @@ does not occur. parsingDidStart?( requestContext: WithRequired< GraphQLRequestContext, - 'metrics' | 'source' + 'metrics' | 'source' | 'logger' >, ): (err?: Error) => void | void; ``` @@ -338,7 +347,7 @@ available at this stage, because parsing must succeed for validation to occur. validationDidStart?( requestContext: WithRequired< GraphQLRequestContext, - 'metrics' | 'source' | 'document' + 'metrics' | 'source' | 'document' | 'logger' >, ): (err?: ReadonlyArray) => void | void; ``` @@ -355,7 +364,7 @@ both the `operationName` string and `operation` AST are available. didResolveOperation?( requestContext: WithRequired< GraphQLRequestContext, - 'metrics' | 'source' | 'document' | 'operationName' | 'operation' + 'metrics' | 'source' | 'document' | 'operationName' | 'operation' | 'logger' >, ): ValueOrPromise; ``` @@ -371,7 +380,7 @@ are invoked in series, and the first non-null response is used. responseForOperation?( requestContext: WithRequired< GraphQLRequestContext, - 'metrics' | 'source' | 'document' | 'operationName' | 'operation' + 'metrics' | 'source' | 'document' | 'operationName' | 'operation' | 'logger' >, ): ValueOrPromise; ``` @@ -385,7 +394,7 @@ GraphQL operation specified by a request's `document` AST. executionDidStart?( requestContext: WithRequired< GraphQLRequestContext, - 'metrics' | 'source' | 'document' | 'operationName' | 'operation' + 'metrics' | 'source' | 'document' | 'operationName' | 'operation' | 'logger' >, ): (err?: Error) => void | void; ``` @@ -399,7 +408,7 @@ parsing, validating, or executing a GraphQL operation. didEncounterErrors?( requestContext: WithRequired< GraphQLRequestContext, - 'metrics' | 'source' | 'errors' + 'metrics' | 'source' | 'errors' | 'logger' >, ): ValueOrPromise; ``` @@ -414,7 +423,7 @@ if the GraphQL operation encounters one or more errors. willSendResponse?( requestContext: WithRequired< GraphQLRequestContext, - 'metrics' | 'response' + 'metrics' | 'response' | 'logger' >, ): ValueOrPromise; ``` From 4482da8e84a0ee032fe29d11f1e1851336ff3d87 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 17 Mar 2020 23:21:31 +0200 Subject: [PATCH 297/642] Fix typo in title of gateway CHANGELOG. --- packages/apollo-gateway/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-gateway/CHANGELOG.md b/packages/apollo-gateway/CHANGELOG.md index e73594426cc..c28295efe78 100644 --- a/packages/apollo-gateway/CHANGELOG.md +++ b/packages/apollo-gateway/CHANGELOG.md @@ -1,4 +1,4 @@ -# CHANGELOG for `@apollo/gatewae` +# CHANGELOG for `@apollo/gateway` ## 0.14.0 (pre-release; `@next` tag) From 0ca43f801e7e1bfc7a03baa937b9274da6f97a44 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Wed, 18 Mar 2020 19:32:40 +0200 Subject: [PATCH 298/642] Remove `loglevel-debug` and `DEBUG=apollo-gateway:*` support. (#3896) While this package provided some simple functionality at one point or another, it was neither actively maintained, properly typed, and as of # fully-featured as of https://github.com/apollographql/apollo-server/pull/3894, no longer really necessary. Also, since it re-uses the same logger based on repeat requests to `getLogger("name")` in a global context, it was responsible for recursively wrapping our log function in tests with the same `methodFactory` and causing our log messages to get longer and longer for each test which used `ApolloGateway`. This only affected tests, but was hard to track down the cause! The new `logger` functionality in the above PR should provide much more flexibility here and `debug: true` on the `ApolloGateway` constructor can replicate the same behavior. Anyone who misses this behavior can utilize the new pluggable logger to provide [`loglevel-debug`] themselves! --- package-lock.json | 9 --------- packages/apollo-gateway/CHANGELOG.md | 1 + packages/apollo-gateway/package.json | 1 - packages/apollo-gateway/src/index.ts | 10 ++++------ types/loglevel-debug/index.d.ts | 4 ---- 5 files changed, 5 insertions(+), 20 deletions(-) delete mode 100644 types/loglevel-debug/index.d.ts diff --git a/package-lock.json b/package-lock.json index 9ca389b2b49..93fc3372717 100644 --- a/package-lock.json +++ b/package-lock.json @@ -33,7 +33,6 @@ "apollo-server-types": "file:packages/apollo-server-types", "graphql-extensions": "file:packages/graphql-extensions", "loglevel": "^1.6.1", - "loglevel-debug": "^0.0.1", "make-fetch-happen": "^7.1.1", "pretty-format": "^24.7.0" }, @@ -12278,14 +12277,6 @@ "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.4.tgz", "integrity": "sha512-p0b6mOGKcGa+7nnmKbpzR6qloPbrgLcnio++E+14Vo/XffOGwZtRpUhr8dTH/x2oCMmEoIU0Zwm3ZauhvYD17g==" }, - "loglevel-debug": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/loglevel-debug/-/loglevel-debug-0.0.1.tgz", - "integrity": "sha1-ifidPboTy6iiy0YV1dOtcYn0iik=", - "requires": { - "loglevel": "^1.4.0" - } - }, "long": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz", diff --git a/packages/apollo-gateway/CHANGELOG.md b/packages/apollo-gateway/CHANGELOG.md index 990a1f76127..8be0a89d74b 100644 --- a/packages/apollo-gateway/CHANGELOG.md +++ b/packages/apollo-gateway/CHANGELOG.md @@ -8,6 +8,7 @@ - Warn of a possible misconfiguration when local service configuration is provided (via `serviceList` or `localServiceList`) and a remote Apollo Graph Manager configuration is subsequently found as well. [PR #3868](https://github.com/apollographql/apollo-server/pull/3868) - During composition, the unavailability of a downstream service in unmanaged federation mode will no longer result in a partially composed schema which merely lacks the types provided by the downed service. This prevents unexpected validation errors for clients querying a graph which lacks types which were merely unavailable during the initial composition but were intended to be part of the graph. [PR #3867](https://github.com/apollographql/apollo-server/pull/3867) - Support providing a custom logger implementation (e.g. [`winston`](https://npm.im/winston), [`bunyan`](https://npm.im/bunyan), etc.) to capture gateway-sourced console output. This allows the use of existing, production logging facilities or the possibiltiy to use advanced structure in logging, such as console output which is encapsulated in JSON. The same PR that introduces this support also introduces a `logger` property to the `GraphQLRequestContext` that is exposed to `GraphQLDataSource`s and Apollo Server plugins, making it possible to attach additional properties (as supported by the logger implementation) to specific requests, if desired, by leveraging custom implementations in those components respectively. When not provided, these will still output to `console`. [PR #3894](https://github.com/apollographql/apollo-server/pull/3894) +- Drop use of `loglevel-debug`. This removes the very long date and time prefix in front of each log line and also the support for the `DEBUG=apollo-gateway:` environment variable. Both of these were uncommonly necessary or seldom used (with the environment variable also being undocumented). The existing behavior can be preserved by providing a `logger` that uses `loglevel-debug`, if desired, and more details can be found in the PR. [PR #3896](https://github.com/apollographql/apollo-server/pull/3896) ## 0.13.2 diff --git a/packages/apollo-gateway/package.json b/packages/apollo-gateway/package.json index 4c9117ec64c..1719e60a6b7 100644 --- a/packages/apollo-gateway/package.json +++ b/packages/apollo-gateway/package.json @@ -30,7 +30,6 @@ "apollo-server-types": "file:../apollo-server-types", "graphql-extensions": "file:../graphql-extensions", "loglevel": "^1.6.1", - "loglevel-debug": "^0.0.1", "make-fetch-happen": "^7.1.1", "pretty-format": "^24.7.0" }, diff --git a/packages/apollo-gateway/src/index.ts b/packages/apollo-gateway/src/index.ts index 64f6ca18e46..fcc911300d2 100644 --- a/packages/apollo-gateway/src/index.ts +++ b/packages/apollo-gateway/src/index.ts @@ -21,7 +21,6 @@ import { import { GraphQLSchemaValidationError } from 'apollo-graphql'; import { composeAndValidate, ServiceDefinition } from '@apollo/federation'; import loglevel from 'loglevel'; -import loglevelDebug from 'loglevel-debug'; import { buildQueryPlan, buildOperationContext } from './buildQueryPlan'; import { @@ -220,14 +219,13 @@ export class ApolloGateway implements GraphQLService { this.logger = this.config.logger; } else { // If the user didn't provide their own logger, we'll initialize one. - const loglevelLogger = loglevel.getLogger(`apollo-gateway:`); - - // Support DEBUG environment variable, à la https://npm.im/debug/. - loglevelDebug(loglevelLogger); + const loglevelLogger = loglevel.getLogger(`apollo-gateway`); // And also support the `debug` option, if it's truthy. if (this.config.debug === true) { - loglevelLogger.enableAll(); + loglevelLogger.setLevel(loglevelLogger.levels.DEBUG); + } else { + loglevelLogger.setLevel(loglevelLogger.levels.WARN); } this.logger = loglevelLogger; diff --git a/types/loglevel-debug/index.d.ts b/types/loglevel-debug/index.d.ts deleted file mode 100644 index 36cf04af657..00000000000 --- a/types/loglevel-debug/index.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -import { Logger } from 'loglevel'; -declare module 'loglevel-debug' { - export default function(logger: Logger): any; -} From 7422d70e19576f7e34aa289c535325552881a17f Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Wed, 18 Mar 2020 19:52:20 +0200 Subject: [PATCH 299/642] Release - apollo-cache-control@0.9.1-alpha.1 - apollo-datasource-rest@0.8.1-alpha.1 - apollo-engine-reporting@1.7.1-alpha.1 - @apollo/gateway@0.14.0-alpha.1 - apollo-server-azure-functions@2.12.0-alpha.1 - apollo-server-cache-redis@1.1.6-alpha.1 - apollo-server-cloud-functions@2.12.0-alpha.1 - apollo-server-cloudflare@2.12.0-alpha.1 - apollo-server-core@2.12.0-alpha.1 - apollo-server-express@2.12.0-alpha.1 - apollo-server-fastify@2.12.0-alpha.1 - apollo-server-hapi@2.12.0-alpha.1 - apollo-server-integration-testsuite@2.12.0-alpha.1 - apollo-server-koa@2.12.0-alpha.1 - apollo-server-lambda@2.12.0-alpha.1 - apollo-server-micro@2.12.0-alpha.1 - apollo-server-plugin-base@0.7.1-alpha.1 - apollo-server-plugin-response-cache@0.4.1-alpha.1 - apollo-server-testing@2.12.0-alpha.1 - apollo-server-types@0.3.1-alpha.1 - apollo-server@2.12.0-alpha.1 - apollo-tracing@0.9.1-alpha.1 - graphql-extensions@0.11.1-alpha.1 --- packages/apollo-cache-control/package.json | 2 +- packages/apollo-datasource-rest/package.json | 2 +- packages/apollo-engine-reporting/package.json | 2 +- packages/apollo-gateway/package.json | 2 +- packages/apollo-server-azure-functions/package.json | 2 +- packages/apollo-server-cache-redis/package.json | 2 +- packages/apollo-server-cloud-functions/package.json | 2 +- packages/apollo-server-cloudflare/package.json | 2 +- packages/apollo-server-core/package.json | 2 +- packages/apollo-server-express/package.json | 2 +- packages/apollo-server-fastify/package.json | 2 +- packages/apollo-server-hapi/package.json | 2 +- packages/apollo-server-integration-testsuite/package.json | 2 +- packages/apollo-server-koa/package.json | 2 +- packages/apollo-server-lambda/package.json | 2 +- packages/apollo-server-micro/package.json | 2 +- packages/apollo-server-plugin-base/package.json | 2 +- packages/apollo-server-plugin-response-cache/package.json | 2 +- packages/apollo-server-testing/package.json | 2 +- packages/apollo-server-types/package.json | 2 +- packages/apollo-server/package.json | 2 +- packages/apollo-tracing/package.json | 2 +- packages/graphql-extensions/package.json | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/packages/apollo-cache-control/package.json b/packages/apollo-cache-control/package.json index 4fbb9715371..e3e3ab79aee 100644 --- a/packages/apollo-cache-control/package.json +++ b/packages/apollo-cache-control/package.json @@ -1,6 +1,6 @@ { "name": "apollo-cache-control", - "version": "0.9.0", + "version": "0.9.1-alpha.1", "description": "A GraphQL extension for cache control", "main": "./dist/index.js", "types": "./dist/index.d.ts", diff --git a/packages/apollo-datasource-rest/package.json b/packages/apollo-datasource-rest/package.json index da8a4f68237..c8daddb66a5 100644 --- a/packages/apollo-datasource-rest/package.json +++ b/packages/apollo-datasource-rest/package.json @@ -1,6 +1,6 @@ { "name": "apollo-datasource-rest", - "version": "0.8.0", + "version": "0.8.1-alpha.1", "author": "opensource@apollographql.com", "license": "MIT", "repository": { diff --git a/packages/apollo-engine-reporting/package.json b/packages/apollo-engine-reporting/package.json index 45b1eb2580f..90478347642 100644 --- a/packages/apollo-engine-reporting/package.json +++ b/packages/apollo-engine-reporting/package.json @@ -1,6 +1,6 @@ { "name": "apollo-engine-reporting", - "version": "1.7.0", + "version": "1.7.1-alpha.1", "description": "Send reports about your GraphQL services to Apollo Graph Manager (previously known as Apollo Engine)", "main": "./dist/index.js", "types": "./dist/index.d.ts", diff --git a/packages/apollo-gateway/package.json b/packages/apollo-gateway/package.json index 1719e60a6b7..4a49c0dee4c 100644 --- a/packages/apollo-gateway/package.json +++ b/packages/apollo-gateway/package.json @@ -1,6 +1,6 @@ { "name": "@apollo/gateway", - "version": "0.14.0-alpha.0", + "version": "0.14.0-alpha.1", "description": "Apollo Gateway", "author": "opensource@apollographql.com", "main": "dist/index.js", diff --git a/packages/apollo-server-azure-functions/package.json b/packages/apollo-server-azure-functions/package.json index f6b8930117e..8a530d82c37 100644 --- a/packages/apollo-server-azure-functions/package.json +++ b/packages/apollo-server-azure-functions/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-azure-functions", - "version": "2.12.0-alpha.0", + "version": "2.12.0-alpha.1", "description": "Production-ready Node.js GraphQL server for Azure Functions", "keywords": [ "GraphQL", diff --git a/packages/apollo-server-cache-redis/package.json b/packages/apollo-server-cache-redis/package.json index d51436b5f18..16160207596 100644 --- a/packages/apollo-server-cache-redis/package.json +++ b/packages/apollo-server-cache-redis/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-cache-redis", - "version": "1.1.5", + "version": "1.1.6-alpha.1", "author": "opensource@apollographql.com", "license": "MIT", "repository": { diff --git a/packages/apollo-server-cloud-functions/package.json b/packages/apollo-server-cloud-functions/package.json index 25607fc4b43..3aed80b07bf 100644 --- a/packages/apollo-server-cloud-functions/package.json +++ b/packages/apollo-server-cloud-functions/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-cloud-functions", - "version": "2.12.0-alpha.0", + "version": "2.12.0-alpha.1", "description": "Production-ready Node.js GraphQL server for Google Cloud Functions", "keywords": [ "GraphQL", diff --git a/packages/apollo-server-cloudflare/package.json b/packages/apollo-server-cloudflare/package.json index ffcdf28f40f..b1c4d99a9dd 100644 --- a/packages/apollo-server-cloudflare/package.json +++ b/packages/apollo-server-cloudflare/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-cloudflare", - "version": "2.12.0-alpha.0", + "version": "2.12.0-alpha.1", "description": "Production-ready Node.js GraphQL server for Cloudflare workers", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-core/package.json b/packages/apollo-server-core/package.json index dd7c21dbf80..a98d426890f 100644 --- a/packages/apollo-server-core/package.json +++ b/packages/apollo-server-core/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-core", - "version": "2.12.0-alpha.0", + "version": "2.12.0-alpha.1", "description": "Core engine for Apollo GraphQL server", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-express/package.json b/packages/apollo-server-express/package.json index b41eb440035..c93fec3c416 100644 --- a/packages/apollo-server-express/package.json +++ b/packages/apollo-server-express/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-express", - "version": "2.12.0-alpha.0", + "version": "2.12.0-alpha.1", "description": "Production-ready Node.js GraphQL server for Express and Connect", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-fastify/package.json b/packages/apollo-server-fastify/package.json index 5c088ade513..cafc9737690 100644 --- a/packages/apollo-server-fastify/package.json +++ b/packages/apollo-server-fastify/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-fastify", - "version": "2.12.0-alpha.0", + "version": "2.12.0-alpha.1", "description": "Production-ready Node.js GraphQL server for Fastify", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-hapi/package.json b/packages/apollo-server-hapi/package.json index 01befb01cc5..0564a15f94d 100644 --- a/packages/apollo-server-hapi/package.json +++ b/packages/apollo-server-hapi/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-hapi", - "version": "2.12.0-alpha.0", + "version": "2.12.0-alpha.1", "description": "Production-ready Node.js GraphQL server for Hapi", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-integration-testsuite/package.json b/packages/apollo-server-integration-testsuite/package.json index 0d4a17ddcdf..0e9066d4ca8 100644 --- a/packages/apollo-server-integration-testsuite/package.json +++ b/packages/apollo-server-integration-testsuite/package.json @@ -1,7 +1,7 @@ { "name": "apollo-server-integration-testsuite", "private": true, - "version": "2.12.0-alpha.0", + "version": "2.12.0-alpha.1", "description": "Apollo Server Integrations testsuite", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-koa/package.json b/packages/apollo-server-koa/package.json index 82095f8e03a..1f013a56d5b 100644 --- a/packages/apollo-server-koa/package.json +++ b/packages/apollo-server-koa/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-koa", - "version": "2.12.0-alpha.0", + "version": "2.12.0-alpha.1", "description": "Production-ready Node.js GraphQL server for Koa", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-lambda/package.json b/packages/apollo-server-lambda/package.json index 756af5fc18f..41473cce8ee 100644 --- a/packages/apollo-server-lambda/package.json +++ b/packages/apollo-server-lambda/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-lambda", - "version": "2.12.0-alpha.0", + "version": "2.12.0-alpha.1", "description": "Production-ready Node.js GraphQL server for AWS Lambda", "keywords": [ "GraphQL", diff --git a/packages/apollo-server-micro/package.json b/packages/apollo-server-micro/package.json index 898ecd7f205..a0f489f11de 100644 --- a/packages/apollo-server-micro/package.json +++ b/packages/apollo-server-micro/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-micro", - "version": "2.12.0-alpha.0", + "version": "2.12.0-alpha.1", "description": "Production-ready Node.js GraphQL server for Micro", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-plugin-base/package.json b/packages/apollo-server-plugin-base/package.json index e0e19583523..3d3a05f6f65 100644 --- a/packages/apollo-server-plugin-base/package.json +++ b/packages/apollo-server-plugin-base/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-plugin-base", - "version": "0.7.0", + "version": "0.7.1-alpha.1", "description": "Apollo Server plugin base classes", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-plugin-response-cache/package.json b/packages/apollo-server-plugin-response-cache/package.json index 5d0836d2ae7..7c5cd1f363f 100644 --- a/packages/apollo-server-plugin-response-cache/package.json +++ b/packages/apollo-server-plugin-response-cache/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-plugin-response-cache", - "version": "0.4.0", + "version": "0.4.1-alpha.1", "description": "Apollo Server full query response cache", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-testing/package.json b/packages/apollo-server-testing/package.json index dd6ca0f4e16..eebddee0cae 100644 --- a/packages/apollo-server-testing/package.json +++ b/packages/apollo-server-testing/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-testing", - "version": "2.12.0-alpha.0", + "version": "2.12.0-alpha.1", "description": "Test utils for apollo-server", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-types/package.json b/packages/apollo-server-types/package.json index 3e3b096eb9e..e43f6f94187 100644 --- a/packages/apollo-server-types/package.json +++ b/packages/apollo-server-types/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-types", - "version": "0.3.0", + "version": "0.3.1-alpha.1", "description": "Apollo Server shared types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server/package.json b/packages/apollo-server/package.json index 7f5bcd9a680..7e75f3419bd 100644 --- a/packages/apollo-server/package.json +++ b/packages/apollo-server/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server", - "version": "2.12.0-alpha.0", + "version": "2.12.0-alpha.1", "description": "Production ready GraphQL Server", "author": "opensource@apollographql.com", "main": "dist/index.js", diff --git a/packages/apollo-tracing/package.json b/packages/apollo-tracing/package.json index 316a21eacd0..a1099c51c13 100644 --- a/packages/apollo-tracing/package.json +++ b/packages/apollo-tracing/package.json @@ -1,6 +1,6 @@ { "name": "apollo-tracing", - "version": "0.9.0", + "version": "0.9.1-alpha.1", "description": "Collect and expose trace data for GraphQL requests", "main": "./dist/index.js", "types": "./dist/index.d.ts", diff --git a/packages/graphql-extensions/package.json b/packages/graphql-extensions/package.json index b5d00026ca5..27d3903bd8d 100644 --- a/packages/graphql-extensions/package.json +++ b/packages/graphql-extensions/package.json @@ -1,6 +1,6 @@ { "name": "graphql-extensions", - "version": "0.11.0", + "version": "0.11.1-alpha.1", "description": "Add extensions to GraphQL servers", "main": "./dist/index.js", "types": "./dist/index.d.ts", From 78e6b8eec21cf5665014c03350ec25ecc51d9ed6 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Wed, 18 Mar 2020 21:39:44 +0200 Subject: [PATCH 300/642] Update CHANGELOG.md --- CHANGELOG.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 53f8dea105e..47aca5cc164 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,12 +5,9 @@ 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) -### v2.13.0 - -- `apollo-server-core`: Support providing a custom logger implementation (e.g. [`winston`](https://npm.im/winston), [`bunyan`](https://npm.im/bunyan), etc.) to capture server console messages. Though there has historically been limited output from Apollo Server, some messages are important to capture in the larger context of production logging facilities or can benefit from using more advanced structure, like JSON-based logging. This also introduces a `logger` property to the `GraphQLRequestContext` that is exposed to plugins, making it possible for plugins to leverage the same server-level logger, and allowing implementors to create request-specific log contexts, if desired. When not provided, these will still output to `console`. [PR #3894](https://github.com/apollographql/apollo-server/pull/3894) - ### v2.12.0 +- `apollo-server-core`: Support providing a custom logger implementation (e.g. [`winston`](https://npm.im/winston), [`bunyan`](https://npm.im/bunyan), etc.) to capture server console messages. Though there has historically been limited output from Apollo Server, some messages are important to capture in the larger context of production logging facilities or can benefit from using more advanced structure, like JSON-based logging. This also introduces a `logger` property to the `GraphQLRequestContext` that is exposed to plugins, making it possible for plugins to leverage the same server-level logger, and allowing implementors to create request-specific log contexts, if desired. When not provided, these will still output to `console`. [PR #3894](https://github.com/apollographql/apollo-server/pull/3894) - `apollo-server-core`: When operating in gateway mode using the `gateway` property of the Apollo Server constructor options, the failure to initialize a schema during initial start-up, e.g. connectivity problems, will no longer result in the federated executor from being assigned when the schema eventually becomes available. This precludes a state where the gateway may never become available to serve federated requests, even when failure conditions are no longer present. [PR #3811](https://github.com/apollographql/apollo-server/pull/3811) - `apollo-server-core`: Prevent a condition which prefixed an error message on each request when the initial gateway initialization resulted in a Promise-rejection which was memoized and re-prepended with `Invalid options provided to ApolloServer:` on each request. [PR #3811](https://github.com/apollographql/apollo-server/pull/3811) - `apollo-server-express`: Disable the automatic inclusion of the `x-powered-by: express` header. [PR #3821](https://github.com/apollographql/apollo-server/pull/3821) From c76441d1ce9b2b03b4d413171c50bea2a59ea6f5 Mon Sep 17 00:00:00 2001 From: Alexander Kachkaev Date: Wed, 18 Mar 2020 20:17:28 +0000 Subject: [PATCH 301/642] Fix repository path for graphql-extensions (#3881) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fix repository path for graphql-extensions Avoids links with 404 on npm and yarn websites * Fix package path 🤦‍♂️ --- packages/graphql-extensions/package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/graphql-extensions/package.json b/packages/graphql-extensions/package.json index b5d00026ca5..5f472ba16ad 100644 --- a/packages/graphql-extensions/package.json +++ b/packages/graphql-extensions/package.json @@ -6,7 +6,8 @@ "types": "./dist/index.d.ts", "repository": { "type": "git", - "url": "apollographql/graphql-extensions" + "url": "apollographql/apollo-server", + "directory": "packages/graphql-extensions" }, "author": "Martijn Walraven ", "license": "MIT", From 145f8569b339868b1c775c0b6a1248428fe100f4 Mon Sep 17 00:00:00 2001 From: Daniel Tseng Date: Thu, 19 Mar 2020 19:55:09 +0800 Subject: [PATCH 302/642] docs(circle): fix GitHub link (#3793) Make the link clickable on GitHub. --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ef5b2ce82cd..bddd2fccefb 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -4,7 +4,7 @@ version: 2.1 # across projects. See https://circleci.com/orbs/ for more information. orbs: # `oss` is a local reference to the package. The source for Apollo Orbs can - # be found at http://github.com/apollographql/CircleCI-Orbs. + # be found at http://github.com/apollographql/CircleCI-Orbs/. oss: apollo/oss-ci-cd-tooling@0.0.5 commands: From a132c2e77214948926bc8b322526508c969a019c Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 19 Mar 2020 16:56:52 +0200 Subject: [PATCH 303/642] tests: Use a fake HTTP context when using `executeOperation`. This resolves a number of runtime errors which surfaced in the test suite for this repository, appearing as: TypeError: Cannot read property 'method' of undefined This was overlooked or not addressed within #158 / #246. While not ideal, today, Apollo Server has a very real expectation of an HTTP request context. That will change in the future. While we can sometimes make by without it, that is no longer the case when Engine Reporting is enabled since it relies on the HTTP "method" property of the HTTP context when building the traces. Therefore, we'll need to make sure that we provide a fake HTTP context to `executeOperation` when testing with Engine enabled, to ensure that it doesn't fail. cc @jsegaran --- ...polloServerPluginOperationRegistry.test.ts | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/ApolloServerPluginOperationRegistry.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/ApolloServerPluginOperationRegistry.test.ts index 842663349a2..009b96a230e 100644 --- a/packages/apollo-server-plugin-operation-registry/src/__tests__/ApolloServerPluginOperationRegistry.test.ts +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/ApolloServerPluginOperationRegistry.test.ts @@ -19,6 +19,22 @@ import { nockGoodManifestsUnderStorageSecret, genericStorageSecret, } from './helpers.test-helpers'; +import { Headers } from 'apollo-server-env'; +import { GraphQLRequest } from 'apollo-server-plugin-base'; + +// While not ideal, today, Apollo Server has a very real expectation of an HTTP +// request context. That will change in the future. While we can sometimes +// make by without it, that is no longer the case when Engine Reporting is +// enabled since it relies on the HTTP "method" property of the HTTP context +// when building the traces. Therefore, we'll need to make sure that we provide +// a fake HTTP context to `executeOperation` when testing with Engine enabled, +// to ensure that it doesn't fail. +const mockHttpRequestContextForExecuteOperation: Required> = { + http: { method: 'GET', headers: new Headers(), url: '/mocked' }, +}; describe('Operation registry plugin', () => { it('will instantiate when not called with options', () => { @@ -84,6 +100,7 @@ describe('Operation registry plugin', () => { }); await server.willStart(); const result = await server.executeOperation({ + ...mockHttpRequestContextForExecuteOperation, query: print(query), operationName: 'HelloFam', }); @@ -136,6 +153,7 @@ describe('Operation registry plugin', () => { }); await server.willStart(); const result = await server.executeOperation({ + ...mockHttpRequestContextForExecuteOperation, query: print(query), operationName: 'HelloFam', }); @@ -175,6 +193,7 @@ describe('Operation registry plugin', () => { }); await server.willStart(); const result = await server.executeOperation({ + ...mockHttpRequestContextForExecuteOperation, query: print(query), operationName: 'HelloFam', }); @@ -230,6 +249,7 @@ describe('Operation registry plugin', () => { }); await server.willStart(); const result = await server.executeOperation({ + ...mockHttpRequestContextForExecuteOperation, query: print(query), operationName: 'HelloFam', }); @@ -269,6 +289,7 @@ describe('Operation registry plugin', () => { }); await server.willStart(); const result = await server.executeOperation({ + ...mockHttpRequestContextForExecuteOperation, query: print(query), operationName: 'HelloFam', }); From 6cebfbade3ec1ecc8ee9a08539edb2792964b7eb Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 19 Mar 2020 17:12:38 +0000 Subject: [PATCH 304/642] chore(deps): update dependency apollo-graphql to v0.4.1 (#248) Co-authored-by: Renovate Bot --- packages/apollo-server-plugin-operation-registry/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/package.json b/packages/apollo-server-plugin-operation-registry/package.json index 2681e4f92fa..8dfe690394f 100644 --- a/packages/apollo-server-plugin-operation-registry/package.json +++ b/packages/apollo-server-plugin-operation-registry/package.json @@ -11,7 +11,7 @@ "node": ">=8" }, "dependencies": { - "apollo-graphql": "0.3.4", + "apollo-graphql": "0.4.1", "apollo-server-caching": "^0.5.0", "apollo-server-errors": "^2.2.0", "apollo-server-plugin-base": "^0.6.0", From 8f033afa27f09d299afca1429c347b4ec70a2f3e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 19 Mar 2020 19:14:17 +0000 Subject: [PATCH 305/642] chore(deps): update dependency apollo-server-plugin-base to ^0.7.0 (#290) Co-authored-by: Renovate Bot --- packages/apollo-server-plugin-operation-registry/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/package.json b/packages/apollo-server-plugin-operation-registry/package.json index 8dfe690394f..bbe472065c5 100644 --- a/packages/apollo-server-plugin-operation-registry/package.json +++ b/packages/apollo-server-plugin-operation-registry/package.json @@ -14,7 +14,7 @@ "apollo-graphql": "0.4.1", "apollo-server-caching": "^0.5.0", "apollo-server-errors": "^2.2.0", - "apollo-server-plugin-base": "^0.6.0", + "apollo-server-plugin-base": "^0.7.0", "fast-json-stable-stringify": "^2.0.0", "loglevel": "^1.6.1", "loglevel-debug": "^0.0.1", From 93d45b31287814bcc22d5d0e708f79b9ebdea304 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 19 Mar 2020 14:14:10 -0700 Subject: [PATCH 306/642] chore(deps): update dependency gatsby-theme-apollo-docs to v4.1.1 (#3901) Co-authored-by: Renovate Bot --- docs/package-lock.json | 1532 ++++++++++++++++++++++++++++++++-------- docs/package.json | 2 +- 2 files changed, 1252 insertions(+), 282 deletions(-) diff --git a/docs/package-lock.json b/docs/package-lock.json index 9eab4e70914..8964ed8f34a 100644 --- a/docs/package-lock.json +++ b/docs/package-lock.json @@ -23,6 +23,16 @@ "@babel/highlight": "^7.0.0" } }, + "@babel/compat-data": { + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.8.6.tgz", + "integrity": "sha512-CurCIKPTkS25Mb8mz267vU95vy+TyUpnctEX2lV33xWNmHAfjruztgiPBbXZRh3xZZy1CYvGx6XfxyTVS+sk7Q==", + "requires": { + "browserslist": "^4.8.5", + "invariant": "^2.2.4", + "semver": "^5.5.0" + } + }, "@babel/core": { "version": "7.8.0", "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.8.0.tgz", @@ -334,6 +344,18 @@ } } }, + "@babel/helper-compilation-targets": { + "version": "7.8.7", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.8.7.tgz", + "integrity": "sha512-4mWm8DCK2LugIS+p1yArqvG1Pf162upsIsjE7cNBjez+NjliQpVhj20obE520nao0o14DaTnFJv+Fw5a0JpoUw==", + "requires": { + "@babel/compat-data": "^7.8.6", + "browserslist": "^4.9.1", + "invariant": "^2.2.4", + "levenary": "^1.1.1", + "semver": "^5.5.0" + } + }, "@babel/helper-create-class-features-plugin": { "version": "7.8.3", "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.8.3.tgz", @@ -2470,9 +2492,9 @@ } }, "@emotion/styled-base": { - "version": "10.0.30", - "resolved": "https://registry.npmjs.org/@emotion/styled-base/-/styled-base-10.0.30.tgz", - "integrity": "sha512-pjAZxjnDzLQ5F0Wv3DgTLvg8pw4bMSABP9GHDdCaDjZak/8Il5mQRLs15h9AKC95E8QG1NEr11GfHO1SGYV5ZA==", + "version": "10.0.31", + "resolved": "https://registry.npmjs.org/@emotion/styled-base/-/styled-base-10.0.31.tgz", + "integrity": "sha512-wTOE1NcXmqMWlyrtwdkqg87Mu6Rj1MaukEoEmEkHirO5IoHDJ8LgCQL4MjJODgxWxXibGR3opGp1p7YvkNEdXQ==", "requires": { "@babel/runtime": "^7.5.5", "@emotion/is-prop-valid": "0.8.8", @@ -2989,9 +3011,9 @@ "integrity": "sha512-OCutwjDZ4aFS6PB1UZ988C4YgwlBHJd6wCeQqaLdmadZ/7e+w79+hbMUFC1QXDNCmdyoRfAFdm0RypzwR+Qpag==" }, "@types/estree": { - "version": "0.0.42", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.42.tgz", - "integrity": "sha512-K1DPVvnBCPxzD+G51/cxVIoc2X8uUVl1zpJeE6iKcgHMj4+tbat5Xu4TjV7v2QSDbIeAfLi2hIk+u2+s0MlpUQ==" + "version": "0.0.43", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.43.tgz", + "integrity": "sha512-WfOySUnBpyKXbkC9QuZguwOGhGnugDXT2f2P6X8EIis7qlnd5NI1Nr4kRi357NtguxezyizIcaFlQe0wx23XnA==" }, "@types/events": { "version": "3.0.0", @@ -3392,9 +3414,9 @@ } }, "acorn": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.0.tgz", - "integrity": "sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ==" + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.1.tgz", + "integrity": "sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==" }, "acorn-jsx": { "version": "5.2.0", @@ -9795,12 +9817,12 @@ } }, "gatsby-core-utils": { - "version": "1.0.31", - "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.0.31.tgz", - "integrity": "sha512-QvyAaC2nK+34giEPn2eMMkruvzyz4cD3+68RFV9A71HDuLU7FTgnhahyV8QmqZdjK2zVnhEIs2rGuf4weEuu1g==", + "version": "1.0.34", + "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.0.34.tgz", + "integrity": "sha512-CVuUQTVY+0X7vAqFnDeRT0ZkN0tUXvk6GLvUqfmoOzBvX9HphiR0VTi1tEYrsc5DSaz7Oyhr0vdp8j/e96rH1w==", "requires": { "ci-info": "2.0.0", - "configstore": "^5.0.0", + "configstore": "^5.0.1", "node-object-hash": "^2.0.0" } }, @@ -9898,12 +9920,12 @@ } }, "gatsby-plugin-emotion": { - "version": "4.1.24", - "resolved": "https://registry.npmjs.org/gatsby-plugin-emotion/-/gatsby-plugin-emotion-4.1.24.tgz", - "integrity": "sha512-lTsfH7HV1RAB13pQOnzRyZ5hMv/m0jqJDW4rcJ3hB6UKmnrD9DAMuGT6A7FuReg16LI+jyLA1O9mCL6booNPIQ==", + "version": "4.1.25", + "resolved": "https://registry.npmjs.org/gatsby-plugin-emotion/-/gatsby-plugin-emotion-4.1.25.tgz", + "integrity": "sha512-VP+s3mEfvaTjKUOVsDRgy/HPfDJQHeZD/Z/WBKgQetLgmvrGVnxm9NEMCJWyJm9LxQ791bfwoP6XNwOYscU8sA==", "requires": { - "@babel/runtime": "^7.7.6", - "@emotion/babel-preset-css-prop": "^10.0.23" + "@babel/runtime": "^7.8.7", + "@emotion/babel-preset-css-prop": "^10.0.27" }, "dependencies": { "@babel/runtime": { @@ -9915,18 +9937,18 @@ } }, "regenerator-runtime": { - "version": "0.13.4", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.4.tgz", - "integrity": "sha512-plpwicqEzfEyTQohIKktWigcLzmNStMGwbOUbykx51/29Z3JOGYldaaNGK7ngNXV+UcoqvIMmloZ48Sr74sd+g==" + "version": "0.13.5", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", + "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==" } } }, "gatsby-plugin-less": { - "version": "3.0.20", - "resolved": "https://registry.npmjs.org/gatsby-plugin-less/-/gatsby-plugin-less-3.0.20.tgz", - "integrity": "sha512-jVPuTZdMB/GQteB9wUJgD0BQqDcBpP6fxRwxzGAoj5tj9Nvt+TuzXOwBIybxg0cvVOTGE3upsk2vtgKoxy8EoQ==", + "version": "3.0.21", + "resolved": "https://registry.npmjs.org/gatsby-plugin-less/-/gatsby-plugin-less-3.0.21.tgz", + "integrity": "sha512-58a5MUSYnPDgy/udBElrtoYeue9ucI/hGglM/QhCNMZtH8XZXW8R2Q8ImKHsNlHtYiqA86auoHM/WOmkWlLkYQ==", "requires": { - "@babel/runtime": "^7.7.6", + "@babel/runtime": "^7.8.7", "less-loader": "^5.0.0" }, "dependencies": { @@ -9939,24 +9961,24 @@ } }, "regenerator-runtime": { - "version": "0.13.4", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.4.tgz", - "integrity": "sha512-plpwicqEzfEyTQohIKktWigcLzmNStMGwbOUbykx51/29Z3JOGYldaaNGK7ngNXV+UcoqvIMmloZ48Sr74sd+g==" + "version": "0.13.5", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", + "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==" } } }, "gatsby-plugin-mdx": { - "version": "1.0.78", - "resolved": "https://registry.npmjs.org/gatsby-plugin-mdx/-/gatsby-plugin-mdx-1.0.78.tgz", - "integrity": "sha512-iB8AN/MGBu8vtYM9UJHx5HwkVhDwk748iAnWHlnM1rwuV5bO8hqCpQ8nBg1VCDo8sf9HRP5Vo1P1TfWurxF1Tg==", + "version": "1.0.84", + "resolved": "https://registry.npmjs.org/gatsby-plugin-mdx/-/gatsby-plugin-mdx-1.0.84.tgz", + "integrity": "sha512-OfMzdSybwB6cFGiTPbW2SDbv37V7NOk3/OAhn27fixOLPGqJ//ontIRldZLQZKZfEa30U2gnnh9XTG3C5jvfVQ==", "requires": { - "@babel/core": "^7.7.5", - "@babel/generator": "^7.7.4", - "@babel/helper-plugin-utils": "^7.0.0", - "@babel/plugin-proposal-object-rest-spread": "^7.7.4", - "@babel/preset-env": "^7.7.6", - "@babel/preset-react": "^7.7.4", - "@babel/types": "^7.7.4", + "@babel/core": "^7.8.7", + "@babel/generator": "^7.8.8", + "@babel/helper-plugin-utils": "^7.8.3", + "@babel/plugin-proposal-object-rest-spread": "^7.8.3", + "@babel/preset-env": "^7.8.7", + "@babel/preset-react": "^7.8.3", + "@babel/types": "^7.8.7", "camelcase-css": "^2.0.1", "change-case": "^3.1.0", "core-js": "2", @@ -9965,12 +9987,12 @@ "escape-string-regexp": "^1.0.5", "eval": "^0.1.4", "fs-extra": "^8.1.0", - "gatsby-core-utils": "^1.0.31", + "gatsby-core-utils": "^1.0.34", "gray-matter": "^4.0.2", - "json5": "^2.1.1", - "loader-utils": "^1.2.3", + "json5": "^2.1.2", + "loader-utils": "^1.4.0", "lodash": "^4.17.15", - "mdast-util-to-string": "^1.0.7", + "mdast-util-to-string": "^1.1.0", "mdast-util-toc": "^3.1.0", "mime": "^2.4.4", "p-queue": "^5.0.0", @@ -9987,228 +10009,1070 @@ "unist-util-visit": "^1.4.1" }, "dependencies": { - "@babel/types": { + "@babel/code-frame": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", + "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", + "requires": { + "@babel/highlight": "^7.8.3" + } + }, + "@babel/core": { "version": "7.8.7", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.7.tgz", - "integrity": "sha512-k2TreEHxFA4CjGkL+GYjRyx35W0Mr7DP5+9q6WMkyKXB+904bYmG40syjMFV0oLlhhFCwWl0vA0DyzTDkwAiJw==", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.8.7.tgz", + "integrity": "sha512-rBlqF3Yko9cynC5CCFy6+K/w2N+Sq/ff2BPy+Krp7rHlABIr5epbA7OxVeKoMHB39LZOp1UY5SuLjy6uWi35yA==", "requires": { - "esutils": "^2.0.2", + "@babel/code-frame": "^7.8.3", + "@babel/generator": "^7.8.7", + "@babel/helpers": "^7.8.4", + "@babel/parser": "^7.8.7", + "@babel/template": "^7.8.6", + "@babel/traverse": "^7.8.6", + "@babel/types": "^7.8.7", + "convert-source-map": "^1.7.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.1", + "json5": "^2.1.0", "lodash": "^4.17.13", - "to-fast-properties": "^2.0.0" + "resolve": "^1.3.2", + "semver": "^5.4.1", + "source-map": "^0.5.0" } }, - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "@babel/generator": { + "version": "7.8.8", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.8.8.tgz", + "integrity": "sha512-HKyUVu69cZoclptr8t8U5b6sx6zoWjh8jiUhnuj3MpZuKT2dJ8zPTuiy31luq32swhI0SpwItCIlU8XW7BZeJg==", "requires": { - "ms": "^2.1.1" + "@babel/types": "^7.8.7", + "jsesc": "^2.5.1", + "lodash": "^4.17.13", + "source-map": "^0.5.0" } }, - "unist-util-visit": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.4.1.tgz", - "integrity": "sha512-AvGNk7Bb//EmJZyhtRUnNMEpId/AZ5Ph/KUpTI09WHQuDZHKovQ1oEv3mfmKpWKtoMzyMC4GLBm1Zy5k12fjIw==", + "@babel/helper-annotate-as-pure": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.8.3.tgz", + "integrity": "sha512-6o+mJrZBxOoEX77Ezv9zwW7WV8DdluouRKNY/IR5u/YTMuKHgugHOzYWlYvYLpLA9nPsQCAAASpCIbjI9Mv+Uw==", "requires": { - "unist-util-visit-parents": "^2.0.0" + "@babel/types": "^7.8.3" } - } - } - }, - "gatsby-plugin-page-creator": { - "version": "2.1.45", - "resolved": "https://registry.npmjs.org/gatsby-plugin-page-creator/-/gatsby-plugin-page-creator-2.1.45.tgz", - "integrity": "sha512-mW5qfJ2C6U522wx63fZRTN2jCKG9FC/jkEmq4B0z5J/SOA9zPAlVvowjQAAW0+oGbEqwfIveSM+hIPwv1J7npA==", - "requires": { - "@babel/runtime": "^7.7.6", - "bluebird": "^3.7.2", - "fs-exists-cached": "^1.0.0", - "gatsby-page-utils": "^0.0.44", - "glob": "^7.1.6", - "lodash": "^4.17.15", - "micromatch": "^3.1.10" - }, - "dependencies": { - "@babel/runtime": { - "version": "7.8.7", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.7.tgz", - "integrity": "sha512-+AATMUFppJDw6aiR5NVPHqIQBlV/Pj8wY/EZH+lmvRdUo9xBaz/rF3alAwFJQavvKfeOlPE7oaaDHVbcySbCsg==", + }, + "@babel/helper-builder-binary-assignment-operator-visitor": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.8.3.tgz", + "integrity": "sha512-5eFOm2SyFPK4Rh3XMMRDjN7lBH0orh3ss0g3rTYZnBQ+r6YPj7lgDyCvPphynHvUrobJmeMignBr6Acw9mAPlw==", "requires": { - "regenerator-runtime": "^0.13.4" + "@babel/helper-explode-assignable-expression": "^7.8.3", + "@babel/types": "^7.8.3" } }, - "bluebird": { - "version": "3.7.2", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", - "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" - }, - "regenerator-runtime": { - "version": "0.13.5", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", - "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==" - } - } - }, - "gatsby-plugin-printer": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/gatsby-plugin-printer/-/gatsby-plugin-printer-1.0.8.tgz", - "integrity": "sha512-a9V1sFQxIrFx47jQJdMkRmTd6jJj3cs+YT1mfuctkmTjBvKU7+L4b3XVqkr0fyljGsAZg/Ztdgud0ccmux4rgQ==", - "requires": { - "@sindresorhus/slugify": "^0.9.1", - "babel-plugin-preval": "^3.0.1", - "fs-extra": "^8.1.0", - "puppeteer": "^1.19.0", - "rollup": "1.23.1", - "rollup-plugin-babel": "^4.3.3", - "rollup-plugin-commonjs": "^10.0.1", - "rollup-plugin-node-builtins": "^2.1.2", - "rollup-plugin-node-globals": "^1.4.0", - "rollup-plugin-node-resolve": "^5.2.0", - "rollup-plugin-replace": "^2.2.0" - } - }, - "gatsby-plugin-react-helmet": { - "version": "3.1.23", - "resolved": "https://registry.npmjs.org/gatsby-plugin-react-helmet/-/gatsby-plugin-react-helmet-3.1.23.tgz", - "integrity": "sha512-l6OomFCfggJ6IG8XOw0WuCqbTnVrqtMRxA/O5qbCpXH7K9JxjE406vUM8To0dVjoaCiSvRZU/Dz0vU0wEWe0UQ==", - "requires": { - "@babel/runtime": "^7.7.6" - }, - "dependencies": { - "@babel/runtime": { - "version": "7.8.7", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.7.tgz", - "integrity": "sha512-+AATMUFppJDw6aiR5NVPHqIQBlV/Pj8wY/EZH+lmvRdUo9xBaz/rF3alAwFJQavvKfeOlPE7oaaDHVbcySbCsg==", + "@babel/helper-builder-react-jsx": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.8.3.tgz", + "integrity": "sha512-JT8mfnpTkKNCboTqZsQTdGo3l3Ik3l7QIt9hh0O9DYiwVel37VoJpILKM4YFbP2euF32nkQSb+F9cUk9b7DDXQ==", "requires": { - "regenerator-runtime": "^0.13.4" + "@babel/types": "^7.8.3", + "esutils": "^2.0.0" } }, - "regenerator-runtime": { - "version": "0.13.4", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.4.tgz", - "integrity": "sha512-plpwicqEzfEyTQohIKktWigcLzmNStMGwbOUbykx51/29Z3JOGYldaaNGK7ngNXV+UcoqvIMmloZ48Sr74sd+g==" - } - } - }, - "gatsby-plugin-segment-js": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/gatsby-plugin-segment-js/-/gatsby-plugin-segment-js-3.1.0.tgz", - "integrity": "sha512-oBcIY+riNehfyQXp8PEGVQTz/VPt/+k2aXCh/bNZSR4HhjEAXafcSCReS2xzs/3IJRa3gH0+NOZvRU8peXDb/w==" - }, - "gatsby-plugin-svgr": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/gatsby-plugin-svgr/-/gatsby-plugin-svgr-2.0.2.tgz", - "integrity": "sha512-54REIMe79qFBAwpcnWHBkvEE9CKoEVkefF9rDXai0k642r91SZ4UeWFuAmsegPG+sPVub7tHfHu/2LVXK1I9kg==" - }, - "gatsby-react-router-scroll": { - "version": "2.1.23", - "resolved": "https://registry.npmjs.org/gatsby-react-router-scroll/-/gatsby-react-router-scroll-2.1.23.tgz", - "integrity": "sha512-yUCWzRYUDgvr3xy5GAYd08gToBfE84SX3zvHWgPunVeL4OfwsYh6eei6GtYbLIjq77bvegd2SZkSujQ4Vgm/Gg==", - "requires": { - "@babel/runtime": "^7.7.6", - "scroll-behavior": "^0.9.10", - "warning": "^3.0.0" - }, - "dependencies": { - "@babel/runtime": { + "@babel/helper-call-delegate": { "version": "7.8.7", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.7.tgz", - "integrity": "sha512-+AATMUFppJDw6aiR5NVPHqIQBlV/Pj8wY/EZH+lmvRdUo9xBaz/rF3alAwFJQavvKfeOlPE7oaaDHVbcySbCsg==", + "resolved": "https://registry.npmjs.org/@babel/helper-call-delegate/-/helper-call-delegate-7.8.7.tgz", + "integrity": "sha512-doAA5LAKhsFCR0LAFIf+r2RSMmC+m8f/oQ+URnUET/rWeEzC0yTRmAGyWkD4sSu3xwbS7MYQ2u+xlt1V5R56KQ==", "requires": { - "regenerator-runtime": "^0.13.4" + "@babel/helper-hoist-variables": "^7.8.3", + "@babel/traverse": "^7.8.3", + "@babel/types": "^7.8.7" } }, - "regenerator-runtime": { - "version": "0.13.5", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", - "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==" - }, - "warning": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/warning/-/warning-3.0.0.tgz", - "integrity": "sha1-MuU3fLVy3kqwR1O9+IIcAe1gW3w=", + "@babel/helper-create-regexp-features-plugin": { + "version": "7.8.8", + "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.8.tgz", + "integrity": "sha512-LYVPdwkrQEiX9+1R29Ld/wTrmQu1SSKYnuOk3g0CkcZMA1p0gsNxJFj/3gBdaJ7Cg0Fnek5z0DsMULePP7Lrqg==", "requires": { - "loose-envify": "^1.0.0" + "@babel/helper-annotate-as-pure": "^7.8.3", + "@babel/helper-regex": "^7.8.3", + "regexpu-core": "^4.7.0" } - } - } - }, - "gatsby-remark-autolink-headers": { - "version": "2.1.25", - "resolved": "https://registry.npmjs.org/gatsby-remark-autolink-headers/-/gatsby-remark-autolink-headers-2.1.25.tgz", - "integrity": "sha512-E8L+3Ub49/v8K5jOcaHmjul0vG50EQdqGFVKrmspEJrHhgDkSascayAtiCdpMbxIPEnuRP35nnu2dYqGaaxSIw==", - "requires": { - "@babel/runtime": "^7.7.6", - "github-slugger": "^1.2.1", - "lodash": "^4.17.15", - "mdast-util-to-string": "^1.0.7", - "unist-util-visit": "^1.4.1" - }, - "dependencies": { - "@babel/runtime": { - "version": "7.8.7", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.7.tgz", - "integrity": "sha512-+AATMUFppJDw6aiR5NVPHqIQBlV/Pj8wY/EZH+lmvRdUo9xBaz/rF3alAwFJQavvKfeOlPE7oaaDHVbcySbCsg==", + }, + "@babel/helper-define-map": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.8.3.tgz", + "integrity": "sha512-PoeBYtxoZGtct3md6xZOCWPcKuMuk3IHhgxsRRNtnNShebf4C8YonTSblsK4tvDbm+eJAw2HAPOfCr+Q/YRG/g==", "requires": { - "regenerator-runtime": "^0.13.4" + "@babel/helper-function-name": "^7.8.3", + "@babel/types": "^7.8.3", + "lodash": "^4.17.13" } }, - "regenerator-runtime": { - "version": "0.13.4", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.4.tgz", - "integrity": "sha512-plpwicqEzfEyTQohIKktWigcLzmNStMGwbOUbykx51/29Z3JOGYldaaNGK7ngNXV+UcoqvIMmloZ48Sr74sd+g==" - }, - "unist-util-visit": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.4.1.tgz", - "integrity": "sha512-AvGNk7Bb//EmJZyhtRUnNMEpId/AZ5Ph/KUpTI09WHQuDZHKovQ1oEv3mfmKpWKtoMzyMC4GLBm1Zy5k12fjIw==", + "@babel/helper-explode-assignable-expression": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.8.3.tgz", + "integrity": "sha512-N+8eW86/Kj147bO9G2uclsg5pwfs/fqqY5rwgIL7eTBklgXjcOJ3btzS5iM6AitJcftnY7pm2lGsrJVYLGjzIw==", "requires": { - "unist-util-visit-parents": "^2.0.0" + "@babel/traverse": "^7.8.3", + "@babel/types": "^7.8.3" } - } - } - }, - "gatsby-remark-check-links": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/gatsby-remark-check-links/-/gatsby-remark-check-links-2.1.0.tgz", - "integrity": "sha512-TbhT8oVlAgJfxe0WUQWDOb0kLkMUYo1N4AfFstejClPWO4OjRlznt3IMW3weQkwuweiovF5cxVpQcFrkCGVFBw==", - "requires": { - "unist-util-visit": "^1.4.1" - }, - "dependencies": { - "unist-util-visit": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.4.1.tgz", - "integrity": "sha512-AvGNk7Bb//EmJZyhtRUnNMEpId/AZ5Ph/KUpTI09WHQuDZHKovQ1oEv3mfmKpWKtoMzyMC4GLBm1Zy5k12fjIw==", + }, + "@babel/helper-hoist-variables": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.8.3.tgz", + "integrity": "sha512-ky1JLOjcDUtSc+xkt0xhYff7Z6ILTAHKmZLHPxAhOP0Nd77O+3nCsd6uSVYur6nJnCI029CrNbYlc0LoPfAPQg==", "requires": { - "unist-util-visit-parents": "^2.0.0" + "@babel/types": "^7.8.3" } - } - } - }, - "gatsby-remark-code-titles": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/gatsby-remark-code-titles/-/gatsby-remark-code-titles-1.1.0.tgz", - "integrity": "sha512-RuNqziXi99eBIj5NJP0TgdzAxzWFL+ArGRb3961Ff9Tto/nCvmyqR1qySaWKXtkOgeqoVUlqAFNUCyEAyNuc8w==", - "requires": { - "query-string": "~6.0.0", - "unist-util-visit": "~1.3.0" - }, - "dependencies": { - "query-string": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/query-string/-/query-string-6.0.0.tgz", - "integrity": "sha1-i485RHtz6CkNb141gXeSGOkXEUI=", + }, + "@babel/helper-member-expression-to-functions": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.8.3.tgz", + "integrity": "sha512-fO4Egq88utkQFjbPrSHGmGLFqmrshs11d46WI+WZDESt7Wu7wN2G2Iu+NMMZJFDOVRHAMIkB5SNh30NtwCA7RA==", "requires": { - "decode-uri-component": "^0.2.0", - "strict-uri-encode": "^2.0.0" + "@babel/types": "^7.8.3" } }, - "strict-uri-encode": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz", - "integrity": "sha1-ucczDHBChi9rFC3CdLvMWGbONUY=" - }, + "@babel/helper-module-imports": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz", + "integrity": "sha512-R0Bx3jippsbAEtzkpZ/6FIiuzOURPcMjHp+Z6xPe6DtApDJx+w7UYyOLanZqO8+wKR9G10s/FmHXvxaMd9s6Kg==", + "requires": { + "@babel/types": "^7.8.3" + } + }, + "@babel/helper-module-transforms": { + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.8.6.tgz", + "integrity": "sha512-RDnGJSR5EFBJjG3deY0NiL0K9TO8SXxS9n/MPsbPK/s9LbQymuLNtlzvDiNS7IpecuL45cMeLVkA+HfmlrnkRg==", + "requires": { + "@babel/helper-module-imports": "^7.8.3", + "@babel/helper-replace-supers": "^7.8.6", + "@babel/helper-simple-access": "^7.8.3", + "@babel/helper-split-export-declaration": "^7.8.3", + "@babel/template": "^7.8.6", + "@babel/types": "^7.8.6", + "lodash": "^4.17.13" + } + }, + "@babel/helper-optimise-call-expression": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.8.3.tgz", + "integrity": "sha512-Kag20n86cbO2AvHca6EJsvqAd82gc6VMGule4HwebwMlwkpXuVqrNRj6CkCV2sKxgi9MyAUnZVnZ6lJ1/vKhHQ==", + "requires": { + "@babel/types": "^7.8.3" + } + }, + "@babel/helper-plugin-utils": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", + "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" + }, + "@babel/helper-regex": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.8.3.tgz", + "integrity": "sha512-BWt0QtYv/cg/NecOAZMdcn/waj/5P26DR4mVLXfFtDokSR6fyuG0Pj+e2FqtSME+MqED1khnSMulkmGl8qWiUQ==", + "requires": { + "lodash": "^4.17.13" + } + }, + "@babel/helper-remap-async-to-generator": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.8.3.tgz", + "integrity": "sha512-kgwDmw4fCg7AVgS4DukQR/roGp+jP+XluJE5hsRZwxCYGg+Rv9wSGErDWhlI90FODdYfd4xG4AQRiMDjjN0GzA==", + "requires": { + "@babel/helper-annotate-as-pure": "^7.8.3", + "@babel/helper-wrap-function": "^7.8.3", + "@babel/template": "^7.8.3", + "@babel/traverse": "^7.8.3", + "@babel/types": "^7.8.3" + } + }, + "@babel/helper-replace-supers": { + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.8.6.tgz", + "integrity": "sha512-PeMArdA4Sv/Wf4zXwBKPqVj7n9UF/xg6slNRtZW84FM7JpE1CbG8B612FyM4cxrf4fMAMGO0kR7voy1ForHHFA==", + "requires": { + "@babel/helper-member-expression-to-functions": "^7.8.3", + "@babel/helper-optimise-call-expression": "^7.8.3", + "@babel/traverse": "^7.8.6", + "@babel/types": "^7.8.6" + } + }, + "@babel/helper-simple-access": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.8.3.tgz", + "integrity": "sha512-VNGUDjx5cCWg4vvCTR8qQ7YJYZ+HBjxOgXEl7ounz+4Sn7+LMD3CFrCTEU6/qXKbA2nKg21CwhhBzO0RpRbdCw==", + "requires": { + "@babel/template": "^7.8.3", + "@babel/types": "^7.8.3" + } + }, + "@babel/helper-wrap-function": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.8.3.tgz", + "integrity": "sha512-LACJrbUET9cQDzb6kG7EeD7+7doC3JNvUgTEQOx2qaO1fKlzE/Bf05qs9w1oXQMmXlPO65lC3Tq9S6gZpTErEQ==", + "requires": { + "@babel/helper-function-name": "^7.8.3", + "@babel/template": "^7.8.3", + "@babel/traverse": "^7.8.3", + "@babel/types": "^7.8.3" + } + }, + "@babel/helpers": { + "version": "7.8.4", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.8.4.tgz", + "integrity": "sha512-VPbe7wcQ4chu4TDQjimHv/5tj73qz88o12EPkO2ValS2QiQS/1F2SsjyIGNnAD0vF/nZS6Cf9i+vW6HIlnaR8w==", + "requires": { + "@babel/template": "^7.8.3", + "@babel/traverse": "^7.8.4", + "@babel/types": "^7.8.3" + } + }, + "@babel/highlight": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.8.3.tgz", + "integrity": "sha512-PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg==", + "requires": { + "chalk": "^2.0.0", + "esutils": "^2.0.2", + "js-tokens": "^4.0.0" + } + }, + "@babel/parser": { + "version": "7.8.8", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.8.8.tgz", + "integrity": "sha512-mO5GWzBPsPf6865iIbzNE0AvkKF3NE+2S3eRUpE+FE07BOAkXh6G+GW/Pj01hhXjve1WScbaIO4UlY1JKeqCcA==" + }, + "@babel/plugin-proposal-async-generator-functions": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.8.3.tgz", + "integrity": "sha512-NZ9zLv848JsV3hs8ryEh7Uaz/0KsmPLqv0+PdkDJL1cJy0K4kOCFa8zc1E3mp+RHPQcpdfb/6GovEsW4VDrOMw==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.3", + "@babel/helper-remap-async-to-generator": "^7.8.3", + "@babel/plugin-syntax-async-generators": "^7.8.0" + } + }, + "@babel/plugin-proposal-dynamic-import": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.8.3.tgz", + "integrity": "sha512-NyaBbyLFXFLT9FP+zk0kYlUlA8XtCUbehs67F0nnEg7KICgMc2mNkIeu9TYhKzyXMkrapZFwAhXLdnt4IYHy1w==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.3", + "@babel/plugin-syntax-dynamic-import": "^7.8.0" + } + }, + "@babel/plugin-proposal-json-strings": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.8.3.tgz", + "integrity": "sha512-KGhQNZ3TVCQG/MjRbAUwuH+14y9q0tpxs1nWWs3pbSleRdDro9SAMMDyye8HhY1gqZ7/NqIc8SKhya0wRDgP1Q==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.3", + "@babel/plugin-syntax-json-strings": "^7.8.0" + } + }, + "@babel/plugin-proposal-optional-catch-binding": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.8.3.tgz", + "integrity": "sha512-0gkX7J7E+AtAw9fcwlVQj8peP61qhdg/89D5swOkjYbkboA2CVckn3kiyum1DE0wskGb7KJJxBdyEBApDLLVdw==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.3", + "@babel/plugin-syntax-optional-catch-binding": "^7.8.0" + } + }, + "@babel/plugin-proposal-unicode-property-regex": { + "version": "7.8.8", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.8.tgz", + "integrity": "sha512-EVhjVsMpbhLw9ZfHWSx2iy13Q8Z/eg8e8ccVWt23sWQK5l1UdkoLJPN5w69UA4uITGBnEZD2JOe4QOHycYKv8A==", + "requires": { + "@babel/helper-create-regexp-features-plugin": "^7.8.8", + "@babel/helper-plugin-utils": "^7.8.3" + } + }, + "@babel/plugin-syntax-async-generators": { + "version": "7.8.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz", + "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + } + }, + "@babel/plugin-syntax-dynamic-import": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz", + "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + } + }, + "@babel/plugin-syntax-json-strings": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz", + "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + } + }, + "@babel/plugin-syntax-object-rest-spread": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz", + "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + } + }, + "@babel/plugin-syntax-optional-catch-binding": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz", + "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + } + }, + "@babel/plugin-syntax-top-level-await": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.8.3.tgz", + "integrity": "sha512-kwj1j9lL/6Wd0hROD3b/OZZ7MSrZLqqn9RAZ5+cYYsflQ9HZBIKCUkr3+uL1MEJ1NePiUbf98jjiMQSv0NMR9g==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.3" + } + }, + "@babel/plugin-transform-arrow-functions": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.8.3.tgz", + "integrity": "sha512-0MRF+KC8EqH4dbuITCWwPSzsyO3HIWWlm30v8BbbpOrS1B++isGxPnnuq/IZvOX5J2D/p7DQalQm+/2PnlKGxg==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.3" + } + }, + "@babel/plugin-transform-async-to-generator": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.8.3.tgz", + "integrity": "sha512-imt9tFLD9ogt56Dd5CI/6XgpukMwd/fLGSrix2httihVe7LOGVPhyhMh1BU5kDM7iHD08i8uUtmV2sWaBFlHVQ==", + "requires": { + "@babel/helper-module-imports": "^7.8.3", + "@babel/helper-plugin-utils": "^7.8.3", + "@babel/helper-remap-async-to-generator": "^7.8.3" + } + }, + "@babel/plugin-transform-block-scoped-functions": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.8.3.tgz", + "integrity": "sha512-vo4F2OewqjbB1+yaJ7k2EJFHlTP3jR634Z9Cj9itpqNjuLXvhlVxgnjsHsdRgASR8xYDrx6onw4vW5H6We0Jmg==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.3" + } + }, + "@babel/plugin-transform-block-scoping": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.8.3.tgz", + "integrity": "sha512-pGnYfm7RNRgYRi7bids5bHluENHqJhrV4bCZRwc5GamaWIIs07N4rZECcmJL6ZClwjDz1GbdMZFtPs27hTB06w==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.3", + "lodash": "^4.17.13" + } + }, + "@babel/plugin-transform-classes": { + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.8.6.tgz", + "integrity": "sha512-k9r8qRay/R6v5aWZkrEclEhKO6mc1CCQr2dLsVHBmOQiMpN6I2bpjX3vgnldUWeEI1GHVNByULVxZ4BdP4Hmdg==", + "requires": { + "@babel/helper-annotate-as-pure": "^7.8.3", + "@babel/helper-define-map": "^7.8.3", + "@babel/helper-function-name": "^7.8.3", + "@babel/helper-optimise-call-expression": "^7.8.3", + "@babel/helper-plugin-utils": "^7.8.3", + "@babel/helper-replace-supers": "^7.8.6", + "@babel/helper-split-export-declaration": "^7.8.3", + "globals": "^11.1.0" + } + }, + "@babel/plugin-transform-computed-properties": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.8.3.tgz", + "integrity": "sha512-O5hiIpSyOGdrQZRQ2ccwtTVkgUDBBiCuK//4RJ6UfePllUTCENOzKxfh6ulckXKc0DixTFLCfb2HVkNA7aDpzA==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.3" + } + }, + "@babel/plugin-transform-destructuring": { + "version": "7.8.8", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.8.8.tgz", + "integrity": "sha512-eRJu4Vs2rmttFCdhPUM3bV0Yo/xPSdPw6ML9KHs/bjB4bLA5HXlbvYXPOD5yASodGod+krjYx21xm1QmL8dCJQ==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.3" + } + }, + "@babel/plugin-transform-dotall-regex": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.8.3.tgz", + "integrity": "sha512-kLs1j9Nn4MQoBYdRXH6AeaXMbEJFaFu/v1nQkvib6QzTj8MZI5OQzqmD83/2jEM1z0DLilra5aWO5YpyC0ALIw==", + "requires": { + "@babel/helper-create-regexp-features-plugin": "^7.8.3", + "@babel/helper-plugin-utils": "^7.8.3" + } + }, + "@babel/plugin-transform-duplicate-keys": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.8.3.tgz", + "integrity": "sha512-s8dHiBUbcbSgipS4SMFuWGqCvyge5V2ZeAWzR6INTVC3Ltjig/Vw1G2Gztv0vU/hRG9X8IvKvYdoksnUfgXOEQ==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.3" + } + }, + "@babel/plugin-transform-exponentiation-operator": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.8.3.tgz", + "integrity": "sha512-zwIpuIymb3ACcInbksHaNcR12S++0MDLKkiqXHl3AzpgdKlFNhog+z/K0+TGW+b0w5pgTq4H6IwV/WhxbGYSjQ==", + "requires": { + "@babel/helper-builder-binary-assignment-operator-visitor": "^7.8.3", + "@babel/helper-plugin-utils": "^7.8.3" + } + }, + "@babel/plugin-transform-for-of": { + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.8.6.tgz", + "integrity": "sha512-M0pw4/1/KI5WAxPsdcUL/w2LJ7o89YHN3yLkzNjg7Yl15GlVGgzHyCU+FMeAxevHGsLVmUqbirlUIKTafPmzdw==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.3" + } + }, + "@babel/plugin-transform-function-name": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.8.3.tgz", + "integrity": "sha512-rO/OnDS78Eifbjn5Py9v8y0aR+aSYhDhqAwVfsTl0ERuMZyr05L1aFSCJnbv2mmsLkit/4ReeQ9N2BgLnOcPCQ==", + "requires": { + "@babel/helper-function-name": "^7.8.3", + "@babel/helper-plugin-utils": "^7.8.3" + } + }, + "@babel/plugin-transform-literals": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.8.3.tgz", + "integrity": "sha512-3Tqf8JJ/qB7TeldGl+TT55+uQei9JfYaregDcEAyBZ7akutriFrt6C/wLYIer6OYhleVQvH/ntEhjE/xMmy10A==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.3" + } + }, + "@babel/plugin-transform-member-expression-literals": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.8.3.tgz", + "integrity": "sha512-3Wk2EXhnw+rP+IDkK6BdtPKsUE5IeZ6QOGrPYvw52NwBStw9V1ZVzxgK6fSKSxqUvH9eQPR3tm3cOq79HlsKYA==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.3" + } + }, + "@babel/plugin-transform-modules-amd": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.8.3.tgz", + "integrity": "sha512-MadJiU3rLKclzT5kBH4yxdry96odTUwuqrZM+GllFI/VhxfPz+k9MshJM+MwhfkCdxxclSbSBbUGciBngR+kEQ==", + "requires": { + "@babel/helper-module-transforms": "^7.8.3", + "@babel/helper-plugin-utils": "^7.8.3", + "babel-plugin-dynamic-import-node": "^2.3.0" + } + }, + "@babel/plugin-transform-modules-commonjs": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.8.3.tgz", + "integrity": "sha512-JpdMEfA15HZ/1gNuB9XEDlZM1h/gF/YOH7zaZzQu2xCFRfwc01NXBMHHSTT6hRjlXJJs5x/bfODM3LiCk94Sxg==", + "requires": { + "@babel/helper-module-transforms": "^7.8.3", + "@babel/helper-plugin-utils": "^7.8.3", + "@babel/helper-simple-access": "^7.8.3", + "babel-plugin-dynamic-import-node": "^2.3.0" + } + }, + "@babel/plugin-transform-modules-systemjs": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.8.3.tgz", + "integrity": "sha512-8cESMCJjmArMYqa9AO5YuMEkE4ds28tMpZcGZB/jl3n0ZzlsxOAi3mC+SKypTfT8gjMupCnd3YiXCkMjj2jfOg==", + "requires": { + "@babel/helper-hoist-variables": "^7.8.3", + "@babel/helper-module-transforms": "^7.8.3", + "@babel/helper-plugin-utils": "^7.8.3", + "babel-plugin-dynamic-import-node": "^2.3.0" + } + }, + "@babel/plugin-transform-modules-umd": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.8.3.tgz", + "integrity": "sha512-evhTyWhbwbI3/U6dZAnx/ePoV7H6OUG+OjiJFHmhr9FPn0VShjwC2kdxqIuQ/+1P50TMrneGzMeyMTFOjKSnAw==", + "requires": { + "@babel/helper-module-transforms": "^7.8.3", + "@babel/helper-plugin-utils": "^7.8.3" + } + }, + "@babel/plugin-transform-named-capturing-groups-regex": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.8.3.tgz", + "integrity": "sha512-f+tF/8UVPU86TrCb06JoPWIdDpTNSGGcAtaD9mLP0aYGA0OS0j7j7DHJR0GTFrUZPUU6loZhbsVZgTh0N+Qdnw==", + "requires": { + "@babel/helper-create-regexp-features-plugin": "^7.8.3" + } + }, + "@babel/plugin-transform-new-target": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.8.3.tgz", + "integrity": "sha512-QuSGysibQpyxexRyui2vca+Cmbljo8bcRckgzYV4kRIsHpVeyeC3JDO63pY+xFZ6bWOBn7pfKZTqV4o/ix9sFw==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.3" + } + }, + "@babel/plugin-transform-object-super": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.8.3.tgz", + "integrity": "sha512-57FXk+gItG/GejofIyLIgBKTas4+pEU47IXKDBWFTxdPd7F80H8zybyAY7UoblVfBhBGs2EKM+bJUu2+iUYPDQ==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.3", + "@babel/helper-replace-supers": "^7.8.3" + } + }, + "@babel/plugin-transform-parameters": { + "version": "7.8.8", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.8.8.tgz", + "integrity": "sha512-hC4Ld/Ulpf1psQciWWwdnUspQoQco2bMzSrwU6TmzRlvoYQe4rQFy9vnCZDTlVeCQj0JPfL+1RX0V8hCJvkgBA==", + "requires": { + "@babel/helper-call-delegate": "^7.8.7", + "@babel/helper-get-function-arity": "^7.8.3", + "@babel/helper-plugin-utils": "^7.8.3" + } + }, + "@babel/plugin-transform-property-literals": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.8.3.tgz", + "integrity": "sha512-uGiiXAZMqEoQhRWMK17VospMZh5sXWg+dlh2soffpkAl96KAm+WZuJfa6lcELotSRmooLqg0MWdH6UUq85nmmg==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.3" + } + }, + "@babel/plugin-transform-react-display-name": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.8.3.tgz", + "integrity": "sha512-3Jy/PCw8Fe6uBKtEgz3M82ljt+lTg+xJaM4og+eyu83qLT87ZUSckn0wy7r31jflURWLO83TW6Ylf7lyXj3m5A==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.3" + } + }, + "@babel/plugin-transform-react-jsx": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.8.3.tgz", + "integrity": "sha512-r0h+mUiyL595ikykci+fbwm9YzmuOrUBi0b+FDIKmi3fPQyFokWVEMJnRWHJPPQEjyFJyna9WZC6Viv6UHSv1g==", + "requires": { + "@babel/helper-builder-react-jsx": "^7.8.3", + "@babel/helper-plugin-utils": "^7.8.3", + "@babel/plugin-syntax-jsx": "^7.8.3" + } + }, + "@babel/plugin-transform-react-jsx-self": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.8.3.tgz", + "integrity": "sha512-01OT7s5oa0XTLf2I8XGsL8+KqV9lx3EZV+jxn/L2LQ97CGKila2YMroTkCEIE0HV/FF7CMSRsIAybopdN9NTdg==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.3", + "@babel/plugin-syntax-jsx": "^7.8.3" + } + }, + "@babel/plugin-transform-react-jsx-source": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.8.3.tgz", + "integrity": "sha512-PLMgdMGuVDtRS/SzjNEQYUT8f4z1xb2BAT54vM1X5efkVuYBf5WyGUMbpmARcfq3NaglIwz08UVQK4HHHbC6ag==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.3", + "@babel/plugin-syntax-jsx": "^7.8.3" + } + }, + "@babel/plugin-transform-regenerator": { + "version": "7.8.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.7.tgz", + "integrity": "sha512-TIg+gAl4Z0a3WmD3mbYSk+J9ZUH6n/Yc57rtKRnlA/7rcCvpekHXe0CMZHP1gYp7/KLe9GHTuIba0vXmls6drA==", + "requires": { + "regenerator-transform": "^0.14.2" + } + }, + "@babel/plugin-transform-reserved-words": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.8.3.tgz", + "integrity": "sha512-mwMxcycN3omKFDjDQUl+8zyMsBfjRFr0Zn/64I41pmjv4NJuqcYlEtezwYtw9TFd9WR1vN5kiM+O0gMZzO6L0A==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.3" + } + }, + "@babel/plugin-transform-shorthand-properties": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.8.3.tgz", + "integrity": "sha512-I9DI6Odg0JJwxCHzbzW08ggMdCezoWcuQRz3ptdudgwaHxTjxw5HgdFJmZIkIMlRymL6YiZcped4TTCB0JcC8w==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.3" + } + }, + "@babel/plugin-transform-spread": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.8.3.tgz", + "integrity": "sha512-CkuTU9mbmAoFOI1tklFWYYbzX5qCIZVXPVy0jpXgGwkplCndQAa58s2jr66fTeQnA64bDox0HL4U56CFYoyC7g==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.3" + } + }, + "@babel/plugin-transform-sticky-regex": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.8.3.tgz", + "integrity": "sha512-9Spq0vGCD5Bb4Z/ZXXSK5wbbLFMG085qd2vhL1JYu1WcQ5bXqZBAYRzU1d+p79GcHs2szYv5pVQCX13QgldaWw==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.3", + "@babel/helper-regex": "^7.8.3" + } + }, + "@babel/plugin-transform-template-literals": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.8.3.tgz", + "integrity": "sha512-820QBtykIQOLFT8NZOcTRJ1UNuztIELe4p9DCgvj4NK+PwluSJ49we7s9FB1HIGNIYT7wFUJ0ar2QpCDj0escQ==", + "requires": { + "@babel/helper-annotate-as-pure": "^7.8.3", + "@babel/helper-plugin-utils": "^7.8.3" + } + }, + "@babel/plugin-transform-typeof-symbol": { + "version": "7.8.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.8.4.tgz", + "integrity": "sha512-2QKyfjGdvuNfHsb7qnBBlKclbD4CfshH2KvDabiijLMGXPHJXGxtDzwIF7bQP+T0ysw8fYTtxPafgfs/c1Lrqg==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.3" + } + }, + "@babel/plugin-transform-unicode-regex": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.8.3.tgz", + "integrity": "sha512-+ufgJjYdmWfSQ+6NS9VGUR2ns8cjJjYbrbi11mZBTaWm+Fui/ncTLFF28Ei1okavY+xkojGr1eJxNsWYeA5aZw==", + "requires": { + "@babel/helper-create-regexp-features-plugin": "^7.8.3", + "@babel/helper-plugin-utils": "^7.8.3" + } + }, + "@babel/preset-env": { + "version": "7.8.7", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.8.7.tgz", + "integrity": "sha512-BYftCVOdAYJk5ASsznKAUl53EMhfBbr8CJ1X+AJLfGPscQkwJFiaV/Wn9DPH/7fzm2v6iRYJKYHSqyynTGw0nw==", + "requires": { + "@babel/compat-data": "^7.8.6", + "@babel/helper-compilation-targets": "^7.8.7", + "@babel/helper-module-imports": "^7.8.3", + "@babel/helper-plugin-utils": "^7.8.3", + "@babel/plugin-proposal-async-generator-functions": "^7.8.3", + "@babel/plugin-proposal-dynamic-import": "^7.8.3", + "@babel/plugin-proposal-json-strings": "^7.8.3", + "@babel/plugin-proposal-nullish-coalescing-operator": "^7.8.3", + "@babel/plugin-proposal-object-rest-spread": "^7.8.3", + "@babel/plugin-proposal-optional-catch-binding": "^7.8.3", + "@babel/plugin-proposal-optional-chaining": "^7.8.3", + "@babel/plugin-proposal-unicode-property-regex": "^7.8.3", + "@babel/plugin-syntax-async-generators": "^7.8.0", + "@babel/plugin-syntax-dynamic-import": "^7.8.0", + "@babel/plugin-syntax-json-strings": "^7.8.0", + "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0", + "@babel/plugin-syntax-object-rest-spread": "^7.8.0", + "@babel/plugin-syntax-optional-catch-binding": "^7.8.0", + "@babel/plugin-syntax-optional-chaining": "^7.8.0", + "@babel/plugin-syntax-top-level-await": "^7.8.3", + "@babel/plugin-transform-arrow-functions": "^7.8.3", + "@babel/plugin-transform-async-to-generator": "^7.8.3", + "@babel/plugin-transform-block-scoped-functions": "^7.8.3", + "@babel/plugin-transform-block-scoping": "^7.8.3", + "@babel/plugin-transform-classes": "^7.8.6", + "@babel/plugin-transform-computed-properties": "^7.8.3", + "@babel/plugin-transform-destructuring": "^7.8.3", + "@babel/plugin-transform-dotall-regex": "^7.8.3", + "@babel/plugin-transform-duplicate-keys": "^7.8.3", + "@babel/plugin-transform-exponentiation-operator": "^7.8.3", + "@babel/plugin-transform-for-of": "^7.8.6", + "@babel/plugin-transform-function-name": "^7.8.3", + "@babel/plugin-transform-literals": "^7.8.3", + "@babel/plugin-transform-member-expression-literals": "^7.8.3", + "@babel/plugin-transform-modules-amd": "^7.8.3", + "@babel/plugin-transform-modules-commonjs": "^7.8.3", + "@babel/plugin-transform-modules-systemjs": "^7.8.3", + "@babel/plugin-transform-modules-umd": "^7.8.3", + "@babel/plugin-transform-named-capturing-groups-regex": "^7.8.3", + "@babel/plugin-transform-new-target": "^7.8.3", + "@babel/plugin-transform-object-super": "^7.8.3", + "@babel/plugin-transform-parameters": "^7.8.7", + "@babel/plugin-transform-property-literals": "^7.8.3", + "@babel/plugin-transform-regenerator": "^7.8.7", + "@babel/plugin-transform-reserved-words": "^7.8.3", + "@babel/plugin-transform-shorthand-properties": "^7.8.3", + "@babel/plugin-transform-spread": "^7.8.3", + "@babel/plugin-transform-sticky-regex": "^7.8.3", + "@babel/plugin-transform-template-literals": "^7.8.3", + "@babel/plugin-transform-typeof-symbol": "^7.8.4", + "@babel/plugin-transform-unicode-regex": "^7.8.3", + "@babel/types": "^7.8.7", + "browserslist": "^4.8.5", + "core-js-compat": "^3.6.2", + "invariant": "^2.2.2", + "levenary": "^1.1.1", + "semver": "^5.5.0" + } + }, + "@babel/preset-react": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.8.3.tgz", + "integrity": "sha512-9hx0CwZg92jGb7iHYQVgi0tOEHP/kM60CtWJQnmbATSPIQQ2xYzfoCI3EdqAhFBeeJwYMdWQuDUHMsuDbH9hyQ==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.3", + "@babel/plugin-transform-react-display-name": "^7.8.3", + "@babel/plugin-transform-react-jsx": "^7.8.3", + "@babel/plugin-transform-react-jsx-self": "^7.8.3", + "@babel/plugin-transform-react-jsx-source": "^7.8.3" + } + }, + "@babel/runtime": { + "version": "7.8.7", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.7.tgz", + "integrity": "sha512-+AATMUFppJDw6aiR5NVPHqIQBlV/Pj8wY/EZH+lmvRdUo9xBaz/rF3alAwFJQavvKfeOlPE7oaaDHVbcySbCsg==", + "requires": { + "regenerator-runtime": "^0.13.4" + } + }, + "@babel/template": { + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz", + "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==", + "requires": { + "@babel/code-frame": "^7.8.3", + "@babel/parser": "^7.8.6", + "@babel/types": "^7.8.6" + } + }, + "@babel/traverse": { + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.8.6.tgz", + "integrity": "sha512-2B8l0db/DPi8iinITKuo7cbPznLCEk0kCxDoB9/N6gGNg/gxOXiR/IcymAFPiBwk5w6TtQ27w4wpElgp9btR9A==", + "requires": { + "@babel/code-frame": "^7.8.3", + "@babel/generator": "^7.8.6", + "@babel/helper-function-name": "^7.8.3", + "@babel/helper-split-export-declaration": "^7.8.3", + "@babel/parser": "^7.8.6", + "@babel/types": "^7.8.6", + "debug": "^4.1.0", + "globals": "^11.1.0", + "lodash": "^4.17.13" + } + }, + "@babel/types": { + "version": "7.8.7", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.7.tgz", + "integrity": "sha512-k2TreEHxFA4CjGkL+GYjRyx35W0Mr7DP5+9q6WMkyKXB+904bYmG40syjMFV0oLlhhFCwWl0vA0DyzTDkwAiJw==", + "requires": { + "esutils": "^2.0.2", + "lodash": "^4.17.13", + "to-fast-properties": "^2.0.0" + } + }, + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "requires": { + "ms": "^2.1.1" + } + }, + "emojis-list": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", + "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==" + }, + "json5": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.2.tgz", + "integrity": "sha512-MoUOQ4WdiN3yxhm7NEVJSJrieAo5hNSLQ5sj05OTRHPL9HOBy8u4Bu88jsC1jvqAdN+E1bJmsUcZH+1HQxliqQ==", + "requires": { + "minimist": "^1.2.5" + } + }, + "loader-utils": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz", + "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==", + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^1.0.1" + }, + "dependencies": { + "json5": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", + "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", + "requires": { + "minimist": "^1.2.0" + } + } + } + }, + "minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" + }, + "regenerate-unicode-properties": { + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz", + "integrity": "sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==", + "requires": { + "regenerate": "^1.4.0" + } + }, + "regenerator-runtime": { + "version": "0.13.5", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", + "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==" + }, + "regenerator-transform": { + "version": "0.14.4", + "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.4.tgz", + "integrity": "sha512-EaJaKPBI9GvKpvUz2mz4fhx7WPgvwRLY9v3hlNHWmAuJHI13T4nwKnNvm5RWJzEdnI5g5UwtOww+S8IdoUC2bw==", + "requires": { + "@babel/runtime": "^7.8.4", + "private": "^0.1.8" + } + }, + "regexpu-core": { + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.0.tgz", + "integrity": "sha512-TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ==", + "requires": { + "regenerate": "^1.4.0", + "regenerate-unicode-properties": "^8.2.0", + "regjsgen": "^0.5.1", + "regjsparser": "^0.6.4", + "unicode-match-property-ecmascript": "^1.0.4", + "unicode-match-property-value-ecmascript": "^1.2.0" + } + }, + "regjsparser": { + "version": "0.6.4", + "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.4.tgz", + "integrity": "sha512-64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==", + "requires": { + "jsesc": "~0.5.0" + }, + "dependencies": { + "jsesc": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", + "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=" + } + } + }, + "unicode-match-property-value-ecmascript": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz", + "integrity": "sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==" + }, + "unist-util-visit": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.4.1.tgz", + "integrity": "sha512-AvGNk7Bb//EmJZyhtRUnNMEpId/AZ5Ph/KUpTI09WHQuDZHKovQ1oEv3mfmKpWKtoMzyMC4GLBm1Zy5k12fjIw==", + "requires": { + "unist-util-visit-parents": "^2.0.0" + } + } + } + }, + "gatsby-plugin-page-creator": { + "version": "2.1.45", + "resolved": "https://registry.npmjs.org/gatsby-plugin-page-creator/-/gatsby-plugin-page-creator-2.1.45.tgz", + "integrity": "sha512-mW5qfJ2C6U522wx63fZRTN2jCKG9FC/jkEmq4B0z5J/SOA9zPAlVvowjQAAW0+oGbEqwfIveSM+hIPwv1J7npA==", + "requires": { + "@babel/runtime": "^7.7.6", + "bluebird": "^3.7.2", + "fs-exists-cached": "^1.0.0", + "gatsby-page-utils": "^0.0.44", + "glob": "^7.1.6", + "lodash": "^4.17.15", + "micromatch": "^3.1.10" + }, + "dependencies": { + "@babel/runtime": { + "version": "7.8.7", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.7.tgz", + "integrity": "sha512-+AATMUFppJDw6aiR5NVPHqIQBlV/Pj8wY/EZH+lmvRdUo9xBaz/rF3alAwFJQavvKfeOlPE7oaaDHVbcySbCsg==", + "requires": { + "regenerator-runtime": "^0.13.4" + } + }, + "bluebird": { + "version": "3.7.2", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", + "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" + }, + "regenerator-runtime": { + "version": "0.13.5", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", + "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==" + } + } + }, + "gatsby-plugin-printer": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/gatsby-plugin-printer/-/gatsby-plugin-printer-1.0.8.tgz", + "integrity": "sha512-a9V1sFQxIrFx47jQJdMkRmTd6jJj3cs+YT1mfuctkmTjBvKU7+L4b3XVqkr0fyljGsAZg/Ztdgud0ccmux4rgQ==", + "requires": { + "@sindresorhus/slugify": "^0.9.1", + "babel-plugin-preval": "^3.0.1", + "fs-extra": "^8.1.0", + "puppeteer": "^1.19.0", + "rollup": "1.23.1", + "rollup-plugin-babel": "^4.3.3", + "rollup-plugin-commonjs": "^10.0.1", + "rollup-plugin-node-builtins": "^2.1.2", + "rollup-plugin-node-globals": "^1.4.0", + "rollup-plugin-node-resolve": "^5.2.0", + "rollup-plugin-replace": "^2.2.0" + } + }, + "gatsby-plugin-react-helmet": { + "version": "3.1.24", + "resolved": "https://registry.npmjs.org/gatsby-plugin-react-helmet/-/gatsby-plugin-react-helmet-3.1.24.tgz", + "integrity": "sha512-kLR/RMDBVriJptsJufoL1UBVHgq2fZIMXen7nru2ugGn0m8xwpArFoOz6meYlpiDB3Z41eYR/+Nr8GizQnYcxg==", + "requires": { + "@babel/runtime": "^7.8.7" + }, + "dependencies": { + "@babel/runtime": { + "version": "7.8.7", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.7.tgz", + "integrity": "sha512-+AATMUFppJDw6aiR5NVPHqIQBlV/Pj8wY/EZH+lmvRdUo9xBaz/rF3alAwFJQavvKfeOlPE7oaaDHVbcySbCsg==", + "requires": { + "regenerator-runtime": "^0.13.4" + } + }, + "regenerator-runtime": { + "version": "0.13.5", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", + "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==" + } + } + }, + "gatsby-plugin-segment-js": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/gatsby-plugin-segment-js/-/gatsby-plugin-segment-js-3.1.0.tgz", + "integrity": "sha512-oBcIY+riNehfyQXp8PEGVQTz/VPt/+k2aXCh/bNZSR4HhjEAXafcSCReS2xzs/3IJRa3gH0+NOZvRU8peXDb/w==" + }, + "gatsby-plugin-svgr": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/gatsby-plugin-svgr/-/gatsby-plugin-svgr-2.0.2.tgz", + "integrity": "sha512-54REIMe79qFBAwpcnWHBkvEE9CKoEVkefF9rDXai0k642r91SZ4UeWFuAmsegPG+sPVub7tHfHu/2LVXK1I9kg==" + }, + "gatsby-react-router-scroll": { + "version": "2.1.23", + "resolved": "https://registry.npmjs.org/gatsby-react-router-scroll/-/gatsby-react-router-scroll-2.1.23.tgz", + "integrity": "sha512-yUCWzRYUDgvr3xy5GAYd08gToBfE84SX3zvHWgPunVeL4OfwsYh6eei6GtYbLIjq77bvegd2SZkSujQ4Vgm/Gg==", + "requires": { + "@babel/runtime": "^7.7.6", + "scroll-behavior": "^0.9.10", + "warning": "^3.0.0" + }, + "dependencies": { + "@babel/runtime": { + "version": "7.8.7", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.7.tgz", + "integrity": "sha512-+AATMUFppJDw6aiR5NVPHqIQBlV/Pj8wY/EZH+lmvRdUo9xBaz/rF3alAwFJQavvKfeOlPE7oaaDHVbcySbCsg==", + "requires": { + "regenerator-runtime": "^0.13.4" + } + }, + "regenerator-runtime": { + "version": "0.13.5", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", + "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==" + }, + "warning": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/warning/-/warning-3.0.0.tgz", + "integrity": "sha1-MuU3fLVy3kqwR1O9+IIcAe1gW3w=", + "requires": { + "loose-envify": "^1.0.0" + } + } + } + }, + "gatsby-remark-autolink-headers": { + "version": "2.1.26", + "resolved": "https://registry.npmjs.org/gatsby-remark-autolink-headers/-/gatsby-remark-autolink-headers-2.1.26.tgz", + "integrity": "sha512-fsf/sTJJr99ETZ1PxpXYUJNVAc5bCKR5JiNWZ5rEC7QH7+0XGaK1cGpc4ME7JW4euzegvmUwVMuiLbgPOfL0RA==", + "requires": { + "@babel/runtime": "^7.8.7", + "github-slugger": "^1.3.0", + "lodash": "^4.17.15", + "mdast-util-to-string": "^1.1.0", + "unist-util-visit": "^1.4.1" + }, + "dependencies": { + "@babel/runtime": { + "version": "7.8.7", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.7.tgz", + "integrity": "sha512-+AATMUFppJDw6aiR5NVPHqIQBlV/Pj8wY/EZH+lmvRdUo9xBaz/rF3alAwFJQavvKfeOlPE7oaaDHVbcySbCsg==", + "requires": { + "regenerator-runtime": "^0.13.4" + } + }, + "regenerator-runtime": { + "version": "0.13.5", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", + "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==" + }, + "unist-util-visit": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.4.1.tgz", + "integrity": "sha512-AvGNk7Bb//EmJZyhtRUnNMEpId/AZ5Ph/KUpTI09WHQuDZHKovQ1oEv3mfmKpWKtoMzyMC4GLBm1Zy5k12fjIw==", + "requires": { + "unist-util-visit-parents": "^2.0.0" + } + } + } + }, + "gatsby-remark-check-links": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/gatsby-remark-check-links/-/gatsby-remark-check-links-2.1.0.tgz", + "integrity": "sha512-TbhT8oVlAgJfxe0WUQWDOb0kLkMUYo1N4AfFstejClPWO4OjRlznt3IMW3weQkwuweiovF5cxVpQcFrkCGVFBw==", + "requires": { + "unist-util-visit": "^1.4.1" + }, + "dependencies": { + "unist-util-visit": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.4.1.tgz", + "integrity": "sha512-AvGNk7Bb//EmJZyhtRUnNMEpId/AZ5Ph/KUpTI09WHQuDZHKovQ1oEv3mfmKpWKtoMzyMC4GLBm1Zy5k12fjIw==", + "requires": { + "unist-util-visit-parents": "^2.0.0" + } + } + } + }, + "gatsby-remark-code-titles": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/gatsby-remark-code-titles/-/gatsby-remark-code-titles-1.1.0.tgz", + "integrity": "sha512-RuNqziXi99eBIj5NJP0TgdzAxzWFL+ArGRb3961Ff9Tto/nCvmyqR1qySaWKXtkOgeqoVUlqAFNUCyEAyNuc8w==", + "requires": { + "query-string": "~6.0.0", + "unist-util-visit": "~1.3.0" + }, + "dependencies": { + "query-string": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/query-string/-/query-string-6.0.0.tgz", + "integrity": "sha1-i485RHtz6CkNb141gXeSGOkXEUI=", + "requires": { + "decode-uri-component": "^0.2.0", + "strict-uri-encode": "^2.0.0" + } + }, + "strict-uri-encode": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz", + "integrity": "sha1-ucczDHBChi9rFC3CdLvMWGbONUY=" + }, "unist-util-is": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-2.1.3.tgz", @@ -10225,11 +11089,11 @@ } }, "gatsby-remark-copy-linked-files": { - "version": "2.1.39", - "resolved": "https://registry.npmjs.org/gatsby-remark-copy-linked-files/-/gatsby-remark-copy-linked-files-2.1.39.tgz", - "integrity": "sha512-jwNGPgS3e7sjvsbcZukZdGN3mfgnzPR4U3C0RRdiiDgJbk5qnVM8n0InUtecHmBNHE+JZho48Okl5zk0gIh+bw==", + "version": "2.1.40", + "resolved": "https://registry.npmjs.org/gatsby-remark-copy-linked-files/-/gatsby-remark-copy-linked-files-2.1.40.tgz", + "integrity": "sha512-htZTd5rD46rg4j6KykJJE/GnV+ONidanyDlZWBJyvmIM97Jmcgh6FLpwy68PCzjw32JBdow3Wu2H//vvGYdBYw==", "requires": { - "@babel/runtime": "^7.7.6", + "@babel/runtime": "^7.8.7", "cheerio": "^1.0.0-rc.3", "fs-extra": "^8.1.0", "is-relative-url": "^3.0.0", @@ -10283,9 +11147,9 @@ } }, "regenerator-runtime": { - "version": "0.13.4", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.4.tgz", - "integrity": "sha512-plpwicqEzfEyTQohIKktWigcLzmNStMGwbOUbykx51/29Z3JOGYldaaNGK7ngNXV+UcoqvIMmloZ48Sr74sd+g==" + "version": "0.13.5", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", + "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==" }, "unist-util-visit": { "version": "1.4.1", @@ -10318,11 +11182,11 @@ } }, "gatsby-remark-prismjs": { - "version": "3.3.33", - "resolved": "https://registry.npmjs.org/gatsby-remark-prismjs/-/gatsby-remark-prismjs-3.3.33.tgz", - "integrity": "sha512-9ob5zaJuAXYUrO3NCjn0332b7HbEZ7IBzwkZbOvabgPXPryoPY9kmriiY49Y0GmYi9nOWc6RL58Aj6YnTe3v3w==", + "version": "3.3.36", + "resolved": "https://registry.npmjs.org/gatsby-remark-prismjs/-/gatsby-remark-prismjs-3.3.36.tgz", + "integrity": "sha512-zB3ugln115JMrypaf1FqllilJx5C56Vw6ze12MLw5BLlWUAPXbteTWtWbFHKPeLK6tSQDLs97d8zFYTqySgSuw==", "requires": { - "@babel/runtime": "^7.7.6", + "@babel/runtime": "^7.8.7", "parse-numeric-range": "^0.0.2", "unist-util-visit": "^1.4.1" }, @@ -10336,9 +11200,9 @@ } }, "regenerator-runtime": { - "version": "0.13.4", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.4.tgz", - "integrity": "sha512-plpwicqEzfEyTQohIKktWigcLzmNStMGwbOUbykx51/29Z3JOGYldaaNGK7ngNXV+UcoqvIMmloZ48Sr74sd+g==" + "version": "0.13.5", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", + "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==" }, "unist-util-visit": { "version": "1.4.1", @@ -10359,17 +11223,17 @@ } }, "gatsby-source-filesystem": { - "version": "2.1.51", - "resolved": "https://registry.npmjs.org/gatsby-source-filesystem/-/gatsby-source-filesystem-2.1.51.tgz", - "integrity": "sha512-j0FlGCy//9a45jPJ/q1MGDK9ViZ/wEQThSwsIjTU6/tNwV2GY0p8dcVGRtUZblYdbWOv8J7WhTA6t3QKLHEzgQ==", + "version": "2.1.57", + "resolved": "https://registry.npmjs.org/gatsby-source-filesystem/-/gatsby-source-filesystem-2.1.57.tgz", + "integrity": "sha512-HBD1wFoCpVXYLwL3Wwyz6d2E/ff7DDy81YrmCzXTJmAsGmVXraJZkUAbxwuqt3L793e8SHBd6yVi+wBKRowBXg==", "requires": { - "@babel/runtime": "^7.7.6", + "@babel/runtime": "^7.8.7", "better-queue": "^3.8.10", "bluebird": "^3.7.2", - "chokidar": "3.3.0", - "file-type": "^12.4.0", + "chokidar": "3.3.1", + "file-type": "^12.4.2", "fs-extra": "^8.1.0", - "gatsby-core-utils": "^1.0.31", + "gatsby-core-utils": "^1.0.34", "got": "^8.3.2", "md5-file": "^3.2.3", "mime": "^2.4.4", @@ -10377,7 +11241,7 @@ "progress": "^2.0.3", "read-chunk": "^3.2.0", "valid-url": "^1.0.9", - "xstate": "^4.7.2" + "xstate": "^4.8.0" }, "dependencies": { "@babel/runtime": { @@ -10388,15 +11252,113 @@ "regenerator-runtime": "^0.13.4" } }, + "anymatch": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz", + "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==", + "requires": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + } + }, + "binary-extensions": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz", + "integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==" + }, "bluebird": { "version": "3.7.2", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" }, + "braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "requires": { + "fill-range": "^7.0.1" + } + }, + "chokidar": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.3.1.tgz", + "integrity": "sha512-4QYCEWOcK3OJrxwvyyAOxFuhpvOVCYkr33LPfFNBjAD/w3sEzWsp2BUOkI4l9bHvWioAd0rc6NlHUOEaWkTeqg==", + "requires": { + "anymatch": "~3.1.1", + "braces": "~3.0.2", + "fsevents": "~2.1.2", + "glob-parent": "~5.1.0", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.3.0" + } + }, + "fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "requires": { + "to-regex-range": "^5.0.1" + } + }, + "fsevents": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.2.tgz", + "integrity": "sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==", + "optional": true + }, + "glob-parent": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz", + "integrity": "sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==", + "requires": { + "is-glob": "^4.0.1" + } + }, + "is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "requires": { + "binary-extensions": "^2.0.0" + } + }, + "is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==" + }, + "normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==" + }, + "readdirp": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.3.0.tgz", + "integrity": "sha512-zz0pAkSPOXXm1viEwygWIPSPkcBYjW1xU5j/JBh5t9bGCJwa6f9+BJa6VaB2g+b55yVrmXzqkyLf4xaWYM0IkQ==", + "requires": { + "picomatch": "^2.0.7" + } + }, "regenerator-runtime": { - "version": "0.13.4", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.4.tgz", - "integrity": "sha512-plpwicqEzfEyTQohIKktWigcLzmNStMGwbOUbykx51/29Z3JOGYldaaNGK7ngNXV+UcoqvIMmloZ48Sr74sd+g==" + "version": "0.13.5", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", + "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==" + }, + "to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "requires": { + "is-number": "^7.0.0" + } + }, + "xstate": { + "version": "4.8.0", + "resolved": "https://registry.npmjs.org/xstate/-/xstate-4.8.0.tgz", + "integrity": "sha512-xHSYQtCHLkcrFRxa5lK4Lp1rnKt00a80jcKFMQiMBuE+6MvTYv7twwqYpzjsJoKFjGZB3GGEpZAuY1dmlPTh/g==" } } }, @@ -10498,9 +11460,9 @@ } }, "gatsby-theme-apollo-core": { - "version": "3.0.10", - "resolved": "https://registry.npmjs.org/gatsby-theme-apollo-core/-/gatsby-theme-apollo-core-3.0.10.tgz", - "integrity": "sha512-vXh1Yu1H2mdDCtuoc6UVGhXLwxXzN4YmWgnweEW+e1ZQYH1WKYQhMM/XjuUQUxXz0aI34y7IZeL3rvXUiDhh9Q==", + "version": "3.0.11", + "resolved": "https://registry.npmjs.org/gatsby-theme-apollo-core/-/gatsby-theme-apollo-core-3.0.11.tgz", + "integrity": "sha512-dWpSi35pbNASs6/6flvlAP2qmOhaLrhDv9CqDyEYajG1yvH7qMrKHP8XLKVObyZ2BU3Y6Zzw+OKdoZVtlo/5Ig==", "requires": { "@apollo/space-kit": "2.15.0", "@emotion/core": "^10.0.7", @@ -10519,9 +11481,9 @@ } }, "gatsby-theme-apollo-docs": { - "version": "4.0.14", - "resolved": "https://registry.npmjs.org/gatsby-theme-apollo-docs/-/gatsby-theme-apollo-docs-4.0.14.tgz", - "integrity": "sha512-hptn26w5o8MOA5iH6NZ00KrWdUzPRXUiCgJzh1J4+ggqCtypGixU5uXJIwR/ka9WRUJtQWz9uaJ47XlPnhTMUw==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/gatsby-theme-apollo-docs/-/gatsby-theme-apollo-docs-4.1.1.tgz", + "integrity": "sha512-ZV83sYtJHapHgdu3TIR7dejWGwgVMafLyOt3fIQ7XFxU3PGztGWwwoeL4kZ3i8M505+I0hMF8OtL1EO+oehkaw==", "requires": { "@mdx-js/mdx": "^1.1.0", "@mdx-js/react": "^1.0.27", @@ -10537,7 +11499,7 @@ "gatsby-remark-rewrite-relative-links": "^1.0.7", "gatsby-source-filesystem": "^2.0.29", "gatsby-source-git": "^1.0.1", - "gatsby-theme-apollo-core": "^3.0.10", + "gatsby-theme-apollo-core": "^3.0.11", "gatsby-transformer-remark": "^2.6.30", "js-yaml": "^3.13.1", "prismjs": "^1.15.0", @@ -10552,26 +11514,26 @@ } }, "gatsby-transformer-remark": { - "version": "2.6.56", - "resolved": "https://registry.npmjs.org/gatsby-transformer-remark/-/gatsby-transformer-remark-2.6.56.tgz", - "integrity": "sha512-WJ0FW95fpGYVBwAKYK+ddEvr7b1Wj3ot2BLSgzhcVGn1dHrih+y89NI6XwHs8bHmRhWaVNSF21fdvDC2bYlZ0w==", + "version": "2.6.59", + "resolved": "https://registry.npmjs.org/gatsby-transformer-remark/-/gatsby-transformer-remark-2.6.59.tgz", + "integrity": "sha512-EL2S85aMtJadVsgKRI7hUZIaW4z5i4lLHXnivveEytu05f+GLnPKmBJB82n4LIRo6p+ebSLGx8Iql+pgy41WIQ==", "requires": { - "@babel/runtime": "^7.7.6", + "@babel/runtime": "^7.8.7", "bluebird": "^3.7.2", - "gatsby-core-utils": "^1.0.31", + "gatsby-core-utils": "^1.0.34", "gray-matter": "^4.0.2", "hast-util-raw": "^4.0.0", "hast-util-to-html": "^4.0.1", "lodash": "^4.17.15", "mdast-util-to-hast": "^3.0.4", - "mdast-util-to-string": "^1.0.7", + "mdast-util-to-string": "^1.1.0", "mdast-util-toc": "^5.0", "remark": "^10.0.1", "remark-parse": "^6.0.3", "remark-retext": "^3.1.3", "remark-stringify": "6.0.4", "retext-english": "^3.0.4", - "sanitize-html": "^1.20.1", + "sanitize-html": "^1.22.1", "underscore.string": "^3.3.5", "unified": "^6.2.0", "unist-util-remove-position": "^1.1.4", @@ -10722,9 +11684,9 @@ } }, "regenerator-runtime": { - "version": "0.13.4", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.4.tgz", - "integrity": "sha512-plpwicqEzfEyTQohIKktWigcLzmNStMGwbOUbykx51/29Z3JOGYldaaNGK7ngNXV+UcoqvIMmloZ48Sr74sd+g==" + "version": "0.13.5", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", + "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==" }, "remark-parse": { "version": "6.0.3", @@ -13187,6 +14149,14 @@ "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz", "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==" }, + "levenary": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/levenary/-/levenary-1.1.1.tgz", + "integrity": "sha512-mkAdOIt79FD6irqjYSs4rdbnlT5vRonMEvBVPVb3XmevfS8kgRXwfes0dhPdEtzTWD/1eNE/Bm/G1iRt6DcnQQ==", + "requires": { + "leven": "^3.1.0" + } + }, "levn": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", @@ -17699,9 +18669,9 @@ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, "sanitize-html": { - "version": "1.22.0", - "resolved": "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.22.0.tgz", - "integrity": "sha512-3RPo65mbTKpOAdAYWU496MSty1YbB3Y5bjwL5OclgaSSMtv65xvM7RW/EHRumzaZ1UddEJowCbSdK0xl5sAu0A==", + "version": "1.22.1", + "resolved": "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.22.1.tgz", + "integrity": "sha512-++IMC00KfMQc45UWZJlhWOlS9eMrME38sFG9GXfR+k6oBo9JXSYQgTOZCl9j3v/smFTRNT9XNwz5DseFdMY+2Q==", "requires": { "chalk": "^2.4.1", "htmlparser2": "^4.1.0", @@ -17709,7 +18679,7 @@ "lodash.escaperegexp": "^4.1.2", "lodash.isplainobject": "^4.0.6", "lodash.isstring": "^4.0.1", - "lodash.mergewith": "^4.6.1", + "lodash.mergewith": "^4.6.2", "postcss": "^7.0.27", "srcset": "^2.0.1", "xtend": "^4.0.1" @@ -18147,9 +19117,9 @@ "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=" }, "simple-git": { - "version": "1.131.0", - "resolved": "https://registry.npmjs.org/simple-git/-/simple-git-1.131.0.tgz", - "integrity": "sha512-z/art7YYtmPnnLItT/j+nKwJt6ap6nHZ4D8sYo9PdCKK/ug56SN6m/evfxJk7uDV3e9JuCa8qIyDU2P3cxmiNQ==", + "version": "1.132.0", + "resolved": "https://registry.npmjs.org/simple-git/-/simple-git-1.132.0.tgz", + "integrity": "sha512-xauHm1YqCTom1sC9eOjfq3/9RKiUA9iPnxBbrY2DdL8l4ADMu0jjM5l5lphQP5YWNqAL2aXC/OeuQ76vHtW5fg==", "requires": { "debug": "^4.0.1" }, diff --git a/docs/package.json b/docs/package.json index 8f25769430f..ce6b6593ed7 100644 --- a/docs/package.json +++ b/docs/package.json @@ -7,7 +7,7 @@ }, "dependencies": { "gatsby": "2.19.43", - "gatsby-theme-apollo-docs": "4.0.14", + "gatsby-theme-apollo-docs": "4.1.1", "react": "16.13.0", "react-dom": "16.13.0" } From 8996158d5b2e3559c3316bfe64532f569e935ad9 Mon Sep 17 00:00:00 2001 From: Trevor Scheer Date: Thu, 19 Mar 2020 11:25:29 -0700 Subject: [PATCH 307/642] Adjust schema rollback test for less flakiness A long `await`ed change (hah), this should put a nail in the schema rollback test flakiness once and for all. This solution is a code-driven approach rather than a time-driven approach. It depends directly on the schema change listener functionality already built-in to the gateway. cc @abernix --- .../integration/networkRequests.test.ts | 32 ++++++++----------- 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/packages/apollo-gateway/src/__tests__/integration/networkRequests.test.ts b/packages/apollo-gateway/src/__tests__/integration/networkRequests.test.ts index c3908780c7a..add29d2a504 100644 --- a/packages/apollo-gateway/src/__tests__/integration/networkRequests.test.ts +++ b/packages/apollo-gateway/src/__tests__/integration/networkRequests.test.ts @@ -172,30 +172,26 @@ it('Rollsback to a previous schema when triggered', async () => { mockImplementingServices(service).reply(304); mockRawPartialSchema(service).reply(304); - jest.useFakeTimers(); + let firstResolve: () => void; + let secondResolve: () => void; + const firstSchemaChangeBlocker = new Promise(res => (firstResolve = res)); + const secondSchemaChangePromise = new Promise(res => (secondResolve = res)); + + const onChange = jest + .fn() + .mockImplementationOnce(() => firstResolve()) + .mockImplementationOnce(() => secondResolve()); - const onChange = jest.fn(); const gateway = new ApolloGateway(); + // @ts-ignore for testing purposes, a short pollInterval is ideal so we'll override here + gateway.experimental_pollInterval = 100; + await gateway.load({ engine: { apiKeyHash, graphId } }); gateway.onSchemaChange(onChange); - // 10000 ms is the default pollInterval - jest.advanceTimersByTime(10000); - - // This useReal/useFake is challenging to explain the need for, and I probably - // don't have the _correct_ answer here, but it seems that pushing this process - // to the back of the task queue is insufficient. - jest.useRealTimers(); - await new Promise(resolve => setTimeout(resolve, 100)); - jest.useFakeTimers(); - + await firstSchemaChangeBlocker; expect(onChange.mock.calls.length).toBe(1); - jest.advanceTimersByTime(10000); - - jest.useRealTimers(); - await new Promise(resolve => setTimeout(resolve, 100)); - jest.useFakeTimers(); - + await secondSchemaChangePromise; expect(onChange.mock.calls.length).toBe(2); }); From 4eaa044d3fa825f82327f1605aea93f580350b03 Mon Sep 17 00:00:00 2001 From: Stephen Barlow Date: Thu, 19 Mar 2020 17:27:22 -0700 Subject: [PATCH 308/642] Incorporate some items from michael-watson and jhampton --- docs/source/federation/gateway.mdx | 4 +- .../federation/implementing-services.mdx | 64 +++++++++++++++++++ 2 files changed, 67 insertions(+), 1 deletion(-) diff --git a/docs/source/federation/gateway.mdx b/docs/source/federation/gateway.mdx index c7d7db48746..055c211d380 100644 --- a/docs/source/federation/gateway.mdx +++ b/docs/source/federation/gateway.mdx @@ -11,6 +11,8 @@ After you set up at least one federation-ready [implementing service](./implemen The `@apollo/gateway` package extends Apollo Server's functionality, enabling it to act as a gateway for an Apollo Federation architecture. +> If you run your gateway in a serverless environment (such as AWS Lambda), we recommend setting your function's timeout to at least 10 seconds to prevent unexpected errors. + ## Setup First, let's install the necessary packages: @@ -214,7 +216,7 @@ server.listen().then(({ url }) => { To learn more about `buildService` and `RemoteGraphQLDataSource`, see the [API docs](/api/apollo-gateway/). -## Implementing custom directives +## Custom directive support The `@apollo/gateway` library supports the use of custom [directives](/schema/directives/) in your implementing service schemas. This support differs depending on whether a given directive is a **type system directive** or an **executable directive**. diff --git a/docs/source/federation/implementing-services.mdx b/docs/source/federation/implementing-services.mdx index 045b21cab7c..d7330c25c8d 100644 --- a/docs/source/federation/implementing-services.mdx +++ b/docs/source/federation/implementing-services.mdx @@ -5,6 +5,10 @@ sidebar_title: Implementing services import FederationArchitecture from '../../shared/diagrams/federation-architecture.mdx'; +import { + ExpansionPanel, +} from 'gatsby-theme-apollo-docs/src/components/expansion-panel'; + This article describes how to create an **implementing service** for a federated data graph using Apollo Server. ## Defining an implementing service @@ -155,6 +159,66 @@ server.listen(4001).then(({ url }) => { }); ``` +## Defining custom directives + +The method for defining [custom directives](/schema/creating-directives/) differs slightly in Apollo Federation. + +**Without Apollo Federation**, you provide your directive definitions to the constructor of `ApolloServer` in the `schemaDirectives` argument, like so: + + + +```js{15-17} +const { ApolloServer, gql, SchemaDirectiveVisitor } = require("apollo-server"); + +// typeDefs and resolvers defined here + +class DeprecatedDirective extends SchemaDirectiveVisitor { + public visitFieldDefinition(field: GraphQLField) { + field.isDeprecated = true; + field.deprecationReason = this.args.reason; + } +} + +const server = new ApolloServer({ + typeDefs, + resolvers, + schemaDirectives: { + deprecated: DeprecatedDirective + } +}); +``` + + + +**With Apollo Federation**, you instead call `SchemaDirectiveVisitor.visitSchemaDirectives`, passing in your schema and your directives, _before_ you provide your schema to the constructor of `ApolloServer`: + +```js +const { ApolloServer, gql, SchemaDirectiveVisitor } = require('apollo-server'); +const { buildFederatedSchema } = require ('@apollo/federation') + +// typeDefs and resolvers defined here + +class DeprecatedDirective extends SchemaDirectiveVisitor { + public visitFieldDefinition(field: GraphQLField) { + field.isDeprecated = true; + field.deprecationReason = this.args.reason; + } +} + +const directives = { + deprecated: DeprecatedDirective +}; +let schema = buildFederatedSchema([{ typeDefs, resolvers }]); + +SchemaDirectiveVisitor.visitSchemaDirectives(schema, directives); + +const server = new ApolloServer({ + schema: schema +}); +``` + +Also make sure to read about the [gateway's support for custom directives](./gateway/#custom-directive-support). + ## Securing implementing services Because of the power and flexibility of Apollo Federation's `_entities` field, your implementing services should **not** be directly accessible by clients. Instead, only your [gateway](./gateway/) should have access to your implementing serivces. Clients then communicate with the gateway: From faae806b85ab44599e00b96baa2d607fd59c2f24 Mon Sep 17 00:00:00 2001 From: Trevor Scheer Date: Thu, 19 Mar 2020 18:17:40 -0700 Subject: [PATCH 309/642] Cleanup test variable name Followup to 8996158d5b2e3559c3316bfe64532f569e935ad9 --- .../src/__tests__/integration/networkRequests.test.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/apollo-gateway/src/__tests__/integration/networkRequests.test.ts b/packages/apollo-gateway/src/__tests__/integration/networkRequests.test.ts index add29d2a504..10a97831655 100644 --- a/packages/apollo-gateway/src/__tests__/integration/networkRequests.test.ts +++ b/packages/apollo-gateway/src/__tests__/integration/networkRequests.test.ts @@ -175,7 +175,7 @@ it('Rollsback to a previous schema when triggered', async () => { let firstResolve: () => void; let secondResolve: () => void; const firstSchemaChangeBlocker = new Promise(res => (firstResolve = res)); - const secondSchemaChangePromise = new Promise(res => (secondResolve = res)); + const secondSchemaChangeBlocker = new Promise(res => (secondResolve = res)); const onChange = jest .fn() @@ -192,6 +192,6 @@ it('Rollsback to a previous schema when triggered', async () => { await firstSchemaChangeBlocker; expect(onChange.mock.calls.length).toBe(1); - await secondSchemaChangePromise; + await secondSchemaChangeBlocker; expect(onChange.mock.calls.length).toBe(2); }); From 10381e6b6396d8aadd0edaad1bd57625b07baf1d Mon Sep 17 00:00:00 2001 From: Stephen Barlow Date: Fri, 20 Mar 2020 13:22:56 -0700 Subject: [PATCH 310/642] Tweak serverless advisory --- docs/source/federation/gateway.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/federation/gateway.mdx b/docs/source/federation/gateway.mdx index 055c211d380..6e0dd2e01ee 100644 --- a/docs/source/federation/gateway.mdx +++ b/docs/source/federation/gateway.mdx @@ -11,7 +11,7 @@ After you set up at least one federation-ready [implementing service](./implemen The `@apollo/gateway` package extends Apollo Server's functionality, enabling it to act as a gateway for an Apollo Federation architecture. -> If you run your gateway in a serverless environment (such as AWS Lambda), we recommend setting your function's timeout to at least 10 seconds to prevent unexpected errors. +> We recommend against running your gateway in a serverless environment (such as AWS Lambda), because schema composition increases Apollo Server's startup time. If you do run your gateway in a serverless environment, set your function's timeout to at least 10 seconds to prevent unexpected errors. ## Setup From 5afdb4e9e5083b76094cd33015a9ee16762d68eb Mon Sep 17 00:00:00 2001 From: Tyler Hogan Date: Fri, 20 Mar 2020 22:55:39 -0700 Subject: [PATCH 311/642] Fix Typescript generic typing for datasource contexts (#3865) This is a fix for the `TContext` typings of the gateway's exposed `GraphQLDataSource` implementations. In their previous form, they didn't work as intended, or in any manner that's useful for typing the `context` property throughout the class methods. This introduces a type argument `TContext` to the class itself (which defaults to `Record` for existing implementations) and removes the non-operational type arguments on the class methods themselves. --- packages/apollo-gateway/CHANGELOG.md | 4 ++++ .../src/datasources/LocalGraphQLDataSource.ts | 4 ++-- .../src/datasources/RemoteGraphQLDataSource.ts | 16 ++++++++-------- packages/apollo-gateway/src/datasources/types.ts | 4 ++-- packages/apollo-gateway/src/executeQueryPlan.ts | 4 ++-- 5 files changed, 18 insertions(+), 14 deletions(-) diff --git a/packages/apollo-gateway/CHANGELOG.md b/packages/apollo-gateway/CHANGELOG.md index 563535733be..43d15532089 100644 --- a/packages/apollo-gateway/CHANGELOG.md +++ b/packages/apollo-gateway/CHANGELOG.md @@ -1,5 +1,9 @@ # CHANGELOG for `@apollo/gateway` +## vNEXT + +- Fix Typescript generic typing for datasource contexts [#3865](https://github.com/apollographql/apollo-server/pull/3865) This is a fix for the `TContext` typings of the gateway's exposed `GraphQLDataSource` implementations. In their current form, they don't work as intended, or in any manner that's useful for typing the `context` property throughout the class methods. This introduces a type argument `TContext` to the class itself (which defaults to `Record` for existing implementations) and removes the non-operational type arguments on the class methods themselves. + ## 0.13.2 - __BREAKING__: The behavior and signature of `RemoteGraphQLDataSource`'s `didReceiveResponse` method has been changed. No changes are necessary _unless_ your implementation has overridden the default behavior of this method by either extending the class and overriding the method or by providing `didReceiveResponse` as a parameter to the `RemoteGraphQLDataSource`'s constructor options. Implementations which have provided their own `didReceiveResponse` using either of these methods should view the PR linked here for details on what has changed. [PR #3743](https://github.com/apollographql/apollo-server/pull/3743) diff --git a/packages/apollo-gateway/src/datasources/LocalGraphQLDataSource.ts b/packages/apollo-gateway/src/datasources/LocalGraphQLDataSource.ts index bcbaae7c408..979e3149791 100644 --- a/packages/apollo-gateway/src/datasources/LocalGraphQLDataSource.ts +++ b/packages/apollo-gateway/src/datasources/LocalGraphQLDataSource.ts @@ -9,14 +9,14 @@ import { import { enableGraphQLExtensions } from 'graphql-extensions'; import { GraphQLDataSource } from './types'; -export class LocalGraphQLDataSource implements GraphQLDataSource { +export class LocalGraphQLDataSource = Record> implements GraphQLDataSource { constructor(public readonly schema: GraphQLSchema) { // FIXME: This is needed to enable support for `resolveObject`, but we // should move that to `apollo-graphql` enableGraphQLExtensions(schema); } - async process({ + async process({ request, context, }: Pick, 'request' | 'context'>): Promise< diff --git a/packages/apollo-gateway/src/datasources/RemoteGraphQLDataSource.ts b/packages/apollo-gateway/src/datasources/RemoteGraphQLDataSource.ts index b9198aecf35..feffde81b2d 100644 --- a/packages/apollo-gateway/src/datasources/RemoteGraphQLDataSource.ts +++ b/packages/apollo-gateway/src/datasources/RemoteGraphQLDataSource.ts @@ -19,11 +19,11 @@ import { isObject } from '../utilities/predicates'; import { GraphQLDataSource } from './types'; import createSHA from 'apollo-server-core/dist/utils/createSHA'; -export class RemoteGraphQLDataSource implements GraphQLDataSource { +export class RemoteGraphQLDataSource = Record> implements GraphQLDataSource { constructor( - config?: Partial & + config?: Partial> & object & - ThisType, + ThisType>, ) { if (config) { return Object.assign(this, config); @@ -52,7 +52,7 @@ export class RemoteGraphQLDataSource implements GraphQLDataSource { */ apq: boolean = false; - async process({ + async process({ request, context, }: Pick, 'request' | 'context'>): Promise< @@ -123,7 +123,7 @@ export class RemoteGraphQLDataSource implements GraphQLDataSource { return respond(response, requestWithQuery); } - private async sendRequest( + private async sendRequest( request: GraphQLRequest, context: TContext, ): Promise { @@ -166,14 +166,14 @@ export class RemoteGraphQLDataSource implements GraphQLDataSource { } } - public willSendRequest?( + public willSendRequest?( requestContext: Pick< GraphQLRequestContext, 'request' | 'context' >, ): ValueOrPromise; - public didReceiveResponse?( + public didReceiveResponse?( requestContext: Required, 'request' | 'response' | 'context'> @@ -184,7 +184,7 @@ export class RemoteGraphQLDataSource implements GraphQLDataSource { throw error; } - public parseBody( + public parseBody( response: Response, _request?: Request, _context?: TContext, diff --git a/packages/apollo-gateway/src/datasources/types.ts b/packages/apollo-gateway/src/datasources/types.ts index d65e42dc0b9..c112c309692 100644 --- a/packages/apollo-gateway/src/datasources/types.ts +++ b/packages/apollo-gateway/src/datasources/types.ts @@ -1,7 +1,7 @@ import { GraphQLResponse, GraphQLRequestContext } from 'apollo-server-types'; -export interface GraphQLDataSource { - process( +export interface GraphQLDataSource = Record> { + process( request: Pick, 'request' | 'context'>, ): Promise; } diff --git a/packages/apollo-gateway/src/executeQueryPlan.ts b/packages/apollo-gateway/src/executeQueryPlan.ts index cb499dfdbd0..6e68cc68830 100644 --- a/packages/apollo-gateway/src/executeQueryPlan.ts +++ b/packages/apollo-gateway/src/executeQueryPlan.ts @@ -285,7 +285,7 @@ async function executeFetch( } } - async function sendOperation( + async function sendOperation( context: ExecutionContext, operation: DocumentNode, variables: Record, @@ -313,7 +313,7 @@ async function executeFetch( traceNode.sentTime = dateToProtoTimestamp(new Date()); } - const response = await service.process({ + const response = await service.process({ request: { query: source, variables, From abaedcd24cb4e0c0e57e4429402b846050607b75 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 21 Mar 2020 07:54:26 +0000 Subject: [PATCH 312/642] chore(deps): update dependency react to v16.13.1 (#3907) Co-authored-by: Renovate Bot --- docs/package-lock.json | 6 +++--- docs/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/package-lock.json b/docs/package-lock.json index 8964ed8f34a..274c7f116f8 100644 --- a/docs/package-lock.json +++ b/docs/package-lock.json @@ -17198,9 +17198,9 @@ } }, "react": { - "version": "16.13.0", - "resolved": "https://registry.npmjs.org/react/-/react-16.13.0.tgz", - "integrity": "sha512-TSavZz2iSLkq5/oiE7gnFzmURKZMltmi193rm5HEoUDAXpzT9Kzw6oNZnGoai/4+fUnm7FqS5dwgUL34TujcWQ==", + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react/-/react-16.13.1.tgz", + "integrity": "sha512-YMZQQq32xHLX0bz5Mnibv1/LHb3Sqzngu7xstSM+vrkE5Kzr9xE0yMByK5kMoTK30YVJE61WfbxIFFvfeDKT1w==", "requires": { "loose-envify": "^1.1.0", "object-assign": "^4.1.1", diff --git a/docs/package.json b/docs/package.json index ce6b6593ed7..bfbd5782ff1 100644 --- a/docs/package.json +++ b/docs/package.json @@ -8,7 +8,7 @@ "dependencies": { "gatsby": "2.19.43", "gatsby-theme-apollo-docs": "4.1.1", - "react": "16.13.0", + "react": "16.13.1", "react-dom": "16.13.0" } } From 499803fc97a890890fb2e025c6dd70f48a3cc9dd Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 21 Mar 2020 08:38:54 +0000 Subject: [PATCH 313/642] chore(deps): update dependency react-dom to v16.13.1 (#3908) Co-authored-by: Renovate Bot --- docs/package-lock.json | 14 +++++++------- docs/package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/package-lock.json b/docs/package-lock.json index 274c7f116f8..53f4e0868c5 100644 --- a/docs/package-lock.json +++ b/docs/package-lock.json @@ -17463,20 +17463,20 @@ } }, "react-dom": { - "version": "16.13.0", - "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.13.0.tgz", - "integrity": "sha512-y09d2c4cG220DzdlFkPTnVvGTszVvNpC73v+AaLGLHbkpy3SSgvYq8x0rNwPJ/Rk/CicTNgk0hbHNw1gMEZAXg==", + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.13.1.tgz", + "integrity": "sha512-81PIMmVLnCNLO/fFOQxdQkvEq/+Hfpv24XNJfpyZhTRfO0QcmQIF/PgCa1zCOj2w1hrn12MFLyaJ/G0+Mxtfag==", "requires": { "loose-envify": "^1.1.0", "object-assign": "^4.1.1", "prop-types": "^15.6.2", - "scheduler": "^0.19.0" + "scheduler": "^0.19.1" }, "dependencies": { "scheduler": { - "version": "0.19.0", - "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.19.0.tgz", - "integrity": "sha512-xowbVaTPe9r7y7RUejcK73/j8tt2jfiyTednOvHbA8JoClvMYCp+r8QegLwK/n8zWQAtZb1fFnER4XLBZXrCxA==", + "version": "0.19.1", + "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.19.1.tgz", + "integrity": "sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==", "requires": { "loose-envify": "^1.1.0", "object-assign": "^4.1.1" diff --git a/docs/package.json b/docs/package.json index bfbd5782ff1..87659393f9f 100644 --- a/docs/package.json +++ b/docs/package.json @@ -9,6 +9,6 @@ "gatsby": "2.19.43", "gatsby-theme-apollo-docs": "4.1.1", "react": "16.13.1", - "react-dom": "16.13.0" + "react-dom": "16.13.1" } } From a2ff86f7b02611bb4811bbd080d7d1f846cc21eb Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 21 Mar 2020 09:16:48 +0000 Subject: [PATCH 314/642] chore(deps): update dependency @types/request-promise to v4.1.46 (#3909) Co-authored-by: Renovate Bot --- package-lock.json | 12 ++++++------ package.json | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9da063a5c72..0a34ff9a906 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3572,9 +3572,9 @@ } }, "@types/bluebird": { - "version": "3.5.29", - "resolved": "https://registry.npmjs.org/@types/bluebird/-/bluebird-3.5.29.tgz", - "integrity": "sha512-kmVtnxTuUuhCET669irqQmPAez4KFnFVKvpleVRyfC3g+SHD1hIkFZcWLim9BVcwUBLO59o8VZE4yGCmTif8Yw==", + "version": "3.5.30", + "resolved": "https://registry.npmjs.org/@types/bluebird/-/bluebird-3.5.30.tgz", + "integrity": "sha512-8LhzvcjIoqoi1TghEkRMkbbmM+jhHnBokPGkJWjclMK+Ks0MxEBow3/p2/iFTZ+OIbJHQDSfpgdZEb+af3gfVw==", "dev": true }, "@types/body-parser": { @@ -3991,9 +3991,9 @@ } }, "@types/request-promise": { - "version": "4.1.45", - "resolved": "https://registry.npmjs.org/@types/request-promise/-/request-promise-4.1.45.tgz", - "integrity": "sha512-KFagTY/a7CzAj86DkhaAtqP0ViYTNam+CfEokSwtPFUIuq9Qrq+Rq2X4nuaB6OJmM2s0xWeiS085Ro7vR0tt9Q==", + "version": "4.1.46", + "resolved": "https://registry.npmjs.org/@types/request-promise/-/request-promise-4.1.46.tgz", + "integrity": "sha512-3Thpj2Va5m0ji3spaCk8YKrjkZyZc6RqUVOphA0n/Xet66AW/AiOAs5vfXhQIL5NmkaO7Jnun7Nl9NEjJ2zBaw==", "dev": true, "requires": { "@types/bluebird": "*", diff --git a/package.json b/package.json index 7faae6f3d21..909afd45904 100644 --- a/package.json +++ b/package.json @@ -79,7 +79,7 @@ "@types/node-fetch": "2.3.2", "@types/qs-middleware": "1.0.1", "@types/request": "2.48.4", - "@types/request-promise": "4.1.45", + "@types/request-promise": "4.1.46", "@types/test-listen": "1.1.0", "@types/type-is": "1.6.3", "@types/ws": "6.0.4", From 9d3f04e6d93a88bfd4ee93888e3ae663e1aa3c00 Mon Sep 17 00:00:00 2001 From: Pierre Carrier Date: Mon, 23 Mar 2020 08:44:12 -0400 Subject: [PATCH 315/642] apollo-engine-reporting: direct path string building (#3479) * apollo-engine-reporting: avoid building arrays in hot path * Update packages/apollo-engine-reporting/src/treeBuilder.ts I don't know the difference :D Co-Authored-By: Jesse Rosenberger * Update packages/apollo-engine-reporting/src/treeBuilder.ts Thanks Co-Authored-By: Jesse Rosenberger * Update packages/apollo-engine-reporting/src/treeBuilder.ts Co-authored-by: Jesse Rosenberger --- .../src/treeBuilder.ts | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/packages/apollo-engine-reporting/src/treeBuilder.ts b/packages/apollo-engine-reporting/src/treeBuilder.ts index 90854a45d64..a10535bbe23 100644 --- a/packages/apollo-engine-reporting/src/treeBuilder.ts +++ b/packages/apollo-engine-reporting/src/treeBuilder.ts @@ -1,9 +1,4 @@ -import { - GraphQLResolveInfo, - GraphQLError, - ResponsePath, - responsePathAsArray, -} from 'graphql'; +import { GraphQLError, GraphQLResolveInfo, ResponsePath } from 'graphql'; import { Trace, google } from 'apollo-engine-reporting-protobuf'; import { PersistedQueryNotFoundError, @@ -22,7 +17,7 @@ export class EngineReportingTreeBuilder { public startHrTime?: [number, number]; private stopped = false; private nodes = new Map([ - [rootResponsePath, this.rootNode], + [responsePathAsString(), this.rootNode], ]); private rewriteError?: (err: GraphQLError) => GraphQLError | null; @@ -249,14 +244,21 @@ function durationHrTimeToNanos(hrtime: [number, number]) { // Convert from the linked-list ResponsePath format to a dot-joined // string. Includes the full path (field names and array indices). -function responsePathAsString(p: ResponsePath | undefined) { +function responsePathAsString(p?: ResponsePath): string { if (p === undefined) { return ''; } - return responsePathAsArray(p).join('.'); -} -const rootResponsePath = responsePathAsString(undefined); + // A previous implementation used `responsePathAsArray` from `graphql-js/execution`, + // however, that employed an approach that created new arrays unnecessarily. + let res = String(p.key); + + while ((p = p.prev) !== undefined) { + res = `${p.key}.${res}`; + } + + return res; +} function errorToProtobufError(error: GraphQLError): Trace.Error { return new Trace.Error({ From eeb1d009600bc3742811705233dcd16433ca15b1 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 23 Mar 2020 14:53:30 +0200 Subject: [PATCH 316/642] Add CHANGELOG.md for #3479. --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 47aca5cc164..d9bf4ece054 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ The version headers in this history reflect the versions of Apollo Server itself - `apollo-server-core`: When operating in gateway mode using the `gateway` property of the Apollo Server constructor options, the failure to initialize a schema during initial start-up, e.g. connectivity problems, will no longer result in the federated executor from being assigned when the schema eventually becomes available. This precludes a state where the gateway may never become available to serve federated requests, even when failure conditions are no longer present. [PR #3811](https://github.com/apollographql/apollo-server/pull/3811) - `apollo-server-core`: Prevent a condition which prefixed an error message on each request when the initial gateway initialization resulted in a Promise-rejection which was memoized and re-prepended with `Invalid options provided to ApolloServer:` on each request. [PR #3811](https://github.com/apollographql/apollo-server/pull/3811) - `apollo-server-express`: Disable the automatic inclusion of the `x-powered-by: express` header. [PR #3821](https://github.com/apollographql/apollo-server/pull/3821) +- `apollo-engine-reporting`: Avoid creating new arrays when building trace trees. [PR #3479](https://github.com/apollographql/apollo-server/pull/3479) ### v2.11.0 From c177acd7959aaf516f8ac814f1a6bb2e6d3ed2e6 Mon Sep 17 00:00:00 2001 From: Sambhav Gore Date: Mon, 23 Mar 2020 14:27:15 +0100 Subject: [PATCH 317/642] fix broken CI status link for apollo-server-micro (#3912) Inline with other packages, update the link for the CI status badge in readme for aollo-server-micro --- packages/apollo-server-micro/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-micro/README.md b/packages/apollo-server-micro/README.md index ff76010ef53..11d60a6c83d 100644 --- a/packages/apollo-server-micro/README.md +++ b/packages/apollo-server-micro/README.md @@ -1,4 +1,4 @@ -[![npm version](https://badge.fury.io/js/apollo-server-core.svg)](https://badge.fury.io/js/apollo-server-core) [![Build Status](https://circleci.com/gh/apollographql/apollo-cache-control-js.svg?style=svg)](https://circleci.com/gh/apollographql/apollo-cache-control-js) [![Join the community on Spectrum](https://withspectrum.github.io/badge/badge.svg)](https://spectrum.chat/apollo) +[![npm version](https://badge.fury.io/js/apollo-server-core.svg)](https://badge.fury.io/js/apollo-server-core) [![Build Status](https://circleci.com/gh/apollographql/apollo-server.svg?style=svg)](https://circleci.com/gh/apollographql/apollo-server) [![Join the community on Spectrum](https://withspectrum.github.io/badge/badge.svg)](https://spectrum.chat/apollo) This is the [Micro](https://github.com/zeit/micro) integration for the Apollo community GraphQL Server. [Read the docs.](https://www.apollographql.com/docs/apollo-server/) [Read the CHANGELOG.](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md) From 01439c21ea0ccb137108ec979d76585eb882910d Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 23 Mar 2020 16:34:24 +0200 Subject: [PATCH 318/642] Align versions with other packages, after unintentionally skipping. --- packages/apollo-federation/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-federation/package.json b/packages/apollo-federation/package.json index 6bc7cb66426..f7bf9a44046 100644 --- a/packages/apollo-federation/package.json +++ b/packages/apollo-federation/package.json @@ -1,6 +1,6 @@ { "name": "@apollo/federation", - "version": "0.14.0-alpha.0", + "version": "0.14.0-alpha.1", "description": "Apollo Federation Utilities", "main": "dist/index.js", "types": "dist/index.d.ts", From 34c707246f8df95a1916aa59469e78fc3144c8bd Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 23 Mar 2020 16:35:04 +0200 Subject: [PATCH 319/642] Release - apollo-cache-control@0.9.1-alpha.2 - apollo-engine-reporting@1.7.1-alpha.2 - @apollo/federation@0.14.0-alpha.2 - @apollo/gateway@0.14.0-alpha.2 - apollo-server-azure-functions@2.12.0-alpha.2 - apollo-server-cloud-functions@2.12.0-alpha.2 - apollo-server-cloudflare@2.12.0-alpha.2 - apollo-server-core@2.12.0-alpha.2 - apollo-server-express@2.12.0-alpha.2 - apollo-server-fastify@2.12.0-alpha.2 - apollo-server-hapi@2.12.0-alpha.2 - apollo-server-integration-testsuite@2.12.0-alpha.2 - apollo-server-koa@2.12.0-alpha.2 - apollo-server-lambda@2.12.0-alpha.2 - apollo-server-micro@2.12.0-alpha.2 - apollo-server-plugin-response-cache@0.4.1-alpha.2 - apollo-server-testing@2.12.0-alpha.2 - apollo-server@2.12.0-alpha.2 - apollo-tracing@0.9.1-alpha.2 - graphql-extensions@0.11.1-alpha.2 --- packages/apollo-cache-control/package.json | 2 +- packages/apollo-engine-reporting/package.json | 2 +- packages/apollo-federation/package.json | 2 +- packages/apollo-gateway/package.json | 2 +- packages/apollo-server-azure-functions/package.json | 2 +- packages/apollo-server-cloud-functions/package.json | 2 +- packages/apollo-server-cloudflare/package.json | 2 +- packages/apollo-server-core/package.json | 2 +- packages/apollo-server-express/package.json | 2 +- packages/apollo-server-fastify/package.json | 2 +- packages/apollo-server-hapi/package.json | 2 +- packages/apollo-server-integration-testsuite/package.json | 2 +- packages/apollo-server-koa/package.json | 2 +- packages/apollo-server-lambda/package.json | 2 +- packages/apollo-server-micro/package.json | 2 +- packages/apollo-server-plugin-response-cache/package.json | 2 +- packages/apollo-server-testing/package.json | 2 +- packages/apollo-server/package.json | 2 +- packages/apollo-tracing/package.json | 2 +- packages/graphql-extensions/package.json | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/packages/apollo-cache-control/package.json b/packages/apollo-cache-control/package.json index e3e3ab79aee..01e799242ab 100644 --- a/packages/apollo-cache-control/package.json +++ b/packages/apollo-cache-control/package.json @@ -1,6 +1,6 @@ { "name": "apollo-cache-control", - "version": "0.9.1-alpha.1", + "version": "0.9.1-alpha.2", "description": "A GraphQL extension for cache control", "main": "./dist/index.js", "types": "./dist/index.d.ts", diff --git a/packages/apollo-engine-reporting/package.json b/packages/apollo-engine-reporting/package.json index 90478347642..9408e9d188e 100644 --- a/packages/apollo-engine-reporting/package.json +++ b/packages/apollo-engine-reporting/package.json @@ -1,6 +1,6 @@ { "name": "apollo-engine-reporting", - "version": "1.7.1-alpha.1", + "version": "1.7.1-alpha.2", "description": "Send reports about your GraphQL services to Apollo Graph Manager (previously known as Apollo Engine)", "main": "./dist/index.js", "types": "./dist/index.d.ts", diff --git a/packages/apollo-federation/package.json b/packages/apollo-federation/package.json index f7bf9a44046..3e75da06956 100644 --- a/packages/apollo-federation/package.json +++ b/packages/apollo-federation/package.json @@ -1,6 +1,6 @@ { "name": "@apollo/federation", - "version": "0.14.0-alpha.1", + "version": "0.14.0-alpha.2", "description": "Apollo Federation Utilities", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-gateway/package.json b/packages/apollo-gateway/package.json index 4a49c0dee4c..6552a63e840 100644 --- a/packages/apollo-gateway/package.json +++ b/packages/apollo-gateway/package.json @@ -1,6 +1,6 @@ { "name": "@apollo/gateway", - "version": "0.14.0-alpha.1", + "version": "0.14.0-alpha.2", "description": "Apollo Gateway", "author": "opensource@apollographql.com", "main": "dist/index.js", diff --git a/packages/apollo-server-azure-functions/package.json b/packages/apollo-server-azure-functions/package.json index 8a530d82c37..0900b9cbabd 100644 --- a/packages/apollo-server-azure-functions/package.json +++ b/packages/apollo-server-azure-functions/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-azure-functions", - "version": "2.12.0-alpha.1", + "version": "2.12.0-alpha.2", "description": "Production-ready Node.js GraphQL server for Azure Functions", "keywords": [ "GraphQL", diff --git a/packages/apollo-server-cloud-functions/package.json b/packages/apollo-server-cloud-functions/package.json index 3aed80b07bf..82824827331 100644 --- a/packages/apollo-server-cloud-functions/package.json +++ b/packages/apollo-server-cloud-functions/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-cloud-functions", - "version": "2.12.0-alpha.1", + "version": "2.12.0-alpha.2", "description": "Production-ready Node.js GraphQL server for Google Cloud Functions", "keywords": [ "GraphQL", diff --git a/packages/apollo-server-cloudflare/package.json b/packages/apollo-server-cloudflare/package.json index b1c4d99a9dd..5cad0a2767a 100644 --- a/packages/apollo-server-cloudflare/package.json +++ b/packages/apollo-server-cloudflare/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-cloudflare", - "version": "2.12.0-alpha.1", + "version": "2.12.0-alpha.2", "description": "Production-ready Node.js GraphQL server for Cloudflare workers", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-core/package.json b/packages/apollo-server-core/package.json index a98d426890f..7c56c16b571 100644 --- a/packages/apollo-server-core/package.json +++ b/packages/apollo-server-core/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-core", - "version": "2.12.0-alpha.1", + "version": "2.12.0-alpha.2", "description": "Core engine for Apollo GraphQL server", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-express/package.json b/packages/apollo-server-express/package.json index c93fec3c416..04897342432 100644 --- a/packages/apollo-server-express/package.json +++ b/packages/apollo-server-express/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-express", - "version": "2.12.0-alpha.1", + "version": "2.12.0-alpha.2", "description": "Production-ready Node.js GraphQL server for Express and Connect", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-fastify/package.json b/packages/apollo-server-fastify/package.json index cafc9737690..d84e85e77a9 100644 --- a/packages/apollo-server-fastify/package.json +++ b/packages/apollo-server-fastify/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-fastify", - "version": "2.12.0-alpha.1", + "version": "2.12.0-alpha.2", "description": "Production-ready Node.js GraphQL server for Fastify", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-hapi/package.json b/packages/apollo-server-hapi/package.json index 0564a15f94d..8cc576bff68 100644 --- a/packages/apollo-server-hapi/package.json +++ b/packages/apollo-server-hapi/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-hapi", - "version": "2.12.0-alpha.1", + "version": "2.12.0-alpha.2", "description": "Production-ready Node.js GraphQL server for Hapi", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-integration-testsuite/package.json b/packages/apollo-server-integration-testsuite/package.json index 0e9066d4ca8..0ad56dd9a7a 100644 --- a/packages/apollo-server-integration-testsuite/package.json +++ b/packages/apollo-server-integration-testsuite/package.json @@ -1,7 +1,7 @@ { "name": "apollo-server-integration-testsuite", "private": true, - "version": "2.12.0-alpha.1", + "version": "2.12.0-alpha.2", "description": "Apollo Server Integrations testsuite", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-koa/package.json b/packages/apollo-server-koa/package.json index 1f013a56d5b..09b9a2322fe 100644 --- a/packages/apollo-server-koa/package.json +++ b/packages/apollo-server-koa/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-koa", - "version": "2.12.0-alpha.1", + "version": "2.12.0-alpha.2", "description": "Production-ready Node.js GraphQL server for Koa", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-lambda/package.json b/packages/apollo-server-lambda/package.json index 41473cce8ee..876e2391811 100644 --- a/packages/apollo-server-lambda/package.json +++ b/packages/apollo-server-lambda/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-lambda", - "version": "2.12.0-alpha.1", + "version": "2.12.0-alpha.2", "description": "Production-ready Node.js GraphQL server for AWS Lambda", "keywords": [ "GraphQL", diff --git a/packages/apollo-server-micro/package.json b/packages/apollo-server-micro/package.json index a0f489f11de..29522e85835 100644 --- a/packages/apollo-server-micro/package.json +++ b/packages/apollo-server-micro/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-micro", - "version": "2.12.0-alpha.1", + "version": "2.12.0-alpha.2", "description": "Production-ready Node.js GraphQL server for Micro", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-plugin-response-cache/package.json b/packages/apollo-server-plugin-response-cache/package.json index 7c5cd1f363f..80252db5f2f 100644 --- a/packages/apollo-server-plugin-response-cache/package.json +++ b/packages/apollo-server-plugin-response-cache/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-plugin-response-cache", - "version": "0.4.1-alpha.1", + "version": "0.4.1-alpha.2", "description": "Apollo Server full query response cache", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-testing/package.json b/packages/apollo-server-testing/package.json index eebddee0cae..c24d7b98b01 100644 --- a/packages/apollo-server-testing/package.json +++ b/packages/apollo-server-testing/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-testing", - "version": "2.12.0-alpha.1", + "version": "2.12.0-alpha.2", "description": "Test utils for apollo-server", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server/package.json b/packages/apollo-server/package.json index 7e75f3419bd..55ef4ed5b18 100644 --- a/packages/apollo-server/package.json +++ b/packages/apollo-server/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server", - "version": "2.12.0-alpha.1", + "version": "2.12.0-alpha.2", "description": "Production ready GraphQL Server", "author": "opensource@apollographql.com", "main": "dist/index.js", diff --git a/packages/apollo-tracing/package.json b/packages/apollo-tracing/package.json index a1099c51c13..48966fc14b6 100644 --- a/packages/apollo-tracing/package.json +++ b/packages/apollo-tracing/package.json @@ -1,6 +1,6 @@ { "name": "apollo-tracing", - "version": "0.9.1-alpha.1", + "version": "0.9.1-alpha.2", "description": "Collect and expose trace data for GraphQL requests", "main": "./dist/index.js", "types": "./dist/index.d.ts", diff --git a/packages/graphql-extensions/package.json b/packages/graphql-extensions/package.json index 7c7c2236c2b..ef4285a0c21 100644 --- a/packages/graphql-extensions/package.json +++ b/packages/graphql-extensions/package.json @@ -1,6 +1,6 @@ { "name": "graphql-extensions", - "version": "0.11.1-alpha.1", + "version": "0.11.1-alpha.2", "description": "Add extensions to GraphQL servers", "main": "./dist/index.js", "types": "./dist/index.d.ts", From cdee9d6f2944cf9db282794284fe4cceee925520 Mon Sep 17 00:00:00 2001 From: Trevor Scheer Date: Mon, 23 Mar 2020 16:26:57 -0700 Subject: [PATCH 320/642] Gateway: retry logic for requests to GCS (#3836) Implement gateway retry logic for requests to GCS. Failed requests will retry up to 5 times. Additionally, this PR adjusts how polling is done in order to prevent the possibility of multiple in-flight updates. The next "tick" only begins after a full round of updating is completed rather than on a perfectly regular interval. Thanks to @abernix for suggesting this change. For more details please see the PR description. --- packages/apollo-gateway/CHANGELOG.md | 1 + .../integration/networkRequests.test.ts | 82 +++++++++++++++++-- packages/apollo-gateway/src/index.ts | 69 ++++++++++------ 3 files changed, 121 insertions(+), 31 deletions(-) diff --git a/packages/apollo-gateway/CHANGELOG.md b/packages/apollo-gateway/CHANGELOG.md index 23abe4e1107..9bfbc833c7c 100644 --- a/packages/apollo-gateway/CHANGELOG.md +++ b/packages/apollo-gateway/CHANGELOG.md @@ -10,6 +10,7 @@ - Support providing a custom logger implementation (e.g. [`winston`](https://npm.im/winston), [`bunyan`](https://npm.im/bunyan), etc.) to capture gateway-sourced console output. This allows the use of existing, production logging facilities or the possibiltiy to use advanced structure in logging, such as console output which is encapsulated in JSON. The same PR that introduces this support also introduces a `logger` property to the `GraphQLRequestContext` that is exposed to `GraphQLDataSource`s and Apollo Server plugins, making it possible to attach additional properties (as supported by the logger implementation) to specific requests, if desired, by leveraging custom implementations in those components respectively. When not provided, these will still output to `console`. [PR #3894](https://github.com/apollographql/apollo-server/pull/3894) - Drop use of `loglevel-debug`. This removes the very long date and time prefix in front of each log line and also the support for the `DEBUG=apollo-gateway:` environment variable. Both of these were uncommonly necessary or seldom used (with the environment variable also being undocumented). The existing behavior can be preserved by providing a `logger` that uses `loglevel-debug`, if desired, and more details can be found in the PR. [PR #3896](https://github.com/apollographql/apollo-server/pull/3896) - Fix Typescript generic typing for datasource contexts [#3865](https://github.com/apollographql/apollo-server/pull/3865) This is a fix for the `TContext` typings of the gateway's exposed `GraphQLDataSource` implementations. In their current form, they don't work as intended, or in any manner that's useful for typing the `context` property throughout the class methods. This introduces a type argument `TContext` to the class itself (which defaults to `Record` for existing implementations) and removes the non-operational type arguments on the class methods themselves. +- Implement retry logic for requests to GCS [PR #3836](https://github.com/apollographql/apollo-server/pull/3836) Note: coupled with this change is a small alteration in how the gateway polls GCS for updates in managed mode. Previously, the tick was on a specific interval. Now, every tick starts after the round of fetches to GCS completes. For more details, see the linked PR. ## 0.13.2 diff --git a/packages/apollo-gateway/src/__tests__/integration/networkRequests.test.ts b/packages/apollo-gateway/src/__tests__/integration/networkRequests.test.ts index 10a97831655..0631355f3fa 100644 --- a/packages/apollo-gateway/src/__tests__/integration/networkRequests.test.ts +++ b/packages/apollo-gateway/src/__tests__/integration/networkRequests.test.ts @@ -1,17 +1,20 @@ import nock from 'nock'; -import { ApolloGateway } from '../..'; +import { fetch } from 'apollo-server-env'; +import { ApolloGateway, GCS_RETRY_COUNT, getDefaultGcsFetcher } from '../..'; import { mockLocalhostSDLQuery, mockStorageSecretSuccess, + mockStorageSecret, mockCompositionConfigLinkSuccess, + mockCompositionConfigLink, mockCompositionConfigsSuccess, + mockCompositionConfigs, mockImplementingServicesSuccess, + mockImplementingServices, mockRawPartialSchemaSuccess, + mockRawPartialSchema, apiKeyHash, graphId, - mockImplementingServices, - mockRawPartialSchema, - mockCompositionConfigLink, } from './nockMocks'; import loadServicesFromStorage = require("../../loadServicesFromStorage"); @@ -36,7 +39,7 @@ const service = { name: String username: String } - ` + `, }; const updatedService = { @@ -55,11 +58,21 @@ const updatedService = { name: String username: String } - ` -} + `, +}; + +let fetcher: typeof fetch; beforeEach(() => { if (!nock.isActive()) nock.activate(); + + fetcher = getDefaultGcsFetcher().defaults({ + retry: { + retries: GCS_RETRY_COUNT, + minTimeout: 0, + maxTimeout: 0, + }, + }); }); afterEach(() => { @@ -195,3 +208,58 @@ it('Rollsback to a previous schema when triggered', async () => { await secondSchemaChangeBlocker; expect(onChange.mock.calls.length).toBe(2); }); + +function failNTimes(n: number, fn: () => nock.Interceptor) { + for (let i = 0; i < n; i++) { + fn().reply(500); + } +} + +it(`Retries GCS (up to ${GCS_RETRY_COUNT} times) on failure for each request and succeeds`, async () => { + failNTimes(GCS_RETRY_COUNT, mockStorageSecret); + mockStorageSecretSuccess(); + + failNTimes(GCS_RETRY_COUNT, mockCompositionConfigLink); + mockCompositionConfigLinkSuccess(); + + failNTimes(GCS_RETRY_COUNT, mockCompositionConfigs); + mockCompositionConfigsSuccess([service.implementingServicePath]); + + failNTimes(GCS_RETRY_COUNT, () => mockImplementingServices(service)); + mockImplementingServicesSuccess(service); + + failNTimes(GCS_RETRY_COUNT, () => mockRawPartialSchema(service)); + mockRawPartialSchemaSuccess(service); + + const gateway = new ApolloGateway({ fetcher }); + + await gateway.load({ engine: { apiKeyHash, graphId } }); + expect(gateway.schema!.getType('User')!.description).toBe('This is my User'); +}); + +it(`Fails after the ${GCS_RETRY_COUNT + 1}th attempt to reach GCS`, async () => { + failNTimes(GCS_RETRY_COUNT + 1, mockStorageSecret); + + const gateway = new ApolloGateway({ fetcher }); + await expect( + gateway.load({ engine: { apiKeyHash, graphId } }), + ).rejects.toThrowErrorMatchingInlineSnapshot( + `"Could not communicate with Apollo Graph Manager storage: "`, + ); +}); + +it(`Errors when the secret isn't hosted on GCS`, async () => { + mockStorageSecret().reply( + 403, + `AccessDenied + Anonymous caller does not have storage.objects.get`, + { 'content-type': 'application/xml' }, + ); + + const gateway = new ApolloGateway({ fetcher }); + await expect( + gateway.load({ engine: { apiKeyHash, graphId } }), + ).rejects.toThrowErrorMatchingInlineSnapshot( + `"Unable to authenticate with Apollo Graph Manager storage while fetching https://storage.googleapis.com/engine-partial-schema-prod/federated-service/storage-secret/dd55a79d467976346d229a7b12b673ce.json. Ensure that the API key is configured properly and that a federated service has been pushed. For details, see https://go.apollo.dev/g/resolve-access-denied."`, + ); +}); diff --git a/packages/apollo-gateway/src/index.ts b/packages/apollo-gateway/src/index.ts index fcc911300d2..bb8e6f62a48 100644 --- a/packages/apollo-gateway/src/index.ts +++ b/packages/apollo-gateway/src/index.ts @@ -162,6 +162,28 @@ type WarnedStates = { remoteWithLocalConfig?: boolean; }; +export const GCS_RETRY_COUNT = 5; + +export function getDefaultGcsFetcher() { + return fetcher.defaults({ + cacheManager: new HttpRequestCache(), + // All headers should be lower-cased here, as `make-fetch-happen` + // treats differently cased headers as unique (unlike the `Headers` object). + // @see: https://git.io/JvRUa + headers: { + 'user-agent': `apollo-gateway/${require('../package.json').version}`, + }, + retry: { + retries: GCS_RETRY_COUNT, + // The default factor: expected attempts at 0, 1, 3, 7, 15, and 31 seconds elapsed + factor: 2, + // 1 second + minTimeout: 1000, + randomize: true, + }, + }); +} + export class ApolloGateway implements GraphQLService { public schema?: GraphQLSchema; protected serviceMap: DataSourceCache = Object.create(null); @@ -176,15 +198,7 @@ export class ApolloGateway implements GraphQLService { private serviceSdlCache = new Map(); private warnedStates: WarnedStates = Object.create(null); - private fetcher: typeof fetch = fetcher.defaults({ - cacheManager: new HttpRequestCache(), - // All headers should be lower-cased here, as `make-fetch-happen` - // treats differently cased headers as unique (unlike the `Headers` object). - // @see: https://git.io/JvRUa - headers: { - 'user-agent': `apollo-gateway/${require('../package.json').version}` - } - }); + private fetcher: typeof fetch = getDefaultGcsFetcher(); // Observe query plan, service info, and operation info prior to execution. // The information made available here will give insight into the resulting @@ -417,7 +431,7 @@ export class ApolloGateway implements GraphQLService { } this.onSchemaChangeListeners.add(callback); - if (!this.pollingTimer) this.startPollingServices(); + if (!this.pollingTimer) this.pollServices(); return () => { this.onSchemaChangeListeners.delete(callback); @@ -428,21 +442,28 @@ export class ApolloGateway implements GraphQLService { }; } - private startPollingServices() { - if (this.pollingTimer) clearInterval(this.pollingTimer); + private async pollServices() { + if (this.pollingTimer) clearTimeout(this.pollingTimer); - this.pollingTimer = setInterval(async () => { - try { - await this.updateComposition(); - } catch (err) { - this.logger.error(err && err.message || err); - } - }, this.experimental_pollInterval || 10000); + try { + await this.updateComposition(); + } catch (err) { + this.logger.error(err && err.message || err); + } + + // Sleep for the specified pollInterval before kicking off another round of polling + await new Promise(res => { + this.pollingTimer = setTimeout( + res, + this.experimental_pollInterval || 10000, + ); + // Prevent the Node.js event loop from remaining active (and preventing, + // e.g. process shutdown) by calling `unref` on the `Timeout`. For more + // information, see https://nodejs.org/api/timers.html#timers_timeout_unref. + this.pollingTimer?.unref(); + }); - // Prevent the Node.js event loop from remaining active (and preventing, - // e.g. process shutdown) by calling `unref` on the `Timeout`. For more - // information, see https://nodejs.org/api/timers.html#timers_timeout_unref. - this.pollingTimer.unref(); + this.pollServices(); } private createAndCacheDataSource( @@ -508,7 +529,7 @@ export class ApolloGateway implements GraphQLService { this.logger.warn( "A local gateway service list is overriding an Apollo Graph " + "Manager managed configuration. To use the managed " + - "configuration, do not specifiy a service list locally.", + "configuration, do not specify a service list locally.", ); }).catch(() => {}); // Don't mind errors if managed config is missing. } From 7ad9897c411d61df492bb2e52c4832d2c285b4d3 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 24 Mar 2020 15:09:07 +0200 Subject: [PATCH 321/642] Fix various spelling mistakes, including one critical one! The `any`-typed errors don't provide as much of a safety net as an `Error` type would, any `messsage` was misspelled! --- packages/apollo-gateway/src/index.ts | 10 +++++----- packages/apollo-server-core/src/ApolloServer.ts | 8 ++++---- packages/apollo-server-core/src/requestPipeline.ts | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/packages/apollo-gateway/src/index.ts b/packages/apollo-gateway/src/index.ts index bb8e6f62a48..09439bfc184 100644 --- a/packages/apollo-gateway/src/index.ts +++ b/packages/apollo-gateway/src/index.ts @@ -282,7 +282,7 @@ export class ApolloGateway implements GraphQLService { this.experimental_pollInterval = config.experimental_pollInterval; } - // Warn against using the pollInterval and a serviceList simulatenously + // Warn against using the pollInterval and a serviceList simultaneously if (config.experimental_pollInterval && isRemoteConfig(config)) { this.logger.warn( 'Polling running services is dangerous and not recommended in production. ' + @@ -319,7 +319,7 @@ export class ApolloGateway implements GraphQLService { protected async updateComposition(options?: { engine?: GraphQLServiceEngineConfig; }): Promise { - // The options argument and internal config update coule be handled by this.load() + // The options argument and internal config update could be handled by this.load() // instead of here. We can remove this as a breaking change in the future. if (options && options.engine) { if (!options.engine.graphVariant) @@ -420,8 +420,8 @@ export class ApolloGateway implements GraphQLService { // this is a temporary workaround for GraphQLFieldExtensions automatic // wrapping of all fields when using ApolloServer. Here we wrap all fields // with support for resolving aliases as part of the root value which - // happens because alises are resolved by sub services and the shape - // of the rootvalue already contains the aliased fields as responseNames + // happens because aliases are resolved by sub services and the shape + // of the root value already contains the aliased fields as responseNames return wrapSchemaWithAliasResolver(schema); } @@ -618,7 +618,7 @@ export class ApolloGateway implements GraphQLService { this.queryPlanStore.set(queryPlanStoreKey, queryPlan), ).catch(err => this.logger.warn( - 'Could not store queryPlan' + ((err && err.messsage) || err), + 'Could not store queryPlan' + ((err && err.message) || err), ), ); } diff --git a/packages/apollo-server-core/src/ApolloServer.ts b/packages/apollo-server-core/src/ApolloServer.ts index e56fba35136..09367bda1be 100644 --- a/packages/apollo-server-core/src/ApolloServer.ts +++ b/packages/apollo-server-core/src/ApolloServer.ts @@ -227,7 +227,7 @@ export class ApolloServerBase { // once per run, so we place the env check inside the constructor. If env // should be used outside of the constructor context, place it as a private // or protected field of the class instead of a global. Keeping the read in - // the contructor enables testing of different environments + // the constructor enables testing of different environments const isDev = process.env.NODE_ENV !== 'production'; // if this is local dev, introspection should turned on @@ -335,7 +335,7 @@ export class ApolloServerBase { // In an effort to avoid over-exposing the API key itself, extract the // service ID from the API key for plugins which only needs service ID. - // The truthyness of this value can also be used in other forks of logic + // The truthiness of this value can also be used in other forks of logic // related to Engine, as is the case with EngineReportingAgent just below. this.engineServiceId = getEngineServiceId(engine); const apiKey = getEngineApiKey(engine); @@ -356,7 +356,7 @@ export class ApolloServerBase { } if (gateway && subscriptions !== false) { - // TODO: this could be handled by adjusting the typings to keep gateway configs and non-gateway configs seprate. + // TODO: this could be handled by adjusting the typings to keep gateway configs and non-gateway configs separate. throw new Error( [ 'Subscriptions are not yet compatible with the gateway.', @@ -459,7 +459,7 @@ export class ApolloServerBase { .catch(err => { // We intentionally do not re-throw the exact error from the gateway // configuration as it may contain implementation details and this - // error will propogate to the client. We will, however, log the error + // error will propagate to the client. We will, however, log the error // for observation in the logs. const message = "This data graph is missing a valid configuration."; this.logger.error(message + " " + (err && err.message || err)); diff --git a/packages/apollo-server-core/src/requestPipeline.ts b/packages/apollo-server-core/src/requestPipeline.ts index 3d41fc9243b..32b200beac2 100644 --- a/packages/apollo-server-core/src/requestPipeline.ts +++ b/packages/apollo-server-core/src/requestPipeline.ts @@ -179,7 +179,7 @@ export async function processGraphQLRequest( } // We won't write to the persisted query cache until later. - // Defering the writing gives plugins the ability to "win" from use of + // Deferring the writing gives plugins the ability to "win" from use of // the cache, but also have their say in whether or not the cache is // written to (by interrupting the request with an error). metrics.persistedQueryRegister = true; @@ -222,7 +222,7 @@ export async function processGraphQLRequest( } catch (err) { logger.warn( 'An error occurred while attempting to read from the documentStore. ' - + (err && err.messsage) || err, + + (err && err.message) || err, ); } } From 7e09cf2bf536b9102ed1221cf3b07a900d7f37d0 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 26 Mar 2020 14:39:18 +0200 Subject: [PATCH 322/642] =?UTF-8?q?plugins:=20Declare=20types=20rather=20t?= =?UTF-8?q?han=20use=20in-line=20types=20for=20life-c=E2=80=A6=20(#3902)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * plugins: Declare types rather than use in-line types for life-cycle hooks. This makes it easier to reason about the types and to keep things DRY, in addition to preserving a more real stacking of types as the stages of server life-cycles progress. E.g., `validationDidStart` will have a super-set of `Required` properties which were present in the `parsingDidStart` phase. Now, rather than actually repeating them verbosely, they will be intersected. These new explicit types will live in `apollo-server-types` where they can also be relied upon by `@apollo/gateway` and other packages, but they'll also be exported directly from the `apollo-server-plugin-base` package. Reason being: The overall concept of `apollo-server-types` and this `apollo-server-plugin-base` package is that they should NOT depend directly on "core", in order to avoid close coupling of plugin support and specific server versions. In other words, someone should be able to install a version of a plugin that depends on `apollo-server-plugin-base` in their application which uses a semver compatible plugin API but NOT the same semver range of `apollo-server-core`, though they are currently similar. They are duplicated concepts right now where one package is intended to be for public plugin exposure (`-plugin-base`), while the other (`-types`) is meant to be used internally. In the future, `apollo-server-types` and `apollo-server-plugin-base` will probably roll into the same "types" package, but that is not today! * plugins: Same as `source`, `queryHash` is required at `parsingDidStart`. They are defined at the same time, as noted in the referenced link. Ref: https://github.com/apollographql/apollo-server/blob/eadcc6b4/packages/apollo-server-core/src/requestPipeline.ts#L196-L197 * Remove unnecessary casting. Per: https://github.com/apollographql/apollo-server/pull/3902/files#r395767682 Thanks to: d1b7a82 --- packages/apollo-gateway/src/index.ts | 12 +--- .../apollo-server-core/src/requestPipeline.ts | 54 ++++++----------- packages/apollo-server-core/src/types.ts | 8 +-- .../apollo-server-plugin-base/src/index.ts | 58 ++++++++++--------- packages/apollo-server-types/src/index.ts | 48 +++++++++++++-- 5 files changed, 97 insertions(+), 83 deletions(-) diff --git a/packages/apollo-gateway/src/index.ts b/packages/apollo-gateway/src/index.ts index 09439bfc184..b6066dd4b6a 100644 --- a/packages/apollo-gateway/src/index.ts +++ b/packages/apollo-gateway/src/index.ts @@ -6,9 +6,8 @@ import { } from 'apollo-server-core'; import { GraphQLExecutionResult, - GraphQLRequestContext, Logger, - WithRequired, + GraphQLRequestContextExecutionDidStart, } from 'apollo-server-types'; import { InMemoryLRUCache } from 'apollo-server-caching'; import { @@ -148,11 +147,6 @@ export type Experimental_UpdateServiceDefinitions = ( type Await = T extends Promise ? U : T; -type RequestContext = WithRequired< - GraphQLRequestContext, - 'document' | 'queryHash' ->; - // Local state to track whether particular UX-improving warning messages have // already been emitted. This is particularly useful to prevent recurring // warnings of the same type in, e.g. repeating timers, which don't provide @@ -569,7 +563,7 @@ export class ApolloGateway implements GraphQLService { // are unlikely to show up as GraphQLErrors. Do we need to use // formatApolloErrors or something? public executor = async ( - requestContext: RequestContext, + requestContext: GraphQLRequestContextExecutionDidStart, ): Promise => { const { request, document, queryHash } = requestContext; const queryPlanStoreKey = queryHash + (request.operationName || ''); @@ -682,7 +676,7 @@ export class ApolloGateway implements GraphQLService { }; protected validateIncomingRequest( - requestContext: RequestContext, + requestContext: GraphQLRequestContextExecutionDidStart, operationContext: OperationContext, ) { // casting out of `readonly` diff --git a/packages/apollo-server-core/src/requestPipeline.ts b/packages/apollo-server-core/src/requestPipeline.ts index 32b200beac2..ae839785d3a 100644 --- a/packages/apollo-server-core/src/requestPipeline.ts +++ b/packages/apollo-server-core/src/requestPipeline.ts @@ -43,6 +43,13 @@ import { import { ApolloServerPlugin, GraphQLRequestListener, + GraphQLRequestContextExecutionDidStart, + GraphQLRequestContextResponseForOperation, + GraphQLRequestContextDidResolveOperation, + GraphQLRequestContextParsingDidStart, + GraphQLRequestContextValidationDidStart, + GraphQLRequestContextWillSendResponse, + GraphQLRequestContextDidEncounterErrors, } from 'apollo-server-plugin-base'; import { Dispatcher } from './utils/dispatcher'; @@ -232,10 +239,7 @@ export async function processGraphQLRequest( if (!requestContext.document) { const parsingDidEnd = await dispatcher.invokeDidStartHook( 'parsingDidStart', - requestContext as WithRequired< - typeof requestContext, - 'metrics' | 'source' - >, + requestContext as GraphQLRequestContextParsingDidStart, ); try { @@ -248,10 +252,7 @@ export async function processGraphQLRequest( const validationDidEnd = await dispatcher.invokeDidStartHook( 'validationDidStart', - requestContext as WithRequired< - typeof requestContext, - 'document' | 'source' | 'metrics' - >, + requestContext as GraphQLRequestContextValidationDidStart, ); const validationErrors = validate(requestContext.document); @@ -307,10 +308,7 @@ export async function processGraphQLRequest( try { await dispatcher.invokeHookAsync( 'didResolveOperation', - requestContext as WithRequired< - typeof requestContext, - 'document' | 'source' | 'operation' | 'operationName' | 'metrics' - >, + requestContext as GraphQLRequestContextDidResolveOperation, ); } catch (err) { // XXX: The HttpQueryError is special-cased here because we currently @@ -354,25 +352,18 @@ export async function processGraphQLRequest( let response: GraphQLResponse | null = await dispatcher.invokeHooksUntilNonNull( 'responseForOperation', - requestContext as WithRequired< - typeof requestContext, - 'document' | 'source' | 'operation' | 'operationName' | 'metrics' - >, + requestContext as GraphQLRequestContextResponseForOperation, ); if (response == null) { const executionDidEnd = await dispatcher.invokeDidStartHook( 'executionDidStart', - requestContext as WithRequired< - typeof requestContext, - 'document' | 'source' | 'operation' | 'operationName' | 'metrics' - >, + requestContext as GraphQLRequestContextExecutionDidStart, ); try { - const result = await execute(requestContext as WithRequired< - typeof requestContext, - 'document' | 'operation' | 'operationName' | 'queryHash' - >); + const result = await execute( + requestContext as GraphQLRequestContextExecutionDidStart, + ); if (result.errors) { await didEncounterErrors(result.errors); @@ -455,10 +446,7 @@ export async function processGraphQLRequest( } async function execute( - requestContext: WithRequired< - GraphQLRequestContext, - 'document' | 'operationName' | 'operation' | 'queryHash' - >, + requestContext: GraphQLRequestContextExecutionDidStart, ): Promise { const { request, document } = requestContext; @@ -509,10 +497,7 @@ export async function processGraphQLRequest( }).graphqlResponse; await dispatcher.invokeHookAsync( 'willSendResponse', - requestContext as WithRequired< - typeof requestContext, - 'metrics' | 'response' - >, + requestContext as GraphQLRequestContextWillSendResponse, ); return requestContext.response!; } @@ -543,10 +528,7 @@ export async function processGraphQLRequest( return await dispatcher.invokeHookAsync( 'didEncounterErrors', - requestContext as WithRequired< - typeof requestContext, - 'metrics' | 'source' | 'errors' - >, + requestContext as GraphQLRequestContextDidEncounterErrors, ); } diff --git a/packages/apollo-server-core/src/types.ts b/packages/apollo-server-core/src/types.ts index c62191384c1..86f24ba434f 100644 --- a/packages/apollo-server-core/src/types.ts +++ b/packages/apollo-server-core/src/types.ts @@ -9,8 +9,7 @@ import { ValueOrPromise, GraphQLExecutor, GraphQLExecutionResult, - WithRequired, - GraphQLRequestContext, + GraphQLRequestContextExecutionDidStart, } from 'apollo-server-types'; import { ConnectionContext } from 'subscriptions-transport-ws'; // The types for `ws` use `export = WebSocket`, so we'll use the @@ -97,10 +96,7 @@ export interface GraphQLService { // Note: The `TContext` typing here is not conclusively behaving as we expect: // https://github.com/apollographql/apollo-server/pull/3811#discussion_r387381605 executor( - requestContext: WithRequired< - GraphQLRequestContext, - 'document' | 'queryHash' | 'operationName' | 'operation' - >, + requestContext: GraphQLRequestContextExecutionDidStart, ): ValueOrPromise; } diff --git a/packages/apollo-server-plugin-base/src/index.ts b/packages/apollo-server-plugin-base/src/index.ts index bbef6d15d83..5ca040fd617 100644 --- a/packages/apollo-server-plugin-base/src/index.ts +++ b/packages/apollo-server-plugin-base/src/index.ts @@ -5,7 +5,23 @@ import { GraphQLResponse, ValueOrPromise, WithRequired, + GraphQLRequestContextParsingDidStart, + GraphQLRequestContextValidationDidStart, + GraphQLRequestContextDidResolveOperation, + GraphQLRequestContextDidEncounterErrors, + GraphQLRequestContextResponseForOperation, + GraphQLRequestContextExecutionDidStart, + GraphQLRequestContextWillSendResponse, } from 'apollo-server-types'; + +// We re-export all of these so plugin authors only need to depend on a single +// package. The overall concept of `apollo-server-types` and this package +// is that they not depend directly on "core", in order to avoid close +// coupling of plugin support with server versions. They are duplicated +// concepts right now where one package is intended to be for public plugin +// exposure, while the other (`-types`) is meant to be used internally. +// In the future, `apollo-server-types` and `apollo-server-plugin-base` will +// probably roll into the same "types" package, but that is not today! export { GraphQLServiceContext, GraphQLRequestContext, @@ -13,6 +29,13 @@ export { GraphQLResponse, ValueOrPromise, WithRequired, + GraphQLRequestContextParsingDidStart, + GraphQLRequestContextValidationDidStart, + GraphQLRequestContextDidResolveOperation, + GraphQLRequestContextDidEncounterErrors, + GraphQLRequestContextResponseForOperation, + GraphQLRequestContextExecutionDidStart, + GraphQLRequestContextWillSendResponse, }; export interface ApolloServerPlugin = Record> { @@ -24,28 +47,16 @@ export interface ApolloServerPlugin = Recor export interface GraphQLRequestListener> { parsingDidStart?( - requestContext: WithRequired< - GraphQLRequestContext, - 'metrics' | 'source' - >, + requestContext: GraphQLRequestContextParsingDidStart, ): ((err?: Error) => void) | void; validationDidStart?( - requestContext: WithRequired< - GraphQLRequestContext, - 'metrics' | 'source' | 'document' - >, + requestContext: GraphQLRequestContextValidationDidStart, ): ((err?: ReadonlyArray) => void) | void; didResolveOperation?( - requestContext: WithRequired< - GraphQLRequestContext, - 'metrics' | 'source' | 'document' | 'operationName' | 'operation' - >, + requestContext: GraphQLRequestContextDidResolveOperation, ): ValueOrPromise; didEncounterErrors?( - requestContext: WithRequired< - GraphQLRequestContext, - 'metrics' | 'source' | 'errors' - >, + requestContext: GraphQLRequestContextDidEncounterErrors, ): ValueOrPromise; // If this hook is defined, it is invoked immediately before GraphQL execution // would take place. If its return value resolves to a non-null @@ -53,21 +64,12 @@ export interface GraphQLRequestListener> { // Hooks from different plugins are invoked in series and the first non-null // response is used. responseForOperation?( - requestContext: WithRequired< - GraphQLRequestContext, - 'metrics' | 'source' | 'document' | 'operationName' | 'operation' - >, + requestContext: GraphQLRequestContextResponseForOperation, ): ValueOrPromise; executionDidStart?( - requestContext: WithRequired< - GraphQLRequestContext, - 'metrics' | 'source' | 'document' | 'operationName' | 'operation' - >, + requestContext: GraphQLRequestContextExecutionDidStart, ): ((err?: Error) => void) | void; willSendResponse?( - requestContext: WithRequired< - GraphQLRequestContext, - 'metrics' | 'response' - >, + requestContext: GraphQLRequestContextWillSendResponse, ): ValueOrPromise; } diff --git a/packages/apollo-server-types/src/index.ts b/packages/apollo-server-types/src/index.ts index fb19ab68854..969872aca49 100644 --- a/packages/apollo-server-types/src/index.ts +++ b/packages/apollo-server-types/src/index.ts @@ -99,10 +99,7 @@ export type ValidationRule = (context: ValidationContext) => ASTVisitor; export class InvalidGraphQLRequestError extends GraphQLError {} export type GraphQLExecutor> = ( - requestContext: WithRequired< - GraphQLRequestContext, - 'document' | 'operationName' | 'operation' | 'queryHash' - >, + requestContext: GraphQLRequestContextExecutionDidStart, ) => ValueOrPromise; export type GraphQLExecutionResult = { @@ -118,3 +115,46 @@ export type Logger = { warn(message?: any): void; error(message?: any): void; } + +export type GraphQLRequestContextParsingDidStart = + WithRequired, + | 'metrics' + | 'source' + | 'queryHash' + >; +export type GraphQLRequestContextValidationDidStart = + GraphQLRequestContextParsingDidStart & + WithRequired, + | 'document' + >; +export type GraphQLRequestContextDidResolveOperation = + GraphQLRequestContextValidationDidStart & + WithRequired, + | 'operation' + | 'operationName' + >; +export type GraphQLRequestContextDidEncounterErrors = + WithRequired, + | 'metrics' + | 'errors' + >; +export type GraphQLRequestContextResponseForOperation = + WithRequired, + | 'metrics' + | 'source' + | 'document' + | 'operation' + | 'operationName' + >; +export type GraphQLRequestContextExecutionDidStart = + GraphQLRequestContextParsingDidStart & + WithRequired, + | 'document' + | 'operation' + | 'operationName' + >; +export type GraphQLRequestContextWillSendResponse = + WithRequired, + | 'metrics' + | 'response' + >; From 152d6b876da614b5fbd95457205516d0064f1d39 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 26 Mar 2020 15:04:42 +0200 Subject: [PATCH 323/642] Align versions prior to bumping together. --- packages/apollo-datasource-rest/package.json | 2 +- packages/apollo-server-plugin-base/package.json | 2 +- packages/apollo-server-types/package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/apollo-datasource-rest/package.json b/packages/apollo-datasource-rest/package.json index c8daddb66a5..76e2b2f04c1 100644 --- a/packages/apollo-datasource-rest/package.json +++ b/packages/apollo-datasource-rest/package.json @@ -1,6 +1,6 @@ { "name": "apollo-datasource-rest", - "version": "0.8.1-alpha.1", + "version": "0.8.1-alpha.2", "author": "opensource@apollographql.com", "license": "MIT", "repository": { diff --git a/packages/apollo-server-plugin-base/package.json b/packages/apollo-server-plugin-base/package.json index 3d3a05f6f65..9f444f37a56 100644 --- a/packages/apollo-server-plugin-base/package.json +++ b/packages/apollo-server-plugin-base/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-plugin-base", - "version": "0.7.1-alpha.1", + "version": "0.7.1-alpha.2", "description": "Apollo Server plugin base classes", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-types/package.json b/packages/apollo-server-types/package.json index e43f6f94187..ca9cad4114a 100644 --- a/packages/apollo-server-types/package.json +++ b/packages/apollo-server-types/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-types", - "version": "0.3.1-alpha.1", + "version": "0.3.1-alpha.2", "description": "Apollo Server shared types", "main": "dist/index.js", "types": "dist/index.d.ts", From 3eaed42548ad524129601263b4b2d8e3d7b65d27 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 26 Mar 2020 15:05:15 +0200 Subject: [PATCH 324/642] Release - apollo-cache-control@0.9.1-alpha.3 - apollo-datasource-rest@0.8.1-alpha.3 - apollo-engine-reporting@1.7.1-alpha.3 - @apollo/gateway@0.14.0-alpha.3 - apollo-server-azure-functions@2.12.0-alpha.3 - apollo-server-cloud-functions@2.12.0-alpha.3 - apollo-server-cloudflare@2.12.0-alpha.3 - apollo-server-core@2.12.0-alpha.3 - apollo-server-express@2.12.0-alpha.3 - apollo-server-fastify@2.12.0-alpha.3 - apollo-server-hapi@2.12.0-alpha.3 - apollo-server-integration-testsuite@2.12.0-alpha.3 - apollo-server-koa@2.12.0-alpha.3 - apollo-server-lambda@2.12.0-alpha.3 - apollo-server-micro@2.12.0-alpha.3 - apollo-server-plugin-base@0.7.1-alpha.3 - apollo-server-plugin-response-cache@0.4.1-alpha.3 - apollo-server-testing@2.12.0-alpha.3 - apollo-server-types@0.3.1-alpha.3 - apollo-server@2.12.0-alpha.3 - apollo-tracing@0.9.1-alpha.3 - graphql-extensions@0.11.1-alpha.3 --- packages/apollo-cache-control/package.json | 2 +- packages/apollo-datasource-rest/package.json | 2 +- packages/apollo-engine-reporting/package.json | 2 +- packages/apollo-gateway/package.json | 2 +- packages/apollo-server-azure-functions/package.json | 2 +- packages/apollo-server-cloud-functions/package.json | 2 +- packages/apollo-server-cloudflare/package.json | 2 +- packages/apollo-server-core/package.json | 2 +- packages/apollo-server-express/package.json | 2 +- packages/apollo-server-fastify/package.json | 2 +- packages/apollo-server-hapi/package.json | 2 +- packages/apollo-server-integration-testsuite/package.json | 2 +- packages/apollo-server-koa/package.json | 2 +- packages/apollo-server-lambda/package.json | 2 +- packages/apollo-server-micro/package.json | 2 +- packages/apollo-server-plugin-base/package.json | 2 +- packages/apollo-server-plugin-response-cache/package.json | 2 +- packages/apollo-server-testing/package.json | 2 +- packages/apollo-server-types/package.json | 2 +- packages/apollo-server/package.json | 2 +- packages/apollo-tracing/package.json | 2 +- packages/graphql-extensions/package.json | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/packages/apollo-cache-control/package.json b/packages/apollo-cache-control/package.json index 01e799242ab..bf034e28194 100644 --- a/packages/apollo-cache-control/package.json +++ b/packages/apollo-cache-control/package.json @@ -1,6 +1,6 @@ { "name": "apollo-cache-control", - "version": "0.9.1-alpha.2", + "version": "0.9.1-alpha.3", "description": "A GraphQL extension for cache control", "main": "./dist/index.js", "types": "./dist/index.d.ts", diff --git a/packages/apollo-datasource-rest/package.json b/packages/apollo-datasource-rest/package.json index 76e2b2f04c1..fe256f59c76 100644 --- a/packages/apollo-datasource-rest/package.json +++ b/packages/apollo-datasource-rest/package.json @@ -1,6 +1,6 @@ { "name": "apollo-datasource-rest", - "version": "0.8.1-alpha.2", + "version": "0.8.1-alpha.3", "author": "opensource@apollographql.com", "license": "MIT", "repository": { diff --git a/packages/apollo-engine-reporting/package.json b/packages/apollo-engine-reporting/package.json index 9408e9d188e..78913f47c60 100644 --- a/packages/apollo-engine-reporting/package.json +++ b/packages/apollo-engine-reporting/package.json @@ -1,6 +1,6 @@ { "name": "apollo-engine-reporting", - "version": "1.7.1-alpha.2", + "version": "1.7.1-alpha.3", "description": "Send reports about your GraphQL services to Apollo Graph Manager (previously known as Apollo Engine)", "main": "./dist/index.js", "types": "./dist/index.d.ts", diff --git a/packages/apollo-gateway/package.json b/packages/apollo-gateway/package.json index 6552a63e840..0f995e3c83d 100644 --- a/packages/apollo-gateway/package.json +++ b/packages/apollo-gateway/package.json @@ -1,6 +1,6 @@ { "name": "@apollo/gateway", - "version": "0.14.0-alpha.2", + "version": "0.14.0-alpha.3", "description": "Apollo Gateway", "author": "opensource@apollographql.com", "main": "dist/index.js", diff --git a/packages/apollo-server-azure-functions/package.json b/packages/apollo-server-azure-functions/package.json index 0900b9cbabd..4edc7ef6a9c 100644 --- a/packages/apollo-server-azure-functions/package.json +++ b/packages/apollo-server-azure-functions/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-azure-functions", - "version": "2.12.0-alpha.2", + "version": "2.12.0-alpha.3", "description": "Production-ready Node.js GraphQL server for Azure Functions", "keywords": [ "GraphQL", diff --git a/packages/apollo-server-cloud-functions/package.json b/packages/apollo-server-cloud-functions/package.json index 82824827331..1cf742cb87c 100644 --- a/packages/apollo-server-cloud-functions/package.json +++ b/packages/apollo-server-cloud-functions/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-cloud-functions", - "version": "2.12.0-alpha.2", + "version": "2.12.0-alpha.3", "description": "Production-ready Node.js GraphQL server for Google Cloud Functions", "keywords": [ "GraphQL", diff --git a/packages/apollo-server-cloudflare/package.json b/packages/apollo-server-cloudflare/package.json index 5cad0a2767a..e03d0645e1a 100644 --- a/packages/apollo-server-cloudflare/package.json +++ b/packages/apollo-server-cloudflare/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-cloudflare", - "version": "2.12.0-alpha.2", + "version": "2.12.0-alpha.3", "description": "Production-ready Node.js GraphQL server for Cloudflare workers", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-core/package.json b/packages/apollo-server-core/package.json index 7c56c16b571..eea6b00c508 100644 --- a/packages/apollo-server-core/package.json +++ b/packages/apollo-server-core/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-core", - "version": "2.12.0-alpha.2", + "version": "2.12.0-alpha.3", "description": "Core engine for Apollo GraphQL server", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-express/package.json b/packages/apollo-server-express/package.json index 04897342432..520d3b95b00 100644 --- a/packages/apollo-server-express/package.json +++ b/packages/apollo-server-express/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-express", - "version": "2.12.0-alpha.2", + "version": "2.12.0-alpha.3", "description": "Production-ready Node.js GraphQL server for Express and Connect", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-fastify/package.json b/packages/apollo-server-fastify/package.json index d84e85e77a9..638c2d10aae 100644 --- a/packages/apollo-server-fastify/package.json +++ b/packages/apollo-server-fastify/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-fastify", - "version": "2.12.0-alpha.2", + "version": "2.12.0-alpha.3", "description": "Production-ready Node.js GraphQL server for Fastify", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-hapi/package.json b/packages/apollo-server-hapi/package.json index 8cc576bff68..84a044c3600 100644 --- a/packages/apollo-server-hapi/package.json +++ b/packages/apollo-server-hapi/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-hapi", - "version": "2.12.0-alpha.2", + "version": "2.12.0-alpha.3", "description": "Production-ready Node.js GraphQL server for Hapi", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-integration-testsuite/package.json b/packages/apollo-server-integration-testsuite/package.json index 0ad56dd9a7a..dffbf2e9b19 100644 --- a/packages/apollo-server-integration-testsuite/package.json +++ b/packages/apollo-server-integration-testsuite/package.json @@ -1,7 +1,7 @@ { "name": "apollo-server-integration-testsuite", "private": true, - "version": "2.12.0-alpha.2", + "version": "2.12.0-alpha.3", "description": "Apollo Server Integrations testsuite", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-koa/package.json b/packages/apollo-server-koa/package.json index 09b9a2322fe..938db7f6d0a 100644 --- a/packages/apollo-server-koa/package.json +++ b/packages/apollo-server-koa/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-koa", - "version": "2.12.0-alpha.2", + "version": "2.12.0-alpha.3", "description": "Production-ready Node.js GraphQL server for Koa", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-lambda/package.json b/packages/apollo-server-lambda/package.json index 876e2391811..90980a80877 100644 --- a/packages/apollo-server-lambda/package.json +++ b/packages/apollo-server-lambda/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-lambda", - "version": "2.12.0-alpha.2", + "version": "2.12.0-alpha.3", "description": "Production-ready Node.js GraphQL server for AWS Lambda", "keywords": [ "GraphQL", diff --git a/packages/apollo-server-micro/package.json b/packages/apollo-server-micro/package.json index 29522e85835..cd21070d911 100644 --- a/packages/apollo-server-micro/package.json +++ b/packages/apollo-server-micro/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-micro", - "version": "2.12.0-alpha.2", + "version": "2.12.0-alpha.3", "description": "Production-ready Node.js GraphQL server for Micro", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-plugin-base/package.json b/packages/apollo-server-plugin-base/package.json index 9f444f37a56..22c10b03f30 100644 --- a/packages/apollo-server-plugin-base/package.json +++ b/packages/apollo-server-plugin-base/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-plugin-base", - "version": "0.7.1-alpha.2", + "version": "0.7.1-alpha.3", "description": "Apollo Server plugin base classes", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-plugin-response-cache/package.json b/packages/apollo-server-plugin-response-cache/package.json index 80252db5f2f..d04430d2c12 100644 --- a/packages/apollo-server-plugin-response-cache/package.json +++ b/packages/apollo-server-plugin-response-cache/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-plugin-response-cache", - "version": "0.4.1-alpha.2", + "version": "0.4.1-alpha.3", "description": "Apollo Server full query response cache", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-testing/package.json b/packages/apollo-server-testing/package.json index c24d7b98b01..0bf5e918b5c 100644 --- a/packages/apollo-server-testing/package.json +++ b/packages/apollo-server-testing/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-testing", - "version": "2.12.0-alpha.2", + "version": "2.12.0-alpha.3", "description": "Test utils for apollo-server", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-types/package.json b/packages/apollo-server-types/package.json index ca9cad4114a..a5edef46722 100644 --- a/packages/apollo-server-types/package.json +++ b/packages/apollo-server-types/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-types", - "version": "0.3.1-alpha.2", + "version": "0.3.1-alpha.3", "description": "Apollo Server shared types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server/package.json b/packages/apollo-server/package.json index 55ef4ed5b18..98e491e064f 100644 --- a/packages/apollo-server/package.json +++ b/packages/apollo-server/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server", - "version": "2.12.0-alpha.2", + "version": "2.12.0-alpha.3", "description": "Production ready GraphQL Server", "author": "opensource@apollographql.com", "main": "dist/index.js", diff --git a/packages/apollo-tracing/package.json b/packages/apollo-tracing/package.json index 48966fc14b6..1748c537fde 100644 --- a/packages/apollo-tracing/package.json +++ b/packages/apollo-tracing/package.json @@ -1,6 +1,6 @@ { "name": "apollo-tracing", - "version": "0.9.1-alpha.2", + "version": "0.9.1-alpha.3", "description": "Collect and expose trace data for GraphQL requests", "main": "./dist/index.js", "types": "./dist/index.d.ts", diff --git a/packages/graphql-extensions/package.json b/packages/graphql-extensions/package.json index ef4285a0c21..47daf428043 100644 --- a/packages/graphql-extensions/package.json +++ b/packages/graphql-extensions/package.json @@ -1,6 +1,6 @@ { "name": "graphql-extensions", - "version": "0.11.1-alpha.2", + "version": "0.11.1-alpha.3", "description": "Add extensions to GraphQL servers", "main": "./dist/index.js", "types": "./dist/index.d.ts", From 903842e1d79374ad1c9d4738d0f772f8a5d80201 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 26 Mar 2020 15:21:51 +0200 Subject: [PATCH 325/642] Add `release:version-bump:server-and-federation` npm script. This will make sure to bump the releases of both federation and server to ensure that the version bumps stay aligned during the prerelease, and avoiding some occasionally bumping to `alpha.2` while others progress to `alpha.3` (for example). This is only a concern for documentation (e.g. CHANGELOG) and human approachability, not for anything technical. cc @trevor-scheer --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 95d2bd8f738..4358e66be30 100644 --- a/package.json +++ b/package.json @@ -9,8 +9,9 @@ "compile:clean": "tsc --build tsconfig.build.json --clean", "watch": "tsc --build tsconfig.build.json --watch", "release:version-bump": "lerna version -m 'Release'", - "release:version-bump:server": "npm run release:version-bump -- --force-publish=apollo-server,apollo-server-core,apollo-server-azure-functions,apollo-server-cloud-functions,apollo-server-cloudflare,apollo-server-express,apollo-server-fastify,apollo-server-hapi,apollo-server-koa,apollo-server-lambda,apollo-server-micro", + "release:version-bump:server": "npm run release:version-bump -- --force-publish=apollo-server,apollo-server-core,apollo-server-azure-functions,apollo-server-cloud-functions,apollo-server-cloudflare,apollo-server-express,apollo-server-fastify,apollo-server-hapi,apollo-server-koa,apollo-server-lambda,apollo-server-micro,apollo-server-integration-testsuite,apollo-server-testing", "release:version-bump:federation": "npm run release:version-bump -- --force-publish=@apollo/federation,@apollo/gateway", + "release:version-bump:server-and-federation": "npm run release:version-bump -- --force-publish=@apollo/federation,@apollo/gateway,apollo-server,apollo-server-core,apollo-server-azure-functions,apollo-server-cloud-functions,apollo-server-cloudflare,apollo-server-express,apollo-server-fastify,apollo-server-hapi,apollo-server-koa,apollo-server-lambda,apollo-server-micro,apollo-server-integration-testsuite,apollo-server-testing", "release:start-ci-publish": "node -p '`Publish (dist-tag:${process.env.APOLLO_DIST_TAG || \"latest\"})`' | git tag -F - \"publish/$(date -u '+%Y%m%d%H%M%S')\" && git push origin \"$(git describe --match='publish/*' --tags --exact-match HEAD)\"", "postinstall": "lerna run prepare && npm run compile", "test": "jest --verbose", From 8b92435c4c9bea355d05c376a0dd37b1c13ac289 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 26 Mar 2020 15:23:26 +0200 Subject: [PATCH 326/642] Align versions prior to bumping version with lerna. --- packages/apollo-federation/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-federation/package.json b/packages/apollo-federation/package.json index 3e75da06956..77c5930eb38 100644 --- a/packages/apollo-federation/package.json +++ b/packages/apollo-federation/package.json @@ -1,6 +1,6 @@ { "name": "@apollo/federation", - "version": "0.14.0-alpha.2", + "version": "0.14.0-alpha.3", "description": "Apollo Federation Utilities", "main": "dist/index.js", "types": "dist/index.d.ts", From 84580175f2e8b64d27e2836a6f73e0474cd6c194 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 26 Mar 2020 15:34:18 +0200 Subject: [PATCH 327/642] Align versions prior to bumping to `-alpha.4`. --- packages/apollo-server-cache-redis/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-cache-redis/package.json b/packages/apollo-server-cache-redis/package.json index 16160207596..bd2667d56f9 100644 --- a/packages/apollo-server-cache-redis/package.json +++ b/packages/apollo-server-cache-redis/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-cache-redis", - "version": "1.1.6-alpha.1", + "version": "1.1.6-alpha.3", "author": "opensource@apollographql.com", "license": "MIT", "repository": { From a6189b32fec3f1ea1ee717e59d89c8137797aa50 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 26 Mar 2020 15:34:55 +0200 Subject: [PATCH 328/642] Release - apollo-cache-control@0.9.1-alpha.4 - apollo-datasource-rest@0.8.1-alpha.4 - apollo-engine-reporting@1.7.1-alpha.4 - @apollo/federation@0.14.0-alpha.4 - @apollo/gateway@0.14.0-alpha.4 - apollo-server-azure-functions@2.12.0-alpha.4 - apollo-server-cache-redis@1.1.6-alpha.4 - apollo-server-cloud-functions@2.12.0-alpha.4 - apollo-server-cloudflare@2.12.0-alpha.4 - apollo-server-core@2.12.0-alpha.4 - apollo-server-express@2.12.0-alpha.4 - apollo-server-fastify@2.12.0-alpha.4 - apollo-server-hapi@2.12.0-alpha.4 - apollo-server-integration-testsuite@2.12.0-alpha.4 - apollo-server-koa@2.12.0-alpha.4 - apollo-server-lambda@2.12.0-alpha.4 - apollo-server-micro@2.12.0-alpha.4 - apollo-server-plugin-base@0.7.1-alpha.4 - apollo-server-plugin-response-cache@0.4.1-alpha.4 - apollo-server-testing@2.12.0-alpha.4 - apollo-server-types@0.3.1-alpha.4 - apollo-server@2.12.0-alpha.4 - apollo-tracing@0.9.1-alpha.4 - graphql-extensions@0.11.1-alpha.4 --- packages/apollo-cache-control/package.json | 2 +- packages/apollo-datasource-rest/package.json | 2 +- packages/apollo-engine-reporting/package.json | 2 +- packages/apollo-federation/package.json | 2 +- packages/apollo-gateway/package.json | 2 +- packages/apollo-server-azure-functions/package.json | 2 +- packages/apollo-server-cache-redis/package.json | 2 +- packages/apollo-server-cloud-functions/package.json | 2 +- packages/apollo-server-cloudflare/package.json | 2 +- packages/apollo-server-core/package.json | 2 +- packages/apollo-server-express/package.json | 2 +- packages/apollo-server-fastify/package.json | 2 +- packages/apollo-server-hapi/package.json | 2 +- packages/apollo-server-integration-testsuite/package.json | 2 +- packages/apollo-server-koa/package.json | 2 +- packages/apollo-server-lambda/package.json | 2 +- packages/apollo-server-micro/package.json | 2 +- packages/apollo-server-plugin-base/package.json | 2 +- packages/apollo-server-plugin-response-cache/package.json | 2 +- packages/apollo-server-testing/package.json | 2 +- packages/apollo-server-types/package.json | 2 +- packages/apollo-server/package.json | 2 +- packages/apollo-tracing/package.json | 2 +- packages/graphql-extensions/package.json | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/packages/apollo-cache-control/package.json b/packages/apollo-cache-control/package.json index bf034e28194..424a2b1d8d2 100644 --- a/packages/apollo-cache-control/package.json +++ b/packages/apollo-cache-control/package.json @@ -1,6 +1,6 @@ { "name": "apollo-cache-control", - "version": "0.9.1-alpha.3", + "version": "0.9.1-alpha.4", "description": "A GraphQL extension for cache control", "main": "./dist/index.js", "types": "./dist/index.d.ts", diff --git a/packages/apollo-datasource-rest/package.json b/packages/apollo-datasource-rest/package.json index fe256f59c76..6973a404947 100644 --- a/packages/apollo-datasource-rest/package.json +++ b/packages/apollo-datasource-rest/package.json @@ -1,6 +1,6 @@ { "name": "apollo-datasource-rest", - "version": "0.8.1-alpha.3", + "version": "0.8.1-alpha.4", "author": "opensource@apollographql.com", "license": "MIT", "repository": { diff --git a/packages/apollo-engine-reporting/package.json b/packages/apollo-engine-reporting/package.json index 78913f47c60..37889c5a695 100644 --- a/packages/apollo-engine-reporting/package.json +++ b/packages/apollo-engine-reporting/package.json @@ -1,6 +1,6 @@ { "name": "apollo-engine-reporting", - "version": "1.7.1-alpha.3", + "version": "1.7.1-alpha.4", "description": "Send reports about your GraphQL services to Apollo Graph Manager (previously known as Apollo Engine)", "main": "./dist/index.js", "types": "./dist/index.d.ts", diff --git a/packages/apollo-federation/package.json b/packages/apollo-federation/package.json index 77c5930eb38..603cc07582d 100644 --- a/packages/apollo-federation/package.json +++ b/packages/apollo-federation/package.json @@ -1,6 +1,6 @@ { "name": "@apollo/federation", - "version": "0.14.0-alpha.3", + "version": "0.14.0-alpha.4", "description": "Apollo Federation Utilities", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-gateway/package.json b/packages/apollo-gateway/package.json index 0f995e3c83d..582c080b410 100644 --- a/packages/apollo-gateway/package.json +++ b/packages/apollo-gateway/package.json @@ -1,6 +1,6 @@ { "name": "@apollo/gateway", - "version": "0.14.0-alpha.3", + "version": "0.14.0-alpha.4", "description": "Apollo Gateway", "author": "opensource@apollographql.com", "main": "dist/index.js", diff --git a/packages/apollo-server-azure-functions/package.json b/packages/apollo-server-azure-functions/package.json index 4edc7ef6a9c..cd6b1debbef 100644 --- a/packages/apollo-server-azure-functions/package.json +++ b/packages/apollo-server-azure-functions/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-azure-functions", - "version": "2.12.0-alpha.3", + "version": "2.12.0-alpha.4", "description": "Production-ready Node.js GraphQL server for Azure Functions", "keywords": [ "GraphQL", diff --git a/packages/apollo-server-cache-redis/package.json b/packages/apollo-server-cache-redis/package.json index bd2667d56f9..327fc163334 100644 --- a/packages/apollo-server-cache-redis/package.json +++ b/packages/apollo-server-cache-redis/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-cache-redis", - "version": "1.1.6-alpha.3", + "version": "1.1.6-alpha.4", "author": "opensource@apollographql.com", "license": "MIT", "repository": { diff --git a/packages/apollo-server-cloud-functions/package.json b/packages/apollo-server-cloud-functions/package.json index 1cf742cb87c..16e85a4f7e4 100644 --- a/packages/apollo-server-cloud-functions/package.json +++ b/packages/apollo-server-cloud-functions/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-cloud-functions", - "version": "2.12.0-alpha.3", + "version": "2.12.0-alpha.4", "description": "Production-ready Node.js GraphQL server for Google Cloud Functions", "keywords": [ "GraphQL", diff --git a/packages/apollo-server-cloudflare/package.json b/packages/apollo-server-cloudflare/package.json index e03d0645e1a..a497a1af36d 100644 --- a/packages/apollo-server-cloudflare/package.json +++ b/packages/apollo-server-cloudflare/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-cloudflare", - "version": "2.12.0-alpha.3", + "version": "2.12.0-alpha.4", "description": "Production-ready Node.js GraphQL server for Cloudflare workers", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-core/package.json b/packages/apollo-server-core/package.json index eea6b00c508..bcec6c9a2e3 100644 --- a/packages/apollo-server-core/package.json +++ b/packages/apollo-server-core/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-core", - "version": "2.12.0-alpha.3", + "version": "2.12.0-alpha.4", "description": "Core engine for Apollo GraphQL server", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-express/package.json b/packages/apollo-server-express/package.json index 520d3b95b00..2316c5e1d46 100644 --- a/packages/apollo-server-express/package.json +++ b/packages/apollo-server-express/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-express", - "version": "2.12.0-alpha.3", + "version": "2.12.0-alpha.4", "description": "Production-ready Node.js GraphQL server for Express and Connect", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-fastify/package.json b/packages/apollo-server-fastify/package.json index 638c2d10aae..ea1db9345be 100644 --- a/packages/apollo-server-fastify/package.json +++ b/packages/apollo-server-fastify/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-fastify", - "version": "2.12.0-alpha.3", + "version": "2.12.0-alpha.4", "description": "Production-ready Node.js GraphQL server for Fastify", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-hapi/package.json b/packages/apollo-server-hapi/package.json index 84a044c3600..dcba835acfb 100644 --- a/packages/apollo-server-hapi/package.json +++ b/packages/apollo-server-hapi/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-hapi", - "version": "2.12.0-alpha.3", + "version": "2.12.0-alpha.4", "description": "Production-ready Node.js GraphQL server for Hapi", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-integration-testsuite/package.json b/packages/apollo-server-integration-testsuite/package.json index dffbf2e9b19..e32f979e134 100644 --- a/packages/apollo-server-integration-testsuite/package.json +++ b/packages/apollo-server-integration-testsuite/package.json @@ -1,7 +1,7 @@ { "name": "apollo-server-integration-testsuite", "private": true, - "version": "2.12.0-alpha.3", + "version": "2.12.0-alpha.4", "description": "Apollo Server Integrations testsuite", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-koa/package.json b/packages/apollo-server-koa/package.json index 938db7f6d0a..5b3139d17b2 100644 --- a/packages/apollo-server-koa/package.json +++ b/packages/apollo-server-koa/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-koa", - "version": "2.12.0-alpha.3", + "version": "2.12.0-alpha.4", "description": "Production-ready Node.js GraphQL server for Koa", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-lambda/package.json b/packages/apollo-server-lambda/package.json index 90980a80877..0bcdf436054 100644 --- a/packages/apollo-server-lambda/package.json +++ b/packages/apollo-server-lambda/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-lambda", - "version": "2.12.0-alpha.3", + "version": "2.12.0-alpha.4", "description": "Production-ready Node.js GraphQL server for AWS Lambda", "keywords": [ "GraphQL", diff --git a/packages/apollo-server-micro/package.json b/packages/apollo-server-micro/package.json index cd21070d911..27994ba9d05 100644 --- a/packages/apollo-server-micro/package.json +++ b/packages/apollo-server-micro/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-micro", - "version": "2.12.0-alpha.3", + "version": "2.12.0-alpha.4", "description": "Production-ready Node.js GraphQL server for Micro", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-plugin-base/package.json b/packages/apollo-server-plugin-base/package.json index 22c10b03f30..8db35fdcb56 100644 --- a/packages/apollo-server-plugin-base/package.json +++ b/packages/apollo-server-plugin-base/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-plugin-base", - "version": "0.7.1-alpha.3", + "version": "0.7.1-alpha.4", "description": "Apollo Server plugin base classes", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-plugin-response-cache/package.json b/packages/apollo-server-plugin-response-cache/package.json index d04430d2c12..541d4ed6995 100644 --- a/packages/apollo-server-plugin-response-cache/package.json +++ b/packages/apollo-server-plugin-response-cache/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-plugin-response-cache", - "version": "0.4.1-alpha.3", + "version": "0.4.1-alpha.4", "description": "Apollo Server full query response cache", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-testing/package.json b/packages/apollo-server-testing/package.json index 0bf5e918b5c..e5533531297 100644 --- a/packages/apollo-server-testing/package.json +++ b/packages/apollo-server-testing/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-testing", - "version": "2.12.0-alpha.3", + "version": "2.12.0-alpha.4", "description": "Test utils for apollo-server", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-types/package.json b/packages/apollo-server-types/package.json index a5edef46722..96fc34a2e62 100644 --- a/packages/apollo-server-types/package.json +++ b/packages/apollo-server-types/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-types", - "version": "0.3.1-alpha.3", + "version": "0.3.1-alpha.4", "description": "Apollo Server shared types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server/package.json b/packages/apollo-server/package.json index 98e491e064f..ea8d38060a3 100644 --- a/packages/apollo-server/package.json +++ b/packages/apollo-server/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server", - "version": "2.12.0-alpha.3", + "version": "2.12.0-alpha.4", "description": "Production ready GraphQL Server", "author": "opensource@apollographql.com", "main": "dist/index.js", diff --git a/packages/apollo-tracing/package.json b/packages/apollo-tracing/package.json index 1748c537fde..eb1fca0ed3f 100644 --- a/packages/apollo-tracing/package.json +++ b/packages/apollo-tracing/package.json @@ -1,6 +1,6 @@ { "name": "apollo-tracing", - "version": "0.9.1-alpha.3", + "version": "0.9.1-alpha.4", "description": "Collect and expose trace data for GraphQL requests", "main": "./dist/index.js", "types": "./dist/index.d.ts", diff --git a/packages/graphql-extensions/package.json b/packages/graphql-extensions/package.json index 47daf428043..2f658e01085 100644 --- a/packages/graphql-extensions/package.json +++ b/packages/graphql-extensions/package.json @@ -1,6 +1,6 @@ { "name": "graphql-extensions", - "version": "0.11.1-alpha.3", + "version": "0.11.1-alpha.4", "description": "Add extensions to GraphQL servers", "main": "./dist/index.js", "types": "./dist/index.d.ts", From 8399a56292d3a5b4f9d5dcc095d3ee6d9e41824e Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 26 Mar 2020 21:04:24 +0200 Subject: [PATCH 329/642] typo: Add missing "y" to "currentl". --- packages/apollo-gateway/src/executeQueryPlan.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-gateway/src/executeQueryPlan.ts b/packages/apollo-gateway/src/executeQueryPlan.ts index e5126e80afa..0527065f252 100644 --- a/packages/apollo-gateway/src/executeQueryPlan.ts +++ b/packages/apollo-gateway/src/executeQueryPlan.ts @@ -93,7 +93,7 @@ export async function executeQueryPlan( }, rootValue: data, variableValues: requestContext.request.variables, - // FIXME: GraphQL extensions currentl wraps every field and creates + // FIXME: GraphQL extensions currently wraps every field and creates // a field resolver. Because of this, when using with ApolloServer // the defaultFieldResolver isn't called. We keep this here // because it is the correct solution and when ApolloServer removes From 2d135457a3139e74c97322360fb2d29a56a22059 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 26 Mar 2020 21:04:59 +0200 Subject: [PATCH 330/642] Selectively import from `graphql`. We currently have two imports for `graphql`, one which is using named exports, and another which imports "*" - which would also get all of those named imports. I'm sure that the named imports are just an artifact of VSCode auto-importing, but let's just use the named imports for their specificity and clarity as well. --- packages/apollo-server-core/src/requestPipeline.ts | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/apollo-server-core/src/requestPipeline.ts b/packages/apollo-server-core/src/requestPipeline.ts index ae839785d3a..07a640c1924 100644 --- a/packages/apollo-server-core/src/requestPipeline.ts +++ b/packages/apollo-server-core/src/requestPipeline.ts @@ -7,8 +7,10 @@ import { ExecutionArgs, GraphQLError, GraphQLFormattedError, + validate as graphqlValidate, + parse as graphqlParse, + execute as graphqlExecute, } from 'graphql'; -import * as graphql from 'graphql'; import { GraphQLExtension, GraphQLExtensionStack, @@ -424,7 +426,7 @@ export async function processGraphQLRequest( }); try { - return graphql.parse(query, parseOptions); + return graphqlParse(query, parseOptions); } finally { parsingDidEnd(); } @@ -439,7 +441,7 @@ export async function processGraphQLRequest( const validationDidEnd = extensionStack.validationDidStart(); try { - return graphql.validate(config.schema, document, rules); + return graphqlValidate(config.schema, document, rules); } finally { validationDidEnd(); } @@ -474,7 +476,7 @@ export async function processGraphQLRequest( // (eg apollo-engine-reporting) assumes that. return await config.executor(requestContext); } else { - return await graphql.execute(executionArgs); + return await graphqlExecute(executionArgs); } } finally { executionDidEnd(); From 8dd114455925dfe177dfbfb21449bdfc658aaf1e Mon Sep 17 00:00:00 2001 From: Adam Zionts Date: Fri, 27 Mar 2020 21:13:54 -0700 Subject: [PATCH 331/642] Support APOLLO_GRAPH_VARIANT and engine.graphVariant This adds support for APOLLO_GRAPH_VARIANT in favor of ENGINE_SCHEMA_TAG and adds a deprecation message for usage of ENGINE_SCHEMA_TAG. Setting both options is not supported. This additionally adds support for engine.graphVariant in the constructor options for apollo engine reporting. --- .../package-lock.json | 97 +++++++++++++++++++ packages/apollo-engine-reporting/src/agent.ts | 12 ++- .../apollo-server-core/src/ApolloServer.ts | 12 ++- 3 files changed, 116 insertions(+), 5 deletions(-) create mode 100644 packages/apollo-engine-reporting-protobuf/package-lock.json diff --git a/packages/apollo-engine-reporting-protobuf/package-lock.json b/packages/apollo-engine-reporting-protobuf/package-lock.json new file mode 100644 index 00000000000..e4e0db1249e --- /dev/null +++ b/packages/apollo-engine-reporting-protobuf/package-lock.json @@ -0,0 +1,97 @@ +{ + "name": "apollo-engine-reporting-protobuf", + "version": "0.4.4", + "lockfileVersion": 1, + "requires": true, + "dependencies": { + "@apollo/protobufjs": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@apollo/protobufjs/-/protobufjs-1.0.3.tgz", + "integrity": "sha512-gqeT810Ect9WIqsrgfUvr+ljSB5m1PyBae9HGdrRyQ3HjHjTcjVvxpsMYXlUk4rUHnrfUqyoGvLSy2yLlRGEOw==", + "requires": { + "@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" + } + }, + "@protobufjs/aspromise": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz", + "integrity": "sha1-m4sMxmPWaafY9vXQiToU00jzD78=" + }, + "@protobufjs/base64": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz", + "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==" + }, + "@protobufjs/codegen": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz", + "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==" + }, + "@protobufjs/eventemitter": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz", + "integrity": "sha1-NVy8mLr61ZePntCV85diHx0Ga3A=" + }, + "@protobufjs/fetch": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz", + "integrity": "sha1-upn7WYYUr2VwDBYZ/wbUVLDYTEU=", + "requires": { + "@protobufjs/aspromise": "^1.1.1", + "@protobufjs/inquire": "^1.1.0" + } + }, + "@protobufjs/float": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz", + "integrity": "sha1-Xp4avctz/Ap8uLKR33jIy9l7h9E=" + }, + "@protobufjs/inquire": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz", + "integrity": "sha1-/yAOPnzyQp4tyvwRQIKOjMY48Ik=" + }, + "@protobufjs/path": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz", + "integrity": "sha1-bMKyDFya1q0NzP0hynZz2Nf79o0=" + }, + "@protobufjs/pool": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz", + "integrity": "sha1-Cf0V8tbTq/qbZbw2ZQbWrXhG/1Q=" + }, + "@protobufjs/utf8": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz", + "integrity": "sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA=" + }, + "@types/long": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.1.tgz", + "integrity": "sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w==" + }, + "@types/node": { + "version": "10.17.17", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.17.tgz", + "integrity": "sha512-gpNnRnZP3VWzzj5k3qrpRC6Rk3H/uclhAVo1aIvwzK5p5cOrs9yEyQ8H/HBsBY0u5rrWxXEiVPQ0dEB6pkjE8Q==" + }, + "long": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz", + "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==" + } + } +} diff --git a/packages/apollo-engine-reporting/src/agent.ts b/packages/apollo-engine-reporting/src/agent.ts index d3b0be2d1c4..3b1df8ac6b5 100644 --- a/packages/apollo-engine-reporting/src/agent.ts +++ b/packages/apollo-engine-reporting/src/agent.ts @@ -178,9 +178,13 @@ export interface EngineReportingOptions { */ rewriteError?: (err: GraphQLError) => GraphQLError | null; /** - * A human readable name to tag this variant of a schema (i.e. staging, EU) + * [DEPRECATED: use graphVariant] A human readable name to tag this variant of a schema (i.e. staging, EU) */ schemaTag?: string; + /** + * A human readable name to refer to the variant of the graph for which metrics are reported + */ + graphVariant?: string; /** * Creates the client information for operation traces. */ @@ -291,7 +295,11 @@ export class EngineReportingAgent { ...serviceHeaderDefaults, schemaHash, schemaTag: - this.options.schemaTag || process.env.ENGINE_SCHEMA_TAG || '', + this.options.graphVariant + || this.options.schemaTag + || process.env.APOLLO_GRAPH_VARIANT + || process.env.ENGINE_SCHEMA_TAG + || '', }); // initializes this.reports[reportHash] this.resetReport(schemaHash); diff --git a/packages/apollo-server-core/src/ApolloServer.ts b/packages/apollo-server-core/src/ApolloServer.ts index 6c21d422fc1..4258eb5da58 100644 --- a/packages/apollo-server-core/src/ApolloServer.ts +++ b/packages/apollo-server-core/src/ApolloServer.ts @@ -97,10 +97,16 @@ function getEngineApiKey(engine: Config['engine']): string | undefined { function getEngineGraphVariant(engine: Config['engine']): string | undefined { if (engine === false) { return; - } else if (typeof engine === 'object' && engine.schemaTag) { - return engine.schemaTag; + } else if (typeof engine === 'object' && (engine.graphVariant || engine.schemaTag)) { + return engine.graphVariant || engine.schemaTag; } else { - return process.env.ENGINE_SCHEMA_TAG; + if (process.env.ENGINE_SCHEMA_TAG) { + console.warn('[Deprecation warning] Usage of ENGINE_SCHEMA_TAG is deprecated. Please use APOLLO_GRAPH_VARIANT instead.'); + } + if (process.env.ENGINE_SCHEMA_TAG && process.env.APOLLO_GRAPH_VARIANT) { + throw new Error('Cannot set both ENGINE_SCHEMA_TAG and APOLLO_GRAPH_VARIANT. Please use APOLLO_GRAPH_VARIANT.') + } + return process.env.APOLLO_GRAPH_VARIANT || process.env.ENGINE_SCHEMA_TAG; } } From 092e4d01ad4bc0861ee1c76c553ed060641accb2 Mon Sep 17 00:00:00 2001 From: Adam Zionts Date: Fri, 27 Mar 2020 21:44:55 -0700 Subject: [PATCH 332/642] Update op-reg plugin to use graphVariant This adds a graphVariant option to the operation registry plugin and deprecates the schemaTag option in favor of it. Additionally, if both options are set, and error is thrown. Also changes names internally and simplifies a boolean. --- .../ApolloServerPluginOperationRegistry.ts | 19 ++++++++++++------- .../src/__tests__/agent.test.ts | 8 ++++---- .../src/__tests__/helpers.test-helpers.ts | 2 +- .../src/agent.ts | 10 +++++----- .../src/common.ts | 4 ++-- 5 files changed, 24 insertions(+), 19 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts index 31073baa97d..57edf2b1d1e 100644 --- a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts +++ b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts @@ -50,6 +50,7 @@ export interface Options { | ForbidUnregisteredOperationsPredicate; dryRun?: boolean; schemaTag?: string; + graphVariant?: string; onUnregisteredOperation?: ( requestContext: GraphQLRequestContext, operationRegistryRequestContext: OperationRegistryRequestContext, @@ -63,7 +64,13 @@ export interface Options { export default function plugin(options: Options = Object.create(null)) { let agent: Agent; let store: InMemoryLRUCache; - let schemaTag = options.schemaTag || 'current'; + const graphVariant = options.graphVariant || options.schemaTag || 'current'; + if (options.graphVariant && options.schemaTag) { + throw new Error('Cannot specify both graphVariant and schemaTag. Please use graphVariant.'); + } + if (options.schemaTag) { + console.warn('[Deprecation warning] schemaTag option is deprecated. Please use graphVariant options instead.'); + } // Setup logging facilities, scoped under the appropriate name. const logger = loglevel.getLogger(`apollo-server:${pluginName}`); @@ -109,7 +116,7 @@ for observability purposes, but all operations will be permitted.`, if (!engine || !engine.serviceID) { const messageEngineConfigurationRequired = - 'The Engine API key must be set to use the operation registry.'; + 'The Apollo API key must be set to use the operation registry.'; throw new Error(`${pluginName}: ${messageEngineConfigurationRequired}`); } @@ -125,7 +132,7 @@ for observability purposes, but all operations will be permitted.`, agent = new Agent({ schemaHash, - schemaTag, + graphVariant, engine, store, logger, @@ -211,9 +218,7 @@ for observability purposes, but all operations will be permitted.`, let shouldForbidOperation: boolean = typeof options.forbidUnregisteredOperations === 'boolean' ? options.forbidUnregisteredOperations - : typeof options.forbidUnregisteredOperations === 'function' - ? true - : false; + : typeof options.forbidUnregisteredOperations === 'function'; if (typeof options.forbidUnregisteredOperations === 'function') { logger.debug( @@ -301,7 +306,7 @@ for observability purposes, but all operations will be permitted.`, Object.assign(error.extensions, { operationSignature: signature, exception: { - message: `Please register your operation with \`npx apollo client:push --tag="${schemaTag}"\`. See https://www.apollographql.com/docs/platform/operation-registry/ for more details.`, + message: `Please register your operation with \`npx apollo client:push --tag="${graphVariant}"\`. See https://www.apollographql.com/docs/platform/operation-registry/ for more details.`, }, }); throw error; diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts index 26e5e3b44eb..fd3b81f090b 100644 --- a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts @@ -442,8 +442,8 @@ describe('Agent', () => { }); }); - describe('When given a schemaTag', () => { - const schemaTag = 'master'; + describe('When given a graphVariant', () => { + const graphVariant = 'master'; const getOperationManifestRelativeUrl = ( ...args: Parameters ) => @@ -454,13 +454,13 @@ describe('Agent', () => { it('fetches manifests for the corresponding schema tag', async () => { nockStorageSecret(genericServiceID, genericApiKeyHash); - const agent = createAgent({ schemaTag }); + const agent = createAgent({ graphVariant: graphVariant }); const nockedManifest = nockBase() .get( getOperationManifestRelativeUrl( genericServiceID, genericStorageSecret, - schemaTag, + graphVariant, ), ) .reply(200, manifest(sampleManifestRecords.a)); diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/helpers.test-helpers.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/helpers.test-helpers.ts index e75d1a8a70e..4818740da74 100644 --- a/packages/apollo-server-plugin-operation-registry/src/__tests__/helpers.test-helpers.ts +++ b/packages/apollo-server-plugin-operation-registry/src/__tests__/helpers.test-helpers.ts @@ -28,7 +28,7 @@ export const defaultAgentOptions: AgentOptions = { engine: { serviceID: genericServiceID, apiKeyHash: genericApiKeyHash }, store: defaultStore(), pollSeconds: defaultTestAgentPollSeconds, - schemaTag: 'current', + graphVariant: 'current', }; // Each nock is good for exactly one request! diff --git a/packages/apollo-server-plugin-operation-registry/src/agent.ts b/packages/apollo-server-plugin-operation-registry/src/agent.ts index 93cc3a8d26e..97a39223b1d 100644 --- a/packages/apollo-server-plugin-operation-registry/src/agent.ts +++ b/packages/apollo-server-plugin-operation-registry/src/agent.ts @@ -23,7 +23,7 @@ export interface AgentOptions { schemaHash: string; engine: any; store: InMemoryLRUCache; - schemaTag: string; + graphVariant: string; } type SignatureStore = Set; @@ -181,9 +181,9 @@ export default class Agent { private async fetchLegacyManifest(): Promise { this.logger.debug(`Fetching legacy manifest.`); - if (this.options.schemaTag !== 'current') { + if (this.options.graphVariant !== 'current') { this.logger.warn( - `The legacy manifest contains operations registered for the "current" tag, but the specified schema tag is "${this.options.schemaTag}".`, + `The legacy manifest contains operations registered for the "current" tag, but the specified schema tag is "${this.options.graphVariant}".`, ); } const legacyManifestUrl = getLegacyOperationManifestUrl( @@ -206,7 +206,7 @@ export default class Agent { const storageSecretManifestUrl = getOperationManifestUrl( this.options.engine.serviceID, storageSecret, - this.options.schemaTag, + this.options.graphVariant, ); this.logger.debug( @@ -219,7 +219,7 @@ export default class Agent { if (response.status === 404 || response.status === 403) { this.logger.warn( - `No manifest found for tag "${this.options.schemaTag}" at ${storageSecretManifestUrl}. ${callToAction}`, + `No manifest found for tag "${this.options.graphVariant}" at ${storageSecretManifestUrl}. ${callToAction}`, ); return this.fetchLegacyManifest(); } diff --git a/packages/apollo-server-plugin-operation-registry/src/common.ts b/packages/apollo-server-plugin-operation-registry/src/common.ts index 82c6445ccef..0577d681043 100644 --- a/packages/apollo-server-plugin-operation-registry/src/common.ts +++ b/packages/apollo-server-plugin-operation-registry/src/common.ts @@ -52,9 +52,9 @@ export function getStorageSecretUrl( export function getOperationManifestUrl( graphId: string, storageSecret: string, - schemaTag: string = 'current', + graphVariant: string = 'current', ): string { - return `${urlOperationManifestBase}/${graphId}/${storageSecret}/${schemaTag}/manifest.v2.json`; + return `${urlOperationManifestBase}/${graphId}/${storageSecret}/${graphVariant}/manifest.v2.json`; } export function getLegacyOperationManifestUrl( From c6c0ed325b854c0e3a79cebecb90fd37f9afe0fc Mon Sep 17 00:00:00 2001 From: Adam Zionts Date: Fri, 27 Mar 2020 21:58:06 -0700 Subject: [PATCH 333/642] Update docs --- .../CHANGELOG.md | 4 ++++ .../README.md | 12 ++++++------ .../src/agent.ts | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/CHANGELOG.md b/packages/apollo-server-plugin-operation-registry/CHANGELOG.md index 13b86df661f..b63b24abfc6 100644 --- a/packages/apollo-server-plugin-operation-registry/CHANGELOG.md +++ b/packages/apollo-server-plugin-operation-registry/CHANGELOG.md @@ -1,5 +1,9 @@ # Change Log +### Upcoming + +- Deprecate schemaTag option, add preferred graphVariant option [PR #295](https://github.com/apollographql/apollo-platform-commercial/pull/295) + ### vNEXT (Currently `alpha` tag) - Add lifecycle hooks: `onUnregisteredOperation`, and `onForbiddenOperation`. [PR #158](https://github.com/apollographql/apollo-platform-commercial/pull/158) [PR #251](https://github.com/apollographql/apollo-platform-commercial/pull/251) [PR #TODO](https://github.com/apollographql/apollo-platform-commercial/pull/TODO) diff --git a/packages/apollo-server-plugin-operation-registry/README.md b/packages/apollo-server-plugin-operation-registry/README.md index e8a62747660..6fd515dc420 100644 --- a/packages/apollo-server-plugin-operation-registry/README.md +++ b/packages/apollo-server-plugin-operation-registry/README.md @@ -2,7 +2,7 @@ The operation registry plugin is the interface into the Apollo Platform's **operation registry** and enables operation **safelisting**, which allows selective execution based on the operation. Safelisting eliminates the risk of unexpected operations that could cause downtime from being run against a graph. -In order to enable safelisting, follow the [step by step guide in the Apollo docs](https://www.apollographql.com/docs/platform/operation-registry/). These steps describe how to extract and upload operations defined within client applications to the [Apollo Graph Manager](https://engine.apollographql.com) using the Apollo CLI. Once operations have been registered, this plugin for Apollo Server fetches the manifest of these operations from the [Apollo Graph Manager](https://engine.apollographql.com) and forbids the execution of any operations that are not in that manifest. +In order to enable safelisting, follow the [step by step guide in the Apollo docs](https://www.apollographql.com/docs/platform/operation-registry/). These steps describe how to extract and upload operations defined within client applications to the [Apollo Graph Manager](https://engine.apollographql.com) using the Apollo CLI. Once operations have been registered, this plugin for Apollo Server fetches the manifest of these operations from the [Apollo Graph Manager](https://engine.apollographql.com) and forbids the execution of any operations that are not in that manifest. ### Usage @@ -59,15 +59,15 @@ server.listen().then(({ url }) => { ``` -#### Schema Tag/Variant +#### Variant -Clients can register their operations to specific tags/variants, so the plugin contains the `schemaTag` field to specify which tag/variant to pull operation manifests from. +Clients can register their operations to a specific variant, so the plugin contains the `graphVariant` field to specify which variant to pull operation manifests from. ```js const server = new ApolloServer({ plugins: [ require("apollo-server-plugin-operation-registry")({ - schemaTag: "overrideTag" + graphVariant: "production" }) ] }); @@ -76,11 +76,11 @@ const server = new ApolloServer({ ### Metrics -The plugin will transmit metrics regarding unregistered operations which can be viewed within [the Apollo Graph Manager](https://engine.apollographql.com). The following example shows the unregistered operations sent by a particular client: +The plugin will transmit metrics regarding unregistered operations which can be viewed within [the Apollo Graph Manager](https://engine.apollographql.com). The following example shows the unregistered operations sent by a particular client:

The clients page showing unregistered operations + />

diff --git a/packages/apollo-server-plugin-operation-registry/src/agent.ts b/packages/apollo-server-plugin-operation-registry/src/agent.ts index 97a39223b1d..f1e976497ed 100644 --- a/packages/apollo-server-plugin-operation-registry/src/agent.ts +++ b/packages/apollo-server-plugin-operation-registry/src/agent.ts @@ -183,7 +183,7 @@ export default class Agent { this.logger.debug(`Fetching legacy manifest.`); if (this.options.graphVariant !== 'current') { this.logger.warn( - `The legacy manifest contains operations registered for the "current" tag, but the specified schema tag is "${this.options.graphVariant}".`, + `The legacy manifest contains operations registered for the "current" variant, but the specified variant is "${this.options.graphVariant}".`, ); } const legacyManifestUrl = getLegacyOperationManifestUrl( From 0ad08681d8509495d17448ab8fd137142ce96d54 Mon Sep 17 00:00:00 2001 From: Adam Zionts Date: Fri, 27 Mar 2020 22:11:15 -0700 Subject: [PATCH 334/642] Support APOLLO_GRAPH_VARIANT --- .../src/ApolloServerPluginOperationRegistry.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts index 57edf2b1d1e..5325f46cff8 100644 --- a/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts +++ b/packages/apollo-server-plugin-operation-registry/src/ApolloServerPluginOperationRegistry.ts @@ -64,7 +64,7 @@ export interface Options { export default function plugin(options: Options = Object.create(null)) { let agent: Agent; let store: InMemoryLRUCache; - const graphVariant = options.graphVariant || options.schemaTag || 'current'; + const graphVariant = options.graphVariant || options.schemaTag || process.env.APOLLO_GRAPH_VARIANT || 'current'; if (options.graphVariant && options.schemaTag) { throw new Error('Cannot specify both graphVariant and schemaTag. Please use graphVariant.'); } From ff46e3a58baa70c510181acb01dabd198a3f87a2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 28 Mar 2020 07:50:50 +0000 Subject: [PATCH 335/642] chore(deps): update dependency gatsby to v2.20.8 (#3910) Co-authored-by: Renovate Bot --- docs/package-lock.json | 2341 +++++++++++++++++++++++++++++++--------- docs/package.json | 2 +- 2 files changed, 1846 insertions(+), 497 deletions(-) diff --git a/docs/package-lock.json b/docs/package-lock.json index 53f4e0868c5..fa7db3c2015 100644 --- a/docs/package-lock.json +++ b/docs/package-lock.json @@ -246,6 +246,44 @@ } } }, + "@babel/helper-builder-react-jsx-experimental": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.9.0.tgz", + "integrity": "sha512-3xJEiyuYU4Q/Ar9BsHisgdxZsRlsShMe90URZ0e6przL26CCs8NJbDoxH94kKT17PcxlMhsCAwZd90evCo26VQ==", + "requires": { + "@babel/helper-annotate-as-pure": "^7.8.3", + "@babel/helper-module-imports": "^7.8.3", + "@babel/types": "^7.9.0" + }, + "dependencies": { + "@babel/helper-annotate-as-pure": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.8.3.tgz", + "integrity": "sha512-6o+mJrZBxOoEX77Ezv9zwW7WV8DdluouRKNY/IR5u/YTMuKHgugHOzYWlYvYLpLA9nPsQCAAASpCIbjI9Mv+Uw==", + "requires": { + "@babel/types": "^7.8.3" + } + }, + "@babel/helper-module-imports": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz", + "integrity": "sha512-R0Bx3jippsbAEtzkpZ/6FIiuzOURPcMjHp+Z6xPe6DtApDJx+w7UYyOLanZqO8+wKR9G10s/FmHXvxaMd9s6Kg==", + "requires": { + "@babel/types": "^7.8.3" + } + }, + "@babel/types": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.0.tgz", + "integrity": "sha512-BS9JKfXkzzJl8RluW4JGknzpiUV7ZrvTayM6yfqLTVBEnFtyowVIOu6rqxRd5cVO6yGoWf4T8u8dgK9oB+GCng==", + "requires": { + "@babel/helper-validator-identifier": "^7.9.0", + "lodash": "^4.17.13", + "to-fast-properties": "^2.0.0" + } + } + } + }, "@babel/helper-call-delegate": { "version": "7.7.4", "resolved": "https://registry.npmjs.org/@babel/helper-call-delegate/-/helper-call-delegate-7.7.4.tgz", @@ -1106,6 +1144,11 @@ } } }, + "@babel/helper-validator-identifier": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.0.tgz", + "integrity": "sha512-6G8bQKjOh+of4PV/ThDm/rRqlU7+IGoJuofpagU5GlEl29Vv0RGqqt86ZGRV8ZuSOY3o+8yXl5y782SMcG7SHw==" + }, "@babel/helper-wrap-function": { "version": "7.7.4", "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.7.4.tgz", @@ -1396,6 +1439,22 @@ } } }, + "@babel/plugin-proposal-numeric-separator": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.8.3.tgz", + "integrity": "sha512-jWioO1s6R/R+wEHizfaScNsAx+xKgwTLNXSh7tTC4Usj3ItsPEhYkEpU4h+lpnBwq7NBVOJXfO6cRFYcX69JUQ==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.3", + "@babel/plugin-syntax-numeric-separator": "^7.8.3" + }, + "dependencies": { + "@babel/helper-plugin-utils": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", + "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" + } + } + }, "@babel/plugin-proposal-object-rest-spread": { "version": "7.8.3", "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.8.3.tgz", @@ -1508,6 +1567,21 @@ } } }, + "@babel/plugin-syntax-numeric-separator": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.8.3.tgz", + "integrity": "sha512-H7dCMAdN83PcCmqmkHB5dtp+Xa9a6LKSvA2hiFBC/5alSHxM5VgWZXFqDi0YFe8XNGT6iCa+z4V4zSt/PdZ7Dw==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.3" + }, + "dependencies": { + "@babel/helper-plugin-utils": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", + "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" + } + } + }, "@babel/plugin-syntax-object-rest-spread": { "version": "7.7.4", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.7.4.tgz", @@ -1950,6 +2024,23 @@ } } }, + "@babel/plugin-transform-react-jsx-development": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.9.0.tgz", + "integrity": "sha512-tK8hWKrQncVvrhvtOiPpKrQjfNX3DtkNLSX4ObuGcpS9p0QrGetKmlySIGR07y48Zft8WVgPakqd/bk46JrMSw==", + "requires": { + "@babel/helper-builder-react-jsx-experimental": "^7.9.0", + "@babel/helper-plugin-utils": "^7.8.3", + "@babel/plugin-syntax-jsx": "^7.8.3" + }, + "dependencies": { + "@babel/helper-plugin-utils": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", + "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" + } + } + }, "@babel/plugin-transform-react-jsx-self": { "version": "7.7.4", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.7.4.tgz", @@ -2005,9 +2096,9 @@ } }, "@babel/plugin-transform-runtime": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.8.3.tgz", - "integrity": "sha512-/vqUt5Yh+cgPZXXjmaG9NT8aVfThKk7G4OqkVhrXqwsC5soMn/qTCxs36rZ2QFhpfTJcjw4SNDIZ4RUb8OL4jQ==", + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.9.0.tgz", + "integrity": "sha512-pUu9VSf3kI1OqbWINQ7MaugnitRss1z533436waNXp+0N3ur3zfut37sXiQMxkuCF4VUjwZucen/quskCh7NHw==", "requires": { "@babel/helper-module-imports": "^7.8.3", "@babel/helper-plugin-utils": "^7.8.3", @@ -2029,11 +2120,11 @@ "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" }, "@babel/types": { - "version": "7.8.7", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.7.tgz", - "integrity": "sha512-k2TreEHxFA4CjGkL+GYjRyx35W0Mr7DP5+9q6WMkyKXB+904bYmG40syjMFV0oLlhhFCwWl0vA0DyzTDkwAiJw==", + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.0.tgz", + "integrity": "sha512-BS9JKfXkzzJl8RluW4JGknzpiUV7ZrvTayM6yfqLTVBEnFtyowVIOu6rqxRd5cVO6yGoWf4T8u8dgK9oB+GCng==", "requires": { - "esutils": "^2.0.2", + "@babel/helper-validator-identifier": "^7.9.0", "lodash": "^4.17.13", "to-fast-properties": "^2.0.0" } @@ -2233,6 +2324,18 @@ } } }, + "@babel/preset-modules": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.3.tgz", + "integrity": "sha512-Ra3JXOHBq2xd56xSF7lMKXdjBn3T772Y1Wet3yWnkDly9zHvJki029tAFzvAAK5cf4YV3yoxuP61crYRol6SVg==", + "requires": { + "@babel/helper-plugin-utils": "^7.0.0", + "@babel/plugin-proposal-unicode-property-regex": "^7.4.4", + "@babel/plugin-transform-dotall-regex": "^7.4.4", + "@babel/types": "^7.4.4", + "esutils": "^2.0.2" + } + }, "@babel/preset-react": { "version": "7.7.4", "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.7.4.tgz", @@ -2270,9 +2373,9 @@ } }, "@babel/runtime-corejs3": { - "version": "7.8.7", - "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.8.7.tgz", - "integrity": "sha512-sc7A+H4I8kTd7S61dgB9RomXu/C+F4IrRr4Ytze4dnfx7AXEpCrejSNpjx7vq6y/Bak9S6Kbk65a/WgMLtg43Q==", + "version": "7.9.2", + "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.9.2.tgz", + "integrity": "sha512-HHxmgxbIzOfFlZ+tdeRKtaxWOMUoCG5Mu3wKeUmOxjYrwb3AAHgnmtCUbPPK11/raIWLIBK250t8E2BPO0p7jA==", "requires": { "core-js-pure": "^3.0.0", "regenerator-runtime": "^0.13.4" @@ -2829,9 +2932,9 @@ } }, "react-error-overlay": { - "version": "6.0.6", - "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.6.tgz", - "integrity": "sha512-Yzpno3enVzSrSCnnljmr4b/2KUQSMZaPuqmS26t9k4nW7uwJk6STWmH9heNjPuvqUTO3jOSPkHoKgO4+Dw7uIw==" + "version": "6.0.7", + "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.7.tgz", + "integrity": "sha512-TAv1KJFh3RhqxNvhzxj6LeT5NWklP6rDr2a0jaTfsZ5wSZWHOGeqQyejUp3xxLfPt2UpyJEcVQB/zyPcmonNFA==" }, "strip-ansi": { "version": "5.2.0", @@ -3092,18 +3195,18 @@ "integrity": "sha512-ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw==" }, "@types/reach__router": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@types/reach__router/-/reach__router-1.3.0.tgz", - "integrity": "sha512-0aL79bFPJzJOJOOMZm2301ErQVaveBdpW88uuavXymUlcYIAOCmI1ujJ2XLH6Mzn76O94eQCHIl1FDzNNKJCYA==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/@types/reach__router/-/reach__router-1.3.1.tgz", + "integrity": "sha512-E51ntVeunnxofXmOoPFiOvElHWf+jBEs3B56gGx7XhPHOkJdjWxWDY4V1AsUiwhtOCXPM7atFy30wj7glyv2Fg==", "requires": { "@types/history": "*", "@types/react": "*" } }, "@types/react": { - "version": "16.9.23", - "resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.23.tgz", - "integrity": "sha512-SsGVT4E7L2wLN3tPYLiF20hmZTPGuzaayVunfgXzUn1x4uHVsKH6QDJQ/TdpHqwsTLd4CwrmQ2vOgxN7gE24gw==", + "version": "16.9.26", + "resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.26.tgz", + "integrity": "sha512-dGuSM+B0Pq1MKXYUMlUQWeS6Jj9IhSAUf9v8Ikaimj+YhkBcQrihWBkmyEhK/1fzkJTwZQkhZp5YhmWa2CH+Rw==", "requires": { "@types/prop-types": "*", "csstype": "^2.2.0" @@ -3118,9 +3221,9 @@ } }, "@types/rimraf": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@types/rimraf/-/rimraf-2.0.3.tgz", - "integrity": "sha512-dZfyfL/u9l/oi984hEXdmAjX3JHry7TLWw43u1HQ8HhPv6KtfxnrZ3T/bleJ0GEvnk9t5sM7eePkgMqz3yBcGg==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@types/rimraf/-/rimraf-2.0.4.tgz", + "integrity": "sha512-8gBudvllD2A/c0CcEX/BivIDorHFt5UI5m46TsNj8DjWCCTTZT74kEe4g+QsY7P/B9WdO98d82zZgXO/RQzu2Q==", "requires": { "@types/glob": "*", "@types/node": "*" @@ -3159,43 +3262,49 @@ "vfile-message": "*" } }, + "@types/yoga-layout": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/@types/yoga-layout/-/yoga-layout-1.9.1.tgz", + "integrity": "sha512-OpfgQXWLZn5Dl7mOd8dBNcV8NywXbYYoHjUpa64vJ/RQABaxMzJ5bVicKLGIvIiMnQPtPgKNgXb5jkv9fkOQtw==", + "optional": true + }, "@typescript-eslint/eslint-plugin": { - "version": "2.23.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.23.0.tgz", - "integrity": "sha512-8iA4FvRsz8qTjR0L/nK9RcRUN3QtIHQiOm69FzV7WS3SE+7P7DyGGwh3k4UNR2JBbk+Ej2Io+jLAaqKibNhmtw==", + "version": "2.25.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.25.0.tgz", + "integrity": "sha512-W2YyMtjmlrOjtXc+FtTelVs9OhuR6OlYc4XKIslJ8PUJOqgYYAPRJhAqkYRQo3G4sjvG8jSodsNycEn4W2gHUw==", "requires": { - "@typescript-eslint/experimental-utils": "2.23.0", - "eslint-utils": "^1.4.3", + "@typescript-eslint/experimental-utils": "2.25.0", "functional-red-black-tree": "^1.0.1", "regexpp": "^3.0.0", "tsutils": "^3.17.1" } }, "@typescript-eslint/experimental-utils": { - "version": "2.23.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.23.0.tgz", - "integrity": "sha512-OswxY59RcXH3NNPmq+4Kis2CYZPurRU6mG5xPcn24CjFyfdVli5mySwZz/g/xDbJXgDsYqNGq7enV0IziWGXVQ==", + "version": "2.25.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.25.0.tgz", + "integrity": "sha512-0IZ4ZR5QkFYbaJk+8eJ2kYeA+1tzOE1sBjbwwtSV85oNWYUBep+EyhlZ7DLUCyhMUGuJpcCCFL0fDtYAP1zMZw==", "requires": { "@types/json-schema": "^7.0.3", - "@typescript-eslint/typescript-estree": "2.23.0", - "eslint-scope": "^5.0.0" + "@typescript-eslint/typescript-estree": "2.25.0", + "eslint-scope": "^5.0.0", + "eslint-utils": "^2.0.0" } }, "@typescript-eslint/parser": { - "version": "2.23.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.23.0.tgz", - "integrity": "sha512-k61pn/Nepk43qa1oLMiyqApC6x5eP5ddPz6VUYXCAuXxbmRLqkPYzkFRKl42ltxzB2luvejlVncrEpflgQoSUg==", + "version": "2.25.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.25.0.tgz", + "integrity": "sha512-mccBLaBSpNVgp191CP5W+8U1crTyXsRziWliCqzj02kpxdjKMvFHGJbK33NroquH3zB/gZ8H511HEsJBa2fNEg==", "requires": { "@types/eslint-visitor-keys": "^1.0.0", - "@typescript-eslint/experimental-utils": "2.23.0", - "@typescript-eslint/typescript-estree": "2.23.0", + "@typescript-eslint/experimental-utils": "2.25.0", + "@typescript-eslint/typescript-estree": "2.25.0", "eslint-visitor-keys": "^1.1.0" } }, "@typescript-eslint/typescript-estree": { - "version": "2.23.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.23.0.tgz", - "integrity": "sha512-pmf7IlmvXdlEXvE/JWNNJpEvwBV59wtJqA8MLAxMKLXNKVRC3HZBXR/SlZLPWTCcwOSg9IM7GeRSV3SIerGVqw==", + "version": "2.25.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.25.0.tgz", + "integrity": "sha512-VUksmx5lDxSi6GfmwSK7SSoIKSw9anukWWNitQPqt58LuYrKalzsgeuignbqnB+rK/xxGlSsCy8lYnwFfB6YJg==", "requires": { "debug": "^4.1.1", "eslint-visitor-keys": "^1.1.0", @@ -3222,160 +3331,159 @@ } }, "@webassemblyjs/ast": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.8.5.tgz", - "integrity": "sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz", + "integrity": "sha512-C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA==", "requires": { - "@webassemblyjs/helper-module-context": "1.8.5", - "@webassemblyjs/helper-wasm-bytecode": "1.8.5", - "@webassemblyjs/wast-parser": "1.8.5" + "@webassemblyjs/helper-module-context": "1.9.0", + "@webassemblyjs/helper-wasm-bytecode": "1.9.0", + "@webassemblyjs/wast-parser": "1.9.0" } }, "@webassemblyjs/floating-point-hex-parser": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz", - "integrity": "sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ==" + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz", + "integrity": "sha512-TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA==" }, "@webassemblyjs/helper-api-error": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz", - "integrity": "sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA==" + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz", + "integrity": "sha512-NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw==" }, "@webassemblyjs/helper-buffer": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz", - "integrity": "sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q==" + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz", + "integrity": "sha512-qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA==" }, "@webassemblyjs/helper-code-frame": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz", - "integrity": "sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz", + "integrity": "sha512-ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA==", "requires": { - "@webassemblyjs/wast-printer": "1.8.5" + "@webassemblyjs/wast-printer": "1.9.0" } }, "@webassemblyjs/helper-fsm": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz", - "integrity": "sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow==" + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz", + "integrity": "sha512-OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw==" }, "@webassemblyjs/helper-module-context": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz", - "integrity": "sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz", + "integrity": "sha512-MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g==", "requires": { - "@webassemblyjs/ast": "1.8.5", - "mamacro": "^0.0.3" + "@webassemblyjs/ast": "1.9.0" } }, "@webassemblyjs/helper-wasm-bytecode": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz", - "integrity": "sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==" + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz", + "integrity": "sha512-R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw==" }, "@webassemblyjs/helper-wasm-section": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz", - "integrity": "sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz", + "integrity": "sha512-XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw==", "requires": { - "@webassemblyjs/ast": "1.8.5", - "@webassemblyjs/helper-buffer": "1.8.5", - "@webassemblyjs/helper-wasm-bytecode": "1.8.5", - "@webassemblyjs/wasm-gen": "1.8.5" + "@webassemblyjs/ast": "1.9.0", + "@webassemblyjs/helper-buffer": "1.9.0", + "@webassemblyjs/helper-wasm-bytecode": "1.9.0", + "@webassemblyjs/wasm-gen": "1.9.0" } }, "@webassemblyjs/ieee754": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz", - "integrity": "sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz", + "integrity": "sha512-dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg==", "requires": { "@xtuc/ieee754": "^1.2.0" } }, "@webassemblyjs/leb128": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.8.5.tgz", - "integrity": "sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.9.0.tgz", + "integrity": "sha512-ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw==", "requires": { "@xtuc/long": "4.2.2" } }, "@webassemblyjs/utf8": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.8.5.tgz", - "integrity": "sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw==" + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.9.0.tgz", + "integrity": "sha512-GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w==" }, "@webassemblyjs/wasm-edit": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz", - "integrity": "sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz", + "integrity": "sha512-FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw==", "requires": { - "@webassemblyjs/ast": "1.8.5", - "@webassemblyjs/helper-buffer": "1.8.5", - "@webassemblyjs/helper-wasm-bytecode": "1.8.5", - "@webassemblyjs/helper-wasm-section": "1.8.5", - "@webassemblyjs/wasm-gen": "1.8.5", - "@webassemblyjs/wasm-opt": "1.8.5", - "@webassemblyjs/wasm-parser": "1.8.5", - "@webassemblyjs/wast-printer": "1.8.5" + "@webassemblyjs/ast": "1.9.0", + "@webassemblyjs/helper-buffer": "1.9.0", + "@webassemblyjs/helper-wasm-bytecode": "1.9.0", + "@webassemblyjs/helper-wasm-section": "1.9.0", + "@webassemblyjs/wasm-gen": "1.9.0", + "@webassemblyjs/wasm-opt": "1.9.0", + "@webassemblyjs/wasm-parser": "1.9.0", + "@webassemblyjs/wast-printer": "1.9.0" } }, "@webassemblyjs/wasm-gen": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz", - "integrity": "sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz", + "integrity": "sha512-cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA==", "requires": { - "@webassemblyjs/ast": "1.8.5", - "@webassemblyjs/helper-wasm-bytecode": "1.8.5", - "@webassemblyjs/ieee754": "1.8.5", - "@webassemblyjs/leb128": "1.8.5", - "@webassemblyjs/utf8": "1.8.5" + "@webassemblyjs/ast": "1.9.0", + "@webassemblyjs/helper-wasm-bytecode": "1.9.0", + "@webassemblyjs/ieee754": "1.9.0", + "@webassemblyjs/leb128": "1.9.0", + "@webassemblyjs/utf8": "1.9.0" } }, "@webassemblyjs/wasm-opt": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz", - "integrity": "sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz", + "integrity": "sha512-Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A==", "requires": { - "@webassemblyjs/ast": "1.8.5", - "@webassemblyjs/helper-buffer": "1.8.5", - "@webassemblyjs/wasm-gen": "1.8.5", - "@webassemblyjs/wasm-parser": "1.8.5" + "@webassemblyjs/ast": "1.9.0", + "@webassemblyjs/helper-buffer": "1.9.0", + "@webassemblyjs/wasm-gen": "1.9.0", + "@webassemblyjs/wasm-parser": "1.9.0" } }, "@webassemblyjs/wasm-parser": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz", - "integrity": "sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz", + "integrity": "sha512-9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA==", "requires": { - "@webassemblyjs/ast": "1.8.5", - "@webassemblyjs/helper-api-error": "1.8.5", - "@webassemblyjs/helper-wasm-bytecode": "1.8.5", - "@webassemblyjs/ieee754": "1.8.5", - "@webassemblyjs/leb128": "1.8.5", - "@webassemblyjs/utf8": "1.8.5" + "@webassemblyjs/ast": "1.9.0", + "@webassemblyjs/helper-api-error": "1.9.0", + "@webassemblyjs/helper-wasm-bytecode": "1.9.0", + "@webassemblyjs/ieee754": "1.9.0", + "@webassemblyjs/leb128": "1.9.0", + "@webassemblyjs/utf8": "1.9.0" } }, "@webassemblyjs/wast-parser": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz", - "integrity": "sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg==", - "requires": { - "@webassemblyjs/ast": "1.8.5", - "@webassemblyjs/floating-point-hex-parser": "1.8.5", - "@webassemblyjs/helper-api-error": "1.8.5", - "@webassemblyjs/helper-code-frame": "1.8.5", - "@webassemblyjs/helper-fsm": "1.8.5", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz", + "integrity": "sha512-qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw==", + "requires": { + "@webassemblyjs/ast": "1.9.0", + "@webassemblyjs/floating-point-hex-parser": "1.9.0", + "@webassemblyjs/helper-api-error": "1.9.0", + "@webassemblyjs/helper-code-frame": "1.9.0", + "@webassemblyjs/helper-fsm": "1.9.0", "@xtuc/long": "4.2.2" } }, "@webassemblyjs/wast-printer": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz", - "integrity": "sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz", + "integrity": "sha512-2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA==", "requires": { - "@webassemblyjs/ast": "1.8.5", - "@webassemblyjs/wast-parser": "1.8.5", + "@webassemblyjs/ast": "1.9.0", + "@webassemblyjs/wast-parser": "1.9.0", "@xtuc/long": "4.2.2" } }, @@ -3634,9 +3742,9 @@ }, "dependencies": { "es-abstract": { - "version": "1.17.4", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz", - "integrity": "sha512-Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ==", + "version": "1.17.5", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz", + "integrity": "sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==", "requires": { "es-to-primitive": "^1.2.1", "function-bind": "^1.1.1", @@ -3732,9 +3840,9 @@ }, "dependencies": { "es-abstract": { - "version": "1.17.4", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz", - "integrity": "sha512-Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ==", + "version": "1.17.5", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz", + "integrity": "sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==", "requires": { "es-to-primitive": "^1.2.1", "function-bind": "^1.1.1", @@ -3896,17 +4004,48 @@ "optional": true }, "autoprefixer": { - "version": "9.7.4", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.7.4.tgz", - "integrity": "sha512-g0Ya30YrMBAEZk60lp+qfX5YQllG+S5W3GYCFvyHTvhOki0AEQJLPEcIuGRsqVwLi8FvXPVtwTGhfr38hVpm0g==", + "version": "9.7.5", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.7.5.tgz", + "integrity": "sha512-URo6Zvt7VYifomeAfJlMFnYDhow1rk2bufwkbamPEAtQFcL11moLk4PnR7n9vlu7M+BkXAZkHFA0mIcY7tjQFg==", "requires": { - "browserslist": "^4.8.3", - "caniuse-lite": "^1.0.30001020", + "browserslist": "^4.11.0", + "caniuse-lite": "^1.0.30001036", "chalk": "^2.4.2", "normalize-range": "^0.1.2", "num2fraction": "^1.2.2", - "postcss": "^7.0.26", - "postcss-value-parser": "^4.0.2" + "postcss": "^7.0.27", + "postcss-value-parser": "^4.0.3" + }, + "dependencies": { + "browserslist": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.11.0.tgz", + "integrity": "sha512-WqEC7Yr5wUH5sg6ruR++v2SGOQYpyUdYYd4tZoAq1F7y+QXoLoYGXVbxhtaIqWmAJjtNTRjVD3HuJc1OXTel2A==", + "requires": { + "caniuse-lite": "^1.0.30001035", + "electron-to-chromium": "^1.3.380", + "node-releases": "^1.1.52", + "pkg-up": "^3.1.0" + } + }, + "caniuse-lite": { + "version": "1.0.30001038", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001038.tgz", + "integrity": "sha512-zii9quPo96XfOiRD4TrfYGs+QsGZpb2cGiMAzPjtf/hpFgB6zCPZgJb7I1+EATeMw/o+lG8FyRAnI+CWStHcaQ==" + }, + "electron-to-chromium": { + "version": "1.3.389", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.389.tgz", + "integrity": "sha512-jccXIOH9PWpTiJCoMOsbDg23eg+P0cvcgjXo0spkbkB0AjCkfZLADp/apnuNEjCfXACS8PPWChTwiDOXjFZdzw==" + }, + "pkg-up": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz", + "integrity": "sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==", + "requires": { + "find-up": "^3.0.0" + } + } } }, "aws-sign2": { @@ -3990,14 +4129,55 @@ } }, "babel-loader": { - "version": "8.0.6", - "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.0.6.tgz", - "integrity": "sha512-4BmWKtBOBm13uoUwd08UwjZlaw3O9GWf456R9j+5YykFZ6LUIjIKLc0zEZf+hauxPOJs96C8k6FvYD09vWzhYw==", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.1.0.tgz", + "integrity": "sha512-7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw==", "requires": { - "find-cache-dir": "^2.0.0", - "loader-utils": "^1.0.2", - "mkdirp": "^0.5.1", - "pify": "^4.0.1" + "find-cache-dir": "^2.1.0", + "loader-utils": "^1.4.0", + "mkdirp": "^0.5.3", + "pify": "^4.0.1", + "schema-utils": "^2.6.5" + }, + "dependencies": { + "emojis-list": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", + "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==" + }, + "json5": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", + "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", + "requires": { + "minimist": "^1.2.0" + } + }, + "loader-utils": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz", + "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==", + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^1.0.1" + } + }, + "mkdirp": { + "version": "0.5.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.4.tgz", + "integrity": "sha512-iG9AK/dJLtJ0XNgTuDbSyNS3zECqDlAhnQW4CsNxBG3LQJBbHmRX1egw39DmtOdCAqY+dKXV+sgPgilNWUKMVw==", + "requires": { + "minimist": "^1.2.5" + }, + "dependencies": { + "minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" + } + } + } } }, "babel-plugin-add-module-exports": { @@ -4119,83 +4299,893 @@ "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz", "integrity": "sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==", "requires": { - "parent-module": "^1.0.0", - "resolve-from": "^4.0.0" + "parent-module": "^1.0.0", + "resolve-from": "^4.0.0" + } + }, + "resolve-from": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==" + } + } + }, + "babel-plugin-preval": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/babel-plugin-preval/-/babel-plugin-preval-3.0.1.tgz", + "integrity": "sha512-s8hmTlRSmzcL7cHSIi0s6WxmpOAxfIlWqSVQwBIt7V5bNBaac+8JMZ6kJXLOazMJ8gCIcb5AJgQUgPHvbSYUzw==", + "requires": { + "babel-plugin-macros": "^2.2.2", + "require-from-string": "^2.0.2" + } + }, + "babel-plugin-remove-graphql-queries": { + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/babel-plugin-remove-graphql-queries/-/babel-plugin-remove-graphql-queries-2.8.1.tgz", + "integrity": "sha512-c/JNri17WypqZNnMsX2PweMe8e5hsJcYNO/VnUBX9iUIvmKBjd143RaUQq0xYa6bpQF0kzpTFVR0sOp+cQlBOQ==" + }, + "babel-plugin-syntax-jsx": { + "version": "6.18.0", + "resolved": "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz", + "integrity": "sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY=" + }, + "babel-plugin-transform-react-remove-prop-types": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.24.tgz", + "integrity": "sha512-eqj0hVcJUR57/Ug2zE1Yswsw4LhuqqHhD+8v120T1cl3kjg76QwtyBrdIk4WVwK+lAhBJVYCd/v+4nc4y+8JsA==" + }, + "babel-preset-gatsby": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/babel-preset-gatsby/-/babel-preset-gatsby-0.3.1.tgz", + "integrity": "sha512-oT/GA1b3xi9xssdwWep874zxD8RZSBg2iL7QHy+emcgkJbYBQJC4NItw561tZGIQqVBJJx8sRaw3V94d1vupOQ==", + "requires": { + "@babel/plugin-proposal-class-properties": "^7.8.3", + "@babel/plugin-proposal-nullish-coalescing-operator": "^7.8.3", + "@babel/plugin-proposal-optional-chaining": "^7.8.3", + "@babel/plugin-syntax-dynamic-import": "^7.8.3", + "@babel/plugin-transform-runtime": "^7.8.3", + "@babel/plugin-transform-spread": "^7.8.3", + "@babel/preset-env": "^7.8.7", + "@babel/preset-react": "^7.8.3", + "@babel/runtime": "^7.8.7", + "babel-plugin-dynamic-import-node": "^2.3.0", + "babel-plugin-macros": "^2.8.0", + "babel-plugin-transform-react-remove-prop-types": "^0.4.24", + "gatsby-core-utils": "^1.1.1" + }, + "dependencies": { + "@babel/code-frame": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", + "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", + "requires": { + "@babel/highlight": "^7.8.3" + } + }, + "@babel/compat-data": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.9.0.tgz", + "integrity": "sha512-zeFQrr+284Ekvd9e7KAX954LkapWiOmQtsfHirhxqfdlX6MEC32iRE+pqUGlYIBchdevaCwvzxWGSy/YBNI85g==", + "requires": { + "browserslist": "^4.9.1", + "invariant": "^2.2.4", + "semver": "^5.5.0" + } + }, + "@babel/generator": { + "version": "7.9.4", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.4.tgz", + "integrity": "sha512-rjP8ahaDy/ouhrvCoU1E5mqaitWrxwuNGU+dy1EpaoK48jZay4MdkskKGIMHLZNewg8sAsqpGSREJwP0zH3YQA==", + "requires": { + "@babel/types": "^7.9.0", + "jsesc": "^2.5.1", + "lodash": "^4.17.13", + "source-map": "^0.5.0" + }, + "dependencies": { + "jsesc": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", + "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==" + } + } + }, + "@babel/helper-annotate-as-pure": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.8.3.tgz", + "integrity": "sha512-6o+mJrZBxOoEX77Ezv9zwW7WV8DdluouRKNY/IR5u/YTMuKHgugHOzYWlYvYLpLA9nPsQCAAASpCIbjI9Mv+Uw==", + "requires": { + "@babel/types": "^7.8.3" + } + }, + "@babel/helper-builder-binary-assignment-operator-visitor": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.8.3.tgz", + "integrity": "sha512-5eFOm2SyFPK4Rh3XMMRDjN7lBH0orh3ss0g3rTYZnBQ+r6YPj7lgDyCvPphynHvUrobJmeMignBr6Acw9mAPlw==", + "requires": { + "@babel/helper-explode-assignable-expression": "^7.8.3", + "@babel/types": "^7.8.3" + } + }, + "@babel/helper-builder-react-jsx": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.9.0.tgz", + "integrity": "sha512-weiIo4gaoGgnhff54GQ3P5wsUQmnSwpkvU0r6ZHq6TzoSzKy4JxHEgnxNytaKbov2a9z/CVNyzliuCOUPEX3Jw==", + "requires": { + "@babel/helper-annotate-as-pure": "^7.8.3", + "@babel/types": "^7.9.0" + } + }, + "@babel/helper-create-regexp-features-plugin": { + "version": "7.8.8", + "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.8.tgz", + "integrity": "sha512-LYVPdwkrQEiX9+1R29Ld/wTrmQu1SSKYnuOk3g0CkcZMA1p0gsNxJFj/3gBdaJ7Cg0Fnek5z0DsMULePP7Lrqg==", + "requires": { + "@babel/helper-annotate-as-pure": "^7.8.3", + "@babel/helper-regex": "^7.8.3", + "regexpu-core": "^4.7.0" + } + }, + "@babel/helper-define-map": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.8.3.tgz", + "integrity": "sha512-PoeBYtxoZGtct3md6xZOCWPcKuMuk3IHhgxsRRNtnNShebf4C8YonTSblsK4tvDbm+eJAw2HAPOfCr+Q/YRG/g==", + "requires": { + "@babel/helper-function-name": "^7.8.3", + "@babel/types": "^7.8.3", + "lodash": "^4.17.13" + } + }, + "@babel/helper-explode-assignable-expression": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.8.3.tgz", + "integrity": "sha512-N+8eW86/Kj147bO9G2uclsg5pwfs/fqqY5rwgIL7eTBklgXjcOJ3btzS5iM6AitJcftnY7pm2lGsrJVYLGjzIw==", + "requires": { + "@babel/traverse": "^7.8.3", + "@babel/types": "^7.8.3" + } + }, + "@babel/helper-hoist-variables": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.8.3.tgz", + "integrity": "sha512-ky1JLOjcDUtSc+xkt0xhYff7Z6ILTAHKmZLHPxAhOP0Nd77O+3nCsd6uSVYur6nJnCI029CrNbYlc0LoPfAPQg==", + "requires": { + "@babel/types": "^7.8.3" + } + }, + "@babel/helper-member-expression-to-functions": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.8.3.tgz", + "integrity": "sha512-fO4Egq88utkQFjbPrSHGmGLFqmrshs11d46WI+WZDESt7Wu7wN2G2Iu+NMMZJFDOVRHAMIkB5SNh30NtwCA7RA==", + "requires": { + "@babel/types": "^7.8.3" + } + }, + "@babel/helper-module-imports": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz", + "integrity": "sha512-R0Bx3jippsbAEtzkpZ/6FIiuzOURPcMjHp+Z6xPe6DtApDJx+w7UYyOLanZqO8+wKR9G10s/FmHXvxaMd9s6Kg==", + "requires": { + "@babel/types": "^7.8.3" + } + }, + "@babel/helper-module-transforms": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz", + "integrity": "sha512-0FvKyu0gpPfIQ8EkxlrAydOWROdHpBmiCiRwLkUiBGhCUPRRbVD2/tm3sFr/c/GWFrQ/ffutGUAnx7V0FzT2wA==", + "requires": { + "@babel/helper-module-imports": "^7.8.3", + "@babel/helper-replace-supers": "^7.8.6", + "@babel/helper-simple-access": "^7.8.3", + "@babel/helper-split-export-declaration": "^7.8.3", + "@babel/template": "^7.8.6", + "@babel/types": "^7.9.0", + "lodash": "^4.17.13" + }, + "dependencies": { + "@babel/template": { + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz", + "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==", + "requires": { + "@babel/code-frame": "^7.8.3", + "@babel/parser": "^7.8.6", + "@babel/types": "^7.8.6" + } + } + } + }, + "@babel/helper-optimise-call-expression": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.8.3.tgz", + "integrity": "sha512-Kag20n86cbO2AvHca6EJsvqAd82gc6VMGule4HwebwMlwkpXuVqrNRj6CkCV2sKxgi9MyAUnZVnZ6lJ1/vKhHQ==", + "requires": { + "@babel/types": "^7.8.3" + } + }, + "@babel/helper-plugin-utils": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", + "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" + }, + "@babel/helper-regex": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.8.3.tgz", + "integrity": "sha512-BWt0QtYv/cg/NecOAZMdcn/waj/5P26DR4mVLXfFtDokSR6fyuG0Pj+e2FqtSME+MqED1khnSMulkmGl8qWiUQ==", + "requires": { + "lodash": "^4.17.13" + } + }, + "@babel/helper-remap-async-to-generator": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.8.3.tgz", + "integrity": "sha512-kgwDmw4fCg7AVgS4DukQR/roGp+jP+XluJE5hsRZwxCYGg+Rv9wSGErDWhlI90FODdYfd4xG4AQRiMDjjN0GzA==", + "requires": { + "@babel/helper-annotate-as-pure": "^7.8.3", + "@babel/helper-wrap-function": "^7.8.3", + "@babel/template": "^7.8.3", + "@babel/traverse": "^7.8.3", + "@babel/types": "^7.8.3" + } + }, + "@babel/helper-replace-supers": { + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.8.6.tgz", + "integrity": "sha512-PeMArdA4Sv/Wf4zXwBKPqVj7n9UF/xg6slNRtZW84FM7JpE1CbG8B612FyM4cxrf4fMAMGO0kR7voy1ForHHFA==", + "requires": { + "@babel/helper-member-expression-to-functions": "^7.8.3", + "@babel/helper-optimise-call-expression": "^7.8.3", + "@babel/traverse": "^7.8.6", + "@babel/types": "^7.8.6" + }, + "dependencies": { + "@babel/traverse": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.0.tgz", + "integrity": "sha512-jAZQj0+kn4WTHO5dUZkZKhbFrqZE7K5LAQ5JysMnmvGij+wOdr+8lWqPeW0BcF4wFwrEXXtdGO7wcV6YPJcf3w==", + "requires": { + "@babel/code-frame": "^7.8.3", + "@babel/generator": "^7.9.0", + "@babel/helper-function-name": "^7.8.3", + "@babel/helper-split-export-declaration": "^7.8.3", + "@babel/parser": "^7.9.0", + "@babel/types": "^7.9.0", + "debug": "^4.1.0", + "globals": "^11.1.0", + "lodash": "^4.17.13" + } + } + } + }, + "@babel/helper-simple-access": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.8.3.tgz", + "integrity": "sha512-VNGUDjx5cCWg4vvCTR8qQ7YJYZ+HBjxOgXEl7ounz+4Sn7+LMD3CFrCTEU6/qXKbA2nKg21CwhhBzO0RpRbdCw==", + "requires": { + "@babel/template": "^7.8.3", + "@babel/types": "^7.8.3" + } + }, + "@babel/helper-wrap-function": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.8.3.tgz", + "integrity": "sha512-LACJrbUET9cQDzb6kG7EeD7+7doC3JNvUgTEQOx2qaO1fKlzE/Bf05qs9w1oXQMmXlPO65lC3Tq9S6gZpTErEQ==", + "requires": { + "@babel/helper-function-name": "^7.8.3", + "@babel/template": "^7.8.3", + "@babel/traverse": "^7.8.3", + "@babel/types": "^7.8.3" + } + }, + "@babel/highlight": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz", + "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==", + "requires": { + "@babel/helper-validator-identifier": "^7.9.0", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" + } + }, + "@babel/parser": { + "version": "7.9.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz", + "integrity": "sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==" + }, + "@babel/plugin-proposal-async-generator-functions": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.8.3.tgz", + "integrity": "sha512-NZ9zLv848JsV3hs8ryEh7Uaz/0KsmPLqv0+PdkDJL1cJy0K4kOCFa8zc1E3mp+RHPQcpdfb/6GovEsW4VDrOMw==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.3", + "@babel/helper-remap-async-to-generator": "^7.8.3", + "@babel/plugin-syntax-async-generators": "^7.8.0" + } + }, + "@babel/plugin-proposal-dynamic-import": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.8.3.tgz", + "integrity": "sha512-NyaBbyLFXFLT9FP+zk0kYlUlA8XtCUbehs67F0nnEg7KICgMc2mNkIeu9TYhKzyXMkrapZFwAhXLdnt4IYHy1w==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.3", + "@babel/plugin-syntax-dynamic-import": "^7.8.0" + } + }, + "@babel/plugin-proposal-json-strings": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.8.3.tgz", + "integrity": "sha512-KGhQNZ3TVCQG/MjRbAUwuH+14y9q0tpxs1nWWs3pbSleRdDro9SAMMDyye8HhY1gqZ7/NqIc8SKhya0wRDgP1Q==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.3", + "@babel/plugin-syntax-json-strings": "^7.8.0" + } + }, + "@babel/plugin-proposal-object-rest-spread": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.0.tgz", + "integrity": "sha512-UgqBv6bjq4fDb8uku9f+wcm1J7YxJ5nT7WO/jBr0cl0PLKb7t1O6RNR1kZbjgx2LQtsDI9hwoQVmn0yhXeQyow==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.3", + "@babel/plugin-syntax-object-rest-spread": "^7.8.0" + } + }, + "@babel/plugin-proposal-optional-catch-binding": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.8.3.tgz", + "integrity": "sha512-0gkX7J7E+AtAw9fcwlVQj8peP61qhdg/89D5swOkjYbkboA2CVckn3kiyum1DE0wskGb7KJJxBdyEBApDLLVdw==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.3", + "@babel/plugin-syntax-optional-catch-binding": "^7.8.0" + } + }, + "@babel/plugin-proposal-unicode-property-regex": { + "version": "7.8.8", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.8.tgz", + "integrity": "sha512-EVhjVsMpbhLw9ZfHWSx2iy13Q8Z/eg8e8ccVWt23sWQK5l1UdkoLJPN5w69UA4uITGBnEZD2JOe4QOHycYKv8A==", + "requires": { + "@babel/helper-create-regexp-features-plugin": "^7.8.8", + "@babel/helper-plugin-utils": "^7.8.3" + } + }, + "@babel/plugin-syntax-async-generators": { + "version": "7.8.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz", + "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + } + }, + "@babel/plugin-syntax-dynamic-import": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz", + "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + } + }, + "@babel/plugin-syntax-json-strings": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz", + "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + } + }, + "@babel/plugin-syntax-object-rest-spread": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz", + "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + } + }, + "@babel/plugin-syntax-optional-catch-binding": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz", + "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + } + }, + "@babel/plugin-syntax-top-level-await": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.8.3.tgz", + "integrity": "sha512-kwj1j9lL/6Wd0hROD3b/OZZ7MSrZLqqn9RAZ5+cYYsflQ9HZBIKCUkr3+uL1MEJ1NePiUbf98jjiMQSv0NMR9g==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.3" + } + }, + "@babel/plugin-transform-arrow-functions": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.8.3.tgz", + "integrity": "sha512-0MRF+KC8EqH4dbuITCWwPSzsyO3HIWWlm30v8BbbpOrS1B++isGxPnnuq/IZvOX5J2D/p7DQalQm+/2PnlKGxg==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.3" + } + }, + "@babel/plugin-transform-async-to-generator": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.8.3.tgz", + "integrity": "sha512-imt9tFLD9ogt56Dd5CI/6XgpukMwd/fLGSrix2httihVe7LOGVPhyhMh1BU5kDM7iHD08i8uUtmV2sWaBFlHVQ==", + "requires": { + "@babel/helper-module-imports": "^7.8.3", + "@babel/helper-plugin-utils": "^7.8.3", + "@babel/helper-remap-async-to-generator": "^7.8.3" + } + }, + "@babel/plugin-transform-block-scoped-functions": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.8.3.tgz", + "integrity": "sha512-vo4F2OewqjbB1+yaJ7k2EJFHlTP3jR634Z9Cj9itpqNjuLXvhlVxgnjsHsdRgASR8xYDrx6onw4vW5H6We0Jmg==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.3" + } + }, + "@babel/plugin-transform-block-scoping": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.8.3.tgz", + "integrity": "sha512-pGnYfm7RNRgYRi7bids5bHluENHqJhrV4bCZRwc5GamaWIIs07N4rZECcmJL6ZClwjDz1GbdMZFtPs27hTB06w==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.3", + "lodash": "^4.17.13" + } + }, + "@babel/plugin-transform-classes": { + "version": "7.9.2", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.9.2.tgz", + "integrity": "sha512-TC2p3bPzsfvSsqBZo0kJnuelnoK9O3welkUpqSqBQuBF6R5MN2rysopri8kNvtlGIb2jmUO7i15IooAZJjZuMQ==", + "requires": { + "@babel/helper-annotate-as-pure": "^7.8.3", + "@babel/helper-define-map": "^7.8.3", + "@babel/helper-function-name": "^7.8.3", + "@babel/helper-optimise-call-expression": "^7.8.3", + "@babel/helper-plugin-utils": "^7.8.3", + "@babel/helper-replace-supers": "^7.8.6", + "@babel/helper-split-export-declaration": "^7.8.3", + "globals": "^11.1.0" + } + }, + "@babel/plugin-transform-computed-properties": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.8.3.tgz", + "integrity": "sha512-O5hiIpSyOGdrQZRQ2ccwtTVkgUDBBiCuK//4RJ6UfePllUTCENOzKxfh6ulckXKc0DixTFLCfb2HVkNA7aDpzA==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.3" + } + }, + "@babel/plugin-transform-destructuring": { + "version": "7.8.8", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.8.8.tgz", + "integrity": "sha512-eRJu4Vs2rmttFCdhPUM3bV0Yo/xPSdPw6ML9KHs/bjB4bLA5HXlbvYXPOD5yASodGod+krjYx21xm1QmL8dCJQ==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.3" + } + }, + "@babel/plugin-transform-dotall-regex": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.8.3.tgz", + "integrity": "sha512-kLs1j9Nn4MQoBYdRXH6AeaXMbEJFaFu/v1nQkvib6QzTj8MZI5OQzqmD83/2jEM1z0DLilra5aWO5YpyC0ALIw==", + "requires": { + "@babel/helper-create-regexp-features-plugin": "^7.8.3", + "@babel/helper-plugin-utils": "^7.8.3" + } + }, + "@babel/plugin-transform-duplicate-keys": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.8.3.tgz", + "integrity": "sha512-s8dHiBUbcbSgipS4SMFuWGqCvyge5V2ZeAWzR6INTVC3Ltjig/Vw1G2Gztv0vU/hRG9X8IvKvYdoksnUfgXOEQ==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.3" + } + }, + "@babel/plugin-transform-exponentiation-operator": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.8.3.tgz", + "integrity": "sha512-zwIpuIymb3ACcInbksHaNcR12S++0MDLKkiqXHl3AzpgdKlFNhog+z/K0+TGW+b0w5pgTq4H6IwV/WhxbGYSjQ==", + "requires": { + "@babel/helper-builder-binary-assignment-operator-visitor": "^7.8.3", + "@babel/helper-plugin-utils": "^7.8.3" + } + }, + "@babel/plugin-transform-for-of": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.9.0.tgz", + "integrity": "sha512-lTAnWOpMwOXpyDx06N+ywmF3jNbafZEqZ96CGYabxHrxNX8l5ny7dt4bK/rGwAh9utyP2b2Hv7PlZh1AAS54FQ==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.3" + } + }, + "@babel/plugin-transform-function-name": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.8.3.tgz", + "integrity": "sha512-rO/OnDS78Eifbjn5Py9v8y0aR+aSYhDhqAwVfsTl0ERuMZyr05L1aFSCJnbv2mmsLkit/4ReeQ9N2BgLnOcPCQ==", + "requires": { + "@babel/helper-function-name": "^7.8.3", + "@babel/helper-plugin-utils": "^7.8.3" + } + }, + "@babel/plugin-transform-literals": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.8.3.tgz", + "integrity": "sha512-3Tqf8JJ/qB7TeldGl+TT55+uQei9JfYaregDcEAyBZ7akutriFrt6C/wLYIer6OYhleVQvH/ntEhjE/xMmy10A==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.3" + } + }, + "@babel/plugin-transform-member-expression-literals": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.8.3.tgz", + "integrity": "sha512-3Wk2EXhnw+rP+IDkK6BdtPKsUE5IeZ6QOGrPYvw52NwBStw9V1ZVzxgK6fSKSxqUvH9eQPR3tm3cOq79HlsKYA==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.3" + } + }, + "@babel/plugin-transform-modules-amd": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.9.0.tgz", + "integrity": "sha512-vZgDDF003B14O8zJy0XXLnPH4sg+9X5hFBBGN1V+B2rgrB+J2xIypSN6Rk9imB2hSTHQi5OHLrFWsZab1GMk+Q==", + "requires": { + "@babel/helper-module-transforms": "^7.9.0", + "@babel/helper-plugin-utils": "^7.8.3", + "babel-plugin-dynamic-import-node": "^2.3.0" + } + }, + "@babel/plugin-transform-modules-commonjs": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.0.tgz", + "integrity": "sha512-qzlCrLnKqio4SlgJ6FMMLBe4bySNis8DFn1VkGmOcxG9gqEyPIOzeQrA//u0HAKrWpJlpZbZMPB1n/OPa4+n8g==", + "requires": { + "@babel/helper-module-transforms": "^7.9.0", + "@babel/helper-plugin-utils": "^7.8.3", + "@babel/helper-simple-access": "^7.8.3", + "babel-plugin-dynamic-import-node": "^2.3.0" + } + }, + "@babel/plugin-transform-modules-systemjs": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.9.0.tgz", + "integrity": "sha512-FsiAv/nao/ud2ZWy4wFacoLOm5uxl0ExSQ7ErvP7jpoihLR6Cq90ilOFyX9UXct3rbtKsAiZ9kFt5XGfPe/5SQ==", + "requires": { + "@babel/helper-hoist-variables": "^7.8.3", + "@babel/helper-module-transforms": "^7.9.0", + "@babel/helper-plugin-utils": "^7.8.3", + "babel-plugin-dynamic-import-node": "^2.3.0" + } + }, + "@babel/plugin-transform-modules-umd": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.9.0.tgz", + "integrity": "sha512-uTWkXkIVtg/JGRSIABdBoMsoIeoHQHPTL0Y2E7xf5Oj7sLqwVsNXOkNk0VJc7vF0IMBsPeikHxFjGe+qmwPtTQ==", + "requires": { + "@babel/helper-module-transforms": "^7.9.0", + "@babel/helper-plugin-utils": "^7.8.3" + } + }, + "@babel/plugin-transform-named-capturing-groups-regex": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.8.3.tgz", + "integrity": "sha512-f+tF/8UVPU86TrCb06JoPWIdDpTNSGGcAtaD9mLP0aYGA0OS0j7j7DHJR0GTFrUZPUU6loZhbsVZgTh0N+Qdnw==", + "requires": { + "@babel/helper-create-regexp-features-plugin": "^7.8.3" + } + }, + "@babel/plugin-transform-new-target": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.8.3.tgz", + "integrity": "sha512-QuSGysibQpyxexRyui2vca+Cmbljo8bcRckgzYV4kRIsHpVeyeC3JDO63pY+xFZ6bWOBn7pfKZTqV4o/ix9sFw==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.3" + } + }, + "@babel/plugin-transform-object-super": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.8.3.tgz", + "integrity": "sha512-57FXk+gItG/GejofIyLIgBKTas4+pEU47IXKDBWFTxdPd7F80H8zybyAY7UoblVfBhBGs2EKM+bJUu2+iUYPDQ==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.3", + "@babel/helper-replace-supers": "^7.8.3" + } + }, + "@babel/plugin-transform-parameters": { + "version": "7.9.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.9.3.tgz", + "integrity": "sha512-fzrQFQhp7mIhOzmOtPiKffvCYQSK10NR8t6BBz2yPbeUHb9OLW8RZGtgDRBn8z2hGcwvKDL3vC7ojPTLNxmqEg==", + "requires": { + "@babel/helper-get-function-arity": "^7.8.3", + "@babel/helper-plugin-utils": "^7.8.3" + } + }, + "@babel/plugin-transform-property-literals": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.8.3.tgz", + "integrity": "sha512-uGiiXAZMqEoQhRWMK17VospMZh5sXWg+dlh2soffpkAl96KAm+WZuJfa6lcELotSRmooLqg0MWdH6UUq85nmmg==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.3" + } + }, + "@babel/plugin-transform-react-display-name": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.8.3.tgz", + "integrity": "sha512-3Jy/PCw8Fe6uBKtEgz3M82ljt+lTg+xJaM4og+eyu83qLT87ZUSckn0wy7r31jflURWLO83TW6Ylf7lyXj3m5A==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.3" + } + }, + "@babel/plugin-transform-react-jsx": { + "version": "7.9.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.9.4.tgz", + "integrity": "sha512-Mjqf3pZBNLt854CK0C/kRuXAnE6H/bo7xYojP+WGtX8glDGSibcwnsWwhwoSuRg0+EBnxPC1ouVnuetUIlPSAw==", + "requires": { + "@babel/helper-builder-react-jsx": "^7.9.0", + "@babel/helper-builder-react-jsx-experimental": "^7.9.0", + "@babel/helper-plugin-utils": "^7.8.3", + "@babel/plugin-syntax-jsx": "^7.8.3" + } + }, + "@babel/plugin-transform-react-jsx-self": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.9.0.tgz", + "integrity": "sha512-K2ObbWPKT7KUTAoyjCsFilOkEgMvFG+y0FqOl6Lezd0/13kMkkjHskVsZvblRPj1PHA44PrToaZANrryppzTvQ==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.3", + "@babel/plugin-syntax-jsx": "^7.8.3" + } + }, + "@babel/plugin-transform-react-jsx-source": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.9.0.tgz", + "integrity": "sha512-K6m3LlSnTSfRkM6FcRk8saNEeaeyG5k7AVkBU2bZK3+1zdkSED3qNdsWrUgQBeTVD2Tp3VMmerxVO2yM5iITmw==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.3", + "@babel/plugin-syntax-jsx": "^7.8.3" + } + }, + "@babel/plugin-transform-regenerator": { + "version": "7.8.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.7.tgz", + "integrity": "sha512-TIg+gAl4Z0a3WmD3mbYSk+J9ZUH6n/Yc57rtKRnlA/7rcCvpekHXe0CMZHP1gYp7/KLe9GHTuIba0vXmls6drA==", + "requires": { + "regenerator-transform": "^0.14.2" + } + }, + "@babel/plugin-transform-reserved-words": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.8.3.tgz", + "integrity": "sha512-mwMxcycN3omKFDjDQUl+8zyMsBfjRFr0Zn/64I41pmjv4NJuqcYlEtezwYtw9TFd9WR1vN5kiM+O0gMZzO6L0A==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.3" + } + }, + "@babel/plugin-transform-shorthand-properties": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.8.3.tgz", + "integrity": "sha512-I9DI6Odg0JJwxCHzbzW08ggMdCezoWcuQRz3ptdudgwaHxTjxw5HgdFJmZIkIMlRymL6YiZcped4TTCB0JcC8w==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.3" + } + }, + "@babel/plugin-transform-spread": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.8.3.tgz", + "integrity": "sha512-CkuTU9mbmAoFOI1tklFWYYbzX5qCIZVXPVy0jpXgGwkplCndQAa58s2jr66fTeQnA64bDox0HL4U56CFYoyC7g==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.3" + } + }, + "@babel/plugin-transform-sticky-regex": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.8.3.tgz", + "integrity": "sha512-9Spq0vGCD5Bb4Z/ZXXSK5wbbLFMG085qd2vhL1JYu1WcQ5bXqZBAYRzU1d+p79GcHs2szYv5pVQCX13QgldaWw==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.3", + "@babel/helper-regex": "^7.8.3" + } + }, + "@babel/plugin-transform-template-literals": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.8.3.tgz", + "integrity": "sha512-820QBtykIQOLFT8NZOcTRJ1UNuztIELe4p9DCgvj4NK+PwluSJ49we7s9FB1HIGNIYT7wFUJ0ar2QpCDj0escQ==", + "requires": { + "@babel/helper-annotate-as-pure": "^7.8.3", + "@babel/helper-plugin-utils": "^7.8.3" + } + }, + "@babel/plugin-transform-typeof-symbol": { + "version": "7.8.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.8.4.tgz", + "integrity": "sha512-2QKyfjGdvuNfHsb7qnBBlKclbD4CfshH2KvDabiijLMGXPHJXGxtDzwIF7bQP+T0ysw8fYTtxPafgfs/c1Lrqg==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.3" + } + }, + "@babel/plugin-transform-unicode-regex": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.8.3.tgz", + "integrity": "sha512-+ufgJjYdmWfSQ+6NS9VGUR2ns8cjJjYbrbi11mZBTaWm+Fui/ncTLFF28Ei1okavY+xkojGr1eJxNsWYeA5aZw==", + "requires": { + "@babel/helper-create-regexp-features-plugin": "^7.8.3", + "@babel/helper-plugin-utils": "^7.8.3" + } + }, + "@babel/preset-env": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.9.0.tgz", + "integrity": "sha512-712DeRXT6dyKAM/FMbQTV/FvRCms2hPCx+3weRjZ8iQVQWZejWWk1wwG6ViWMyqb/ouBbGOl5b6aCk0+j1NmsQ==", + "requires": { + "@babel/compat-data": "^7.9.0", + "@babel/helper-compilation-targets": "^7.8.7", + "@babel/helper-module-imports": "^7.8.3", + "@babel/helper-plugin-utils": "^7.8.3", + "@babel/plugin-proposal-async-generator-functions": "^7.8.3", + "@babel/plugin-proposal-dynamic-import": "^7.8.3", + "@babel/plugin-proposal-json-strings": "^7.8.3", + "@babel/plugin-proposal-nullish-coalescing-operator": "^7.8.3", + "@babel/plugin-proposal-numeric-separator": "^7.8.3", + "@babel/plugin-proposal-object-rest-spread": "^7.9.0", + "@babel/plugin-proposal-optional-catch-binding": "^7.8.3", + "@babel/plugin-proposal-optional-chaining": "^7.9.0", + "@babel/plugin-proposal-unicode-property-regex": "^7.8.3", + "@babel/plugin-syntax-async-generators": "^7.8.0", + "@babel/plugin-syntax-dynamic-import": "^7.8.0", + "@babel/plugin-syntax-json-strings": "^7.8.0", + "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0", + "@babel/plugin-syntax-numeric-separator": "^7.8.0", + "@babel/plugin-syntax-object-rest-spread": "^7.8.0", + "@babel/plugin-syntax-optional-catch-binding": "^7.8.0", + "@babel/plugin-syntax-optional-chaining": "^7.8.0", + "@babel/plugin-syntax-top-level-await": "^7.8.3", + "@babel/plugin-transform-arrow-functions": "^7.8.3", + "@babel/plugin-transform-async-to-generator": "^7.8.3", + "@babel/plugin-transform-block-scoped-functions": "^7.8.3", + "@babel/plugin-transform-block-scoping": "^7.8.3", + "@babel/plugin-transform-classes": "^7.9.0", + "@babel/plugin-transform-computed-properties": "^7.8.3", + "@babel/plugin-transform-destructuring": "^7.8.3", + "@babel/plugin-transform-dotall-regex": "^7.8.3", + "@babel/plugin-transform-duplicate-keys": "^7.8.3", + "@babel/plugin-transform-exponentiation-operator": "^7.8.3", + "@babel/plugin-transform-for-of": "^7.9.0", + "@babel/plugin-transform-function-name": "^7.8.3", + "@babel/plugin-transform-literals": "^7.8.3", + "@babel/plugin-transform-member-expression-literals": "^7.8.3", + "@babel/plugin-transform-modules-amd": "^7.9.0", + "@babel/plugin-transform-modules-commonjs": "^7.9.0", + "@babel/plugin-transform-modules-systemjs": "^7.9.0", + "@babel/plugin-transform-modules-umd": "^7.9.0", + "@babel/plugin-transform-named-capturing-groups-regex": "^7.8.3", + "@babel/plugin-transform-new-target": "^7.8.3", + "@babel/plugin-transform-object-super": "^7.8.3", + "@babel/plugin-transform-parameters": "^7.8.7", + "@babel/plugin-transform-property-literals": "^7.8.3", + "@babel/plugin-transform-regenerator": "^7.8.7", + "@babel/plugin-transform-reserved-words": "^7.8.3", + "@babel/plugin-transform-shorthand-properties": "^7.8.3", + "@babel/plugin-transform-spread": "^7.8.3", + "@babel/plugin-transform-sticky-regex": "^7.8.3", + "@babel/plugin-transform-template-literals": "^7.8.3", + "@babel/plugin-transform-typeof-symbol": "^7.8.4", + "@babel/plugin-transform-unicode-regex": "^7.8.3", + "@babel/preset-modules": "^0.1.3", + "@babel/types": "^7.9.0", + "browserslist": "^4.9.1", + "core-js-compat": "^3.6.2", + "invariant": "^2.2.2", + "levenary": "^1.1.1", + "semver": "^5.5.0" + }, + "dependencies": { + "@babel/plugin-proposal-optional-chaining": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.9.0.tgz", + "integrity": "sha512-NDn5tu3tcv4W30jNhmc2hyD5c56G6cXx4TesJubhxrJeCvuuMpttxr0OnNCqbZGhFjLrg+NIhxxC+BK5F6yS3w==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.3", + "@babel/plugin-syntax-optional-chaining": "^7.8.0" + } + } + } + }, + "@babel/preset-react": { + "version": "7.9.4", + "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.9.4.tgz", + "integrity": "sha512-AxylVB3FXeOTQXNXyiuAQJSvss62FEotbX2Pzx3K/7c+MKJMdSg6Ose6QYllkdCFA8EInCJVw7M/o5QbLuA4ZQ==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.3", + "@babel/plugin-transform-react-display-name": "^7.8.3", + "@babel/plugin-transform-react-jsx": "^7.9.4", + "@babel/plugin-transform-react-jsx-development": "^7.9.0", + "@babel/plugin-transform-react-jsx-self": "^7.9.0", + "@babel/plugin-transform-react-jsx-source": "^7.9.0" } }, - "resolve-from": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==" - } - } - }, - "babel-plugin-preval": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/babel-plugin-preval/-/babel-plugin-preval-3.0.1.tgz", - "integrity": "sha512-s8hmTlRSmzcL7cHSIi0s6WxmpOAxfIlWqSVQwBIt7V5bNBaac+8JMZ6kJXLOazMJ8gCIcb5AJgQUgPHvbSYUzw==", - "requires": { - "babel-plugin-macros": "^2.2.2", - "require-from-string": "^2.0.2" - } - }, - "babel-plugin-remove-graphql-queries": { - "version": "2.7.25", - "resolved": "https://registry.npmjs.org/babel-plugin-remove-graphql-queries/-/babel-plugin-remove-graphql-queries-2.7.25.tgz", - "integrity": "sha512-kQZnj1SszxhlOvaNIGA7sw0bcdHyWpLDBy+1MBNYblGes7eUjfUeshzRd5ffJ9WMaKgXz4tyKDzAygjnpPaPZg==" - }, - "babel-plugin-syntax-jsx": { - "version": "6.18.0", - "resolved": "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz", - "integrity": "sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY=" - }, - "babel-plugin-transform-react-remove-prop-types": { - "version": "0.4.24", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.24.tgz", - "integrity": "sha512-eqj0hVcJUR57/Ug2zE1Yswsw4LhuqqHhD+8v120T1cl3kjg76QwtyBrdIk4WVwK+lAhBJVYCd/v+4nc4y+8JsA==" - }, - "babel-preset-gatsby": { - "version": "0.2.35", - "resolved": "https://registry.npmjs.org/babel-preset-gatsby/-/babel-preset-gatsby-0.2.35.tgz", - "integrity": "sha512-zylN9yeFB2WJJUt4mndkbHu1yhZVNKIgc0lUEgO1BZYeH2Rhj0zBMmP7zzR1dpxvryI96+etn2raIvnW+TTXeA==", - "requires": { - "@babel/plugin-proposal-class-properties": "^7.7.4", - "@babel/plugin-proposal-nullish-coalescing-operator": "^7.7.4", - "@babel/plugin-proposal-optional-chaining": "^7.7.5", - "@babel/plugin-syntax-dynamic-import": "^7.7.4", - "@babel/plugin-transform-runtime": "^7.7.6", - "@babel/plugin-transform-spread": "^7.7.4", - "@babel/preset-env": "^7.7.6", - "@babel/preset-react": "^7.7.4", - "@babel/runtime": "^7.7.6", - "babel-plugin-dynamic-import-node": "^2.3.0", - "babel-plugin-macros": "^2.8.0", - "babel-plugin-transform-react-remove-prop-types": "^0.4.24", - "gatsby-core-utils": "^1.0.33" - }, - "dependencies": { "@babel/runtime": { - "version": "7.8.7", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.7.tgz", - "integrity": "sha512-+AATMUFppJDw6aiR5NVPHqIQBlV/Pj8wY/EZH+lmvRdUo9xBaz/rF3alAwFJQavvKfeOlPE7oaaDHVbcySbCsg==", + "version": "7.9.2", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz", + "integrity": "sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==", "requires": { "regenerator-runtime": "^0.13.4" } }, + "@babel/types": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.0.tgz", + "integrity": "sha512-BS9JKfXkzzJl8RluW4JGknzpiUV7ZrvTayM6yfqLTVBEnFtyowVIOu6rqxRd5cVO6yGoWf4T8u8dgK9oB+GCng==", + "requires": { + "@babel/helper-validator-identifier": "^7.9.0", + "lodash": "^4.17.13", + "to-fast-properties": "^2.0.0" + } + }, + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "requires": { + "ms": "^2.1.1" + } + }, "gatsby-core-utils": { - "version": "1.0.33", - "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.0.33.tgz", - "integrity": "sha512-eQkOQumfbMLdbKJN0E1dlnBjAKWAzexxuNdpL88yCIaqHGOMogGTmAmhG1Hs0sz9bMrNPxuIgEyDNQe3IDfJXw==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.1.1.tgz", + "integrity": "sha512-EboPcBx37YQVUKN9JH753S54nDxjRmOefbR0i08KTmaVgQ1lZnDXJr8JfrImmMqupZlOkPQX1mWlXfp+r1jGhA==", "requires": { "ci-info": "2.0.0", - "configstore": "^5.0.0", + "configstore": "^5.0.1", "node-object-hash": "^2.0.0" } }, + "jsesc": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", + "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=" + }, + "regenerate-unicode-properties": { + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz", + "integrity": "sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==", + "requires": { + "regenerate": "^1.4.0" + } + }, "regenerator-runtime": { "version": "0.13.5", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==" + }, + "regenerator-transform": { + "version": "0.14.4", + "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.4.tgz", + "integrity": "sha512-EaJaKPBI9GvKpvUz2mz4fhx7WPgvwRLY9v3hlNHWmAuJHI13T4nwKnNvm5RWJzEdnI5g5UwtOww+S8IdoUC2bw==", + "requires": { + "@babel/runtime": "^7.8.4", + "private": "^0.1.8" + } + }, + "regexpu-core": { + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.0.tgz", + "integrity": "sha512-TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ==", + "requires": { + "regenerate": "^1.4.0", + "regenerate-unicode-properties": "^8.2.0", + "regjsgen": "^0.5.1", + "regjsparser": "^0.6.4", + "unicode-match-property-ecmascript": "^1.0.4", + "unicode-match-property-value-ecmascript": "^1.2.0" + } + }, + "regjsparser": { + "version": "0.6.4", + "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.4.tgz", + "integrity": "sha512-64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==", + "requires": { + "jsesc": "~0.5.0" + } + }, + "unicode-match-property-value-ecmascript": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz", + "integrity": "sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==" } } }, @@ -4763,9 +5753,9 @@ "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=" }, "cacache": { - "version": "12.0.3", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.3.tgz", - "integrity": "sha512-kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw==", + "version": "12.0.4", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz", + "integrity": "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==", "requires": { "bluebird": "^3.5.5", "chownr": "^1.1.1", @@ -5062,18 +6052,18 @@ } }, "chokidar": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.3.0.tgz", - "integrity": "sha512-dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.3.1.tgz", + "integrity": "sha512-4QYCEWOcK3OJrxwvyyAOxFuhpvOVCYkr33LPfFNBjAD/w3sEzWsp2BUOkI4l9bHvWioAd0rc6NlHUOEaWkTeqg==", "requires": { "anymatch": "~3.1.1", "braces": "~3.0.2", - "fsevents": "~2.1.1", + "fsevents": "~2.1.2", "glob-parent": "~5.1.0", "is-binary-path": "~2.1.0", "is-glob": "~4.0.1", "normalize-path": "~3.0.0", - "readdirp": "~3.2.0" + "readdirp": "~3.3.0" }, "dependencies": { "anymatch": { @@ -5113,9 +6103,9 @@ "optional": true }, "glob-parent": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz", - "integrity": "sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz", + "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==", "requires": { "is-glob": "^4.0.1" } @@ -5139,11 +6129,11 @@ "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==" }, "readdirp": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.2.0.tgz", - "integrity": "sha512-crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.3.0.tgz", + "integrity": "sha512-zz0pAkSPOXXm1viEwygWIPSPkcBYjW1xU5j/JBh5t9bGCJwa6f9+BJa6VaB2g+b55yVrmXzqkyLf4xaWYM0IkQ==", "requires": { - "picomatch": "^2.0.4" + "picomatch": "^2.0.7" } }, "to-regex-range": { @@ -5367,9 +6357,9 @@ } }, "clipboardy": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/clipboardy/-/clipboardy-2.2.0.tgz", - "integrity": "sha512-9ry9nC3VFULNmoEIqvuRwCIQ9M7wjnm4O+yvk7xkmhR+7FAUWaeX751oeYJbORg0h0zmqW1EVDoZK8f7yapwbg==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/clipboardy/-/clipboardy-2.3.0.tgz", + "integrity": "sha512-mKhiIL2DrQIsuXMgBgnfEHOZOryC7kY7YO//TN6c63wlEm3NG5tz+YgY5rVi29KCmq/QQjKYvM7a19+MDOTHOQ==", "requires": { "arch": "^2.1.1", "execa": "^1.0.0", @@ -6513,9 +7503,9 @@ "integrity": "sha512-68s5jYdlvasItOJnCuI2Q9s4q98g0pCyL3HrcKJu8KNugUl8ahgmZYg38ysLTgQjjXX3H8CJLkAvWrclWfcalw==" }, "date-fns": { - "version": "2.11.0", - "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.11.0.tgz", - "integrity": "sha512-8P1cDi8ebZyDxUyUprBXwidoEtiQAawYPGvpfb+Dg0G6JrQ+VozwOmm91xYC0vAv1+0VmLehEPb+isg4BGUFfA==" + "version": "2.11.1", + "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.11.1.tgz", + "integrity": "sha512-3RdUoinZ43URd2MJcquzBbDQo+J87cSzB8NkXdZiN5ia1UNyep0oCyitfiL88+R7clGTeq/RniXAc16gWyAu1w==" }, "debug": { "version": "3.2.6", @@ -6725,9 +7715,9 @@ } }, "glob-parent": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz", - "integrity": "sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz", + "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==", "requires": { "is-glob": "^4.0.1" } @@ -6767,9 +7757,9 @@ } }, "picomatch": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.1.tgz", - "integrity": "sha512-ISBaA8xQNmwELC7eOjqFKMESB2VIqt4PPDD0nsS95b/9dZXvVKOlz9keMSnoGGKcOHXfTvDD6WMaRoSc9UuhRA==" + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz", + "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==" }, "slash": { "version": "3.0.0", @@ -7388,9 +8378,9 @@ "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==" }, "es6-promisify": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-6.0.2.tgz", - "integrity": "sha512-eO6vFm0JvqGzjWIQA6QVKjxpmELfhWbDUWHm1rPfIbn55mhKPiAa5xpLmQWJrNa629ZIeQ8ZvMAi13kvrjK6Mg==" + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-6.1.0.tgz", + "integrity": "sha512-jCsk2fpfEFusVv1MDkF4Uf0hAzIKNDMgR6LyOIw6a3jwkN1sCgWzuwgnsHY9YSQ8n8P31HoncvE0LC44cpWTrw==" }, "escape-html": { "version": "1.0.3", @@ -7514,6 +8504,14 @@ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" }, + "eslint-utils": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz", + "integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==", + "requires": { + "eslint-visitor-keys": "^1.1.0" + } + }, "figures": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz", @@ -7523,9 +8521,9 @@ } }, "glob-parent": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz", - "integrity": "sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz", + "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==", "requires": { "is-glob": "^4.0.1" } @@ -7694,9 +8692,9 @@ } }, "eslint-config-react-app": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/eslint-config-react-app/-/eslint-config-react-app-5.2.0.tgz", - "integrity": "sha512-WrHjoGpKr1kLLiWDD81tme9jMM0hk5cMxasLSdyno6DdPt+IfLOrDJBVo6jN7tn4y1nzhs43TmUaZWO6Sf0blw==", + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/eslint-config-react-app/-/eslint-config-react-app-5.2.1.tgz", + "integrity": "sha512-pGIZ8t0mFLcV+6ZirRgYK6RVqUIKRIi9MmgzUEmrIknsn3AdO0I32asO86dJgloHq+9ZPl8UIg8mYrvgP5u2wQ==", "requires": { "confusing-browser-globals": "^1.0.9" } @@ -7929,9 +8927,9 @@ } }, "es-abstract": { - "version": "1.17.4", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz", - "integrity": "sha512-Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ==", + "version": "1.17.5", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz", + "integrity": "sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==", "requires": { "es-to-primitive": "^1.2.1", "function-bind": "^1.1.1", @@ -8023,9 +9021,9 @@ } }, "eslint-utils": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz", - "integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.0.0.tgz", + "integrity": "sha512-0HCPuJv+7Wv1bACm8y5/ECVfYdfsAm9xmVb7saeFlxjPYALefjhbYoCkBjPdPzGH8wWyTpAez82Fh3VKYEZ8OA==", "requires": { "eslint-visitor-keys": "^1.1.0" } @@ -8043,13 +9041,6 @@ "acorn": "^7.1.1", "acorn-jsx": "^5.2.0", "eslint-visitor-keys": "^1.1.0" - }, - "dependencies": { - "acorn": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.1.tgz", - "integrity": "sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==" - } } }, "esprima": { @@ -8058,11 +9049,18 @@ "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==" }, "esquery": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.1.0.tgz", - "integrity": "sha512-MxYW9xKmROWF672KqjO75sszsA8Mxhw06YFeS5VHlB98KDHbOSurm3ArsjO60Eaf3QmGMCP1yn+0JQkNLo/97Q==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.2.0.tgz", + "integrity": "sha512-weltsSqdeWIX9G2qQZz7KlTRJdkkOCTPgLYJUz1Hacf48R4YOwGPHO3+ORfWedqJKbq5WQmsgK90n+pFLIKt/Q==", "requires": { - "estraverse": "^4.0.0" + "estraverse": "^5.0.0" + }, + "dependencies": { + "estraverse": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.0.0.tgz", + "integrity": "sha512-j3acdrMzqrxmJTNj5dbr1YbjacrYgAxVMeF0gK16E3j494mOe7xygM/ZLIguEQ0ETwAg2hlJCtHRGav+y0Ny5A==" + } } }, "esrecurse": { @@ -8581,9 +9579,9 @@ } }, "figgy-pudding": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz", - "integrity": "sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==" + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.2.tgz", + "integrity": "sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==" }, "figures": { "version": "2.0.0", @@ -8608,6 +9606,17 @@ "requires": { "loader-utils": "^1.0.2", "schema-utils": "^0.4.5" + }, + "dependencies": { + "schema-utils": { + "version": "0.4.7", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.7.tgz", + "integrity": "sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==", + "requires": { + "ajv": "^6.1.0", + "ajv-keywords": "^3.1.0" + } + } } }, "file-type": { @@ -8904,9 +9913,9 @@ "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, "fsevents": { - "version": "1.2.11", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.11.tgz", - "integrity": "sha512-+ux3lx6peh0BpvY0JebGyZoiR4D+oYzdPZMKJwkZ+sFkNJzpL7tXc/wehS49gUAxg3tmMHPHZkA8JU2rhhgDHw==", + "version": "1.2.12", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.12.tgz", + "integrity": "sha512-Ggd/Ktt7E7I8pxZRbGIs7vwqAPscSESMrCSkx2FtWeqmheJgCo2R74fTsZFCifr0VTPwqRpPv17+6b8Zp7th0Q==", "optional": true, "requires": { "bindings": "^1.5.0", @@ -8953,7 +9962,7 @@ } }, "chownr": { - "version": "1.1.3", + "version": "1.1.4", "bundled": true, "optional": true }, @@ -9103,7 +10112,7 @@ } }, "minimist": { - "version": "0.0.8", + "version": "1.2.5", "bundled": true, "optional": true }, @@ -9125,11 +10134,11 @@ } }, "mkdirp": { - "version": "0.5.1", + "version": "0.5.3", "bundled": true, "optional": true, "requires": { - "minimist": "0.0.8" + "minimist": "^1.2.5" } }, "ms": { @@ -9138,7 +10147,7 @@ "optional": true }, "needle": { - "version": "2.4.0", + "version": "2.3.3", "bundled": true, "optional": true, "requires": { @@ -9165,7 +10174,7 @@ } }, "nopt": { - "version": "4.0.1", + "version": "4.0.3", "bundled": true, "optional": true, "requires": { @@ -9187,12 +10196,13 @@ "optional": true }, "npm-packlist": { - "version": "1.4.7", + "version": "1.4.8", "bundled": true, "optional": true, "requires": { "ignore-walk": "^3.0.1", - "npm-bundled": "^1.0.1" + "npm-bundled": "^1.0.1", + "npm-normalize-package-bin": "^1.0.1" } }, "npmlog": { @@ -9262,17 +10272,10 @@ "ini": "~1.3.0", "minimist": "^1.2.0", "strip-json-comments": "~2.0.1" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "bundled": true, - "optional": true - } } }, "readable-stream": { - "version": "2.3.6", + "version": "2.3.7", "bundled": true, "optional": true, "requires": { @@ -9435,33 +10438,33 @@ } }, "gatsby": { - "version": "2.19.43", - "resolved": "https://registry.npmjs.org/gatsby/-/gatsby-2.19.43.tgz", - "integrity": "sha512-lrEENBE907oLptB4rrXAx1ahqxNoI4fjgJdK1zQobEKwgkTSjyNX0YRlWQ+4+2VdgaDjw25ZBGglsk0leifmTA==", - "requires": { - "@babel/code-frame": "^7.5.5", - "@babel/core": "^7.7.5", - "@babel/parser": "^7.7.5", - "@babel/polyfill": "^7.7.0", - "@babel/runtime": "^7.7.6", - "@babel/traverse": "^7.7.4", + "version": "2.20.8", + "resolved": "https://registry.npmjs.org/gatsby/-/gatsby-2.20.8.tgz", + "integrity": "sha512-n3wtQ1zFIb9JpnO0059W/8CR81rH67doPQrhqlYjkPUSz1o4YjDdluF0PICyb0YX+f71AZr9pkWSwDqgJNcC3g==", + "requires": { + "@babel/code-frame": "^7.8.3", + "@babel/core": "^7.8.7", + "@babel/parser": "^7.8.8", + "@babel/polyfill": "^7.8.7", + "@babel/runtime": "^7.8.7", + "@babel/traverse": "^7.8.6", "@hapi/joi": "^15.1.1", "@mikaelkristiansson/domready": "^1.0.10", "@pieh/friendly-errors-webpack-plugin": "1.7.0-chalk-2", "@pmmmwh/react-refresh-webpack-plugin": "^0.2.0", - "@reach/router": "^1.3.1", - "@typescript-eslint/eslint-plugin": "^2.23.0", - "@typescript-eslint/parser": "^2.23.0", + "@reach/router": "^1.3.3", + "@typescript-eslint/eslint-plugin": "^2.24.0", + "@typescript-eslint/parser": "^2.24.0", "address": "1.1.2", - "autoprefixer": "^9.7.3", - "axios": "^0.19.0", + "autoprefixer": "^9.7.4", + "axios": "^0.19.2", "babel-core": "7.0.0-bridge.0", - "babel-eslint": "^10.0.3", + "babel-eslint": "^10.1.0", "babel-loader": "^8.0.6", "babel-plugin-add-module-exports": "^0.3.3", "babel-plugin-dynamic-import-node": "^2.3.0", - "babel-plugin-remove-graphql-queries": "^2.7.25", - "babel-preset-gatsby": "^0.2.35", + "babel-plugin-remove-graphql-queries": "^2.8.1", + "babel-preset-gatsby": "^0.3.1", "better-opn": "1.0.0", "better-queue": "^3.8.10", "bluebird": "^3.7.2", @@ -9469,30 +10472,30 @@ "cache-manager": "^2.11.1", "cache-manager-fs-hash": "^0.0.7", "chalk": "^2.4.2", - "chokidar": "3.3.0", + "chokidar": "3.3.1", "common-tags": "^1.8.0", "compression": "^1.7.4", "convert-hrtime": "^3.0.0", - "copyfiles": "^2.1.1", + "copyfiles": "^2.2.0", "core-js": "^2.6.11", "cors": "^2.8.5", "css-loader": "^1.0.1", - "date-fns": "^2.10.0", + "date-fns": "^2.11.0", "debug": "^3.2.6", "del": "^5.1.0", "detect-port": "^1.3.0", - "devcert": "^1.0.2", + "devcert": "^1.1.0", "dotenv": "^8.2.0", - "eslint": "^6.7.2", - "eslint-config-react-app": "^5.1.0", + "eslint": "^6.8.0", + "eslint-config-react-app": "^5.2.0", "eslint-loader": "^2.2.1", "eslint-plugin-flowtype": "^3.13.0", - "eslint-plugin-graphql": "^3.1.0", - "eslint-plugin-import": "^2.19.1", + "eslint-plugin-graphql": "^3.1.1", + "eslint-plugin-import": "^2.20.1", "eslint-plugin-jsx-a11y": "^6.2.3", - "eslint-plugin-react": "^7.17.0", + "eslint-plugin-react": "^7.19.0", "eslint-plugin-react-hooks": "^1.7.0", - "event-source-polyfill": "^1.0.11", + "event-source-polyfill": "^1.0.12", "express": "^4.17.1", "express-graphql": "^0.9.0", "fast-levenshtein": "^2.0.6", @@ -9500,19 +10503,19 @@ "flat": "^4.1.0", "fs-exists-cached": "1.0.0", "fs-extra": "^8.1.0", - "gatsby-cli": "^2.10.10", - "gatsby-core-utils": "^1.0.33", - "gatsby-graphiql-explorer": "^0.2.35", - "gatsby-link": "^2.2.30", - "gatsby-plugin-page-creator": "^2.1.45", - "gatsby-react-router-scroll": "^2.1.23", - "gatsby-telemetry": "^1.1.55", + "gatsby-cli": "^2.11.3", + "gatsby-core-utils": "^1.1.1", + "gatsby-graphiql-explorer": "^0.3.1", + "gatsby-link": "^2.3.1", + "gatsby-plugin-page-creator": "^2.2.1", + "gatsby-react-router-scroll": "^2.2.1", + "gatsby-telemetry": "^1.2.2", "glob": "^7.1.6", "got": "8.3.2", - "graphql": "^14.5.8", - "graphql-compose": "^6.3.7", + "graphql": "^14.6.0", + "graphql-compose": "^6.3.8", "graphql-playground-middleware-express": "^1.7.12", - "hasha": "^5.1.0", + "hasha": "^5.2.0", "invariant": "^2.2.4", "is-relative": "^1.0.0", "is-relative-url": "^3.0.0", @@ -9527,27 +10530,27 @@ "md5-file": "^3.2.3", "micromatch": "^3.1.10", "mime": "^2.4.4", - "mini-css-extract-plugin": "^0.8.0", + "mini-css-extract-plugin": "^0.8.2", "mitt": "^1.2.0", "mkdirp": "^0.5.1", "moment": "^2.24.0", "name-all-modules-plugin": "^1.0.1", "normalize-path": "^2.1.1", - "null-loader": "^0.1.1", + "null-loader": "^3.0.0", "opentracing": "^0.14.4", "optimize-css-assets-webpack-plugin": "^5.0.3", "p-defer": "^3.0.0", "parseurl": "^1.3.3", "physical-cpu-count": "^2.0.0", - "pnp-webpack-plugin": "^1.5.0", + "pnp-webpack-plugin": "^1.6.4", "postcss-flexbugs-fixes": "^4.2.0", "postcss-loader": "^3.0.0", - "prompts": "^2.3.0", + "prompts": "^2.3.1", "prop-types": "^15.7.2", "raw-loader": "^0.5.1", "react-dev-utils": "^4.2.3", "react-error-overlay": "^3.0.0", - "react-hot-loader": "^4.12.18", + "react-hot-loader": "^4.12.20", "react-refresh": "^0.7.0", "redux": "^4.0.5", "redux-thunk": "^2.3.0", @@ -9555,36 +10558,217 @@ "shallow-compare": "^1.2.2", "sift": "^5.1.0", "signal-exit": "^3.0.2", - "slugify": "^1.3.6", + "slugify": "^1.4.0", "socket.io": "^2.3.0", "stack-trace": "^0.0.10", "string-similarity": "^1.2.2", "style-loader": "^0.23.1", - "terser-webpack-plugin": "^1.4.2", + "terser-webpack-plugin": "^1.4.3", "true-case-path": "^2.2.1", "type-of": "^2.0.1", "url-loader": "^1.1.2", - "util.promisify": "^1.0.0", - "uuid": "^3.3.3", + "util.promisify": "^1.0.1", + "uuid": "^3.4.0", "v8-compile-cache": "^1.1.2", - "webpack": "~4.41.2", + "webpack": "~4.42.0", "webpack-dev-middleware": "^3.7.2", - "webpack-dev-server": "^3.9.0", + "webpack-dev-server": "^3.10.3", "webpack-hot-middleware": "^2.25.0", "webpack-merge": "^4.2.2", - "webpack-stats-plugin": "^0.3.0", - "xstate": "^4.7.2", + "webpack-stats-plugin": "^0.3.1", + "xstate": "^4.8.0", "yaml-loader": "^0.5.0" }, "dependencies": { + "@babel/code-frame": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", + "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", + "requires": { + "@babel/highlight": "^7.8.3" + } + }, + "@babel/core": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.0.tgz", + "integrity": "sha512-kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==", + "requires": { + "@babel/code-frame": "^7.8.3", + "@babel/generator": "^7.9.0", + "@babel/helper-module-transforms": "^7.9.0", + "@babel/helpers": "^7.9.0", + "@babel/parser": "^7.9.0", + "@babel/template": "^7.8.6", + "@babel/traverse": "^7.9.0", + "@babel/types": "^7.9.0", + "convert-source-map": "^1.7.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.1", + "json5": "^2.1.2", + "lodash": "^4.17.13", + "resolve": "^1.3.2", + "semver": "^5.4.1", + "source-map": "^0.5.0" + }, + "dependencies": { + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "requires": { + "ms": "^2.1.1" + } + } + } + }, + "@babel/generator": { + "version": "7.9.4", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.4.tgz", + "integrity": "sha512-rjP8ahaDy/ouhrvCoU1E5mqaitWrxwuNGU+dy1EpaoK48jZay4MdkskKGIMHLZNewg8sAsqpGSREJwP0zH3YQA==", + "requires": { + "@babel/types": "^7.9.0", + "jsesc": "^2.5.1", + "lodash": "^4.17.13", + "source-map": "^0.5.0" + } + }, + "@babel/helper-member-expression-to-functions": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.8.3.tgz", + "integrity": "sha512-fO4Egq88utkQFjbPrSHGmGLFqmrshs11d46WI+WZDESt7Wu7wN2G2Iu+NMMZJFDOVRHAMIkB5SNh30NtwCA7RA==", + "requires": { + "@babel/types": "^7.8.3" + } + }, + "@babel/helper-module-imports": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz", + "integrity": "sha512-R0Bx3jippsbAEtzkpZ/6FIiuzOURPcMjHp+Z6xPe6DtApDJx+w7UYyOLanZqO8+wKR9G10s/FmHXvxaMd9s6Kg==", + "requires": { + "@babel/types": "^7.8.3" + } + }, + "@babel/helper-module-transforms": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz", + "integrity": "sha512-0FvKyu0gpPfIQ8EkxlrAydOWROdHpBmiCiRwLkUiBGhCUPRRbVD2/tm3sFr/c/GWFrQ/ffutGUAnx7V0FzT2wA==", + "requires": { + "@babel/helper-module-imports": "^7.8.3", + "@babel/helper-replace-supers": "^7.8.6", + "@babel/helper-simple-access": "^7.8.3", + "@babel/helper-split-export-declaration": "^7.8.3", + "@babel/template": "^7.8.6", + "@babel/types": "^7.9.0", + "lodash": "^4.17.13" + } + }, + "@babel/helper-optimise-call-expression": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.8.3.tgz", + "integrity": "sha512-Kag20n86cbO2AvHca6EJsvqAd82gc6VMGule4HwebwMlwkpXuVqrNRj6CkCV2sKxgi9MyAUnZVnZ6lJ1/vKhHQ==", + "requires": { + "@babel/types": "^7.8.3" + } + }, + "@babel/helper-replace-supers": { + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.8.6.tgz", + "integrity": "sha512-PeMArdA4Sv/Wf4zXwBKPqVj7n9UF/xg6slNRtZW84FM7JpE1CbG8B612FyM4cxrf4fMAMGO0kR7voy1ForHHFA==", + "requires": { + "@babel/helper-member-expression-to-functions": "^7.8.3", + "@babel/helper-optimise-call-expression": "^7.8.3", + "@babel/traverse": "^7.8.6", + "@babel/types": "^7.8.6" + } + }, + "@babel/helper-simple-access": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.8.3.tgz", + "integrity": "sha512-VNGUDjx5cCWg4vvCTR8qQ7YJYZ+HBjxOgXEl7ounz+4Sn7+LMD3CFrCTEU6/qXKbA2nKg21CwhhBzO0RpRbdCw==", + "requires": { + "@babel/template": "^7.8.3", + "@babel/types": "^7.8.3" + } + }, + "@babel/helpers": { + "version": "7.9.2", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.2.tgz", + "integrity": "sha512-JwLvzlXVPjO8eU9c/wF9/zOIN7X6h8DYf7mG4CiFRZRvZNKEF5dQ3H3V+ASkHoIB3mWhatgl5ONhyqHRI6MppA==", + "requires": { + "@babel/template": "^7.8.3", + "@babel/traverse": "^7.9.0", + "@babel/types": "^7.9.0" + } + }, + "@babel/highlight": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz", + "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==", + "requires": { + "@babel/helper-validator-identifier": "^7.9.0", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" + } + }, + "@babel/parser": { + "version": "7.9.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz", + "integrity": "sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==" + }, "@babel/runtime": { - "version": "7.8.7", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.7.tgz", - "integrity": "sha512-+AATMUFppJDw6aiR5NVPHqIQBlV/Pj8wY/EZH+lmvRdUo9xBaz/rF3alAwFJQavvKfeOlPE7oaaDHVbcySbCsg==", + "version": "7.9.2", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz", + "integrity": "sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==", "requires": { "regenerator-runtime": "^0.13.4" } }, + "@babel/template": { + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz", + "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==", + "requires": { + "@babel/code-frame": "^7.8.3", + "@babel/parser": "^7.8.6", + "@babel/types": "^7.8.6" + } + }, + "@babel/traverse": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.0.tgz", + "integrity": "sha512-jAZQj0+kn4WTHO5dUZkZKhbFrqZE7K5LAQ5JysMnmvGij+wOdr+8lWqPeW0BcF4wFwrEXXtdGO7wcV6YPJcf3w==", + "requires": { + "@babel/code-frame": "^7.8.3", + "@babel/generator": "^7.9.0", + "@babel/helper-function-name": "^7.8.3", + "@babel/helper-split-export-declaration": "^7.8.3", + "@babel/parser": "^7.9.0", + "@babel/types": "^7.9.0", + "debug": "^4.1.0", + "globals": "^11.1.0", + "lodash": "^4.17.13" + }, + "dependencies": { + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "requires": { + "ms": "^2.1.1" + } + } + } + }, + "@babel/types": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.0.tgz", + "integrity": "sha512-BS9JKfXkzzJl8RluW4JGknzpiUV7ZrvTayM6yfqLTVBEnFtyowVIOu6rqxRd5cVO6yGoWf4T8u8dgK9oB+GCng==", + "requires": { + "@babel/helper-validator-identifier": "^7.9.0", + "lodash": "^4.17.13", + "to-fast-properties": "^2.0.0" + } + }, "ansi-regex": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", @@ -9625,40 +10809,58 @@ "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz", "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==" }, + "es-abstract": { + "version": "1.17.5", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz", + "integrity": "sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==", + "requires": { + "es-to-primitive": "^1.2.1", + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1", + "is-callable": "^1.1.5", + "is-regex": "^1.0.5", + "object-inspect": "^1.7.0", + "object-keys": "^1.1.1", + "object.assign": "^4.1.0", + "string.prototype.trimleft": "^2.1.1", + "string.prototype.trimright": "^2.1.1" + } + }, "gatsby-cli": { - "version": "2.10.10", - "resolved": "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-2.10.10.tgz", - "integrity": "sha512-J7geHpblEho35R47fRTl9QTygfk1FKxfsoNjtXbU1yzSWLAa2Qi46GyeJOxwbGeC1oQ+KhlPDuk6lFXjQ69OPw==", + "version": "2.11.3", + "resolved": "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-2.11.3.tgz", + "integrity": "sha512-ek1L/CVB2ak+tbRgPUriotf2MhYVnZIQUogldD5PxPqLizN7expOTjoDcnV5DHG1zsmD19/TfXBj1hp6+DuOpQ==", "requires": { - "@babel/code-frame": "^7.5.5", - "@babel/runtime": "^7.7.6", + "@babel/code-frame": "^7.8.3", + "@babel/runtime": "^7.8.7", "@hapi/joi": "^15.1.1", "better-opn": "^1.0.0", "bluebird": "^3.7.2", "chalk": "^2.4.2", - "clipboardy": "^2.1.0", + "clipboardy": "^2.2.0", "common-tags": "^1.8.0", - "configstore": "^5.0.0", + "configstore": "^5.0.1", "convert-hrtime": "^3.0.0", "core-js": "^2.6.11", "envinfo": "^7.5.0", "execa": "^3.4.0", "fs-exists-cached": "^1.0.0", "fs-extra": "^8.1.0", - "gatsby-core-utils": "^1.0.33", - "gatsby-telemetry": "^1.1.55", - "hosted-git-info": "^3.0.2", - "ink": "^2.6.0", + "gatsby-core-utils": "^1.1.1", + "gatsby-telemetry": "^1.2.2", + "hosted-git-info": "^3.0.4", + "ink": "^2.7.1", "ink-spinner": "^3.0.1", "is-valid-path": "^0.1.1", "lodash": "^4.17.15", "meant": "^1.0.1", "node-fetch": "^2.6.0", - "object.entries": "^1.1.0", + "object.entries": "^1.1.1", "opentracing": "^0.14.4", "pretty-error": "^2.1.1", "progress": "^2.0.3", - "prompts": "^2.3.0", + "prompts": "^2.3.1", "react": "^16.8.0", "redux": "^4.0.5", "resolve-cwd": "^2.0.0", @@ -9668,25 +10870,30 @@ "stack-trace": "^0.0.10", "strip-ansi": "^5.2.0", "update-notifier": "^3.0.1", - "uuid": "3.3.3", + "uuid": "3.4.0", "yargs": "^12.0.5", - "yurnalist": "^1.1.1" + "yurnalist": "^1.1.2" }, "dependencies": { "semver": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + }, + "source-map": { + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", + "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==" } } }, "gatsby-core-utils": { - "version": "1.0.33", - "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.0.33.tgz", - "integrity": "sha512-eQkOQumfbMLdbKJN0E1dlnBjAKWAzexxuNdpL88yCIaqHGOMogGTmAmhG1Hs0sz9bMrNPxuIgEyDNQe3IDfJXw==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.1.1.tgz", + "integrity": "sha512-EboPcBx37YQVUKN9JH753S54nDxjRmOefbR0i08KTmaVgQ1lZnDXJr8JfrImmMqupZlOkPQX1mWlXfp+r1jGhA==", "requires": { "ci-info": "2.0.0", - "configstore": "^5.0.0", + "configstore": "^5.0.1", "node-object-hash": "^2.0.0" } }, @@ -9695,6 +10902,11 @@ "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz", "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==" }, + "has-symbols": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", + "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==" + }, "hosted-git-info": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.4.tgz", @@ -9703,6 +10915,11 @@ "lru-cache": "^5.1.1" } }, + "is-callable": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz", + "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==" + }, "is-fullwidth-code-point": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", @@ -9711,6 +10928,22 @@ "number-is-nan": "^1.0.0" } }, + "is-regex": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz", + "integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==", + "requires": { + "has": "^1.0.3" + } + }, + "json5": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.2.tgz", + "integrity": "sha512-MoUOQ4WdiN3yxhm7NEVJSJrieAo5hNSLQ5sj05OTRHPL9HOBy8u4Bu88jsC1jvqAdN+E1bJmsUcZH+1HQxliqQ==", + "requires": { + "minimist": "^1.2.5" + } + }, "lru-cache": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", @@ -9719,11 +10952,25 @@ "yallist": "^3.0.2" } }, + "minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" + }, "node-fetch": { "version": "2.6.0", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz", "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==" }, + "object.getownpropertydescriptors": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz", + "integrity": "sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==", + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.0-next.1" + } + }, "regenerator-runtime": { "version": "0.13.5", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", @@ -9734,10 +10981,28 @@ "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=" }, - "source-map": { - "version": "0.7.3", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", - "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==" + "slugify": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/slugify/-/slugify-1.4.0.tgz", + "integrity": "sha512-FtLNsMGBSRB/0JOE2A0fxlqjI6fJsgHGS13iTuVT28kViI4JjUiNqp/vyis0ZXYcMnpR3fzGNkv+6vRlI2GwdQ==" + }, + "string.prototype.trimleft": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz", + "integrity": "sha512-iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag==", + "requires": { + "define-properties": "^1.1.3", + "function-bind": "^1.1.1" + } + }, + "string.prototype.trimright": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz", + "integrity": "sha512-qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g==", + "requires": { + "define-properties": "^1.1.3", + "function-bind": "^1.1.1" + } }, "strip-ansi": { "version": "5.2.0", @@ -9747,6 +11012,22 @@ "ansi-regex": "^4.1.0" } }, + "util.promisify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz", + "integrity": "sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==", + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.2", + "has-symbols": "^1.0.1", + "object.getownpropertydescriptors": "^2.1.0" + } + }, + "uuid": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", + "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==" + }, "wrap-ansi": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", @@ -9827,17 +11108,17 @@ } }, "gatsby-graphiql-explorer": { - "version": "0.2.35", - "resolved": "https://registry.npmjs.org/gatsby-graphiql-explorer/-/gatsby-graphiql-explorer-0.2.35.tgz", - "integrity": "sha512-y0ec6zLeaWwCus7xQnOS5dMX4Fu+//H6LLwPjODqnXAtnx2pT8MI5VYnYDqhMLHk32VEXYxhPJRvxg7VMkn18g==", + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/gatsby-graphiql-explorer/-/gatsby-graphiql-explorer-0.3.1.tgz", + "integrity": "sha512-HTW0ST3zQGxOORCpmRKhy4lO48SwA9QHBfVBTm8zUWh5jgJOtDZa+O0CLxEieQhdb54lRt/PuZlozJCYFLEkYA==", "requires": { - "@babel/runtime": "^7.7.6" + "@babel/runtime": "^7.8.7" }, "dependencies": { "@babel/runtime": { - "version": "7.8.7", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.7.tgz", - "integrity": "sha512-+AATMUFppJDw6aiR5NVPHqIQBlV/Pj8wY/EZH+lmvRdUo9xBaz/rF3alAwFJQavvKfeOlPE7oaaDHVbcySbCsg==", + "version": "7.9.2", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz", + "integrity": "sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==", "requires": { "regenerator-runtime": "^0.13.4" } @@ -9850,19 +11131,19 @@ } }, "gatsby-link": { - "version": "2.2.30", - "resolved": "https://registry.npmjs.org/gatsby-link/-/gatsby-link-2.2.30.tgz", - "integrity": "sha512-fGUzQBHcARIYBVMno2qkyOykcxVdANLQpQ1R0kg8b6AEVjxReB+aUlXhq25nJkW4Z2E9Dhn32Xv4mk6znteNig==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/gatsby-link/-/gatsby-link-2.3.1.tgz", + "integrity": "sha512-waVhJ7klcAOgAD3UjX5P3LWYCee4GwZ7jqJS7dj8tTeiumXV1NAur4gjNiUZF8w3+0HQ4uY0vBjy+TozRRVk6Q==", "requires": { - "@babel/runtime": "^7.7.6", - "@types/reach__router": "^1.2.6", + "@babel/runtime": "^7.8.7", + "@types/reach__router": "^1.3.0", "prop-types": "^15.7.2" }, "dependencies": { "@babel/runtime": { - "version": "7.8.7", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.7.tgz", - "integrity": "sha512-+AATMUFppJDw6aiR5NVPHqIQBlV/Pj8wY/EZH+lmvRdUo9xBaz/rF3alAwFJQavvKfeOlPE7oaaDHVbcySbCsg==", + "version": "7.9.2", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz", + "integrity": "sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==", "requires": { "regenerator-runtime": "^0.13.4" } @@ -9875,24 +11156,24 @@ } }, "gatsby-page-utils": { - "version": "0.0.44", - "resolved": "https://registry.npmjs.org/gatsby-page-utils/-/gatsby-page-utils-0.0.44.tgz", - "integrity": "sha512-6N6+nptFpiFsjmOmPF7T/go9Hcd+5vhkhmArx5yRsJOv8kDs6LBOLh/d+mxRqT0Y3iQoXjUP5loy6li4syn4Hw==", + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/gatsby-page-utils/-/gatsby-page-utils-0.1.1.tgz", + "integrity": "sha512-g4ETSZM7wlMycHPKwQ7QqxkqnwbXCgwg2Sqh2DyCsd5qwtPm6RrQht3cnbsKAeuo7gWsbqzv088YGa3krrIREw==", "requires": { - "@babel/runtime": "^7.7.6", + "@babel/runtime": "^7.8.7", "bluebird": "^3.7.2", - "chokidar": "3.3.0", + "chokidar": "3.3.1", "fs-exists-cached": "^1.0.0", - "gatsby-core-utils": "^1.0.33", + "gatsby-core-utils": "^1.1.1", "glob": "^7.1.6", "lodash": "^4.17.15", "micromatch": "^3.1.10" }, "dependencies": { "@babel/runtime": { - "version": "7.8.7", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.7.tgz", - "integrity": "sha512-+AATMUFppJDw6aiR5NVPHqIQBlV/Pj8wY/EZH+lmvRdUo9xBaz/rF3alAwFJQavvKfeOlPE7oaaDHVbcySbCsg==", + "version": "7.9.2", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz", + "integrity": "sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==", "requires": { "regenerator-runtime": "^0.13.4" } @@ -9903,12 +11184,12 @@ "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" }, "gatsby-core-utils": { - "version": "1.0.33", - "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.0.33.tgz", - "integrity": "sha512-eQkOQumfbMLdbKJN0E1dlnBjAKWAzexxuNdpL88yCIaqHGOMogGTmAmhG1Hs0sz9bMrNPxuIgEyDNQe3IDfJXw==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.1.1.tgz", + "integrity": "sha512-EboPcBx37YQVUKN9JH753S54nDxjRmOefbR0i08KTmaVgQ1lZnDXJr8JfrImmMqupZlOkPQX1mWlXfp+r1jGhA==", "requires": { "ci-info": "2.0.0", - "configstore": "^5.0.0", + "configstore": "^5.0.1", "node-object-hash": "^2.0.0" } }, @@ -10880,23 +12161,23 @@ } }, "gatsby-plugin-page-creator": { - "version": "2.1.45", - "resolved": "https://registry.npmjs.org/gatsby-plugin-page-creator/-/gatsby-plugin-page-creator-2.1.45.tgz", - "integrity": "sha512-mW5qfJ2C6U522wx63fZRTN2jCKG9FC/jkEmq4B0z5J/SOA9zPAlVvowjQAAW0+oGbEqwfIveSM+hIPwv1J7npA==", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/gatsby-plugin-page-creator/-/gatsby-plugin-page-creator-2.2.1.tgz", + "integrity": "sha512-RRlk7FUScyEj1S6PlGpdj/lrJmps+rl7sQNauOBCIGt3Sod5alin0l8aQJa/ldpI6DIPbp4PWIpqkPsWxED/LA==", "requires": { - "@babel/runtime": "^7.7.6", + "@babel/runtime": "^7.8.7", "bluebird": "^3.7.2", "fs-exists-cached": "^1.0.0", - "gatsby-page-utils": "^0.0.44", + "gatsby-page-utils": "^0.1.1", "glob": "^7.1.6", "lodash": "^4.17.15", "micromatch": "^3.1.10" }, "dependencies": { "@babel/runtime": { - "version": "7.8.7", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.7.tgz", - "integrity": "sha512-+AATMUFppJDw6aiR5NVPHqIQBlV/Pj8wY/EZH+lmvRdUo9xBaz/rF3alAwFJQavvKfeOlPE7oaaDHVbcySbCsg==", + "version": "7.9.2", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz", + "integrity": "sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==", "requires": { "regenerator-runtime": "^0.13.4" } @@ -10965,19 +12246,19 @@ "integrity": "sha512-54REIMe79qFBAwpcnWHBkvEE9CKoEVkefF9rDXai0k642r91SZ4UeWFuAmsegPG+sPVub7tHfHu/2LVXK1I9kg==" }, "gatsby-react-router-scroll": { - "version": "2.1.23", - "resolved": "https://registry.npmjs.org/gatsby-react-router-scroll/-/gatsby-react-router-scroll-2.1.23.tgz", - "integrity": "sha512-yUCWzRYUDgvr3xy5GAYd08gToBfE84SX3zvHWgPunVeL4OfwsYh6eei6GtYbLIjq77bvegd2SZkSujQ4Vgm/Gg==", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/gatsby-react-router-scroll/-/gatsby-react-router-scroll-2.2.1.tgz", + "integrity": "sha512-mkaG6NNIbWPNiU8Wj3aawUQa7AqI42Skrnh0VCLUCSDvUgCjOJOZfxM0FVPA/masNiVsCprq3a6xz7fmW93jgQ==", "requires": { - "@babel/runtime": "^7.7.6", - "scroll-behavior": "^0.9.10", + "@babel/runtime": "^7.8.7", + "scroll-behavior": "^0.9.12", "warning": "^3.0.0" }, "dependencies": { "@babel/runtime": { - "version": "7.8.7", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.7.tgz", - "integrity": "sha512-+AATMUFppJDw6aiR5NVPHqIQBlV/Pj8wY/EZH+lmvRdUo9xBaz/rF3alAwFJQavvKfeOlPE7oaaDHVbcySbCsg==", + "version": "7.9.2", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz", + "integrity": "sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==", "requires": { "regenerator-runtime": "^0.13.4" } @@ -11396,18 +12677,18 @@ } }, "gatsby-telemetry": { - "version": "1.1.55", - "resolved": "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-1.1.55.tgz", - "integrity": "sha512-6J0y+WaXLV9iMJnT8XZgK4GeFlN0pY17LHqfYhDHaTteAZTOsCgh28yJPXkKQEN+M2ahmKkq4buD1xSveT5r7A==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-1.2.2.tgz", + "integrity": "sha512-I1RkcbLIR7jg+SRu71FT5c7eEqDScmJ8/sZ/mfYVwARo6Kq6obB0VzlYHVYd+KjdeiuQb6YIHhlxUn37eGq7Vw==", "requires": { - "@babel/code-frame": "^7.5.5", - "@babel/runtime": "^7.7.6", + "@babel/code-frame": "^7.8.3", + "@babel/runtime": "^7.8.7", "bluebird": "^3.7.2", "boxen": "^4.2.0", - "configstore": "^5.0.0", + "configstore": "^5.0.1", "envinfo": "^7.5.0", "fs-extra": "^8.1.0", - "gatsby-core-utils": "^1.0.33", + "gatsby-core-utils": "^1.1.1", "git-up": "4.0.1", "is-docker": "2.0.0", "lodash": "^4.17.15", @@ -11416,13 +12697,31 @@ "source-map": "^0.7.3", "stack-trace": "^0.0.10", "stack-utils": "1.0.2", - "uuid": "3.3.3" + "uuid": "3.4.0" }, "dependencies": { + "@babel/code-frame": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", + "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", + "requires": { + "@babel/highlight": "^7.8.3" + } + }, + "@babel/highlight": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz", + "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==", + "requires": { + "@babel/helper-validator-identifier": "^7.9.0", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" + } + }, "@babel/runtime": { - "version": "7.8.7", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.7.tgz", - "integrity": "sha512-+AATMUFppJDw6aiR5NVPHqIQBlV/Pj8wY/EZH+lmvRdUo9xBaz/rF3alAwFJQavvKfeOlPE7oaaDHVbcySbCsg==", + "version": "7.9.2", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz", + "integrity": "sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==", "requires": { "regenerator-runtime": "^0.13.4" } @@ -11433,12 +12732,12 @@ "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" }, "gatsby-core-utils": { - "version": "1.0.33", - "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.0.33.tgz", - "integrity": "sha512-eQkOQumfbMLdbKJN0E1dlnBjAKWAzexxuNdpL88yCIaqHGOMogGTmAmhG1Hs0sz9bMrNPxuIgEyDNQe3IDfJXw==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.1.1.tgz", + "integrity": "sha512-EboPcBx37YQVUKN9JH753S54nDxjRmOefbR0i08KTmaVgQ1lZnDXJr8JfrImmMqupZlOkPQX1mWlXfp+r1jGhA==", "requires": { "ci-info": "2.0.0", - "configstore": "^5.0.0", + "configstore": "^5.0.1", "node-object-hash": "^2.0.0" } }, @@ -11456,6 +12755,11 @@ "version": "0.7.3", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==" + }, + "uuid": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", + "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==" } } }, @@ -12079,9 +13383,9 @@ } }, "graphql-config": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/graphql-config/-/graphql-config-2.2.1.tgz", - "integrity": "sha512-U8+1IAhw9m6WkZRRcyj8ZarK96R6lQBQ0an4lp76Ps9FyhOXENC5YQOxOFGm5CxPrX2rD0g3Je4zG5xdNJjwzQ==", + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/graphql-config/-/graphql-config-2.2.2.tgz", + "integrity": "sha512-mtv1ejPyyR2mJUUZNhljggU+B/Xl8tJJWf+h145hB+1Y48acSghFalhNtXfPBcYl2tJzpb+lGxfj3O7OjaiMgw==", "requires": { "graphql-import": "^0.7.1", "graphql-request": "^1.5.0", @@ -12158,9 +13462,9 @@ } }, "handle-thing": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.0.tgz", - "integrity": "sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ==" + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz", + "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==" }, "har-schema": { "version": "2.0.0", @@ -13087,9 +14391,9 @@ }, "dependencies": { "es-abstract": { - "version": "1.17.4", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz", - "integrity": "sha512-Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ==", + "version": "1.17.5", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz", + "integrity": "sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==", "requires": { "es-to-primitive": "^1.2.1", "function-bind": "^1.1.1", @@ -14198,12 +15502,12 @@ } }, "loader-fs-cache": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/loader-fs-cache/-/loader-fs-cache-1.0.2.tgz", - "integrity": "sha512-70IzT/0/L+M20jUlEqZhZyArTU6VKLRTYRDAYN26g4jfzpJqjipLL3/hgYpySqI9PwsVRHHFja0LfEmsx9X2Cw==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/loader-fs-cache/-/loader-fs-cache-1.0.3.tgz", + "integrity": "sha512-ldcgZpjNJj71n+2Mf6yetz+c9bM4xpKtNds4LbqXzU/PTdeAX0g3ytnU1AJMEcTk2Lex4Smpe3Q/eCTsvUBxbA==", "requires": { "find-cache-dir": "^0.1.1", - "mkdirp": "0.5.1" + "mkdirp": "^0.5.1" }, "dependencies": { "find-cache-dir": { @@ -14513,11 +15817,6 @@ "semver": "^5.6.0" } }, - "mamacro": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/mamacro/-/mamacro-0.0.3.tgz", - "integrity": "sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA==" - }, "map-age-cleaner": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz", @@ -15346,9 +16645,25 @@ } }, "null-loader": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/null-loader/-/null-loader-0.1.1.tgz", - "integrity": "sha1-F76av80/8OFRL2/Er8sfUDk3j64=" + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/null-loader/-/null-loader-3.0.0.tgz", + "integrity": "sha512-hf5sNLl8xdRho4UPBOOeoIwT3WhjYcMUQm0zj44EhD6UscMAz72o2udpoDFBgykucdEDGIcd6SXbc/G6zssbzw==", + "requires": { + "loader-utils": "^1.2.3", + "schema-utils": "^1.0.0" + }, + "dependencies": { + "schema-utils": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz", + "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==", + "requires": { + "ajv": "^6.1.0", + "ajv-errors": "^1.0.0", + "ajv-keywords": "^3.1.0" + } + } + } }, "num2fraction": { "version": "1.2.2", @@ -15459,9 +16774,9 @@ }, "dependencies": { "es-abstract": { - "version": "1.17.4", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz", - "integrity": "sha512-Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ==", + "version": "1.17.5", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz", + "integrity": "sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==", "requires": { "es-to-primitive": "^1.2.1", "function-bind": "^1.1.1", @@ -15526,9 +16841,9 @@ }, "dependencies": { "es-abstract": { - "version": "1.17.4", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz", - "integrity": "sha512-Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ==", + "version": "1.17.5", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz", + "integrity": "sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==", "requires": { "es-to-primitive": "^1.2.1", "function-bind": "^1.1.1", @@ -16950,9 +18265,9 @@ "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=" }, "prompts": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.3.1.tgz", - "integrity": "sha512-qIP2lQyCwYbdzcqHIUi2HAxiWixhoM9OdLCWf8txXsapC/X9YdsCoeyRIXE/GP+Q0J37Q7+XN/MFqbUa7IzXNA==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.3.2.tgz", + "integrity": "sha512-Q06uKs2CkNYVID0VqwfAl9mipo99zkBv/n2JtWY89Yxa3ZabWSrs0e2KTudKVa3peLUvYXMefDqIleLPVUBZMA==", "requires": { "kleur": "^3.0.3", "sisteransi": "^1.0.4" @@ -17792,9 +19107,9 @@ }, "dependencies": { "es-abstract": { - "version": "1.17.4", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz", - "integrity": "sha512-Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ==", + "version": "1.17.5", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz", + "integrity": "sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==", "requires": { "es-to-primitive": "^1.2.1", "function-bind": "^1.1.1", @@ -18737,12 +20052,30 @@ } }, "schema-utils": { - "version": "0.4.7", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.7.tgz", - "integrity": "sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==", + "version": "2.6.5", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.6.5.tgz", + "integrity": "sha512-5KXuwKziQrTVHh8j/Uxz+QUbxkaLW9X/86NBlx/gnKgtsZA2GIVMUn17qWhRFwF8jdYb3Dig5hRO/W5mZqy6SQ==", "requires": { - "ajv": "^6.1.0", - "ajv-keywords": "^3.1.0" + "ajv": "^6.12.0", + "ajv-keywords": "^3.4.1" + }, + "dependencies": { + "ajv": { + "version": "6.12.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz", + "integrity": "sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==", + "requires": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + } + }, + "fast-deep-equal": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz", + "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==" + } } }, "scope-css": { @@ -19051,9 +20384,9 @@ }, "dependencies": { "es-abstract": { - "version": "1.17.4", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz", - "integrity": "sha512-Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ==", + "version": "1.17.5", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz", + "integrity": "sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==", "requires": { "es-to-primitive": "^1.2.1", "function-bind": "^1.1.1", @@ -19150,9 +20483,9 @@ } }, "sisteransi": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.4.tgz", - "integrity": "sha512-/ekMoM4NJ59ivGSfKapeG+FWtrmWvA1p6FBZwXrqojw90vJu8lBmrTxCMuBCydKtkaUe2zt4PlxeTKpjwMbyig==" + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", + "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==" }, "slash": { "version": "1.0.0", @@ -19890,9 +21223,9 @@ }, "dependencies": { "es-abstract": { - "version": "1.17.4", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz", - "integrity": "sha512-Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ==", + "version": "1.17.5", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz", + "integrity": "sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==", "requires": { "es-to-primitive": "^1.2.1", "function-bind": "^1.1.1", @@ -20464,9 +21797,9 @@ "integrity": "sha512-Z86EW+fFFh/IFB1fqQ3/+7Zpf9t2ebOAxNI/V6Wo7r5gqiqtxmgTlQ1qbqQcjLKYeSHPTsEmvlJUDg/EuL0uHQ==" }, "ts-pnp": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/ts-pnp/-/ts-pnp-1.1.6.tgz", - "integrity": "sha512-CrG5GqAAzMT7144Cl+UIFP7mz/iIhiy+xQ6GGcnjTezhALT02uPMRw7tgDSESgB5MsfKt55+GPWw4ir1kVtMIQ==" + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/ts-pnp/-/ts-pnp-1.2.0.tgz", + "integrity": "sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw==" }, "tslib": { "version": "1.10.0", @@ -21291,11 +22624,11 @@ } }, "watchpack": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz", - "integrity": "sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==", + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.1.tgz", + "integrity": "sha512-+IF9hfUFOrYOOaKyfaI7h7dquUIOgyEMoQMLA7OP5FxegKA2+XdXThAZ9TU2kucfhDH7rfMHs1oPYziVGWRnZA==", "requires": { - "chokidar": "^2.0.2", + "chokidar": "^2.1.8", "graceful-fs": "^4.1.2", "neo-async": "^2.5.0" }, @@ -21340,14 +22673,14 @@ "integrity": "sha512-wYxSGajtmoP4WxfejAPIr4l0fVh+jeMXZb08wNc0tMg6xsfZXj3cECqIK0G7ZAqUq0PP8WlMDtaOGVBTAWztNw==" }, "webpack": { - "version": "4.41.6", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.41.6.tgz", - "integrity": "sha512-yxXfV0Zv9WMGRD+QexkZzmGIh54bsvEs+9aRWxnN8erLWEOehAKUTeNBoUbA6HPEZPlRo7KDi2ZcNveoZgK9MA==", - "requires": { - "@webassemblyjs/ast": "1.8.5", - "@webassemblyjs/helper-module-context": "1.8.5", - "@webassemblyjs/wasm-edit": "1.8.5", - "@webassemblyjs/wasm-parser": "1.8.5", + "version": "4.42.1", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.42.1.tgz", + "integrity": "sha512-SGfYMigqEfdGchGhFFJ9KyRpQKnipvEvjc1TwrXEPCM6H5Wywu10ka8o3KGrMzSMxMQKt8aCHUFh5DaQ9UmyRg==", + "requires": { + "@webassemblyjs/ast": "1.9.0", + "@webassemblyjs/helper-module-context": "1.9.0", + "@webassemblyjs/wasm-edit": "1.9.0", + "@webassemblyjs/wasm-parser": "1.9.0", "acorn": "^6.2.1", "ajv": "^6.10.2", "ajv-keywords": "^3.4.1", @@ -21359,7 +22692,7 @@ "loader-utils": "^1.2.3", "memory-fs": "^0.4.1", "micromatch": "^3.1.10", - "mkdirp": "^0.5.1", + "mkdirp": "^0.5.3", "neo-async": "^2.6.1", "node-libs-browser": "^2.2.1", "schema-utils": "^1.0.0", @@ -21383,6 +22716,19 @@ "estraverse": "^4.1.1" } }, + "minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" + }, + "mkdirp": { + "version": "0.5.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.4.tgz", + "integrity": "sha512-iG9AK/dJLtJ0XNgTuDbSyNS3zECqDlAhnQW4CsNxBG3LQJBbHmRX1egw39DmtOdCAqY+dKXV+sgPgilNWUKMVw==", + "requires": { + "minimist": "^1.2.5" + } + }, "schema-utils": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz", @@ -21902,9 +23248,9 @@ } }, "xstate": { - "version": "4.7.3", - "resolved": "https://registry.npmjs.org/xstate/-/xstate-4.7.3.tgz", - "integrity": "sha512-+1KyOB2JTv4kQQlZnEiDxSpEaIJnqslMa/479sc1KU3NMRP0caIV3p55Sr27GFS1EXQvnJ+n84bnWx77qplDWg==" + "version": "4.8.0", + "resolved": "https://registry.npmjs.org/xstate/-/xstate-4.8.0.tgz", + "integrity": "sha512-xHSYQtCHLkcrFRxa5lK4Lp1rnKt00a80jcKFMQiMBuE+6MvTYv7twwqYpzjsJoKFjGZB3GGEpZAuY1dmlPTh/g==" }, "xtend": { "version": "4.0.2", @@ -22002,10 +23348,13 @@ "integrity": "sha1-AI4G2AlDIMNy28L47XagymyKxBk=" }, "yoga-layout-prebuilt": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/yoga-layout-prebuilt/-/yoga-layout-prebuilt-1.9.3.tgz", - "integrity": "sha512-9SNQpwuEh2NucU83i2KMZnONVudZ86YNcFk9tq74YaqrQfgJWO3yB9uzH1tAg8iqh5c9F5j0wuyJ2z72wcum2w==", - "optional": true + "version": "1.9.5", + "resolved": "https://registry.npmjs.org/yoga-layout-prebuilt/-/yoga-layout-prebuilt-1.9.5.tgz", + "integrity": "sha512-+G5Ojl4/sG78mk5masCL3SRaZtkKXRBhMGf5c+4C1j32jN9KpS4lxVFdYyBi15EHN4gMeK5sIRf83T33TOaDkA==", + "optional": true, + "requires": { + "@types/yoga-layout": "1.9.1" + } }, "yurnalist": { "version": "1.1.2", diff --git a/docs/package.json b/docs/package.json index 87659393f9f..5c647101c98 100644 --- a/docs/package.json +++ b/docs/package.json @@ -6,7 +6,7 @@ "serve": "gatsby serve" }, "dependencies": { - "gatsby": "2.19.43", + "gatsby": "2.20.8", "gatsby-theme-apollo-docs": "4.1.1", "react": "16.13.1", "react-dom": "16.13.1" From b3ef27c5ef2f5dde4178cfb257a180b0a1aeeff4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 28 Mar 2020 12:29:28 +0000 Subject: [PATCH 336/642] chore(deps): update dependency ioredis to v4.16.1 (#3925) Co-authored-by: Renovate Bot --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0a34ff9a906..89fead26398 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8920,9 +8920,9 @@ } }, "ioredis": { - "version": "4.16.0", - "resolved": "https://registry.npmjs.org/ioredis/-/ioredis-4.16.0.tgz", - "integrity": "sha512-tlalhtuvnxXJNtrPjec1nGicuOCpi9ErYV/fRfwaWSzktX9ESrzHlcFwj1pVAL326E8dmt7h9pPQZyyVPPksRA==", + "version": "4.16.1", + "resolved": "https://registry.npmjs.org/ioredis/-/ioredis-4.16.1.tgz", + "integrity": "sha512-g76Mm9dE7BLuewncu1MimGZw5gDDjDwjoRony/VoSxSJEKAhuYncDEwYKYjtHi2NWsTNIB6XXRjE64uVa/wpKQ==", "requires": { "cluster-key-slot": "^1.1.0", "debug": "^4.1.1", diff --git a/package.json b/package.json index 909afd45904..c9cd856ec5e 100644 --- a/package.json +++ b/package.json @@ -100,7 +100,7 @@ "graphql-tag": "2.10.3", "graphql-tools": "4.0.7", "hapi": "17.8.5", - "ioredis": "4.16.0", + "ioredis": "4.16.1", "jest": "24.9.0", "jest-config": "24.9.0", "jest-junit": "9.0.0", From cc2c004477b8c6aae06ce114f735c57bb75b0fb3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 31 Mar 2020 01:12:28 +0000 Subject: [PATCH 337/642] chore(deps): update dependency gatsby-theme-apollo-docs to v4.1.2 (#3931) Co-authored-by: Renovate Bot --- docs/package-lock.json | 3834 +++++++++++++++------------------------- docs/package.json | 2 +- 2 files changed, 1383 insertions(+), 2453 deletions(-) diff --git a/docs/package-lock.json b/docs/package-lock.json index fa7db3c2015..22528d23682 100644 --- a/docs/package-lock.json +++ b/docs/package-lock.json @@ -34,17 +34,17 @@ } }, "@babel/core": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.8.0.tgz", - "integrity": "sha512-3rqPi/bv/Xfu2YzHvBz4XqMI1fKVwnhntPA1/fjoECrSjrhbOCxlTrbVu5gUtr8zkxW+RpkDOa/HCW93gzS2Dw==", - "requires": { - "@babel/code-frame": "^7.8.0", - "@babel/generator": "^7.8.0", - "@babel/helpers": "^7.8.0", - "@babel/parser": "^7.8.0", - "@babel/template": "^7.8.0", - "@babel/traverse": "^7.8.0", - "@babel/types": "^7.8.0", + "version": "7.8.4", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.8.4.tgz", + "integrity": "sha512-0LiLrB2PwrVI+a2/IEskBopDYSd8BCb3rOvH7D5tzoWd696TBEduBvuLVm4Nx6rltrLZqvI3MCalB2K2aVzQjA==", + "requires": { + "@babel/code-frame": "^7.8.3", + "@babel/generator": "^7.8.4", + "@babel/helpers": "^7.8.4", + "@babel/parser": "^7.8.4", + "@babel/template": "^7.8.3", + "@babel/traverse": "^7.8.4", + "@babel/types": "^7.8.3", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.1", @@ -63,90 +63,22 @@ "@babel/highlight": "^7.8.3" } }, - "@babel/generator": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.8.3.tgz", - "integrity": "sha512-WjoPk8hRpDRqqzRpvaR8/gDUPkrnOOeuT2m8cNICJtZH6mwaCo3v0OKMI7Y6SM1pBtyijnLtAL0HDi41pf41ug==", - "requires": { - "@babel/types": "^7.8.3", - "jsesc": "^2.5.1", - "lodash": "^4.17.13", - "source-map": "^0.5.0" - } - }, - "@babel/helper-function-name": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.8.3.tgz", - "integrity": "sha512-BCxgX1BC2hD/oBlIFUgOCQDOPV8nSINxCwM3o93xP4P9Fq6aV5sgv2cOOITDMtCfQ+3PvHp3l689XZvAM9QyOA==", - "requires": { - "@babel/helper-get-function-arity": "^7.8.3", - "@babel/template": "^7.8.3", - "@babel/types": "^7.8.3" - } - }, - "@babel/helper-get-function-arity": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz", - "integrity": "sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==", - "requires": { - "@babel/types": "^7.8.3" - } - }, - "@babel/helper-split-export-declaration": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz", - "integrity": "sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==", - "requires": { - "@babel/types": "^7.8.3" - } - }, "@babel/highlight": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.8.3.tgz", - "integrity": "sha512-PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg==", + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz", + "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==", "requires": { + "@babel/helper-validator-identifier": "^7.9.0", "chalk": "^2.0.0", - "esutils": "^2.0.2", "js-tokens": "^4.0.0" } }, - "@babel/parser": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.8.3.tgz", - "integrity": "sha512-/V72F4Yp/qmHaTALizEm9Gf2eQHV3QyTL3K0cNfijwnMnb1L+LDlAubb/ZnSdGAVzVSWakujHYs1I26x66sMeQ==" - }, - "@babel/template": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.3.tgz", - "integrity": "sha512-04m87AcQgAFdvuoyiQ2kgELr2tV8B4fP/xJAVUL3Yb3bkNdMedD3d0rlSQr3PegP0cms3eHjl1F7PWlvWbU8FQ==", - "requires": { - "@babel/code-frame": "^7.8.3", - "@babel/parser": "^7.8.3", - "@babel/types": "^7.8.3" - } - }, - "@babel/traverse": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.8.3.tgz", - "integrity": "sha512-we+a2lti+eEImHmEXp7bM9cTxGzxPmBiVJlLVD+FuuQMeeO7RaDbutbgeheDkw+Xe3mCfJHnGOWLswT74m2IPg==", - "requires": { - "@babel/code-frame": "^7.8.3", - "@babel/generator": "^7.8.3", - "@babel/helper-function-name": "^7.8.3", - "@babel/helper-split-export-declaration": "^7.8.3", - "@babel/parser": "^7.8.3", - "@babel/types": "^7.8.3", - "debug": "^4.1.0", - "globals": "^11.1.0", - "lodash": "^4.17.13" - } - }, "@babel/types": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.3.tgz", - "integrity": "sha512-jBD+G8+LWpMBBWvVcdr4QysjUE4mU/syrhN17o1u3gx0/WzJB1kwiVZAXRtWbsIPOwW8pF/YJV5+nmetPzepXg==", + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.0.tgz", + "integrity": "sha512-BS9JKfXkzzJl8RluW4JGknzpiUV7ZrvTayM6yfqLTVBEnFtyowVIOu6rqxRd5cVO6yGoWf4T8u8dgK9oB+GCng==", "requires": { - "esutils": "^2.0.2", + "@babel/helper-validator-identifier": "^7.9.0", "lodash": "^4.17.13", "to-fast-properties": "^2.0.0" } @@ -185,19 +117,19 @@ } }, "@babel/helper-annotate-as-pure": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.7.4.tgz", - "integrity": "sha512-2BQmQgECKzYKFPpiycoF9tlb5HA4lrVyAmLLVK177EcQAqjVLciUb2/R+n1boQ9y5ENV3uz2ZqiNw7QMBBw1Og==", + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.8.3.tgz", + "integrity": "sha512-6o+mJrZBxOoEX77Ezv9zwW7WV8DdluouRKNY/IR5u/YTMuKHgugHOzYWlYvYLpLA9nPsQCAAASpCIbjI9Mv+Uw==", "requires": { - "@babel/types": "^7.7.4" + "@babel/types": "^7.8.3" }, "dependencies": { "@babel/types": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.4.tgz", - "integrity": "sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==", + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.0.tgz", + "integrity": "sha512-BS9JKfXkzzJl8RluW4JGknzpiUV7ZrvTayM6yfqLTVBEnFtyowVIOu6rqxRd5cVO6yGoWf4T8u8dgK9oB+GCng==", "requires": { - "esutils": "^2.0.2", + "@babel/helper-validator-identifier": "^7.9.0", "lodash": "^4.17.13", "to-fast-properties": "^2.0.0" } @@ -205,20 +137,20 @@ } }, "@babel/helper-builder-binary-assignment-operator-visitor": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.7.4.tgz", - "integrity": "sha512-Biq/d/WtvfftWZ9Uf39hbPBYDUo986m5Bb4zhkeYDGUllF43D+nUe5M6Vuo6/8JDK/0YX/uBdeoQpyaNhNugZQ==", + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.8.3.tgz", + "integrity": "sha512-5eFOm2SyFPK4Rh3XMMRDjN7lBH0orh3ss0g3rTYZnBQ+r6YPj7lgDyCvPphynHvUrobJmeMignBr6Acw9mAPlw==", "requires": { - "@babel/helper-explode-assignable-expression": "^7.7.4", - "@babel/types": "^7.7.4" + "@babel/helper-explode-assignable-expression": "^7.8.3", + "@babel/types": "^7.8.3" }, "dependencies": { "@babel/types": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.4.tgz", - "integrity": "sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==", + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.0.tgz", + "integrity": "sha512-BS9JKfXkzzJl8RluW4JGknzpiUV7ZrvTayM6yfqLTVBEnFtyowVIOu6rqxRd5cVO6yGoWf4T8u8dgK9oB+GCng==", "requires": { - "esutils": "^2.0.2", + "@babel/helper-validator-identifier": "^7.9.0", "lodash": "^4.17.13", "to-fast-properties": "^2.0.0" } @@ -226,20 +158,20 @@ } }, "@babel/helper-builder-react-jsx": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.7.4.tgz", - "integrity": "sha512-kvbfHJNN9dg4rkEM4xn1s8d1/h6TYNvajy9L1wx4qLn9HFg0IkTsQi4rfBe92nxrPUFcMsHoMV+8rU7MJb3fCA==", + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.9.0.tgz", + "integrity": "sha512-weiIo4gaoGgnhff54GQ3P5wsUQmnSwpkvU0r6ZHq6TzoSzKy4JxHEgnxNytaKbov2a9z/CVNyzliuCOUPEX3Jw==", "requires": { - "@babel/types": "^7.7.4", - "esutils": "^2.0.0" + "@babel/helper-annotate-as-pure": "^7.8.3", + "@babel/types": "^7.9.0" }, "dependencies": { "@babel/types": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.4.tgz", - "integrity": "sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==", + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.0.tgz", + "integrity": "sha512-BS9JKfXkzzJl8RluW4JGknzpiUV7ZrvTayM6yfqLTVBEnFtyowVIOu6rqxRd5cVO6yGoWf4T8u8dgK9oB+GCng==", "requires": { - "esutils": "^2.0.2", + "@babel/helper-validator-identifier": "^7.9.0", "lodash": "^4.17.13", "to-fast-properties": "^2.0.0" } @@ -284,104 +216,6 @@ } } }, - "@babel/helper-call-delegate": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/helper-call-delegate/-/helper-call-delegate-7.7.4.tgz", - "integrity": "sha512-8JH9/B7J7tCYJ2PpWVpw9JhPuEVHztagNVuQAFBVFYluRMlpG7F1CgKEgGeL6KFqcsIa92ZYVj6DSc0XwmN1ZA==", - "requires": { - "@babel/helper-hoist-variables": "^7.7.4", - "@babel/traverse": "^7.7.4", - "@babel/types": "^7.7.4" - }, - "dependencies": { - "@babel/generator": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.7.4.tgz", - "integrity": "sha512-m5qo2WgdOJeyYngKImbkyQrnUN1mPceaG5BV+G0E3gWsa4l/jCSryWJdM2x8OuGAOyh+3d5pVYfZWCiNFtynxg==", - "requires": { - "@babel/types": "^7.7.4", - "jsesc": "^2.5.1", - "lodash": "^4.17.13", - "source-map": "^0.5.0" - } - }, - "@babel/helper-function-name": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.7.4.tgz", - "integrity": "sha512-AnkGIdiBhEuiwdoMnKm7jfPfqItZhgRaZfMg1XX3bS25INOnLPjPG1Ppnajh8eqgt5kPJnfqrRHqFqmjKDZLzQ==", - "requires": { - "@babel/helper-get-function-arity": "^7.7.4", - "@babel/template": "^7.7.4", - "@babel/types": "^7.7.4" - } - }, - "@babel/helper-get-function-arity": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.4.tgz", - "integrity": "sha512-QTGKEdCkjgzgfJ3bAyRwF4yyT3pg+vDgan8DSivq1eS0gwi+KGKE5x8kRcbeFTb/673mkO5SN1IZfmCfA5o+EA==", - "requires": { - "@babel/types": "^7.7.4" - } - }, - "@babel/helper-split-export-declaration": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.4.tgz", - "integrity": "sha512-guAg1SXFcVr04Guk9eq0S4/rWS++sbmyqosJzVs8+1fH5NI+ZcmkaSkc7dmtAFbHFva6yRJnjW3yAcGxjueDug==", - "requires": { - "@babel/types": "^7.7.4" - } - }, - "@babel/parser": { - "version": "7.7.5", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.5.tgz", - "integrity": "sha512-KNlOe9+/nk4i29g0VXgl8PEXIRms5xKLJeuZ6UptN0fHv+jDiriG+y94X6qAgWTR0h3KaoM1wK5G5h7MHFRSig==" - }, - "@babel/template": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.4.tgz", - "integrity": "sha512-qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw==", - "requires": { - "@babel/code-frame": "^7.0.0", - "@babel/parser": "^7.7.4", - "@babel/types": "^7.7.4" - } - }, - "@babel/traverse": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.7.4.tgz", - "integrity": "sha512-P1L58hQyupn8+ezVA2z5KBm4/Zr4lCC8dwKCMYzsa5jFMDMQAzaBNy9W5VjB+KAmBjb40U7a/H6ao+Xo+9saIw==", - "requires": { - "@babel/code-frame": "^7.5.5", - "@babel/generator": "^7.7.4", - "@babel/helper-function-name": "^7.7.4", - "@babel/helper-split-export-declaration": "^7.7.4", - "@babel/parser": "^7.7.4", - "@babel/types": "^7.7.4", - "debug": "^4.1.0", - "globals": "^11.1.0", - "lodash": "^4.17.13" - } - }, - "@babel/types": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.4.tgz", - "integrity": "sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==", - "requires": { - "esutils": "^2.0.2", - "lodash": "^4.17.13", - "to-fast-properties": "^2.0.0" - } - }, - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "requires": { - "ms": "^2.1.1" - } - } - } - }, "@babel/helper-compilation-targets": { "version": "7.8.7", "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.8.7.tgz", @@ -555,54 +389,21 @@ } }, "@babel/helper-define-map": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.7.4.tgz", - "integrity": "sha512-v5LorqOa0nVQUvAUTUF3KPastvUt/HzByXNamKQ6RdJRTV7j8rLL+WB5C/MzzWAwOomxDhYFb1wLLxHqox86lg==", + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.8.3.tgz", + "integrity": "sha512-PoeBYtxoZGtct3md6xZOCWPcKuMuk3IHhgxsRRNtnNShebf4C8YonTSblsK4tvDbm+eJAw2HAPOfCr+Q/YRG/g==", "requires": { - "@babel/helper-function-name": "^7.7.4", - "@babel/types": "^7.7.4", + "@babel/helper-function-name": "^7.8.3", + "@babel/types": "^7.8.3", "lodash": "^4.17.13" }, "dependencies": { - "@babel/helper-function-name": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.7.4.tgz", - "integrity": "sha512-AnkGIdiBhEuiwdoMnKm7jfPfqItZhgRaZfMg1XX3bS25INOnLPjPG1Ppnajh8eqgt5kPJnfqrRHqFqmjKDZLzQ==", - "requires": { - "@babel/helper-get-function-arity": "^7.7.4", - "@babel/template": "^7.7.4", - "@babel/types": "^7.7.4" - } - }, - "@babel/helper-get-function-arity": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.4.tgz", - "integrity": "sha512-QTGKEdCkjgzgfJ3bAyRwF4yyT3pg+vDgan8DSivq1eS0gwi+KGKE5x8kRcbeFTb/673mkO5SN1IZfmCfA5o+EA==", - "requires": { - "@babel/types": "^7.7.4" - } - }, - "@babel/parser": { - "version": "7.7.5", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.5.tgz", - "integrity": "sha512-KNlOe9+/nk4i29g0VXgl8PEXIRms5xKLJeuZ6UptN0fHv+jDiriG+y94X6qAgWTR0h3KaoM1wK5G5h7MHFRSig==" - }, - "@babel/template": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.4.tgz", - "integrity": "sha512-qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw==", - "requires": { - "@babel/code-frame": "^7.0.0", - "@babel/parser": "^7.7.4", - "@babel/types": "^7.7.4" - } - }, "@babel/types": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.4.tgz", - "integrity": "sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==", + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.0.tgz", + "integrity": "sha512-BS9JKfXkzzJl8RluW4JGknzpiUV7ZrvTayM6yfqLTVBEnFtyowVIOu6rqxRd5cVO6yGoWf4T8u8dgK9oB+GCng==", "requires": { - "esutils": "^2.0.2", + "@babel/helper-validator-identifier": "^7.9.0", "lodash": "^4.17.13", "to-fast-properties": "^2.0.0" } @@ -610,99 +411,23 @@ } }, "@babel/helper-explode-assignable-expression": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.7.4.tgz", - "integrity": "sha512-2/SicuFrNSXsZNBxe5UGdLr+HZg+raWBLE9vC98bdYOKX/U6PY0mdGlYUJdtTDPSU0Lw0PNbKKDpwYHJLn2jLg==", + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.8.3.tgz", + "integrity": "sha512-N+8eW86/Kj147bO9G2uclsg5pwfs/fqqY5rwgIL7eTBklgXjcOJ3btzS5iM6AitJcftnY7pm2lGsrJVYLGjzIw==", "requires": { - "@babel/traverse": "^7.7.4", - "@babel/types": "^7.7.4" + "@babel/traverse": "^7.8.3", + "@babel/types": "^7.8.3" }, "dependencies": { - "@babel/generator": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.7.4.tgz", - "integrity": "sha512-m5qo2WgdOJeyYngKImbkyQrnUN1mPceaG5BV+G0E3gWsa4l/jCSryWJdM2x8OuGAOyh+3d5pVYfZWCiNFtynxg==", - "requires": { - "@babel/types": "^7.7.4", - "jsesc": "^2.5.1", - "lodash": "^4.17.13", - "source-map": "^0.5.0" - } - }, - "@babel/helper-function-name": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.7.4.tgz", - "integrity": "sha512-AnkGIdiBhEuiwdoMnKm7jfPfqItZhgRaZfMg1XX3bS25INOnLPjPG1Ppnajh8eqgt5kPJnfqrRHqFqmjKDZLzQ==", - "requires": { - "@babel/helper-get-function-arity": "^7.7.4", - "@babel/template": "^7.7.4", - "@babel/types": "^7.7.4" - } - }, - "@babel/helper-get-function-arity": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.4.tgz", - "integrity": "sha512-QTGKEdCkjgzgfJ3bAyRwF4yyT3pg+vDgan8DSivq1eS0gwi+KGKE5x8kRcbeFTb/673mkO5SN1IZfmCfA5o+EA==", - "requires": { - "@babel/types": "^7.7.4" - } - }, - "@babel/helper-split-export-declaration": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.4.tgz", - "integrity": "sha512-guAg1SXFcVr04Guk9eq0S4/rWS++sbmyqosJzVs8+1fH5NI+ZcmkaSkc7dmtAFbHFva6yRJnjW3yAcGxjueDug==", - "requires": { - "@babel/types": "^7.7.4" - } - }, - "@babel/parser": { - "version": "7.7.5", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.5.tgz", - "integrity": "sha512-KNlOe9+/nk4i29g0VXgl8PEXIRms5xKLJeuZ6UptN0fHv+jDiriG+y94X6qAgWTR0h3KaoM1wK5G5h7MHFRSig==" - }, - "@babel/template": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.4.tgz", - "integrity": "sha512-qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw==", - "requires": { - "@babel/code-frame": "^7.0.0", - "@babel/parser": "^7.7.4", - "@babel/types": "^7.7.4" - } - }, - "@babel/traverse": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.7.4.tgz", - "integrity": "sha512-P1L58hQyupn8+ezVA2z5KBm4/Zr4lCC8dwKCMYzsa5jFMDMQAzaBNy9W5VjB+KAmBjb40U7a/H6ao+Xo+9saIw==", - "requires": { - "@babel/code-frame": "^7.5.5", - "@babel/generator": "^7.7.4", - "@babel/helper-function-name": "^7.7.4", - "@babel/helper-split-export-declaration": "^7.7.4", - "@babel/parser": "^7.7.4", - "@babel/types": "^7.7.4", - "debug": "^4.1.0", - "globals": "^11.1.0", - "lodash": "^4.17.13" - } - }, "@babel/types": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.4.tgz", - "integrity": "sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==", + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.0.tgz", + "integrity": "sha512-BS9JKfXkzzJl8RluW4JGknzpiUV7ZrvTayM6yfqLTVBEnFtyowVIOu6rqxRd5cVO6yGoWf4T8u8dgK9oB+GCng==", "requires": { - "esutils": "^2.0.2", + "@babel/helper-validator-identifier": "^7.9.0", "lodash": "^4.17.13", "to-fast-properties": "^2.0.0" } - }, - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "requires": { - "ms": "^2.1.1" - } } } }, @@ -749,19 +474,19 @@ } }, "@babel/helper-hoist-variables": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.7.4.tgz", - "integrity": "sha512-wQC4xyvc1Jo/FnLirL6CEgPgPCa8M74tOdjWpRhQYapz5JC7u3NYU1zCVoVAGCE3EaIP9T1A3iW0WLJ+reZlpQ==", + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.8.3.tgz", + "integrity": "sha512-ky1JLOjcDUtSc+xkt0xhYff7Z6ILTAHKmZLHPxAhOP0Nd77O+3nCsd6uSVYur6nJnCI029CrNbYlc0LoPfAPQg==", "requires": { - "@babel/types": "^7.7.4" + "@babel/types": "^7.8.3" }, "dependencies": { "@babel/types": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.4.tgz", - "integrity": "sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==", + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.0.tgz", + "integrity": "sha512-BS9JKfXkzzJl8RluW4JGknzpiUV7ZrvTayM6yfqLTVBEnFtyowVIOu6rqxRd5cVO6yGoWf4T8u8dgK9oB+GCng==", "requires": { - "esutils": "^2.0.2", + "@babel/helper-validator-identifier": "^7.9.0", "lodash": "^4.17.13", "to-fast-properties": "^2.0.0" } @@ -769,19 +494,19 @@ } }, "@babel/helper-member-expression-to-functions": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.7.4.tgz", - "integrity": "sha512-9KcA1X2E3OjXl/ykfMMInBK+uVdfIVakVe7W7Lg3wfXUNyS3Q1HWLFRwZIjhqiCGbslummPDnmb7vIekS0C1vw==", + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.8.3.tgz", + "integrity": "sha512-fO4Egq88utkQFjbPrSHGmGLFqmrshs11d46WI+WZDESt7Wu7wN2G2Iu+NMMZJFDOVRHAMIkB5SNh30NtwCA7RA==", "requires": { - "@babel/types": "^7.7.4" + "@babel/types": "^7.8.3" }, "dependencies": { "@babel/types": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.4.tgz", - "integrity": "sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==", + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.0.tgz", + "integrity": "sha512-BS9JKfXkzzJl8RluW4JGknzpiUV7ZrvTayM6yfqLTVBEnFtyowVIOu6rqxRd5cVO6yGoWf4T8u8dgK9oB+GCng==", "requires": { - "esutils": "^2.0.2", + "@babel/helper-validator-identifier": "^7.9.0", "lodash": "^4.17.13", "to-fast-properties": "^2.0.0" } @@ -789,19 +514,19 @@ } }, "@babel/helper-module-imports": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.7.4.tgz", - "integrity": "sha512-dGcrX6K9l8258WFjyDLJwuVKxR4XZfU0/vTUgOQYWEnRD8mgr+p4d6fCUMq/ys0h4CCt/S5JhbvtyErjWouAUQ==", + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz", + "integrity": "sha512-R0Bx3jippsbAEtzkpZ/6FIiuzOURPcMjHp+Z6xPe6DtApDJx+w7UYyOLanZqO8+wKR9G10s/FmHXvxaMd9s6Kg==", "requires": { - "@babel/types": "^7.7.4" + "@babel/types": "^7.8.3" }, "dependencies": { "@babel/types": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.4.tgz", - "integrity": "sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==", + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.0.tgz", + "integrity": "sha512-BS9JKfXkzzJl8RluW4JGknzpiUV7ZrvTayM6yfqLTVBEnFtyowVIOu6rqxRd5cVO6yGoWf4T8u8dgK9oB+GCng==", "requires": { - "esutils": "^2.0.2", + "@babel/helper-validator-identifier": "^7.9.0", "lodash": "^4.17.13", "to-fast-properties": "^2.0.0" } @@ -809,47 +534,58 @@ } }, "@babel/helper-module-transforms": { - "version": "7.7.5", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.7.5.tgz", - "integrity": "sha512-A7pSxyJf1gN5qXVcidwLWydjftUN878VkalhXX5iQDuGyiGK3sOrrKKHF4/A4fwHtnsotv/NipwAeLzY4KQPvw==", - "requires": { - "@babel/helper-module-imports": "^7.7.4", - "@babel/helper-simple-access": "^7.7.4", - "@babel/helper-split-export-declaration": "^7.7.4", - "@babel/template": "^7.7.4", - "@babel/types": "^7.7.4", + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz", + "integrity": "sha512-0FvKyu0gpPfIQ8EkxlrAydOWROdHpBmiCiRwLkUiBGhCUPRRbVD2/tm3sFr/c/GWFrQ/ffutGUAnx7V0FzT2wA==", + "requires": { + "@babel/helper-module-imports": "^7.8.3", + "@babel/helper-replace-supers": "^7.8.6", + "@babel/helper-simple-access": "^7.8.3", + "@babel/helper-split-export-declaration": "^7.8.3", + "@babel/template": "^7.8.6", + "@babel/types": "^7.9.0", "lodash": "^4.17.13" }, "dependencies": { - "@babel/helper-split-export-declaration": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.4.tgz", - "integrity": "sha512-guAg1SXFcVr04Guk9eq0S4/rWS++sbmyqosJzVs8+1fH5NI+ZcmkaSkc7dmtAFbHFva6yRJnjW3yAcGxjueDug==", + "@babel/code-frame": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", + "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", "requires": { - "@babel/types": "^7.7.4" + "@babel/highlight": "^7.8.3" + } + }, + "@babel/highlight": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz", + "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==", + "requires": { + "@babel/helper-validator-identifier": "^7.9.0", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" } }, "@babel/parser": { - "version": "7.7.5", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.5.tgz", - "integrity": "sha512-KNlOe9+/nk4i29g0VXgl8PEXIRms5xKLJeuZ6UptN0fHv+jDiriG+y94X6qAgWTR0h3KaoM1wK5G5h7MHFRSig==" + "version": "7.9.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz", + "integrity": "sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==" }, "@babel/template": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.4.tgz", - "integrity": "sha512-qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw==", + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz", + "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==", "requires": { - "@babel/code-frame": "^7.0.0", - "@babel/parser": "^7.7.4", - "@babel/types": "^7.7.4" + "@babel/code-frame": "^7.8.3", + "@babel/parser": "^7.8.6", + "@babel/types": "^7.8.6" } }, "@babel/types": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.4.tgz", - "integrity": "sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==", + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.0.tgz", + "integrity": "sha512-BS9JKfXkzzJl8RluW4JGknzpiUV7ZrvTayM6yfqLTVBEnFtyowVIOu6rqxRd5cVO6yGoWf4T8u8dgK9oB+GCng==", "requires": { - "esutils": "^2.0.2", + "@babel/helper-validator-identifier": "^7.9.0", "lodash": "^4.17.13", "to-fast-properties": "^2.0.0" } @@ -857,19 +593,19 @@ } }, "@babel/helper-optimise-call-expression": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.7.4.tgz", - "integrity": "sha512-VB7gWZ2fDkSuqW6b1AKXkJWO5NyNI3bFL/kK79/30moK57blr6NbH8xcl2XcKCwOmJosftWunZqfO84IGq3ZZg==", + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.8.3.tgz", + "integrity": "sha512-Kag20n86cbO2AvHca6EJsvqAd82gc6VMGule4HwebwMlwkpXuVqrNRj6CkCV2sKxgi9MyAUnZVnZ6lJ1/vKhHQ==", "requires": { - "@babel/types": "^7.7.4" + "@babel/types": "^7.8.3" }, "dependencies": { "@babel/types": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.4.tgz", - "integrity": "sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==", + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.0.tgz", + "integrity": "sha512-BS9JKfXkzzJl8RluW4JGknzpiUV7ZrvTayM6yfqLTVBEnFtyowVIOu6rqxRd5cVO6yGoWf4T8u8dgK9oB+GCng==", "requires": { - "esutils": "^2.0.2", + "@babel/helper-validator-identifier": "^7.9.0", "lodash": "^4.17.13", "to-fast-properties": "^2.0.0" } @@ -890,190 +626,96 @@ } }, "@babel/helper-remap-async-to-generator": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.7.4.tgz", - "integrity": "sha512-Sk4xmtVdM9sA/jCI80f+KS+Md+ZHIpjuqmYPk1M7F/upHou5e4ReYmExAiu6PVe65BhJPZA2CY9x9k4BqE5klw==", + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.8.3.tgz", + "integrity": "sha512-kgwDmw4fCg7AVgS4DukQR/roGp+jP+XluJE5hsRZwxCYGg+Rv9wSGErDWhlI90FODdYfd4xG4AQRiMDjjN0GzA==", "requires": { - "@babel/helper-annotate-as-pure": "^7.7.4", - "@babel/helper-wrap-function": "^7.7.4", - "@babel/template": "^7.7.4", - "@babel/traverse": "^7.7.4", - "@babel/types": "^7.7.4" + "@babel/helper-annotate-as-pure": "^7.8.3", + "@babel/helper-wrap-function": "^7.8.3", + "@babel/template": "^7.8.3", + "@babel/traverse": "^7.8.3", + "@babel/types": "^7.8.3" }, "dependencies": { - "@babel/generator": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.7.4.tgz", - "integrity": "sha512-m5qo2WgdOJeyYngKImbkyQrnUN1mPceaG5BV+G0E3gWsa4l/jCSryWJdM2x8OuGAOyh+3d5pVYfZWCiNFtynxg==", - "requires": { - "@babel/types": "^7.7.4", - "jsesc": "^2.5.1", - "lodash": "^4.17.13", - "source-map": "^0.5.0" - } - }, - "@babel/helper-function-name": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.7.4.tgz", - "integrity": "sha512-AnkGIdiBhEuiwdoMnKm7jfPfqItZhgRaZfMg1XX3bS25INOnLPjPG1Ppnajh8eqgt5kPJnfqrRHqFqmjKDZLzQ==", - "requires": { - "@babel/helper-get-function-arity": "^7.7.4", - "@babel/template": "^7.7.4", - "@babel/types": "^7.7.4" - } - }, - "@babel/helper-get-function-arity": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.4.tgz", - "integrity": "sha512-QTGKEdCkjgzgfJ3bAyRwF4yyT3pg+vDgan8DSivq1eS0gwi+KGKE5x8kRcbeFTb/673mkO5SN1IZfmCfA5o+EA==", - "requires": { - "@babel/types": "^7.7.4" - } - }, - "@babel/helper-split-export-declaration": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.4.tgz", - "integrity": "sha512-guAg1SXFcVr04Guk9eq0S4/rWS++sbmyqosJzVs8+1fH5NI+ZcmkaSkc7dmtAFbHFva6yRJnjW3yAcGxjueDug==", - "requires": { - "@babel/types": "^7.7.4" - } - }, - "@babel/parser": { - "version": "7.7.5", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.5.tgz", - "integrity": "sha512-KNlOe9+/nk4i29g0VXgl8PEXIRms5xKLJeuZ6UptN0fHv+jDiriG+y94X6qAgWTR0h3KaoM1wK5G5h7MHFRSig==" - }, - "@babel/template": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.4.tgz", - "integrity": "sha512-qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw==", - "requires": { - "@babel/code-frame": "^7.0.0", - "@babel/parser": "^7.7.4", - "@babel/types": "^7.7.4" - } - }, - "@babel/traverse": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.7.4.tgz", - "integrity": "sha512-P1L58hQyupn8+ezVA2z5KBm4/Zr4lCC8dwKCMYzsa5jFMDMQAzaBNy9W5VjB+KAmBjb40U7a/H6ao+Xo+9saIw==", - "requires": { - "@babel/code-frame": "^7.5.5", - "@babel/generator": "^7.7.4", - "@babel/helper-function-name": "^7.7.4", - "@babel/helper-split-export-declaration": "^7.7.4", - "@babel/parser": "^7.7.4", - "@babel/types": "^7.7.4", - "debug": "^4.1.0", - "globals": "^11.1.0", - "lodash": "^4.17.13" - } - }, "@babel/types": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.4.tgz", - "integrity": "sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==", + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.0.tgz", + "integrity": "sha512-BS9JKfXkzzJl8RluW4JGknzpiUV7ZrvTayM6yfqLTVBEnFtyowVIOu6rqxRd5cVO6yGoWf4T8u8dgK9oB+GCng==", "requires": { - "esutils": "^2.0.2", + "@babel/helper-validator-identifier": "^7.9.0", "lodash": "^4.17.13", "to-fast-properties": "^2.0.0" } - }, - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "requires": { - "ms": "^2.1.1" - } } } }, "@babel/helper-replace-supers": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.7.4.tgz", - "integrity": "sha512-pP0tfgg9hsZWo5ZboYGuBn/bbYT/hdLPVSS4NMmiRJdwWhP0IznPwN9AE1JwyGsjSPLC364I0Qh5p+EPkGPNpg==", + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.8.6.tgz", + "integrity": "sha512-PeMArdA4Sv/Wf4zXwBKPqVj7n9UF/xg6slNRtZW84FM7JpE1CbG8B612FyM4cxrf4fMAMGO0kR7voy1ForHHFA==", "requires": { - "@babel/helper-member-expression-to-functions": "^7.7.4", - "@babel/helper-optimise-call-expression": "^7.7.4", - "@babel/traverse": "^7.7.4", - "@babel/types": "^7.7.4" + "@babel/helper-member-expression-to-functions": "^7.8.3", + "@babel/helper-optimise-call-expression": "^7.8.3", + "@babel/traverse": "^7.8.6", + "@babel/types": "^7.8.6" }, "dependencies": { + "@babel/code-frame": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", + "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", + "requires": { + "@babel/highlight": "^7.8.3" + } + }, "@babel/generator": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.7.4.tgz", - "integrity": "sha512-m5qo2WgdOJeyYngKImbkyQrnUN1mPceaG5BV+G0E3gWsa4l/jCSryWJdM2x8OuGAOyh+3d5pVYfZWCiNFtynxg==", + "version": "7.9.4", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.4.tgz", + "integrity": "sha512-rjP8ahaDy/ouhrvCoU1E5mqaitWrxwuNGU+dy1EpaoK48jZay4MdkskKGIMHLZNewg8sAsqpGSREJwP0zH3YQA==", "requires": { - "@babel/types": "^7.7.4", + "@babel/types": "^7.9.0", "jsesc": "^2.5.1", "lodash": "^4.17.13", "source-map": "^0.5.0" } }, - "@babel/helper-function-name": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.7.4.tgz", - "integrity": "sha512-AnkGIdiBhEuiwdoMnKm7jfPfqItZhgRaZfMg1XX3bS25INOnLPjPG1Ppnajh8eqgt5kPJnfqrRHqFqmjKDZLzQ==", - "requires": { - "@babel/helper-get-function-arity": "^7.7.4", - "@babel/template": "^7.7.4", - "@babel/types": "^7.7.4" - } - }, - "@babel/helper-get-function-arity": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.4.tgz", - "integrity": "sha512-QTGKEdCkjgzgfJ3bAyRwF4yyT3pg+vDgan8DSivq1eS0gwi+KGKE5x8kRcbeFTb/673mkO5SN1IZfmCfA5o+EA==", - "requires": { - "@babel/types": "^7.7.4" - } - }, - "@babel/helper-split-export-declaration": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.4.tgz", - "integrity": "sha512-guAg1SXFcVr04Guk9eq0S4/rWS++sbmyqosJzVs8+1fH5NI+ZcmkaSkc7dmtAFbHFva6yRJnjW3yAcGxjueDug==", + "@babel/highlight": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz", + "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==", "requires": { - "@babel/types": "^7.7.4" + "@babel/helper-validator-identifier": "^7.9.0", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" } }, "@babel/parser": { - "version": "7.7.5", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.5.tgz", - "integrity": "sha512-KNlOe9+/nk4i29g0VXgl8PEXIRms5xKLJeuZ6UptN0fHv+jDiriG+y94X6qAgWTR0h3KaoM1wK5G5h7MHFRSig==" - }, - "@babel/template": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.4.tgz", - "integrity": "sha512-qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw==", - "requires": { - "@babel/code-frame": "^7.0.0", - "@babel/parser": "^7.7.4", - "@babel/types": "^7.7.4" - } + "version": "7.9.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz", + "integrity": "sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==" }, "@babel/traverse": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.7.4.tgz", - "integrity": "sha512-P1L58hQyupn8+ezVA2z5KBm4/Zr4lCC8dwKCMYzsa5jFMDMQAzaBNy9W5VjB+KAmBjb40U7a/H6ao+Xo+9saIw==", - "requires": { - "@babel/code-frame": "^7.5.5", - "@babel/generator": "^7.7.4", - "@babel/helper-function-name": "^7.7.4", - "@babel/helper-split-export-declaration": "^7.7.4", - "@babel/parser": "^7.7.4", - "@babel/types": "^7.7.4", + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.0.tgz", + "integrity": "sha512-jAZQj0+kn4WTHO5dUZkZKhbFrqZE7K5LAQ5JysMnmvGij+wOdr+8lWqPeW0BcF4wFwrEXXtdGO7wcV6YPJcf3w==", + "requires": { + "@babel/code-frame": "^7.8.3", + "@babel/generator": "^7.9.0", + "@babel/helper-function-name": "^7.8.3", + "@babel/helper-split-export-declaration": "^7.8.3", + "@babel/parser": "^7.9.0", + "@babel/types": "^7.9.0", "debug": "^4.1.0", "globals": "^11.1.0", "lodash": "^4.17.13" } }, "@babel/types": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.4.tgz", - "integrity": "sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==", + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.0.tgz", + "integrity": "sha512-BS9JKfXkzzJl8RluW4JGknzpiUV7ZrvTayM6yfqLTVBEnFtyowVIOu6rqxRd5cVO6yGoWf4T8u8dgK9oB+GCng==", "requires": { - "esutils": "^2.0.2", + "@babel/helper-validator-identifier": "^7.9.0", "lodash": "^4.17.13", "to-fast-properties": "^2.0.0" } @@ -1089,35 +731,20 @@ } }, "@babel/helper-simple-access": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.7.4.tgz", - "integrity": "sha512-zK7THeEXfan7UlWsG2A6CI/L9jVnI5+xxKZOdej39Y0YtDYKx9raHk5F2EtK9K8DHRTihYwg20ADt9S36GR78A==", + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.8.3.tgz", + "integrity": "sha512-VNGUDjx5cCWg4vvCTR8qQ7YJYZ+HBjxOgXEl7ounz+4Sn7+LMD3CFrCTEU6/qXKbA2nKg21CwhhBzO0RpRbdCw==", "requires": { - "@babel/template": "^7.7.4", - "@babel/types": "^7.7.4" + "@babel/template": "^7.8.3", + "@babel/types": "^7.8.3" }, "dependencies": { - "@babel/parser": { - "version": "7.7.5", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.5.tgz", - "integrity": "sha512-KNlOe9+/nk4i29g0VXgl8PEXIRms5xKLJeuZ6UptN0fHv+jDiriG+y94X6qAgWTR0h3KaoM1wK5G5h7MHFRSig==" - }, - "@babel/template": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.4.tgz", - "integrity": "sha512-qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw==", - "requires": { - "@babel/code-frame": "^7.0.0", - "@babel/parser": "^7.7.4", - "@babel/types": "^7.7.4" - } - }, "@babel/types": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.4.tgz", - "integrity": "sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==", + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.0.tgz", + "integrity": "sha512-BS9JKfXkzzJl8RluW4JGknzpiUV7ZrvTayM6yfqLTVBEnFtyowVIOu6rqxRd5cVO6yGoWf4T8u8dgK9oB+GCng==", "requires": { - "esutils": "^2.0.2", + "@babel/helper-validator-identifier": "^7.9.0", "lodash": "^4.17.13", "to-fast-properties": "^2.0.0" } @@ -1150,90 +777,94 @@ "integrity": "sha512-6G8bQKjOh+of4PV/ThDm/rRqlU7+IGoJuofpagU5GlEl29Vv0RGqqt86ZGRV8ZuSOY3o+8yXl5y782SMcG7SHw==" }, "@babel/helper-wrap-function": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.7.4.tgz", - "integrity": "sha512-VsfzZt6wmsocOaVU0OokwrIytHND55yvyT4BPB9AIIgwr8+x7617hetdJTsuGwygN5RC6mxA9EJztTjuwm2ofg==", + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.8.3.tgz", + "integrity": "sha512-LACJrbUET9cQDzb6kG7EeD7+7doC3JNvUgTEQOx2qaO1fKlzE/Bf05qs9w1oXQMmXlPO65lC3Tq9S6gZpTErEQ==", "requires": { - "@babel/helper-function-name": "^7.7.4", - "@babel/template": "^7.7.4", - "@babel/traverse": "^7.7.4", - "@babel/types": "^7.7.4" + "@babel/helper-function-name": "^7.8.3", + "@babel/template": "^7.8.3", + "@babel/traverse": "^7.8.3", + "@babel/types": "^7.8.3" }, "dependencies": { - "@babel/generator": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.7.4.tgz", - "integrity": "sha512-m5qo2WgdOJeyYngKImbkyQrnUN1mPceaG5BV+G0E3gWsa4l/jCSryWJdM2x8OuGAOyh+3d5pVYfZWCiNFtynxg==", + "@babel/types": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.0.tgz", + "integrity": "sha512-BS9JKfXkzzJl8RluW4JGknzpiUV7ZrvTayM6yfqLTVBEnFtyowVIOu6rqxRd5cVO6yGoWf4T8u8dgK9oB+GCng==", "requires": { - "@babel/types": "^7.7.4", - "jsesc": "^2.5.1", + "@babel/helper-validator-identifier": "^7.9.0", "lodash": "^4.17.13", - "source-map": "^0.5.0" + "to-fast-properties": "^2.0.0" } - }, - "@babel/helper-function-name": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.7.4.tgz", - "integrity": "sha512-AnkGIdiBhEuiwdoMnKm7jfPfqItZhgRaZfMg1XX3bS25INOnLPjPG1Ppnajh8eqgt5kPJnfqrRHqFqmjKDZLzQ==", + } + } + }, + "@babel/helpers": { + "version": "7.9.2", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.2.tgz", + "integrity": "sha512-JwLvzlXVPjO8eU9c/wF9/zOIN7X6h8DYf7mG4CiFRZRvZNKEF5dQ3H3V+ASkHoIB3mWhatgl5ONhyqHRI6MppA==", + "requires": { + "@babel/template": "^7.8.3", + "@babel/traverse": "^7.9.0", + "@babel/types": "^7.9.0" + }, + "dependencies": { + "@babel/code-frame": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", + "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", "requires": { - "@babel/helper-get-function-arity": "^7.7.4", - "@babel/template": "^7.7.4", - "@babel/types": "^7.7.4" + "@babel/highlight": "^7.8.3" } }, - "@babel/helper-get-function-arity": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.4.tgz", - "integrity": "sha512-QTGKEdCkjgzgfJ3bAyRwF4yyT3pg+vDgan8DSivq1eS0gwi+KGKE5x8kRcbeFTb/673mkO5SN1IZfmCfA5o+EA==", + "@babel/generator": { + "version": "7.9.4", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.4.tgz", + "integrity": "sha512-rjP8ahaDy/ouhrvCoU1E5mqaitWrxwuNGU+dy1EpaoK48jZay4MdkskKGIMHLZNewg8sAsqpGSREJwP0zH3YQA==", "requires": { - "@babel/types": "^7.7.4" + "@babel/types": "^7.9.0", + "jsesc": "^2.5.1", + "lodash": "^4.17.13", + "source-map": "^0.5.0" } }, - "@babel/helper-split-export-declaration": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.4.tgz", - "integrity": "sha512-guAg1SXFcVr04Guk9eq0S4/rWS++sbmyqosJzVs8+1fH5NI+ZcmkaSkc7dmtAFbHFva6yRJnjW3yAcGxjueDug==", + "@babel/highlight": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz", + "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==", "requires": { - "@babel/types": "^7.7.4" + "@babel/helper-validator-identifier": "^7.9.0", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" } }, "@babel/parser": { - "version": "7.7.5", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.5.tgz", - "integrity": "sha512-KNlOe9+/nk4i29g0VXgl8PEXIRms5xKLJeuZ6UptN0fHv+jDiriG+y94X6qAgWTR0h3KaoM1wK5G5h7MHFRSig==" - }, - "@babel/template": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.4.tgz", - "integrity": "sha512-qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw==", - "requires": { - "@babel/code-frame": "^7.0.0", - "@babel/parser": "^7.7.4", - "@babel/types": "^7.7.4" - } + "version": "7.9.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz", + "integrity": "sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==" }, "@babel/traverse": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.7.4.tgz", - "integrity": "sha512-P1L58hQyupn8+ezVA2z5KBm4/Zr4lCC8dwKCMYzsa5jFMDMQAzaBNy9W5VjB+KAmBjb40U7a/H6ao+Xo+9saIw==", - "requires": { - "@babel/code-frame": "^7.5.5", - "@babel/generator": "^7.7.4", - "@babel/helper-function-name": "^7.7.4", - "@babel/helper-split-export-declaration": "^7.7.4", - "@babel/parser": "^7.7.4", - "@babel/types": "^7.7.4", + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.0.tgz", + "integrity": "sha512-jAZQj0+kn4WTHO5dUZkZKhbFrqZE7K5LAQ5JysMnmvGij+wOdr+8lWqPeW0BcF4wFwrEXXtdGO7wcV6YPJcf3w==", + "requires": { + "@babel/code-frame": "^7.8.3", + "@babel/generator": "^7.9.0", + "@babel/helper-function-name": "^7.8.3", + "@babel/helper-split-export-declaration": "^7.8.3", + "@babel/parser": "^7.9.0", + "@babel/types": "^7.9.0", "debug": "^4.1.0", "globals": "^11.1.0", "lodash": "^4.17.13" } }, "@babel/types": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.4.tgz", - "integrity": "sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==", + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.0.tgz", + "integrity": "sha512-BS9JKfXkzzJl8RluW4JGknzpiUV7ZrvTayM6yfqLTVBEnFtyowVIOu6rqxRd5cVO6yGoWf4T8u8dgK9oB+GCng==", "requires": { - "esutils": "^2.0.2", + "@babel/helper-validator-identifier": "^7.9.0", "lodash": "^4.17.13", "to-fast-properties": "^2.0.0" } @@ -1248,126 +879,10 @@ } } }, - "@babel/helpers": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.8.3.tgz", - "integrity": "sha512-LmU3q9Pah/XyZU89QvBgGt+BCsTPoQa+73RxAQh8fb8qkDyIfeQnmgs+hvzhTCKTzqOyk7JTkS3MS1S8Mq5yrQ==", - "requires": { - "@babel/template": "^7.8.3", - "@babel/traverse": "^7.8.3", - "@babel/types": "^7.8.3" - }, - "dependencies": { - "@babel/code-frame": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", - "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", - "requires": { - "@babel/highlight": "^7.8.3" - } - }, - "@babel/generator": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.8.3.tgz", - "integrity": "sha512-WjoPk8hRpDRqqzRpvaR8/gDUPkrnOOeuT2m8cNICJtZH6mwaCo3v0OKMI7Y6SM1pBtyijnLtAL0HDi41pf41ug==", - "requires": { - "@babel/types": "^7.8.3", - "jsesc": "^2.5.1", - "lodash": "^4.17.13", - "source-map": "^0.5.0" - } - }, - "@babel/helper-function-name": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.8.3.tgz", - "integrity": "sha512-BCxgX1BC2hD/oBlIFUgOCQDOPV8nSINxCwM3o93xP4P9Fq6aV5sgv2cOOITDMtCfQ+3PvHp3l689XZvAM9QyOA==", - "requires": { - "@babel/helper-get-function-arity": "^7.8.3", - "@babel/template": "^7.8.3", - "@babel/types": "^7.8.3" - } - }, - "@babel/helper-get-function-arity": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz", - "integrity": "sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==", - "requires": { - "@babel/types": "^7.8.3" - } - }, - "@babel/helper-split-export-declaration": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz", - "integrity": "sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==", - "requires": { - "@babel/types": "^7.8.3" - } - }, - "@babel/highlight": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.8.3.tgz", - "integrity": "sha512-PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg==", - "requires": { - "chalk": "^2.0.0", - "esutils": "^2.0.2", - "js-tokens": "^4.0.0" - } - }, - "@babel/parser": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.8.3.tgz", - "integrity": "sha512-/V72F4Yp/qmHaTALizEm9Gf2eQHV3QyTL3K0cNfijwnMnb1L+LDlAubb/ZnSdGAVzVSWakujHYs1I26x66sMeQ==" - }, - "@babel/template": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.3.tgz", - "integrity": "sha512-04m87AcQgAFdvuoyiQ2kgELr2tV8B4fP/xJAVUL3Yb3bkNdMedD3d0rlSQr3PegP0cms3eHjl1F7PWlvWbU8FQ==", - "requires": { - "@babel/code-frame": "^7.8.3", - "@babel/parser": "^7.8.3", - "@babel/types": "^7.8.3" - } - }, - "@babel/traverse": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.8.3.tgz", - "integrity": "sha512-we+a2lti+eEImHmEXp7bM9cTxGzxPmBiVJlLVD+FuuQMeeO7RaDbutbgeheDkw+Xe3mCfJHnGOWLswT74m2IPg==", - "requires": { - "@babel/code-frame": "^7.8.3", - "@babel/generator": "^7.8.3", - "@babel/helper-function-name": "^7.8.3", - "@babel/helper-split-export-declaration": "^7.8.3", - "@babel/parser": "^7.8.3", - "@babel/types": "^7.8.3", - "debug": "^4.1.0", - "globals": "^11.1.0", - "lodash": "^4.17.13" - } - }, - "@babel/types": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.3.tgz", - "integrity": "sha512-jBD+G8+LWpMBBWvVcdr4QysjUE4mU/syrhN17o1u3gx0/WzJB1kwiVZAXRtWbsIPOwW8pF/YJV5+nmetPzepXg==", - "requires": { - "esutils": "^2.0.2", - "lodash": "^4.17.13", - "to-fast-properties": "^2.0.0" - } - }, - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "requires": { - "ms": "^2.1.1" - } - } - } - }, - "@babel/highlight": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.5.0.tgz", - "integrity": "sha512-7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ==", + "@babel/highlight": { + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.5.0.tgz", + "integrity": "sha512-7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ==", "requires": { "chalk": "^2.0.0", "esutils": "^2.0.2", @@ -1380,13 +895,20 @@ "integrity": "sha512-0fKu/QqildpXmPVaRBoXOlyBb3MC+J0A66x97qEfLOMkn3u6nfY5esWogQwi/K0BjASYy4DbnsEWnpNL6qT5Mw==" }, "@babel/plugin-proposal-async-generator-functions": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.7.4.tgz", - "integrity": "sha512-1ypyZvGRXriY/QP668+s8sFr2mqinhkRDMPSQLNghCQE+GAkFtp+wkHVvg2+Hdki8gwP+NFzJBJ/N1BfzCCDEw==", + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.8.3.tgz", + "integrity": "sha512-NZ9zLv848JsV3hs8ryEh7Uaz/0KsmPLqv0+PdkDJL1cJy0K4kOCFa8zc1E3mp+RHPQcpdfb/6GovEsW4VDrOMw==", "requires": { - "@babel/helper-plugin-utils": "^7.0.0", - "@babel/helper-remap-async-to-generator": "^7.7.4", - "@babel/plugin-syntax-async-generators": "^7.7.4" + "@babel/helper-plugin-utils": "^7.8.3", + "@babel/helper-remap-async-to-generator": "^7.8.3", + "@babel/plugin-syntax-async-generators": "^7.8.0" + }, + "dependencies": { + "@babel/helper-plugin-utils": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", + "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" + } } }, "@babel/plugin-proposal-class-properties": { @@ -1406,21 +928,35 @@ } }, "@babel/plugin-proposal-dynamic-import": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.7.4.tgz", - "integrity": "sha512-StH+nGAdO6qDB1l8sZ5UBV8AC3F2VW2I8Vfld73TMKyptMU9DY5YsJAS8U81+vEtxcH3Y/La0wG0btDrhpnhjQ==", + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.8.3.tgz", + "integrity": "sha512-NyaBbyLFXFLT9FP+zk0kYlUlA8XtCUbehs67F0nnEg7KICgMc2mNkIeu9TYhKzyXMkrapZFwAhXLdnt4IYHy1w==", "requires": { - "@babel/helper-plugin-utils": "^7.0.0", - "@babel/plugin-syntax-dynamic-import": "^7.7.4" + "@babel/helper-plugin-utils": "^7.8.3", + "@babel/plugin-syntax-dynamic-import": "^7.8.0" + }, + "dependencies": { + "@babel/helper-plugin-utils": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", + "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" + } } }, "@babel/plugin-proposal-json-strings": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.7.4.tgz", - "integrity": "sha512-wQvt3akcBTfLU/wYoqm/ws7YOAQKu8EVJEvHip/mzkNtjaclQoCCIqKXFP5/eyfnfbQCDV3OLRIK3mIVyXuZlw==", + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.8.3.tgz", + "integrity": "sha512-KGhQNZ3TVCQG/MjRbAUwuH+14y9q0tpxs1nWWs3pbSleRdDro9SAMMDyye8HhY1gqZ7/NqIc8SKhya0wRDgP1Q==", "requires": { - "@babel/helper-plugin-utils": "^7.0.0", - "@babel/plugin-syntax-json-strings": "^7.7.4" + "@babel/helper-plugin-utils": "^7.8.3", + "@babel/plugin-syntax-json-strings": "^7.8.0" + }, + "dependencies": { + "@babel/helper-plugin-utils": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", + "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" + } } }, "@babel/plugin-proposal-nullish-coalescing-operator": { @@ -1468,24 +1004,23 @@ "version": "7.8.3", "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" - }, - "@babel/plugin-syntax-object-rest-spread": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz", - "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==", - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } } } }, "@babel/plugin-proposal-optional-catch-binding": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.7.4.tgz", - "integrity": "sha512-DyM7U2bnsQerCQ+sejcTNZh8KQEUuC3ufzdnVnSiUv/qoGJp2Z3hanKL18KDhsBT5Wj6a7CMT5mdyCNJsEaA9w==", + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.8.3.tgz", + "integrity": "sha512-0gkX7J7E+AtAw9fcwlVQj8peP61qhdg/89D5swOkjYbkboA2CVckn3kiyum1DE0wskGb7KJJxBdyEBApDLLVdw==", "requires": { - "@babel/helper-plugin-utils": "^7.0.0", - "@babel/plugin-syntax-optional-catch-binding": "^7.7.4" + "@babel/helper-plugin-utils": "^7.8.3", + "@babel/plugin-syntax-optional-catch-binding": "^7.8.0" + }, + "dependencies": { + "@babel/helper-plugin-utils": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", + "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" + } } }, "@babel/plugin-proposal-optional-chaining": { @@ -1514,27 +1049,48 @@ } }, "@babel/plugin-syntax-async-generators": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.7.4.tgz", - "integrity": "sha512-Li4+EjSpBgxcsmeEF8IFcfV/+yJGxHXDirDkEoyFjumuwbmfCVHUt0HuowD/iGM7OhIRyXJH9YXxqiH6N815+g==", + "version": "7.8.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz", + "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==", "requires": { - "@babel/helper-plugin-utils": "^7.0.0" + "@babel/helper-plugin-utils": "^7.8.0" + }, + "dependencies": { + "@babel/helper-plugin-utils": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", + "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" + } } }, "@babel/plugin-syntax-dynamic-import": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.7.4.tgz", - "integrity": "sha512-jHQW0vbRGvwQNgyVxwDh4yuXu4bH1f5/EICJLAhl1SblLs2CDhrsmCk+v5XLdE9wxtAFRyxx+P//Iw+a5L/tTg==", + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz", + "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==", "requires": { - "@babel/helper-plugin-utils": "^7.0.0" + "@babel/helper-plugin-utils": "^7.8.0" + }, + "dependencies": { + "@babel/helper-plugin-utils": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", + "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" + } } }, "@babel/plugin-syntax-json-strings": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.7.4.tgz", - "integrity": "sha512-QpGupahTQW1mHRXddMG5srgpHWqRLwJnJZKXTigB9RPFCCGbDGCgBeM/iC82ICXp414WeYx/tD54w7M2qRqTMg==", + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz", + "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==", "requires": { - "@babel/helper-plugin-utils": "^7.0.0" + "@babel/helper-plugin-utils": "^7.8.0" + }, + "dependencies": { + "@babel/helper-plugin-utils": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", + "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" + } } }, "@babel/plugin-syntax-jsx": { @@ -1583,19 +1139,33 @@ } }, "@babel/plugin-syntax-object-rest-spread": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.7.4.tgz", - "integrity": "sha512-mObR+r+KZq0XhRVS2BrBKBpr5jqrqzlPvS9C9vuOf5ilSwzloAl7RPWLrgKdWS6IreaVrjHxTjtyqFiOisaCwg==", + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz", + "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==", "requires": { - "@babel/helper-plugin-utils": "^7.0.0" + "@babel/helper-plugin-utils": "^7.8.0" + }, + "dependencies": { + "@babel/helper-plugin-utils": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", + "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" + } } }, "@babel/plugin-syntax-optional-catch-binding": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.7.4.tgz", - "integrity": "sha512-4ZSuzWgFxqHRE31Glu+fEr/MirNZOMYmD/0BhBWyLyOOQz/gTAl7QmWm2hX1QxEIXsr2vkdlwxIzTyiYRC4xcQ==", + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz", + "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==", "requires": { - "@babel/helper-plugin-utils": "^7.0.0" + "@babel/helper-plugin-utils": "^7.8.0" + }, + "dependencies": { + "@babel/helper-plugin-utils": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", + "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" + } } }, "@babel/plugin-syntax-optional-chaining": { @@ -1614,11 +1184,18 @@ } }, "@babel/plugin-syntax-top-level-await": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.7.4.tgz", - "integrity": "sha512-wdsOw0MvkL1UIgiQ/IFr3ETcfv1xb8RMM0H9wbiDyLaJFyiDg5oZvDLCXosIXmFeIlweML5iOBXAkqddkYNizg==", + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.8.3.tgz", + "integrity": "sha512-kwj1j9lL/6Wd0hROD3b/OZZ7MSrZLqqn9RAZ5+cYYsflQ9HZBIKCUkr3+uL1MEJ1NePiUbf98jjiMQSv0NMR9g==", "requires": { - "@babel/helper-plugin-utils": "^7.0.0" + "@babel/helper-plugin-utils": "^7.8.3" + }, + "dependencies": { + "@babel/helper-plugin-utils": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", + "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" + } } }, "@babel/plugin-syntax-typescript": { @@ -1637,122 +1214,118 @@ } }, "@babel/plugin-transform-arrow-functions": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.7.4.tgz", - "integrity": "sha512-zUXy3e8jBNPiffmqkHRNDdZM2r8DWhCB7HhcoyZjiK1TxYEluLHAvQuYnTT+ARqRpabWqy/NHkO6e3MsYB5YfA==", + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.8.3.tgz", + "integrity": "sha512-0MRF+KC8EqH4dbuITCWwPSzsyO3HIWWlm30v8BbbpOrS1B++isGxPnnuq/IZvOX5J2D/p7DQalQm+/2PnlKGxg==", "requires": { - "@babel/helper-plugin-utils": "^7.0.0" + "@babel/helper-plugin-utils": "^7.8.3" + }, + "dependencies": { + "@babel/helper-plugin-utils": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", + "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" + } } }, "@babel/plugin-transform-async-to-generator": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.7.4.tgz", - "integrity": "sha512-zpUTZphp5nHokuy8yLlyafxCJ0rSlFoSHypTUWgpdwoDXWQcseaect7cJ8Ppk6nunOM6+5rPMkod4OYKPR5MUg==", + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.8.3.tgz", + "integrity": "sha512-imt9tFLD9ogt56Dd5CI/6XgpukMwd/fLGSrix2httihVe7LOGVPhyhMh1BU5kDM7iHD08i8uUtmV2sWaBFlHVQ==", "requires": { - "@babel/helper-module-imports": "^7.7.4", - "@babel/helper-plugin-utils": "^7.0.0", - "@babel/helper-remap-async-to-generator": "^7.7.4" + "@babel/helper-module-imports": "^7.8.3", + "@babel/helper-plugin-utils": "^7.8.3", + "@babel/helper-remap-async-to-generator": "^7.8.3" + }, + "dependencies": { + "@babel/helper-plugin-utils": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", + "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" + } } }, "@babel/plugin-transform-block-scoped-functions": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.7.4.tgz", - "integrity": "sha512-kqtQzwtKcpPclHYjLK//3lH8OFsCDuDJBaFhVwf8kqdnF6MN4l618UDlcA7TfRs3FayrHj+svYnSX8MC9zmUyQ==", - "requires": { - "@babel/helper-plugin-utils": "^7.0.0" - } - }, - "@babel/plugin-transform-block-scoping": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.7.4.tgz", - "integrity": "sha512-2VBe9u0G+fDt9B5OV5DQH4KBf5DoiNkwFKOz0TCvBWvdAN2rOykCTkrL+jTLxfCAm76l9Qo5OqL7HBOx2dWggg==", + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.8.3.tgz", + "integrity": "sha512-vo4F2OewqjbB1+yaJ7k2EJFHlTP3jR634Z9Cj9itpqNjuLXvhlVxgnjsHsdRgASR8xYDrx6onw4vW5H6We0Jmg==", "requires": { - "@babel/helper-plugin-utils": "^7.0.0", + "@babel/helper-plugin-utils": "^7.8.3" + }, + "dependencies": { + "@babel/helper-plugin-utils": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", + "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" + } + } + }, + "@babel/plugin-transform-block-scoping": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.8.3.tgz", + "integrity": "sha512-pGnYfm7RNRgYRi7bids5bHluENHqJhrV4bCZRwc5GamaWIIs07N4rZECcmJL6ZClwjDz1GbdMZFtPs27hTB06w==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.3", "lodash": "^4.17.13" + }, + "dependencies": { + "@babel/helper-plugin-utils": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", + "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" + } } }, "@babel/plugin-transform-classes": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.7.4.tgz", - "integrity": "sha512-sK1mjWat7K+buWRuImEzjNf68qrKcrddtpQo3swi9j7dUcG6y6R6+Di039QN2bD1dykeswlagupEmpOatFHHUg==", + "version": "7.9.2", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.9.2.tgz", + "integrity": "sha512-TC2p3bPzsfvSsqBZo0kJnuelnoK9O3welkUpqSqBQuBF6R5MN2rysopri8kNvtlGIb2jmUO7i15IooAZJjZuMQ==", "requires": { - "@babel/helper-annotate-as-pure": "^7.7.4", - "@babel/helper-define-map": "^7.7.4", - "@babel/helper-function-name": "^7.7.4", - "@babel/helper-optimise-call-expression": "^7.7.4", - "@babel/helper-plugin-utils": "^7.0.0", - "@babel/helper-replace-supers": "^7.7.4", - "@babel/helper-split-export-declaration": "^7.7.4", + "@babel/helper-annotate-as-pure": "^7.8.3", + "@babel/helper-define-map": "^7.8.3", + "@babel/helper-function-name": "^7.8.3", + "@babel/helper-optimise-call-expression": "^7.8.3", + "@babel/helper-plugin-utils": "^7.8.3", + "@babel/helper-replace-supers": "^7.8.6", + "@babel/helper-split-export-declaration": "^7.8.3", "globals": "^11.1.0" }, "dependencies": { - "@babel/helper-function-name": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.7.4.tgz", - "integrity": "sha512-AnkGIdiBhEuiwdoMnKm7jfPfqItZhgRaZfMg1XX3bS25INOnLPjPG1Ppnajh8eqgt5kPJnfqrRHqFqmjKDZLzQ==", - "requires": { - "@babel/helper-get-function-arity": "^7.7.4", - "@babel/template": "^7.7.4", - "@babel/types": "^7.7.4" - } - }, - "@babel/helper-get-function-arity": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.4.tgz", - "integrity": "sha512-QTGKEdCkjgzgfJ3bAyRwF4yyT3pg+vDgan8DSivq1eS0gwi+KGKE5x8kRcbeFTb/673mkO5SN1IZfmCfA5o+EA==", - "requires": { - "@babel/types": "^7.7.4" - } - }, - "@babel/helper-split-export-declaration": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.4.tgz", - "integrity": "sha512-guAg1SXFcVr04Guk9eq0S4/rWS++sbmyqosJzVs8+1fH5NI+ZcmkaSkc7dmtAFbHFva6yRJnjW3yAcGxjueDug==", - "requires": { - "@babel/types": "^7.7.4" - } - }, - "@babel/parser": { - "version": "7.7.5", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.5.tgz", - "integrity": "sha512-KNlOe9+/nk4i29g0VXgl8PEXIRms5xKLJeuZ6UptN0fHv+jDiriG+y94X6qAgWTR0h3KaoM1wK5G5h7MHFRSig==" - }, - "@babel/template": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.4.tgz", - "integrity": "sha512-qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw==", - "requires": { - "@babel/code-frame": "^7.0.0", - "@babel/parser": "^7.7.4", - "@babel/types": "^7.7.4" - } - }, - "@babel/types": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.4.tgz", - "integrity": "sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==", - "requires": { - "esutils": "^2.0.2", - "lodash": "^4.17.13", - "to-fast-properties": "^2.0.0" - } + "@babel/helper-plugin-utils": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", + "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" } } }, "@babel/plugin-transform-computed-properties": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.7.4.tgz", - "integrity": "sha512-bSNsOsZnlpLLyQew35rl4Fma3yKWqK3ImWMSC/Nc+6nGjC9s5NFWAer1YQ899/6s9HxO2zQC1WoFNfkOqRkqRQ==", + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.8.3.tgz", + "integrity": "sha512-O5hiIpSyOGdrQZRQ2ccwtTVkgUDBBiCuK//4RJ6UfePllUTCENOzKxfh6ulckXKc0DixTFLCfb2HVkNA7aDpzA==", "requires": { - "@babel/helper-plugin-utils": "^7.0.0" + "@babel/helper-plugin-utils": "^7.8.3" + }, + "dependencies": { + "@babel/helper-plugin-utils": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", + "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" + } } }, "@babel/plugin-transform-destructuring": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.7.4.tgz", - "integrity": "sha512-4jFMXI1Cu2aXbcXXl8Lr6YubCn6Oc7k9lLsu8v61TZh+1jny2BWmdtvY9zSUlLdGUvcy9DMAWyZEOqjsbeg/wA==", + "version": "7.8.8", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.8.8.tgz", + "integrity": "sha512-eRJu4Vs2rmttFCdhPUM3bV0Yo/xPSdPw6ML9KHs/bjB4bLA5HXlbvYXPOD5yASodGod+krjYx21xm1QmL8dCJQ==", "requires": { - "@babel/helper-plugin-utils": "^7.0.0" + "@babel/helper-plugin-utils": "^7.8.3" + }, + "dependencies": { + "@babel/helper-plugin-utils": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", + "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" + } } }, "@babel/plugin-transform-dotall-regex": { @@ -1765,262 +1338,340 @@ } }, "@babel/plugin-transform-duplicate-keys": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.7.4.tgz", - "integrity": "sha512-g1y4/G6xGWMD85Tlft5XedGaZBCIVN+/P0bs6eabmcPP9egFleMAo65OOjlhcz1njpwagyY3t0nsQC9oTFegJA==", + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.8.3.tgz", + "integrity": "sha512-s8dHiBUbcbSgipS4SMFuWGqCvyge5V2ZeAWzR6INTVC3Ltjig/Vw1G2Gztv0vU/hRG9X8IvKvYdoksnUfgXOEQ==", "requires": { - "@babel/helper-plugin-utils": "^7.0.0" + "@babel/helper-plugin-utils": "^7.8.3" + }, + "dependencies": { + "@babel/helper-plugin-utils": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", + "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" + } } }, "@babel/plugin-transform-exponentiation-operator": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.7.4.tgz", - "integrity": "sha512-MCqiLfCKm6KEA1dglf6Uqq1ElDIZwFuzz1WH5mTf8k2uQSxEJMbOIEh7IZv7uichr7PMfi5YVSrr1vz+ipp7AQ==", + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.8.3.tgz", + "integrity": "sha512-zwIpuIymb3ACcInbksHaNcR12S++0MDLKkiqXHl3AzpgdKlFNhog+z/K0+TGW+b0w5pgTq4H6IwV/WhxbGYSjQ==", "requires": { - "@babel/helper-builder-binary-assignment-operator-visitor": "^7.7.4", - "@babel/helper-plugin-utils": "^7.0.0" + "@babel/helper-builder-binary-assignment-operator-visitor": "^7.8.3", + "@babel/helper-plugin-utils": "^7.8.3" + }, + "dependencies": { + "@babel/helper-plugin-utils": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", + "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" + } } }, "@babel/plugin-transform-for-of": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.7.4.tgz", - "integrity": "sha512-zZ1fD1B8keYtEcKF+M1TROfeHTKnijcVQm0yO/Yu1f7qoDoxEIc/+GX6Go430Bg84eM/xwPFp0+h4EbZg7epAA==", + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.9.0.tgz", + "integrity": "sha512-lTAnWOpMwOXpyDx06N+ywmF3jNbafZEqZ96CGYabxHrxNX8l5ny7dt4bK/rGwAh9utyP2b2Hv7PlZh1AAS54FQ==", "requires": { - "@babel/helper-plugin-utils": "^7.0.0" + "@babel/helper-plugin-utils": "^7.8.3" + }, + "dependencies": { + "@babel/helper-plugin-utils": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", + "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" + } } }, "@babel/plugin-transform-function-name": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.7.4.tgz", - "integrity": "sha512-E/x09TvjHNhsULs2IusN+aJNRV5zKwxu1cpirZyRPw+FyyIKEHPXTsadj48bVpc1R5Qq1B5ZkzumuFLytnbT6g==", + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.8.3.tgz", + "integrity": "sha512-rO/OnDS78Eifbjn5Py9v8y0aR+aSYhDhqAwVfsTl0ERuMZyr05L1aFSCJnbv2mmsLkit/4ReeQ9N2BgLnOcPCQ==", "requires": { - "@babel/helper-function-name": "^7.7.4", - "@babel/helper-plugin-utils": "^7.0.0" + "@babel/helper-function-name": "^7.8.3", + "@babel/helper-plugin-utils": "^7.8.3" }, "dependencies": { - "@babel/helper-function-name": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.7.4.tgz", - "integrity": "sha512-AnkGIdiBhEuiwdoMnKm7jfPfqItZhgRaZfMg1XX3bS25INOnLPjPG1Ppnajh8eqgt5kPJnfqrRHqFqmjKDZLzQ==", - "requires": { - "@babel/helper-get-function-arity": "^7.7.4", - "@babel/template": "^7.7.4", - "@babel/types": "^7.7.4" - } - }, - "@babel/helper-get-function-arity": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.4.tgz", - "integrity": "sha512-QTGKEdCkjgzgfJ3bAyRwF4yyT3pg+vDgan8DSivq1eS0gwi+KGKE5x8kRcbeFTb/673mkO5SN1IZfmCfA5o+EA==", - "requires": { - "@babel/types": "^7.7.4" - } - }, - "@babel/parser": { - "version": "7.7.5", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.5.tgz", - "integrity": "sha512-KNlOe9+/nk4i29g0VXgl8PEXIRms5xKLJeuZ6UptN0fHv+jDiriG+y94X6qAgWTR0h3KaoM1wK5G5h7MHFRSig==" - }, - "@babel/template": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.4.tgz", - "integrity": "sha512-qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw==", - "requires": { - "@babel/code-frame": "^7.0.0", - "@babel/parser": "^7.7.4", - "@babel/types": "^7.7.4" - } - }, - "@babel/types": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.4.tgz", - "integrity": "sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==", - "requires": { - "esutils": "^2.0.2", - "lodash": "^4.17.13", - "to-fast-properties": "^2.0.0" - } + "@babel/helper-plugin-utils": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", + "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" } } }, "@babel/plugin-transform-literals": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.7.4.tgz", - "integrity": "sha512-X2MSV7LfJFm4aZfxd0yLVFrEXAgPqYoDG53Br/tCKiKYfX0MjVjQeWPIhPHHsCqzwQANq+FLN786fF5rgLS+gw==", + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.8.3.tgz", + "integrity": "sha512-3Tqf8JJ/qB7TeldGl+TT55+uQei9JfYaregDcEAyBZ7akutriFrt6C/wLYIer6OYhleVQvH/ntEhjE/xMmy10A==", "requires": { - "@babel/helper-plugin-utils": "^7.0.0" + "@babel/helper-plugin-utils": "^7.8.3" + }, + "dependencies": { + "@babel/helper-plugin-utils": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", + "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" + } } }, "@babel/plugin-transform-member-expression-literals": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.7.4.tgz", - "integrity": "sha512-9VMwMO7i69LHTesL0RdGy93JU6a+qOPuvB4F4d0kR0zyVjJRVJRaoaGjhtki6SzQUu8yen/vxPKN6CWnCUw6bA==", + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.8.3.tgz", + "integrity": "sha512-3Wk2EXhnw+rP+IDkK6BdtPKsUE5IeZ6QOGrPYvw52NwBStw9V1ZVzxgK6fSKSxqUvH9eQPR3tm3cOq79HlsKYA==", "requires": { - "@babel/helper-plugin-utils": "^7.0.0" + "@babel/helper-plugin-utils": "^7.8.3" + }, + "dependencies": { + "@babel/helper-plugin-utils": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", + "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" + } } }, "@babel/plugin-transform-modules-amd": { - "version": "7.7.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.7.5.tgz", - "integrity": "sha512-CT57FG4A2ZUNU1v+HdvDSDrjNWBrtCmSH6YbbgN3Lrf0Di/q/lWRxZrE72p3+HCCz9UjfZOEBdphgC0nzOS6DQ==", + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.9.0.tgz", + "integrity": "sha512-vZgDDF003B14O8zJy0XXLnPH4sg+9X5hFBBGN1V+B2rgrB+J2xIypSN6Rk9imB2hSTHQi5OHLrFWsZab1GMk+Q==", "requires": { - "@babel/helper-module-transforms": "^7.7.5", - "@babel/helper-plugin-utils": "^7.0.0", + "@babel/helper-module-transforms": "^7.9.0", + "@babel/helper-plugin-utils": "^7.8.3", "babel-plugin-dynamic-import-node": "^2.3.0" + }, + "dependencies": { + "@babel/helper-plugin-utils": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", + "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" + } } }, "@babel/plugin-transform-modules-commonjs": { - "version": "7.7.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.7.5.tgz", - "integrity": "sha512-9Cq4zTFExwFhQI6MT1aFxgqhIsMWQWDVwOgLzl7PTWJHsNaqFvklAU+Oz6AQLAS0dJKTwZSOCo20INwktxpi3Q==", + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.0.tgz", + "integrity": "sha512-qzlCrLnKqio4SlgJ6FMMLBe4bySNis8DFn1VkGmOcxG9gqEyPIOzeQrA//u0HAKrWpJlpZbZMPB1n/OPa4+n8g==", "requires": { - "@babel/helper-module-transforms": "^7.7.5", - "@babel/helper-plugin-utils": "^7.0.0", - "@babel/helper-simple-access": "^7.7.4", + "@babel/helper-module-transforms": "^7.9.0", + "@babel/helper-plugin-utils": "^7.8.3", + "@babel/helper-simple-access": "^7.8.3", "babel-plugin-dynamic-import-node": "^2.3.0" + }, + "dependencies": { + "@babel/helper-plugin-utils": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", + "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" + } } }, "@babel/plugin-transform-modules-systemjs": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.7.4.tgz", - "integrity": "sha512-y2c96hmcsUi6LrMqvmNDPBBiGCiQu0aYqpHatVVu6kD4mFEXKjyNxd/drc18XXAf9dv7UXjrZwBVmTTGaGP8iw==", + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.9.0.tgz", + "integrity": "sha512-FsiAv/nao/ud2ZWy4wFacoLOm5uxl0ExSQ7ErvP7jpoihLR6Cq90ilOFyX9UXct3rbtKsAiZ9kFt5XGfPe/5SQ==", "requires": { - "@babel/helper-hoist-variables": "^7.7.4", - "@babel/helper-plugin-utils": "^7.0.0", + "@babel/helper-hoist-variables": "^7.8.3", + "@babel/helper-module-transforms": "^7.9.0", + "@babel/helper-plugin-utils": "^7.8.3", "babel-plugin-dynamic-import-node": "^2.3.0" - } - }, - "@babel/plugin-transform-modules-umd": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.7.4.tgz", - "integrity": "sha512-u2B8TIi0qZI4j8q4C51ktfO7E3cQ0qnaXFI1/OXITordD40tt17g/sXqgNNCcMTcBFKrUPcGDx+TBJuZxLx7tw==", - "requires": { - "@babel/helper-module-transforms": "^7.7.4", - "@babel/helper-plugin-utils": "^7.0.0" - } - }, - "@babel/plugin-transform-named-capturing-groups-regex": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.7.4.tgz", - "integrity": "sha512-jBUkiqLKvUWpv9GLSuHUFYdmHg0ujC1JEYoZUfeOOfNydZXp1sXObgyPatpcwjWgsdBGsagWW0cdJpX/DO2jMw==", - "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.7.4" - } - }, - "@babel/plugin-transform-new-target": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.7.4.tgz", - "integrity": "sha512-CnPRiNtOG1vRodnsyGX37bHQleHE14B9dnnlgSeEs3ek3fHN1A1SScglTCg1sfbe7sRQ2BUcpgpTpWSfMKz3gg==", - "requires": { - "@babel/helper-plugin-utils": "^7.0.0" - } - }, - "@babel/plugin-transform-object-super": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.7.4.tgz", - "integrity": "sha512-ho+dAEhC2aRnff2JCA0SAK7V2R62zJd/7dmtoe7MHcso4C2mS+vZjn1Pb1pCVZvJs1mgsvv5+7sT+m3Bysb6eg==", - "requires": { - "@babel/helper-plugin-utils": "^7.0.0", - "@babel/helper-replace-supers": "^7.7.4" - } - }, - "@babel/plugin-transform-parameters": { - "version": "7.7.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.7.7.tgz", - "integrity": "sha512-OhGSrf9ZBrr1fw84oFXj5hgi8Nmg+E2w5L7NhnG0lPvpDtqd7dbyilM2/vR8CKbJ907RyxPh2kj6sBCSSfI9Ew==", - "requires": { - "@babel/helper-call-delegate": "^7.7.4", - "@babel/helper-get-function-arity": "^7.7.4", - "@babel/helper-plugin-utils": "^7.0.0" }, "dependencies": { - "@babel/helper-get-function-arity": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.4.tgz", - "integrity": "sha512-QTGKEdCkjgzgfJ3bAyRwF4yyT3pg+vDgan8DSivq1eS0gwi+KGKE5x8kRcbeFTb/673mkO5SN1IZfmCfA5o+EA==", - "requires": { - "@babel/types": "^7.7.4" - } - }, - "@babel/types": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.4.tgz", - "integrity": "sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==", - "requires": { - "esutils": "^2.0.2", - "lodash": "^4.17.13", - "to-fast-properties": "^2.0.0" - } + "@babel/helper-plugin-utils": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", + "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" } } }, - "@babel/plugin-transform-property-literals": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.7.4.tgz", - "integrity": "sha512-MatJhlC4iHsIskWYyawl53KuHrt+kALSADLQQ/HkhTjX954fkxIEh4q5slL4oRAnsm/eDoZ4q0CIZpcqBuxhJQ==", - "requires": { - "@babel/helper-plugin-utils": "^7.0.0" - } - }, - "@babel/plugin-transform-react-constant-elements": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.8.3.tgz", - "integrity": "sha512-glrzN2U+egwRfkNFtL34xIBYTxbbUF2qJTP8HD3qETBBqzAWSeNB821X0GjU06+dNpq/UyCIjI72FmGE5NNkQQ==", + "@babel/plugin-transform-modules-umd": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.9.0.tgz", + "integrity": "sha512-uTWkXkIVtg/JGRSIABdBoMsoIeoHQHPTL0Y2E7xf5Oj7sLqwVsNXOkNk0VJc7vF0IMBsPeikHxFjGe+qmwPtTQ==", + "requires": { + "@babel/helper-module-transforms": "^7.9.0", + "@babel/helper-plugin-utils": "^7.8.3" + }, + "dependencies": { + "@babel/helper-plugin-utils": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", + "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" + } + } + }, + "@babel/plugin-transform-named-capturing-groups-regex": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.8.3.tgz", + "integrity": "sha512-f+tF/8UVPU86TrCb06JoPWIdDpTNSGGcAtaD9mLP0aYGA0OS0j7j7DHJR0GTFrUZPUU6loZhbsVZgTh0N+Qdnw==", + "requires": { + "@babel/helper-create-regexp-features-plugin": "^7.8.3" + }, + "dependencies": { + "@babel/helper-create-regexp-features-plugin": { + "version": "7.8.8", + "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.8.tgz", + "integrity": "sha512-LYVPdwkrQEiX9+1R29Ld/wTrmQu1SSKYnuOk3g0CkcZMA1p0gsNxJFj/3gBdaJ7Cg0Fnek5z0DsMULePP7Lrqg==", + "requires": { + "@babel/helper-annotate-as-pure": "^7.8.3", + "@babel/helper-regex": "^7.8.3", + "regexpu-core": "^4.7.0" + } + }, + "@babel/helper-regex": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.8.3.tgz", + "integrity": "sha512-BWt0QtYv/cg/NecOAZMdcn/waj/5P26DR4mVLXfFtDokSR6fyuG0Pj+e2FqtSME+MqED1khnSMulkmGl8qWiUQ==", + "requires": { + "lodash": "^4.17.13" + } + }, + "jsesc": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", + "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=" + }, + "regenerate-unicode-properties": { + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz", + "integrity": "sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==", + "requires": { + "regenerate": "^1.4.0" + } + }, + "regexpu-core": { + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.0.tgz", + "integrity": "sha512-TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ==", + "requires": { + "regenerate": "^1.4.0", + "regenerate-unicode-properties": "^8.2.0", + "regjsgen": "^0.5.1", + "regjsparser": "^0.6.4", + "unicode-match-property-ecmascript": "^1.0.4", + "unicode-match-property-value-ecmascript": "^1.2.0" + } + }, + "regjsparser": { + "version": "0.6.4", + "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.4.tgz", + "integrity": "sha512-64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==", + "requires": { + "jsesc": "~0.5.0" + } + }, + "unicode-match-property-value-ecmascript": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz", + "integrity": "sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==" + } + } + }, + "@babel/plugin-transform-new-target": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.8.3.tgz", + "integrity": "sha512-QuSGysibQpyxexRyui2vca+Cmbljo8bcRckgzYV4kRIsHpVeyeC3JDO63pY+xFZ6bWOBn7pfKZTqV4o/ix9sFw==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.3" + }, + "dependencies": { + "@babel/helper-plugin-utils": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", + "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" + } + } + }, + "@babel/plugin-transform-object-super": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.8.3.tgz", + "integrity": "sha512-57FXk+gItG/GejofIyLIgBKTas4+pEU47IXKDBWFTxdPd7F80H8zybyAY7UoblVfBhBGs2EKM+bJUu2+iUYPDQ==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.3", + "@babel/helper-replace-supers": "^7.8.3" + }, + "dependencies": { + "@babel/helper-plugin-utils": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", + "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" + } + } + }, + "@babel/plugin-transform-parameters": { + "version": "7.9.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.9.3.tgz", + "integrity": "sha512-fzrQFQhp7mIhOzmOtPiKffvCYQSK10NR8t6BBz2yPbeUHb9OLW8RZGtgDRBn8z2hGcwvKDL3vC7ojPTLNxmqEg==", + "requires": { + "@babel/helper-get-function-arity": "^7.8.3", + "@babel/helper-plugin-utils": "^7.8.3" + }, + "dependencies": { + "@babel/helper-plugin-utils": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", + "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" + } + } + }, + "@babel/plugin-transform-property-literals": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.8.3.tgz", + "integrity": "sha512-uGiiXAZMqEoQhRWMK17VospMZh5sXWg+dlh2soffpkAl96KAm+WZuJfa6lcELotSRmooLqg0MWdH6UUq85nmmg==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.3" + }, + "dependencies": { + "@babel/helper-plugin-utils": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", + "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" + } + } + }, + "@babel/plugin-transform-react-constant-elements": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.9.0.tgz", + "integrity": "sha512-wXMXsToAUOxJuBBEHajqKLFWcCkOSLshTI2ChCFFj1zDd7od4IOxiwLCOObNUvOpkxLpjIuaIdBMmNt6ocCPAw==", "requires": { - "@babel/helper-annotate-as-pure": "^7.8.3", "@babel/helper-plugin-utils": "^7.8.3" }, "dependencies": { - "@babel/helper-annotate-as-pure": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.8.3.tgz", - "integrity": "sha512-6o+mJrZBxOoEX77Ezv9zwW7WV8DdluouRKNY/IR5u/YTMuKHgugHOzYWlYvYLpLA9nPsQCAAASpCIbjI9Mv+Uw==", - "requires": { - "@babel/types": "^7.8.3" - } - }, "@babel/helper-plugin-utils": { "version": "7.8.3", "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" - }, - "@babel/types": { - "version": "7.8.7", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.7.tgz", - "integrity": "sha512-k2TreEHxFA4CjGkL+GYjRyx35W0Mr7DP5+9q6WMkyKXB+904bYmG40syjMFV0oLlhhFCwWl0vA0DyzTDkwAiJw==", - "requires": { - "esutils": "^2.0.2", - "lodash": "^4.17.13", - "to-fast-properties": "^2.0.0" - } } } }, "@babel/plugin-transform-react-display-name": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.7.4.tgz", - "integrity": "sha512-sBbIvqYkthai0X0vkD2xsAwluBp+LtNHH+/V4a5ydifmTtb8KOVOlrMIk/MYmIc4uTYDnjZUHQildYNo36SRJw==", + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.8.3.tgz", + "integrity": "sha512-3Jy/PCw8Fe6uBKtEgz3M82ljt+lTg+xJaM4og+eyu83qLT87ZUSckn0wy7r31jflURWLO83TW6Ylf7lyXj3m5A==", "requires": { - "@babel/helper-plugin-utils": "^7.0.0" + "@babel/helper-plugin-utils": "^7.8.3" + }, + "dependencies": { + "@babel/helper-plugin-utils": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", + "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" + } } }, "@babel/plugin-transform-react-jsx": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.7.4.tgz", - "integrity": "sha512-LixU4BS95ZTEAZdPaIuyg/k8FiiqN9laQ0dMHB4MlpydHY53uQdWCUrwjLr5o6ilS6fAgZey4Q14XBjl5tL6xw==", + "version": "7.9.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.9.4.tgz", + "integrity": "sha512-Mjqf3pZBNLt854CK0C/kRuXAnE6H/bo7xYojP+WGtX8glDGSibcwnsWwhwoSuRg0+EBnxPC1ouVnuetUIlPSAw==", "requires": { - "@babel/helper-builder-react-jsx": "^7.7.4", - "@babel/helper-plugin-utils": "^7.0.0", - "@babel/plugin-syntax-jsx": "^7.7.4" + "@babel/helper-builder-react-jsx": "^7.9.0", + "@babel/helper-builder-react-jsx-experimental": "^7.9.0", + "@babel/helper-plugin-utils": "^7.8.3", + "@babel/plugin-syntax-jsx": "^7.8.3" }, "dependencies": { - "@babel/plugin-syntax-jsx": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.7.4.tgz", - "integrity": "sha512-wuy6fiMe9y7HeZBWXYCGt2RGxZOj0BImZ9EyXJVnVGBKO/Br592rbR3rtIQn0eQhAk9vqaKP5n8tVqEFBQMfLg==", - "requires": { - "@babel/helper-plugin-utils": "^7.0.0" - } + "@babel/helper-plugin-utils": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", + "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" } } }, @@ -2042,57 +1693,58 @@ } }, "@babel/plugin-transform-react-jsx-self": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.7.4.tgz", - "integrity": "sha512-PWYjSfqrO273mc1pKCRTIJXyqfc9vWYBax88yIhQb+bpw3XChVC7VWS4VwRVs63wFHKxizvGSd00XEr+YB9Q2A==", + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.9.0.tgz", + "integrity": "sha512-K2ObbWPKT7KUTAoyjCsFilOkEgMvFG+y0FqOl6Lezd0/13kMkkjHskVsZvblRPj1PHA44PrToaZANrryppzTvQ==", "requires": { - "@babel/helper-plugin-utils": "^7.0.0", - "@babel/plugin-syntax-jsx": "^7.7.4" + "@babel/helper-plugin-utils": "^7.8.3", + "@babel/plugin-syntax-jsx": "^7.8.3" }, "dependencies": { - "@babel/plugin-syntax-jsx": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.7.4.tgz", - "integrity": "sha512-wuy6fiMe9y7HeZBWXYCGt2RGxZOj0BImZ9EyXJVnVGBKO/Br592rbR3rtIQn0eQhAk9vqaKP5n8tVqEFBQMfLg==", - "requires": { - "@babel/helper-plugin-utils": "^7.0.0" - } + "@babel/helper-plugin-utils": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", + "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" } } }, "@babel/plugin-transform-react-jsx-source": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.7.4.tgz", - "integrity": "sha512-5ZU9FnPhqtHsOXxutRtXZAzoEJwDaP32QcobbMP1/qt7NYcsCNK8XgzJcJfoEr/ZnzVvUNInNjIW22Z6I8p9mg==", + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.9.0.tgz", + "integrity": "sha512-K6m3LlSnTSfRkM6FcRk8saNEeaeyG5k7AVkBU2bZK3+1zdkSED3qNdsWrUgQBeTVD2Tp3VMmerxVO2yM5iITmw==", "requires": { - "@babel/helper-plugin-utils": "^7.0.0", - "@babel/plugin-syntax-jsx": "^7.7.4" + "@babel/helper-plugin-utils": "^7.8.3", + "@babel/plugin-syntax-jsx": "^7.8.3" }, "dependencies": { - "@babel/plugin-syntax-jsx": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.7.4.tgz", - "integrity": "sha512-wuy6fiMe9y7HeZBWXYCGt2RGxZOj0BImZ9EyXJVnVGBKO/Br592rbR3rtIQn0eQhAk9vqaKP5n8tVqEFBQMfLg==", - "requires": { - "@babel/helper-plugin-utils": "^7.0.0" - } + "@babel/helper-plugin-utils": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", + "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" } } }, "@babel/plugin-transform-regenerator": { - "version": "7.7.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.7.5.tgz", - "integrity": "sha512-/8I8tPvX2FkuEyWbjRCt4qTAgZK0DVy8QRguhA524UH48RfGJy94On2ri+dCuwOpcerPRl9O4ebQkRcVzIaGBw==", + "version": "7.8.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.7.tgz", + "integrity": "sha512-TIg+gAl4Z0a3WmD3mbYSk+J9ZUH6n/Yc57rtKRnlA/7rcCvpekHXe0CMZHP1gYp7/KLe9GHTuIba0vXmls6drA==", "requires": { - "regenerator-transform": "^0.14.0" + "regenerator-transform": "^0.14.2" } }, "@babel/plugin-transform-reserved-words": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.7.4.tgz", - "integrity": "sha512-OrPiUB5s5XvkCO1lS7D8ZtHcswIC57j62acAnJZKqGGnHP+TIc/ljQSrgdX/QyOTdEK5COAhuc820Hi1q2UgLQ==", + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.8.3.tgz", + "integrity": "sha512-mwMxcycN3omKFDjDQUl+8zyMsBfjRFr0Zn/64I41pmjv4NJuqcYlEtezwYtw9TFd9WR1vN5kiM+O0gMZzO6L0A==", "requires": { - "@babel/helper-plugin-utils": "^7.0.0" + "@babel/helper-plugin-utils": "^7.8.3" + }, + "dependencies": { + "@babel/helper-plugin-utils": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", + "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" + } } }, "@babel/plugin-transform-runtime": { @@ -2132,51 +1784,94 @@ } }, "@babel/plugin-transform-shorthand-properties": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.7.4.tgz", - "integrity": "sha512-q+suddWRfIcnyG5YiDP58sT65AJDZSUhXQDZE3r04AuqD6d/XLaQPPXSBzP2zGerkgBivqtQm9XKGLuHqBID6Q==", + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.8.3.tgz", + "integrity": "sha512-I9DI6Odg0JJwxCHzbzW08ggMdCezoWcuQRz3ptdudgwaHxTjxw5HgdFJmZIkIMlRymL6YiZcped4TTCB0JcC8w==", "requires": { - "@babel/helper-plugin-utils": "^7.0.0" + "@babel/helper-plugin-utils": "^7.8.3" + }, + "dependencies": { + "@babel/helper-plugin-utils": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", + "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" + } } }, "@babel/plugin-transform-spread": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.7.4.tgz", - "integrity": "sha512-8OSs0FLe5/80cndziPlg4R0K6HcWSM0zyNhHhLsmw/Nc5MaA49cAsnoJ/t/YZf8qkG7fD+UjTRaApVDB526d7Q==", + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.8.3.tgz", + "integrity": "sha512-CkuTU9mbmAoFOI1tklFWYYbzX5qCIZVXPVy0jpXgGwkplCndQAa58s2jr66fTeQnA64bDox0HL4U56CFYoyC7g==", "requires": { - "@babel/helper-plugin-utils": "^7.0.0" + "@babel/helper-plugin-utils": "^7.8.3" + }, + "dependencies": { + "@babel/helper-plugin-utils": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", + "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" + } } }, "@babel/plugin-transform-sticky-regex": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.7.4.tgz", - "integrity": "sha512-Ls2NASyL6qtVe1H1hXts9yuEeONV2TJZmplLONkMPUG158CtmnrzW5Q5teibM5UVOFjG0D3IC5mzXR6pPpUY7A==", + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.8.3.tgz", + "integrity": "sha512-9Spq0vGCD5Bb4Z/ZXXSK5wbbLFMG085qd2vhL1JYu1WcQ5bXqZBAYRzU1d+p79GcHs2szYv5pVQCX13QgldaWw==", "requires": { - "@babel/helper-plugin-utils": "^7.0.0", - "@babel/helper-regex": "^7.0.0" + "@babel/helper-plugin-utils": "^7.8.3", + "@babel/helper-regex": "^7.8.3" + }, + "dependencies": { + "@babel/helper-plugin-utils": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", + "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" + }, + "@babel/helper-regex": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.8.3.tgz", + "integrity": "sha512-BWt0QtYv/cg/NecOAZMdcn/waj/5P26DR4mVLXfFtDokSR6fyuG0Pj+e2FqtSME+MqED1khnSMulkmGl8qWiUQ==", + "requires": { + "lodash": "^4.17.13" + } + } } }, "@babel/plugin-transform-template-literals": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.7.4.tgz", - "integrity": "sha512-sA+KxLwF3QwGj5abMHkHgshp9+rRz+oY9uoRil4CyLtgEuE/88dpkeWgNk5qKVsJE9iSfly3nvHapdRiIS2wnQ==", + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.8.3.tgz", + "integrity": "sha512-820QBtykIQOLFT8NZOcTRJ1UNuztIELe4p9DCgvj4NK+PwluSJ49we7s9FB1HIGNIYT7wFUJ0ar2QpCDj0escQ==", "requires": { - "@babel/helper-annotate-as-pure": "^7.7.4", - "@babel/helper-plugin-utils": "^7.0.0" + "@babel/helper-annotate-as-pure": "^7.8.3", + "@babel/helper-plugin-utils": "^7.8.3" + }, + "dependencies": { + "@babel/helper-plugin-utils": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", + "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" + } } }, "@babel/plugin-transform-typeof-symbol": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.7.4.tgz", - "integrity": "sha512-KQPUQ/7mqe2m0B8VecdyaW5XcQYaePyl9R7IsKd+irzj6jvbhoGnRE+M0aNkyAzI07VfUQ9266L5xMARitV3wg==", + "version": "7.8.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.8.4.tgz", + "integrity": "sha512-2QKyfjGdvuNfHsb7qnBBlKclbD4CfshH2KvDabiijLMGXPHJXGxtDzwIF7bQP+T0ysw8fYTtxPafgfs/c1Lrqg==", "requires": { - "@babel/helper-plugin-utils": "^7.0.0" + "@babel/helper-plugin-utils": "^7.8.3" + }, + "dependencies": { + "@babel/helper-plugin-utils": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", + "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" + } } }, "@babel/plugin-transform-typescript": { - "version": "7.8.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.8.7.tgz", - "integrity": "sha512-7O0UsPQVNKqpHeHLpfvOG4uXmlw+MOxYvUv6Otc9uH5SYMIxvF6eBdjkWvC3f9G+VXe0RsNExyAQBeTRug/wqQ==", + "version": "7.9.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.9.4.tgz", + "integrity": "sha512-yeWeUkKx2auDbSxRe8MusAG+n4m9BFY/v+lPjmQDgOFX5qnySkUY5oXzkp6FwPdsYqnKay6lorXYdC0n3bZO7w==", "requires": { "@babel/helper-create-class-features-plugin": "^7.8.3", "@babel/helper-plugin-utils": "^7.8.3", @@ -2191,14 +1886,78 @@ } }, "@babel/plugin-transform-unicode-regex": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.7.4.tgz", - "integrity": "sha512-N77UUIV+WCvE+5yHw+oks3m18/umd7y392Zv7mYTpFqHtkpcc+QUz+gLJNTWVlWROIWeLqY0f3OjZxV5TcXnRw==", + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.8.3.tgz", + "integrity": "sha512-+ufgJjYdmWfSQ+6NS9VGUR2ns8cjJjYbrbi11mZBTaWm+Fui/ncTLFF28Ei1okavY+xkojGr1eJxNsWYeA5aZw==", "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.7.4", - "@babel/helper-plugin-utils": "^7.0.0" - } - }, + "@babel/helper-create-regexp-features-plugin": "^7.8.3", + "@babel/helper-plugin-utils": "^7.8.3" + }, + "dependencies": { + "@babel/helper-create-regexp-features-plugin": { + "version": "7.8.8", + "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.8.tgz", + "integrity": "sha512-LYVPdwkrQEiX9+1R29Ld/wTrmQu1SSKYnuOk3g0CkcZMA1p0gsNxJFj/3gBdaJ7Cg0Fnek5z0DsMULePP7Lrqg==", + "requires": { + "@babel/helper-annotate-as-pure": "^7.8.3", + "@babel/helper-regex": "^7.8.3", + "regexpu-core": "^4.7.0" + } + }, + "@babel/helper-plugin-utils": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", + "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" + }, + "@babel/helper-regex": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.8.3.tgz", + "integrity": "sha512-BWt0QtYv/cg/NecOAZMdcn/waj/5P26DR4mVLXfFtDokSR6fyuG0Pj+e2FqtSME+MqED1khnSMulkmGl8qWiUQ==", + "requires": { + "lodash": "^4.17.13" + } + }, + "jsesc": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", + "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=" + }, + "regenerate-unicode-properties": { + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz", + "integrity": "sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==", + "requires": { + "regenerate": "^1.4.0" + } + }, + "regexpu-core": { + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.0.tgz", + "integrity": "sha512-TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ==", + "requires": { + "regenerate": "^1.4.0", + "regenerate-unicode-properties": "^8.2.0", + "regjsgen": "^0.5.1", + "regjsparser": "^0.6.4", + "unicode-match-property-ecmascript": "^1.0.4", + "unicode-match-property-value-ecmascript": "^1.2.0" + } + }, + "regjsparser": { + "version": "0.6.4", + "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.4.tgz", + "integrity": "sha512-64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==", + "requires": { + "jsesc": "~0.5.0" + } + }, + "unicode-match-property-value-ecmascript": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz", + "integrity": "sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==" + } + } + }, "@babel/polyfill": { "version": "7.8.7", "resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.8.7.tgz", @@ -2216,111 +1975,189 @@ } }, "@babel/preset-env": { - "version": "7.7.7", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.7.7.tgz", - "integrity": "sha512-pCu0hrSSDVI7kCVUOdcMNQEbOPJ52E+LrQ14sN8uL2ALfSqePZQlKrOy+tM4uhEdYlCHi4imr8Zz2cZe9oSdIg==", + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.9.0.tgz", + "integrity": "sha512-712DeRXT6dyKAM/FMbQTV/FvRCms2hPCx+3weRjZ8iQVQWZejWWk1wwG6ViWMyqb/ouBbGOl5b6aCk0+j1NmsQ==", "requires": { - "@babel/helper-module-imports": "^7.7.4", - "@babel/helper-plugin-utils": "^7.0.0", - "@babel/plugin-proposal-async-generator-functions": "^7.7.4", - "@babel/plugin-proposal-dynamic-import": "^7.7.4", - "@babel/plugin-proposal-json-strings": "^7.7.4", - "@babel/plugin-proposal-object-rest-spread": "^7.7.7", - "@babel/plugin-proposal-optional-catch-binding": "^7.7.4", - "@babel/plugin-proposal-unicode-property-regex": "^7.7.7", - "@babel/plugin-syntax-async-generators": "^7.7.4", - "@babel/plugin-syntax-dynamic-import": "^7.7.4", - "@babel/plugin-syntax-json-strings": "^7.7.4", - "@babel/plugin-syntax-object-rest-spread": "^7.7.4", - "@babel/plugin-syntax-optional-catch-binding": "^7.7.4", - "@babel/plugin-syntax-top-level-await": "^7.7.4", - "@babel/plugin-transform-arrow-functions": "^7.7.4", - "@babel/plugin-transform-async-to-generator": "^7.7.4", - "@babel/plugin-transform-block-scoped-functions": "^7.7.4", - "@babel/plugin-transform-block-scoping": "^7.7.4", - "@babel/plugin-transform-classes": "^7.7.4", - "@babel/plugin-transform-computed-properties": "^7.7.4", - "@babel/plugin-transform-destructuring": "^7.7.4", - "@babel/plugin-transform-dotall-regex": "^7.7.7", - "@babel/plugin-transform-duplicate-keys": "^7.7.4", - "@babel/plugin-transform-exponentiation-operator": "^7.7.4", - "@babel/plugin-transform-for-of": "^7.7.4", - "@babel/plugin-transform-function-name": "^7.7.4", - "@babel/plugin-transform-literals": "^7.7.4", - "@babel/plugin-transform-member-expression-literals": "^7.7.4", - "@babel/plugin-transform-modules-amd": "^7.7.5", - "@babel/plugin-transform-modules-commonjs": "^7.7.5", - "@babel/plugin-transform-modules-systemjs": "^7.7.4", - "@babel/plugin-transform-modules-umd": "^7.7.4", - "@babel/plugin-transform-named-capturing-groups-regex": "^7.7.4", - "@babel/plugin-transform-new-target": "^7.7.4", - "@babel/plugin-transform-object-super": "^7.7.4", - "@babel/plugin-transform-parameters": "^7.7.7", - "@babel/plugin-transform-property-literals": "^7.7.4", - "@babel/plugin-transform-regenerator": "^7.7.5", - "@babel/plugin-transform-reserved-words": "^7.7.4", - "@babel/plugin-transform-shorthand-properties": "^7.7.4", - "@babel/plugin-transform-spread": "^7.7.4", - "@babel/plugin-transform-sticky-regex": "^7.7.4", - "@babel/plugin-transform-template-literals": "^7.7.4", - "@babel/plugin-transform-typeof-symbol": "^7.7.4", - "@babel/plugin-transform-unicode-regex": "^7.7.4", - "@babel/types": "^7.7.4", - "browserslist": "^4.6.0", - "core-js-compat": "^3.6.0", + "@babel/compat-data": "^7.9.0", + "@babel/helper-compilation-targets": "^7.8.7", + "@babel/helper-module-imports": "^7.8.3", + "@babel/helper-plugin-utils": "^7.8.3", + "@babel/plugin-proposal-async-generator-functions": "^7.8.3", + "@babel/plugin-proposal-dynamic-import": "^7.8.3", + "@babel/plugin-proposal-json-strings": "^7.8.3", + "@babel/plugin-proposal-nullish-coalescing-operator": "^7.8.3", + "@babel/plugin-proposal-numeric-separator": "^7.8.3", + "@babel/plugin-proposal-object-rest-spread": "^7.9.0", + "@babel/plugin-proposal-optional-catch-binding": "^7.8.3", + "@babel/plugin-proposal-optional-chaining": "^7.9.0", + "@babel/plugin-proposal-unicode-property-regex": "^7.8.3", + "@babel/plugin-syntax-async-generators": "^7.8.0", + "@babel/plugin-syntax-dynamic-import": "^7.8.0", + "@babel/plugin-syntax-json-strings": "^7.8.0", + "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0", + "@babel/plugin-syntax-numeric-separator": "^7.8.0", + "@babel/plugin-syntax-object-rest-spread": "^7.8.0", + "@babel/plugin-syntax-optional-catch-binding": "^7.8.0", + "@babel/plugin-syntax-optional-chaining": "^7.8.0", + "@babel/plugin-syntax-top-level-await": "^7.8.3", + "@babel/plugin-transform-arrow-functions": "^7.8.3", + "@babel/plugin-transform-async-to-generator": "^7.8.3", + "@babel/plugin-transform-block-scoped-functions": "^7.8.3", + "@babel/plugin-transform-block-scoping": "^7.8.3", + "@babel/plugin-transform-classes": "^7.9.0", + "@babel/plugin-transform-computed-properties": "^7.8.3", + "@babel/plugin-transform-destructuring": "^7.8.3", + "@babel/plugin-transform-dotall-regex": "^7.8.3", + "@babel/plugin-transform-duplicate-keys": "^7.8.3", + "@babel/plugin-transform-exponentiation-operator": "^7.8.3", + "@babel/plugin-transform-for-of": "^7.9.0", + "@babel/plugin-transform-function-name": "^7.8.3", + "@babel/plugin-transform-literals": "^7.8.3", + "@babel/plugin-transform-member-expression-literals": "^7.8.3", + "@babel/plugin-transform-modules-amd": "^7.9.0", + "@babel/plugin-transform-modules-commonjs": "^7.9.0", + "@babel/plugin-transform-modules-systemjs": "^7.9.0", + "@babel/plugin-transform-modules-umd": "^7.9.0", + "@babel/plugin-transform-named-capturing-groups-regex": "^7.8.3", + "@babel/plugin-transform-new-target": "^7.8.3", + "@babel/plugin-transform-object-super": "^7.8.3", + "@babel/plugin-transform-parameters": "^7.8.7", + "@babel/plugin-transform-property-literals": "^7.8.3", + "@babel/plugin-transform-regenerator": "^7.8.7", + "@babel/plugin-transform-reserved-words": "^7.8.3", + "@babel/plugin-transform-shorthand-properties": "^7.8.3", + "@babel/plugin-transform-spread": "^7.8.3", + "@babel/plugin-transform-sticky-regex": "^7.8.3", + "@babel/plugin-transform-template-literals": "^7.8.3", + "@babel/plugin-transform-typeof-symbol": "^7.8.4", + "@babel/plugin-transform-unicode-regex": "^7.8.3", + "@babel/preset-modules": "^0.1.3", + "@babel/types": "^7.9.0", + "browserslist": "^4.9.1", + "core-js-compat": "^3.6.2", "invariant": "^2.2.2", - "js-levenshtein": "^1.1.3", + "levenary": "^1.1.1", "semver": "^5.5.0" }, "dependencies": { + "@babel/compat-data": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.9.0.tgz", + "integrity": "sha512-zeFQrr+284Ekvd9e7KAX954LkapWiOmQtsfHirhxqfdlX6MEC32iRE+pqUGlYIBchdevaCwvzxWGSy/YBNI85g==", + "requires": { + "browserslist": "^4.9.1", + "invariant": "^2.2.4", + "semver": "^5.5.0" + } + }, + "@babel/helper-create-regexp-features-plugin": { + "version": "7.8.8", + "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.8.tgz", + "integrity": "sha512-LYVPdwkrQEiX9+1R29Ld/wTrmQu1SSKYnuOk3g0CkcZMA1p0gsNxJFj/3gBdaJ7Cg0Fnek5z0DsMULePP7Lrqg==", + "requires": { + "@babel/helper-annotate-as-pure": "^7.8.3", + "@babel/helper-regex": "^7.8.3", + "regexpu-core": "^4.7.0" + } + }, + "@babel/helper-plugin-utils": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", + "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" + }, + "@babel/helper-regex": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.8.3.tgz", + "integrity": "sha512-BWt0QtYv/cg/NecOAZMdcn/waj/5P26DR4mVLXfFtDokSR6fyuG0Pj+e2FqtSME+MqED1khnSMulkmGl8qWiUQ==", + "requires": { + "lodash": "^4.17.13" + } + }, "@babel/plugin-proposal-object-rest-spread": { - "version": "7.7.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.7.7.tgz", - "integrity": "sha512-3qp9I8lelgzNedI3hrhkvhaEYree6+WHnyA/q4Dza9z7iEIs1eyhWyJnetk3jJ69RT0AT4G0UhEGwyGFJ7GUuQ==", + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.0.tgz", + "integrity": "sha512-UgqBv6bjq4fDb8uku9f+wcm1J7YxJ5nT7WO/jBr0cl0PLKb7t1O6RNR1kZbjgx2LQtsDI9hwoQVmn0yhXeQyow==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.3", + "@babel/plugin-syntax-object-rest-spread": "^7.8.0" + } + }, + "@babel/plugin-proposal-optional-chaining": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.9.0.tgz", + "integrity": "sha512-NDn5tu3tcv4W30jNhmc2hyD5c56G6cXx4TesJubhxrJeCvuuMpttxr0OnNCqbZGhFjLrg+NIhxxC+BK5F6yS3w==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.3", + "@babel/plugin-syntax-optional-chaining": "^7.8.0" + } + }, + "@babel/plugin-proposal-unicode-property-regex": { + "version": "7.8.8", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.8.tgz", + "integrity": "sha512-EVhjVsMpbhLw9ZfHWSx2iy13Q8Z/eg8e8ccVWt23sWQK5l1UdkoLJPN5w69UA4uITGBnEZD2JOe4QOHycYKv8A==", + "requires": { + "@babel/helper-create-regexp-features-plugin": "^7.8.8", + "@babel/helper-plugin-utils": "^7.8.3" + } + }, + "@babel/plugin-transform-dotall-regex": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.8.3.tgz", + "integrity": "sha512-kLs1j9Nn4MQoBYdRXH6AeaXMbEJFaFu/v1nQkvib6QzTj8MZI5OQzqmD83/2jEM1z0DLilra5aWO5YpyC0ALIw==", "requires": { - "@babel/helper-plugin-utils": "^7.0.0", - "@babel/plugin-syntax-object-rest-spread": "^7.7.4" + "@babel/helper-create-regexp-features-plugin": "^7.8.3", + "@babel/helper-plugin-utils": "^7.8.3" } }, "@babel/types": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.4.tgz", - "integrity": "sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==", + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.0.tgz", + "integrity": "sha512-BS9JKfXkzzJl8RluW4JGknzpiUV7ZrvTayM6yfqLTVBEnFtyowVIOu6rqxRd5cVO6yGoWf4T8u8dgK9oB+GCng==", "requires": { - "esutils": "^2.0.2", + "@babel/helper-validator-identifier": "^7.9.0", "lodash": "^4.17.13", "to-fast-properties": "^2.0.0" } }, - "browserslist": { - "version": "4.8.3", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.8.3.tgz", - "integrity": "sha512-iU43cMMknxG1ClEZ2MDKeonKE1CCrFVkQK2AqO2YWFmvIrx4JWrvQ4w4hQez6EpVI8rHTtqh/ruHHDHSOKxvUg==", + "jsesc": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", + "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=" + }, + "regenerate-unicode-properties": { + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz", + "integrity": "sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==", "requires": { - "caniuse-lite": "^1.0.30001017", - "electron-to-chromium": "^1.3.322", - "node-releases": "^1.1.44" + "regenerate": "^1.4.0" } }, - "caniuse-lite": { - "version": "1.0.30001019", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001019.tgz", - "integrity": "sha512-6ljkLtF1KM5fQ+5ZN0wuyVvvebJxgJPTmScOMaFuQN2QuOzvRJnWSKfzQskQU5IOU4Gap3zasYPIinzwUjoj/g==" + "regexpu-core": { + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.0.tgz", + "integrity": "sha512-TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ==", + "requires": { + "regenerate": "^1.4.0", + "regenerate-unicode-properties": "^8.2.0", + "regjsgen": "^0.5.1", + "regjsparser": "^0.6.4", + "unicode-match-property-ecmascript": "^1.0.4", + "unicode-match-property-value-ecmascript": "^1.2.0" + } }, - "node-releases": { - "version": "1.1.45", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.45.tgz", - "integrity": "sha512-cXvGSfhITKI8qsV116u2FTzH5EWZJfgG7d4cpqwF8I8+1tWpD6AsvvGRKq2onR0DNj1jfqsjkXZsm14JMS7Cyg==", + "regjsparser": { + "version": "0.6.4", + "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.4.tgz", + "integrity": "sha512-64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==", "requires": { - "semver": "^6.3.0" - }, - "dependencies": { - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" - } + "jsesc": "~0.5.0" } + }, + "unicode-match-property-value-ecmascript": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz", + "integrity": "sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==" } } }, @@ -2337,24 +2174,32 @@ } }, "@babel/preset-react": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.7.4.tgz", - "integrity": "sha512-j+vZtg0/8pQr1H8wKoaJyGL2IEk3rG/GIvua7Sec7meXVIvGycihlGMx5xcU00kqCJbwzHs18xTu3YfREOqQ+g==", + "version": "7.9.4", + "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.9.4.tgz", + "integrity": "sha512-AxylVB3FXeOTQXNXyiuAQJSvss62FEotbX2Pzx3K/7c+MKJMdSg6Ose6QYllkdCFA8EInCJVw7M/o5QbLuA4ZQ==", "requires": { - "@babel/helper-plugin-utils": "^7.0.0", - "@babel/plugin-transform-react-display-name": "^7.7.4", - "@babel/plugin-transform-react-jsx": "^7.7.4", - "@babel/plugin-transform-react-jsx-self": "^7.7.4", - "@babel/plugin-transform-react-jsx-source": "^7.7.4" + "@babel/helper-plugin-utils": "^7.8.3", + "@babel/plugin-transform-react-display-name": "^7.8.3", + "@babel/plugin-transform-react-jsx": "^7.9.4", + "@babel/plugin-transform-react-jsx-development": "^7.9.0", + "@babel/plugin-transform-react-jsx-self": "^7.9.0", + "@babel/plugin-transform-react-jsx-source": "^7.9.0" + }, + "dependencies": { + "@babel/helper-plugin-utils": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", + "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" + } } }, "@babel/preset-typescript": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.8.3.tgz", - "integrity": "sha512-qee5LgPGui9zQ0jR1TeU5/fP9L+ovoArklEqY12ek8P/wV5ZeM/VYSQYwICeoT6FfpJTekG9Ilay5PhwsOpMHA==", + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.9.0.tgz", + "integrity": "sha512-S4cueFnGrIbvYJgwsVFKdvOmpiL0XGw9MFW9D0vgRys5g36PBhZRL8NX8Gr2akz8XRtzq6HuDXPD/1nniagNUg==", "requires": { "@babel/helper-plugin-utils": "^7.8.3", - "@babel/plugin-transform-typescript": "^7.8.3" + "@babel/plugin-transform-typescript": "^7.9.0" }, "dependencies": { "@babel/helper-plugin-utils": { @@ -2678,144 +2523,61 @@ } }, "@mdx-js/mdx": { - "version": "1.5.7", - "resolved": "https://registry.npmjs.org/@mdx-js/mdx/-/mdx-1.5.7.tgz", - "integrity": "sha512-db1E3P0HCgSUX768Y/jIcr5h41VR5AsvaOmPTydltNM4R8Uh863IqDvnkpa7l829bY/tp6wrMBWM2NH0oLuxHw==", + "version": "1.5.8", + "resolved": "https://registry.npmjs.org/@mdx-js/mdx/-/mdx-1.5.8.tgz", + "integrity": "sha512-OzanPTN0p9GZOEVeEuEa8QsjxxGyfFOOnI/+V1oC1su9UIN4KUg1k4n/hWTZC+VZhdW1Lfj6+Ho8nIs6L+pbDA==", "requires": { "@babel/core": "7.8.4", "@babel/plugin-syntax-jsx": "7.8.3", "@babel/plugin-syntax-object-rest-spread": "7.8.3", - "@mdx-js/util": "^1.5.7", - "babel-plugin-apply-mdx-type-prop": "^1.5.7", - "babel-plugin-extract-import-names": "^1.5.7", + "@mdx-js/util": "^1.5.8", + "babel-plugin-apply-mdx-type-prop": "^1.5.8", + "babel-plugin-extract-import-names": "^1.5.8", "camelcase-css": "2.0.1", "detab": "2.0.3", - "hast-util-raw": "5.0.1", + "hast-util-raw": "5.0.2", "lodash.uniq": "4.5.0", "mdast-util-to-hast": "7.0.0", - "remark-mdx": "^1.5.7", + "remark-mdx": "^1.5.8", "remark-parse": "7.0.2", "remark-squeeze-paragraphs": "3.0.4", "style-to-object": "0.3.0", "unified": "8.4.2", "unist-builder": "2.0.3", "unist-util-visit": "2.0.2" - }, - "dependencies": { - "@babel/code-frame": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", - "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", - "requires": { - "@babel/highlight": "^7.8.3" - } - }, - "@babel/core": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.8.4.tgz", - "integrity": "sha512-0LiLrB2PwrVI+a2/IEskBopDYSd8BCb3rOvH7D5tzoWd696TBEduBvuLVm4Nx6rltrLZqvI3MCalB2K2aVzQjA==", - "requires": { - "@babel/code-frame": "^7.8.3", - "@babel/generator": "^7.8.4", - "@babel/helpers": "^7.8.4", - "@babel/parser": "^7.8.4", - "@babel/template": "^7.8.3", - "@babel/traverse": "^7.8.4", - "@babel/types": "^7.8.3", - "convert-source-map": "^1.7.0", - "debug": "^4.1.0", - "gensync": "^1.0.0-beta.1", - "json5": "^2.1.0", - "lodash": "^4.17.13", - "resolve": "^1.3.2", - "semver": "^5.4.1", - "source-map": "^0.5.0" - } - }, - "@babel/helper-plugin-utils": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", - "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" - }, - "@babel/helpers": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.8.4.tgz", - "integrity": "sha512-VPbe7wcQ4chu4TDQjimHv/5tj73qz88o12EPkO2ValS2QiQS/1F2SsjyIGNnAD0vF/nZS6Cf9i+vW6HIlnaR8w==", - "requires": { - "@babel/template": "^7.8.3", - "@babel/traverse": "^7.8.4", - "@babel/types": "^7.8.3" - } - }, - "@babel/highlight": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.8.3.tgz", - "integrity": "sha512-PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg==", - "requires": { - "chalk": "^2.0.0", - "esutils": "^2.0.2", - "js-tokens": "^4.0.0" - } - }, - "@babel/plugin-syntax-object-rest-spread": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz", - "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==", - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/types": { - "version": "7.8.7", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.7.tgz", - "integrity": "sha512-k2TreEHxFA4CjGkL+GYjRyx35W0Mr7DP5+9q6WMkyKXB+904bYmG40syjMFV0oLlhhFCwWl0vA0DyzTDkwAiJw==", - "requires": { - "esutils": "^2.0.2", - "lodash": "^4.17.13", - "to-fast-properties": "^2.0.0" - } - }, - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "requires": { - "ms": "^2.1.1" - } - } - } - }, - "@mdx-js/react": { - "version": "1.5.7", - "resolved": "https://registry.npmjs.org/@mdx-js/react/-/react-1.5.7.tgz", - "integrity": "sha512-OxX/GKyVlqY7WqyRcsIA/qr7i1Xq3kAVNUhSSnL1mfKKNKO+hwMWcZX4WS2OItLtoavA2/8TVDHpV/MWKWyfvw==" - }, - "@mdx-js/util": { - "version": "1.5.7", - "resolved": "https://registry.npmjs.org/@mdx-js/util/-/util-1.5.7.tgz", - "integrity": "sha512-SV+V8A+Y33pmVT/LWk/2y51ixIyA/QH1XL+nrWAhoqre1rFtxOEZ4jr0W+bKZpeahOvkn/BQTheK+dRty9o/ig==" - }, - "@mikaelkristiansson/domready": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/@mikaelkristiansson/domready/-/domready-1.0.10.tgz", - "integrity": "sha512-6cDuZeKSCSJ1KvfEQ25Y8OXUjqDJZ+HgUs6dhASWbAX8fxVraTfPsSeRe2bN+4QJDsgUaXaMWBYfRomCr04GGg==" - }, - "@mrmlnc/readdir-enhanced": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz", - "integrity": "sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==", - "requires": { - "call-me-maybe": "^1.0.1", - "glob-to-regexp": "^0.3.0" - } - }, - "@nodelib/fs.scandir": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz", - "integrity": "sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==", - "requires": { - "@nodelib/fs.stat": "2.0.3", - "run-parallel": "^1.1.9" + } + }, + "@mdx-js/react": { + "version": "1.5.8", + "resolved": "https://registry.npmjs.org/@mdx-js/react/-/react-1.5.8.tgz", + "integrity": "sha512-L3rehITVxqDHOPJFGBSHKt3Mv/p3MENYlGIwLNYU89/iVqTLMD/vz8hL9RQtKqRoMbKuWpzzLlKIObqJzthNYg==" + }, + "@mdx-js/util": { + "version": "1.5.8", + "resolved": "https://registry.npmjs.org/@mdx-js/util/-/util-1.5.8.tgz", + "integrity": "sha512-a7Gjjw8bfBSertA/pTWBA/9WKEhgaSxvQE2NTSUzaknrzGFOhs4alZSHh3RHmSFdSWv5pUuzAgsWseMLhWEVkQ==" + }, + "@mikaelkristiansson/domready": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/@mikaelkristiansson/domready/-/domready-1.0.10.tgz", + "integrity": "sha512-6cDuZeKSCSJ1KvfEQ25Y8OXUjqDJZ+HgUs6dhASWbAX8fxVraTfPsSeRe2bN+4QJDsgUaXaMWBYfRomCr04GGg==" + }, + "@mrmlnc/readdir-enhanced": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz", + "integrity": "sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==", + "requires": { + "call-me-maybe": "^1.0.1", + "glob-to-regexp": "^0.3.0" + } + }, + "@nodelib/fs.scandir": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz", + "integrity": "sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==", + "requires": { + "@nodelib/fs.stat": "2.0.3", + "run-parallel": "^1.1.9" }, "dependencies": { "@nodelib/fs.stat": { @@ -3114,9 +2876,9 @@ "integrity": "sha512-OCutwjDZ4aFS6PB1UZ988C4YgwlBHJd6wCeQqaLdmadZ/7e+w79+hbMUFC1QXDNCmdyoRfAFdm0RypzwR+Qpag==" }, "@types/estree": { - "version": "0.0.43", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.43.tgz", - "integrity": "sha512-WfOySUnBpyKXbkC9QuZguwOGhGnugDXT2f2P6X8EIis7qlnd5NI1Nr4kRi357NtguxezyizIcaFlQe0wx23XnA==" + "version": "0.0.44", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.44.tgz", + "integrity": "sha512-iaIVzr+w2ZJ5HkidlZ3EJM8VTZb2MJLCjw3V+505yVts0gRC4UMvjw0d1HPtGqI/HQC/KdsYtayfzl+AXY2R8g==" }, "@types/events": { "version": "3.0.0", @@ -4217,12 +3979,12 @@ } }, "babel-plugin-apply-mdx-type-prop": { - "version": "1.5.7", - "resolved": "https://registry.npmjs.org/babel-plugin-apply-mdx-type-prop/-/babel-plugin-apply-mdx-type-prop-1.5.7.tgz", - "integrity": "sha512-SUDwTmMmxzaAZ1YfAPnL2UI3q/JEs+fekx/QTZYEgK+cVGMwS/PrCeK9UDlTHOYJr9b4mieR+iLhm43jrav2WA==", + "version": "1.5.8", + "resolved": "https://registry.npmjs.org/babel-plugin-apply-mdx-type-prop/-/babel-plugin-apply-mdx-type-prop-1.5.8.tgz", + "integrity": "sha512-xYp5F9mAnZdDRFSd1vF3XQ0GQUbIulCpnuht2jCmK30GAHL8szVL7TgzwhEGamQ6yJmP/gEyYNM9OR5D2n26eA==", "requires": { "@babel/helper-plugin-utils": "7.8.3", - "@mdx-js/util": "^1.5.7" + "@mdx-js/util": "^1.5.8" }, "dependencies": { "@babel/helper-plugin-utils": { @@ -4258,9 +4020,9 @@ } }, "babel-plugin-extract-import-names": { - "version": "1.5.7", - "resolved": "https://registry.npmjs.org/babel-plugin-extract-import-names/-/babel-plugin-extract-import-names-1.5.7.tgz", - "integrity": "sha512-kZX4g9ehTyxjdbq2rb8wW307+jNu5z3KllYs8cnbapSwclT9wBErJoqvKKZAkuiaufp0r+7WaIvjhKtJ7QlG3A==", + "version": "1.5.8", + "resolved": "https://registry.npmjs.org/babel-plugin-extract-import-names/-/babel-plugin-extract-import-names-1.5.8.tgz", + "integrity": "sha512-LcLfP8ZRBZMdMAXHLugyvvd5PY0gMmLMWFogWAUsG32X6TYW2Eavx+il2bw73KDbW+UdCC1bAJ3NuU25T1MI3g==", "requires": { "@babel/helper-plugin-utils": "7.8.3" }, @@ -5712,6 +5474,11 @@ "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz", "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==" }, + "buffer-crc32": { + "version": "0.2.13", + "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", + "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=" + }, "buffer-es6": { "version": "4.9.3", "resolved": "https://registry.npmjs.org/buffer-es6/-/buffer-es6-4.9.3.tgz", @@ -9465,14 +9232,14 @@ } }, "extract-zip": { - "version": "1.6.7", - "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.7.tgz", - "integrity": "sha1-qEC0uK9kAyZMjbV/Txp0Mz74H+k=", + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.7.0.tgz", + "integrity": "sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA==", "requires": { - "concat-stream": "1.6.2", - "debug": "2.6.9", - "mkdirp": "0.5.1", - "yauzl": "2.4.1" + "concat-stream": "^1.6.2", + "debug": "^2.6.9", + "mkdirp": "^0.5.4", + "yauzl": "^2.10.0" }, "dependencies": { "debug": { @@ -9483,6 +9250,19 @@ "ms": "2.0.0" } }, + "minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" + }, + "mkdirp": { + "version": "0.5.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.4.tgz", + "integrity": "sha512-iG9AK/dJLtJ0XNgTuDbSyNS3zECqDlAhnQW4CsNxBG3LQJBbHmRX1egw39DmtOdCAqY+dKXV+sgPgilNWUKMVw==", + "requires": { + "minimist": "^1.2.5" + } + }, "ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", @@ -9571,9 +9351,9 @@ } }, "fd-slicer": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz", - "integrity": "sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", + "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=", "requires": { "pend": "~1.2.0" } @@ -11098,9 +10878,9 @@ } }, "gatsby-core-utils": { - "version": "1.0.34", - "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.0.34.tgz", - "integrity": "sha512-CVuUQTVY+0X7vAqFnDeRT0ZkN0tUXvk6GLvUqfmoOzBvX9HphiR0VTi1tEYrsc5DSaz7Oyhr0vdp8j/e96rH1w==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.1.1.tgz", + "integrity": "sha512-EboPcBx37YQVUKN9JH753S54nDxjRmOefbR0i08KTmaVgQ1lZnDXJr8JfrImmMqupZlOkPQX1mWlXfp+r1jGhA==", "requires": { "ci-info": "2.0.0", "configstore": "^5.0.1", @@ -11201,18 +10981,18 @@ } }, "gatsby-plugin-emotion": { - "version": "4.1.25", - "resolved": "https://registry.npmjs.org/gatsby-plugin-emotion/-/gatsby-plugin-emotion-4.1.25.tgz", - "integrity": "sha512-VP+s3mEfvaTjKUOVsDRgy/HPfDJQHeZD/Z/WBKgQetLgmvrGVnxm9NEMCJWyJm9LxQ791bfwoP6XNwOYscU8sA==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/gatsby-plugin-emotion/-/gatsby-plugin-emotion-4.2.1.tgz", + "integrity": "sha512-ygXxkpnWJdDOAgb1XA9TbVCRLkaAYTFLTsqVQXMBhnrknb5iPNO+MP0fZ5LRqWgBALyJ629nxs0efUpnT/RSWw==", "requires": { "@babel/runtime": "^7.8.7", "@emotion/babel-preset-css-prop": "^10.0.27" }, "dependencies": { "@babel/runtime": { - "version": "7.8.7", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.7.tgz", - "integrity": "sha512-+AATMUFppJDw6aiR5NVPHqIQBlV/Pj8wY/EZH+lmvRdUo9xBaz/rF3alAwFJQavvKfeOlPE7oaaDHVbcySbCsg==", + "version": "7.9.2", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz", + "integrity": "sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==", "requires": { "regenerator-runtime": "^0.13.4" } @@ -11225,18 +11005,18 @@ } }, "gatsby-plugin-less": { - "version": "3.0.21", - "resolved": "https://registry.npmjs.org/gatsby-plugin-less/-/gatsby-plugin-less-3.0.21.tgz", - "integrity": "sha512-58a5MUSYnPDgy/udBElrtoYeue9ucI/hGglM/QhCNMZtH8XZXW8R2Q8ImKHsNlHtYiqA86auoHM/WOmkWlLkYQ==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/gatsby-plugin-less/-/gatsby-plugin-less-3.1.1.tgz", + "integrity": "sha512-H0LQXy2DpwD1UW3bEuE8RHk2yNfOcZGFjzYH9URPUAzxuOo6bhPyNxKJ8tLcvarqwYiJIWFFivDMv0IqgBJ16Q==", "requires": { "@babel/runtime": "^7.8.7", "less-loader": "^5.0.0" }, "dependencies": { "@babel/runtime": { - "version": "7.8.7", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.7.tgz", - "integrity": "sha512-+AATMUFppJDw6aiR5NVPHqIQBlV/Pj8wY/EZH+lmvRdUo9xBaz/rF3alAwFJQavvKfeOlPE7oaaDHVbcySbCsg==", + "version": "7.9.2", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz", + "integrity": "sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==", "requires": { "regenerator-runtime": "^0.13.4" } @@ -11249,9 +11029,9 @@ } }, "gatsby-plugin-mdx": { - "version": "1.0.84", - "resolved": "https://registry.npmjs.org/gatsby-plugin-mdx/-/gatsby-plugin-mdx-1.0.84.tgz", - "integrity": "sha512-OfMzdSybwB6cFGiTPbW2SDbv37V7NOk3/OAhn27fixOLPGqJ//ontIRldZLQZKZfEa30U2gnnh9XTG3C5jvfVQ==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/gatsby-plugin-mdx/-/gatsby-plugin-mdx-1.1.4.tgz", + "integrity": "sha512-id2/LALN7eseTGN05v1n16XCYggrl2UTzWOJOQME9rh25jNK+KT5ywaPY6vNYimeAW7wWdad3rl6hORpv4L6yw==", "requires": { "@babel/core": "^7.8.7", "@babel/generator": "^7.8.8", @@ -11268,7 +11048,7 @@ "escape-string-regexp": "^1.0.5", "eval": "^0.1.4", "fs-extra": "^8.1.0", - "gatsby-core-utils": "^1.0.34", + "gatsby-core-utils": "^1.1.1", "gray-matter": "^4.0.2", "json5": "^2.1.2", "loader-utils": "^1.4.0", @@ -11299,21 +11079,22 @@ } }, "@babel/core": { - "version": "7.8.7", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.8.7.tgz", - "integrity": "sha512-rBlqF3Yko9cynC5CCFy6+K/w2N+Sq/ff2BPy+Krp7rHlABIr5epbA7OxVeKoMHB39LZOp1UY5SuLjy6uWi35yA==", + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.0.tgz", + "integrity": "sha512-kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==", "requires": { "@babel/code-frame": "^7.8.3", - "@babel/generator": "^7.8.7", - "@babel/helpers": "^7.8.4", - "@babel/parser": "^7.8.7", + "@babel/generator": "^7.9.0", + "@babel/helper-module-transforms": "^7.9.0", + "@babel/helpers": "^7.9.0", + "@babel/parser": "^7.9.0", "@babel/template": "^7.8.6", - "@babel/traverse": "^7.8.6", - "@babel/types": "^7.8.7", + "@babel/traverse": "^7.9.0", + "@babel/types": "^7.9.0", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.1", - "json5": "^2.1.0", + "json5": "^2.1.2", "lodash": "^4.17.13", "resolve": "^1.3.2", "semver": "^5.4.1", @@ -11321,732 +11102,70 @@ } }, "@babel/generator": { - "version": "7.8.8", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.8.8.tgz", - "integrity": "sha512-HKyUVu69cZoclptr8t8U5b6sx6zoWjh8jiUhnuj3MpZuKT2dJ8zPTuiy31luq32swhI0SpwItCIlU8XW7BZeJg==", + "version": "7.9.4", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.4.tgz", + "integrity": "sha512-rjP8ahaDy/ouhrvCoU1E5mqaitWrxwuNGU+dy1EpaoK48jZay4MdkskKGIMHLZNewg8sAsqpGSREJwP0zH3YQA==", "requires": { - "@babel/types": "^7.8.7", + "@babel/types": "^7.9.0", "jsesc": "^2.5.1", "lodash": "^4.17.13", "source-map": "^0.5.0" } }, - "@babel/helper-annotate-as-pure": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.8.3.tgz", - "integrity": "sha512-6o+mJrZBxOoEX77Ezv9zwW7WV8DdluouRKNY/IR5u/YTMuKHgugHOzYWlYvYLpLA9nPsQCAAASpCIbjI9Mv+Uw==", - "requires": { - "@babel/types": "^7.8.3" - } - }, - "@babel/helper-builder-binary-assignment-operator-visitor": { + "@babel/helper-plugin-utils": { "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.8.3.tgz", - "integrity": "sha512-5eFOm2SyFPK4Rh3XMMRDjN7lBH0orh3ss0g3rTYZnBQ+r6YPj7lgDyCvPphynHvUrobJmeMignBr6Acw9mAPlw==", - "requires": { - "@babel/helper-explode-assignable-expression": "^7.8.3", - "@babel/types": "^7.8.3" - } + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", + "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" }, - "@babel/helper-builder-react-jsx": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.8.3.tgz", - "integrity": "sha512-JT8mfnpTkKNCboTqZsQTdGo3l3Ik3l7QIt9hh0O9DYiwVel37VoJpILKM4YFbP2euF32nkQSb+F9cUk9b7DDXQ==", + "@babel/highlight": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz", + "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==", "requires": { - "@babel/types": "^7.8.3", - "esutils": "^2.0.0" + "@babel/helper-validator-identifier": "^7.9.0", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" } }, - "@babel/helper-call-delegate": { - "version": "7.8.7", - "resolved": "https://registry.npmjs.org/@babel/helper-call-delegate/-/helper-call-delegate-7.8.7.tgz", - "integrity": "sha512-doAA5LAKhsFCR0LAFIf+r2RSMmC+m8f/oQ+URnUET/rWeEzC0yTRmAGyWkD4sSu3xwbS7MYQ2u+xlt1V5R56KQ==", - "requires": { - "@babel/helper-hoist-variables": "^7.8.3", - "@babel/traverse": "^7.8.3", - "@babel/types": "^7.8.7" - } + "@babel/parser": { + "version": "7.9.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz", + "integrity": "sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==" }, - "@babel/helper-create-regexp-features-plugin": { - "version": "7.8.8", - "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.8.tgz", - "integrity": "sha512-LYVPdwkrQEiX9+1R29Ld/wTrmQu1SSKYnuOk3g0CkcZMA1p0gsNxJFj/3gBdaJ7Cg0Fnek5z0DsMULePP7Lrqg==", + "@babel/template": { + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz", + "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==", "requires": { - "@babel/helper-annotate-as-pure": "^7.8.3", - "@babel/helper-regex": "^7.8.3", - "regexpu-core": "^4.7.0" + "@babel/code-frame": "^7.8.3", + "@babel/parser": "^7.8.6", + "@babel/types": "^7.8.6" } }, - "@babel/helper-define-map": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.8.3.tgz", - "integrity": "sha512-PoeBYtxoZGtct3md6xZOCWPcKuMuk3IHhgxsRRNtnNShebf4C8YonTSblsK4tvDbm+eJAw2HAPOfCr+Q/YRG/g==", + "@babel/traverse": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.0.tgz", + "integrity": "sha512-jAZQj0+kn4WTHO5dUZkZKhbFrqZE7K5LAQ5JysMnmvGij+wOdr+8lWqPeW0BcF4wFwrEXXtdGO7wcV6YPJcf3w==", "requires": { + "@babel/code-frame": "^7.8.3", + "@babel/generator": "^7.9.0", "@babel/helper-function-name": "^7.8.3", - "@babel/types": "^7.8.3", - "lodash": "^4.17.13" - } - }, - "@babel/helper-explode-assignable-expression": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.8.3.tgz", - "integrity": "sha512-N+8eW86/Kj147bO9G2uclsg5pwfs/fqqY5rwgIL7eTBklgXjcOJ3btzS5iM6AitJcftnY7pm2lGsrJVYLGjzIw==", - "requires": { - "@babel/traverse": "^7.8.3", - "@babel/types": "^7.8.3" - } - }, - "@babel/helper-hoist-variables": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.8.3.tgz", - "integrity": "sha512-ky1JLOjcDUtSc+xkt0xhYff7Z6ILTAHKmZLHPxAhOP0Nd77O+3nCsd6uSVYur6nJnCI029CrNbYlc0LoPfAPQg==", - "requires": { - "@babel/types": "^7.8.3" - } - }, - "@babel/helper-member-expression-to-functions": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.8.3.tgz", - "integrity": "sha512-fO4Egq88utkQFjbPrSHGmGLFqmrshs11d46WI+WZDESt7Wu7wN2G2Iu+NMMZJFDOVRHAMIkB5SNh30NtwCA7RA==", - "requires": { - "@babel/types": "^7.8.3" - } - }, - "@babel/helper-module-imports": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz", - "integrity": "sha512-R0Bx3jippsbAEtzkpZ/6FIiuzOURPcMjHp+Z6xPe6DtApDJx+w7UYyOLanZqO8+wKR9G10s/FmHXvxaMd9s6Kg==", - "requires": { - "@babel/types": "^7.8.3" - } - }, - "@babel/helper-module-transforms": { - "version": "7.8.6", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.8.6.tgz", - "integrity": "sha512-RDnGJSR5EFBJjG3deY0NiL0K9TO8SXxS9n/MPsbPK/s9LbQymuLNtlzvDiNS7IpecuL45cMeLVkA+HfmlrnkRg==", - "requires": { - "@babel/helper-module-imports": "^7.8.3", - "@babel/helper-replace-supers": "^7.8.6", - "@babel/helper-simple-access": "^7.8.3", "@babel/helper-split-export-declaration": "^7.8.3", - "@babel/template": "^7.8.6", - "@babel/types": "^7.8.6", + "@babel/parser": "^7.9.0", + "@babel/types": "^7.9.0", + "debug": "^4.1.0", + "globals": "^11.1.0", "lodash": "^4.17.13" } }, - "@babel/helper-optimise-call-expression": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.8.3.tgz", - "integrity": "sha512-Kag20n86cbO2AvHca6EJsvqAd82gc6VMGule4HwebwMlwkpXuVqrNRj6CkCV2sKxgi9MyAUnZVnZ6lJ1/vKhHQ==", + "@babel/types": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.0.tgz", + "integrity": "sha512-BS9JKfXkzzJl8RluW4JGknzpiUV7ZrvTayM6yfqLTVBEnFtyowVIOu6rqxRd5cVO6yGoWf4T8u8dgK9oB+GCng==", "requires": { - "@babel/types": "^7.8.3" - } - }, - "@babel/helper-plugin-utils": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", - "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" - }, - "@babel/helper-regex": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.8.3.tgz", - "integrity": "sha512-BWt0QtYv/cg/NecOAZMdcn/waj/5P26DR4mVLXfFtDokSR6fyuG0Pj+e2FqtSME+MqED1khnSMulkmGl8qWiUQ==", - "requires": { - "lodash": "^4.17.13" - } - }, - "@babel/helper-remap-async-to-generator": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.8.3.tgz", - "integrity": "sha512-kgwDmw4fCg7AVgS4DukQR/roGp+jP+XluJE5hsRZwxCYGg+Rv9wSGErDWhlI90FODdYfd4xG4AQRiMDjjN0GzA==", - "requires": { - "@babel/helper-annotate-as-pure": "^7.8.3", - "@babel/helper-wrap-function": "^7.8.3", - "@babel/template": "^7.8.3", - "@babel/traverse": "^7.8.3", - "@babel/types": "^7.8.3" - } - }, - "@babel/helper-replace-supers": { - "version": "7.8.6", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.8.6.tgz", - "integrity": "sha512-PeMArdA4Sv/Wf4zXwBKPqVj7n9UF/xg6slNRtZW84FM7JpE1CbG8B612FyM4cxrf4fMAMGO0kR7voy1ForHHFA==", - "requires": { - "@babel/helper-member-expression-to-functions": "^7.8.3", - "@babel/helper-optimise-call-expression": "^7.8.3", - "@babel/traverse": "^7.8.6", - "@babel/types": "^7.8.6" - } - }, - "@babel/helper-simple-access": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.8.3.tgz", - "integrity": "sha512-VNGUDjx5cCWg4vvCTR8qQ7YJYZ+HBjxOgXEl7ounz+4Sn7+LMD3CFrCTEU6/qXKbA2nKg21CwhhBzO0RpRbdCw==", - "requires": { - "@babel/template": "^7.8.3", - "@babel/types": "^7.8.3" - } - }, - "@babel/helper-wrap-function": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.8.3.tgz", - "integrity": "sha512-LACJrbUET9cQDzb6kG7EeD7+7doC3JNvUgTEQOx2qaO1fKlzE/Bf05qs9w1oXQMmXlPO65lC3Tq9S6gZpTErEQ==", - "requires": { - "@babel/helper-function-name": "^7.8.3", - "@babel/template": "^7.8.3", - "@babel/traverse": "^7.8.3", - "@babel/types": "^7.8.3" - } - }, - "@babel/helpers": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.8.4.tgz", - "integrity": "sha512-VPbe7wcQ4chu4TDQjimHv/5tj73qz88o12EPkO2ValS2QiQS/1F2SsjyIGNnAD0vF/nZS6Cf9i+vW6HIlnaR8w==", - "requires": { - "@babel/template": "^7.8.3", - "@babel/traverse": "^7.8.4", - "@babel/types": "^7.8.3" - } - }, - "@babel/highlight": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.8.3.tgz", - "integrity": "sha512-PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg==", - "requires": { - "chalk": "^2.0.0", - "esutils": "^2.0.2", - "js-tokens": "^4.0.0" - } - }, - "@babel/parser": { - "version": "7.8.8", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.8.8.tgz", - "integrity": "sha512-mO5GWzBPsPf6865iIbzNE0AvkKF3NE+2S3eRUpE+FE07BOAkXh6G+GW/Pj01hhXjve1WScbaIO4UlY1JKeqCcA==" - }, - "@babel/plugin-proposal-async-generator-functions": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.8.3.tgz", - "integrity": "sha512-NZ9zLv848JsV3hs8ryEh7Uaz/0KsmPLqv0+PdkDJL1cJy0K4kOCFa8zc1E3mp+RHPQcpdfb/6GovEsW4VDrOMw==", - "requires": { - "@babel/helper-plugin-utils": "^7.8.3", - "@babel/helper-remap-async-to-generator": "^7.8.3", - "@babel/plugin-syntax-async-generators": "^7.8.0" - } - }, - "@babel/plugin-proposal-dynamic-import": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.8.3.tgz", - "integrity": "sha512-NyaBbyLFXFLT9FP+zk0kYlUlA8XtCUbehs67F0nnEg7KICgMc2mNkIeu9TYhKzyXMkrapZFwAhXLdnt4IYHy1w==", - "requires": { - "@babel/helper-plugin-utils": "^7.8.3", - "@babel/plugin-syntax-dynamic-import": "^7.8.0" - } - }, - "@babel/plugin-proposal-json-strings": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.8.3.tgz", - "integrity": "sha512-KGhQNZ3TVCQG/MjRbAUwuH+14y9q0tpxs1nWWs3pbSleRdDro9SAMMDyye8HhY1gqZ7/NqIc8SKhya0wRDgP1Q==", - "requires": { - "@babel/helper-plugin-utils": "^7.8.3", - "@babel/plugin-syntax-json-strings": "^7.8.0" - } - }, - "@babel/plugin-proposal-optional-catch-binding": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.8.3.tgz", - "integrity": "sha512-0gkX7J7E+AtAw9fcwlVQj8peP61qhdg/89D5swOkjYbkboA2CVckn3kiyum1DE0wskGb7KJJxBdyEBApDLLVdw==", - "requires": { - "@babel/helper-plugin-utils": "^7.8.3", - "@babel/plugin-syntax-optional-catch-binding": "^7.8.0" - } - }, - "@babel/plugin-proposal-unicode-property-regex": { - "version": "7.8.8", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.8.tgz", - "integrity": "sha512-EVhjVsMpbhLw9ZfHWSx2iy13Q8Z/eg8e8ccVWt23sWQK5l1UdkoLJPN5w69UA4uITGBnEZD2JOe4QOHycYKv8A==", - "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.8.8", - "@babel/helper-plugin-utils": "^7.8.3" - } - }, - "@babel/plugin-syntax-async-generators": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz", - "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==", - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-dynamic-import": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz", - "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==", - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-json-strings": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz", - "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==", - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-object-rest-spread": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz", - "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==", - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-optional-catch-binding": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz", - "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==", - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-top-level-await": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.8.3.tgz", - "integrity": "sha512-kwj1j9lL/6Wd0hROD3b/OZZ7MSrZLqqn9RAZ5+cYYsflQ9HZBIKCUkr3+uL1MEJ1NePiUbf98jjiMQSv0NMR9g==", - "requires": { - "@babel/helper-plugin-utils": "^7.8.3" - } - }, - "@babel/plugin-transform-arrow-functions": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.8.3.tgz", - "integrity": "sha512-0MRF+KC8EqH4dbuITCWwPSzsyO3HIWWlm30v8BbbpOrS1B++isGxPnnuq/IZvOX5J2D/p7DQalQm+/2PnlKGxg==", - "requires": { - "@babel/helper-plugin-utils": "^7.8.3" - } - }, - "@babel/plugin-transform-async-to-generator": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.8.3.tgz", - "integrity": "sha512-imt9tFLD9ogt56Dd5CI/6XgpukMwd/fLGSrix2httihVe7LOGVPhyhMh1BU5kDM7iHD08i8uUtmV2sWaBFlHVQ==", - "requires": { - "@babel/helper-module-imports": "^7.8.3", - "@babel/helper-plugin-utils": "^7.8.3", - "@babel/helper-remap-async-to-generator": "^7.8.3" - } - }, - "@babel/plugin-transform-block-scoped-functions": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.8.3.tgz", - "integrity": "sha512-vo4F2OewqjbB1+yaJ7k2EJFHlTP3jR634Z9Cj9itpqNjuLXvhlVxgnjsHsdRgASR8xYDrx6onw4vW5H6We0Jmg==", - "requires": { - "@babel/helper-plugin-utils": "^7.8.3" - } - }, - "@babel/plugin-transform-block-scoping": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.8.3.tgz", - "integrity": "sha512-pGnYfm7RNRgYRi7bids5bHluENHqJhrV4bCZRwc5GamaWIIs07N4rZECcmJL6ZClwjDz1GbdMZFtPs27hTB06w==", - "requires": { - "@babel/helper-plugin-utils": "^7.8.3", - "lodash": "^4.17.13" - } - }, - "@babel/plugin-transform-classes": { - "version": "7.8.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.8.6.tgz", - "integrity": "sha512-k9r8qRay/R6v5aWZkrEclEhKO6mc1CCQr2dLsVHBmOQiMpN6I2bpjX3vgnldUWeEI1GHVNByULVxZ4BdP4Hmdg==", - "requires": { - "@babel/helper-annotate-as-pure": "^7.8.3", - "@babel/helper-define-map": "^7.8.3", - "@babel/helper-function-name": "^7.8.3", - "@babel/helper-optimise-call-expression": "^7.8.3", - "@babel/helper-plugin-utils": "^7.8.3", - "@babel/helper-replace-supers": "^7.8.6", - "@babel/helper-split-export-declaration": "^7.8.3", - "globals": "^11.1.0" - } - }, - "@babel/plugin-transform-computed-properties": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.8.3.tgz", - "integrity": "sha512-O5hiIpSyOGdrQZRQ2ccwtTVkgUDBBiCuK//4RJ6UfePllUTCENOzKxfh6ulckXKc0DixTFLCfb2HVkNA7aDpzA==", - "requires": { - "@babel/helper-plugin-utils": "^7.8.3" - } - }, - "@babel/plugin-transform-destructuring": { - "version": "7.8.8", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.8.8.tgz", - "integrity": "sha512-eRJu4Vs2rmttFCdhPUM3bV0Yo/xPSdPw6ML9KHs/bjB4bLA5HXlbvYXPOD5yASodGod+krjYx21xm1QmL8dCJQ==", - "requires": { - "@babel/helper-plugin-utils": "^7.8.3" - } - }, - "@babel/plugin-transform-dotall-regex": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.8.3.tgz", - "integrity": "sha512-kLs1j9Nn4MQoBYdRXH6AeaXMbEJFaFu/v1nQkvib6QzTj8MZI5OQzqmD83/2jEM1z0DLilra5aWO5YpyC0ALIw==", - "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.8.3", - "@babel/helper-plugin-utils": "^7.8.3" - } - }, - "@babel/plugin-transform-duplicate-keys": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.8.3.tgz", - "integrity": "sha512-s8dHiBUbcbSgipS4SMFuWGqCvyge5V2ZeAWzR6INTVC3Ltjig/Vw1G2Gztv0vU/hRG9X8IvKvYdoksnUfgXOEQ==", - "requires": { - "@babel/helper-plugin-utils": "^7.8.3" - } - }, - "@babel/plugin-transform-exponentiation-operator": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.8.3.tgz", - "integrity": "sha512-zwIpuIymb3ACcInbksHaNcR12S++0MDLKkiqXHl3AzpgdKlFNhog+z/K0+TGW+b0w5pgTq4H6IwV/WhxbGYSjQ==", - "requires": { - "@babel/helper-builder-binary-assignment-operator-visitor": "^7.8.3", - "@babel/helper-plugin-utils": "^7.8.3" - } - }, - "@babel/plugin-transform-for-of": { - "version": "7.8.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.8.6.tgz", - "integrity": "sha512-M0pw4/1/KI5WAxPsdcUL/w2LJ7o89YHN3yLkzNjg7Yl15GlVGgzHyCU+FMeAxevHGsLVmUqbirlUIKTafPmzdw==", - "requires": { - "@babel/helper-plugin-utils": "^7.8.3" - } - }, - "@babel/plugin-transform-function-name": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.8.3.tgz", - "integrity": "sha512-rO/OnDS78Eifbjn5Py9v8y0aR+aSYhDhqAwVfsTl0ERuMZyr05L1aFSCJnbv2mmsLkit/4ReeQ9N2BgLnOcPCQ==", - "requires": { - "@babel/helper-function-name": "^7.8.3", - "@babel/helper-plugin-utils": "^7.8.3" - } - }, - "@babel/plugin-transform-literals": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.8.3.tgz", - "integrity": "sha512-3Tqf8JJ/qB7TeldGl+TT55+uQei9JfYaregDcEAyBZ7akutriFrt6C/wLYIer6OYhleVQvH/ntEhjE/xMmy10A==", - "requires": { - "@babel/helper-plugin-utils": "^7.8.3" - } - }, - "@babel/plugin-transform-member-expression-literals": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.8.3.tgz", - "integrity": "sha512-3Wk2EXhnw+rP+IDkK6BdtPKsUE5IeZ6QOGrPYvw52NwBStw9V1ZVzxgK6fSKSxqUvH9eQPR3tm3cOq79HlsKYA==", - "requires": { - "@babel/helper-plugin-utils": "^7.8.3" - } - }, - "@babel/plugin-transform-modules-amd": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.8.3.tgz", - "integrity": "sha512-MadJiU3rLKclzT5kBH4yxdry96odTUwuqrZM+GllFI/VhxfPz+k9MshJM+MwhfkCdxxclSbSBbUGciBngR+kEQ==", - "requires": { - "@babel/helper-module-transforms": "^7.8.3", - "@babel/helper-plugin-utils": "^7.8.3", - "babel-plugin-dynamic-import-node": "^2.3.0" - } - }, - "@babel/plugin-transform-modules-commonjs": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.8.3.tgz", - "integrity": "sha512-JpdMEfA15HZ/1gNuB9XEDlZM1h/gF/YOH7zaZzQu2xCFRfwc01NXBMHHSTT6hRjlXJJs5x/bfODM3LiCk94Sxg==", - "requires": { - "@babel/helper-module-transforms": "^7.8.3", - "@babel/helper-plugin-utils": "^7.8.3", - "@babel/helper-simple-access": "^7.8.3", - "babel-plugin-dynamic-import-node": "^2.3.0" - } - }, - "@babel/plugin-transform-modules-systemjs": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.8.3.tgz", - "integrity": "sha512-8cESMCJjmArMYqa9AO5YuMEkE4ds28tMpZcGZB/jl3n0ZzlsxOAi3mC+SKypTfT8gjMupCnd3YiXCkMjj2jfOg==", - "requires": { - "@babel/helper-hoist-variables": "^7.8.3", - "@babel/helper-module-transforms": "^7.8.3", - "@babel/helper-plugin-utils": "^7.8.3", - "babel-plugin-dynamic-import-node": "^2.3.0" - } - }, - "@babel/plugin-transform-modules-umd": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.8.3.tgz", - "integrity": "sha512-evhTyWhbwbI3/U6dZAnx/ePoV7H6OUG+OjiJFHmhr9FPn0VShjwC2kdxqIuQ/+1P50TMrneGzMeyMTFOjKSnAw==", - "requires": { - "@babel/helper-module-transforms": "^7.8.3", - "@babel/helper-plugin-utils": "^7.8.3" - } - }, - "@babel/plugin-transform-named-capturing-groups-regex": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.8.3.tgz", - "integrity": "sha512-f+tF/8UVPU86TrCb06JoPWIdDpTNSGGcAtaD9mLP0aYGA0OS0j7j7DHJR0GTFrUZPUU6loZhbsVZgTh0N+Qdnw==", - "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.8.3" - } - }, - "@babel/plugin-transform-new-target": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.8.3.tgz", - "integrity": "sha512-QuSGysibQpyxexRyui2vca+Cmbljo8bcRckgzYV4kRIsHpVeyeC3JDO63pY+xFZ6bWOBn7pfKZTqV4o/ix9sFw==", - "requires": { - "@babel/helper-plugin-utils": "^7.8.3" - } - }, - "@babel/plugin-transform-object-super": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.8.3.tgz", - "integrity": "sha512-57FXk+gItG/GejofIyLIgBKTas4+pEU47IXKDBWFTxdPd7F80H8zybyAY7UoblVfBhBGs2EKM+bJUu2+iUYPDQ==", - "requires": { - "@babel/helper-plugin-utils": "^7.8.3", - "@babel/helper-replace-supers": "^7.8.3" - } - }, - "@babel/plugin-transform-parameters": { - "version": "7.8.8", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.8.8.tgz", - "integrity": "sha512-hC4Ld/Ulpf1psQciWWwdnUspQoQco2bMzSrwU6TmzRlvoYQe4rQFy9vnCZDTlVeCQj0JPfL+1RX0V8hCJvkgBA==", - "requires": { - "@babel/helper-call-delegate": "^7.8.7", - "@babel/helper-get-function-arity": "^7.8.3", - "@babel/helper-plugin-utils": "^7.8.3" - } - }, - "@babel/plugin-transform-property-literals": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.8.3.tgz", - "integrity": "sha512-uGiiXAZMqEoQhRWMK17VospMZh5sXWg+dlh2soffpkAl96KAm+WZuJfa6lcELotSRmooLqg0MWdH6UUq85nmmg==", - "requires": { - "@babel/helper-plugin-utils": "^7.8.3" - } - }, - "@babel/plugin-transform-react-display-name": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.8.3.tgz", - "integrity": "sha512-3Jy/PCw8Fe6uBKtEgz3M82ljt+lTg+xJaM4og+eyu83qLT87ZUSckn0wy7r31jflURWLO83TW6Ylf7lyXj3m5A==", - "requires": { - "@babel/helper-plugin-utils": "^7.8.3" - } - }, - "@babel/plugin-transform-react-jsx": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.8.3.tgz", - "integrity": "sha512-r0h+mUiyL595ikykci+fbwm9YzmuOrUBi0b+FDIKmi3fPQyFokWVEMJnRWHJPPQEjyFJyna9WZC6Viv6UHSv1g==", - "requires": { - "@babel/helper-builder-react-jsx": "^7.8.3", - "@babel/helper-plugin-utils": "^7.8.3", - "@babel/plugin-syntax-jsx": "^7.8.3" - } - }, - "@babel/plugin-transform-react-jsx-self": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.8.3.tgz", - "integrity": "sha512-01OT7s5oa0XTLf2I8XGsL8+KqV9lx3EZV+jxn/L2LQ97CGKila2YMroTkCEIE0HV/FF7CMSRsIAybopdN9NTdg==", - "requires": { - "@babel/helper-plugin-utils": "^7.8.3", - "@babel/plugin-syntax-jsx": "^7.8.3" - } - }, - "@babel/plugin-transform-react-jsx-source": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.8.3.tgz", - "integrity": "sha512-PLMgdMGuVDtRS/SzjNEQYUT8f4z1xb2BAT54vM1X5efkVuYBf5WyGUMbpmARcfq3NaglIwz08UVQK4HHHbC6ag==", - "requires": { - "@babel/helper-plugin-utils": "^7.8.3", - "@babel/plugin-syntax-jsx": "^7.8.3" - } - }, - "@babel/plugin-transform-regenerator": { - "version": "7.8.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.7.tgz", - "integrity": "sha512-TIg+gAl4Z0a3WmD3mbYSk+J9ZUH6n/Yc57rtKRnlA/7rcCvpekHXe0CMZHP1gYp7/KLe9GHTuIba0vXmls6drA==", - "requires": { - "regenerator-transform": "^0.14.2" - } - }, - "@babel/plugin-transform-reserved-words": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.8.3.tgz", - "integrity": "sha512-mwMxcycN3omKFDjDQUl+8zyMsBfjRFr0Zn/64I41pmjv4NJuqcYlEtezwYtw9TFd9WR1vN5kiM+O0gMZzO6L0A==", - "requires": { - "@babel/helper-plugin-utils": "^7.8.3" - } - }, - "@babel/plugin-transform-shorthand-properties": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.8.3.tgz", - "integrity": "sha512-I9DI6Odg0JJwxCHzbzW08ggMdCezoWcuQRz3ptdudgwaHxTjxw5HgdFJmZIkIMlRymL6YiZcped4TTCB0JcC8w==", - "requires": { - "@babel/helper-plugin-utils": "^7.8.3" - } - }, - "@babel/plugin-transform-spread": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.8.3.tgz", - "integrity": "sha512-CkuTU9mbmAoFOI1tklFWYYbzX5qCIZVXPVy0jpXgGwkplCndQAa58s2jr66fTeQnA64bDox0HL4U56CFYoyC7g==", - "requires": { - "@babel/helper-plugin-utils": "^7.8.3" - } - }, - "@babel/plugin-transform-sticky-regex": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.8.3.tgz", - "integrity": "sha512-9Spq0vGCD5Bb4Z/ZXXSK5wbbLFMG085qd2vhL1JYu1WcQ5bXqZBAYRzU1d+p79GcHs2szYv5pVQCX13QgldaWw==", - "requires": { - "@babel/helper-plugin-utils": "^7.8.3", - "@babel/helper-regex": "^7.8.3" - } - }, - "@babel/plugin-transform-template-literals": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.8.3.tgz", - "integrity": "sha512-820QBtykIQOLFT8NZOcTRJ1UNuztIELe4p9DCgvj4NK+PwluSJ49we7s9FB1HIGNIYT7wFUJ0ar2QpCDj0escQ==", - "requires": { - "@babel/helper-annotate-as-pure": "^7.8.3", - "@babel/helper-plugin-utils": "^7.8.3" - } - }, - "@babel/plugin-transform-typeof-symbol": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.8.4.tgz", - "integrity": "sha512-2QKyfjGdvuNfHsb7qnBBlKclbD4CfshH2KvDabiijLMGXPHJXGxtDzwIF7bQP+T0ysw8fYTtxPafgfs/c1Lrqg==", - "requires": { - "@babel/helper-plugin-utils": "^7.8.3" - } - }, - "@babel/plugin-transform-unicode-regex": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.8.3.tgz", - "integrity": "sha512-+ufgJjYdmWfSQ+6NS9VGUR2ns8cjJjYbrbi11mZBTaWm+Fui/ncTLFF28Ei1okavY+xkojGr1eJxNsWYeA5aZw==", - "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.8.3", - "@babel/helper-plugin-utils": "^7.8.3" - } - }, - "@babel/preset-env": { - "version": "7.8.7", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.8.7.tgz", - "integrity": "sha512-BYftCVOdAYJk5ASsznKAUl53EMhfBbr8CJ1X+AJLfGPscQkwJFiaV/Wn9DPH/7fzm2v6iRYJKYHSqyynTGw0nw==", - "requires": { - "@babel/compat-data": "^7.8.6", - "@babel/helper-compilation-targets": "^7.8.7", - "@babel/helper-module-imports": "^7.8.3", - "@babel/helper-plugin-utils": "^7.8.3", - "@babel/plugin-proposal-async-generator-functions": "^7.8.3", - "@babel/plugin-proposal-dynamic-import": "^7.8.3", - "@babel/plugin-proposal-json-strings": "^7.8.3", - "@babel/plugin-proposal-nullish-coalescing-operator": "^7.8.3", - "@babel/plugin-proposal-object-rest-spread": "^7.8.3", - "@babel/plugin-proposal-optional-catch-binding": "^7.8.3", - "@babel/plugin-proposal-optional-chaining": "^7.8.3", - "@babel/plugin-proposal-unicode-property-regex": "^7.8.3", - "@babel/plugin-syntax-async-generators": "^7.8.0", - "@babel/plugin-syntax-dynamic-import": "^7.8.0", - "@babel/plugin-syntax-json-strings": "^7.8.0", - "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0", - "@babel/plugin-syntax-object-rest-spread": "^7.8.0", - "@babel/plugin-syntax-optional-catch-binding": "^7.8.0", - "@babel/plugin-syntax-optional-chaining": "^7.8.0", - "@babel/plugin-syntax-top-level-await": "^7.8.3", - "@babel/plugin-transform-arrow-functions": "^7.8.3", - "@babel/plugin-transform-async-to-generator": "^7.8.3", - "@babel/plugin-transform-block-scoped-functions": "^7.8.3", - "@babel/plugin-transform-block-scoping": "^7.8.3", - "@babel/plugin-transform-classes": "^7.8.6", - "@babel/plugin-transform-computed-properties": "^7.8.3", - "@babel/plugin-transform-destructuring": "^7.8.3", - "@babel/plugin-transform-dotall-regex": "^7.8.3", - "@babel/plugin-transform-duplicate-keys": "^7.8.3", - "@babel/plugin-transform-exponentiation-operator": "^7.8.3", - "@babel/plugin-transform-for-of": "^7.8.6", - "@babel/plugin-transform-function-name": "^7.8.3", - "@babel/plugin-transform-literals": "^7.8.3", - "@babel/plugin-transform-member-expression-literals": "^7.8.3", - "@babel/plugin-transform-modules-amd": "^7.8.3", - "@babel/plugin-transform-modules-commonjs": "^7.8.3", - "@babel/plugin-transform-modules-systemjs": "^7.8.3", - "@babel/plugin-transform-modules-umd": "^7.8.3", - "@babel/plugin-transform-named-capturing-groups-regex": "^7.8.3", - "@babel/plugin-transform-new-target": "^7.8.3", - "@babel/plugin-transform-object-super": "^7.8.3", - "@babel/plugin-transform-parameters": "^7.8.7", - "@babel/plugin-transform-property-literals": "^7.8.3", - "@babel/plugin-transform-regenerator": "^7.8.7", - "@babel/plugin-transform-reserved-words": "^7.8.3", - "@babel/plugin-transform-shorthand-properties": "^7.8.3", - "@babel/plugin-transform-spread": "^7.8.3", - "@babel/plugin-transform-sticky-regex": "^7.8.3", - "@babel/plugin-transform-template-literals": "^7.8.3", - "@babel/plugin-transform-typeof-symbol": "^7.8.4", - "@babel/plugin-transform-unicode-regex": "^7.8.3", - "@babel/types": "^7.8.7", - "browserslist": "^4.8.5", - "core-js-compat": "^3.6.2", - "invariant": "^2.2.2", - "levenary": "^1.1.1", - "semver": "^5.5.0" - } - }, - "@babel/preset-react": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.8.3.tgz", - "integrity": "sha512-9hx0CwZg92jGb7iHYQVgi0tOEHP/kM60CtWJQnmbATSPIQQ2xYzfoCI3EdqAhFBeeJwYMdWQuDUHMsuDbH9hyQ==", - "requires": { - "@babel/helper-plugin-utils": "^7.8.3", - "@babel/plugin-transform-react-display-name": "^7.8.3", - "@babel/plugin-transform-react-jsx": "^7.8.3", - "@babel/plugin-transform-react-jsx-self": "^7.8.3", - "@babel/plugin-transform-react-jsx-source": "^7.8.3" - } - }, - "@babel/runtime": { - "version": "7.8.7", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.7.tgz", - "integrity": "sha512-+AATMUFppJDw6aiR5NVPHqIQBlV/Pj8wY/EZH+lmvRdUo9xBaz/rF3alAwFJQavvKfeOlPE7oaaDHVbcySbCsg==", - "requires": { - "regenerator-runtime": "^0.13.4" - } - }, - "@babel/template": { - "version": "7.8.6", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz", - "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==", - "requires": { - "@babel/code-frame": "^7.8.3", - "@babel/parser": "^7.8.6", - "@babel/types": "^7.8.6" - } - }, - "@babel/traverse": { - "version": "7.8.6", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.8.6.tgz", - "integrity": "sha512-2B8l0db/DPi8iinITKuo7cbPznLCEk0kCxDoB9/N6gGNg/gxOXiR/IcymAFPiBwk5w6TtQ27w4wpElgp9btR9A==", - "requires": { - "@babel/code-frame": "^7.8.3", - "@babel/generator": "^7.8.6", - "@babel/helper-function-name": "^7.8.3", - "@babel/helper-split-export-declaration": "^7.8.3", - "@babel/parser": "^7.8.6", - "@babel/types": "^7.8.6", - "debug": "^4.1.0", - "globals": "^11.1.0", - "lodash": "^4.17.13" - } - }, - "@babel/types": { - "version": "7.8.7", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.7.tgz", - "integrity": "sha512-k2TreEHxFA4CjGkL+GYjRyx35W0Mr7DP5+9q6WMkyKXB+904bYmG40syjMFV0oLlhhFCwWl0vA0DyzTDkwAiJw==", - "requires": { - "esutils": "^2.0.2", - "lodash": "^4.17.13", - "to-fast-properties": "^2.0.0" + "@babel/helper-validator-identifier": "^7.9.0", + "lodash": "^4.17.13", + "to-fast-properties": "^2.0.0" } }, "debug": { @@ -12054,102 +11173,34 @@ "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", "requires": { - "ms": "^2.1.1" - } - }, - "emojis-list": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", - "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==" - }, - "json5": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.2.tgz", - "integrity": "sha512-MoUOQ4WdiN3yxhm7NEVJSJrieAo5hNSLQ5sj05OTRHPL9HOBy8u4Bu88jsC1jvqAdN+E1bJmsUcZH+1HQxliqQ==", - "requires": { - "minimist": "^1.2.5" - } - }, - "loader-utils": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz", - "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==", - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^1.0.1" - }, - "dependencies": { - "json5": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", - "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", - "requires": { - "minimist": "^1.2.0" - } - } - } - }, - "minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" - }, - "regenerate-unicode-properties": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz", - "integrity": "sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==", - "requires": { - "regenerate": "^1.4.0" - } - }, - "regenerator-runtime": { - "version": "0.13.5", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", - "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==" - }, - "regenerator-transform": { - "version": "0.14.4", - "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.4.tgz", - "integrity": "sha512-EaJaKPBI9GvKpvUz2mz4fhx7WPgvwRLY9v3hlNHWmAuJHI13T4nwKnNvm5RWJzEdnI5g5UwtOww+S8IdoUC2bw==", - "requires": { - "@babel/runtime": "^7.8.4", - "private": "^0.1.8" - } - }, - "regexpu-core": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.0.tgz", - "integrity": "sha512-TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ==", - "requires": { - "regenerate": "^1.4.0", - "regenerate-unicode-properties": "^8.2.0", - "regjsgen": "^0.5.1", - "regjsparser": "^0.6.4", - "unicode-match-property-ecmascript": "^1.0.4", - "unicode-match-property-value-ecmascript": "^1.2.0" + "ms": "^2.1.1" } }, - "regjsparser": { - "version": "0.6.4", - "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.4.tgz", - "integrity": "sha512-64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==", + "emojis-list": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", + "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==" + }, + "loader-utils": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz", + "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==", "requires": { - "jsesc": "~0.5.0" + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^1.0.1" }, "dependencies": { - "jsesc": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", - "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=" + "json5": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", + "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", + "requires": { + "minimist": "^1.2.0" + } } } }, - "unicode-match-property-value-ecmascript": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz", - "integrity": "sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==" - }, "unist-util-visit": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.4.1.tgz", @@ -12213,17 +11264,17 @@ } }, "gatsby-plugin-react-helmet": { - "version": "3.1.24", - "resolved": "https://registry.npmjs.org/gatsby-plugin-react-helmet/-/gatsby-plugin-react-helmet-3.1.24.tgz", - "integrity": "sha512-kLR/RMDBVriJptsJufoL1UBVHgq2fZIMXen7nru2ugGn0m8xwpArFoOz6meYlpiDB3Z41eYR/+Nr8GizQnYcxg==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/gatsby-plugin-react-helmet/-/gatsby-plugin-react-helmet-3.2.1.tgz", + "integrity": "sha512-5oarZdVvp3k3keG26eVFagVHLYw7wCGs/MXRYQg8MEyJewU3X4Uc0eo7qu4TM5EIuZ2ekaL14r86RB6RM5TORA==", "requires": { "@babel/runtime": "^7.8.7" }, "dependencies": { "@babel/runtime": { - "version": "7.8.7", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.7.tgz", - "integrity": "sha512-+AATMUFppJDw6aiR5NVPHqIQBlV/Pj8wY/EZH+lmvRdUo9xBaz/rF3alAwFJQavvKfeOlPE7oaaDHVbcySbCsg==", + "version": "7.9.2", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz", + "integrity": "sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==", "requires": { "regenerator-runtime": "^0.13.4" } @@ -12279,9 +11330,9 @@ } }, "gatsby-remark-autolink-headers": { - "version": "2.1.26", - "resolved": "https://registry.npmjs.org/gatsby-remark-autolink-headers/-/gatsby-remark-autolink-headers-2.1.26.tgz", - "integrity": "sha512-fsf/sTJJr99ETZ1PxpXYUJNVAc5bCKR5JiNWZ5rEC7QH7+0XGaK1cGpc4ME7JW4euzegvmUwVMuiLbgPOfL0RA==", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/gatsby-remark-autolink-headers/-/gatsby-remark-autolink-headers-2.2.1.tgz", + "integrity": "sha512-FqTq9rh9fRxdlX1V3InXSAoZQyBcZ3mI5zNiNagO+DRNZCSve3YVKTDmMZ7a7GXx5Bz7QTPBB993wk2OcRSIFg==", "requires": { "@babel/runtime": "^7.8.7", "github-slugger": "^1.3.0", @@ -12291,9 +11342,9 @@ }, "dependencies": { "@babel/runtime": { - "version": "7.8.7", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.7.tgz", - "integrity": "sha512-+AATMUFppJDw6aiR5NVPHqIQBlV/Pj8wY/EZH+lmvRdUo9xBaz/rF3alAwFJQavvKfeOlPE7oaaDHVbcySbCsg==", + "version": "7.9.2", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz", + "integrity": "sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==", "requires": { "regenerator-runtime": "^0.13.4" } @@ -12370,9 +11421,9 @@ } }, "gatsby-remark-copy-linked-files": { - "version": "2.1.40", - "resolved": "https://registry.npmjs.org/gatsby-remark-copy-linked-files/-/gatsby-remark-copy-linked-files-2.1.40.tgz", - "integrity": "sha512-htZTd5rD46rg4j6KykJJE/GnV+ONidanyDlZWBJyvmIM97Jmcgh6FLpwy68PCzjw32JBdow3Wu2H//vvGYdBYw==", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/gatsby-remark-copy-linked-files/-/gatsby-remark-copy-linked-files-2.2.1.tgz", + "integrity": "sha512-xTy52n0K+fF4aXCNYkpH1HdhYy47GwLG2tE5H+xIisyEQiCr5XA555yQdS0U4MRtDZEyfX4TB+XTwaNhOgTPgw==", "requires": { "@babel/runtime": "^7.8.7", "cheerio": "^1.0.0-rc.3", @@ -12385,9 +11436,9 @@ }, "dependencies": { "@babel/runtime": { - "version": "7.8.7", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.7.tgz", - "integrity": "sha512-+AATMUFppJDw6aiR5NVPHqIQBlV/Pj8wY/EZH+lmvRdUo9xBaz/rF3alAwFJQavvKfeOlPE7oaaDHVbcySbCsg==", + "version": "7.9.2", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz", + "integrity": "sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==", "requires": { "regenerator-runtime": "^0.13.4" } @@ -12463,9 +11514,9 @@ } }, "gatsby-remark-prismjs": { - "version": "3.3.36", - "resolved": "https://registry.npmjs.org/gatsby-remark-prismjs/-/gatsby-remark-prismjs-3.3.36.tgz", - "integrity": "sha512-zB3ugln115JMrypaf1FqllilJx5C56Vw6ze12MLw5BLlWUAPXbteTWtWbFHKPeLK6tSQDLs97d8zFYTqySgSuw==", + "version": "3.4.1", + "resolved": "https://registry.npmjs.org/gatsby-remark-prismjs/-/gatsby-remark-prismjs-3.4.1.tgz", + "integrity": "sha512-DPg4PjalrElXXZ3KZRiWiJiHIsXaee51nN2hCoGC2hfaXW8VdSjXhpBSSps9OWuB+QNmdTp/EP3FDiiwImjpUw==", "requires": { "@babel/runtime": "^7.8.7", "parse-numeric-range": "^0.0.2", @@ -12473,9 +11524,9 @@ }, "dependencies": { "@babel/runtime": { - "version": "7.8.7", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.7.tgz", - "integrity": "sha512-+AATMUFppJDw6aiR5NVPHqIQBlV/Pj8wY/EZH+lmvRdUo9xBaz/rF3alAwFJQavvKfeOlPE7oaaDHVbcySbCsg==", + "version": "7.9.2", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz", + "integrity": "sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==", "requires": { "regenerator-runtime": "^0.13.4" } @@ -12504,9 +11555,9 @@ } }, "gatsby-source-filesystem": { - "version": "2.1.57", - "resolved": "https://registry.npmjs.org/gatsby-source-filesystem/-/gatsby-source-filesystem-2.1.57.tgz", - "integrity": "sha512-HBD1wFoCpVXYLwL3Wwyz6d2E/ff7DDy81YrmCzXTJmAsGmVXraJZkUAbxwuqt3L793e8SHBd6yVi+wBKRowBXg==", + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/gatsby-source-filesystem/-/gatsby-source-filesystem-2.2.2.tgz", + "integrity": "sha512-uHHCiTp8/q9JF0Yr14Q5aJZ07jUJSV6HJSnrSVnEIF4PfRQkVJG5FHQULmxJUXWQhIoy17EGuzqVjxMsFY69QA==", "requires": { "@babel/runtime": "^7.8.7", "better-queue": "^3.8.10", @@ -12514,8 +11565,8 @@ "chokidar": "3.3.1", "file-type": "^12.4.2", "fs-extra": "^8.1.0", - "gatsby-core-utils": "^1.0.34", - "got": "^8.3.2", + "gatsby-core-utils": "^1.1.1", + "got": "^9.6.0", "md5-file": "^3.2.3", "mime": "^2.4.4", "pretty-bytes": "^5.3.0", @@ -12526,120 +11577,48 @@ }, "dependencies": { "@babel/runtime": { - "version": "7.8.7", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.7.tgz", - "integrity": "sha512-+AATMUFppJDw6aiR5NVPHqIQBlV/Pj8wY/EZH+lmvRdUo9xBaz/rF3alAwFJQavvKfeOlPE7oaaDHVbcySbCsg==", + "version": "7.9.2", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz", + "integrity": "sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==", "requires": { "regenerator-runtime": "^0.13.4" } }, - "anymatch": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz", - "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==", - "requires": { - "normalize-path": "^3.0.0", - "picomatch": "^2.0.4" - } - }, - "binary-extensions": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz", - "integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==" - }, "bluebird": { "version": "3.7.2", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" }, - "braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", - "requires": { - "fill-range": "^7.0.1" - } - }, - "chokidar": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.3.1.tgz", - "integrity": "sha512-4QYCEWOcK3OJrxwvyyAOxFuhpvOVCYkr33LPfFNBjAD/w3sEzWsp2BUOkI4l9bHvWioAd0rc6NlHUOEaWkTeqg==", - "requires": { - "anymatch": "~3.1.1", - "braces": "~3.0.2", - "fsevents": "~2.1.2", - "glob-parent": "~5.1.0", - "is-binary-path": "~2.1.0", - "is-glob": "~4.0.1", - "normalize-path": "~3.0.0", - "readdirp": "~3.3.0" - } - }, - "fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", - "requires": { - "to-regex-range": "^5.0.1" - } - }, - "fsevents": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.2.tgz", - "integrity": "sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==", - "optional": true - }, - "glob-parent": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz", - "integrity": "sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==", - "requires": { - "is-glob": "^4.0.1" - } - }, - "is-binary-path": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", - "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "get-stream": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", + "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", "requires": { - "binary-extensions": "^2.0.0" + "pump": "^3.0.0" } }, - "is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==" - }, - "normalize-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==" - }, - "readdirp": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.3.0.tgz", - "integrity": "sha512-zz0pAkSPOXXm1viEwygWIPSPkcBYjW1xU5j/JBh5t9bGCJwa6f9+BJa6VaB2g+b55yVrmXzqkyLf4xaWYM0IkQ==", + "got": { + "version": "9.6.0", + "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz", + "integrity": "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==", "requires": { - "picomatch": "^2.0.7" + "@sindresorhus/is": "^0.14.0", + "@szmarczak/http-timer": "^1.1.2", + "cacheable-request": "^6.0.0", + "decompress-response": "^3.3.0", + "duplexer3": "^0.1.4", + "get-stream": "^4.1.0", + "lowercase-keys": "^1.0.1", + "mimic-response": "^1.0.1", + "p-cancelable": "^1.0.0", + "to-readable-stream": "^1.0.0", + "url-parse-lax": "^3.0.0" } }, "regenerator-runtime": { "version": "0.13.5", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==" - }, - "to-regex-range": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "requires": { - "is-number": "^7.0.0" - } - }, - "xstate": { - "version": "4.8.0", - "resolved": "https://registry.npmjs.org/xstate/-/xstate-4.8.0.tgz", - "integrity": "sha512-xHSYQtCHLkcrFRxa5lK4Lp1rnKt00a80jcKFMQiMBuE+6MvTYv7twwqYpzjsJoKFjGZB3GGEpZAuY1dmlPTh/g==" } } }, @@ -12785,9 +11764,9 @@ } }, "gatsby-theme-apollo-docs": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/gatsby-theme-apollo-docs/-/gatsby-theme-apollo-docs-4.1.1.tgz", - "integrity": "sha512-ZV83sYtJHapHgdu3TIR7dejWGwgVMafLyOt3fIQ7XFxU3PGztGWwwoeL4kZ3i8M505+I0hMF8OtL1EO+oehkaw==", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/gatsby-theme-apollo-docs/-/gatsby-theme-apollo-docs-4.1.2.tgz", + "integrity": "sha512-L61bl2V5rsajuTrFJY+Ebz5u3+pSoxZRwSOxrDSeSnoA5vG7xwQ8Cg+d4e4UEOdHsv4ayPw+7ffZf0PP+NmT5w==", "requires": { "@mdx-js/mdx": "^1.1.0", "@mdx-js/react": "^1.0.27", @@ -12818,13 +11797,13 @@ } }, "gatsby-transformer-remark": { - "version": "2.6.59", - "resolved": "https://registry.npmjs.org/gatsby-transformer-remark/-/gatsby-transformer-remark-2.6.59.tgz", - "integrity": "sha512-EL2S85aMtJadVsgKRI7hUZIaW4z5i4lLHXnivveEytu05f+GLnPKmBJB82n4LIRo6p+ebSLGx8Iql+pgy41WIQ==", + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/gatsby-transformer-remark/-/gatsby-transformer-remark-2.7.1.tgz", + "integrity": "sha512-9geE8itjePDvaa0uWmyRgi2emPt9ut420YyjaNJ1/4eZw9Yj8zAuCdancw7j1buhL0UAxgQ2YseO6+MWTHEoMw==", "requires": { "@babel/runtime": "^7.8.7", "bluebird": "^3.7.2", - "gatsby-core-utils": "^1.0.34", + "gatsby-core-utils": "^1.1.1", "gray-matter": "^4.0.2", "hast-util-raw": "^4.0.0", "hast-util-to-html": "^4.0.1", @@ -12846,9 +11825,9 @@ }, "dependencies": { "@babel/runtime": { - "version": "7.8.7", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.7.tgz", - "integrity": "sha512-+AATMUFppJDw6aiR5NVPHqIQBlV/Pj8wY/EZH+lmvRdUo9xBaz/rF3alAwFJQavvKfeOlPE7oaaDHVbcySbCsg==", + "version": "7.9.2", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz", + "integrity": "sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==", "requires": { "regenerator-runtime": "^0.13.4" } @@ -13660,17 +12639,17 @@ "integrity": "sha512-gW3sxfynIvZApL4L07wryYF4+C9VvH3AUi7LAnVXV4MneGEgwOByXvFo18BgmTWnm7oHAe874jKbIB1YhHSIzA==" }, "hast-util-raw": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/hast-util-raw/-/hast-util-raw-5.0.1.tgz", - "integrity": "sha512-iHo7G6BjRc/GU1Yun5CIEXjil0wVnIbz11C6k0JdDichSDMtYi2+NNtk6YN7EOP0JfPstX30d3pRLfaJv5CkdA==", + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/hast-util-raw/-/hast-util-raw-5.0.2.tgz", + "integrity": "sha512-3ReYQcIHmzSgMq8UrDZHFL0oGlbuVGdLKs8s/Fe8BfHFAyZDrdv1fy/AGn+Fim8ZuvAHcJ61NQhVMtyfHviT/g==", "requires": { "hast-util-from-parse5": "^5.0.0", "hast-util-to-parse5": "^5.0.0", - "html-void-elements": "^1.0.1", + "html-void-elements": "^1.0.0", "parse5": "^5.0.0", "unist-util-position": "^3.0.0", "web-namespaces": "^1.0.0", - "xtend": "^4.0.1", + "xtend": "^4.0.0", "zwitch": "^1.0.0" } }, @@ -15025,11 +14004,6 @@ } } }, - "js-levenshtein": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/js-levenshtein/-/js-levenshtein-1.1.6.tgz", - "integrity": "sha512-X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g==" - }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -15095,11 +14069,18 @@ "integrity": "sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA==" }, "json5": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.1.tgz", - "integrity": "sha512-l+3HXD0GEI3huGq1njuqtzYK8OYJyXMkOLtQ53pjWh89tvWS2h6l+1zMkYWqlb57+SiQodKZyvMEFb2X+KrFhQ==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.2.tgz", + "integrity": "sha512-MoUOQ4WdiN3yxhm7NEVJSJrieAo5hNSLQ5sj05OTRHPL9HOBy8u4Bu88jsC1jvqAdN+E1bJmsUcZH+1HQxliqQ==", "requires": { - "minimist": "^1.2.0" + "minimist": "^1.2.5" + }, + "dependencies": { + "minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" + } } }, "jsonfile": { @@ -18321,9 +17302,9 @@ "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=" }, "psl": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/psl/-/psl-1.7.0.tgz", - "integrity": "sha512-5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ==" + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz", + "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==" }, "public-encrypt": { "version": "4.0.3", @@ -19081,11 +18062,27 @@ "integrity": "sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw==" }, "regenerator-transform": { - "version": "0.14.1", - "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.1.tgz", - "integrity": "sha512-flVuee02C3FKRISbxhXl9mGzdbWUVHubl1SMaknjxkFB1/iqpJhArQUvRxOOPEc/9tAiX0BaQ28FJH10E4isSQ==", + "version": "0.14.4", + "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.4.tgz", + "integrity": "sha512-EaJaKPBI9GvKpvUz2mz4fhx7WPgvwRLY9v3hlNHWmAuJHI13T4nwKnNvm5RWJzEdnI5g5UwtOww+S8IdoUC2bw==", "requires": { - "private": "^0.1.6" + "@babel/runtime": "^7.8.4", + "private": "^0.1.8" + }, + "dependencies": { + "@babel/runtime": { + "version": "7.9.2", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz", + "integrity": "sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==", + "requires": { + "regenerator-runtime": "^0.13.4" + } + }, + "regenerator-runtime": { + "version": "0.13.5", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", + "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==" + } } }, "regex-not": { @@ -19346,92 +18343,24 @@ } }, "remark-mdx": { - "version": "1.5.7", - "resolved": "https://registry.npmjs.org/remark-mdx/-/remark-mdx-1.5.7.tgz", - "integrity": "sha512-f13ot+zaByDXYuOC4FWTpQCGP/rNbaxdhs2mLlW7ZBipm3JYR2ASFSL7RC3R7ytzm3n8v6hhcFxDKU+CwC2f4g==", + "version": "1.5.8", + "resolved": "https://registry.npmjs.org/remark-mdx/-/remark-mdx-1.5.8.tgz", + "integrity": "sha512-wtqqsDuO/mU/ucEo/CDp0L8SPdS2oOE6PRsMm+lQ9TLmqgep4MBmyH8bLpoc8Wf7yjNmae/5yBzUN1YUvR/SsQ==", "requires": { "@babel/core": "7.8.4", "@babel/helper-plugin-utils": "7.8.3", "@babel/plugin-proposal-object-rest-spread": "7.8.3", "@babel/plugin-syntax-jsx": "7.8.3", - "@mdx-js/util": "^1.5.7", + "@mdx-js/util": "^1.5.8", "is-alphabetical": "1.0.4", "remark-parse": "7.0.2", "unified": "8.4.2" }, "dependencies": { - "@babel/code-frame": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", - "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", - "requires": { - "@babel/highlight": "^7.8.3" - } - }, - "@babel/core": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.8.4.tgz", - "integrity": "sha512-0LiLrB2PwrVI+a2/IEskBopDYSd8BCb3rOvH7D5tzoWd696TBEduBvuLVm4Nx6rltrLZqvI3MCalB2K2aVzQjA==", - "requires": { - "@babel/code-frame": "^7.8.3", - "@babel/generator": "^7.8.4", - "@babel/helpers": "^7.8.4", - "@babel/parser": "^7.8.4", - "@babel/template": "^7.8.3", - "@babel/traverse": "^7.8.4", - "@babel/types": "^7.8.3", - "convert-source-map": "^1.7.0", - "debug": "^4.1.0", - "gensync": "^1.0.0-beta.1", - "json5": "^2.1.0", - "lodash": "^4.17.13", - "resolve": "^1.3.2", - "semver": "^5.4.1", - "source-map": "^0.5.0" - } - }, "@babel/helper-plugin-utils": { "version": "7.8.3", "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" - }, - "@babel/helpers": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.8.4.tgz", - "integrity": "sha512-VPbe7wcQ4chu4TDQjimHv/5tj73qz88o12EPkO2ValS2QiQS/1F2SsjyIGNnAD0vF/nZS6Cf9i+vW6HIlnaR8w==", - "requires": { - "@babel/template": "^7.8.3", - "@babel/traverse": "^7.8.4", - "@babel/types": "^7.8.3" - } - }, - "@babel/highlight": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.8.3.tgz", - "integrity": "sha512-PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg==", - "requires": { - "chalk": "^2.0.0", - "esutils": "^2.0.2", - "js-tokens": "^4.0.0" - } - }, - "@babel/types": { - "version": "7.8.7", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.7.tgz", - "integrity": "sha512-k2TreEHxFA4CjGkL+GYjRyx35W0Mr7DP5+9q6WMkyKXB+904bYmG40syjMFV0oLlhhFCwWl0vA0DyzTDkwAiJw==", - "requires": { - "esutils": "^2.0.2", - "lodash": "^4.17.13", - "to-fast-properties": "^2.0.0" - } - }, - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "requires": { - "ms": "^2.1.1" - } } } }, @@ -20503,9 +19432,9 @@ } }, "slugify": { - "version": "1.3.6", - "resolved": "https://registry.npmjs.org/slugify/-/slugify-1.3.6.tgz", - "integrity": "sha512-wA9XS475ZmGNlEnYYLPReSfuz/c3VQsEMoU43mi6OnKMCdbnFXd4/Yg7J0lBv8jkPolacMpOrWEaoYxuE1+hoQ==" + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/slugify/-/slugify-1.4.0.tgz", + "integrity": "sha512-FtLNsMGBSRB/0JOE2A0fxlqjI6fJsgHGS13iTuVT28kViI4JjUiNqp/vyis0ZXYcMnpR3fzGNkv+6vRlI2GwdQ==" }, "snake-case": { "version": "2.1.0", @@ -21878,9 +20807,9 @@ "integrity": "sha512-+O8/qh/Qj8CgC6eYBVBykMrNtp5Gebn4dlGD/kKXVkJNDwyrAwSIqwz8CDf+tsAIWVycKcku6gIXJ0qwx/ZXaQ==" }, "uglify-js": { - "version": "3.8.0", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.8.0.tgz", - "integrity": "sha512-ugNSTT8ierCsDHso2jkBHXYrU8Y5/fY2ZUprfrJUiD7YpuFvV4jODLFmb3h4btQjqr5Nh4TX4XtgDfCU1WdioQ==", + "version": "3.8.1", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.8.1.tgz", + "integrity": "sha512-W7KxyzeaQmZvUFbGj4+YFshhVrMBGSg2IbcYAjGWGvx8DHvJMclbTDMpffdxFUGPBHjIytk7KJUR/KUXstUGDw==", "requires": { "commander": "~2.20.3", "source-map": "~0.6.1" @@ -22573,9 +21502,9 @@ } }, "vfile": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/vfile/-/vfile-4.0.3.tgz", - "integrity": "sha512-lREgT5sF05TQk68LO6APy0In+TkFGnFEgKChK2+PHIaTrFQ9oHCKXznZ7VILwgYVBcl0gv4lGATFZBLhi2kVQg==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/vfile/-/vfile-4.1.0.tgz", + "integrity": "sha512-BaTPalregj++64xbGK6uIlsurN3BCRNM/P2Pg8HezlGzKd1O9PrwIac6bd9Pdx2uTb0QHoioZ+rXKolbVXEgJg==", "requires": { "@types/unist": "^2.0.0", "is-buffer": "^2.0.0", @@ -22597,9 +21526,9 @@ "integrity": "sha512-sSFdyCP3G6Ka0CEmN83A2YCMKIieHx0EDaj5IDP4g1pa5ZJ4FJDvpO0WODLxo4LUX4oe52gmSCK7Jw4SBghqxA==" }, "vfile-message": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-2.0.3.tgz", - "integrity": "sha512-qQg/2z8qnnBHL0psXyF72kCjb9YioIynvyltuNKFaUhRtqTIcIMP3xnBaPzirVZNuBrUe1qwFciSx2yApa4byw==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-2.0.4.tgz", + "integrity": "sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ==", "requires": { "@types/unist": "^2.0.0", "unist-util-stringify-position": "^2.0.0" @@ -23335,11 +22264,12 @@ } }, "yauzl": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz", - "integrity": "sha1-lSj0QtqxsihOWLQ3m7GU4i4MQAU=", + "version": "2.10.0", + "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz", + "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=", "requires": { - "fd-slicer": "~1.0.1" + "buffer-crc32": "~0.2.3", + "fd-slicer": "~1.1.0" } }, "yeast": { diff --git a/docs/package.json b/docs/package.json index 5c647101c98..b2db6a99459 100644 --- a/docs/package.json +++ b/docs/package.json @@ -7,7 +7,7 @@ }, "dependencies": { "gatsby": "2.20.8", - "gatsby-theme-apollo-docs": "4.1.1", + "gatsby-theme-apollo-docs": "4.1.2", "react": "16.13.1", "react-dom": "16.13.1" } From bbae424d1faec3dad25570234d672491ba0ee032 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 31 Mar 2020 20:17:39 +0000 Subject: [PATCH 338/642] chore(deps): update dependency @apollographql/apollo-tools to v0.4.5 (#3934) Co-authored-by: Renovate Bot --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 89fead26398..7504c291864 100644 --- a/package-lock.json +++ b/package-lock.json @@ -252,9 +252,9 @@ } }, "@apollographql/apollo-tools": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/@apollographql/apollo-tools/-/apollo-tools-0.4.4.tgz", - "integrity": "sha512-kldvB9c+vzimel4yEktlkB08gaJ5DQn9ZuIfFf1kpAw+++5hFwYRWTyKgOhF9LbOWNWGropesYC7WwLja2erhQ==", + "version": "0.4.5", + "resolved": "https://registry.npmjs.org/@apollographql/apollo-tools/-/apollo-tools-0.4.5.tgz", + "integrity": "sha512-KOZC4Y+JM4iQQ7P4CVC878Ee7ya0QoHApGHu4klwjwZkYyOdWIvbML7JfXOUb/AfCO4DFmJfHCjRdAX09Ga6sQ==", "requires": { "apollo-env": "^0.6.2" }, diff --git a/package.json b/package.json index c9cd856ec5e..78e46a38a70 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "node": ">=6" }, "dependencies": { - "@apollographql/apollo-tools": "0.4.4", + "@apollographql/apollo-tools": "0.4.5", "@apollo/federation": "file:packages/apollo-federation", "@apollo/gateway": "file:packages/apollo-gateway", "apollo-cache-control": "file:packages/apollo-cache-control", From e1f8f76408e08e49de30f181a88ae42dd6edccc0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 1 Apr 2020 22:10:33 +0000 Subject: [PATCH 339/642] chore(deps): update dependency gatsby-theme-apollo-docs to v4.1.3 (#3939) Co-authored-by: Renovate Bot --- docs/package-lock.json | 26 +++++++++++++------------- docs/package.json | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/docs/package-lock.json b/docs/package-lock.json index 22528d23682..20281ddba25 100644 --- a/docs/package-lock.json +++ b/docs/package-lock.json @@ -6968,9 +6968,9 @@ "integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=" }, "d3": { - "version": "5.15.0", - "resolved": "https://registry.npmjs.org/d3/-/d3-5.15.0.tgz", - "integrity": "sha512-C+E80SL2nLLtmykZ6klwYj5rPqB5nlfN5LdWEAVdWPppqTD8taoJi2PxLZjPeYT8FFRR2yucXq+kBlOnnvZeLg==", + "version": "5.15.1", + "resolved": "https://registry.npmjs.org/d3/-/d3-5.15.1.tgz", + "integrity": "sha512-Xu9gT6Lm0jH3wWJJSRomFwqnGGi3YAfWIfxNFl4++YVgYOjo3F8V2idAG3nJBgpZOkD0/RHPZX6F4k6tzgOvYw==", "requires": { "d3-array": "1", "d3-axis": "1", @@ -7103,9 +7103,9 @@ } }, "d3-format": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-1.4.3.tgz", - "integrity": "sha512-mm/nE2Y9HgGyjP+rKIekeITVgBtX97o1nrvHCWX8F/yBYyevUTvu9vb5pUnKwrcSw7o7GuwMOWjS9gFDs4O+uQ==" + "version": "1.4.4", + "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-1.4.4.tgz", + "integrity": "sha512-TWks25e7t8/cqctxCmxpUuzZN11QxIA7YrMbram94zMQ0PXjE4LVIMe/f6a4+xxL8HQ3OsAFULOINQi1pE62Aw==" }, "d3-geo": { "version": "1.11.9", @@ -11547,9 +11547,9 @@ } }, "gatsby-remark-rewrite-relative-links": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/gatsby-remark-rewrite-relative-links/-/gatsby-remark-rewrite-relative-links-1.0.7.tgz", - "integrity": "sha512-KScR54EJ8nJuKCFDsFyB/e8BkO96r4O2G16Prz1JdRP6utoBtzjf9BAL60hfC8S4FWc+bpQD7zJIpE33s47naw==", + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/gatsby-remark-rewrite-relative-links/-/gatsby-remark-rewrite-relative-links-1.0.8.tgz", + "integrity": "sha512-7jCyMM+AWdp8mFLUWuJ5RGPQIKFzpLqf253QR6Aq8xrhlV0Bcz2k1+03MxPnGP0R5XetIoRm2W864KrbIZdk9Q==", "requires": { "unist-util-visit": "^2.0.0" } @@ -11764,9 +11764,9 @@ } }, "gatsby-theme-apollo-docs": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/gatsby-theme-apollo-docs/-/gatsby-theme-apollo-docs-4.1.2.tgz", - "integrity": "sha512-L61bl2V5rsajuTrFJY+Ebz5u3+pSoxZRwSOxrDSeSnoA5vG7xwQ8Cg+d4e4UEOdHsv4ayPw+7ffZf0PP+NmT5w==", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/gatsby-theme-apollo-docs/-/gatsby-theme-apollo-docs-4.1.3.tgz", + "integrity": "sha512-RQirpJrmDyUR3lZxtkzaxBQuSnmv2vDHsQHRoNjRWldqc+4c4Zq2myiQ1eXyxvs/Uysj2205oAmIgh+2ez/NfQ==", "requires": { "@mdx-js/mdx": "^1.1.0", "@mdx-js/react": "^1.0.27", @@ -11779,7 +11779,7 @@ "gatsby-remark-copy-linked-files": "^2.0.12", "gatsby-remark-mermaid": "^1.2.0", "gatsby-remark-prismjs": "^3.2.8", - "gatsby-remark-rewrite-relative-links": "^1.0.7", + "gatsby-remark-rewrite-relative-links": "^1.0.8", "gatsby-source-filesystem": "^2.0.29", "gatsby-source-git": "^1.0.1", "gatsby-theme-apollo-core": "^3.0.11", diff --git a/docs/package.json b/docs/package.json index b2db6a99459..ed104274f83 100644 --- a/docs/package.json +++ b/docs/package.json @@ -7,7 +7,7 @@ }, "dependencies": { "gatsby": "2.20.8", - "gatsby-theme-apollo-docs": "4.1.2", + "gatsby-theme-apollo-docs": "4.1.3", "react": "16.13.1", "react-dom": "16.13.1" } From efa9427dcca848eafc1fd37463bcb4ac1ceeca7d Mon Sep 17 00:00:00 2001 From: Trevor Scheer Date: Mon, 30 Mar 2020 12:58:13 -0700 Subject: [PATCH 340/642] Gateway network testing cleanup --- .../integration/networkRequests.test.ts | 52 ++++---- .../src/__tests__/integration/nockMocks.ts | 118 ++++++++---------- 2 files changed, 80 insertions(+), 90 deletions(-) diff --git a/packages/apollo-gateway/src/__tests__/integration/networkRequests.test.ts b/packages/apollo-gateway/src/__tests__/integration/networkRequests.test.ts index 0631355f3fa..974e10904f7 100644 --- a/packages/apollo-gateway/src/__tests__/integration/networkRequests.test.ts +++ b/packages/apollo-gateway/src/__tests__/integration/networkRequests.test.ts @@ -2,7 +2,7 @@ import nock from 'nock'; import { fetch } from 'apollo-server-env'; import { ApolloGateway, GCS_RETRY_COUNT, getDefaultGcsFetcher } from '../..'; import { - mockLocalhostSDLQuery, + mockSDLQuerySuccess, mockStorageSecretSuccess, mockStorageSecret, mockCompositionConfigLinkSuccess, @@ -23,11 +23,18 @@ import loadServicesFromStorage = require("../../loadServicesFromStorage"); // Anything wrapped within the gql tag within this file is just a string, not an AST. const gql = String.raw; -const service = { - implementingServicePath: 'service-definition.json', +export interface MockService { + gcsDefinitionPath: string; + partialSchemaPath: string; + url: string; + sdl: string; +} + +const service: MockService = { + gcsDefinitionPath: 'service-definition.json', partialSchemaPath: 'accounts-partial-schema.json', - federatedServiceURL: 'http://localhost:4001', - federatedServiceSchema: gql` + url: 'http://localhost:4001', + sdl: gql` extend type Query { me: User everyone: [User] @@ -42,11 +49,11 @@ const service = { `, }; -const updatedService = { - implementingServicePath: 'updated-service-definition.json', +const updatedService: MockService = { + gcsDefinitionPath: 'updated-service-definition.json', partialSchemaPath: 'updated-accounts-partial-schema.json', - federatedServiceURL: 'http://localhost:4002', - federatedServiceSchema: gql` + url: 'http://localhost:4002', + sdl: gql` extend type Query { me: User everyone: [User] @@ -83,24 +90,19 @@ afterEach(() => { }); it('Queries remote endpoints for their SDLs', async () => { - mockLocalhostSDLQuery({ url: service.federatedServiceURL }).reply(200, { - data: { _service: { sdl: service.federatedServiceSchema } }, - }); + mockSDLQuerySuccess(service); const gateway = new ApolloGateway({ - serviceList: [ - { name: 'accounts', url: `${service.federatedServiceURL}/graphql` }, - ], + serviceList: [{ name: 'accounts', url: service.url }], }); await gateway.load(); expect(gateway.schema!.getType('User')!.description).toBe('This is my User'); }); -// This test is maybe a bit terrible, but IDK a better way to mock all the requests it('Extracts service definitions from remote storage', async () => { mockStorageSecretSuccess(); mockCompositionConfigLinkSuccess(); - mockCompositionConfigsSuccess([service.implementingServicePath]); + mockCompositionConfigsSuccess([service]); mockImplementingServicesSuccess(service); mockRawPartialSchemaSuccess(service); @@ -134,20 +136,18 @@ it.each([ mockStorageSecretSuccess(); if (isConflict) { mockCompositionConfigLinkSuccess(); - mockCompositionConfigsSuccess([service.implementingServicePath]); + mockCompositionConfigsSuccess([service]); mockImplementingServicesSuccess(service); mockRawPartialSchemaSuccess(service); } else { mockCompositionConfigLink().reply(403); } - mockLocalhostSDLQuery({ url: service.federatedServiceURL }).reply(200, { - data: { _service: { sdl: service.federatedServiceSchema } }, - }); + mockSDLQuerySuccess(service); const gateway = new ApolloGateway({ serviceList: [ - { name: 'accounts', url: `${service.federatedServiceURL}/graphql` }, + { name: 'accounts', url: service.url }, ], }); @@ -167,21 +167,21 @@ it('Rollsback to a previous schema when triggered', async () => { // Init mockStorageSecretSuccess(); mockCompositionConfigLinkSuccess(); - mockCompositionConfigsSuccess([service.implementingServicePath]); + mockCompositionConfigsSuccess([service]); mockImplementingServicesSuccess(service); mockRawPartialSchemaSuccess(service); // Update 1 mockStorageSecretSuccess(); mockCompositionConfigLinkSuccess(); - mockCompositionConfigsSuccess([updatedService.implementingServicePath]); + mockCompositionConfigsSuccess([updatedService]); mockImplementingServicesSuccess(updatedService); mockRawPartialSchemaSuccess(updatedService); // Rollback mockStorageSecretSuccess(); mockCompositionConfigLinkSuccess(); - mockCompositionConfigsSuccess([service.implementingServicePath]); + mockCompositionConfigsSuccess([service]); mockImplementingServices(service).reply(304); mockRawPartialSchema(service).reply(304); @@ -223,7 +223,7 @@ it(`Retries GCS (up to ${GCS_RETRY_COUNT} times) on failure for each request and mockCompositionConfigLinkSuccess(); failNTimes(GCS_RETRY_COUNT, mockCompositionConfigs); - mockCompositionConfigsSuccess([service.implementingServicePath]); + mockCompositionConfigsSuccess([service]); failNTimes(GCS_RETRY_COUNT, () => mockImplementingServices(service)); mockImplementingServicesSuccess(service); diff --git a/packages/apollo-gateway/src/__tests__/integration/nockMocks.ts b/packages/apollo-gateway/src/__tests__/integration/nockMocks.ts index 8368fbf00a2..f96866d85ce 100644 --- a/packages/apollo-gateway/src/__tests__/integration/nockMocks.ts +++ b/packages/apollo-gateway/src/__tests__/integration/nockMocks.ts @@ -1,4 +1,23 @@ import nock from 'nock'; +import { MockService } from './networkRequests.test'; + +export const graphId = 'federated-service'; +export const apiKeyHash = 'dd55a79d467976346d229a7b12b673ce'; +const storageSecret = 'my-storage-secret'; +const accountsService = 'accounts'; + +// Service mocks +function mockSDLQuery({ url }: MockService) { + return nock(url).post('/', { + query: 'query GetServiceDefinition { _service { sdl } }', + }); +} + +export function mockSDLQuerySuccess(service: MockService) { + mockSDLQuery(service).reply(200, { + data: { _service: { sdl: service.sdl } }, + }); +} function gcsNock(url: Parameters[0]): nock.Scope { return nock(url, { @@ -10,100 +29,71 @@ function gcsNock(url: Parameters[0]): nock.Scope { }); } -export const mockLocalhostSDLQuery = ({ url }: { url: string }) => - nock(url).post('/graphql', { - query: 'query GetServiceDefinition { _service { sdl } }', - }); - -export const graphId = 'federated-service'; -export const apiKeyHash = 'dd55a79d467976346d229a7b12b673ce'; -const storageSecret = 'my-storage-secret'; -const accountsService = 'accounts'; - -export const mockStorageSecret = () => - gcsNock('https://storage.googleapis.com:443').get( +export function mockStorageSecret() { + return gcsNock('https://storage.googleapis.com:443').get( `/engine-partial-schema-prod/${graphId}/storage-secret/${apiKeyHash}.json`, ); +} -export const mockStorageSecretSuccess = () => - gcsNock('https://storage.googleapis.com:443') +export function mockStorageSecretSuccess() { + return gcsNock('https://storage.googleapis.com:443') .get( `/engine-partial-schema-prod/${graphId}/storage-secret/${apiKeyHash}.json`, ) .reply(200, `"${storageSecret}"`); +} // get composition config link, using received storage secret -export const mockCompositionConfigLink = () => - gcsNock('https://storage.googleapis.com:443').get( +export function mockCompositionConfigLink() { + return gcsNock('https://storage.googleapis.com:443').get( `/engine-partial-schema-prod/${storageSecret}/current/v1/composition-config-link`, ); +} -export const mockCompositionConfigLinkSuccess = () => - mockCompositionConfigLink().reply(200, { +export function mockCompositionConfigLinkSuccess() { + return mockCompositionConfigLink().reply(200, { configPath: `${storageSecret}/current/v1/composition-configs/composition-config-path.json`, }); +} // get composition configs, using received composition config link -export const mockCompositionConfigs = () => - gcsNock('https://storage.googleapis.com:443').get( +export function mockCompositionConfigs() { + return gcsNock('https://storage.googleapis.com:443').get( `/engine-partial-schema-prod/${storageSecret}/current/v1/composition-configs/composition-config-path.json`, ); +} -export const mockCompositionConfigsSuccess = ( - implementingServicePaths: string[], -) => - mockCompositionConfigs().reply(200, { - implementingServiceLocations: implementingServicePaths.map(servicePath => ({ +export function mockCompositionConfigsSuccess(services: MockService[]) { + return mockCompositionConfigs().reply(200, { + implementingServiceLocations: services.map(service => ({ name: accountsService, - path: `${storageSecret}/current/v1/implementing-services/${accountsService}/${servicePath}`, + path: `${storageSecret}/current/v1/implementing-services/${accountsService}/${service.gcsDefinitionPath}`, })), }); +} // get implementing service reference, using received composition-config -export const mockImplementingServices = ({ - implementingServicePath, -}: { - implementingServicePath: string; -}) => - gcsNock('https://storage.googleapis.com:443').get( - `/engine-partial-schema-prod/${storageSecret}/current/v1/implementing-services/${accountsService}/${implementingServicePath}`, +export function mockImplementingServices({ gcsDefinitionPath }: MockService) { + return gcsNock('https://storage.googleapis.com:443').get( + `/engine-partial-schema-prod/${storageSecret}/current/v1/implementing-services/${accountsService}/${gcsDefinitionPath}`, ); +} -export const mockImplementingServicesSuccess = ({ - implementingServicePath, - partialSchemaPath, - federatedServiceURL, -}: { - implementingServicePath: string; - partialSchemaPath: string; - federatedServiceURL: string; -}) => - mockImplementingServices({ - implementingServicePath, - }).reply(200, { +export function mockImplementingServicesSuccess(service: MockService) { + return mockImplementingServices(service).reply(200, { name: accountsService, - partialSchemaPath: `${storageSecret}/current/raw-partial-schemas/${partialSchemaPath}`, - url: federatedServiceURL, + partialSchemaPath: `${storageSecret}/current/raw-partial-schemas/${service.partialSchemaPath}`, + url: service.url, }); +} // get raw-partial-schema, using received composition-config -export const mockRawPartialSchema = ({ - partialSchemaPath, -}: { - partialSchemaPath: string; -}) => - gcsNock('https://storage.googleapis.com:443').get( +export function mockRawPartialSchema({ partialSchemaPath }: MockService) { + return gcsNock('https://storage.googleapis.com:443').get( `/engine-partial-schema-prod/${storageSecret}/current/raw-partial-schemas/${partialSchemaPath}`, ); +} -export const mockRawPartialSchemaSuccess = ({ - partialSchemaPath, - federatedServiceSchema, -}: { - partialSchemaPath: string; - federatedServiceSchema: string; -}) => - mockRawPartialSchema({ partialSchemaPath }).reply( - 200, - federatedServiceSchema, - ); +export function mockRawPartialSchemaSuccess(service: MockService) { + mockRawPartialSchema(service).reply(200, service.sdl); +} From 96215543e3ad1f0092ed0a4967e80ae2a2984936 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 2 Apr 2020 15:14:48 +0300 Subject: [PATCH 341/642] docs: Add redirect for /v2/ docs to point to default (/). --- docs/static/_redirects | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/static/_redirects b/docs/static/_redirects index 0d1caf0e89a..48ff558fd49 100644 --- a/docs/static/_redirects +++ b/docs/static/_redirects @@ -1,5 +1,10 @@ / /docs/apollo-server/ +# The v2 docs were beta for a while, and non-default, but now that they are +# default, the v2 docs don't exist anymore. So redirect them to the default! +/docs/apollo-server/v2 /docs/apollo-server/ +/docs/apollo-server/v2/* /docs/apollo-server/:splat + /docs/apollo-server/data/data/ /docs/apollo-server/data/resolvers/ /docs/apollo-server/federation/implementing/ /docs/apollo-server/federation/implementing-services/ From ef6e118e11edd51f702b9f74b0bd81142dc44549 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 2 Apr 2020 19:27:10 +0000 Subject: [PATCH 342/642] chore(deps): update dependency gatsby-theme-apollo-docs to v4.1.4 (#3942) Co-authored-by: Renovate Bot --- docs/package-lock.json | 6 +++--- docs/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/package-lock.json b/docs/package-lock.json index 20281ddba25..26d5c9df2b0 100644 --- a/docs/package-lock.json +++ b/docs/package-lock.json @@ -11764,9 +11764,9 @@ } }, "gatsby-theme-apollo-docs": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/gatsby-theme-apollo-docs/-/gatsby-theme-apollo-docs-4.1.3.tgz", - "integrity": "sha512-RQirpJrmDyUR3lZxtkzaxBQuSnmv2vDHsQHRoNjRWldqc+4c4Zq2myiQ1eXyxvs/Uysj2205oAmIgh+2ez/NfQ==", + "version": "4.1.4", + "resolved": "https://registry.npmjs.org/gatsby-theme-apollo-docs/-/gatsby-theme-apollo-docs-4.1.4.tgz", + "integrity": "sha512-TFJwN0z+J3dpNmQ07q9TxboSbVu1mw7xzTn76LLGGnCxwbPqLoPqqU8iy2naGXFkfV6pplUtpKG7rBl8saoyJg==", "requires": { "@mdx-js/mdx": "^1.1.0", "@mdx-js/react": "^1.0.27", diff --git a/docs/package.json b/docs/package.json index ed104274f83..cfa31002755 100644 --- a/docs/package.json +++ b/docs/package.json @@ -7,7 +7,7 @@ }, "dependencies": { "gatsby": "2.20.8", - "gatsby-theme-apollo-docs": "4.1.3", + "gatsby-theme-apollo-docs": "4.1.4", "react": "16.13.1", "react-dom": "16.13.1" } From 33151b73216d2c25dd4d65badafe0cf46749b4d2 Mon Sep 17 00:00:00 2001 From: Trevor Scheer Date: Mon, 30 Mar 2020 12:44:58 -0700 Subject: [PATCH 343/642] Leverage logger implementation in tests --- .../integration/networkRequests.test.ts | 32 +++++++++++++------ 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/packages/apollo-gateway/src/__tests__/integration/networkRequests.test.ts b/packages/apollo-gateway/src/__tests__/integration/networkRequests.test.ts index 974e10904f7..c2a30cff520 100644 --- a/packages/apollo-gateway/src/__tests__/integration/networkRequests.test.ts +++ b/packages/apollo-gateway/src/__tests__/integration/networkRequests.test.ts @@ -1,5 +1,6 @@ import nock from 'nock'; import { fetch } from 'apollo-server-env'; +import { Logger } from 'apollo-server-types'; import { ApolloGateway, GCS_RETRY_COUNT, getDefaultGcsFetcher } from '../..'; import { mockSDLQuerySuccess, @@ -69,6 +70,7 @@ const updatedService: MockService = { }; let fetcher: typeof fetch; +let logger: Logger; beforeEach(() => { if (!nock.isActive()) nock.activate(); @@ -80,6 +82,18 @@ beforeEach(() => { maxTimeout: 0, }, }); + + const warn = jest.fn(); + const debug = jest.fn(); + const error = jest.fn(); + const info = jest.fn(); + + logger = { + warn, + debug, + error, + info, + }; }); afterEach(() => { @@ -94,6 +108,7 @@ it('Queries remote endpoints for their SDLs', async () => { const gateway = new ApolloGateway({ serviceList: [{ name: 'accounts', url: service.url }], + logger }); await gateway.load(); expect(gateway.schema!.getType('User')!.description).toBe('This is my User'); @@ -106,7 +121,7 @@ it('Extracts service definitions from remote storage', async () => { mockImplementingServicesSuccess(service); mockRawPartialSchemaSuccess(service); - const gateway = new ApolloGateway({}); + const gateway = new ApolloGateway({ logger }); await gateway.load({ engine: { apiKeyHash, graphId } }); expect(gateway.schema!.getType('User')!.description).toBe('This is my User'); @@ -117,7 +132,6 @@ it.each([ ['not warned', 'absent'], ])('conflicting configurations are %s about when %s', async (_word, mode) => { const isConflict = mode === 'present'; - const spyConsoleWarn = jest.spyOn(console, 'warn'); let blockerResolve: () => void; const blocker = new Promise(resolve => (blockerResolve = resolve)); const original = loadServicesFromStorage.getServiceDefinitionsFromStorage; @@ -149,18 +163,18 @@ it.each([ serviceList: [ { name: 'accounts', url: service.url }, ], + logger }); await gateway.load({ engine: { apiKeyHash, graphId } }); await blocker; // Wait for the definitions to be "fetched". (isConflict - ? expect(spyConsoleWarn) - : expect(spyConsoleWarn).not + ? expect(logger.warn) + : expect(logger.warn).not ).toHaveBeenCalledWith(expect.stringMatching( /A local gateway service list is overriding an Apollo Graph Manager managed configuration/)); spyGetServiceDefinitionsFromStorage.mockRestore(); - spyConsoleWarn.mockRestore(); }); it('Rollsback to a previous schema when triggered', async () => { @@ -195,7 +209,7 @@ it('Rollsback to a previous schema when triggered', async () => { .mockImplementationOnce(() => firstResolve()) .mockImplementationOnce(() => secondResolve()); - const gateway = new ApolloGateway(); + const gateway = new ApolloGateway({ logger }); // @ts-ignore for testing purposes, a short pollInterval is ideal so we'll override here gateway.experimental_pollInterval = 100; @@ -231,7 +245,7 @@ it(`Retries GCS (up to ${GCS_RETRY_COUNT} times) on failure for each request and failNTimes(GCS_RETRY_COUNT, () => mockRawPartialSchema(service)); mockRawPartialSchemaSuccess(service); - const gateway = new ApolloGateway({ fetcher }); + const gateway = new ApolloGateway({ fetcher, logger }); await gateway.load({ engine: { apiKeyHash, graphId } }); expect(gateway.schema!.getType('User')!.description).toBe('This is my User'); @@ -240,7 +254,7 @@ it(`Retries GCS (up to ${GCS_RETRY_COUNT} times) on failure for each request and it(`Fails after the ${GCS_RETRY_COUNT + 1}th attempt to reach GCS`, async () => { failNTimes(GCS_RETRY_COUNT + 1, mockStorageSecret); - const gateway = new ApolloGateway({ fetcher }); + const gateway = new ApolloGateway({ fetcher, logger }); await expect( gateway.load({ engine: { apiKeyHash, graphId } }), ).rejects.toThrowErrorMatchingInlineSnapshot( @@ -256,7 +270,7 @@ it(`Errors when the secret isn't hosted on GCS`, async () => { { 'content-type': 'application/xml' }, ); - const gateway = new ApolloGateway({ fetcher }); + const gateway = new ApolloGateway({ fetcher, logger }); await expect( gateway.load({ engine: { apiKeyHash, graphId } }), ).rejects.toThrowErrorMatchingInlineSnapshot( From 5eef2a663c82dbe5f450806a6429791db117a4e5 Mon Sep 17 00:00:00 2001 From: Trevor Scheer Date: Thu, 2 Apr 2020 12:39:15 -0700 Subject: [PATCH 344/642] Gateway downstream health checks (#3930) This commit introduces a new configuration option to the gateway: performServiceHealthChecks. This option adds an additional precautionary step to the gateway load and schema update code paths. A gateway with this setting turned on will send a simple graphql query to all downstream services ({ __typename }) to ensure the service is live and responsive. It performs these queries on initial schema load as well as during a schema update. The interesting failure behaviors are: * On load: throw an error, failure to load. * On schema update: "rollback" (never roll forward). Log the event, but continue serving requests with the old schema. --- docs/source/api/apollo-gateway.mdx | 25 ++- packages/apollo-gateway/CHANGELOG.md | 1 + .../__tests__/gateway/buildService.test.ts | 10 +- .../integration/networkRequests.test.ts | 164 +++++++++++++++++- .../src/__tests__/integration/nockMocks.ts | 16 +- packages/apollo-gateway/src/index.ts | 84 ++++++++- .../src/loadServicesFromRemoteEndpoint.ts | 4 +- 7 files changed, 284 insertions(+), 20 deletions(-) diff --git a/docs/source/api/apollo-gateway.mdx b/docs/source/api/apollo-gateway.mdx index 1cf5ee6e4d2..7f2e3701d36 100644 --- a/docs/source/api/apollo-gateway.mdx +++ b/docs/source/api/apollo-gateway.mdx @@ -105,7 +105,6 @@ example of using `ApolloGateway`, see [The gateway](/federation/gateway/). Additionally, this `logger` will be made available on the `GraphQLRequestContext` and available to plugins. This allows a plugin to, e.g., augment the logger on a per-request basis within the `requestDidStart` life-cycle hook. - * `debug`: `Boolean` If `true`, the gateway logs startup messages, along with the query plan for @@ -122,7 +121,7 @@ example of using `ApolloGateway`, see [The gateway](/federation/gateway/). `fetcher: require('node-fetch')`) or different [default options for `make-fetch-happen`](https://www.npmjs.com/package/make-fetch-happen#extra-options) can be defined entirely. E.g.: - + ```javascript const gateway = new ApolloGateway({ /* ... */ @@ -135,6 +134,14 @@ example of using `ApolloGateway`, see [The gateway](/federation/gateway/). }); ``` + * `serviceHealthCheck`: `boolean` + + When set to true, the gateway will issue a small query (`{ __typename }`) to + its downstream services on load and on schema update. On load, the gateway + will throw an error if any of the requests fail. On schema update, the + gateway will not roll over to the new schema or service configuration if any + of the requests fail, but it will try again at the next poll interval. + * `experimental_approximateQueryPlanStoreMiB`: `number` > **This property is experimental.** It may be removed or change at any time, even within a patch release. @@ -157,6 +164,20 @@ const server = new ApolloServer({ }); ``` +### `serviceHealthCheck` + +Calling this function on the gateway will issue a small query (`{ __typename }`) +to each downstream service to ensure they are all responsive. This function +`throw`s on failure and returns a `Promise` to be `await`ed. + +#### Parameters + +* `serviceMap`: `DataSourceMap` + + A map of data sources can optionally be provided to this function in order to + modify where the health checks will be issued. By default, the gateway will + use the existing `this.serviceMap` for issuing the health check requests. + ## `RemoteGraphQLDataSource` A `RemoteGraphQLDataSource` object represents a connection between your diff --git a/packages/apollo-gateway/CHANGELOG.md b/packages/apollo-gateway/CHANGELOG.md index 9bfbc833c7c..cb7cd3af911 100644 --- a/packages/apollo-gateway/CHANGELOG.md +++ b/packages/apollo-gateway/CHANGELOG.md @@ -11,6 +11,7 @@ - Drop use of `loglevel-debug`. This removes the very long date and time prefix in front of each log line and also the support for the `DEBUG=apollo-gateway:` environment variable. Both of these were uncommonly necessary or seldom used (with the environment variable also being undocumented). The existing behavior can be preserved by providing a `logger` that uses `loglevel-debug`, if desired, and more details can be found in the PR. [PR #3896](https://github.com/apollographql/apollo-server/pull/3896) - Fix Typescript generic typing for datasource contexts [#3865](https://github.com/apollographql/apollo-server/pull/3865) This is a fix for the `TContext` typings of the gateway's exposed `GraphQLDataSource` implementations. In their current form, they don't work as intended, or in any manner that's useful for typing the `context` property throughout the class methods. This introduces a type argument `TContext` to the class itself (which defaults to `Record` for existing implementations) and removes the non-operational type arguments on the class methods themselves. - Implement retry logic for requests to GCS [PR #3836](https://github.com/apollographql/apollo-server/pull/3836) Note: coupled with this change is a small alteration in how the gateway polls GCS for updates in managed mode. Previously, the tick was on a specific interval. Now, every tick starts after the round of fetches to GCS completes. For more details, see the linked PR. +- Gateway issues health checks to downstream services via `serviceHealthCheck` configuration option. Note: expected behavior differs between managed and unmanaged federation. See PR for new test cases and documentation. [#3930](https://github.com/apollographql/apollo-server/pull/3930) ## 0.13.2 diff --git a/packages/apollo-gateway/src/__tests__/gateway/buildService.test.ts b/packages/apollo-gateway/src/__tests__/gateway/buildService.test.ts index 564d101962b..3361f7ad4b0 100644 --- a/packages/apollo-gateway/src/__tests__/gateway/buildService.test.ts +++ b/packages/apollo-gateway/src/__tests__/gateway/buildService.test.ts @@ -4,7 +4,7 @@ import { createTestClient } from 'apollo-server-testing'; import { ApolloServerBase as ApolloServer } from 'apollo-server-core'; import { RemoteGraphQLDataSource } from '../../datasources/RemoteGraphQLDataSource'; -import { ApolloGateway } from '../../'; +import { ApolloGateway, SERVICE_DEFINITION_QUERY } from '../../'; import * as accounts from '../__fixtures__/schemas/accounts'; import * as books from '../__fixtures__/schemas/books'; @@ -133,7 +133,7 @@ it('makes enhanced introspection request using datasource', async () => { expect(fetch).toHaveFetched({ url: 'https://api.example.com/override', body: { - query: `query GetServiceDefinition { _service { sdl } }`, + query: SERVICE_DEFINITION_QUERY, }, headers: { 'custom-header': 'some-custom-value', @@ -179,7 +179,7 @@ it('customizes request on a per-service basis', async () => { expect(fetch).toHaveFetched({ url: 'https://api.example.com/one', body: { - query: `query GetServiceDefinition { _service { sdl } }`, + query: `query __ApolloGetServiceDefinition__ { _service { sdl } }`, }, headers: { 'service-name': 'one', @@ -189,7 +189,7 @@ it('customizes request on a per-service basis', async () => { expect(fetch).toHaveFetched({ url: 'https://api.example.com/two', body: { - query: `query GetServiceDefinition { _service { sdl } }`, + query: `query __ApolloGetServiceDefinition__ { _service { sdl } }`, }, headers: { 'service-name': 'two', @@ -199,7 +199,7 @@ it('customizes request on a per-service basis', async () => { expect(fetch).toHaveFetched({ url: 'https://api.example.com/three', body: { - query: `query GetServiceDefinition { _service { sdl } }`, + query: `query __ApolloGetServiceDefinition__ { _service { sdl } }`, }, headers: { 'service-name': 'three', diff --git a/packages/apollo-gateway/src/__tests__/integration/networkRequests.test.ts b/packages/apollo-gateway/src/__tests__/integration/networkRequests.test.ts index c2a30cff520..df976f8029a 100644 --- a/packages/apollo-gateway/src/__tests__/integration/networkRequests.test.ts +++ b/packages/apollo-gateway/src/__tests__/integration/networkRequests.test.ts @@ -4,6 +4,8 @@ import { Logger } from 'apollo-server-types'; import { ApolloGateway, GCS_RETRY_COUNT, getDefaultGcsFetcher } from '../..'; import { mockSDLQuerySuccess, + mockServiceHealthCheckSuccess, + mockServiceHealthCheck, mockStorageSecretSuccess, mockStorageSecret, mockCompositionConfigLinkSuccess, @@ -100,7 +102,6 @@ afterEach(() => { expect(nock.isDone()).toBeTruthy(); nock.cleanAll(); nock.restore(); - jest.useRealTimers(); }); it('Queries remote endpoints for their SDLs', async () => { @@ -277,3 +278,164 @@ it(`Errors when the secret isn't hosted on GCS`, async () => { `"Unable to authenticate with Apollo Graph Manager storage while fetching https://storage.googleapis.com/engine-partial-schema-prod/federated-service/storage-secret/dd55a79d467976346d229a7b12b673ce.json. Ensure that the API key is configured properly and that a federated service has been pushed. For details, see https://go.apollo.dev/g/resolve-access-denied."`, ); }); + +describe('Downstream service health checks', () => { + describe('Unmanaged mode', () => { + it(`Performs health checks to downstream services on load`, async () => { + mockSDLQuerySuccess(service); + mockServiceHealthCheckSuccess(service); + + const gateway = new ApolloGateway({ + logger, + serviceList: [{ name: 'accounts', url: service.url }], + serviceHealthCheck: true, + }); + + await gateway.load(); + expect(gateway.schema!.getType('User')!.description).toBe('This is my User'); + }); + + it(`Rejects on initial load when health check fails`, async () => { + mockSDLQuerySuccess(service); + mockServiceHealthCheck(service).reply(500); + + const gateway = new ApolloGateway({ + serviceList: [{ name: 'accounts', url: service.url }], + serviceHealthCheck: true, + logger, + }); + + await expect(gateway.load()).rejects.toThrowErrorMatchingInlineSnapshot( + `"500: Internal Server Error"`, + ); + }); + }); + + describe('Managed mode', () => { + it('Performs health checks to downstream services on load', async () => { + mockStorageSecretSuccess(); + mockCompositionConfigLinkSuccess(); + mockCompositionConfigsSuccess([service]); + mockImplementingServicesSuccess(service); + mockRawPartialSchemaSuccess(service); + + mockServiceHealthCheckSuccess(service); + + const gateway = new ApolloGateway({ serviceHealthCheck: true, logger }); + + await gateway.load({ engine: { apiKeyHash, graphId } }); + expect(gateway.schema!.getType('User')!.description).toBe('This is my User'); + }); + + it('Rejects on initial load when health check fails', async () => { + mockStorageSecretSuccess(); + mockCompositionConfigLinkSuccess(); + mockCompositionConfigsSuccess([service]); + mockImplementingServicesSuccess(service); + mockRawPartialSchemaSuccess(service); + + mockServiceHealthCheck(service).reply(500); + + const gateway = new ApolloGateway({ serviceHealthCheck: true, logger }); + + await expect( + gateway.load({ engine: { apiKeyHash, graphId } }), + ).rejects.toThrowErrorMatchingInlineSnapshot(`"500: Internal Server Error"`); + }); + + it('Rolls over to new schema when health check succeeds', async () => { + mockStorageSecretSuccess(); + mockCompositionConfigLinkSuccess(); + mockCompositionConfigsSuccess([service]); + mockImplementingServicesSuccess(service); + mockRawPartialSchemaSuccess(service); + mockServiceHealthCheckSuccess(service); + + // Update + mockStorageSecretSuccess(); + mockCompositionConfigLinkSuccess(); + mockCompositionConfigsSuccess([updatedService]); + mockImplementingServicesSuccess(updatedService); + mockRawPartialSchemaSuccess(updatedService); + mockServiceHealthCheckSuccess(updatedService); + + let resolve: () => void; + const schemaChangeBlocker = new Promise(res => (resolve = res)); + const onChange = jest.fn().mockImplementationOnce(() => resolve()); + + const gateway = new ApolloGateway({ + serviceHealthCheck: true, + logger, + }); + // @ts-ignore for testing purposes, a short pollInterval is ideal so we'll override here + gateway.experimental_pollInterval = 100; + + await gateway.load({ engine: { apiKeyHash, graphId } }); + gateway.onSchemaChange(onChange); + + await schemaChangeBlocker; + expect(onChange.mock.calls.length).toBe(1); + + expect(gateway.schema!.getType('User')!.description).toBe('This is my updated User'); + }); + + it('Preserves original schema when health check fails', async () => { + mockStorageSecretSuccess(); + mockCompositionConfigLinkSuccess(); + mockCompositionConfigsSuccess([service]); + mockImplementingServicesSuccess(service); + mockRawPartialSchemaSuccess(service); + mockServiceHealthCheckSuccess(service); + + // Update + mockStorageSecretSuccess(); + mockCompositionConfigLinkSuccess(); + mockCompositionConfigsSuccess([updatedService]); + mockImplementingServicesSuccess(updatedService); + mockRawPartialSchemaSuccess(updatedService); + mockServiceHealthCheck(updatedService).reply(500); + + let resolve: () => void; + const schemaChangeBlocker = new Promise(res => (resolve = res)); + + const gateway = new ApolloGateway({ serviceHealthCheck: true, logger }); + // @ts-ignore for testing purposes, a short pollInterval is ideal so we'll override here + gateway.experimental_pollInterval = 100; + + // load the gateway as usual + await gateway.load({ engine: { apiKeyHash, graphId } }); + expect(gateway.schema!.getType('User')!.description).toBe('This is my User'); + + // @ts-ignore for testing purposes, we'll call the original `updateComposition` + // function from our mock + const original = gateway.updateComposition; + const mockUpdateComposition = jest + .fn(original) + .mockImplementationOnce(async opts => { + // mock the first poll and handle the error which would otherwise be caught + // and logged from within the `pollServices` class method + await expect(original.apply(gateway, [opts])) + .rejects + .toThrowErrorMatchingInlineSnapshot( + `"500: Internal Server Error"`, + ); + // finally resolve the promise which drives this test + resolve(); + }); + + // @ts-ignore for testing purposes, replace the `updateComposition` + // function on the gateway with our mock + gateway.updateComposition = mockUpdateComposition; + + // This kicks off polling within the gateway + gateway.onSchemaChange(() => {}); + + await schemaChangeBlocker; + + // At this point, the mock update should have been called but the schema + // should not have updated to the new one. + expect(mockUpdateComposition.mock.calls.length).toBe(1); + expect(gateway.schema!.getType('User')!.description).toBe('This is my User'); + }); + }); +}); diff --git a/packages/apollo-gateway/src/__tests__/integration/nockMocks.ts b/packages/apollo-gateway/src/__tests__/integration/nockMocks.ts index f96866d85ce..7a14eb1139c 100644 --- a/packages/apollo-gateway/src/__tests__/integration/nockMocks.ts +++ b/packages/apollo-gateway/src/__tests__/integration/nockMocks.ts @@ -1,4 +1,5 @@ import nock from 'nock'; +import { HEALTH_CHECK_QUERY, SERVICE_DEFINITION_QUERY } from '../..'; import { MockService } from './networkRequests.test'; export const graphId = 'federated-service'; @@ -9,7 +10,7 @@ const accountsService = 'accounts'; // Service mocks function mockSDLQuery({ url }: MockService) { return nock(url).post('/', { - query: 'query GetServiceDefinition { _service { sdl } }', + query: SERVICE_DEFINITION_QUERY, }); } @@ -19,6 +20,19 @@ export function mockSDLQuerySuccess(service: MockService) { }); } +export function mockServiceHealthCheck({ url }: MockService) { + return nock(url).post('/', { + query: HEALTH_CHECK_QUERY, + }); +} + +export function mockServiceHealthCheckSuccess(service: MockService) { + return mockServiceHealthCheck(service).reply(200, { + data: { __typename: 'Query' }, + }); +} + +// GCS mocks function gcsNock(url: Parameters[0]): nock.Scope { return nock(url, { reqheaders: { diff --git a/packages/apollo-gateway/src/index.ts b/packages/apollo-gateway/src/index.ts index b6066dd4b6a..fa736d34a6f 100644 --- a/packages/apollo-gateway/src/index.ts +++ b/packages/apollo-gateway/src/index.ts @@ -63,6 +63,7 @@ interface GatewayConfigBase { experimental_approximateQueryPlanStoreMiB?: number; experimental_autoFragmentization?: boolean; fetcher?: typeof fetch; + serviceHealthCheck?: boolean; } interface RemoteGatewayConfig extends GatewayConfigBase { @@ -82,7 +83,7 @@ export type GatewayConfig = | LocalGatewayConfig | ManagedGatewayConfig; -type DataSourceCache = { +type DataSourceMap = { [serviceName: string]: { url?: string; dataSource: GraphQLDataSource }; }; @@ -178,9 +179,14 @@ export function getDefaultGcsFetcher() { }); } +export const HEALTH_CHECK_QUERY = + 'query __ApolloServiceHealthCheck__ { __typename }'; +export const SERVICE_DEFINITION_QUERY = + 'query __ApolloGetServiceDefinition__ { _service { sdl } }'; + export class ApolloGateway implements GraphQLService { public schema?: GraphQLSchema; - protected serviceMap: DataSourceCache = Object.create(null); + protected serviceMap: DataSourceMap = Object.create(null); protected config: GatewayConfig; private logger: Logger; protected queryPlanStore?: InMemoryLRUCache; @@ -350,12 +356,41 @@ export class ApolloGateway implements GraphQLService { this.logger.info("New service definitions were found."); } + // Run service health checks before we commit and update the new schema. + // This is the last chance to bail out of a schema update. + if (this.config.serviceHealthCheck) { + // Here we need to construct new datasources based on the new schema info + // so we can check the health of the services we're _updating to_. + const serviceMap = result.serviceDefinitions.reduce( + (serviceMap, serviceDef) => { + serviceMap[serviceDef.name] = { + url: serviceDef.url, + dataSource: this.createDataSource(serviceDef), + }; + return serviceMap; + }, + Object.create(null) as DataSourceMap, + ); + + try { + await this.serviceHealthCheck(serviceMap); + } catch (e) { + this.logger.error( + 'The gateway did not update its schema due to failed service health checks. ' + + 'The gateway will continue to operate with the previous schema and reattempt updates.' + e + ); + throw e; + } + } + this.compositionMetadata = result.compositionMetadata; this.serviceDefinitions = result.serviceDefinitions; if (this.queryPlanStore) this.queryPlanStore.flush(); this.schema = this.createSchema(result.serviceDefinitions); + + // Notify the schema listeners of the updated schema try { this.onSchemaChangeListeners.forEach(listener => listener(this.schema!)); } catch (e) { @@ -385,6 +420,31 @@ export class ApolloGateway implements GraphQLService { } } + /** + * This can be used without an argument in order to perform an ad-hoc health check + * of the downstream services like so: + * + * @example + * ``` + * try { + * await gateway.serviceHealthCheck(); + * } catch(e) { + * /* your error handling here *\/ + * } + * ``` + * @throws + * @param serviceMap {DataSourceMap} + */ + public serviceHealthCheck(serviceMap: DataSourceMap = this.serviceMap) { + return Promise.all( + Object.entries(serviceMap).map(([name, { dataSource }]) => + dataSource + .process({ request: { query: HEALTH_CHECK_QUERY }, context: {} }) + .then(response => ({ name, response })), + ), + ); + } + protected createSchema(serviceList: ServiceDefinition[]) { this.logger.debug( `Composing schema from service list: \n${serviceList @@ -470,22 +530,28 @@ export class ApolloGateway implements GraphQLService { ) return this.serviceMap[serviceDef.name].dataSource; + const dataSource = this.createDataSource(serviceDef); + + // Cache the created DataSource + this.serviceMap[serviceDef.name] = { url: serviceDef.url, dataSource }; + + return dataSource; + } + + private createDataSource( + serviceDef: ServiceEndpointDefinition, + ): GraphQLDataSource { if (!serviceDef.url && !isLocalConfig(this.config)) { this.logger.error( `Service definition for service ${serviceDef.name} is missing a url`, ); } - const dataSource = this.config.buildService + return this.config.buildService ? this.config.buildService(serviceDef) : new RemoteGraphQLDataSource({ url: serviceDef.url, }); - - // Cache the created DataSource - this.serviceMap[serviceDef.name] = { url: serviceDef.url, dataSource }; - - return dataSource; } protected createServices(services: ServiceEndpointDefinition[]) { @@ -710,7 +776,7 @@ export class ApolloGateway implements GraphQLService { public async stop() { if (this.pollingTimer) { - clearInterval(this.pollingTimer); + clearTimeout(this.pollingTimer); this.pollingTimer = undefined; } } diff --git a/packages/apollo-gateway/src/loadServicesFromRemoteEndpoint.ts b/packages/apollo-gateway/src/loadServicesFromRemoteEndpoint.ts index e9a7d8ca4c6..c4dd8b9f3c8 100644 --- a/packages/apollo-gateway/src/loadServicesFromRemoteEndpoint.ts +++ b/packages/apollo-gateway/src/loadServicesFromRemoteEndpoint.ts @@ -2,7 +2,7 @@ import { GraphQLRequest } from 'apollo-server-types'; import { parse } from 'graphql'; import { Headers, HeadersInit } from 'node-fetch'; import { GraphQLDataSource } from './datasources/types'; -import { Experimental_UpdateServiceDefinitions } from './'; +import { Experimental_UpdateServiceDefinitions, SERVICE_DEFINITION_QUERY } from './'; import { ServiceDefinition } from '@apollo/federation'; export async function getServiceDefinitionsFromRemoteEndpoint({ @@ -33,7 +33,7 @@ export async function getServiceDefinitionsFromRemoteEndpoint({ } const request: GraphQLRequest = { - query: 'query GetServiceDefinition { _service { sdl } }', + query: SERVICE_DEFINITION_QUERY, http: { url, method: 'POST', From 8647334d9237f46c5b18a39a361d456a16db9e74 Mon Sep 17 00:00:00 2001 From: Trevor Scheer Date: Thu, 2 Apr 2020 15:53:58 -0700 Subject: [PATCH 345/642] Bump `graphql` peerDependencies to `^15.0.0` (#3944) In response to the release of graphql@15.0.0, this updates all peerDependencies in the apollo-server monorepo to include the latest version of graphql-js. Note: this drops support for the previously supported rcs and will result in a peerDependencies warning if you choose not to upgrade your version of graphql from an rc to latest. --- CHANGELOG.md | 3 ++- packages/apollo-cache-control/package.json | 2 +- packages/apollo-engine-reporting/package.json | 2 +- packages/apollo-federation/package.json | 2 +- packages/apollo-gateway/package.json | 2 +- packages/apollo-server-azure-functions/package.json | 2 +- packages/apollo-server-cloud-functions/package.json | 2 +- packages/apollo-server-cloudflare/package.json | 2 +- packages/apollo-server-core/package.json | 2 +- packages/apollo-server-errors/package.json | 2 +- packages/apollo-server-express/package.json | 2 +- packages/apollo-server-fastify/package.json | 2 +- packages/apollo-server-hapi/package.json | 2 +- packages/apollo-server-koa/package.json | 2 +- packages/apollo-server-lambda/package.json | 2 +- packages/apollo-server-plugin-base/package.json | 2 +- packages/apollo-server-plugin-response-cache/package.json | 2 +- packages/apollo-server-testing/package.json | 2 +- packages/apollo-server-types/package.json | 2 +- packages/apollo-server/package.json | 2 +- packages/apollo-tracing/package.json | 2 +- packages/graphql-extensions/package.json | 2 +- 22 files changed, 23 insertions(+), 22 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d9bf4ece054..bd22b262c7d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,8 @@ The version headers in this history reflect the versions of Apollo Server itself - `apollo-server-core`: When operating in gateway mode using the `gateway` property of the Apollo Server constructor options, the failure to initialize a schema during initial start-up, e.g. connectivity problems, will no longer result in the federated executor from being assigned when the schema eventually becomes available. This precludes a state where the gateway may never become available to serve federated requests, even when failure conditions are no longer present. [PR #3811](https://github.com/apollographql/apollo-server/pull/3811) - `apollo-server-core`: Prevent a condition which prefixed an error message on each request when the initial gateway initialization resulted in a Promise-rejection which was memoized and re-prepended with `Invalid options provided to ApolloServer:` on each request. [PR #3811](https://github.com/apollographql/apollo-server/pull/3811) - `apollo-server-express`: Disable the automatic inclusion of the `x-powered-by: express` header. [PR #3821](https://github.com/apollographql/apollo-server/pull/3821) -- `apollo-engine-reporting`: Avoid creating new arrays when building trace trees. [PR #3479](https://github.com/apollographql/apollo-server/pull/3479) +- `apollo-engine-reporting`: Avoid creating new arrays when building trace trees. [PR #3479](https://github.com/apollographql/apollo-server/pull/3479) +- `apollo-server-core`: Bump `graphql` peerDependencies to `^15.0.0`. [PR #3944](https://github.com/apollographql/apollo-server/pull/3944) ### v2.11.0 diff --git a/packages/apollo-cache-control/package.json b/packages/apollo-cache-control/package.json index 424a2b1d8d2..14fa364ddf1 100644 --- a/packages/apollo-cache-control/package.json +++ b/packages/apollo-cache-control/package.json @@ -15,6 +15,6 @@ "graphql-extensions": "file:../graphql-extensions" }, "peerDependencies": { - "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0-rc.2" + "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0" } } diff --git a/packages/apollo-engine-reporting/package.json b/packages/apollo-engine-reporting/package.json index 37889c5a695..0edc2feac80 100644 --- a/packages/apollo-engine-reporting/package.json +++ b/packages/apollo-engine-reporting/package.json @@ -21,6 +21,6 @@ "graphql-extensions": "file:../graphql-extensions" }, "peerDependencies": { - "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0-rc.2" + "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0" } } diff --git a/packages/apollo-federation/package.json b/packages/apollo-federation/package.json index 603cc07582d..5bd5000763d 100644 --- a/packages/apollo-federation/package.json +++ b/packages/apollo-federation/package.json @@ -20,6 +20,6 @@ "lodash.xorby": "^4.7.0" }, "peerDependencies": { - "graphql": "^14.0.2 || ^15.0.0-rc.2" + "graphql": "^14.0.2 || ^15.0.0" } } diff --git a/packages/apollo-gateway/package.json b/packages/apollo-gateway/package.json index 582c080b410..ed296ff9952 100644 --- a/packages/apollo-gateway/package.json +++ b/packages/apollo-gateway/package.json @@ -34,6 +34,6 @@ "pretty-format": "^24.7.0" }, "peerDependencies": { - "graphql": "^14.2.1 || ^15.0.0-rc.2" + "graphql": "^14.2.1 || ^15.0.0" } } diff --git a/packages/apollo-server-azure-functions/package.json b/packages/apollo-server-azure-functions/package.json index cd6b1debbef..f55c997762d 100644 --- a/packages/apollo-server-azure-functions/package.json +++ b/packages/apollo-server-azure-functions/package.json @@ -36,6 +36,6 @@ "apollo-server-integration-testsuite": "file:../apollo-server-integration-testsuite" }, "peerDependencies": { - "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0-rc.2" + "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0" } } diff --git a/packages/apollo-server-cloud-functions/package.json b/packages/apollo-server-cloud-functions/package.json index 16e85a4f7e4..72dfd0251a0 100644 --- a/packages/apollo-server-cloud-functions/package.json +++ b/packages/apollo-server-cloud-functions/package.json @@ -35,6 +35,6 @@ "apollo-server-integration-testsuite": "file:../apollo-server-integration-testsuite" }, "peerDependencies": { - "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0-rc.2" + "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0" } } diff --git a/packages/apollo-server-cloudflare/package.json b/packages/apollo-server-cloudflare/package.json index a497a1af36d..0b55c90b3de 100644 --- a/packages/apollo-server-cloudflare/package.json +++ b/packages/apollo-server-cloudflare/package.json @@ -26,6 +26,6 @@ "apollo-server-types": "file:../apollo-server-types" }, "peerDependencies": { - "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0-rc.2" + "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0" } } diff --git a/packages/apollo-server-core/package.json b/packages/apollo-server-core/package.json index bcec6c9a2e3..58d51959de9 100644 --- a/packages/apollo-server-core/package.json +++ b/packages/apollo-server-core/package.json @@ -48,6 +48,6 @@ "ws": "^6.0.0" }, "peerDependencies": { - "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0-rc.2" + "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0" } } diff --git a/packages/apollo-server-errors/package.json b/packages/apollo-server-errors/package.json index 1d81652e7f7..dc6b7567591 100644 --- a/packages/apollo-server-errors/package.json +++ b/packages/apollo-server-errors/package.json @@ -17,6 +17,6 @@ "node": ">=6" }, "peerDependencies": { - "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0-rc.2" + "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0" } } diff --git a/packages/apollo-server-express/package.json b/packages/apollo-server-express/package.json index 2316c5e1d46..17e1b4efbe9 100644 --- a/packages/apollo-server-express/package.json +++ b/packages/apollo-server-express/package.json @@ -47,6 +47,6 @@ "apollo-server-integration-testsuite": "file:../apollo-server-integration-testsuite" }, "peerDependencies": { - "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0-rc.2" + "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0" } } diff --git a/packages/apollo-server-fastify/package.json b/packages/apollo-server-fastify/package.json index ea1db9345be..2fbdaceb51c 100644 --- a/packages/apollo-server-fastify/package.json +++ b/packages/apollo-server-fastify/package.json @@ -37,6 +37,6 @@ "apollo-server-integration-testsuite": "file:../apollo-server-integration-testsuite" }, "peerDependencies": { - "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0-rc.2" + "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0" } } diff --git a/packages/apollo-server-hapi/package.json b/packages/apollo-server-hapi/package.json index dcba835acfb..36604c95356 100644 --- a/packages/apollo-server-hapi/package.json +++ b/packages/apollo-server-hapi/package.json @@ -37,6 +37,6 @@ "apollo-server-integration-testsuite": "file:../apollo-server-integration-testsuite" }, "peerDependencies": { - "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0-rc.2" + "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0" } } diff --git a/packages/apollo-server-koa/package.json b/packages/apollo-server-koa/package.json index 5b3139d17b2..8576017fa1b 100644 --- a/packages/apollo-server-koa/package.json +++ b/packages/apollo-server-koa/package.json @@ -48,6 +48,6 @@ "apollo-server-integration-testsuite": "file:../apollo-server-integration-testsuite" }, "peerDependencies": { - "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0-rc.2" + "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0" } } diff --git a/packages/apollo-server-lambda/package.json b/packages/apollo-server-lambda/package.json index 0bcdf436054..1048dabb926 100644 --- a/packages/apollo-server-lambda/package.json +++ b/packages/apollo-server-lambda/package.json @@ -36,6 +36,6 @@ "apollo-server-integration-testsuite": "file:../apollo-server-integration-testsuite" }, "peerDependencies": { - "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0-rc.2" + "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0" } } diff --git a/packages/apollo-server-plugin-base/package.json b/packages/apollo-server-plugin-base/package.json index 8db35fdcb56..bcf15116904 100644 --- a/packages/apollo-server-plugin-base/package.json +++ b/packages/apollo-server-plugin-base/package.json @@ -14,6 +14,6 @@ "apollo-server-types": "file:../apollo-server-types" }, "peerDependencies": { - "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0-rc.2" + "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0" } } diff --git a/packages/apollo-server-plugin-response-cache/package.json b/packages/apollo-server-plugin-response-cache/package.json index 541d4ed6995..76e9051a1b6 100644 --- a/packages/apollo-server-plugin-response-cache/package.json +++ b/packages/apollo-server-plugin-response-cache/package.json @@ -27,6 +27,6 @@ "apollo-server-types": "file:../apollo-server-types" }, "peerDependencies": { - "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0-rc.2" + "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0" } } diff --git a/packages/apollo-server-testing/package.json b/packages/apollo-server-testing/package.json index e5533531297..83488e60887 100644 --- a/packages/apollo-server-testing/package.json +++ b/packages/apollo-server-testing/package.json @@ -30,6 +30,6 @@ "apollo-server-types": "file:../apollo-server-types" }, "peerDependencies": { - "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0-rc.2" + "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0" } } diff --git a/packages/apollo-server-types/package.json b/packages/apollo-server-types/package.json index 96fc34a2e62..eae3f638655 100644 --- a/packages/apollo-server-types/package.json +++ b/packages/apollo-server-types/package.json @@ -16,6 +16,6 @@ "apollo-server-env": "file:../apollo-server-env" }, "peerDependencies": { - "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0-rc.2" + "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0" } } diff --git a/packages/apollo-server/package.json b/packages/apollo-server/package.json index ea8d38060a3..274d2e2e501 100644 --- a/packages/apollo-server/package.json +++ b/packages/apollo-server/package.json @@ -28,6 +28,6 @@ "graphql-tools": "^4.0.0" }, "peerDependencies": { - "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0-rc.2" + "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0" } } diff --git a/packages/apollo-tracing/package.json b/packages/apollo-tracing/package.json index eb1fca0ed3f..4cd40ade618 100644 --- a/packages/apollo-tracing/package.json +++ b/packages/apollo-tracing/package.json @@ -15,6 +15,6 @@ "graphql-extensions": "file:../graphql-extensions" }, "peerDependencies": { - "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0-rc.2" + "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0" } } diff --git a/packages/graphql-extensions/package.json b/packages/graphql-extensions/package.json index 2f658e01085..926d0b04c5b 100644 --- a/packages/graphql-extensions/package.json +++ b/packages/graphql-extensions/package.json @@ -20,6 +20,6 @@ "apollo-server-types": "file:../apollo-server-types" }, "peerDependencies": { - "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0-rc.2" + "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0" } } From c69557b0e94e15ab2ddd031ec46f20f58cbcb96f Mon Sep 17 00:00:00 2001 From: Trevor Scheer Date: Thu, 2 Apr 2020 15:58:49 -0700 Subject: [PATCH 346/642] Release - apollo-cache-control@0.9.1-alpha.5 - apollo-datasource-rest@0.8.1-alpha.5 - apollo-engine-reporting@1.7.1-alpha.5 - @apollo/federation@0.14.0-alpha.5 - @apollo/gateway@0.14.0-alpha.5 - apollo-server-azure-functions@2.12.0-alpha.5 - apollo-server-cloud-functions@2.12.0-alpha.5 - apollo-server-cloudflare@2.12.0-alpha.5 - apollo-server-core@2.12.0-alpha.5 - apollo-server-errors@2.4.1-alpha.0 - apollo-server-express@2.12.0-alpha.5 - apollo-server-fastify@2.12.0-alpha.5 - apollo-server-hapi@2.12.0-alpha.5 - apollo-server-integration-testsuite@2.12.0-alpha.5 - apollo-server-koa@2.12.0-alpha.5 - apollo-server-lambda@2.12.0-alpha.5 - apollo-server-micro@2.12.0-alpha.5 - apollo-server-plugin-base@0.7.1-alpha.5 - apollo-server-plugin-response-cache@0.4.1-alpha.5 - apollo-server-testing@2.12.0-alpha.5 - apollo-server-types@0.3.1-alpha.5 - apollo-server@2.12.0-alpha.5 - apollo-tracing@0.9.1-alpha.5 - graphql-extensions@0.11.1-alpha.5 --- packages/apollo-cache-control/package.json | 2 +- packages/apollo-datasource-rest/package.json | 2 +- packages/apollo-engine-reporting/package.json | 2 +- packages/apollo-federation/package.json | 2 +- packages/apollo-gateway/package.json | 2 +- packages/apollo-server-azure-functions/package.json | 2 +- packages/apollo-server-cloud-functions/package.json | 2 +- packages/apollo-server-cloudflare/package.json | 2 +- packages/apollo-server-core/package.json | 2 +- packages/apollo-server-errors/package.json | 2 +- packages/apollo-server-express/package.json | 2 +- packages/apollo-server-fastify/package.json | 2 +- packages/apollo-server-hapi/package.json | 2 +- packages/apollo-server-integration-testsuite/package.json | 2 +- packages/apollo-server-koa/package.json | 2 +- packages/apollo-server-lambda/package.json | 2 +- packages/apollo-server-micro/package.json | 2 +- packages/apollo-server-plugin-base/package.json | 2 +- packages/apollo-server-plugin-response-cache/package.json | 2 +- packages/apollo-server-testing/package.json | 2 +- packages/apollo-server-types/package.json | 2 +- packages/apollo-server/package.json | 2 +- packages/apollo-tracing/package.json | 2 +- packages/graphql-extensions/package.json | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/packages/apollo-cache-control/package.json b/packages/apollo-cache-control/package.json index 14fa364ddf1..2beba44a38b 100644 --- a/packages/apollo-cache-control/package.json +++ b/packages/apollo-cache-control/package.json @@ -1,6 +1,6 @@ { "name": "apollo-cache-control", - "version": "0.9.1-alpha.4", + "version": "0.9.1-alpha.5", "description": "A GraphQL extension for cache control", "main": "./dist/index.js", "types": "./dist/index.d.ts", diff --git a/packages/apollo-datasource-rest/package.json b/packages/apollo-datasource-rest/package.json index 6973a404947..3cef735a8e2 100644 --- a/packages/apollo-datasource-rest/package.json +++ b/packages/apollo-datasource-rest/package.json @@ -1,6 +1,6 @@ { "name": "apollo-datasource-rest", - "version": "0.8.1-alpha.4", + "version": "0.8.1-alpha.5", "author": "opensource@apollographql.com", "license": "MIT", "repository": { diff --git a/packages/apollo-engine-reporting/package.json b/packages/apollo-engine-reporting/package.json index 0edc2feac80..cf73a30b072 100644 --- a/packages/apollo-engine-reporting/package.json +++ b/packages/apollo-engine-reporting/package.json @@ -1,6 +1,6 @@ { "name": "apollo-engine-reporting", - "version": "1.7.1-alpha.4", + "version": "1.7.1-alpha.5", "description": "Send reports about your GraphQL services to Apollo Graph Manager (previously known as Apollo Engine)", "main": "./dist/index.js", "types": "./dist/index.d.ts", diff --git a/packages/apollo-federation/package.json b/packages/apollo-federation/package.json index 5bd5000763d..af4287d63d1 100644 --- a/packages/apollo-federation/package.json +++ b/packages/apollo-federation/package.json @@ -1,6 +1,6 @@ { "name": "@apollo/federation", - "version": "0.14.0-alpha.4", + "version": "0.14.0-alpha.5", "description": "Apollo Federation Utilities", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-gateway/package.json b/packages/apollo-gateway/package.json index ed296ff9952..f36db970099 100644 --- a/packages/apollo-gateway/package.json +++ b/packages/apollo-gateway/package.json @@ -1,6 +1,6 @@ { "name": "@apollo/gateway", - "version": "0.14.0-alpha.4", + "version": "0.14.0-alpha.5", "description": "Apollo Gateway", "author": "opensource@apollographql.com", "main": "dist/index.js", diff --git a/packages/apollo-server-azure-functions/package.json b/packages/apollo-server-azure-functions/package.json index f55c997762d..b63749c2d95 100644 --- a/packages/apollo-server-azure-functions/package.json +++ b/packages/apollo-server-azure-functions/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-azure-functions", - "version": "2.12.0-alpha.4", + "version": "2.12.0-alpha.5", "description": "Production-ready Node.js GraphQL server for Azure Functions", "keywords": [ "GraphQL", diff --git a/packages/apollo-server-cloud-functions/package.json b/packages/apollo-server-cloud-functions/package.json index 72dfd0251a0..e58296d7592 100644 --- a/packages/apollo-server-cloud-functions/package.json +++ b/packages/apollo-server-cloud-functions/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-cloud-functions", - "version": "2.12.0-alpha.4", + "version": "2.12.0-alpha.5", "description": "Production-ready Node.js GraphQL server for Google Cloud Functions", "keywords": [ "GraphQL", diff --git a/packages/apollo-server-cloudflare/package.json b/packages/apollo-server-cloudflare/package.json index 0b55c90b3de..f5bf2d2e18e 100644 --- a/packages/apollo-server-cloudflare/package.json +++ b/packages/apollo-server-cloudflare/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-cloudflare", - "version": "2.12.0-alpha.4", + "version": "2.12.0-alpha.5", "description": "Production-ready Node.js GraphQL server for Cloudflare workers", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-core/package.json b/packages/apollo-server-core/package.json index 58d51959de9..4e1105ce7f8 100644 --- a/packages/apollo-server-core/package.json +++ b/packages/apollo-server-core/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-core", - "version": "2.12.0-alpha.4", + "version": "2.12.0-alpha.5", "description": "Core engine for Apollo GraphQL server", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-errors/package.json b/packages/apollo-server-errors/package.json index dc6b7567591..5638cda213a 100644 --- a/packages/apollo-server-errors/package.json +++ b/packages/apollo-server-errors/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-errors", - "version": "2.4.0", + "version": "2.4.1-alpha.0", "author": "opensource@apollographql.com", "license": "MIT", "repository": { diff --git a/packages/apollo-server-express/package.json b/packages/apollo-server-express/package.json index 17e1b4efbe9..78bb5aba3d2 100644 --- a/packages/apollo-server-express/package.json +++ b/packages/apollo-server-express/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-express", - "version": "2.12.0-alpha.4", + "version": "2.12.0-alpha.5", "description": "Production-ready Node.js GraphQL server for Express and Connect", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-fastify/package.json b/packages/apollo-server-fastify/package.json index 2fbdaceb51c..562db189e9a 100644 --- a/packages/apollo-server-fastify/package.json +++ b/packages/apollo-server-fastify/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-fastify", - "version": "2.12.0-alpha.4", + "version": "2.12.0-alpha.5", "description": "Production-ready Node.js GraphQL server for Fastify", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-hapi/package.json b/packages/apollo-server-hapi/package.json index 36604c95356..0abeb8c1a75 100644 --- a/packages/apollo-server-hapi/package.json +++ b/packages/apollo-server-hapi/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-hapi", - "version": "2.12.0-alpha.4", + "version": "2.12.0-alpha.5", "description": "Production-ready Node.js GraphQL server for Hapi", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-integration-testsuite/package.json b/packages/apollo-server-integration-testsuite/package.json index e32f979e134..86889250273 100644 --- a/packages/apollo-server-integration-testsuite/package.json +++ b/packages/apollo-server-integration-testsuite/package.json @@ -1,7 +1,7 @@ { "name": "apollo-server-integration-testsuite", "private": true, - "version": "2.12.0-alpha.4", + "version": "2.12.0-alpha.5", "description": "Apollo Server Integrations testsuite", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-koa/package.json b/packages/apollo-server-koa/package.json index 8576017fa1b..cd1088ec738 100644 --- a/packages/apollo-server-koa/package.json +++ b/packages/apollo-server-koa/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-koa", - "version": "2.12.0-alpha.4", + "version": "2.12.0-alpha.5", "description": "Production-ready Node.js GraphQL server for Koa", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-lambda/package.json b/packages/apollo-server-lambda/package.json index 1048dabb926..0c3c70ea112 100644 --- a/packages/apollo-server-lambda/package.json +++ b/packages/apollo-server-lambda/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-lambda", - "version": "2.12.0-alpha.4", + "version": "2.12.0-alpha.5", "description": "Production-ready Node.js GraphQL server for AWS Lambda", "keywords": [ "GraphQL", diff --git a/packages/apollo-server-micro/package.json b/packages/apollo-server-micro/package.json index 27994ba9d05..4e593042844 100644 --- a/packages/apollo-server-micro/package.json +++ b/packages/apollo-server-micro/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-micro", - "version": "2.12.0-alpha.4", + "version": "2.12.0-alpha.5", "description": "Production-ready Node.js GraphQL server for Micro", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-plugin-base/package.json b/packages/apollo-server-plugin-base/package.json index bcf15116904..b7bb85ce58a 100644 --- a/packages/apollo-server-plugin-base/package.json +++ b/packages/apollo-server-plugin-base/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-plugin-base", - "version": "0.7.1-alpha.4", + "version": "0.7.1-alpha.5", "description": "Apollo Server plugin base classes", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-plugin-response-cache/package.json b/packages/apollo-server-plugin-response-cache/package.json index 76e9051a1b6..258ccd4a7f6 100644 --- a/packages/apollo-server-plugin-response-cache/package.json +++ b/packages/apollo-server-plugin-response-cache/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-plugin-response-cache", - "version": "0.4.1-alpha.4", + "version": "0.4.1-alpha.5", "description": "Apollo Server full query response cache", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-testing/package.json b/packages/apollo-server-testing/package.json index 83488e60887..cdb23c90c3f 100644 --- a/packages/apollo-server-testing/package.json +++ b/packages/apollo-server-testing/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-testing", - "version": "2.12.0-alpha.4", + "version": "2.12.0-alpha.5", "description": "Test utils for apollo-server", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-types/package.json b/packages/apollo-server-types/package.json index eae3f638655..afc643e8c70 100644 --- a/packages/apollo-server-types/package.json +++ b/packages/apollo-server-types/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-types", - "version": "0.3.1-alpha.4", + "version": "0.3.1-alpha.5", "description": "Apollo Server shared types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server/package.json b/packages/apollo-server/package.json index 274d2e2e501..178d50f04b9 100644 --- a/packages/apollo-server/package.json +++ b/packages/apollo-server/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server", - "version": "2.12.0-alpha.4", + "version": "2.12.0-alpha.5", "description": "Production ready GraphQL Server", "author": "opensource@apollographql.com", "main": "dist/index.js", diff --git a/packages/apollo-tracing/package.json b/packages/apollo-tracing/package.json index 4cd40ade618..6cc3d176b54 100644 --- a/packages/apollo-tracing/package.json +++ b/packages/apollo-tracing/package.json @@ -1,6 +1,6 @@ { "name": "apollo-tracing", - "version": "0.9.1-alpha.4", + "version": "0.9.1-alpha.5", "description": "Collect and expose trace data for GraphQL requests", "main": "./dist/index.js", "types": "./dist/index.d.ts", diff --git a/packages/graphql-extensions/package.json b/packages/graphql-extensions/package.json index 926d0b04c5b..a0fcf48df1c 100644 --- a/packages/graphql-extensions/package.json +++ b/packages/graphql-extensions/package.json @@ -1,6 +1,6 @@ { "name": "graphql-extensions", - "version": "0.11.1-alpha.4", + "version": "0.11.1-alpha.5", "description": "Add extensions to GraphQL servers", "main": "./dist/index.js", "types": "./dist/index.d.ts", From 3f8cacbbfc2bb30fa468ee2dfb03405c2832e60a Mon Sep 17 00:00:00 2001 From: Stephen Barlow Date: Fri, 3 Apr 2020 13:12:31 -0700 Subject: [PATCH 347/642] Add clarification on subscription support --- docs/source/federation/introduction.mdx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/source/federation/introduction.mdx b/docs/source/federation/introduction.mdx index 9c908603781..38f538458fa 100644 --- a/docs/source/federation/introduction.mdx +++ b/docs/source/federation/introduction.mdx @@ -35,6 +35,8 @@ An Apollo Federation architecture consists of: Apollo Server provides libraries for acting both as an implementing service and as a gateway, but these components can be implemented in any language and framework. +> Apollo Federation does not currently support [GraphQL subscription operations](https://www.apollographql.com/docs/react/data/subscriptions/). + ## Core principles ### Incremental adoption From 67f9bce12301766dfeeecc396b0cc1ec103e777d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 4 Apr 2020 08:15:08 +0000 Subject: [PATCH 348/642] chore(deps): update dependency @types/aws-lambda to v8.10.47 (#3947) Co-authored-by: Renovate Bot --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7504c291864..227bbd7b4b4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3526,9 +3526,9 @@ } }, "@types/aws-lambda": { - "version": "8.10.46", - "resolved": "https://registry.npmjs.org/@types/aws-lambda/-/aws-lambda-8.10.46.tgz", - "integrity": "sha512-88E4Hlypo3AE40wslm7N4n09lCIJwgYJm5wsaA3/Vib1xqjC/ANePTaPRpPdj9NzBSpw7Tgon58qGMYEArx4oA==" + "version": "8.10.47", + "resolved": "https://registry.npmjs.org/@types/aws-lambda/-/aws-lambda-8.10.47.tgz", + "integrity": "sha512-FIZjS1alDbH7qFpJxghmyS2g7h+DJjBj6Qhf2F4Nkz4LR+alTSvThQEAR2j9yRt7qlxDDxK/EagXDCURRSxo8A==" }, "@types/babel__core": { "version": "7.1.0", diff --git a/package.json b/package.json index 78e46a38a70..ca9c3ee72fb 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ }, "devDependencies": { "@types/async-retry": "1.4.1", - "@types/aws-lambda": "8.10.46", + "@types/aws-lambda": "8.10.47", "@types/body-parser": "1.19.0", "@types/connect": "3.4.33", "@types/fast-json-stable-stringify": "2.0.0", From 51059d8242318ae60964717040425a62176e8036 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 4 Apr 2020 09:15:19 +0000 Subject: [PATCH 349/642] chore(deps): update dependency @types/express to v4.17.4 (#3948) Co-authored-by: Renovate Bot --- package-lock.json | 12 ++++++------ packages/apollo-server-express/package.json | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index 227bbd7b4b4..36a1235a703 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3960,8 +3960,7 @@ "@types/qs": { "version": "6.5.3", "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.5.3.tgz", - "integrity": "sha512-Jugo5V/1bS0fRhy2z8+cUAHEyWOATaz4rbyLVvcFs7+dXp5HfwpEwzF1Q11bB10ApUqHf+yTauxI0UXQDwGrbA==", - "dev": true + "integrity": "sha512-Jugo5V/1bS0fRhy2z8+cUAHEyWOATaz4rbyLVvcFs7+dXp5HfwpEwzF1Q11bB10ApUqHf+yTauxI0UXQDwGrbA==" }, "@types/qs-middleware": { "version": "1.0.1", @@ -4471,7 +4470,7 @@ "@types/accepts": "^1.3.5", "@types/body-parser": "1.19.0", "@types/cors": "^2.8.4", - "@types/express": "4.17.3", + "@types/express": "4.17.4", "accepts": "^1.3.5", "apollo-server-core": "file:packages/apollo-server-core", "apollo-server-types": "file:packages/apollo-server-types", @@ -4486,12 +4485,13 @@ }, "dependencies": { "@types/express": { - "version": "4.17.3", - "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.3.tgz", - "integrity": "sha512-I8cGRJj3pyOLs/HndoP+25vOqhqWkAZsWMEmq1qXy/b/M3ppufecUwaK2/TVDVxcV61/iSdhykUjQQ2DLSrTdg==", + "version": "4.17.4", + "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.4.tgz", + "integrity": "sha512-DO1L53rGqIDUEvOjJKmbMEQ5Z+BM2cIEPy/eV3En+s166Gz+FeuzRerxcab757u/U4v4XF4RYrZPmqKa+aY/2w==", "requires": { "@types/body-parser": "*", "@types/express-serve-static-core": "*", + "@types/qs": "*", "@types/serve-static": "*" } } diff --git a/packages/apollo-server-express/package.json b/packages/apollo-server-express/package.json index ed759059c79..2309e56bcce 100644 --- a/packages/apollo-server-express/package.json +++ b/packages/apollo-server-express/package.json @@ -30,7 +30,7 @@ "@types/accepts": "^1.3.5", "@types/body-parser": "1.19.0", "@types/cors": "^2.8.4", - "@types/express": "4.17.3", + "@types/express": "4.17.4", "accepts": "^1.3.5", "apollo-server-core": "file:../apollo-server-core", "apollo-server-types": "file:../apollo-server-types", From 650f298617399c4d8cd06c109a53948930815bba Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 4 Apr 2020 10:13:53 +0000 Subject: [PATCH 350/642] chore(deps): update dependency gatsby to v2.20.12 (#3949) Co-authored-by: Renovate Bot --- docs/package-lock.json | 1727 +++++++++++----------------------------- docs/package.json | 2 +- 2 files changed, 447 insertions(+), 1282 deletions(-) diff --git a/docs/package-lock.json b/docs/package-lock.json index 26d5c9df2b0..689ad71a417 100644 --- a/docs/package-lock.json +++ b/docs/package-lock.json @@ -1024,9 +1024,9 @@ } }, "@babel/plugin-proposal-optional-chaining": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.8.3.tgz", - "integrity": "sha512-QIoIR9abkVn+seDE3OjA08jWcs3eZ9+wJCKSRgo3WdEU2csFYgdScb+8qHB3+WXsGJD55u+5hWCISI7ejXS+kg==", + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.9.0.tgz", + "integrity": "sha512-NDn5tu3tcv4W30jNhmc2hyD5c56G6cXx4TesJubhxrJeCvuuMpttxr0OnNCqbZGhFjLrg+NIhxxC+BK5F6yS3w==", "requires": { "@babel/helper-plugin-utils": "^7.8.3", "@babel/plugin-syntax-optional-chaining": "^7.8.0" @@ -1758,28 +1758,10 @@ "semver": "^5.5.1" }, "dependencies": { - "@babel/helper-module-imports": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz", - "integrity": "sha512-R0Bx3jippsbAEtzkpZ/6FIiuzOURPcMjHp+Z6xPe6DtApDJx+w7UYyOLanZqO8+wKR9G10s/FmHXvxaMd9s6Kg==", - "requires": { - "@babel/types": "^7.8.3" - } - }, "@babel/helper-plugin-utils": { "version": "7.8.3", "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" - }, - "@babel/types": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.0.tgz", - "integrity": "sha512-BS9JKfXkzzJl8RluW4JGknzpiUV7ZrvTayM6yfqLTVBEnFtyowVIOu6rqxRd5cVO6yGoWf4T8u8dgK9oB+GCng==", - "requires": { - "@babel/helper-validator-identifier": "^7.9.0", - "lodash": "^4.17.13", - "to-fast-properties": "^2.0.0" - } } } }, @@ -2957,18 +2939,18 @@ "integrity": "sha512-ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw==" }, "@types/reach__router": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/@types/reach__router/-/reach__router-1.3.1.tgz", - "integrity": "sha512-E51ntVeunnxofXmOoPFiOvElHWf+jBEs3B56gGx7XhPHOkJdjWxWDY4V1AsUiwhtOCXPM7atFy30wj7glyv2Fg==", + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/@types/reach__router/-/reach__router-1.3.4.tgz", + "integrity": "sha512-DZgYfxUIlVSjvf0AvBbYNbpXLrTFNNpU1HrvCRbnMtx3nvGUUWC1/zlAe4dD4FCPFtc+LQuIPEsDiTb0zQkthg==", "requires": { "@types/history": "*", "@types/react": "*" } }, "@types/react": { - "version": "16.9.26", - "resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.26.tgz", - "integrity": "sha512-dGuSM+B0Pq1MKXYUMlUQWeS6Jj9IhSAUf9v8Ikaimj+YhkBcQrihWBkmyEhK/1fzkJTwZQkhZp5YhmWa2CH+Rw==", + "version": "16.9.32", + "resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.32.tgz", + "integrity": "sha512-fmejdp0CTH00mOJmxUPPbWCEBWPvRIL4m8r0qD+BSDUqmutPyGQCHifzMpMzdvZwROdEdL78IuZItntFWgPXHQ==", "requires": { "@types/prop-types": "*", "csstype": "^2.2.0" @@ -3031,42 +3013,42 @@ "optional": true }, "@typescript-eslint/eslint-plugin": { - "version": "2.25.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.25.0.tgz", - "integrity": "sha512-W2YyMtjmlrOjtXc+FtTelVs9OhuR6OlYc4XKIslJ8PUJOqgYYAPRJhAqkYRQo3G4sjvG8jSodsNycEn4W2gHUw==", + "version": "2.26.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.26.0.tgz", + "integrity": "sha512-4yUnLv40bzfzsXcTAtZyTjbiGUXMrcIJcIMioI22tSOyAxpdXiZ4r7YQUU8Jj6XXrLz9d5aMHPQf5JFR7h27Nw==", "requires": { - "@typescript-eslint/experimental-utils": "2.25.0", + "@typescript-eslint/experimental-utils": "2.26.0", "functional-red-black-tree": "^1.0.1", "regexpp": "^3.0.0", "tsutils": "^3.17.1" } }, "@typescript-eslint/experimental-utils": { - "version": "2.25.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.25.0.tgz", - "integrity": "sha512-0IZ4ZR5QkFYbaJk+8eJ2kYeA+1tzOE1sBjbwwtSV85oNWYUBep+EyhlZ7DLUCyhMUGuJpcCCFL0fDtYAP1zMZw==", + "version": "2.26.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.26.0.tgz", + "integrity": "sha512-RELVoH5EYd+JlGprEyojUv9HeKcZqF7nZUGSblyAw1FwOGNnmQIU8kxJ69fttQvEwCsX5D6ECJT8GTozxrDKVQ==", "requires": { "@types/json-schema": "^7.0.3", - "@typescript-eslint/typescript-estree": "2.25.0", + "@typescript-eslint/typescript-estree": "2.26.0", "eslint-scope": "^5.0.0", "eslint-utils": "^2.0.0" } }, "@typescript-eslint/parser": { - "version": "2.25.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.25.0.tgz", - "integrity": "sha512-mccBLaBSpNVgp191CP5W+8U1crTyXsRziWliCqzj02kpxdjKMvFHGJbK33NroquH3zB/gZ8H511HEsJBa2fNEg==", + "version": "2.26.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.26.0.tgz", + "integrity": "sha512-+Xj5fucDtdKEVGSh9353wcnseMRkPpEAOY96EEenN7kJVrLqy/EVwtIh3mxcUz8lsFXW1mT5nN5vvEam/a5HiQ==", "requires": { "@types/eslint-visitor-keys": "^1.0.0", - "@typescript-eslint/experimental-utils": "2.25.0", - "@typescript-eslint/typescript-estree": "2.25.0", + "@typescript-eslint/experimental-utils": "2.26.0", + "@typescript-eslint/typescript-estree": "2.26.0", "eslint-visitor-keys": "^1.1.0" } }, "@typescript-eslint/typescript-estree": { - "version": "2.25.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.25.0.tgz", - "integrity": "sha512-VUksmx5lDxSi6GfmwSK7SSoIKSw9anukWWNitQPqt58LuYrKalzsgeuignbqnB+rK/xxGlSsCy8lYnwFfB6YJg==", + "version": "2.26.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.26.0.tgz", + "integrity": "sha512-3x4SyZCLB4zsKsjuhxDLeVJN6W29VwBnYpCsZ7vIdPel9ZqLfIZJgJXO47MNUkurGpQuIBALdPQKtsSnWpE1Yg==", "requires": { "debug": "^4.1.1", "eslint-visitor-keys": "^1.1.0", @@ -3540,21 +3522,23 @@ } }, "string.prototype.trimleft": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz", - "integrity": "sha512-iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz", + "integrity": "sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw==", "requires": { "define-properties": "^1.1.3", - "function-bind": "^1.1.1" + "es-abstract": "^1.17.5", + "string.prototype.trimstart": "^1.0.0" } }, "string.prototype.trimright": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz", - "integrity": "sha512-qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz", + "integrity": "sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg==", "requires": { "define-properties": "^1.1.3", - "function-bind": "^1.1.1" + "es-abstract": "^1.17.5", + "string.prototype.trimend": "^1.0.0" } } } @@ -3638,21 +3622,23 @@ } }, "string.prototype.trimleft": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz", - "integrity": "sha512-iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz", + "integrity": "sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw==", "requires": { "define-properties": "^1.1.3", - "function-bind": "^1.1.1" + "es-abstract": "^1.17.5", + "string.prototype.trimstart": "^1.0.0" } }, "string.prototype.trimright": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz", - "integrity": "sha512-qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz", + "integrity": "sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg==", "requires": { "define-properties": "^1.1.3", - "function-bind": "^1.1.1" + "es-abstract": "^1.17.5", + "string.prototype.trimend": "^1.0.0" } } } @@ -3780,33 +3766,30 @@ }, "dependencies": { "browserslist": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.11.0.tgz", - "integrity": "sha512-WqEC7Yr5wUH5sg6ruR++v2SGOQYpyUdYYd4tZoAq1F7y+QXoLoYGXVbxhtaIqWmAJjtNTRjVD3HuJc1OXTel2A==", + "version": "4.11.1", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.11.1.tgz", + "integrity": "sha512-DCTr3kDrKEYNw6Jb9HFxVLQNaue8z+0ZfRBRjmCunKDEXEBajKDj2Y+Uelg+Pi29OnvaSGwjOsnRyNEkXzHg5g==", "requires": { - "caniuse-lite": "^1.0.30001035", - "electron-to-chromium": "^1.3.380", - "node-releases": "^1.1.52", - "pkg-up": "^3.1.0" + "caniuse-lite": "^1.0.30001038", + "electron-to-chromium": "^1.3.390", + "node-releases": "^1.1.53", + "pkg-up": "^2.0.0" } }, "caniuse-lite": { - "version": "1.0.30001038", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001038.tgz", - "integrity": "sha512-zii9quPo96XfOiRD4TrfYGs+QsGZpb2cGiMAzPjtf/hpFgB6zCPZgJb7I1+EATeMw/o+lG8FyRAnI+CWStHcaQ==" + "version": "1.0.30001039", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001039.tgz", + "integrity": "sha512-SezbWCTT34eyFoWHgx8UWso7YtvtM7oosmFoXbCkdC6qJzRfBTeTgE9REtKtiuKXuMwWTZEvdnFNGAyVMorv8Q==" }, "electron-to-chromium": { - "version": "1.3.389", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.389.tgz", - "integrity": "sha512-jccXIOH9PWpTiJCoMOsbDg23eg+P0cvcgjXo0spkbkB0AjCkfZLADp/apnuNEjCfXACS8PPWChTwiDOXjFZdzw==" + "version": "1.3.396", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.396.tgz", + "integrity": "sha512-ESY3UGekvNQwofHvgdsFW8GQEoudbqtJfoSDovnsCRRx8t0+0dPbE1XD/ZQdB+jbskSyPwUtIVYSyKwSXW/A6Q==" }, - "pkg-up": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz", - "integrity": "sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==", - "requires": { - "find-up": "^3.0.0" - } + "node-releases": { + "version": "1.1.53", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.53.tgz", + "integrity": "sha512-wp8zyQVwef2hpZ/dJH7SfSrIPD6YoJz6BDQDpGEkcA0s3LpAQoxBIYmfIq6QAhC1DhwsyCgTaTTcONwX8qzCuQ==" } } }, @@ -3926,9 +3909,9 @@ } }, "mkdirp": { - "version": "0.5.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.4.tgz", - "integrity": "sha512-iG9AK/dJLtJ0XNgTuDbSyNS3zECqDlAhnQW4CsNxBG3LQJBbHmRX1egw39DmtOdCAqY+dKXV+sgPgilNWUKMVw==", + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", + "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", "requires": { "minimist": "^1.2.5" }, @@ -4040,826 +4023,82 @@ "integrity": "sha512-SEP5kJpfGYqYKpBrj5XU3ahw5p5GOHJ0U5ssOSQ/WBVdwkD2Dzlce95exQTs3jOVWPPKLBN2rlEWkCK7dSmLvg==", "requires": { "@babel/runtime": "^7.7.2", - "cosmiconfig": "^6.0.0", - "resolve": "^1.12.0" - }, - "dependencies": { - "cosmiconfig": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz", - "integrity": "sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==", - "requires": { - "@types/parse-json": "^4.0.0", - "import-fresh": "^3.1.0", - "parse-json": "^5.0.0", - "path-type": "^4.0.0", - "yaml": "^1.7.2" - } - }, - "import-fresh": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz", - "integrity": "sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==", - "requires": { - "parent-module": "^1.0.0", - "resolve-from": "^4.0.0" - } - }, - "resolve-from": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==" - } - } - }, - "babel-plugin-preval": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/babel-plugin-preval/-/babel-plugin-preval-3.0.1.tgz", - "integrity": "sha512-s8hmTlRSmzcL7cHSIi0s6WxmpOAxfIlWqSVQwBIt7V5bNBaac+8JMZ6kJXLOazMJ8gCIcb5AJgQUgPHvbSYUzw==", - "requires": { - "babel-plugin-macros": "^2.2.2", - "require-from-string": "^2.0.2" - } - }, - "babel-plugin-remove-graphql-queries": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/babel-plugin-remove-graphql-queries/-/babel-plugin-remove-graphql-queries-2.8.1.tgz", - "integrity": "sha512-c/JNri17WypqZNnMsX2PweMe8e5hsJcYNO/VnUBX9iUIvmKBjd143RaUQq0xYa6bpQF0kzpTFVR0sOp+cQlBOQ==" - }, - "babel-plugin-syntax-jsx": { - "version": "6.18.0", - "resolved": "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz", - "integrity": "sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY=" - }, - "babel-plugin-transform-react-remove-prop-types": { - "version": "0.4.24", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.24.tgz", - "integrity": "sha512-eqj0hVcJUR57/Ug2zE1Yswsw4LhuqqHhD+8v120T1cl3kjg76QwtyBrdIk4WVwK+lAhBJVYCd/v+4nc4y+8JsA==" - }, - "babel-preset-gatsby": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/babel-preset-gatsby/-/babel-preset-gatsby-0.3.1.tgz", - "integrity": "sha512-oT/GA1b3xi9xssdwWep874zxD8RZSBg2iL7QHy+emcgkJbYBQJC4NItw561tZGIQqVBJJx8sRaw3V94d1vupOQ==", - "requires": { - "@babel/plugin-proposal-class-properties": "^7.8.3", - "@babel/plugin-proposal-nullish-coalescing-operator": "^7.8.3", - "@babel/plugin-proposal-optional-chaining": "^7.8.3", - "@babel/plugin-syntax-dynamic-import": "^7.8.3", - "@babel/plugin-transform-runtime": "^7.8.3", - "@babel/plugin-transform-spread": "^7.8.3", - "@babel/preset-env": "^7.8.7", - "@babel/preset-react": "^7.8.3", - "@babel/runtime": "^7.8.7", - "babel-plugin-dynamic-import-node": "^2.3.0", - "babel-plugin-macros": "^2.8.0", - "babel-plugin-transform-react-remove-prop-types": "^0.4.24", - "gatsby-core-utils": "^1.1.1" - }, - "dependencies": { - "@babel/code-frame": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", - "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", - "requires": { - "@babel/highlight": "^7.8.3" - } - }, - "@babel/compat-data": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.9.0.tgz", - "integrity": "sha512-zeFQrr+284Ekvd9e7KAX954LkapWiOmQtsfHirhxqfdlX6MEC32iRE+pqUGlYIBchdevaCwvzxWGSy/YBNI85g==", - "requires": { - "browserslist": "^4.9.1", - "invariant": "^2.2.4", - "semver": "^5.5.0" - } - }, - "@babel/generator": { - "version": "7.9.4", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.4.tgz", - "integrity": "sha512-rjP8ahaDy/ouhrvCoU1E5mqaitWrxwuNGU+dy1EpaoK48jZay4MdkskKGIMHLZNewg8sAsqpGSREJwP0zH3YQA==", - "requires": { - "@babel/types": "^7.9.0", - "jsesc": "^2.5.1", - "lodash": "^4.17.13", - "source-map": "^0.5.0" - }, - "dependencies": { - "jsesc": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", - "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==" - } - } - }, - "@babel/helper-annotate-as-pure": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.8.3.tgz", - "integrity": "sha512-6o+mJrZBxOoEX77Ezv9zwW7WV8DdluouRKNY/IR5u/YTMuKHgugHOzYWlYvYLpLA9nPsQCAAASpCIbjI9Mv+Uw==", - "requires": { - "@babel/types": "^7.8.3" - } - }, - "@babel/helper-builder-binary-assignment-operator-visitor": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.8.3.tgz", - "integrity": "sha512-5eFOm2SyFPK4Rh3XMMRDjN7lBH0orh3ss0g3rTYZnBQ+r6YPj7lgDyCvPphynHvUrobJmeMignBr6Acw9mAPlw==", - "requires": { - "@babel/helper-explode-assignable-expression": "^7.8.3", - "@babel/types": "^7.8.3" - } - }, - "@babel/helper-builder-react-jsx": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.9.0.tgz", - "integrity": "sha512-weiIo4gaoGgnhff54GQ3P5wsUQmnSwpkvU0r6ZHq6TzoSzKy4JxHEgnxNytaKbov2a9z/CVNyzliuCOUPEX3Jw==", - "requires": { - "@babel/helper-annotate-as-pure": "^7.8.3", - "@babel/types": "^7.9.0" - } - }, - "@babel/helper-create-regexp-features-plugin": { - "version": "7.8.8", - "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.8.tgz", - "integrity": "sha512-LYVPdwkrQEiX9+1R29Ld/wTrmQu1SSKYnuOk3g0CkcZMA1p0gsNxJFj/3gBdaJ7Cg0Fnek5z0DsMULePP7Lrqg==", - "requires": { - "@babel/helper-annotate-as-pure": "^7.8.3", - "@babel/helper-regex": "^7.8.3", - "regexpu-core": "^4.7.0" - } - }, - "@babel/helper-define-map": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.8.3.tgz", - "integrity": "sha512-PoeBYtxoZGtct3md6xZOCWPcKuMuk3IHhgxsRRNtnNShebf4C8YonTSblsK4tvDbm+eJAw2HAPOfCr+Q/YRG/g==", - "requires": { - "@babel/helper-function-name": "^7.8.3", - "@babel/types": "^7.8.3", - "lodash": "^4.17.13" - } - }, - "@babel/helper-explode-assignable-expression": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.8.3.tgz", - "integrity": "sha512-N+8eW86/Kj147bO9G2uclsg5pwfs/fqqY5rwgIL7eTBklgXjcOJ3btzS5iM6AitJcftnY7pm2lGsrJVYLGjzIw==", - "requires": { - "@babel/traverse": "^7.8.3", - "@babel/types": "^7.8.3" - } - }, - "@babel/helper-hoist-variables": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.8.3.tgz", - "integrity": "sha512-ky1JLOjcDUtSc+xkt0xhYff7Z6ILTAHKmZLHPxAhOP0Nd77O+3nCsd6uSVYur6nJnCI029CrNbYlc0LoPfAPQg==", - "requires": { - "@babel/types": "^7.8.3" - } - }, - "@babel/helper-member-expression-to-functions": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.8.3.tgz", - "integrity": "sha512-fO4Egq88utkQFjbPrSHGmGLFqmrshs11d46WI+WZDESt7Wu7wN2G2Iu+NMMZJFDOVRHAMIkB5SNh30NtwCA7RA==", - "requires": { - "@babel/types": "^7.8.3" - } - }, - "@babel/helper-module-imports": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz", - "integrity": "sha512-R0Bx3jippsbAEtzkpZ/6FIiuzOURPcMjHp+Z6xPe6DtApDJx+w7UYyOLanZqO8+wKR9G10s/FmHXvxaMd9s6Kg==", - "requires": { - "@babel/types": "^7.8.3" - } - }, - "@babel/helper-module-transforms": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz", - "integrity": "sha512-0FvKyu0gpPfIQ8EkxlrAydOWROdHpBmiCiRwLkUiBGhCUPRRbVD2/tm3sFr/c/GWFrQ/ffutGUAnx7V0FzT2wA==", - "requires": { - "@babel/helper-module-imports": "^7.8.3", - "@babel/helper-replace-supers": "^7.8.6", - "@babel/helper-simple-access": "^7.8.3", - "@babel/helper-split-export-declaration": "^7.8.3", - "@babel/template": "^7.8.6", - "@babel/types": "^7.9.0", - "lodash": "^4.17.13" - }, - "dependencies": { - "@babel/template": { - "version": "7.8.6", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz", - "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==", - "requires": { - "@babel/code-frame": "^7.8.3", - "@babel/parser": "^7.8.6", - "@babel/types": "^7.8.6" - } - } - } - }, - "@babel/helper-optimise-call-expression": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.8.3.tgz", - "integrity": "sha512-Kag20n86cbO2AvHca6EJsvqAd82gc6VMGule4HwebwMlwkpXuVqrNRj6CkCV2sKxgi9MyAUnZVnZ6lJ1/vKhHQ==", - "requires": { - "@babel/types": "^7.8.3" - } - }, - "@babel/helper-plugin-utils": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", - "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" - }, - "@babel/helper-regex": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.8.3.tgz", - "integrity": "sha512-BWt0QtYv/cg/NecOAZMdcn/waj/5P26DR4mVLXfFtDokSR6fyuG0Pj+e2FqtSME+MqED1khnSMulkmGl8qWiUQ==", - "requires": { - "lodash": "^4.17.13" - } - }, - "@babel/helper-remap-async-to-generator": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.8.3.tgz", - "integrity": "sha512-kgwDmw4fCg7AVgS4DukQR/roGp+jP+XluJE5hsRZwxCYGg+Rv9wSGErDWhlI90FODdYfd4xG4AQRiMDjjN0GzA==", - "requires": { - "@babel/helper-annotate-as-pure": "^7.8.3", - "@babel/helper-wrap-function": "^7.8.3", - "@babel/template": "^7.8.3", - "@babel/traverse": "^7.8.3", - "@babel/types": "^7.8.3" - } - }, - "@babel/helper-replace-supers": { - "version": "7.8.6", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.8.6.tgz", - "integrity": "sha512-PeMArdA4Sv/Wf4zXwBKPqVj7n9UF/xg6slNRtZW84FM7JpE1CbG8B612FyM4cxrf4fMAMGO0kR7voy1ForHHFA==", - "requires": { - "@babel/helper-member-expression-to-functions": "^7.8.3", - "@babel/helper-optimise-call-expression": "^7.8.3", - "@babel/traverse": "^7.8.6", - "@babel/types": "^7.8.6" - }, - "dependencies": { - "@babel/traverse": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.0.tgz", - "integrity": "sha512-jAZQj0+kn4WTHO5dUZkZKhbFrqZE7K5LAQ5JysMnmvGij+wOdr+8lWqPeW0BcF4wFwrEXXtdGO7wcV6YPJcf3w==", - "requires": { - "@babel/code-frame": "^7.8.3", - "@babel/generator": "^7.9.0", - "@babel/helper-function-name": "^7.8.3", - "@babel/helper-split-export-declaration": "^7.8.3", - "@babel/parser": "^7.9.0", - "@babel/types": "^7.9.0", - "debug": "^4.1.0", - "globals": "^11.1.0", - "lodash": "^4.17.13" - } - } - } - }, - "@babel/helper-simple-access": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.8.3.tgz", - "integrity": "sha512-VNGUDjx5cCWg4vvCTR8qQ7YJYZ+HBjxOgXEl7ounz+4Sn7+LMD3CFrCTEU6/qXKbA2nKg21CwhhBzO0RpRbdCw==", - "requires": { - "@babel/template": "^7.8.3", - "@babel/types": "^7.8.3" - } - }, - "@babel/helper-wrap-function": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.8.3.tgz", - "integrity": "sha512-LACJrbUET9cQDzb6kG7EeD7+7doC3JNvUgTEQOx2qaO1fKlzE/Bf05qs9w1oXQMmXlPO65lC3Tq9S6gZpTErEQ==", - "requires": { - "@babel/helper-function-name": "^7.8.3", - "@babel/template": "^7.8.3", - "@babel/traverse": "^7.8.3", - "@babel/types": "^7.8.3" - } - }, - "@babel/highlight": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz", - "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==", - "requires": { - "@babel/helper-validator-identifier": "^7.9.0", - "chalk": "^2.0.0", - "js-tokens": "^4.0.0" - } - }, - "@babel/parser": { - "version": "7.9.4", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz", - "integrity": "sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==" - }, - "@babel/plugin-proposal-async-generator-functions": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.8.3.tgz", - "integrity": "sha512-NZ9zLv848JsV3hs8ryEh7Uaz/0KsmPLqv0+PdkDJL1cJy0K4kOCFa8zc1E3mp+RHPQcpdfb/6GovEsW4VDrOMw==", - "requires": { - "@babel/helper-plugin-utils": "^7.8.3", - "@babel/helper-remap-async-to-generator": "^7.8.3", - "@babel/plugin-syntax-async-generators": "^7.8.0" - } - }, - "@babel/plugin-proposal-dynamic-import": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.8.3.tgz", - "integrity": "sha512-NyaBbyLFXFLT9FP+zk0kYlUlA8XtCUbehs67F0nnEg7KICgMc2mNkIeu9TYhKzyXMkrapZFwAhXLdnt4IYHy1w==", - "requires": { - "@babel/helper-plugin-utils": "^7.8.3", - "@babel/plugin-syntax-dynamic-import": "^7.8.0" - } - }, - "@babel/plugin-proposal-json-strings": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.8.3.tgz", - "integrity": "sha512-KGhQNZ3TVCQG/MjRbAUwuH+14y9q0tpxs1nWWs3pbSleRdDro9SAMMDyye8HhY1gqZ7/NqIc8SKhya0wRDgP1Q==", - "requires": { - "@babel/helper-plugin-utils": "^7.8.3", - "@babel/plugin-syntax-json-strings": "^7.8.0" - } - }, - "@babel/plugin-proposal-object-rest-spread": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.0.tgz", - "integrity": "sha512-UgqBv6bjq4fDb8uku9f+wcm1J7YxJ5nT7WO/jBr0cl0PLKb7t1O6RNR1kZbjgx2LQtsDI9hwoQVmn0yhXeQyow==", - "requires": { - "@babel/helper-plugin-utils": "^7.8.3", - "@babel/plugin-syntax-object-rest-spread": "^7.8.0" - } - }, - "@babel/plugin-proposal-optional-catch-binding": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.8.3.tgz", - "integrity": "sha512-0gkX7J7E+AtAw9fcwlVQj8peP61qhdg/89D5swOkjYbkboA2CVckn3kiyum1DE0wskGb7KJJxBdyEBApDLLVdw==", - "requires": { - "@babel/helper-plugin-utils": "^7.8.3", - "@babel/plugin-syntax-optional-catch-binding": "^7.8.0" - } - }, - "@babel/plugin-proposal-unicode-property-regex": { - "version": "7.8.8", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.8.tgz", - "integrity": "sha512-EVhjVsMpbhLw9ZfHWSx2iy13Q8Z/eg8e8ccVWt23sWQK5l1UdkoLJPN5w69UA4uITGBnEZD2JOe4QOHycYKv8A==", - "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.8.8", - "@babel/helper-plugin-utils": "^7.8.3" - } - }, - "@babel/plugin-syntax-async-generators": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz", - "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==", - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-dynamic-import": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz", - "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==", - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-json-strings": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz", - "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==", - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-object-rest-spread": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz", - "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==", - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-optional-catch-binding": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz", - "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==", - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-top-level-await": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.8.3.tgz", - "integrity": "sha512-kwj1j9lL/6Wd0hROD3b/OZZ7MSrZLqqn9RAZ5+cYYsflQ9HZBIKCUkr3+uL1MEJ1NePiUbf98jjiMQSv0NMR9g==", - "requires": { - "@babel/helper-plugin-utils": "^7.8.3" - } - }, - "@babel/plugin-transform-arrow-functions": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.8.3.tgz", - "integrity": "sha512-0MRF+KC8EqH4dbuITCWwPSzsyO3HIWWlm30v8BbbpOrS1B++isGxPnnuq/IZvOX5J2D/p7DQalQm+/2PnlKGxg==", - "requires": { - "@babel/helper-plugin-utils": "^7.8.3" - } - }, - "@babel/plugin-transform-async-to-generator": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.8.3.tgz", - "integrity": "sha512-imt9tFLD9ogt56Dd5CI/6XgpukMwd/fLGSrix2httihVe7LOGVPhyhMh1BU5kDM7iHD08i8uUtmV2sWaBFlHVQ==", - "requires": { - "@babel/helper-module-imports": "^7.8.3", - "@babel/helper-plugin-utils": "^7.8.3", - "@babel/helper-remap-async-to-generator": "^7.8.3" - } - }, - "@babel/plugin-transform-block-scoped-functions": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.8.3.tgz", - "integrity": "sha512-vo4F2OewqjbB1+yaJ7k2EJFHlTP3jR634Z9Cj9itpqNjuLXvhlVxgnjsHsdRgASR8xYDrx6onw4vW5H6We0Jmg==", - "requires": { - "@babel/helper-plugin-utils": "^7.8.3" - } - }, - "@babel/plugin-transform-block-scoping": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.8.3.tgz", - "integrity": "sha512-pGnYfm7RNRgYRi7bids5bHluENHqJhrV4bCZRwc5GamaWIIs07N4rZECcmJL6ZClwjDz1GbdMZFtPs27hTB06w==", - "requires": { - "@babel/helper-plugin-utils": "^7.8.3", - "lodash": "^4.17.13" - } - }, - "@babel/plugin-transform-classes": { - "version": "7.9.2", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.9.2.tgz", - "integrity": "sha512-TC2p3bPzsfvSsqBZo0kJnuelnoK9O3welkUpqSqBQuBF6R5MN2rysopri8kNvtlGIb2jmUO7i15IooAZJjZuMQ==", - "requires": { - "@babel/helper-annotate-as-pure": "^7.8.3", - "@babel/helper-define-map": "^7.8.3", - "@babel/helper-function-name": "^7.8.3", - "@babel/helper-optimise-call-expression": "^7.8.3", - "@babel/helper-plugin-utils": "^7.8.3", - "@babel/helper-replace-supers": "^7.8.6", - "@babel/helper-split-export-declaration": "^7.8.3", - "globals": "^11.1.0" - } - }, - "@babel/plugin-transform-computed-properties": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.8.3.tgz", - "integrity": "sha512-O5hiIpSyOGdrQZRQ2ccwtTVkgUDBBiCuK//4RJ6UfePllUTCENOzKxfh6ulckXKc0DixTFLCfb2HVkNA7aDpzA==", - "requires": { - "@babel/helper-plugin-utils": "^7.8.3" - } - }, - "@babel/plugin-transform-destructuring": { - "version": "7.8.8", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.8.8.tgz", - "integrity": "sha512-eRJu4Vs2rmttFCdhPUM3bV0Yo/xPSdPw6ML9KHs/bjB4bLA5HXlbvYXPOD5yASodGod+krjYx21xm1QmL8dCJQ==", - "requires": { - "@babel/helper-plugin-utils": "^7.8.3" - } - }, - "@babel/plugin-transform-dotall-regex": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.8.3.tgz", - "integrity": "sha512-kLs1j9Nn4MQoBYdRXH6AeaXMbEJFaFu/v1nQkvib6QzTj8MZI5OQzqmD83/2jEM1z0DLilra5aWO5YpyC0ALIw==", - "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.8.3", - "@babel/helper-plugin-utils": "^7.8.3" - } - }, - "@babel/plugin-transform-duplicate-keys": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.8.3.tgz", - "integrity": "sha512-s8dHiBUbcbSgipS4SMFuWGqCvyge5V2ZeAWzR6INTVC3Ltjig/Vw1G2Gztv0vU/hRG9X8IvKvYdoksnUfgXOEQ==", - "requires": { - "@babel/helper-plugin-utils": "^7.8.3" - } - }, - "@babel/plugin-transform-exponentiation-operator": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.8.3.tgz", - "integrity": "sha512-zwIpuIymb3ACcInbksHaNcR12S++0MDLKkiqXHl3AzpgdKlFNhog+z/K0+TGW+b0w5pgTq4H6IwV/WhxbGYSjQ==", - "requires": { - "@babel/helper-builder-binary-assignment-operator-visitor": "^7.8.3", - "@babel/helper-plugin-utils": "^7.8.3" - } - }, - "@babel/plugin-transform-for-of": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.9.0.tgz", - "integrity": "sha512-lTAnWOpMwOXpyDx06N+ywmF3jNbafZEqZ96CGYabxHrxNX8l5ny7dt4bK/rGwAh9utyP2b2Hv7PlZh1AAS54FQ==", - "requires": { - "@babel/helper-plugin-utils": "^7.8.3" - } - }, - "@babel/plugin-transform-function-name": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.8.3.tgz", - "integrity": "sha512-rO/OnDS78Eifbjn5Py9v8y0aR+aSYhDhqAwVfsTl0ERuMZyr05L1aFSCJnbv2mmsLkit/4ReeQ9N2BgLnOcPCQ==", - "requires": { - "@babel/helper-function-name": "^7.8.3", - "@babel/helper-plugin-utils": "^7.8.3" - } - }, - "@babel/plugin-transform-literals": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.8.3.tgz", - "integrity": "sha512-3Tqf8JJ/qB7TeldGl+TT55+uQei9JfYaregDcEAyBZ7akutriFrt6C/wLYIer6OYhleVQvH/ntEhjE/xMmy10A==", - "requires": { - "@babel/helper-plugin-utils": "^7.8.3" - } - }, - "@babel/plugin-transform-member-expression-literals": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.8.3.tgz", - "integrity": "sha512-3Wk2EXhnw+rP+IDkK6BdtPKsUE5IeZ6QOGrPYvw52NwBStw9V1ZVzxgK6fSKSxqUvH9eQPR3tm3cOq79HlsKYA==", - "requires": { - "@babel/helper-plugin-utils": "^7.8.3" - } - }, - "@babel/plugin-transform-modules-amd": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.9.0.tgz", - "integrity": "sha512-vZgDDF003B14O8zJy0XXLnPH4sg+9X5hFBBGN1V+B2rgrB+J2xIypSN6Rk9imB2hSTHQi5OHLrFWsZab1GMk+Q==", - "requires": { - "@babel/helper-module-transforms": "^7.9.0", - "@babel/helper-plugin-utils": "^7.8.3", - "babel-plugin-dynamic-import-node": "^2.3.0" - } - }, - "@babel/plugin-transform-modules-commonjs": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.0.tgz", - "integrity": "sha512-qzlCrLnKqio4SlgJ6FMMLBe4bySNis8DFn1VkGmOcxG9gqEyPIOzeQrA//u0HAKrWpJlpZbZMPB1n/OPa4+n8g==", - "requires": { - "@babel/helper-module-transforms": "^7.9.0", - "@babel/helper-plugin-utils": "^7.8.3", - "@babel/helper-simple-access": "^7.8.3", - "babel-plugin-dynamic-import-node": "^2.3.0" - } - }, - "@babel/plugin-transform-modules-systemjs": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.9.0.tgz", - "integrity": "sha512-FsiAv/nao/ud2ZWy4wFacoLOm5uxl0ExSQ7ErvP7jpoihLR6Cq90ilOFyX9UXct3rbtKsAiZ9kFt5XGfPe/5SQ==", - "requires": { - "@babel/helper-hoist-variables": "^7.8.3", - "@babel/helper-module-transforms": "^7.9.0", - "@babel/helper-plugin-utils": "^7.8.3", - "babel-plugin-dynamic-import-node": "^2.3.0" - } - }, - "@babel/plugin-transform-modules-umd": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.9.0.tgz", - "integrity": "sha512-uTWkXkIVtg/JGRSIABdBoMsoIeoHQHPTL0Y2E7xf5Oj7sLqwVsNXOkNk0VJc7vF0IMBsPeikHxFjGe+qmwPtTQ==", - "requires": { - "@babel/helper-module-transforms": "^7.9.0", - "@babel/helper-plugin-utils": "^7.8.3" - } - }, - "@babel/plugin-transform-named-capturing-groups-regex": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.8.3.tgz", - "integrity": "sha512-f+tF/8UVPU86TrCb06JoPWIdDpTNSGGcAtaD9mLP0aYGA0OS0j7j7DHJR0GTFrUZPUU6loZhbsVZgTh0N+Qdnw==", - "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.8.3" - } - }, - "@babel/plugin-transform-new-target": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.8.3.tgz", - "integrity": "sha512-QuSGysibQpyxexRyui2vca+Cmbljo8bcRckgzYV4kRIsHpVeyeC3JDO63pY+xFZ6bWOBn7pfKZTqV4o/ix9sFw==", - "requires": { - "@babel/helper-plugin-utils": "^7.8.3" - } - }, - "@babel/plugin-transform-object-super": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.8.3.tgz", - "integrity": "sha512-57FXk+gItG/GejofIyLIgBKTas4+pEU47IXKDBWFTxdPd7F80H8zybyAY7UoblVfBhBGs2EKM+bJUu2+iUYPDQ==", - "requires": { - "@babel/helper-plugin-utils": "^7.8.3", - "@babel/helper-replace-supers": "^7.8.3" - } - }, - "@babel/plugin-transform-parameters": { - "version": "7.9.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.9.3.tgz", - "integrity": "sha512-fzrQFQhp7mIhOzmOtPiKffvCYQSK10NR8t6BBz2yPbeUHb9OLW8RZGtgDRBn8z2hGcwvKDL3vC7ojPTLNxmqEg==", - "requires": { - "@babel/helper-get-function-arity": "^7.8.3", - "@babel/helper-plugin-utils": "^7.8.3" - } - }, - "@babel/plugin-transform-property-literals": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.8.3.tgz", - "integrity": "sha512-uGiiXAZMqEoQhRWMK17VospMZh5sXWg+dlh2soffpkAl96KAm+WZuJfa6lcELotSRmooLqg0MWdH6UUq85nmmg==", - "requires": { - "@babel/helper-plugin-utils": "^7.8.3" - } - }, - "@babel/plugin-transform-react-display-name": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.8.3.tgz", - "integrity": "sha512-3Jy/PCw8Fe6uBKtEgz3M82ljt+lTg+xJaM4og+eyu83qLT87ZUSckn0wy7r31jflURWLO83TW6Ylf7lyXj3m5A==", - "requires": { - "@babel/helper-plugin-utils": "^7.8.3" - } - }, - "@babel/plugin-transform-react-jsx": { - "version": "7.9.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.9.4.tgz", - "integrity": "sha512-Mjqf3pZBNLt854CK0C/kRuXAnE6H/bo7xYojP+WGtX8glDGSibcwnsWwhwoSuRg0+EBnxPC1ouVnuetUIlPSAw==", - "requires": { - "@babel/helper-builder-react-jsx": "^7.9.0", - "@babel/helper-builder-react-jsx-experimental": "^7.9.0", - "@babel/helper-plugin-utils": "^7.8.3", - "@babel/plugin-syntax-jsx": "^7.8.3" - } - }, - "@babel/plugin-transform-react-jsx-self": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.9.0.tgz", - "integrity": "sha512-K2ObbWPKT7KUTAoyjCsFilOkEgMvFG+y0FqOl6Lezd0/13kMkkjHskVsZvblRPj1PHA44PrToaZANrryppzTvQ==", - "requires": { - "@babel/helper-plugin-utils": "^7.8.3", - "@babel/plugin-syntax-jsx": "^7.8.3" - } - }, - "@babel/plugin-transform-react-jsx-source": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.9.0.tgz", - "integrity": "sha512-K6m3LlSnTSfRkM6FcRk8saNEeaeyG5k7AVkBU2bZK3+1zdkSED3qNdsWrUgQBeTVD2Tp3VMmerxVO2yM5iITmw==", - "requires": { - "@babel/helper-plugin-utils": "^7.8.3", - "@babel/plugin-syntax-jsx": "^7.8.3" - } - }, - "@babel/plugin-transform-regenerator": { - "version": "7.8.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.7.tgz", - "integrity": "sha512-TIg+gAl4Z0a3WmD3mbYSk+J9ZUH6n/Yc57rtKRnlA/7rcCvpekHXe0CMZHP1gYp7/KLe9GHTuIba0vXmls6drA==", - "requires": { - "regenerator-transform": "^0.14.2" - } - }, - "@babel/plugin-transform-reserved-words": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.8.3.tgz", - "integrity": "sha512-mwMxcycN3omKFDjDQUl+8zyMsBfjRFr0Zn/64I41pmjv4NJuqcYlEtezwYtw9TFd9WR1vN5kiM+O0gMZzO6L0A==", - "requires": { - "@babel/helper-plugin-utils": "^7.8.3" - } - }, - "@babel/plugin-transform-shorthand-properties": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.8.3.tgz", - "integrity": "sha512-I9DI6Odg0JJwxCHzbzW08ggMdCezoWcuQRz3ptdudgwaHxTjxw5HgdFJmZIkIMlRymL6YiZcped4TTCB0JcC8w==", - "requires": { - "@babel/helper-plugin-utils": "^7.8.3" - } - }, - "@babel/plugin-transform-spread": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.8.3.tgz", - "integrity": "sha512-CkuTU9mbmAoFOI1tklFWYYbzX5qCIZVXPVy0jpXgGwkplCndQAa58s2jr66fTeQnA64bDox0HL4U56CFYoyC7g==", - "requires": { - "@babel/helper-plugin-utils": "^7.8.3" - } - }, - "@babel/plugin-transform-sticky-regex": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.8.3.tgz", - "integrity": "sha512-9Spq0vGCD5Bb4Z/ZXXSK5wbbLFMG085qd2vhL1JYu1WcQ5bXqZBAYRzU1d+p79GcHs2szYv5pVQCX13QgldaWw==", - "requires": { - "@babel/helper-plugin-utils": "^7.8.3", - "@babel/helper-regex": "^7.8.3" - } - }, - "@babel/plugin-transform-template-literals": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.8.3.tgz", - "integrity": "sha512-820QBtykIQOLFT8NZOcTRJ1UNuztIELe4p9DCgvj4NK+PwluSJ49we7s9FB1HIGNIYT7wFUJ0ar2QpCDj0escQ==", - "requires": { - "@babel/helper-annotate-as-pure": "^7.8.3", - "@babel/helper-plugin-utils": "^7.8.3" - } - }, - "@babel/plugin-transform-typeof-symbol": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.8.4.tgz", - "integrity": "sha512-2QKyfjGdvuNfHsb7qnBBlKclbD4CfshH2KvDabiijLMGXPHJXGxtDzwIF7bQP+T0ysw8fYTtxPafgfs/c1Lrqg==", - "requires": { - "@babel/helper-plugin-utils": "^7.8.3" - } - }, - "@babel/plugin-transform-unicode-regex": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.8.3.tgz", - "integrity": "sha512-+ufgJjYdmWfSQ+6NS9VGUR2ns8cjJjYbrbi11mZBTaWm+Fui/ncTLFF28Ei1okavY+xkojGr1eJxNsWYeA5aZw==", - "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.8.3", - "@babel/helper-plugin-utils": "^7.8.3" - } - }, - "@babel/preset-env": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.9.0.tgz", - "integrity": "sha512-712DeRXT6dyKAM/FMbQTV/FvRCms2hPCx+3weRjZ8iQVQWZejWWk1wwG6ViWMyqb/ouBbGOl5b6aCk0+j1NmsQ==", + "cosmiconfig": "^6.0.0", + "resolve": "^1.12.0" + }, + "dependencies": { + "cosmiconfig": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz", + "integrity": "sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==", "requires": { - "@babel/compat-data": "^7.9.0", - "@babel/helper-compilation-targets": "^7.8.7", - "@babel/helper-module-imports": "^7.8.3", - "@babel/helper-plugin-utils": "^7.8.3", - "@babel/plugin-proposal-async-generator-functions": "^7.8.3", - "@babel/plugin-proposal-dynamic-import": "^7.8.3", - "@babel/plugin-proposal-json-strings": "^7.8.3", - "@babel/plugin-proposal-nullish-coalescing-operator": "^7.8.3", - "@babel/plugin-proposal-numeric-separator": "^7.8.3", - "@babel/plugin-proposal-object-rest-spread": "^7.9.0", - "@babel/plugin-proposal-optional-catch-binding": "^7.8.3", - "@babel/plugin-proposal-optional-chaining": "^7.9.0", - "@babel/plugin-proposal-unicode-property-regex": "^7.8.3", - "@babel/plugin-syntax-async-generators": "^7.8.0", - "@babel/plugin-syntax-dynamic-import": "^7.8.0", - "@babel/plugin-syntax-json-strings": "^7.8.0", - "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0", - "@babel/plugin-syntax-numeric-separator": "^7.8.0", - "@babel/plugin-syntax-object-rest-spread": "^7.8.0", - "@babel/plugin-syntax-optional-catch-binding": "^7.8.0", - "@babel/plugin-syntax-optional-chaining": "^7.8.0", - "@babel/plugin-syntax-top-level-await": "^7.8.3", - "@babel/plugin-transform-arrow-functions": "^7.8.3", - "@babel/plugin-transform-async-to-generator": "^7.8.3", - "@babel/plugin-transform-block-scoped-functions": "^7.8.3", - "@babel/plugin-transform-block-scoping": "^7.8.3", - "@babel/plugin-transform-classes": "^7.9.0", - "@babel/plugin-transform-computed-properties": "^7.8.3", - "@babel/plugin-transform-destructuring": "^7.8.3", - "@babel/plugin-transform-dotall-regex": "^7.8.3", - "@babel/plugin-transform-duplicate-keys": "^7.8.3", - "@babel/plugin-transform-exponentiation-operator": "^7.8.3", - "@babel/plugin-transform-for-of": "^7.9.0", - "@babel/plugin-transform-function-name": "^7.8.3", - "@babel/plugin-transform-literals": "^7.8.3", - "@babel/plugin-transform-member-expression-literals": "^7.8.3", - "@babel/plugin-transform-modules-amd": "^7.9.0", - "@babel/plugin-transform-modules-commonjs": "^7.9.0", - "@babel/plugin-transform-modules-systemjs": "^7.9.0", - "@babel/plugin-transform-modules-umd": "^7.9.0", - "@babel/plugin-transform-named-capturing-groups-regex": "^7.8.3", - "@babel/plugin-transform-new-target": "^7.8.3", - "@babel/plugin-transform-object-super": "^7.8.3", - "@babel/plugin-transform-parameters": "^7.8.7", - "@babel/plugin-transform-property-literals": "^7.8.3", - "@babel/plugin-transform-regenerator": "^7.8.7", - "@babel/plugin-transform-reserved-words": "^7.8.3", - "@babel/plugin-transform-shorthand-properties": "^7.8.3", - "@babel/plugin-transform-spread": "^7.8.3", - "@babel/plugin-transform-sticky-regex": "^7.8.3", - "@babel/plugin-transform-template-literals": "^7.8.3", - "@babel/plugin-transform-typeof-symbol": "^7.8.4", - "@babel/plugin-transform-unicode-regex": "^7.8.3", - "@babel/preset-modules": "^0.1.3", - "@babel/types": "^7.9.0", - "browserslist": "^4.9.1", - "core-js-compat": "^3.6.2", - "invariant": "^2.2.2", - "levenary": "^1.1.1", - "semver": "^5.5.0" - }, - "dependencies": { - "@babel/plugin-proposal-optional-chaining": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.9.0.tgz", - "integrity": "sha512-NDn5tu3tcv4W30jNhmc2hyD5c56G6cXx4TesJubhxrJeCvuuMpttxr0OnNCqbZGhFjLrg+NIhxxC+BK5F6yS3w==", - "requires": { - "@babel/helper-plugin-utils": "^7.8.3", - "@babel/plugin-syntax-optional-chaining": "^7.8.0" - } - } + "@types/parse-json": "^4.0.0", + "import-fresh": "^3.1.0", + "parse-json": "^5.0.0", + "path-type": "^4.0.0", + "yaml": "^1.7.2" } }, - "@babel/preset-react": { - "version": "7.9.4", - "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.9.4.tgz", - "integrity": "sha512-AxylVB3FXeOTQXNXyiuAQJSvss62FEotbX2Pzx3K/7c+MKJMdSg6Ose6QYllkdCFA8EInCJVw7M/o5QbLuA4ZQ==", + "import-fresh": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz", + "integrity": "sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==", "requires": { - "@babel/helper-plugin-utils": "^7.8.3", - "@babel/plugin-transform-react-display-name": "^7.8.3", - "@babel/plugin-transform-react-jsx": "^7.9.4", - "@babel/plugin-transform-react-jsx-development": "^7.9.0", - "@babel/plugin-transform-react-jsx-self": "^7.9.0", - "@babel/plugin-transform-react-jsx-source": "^7.9.0" + "parent-module": "^1.0.0", + "resolve-from": "^4.0.0" } }, + "resolve-from": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==" + } + } + }, + "babel-plugin-preval": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/babel-plugin-preval/-/babel-plugin-preval-3.0.1.tgz", + "integrity": "sha512-s8hmTlRSmzcL7cHSIi0s6WxmpOAxfIlWqSVQwBIt7V5bNBaac+8JMZ6kJXLOazMJ8gCIcb5AJgQUgPHvbSYUzw==", + "requires": { + "babel-plugin-macros": "^2.2.2", + "require-from-string": "^2.0.2" + } + }, + "babel-plugin-remove-graphql-queries": { + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/babel-plugin-remove-graphql-queries/-/babel-plugin-remove-graphql-queries-2.8.1.tgz", + "integrity": "sha512-c/JNri17WypqZNnMsX2PweMe8e5hsJcYNO/VnUBX9iUIvmKBjd143RaUQq0xYa6bpQF0kzpTFVR0sOp+cQlBOQ==" + }, + "babel-plugin-syntax-jsx": { + "version": "6.18.0", + "resolved": "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz", + "integrity": "sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY=" + }, + "babel-plugin-transform-react-remove-prop-types": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.24.tgz", + "integrity": "sha512-eqj0hVcJUR57/Ug2zE1Yswsw4LhuqqHhD+8v120T1cl3kjg76QwtyBrdIk4WVwK+lAhBJVYCd/v+4nc4y+8JsA==" + }, + "babel-preset-gatsby": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/babel-preset-gatsby/-/babel-preset-gatsby-0.3.1.tgz", + "integrity": "sha512-oT/GA1b3xi9xssdwWep874zxD8RZSBg2iL7QHy+emcgkJbYBQJC4NItw561tZGIQqVBJJx8sRaw3V94d1vupOQ==", + "requires": { + "@babel/plugin-proposal-class-properties": "^7.8.3", + "@babel/plugin-proposal-nullish-coalescing-operator": "^7.8.3", + "@babel/plugin-proposal-optional-chaining": "^7.8.3", + "@babel/plugin-syntax-dynamic-import": "^7.8.3", + "@babel/plugin-transform-runtime": "^7.8.3", + "@babel/plugin-transform-spread": "^7.8.3", + "@babel/preset-env": "^7.8.7", + "@babel/preset-react": "^7.8.3", + "@babel/runtime": "^7.8.7", + "babel-plugin-dynamic-import-node": "^2.3.0", + "babel-plugin-macros": "^2.8.0", + "babel-plugin-transform-react-remove-prop-types": "^0.4.24", + "gatsby-core-utils": "^1.1.1" + }, + "dependencies": { "@babel/runtime": { "version": "7.9.2", "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz", @@ -4868,86 +4107,10 @@ "regenerator-runtime": "^0.13.4" } }, - "@babel/types": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.0.tgz", - "integrity": "sha512-BS9JKfXkzzJl8RluW4JGknzpiUV7ZrvTayM6yfqLTVBEnFtyowVIOu6rqxRd5cVO6yGoWf4T8u8dgK9oB+GCng==", - "requires": { - "@babel/helper-validator-identifier": "^7.9.0", - "lodash": "^4.17.13", - "to-fast-properties": "^2.0.0" - } - }, - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "requires": { - "ms": "^2.1.1" - } - }, - "gatsby-core-utils": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.1.1.tgz", - "integrity": "sha512-EboPcBx37YQVUKN9JH753S54nDxjRmOefbR0i08KTmaVgQ1lZnDXJr8JfrImmMqupZlOkPQX1mWlXfp+r1jGhA==", - "requires": { - "ci-info": "2.0.0", - "configstore": "^5.0.1", - "node-object-hash": "^2.0.0" - } - }, - "jsesc": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", - "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=" - }, - "regenerate-unicode-properties": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz", - "integrity": "sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==", - "requires": { - "regenerate": "^1.4.0" - } - }, "regenerator-runtime": { "version": "0.13.5", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==" - }, - "regenerator-transform": { - "version": "0.14.4", - "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.4.tgz", - "integrity": "sha512-EaJaKPBI9GvKpvUz2mz4fhx7WPgvwRLY9v3hlNHWmAuJHI13T4nwKnNvm5RWJzEdnI5g5UwtOww+S8IdoUC2bw==", - "requires": { - "@babel/runtime": "^7.8.4", - "private": "^0.1.8" - } - }, - "regexpu-core": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.0.tgz", - "integrity": "sha512-TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ==", - "requires": { - "regenerate": "^1.4.0", - "regenerate-unicode-properties": "^8.2.0", - "regjsgen": "^0.5.1", - "regjsparser": "^0.6.4", - "unicode-match-property-ecmascript": "^1.0.4", - "unicode-match-property-value-ecmascript": "^1.2.0" - } - }, - "regjsparser": { - "version": "0.6.4", - "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.4.tgz", - "integrity": "sha512-64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==", - "requires": { - "jsesc": "~0.5.0" - } - }, - "unicode-match-property-value-ecmascript": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz", - "integrity": "sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==" } } }, @@ -6146,14 +5309,6 @@ "signal-exit": "^3.0.0", "strip-eof": "^1.0.0" } - }, - "get-stream": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", - "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", - "requires": { - "pump": "^3.0.0" - } } } }, @@ -7350,14 +6505,6 @@ "signal-exit": "^3.0.0", "strip-eof": "^1.0.0" } - }, - "get-stream": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", - "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", - "requires": { - "pump": "^3.0.0" - } } } }, @@ -7834,9 +6981,9 @@ } }, "dom-walk": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.1.tgz", - "integrity": "sha1-ZyIm3HTI95mtNTB9+TaroRrNYBg=" + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.2.tgz", + "integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==" }, "domain-browser": { "version": "1.2.0", @@ -8521,9 +7668,9 @@ } }, "eslint-module-utils": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.5.2.tgz", - "integrity": "sha512-LGScZ/JSlqGKiT8OC+cYRxseMjyqt6QO54nl281CK93unD89ijSeRV6An8Ci/2nvWVKe8K/Tqdm75RQoIOCr+Q==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz", + "integrity": "sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA==", "requires": { "debug": "^2.6.9", "pkg-dir": "^2.0.0" @@ -8608,9 +7755,9 @@ } }, "eslint-plugin-import": { - "version": "2.20.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.20.1.tgz", - "integrity": "sha512-qQHgFOTjguR+LnYRoToeZWT62XM55MBVXObHM6SKFd1VzDcX/vqT1kAz8ssqigh5eMj8qXcRoXXGZpPP6RfdCw==", + "version": "2.20.2", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.20.2.tgz", + "integrity": "sha512-FObidqpXrR8OnCh4iNsxy+WACztJLXAHBO5hK79T1Hc77PgQZkyDGA5Ag9xAvRpglvLNxhH/zSmZ70/pZ31dHg==", "requires": { "array-includes": "^3.0.3", "array.prototype.flat": "^1.2.1", @@ -8754,21 +7901,23 @@ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" }, "string.prototype.trimleft": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz", - "integrity": "sha512-iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz", + "integrity": "sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw==", "requires": { "define-properties": "^1.1.3", - "function-bind": "^1.1.1" + "es-abstract": "^1.17.5", + "string.prototype.trimstart": "^1.0.0" } }, "string.prototype.trimright": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz", - "integrity": "sha512-qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz", + "integrity": "sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg==", "requires": { "define-properties": "^1.1.3", - "function-bind": "^1.1.1" + "es-abstract": "^1.17.5", + "string.prototype.trimend": "^1.0.0" } } } @@ -9314,9 +8463,9 @@ "integrity": "sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==" }, "fastq": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.6.1.tgz", - "integrity": "sha512-mpIH5sKYueh3YyeJwqtVo8sORi0CgtmkVbK6kZStpQlZBYQuTzG2CZ7idSiJuA7bY0SFCWUc5WIs+oYumGCQNw==", + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.7.0.tgz", + "integrity": "sha512-YOadQRnHd5q6PogvAR/x62BGituF2ufiEA6s8aavQANw5YKHERI4AREboX6KotzP8oX2klxYF2wcV/7bn1clfQ==", "requires": { "reusify": "^1.0.4" } @@ -9524,9 +8673,9 @@ } }, "flatted": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.1.tgz", - "integrity": "sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg==" + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz", + "integrity": "sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==" }, "flush-write-stream": { "version": "1.1.1", @@ -10218,9 +9367,9 @@ } }, "gatsby": { - "version": "2.20.8", - "resolved": "https://registry.npmjs.org/gatsby/-/gatsby-2.20.8.tgz", - "integrity": "sha512-n3wtQ1zFIb9JpnO0059W/8CR81rH67doPQrhqlYjkPUSz1o4YjDdluF0PICyb0YX+f71AZr9pkWSwDqgJNcC3g==", + "version": "2.20.12", + "resolved": "https://registry.npmjs.org/gatsby/-/gatsby-2.20.12.tgz", + "integrity": "sha512-HoyjJA432ZUKOgkzsOSEdSbo3Vhi3lhr5uw8JnebO4S9Cqc6J2kw9HNASwtYFGzZVClGrsYwXVaLcOnSKtZmxA==", "requires": { "@babel/code-frame": "^7.8.3", "@babel/core": "^7.8.7", @@ -10283,13 +9432,13 @@ "flat": "^4.1.0", "fs-exists-cached": "1.0.0", "fs-extra": "^8.1.0", - "gatsby-cli": "^2.11.3", + "gatsby-cli": "^2.11.5", "gatsby-core-utils": "^1.1.1", "gatsby-graphiql-explorer": "^0.3.1", - "gatsby-link": "^2.3.1", + "gatsby-link": "^2.3.2", "gatsby-plugin-page-creator": "^2.2.1", "gatsby-react-router-scroll": "^2.2.1", - "gatsby-telemetry": "^1.2.2", + "gatsby-telemetry": "^1.2.3", "glob": "^7.1.6", "got": "8.3.2", "graphql": "^14.6.0", @@ -10363,121 +9512,53 @@ "@babel/code-frame": { "version": "7.8.3", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", - "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", - "requires": { - "@babel/highlight": "^7.8.3" - } - }, - "@babel/core": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.0.tgz", - "integrity": "sha512-kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==", - "requires": { - "@babel/code-frame": "^7.8.3", - "@babel/generator": "^7.9.0", - "@babel/helper-module-transforms": "^7.9.0", - "@babel/helpers": "^7.9.0", - "@babel/parser": "^7.9.0", - "@babel/template": "^7.8.6", - "@babel/traverse": "^7.9.0", - "@babel/types": "^7.9.0", - "convert-source-map": "^1.7.0", - "debug": "^4.1.0", - "gensync": "^1.0.0-beta.1", - "json5": "^2.1.2", - "lodash": "^4.17.13", - "resolve": "^1.3.2", - "semver": "^5.4.1", - "source-map": "^0.5.0" - }, - "dependencies": { - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "requires": { - "ms": "^2.1.1" - } - } - } - }, - "@babel/generator": { - "version": "7.9.4", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.4.tgz", - "integrity": "sha512-rjP8ahaDy/ouhrvCoU1E5mqaitWrxwuNGU+dy1EpaoK48jZay4MdkskKGIMHLZNewg8sAsqpGSREJwP0zH3YQA==", - "requires": { - "@babel/types": "^7.9.0", - "jsesc": "^2.5.1", - "lodash": "^4.17.13", - "source-map": "^0.5.0" - } - }, - "@babel/helper-member-expression-to-functions": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.8.3.tgz", - "integrity": "sha512-fO4Egq88utkQFjbPrSHGmGLFqmrshs11d46WI+WZDESt7Wu7wN2G2Iu+NMMZJFDOVRHAMIkB5SNh30NtwCA7RA==", - "requires": { - "@babel/types": "^7.8.3" - } - }, - "@babel/helper-module-imports": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz", - "integrity": "sha512-R0Bx3jippsbAEtzkpZ/6FIiuzOURPcMjHp+Z6xPe6DtApDJx+w7UYyOLanZqO8+wKR9G10s/FmHXvxaMd9s6Kg==", - "requires": { - "@babel/types": "^7.8.3" - } - }, - "@babel/helper-module-transforms": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz", - "integrity": "sha512-0FvKyu0gpPfIQ8EkxlrAydOWROdHpBmiCiRwLkUiBGhCUPRRbVD2/tm3sFr/c/GWFrQ/ffutGUAnx7V0FzT2wA==", - "requires": { - "@babel/helper-module-imports": "^7.8.3", - "@babel/helper-replace-supers": "^7.8.6", - "@babel/helper-simple-access": "^7.8.3", - "@babel/helper-split-export-declaration": "^7.8.3", - "@babel/template": "^7.8.6", - "@babel/types": "^7.9.0", - "lodash": "^4.17.13" - } - }, - "@babel/helper-optimise-call-expression": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.8.3.tgz", - "integrity": "sha512-Kag20n86cbO2AvHca6EJsvqAd82gc6VMGule4HwebwMlwkpXuVqrNRj6CkCV2sKxgi9MyAUnZVnZ6lJ1/vKhHQ==", - "requires": { - "@babel/types": "^7.8.3" - } - }, - "@babel/helper-replace-supers": { - "version": "7.8.6", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.8.6.tgz", - "integrity": "sha512-PeMArdA4Sv/Wf4zXwBKPqVj7n9UF/xg6slNRtZW84FM7JpE1CbG8B612FyM4cxrf4fMAMGO0kR7voy1ForHHFA==", + "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", "requires": { - "@babel/helper-member-expression-to-functions": "^7.8.3", - "@babel/helper-optimise-call-expression": "^7.8.3", - "@babel/traverse": "^7.8.6", - "@babel/types": "^7.8.6" + "@babel/highlight": "^7.8.3" } }, - "@babel/helper-simple-access": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.8.3.tgz", - "integrity": "sha512-VNGUDjx5cCWg4vvCTR8qQ7YJYZ+HBjxOgXEl7ounz+4Sn7+LMD3CFrCTEU6/qXKbA2nKg21CwhhBzO0RpRbdCw==", + "@babel/core": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.0.tgz", + "integrity": "sha512-kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==", "requires": { - "@babel/template": "^7.8.3", - "@babel/types": "^7.8.3" + "@babel/code-frame": "^7.8.3", + "@babel/generator": "^7.9.0", + "@babel/helper-module-transforms": "^7.9.0", + "@babel/helpers": "^7.9.0", + "@babel/parser": "^7.9.0", + "@babel/template": "^7.8.6", + "@babel/traverse": "^7.9.0", + "@babel/types": "^7.9.0", + "convert-source-map": "^1.7.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.1", + "json5": "^2.1.2", + "lodash": "^4.17.13", + "resolve": "^1.3.2", + "semver": "^5.4.1", + "source-map": "^0.5.0" + }, + "dependencies": { + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "requires": { + "ms": "^2.1.1" + } + } } }, - "@babel/helpers": { - "version": "7.9.2", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.2.tgz", - "integrity": "sha512-JwLvzlXVPjO8eU9c/wF9/zOIN7X6h8DYf7mG4CiFRZRvZNKEF5dQ3H3V+ASkHoIB3mWhatgl5ONhyqHRI6MppA==", + "@babel/generator": { + "version": "7.9.4", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.4.tgz", + "integrity": "sha512-rjP8ahaDy/ouhrvCoU1E5mqaitWrxwuNGU+dy1EpaoK48jZay4MdkskKGIMHLZNewg8sAsqpGSREJwP0zH3YQA==", "requires": { - "@babel/template": "^7.8.3", - "@babel/traverse": "^7.9.0", - "@babel/types": "^7.9.0" + "@babel/types": "^7.9.0", + "jsesc": "^2.5.1", + "lodash": "^4.17.13", + "source-map": "^0.5.0" } }, "@babel/highlight": { @@ -10608,9 +9689,9 @@ } }, "gatsby-cli": { - "version": "2.11.3", - "resolved": "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-2.11.3.tgz", - "integrity": "sha512-ek1L/CVB2ak+tbRgPUriotf2MhYVnZIQUogldD5PxPqLizN7expOTjoDcnV5DHG1zsmD19/TfXBj1hp6+DuOpQ==", + "version": "2.11.5", + "resolved": "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-2.11.5.tgz", + "integrity": "sha512-yAvyplWx19dU5gYdWJETEMywbNTtL9HntlR65cHhznKiwrr6Jyao+TsE50CmgZ/8Vv2JMF3UZFd3vFRXb+aK7w==", "requires": { "@babel/code-frame": "^7.8.3", "@babel/runtime": "^7.8.7", @@ -10628,7 +9709,7 @@ "fs-exists-cached": "^1.0.0", "fs-extra": "^8.1.0", "gatsby-core-utils": "^1.1.1", - "gatsby-telemetry": "^1.2.2", + "gatsby-telemetry": "^1.2.3", "hosted-git-info": "^3.0.4", "ink": "^2.7.1", "ink-spinner": "^3.0.1", @@ -10667,16 +9748,6 @@ } } }, - "gatsby-core-utils": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.1.1.tgz", - "integrity": "sha512-EboPcBx37YQVUKN9JH753S54nDxjRmOefbR0i08KTmaVgQ1lZnDXJr8JfrImmMqupZlOkPQX1mWlXfp+r1jGhA==", - "requires": { - "ci-info": "2.0.0", - "configstore": "^5.0.1", - "node-object-hash": "^2.0.0" - } - }, "get-caller-file": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz", @@ -10716,14 +9787,6 @@ "has": "^1.0.3" } }, - "json5": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.2.tgz", - "integrity": "sha512-MoUOQ4WdiN3yxhm7NEVJSJrieAo5hNSLQ5sj05OTRHPL9HOBy8u4Bu88jsC1jvqAdN+E1bJmsUcZH+1HQxliqQ==", - "requires": { - "minimist": "^1.2.5" - } - }, "lru-cache": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", @@ -10732,11 +9795,6 @@ "yallist": "^3.0.2" } }, - "minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" - }, "node-fetch": { "version": "2.6.0", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz", @@ -10761,27 +9819,24 @@ "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=" }, - "slugify": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/slugify/-/slugify-1.4.0.tgz", - "integrity": "sha512-FtLNsMGBSRB/0JOE2A0fxlqjI6fJsgHGS13iTuVT28kViI4JjUiNqp/vyis0ZXYcMnpR3fzGNkv+6vRlI2GwdQ==" - }, "string.prototype.trimleft": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz", - "integrity": "sha512-iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz", + "integrity": "sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw==", "requires": { "define-properties": "^1.1.3", - "function-bind": "^1.1.1" + "es-abstract": "^1.17.5", + "string.prototype.trimstart": "^1.0.0" } }, "string.prototype.trimright": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz", - "integrity": "sha512-qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz", + "integrity": "sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg==", "requires": { "define-properties": "^1.1.3", - "function-bind": "^1.1.1" + "es-abstract": "^1.17.5", + "string.prototype.trimend": "^1.0.0" } }, "strip-ansi": { @@ -10911,12 +9966,12 @@ } }, "gatsby-link": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/gatsby-link/-/gatsby-link-2.3.1.tgz", - "integrity": "sha512-waVhJ7klcAOgAD3UjX5P3LWYCee4GwZ7jqJS7dj8tTeiumXV1NAur4gjNiUZF8w3+0HQ4uY0vBjy+TozRRVk6Q==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/gatsby-link/-/gatsby-link-2.3.2.tgz", + "integrity": "sha512-A4aC6EEux/zumpgWnMlqcLhDq80uwzuCVrYfPVBxs/fFifVzzrMIvsPFhqw5w3l5DHC3XkxP4Y3TZq+EhypJhA==", "requires": { "@babel/runtime": "^7.8.7", - "@types/reach__router": "^1.3.0", + "@types/reach__router": "^1.3.3", "prop-types": "^15.7.2" }, "dependencies": { @@ -10963,16 +10018,6 @@ "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" }, - "gatsby-core-utils": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.1.1.tgz", - "integrity": "sha512-EboPcBx37YQVUKN9JH753S54nDxjRmOefbR0i08KTmaVgQ1lZnDXJr8JfrImmMqupZlOkPQX1mWlXfp+r1jGhA==", - "requires": { - "ci-info": "2.0.0", - "configstore": "^5.0.1", - "node-object-hash": "^2.0.0" - } - }, "regenerator-runtime": { "version": "0.13.5", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", @@ -11656,9 +10701,9 @@ } }, "gatsby-telemetry": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-1.2.2.tgz", - "integrity": "sha512-I1RkcbLIR7jg+SRu71FT5c7eEqDScmJ8/sZ/mfYVwARo6Kq6obB0VzlYHVYd+KjdeiuQb6YIHhlxUn37eGq7Vw==", + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-1.2.3.tgz", + "integrity": "sha512-butEEIfuGAWZ9cVISrS6XVXMFPweFTDNO2Z5jj+mA1GkHlriahF4BtbVX3b4miQbQW16g2TfzNw/ztwIUfy0RQ==", "requires": { "@babel/code-frame": "^7.8.3", "@babel/runtime": "^7.8.7", @@ -11710,16 +10755,6 @@ "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" }, - "gatsby-core-utils": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.1.1.tgz", - "integrity": "sha512-EboPcBx37YQVUKN9JH753S54nDxjRmOefbR0i08KTmaVgQ1lZnDXJr8JfrImmMqupZlOkPQX1mWlXfp+r1jGhA==", - "requires": { - "ci-info": "2.0.0", - "configstore": "^5.0.1", - "node-object-hash": "^2.0.0" - } - }, "node-fetch": { "version": "2.6.0", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz", @@ -12077,9 +11112,12 @@ "integrity": "sha1-3Xzn3hh8Bsi/NTeWrHHgmfCYDrw=" }, "get-stream": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", - "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=" + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", + "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", + "requires": { + "pump": "^3.0.0" + } }, "get-value": { "version": "2.0.6", @@ -12283,6 +11321,11 @@ } } }, + "get-stream": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", + "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=" + }, "http-cache-semantics": { "version": "3.8.1", "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz", @@ -12315,19 +11358,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" - }, - "prepend-http": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz", - "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=" - }, - "url-parse-lax": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz", - "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=", - "requires": { - "prepend-http": "^2.0.0" - } } } }, @@ -13406,21 +12436,23 @@ } }, "string.prototype.trimleft": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz", - "integrity": "sha512-iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz", + "integrity": "sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw==", "requires": { "define-properties": "^1.1.3", - "function-bind": "^1.1.1" + "es-abstract": "^1.17.5", + "string.prototype.trimstart": "^1.0.0" } }, "string.prototype.trimright": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz", - "integrity": "sha512-qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz", + "integrity": "sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg==", "requires": { "define-properties": "^1.1.3", - "function-bind": "^1.1.1" + "es-abstract": "^1.17.5", + "string.prototype.trimend": "^1.0.0" } } } @@ -15791,21 +14823,23 @@ } }, "string.prototype.trimleft": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz", - "integrity": "sha512-iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz", + "integrity": "sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw==", "requires": { "define-properties": "^1.1.3", - "function-bind": "^1.1.1" + "es-abstract": "^1.17.5", + "string.prototype.trimstart": "^1.0.0" } }, "string.prototype.trimright": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz", - "integrity": "sha512-qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz", + "integrity": "sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg==", "requires": { "define-properties": "^1.1.3", - "function-bind": "^1.1.1" + "es-abstract": "^1.17.5", + "string.prototype.trimend": "^1.0.0" } } } @@ -15858,21 +14892,23 @@ } }, "string.prototype.trimleft": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz", - "integrity": "sha512-iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz", + "integrity": "sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw==", "requires": { "define-properties": "^1.1.3", - "function-bind": "^1.1.1" + "es-abstract": "^1.17.5", + "string.prototype.trimstart": "^1.0.0" } }, "string.prototype.trimright": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz", - "integrity": "sha512-qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz", + "integrity": "sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg==", "requires": { "define-properties": "^1.1.3", - "function-bind": "^1.1.1" + "es-abstract": "^1.17.5", + "string.prototype.trimend": "^1.0.0" } } } @@ -16037,14 +15073,6 @@ "signal-exit": "^3.0.0", "strip-eof": "^1.0.0" } - }, - "get-stream": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", - "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", - "requires": { - "pump": "^3.0.0" - } } } }, @@ -16144,14 +15172,6 @@ "semver": "^6.2.0" }, "dependencies": { - "get-stream": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", - "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", - "requires": { - "pump": "^3.0.0" - } - }, "got": { "version": "9.6.0", "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz", @@ -18140,21 +17160,23 @@ } }, "string.prototype.trimleft": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz", - "integrity": "sha512-iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz", + "integrity": "sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw==", "requires": { "define-properties": "^1.1.3", - "function-bind": "^1.1.1" + "es-abstract": "^1.17.5", + "string.prototype.trimstart": "^1.0.0" } }, "string.prototype.trimright": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz", - "integrity": "sha512-qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz", + "integrity": "sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg==", "requires": { "define-properties": "^1.1.3", - "function-bind": "^1.1.1" + "es-abstract": "^1.17.5", + "string.prototype.trimend": "^1.0.0" } } } @@ -18887,9 +17909,9 @@ } }, "rxjs": { - "version": "6.5.4", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.4.tgz", - "integrity": "sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q==", + "version": "6.5.5", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.5.tgz", + "integrity": "sha512-WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ==", "requires": { "tslib": "^1.9.0" } @@ -19349,21 +18371,23 @@ } }, "string.prototype.trimleft": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz", - "integrity": "sha512-iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz", + "integrity": "sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw==", "requires": { "define-properties": "^1.1.3", - "function-bind": "^1.1.1" + "es-abstract": "^1.17.5", + "string.prototype.trimstart": "^1.0.0" } }, "string.prototype.trimright": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz", - "integrity": "sha512-qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz", + "integrity": "sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg==", "requires": { "define-properties": "^1.1.3", - "function-bind": "^1.1.1" + "es-abstract": "^1.17.5", + "string.prototype.trimend": "^1.0.0" } } } @@ -19805,9 +18829,9 @@ "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==" }, "spdy": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.1.tgz", - "integrity": "sha512-HeZS3PBdMA+sZSu0qwpCxl3DeALD5ASx8pAX0jZdKXSpPWbQ6SYGnlg3BBmYLx5LtiZrmkAZfErCm2oECBcioA==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz", + "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==", "requires": { "debug": "^4.1.0", "handle-thing": "^2.0.0", @@ -20188,21 +19212,90 @@ } }, "string.prototype.trimleft": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz", - "integrity": "sha512-iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz", + "integrity": "sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw==", "requires": { "define-properties": "^1.1.3", - "function-bind": "^1.1.1" + "es-abstract": "^1.17.5", + "string.prototype.trimstart": "^1.0.0" } }, "string.prototype.trimright": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz", - "integrity": "sha512-qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz", + "integrity": "sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg==", + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.5", + "string.prototype.trimend": "^1.0.0" + } + } + } + }, + "string.prototype.trimend": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.0.tgz", + "integrity": "sha512-EEJnGqa/xNfIg05SxiPSqRS7S9qwDhYts1TSLR1BQfYUfPe1stofgGKvwERK9+9yf+PpfBMlpBaCHucXGPQfUA==", + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.5" + }, + "dependencies": { + "es-abstract": { + "version": "1.17.5", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz", + "integrity": "sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==", + "requires": { + "es-to-primitive": "^1.2.1", + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1", + "is-callable": "^1.1.5", + "is-regex": "^1.0.5", + "object-inspect": "^1.7.0", + "object-keys": "^1.1.1", + "object.assign": "^4.1.0", + "string.prototype.trimleft": "^2.1.1", + "string.prototype.trimright": "^2.1.1" + } + }, + "has-symbols": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", + "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==" + }, + "is-callable": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz", + "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==" + }, + "is-regex": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz", + "integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==", + "requires": { + "has": "^1.0.3" + } + }, + "string.prototype.trimleft": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz", + "integrity": "sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw==", + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.5", + "string.prototype.trimstart": "^1.0.0" + } + }, + "string.prototype.trimright": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz", + "integrity": "sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg==", "requires": { "define-properties": "^1.1.3", - "function-bind": "^1.1.1" + "es-abstract": "^1.17.5", + "string.prototype.trimend": "^1.0.0" } } } @@ -20225,6 +19318,73 @@ "function-bind": "^1.1.1" } }, + "string.prototype.trimstart": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.0.tgz", + "integrity": "sha512-iCP8g01NFYiiBOnwG1Xc3WZLyoo+RuBymwIlWncShXDDJYWN6DbnM3odslBJdgCdRlq94B5s63NWAZlcn2CS4w==", + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.5" + }, + "dependencies": { + "es-abstract": { + "version": "1.17.5", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz", + "integrity": "sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==", + "requires": { + "es-to-primitive": "^1.2.1", + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1", + "is-callable": "^1.1.5", + "is-regex": "^1.0.5", + "object-inspect": "^1.7.0", + "object-keys": "^1.1.1", + "object.assign": "^4.1.0", + "string.prototype.trimleft": "^2.1.1", + "string.prototype.trimright": "^2.1.1" + } + }, + "has-symbols": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", + "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==" + }, + "is-callable": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz", + "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==" + }, + "is-regex": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz", + "integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==", + "requires": { + "has": "^1.0.3" + } + }, + "string.prototype.trimleft": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz", + "integrity": "sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw==", + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.5", + "string.prototype.trimstart": "^1.0.0" + } + }, + "string.prototype.trimright": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz", + "integrity": "sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg==", + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.5", + "string.prototype.trimend": "^1.0.0" + } + } + } + }, "string_decoder": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", @@ -21212,6 +20372,11 @@ "strip-eof": "^1.0.0" } }, + "get-stream": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", + "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=" + }, "is-obj": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", @@ -21651,9 +20816,9 @@ "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" }, "mkdirp": { - "version": "0.5.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.4.tgz", - "integrity": "sha512-iG9AK/dJLtJ0XNgTuDbSyNS3zECqDlAhnQW4CsNxBG3LQJBbHmRX1egw39DmtOdCAqY+dKXV+sgPgilNWUKMVw==", + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", + "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", "requires": { "minimist": "^1.2.5" } diff --git a/docs/package.json b/docs/package.json index cfa31002755..9a276368ac0 100644 --- a/docs/package.json +++ b/docs/package.json @@ -6,7 +6,7 @@ "serve": "gatsby serve" }, "dependencies": { - "gatsby": "2.20.8", + "gatsby": "2.20.12", "gatsby-theme-apollo-docs": "4.1.4", "react": "16.13.1", "react-dom": "16.13.1" From 06535408ddea0b91167c30ae502795c344ca8148 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 4 Apr 2020 10:38:29 +0000 Subject: [PATCH 351/642] chore(deps): update dependency jest-junit to v10 --- package-lock.json | 20 ++++++-------------- package.json | 2 +- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/package-lock.json b/package-lock.json index 36a1235a703..eb198770965 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10582,9 +10582,9 @@ } }, "jest-junit": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/jest-junit/-/jest-junit-9.0.0.tgz", - "integrity": "sha512-jnABGjL5pd2lhE1w3RIslZSufFbWQZGx8O3eluDES7qKxQuonXMtsPIi+4AKl4rtjb4DvMAjwLi4eHukc2FP/Q==", + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/jest-junit/-/jest-junit-10.0.0.tgz", + "integrity": "sha512-dbOVRyxHprdSpwSAR9/YshLwmnwf+RSl5hf0kCGlhAcEeZY9aRqo4oNmaT0tLC16Zy9D0zekDjWkjHGjXlglaQ==", "dev": true, "requires": { "jest-validate": "^24.9.0", @@ -10604,9 +10604,9 @@ } }, "uuid": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz", - "integrity": "sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", + "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", "dev": true } } @@ -11451,14 +11451,6 @@ "jest-get-type": "^24.9.0", "leven": "^3.1.0", "pretty-format": "^24.9.0" - }, - "dependencies": { - "camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", - "dev": true - } } }, "jest-watcher": { diff --git a/package.json b/package.json index ca9c3ee72fb..ac4f4b0663e 100644 --- a/package.json +++ b/package.json @@ -103,7 +103,7 @@ "ioredis": "4.16.1", "jest": "24.9.0", "jest-config": "24.9.0", - "jest-junit": "9.0.0", + "jest-junit": "10.0.0", "jest-matcher-utils": "24.9.0", "js-sha256": "0.9.0", "koa": "2.11.0", From 47c56ce78de7d0189e584df4bebc173c5e70f5a6 Mon Sep 17 00:00:00 2001 From: Miles Crighton <39874506+miles-crighton@users.noreply.github.com> Date: Sat, 4 Apr 2020 12:03:48 +0100 Subject: [PATCH 352/642] Add GraphQL Playground config section When accessing the API endpoint generated by Serverless' deployment to AWS the returned Playground uses the /dev/graphql endpoint causing polling and server communications to fail. This can be fixed by manually changing the URL in the playground, however this can lead to confusion when the issue is not fully understood by the user. This commit includes a new section describing how to setup GraphQL Playground to work with the serverless deployment detailed in the guide. --- docs/source/deployment/lambda.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/docs/source/deployment/lambda.md b/docs/source/deployment/lambda.md index ca6d2de1260..229b4901f10 100644 --- a/docs/source/deployment/lambda.md +++ b/docs/source/deployment/lambda.md @@ -227,3 +227,23 @@ exports.graphqlHandler = server.createHandler({ }, }); ``` + +## Setting up GraphQL Playground + +By default serverless will deploy to AWS with the stage set to development, creating an API endpoint at /dev/graphql. + +To allow GraphQL Playground to correctly use the dev endpoint, add a new configuration option to the ApolloServer instance as seen below. + +```js +//graphql.js + +const server = new ApolloServer({ + typeDefs, + resolvers, + playground: { + endpoint: "/dev/graphql" + } +}); +``` + +For more information on configuring GraphQL Playground see the Apollo [documentation](https://www.apollographql.com/docs/apollo-server/testing/graphql-playground/). From 7efa03f882aa1a4a63e52e71689d32589d0a67de Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 7 Apr 2020 13:19:20 +0300 Subject: [PATCH 353/642] CHANGELOG.md formatting. --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bd22b262c7d..ca50e89ca8d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,7 +12,7 @@ The version headers in this history reflect the versions of Apollo Server itself - `apollo-server-core`: Prevent a condition which prefixed an error message on each request when the initial gateway initialization resulted in a Promise-rejection which was memoized and re-prepended with `Invalid options provided to ApolloServer:` on each request. [PR #3811](https://github.com/apollographql/apollo-server/pull/3811) - `apollo-server-express`: Disable the automatic inclusion of the `x-powered-by: express` header. [PR #3821](https://github.com/apollographql/apollo-server/pull/3821) - `apollo-engine-reporting`: Avoid creating new arrays when building trace trees. [PR #3479](https://github.com/apollographql/apollo-server/pull/3479) -- `apollo-server-core`: Bump `graphql` peerDependencies to `^15.0.0`. [PR #3944](https://github.com/apollographql/apollo-server/pull/3944) +- `apollo-server-core`: Bump `graphql` `peerDependencies` range to include `^15.0.0`. [PR #3944](https://github.com/apollographql/apollo-server/pull/3944) ### v2.11.0 From 509d6a6ce1b9396638adb44a4b1d8c7fe5c345a2 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 7 Apr 2020 13:34:05 +0300 Subject: [PATCH 354/642] Adjust `CHANGELOG.md` prior to releasing. --- packages/apollo-gateway/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-gateway/CHANGELOG.md b/packages/apollo-gateway/CHANGELOG.md index cb7cd3af911..c5856aa2e7b 100644 --- a/packages/apollo-gateway/CHANGELOG.md +++ b/packages/apollo-gateway/CHANGELOG.md @@ -1,6 +1,6 @@ # CHANGELOG for `@apollo/gateway` -## 0.14.0 (pre-release; `@next` tag) +## 0.14.0 - Several previously unhandled Promise rejection errors stemming from, e.g. connectivity, failures when communicating with Apollo Graph Manager within asynchronous code are now handled. [PR #3811](https://github.com/apollographql/apollo-server/pull/3811) - Provide a more helpful error message when encountering expected errors. [PR #3811](https://github.com/apollographql/apollo-server/pull/3811) From c68c577aa6f1fda8ff905f21d49eda7cce444e11 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 7 Apr 2020 20:44:31 +0300 Subject: [PATCH 355/642] Disable Node.js as a requirement for the publishing workflow. This is a work-around, but should not preclude or prevent Node.js 6 from working at runtime, since this is a failure in the local repository's ability to generate the `proto` file for publishing in `apollo-engine-reporting-protobuf`, not a limitation of the generated file (which will be published). Essentially, the release is being prevented since the Node.js workflow is failing because `@apollo/protobufjs`'s insistence on not having lockstep versioning or being constrained by a `package-lock.json`. This results in an unexpected update to a transitive dependency (`mkdirp`) which is caused by `mkdirp` recently changing its `latest` tag to point to the `v1.x.x` release line rather than the `0.5.x` release line it had been using 4 days ago. cc @trevor-scheer --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bddd2fccefb..227f8f115e6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -104,7 +104,7 @@ workflows: name: Package tarballs <<: *common_non_publish_filters requires: - - NodeJS 6 + # - NodeJS 6 - NodeJS 8 - NodeJS 10 - NodeJS 12 @@ -112,7 +112,7 @@ workflows: name: Dry-run <<: *common_publish_filters requires: - - NodeJS 6 + # - NodeJS 6 - NodeJS 8 - NodeJS 10 - NodeJS 12 From 0d2bc78521bf3447134d20414845fa933020aa32 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 7 Apr 2020 21:00:23 +0300 Subject: [PATCH 356/642] Follow-up c68c577aa by completely disabling Node.js 6 tests. --- .circleci/config.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 227f8f115e6..7f55e8944ff 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -37,10 +37,10 @@ jobs: # at https://hub.docker.com/r/circleci/node/. # NODE: Note certain tests are currently being skipped for Node.js 6. - NodeJS 6: - executor: { name: oss/node, tag: '6' } - steps: - - common_test_steps + # NodeJS 6: + # executor: { name: oss/node, tag: '6' } + # steps: + # - common_test_steps NodeJS 8: executor: { name: oss/node, tag: '8' } @@ -92,8 +92,8 @@ workflows: version: 2 Build: jobs: - - NodeJS 6: - <<: *common_non_publish_filters + # - NodeJS 6: + # <<: *common_non_publish_filters - NodeJS 8: <<: *common_non_publish_filters - NodeJS 10: From 71a3863f59f4ab2c9052c316479d94c6708c4309 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 7 Apr 2020 21:08:49 +0300 Subject: [PATCH 357/642] Release - apollo-cache-control@0.9.1 - apollo-datasource-rest@0.8.1 - apollo-engine-reporting@1.7.1 - @apollo/federation@0.14.0 - @apollo/gateway@0.14.0 - apollo-server-azure-functions@2.12.0 - apollo-server-cache-redis@1.1.6 - apollo-server-cloud-functions@2.12.0 - apollo-server-cloudflare@2.12.0 - apollo-server-core@2.12.0 - apollo-server-errors@2.4.1 - apollo-server-express@2.12.0 - apollo-server-fastify@2.12.0 - apollo-server-hapi@2.12.0 - apollo-server-integration-testsuite@2.12.0 - apollo-server-koa@2.12.0 - apollo-server-lambda@2.12.0 - apollo-server-micro@2.12.0 - apollo-server-plugin-base@0.7.1 - apollo-server-plugin-response-cache@0.4.1 - apollo-server-testing@2.12.0 - apollo-server-types@0.3.1 - apollo-server@2.12.0 - apollo-tracing@0.9.1 - graphql-extensions@0.11.1 --- packages/apollo-cache-control/package.json | 2 +- packages/apollo-datasource-rest/package.json | 2 +- packages/apollo-engine-reporting/package.json | 2 +- packages/apollo-federation/package.json | 2 +- packages/apollo-gateway/package.json | 2 +- packages/apollo-server-azure-functions/package.json | 2 +- packages/apollo-server-cache-redis/package.json | 2 +- packages/apollo-server-cloud-functions/package.json | 2 +- packages/apollo-server-cloudflare/package.json | 2 +- packages/apollo-server-core/package.json | 2 +- packages/apollo-server-errors/package.json | 2 +- packages/apollo-server-express/package.json | 2 +- packages/apollo-server-fastify/package.json | 2 +- packages/apollo-server-hapi/package.json | 2 +- packages/apollo-server-integration-testsuite/package.json | 2 +- packages/apollo-server-koa/package.json | 2 +- packages/apollo-server-lambda/package.json | 2 +- packages/apollo-server-micro/package.json | 2 +- packages/apollo-server-plugin-base/package.json | 2 +- packages/apollo-server-plugin-response-cache/package.json | 2 +- packages/apollo-server-testing/package.json | 2 +- packages/apollo-server-types/package.json | 2 +- packages/apollo-server/package.json | 2 +- packages/apollo-tracing/package.json | 2 +- packages/graphql-extensions/package.json | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/packages/apollo-cache-control/package.json b/packages/apollo-cache-control/package.json index 2beba44a38b..95a50d0fde3 100644 --- a/packages/apollo-cache-control/package.json +++ b/packages/apollo-cache-control/package.json @@ -1,6 +1,6 @@ { "name": "apollo-cache-control", - "version": "0.9.1-alpha.5", + "version": "0.9.1", "description": "A GraphQL extension for cache control", "main": "./dist/index.js", "types": "./dist/index.d.ts", diff --git a/packages/apollo-datasource-rest/package.json b/packages/apollo-datasource-rest/package.json index 3cef735a8e2..3a50b7f4c3b 100644 --- a/packages/apollo-datasource-rest/package.json +++ b/packages/apollo-datasource-rest/package.json @@ -1,6 +1,6 @@ { "name": "apollo-datasource-rest", - "version": "0.8.1-alpha.5", + "version": "0.8.1", "author": "opensource@apollographql.com", "license": "MIT", "repository": { diff --git a/packages/apollo-engine-reporting/package.json b/packages/apollo-engine-reporting/package.json index cf73a30b072..f8dfc3f24a1 100644 --- a/packages/apollo-engine-reporting/package.json +++ b/packages/apollo-engine-reporting/package.json @@ -1,6 +1,6 @@ { "name": "apollo-engine-reporting", - "version": "1.7.1-alpha.5", + "version": "1.7.1", "description": "Send reports about your GraphQL services to Apollo Graph Manager (previously known as Apollo Engine)", "main": "./dist/index.js", "types": "./dist/index.d.ts", diff --git a/packages/apollo-federation/package.json b/packages/apollo-federation/package.json index af4287d63d1..0004853940d 100644 --- a/packages/apollo-federation/package.json +++ b/packages/apollo-federation/package.json @@ -1,6 +1,6 @@ { "name": "@apollo/federation", - "version": "0.14.0-alpha.5", + "version": "0.14.0", "description": "Apollo Federation Utilities", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-gateway/package.json b/packages/apollo-gateway/package.json index f36db970099..8d338126307 100644 --- a/packages/apollo-gateway/package.json +++ b/packages/apollo-gateway/package.json @@ -1,6 +1,6 @@ { "name": "@apollo/gateway", - "version": "0.14.0-alpha.5", + "version": "0.14.0", "description": "Apollo Gateway", "author": "opensource@apollographql.com", "main": "dist/index.js", diff --git a/packages/apollo-server-azure-functions/package.json b/packages/apollo-server-azure-functions/package.json index b63749c2d95..1f2b267c1e1 100644 --- a/packages/apollo-server-azure-functions/package.json +++ b/packages/apollo-server-azure-functions/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-azure-functions", - "version": "2.12.0-alpha.5", + "version": "2.12.0", "description": "Production-ready Node.js GraphQL server for Azure Functions", "keywords": [ "GraphQL", diff --git a/packages/apollo-server-cache-redis/package.json b/packages/apollo-server-cache-redis/package.json index 327fc163334..46eb45f52a7 100644 --- a/packages/apollo-server-cache-redis/package.json +++ b/packages/apollo-server-cache-redis/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-cache-redis", - "version": "1.1.6-alpha.4", + "version": "1.1.6", "author": "opensource@apollographql.com", "license": "MIT", "repository": { diff --git a/packages/apollo-server-cloud-functions/package.json b/packages/apollo-server-cloud-functions/package.json index e58296d7592..f04f58019d1 100644 --- a/packages/apollo-server-cloud-functions/package.json +++ b/packages/apollo-server-cloud-functions/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-cloud-functions", - "version": "2.12.0-alpha.5", + "version": "2.12.0", "description": "Production-ready Node.js GraphQL server for Google Cloud Functions", "keywords": [ "GraphQL", diff --git a/packages/apollo-server-cloudflare/package.json b/packages/apollo-server-cloudflare/package.json index f5bf2d2e18e..c7d6d965ccf 100644 --- a/packages/apollo-server-cloudflare/package.json +++ b/packages/apollo-server-cloudflare/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-cloudflare", - "version": "2.12.0-alpha.5", + "version": "2.12.0", "description": "Production-ready Node.js GraphQL server for Cloudflare workers", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-core/package.json b/packages/apollo-server-core/package.json index 4e1105ce7f8..3615c6e02a1 100644 --- a/packages/apollo-server-core/package.json +++ b/packages/apollo-server-core/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-core", - "version": "2.12.0-alpha.5", + "version": "2.12.0", "description": "Core engine for Apollo GraphQL server", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-errors/package.json b/packages/apollo-server-errors/package.json index 5638cda213a..92fb6ed0183 100644 --- a/packages/apollo-server-errors/package.json +++ b/packages/apollo-server-errors/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-errors", - "version": "2.4.1-alpha.0", + "version": "2.4.1", "author": "opensource@apollographql.com", "license": "MIT", "repository": { diff --git a/packages/apollo-server-express/package.json b/packages/apollo-server-express/package.json index 78bb5aba3d2..28a715f51ea 100644 --- a/packages/apollo-server-express/package.json +++ b/packages/apollo-server-express/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-express", - "version": "2.12.0-alpha.5", + "version": "2.12.0", "description": "Production-ready Node.js GraphQL server for Express and Connect", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-fastify/package.json b/packages/apollo-server-fastify/package.json index 562db189e9a..7c20f460d5a 100644 --- a/packages/apollo-server-fastify/package.json +++ b/packages/apollo-server-fastify/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-fastify", - "version": "2.12.0-alpha.5", + "version": "2.12.0", "description": "Production-ready Node.js GraphQL server for Fastify", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-hapi/package.json b/packages/apollo-server-hapi/package.json index 0abeb8c1a75..7d2fbed991d 100644 --- a/packages/apollo-server-hapi/package.json +++ b/packages/apollo-server-hapi/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-hapi", - "version": "2.12.0-alpha.5", + "version": "2.12.0", "description": "Production-ready Node.js GraphQL server for Hapi", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-integration-testsuite/package.json b/packages/apollo-server-integration-testsuite/package.json index 86889250273..954fc609822 100644 --- a/packages/apollo-server-integration-testsuite/package.json +++ b/packages/apollo-server-integration-testsuite/package.json @@ -1,7 +1,7 @@ { "name": "apollo-server-integration-testsuite", "private": true, - "version": "2.12.0-alpha.5", + "version": "2.12.0", "description": "Apollo Server Integrations testsuite", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-koa/package.json b/packages/apollo-server-koa/package.json index cd1088ec738..674891a0ba0 100644 --- a/packages/apollo-server-koa/package.json +++ b/packages/apollo-server-koa/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-koa", - "version": "2.12.0-alpha.5", + "version": "2.12.0", "description": "Production-ready Node.js GraphQL server for Koa", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-lambda/package.json b/packages/apollo-server-lambda/package.json index 0c3c70ea112..a33da3c6388 100644 --- a/packages/apollo-server-lambda/package.json +++ b/packages/apollo-server-lambda/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-lambda", - "version": "2.12.0-alpha.5", + "version": "2.12.0", "description": "Production-ready Node.js GraphQL server for AWS Lambda", "keywords": [ "GraphQL", diff --git a/packages/apollo-server-micro/package.json b/packages/apollo-server-micro/package.json index 4e593042844..73804efb918 100644 --- a/packages/apollo-server-micro/package.json +++ b/packages/apollo-server-micro/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-micro", - "version": "2.12.0-alpha.5", + "version": "2.12.0", "description": "Production-ready Node.js GraphQL server for Micro", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-plugin-base/package.json b/packages/apollo-server-plugin-base/package.json index b7bb85ce58a..db9b3b366ea 100644 --- a/packages/apollo-server-plugin-base/package.json +++ b/packages/apollo-server-plugin-base/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-plugin-base", - "version": "0.7.1-alpha.5", + "version": "0.7.1", "description": "Apollo Server plugin base classes", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-plugin-response-cache/package.json b/packages/apollo-server-plugin-response-cache/package.json index 258ccd4a7f6..f7f5a423846 100644 --- a/packages/apollo-server-plugin-response-cache/package.json +++ b/packages/apollo-server-plugin-response-cache/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-plugin-response-cache", - "version": "0.4.1-alpha.5", + "version": "0.4.1", "description": "Apollo Server full query response cache", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-testing/package.json b/packages/apollo-server-testing/package.json index cdb23c90c3f..20bb1d1fb12 100644 --- a/packages/apollo-server-testing/package.json +++ b/packages/apollo-server-testing/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-testing", - "version": "2.12.0-alpha.5", + "version": "2.12.0", "description": "Test utils for apollo-server", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-types/package.json b/packages/apollo-server-types/package.json index afc643e8c70..2ffbe4d973a 100644 --- a/packages/apollo-server-types/package.json +++ b/packages/apollo-server-types/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-types", - "version": "0.3.1-alpha.5", + "version": "0.3.1", "description": "Apollo Server shared types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server/package.json b/packages/apollo-server/package.json index 178d50f04b9..f5e258f6961 100644 --- a/packages/apollo-server/package.json +++ b/packages/apollo-server/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server", - "version": "2.12.0-alpha.5", + "version": "2.12.0", "description": "Production ready GraphQL Server", "author": "opensource@apollographql.com", "main": "dist/index.js", diff --git a/packages/apollo-tracing/package.json b/packages/apollo-tracing/package.json index 6cc3d176b54..9261935ae0e 100644 --- a/packages/apollo-tracing/package.json +++ b/packages/apollo-tracing/package.json @@ -1,6 +1,6 @@ { "name": "apollo-tracing", - "version": "0.9.1-alpha.5", + "version": "0.9.1", "description": "Collect and expose trace data for GraphQL requests", "main": "./dist/index.js", "types": "./dist/index.d.ts", diff --git a/packages/graphql-extensions/package.json b/packages/graphql-extensions/package.json index a0fcf48df1c..92266750f03 100644 --- a/packages/graphql-extensions/package.json +++ b/packages/graphql-extensions/package.json @@ -1,6 +1,6 @@ { "name": "graphql-extensions", - "version": "0.11.1-alpha.5", + "version": "0.11.1", "description": "Add extensions to GraphQL servers", "main": "./dist/index.js", "types": "./dist/index.d.ts", From d3c9498ca1362d7fb7b88c39c2e177f405ad59f0 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 8 Apr 2020 08:24:09 +0000 Subject: [PATCH 358/642] chore(deps): update dependency dataloader to v2 --- package-lock.json | 14 ++++++++------ packages/apollo-server-cache-redis/package.json | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index 90d56e93b28..3314bcd4b79 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4407,8 +4407,15 @@ "requires": { "apollo-server-caching": "file:packages/apollo-server-caching", "apollo-server-env": "file:packages/apollo-server-env", - "dataloader": "^1.4.0", + "dataloader": "^2.0.0", "ioredis": "^4.0.0" + }, + "dependencies": { + "dataloader": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/dataloader/-/dataloader-2.0.0.tgz", + "integrity": "sha512-YzhyDAwA4TaQIhM5go+vCLmU0UikghC/t9DTQYZR2M/UvZ1MdOhPezSDZcjj9uqQJOMqjLcpWtyW2iNINdlatQ==" + } } }, "apollo-server-caching": { @@ -6354,11 +6361,6 @@ } } }, - "dataloader": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/dataloader/-/dataloader-1.4.0.tgz", - "integrity": "sha512-68s5jYdlvasItOJnCuI2Q9s4q98g0pCyL3HrcKJu8KNugUl8ahgmZYg38ysLTgQjjXX3H8CJLkAvWrclWfcalw==" - }, "date-format": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/date-format/-/date-format-2.1.0.tgz", diff --git a/packages/apollo-server-cache-redis/package.json b/packages/apollo-server-cache-redis/package.json index 46eb45f52a7..65cee46fe15 100644 --- a/packages/apollo-server-cache-redis/package.json +++ b/packages/apollo-server-cache-redis/package.json @@ -19,7 +19,7 @@ "dependencies": { "apollo-server-caching": "file:../apollo-server-caching", "apollo-server-env": "file:../apollo-server-env", - "dataloader": "^1.4.0", + "dataloader": "^2.0.0", "ioredis": "^4.0.0" } } From e7180762f2dbfc415c11e25cf6579b33c98ea360 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Wed, 8 Apr 2020 11:31:21 +0300 Subject: [PATCH 359/642] Apply suggestions from code review --- docs/source/deployment/lambda.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/source/deployment/lambda.md b/docs/source/deployment/lambda.md index 229b4901f10..96f73fe376e 100644 --- a/docs/source/deployment/lambda.md +++ b/docs/source/deployment/lambda.md @@ -230,20 +230,20 @@ exports.graphqlHandler = server.createHandler({ ## Setting up GraphQL Playground -By default serverless will deploy to AWS with the stage set to development, creating an API endpoint at /dev/graphql. +By default, `serverless` will deploy to AWS with the `stage` set to `development` resulting in an API endpoint at `/dev/graphql`. -To allow GraphQL Playground to correctly use the dev endpoint, add a new configuration option to the ApolloServer instance as seen below. +To allow GraphQL Playground to correctly use the `dev` endpoint, add a new `endpoint` configuration within the `playground` option to the `ApolloServer` instantiation options: ```js -//graphql.js - const server = new ApolloServer({ typeDefs, resolvers, + // highlight-start playground: { - endpoint: "/dev/graphql" + endpoint: "/dev/graphql" } + // highlight-end }); ``` -For more information on configuring GraphQL Playground see the Apollo [documentation](https://www.apollographql.com/docs/apollo-server/testing/graphql-playground/). +For information on additional configuration options, see [GraphQL Playground](https://www.apollographql.com/docs/apollo-server/testing/graphql-playground/). From 721ed0426e5fe81ee97674a071b3bf3cabc5d2cb Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 9 Apr 2020 22:12:17 +0300 Subject: [PATCH 360/642] Remove syntactically noop copy-pasta. Thankfully, I don't believe that this should have been causing any problems, given the nature of the formatting. Thanks, @evocateur for the observation! Ref: https://github.com/apollographql/apollo-server/commit/a94f403f5#r38153870 --- packages/apollo-server-core/src/ApolloServer.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/apollo-server-core/src/ApolloServer.ts b/packages/apollo-server-core/src/ApolloServer.ts index 747ef8e6e92..5b94b5ea022 100644 --- a/packages/apollo-server-core/src/ApolloServer.ts +++ b/packages/apollo-server-core/src/ApolloServer.ts @@ -649,7 +649,6 @@ export class ApolloServerBase { } } - persistedQueries: this.requestOptions.persistedQueries, await Promise.all( this.plugins.map( plugin => From 71ed2422e481a80731828eb045e6717ca63bd7a5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 9 Apr 2020 22:19:07 +0000 Subject: [PATCH 361/642] chore(deps): update dependency apollo-link to v1.2.14 (#3966) Co-authored-by: Renovate Bot --- package-lock.json | 20 ++++++++++---------- package.json | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3314bcd4b79..b225e8d8d4f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4331,14 +4331,14 @@ } }, "apollo-link": { - "version": "1.2.13", - "resolved": "https://registry.npmjs.org/apollo-link/-/apollo-link-1.2.13.tgz", - "integrity": "sha512-+iBMcYeevMm1JpYgwDEIDt/y0BB7VWyvlm/7x+TIPNLHCTCMgcEgDuW5kH86iQZWo0I7mNwQiTOz+/3ShPFmBw==", + "version": "1.2.14", + "resolved": "https://registry.npmjs.org/apollo-link/-/apollo-link-1.2.14.tgz", + "integrity": "sha512-p67CMEFP7kOG1JZ0ZkYZwRDa369w5PIjtMjvrQd/HnIV8FRsHRqLqK+oAZQnFa1DDdZtOtHTi+aMIW6EatC2jg==", "requires": { "apollo-utilities": "^1.3.0", "ts-invariant": "^0.4.0", "tslib": "^1.9.3", - "zen-observable-ts": "^0.8.20" + "zen-observable-ts": "^0.8.21" } }, "apollo-link-http": { @@ -16432,14 +16432,14 @@ "integrity": "sha512-faQrqNMzcPCHGVC2aaOINk13K+aaBDUPjGWl0teOXywElLjyVAB6Oe2jj62jHYtwsU49jXhScYbvPENK+6zAvQ==" }, "zen-observable": { - "version": "0.8.14", - "resolved": "https://registry.npmjs.org/zen-observable/-/zen-observable-0.8.14.tgz", - "integrity": "sha512-kQz39uonEjEESwh+qCi83kcC3rZJGh4mrZW7xjkSQYXkq//JZHTtKo+6yuVloTgMtzsIWOJrjIrKvk/dqm0L5g==" + "version": "0.8.15", + "resolved": "https://registry.npmjs.org/zen-observable/-/zen-observable-0.8.15.tgz", + "integrity": "sha512-PQ2PC7R9rslx84ndNBZB/Dkv8V8fZEpk83RLgXtYd0fwUgEjseMn1Dgajh2x6S8QbZAFa9p2qVCEuYZNgve0dQ==" }, "zen-observable-ts": { - "version": "0.8.20", - "resolved": "https://registry.npmjs.org/zen-observable-ts/-/zen-observable-ts-0.8.20.tgz", - "integrity": "sha512-2rkjiPALhOtRaDX6pWyNqK1fnP5KkJJybYebopNSn6wDG1lxBoFs2+nwwXKoA6glHIrtwrfBBy6da0stkKtTAA==", + "version": "0.8.21", + "resolved": "https://registry.npmjs.org/zen-observable-ts/-/zen-observable-ts-0.8.21.tgz", + "integrity": "sha512-Yj3yXweRc8LdRMrCC8nIc4kkjWecPAUVh0TI0OUrWXx6aX790vLcDlWca6I4vsyCGH3LpWxq0dJRcMOFoVqmeg==", "requires": { "tslib": "^1.9.3", "zen-observable": "^0.8.0" diff --git a/package.json b/package.json index 159d5ce073b..5a187ddedc2 100644 --- a/package.json +++ b/package.json @@ -86,7 +86,7 @@ "@types/type-is": "1.6.3", "@types/ws": "6.0.4", "apollo-fetch": "0.7.0", - "apollo-link": "1.2.13", + "apollo-link": "1.2.14", "apollo-link-http": "1.5.16", "apollo-link-persisted-queries": "0.2.2", "azure-functions-ts-essentials": "1.3.2", From 318c69ec03d5d9802be108efa978f739b4a37582 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Fri, 10 Apr 2020 14:20:13 +0300 Subject: [PATCH 362/642] changelog: Add back `vNEXT` section for staging changes. --- CHANGELOG.md | 6 ++++++ packages/apollo-federation/CHANGELOG.md | 6 ++++++ packages/apollo-gateway/CHANGELOG.md | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ca50e89ca8d..a3c9a883741 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ 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 + +> 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. When a release is being prepared, a new header will be (manually) created below and the the appropriate changes within that release will be moved into the new section. + +- _Nothing yet! Stay tuned._ + ### v2.12.0 - `apollo-server-core`: Support providing a custom logger implementation (e.g. [`winston`](https://npm.im/winston), [`bunyan`](https://npm.im/bunyan), etc.) to capture server console messages. Though there has historically been limited output from Apollo Server, some messages are important to capture in the larger context of production logging facilities or can benefit from using more advanced structure, like JSON-based logging. This also introduces a `logger` property to the `GraphQLRequestContext` that is exposed to plugins, making it possible for plugins to leverage the same server-level logger, and allowing implementors to create request-specific log contexts, if desired. When not provided, these will still output to `console`. [PR #3894](https://github.com/apollographql/apollo-server/pull/3894) diff --git a/packages/apollo-federation/CHANGELOG.md b/packages/apollo-federation/CHANGELOG.md index d78c53f24bc..5779fe7dfbd 100644 --- a/packages/apollo-federation/CHANGELOG.md +++ b/packages/apollo-federation/CHANGELOG.md @@ -1,5 +1,11 @@ # CHANGELOG for `@apollo/federation` +### vNEXT + +> 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. When a release is being prepared, a new header will be (manually) created below and the the appropriate changes within that release will be moved into the new section. + +- _Nothing yet! Stay tuned._ + ## 0.14.0 - Only changes in the similarly versioned `@apollo/gateway` package. diff --git a/packages/apollo-gateway/CHANGELOG.md b/packages/apollo-gateway/CHANGELOG.md index c5856aa2e7b..229e89530e1 100644 --- a/packages/apollo-gateway/CHANGELOG.md +++ b/packages/apollo-gateway/CHANGELOG.md @@ -1,5 +1,11 @@ # CHANGELOG for `@apollo/gateway` +### vNEXT + +> 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. When a release is being prepared, a new header will be (manually) created below and the the appropriate changes within that release will be moved into the new section. + +- _Nothing yet! Stay tuned._ + ## 0.14.0 - Several previously unhandled Promise rejection errors stemming from, e.g. connectivity, failures when communicating with Apollo Graph Manager within asynchronous code are now handled. [PR #3811](https://github.com/apollographql/apollo-server/pull/3811) From 12e548d52064bdfc065880b8db23a045c4fe6aaa Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Fri, 10 Apr 2020 14:24:49 +0300 Subject: [PATCH 363/642] changelog: Add complete version detail links for last several releases. We will automate this eventually, or get rid of the way we publish. --- CHANGELOG.md | 8 ++++++++ packages/apollo-federation/CHANGELOG.md | 2 ++ packages/apollo-gateway/CHANGELOG.md | 2 ++ 3 files changed, 12 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a3c9a883741..100d21c435b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,8 @@ The version headers in this history reflect the versions of Apollo Server itself ### v2.12.0 +> [See complete versioning details.](https://github.com/apollographql/apollo-server/commit/71a3863f59f4ab2c9052c316479d94c6708c4309) + - `apollo-server-core`: Support providing a custom logger implementation (e.g. [`winston`](https://npm.im/winston), [`bunyan`](https://npm.im/bunyan), etc.) to capture server console messages. Though there has historically been limited output from Apollo Server, some messages are important to capture in the larger context of production logging facilities or can benefit from using more advanced structure, like JSON-based logging. This also introduces a `logger` property to the `GraphQLRequestContext` that is exposed to plugins, making it possible for plugins to leverage the same server-level logger, and allowing implementors to create request-specific log contexts, if desired. When not provided, these will still output to `console`. [PR #3894](https://github.com/apollographql/apollo-server/pull/3894) - `apollo-server-core`: When operating in gateway mode using the `gateway` property of the Apollo Server constructor options, the failure to initialize a schema during initial start-up, e.g. connectivity problems, will no longer result in the federated executor from being assigned when the schema eventually becomes available. This precludes a state where the gateway may never become available to serve federated requests, even when failure conditions are no longer present. [PR #3811](https://github.com/apollographql/apollo-server/pull/3811) - `apollo-server-core`: Prevent a condition which prefixed an error message on each request when the initial gateway initialization resulted in a Promise-rejection which was memoized and re-prepended with `Invalid options provided to ApolloServer:` on each request. [PR #3811](https://github.com/apollographql/apollo-server/pull/3811) @@ -22,15 +24,21 @@ The version headers in this history reflect the versions of Apollo Server itself ### v2.11.0 +> [See complete versioning details.](https://github.com/apollographql/apollo-server/commit/056f083ddaf116633e6f759a2b3d69248bb18f66) + - The range of accepted `peerDepedencies` versions for `graphql` has been widened to include `graphql@^15.0.0-rc.2` so as to accommodate the latest release-candidate of the `graphql@15` package, and an intention to support it when it is finally released on the `latest` npm tag. While this change will subdue peer dependency warnings for Apollo Server packages, many dependencies from outside of this repository will continue to raise similar warnings until those packages own `peerDependencies` are updated. It is unlikely that all of those packages will update their ranges prior to the final version of `graphql@15` being released, but if everything is working as expected, the warnings can be safely ignored. [PR #3825](https://github.com/apollographql/apollo-server/pull/3825) ### v2.10.1 +> [See complete versioning details.](https://github.com/apollographql/apollo-server/commit/dba97895485d6444535a684d4646f1363954f698) + - `apollo-server-core`: Update GraphQL Playground to latest version to remove a rogue curly-brace appearing in the top-right corner of the interface under certain conditions. [PR #3702](https://github.com/apollographql/apollo-server/pull/3702) [Playground PR](https://github.com/apollographql/graphql-playground/pull/21) - `apollo-server-core`: Typings: Allow the `cache` property inside `persistedQueries` to be optional. This was already optional at runtime where it defaults to the top-level global cache when unspecified, but with the introduction of the `ttl` property, it now makes sense that one may be provided without the other. [#3671](https://github.com/apollographql/apollo-server/pull/3671) ### v2.10.0 +> [See complete versioning details.](https://github.com/apollographql/apollo-server/commit/9c0aa1e661ccc2c5a1471b781102637dd47e21b1) + - `apollo-server-express`: Support `CorsOptionsDelegate` type on `cors` parameter to `applyMiddleware`, to align with the supported type of the underlying [`cors`](https://npm.im/cors) middleware [itself](https://github.com/DefinitelyTyped/DefinitelyTyped/blob/31483b781ac30f98bdf4d40a517e921f2fc2ce37/types/cors/index.d.ts#L32). [#3613](https://github.com/apollographql/apollo-server/pull/3613) - `apollo-server-core`: Allow asynchronous initialization of datasources: the `initialize` method on datasources may now return a Promise, which will be settled before any resolvers are called. [#3639](https://github.com/apollographql/apollo-server/pull/3639) - `apollo-server-core`: experimental: Allow configuration of the parsed/validated document store by introducing an `experimental_approximateDocumentStoreMiB` property to the `ApolloServer` constructor options which overrides the default cache size of 30MiB. [#3755](https://github.com/apollographql/apollo-server/pull/3755) diff --git a/packages/apollo-federation/CHANGELOG.md b/packages/apollo-federation/CHANGELOG.md index 5779fe7dfbd..bb287a57477 100644 --- a/packages/apollo-federation/CHANGELOG.md +++ b/packages/apollo-federation/CHANGELOG.md @@ -8,6 +8,8 @@ ## 0.14.0 +> [See complete versioning details.](https://github.com/apollographql/apollo-server/commit/71a3863f59f4ab2c9052c316479d94c6708c4309) + - Only changes in the similarly versioned `@apollo/gateway` package. ## 0.13.2 diff --git a/packages/apollo-gateway/CHANGELOG.md b/packages/apollo-gateway/CHANGELOG.md index 229e89530e1..63abdd2466a 100644 --- a/packages/apollo-gateway/CHANGELOG.md +++ b/packages/apollo-gateway/CHANGELOG.md @@ -8,6 +8,8 @@ ## 0.14.0 +> [See complete versioning details.](https://github.com/apollographql/apollo-server/commit/71a3863f59f4ab2c9052c316479d94c6708c4309) + - Several previously unhandled Promise rejection errors stemming from, e.g. connectivity, failures when communicating with Apollo Graph Manager within asynchronous code are now handled. [PR #3811](https://github.com/apollographql/apollo-server/pull/3811) - Provide a more helpful error message when encountering expected errors. [PR #3811](https://github.com/apollographql/apollo-server/pull/3811) - General improvements and clarity to error messages and logging. [PR #3811](https://github.com/apollographql/apollo-server/pull/3811) From af7f2f0344159815381d4b3e8772ac4e0bc19c24 Mon Sep 17 00:00:00 2001 From: Arnaud Gissinger <37625778+mathix420@users.noreply.github.com> Date: Fri, 10 Apr 2020 13:54:35 +0200 Subject: [PATCH 364/642] feat(lambda) File uploads (#3926) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Aim to provide file-upload parity support — as already supported within the other Apollo Server integration packages — via the third-party `graphql-upload` package. Co-authored-by: charleswong28 Co-authored-by: Steve Babigian Co-authored-by: Jesse Rosenberger Closes: https://github.com/apollographql/apollo-server/issues/1419 Closes: https://github.com/apollographql/apollo-server/issues/1703 Supersedes: https://github.com/apollographql/apollo-server/pull/1739 ...and therefore... Closes: https://github.com/apollographql/apollo-server/pull/1739 Supersedes: https://github.com/apollographql/apollo-server/pull/3676 ...and therefore... Closes: https://github.com/apollographql/apollo-server/pull/3676 --- CHANGELOG.md | 4 +- package-lock.json | 25 +++ package.json | 1 + .../src/__tests__/googleCloudApollo.test.ts | 2 +- .../src/index.ts | 2 +- .../apollo-server-lambda/src/ApolloServer.ts | 67 ++++++- .../src/__tests__/lambdaApollo.test.ts | 168 +++++++++++++++++- .../apollo-server-lambda/src/lambdaApollo.ts | 19 +- 8 files changed, 269 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 100d21c435b..acffd5971b5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ The version headers in this history reflect the versions of Apollo Server itself > 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. When a release is being prepared, a new header will be (manually) created below and the the appropriate changes within that release will be moved into the new section. -- _Nothing yet! Stay tuned._ +- `apollo-server-lambda`: Support file uploads on AWS Lambda [Issue #1419](https://github.com/apollographql/apollo-server/issues/1419) [Issue #1703](https://github.com/apollographql/apollo-server/issues/1703) [PR #3926](https://github.com/apollographql/apollo-server/pull/3926) ### v2.12.0 @@ -28,6 +28,8 @@ The version headers in this history reflect the versions of Apollo Server itself - The range of accepted `peerDepedencies` versions for `graphql` has been widened to include `graphql@^15.0.0-rc.2` so as to accommodate the latest release-candidate of the `graphql@15` package, and an intention to support it when it is finally released on the `latest` npm tag. While this change will subdue peer dependency warnings for Apollo Server packages, many dependencies from outside of this repository will continue to raise similar warnings until those packages own `peerDependencies` are updated. It is unlikely that all of those packages will update their ranges prior to the final version of `graphql@15` being released, but if everything is working as expected, the warnings can be safely ignored. [PR #3825](https://github.com/apollographql/apollo-server/pull/3825) +- `apollo-server-lambda`: Support file uploads on AWS Lambda [Issue #1419](https://github.com/apollographql/apollo-server/issues/1419) [Issue #1703](https://github.com/apollographql/apollo-server/issues/1703) [PR #3926](https://github.com/apollographql/apollo-server/pull/3926) + ### v2.10.1 > [See complete versioning details.](https://github.com/apollographql/apollo-server/commit/dba97895485d6444535a684d4646f1363954f698) diff --git a/package-lock.json b/package-lock.json index b225e8d8d4f..ae168e21bcb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3620,6 +3620,12 @@ "@types/node": "*" } }, + "@types/cookiejar": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@types/cookiejar/-/cookiejar-2.1.1.tgz", + "integrity": "sha512-aRnpPa7ysx3aNW60hTiCtLHlQaIFsXFCgQlpakNgDNVFzbtusSY8PwjAQgRWfSk0ekNoBjO51eQRB6upA9uuyw==", + "dev": true + }, "@types/cookies": { "version": "0.7.1", "resolved": "https://registry.npmjs.org/@types/cookies/-/cookies-0.7.1.tgz", @@ -4037,6 +4043,25 @@ "integrity": "sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==", "dev": true }, + "@types/superagent": { + "version": "4.1.7", + "resolved": "https://registry.npmjs.org/@types/superagent/-/superagent-4.1.7.tgz", + "integrity": "sha512-JSwNPgRYjIC4pIeOqLwWwfGj6iP1n5NE6kNBEbGx2V8H78xCPwx7QpNp9plaI30+W3cFEzJO7BIIsXE+dbtaGg==", + "dev": true, + "requires": { + "@types/cookiejar": "*", + "@types/node": "*" + } + }, + "@types/supertest": { + "version": "2.0.8", + "resolved": "https://registry.npmjs.org/@types/supertest/-/supertest-2.0.8.tgz", + "integrity": "sha512-wcax7/ip4XSSJRLbNzEIUVy2xjcBIZZAuSd2vtltQfRK7kxhx5WMHbLHkYdxN3wuQCrwpYrg86/9byDjPXoGMA==", + "dev": true, + "requires": { + "@types/superagent": "*" + } + }, "@types/test-listen": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@types/test-listen/-/test-listen-1.1.0.tgz", diff --git a/package.json b/package.json index 5a187ddedc2..40b6c0d316d 100644 --- a/package.json +++ b/package.json @@ -82,6 +82,7 @@ "@types/qs-middleware": "1.0.1", "@types/request": "2.48.4", "@types/request-promise": "4.1.46", + "@types/supertest": "^2.0.8", "@types/test-listen": "1.1.0", "@types/type-is": "1.6.3", "@types/ws": "6.0.4", diff --git a/packages/apollo-server-cloud-functions/src/__tests__/googleCloudApollo.test.ts b/packages/apollo-server-cloud-functions/src/__tests__/googleCloudApollo.test.ts index fa7d20b4d6e..ea311f6b869 100644 --- a/packages/apollo-server-cloud-functions/src/__tests__/googleCloudApollo.test.ts +++ b/packages/apollo-server-cloud-functions/src/__tests__/googleCloudApollo.test.ts @@ -6,7 +6,7 @@ import testSuite, { import { Config } from 'apollo-server-core'; import express = require('express'); import bodyParser = require('body-parser'); -import request = require('supertest'); +import request from 'supertest'; type GcfRequest = { path: string | null; diff --git a/packages/apollo-server-integration-testsuite/src/index.ts b/packages/apollo-server-integration-testsuite/src/index.ts index ccfe6891bd4..5b87741ed8f 100644 --- a/packages/apollo-server-integration-testsuite/src/index.ts +++ b/packages/apollo-server-integration-testsuite/src/index.ts @@ -16,7 +16,7 @@ import { getOperationAST, } from 'graphql'; -import request = require('supertest'); +import request from 'supertest'; import { GraphQLOptions, Config } from 'apollo-server-core'; import gql from 'graphql-tag'; diff --git a/packages/apollo-server-lambda/src/ApolloServer.ts b/packages/apollo-server-lambda/src/ApolloServer.ts index 181de51b061..34bb0b899e9 100644 --- a/packages/apollo-server-lambda/src/ApolloServer.ts +++ b/packages/apollo-server-lambda/src/ApolloServer.ts @@ -3,14 +3,27 @@ import { APIGatewayProxyEvent, Context as LambdaContext, } from 'aws-lambda'; -import { ApolloServerBase, GraphQLOptions, Config } from 'apollo-server-core'; +import { + formatApolloErrors, + processFileUploads, + FileUploadOptions, + ApolloServerBase, + GraphQLOptions, + Config, +} from 'apollo-server-core'; import { renderPlaygroundPage, RenderPageOptions as PlaygroundRenderPageOptions, } from '@apollographql/graphql-playground-html'; +import { + ServerResponse, + IncomingHttpHeaders, + IncomingMessage, +} from 'http'; import { graphqlLambda } from './lambdaApollo'; import { Headers } from 'apollo-server-env'; +import { Readable, Writable } from 'stream'; export interface CreateHandlerOptions { cors?: { @@ -21,9 +34,14 @@ export interface CreateHandlerOptions { credentials?: boolean; maxAge?: number; }; + uploadsConfig?: FileUploadOptions; onHealthCheck?: (req: APIGatewayProxyEvent) => Promise; } +export class FileUploadRequest extends Readable { + headers!: IncomingHttpHeaders; +} + export class ApolloServer extends ApolloServerBase { // If you feel tempted to add an option to this constructor. Please consider // another place, since the documentation becomes much more complicated when @@ -38,6 +56,11 @@ export class ApolloServer extends ApolloServerBase { super(options); } + // Uploads are supported in this integration + protected supportsUploads(): boolean { + return true; + } + // This translates the arguments from the middleware into graphQL options It // provides typings for the integration specific behavior, ideally this would // be propagated with a generic to the super class @@ -184,9 +207,9 @@ export class ApolloServer extends ApolloServerBase { }, }); }); - } else { - return callback(null, successfulResponse); - } + } else { + return callback(null, successfulResponse); + } } if (this.playgroundOptions && event.httpMethod === 'GET') { @@ -213,7 +236,9 @@ export class ApolloServer extends ApolloServerBase { } } + const response = new Writable() as ServerResponse; const callbackFilter: APIGatewayProxyCallback = (error, result) => { + response.end(); callback( error, result && { @@ -226,7 +251,37 @@ export class ApolloServer extends ApolloServerBase { ); }; - graphqlLambda(async () => { + const fileUploadHandler = (next: Function) => { + const contentType = + event.headers["content-type"] || event.headers["Content-Type"]; + if (contentType && contentType.startsWith("multipart/form-data") + && typeof processFileUploads === "function") { + const request = new FileUploadRequest() as IncomingMessage; + request.push( + Buffer.from( + event.body, + event.isBase64Encoded ? "base64" : "ascii" + ) + ); + request.push(null); + request.headers = event.headers; + processFileUploads(request, response, this.uploadsConfig || {}) + .then(body => { + event.body = body as any; + return next(); + }) + .catch(error => { + throw formatApolloErrors([error], { + formatter: this.requestOptions.formatError, + debug: this.requestOptions.debug, + }); + }); + } else { + return next(); + } + }; + + fileUploadHandler(() => graphqlLambda(async () => { // In a world where this `createHandler` was async, we might avoid this // but since we don't want to introduce a breaking change to this API // (by switching it to `async`), we'll leverage the @@ -236,7 +291,7 @@ export class ApolloServer extends ApolloServerBase { // its contract) prior to processing the request. await promiseWillStart; return this.createGraphQLServerOptions(event, context); - })(event, context, callbackFilter); + })(event, context, callbackFilter)); }; } } diff --git a/packages/apollo-server-lambda/src/__tests__/lambdaApollo.test.ts b/packages/apollo-server-lambda/src/__tests__/lambdaApollo.test.ts index 300071015ab..f26ebe65e7d 100644 --- a/packages/apollo-server-lambda/src/__tests__/lambdaApollo.test.ts +++ b/packages/apollo-server-lambda/src/__tests__/lambdaApollo.test.ts @@ -2,11 +2,16 @@ import { ApolloServer } from '../ApolloServer'; import testSuite, { schema as Schema, CreateAppOptions, + NODE_MAJOR_VERSION, } from 'apollo-server-integration-testsuite'; import { Config } from 'apollo-server-core'; -import url from 'url'; import { IncomingMessage, ServerResponse } from 'http'; +import url from 'url'; +import gql from 'graphql-tag'; +import request from 'supertest'; +import { APIGatewayProxyCallback } from "aws-lambda"; + const createLambda = (options: CreateAppOptions = {}) => { const server = new ApolloServer( (options.graphqlOptions as Config) || { schema: Schema }, @@ -16,7 +21,7 @@ const createLambda = (options: CreateAppOptions = {}) => { return (req: IncomingMessage, res: ServerResponse) => { // return 404 if path is /bogus-route to pass the test, lambda doesn't have paths - if (req.url.includes('/bogus-route')) { + if (req.url && req.url.includes('/bogus-route')) { res.statusCode = 404; return res.end(); } @@ -24,7 +29,7 @@ const createLambda = (options: CreateAppOptions = {}) => { let body = ''; req.on('data', chunk => (body += chunk)); req.on('end', () => { - const urlObject = url.parse(req.url, true); + const urlObject = url.parse(req.url || '', true); const event = { httpMethod: req.method, body: body, @@ -35,12 +40,22 @@ const createLambda = (options: CreateAppOptions = {}) => { }, headers: req.headers, }; - const callback = (error, result) => { - if (error) throw error; + const callback: APIGatewayProxyCallback = (error, result) => { + if (error) { + throw error; + } else { + result = result as NonNullable; + } res.statusCode = result.statusCode; for (let key in result.headers) { if (result.headers.hasOwnProperty(key)) { - res.setHeader(key, result.headers[key]); + if (typeof result.headers[key] === 'boolean') { + res.setHeader(key, result.headers[key].toString()); + } else { + // Without casting this to `any`, TS still believes `boolean` + // is possible. + res.setHeader(key, result.headers[key] as any); + } } } res.write(result.body); @@ -54,3 +69,144 @@ const createLambda = (options: CreateAppOptions = {}) => { describe('integration:Lambda', () => { testSuite(createLambda); }); + +const typeDefs = gql` + type File { + filename: String! + mimetype: String! + encoding: String! + } + type Query { + uploads: [File] + helloWorld: String + } + type Mutation { + singleUpload(file: Upload!): File! + multiUpload(files: [Upload!]!): [File]! + } +`; + +const resolvers = { + Query: { + uploads() { }, + helloWorld() { return 'hi'; } + }, + Mutation: { + async singleUpload(_parent: any, { file }: { file: any }) { + expect((await file).createReadStream).toBeDefined(); + return file; + }, + async multiUpload(_parent: any, { files }: { files: any }) { + const fileArray = await files; + fileArray.forEach(async (file: any) => { + expect((await file).createReadStream).toBeDefined(); + }); + return fileArray; + }, + }, +}; + +// NODE: graphql-upload (8.0.0) requires Node 8.5 or higher + +(NODE_MAJOR_VERSION < 8 ? describe.skip : describe)('file uploads', () => { + let app = null + beforeAll(async () => { + app = await createLambda({ + graphqlOptions: { + typeDefs, + resolvers, + }, + }); + }); + + it('allows for a standard query without uploads', async () => { + const req = request(app) + .post('/graphql') + .set('Content-Type', 'application/json') + .set('Accept', 'application/json') + .send({ + query: `query{helloWorld}` + }); + const res = await req; + expect(res.statusCode).toBe(200); + expect(res.body.data.helloWorld).toBe('hi') + }); + + it('allows for uploading a single file', async () => { + const expected = { + filename: 'package.json', + encoding: '7bit', + mimetype: 'application/json', + }; + + const req = request(app) + .post('/graphql') + .set('Content-Type', 'multipart/form-data') + .field( + 'operations', + JSON.stringify({ + query: ` + mutation($file: Upload!) { + singleUpload(file: $file) { + filename + encoding + mimetype + } + } + `, + variables: { + file: null, + }, + }), + ) + .field('map', JSON.stringify({ 0: ['variables.file'] })) + .attach('0', 'package.json'); + return req.then((res: any) => { + expect(res.status).toEqual(200); + expect(res.body.errors).toBeUndefined(); + expect(res.body.data.singleUpload).toEqual(expected); + }); + }); + + it('allows for uploading multiple files', async () => { + const expected = [{ + filename: 'package.json', + encoding: '7bit', + mimetype: 'application/json', + }, + { + filename: 'tsconfig.json', + encoding: '7bit', + mimetype: 'application/json', + }]; + + const req = request(app) + .post('/graphql') + .type('form') + .field( + 'operations', + JSON.stringify({ + query: ` + mutation($files: [Upload!]!) { + multiUpload(files: $files) { + filename + encoding + mimetype + } + } + `, + variables: { + files: [null, null], + }, + }), + ) + .field('map', JSON.stringify({ 0: ['variables.files.0'], 1: ['variables.files.1'] })) + .attach('0', 'package.json') + .attach('1', 'tsconfig.json'); + return req.then((res: any) => { + expect(res.status).toEqual(200); + expect(res.body.errors).toBeUndefined(); + expect(res.body.data.multiUpload).toEqual(expected); + }); + }); +}); diff --git a/packages/apollo-server-lambda/src/lambdaApollo.ts b/packages/apollo-server-lambda/src/lambdaApollo.ts index fb7fd1066ab..934c2959593 100644 --- a/packages/apollo-server-lambda/src/lambdaApollo.ts +++ b/packages/apollo-server-lambda/src/lambdaApollo.ts @@ -39,13 +39,24 @@ export function graphqlLambda( statusCode: 500, }); } + + const contentType = event.headers["content-type"] || event.headers["Content-Type"]; + let query: Record | Record[]; + + if (event.body && event.httpMethod === 'POST' && + contentType && contentType.startsWith("multipart/form-data") + ) { + query = event.body as any; + } else if (event.body && event.httpMethod === 'POST') { + query = JSON.parse(event.body); + } else { + query = event.queryStringParameters || {}; + } + runHttpQuery([event, context], { method: event.httpMethod, options: options, - query: - event.httpMethod === 'POST' && event.body - ? JSON.parse(event.body) - : event.queryStringParameters, + query, request: { url: event.path, method: event.httpMethod, From e8266d6ed37b1072041f9d6d9353caacdfaa069f Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Fri, 10 Apr 2020 15:08:46 +0300 Subject: [PATCH 365/642] Release - apollo-cache-control@0.10.0-alpha.0 - apollo-datasource-rest@0.9.0-alpha.0 - apollo-engine-reporting-protobuf@0.5.0-alpha.0 - apollo-engine-reporting@1.8.0-alpha.0 - @apollo/federation@0.15.0-alpha.0 - @apollo/gateway@0.15.0-alpha.0 - apollo-server-azure-functions@2.13.0-alpha.0 - apollo-server-cache-redis@1.2.0-alpha.0 - apollo-server-cloud-functions@2.13.0-alpha.0 - apollo-server-cloudflare@2.13.0-alpha.0 - apollo-server-core@2.13.0-alpha.0 - apollo-server-express@2.13.0-alpha.0 - apollo-server-fastify@2.13.0-alpha.0 - apollo-server-hapi@2.13.0-alpha.0 - apollo-server-integration-testsuite@2.13.0-alpha.0 - apollo-server-koa@2.13.0-alpha.0 - apollo-server-lambda@2.13.0-alpha.0 - apollo-server-micro@2.13.0-alpha.0 - apollo-server-plugin-base@0.8.0-alpha.0 - apollo-server-plugin-response-cache@0.5.0-alpha.0 - apollo-server-testing@2.13.0-alpha.0 - apollo-server-types@0.4.0-alpha.0 - apollo-server@2.13.0-alpha.0 - apollo-tracing@0.10.0-alpha.0 - graphql-extensions@0.12.0-alpha.0 --- packages/apollo-cache-control/CHANGELOG.md | 13 +++++++++++++ packages/apollo-cache-control/package.json | 2 +- packages/apollo-datasource-rest/CHANGELOG.md | 8 ++++++++ packages/apollo-datasource-rest/package.json | 2 +- .../apollo-engine-reporting-protobuf/CHANGELOG.md | 8 ++++++++ .../package-lock.json | 2 +- .../apollo-engine-reporting-protobuf/package.json | 2 +- packages/apollo-engine-reporting/CHANGELOG.md | 14 +++++++++++++- packages/apollo-engine-reporting/package.json | 2 +- packages/apollo-federation/CHANGELOG.md | 13 +++++++++++++ packages/apollo-federation/package.json | 2 +- packages/apollo-gateway/CHANGELOG.md | 13 +++++++++++++ packages/apollo-gateway/package.json | 2 +- .../apollo-server-azure-functions/CHANGELOG.md | 8 ++++++++ .../apollo-server-azure-functions/package.json | 2 +- packages/apollo-server-cache-redis/CHANGELOG.md | 8 ++++++++ packages/apollo-server-cache-redis/package.json | 2 +- .../apollo-server-cloud-functions/CHANGELOG.md | 8 ++++++++ .../apollo-server-cloud-functions/package.json | 2 +- packages/apollo-server-cloudflare/CHANGELOG.md | 8 ++++++++ packages/apollo-server-cloudflare/package.json | 2 +- packages/apollo-server-core/CHANGELOG.md | 13 +++++++++++++ packages/apollo-server-core/package.json | 2 +- packages/apollo-server-express/CHANGELOG.md | 8 ++++++++ packages/apollo-server-express/package.json | 2 +- packages/apollo-server-fastify/CHANGELOG.md | 8 ++++++++ packages/apollo-server-fastify/package.json | 2 +- packages/apollo-server-hapi/CHANGELOG.md | 8 ++++++++ packages/apollo-server-hapi/package.json | 2 +- .../CHANGELOG.md | 8 ++++++++ .../package.json | 2 +- packages/apollo-server-koa/CHANGELOG.md | 8 ++++++++ packages/apollo-server-koa/package.json | 2 +- packages/apollo-server-lambda/CHANGELOG.md | 8 ++++++++ packages/apollo-server-lambda/package.json | 2 +- packages/apollo-server-micro/CHANGELOG.md | 8 ++++++++ packages/apollo-server-micro/package.json | 2 +- packages/apollo-server-plugin-base/CHANGELOG.md | 14 +++++++++++++- packages/apollo-server-plugin-base/package.json | 2 +- .../CHANGELOG.md | 14 +++++++++++++- .../package.json | 2 +- packages/apollo-server-testing/CHANGELOG.md | 13 +++++++++++++ packages/apollo-server-testing/package.json | 2 +- packages/apollo-server-types/CHANGELOG.md | 14 +++++++++++++- packages/apollo-server-types/package.json | 2 +- packages/apollo-server/CHANGELOG.md | 13 +++++++++++++ packages/apollo-server/package.json | 2 +- packages/apollo-tracing/CHANGELOG.md | 8 ++++++++ packages/apollo-tracing/package.json | 2 +- packages/graphql-extensions/CHANGELOG.md | 13 +++++++++++++ packages/graphql-extensions/package.json | 2 +- 51 files changed, 281 insertions(+), 30 deletions(-) create mode 100644 packages/apollo-datasource-rest/CHANGELOG.md create mode 100644 packages/apollo-engine-reporting-protobuf/CHANGELOG.md create mode 100644 packages/apollo-server-azure-functions/CHANGELOG.md create mode 100644 packages/apollo-server-cache-redis/CHANGELOG.md create mode 100644 packages/apollo-server-cloud-functions/CHANGELOG.md create mode 100644 packages/apollo-server-cloudflare/CHANGELOG.md create mode 100644 packages/apollo-server-express/CHANGELOG.md create mode 100644 packages/apollo-server-fastify/CHANGELOG.md create mode 100644 packages/apollo-server-hapi/CHANGELOG.md create mode 100644 packages/apollo-server-integration-testsuite/CHANGELOG.md create mode 100644 packages/apollo-server-koa/CHANGELOG.md create mode 100644 packages/apollo-server-lambda/CHANGELOG.md create mode 100644 packages/apollo-server-micro/CHANGELOG.md create mode 100644 packages/apollo-tracing/CHANGELOG.md diff --git a/packages/apollo-cache-control/CHANGELOG.md b/packages/apollo-cache-control/CHANGELOG.md index 1e773242f21..257d6658b40 100644 --- a/packages/apollo-cache-control/CHANGELOG.md +++ b/packages/apollo-cache-control/CHANGELOG.md @@ -1,3 +1,16 @@ +# Change Log + +All notable changes to this project will be documented in this file. +See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +# [0.10.0-alpha.0](https://github.com/apollographql/apollo-cache-control-js/compare/apollo-cache-control@0.9.1...apollo-cache-control@0.10.0-alpha.0) (2020-04-10) + +**Note:** Version bump only for package apollo-cache-control + + + + + # Changelog > **A note on ommitted versions**: Due to the way that the Apollo Server diff --git a/packages/apollo-cache-control/package.json b/packages/apollo-cache-control/package.json index 95a50d0fde3..a14de3e4b15 100644 --- a/packages/apollo-cache-control/package.json +++ b/packages/apollo-cache-control/package.json @@ -1,6 +1,6 @@ { "name": "apollo-cache-control", - "version": "0.9.1", + "version": "0.10.0-alpha.0", "description": "A GraphQL extension for cache control", "main": "./dist/index.js", "types": "./dist/index.d.ts", diff --git a/packages/apollo-datasource-rest/CHANGELOG.md b/packages/apollo-datasource-rest/CHANGELOG.md new file mode 100644 index 00000000000..308412cf9a2 --- /dev/null +++ b/packages/apollo-datasource-rest/CHANGELOG.md @@ -0,0 +1,8 @@ +# Change Log + +All notable changes to this project will be documented in this file. +See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +# [0.9.0-alpha.0](https://github.com/apollographql/apollo-server/tree/master/packages/apollo-datasource-rest/compare/apollo-datasource-rest@0.8.1...apollo-datasource-rest@0.9.0-alpha.0) (2020-04-10) + +**Note:** Version bump only for package apollo-datasource-rest diff --git a/packages/apollo-datasource-rest/package.json b/packages/apollo-datasource-rest/package.json index 3a50b7f4c3b..704b5874340 100644 --- a/packages/apollo-datasource-rest/package.json +++ b/packages/apollo-datasource-rest/package.json @@ -1,6 +1,6 @@ { "name": "apollo-datasource-rest", - "version": "0.8.1", + "version": "0.9.0-alpha.0", "author": "opensource@apollographql.com", "license": "MIT", "repository": { diff --git a/packages/apollo-engine-reporting-protobuf/CHANGELOG.md b/packages/apollo-engine-reporting-protobuf/CHANGELOG.md new file mode 100644 index 00000000000..a115c84b5ab --- /dev/null +++ b/packages/apollo-engine-reporting-protobuf/CHANGELOG.md @@ -0,0 +1,8 @@ +# Change Log + +All notable changes to this project will be documented in this file. +See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +# [0.5.0-alpha.0](https://github.com/apollographql/apollo-engine-reporting/tree/master/packages/apollo-engine-reporting-protobuf/compare/apollo-engine-reporting-protobuf@0.4.4...apollo-engine-reporting-protobuf@0.5.0-alpha.0) (2020-04-10) + +**Note:** Version bump only for package apollo-engine-reporting-protobuf diff --git a/packages/apollo-engine-reporting-protobuf/package-lock.json b/packages/apollo-engine-reporting-protobuf/package-lock.json index e4e0db1249e..9ccfb67a783 100644 --- a/packages/apollo-engine-reporting-protobuf/package-lock.json +++ b/packages/apollo-engine-reporting-protobuf/package-lock.json @@ -1,6 +1,6 @@ { "name": "apollo-engine-reporting-protobuf", - "version": "0.4.4", + "version": "0.5.0-alpha.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/packages/apollo-engine-reporting-protobuf/package.json b/packages/apollo-engine-reporting-protobuf/package.json index 51e3e80ba08..f724ec97560 100644 --- a/packages/apollo-engine-reporting-protobuf/package.json +++ b/packages/apollo-engine-reporting-protobuf/package.json @@ -1,6 +1,6 @@ { "name": "apollo-engine-reporting-protobuf", - "version": "0.4.4", + "version": "0.5.0-alpha.0", "description": "Protobuf format for Apollo Engine", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-engine-reporting/CHANGELOG.md b/packages/apollo-engine-reporting/CHANGELOG.md index cb79cc96467..a61592046a0 100644 --- a/packages/apollo-engine-reporting/CHANGELOG.md +++ b/packages/apollo-engine-reporting/CHANGELOG.md @@ -1,3 +1,16 @@ +# Change Log + +All notable changes to this project will be documented in this file. +See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +# [1.8.0-alpha.0](https://github.com/apollographql/apollo-engine-reporting/compare/apollo-engine-reporting@1.7.1...apollo-engine-reporting@1.8.0-alpha.0) (2020-04-10) + +**Note:** Version bump only for package apollo-engine-reporting + + + + + ### vNext # v1.0.0 @@ -7,4 +20,3 @@ moved to the `apollo-graphql` package. They should be more universally helpful in that library, and should avoid tooling which needs to use them from needing to bring in all of `apollo-server-core`. - diff --git a/packages/apollo-engine-reporting/package.json b/packages/apollo-engine-reporting/package.json index f8dfc3f24a1..df8036f35cb 100644 --- a/packages/apollo-engine-reporting/package.json +++ b/packages/apollo-engine-reporting/package.json @@ -1,6 +1,6 @@ { "name": "apollo-engine-reporting", - "version": "1.7.1", + "version": "1.8.0-alpha.0", "description": "Send reports about your GraphQL services to Apollo Graph Manager (previously known as Apollo Engine)", "main": "./dist/index.js", "types": "./dist/index.d.ts", diff --git a/packages/apollo-federation/CHANGELOG.md b/packages/apollo-federation/CHANGELOG.md index bb287a57477..f6d1d333b9a 100644 --- a/packages/apollo-federation/CHANGELOG.md +++ b/packages/apollo-federation/CHANGELOG.md @@ -1,3 +1,16 @@ +# Change Log + +All notable changes to this project will be documented in this file. +See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +# [0.15.0-alpha.0](/compare/@apollo/federation@0.14.0...@apollo/federation@0.15.0-alpha.0) (2020-04-10) + +**Note:** Version bump only for package @apollo/federation + + + + + # CHANGELOG for `@apollo/federation` ### vNEXT diff --git a/packages/apollo-federation/package.json b/packages/apollo-federation/package.json index 0004853940d..b7df5abacad 100644 --- a/packages/apollo-federation/package.json +++ b/packages/apollo-federation/package.json @@ -1,6 +1,6 @@ { "name": "@apollo/federation", - "version": "0.14.0", + "version": "0.15.0-alpha.0", "description": "Apollo Federation Utilities", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-gateway/CHANGELOG.md b/packages/apollo-gateway/CHANGELOG.md index 63abdd2466a..a49ab76675b 100644 --- a/packages/apollo-gateway/CHANGELOG.md +++ b/packages/apollo-gateway/CHANGELOG.md @@ -1,3 +1,16 @@ +# Change Log + +All notable changes to this project will be documented in this file. +See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +# [0.15.0-alpha.0](/compare/@apollo/gateway@0.14.0...@apollo/gateway@0.15.0-alpha.0) (2020-04-10) + +**Note:** Version bump only for package @apollo/gateway + + + + + # CHANGELOG for `@apollo/gateway` ### vNEXT diff --git a/packages/apollo-gateway/package.json b/packages/apollo-gateway/package.json index 8d338126307..af57055d088 100644 --- a/packages/apollo-gateway/package.json +++ b/packages/apollo-gateway/package.json @@ -1,6 +1,6 @@ { "name": "@apollo/gateway", - "version": "0.14.0", + "version": "0.15.0-alpha.0", "description": "Apollo Gateway", "author": "opensource@apollographql.com", "main": "dist/index.js", diff --git a/packages/apollo-server-azure-functions/CHANGELOG.md b/packages/apollo-server-azure-functions/CHANGELOG.md new file mode 100644 index 00000000000..7d12d5b0b54 --- /dev/null +++ b/packages/apollo-server-azure-functions/CHANGELOG.md @@ -0,0 +1,8 @@ +# Change Log + +All notable changes to this project will be documented in this file. +See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +# [2.13.0-alpha.0](https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-azure-functions/compare/apollo-server-azure-functions@2.12.0...apollo-server-azure-functions@2.13.0-alpha.0) (2020-04-10) + +**Note:** Version bump only for package apollo-server-azure-functions diff --git a/packages/apollo-server-azure-functions/package.json b/packages/apollo-server-azure-functions/package.json index 1f2b267c1e1..fe8a9dd0fb7 100644 --- a/packages/apollo-server-azure-functions/package.json +++ b/packages/apollo-server-azure-functions/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-azure-functions", - "version": "2.12.0", + "version": "2.13.0-alpha.0", "description": "Production-ready Node.js GraphQL server for Azure Functions", "keywords": [ "GraphQL", diff --git a/packages/apollo-server-cache-redis/CHANGELOG.md b/packages/apollo-server-cache-redis/CHANGELOG.md new file mode 100644 index 00000000000..1e27de052e6 --- /dev/null +++ b/packages/apollo-server-cache-redis/CHANGELOG.md @@ -0,0 +1,8 @@ +# Change Log + +All notable changes to this project will be documented in this file. +See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +# [1.2.0-alpha.0](https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-cache-redis/compare/apollo-server-cache-redis@1.1.6...apollo-server-cache-redis@1.2.0-alpha.0) (2020-04-10) + +**Note:** Version bump only for package apollo-server-cache-redis diff --git a/packages/apollo-server-cache-redis/package.json b/packages/apollo-server-cache-redis/package.json index 65cee46fe15..6690dfc75f4 100644 --- a/packages/apollo-server-cache-redis/package.json +++ b/packages/apollo-server-cache-redis/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-cache-redis", - "version": "1.1.6", + "version": "1.2.0-alpha.0", "author": "opensource@apollographql.com", "license": "MIT", "repository": { diff --git a/packages/apollo-server-cloud-functions/CHANGELOG.md b/packages/apollo-server-cloud-functions/CHANGELOG.md new file mode 100644 index 00000000000..3c769188f06 --- /dev/null +++ b/packages/apollo-server-cloud-functions/CHANGELOG.md @@ -0,0 +1,8 @@ +# Change Log + +All notable changes to this project will be documented in this file. +See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +# [2.13.0-alpha.0](https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-cloud-functions/compare/apollo-server-cloud-functions@2.12.0...apollo-server-cloud-functions@2.13.0-alpha.0) (2020-04-10) + +**Note:** Version bump only for package apollo-server-cloud-functions diff --git a/packages/apollo-server-cloud-functions/package.json b/packages/apollo-server-cloud-functions/package.json index f04f58019d1..acd666fb18e 100644 --- a/packages/apollo-server-cloud-functions/package.json +++ b/packages/apollo-server-cloud-functions/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-cloud-functions", - "version": "2.12.0", + "version": "2.13.0-alpha.0", "description": "Production-ready Node.js GraphQL server for Google Cloud Functions", "keywords": [ "GraphQL", diff --git a/packages/apollo-server-cloudflare/CHANGELOG.md b/packages/apollo-server-cloudflare/CHANGELOG.md new file mode 100644 index 00000000000..3d992f8fc43 --- /dev/null +++ b/packages/apollo-server-cloudflare/CHANGELOG.md @@ -0,0 +1,8 @@ +# Change Log + +All notable changes to this project will be documented in this file. +See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +# [2.13.0-alpha.0](https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-cloudflare-workers/compare/apollo-server-cloudflare@2.12.0...apollo-server-cloudflare@2.13.0-alpha.0) (2020-04-10) + +**Note:** Version bump only for package apollo-server-cloudflare diff --git a/packages/apollo-server-cloudflare/package.json b/packages/apollo-server-cloudflare/package.json index c7d6d965ccf..fed35d9c09d 100644 --- a/packages/apollo-server-cloudflare/package.json +++ b/packages/apollo-server-cloudflare/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-cloudflare", - "version": "2.12.0", + "version": "2.13.0-alpha.0", "description": "Production-ready Node.js GraphQL server for Cloudflare workers", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-core/CHANGELOG.md b/packages/apollo-server-core/CHANGELOG.md index a188c3d0e47..b3652c52d60 100644 --- a/packages/apollo-server-core/CHANGELOG.md +++ b/packages/apollo-server-core/CHANGELOG.md @@ -1,3 +1,16 @@ +# Change Log + +All notable changes to this project will be documented in this file. +See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +# [2.13.0-alpha.0](https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-core/compare/apollo-server-core@2.12.0...apollo-server-core@2.13.0-alpha.0) (2020-04-10) + +**Note:** Version bump only for package apollo-server-core + + + + + # Changelog ### vNEXT diff --git a/packages/apollo-server-core/package.json b/packages/apollo-server-core/package.json index 3615c6e02a1..a6e8e5afde5 100644 --- a/packages/apollo-server-core/package.json +++ b/packages/apollo-server-core/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-core", - "version": "2.12.0", + "version": "2.13.0-alpha.0", "description": "Core engine for Apollo GraphQL server", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-express/CHANGELOG.md b/packages/apollo-server-express/CHANGELOG.md new file mode 100644 index 00000000000..3daf80a77c2 --- /dev/null +++ b/packages/apollo-server-express/CHANGELOG.md @@ -0,0 +1,8 @@ +# Change Log + +All notable changes to this project will be documented in this file. +See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +# [2.13.0-alpha.0](https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-express/compare/apollo-server-express@2.12.0...apollo-server-express@2.13.0-alpha.0) (2020-04-10) + +**Note:** Version bump only for package apollo-server-express diff --git a/packages/apollo-server-express/package.json b/packages/apollo-server-express/package.json index a123e0597c0..7c0fa05eded 100644 --- a/packages/apollo-server-express/package.json +++ b/packages/apollo-server-express/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-express", - "version": "2.12.0", + "version": "2.13.0-alpha.0", "description": "Production-ready Node.js GraphQL server for Express and Connect", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-fastify/CHANGELOG.md b/packages/apollo-server-fastify/CHANGELOG.md new file mode 100644 index 00000000000..9c5d2b5671d --- /dev/null +++ b/packages/apollo-server-fastify/CHANGELOG.md @@ -0,0 +1,8 @@ +# Change Log + +All notable changes to this project will be documented in this file. +See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +# [2.13.0-alpha.0](https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-fastify/compare/apollo-server-fastify@2.12.0...apollo-server-fastify@2.13.0-alpha.0) (2020-04-10) + +**Note:** Version bump only for package apollo-server-fastify diff --git a/packages/apollo-server-fastify/package.json b/packages/apollo-server-fastify/package.json index 7c20f460d5a..3911b5fc9ed 100644 --- a/packages/apollo-server-fastify/package.json +++ b/packages/apollo-server-fastify/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-fastify", - "version": "2.12.0", + "version": "2.13.0-alpha.0", "description": "Production-ready Node.js GraphQL server for Fastify", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-hapi/CHANGELOG.md b/packages/apollo-server-hapi/CHANGELOG.md new file mode 100644 index 00000000000..79590278004 --- /dev/null +++ b/packages/apollo-server-hapi/CHANGELOG.md @@ -0,0 +1,8 @@ +# Change Log + +All notable changes to this project will be documented in this file. +See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +# [2.13.0-alpha.0](https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-hapi/compare/apollo-server-hapi@2.12.0...apollo-server-hapi@2.13.0-alpha.0) (2020-04-10) + +**Note:** Version bump only for package apollo-server-hapi diff --git a/packages/apollo-server-hapi/package.json b/packages/apollo-server-hapi/package.json index 7d2fbed991d..2ca383df716 100644 --- a/packages/apollo-server-hapi/package.json +++ b/packages/apollo-server-hapi/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-hapi", - "version": "2.12.0", + "version": "2.13.0-alpha.0", "description": "Production-ready Node.js GraphQL server for Hapi", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-integration-testsuite/CHANGELOG.md b/packages/apollo-server-integration-testsuite/CHANGELOG.md new file mode 100644 index 00000000000..8b94809f115 --- /dev/null +++ b/packages/apollo-server-integration-testsuite/CHANGELOG.md @@ -0,0 +1,8 @@ +# Change Log + +All notable changes to this project will be documented in this file. +See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +# [2.13.0-alpha.0](https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-integration-testsuite/compare/apollo-server-integration-testsuite@2.12.0...apollo-server-integration-testsuite@2.13.0-alpha.0) (2020-04-10) + +**Note:** Version bump only for package apollo-server-integration-testsuite diff --git a/packages/apollo-server-integration-testsuite/package.json b/packages/apollo-server-integration-testsuite/package.json index 954fc609822..0e96cb4ae8f 100644 --- a/packages/apollo-server-integration-testsuite/package.json +++ b/packages/apollo-server-integration-testsuite/package.json @@ -1,7 +1,7 @@ { "name": "apollo-server-integration-testsuite", "private": true, - "version": "2.12.0", + "version": "2.13.0-alpha.0", "description": "Apollo Server Integrations testsuite", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-koa/CHANGELOG.md b/packages/apollo-server-koa/CHANGELOG.md new file mode 100644 index 00000000000..24b87433bda --- /dev/null +++ b/packages/apollo-server-koa/CHANGELOG.md @@ -0,0 +1,8 @@ +# Change Log + +All notable changes to this project will be documented in this file. +See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +# [2.13.0-alpha.0](https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-koa/compare/apollo-server-koa@2.12.0...apollo-server-koa@2.13.0-alpha.0) (2020-04-10) + +**Note:** Version bump only for package apollo-server-koa diff --git a/packages/apollo-server-koa/package.json b/packages/apollo-server-koa/package.json index 674891a0ba0..1ebdffedfbc 100644 --- a/packages/apollo-server-koa/package.json +++ b/packages/apollo-server-koa/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-koa", - "version": "2.12.0", + "version": "2.13.0-alpha.0", "description": "Production-ready Node.js GraphQL server for Koa", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-lambda/CHANGELOG.md b/packages/apollo-server-lambda/CHANGELOG.md new file mode 100644 index 00000000000..a15f1fb865c --- /dev/null +++ b/packages/apollo-server-lambda/CHANGELOG.md @@ -0,0 +1,8 @@ +# Change Log + +All notable changes to this project will be documented in this file. +See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +# [2.13.0-alpha.0](https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-lambda/compare/apollo-server-lambda@2.12.0...apollo-server-lambda@2.13.0-alpha.0) (2020-04-10) + +**Note:** Version bump only for package apollo-server-lambda diff --git a/packages/apollo-server-lambda/package.json b/packages/apollo-server-lambda/package.json index a33da3c6388..a61246cfd72 100644 --- a/packages/apollo-server-lambda/package.json +++ b/packages/apollo-server-lambda/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-lambda", - "version": "2.12.0", + "version": "2.13.0-alpha.0", "description": "Production-ready Node.js GraphQL server for AWS Lambda", "keywords": [ "GraphQL", diff --git a/packages/apollo-server-micro/CHANGELOG.md b/packages/apollo-server-micro/CHANGELOG.md new file mode 100644 index 00000000000..92bea404e46 --- /dev/null +++ b/packages/apollo-server-micro/CHANGELOG.md @@ -0,0 +1,8 @@ +# Change Log + +All notable changes to this project will be documented in this file. +See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +# [2.13.0-alpha.0](https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-micro/compare/apollo-server-micro@2.12.0...apollo-server-micro@2.13.0-alpha.0) (2020-04-10) + +**Note:** Version bump only for package apollo-server-micro diff --git a/packages/apollo-server-micro/package.json b/packages/apollo-server-micro/package.json index 73804efb918..1bff9664b56 100644 --- a/packages/apollo-server-micro/package.json +++ b/packages/apollo-server-micro/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-micro", - "version": "2.12.0", + "version": "2.13.0-alpha.0", "description": "Production-ready Node.js GraphQL server for Micro", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-plugin-base/CHANGELOG.md b/packages/apollo-server-plugin-base/CHANGELOG.md index ef45b84f48c..612c2a1969e 100644 --- a/packages/apollo-server-plugin-base/CHANGELOG.md +++ b/packages/apollo-server-plugin-base/CHANGELOG.md @@ -1,4 +1,16 @@ # Change Log -### vNEXT +All notable changes to this project will be documented in this file. +See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +# [0.8.0-alpha.0](/compare/apollo-server-plugin-base@0.7.1...apollo-server-plugin-base@0.8.0-alpha.0) (2020-04-10) + +**Note:** Version bump only for package apollo-server-plugin-base + + + + +# Change Log + +### vNEXT diff --git a/packages/apollo-server-plugin-base/package.json b/packages/apollo-server-plugin-base/package.json index db9b3b366ea..8d92d6f4170 100644 --- a/packages/apollo-server-plugin-base/package.json +++ b/packages/apollo-server-plugin-base/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-plugin-base", - "version": "0.7.1", + "version": "0.8.0-alpha.0", "description": "Apollo Server plugin base classes", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-plugin-response-cache/CHANGELOG.md b/packages/apollo-server-plugin-response-cache/CHANGELOG.md index ef45b84f48c..0e96aa73051 100644 --- a/packages/apollo-server-plugin-response-cache/CHANGELOG.md +++ b/packages/apollo-server-plugin-response-cache/CHANGELOG.md @@ -1,4 +1,16 @@ # Change Log -### vNEXT +All notable changes to this project will be documented in this file. +See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +# [0.5.0-alpha.0](https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-plugin-response-cache/compare/apollo-server-plugin-response-cache@0.4.1...apollo-server-plugin-response-cache@0.5.0-alpha.0) (2020-04-10) + +**Note:** Version bump only for package apollo-server-plugin-response-cache + + + + +# Change Log + +### vNEXT diff --git a/packages/apollo-server-plugin-response-cache/package.json b/packages/apollo-server-plugin-response-cache/package.json index f7f5a423846..5884edb1b71 100644 --- a/packages/apollo-server-plugin-response-cache/package.json +++ b/packages/apollo-server-plugin-response-cache/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-plugin-response-cache", - "version": "0.4.1", + "version": "0.5.0-alpha.0", "description": "Apollo Server full query response cache", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-testing/CHANGELOG.md b/packages/apollo-server-testing/CHANGELOG.md index d1c2295b906..21d0fb5fdcb 100644 --- a/packages/apollo-server-testing/CHANGELOG.md +++ b/packages/apollo-server-testing/CHANGELOG.md @@ -1,3 +1,16 @@ +# Change Log + +All notable changes to this project will be documented in this file. +See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +# [2.13.0-alpha.0](https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-testing/compare/apollo-server-testing@2.12.0...apollo-server-testing@2.13.0-alpha.0) (2020-04-10) + +**Note:** Version bump only for package apollo-server-testing + + + + + # Changelog ### vNEXT diff --git a/packages/apollo-server-testing/package.json b/packages/apollo-server-testing/package.json index 20bb1d1fb12..a0d8e72d84d 100644 --- a/packages/apollo-server-testing/package.json +++ b/packages/apollo-server-testing/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-testing", - "version": "2.12.0", + "version": "2.13.0-alpha.0", "description": "Test utils for apollo-server", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-types/CHANGELOG.md b/packages/apollo-server-types/CHANGELOG.md index ef45b84f48c..c36c667151e 100644 --- a/packages/apollo-server-types/CHANGELOG.md +++ b/packages/apollo-server-types/CHANGELOG.md @@ -1,4 +1,16 @@ # Change Log -### vNEXT +All notable changes to this project will be documented in this file. +See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +# [0.4.0-alpha.0](/compare/apollo-server-types@0.3.1...apollo-server-types@0.4.0-alpha.0) (2020-04-10) + +**Note:** Version bump only for package apollo-server-types + + + + +# Change Log + +### vNEXT diff --git a/packages/apollo-server-types/package.json b/packages/apollo-server-types/package.json index 2ffbe4d973a..0b00970488d 100644 --- a/packages/apollo-server-types/package.json +++ b/packages/apollo-server-types/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-types", - "version": "0.3.1", + "version": "0.4.0-alpha.0", "description": "Apollo Server shared types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server/CHANGELOG.md b/packages/apollo-server/CHANGELOG.md index f6c1bd04b49..b38a661a90f 100644 --- a/packages/apollo-server/CHANGELOG.md +++ b/packages/apollo-server/CHANGELOG.md @@ -1,3 +1,16 @@ +# Change Log + +All notable changes to this project will be documented in this file. +See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +# [2.13.0-alpha.0](https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server/compare/apollo-server@2.12.0...apollo-server@2.13.0-alpha.0) (2020-04-10) + +**Note:** Version bump only for package apollo-server + + + + + # Changelog ### vNEXT diff --git a/packages/apollo-server/package.json b/packages/apollo-server/package.json index f5e258f6961..5669ad553a3 100644 --- a/packages/apollo-server/package.json +++ b/packages/apollo-server/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server", - "version": "2.12.0", + "version": "2.13.0-alpha.0", "description": "Production ready GraphQL Server", "author": "opensource@apollographql.com", "main": "dist/index.js", diff --git a/packages/apollo-tracing/CHANGELOG.md b/packages/apollo-tracing/CHANGELOG.md new file mode 100644 index 00000000000..c442f7d0a9a --- /dev/null +++ b/packages/apollo-tracing/CHANGELOG.md @@ -0,0 +1,8 @@ +# Change Log + +All notable changes to this project will be documented in this file. +See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +# [0.10.0-alpha.0](https://github.com/apollographql/apollo-tracing-js/compare/apollo-tracing@0.9.1...apollo-tracing@0.10.0-alpha.0) (2020-04-10) + +**Note:** Version bump only for package apollo-tracing diff --git a/packages/apollo-tracing/package.json b/packages/apollo-tracing/package.json index 9261935ae0e..6fe6e4434d9 100644 --- a/packages/apollo-tracing/package.json +++ b/packages/apollo-tracing/package.json @@ -1,6 +1,6 @@ { "name": "apollo-tracing", - "version": "0.9.1", + "version": "0.10.0-alpha.0", "description": "Collect and expose trace data for GraphQL requests", "main": "./dist/index.js", "types": "./dist/index.d.ts", diff --git a/packages/graphql-extensions/CHANGELOG.md b/packages/graphql-extensions/CHANGELOG.md index fa589535e83..b587976e53f 100644 --- a/packages/graphql-extensions/CHANGELOG.md +++ b/packages/graphql-extensions/CHANGELOG.md @@ -1,3 +1,16 @@ +# Change Log + +All notable changes to this project will be documented in this file. +See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +# [0.12.0-alpha.0](https://github.com/apollographql/apollo-server/compare/graphql-extensions@0.11.1...graphql-extensions@0.12.0-alpha.0) (2020-04-10) + +**Note:** Version bump only for package graphql-extensions + + + + + # Changelog ### vNext diff --git a/packages/graphql-extensions/package.json b/packages/graphql-extensions/package.json index 92266750f03..137b8a44d3b 100644 --- a/packages/graphql-extensions/package.json +++ b/packages/graphql-extensions/package.json @@ -1,6 +1,6 @@ { "name": "graphql-extensions", - "version": "0.11.1", + "version": "0.12.0-alpha.0", "description": "Add extensions to GraphQL servers", "main": "./dist/index.js", "types": "./dist/index.d.ts", From d5b822f2d5cbfce098ce2b97757a7a8636fbf25b Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Fri, 10 Apr 2020 15:40:06 +0300 Subject: [PATCH 366/642] chore: Change link in release PR template to reference `is:closed`. --- .github/APOLLO_RELEASE_TEMPLATE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/APOLLO_RELEASE_TEMPLATE.md b/.github/APOLLO_RELEASE_TEMPLATE.md index bd8f896639c..fc1f71a4724 100644 --- a/.github/APOLLO_RELEASE_TEMPLATE.md +++ b/.github/APOLLO_RELEASE_TEMPLATE.md @@ -1,6 +1,6 @@ Release X.Y.Z -As with [release PRs in the past](https://github.com/apollographql/apollo-server/labels/%F0%9F%8F%97%20release), this is a PR tracking a `release-x.y.z` branch for an upcoming release of Apollo Server. 🙌 The version in the title of this PR should correspond to the appropriate branch. +As with [release PRs in the past](https://github.com/apollographql/apollo-server/issues?q=label%3A%22%F0%9F%8F%97+release%22+is%3Aclosed), this is a PR tracking a `release-x.y.z` branch for an upcoming release of Apollo Server. 🙌 The version in the title of this PR should correspond to the appropriate branch. Check the appropriate milestone (to the right) for more details on what we hope to get into this release! From a9c4e8bb063e028a83b6fde2562c9888a3cb2e53 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Fri, 10 Apr 2020 15:41:40 +0300 Subject: [PATCH 367/642] changelog: Remove rogue bullet-point left behind in merge conflict. --- CHANGELOG.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index acffd5971b5..c6f5526f517 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,8 +28,6 @@ The version headers in this history reflect the versions of Apollo Server itself - The range of accepted `peerDepedencies` versions for `graphql` has been widened to include `graphql@^15.0.0-rc.2` so as to accommodate the latest release-candidate of the `graphql@15` package, and an intention to support it when it is finally released on the `latest` npm tag. While this change will subdue peer dependency warnings for Apollo Server packages, many dependencies from outside of this repository will continue to raise similar warnings until those packages own `peerDependencies` are updated. It is unlikely that all of those packages will update their ranges prior to the final version of `graphql@15` being released, but if everything is working as expected, the warnings can be safely ignored. [PR #3825](https://github.com/apollographql/apollo-server/pull/3825) -- `apollo-server-lambda`: Support file uploads on AWS Lambda [Issue #1419](https://github.com/apollographql/apollo-server/issues/1419) [Issue #1703](https://github.com/apollographql/apollo-server/issues/1703) [PR #3926](https://github.com/apollographql/apollo-server/pull/3926) - ### v2.10.1 > [See complete versioning details.](https://github.com/apollographql/apollo-server/commit/dba97895485d6444535a684d4646f1363954f698) From b3b309d635c164660c00a978752813b2a4e40ce9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 10 Apr 2020 13:14:06 +0000 Subject: [PATCH 368/642] chore(deps): update dependency apollo-link-http to v1.5.17 (#3967) Co-authored-by: Renovate Bot --- package-lock.json | 18 +++++++++--------- package.json | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index b225e8d8d4f..22604d0cf51 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4342,23 +4342,23 @@ } }, "apollo-link-http": { - "version": "1.5.16", - "resolved": "https://registry.npmjs.org/apollo-link-http/-/apollo-link-http-1.5.16.tgz", - "integrity": "sha512-IA3xA/OcrOzINRZEECI6IdhRp/Twom5X5L9jMehfzEo2AXdeRwAMlH5LuvTZHgKD8V1MBnXdM6YXawXkTDSmJw==", + "version": "1.5.17", + "resolved": "https://registry.npmjs.org/apollo-link-http/-/apollo-link-http-1.5.17.tgz", + "integrity": "sha512-uWcqAotbwDEU/9+Dm9e1/clO7hTB2kQ/94JYcGouBVLjoKmTeJTUPQKcJGpPwUjZcSqgYicbFqQSoJIW0yrFvg==", "dev": true, "requires": { - "apollo-link": "^1.2.13", - "apollo-link-http-common": "^0.2.15", + "apollo-link": "^1.2.14", + "apollo-link-http-common": "^0.2.16", "tslib": "^1.9.3" } }, "apollo-link-http-common": { - "version": "0.2.15", - "resolved": "https://registry.npmjs.org/apollo-link-http-common/-/apollo-link-http-common-0.2.15.tgz", - "integrity": "sha512-+Heey4S2IPsPyTf8Ag3PugUupASJMW894iVps6hXbvwtg1aHSNMXUYO5VG7iRHkPzqpuzT4HMBanCTXPjtGzxg==", + "version": "0.2.16", + "resolved": "https://registry.npmjs.org/apollo-link-http-common/-/apollo-link-http-common-0.2.16.tgz", + "integrity": "sha512-2tIhOIrnaF4UbQHf7kjeQA/EmSorB7+HyJIIrUjJOKBgnXwuexi8aMecRlqTIDWcyVXCeqLhUnztMa6bOH/jTg==", "dev": true, "requires": { - "apollo-link": "^1.2.13", + "apollo-link": "^1.2.14", "ts-invariant": "^0.4.0", "tslib": "^1.9.3" } diff --git a/package.json b/package.json index 5a187ddedc2..a391fa95344 100644 --- a/package.json +++ b/package.json @@ -87,7 +87,7 @@ "@types/ws": "6.0.4", "apollo-fetch": "0.7.0", "apollo-link": "1.2.14", - "apollo-link-http": "1.5.16", + "apollo-link-http": "1.5.17", "apollo-link-persisted-queries": "0.2.2", "azure-functions-ts-essentials": "1.3.2", "body-parser": "1.19.0", From 1ba100163c044669b0a9037f14009090f46dcdfd Mon Sep 17 00:00:00 2001 From: Corey Ford Date: Fri, 10 Apr 2020 06:35:45 -0700 Subject: [PATCH 369/642] chore(federation,gateway): use SPDX'd `license` attr. in `package.json`. Both `@apollo/gateway` and `@apollo/federation` have been MIT since their original public release. Using the correct `SPDX` identifier will help automated license checkers ensure compliance with their licensing desires. Ref: https://docs.npmjs.com/files/package.json#license --- packages/apollo-federation/package.json | 2 +- packages/apollo-gateway/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/apollo-federation/package.json b/packages/apollo-federation/package.json index b7df5abacad..a3729b6909a 100644 --- a/packages/apollo-federation/package.json +++ b/packages/apollo-federation/package.json @@ -6,7 +6,7 @@ "types": "dist/index.d.ts", "keywords": [], "author": "Apollo ", - "license": "SEE LICENSE IN LICENSE.md", + "license": "MIT", "engines": { "node": ">=8" }, diff --git a/packages/apollo-gateway/package.json b/packages/apollo-gateway/package.json index af57055d088..0aa03ac9b84 100644 --- a/packages/apollo-gateway/package.json +++ b/packages/apollo-gateway/package.json @@ -14,7 +14,7 @@ "engines": { "node": ">=8" }, - "license": "SEE LICENSE IN LICENSE.md", + "license": "MIT", "publishConfig": { "access": "public" }, From 1bda94d91a92c1d05dce928c9af4b500a8135945 Mon Sep 17 00:00:00 2001 From: Joshua Segaran Date: Fri, 13 Mar 2020 14:17:46 -0700 Subject: [PATCH 370/642] Update reports.proto --- .../src/reports.proto | 150 ++---------------- 1 file changed, 16 insertions(+), 134 deletions(-) diff --git a/packages/apollo-engine-reporting-protobuf/src/reports.proto b/packages/apollo-engine-reporting-protobuf/src/reports.proto index 55cb2b39c93..9000a85d254 100644 --- a/packages/apollo-engine-reporting-protobuf/src/reports.proto +++ b/packages/apollo-engine-reporting-protobuf/src/reports.proto @@ -24,15 +24,9 @@ message Trace { map variables_json = 4; // Deprecated. Engineproxy did not encode variable values as JSON, so you // couldn't tell numbers from numeric strings. Send variables_json instead. - map variables = 1; - // Optional: this is the original full query before the signature algorithm - // is applied. Engineproxy always sent this in all traces, which meant that - // literal-masking done by the signature algorithm didn't fully hide - // sensitive data from Engine servers. apollo-engine-reporting does not - // include this by default. (The Engine frontend does not currently show - // this field.) - string raw_query = 2; - // Don't include this in traces inside a FullTracesReport; the operation + map deprecated_variables = 1; + // This is deprecated and only used for legacy applications + // don't include this in traces inside a FullTracesReport; the operation // name for these traces comes from the key of the traces_per_query map. string operation_name = 3; } @@ -139,8 +133,6 @@ message Trace { // This might include an operation signature, requires directive, reference resolutions, etc. string serviceName = 1; - bool traceParsingFailed = 2; - // This Trace only contains start_time, end_time, duration_ns, and root; // all timings were calculated **on the federated service**, and clock skew // will be handled by the ingress server. @@ -240,9 +232,6 @@ message Trace { // -------------------------------------------------------------- // Fields below this line are only set by the old Go engineproxy. - google.protobuf.Timestamp origin_reported_start_time = 15; - google.protobuf.Timestamp origin_reported_end_time = 16; - uint64 origin_reported_duration_ns = 17; // Older agents (eg the Go engineproxy) relied to some degree on the Engine // backend to run their own semi-compatible implementation of a specific @@ -252,7 +241,6 @@ message Trace { // Deprecated and ignored in FullTracesReports. string legacy_signature_needs_resigning = 5; - // removed: Node parse = 12; Node validate = 13; // Id128 server_id = 1; Id128 client_id = 2; reserved 12, 13, 1, 2; @@ -266,7 +254,6 @@ message Trace { // agent_version, etc.) is sent by the Apollo Engine Reporting agent, but we do not currently save that // information to any of our persistent storage. message ReportHeader { - string service = 3; // eg "host-01.example.com" string hostname = 5; @@ -282,6 +269,8 @@ message ReportHeader { string schema_tag = 10; // The hex representation of the sha512 of the introspection response string schema_hash = 11; + + reserved 3; // removed string service = 3; } message PathErrorStats { @@ -290,33 +279,6 @@ message PathErrorStats { uint64 requests_with_errors_count = 5; } -message ClientNameStats { - // Duration histogram for non-cache-hit queries. - // (See docs/histograms.md for the histogram format.) - repeated int64 latency_count = 1; - reserved 2; // removed: repeated uint64 error_count = 2; - // These per-version fields were used to understand what versions contributed to this sample - // when we were implementing the aggregation of this information ourselves using BigTable. - // However, since the per-version stats don't separate out latency, it makes more sense to - // have stats reported with contextual information so we can have the specific breakdown we're - // looking for. These fields are somewhat misleading as we never actually do any per-version - // awareness with anything reporting in the legacy "per_client_name" stats, and instead use - // "query_stats_with_context" to have more contextual information. - map requests_count_per_version = 3; // required - map cache_hits_per_version = 4; - map persisted_query_hits_per_version = 10; - map persisted_query_misses_per_version = 11; - map registered_operation_count_per_version = 12; - map forbidden_operation_count_per_version = 13; - repeated int64 cache_latency_count = 5; // Duration histogram; see docs/histograms.md - PathErrorStats root_error_stats = 6; - uint64 requests_with_errors_count = 7; - // TTL histograms for cache misses for the public cache. - repeated int64 public_cache_ttl_count = 8; - // TTL histograms for cache misses for the private cache. - repeated int64 private_cache_ttl_count = 9; -} - message QueryLatencyStats { repeated int64 latency_count = 1; uint64 request_count = 2; @@ -349,39 +311,18 @@ message ContextualizedTypeStats { } message FieldStat { - string name = 2; // deprecated; only set when stored in TypeStat.field string return_type = 3; // required; eg "String!" for User.email:String! uint64 errors_count = 4; uint64 count = 5; uint64 requests_with_errors_count = 6; repeated int64 latency_count = 8; // Duration histogram; see docs/histograms.md + reserved 1, 2, 7; } message TypeStat { - string name = 1; // deprecated; only set when stored in QueryStats.per_type - repeated FieldStat field = 2; // deprecated; use per_field_stat instead // Key is (eg) "email" for User.email:String! map per_field_stat = 3; -} - -message QueryStats { - // Either per_client_name (for back-compat) or query_stats_with_context must be specified. If both are - // specified, then query_stats_with_context will be used and per_client_name will be ignored. Although - // the fields in ClientNameStats mention things "per-version," the information in the "per-version" - // fields will only ever be over the default version, the empty String: "", if arrived at via the - // FullTracesAggregator. - map per_client_name = 1; // deprecated; use stats_with_context instead - repeated ContextualizedQueryLatencyStats query_stats_with_context = 4; - repeated TypeStat per_type = 2; // deprecated; use type_stats_with_context instead - // Key is the parent type, e.g. "User" for User.email:String! - map per_type_stat = 3; // deprecated; use type_stats_with_context instead - repeated ContextualizedTypeStats type_stats_with_context = 5; -} - -// Top-level message type for the server-side traces endpoint -message TracesReport { - ReportHeader header = 1; // required - repeated Trace trace = 2; // required + reserved 1, 2; } message Field { @@ -394,68 +335,6 @@ message Type { repeated Field field = 2; } -message MemStats { - uint64 total_bytes = 1; // MemStats.Sys - uint64 stack_bytes = 2; // MemStats.StackSys - uint64 heap_bytes = 3; // MemStats.HeapSys - uint64 heap_released_bytes = 13; // MemStats.HeapReleased - uint64 gc_overhead_bytes = 4; // MemStats.GCSys - - uint64 stack_used_bytes = 5; // MemStats.StackInuse - uint64 heap_allocated_bytes = 6; // MemStats.HeapAlloc - uint64 heap_allocated_objects = 7; // MemStats.HeapObjects - - uint64 heap_allocated_bytes_delta = 8; // MemStats.TotalAlloc delta - uint64 heap_allocated_objects_delta = 9; // MemStats.Mallocs delta - uint64 heap_freed_objects_delta = 10; // MemStats.Frees delta - - uint64 gc_stw_ns_delta = 11; // MemStats.PauseTotalNs delta - uint64 gc_count_delta = 12; // MemStats.NumGC delta -} - -message TimeStats { - uint64 uptime_ns = 1; - uint64 real_ns_delta = 2; - uint64 user_ns_delta = 3; - uint64 sys_ns_delta = 4; -} - -// Top-level message type for the server-side stats endpoint -message StatsReport { - ReportHeader header = 1; // required - - // These fields are about properties of the engineproxy and are not generated - // from FullTracesReports. - MemStats mem_stats = 2; - TimeStats time_stats = 3; - - // Beginning of the period over which stats are collected. - google.protobuf.Timestamp start_time = 8; - // End of the period of which stats are collected. - google.protobuf.Timestamp end_time = 9; - // Only used to interpret mem_stats and time_stats; not generated from - // FullTracesReports. - uint64 realtime_duration = 10; - - - // Maps from query descriptor to QueryStats. Required unless - // legacy_per_query_missing_operation_name is set. The keys are strings of the - // form `# operationName\nsignature` (literal hash and space), with - // operationName - if there is no operation name. - map per_query = 14; - - // Older agents (Go engineproxy) didn't explicitly include the operation name - // in the key of this map, and the server had to parse it out (after a - // re-signing operation which is no longer performed). The key here is just the query - // signature. Deprecated. - map legacy_per_query_implicit_operation_name = 12; - - // Deprecated: it was useful in Optics where we had access to the whole schema - // but has not been ever used in Engine. apollo-engine-reporting will not - // send it. - repeated Type type = 13; -} - // This is the top-level message used by the new traces ingress. This // is designed for the apollo-engine-reporting TypeScript agent and will // eventually be documented as a public ingress API. This message consists @@ -477,12 +356,15 @@ message FullTracesReport { map traces_per_query = 5; } -// Just a sequence of traces with the same statsReportKey. -message Traces { - repeated Trace trace = 1; +message ContextualizedStats { + StatsContext context = 1; + QueryLatencyStats query_latency_stats = 2; + // Key is type name. + map per_type_stat = 3; } -message TraceV1 { - ReportHeader header = 1; - Trace trace = 2; +// A sequence of traces and stats. An individual trace should either be counted as a stat or trace +message Traces { + repeated Trace trace = 1; + repeated ContextualizedStats stats_with_context = 2; } From 932d81760d56d78bad56f5289f5d4e29f1d9218f Mon Sep 17 00:00:00 2001 From: Joshua Segaran Date: Fri, 13 Mar 2020 14:32:30 -0700 Subject: [PATCH 371/642] Snake case fields --- packages/apollo-engine-reporting-protobuf/src/reports.proto | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/apollo-engine-reporting-protobuf/src/reports.proto b/packages/apollo-engine-reporting-protobuf/src/reports.proto index 9000a85d254..4b19dca0d20 100644 --- a/packages/apollo-engine-reporting-protobuf/src/reports.proto +++ b/packages/apollo-engine-reporting-protobuf/src/reports.proto @@ -131,7 +131,9 @@ message Trace { // XXX When we want to include more details about the sub-operation that was // executed against this service, we should include that here in each fetch node. // This might include an operation signature, requires directive, reference resolutions, etc. - string serviceName = 1; + string service_name = 1; + + bool trace_parsing_failed = 2; // This Trace only contains start_time, end_time, duration_ns, and root; // all timings were calculated **on the federated service**, and clock skew From 32bf5319ec85cbe6c8fc5b6715f4533e2f8b27bf Mon Sep 17 00:00:00 2001 From: Joshua Segaran Date: Thu, 9 Apr 2020 16:00:07 -0400 Subject: [PATCH 372/642] Update proto object and corresponding type names --- .../src/reports.proto | 17 ++++++++++++----- packages/apollo-engine-reporting/src/agent.ts | 18 ++++++++++-------- .../src/__tests__/gateway/reporting.test.ts | 4 ++-- .../src/ApolloServer.ts | 12 ++++++------ 4 files changed, 30 insertions(+), 21 deletions(-) diff --git a/packages/apollo-engine-reporting-protobuf/src/reports.proto b/packages/apollo-engine-reporting-protobuf/src/reports.proto index 4b19dca0d20..9f106f1c50b 100644 --- a/packages/apollo-engine-reporting-protobuf/src/reports.proto +++ b/packages/apollo-engine-reporting-protobuf/src/reports.proto @@ -341,10 +341,11 @@ message Type { // is designed for the apollo-engine-reporting TypeScript agent and will // eventually be documented as a public ingress API. This message consists // solely of traces; the equivalent of the StatsReport is automatically -// generated server-side from this message. Agents should send traces -// for all requests in this report. Generally, buffering up until a large +// generated server-side from this message. Agent should either send a trace or include it in the stats +// for every request in this report. Generally, buffering up until a large // size has been reached (say, 4MB) or 5-10 seconds has passed is appropriate. -message FullTracesReport { +// This message used to be know as FullTracesReport, but got renamed since it isn't just for traces anymore +message Report { ReportHeader header = 1; // key is statsReportKey (# operationName\nsignature) Note that the nested @@ -355,7 +356,13 @@ message FullTracesReport { // legacy_per_query_implicit_operation_name, and we don't require them to have // details.raw_query (which would consume a lot of space and has privacy/data // access issues, and isn't currently exposed by our app anyway). - map traces_per_query = 5; + map traces_per_query = 5; + + // This is the time that the requests in this trace are considered to have taken place + // If this field is not present the max of the end_time of each trace will be used instead. + // If there are no traces and no end_time present the report will not be able to be processed. + // Note: This will override the end_time from traces. + google.protobuf.Timestamp end_time = 2; // required if no traces in this message } message ContextualizedStats { @@ -366,7 +373,7 @@ message ContextualizedStats { } // A sequence of traces and stats. An individual trace should either be counted as a stat or trace -message Traces { +message TracesAndStats { repeated Trace trace = 1; repeated ContextualizedStats stats_with_context = 2; } diff --git a/packages/apollo-engine-reporting/src/agent.ts b/packages/apollo-engine-reporting/src/agent.ts index cab2ec9d982..ddb3849bbac 100644 --- a/packages/apollo-engine-reporting/src/agent.ts +++ b/packages/apollo-engine-reporting/src/agent.ts @@ -2,9 +2,7 @@ import os from 'os'; import { gzip } from 'zlib'; import { DocumentNode, GraphQLError } from 'graphql'; import { - FullTracesReport, ReportHeader, - Traces, Trace, } from 'apollo-engine-reporting-protobuf'; @@ -15,6 +13,10 @@ import { EngineReportingExtension } from './extension'; import { GraphQLRequestContext, Logger } from 'apollo-server-types'; import { InMemoryLRUCache } from 'apollo-server-caching'; import { defaultEngineReportingSignature } from 'apollo-graphql'; +import { + Report, + TracesAndStats +} from "apollo-engine-reporting-protobuf/dist/protobuf"; export interface ClientInfo { clientName?: string; @@ -222,12 +224,12 @@ export class EngineReportingAgent { private options: EngineReportingOptions; private logger: Logger = console; private apiKey: string; - private reports: { [schemaHash: string]: FullTracesReport } = Object.create( + private reports: { [schemaHash: string]: Report } = Object.create( null, ); private reportSizes: { [schemaHash: string]: number } = Object.create(null); private reportTimer: any; // timer typing is weird and node-specific - private sendReportsImmediately?: boolean; + private readonly sendReportsImmediately?: boolean; private stopped: boolean = false; private reportHeaders: { [schemaHash: string]: ReportHeader } = Object.create( null, @@ -330,7 +332,7 @@ export class EngineReportingAgent { const statsReportKey = `# ${operationName || '-'}\n${signature}`; if (!report.tracesPerQuery.hasOwnProperty(statsReportKey)) { - report.tracesPerQuery[statsReportKey] = new Traces(); + report.tracesPerQuery[statsReportKey] = new TracesAndStats(); (report.tracesPerQuery[statsReportKey] as any).encodedTraces = []; } // See comment on our override of Traces.encode inside of @@ -383,11 +385,11 @@ export class EngineReportingAgent { ); } - const protobufError = FullTracesReport.verify(report); + const protobufError = Report.verify(report); if (protobufError) { throw new Error(`Error encoding report: ${protobufError}`); } - const message = FullTracesReport.encode(report).finish(); + const message = Report.encode(report).finish(); const compressed = await new Promise((resolve, reject) => { // The protobuf library gives us a Uint8Array. Node 8's zlib lets us @@ -557,7 +559,7 @@ export class EngineReportingAgent { } private resetReport(schemaHash: string) { - this.reports[schemaHash] = new FullTracesReport({ + this.reports[schemaHash] = new Report({ header: this.reportHeaders[schemaHash], }); this.reportSizes[schemaHash] = 0; diff --git a/packages/apollo-gateway/src/__tests__/gateway/reporting.test.ts b/packages/apollo-gateway/src/__tests__/gateway/reporting.test.ts index ebd8ef7ddee..2be5a38c0ca 100644 --- a/packages/apollo-gateway/src/__tests__/gateway/reporting.test.ts +++ b/packages/apollo-gateway/src/__tests__/gateway/reporting.test.ts @@ -5,7 +5,7 @@ import { GraphQLSchemaModule } from 'apollo-graphql'; import gql from 'graphql-tag'; import { buildFederatedSchema } from '@apollo/federation'; import { ApolloServer } from 'apollo-server'; -import { FullTracesReport } from 'apollo-engine-reporting-protobuf'; +import { Reports } from 'apollo-engine-reporting-protobuf'; import { execute, toPromise } from 'apollo-link'; import { createHttpLink } from 'apollo-link-http'; import fetch from 'node-fetch'; @@ -189,7 +189,7 @@ describe('reporting', () => { // nock returns binary bodies as hex strings const gzipReportBuffer = Buffer.from(reportBody, 'hex'); const reportBuffer = gunzipSync(gzipReportBuffer); - const report = FullTracesReport.decode(reportBuffer); + const report = Reports.decode(reportBuffer); // Some handwritten tests to capture salient properties. const statsReportKey = '# -\n{me{name}topProducts{name}}'; diff --git a/packages/apollo-server-integration-testsuite/src/ApolloServer.ts b/packages/apollo-server-integration-testsuite/src/ApolloServer.ts index 176033dd152..ee2e03b655f 100644 --- a/packages/apollo-server-integration-testsuite/src/ApolloServer.ts +++ b/packages/apollo-server-integration-testsuite/src/ApolloServer.ts @@ -4,7 +4,7 @@ import { URL } from 'url'; import express = require('express'); import bodyParser = require('body-parser'); -import { FullTracesReport, Trace } from 'apollo-engine-reporting-protobuf'; +import { Reports, Trace } from 'apollo-engine-reporting-protobuf'; import { GraphQLSchema, @@ -795,12 +795,12 @@ export function testApolloServer( class EngineMockServer { private app: express.Application; private server: http.Server; - private reports: FullTracesReport[] = []; - public readonly promiseOfReports: Promise; + private reports: Reports[] = []; + public readonly promiseOfReports: Promise; constructor() { - let reportResolver: (reports: FullTracesReport[]) => void; - this.promiseOfReports = new Promise(resolve => { + let reportResolver: (reports: Reports[]) => void; + this.promiseOfReports = new Promise(resolve => { reportResolver = resolve; }); @@ -818,7 +818,7 @@ export function testApolloServer( ); this.app.use((req, res) => { - const report = FullTracesReport.decode(req.body); + const report = Reports.decode(req.body); this.reports.push(report); res.end(); From 56a3a72e5b5f12ef0482e9bf2f0eb335c74aed8f Mon Sep 17 00:00:00 2001 From: Joshua Segaran Date: Thu, 9 Apr 2020 16:05:06 -0400 Subject: [PATCH 373/642] Fix protobuf type error --- packages/apollo-engine-reporting-protobuf/src/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/apollo-engine-reporting-protobuf/src/index.js b/packages/apollo-engine-reporting-protobuf/src/index.js index 3d29a88efd8..16e8b65626b 100644 --- a/packages/apollo-engine-reporting-protobuf/src/index.js +++ b/packages/apollo-engine-reporting-protobuf/src/index.js @@ -15,8 +15,8 @@ protobufJS.configure(); // a casually noticeable effect on p50 times. This also makes it easier for us // to implement maxUncompressedReportSize as we know the encoded size of traces // as we go. -const originalTracesEncode = protobuf.Traces.encode; -protobuf.Traces.encode = function(message, originalWriter) { +const originalTracesEncode = protobuf.TracesAndStats.encode; +protobuf.TracesAndStats.encode = function(message, originalWriter) { const writer = originalTracesEncode(message, originalWriter); const encodedTraces = message.encodedTraces; if (encodedTraces != null && encodedTraces.length) { From 5801e0f29be75c411db73cfd22b0fa77361ee22e Mon Sep 17 00:00:00 2001 From: Joshua Segaran Date: Thu, 9 Apr 2020 16:46:46 -0400 Subject: [PATCH 374/642] Fix more changes --- packages/apollo-engine-reporting-protobuf/src/index.js | 4 ++-- .../apollo-gateway/src/__tests__/gateway/reporting.test.ts | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/apollo-engine-reporting-protobuf/src/index.js b/packages/apollo-engine-reporting-protobuf/src/index.js index 16e8b65626b..f50831c507c 100644 --- a/packages/apollo-engine-reporting-protobuf/src/index.js +++ b/packages/apollo-engine-reporting-protobuf/src/index.js @@ -15,9 +15,9 @@ protobufJS.configure(); // a casually noticeable effect on p50 times. This also makes it easier for us // to implement maxUncompressedReportSize as we know the encoded size of traces // as we go. -const originalTracesEncode = protobuf.TracesAndStats.encode; +const originalTracesAndStatsEncode = protobuf.TracesAndStats.encode; protobuf.TracesAndStats.encode = function(message, originalWriter) { - const writer = originalTracesEncode(message, originalWriter); + const writer = originalTracesAndStatsEncode(message, originalWriter); const encodedTraces = message.encodedTraces; if (encodedTraces != null && encodedTraces.length) { for (let i = 0; i < encodedTraces.length; ++i) { diff --git a/packages/apollo-gateway/src/__tests__/gateway/reporting.test.ts b/packages/apollo-gateway/src/__tests__/gateway/reporting.test.ts index 2be5a38c0ca..aa2a1662860 100644 --- a/packages/apollo-gateway/src/__tests__/gateway/reporting.test.ts +++ b/packages/apollo-gateway/src/__tests__/gateway/reporting.test.ts @@ -5,12 +5,12 @@ import { GraphQLSchemaModule } from 'apollo-graphql'; import gql from 'graphql-tag'; import { buildFederatedSchema } from '@apollo/federation'; import { ApolloServer } from 'apollo-server'; -import { Reports } from 'apollo-engine-reporting-protobuf'; import { execute, toPromise } from 'apollo-link'; import { createHttpLink } from 'apollo-link-http'; import fetch from 'node-fetch'; import { ApolloGateway } from '../..'; import { Plugin, Config, Refs } from 'pretty-format'; +import { Report } from 'apollo-engine-reporting-protobuf'; // Normalize specific fields that change often (eg timestamps) to static values, // to make snapshot testing viable. (If these helpers are more generally @@ -189,7 +189,7 @@ describe('reporting', () => { // nock returns binary bodies as hex strings const gzipReportBuffer = Buffer.from(reportBody, 'hex'); const reportBuffer = gunzipSync(gzipReportBuffer); - const report = Reports.decode(reportBuffer); + const report = Report.decode(reportBuffer); // Some handwritten tests to capture salient properties. const statsReportKey = '# -\n{me{name}topProducts{name}}'; @@ -219,6 +219,7 @@ describe('reporting', () => { expect(report).toMatchInlineSnapshot(` Object { + "endTime": null, "header": "
", "tracesPerQuery": Object { "# - From 789e8c9924dc9150f398f50e421d8dfab9f879f9 Mon Sep 17 00:00:00 2001 From: Joshua Segaran Date: Fri, 10 Apr 2020 09:51:06 -0400 Subject: [PATCH 375/642] Correct import --- .../src/ApolloServer.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/apollo-server-integration-testsuite/src/ApolloServer.ts b/packages/apollo-server-integration-testsuite/src/ApolloServer.ts index ee2e03b655f..521c52bcabd 100644 --- a/packages/apollo-server-integration-testsuite/src/ApolloServer.ts +++ b/packages/apollo-server-integration-testsuite/src/ApolloServer.ts @@ -4,7 +4,7 @@ import { URL } from 'url'; import express = require('express'); import bodyParser = require('body-parser'); -import { Reports, Trace } from 'apollo-engine-reporting-protobuf'; +import { Report, Trace } from 'apollo-engine-reporting-protobuf'; import { GraphQLSchema, @@ -795,12 +795,12 @@ export function testApolloServer( class EngineMockServer { private app: express.Application; private server: http.Server; - private reports: Reports[] = []; - public readonly promiseOfReports: Promise; + private reports: Report[] = []; + public readonly promiseOfReports: Promise; constructor() { - let reportResolver: (reports: Reports[]) => void; - this.promiseOfReports = new Promise(resolve => { + let reportResolver: (reports: Report[]) => void; + this.promiseOfReports = new Promise(resolve => { reportResolver = resolve; }); @@ -818,7 +818,7 @@ export function testApolloServer( ); this.app.use((req, res) => { - const report = Reports.decode(req.body); + const report = Report.decode(req.body); this.reports.push(report); res.end(); From 1f66d8c80bcb36fe10d8abe3483c85c06202b579 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 10 Apr 2020 13:14:06 +0000 Subject: [PATCH 376/642] chore(deps): update dependency apollo-link-http to v1.5.17 (#3967) Co-authored-by: Renovate Bot --- package-lock.json | 18 +++++++++--------- package.json | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index ae168e21bcb..776da4169a3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4367,23 +4367,23 @@ } }, "apollo-link-http": { - "version": "1.5.16", - "resolved": "https://registry.npmjs.org/apollo-link-http/-/apollo-link-http-1.5.16.tgz", - "integrity": "sha512-IA3xA/OcrOzINRZEECI6IdhRp/Twom5X5L9jMehfzEo2AXdeRwAMlH5LuvTZHgKD8V1MBnXdM6YXawXkTDSmJw==", + "version": "1.5.17", + "resolved": "https://registry.npmjs.org/apollo-link-http/-/apollo-link-http-1.5.17.tgz", + "integrity": "sha512-uWcqAotbwDEU/9+Dm9e1/clO7hTB2kQ/94JYcGouBVLjoKmTeJTUPQKcJGpPwUjZcSqgYicbFqQSoJIW0yrFvg==", "dev": true, "requires": { - "apollo-link": "^1.2.13", - "apollo-link-http-common": "^0.2.15", + "apollo-link": "^1.2.14", + "apollo-link-http-common": "^0.2.16", "tslib": "^1.9.3" } }, "apollo-link-http-common": { - "version": "0.2.15", - "resolved": "https://registry.npmjs.org/apollo-link-http-common/-/apollo-link-http-common-0.2.15.tgz", - "integrity": "sha512-+Heey4S2IPsPyTf8Ag3PugUupASJMW894iVps6hXbvwtg1aHSNMXUYO5VG7iRHkPzqpuzT4HMBanCTXPjtGzxg==", + "version": "0.2.16", + "resolved": "https://registry.npmjs.org/apollo-link-http-common/-/apollo-link-http-common-0.2.16.tgz", + "integrity": "sha512-2tIhOIrnaF4UbQHf7kjeQA/EmSorB7+HyJIIrUjJOKBgnXwuexi8aMecRlqTIDWcyVXCeqLhUnztMa6bOH/jTg==", "dev": true, "requires": { - "apollo-link": "^1.2.13", + "apollo-link": "^1.2.14", "ts-invariant": "^0.4.0", "tslib": "^1.9.3" } diff --git a/package.json b/package.json index 40b6c0d316d..4ae86497e56 100644 --- a/package.json +++ b/package.json @@ -88,7 +88,7 @@ "@types/ws": "6.0.4", "apollo-fetch": "0.7.0", "apollo-link": "1.2.14", - "apollo-link-http": "1.5.16", + "apollo-link-http": "1.5.17", "apollo-link-persisted-queries": "0.2.2", "azure-functions-ts-essentials": "1.3.2", "body-parser": "1.19.0", From 8eaa5d01898c0dab3f68bfa8f75e166ab9bb2219 Mon Sep 17 00:00:00 2001 From: Joshua Segaran Date: Fri, 10 Apr 2020 12:04:33 -0400 Subject: [PATCH 377/642] Don't import from dist --- packages/apollo-engine-reporting/src/agent.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-engine-reporting/src/agent.ts b/packages/apollo-engine-reporting/src/agent.ts index ddb3849bbac..0042924dcfb 100644 --- a/packages/apollo-engine-reporting/src/agent.ts +++ b/packages/apollo-engine-reporting/src/agent.ts @@ -16,7 +16,7 @@ import { defaultEngineReportingSignature } from 'apollo-graphql'; import { Report, TracesAndStats -} from "apollo-engine-reporting-protobuf/dist/protobuf"; +} from "apollo-engine-reporting-protobuf"; export interface ClientInfo { clientName?: string; From 69cd6f59ba77e0cfa61d58082e7c00e843e8f61d Mon Sep 17 00:00:00 2001 From: Joshua Segaran Date: Fri, 10 Apr 2020 12:47:31 -0400 Subject: [PATCH 378/642] Dedup import statements --- packages/apollo-engine-reporting/src/agent.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/apollo-engine-reporting/src/agent.ts b/packages/apollo-engine-reporting/src/agent.ts index 0042924dcfb..ef5f0f4f076 100644 --- a/packages/apollo-engine-reporting/src/agent.ts +++ b/packages/apollo-engine-reporting/src/agent.ts @@ -4,6 +4,8 @@ import { DocumentNode, GraphQLError } from 'graphql'; import { ReportHeader, Trace, + Report, + TracesAndStats } from 'apollo-engine-reporting-protobuf'; import { fetch, RequestAgent, Response } from 'apollo-server-env'; @@ -13,10 +15,6 @@ import { EngineReportingExtension } from './extension'; import { GraphQLRequestContext, Logger } from 'apollo-server-types'; import { InMemoryLRUCache } from 'apollo-server-caching'; import { defaultEngineReportingSignature } from 'apollo-graphql'; -import { - Report, - TracesAndStats -} from "apollo-engine-reporting-protobuf"; export interface ClientInfo { clientName?: string; From bbae9662207f6f2ce605a1a74841c94a0aee1391 Mon Sep 17 00:00:00 2001 From: Joshua Segaran Date: Fri, 10 Apr 2020 12:50:24 -0400 Subject: [PATCH 379/642] Add changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c6f5526f517..9f6db09c1a6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ The version headers in this history reflect the versions of Apollo Server itself > 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. When a release is being prepared, a new header will be (manually) created below and the the appropriate changes within that release will be moved into the new section. - `apollo-server-lambda`: Support file uploads on AWS Lambda [Issue #1419](https://github.com/apollographql/apollo-server/issues/1419) [Issue #1703](https://github.com/apollographql/apollo-server/issues/1703) [PR #3926](https://github.com/apollographql/apollo-server/pull/3926) +- **breaking** `apollo-engine-reporting-protobuf`: Drop legacy fields that were never used by `apollo-engine-reporting`. Added new fields `StatsContext` to allow `apollo-server` to send summary stats instead of full traces, and renamed `FullTracesReport` to `Report` and `Traces` to `TracesAndStats` since reports now can include stats as well as traces. ### v2.12.0 From e142463f7d0882db5681a5b75e41017d86cf9c76 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 11 Apr 2020 09:13:59 +0000 Subject: [PATCH 380/642] chore(deps): update dependency @types/aws-lambda to v8.10.48 (#3970) Co-authored-by: Renovate Bot --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 22604d0cf51..e833d18a7f2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3525,9 +3525,9 @@ } }, "@types/aws-lambda": { - "version": "8.10.47", - "resolved": "https://registry.npmjs.org/@types/aws-lambda/-/aws-lambda-8.10.47.tgz", - "integrity": "sha512-FIZjS1alDbH7qFpJxghmyS2g7h+DJjBj6Qhf2F4Nkz4LR+alTSvThQEAR2j9yRt7qlxDDxK/EagXDCURRSxo8A==" + "version": "8.10.48", + "resolved": "https://registry.npmjs.org/@types/aws-lambda/-/aws-lambda-8.10.48.tgz", + "integrity": "sha512-+qFDcssXvrdXIxBbKCJp0atg94TJVJSt5sx3Cu6LOQX/EV2mbInjgxGeKuLmFFBjoxD7G6fSytZoeC6A9fzTuw==" }, "@types/babel__core": { "version": "7.1.0", diff --git a/package.json b/package.json index a391fa95344..909d144fd5b 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ }, "devDependencies": { "@types/async-retry": "1.4.1", - "@types/aws-lambda": "8.10.47", + "@types/aws-lambda": "8.10.48", "@types/body-parser": "1.19.0", "@types/bunyan": "1.8.6", "@types/connect": "3.4.33", From bb77cf2de65806b309309aa7bc28d10ba46e4daf Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 11 Apr 2020 10:15:15 +0000 Subject: [PATCH 381/642] chore(deps): update dependency gatsby to v2.20.17 (#3972) Co-authored-by: Renovate Bot --- docs/package-lock.json | 181 ++++++++++++++++++++++------------------- docs/package.json | 2 +- 2 files changed, 100 insertions(+), 83 deletions(-) diff --git a/docs/package-lock.json b/docs/package-lock.json index 689ad71a417..6a3f90865a6 100644 --- a/docs/package-lock.json +++ b/docs/package-lock.json @@ -2948,9 +2948,9 @@ } }, "@types/react": { - "version": "16.9.32", - "resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.32.tgz", - "integrity": "sha512-fmejdp0CTH00mOJmxUPPbWCEBWPvRIL4m8r0qD+BSDUqmutPyGQCHifzMpMzdvZwROdEdL78IuZItntFWgPXHQ==", + "version": "16.9.34", + "resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.34.tgz", + "integrity": "sha512-8AJlYMOfPe1KGLKyHpflCg5z46n0b5DbRfqDksxBLBTUpB75ypDBAO9eCUcjNwE6LCUslwTz00yyG/X9gaVtow==", "requires": { "@types/prop-types": "*", "csstype": "^2.2.0" @@ -3013,42 +3013,42 @@ "optional": true }, "@typescript-eslint/eslint-plugin": { - "version": "2.26.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.26.0.tgz", - "integrity": "sha512-4yUnLv40bzfzsXcTAtZyTjbiGUXMrcIJcIMioI22tSOyAxpdXiZ4r7YQUU8Jj6XXrLz9d5aMHPQf5JFR7h27Nw==", + "version": "2.27.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.27.0.tgz", + "integrity": "sha512-/my+vVHRN7zYgcp0n4z5A6HAK7bvKGBiswaM5zIlOQczsxj/aiD7RcgD+dvVFuwFaGh5+kM7XA6Q6PN0bvb1tw==", "requires": { - "@typescript-eslint/experimental-utils": "2.26.0", + "@typescript-eslint/experimental-utils": "2.27.0", "functional-red-black-tree": "^1.0.1", "regexpp": "^3.0.0", "tsutils": "^3.17.1" } }, "@typescript-eslint/experimental-utils": { - "version": "2.26.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.26.0.tgz", - "integrity": "sha512-RELVoH5EYd+JlGprEyojUv9HeKcZqF7nZUGSblyAw1FwOGNnmQIU8kxJ69fttQvEwCsX5D6ECJT8GTozxrDKVQ==", + "version": "2.27.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.27.0.tgz", + "integrity": "sha512-vOsYzjwJlY6E0NJRXPTeCGqjv5OHgRU1kzxHKWJVPjDYGbPgLudBXjIlc+OD1hDBZ4l1DLbOc5VjofKahsu9Jw==", "requires": { "@types/json-schema": "^7.0.3", - "@typescript-eslint/typescript-estree": "2.26.0", + "@typescript-eslint/typescript-estree": "2.27.0", "eslint-scope": "^5.0.0", "eslint-utils": "^2.0.0" } }, "@typescript-eslint/parser": { - "version": "2.26.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.26.0.tgz", - "integrity": "sha512-+Xj5fucDtdKEVGSh9353wcnseMRkPpEAOY96EEenN7kJVrLqy/EVwtIh3mxcUz8lsFXW1mT5nN5vvEam/a5HiQ==", + "version": "2.27.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.27.0.tgz", + "integrity": "sha512-HFUXZY+EdwrJXZo31DW4IS1ujQW3krzlRjBrFRrJcMDh0zCu107/nRfhk/uBasO8m0NVDbBF5WZKcIUMRO7vPg==", "requires": { "@types/eslint-visitor-keys": "^1.0.0", - "@typescript-eslint/experimental-utils": "2.26.0", - "@typescript-eslint/typescript-estree": "2.26.0", + "@typescript-eslint/experimental-utils": "2.27.0", + "@typescript-eslint/typescript-estree": "2.27.0", "eslint-visitor-keys": "^1.1.0" } }, "@typescript-eslint/typescript-estree": { - "version": "2.26.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.26.0.tgz", - "integrity": "sha512-3x4SyZCLB4zsKsjuhxDLeVJN6W29VwBnYpCsZ7vIdPel9ZqLfIZJgJXO47MNUkurGpQuIBALdPQKtsSnWpE1Yg==", + "version": "2.27.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.27.0.tgz", + "integrity": "sha512-t2miCCJIb/FU8yArjAvxllxbTiyNqaXJag7UOpB5DVoM3+xnjeOngtqlJkLRnMtzaRcJhe3CIR9RmL40omubhg==", "requires": { "debug": "^4.1.1", "eslint-visitor-keys": "^1.1.0", @@ -3752,12 +3752,12 @@ "optional": true }, "autoprefixer": { - "version": "9.7.5", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.7.5.tgz", - "integrity": "sha512-URo6Zvt7VYifomeAfJlMFnYDhow1rk2bufwkbamPEAtQFcL11moLk4PnR7n9vlu7M+BkXAZkHFA0mIcY7tjQFg==", + "version": "9.7.6", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.7.6.tgz", + "integrity": "sha512-F7cYpbN7uVVhACZTeeIeealwdGM6wMtfWARVLTy5xmKtgVdBNJvbDRoCK3YO1orcs7gv/KwYlb3iXwu9Ug9BkQ==", "requires": { - "browserslist": "^4.11.0", - "caniuse-lite": "^1.0.30001036", + "browserslist": "^4.11.1", + "caniuse-lite": "^1.0.30001039", "chalk": "^2.4.2", "normalize-range": "^0.1.2", "num2fraction": "^1.2.2", @@ -3777,14 +3777,14 @@ } }, "caniuse-lite": { - "version": "1.0.30001039", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001039.tgz", - "integrity": "sha512-SezbWCTT34eyFoWHgx8UWso7YtvtM7oosmFoXbCkdC6qJzRfBTeTgE9REtKtiuKXuMwWTZEvdnFNGAyVMorv8Q==" + "version": "1.0.30001040", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001040.tgz", + "integrity": "sha512-Ep0tEPeI5wCvmJNrXjE3etgfI+lkl1fTDU6Y3ZH1mhrjkPlVI9W4pcKbMo+BQLpEWKVYYp2EmYaRsqpPC3k7lQ==" }, "electron-to-chromium": { - "version": "1.3.396", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.396.tgz", - "integrity": "sha512-ESY3UGekvNQwofHvgdsFW8GQEoudbqtJfoSDovnsCRRx8t0+0dPbE1XD/ZQdB+jbskSyPwUtIVYSyKwSXW/A6Q==" + "version": "1.3.403", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.403.tgz", + "integrity": "sha512-JaoxV4RzdBAZOnsF4dAlZ2ijJW72MbqO5lNfOBHUWiBQl3Rwe+mk2RCUMrRI3rSClLJ8HSNQNqcry12H+0ZjFw==" }, "node-releases": { "version": "1.1.53", @@ -5755,9 +5755,9 @@ } }, "core-js-pure": { - "version": "3.6.4", - "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.6.4.tgz", - "integrity": "sha512-epIhRLkXdgv32xIUFaaAry2wdxZYBi6bgM7cB136dzzXXa+dFyRLTZeLUJxnd8ShrmyVXBub63n2NHo2JAt8Cw==" + "version": "3.6.5", + "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.6.5.tgz", + "integrity": "sha512-lacdXOimsiD0QyNf9BC/mxivNJ/ybBGJXQFKzRekp1WTHoVUWsUHEn+2T8GJAzzIhyOuXA+gOxCVN3l+5PLPUA==" }, "core-util-is": { "version": "1.0.2", @@ -6425,9 +6425,9 @@ "integrity": "sha512-68s5jYdlvasItOJnCuI2Q9s4q98g0pCyL3HrcKJu8KNugUl8ahgmZYg38ysLTgQjjXX3H8CJLkAvWrclWfcalw==" }, "date-fns": { - "version": "2.11.1", - "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.11.1.tgz", - "integrity": "sha512-3RdUoinZ43URd2MJcquzBbDQo+J87cSzB8NkXdZiN5ia1UNyep0oCyitfiL88+R7clGTeq/RniXAc16gWyAu1w==" + "version": "2.12.0", + "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.12.0.tgz", + "integrity": "sha512-qJgn99xxKnFgB1qL4jpxU7Q2t0LOn1p8KMIveef3UZD7kqjT3tpFNNdXJelEHhE+rUgffriXriw/sOSU+cS1Hw==" }, "debug": { "version": "3.2.6", @@ -8065,9 +8065,9 @@ }, "dependencies": { "cross-spawn": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.1.tgz", - "integrity": "sha512-u7v4o84SwFpD32Z8IIcPZ6z1/ie24O6RU3RbtL5Y316l3KuHVPx9ItBgWQ6VlfAFnRnTtMUrsQ9MUUTuEZjogg==", + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.2.tgz", + "integrity": "sha512-PD6G8QG3S4FK/XCGFbEQrDqO2AnMMsy0meR7lerlIOHAAbkuavGU/pOqprrlvfTNjvowivTeBsjebAL0NSoMxw==", "requires": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -9367,9 +9367,9 @@ } }, "gatsby": { - "version": "2.20.12", - "resolved": "https://registry.npmjs.org/gatsby/-/gatsby-2.20.12.tgz", - "integrity": "sha512-HoyjJA432ZUKOgkzsOSEdSbo3Vhi3lhr5uw8JnebO4S9Cqc6J2kw9HNASwtYFGzZVClGrsYwXVaLcOnSKtZmxA==", + "version": "2.20.17", + "resolved": "https://registry.npmjs.org/gatsby/-/gatsby-2.20.17.tgz", + "integrity": "sha512-ikwsR5dbuhjrz9K01PHwuBGAxjUpjMxLHOKXqTV/ZfKtAPmZVRoMDMzD4284bGXUFsxYQNKSJogxAph5Mlj+Ug==", "requires": { "@babel/code-frame": "^7.8.3", "@babel/core": "^7.8.7", @@ -9432,7 +9432,7 @@ "flat": "^4.1.0", "fs-exists-cached": "1.0.0", "fs-extra": "^8.1.0", - "gatsby-cli": "^2.11.5", + "gatsby-cli": "^2.11.7", "gatsby-core-utils": "^1.1.1", "gatsby-graphiql-explorer": "^0.3.1", "gatsby-link": "^2.3.2", @@ -9551,16 +9551,26 @@ } }, "@babel/generator": { - "version": "7.9.4", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.4.tgz", - "integrity": "sha512-rjP8ahaDy/ouhrvCoU1E5mqaitWrxwuNGU+dy1EpaoK48jZay4MdkskKGIMHLZNewg8sAsqpGSREJwP0zH3YQA==", + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.5.tgz", + "integrity": "sha512-GbNIxVB3ZJe3tLeDm1HSn2AhuD/mVcyLDpgtLXa5tplmWrJdF/elxB56XNqCuD6szyNkDi6wuoKXln3QeBmCHQ==", "requires": { - "@babel/types": "^7.9.0", + "@babel/types": "^7.9.5", "jsesc": "^2.5.1", "lodash": "^4.17.13", "source-map": "^0.5.0" } }, + "@babel/helper-function-name": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz", + "integrity": "sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==", + "requires": { + "@babel/helper-get-function-arity": "^7.8.3", + "@babel/template": "^7.8.3", + "@babel/types": "^7.9.5" + } + }, "@babel/highlight": { "version": "7.9.0", "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz", @@ -9595,16 +9605,16 @@ } }, "@babel/traverse": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.0.tgz", - "integrity": "sha512-jAZQj0+kn4WTHO5dUZkZKhbFrqZE7K5LAQ5JysMnmvGij+wOdr+8lWqPeW0BcF4wFwrEXXtdGO7wcV6YPJcf3w==", + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.5.tgz", + "integrity": "sha512-c4gH3jsvSuGUezlP6rzSJ6jf8fYjLj3hsMZRx/nX0h+fmHN0w+ekubRrHPqnMec0meycA2nwCsJ7dC8IPem2FQ==", "requires": { "@babel/code-frame": "^7.8.3", - "@babel/generator": "^7.9.0", - "@babel/helper-function-name": "^7.8.3", + "@babel/generator": "^7.9.5", + "@babel/helper-function-name": "^7.9.5", "@babel/helper-split-export-declaration": "^7.8.3", "@babel/parser": "^7.9.0", - "@babel/types": "^7.9.0", + "@babel/types": "^7.9.5", "debug": "^4.1.0", "globals": "^11.1.0", "lodash": "^4.17.13" @@ -9621,13 +9631,20 @@ } }, "@babel/types": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.0.tgz", - "integrity": "sha512-BS9JKfXkzzJl8RluW4JGknzpiUV7ZrvTayM6yfqLTVBEnFtyowVIOu6rqxRd5cVO6yGoWf4T8u8dgK9oB+GCng==", + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.5.tgz", + "integrity": "sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==", "requires": { - "@babel/helper-validator-identifier": "^7.9.0", + "@babel/helper-validator-identifier": "^7.9.5", "lodash": "^4.17.13", "to-fast-properties": "^2.0.0" + }, + "dependencies": { + "@babel/helper-validator-identifier": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz", + "integrity": "sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==" + } } }, "ansi-regex": { @@ -9689,9 +9706,9 @@ } }, "gatsby-cli": { - "version": "2.11.5", - "resolved": "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-2.11.5.tgz", - "integrity": "sha512-yAvyplWx19dU5gYdWJETEMywbNTtL9HntlR65cHhznKiwrr6Jyao+TsE50CmgZ/8Vv2JMF3UZFd3vFRXb+aK7w==", + "version": "2.11.7", + "resolved": "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-2.11.7.tgz", + "integrity": "sha512-LORyxuKmZPX+0SGZcD1WXWVZYIcXzIZchENk3hY73WlARNj+qs+0y/+OR7wToydLoTu/iHQ/WZPF4mkwxvIiQQ==", "requires": { "@babel/code-frame": "^7.8.3", "@babel/runtime": "^7.8.7", @@ -11420,16 +11437,16 @@ } }, "graphql-playground-html": { - "version": "1.6.12", - "resolved": "https://registry.npmjs.org/graphql-playground-html/-/graphql-playground-html-1.6.12.tgz", - "integrity": "sha512-yOYFwwSMBL0MwufeL8bkrNDgRE7eF/kTHiwrqn9FiR9KLcNIl1xw9l9a+6yIRZM56JReQOHpbQFXTZn1IuSKRg==" + "version": "1.6.15", + "resolved": "https://registry.npmjs.org/graphql-playground-html/-/graphql-playground-html-1.6.15.tgz", + "integrity": "sha512-yRTKAOybHD6Lcb2/u4jkSkBzcz+Ppje8NmQuA0jn8Ou9T44qjm4vVwqkOW5ciugR/t4s5NilaWgvdbPMocfS6g==" }, "graphql-playground-middleware-express": { - "version": "1.7.12", - "resolved": "https://registry.npmjs.org/graphql-playground-middleware-express/-/graphql-playground-middleware-express-1.7.12.tgz", - "integrity": "sha512-17szgonnVSxWVrgblLRHHLjWnMUONfkULIwSunaMvYx8k5oG3yL86cyGCbHuDFUFkyr2swLhdfYl4mDfDXuvOA==", + "version": "1.7.13", + "resolved": "https://registry.npmjs.org/graphql-playground-middleware-express/-/graphql-playground-middleware-express-1.7.13.tgz", + "integrity": "sha512-dsB+3JSRGkaSE5GIZHKuOhAw0Ay/vXsqDiLPQNiu9vKg7291heA9g3jZHuDkGuHnsMzgFSNCHb6ovcN7KU4xpw==", "requires": { - "graphql-playground-html": "1.6.12" + "graphql-playground-html": "^1.6.15" } }, "graphql-request": { @@ -15102,9 +15119,9 @@ "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==" }, "p-limit": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz", - "integrity": "sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", "requires": { "p-try": "^2.0.0" } @@ -17182,9 +17199,9 @@ } }, "regexpp": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.0.0.tgz", - "integrity": "sha512-Z+hNr7RAVWxznLPuA7DIh8UNX1j9CDrUQxskw9IrBE1Dxue2lyXT+shqEIeLUjrokxIP8CMy1WkjgG3rTsd5/g==" + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz", + "integrity": "sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==" }, "regexpu-core": { "version": "4.6.0", @@ -19234,9 +19251,9 @@ } }, "string.prototype.trimend": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.0.tgz", - "integrity": "sha512-EEJnGqa/xNfIg05SxiPSqRS7S9qwDhYts1TSLR1BQfYUfPe1stofgGKvwERK9+9yf+PpfBMlpBaCHucXGPQfUA==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz", + "integrity": "sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==", "requires": { "define-properties": "^1.1.3", "es-abstract": "^1.17.5" @@ -19319,9 +19336,9 @@ } }, "string.prototype.trimstart": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.0.tgz", - "integrity": "sha512-iCP8g01NFYiiBOnwG1Xc3WZLyoo+RuBymwIlWncShXDDJYWN6DbnM3odslBJdgCdRlq94B5s63NWAZlcn2CS4w==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz", + "integrity": "sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==", "requires": { "define-properties": "^1.1.3", "es-abstract": "^1.17.5" @@ -19448,9 +19465,9 @@ "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==" }, "strip-json-comments": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.0.1.tgz", - "integrity": "sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw==" + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.0.tgz", + "integrity": "sha512-e6/d0eBu7gHtdCqFt0xJr642LdToM5/cN4Qb9DbHjVx1CP5RyeM+zH7pbecEmDv/lBqb0QH+6Uqq75rxFPkM0w==" }, "striptags": { "version": "3.1.1", diff --git a/docs/package.json b/docs/package.json index 9a276368ac0..b5655a94a87 100644 --- a/docs/package.json +++ b/docs/package.json @@ -6,7 +6,7 @@ "serve": "gatsby serve" }, "dependencies": { - "gatsby": "2.20.12", + "gatsby": "2.20.17", "gatsby-theme-apollo-docs": "4.1.4", "react": "16.13.1", "react-dom": "16.13.1" From bc9b3ecc4148226ef92fa336377e0f3fa8eaeb3c Mon Sep 17 00:00:00 2001 From: Michael Staib Date: Mon, 13 Apr 2020 18:42:51 +0200 Subject: [PATCH 382/642] Fixed a little type `FIELD_DEFINITON` to `FIELD_DEFINITION` (#3974) --- docs/source/federation/federation-spec.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/federation/federation-spec.md b/docs/source/federation/federation-spec.md index a118a4248bb..954ac3fcf59 100644 --- a/docs/source/federation/federation-spec.md +++ b/docs/source/federation/federation-spec.md @@ -276,7 +276,7 @@ When fetching `Review.product` from the Reviews service, it is possible to reque ### `@requires` ```graphql -directive @requires(fields: _FieldSet!) on FIELD_DEFINITON +directive @requires(fields: _FieldSet!) on FIELD_DEFINITION ``` The `@requires` directive is used to annotate the required input fieldset from a base type for a resolver. It is used to develop a query plan where the required fields may not be needed by the client, but the service may need additional information from other services. For example: From 87c8be4a3c1091a26cac420b95a669201736bd8b Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 14 Apr 2020 11:40:28 +0300 Subject: [PATCH 383/642] Update metrics.md --- docs/source/federation/metrics.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/federation/metrics.md b/docs/source/federation/metrics.md index dc3dc2b3745..3f21c638b65 100644 --- a/docs/source/federation/metrics.md +++ b/docs/source/federation/metrics.md @@ -16,7 +16,7 @@ The model of federated metrics is that implementing services report timing and e ## Turning it on -Ensure that all dependencies on `apollo-server` are at version `2.7.0` or higher. Provide an API key to your gateway via the `ENGINE_API_KEY` environment variable for the gateway to report metrics to the default ingress. To ensure that implementing services do not report metrics as well, do not provide them with an `ENGINE_API_KEY` or set `{ engine: true, reporting: false }` in the constructor options to ApolloServer. +Ensure that all dependencies on `apollo-server` are at version `2.7.0` or higher. Provide an API key to your gateway via the `ENGINE_API_KEY` environment variable for the gateway to report metrics to the default ingress. To ensure that implementing services do not report metrics as well, do not provide them with an `ENGINE_API_KEY` or set `{ engine: false }` in the constructor options to `ApolloServer`. These options will cause the Apollo gateway to collect tracing information from the underlying federated services and pass them on, along with the query plan, to the Apollo metrics ingress. Currently, only Apollo Server supports detailed metrics insights as an implementing service, but we would love to work with you to implement the protocol in other languages! From fcbff5bc358f938f169d5b998880cad8d171cf43 Mon Sep 17 00:00:00 2001 From: Trevor Scheer Date: Tue, 14 Apr 2020 04:11:14 -0700 Subject: [PATCH 384/642] fix: Engine config load issue (#3979) * Separate polling concerns from schema change subscription This commit separates the coupling of 2 unrelated concepts: polling for schema changes and registering schema change listeners. This coupling has been questionable for some time, but has become problematic with changes from the latest release branch `release-2.12.0`. Disentangling them is finally necessary. Previously, polling would begin once a schema change listener was registered. This operated independently of the initial `gateway.load` call. This means that if you registered a listener before "loading" the gateway, polling would kickoff before the gateway had initialized. After these changes, load and polling are coupled while schema change listener registration is completely independent of either. This allows a user/consumer to register listeners with no unexpected side effect, and then "load" the gateway when desirable. * Update tests --- .../__tests__/gateway/lifecycle-hooks.test.ts | 44 +++++++++--------- .../integration/networkRequests.test.ts | 45 ++++++++++++------- packages/apollo-gateway/src/index.ts | 14 +++--- 3 files changed, 58 insertions(+), 45 deletions(-) diff --git a/packages/apollo-gateway/src/__tests__/gateway/lifecycle-hooks.test.ts b/packages/apollo-gateway/src/__tests__/gateway/lifecycle-hooks.test.ts index 267c15cc984..bc2c77c30bf 100644 --- a/packages/apollo-gateway/src/__tests__/gateway/lifecycle-hooks.test.ts +++ b/packages/apollo-gateway/src/__tests__/gateway/lifecycle-hooks.test.ts @@ -2,7 +2,6 @@ import { ApolloGateway, GatewayConfig, Experimental_UpdateServiceDefinitions, - Experimental_DidUpdateCompositionCallback, } from '../../index'; import * as accounts from '../__fixtures__/schemas/accounts'; import * as books from '../__fixtures__/schemas/books'; @@ -69,8 +68,6 @@ describe('lifecycle hooks', () => { }); it('calls experimental_didUpdateComposition on schema update', async () => { - jest.useFakeTimers(); - const compositionMetadata = { formatVersion: 1, id: 'abc', @@ -111,26 +108,33 @@ describe('lifecycle hooks', () => { }; }); - const didUpdate: Experimental_DidUpdateCompositionCallback = () => {}; - const mockDidUpdate = jest.fn(didUpdate); + const mockDidUpdate = jest.fn(); const gateway = new ApolloGateway({ experimental_updateServiceDefinitions: mockUpdate, experimental_didUpdateComposition: mockDidUpdate, - experimental_pollInterval: 10, + experimental_pollInterval: 100, }); - await gateway.load(); + let resolve1: Function; + let resolve2: Function; + const schemaChangeBlocker1 = new Promise(res => (resolve1 = res)); + const schemaChangeBlocker2 = new Promise(res => (resolve2 = res)); + + gateway.onSchemaChange( + jest + .fn() + .mockImplementationOnce(() => resolve1()) + .mockImplementationOnce(() => resolve2()), + ); + + gateway.load(); + await schemaChangeBlocker1; expect(mockUpdate).toBeCalledTimes(1); expect(mockDidUpdate).toBeCalledTimes(1); - gateway.onSchemaChange(() => {}); - - jest.runOnlyPendingTimers(); - // XXX This allows the ApolloGateway.updateComposition() Promise to resolve - // after the poll ticks, and is necessary for allowing mockDidUpdate to see the expected calls. - await Promise.resolve(); + await schemaChangeBlocker2; expect(mockUpdate).toBeCalledTimes(2); expect(mockDidUpdate).toBeCalledTimes(2); @@ -179,8 +183,6 @@ describe('lifecycle hooks', () => { }); it('registers schema change callbacks when experimental_pollInterval is set for unmanaged configs', async () => { - jest.useFakeTimers(); - const experimental_updateServiceDefinitions: Experimental_UpdateServiceDefinitions = jest.fn( async (_config: GatewayConfig) => { return { serviceDefinitions, isNewSchema: true }; @@ -190,18 +192,18 @@ describe('lifecycle hooks', () => { const gateway = new ApolloGateway({ serviceList: [{ name: 'book', url: 'http://localhost:32542' }], experimental_updateServiceDefinitions, - experimental_pollInterval: 10, + experimental_pollInterval: 100, }); - const schemaChangeCallback = jest.fn(); + let resolve: Function; + const schemaChangeBlocker = new Promise(res => (resolve = res)); + const schemaChangeCallback = jest.fn(() => resolve()); gateway.onSchemaChange(schemaChangeCallback); + gateway.load(); - jest.runOnlyPendingTimers(); - await Promise.resolve(); + await schemaChangeBlocker; expect(schemaChangeCallback).toBeCalledTimes(1); - - jest.useRealTimers(); }); }); diff --git a/packages/apollo-gateway/src/__tests__/integration/networkRequests.test.ts b/packages/apollo-gateway/src/__tests__/integration/networkRequests.test.ts index df976f8029a..22d765b6903 100644 --- a/packages/apollo-gateway/src/__tests__/integration/networkRequests.test.ts +++ b/packages/apollo-gateway/src/__tests__/integration/networkRequests.test.ts @@ -202,26 +202,32 @@ it('Rollsback to a previous schema when triggered', async () => { let firstResolve: () => void; let secondResolve: () => void; + let thirdResolve: () => void const firstSchemaChangeBlocker = new Promise(res => (firstResolve = res)); const secondSchemaChangeBlocker = new Promise(res => (secondResolve = res)); + const thirdSchemaChangeBlocker = new Promise(res => (thirdResolve = res)); const onChange = jest .fn() .mockImplementationOnce(() => firstResolve()) - .mockImplementationOnce(() => secondResolve()); + .mockImplementationOnce(() => secondResolve()) + .mockImplementationOnce(() => thirdResolve()); const gateway = new ApolloGateway({ logger }); // @ts-ignore for testing purposes, a short pollInterval is ideal so we'll override here gateway.experimental_pollInterval = 100; - await gateway.load({ engine: { apiKeyHash, graphId } }); gateway.onSchemaChange(onChange); + await gateway.load({ engine: { apiKeyHash, graphId } }); await firstSchemaChangeBlocker; expect(onChange.mock.calls.length).toBe(1); await secondSchemaChangeBlocker; expect(onChange.mock.calls.length).toBe(2); + + await thirdSchemaChangeBlocker; + expect(onChange.mock.calls.length).toBe(3); }); function failNTimes(n: number, fn: () => nock.Interceptor) { @@ -359,9 +365,14 @@ describe('Downstream service health checks', () => { mockRawPartialSchemaSuccess(updatedService); mockServiceHealthCheckSuccess(updatedService); - let resolve: () => void; - const schemaChangeBlocker = new Promise(res => (resolve = res)); - const onChange = jest.fn().mockImplementationOnce(() => resolve()); + let resolve1: () => void; + let resolve2: () => void; + const schemaChangeBlocker1 = new Promise(res => (resolve1 = res)); + const schemaChangeBlocker2 = new Promise(res => (resolve2 = res)); + const onChange = jest + .fn() + .mockImplementationOnce(() => resolve1()) + .mockImplementationOnce(() => resolve2()); const gateway = new ApolloGateway({ serviceHealthCheck: true, @@ -370,12 +381,13 @@ describe('Downstream service health checks', () => { // @ts-ignore for testing purposes, a short pollInterval is ideal so we'll override here gateway.experimental_pollInterval = 100; - await gateway.load({ engine: { apiKeyHash, graphId } }); gateway.onSchemaChange(onChange); + gateway.load({ engine: { apiKeyHash, graphId } }); - await schemaChangeBlocker; + await schemaChangeBlocker1; expect(onChange.mock.calls.length).toBe(1); + await schemaChangeBlocker2; expect(gateway.schema!.getType('User')!.description).toBe('This is my updated User'); }); @@ -402,15 +414,16 @@ describe('Downstream service health checks', () => { // @ts-ignore for testing purposes, a short pollInterval is ideal so we'll override here gateway.experimental_pollInterval = 100; - // load the gateway as usual - await gateway.load({ engine: { apiKeyHash, graphId } }); - expect(gateway.schema!.getType('User')!.description).toBe('This is my User'); - // @ts-ignore for testing purposes, we'll call the original `updateComposition` - // function from our mock + // function from our mock. The first call should mimic original behavior, + // but the second call needs to handle the PromiseRejection. Typically for tests + // like these we would leverage the `gateway.onSchemaChange` callback to drive + // the test, but in this case, that callback isn't triggered when the update + // fails (as expected) so we get creative with the second mock as seen below. const original = gateway.updateComposition; const mockUpdateComposition = jest .fn(original) + .mockImplementationOnce(original) .mockImplementationOnce(async opts => { // mock the first poll and handle the error which would otherwise be caught // and logged from within the `pollServices` class method @@ -427,14 +440,16 @@ describe('Downstream service health checks', () => { // function on the gateway with our mock gateway.updateComposition = mockUpdateComposition; - // This kicks off polling within the gateway - gateway.onSchemaChange(() => {}); + // load the gateway as usual + await gateway.load({ engine: { apiKeyHash, graphId } }); + + expect(gateway.schema!.getType('User')!.description).toBe('This is my User'); await schemaChangeBlocker; // At this point, the mock update should have been called but the schema // should not have updated to the new one. - expect(mockUpdateComposition.mock.calls.length).toBe(1); + expect(mockUpdateComposition.mock.calls.length).toBe(2); expect(gateway.schema!.getType('User')!.description).toBe('This is my User'); }); }); diff --git a/packages/apollo-gateway/src/index.ts b/packages/apollo-gateway/src/index.ts index fa736d34a6f..bc9433e87e6 100644 --- a/packages/apollo-gateway/src/index.ts +++ b/packages/apollo-gateway/src/index.ts @@ -299,6 +299,11 @@ export class ApolloGateway implements GraphQLService { public async load(options?: { engine?: GraphQLServiceEngineConfig }) { await this.updateComposition(options); + + if (isManagedConfig(this.config) || this.experimental_pollInterval) { + if (!this.pollingTimer) this.pollServices(); + } + const { graphId, graphVariant } = (options && options.engine) || {}; const mode = isManagedConfig(this.config) ? 'managed' : 'unmanaged'; @@ -480,19 +485,10 @@ export class ApolloGateway implements GraphQLService { } public onSchemaChange(callback: SchemaChangeCallback): Unsubscriber { - if (!isManagedConfig(this.config) && !this.experimental_pollInterval) { - return () => {}; - } - this.onSchemaChangeListeners.add(callback); - if (!this.pollingTimer) this.pollServices(); return () => { this.onSchemaChangeListeners.delete(callback); - if (this.onSchemaChangeListeners.size === 0 && this.pollingTimer) { - clearInterval(this.pollingTimer!); - this.pollingTimer = undefined; - } }; } From 84fdcafd0b9024cf64ae88fedd52ec7adaf8c11f Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 14 Apr 2020 14:12:13 +0300 Subject: [PATCH 385/642] clarity: Change `getRemoteConfig` to `getManagedConfig` internally. This is a "remote" configuration, but specifically, it's the "stored" configuration which lives within Apollo Graph Manager's storage facilities. This is not to be confused with the "remote" config which can be fetched from a remote endpoint that is running a federated service which is typical in `serviceList` mode. --- packages/apollo-gateway/src/index.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/apollo-gateway/src/index.ts b/packages/apollo-gateway/src/index.ts index bc9433e87e6..1daf6097d69 100644 --- a/packages/apollo-gateway/src/index.ts +++ b/packages/apollo-gateway/src/index.ts @@ -563,7 +563,7 @@ export class ApolloGateway implements GraphQLService { // is invoked below. It is a helper, rather than an options object, since it // depends on the presence of `this.engineConfig`, which is guarded against // further down in this method in two separate places. - const getRemoteConfig = (engineConfig: GraphQLServiceEngineConfig) => { + const getManagedConfig = (engineConfig: GraphQLServiceEngineConfig) => { return getServiceDefinitionsFromStorage({ graphId: engineConfig.graphId, apiKeyHash: engineConfig.apiKeyHash, @@ -581,7 +581,7 @@ export class ApolloGateway implements GraphQLService { // This error helps avoid common misconfiguration. // We don't await this because a local configuration should assume // remote is unavailable for one reason or another. - getRemoteConfig(this.engineConfig).then(() => { + getManagedConfig(this.engineConfig).then(() => { this.logger.warn( "A local gateway service list is overriding an Apollo Graph " + "Manager managed configuration. To use the managed " + @@ -616,7 +616,7 @@ export class ApolloGateway implements GraphQLService { ); } - return getRemoteConfig(this.engineConfig); + return getManagedConfig(this.engineConfig); } // XXX Nothing guarantees that the only errors thrown or returned in From b1c8bc989b773c56ac9a2bbd81b25acd8fbf6f18 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 14 Apr 2020 14:16:07 +0300 Subject: [PATCH 386/642] Release - @apollo/federation@0.14.1-alpha.0 - @apollo/gateway@0.14.1-alpha.0 --- packages/apollo-federation/CHANGELOG.md | 13 +++++++++++++ packages/apollo-federation/package.json | 2 +- packages/apollo-gateway/CHANGELOG.md | 16 ++++++++++++++++ packages/apollo-gateway/package.json | 2 +- 4 files changed, 31 insertions(+), 2 deletions(-) diff --git a/packages/apollo-federation/CHANGELOG.md b/packages/apollo-federation/CHANGELOG.md index d78c53f24bc..14c35736e27 100644 --- a/packages/apollo-federation/CHANGELOG.md +++ b/packages/apollo-federation/CHANGELOG.md @@ -1,3 +1,16 @@ +# Change Log + +All notable changes to this project will be documented in this file. +See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.14.1-alpha.0](https://github.com/apollographql/apollo-server/compare/@apollo/federation@0.14.0...@apollo/federation@0.14.1-alpha.0) (2020-04-14) + +**Note:** Version bump only for package @apollo/federation + + + + + # CHANGELOG for `@apollo/federation` ## 0.14.0 diff --git a/packages/apollo-federation/package.json b/packages/apollo-federation/package.json index 0004853940d..27a4361d704 100644 --- a/packages/apollo-federation/package.json +++ b/packages/apollo-federation/package.json @@ -1,6 +1,6 @@ { "name": "@apollo/federation", - "version": "0.14.0", + "version": "0.14.1-alpha.0", "description": "Apollo Federation Utilities", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-gateway/CHANGELOG.md b/packages/apollo-gateway/CHANGELOG.md index c5856aa2e7b..c271a0491e7 100644 --- a/packages/apollo-gateway/CHANGELOG.md +++ b/packages/apollo-gateway/CHANGELOG.md @@ -1,3 +1,19 @@ +# Change Log + +All notable changes to this project will be documented in this file. +See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.14.1-alpha.0](https://github.com/apollographql/apollo-server/compare/@apollo/gateway@0.14.0...@apollo/gateway@0.14.1-alpha.0) (2020-04-14) + + +### Bug Fixes + +* Engine config load issue ([#3979](https://github.com/apollographql/apollo-server/issues/3979)) ([fcbff5b](https://github.com/apollographql/apollo-server/commit/fcbff5bc358f938f169d5b998880cad8d171cf43)) + + + + + # CHANGELOG for `@apollo/gateway` ## 0.14.0 diff --git a/packages/apollo-gateway/package.json b/packages/apollo-gateway/package.json index 8d338126307..e699f9b9c09 100644 --- a/packages/apollo-gateway/package.json +++ b/packages/apollo-gateway/package.json @@ -1,6 +1,6 @@ { "name": "@apollo/gateway", - "version": "0.14.0", + "version": "0.14.1-alpha.0", "description": "Apollo Gateway", "author": "opensource@apollographql.com", "main": "dist/index.js", From 85bf8085af6ea47702e34648d9acb4d78e847587 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 14 Apr 2020 15:51:28 +0300 Subject: [PATCH 387/642] Update CHANGELOG.md prior to releasing. --- packages/apollo-federation/CHANGELOG.md | 15 +++------------ packages/apollo-gateway/CHANGELOG.md | 18 +++--------------- 2 files changed, 6 insertions(+), 27 deletions(-) diff --git a/packages/apollo-federation/CHANGELOG.md b/packages/apollo-federation/CHANGELOG.md index 14c35736e27..c027b8057ad 100644 --- a/packages/apollo-federation/CHANGELOG.md +++ b/packages/apollo-federation/CHANGELOG.md @@ -1,17 +1,8 @@ -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - -## [0.14.1-alpha.0](https://github.com/apollographql/apollo-server/compare/@apollo/federation@0.14.0...@apollo/federation@0.14.1-alpha.0) (2020-04-14) - -**Note:** Version bump only for package @apollo/federation - - - +# CHANGELOG for `@apollo/federation` +## 0.14.1 -# CHANGELOG for `@apollo/federation` +- Only changes in the similarly versioned `@apollo/gateway` package. ## 0.14.0 diff --git a/packages/apollo-gateway/CHANGELOG.md b/packages/apollo-gateway/CHANGELOG.md index c271a0491e7..094e6521945 100644 --- a/packages/apollo-gateway/CHANGELOG.md +++ b/packages/apollo-gateway/CHANGELOG.md @@ -1,20 +1,8 @@ -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - -## [0.14.1-alpha.0](https://github.com/apollographql/apollo-server/compare/@apollo/gateway@0.14.0...@apollo/gateway@0.14.1-alpha.0) (2020-04-14) - - -### Bug Fixes - -* Engine config load issue ([#3979](https://github.com/apollographql/apollo-server/issues/3979)) ([fcbff5b](https://github.com/apollographql/apollo-server/commit/fcbff5bc358f938f169d5b998880cad8d171cf43)) - - - +# CHANGELOG for `@apollo/gateway` +## 0.14.1 -# CHANGELOG for `@apollo/gateway` +- __FIX__: Resolve condition which surfaced in `0.14.0` which prevented loading the configuration using managed federation. [PR #3979](https://github.com/apollographql/apollo-server/pull/3979) ## 0.14.0 From b898396e9fcd3b9092b168f9aac8466ca186fa6b Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 14 Apr 2020 15:52:55 +0300 Subject: [PATCH 388/642] Release - @apollo/federation@0.14.1 - @apollo/gateway@0.14.1 --- packages/apollo-federation/package.json | 2 +- packages/apollo-gateway/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/apollo-federation/package.json b/packages/apollo-federation/package.json index 27a4361d704..fe795a99d4f 100644 --- a/packages/apollo-federation/package.json +++ b/packages/apollo-federation/package.json @@ -1,6 +1,6 @@ { "name": "@apollo/federation", - "version": "0.14.1-alpha.0", + "version": "0.14.1", "description": "Apollo Federation Utilities", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-gateway/package.json b/packages/apollo-gateway/package.json index e699f9b9c09..8bd67f96aee 100644 --- a/packages/apollo-gateway/package.json +++ b/packages/apollo-gateway/package.json @@ -1,6 +1,6 @@ { "name": "@apollo/gateway", - "version": "0.14.1-alpha.0", + "version": "0.14.1", "description": "Apollo Gateway", "author": "opensource@apollographql.com", "main": "dist/index.js", From 9b2f1868aed30a720ec71d9bf7cceade6ff3776c Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 14 Apr 2020 17:07:01 +0300 Subject: [PATCH 389/642] changelog: Add complete versioning details for "v2.12.1" (but really 0.14.1). This release was only gateway and federation. --- packages/apollo-federation/CHANGELOG.md | 2 ++ packages/apollo-gateway/CHANGELOG.md | 2 ++ 2 files changed, 4 insertions(+) diff --git a/packages/apollo-federation/CHANGELOG.md b/packages/apollo-federation/CHANGELOG.md index c3021677d2a..872e00aa816 100644 --- a/packages/apollo-federation/CHANGELOG.md +++ b/packages/apollo-federation/CHANGELOG.md @@ -8,6 +8,8 @@ ## 0.14.1 +> [See complete versioning details.](https://github.com/apollographql/apollo-server/commit/b898396e9fcd3b9092b168f9aac8466ca186fa6b) + - Only changes in the similarly versioned `@apollo/gateway` package. ## 0.14.0 diff --git a/packages/apollo-gateway/CHANGELOG.md b/packages/apollo-gateway/CHANGELOG.md index c618e0dd1dd..6265028908e 100644 --- a/packages/apollo-gateway/CHANGELOG.md +++ b/packages/apollo-gateway/CHANGELOG.md @@ -8,6 +8,8 @@ ## 0.14.1 +> [See complete versioning details.](https://github.com/apollographql/apollo-server/commit/b898396e9fcd3b9092b168f9aac8466ca186fa6b) + - __FIX__: Resolve condition which surfaced in `0.14.0` which prevented loading the configuration using managed federation. [PR #3979](https://github.com/apollographql/apollo-server/pull/3979) ## 0.14.0 From 21d03c34ff8a4e6d233c4ee6ffe105d9c8f5b394 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Wed, 15 Apr 2020 12:25:21 +0300 Subject: [PATCH 390/642] Remove comment which is unlikely to become true. This has confused a customer already, so I'm removing it. We have too many notions of "IDs" already to even suggest that this may become another one which doesn't exist by this name anywhere else right now. --- packages/apollo-server-types/src/index.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/apollo-server-types/src/index.ts b/packages/apollo-server-types/src/index.ts index 969872aca49..40d2639e4ff 100644 --- a/packages/apollo-server-types/src/index.ts +++ b/packages/apollo-server-types/src/index.ts @@ -68,7 +68,6 @@ export interface GraphQLRequestContext> { readonly context: TContext; readonly cache: KeyValueCache; - // This will be replaced with the `operationID`. readonly queryHash?: string; readonly document?: DocumentNode; From fb99d9339bf8dcfefc4e65cf6db125fcafbb51d3 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 26 Mar 2020 21:06:15 +0200 Subject: [PATCH 391/642] Use named types for the "DidEnd" hooks. Some of the "didStart" request life-cycle hooks permit returning a "didEnd" function from them which will be invoked upon completion. This wasn't always immediately clear by looking at the in-line signature, but providing named types should make it marginally easier to recognize this in the typings. --- packages/apollo-server-plugin-base/src/index.ts | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/packages/apollo-server-plugin-base/src/index.ts b/packages/apollo-server-plugin-base/src/index.ts index 5ca040fd617..6d89ea815cd 100644 --- a/packages/apollo-server-plugin-base/src/index.ts +++ b/packages/apollo-server-plugin-base/src/index.ts @@ -45,13 +45,20 @@ export interface ApolloServerPlugin = Recor ): GraphQLRequestListener | void; } +export type GraphQLRequestListenerParsingDidEnd = + ((err?: Error) => void) | void; +export type GraphQLRequestListenerValidationDidEnd = + ((err?: ReadonlyArray) => void) | void; +export type GraphQLRequestListenerExecutionDidEnd = + ((err?: Error) => void) | void; + export interface GraphQLRequestListener> { parsingDidStart?( requestContext: GraphQLRequestContextParsingDidStart, - ): ((err?: Error) => void) | void; + ): GraphQLRequestListenerParsingDidEnd; validationDidStart?( requestContext: GraphQLRequestContextValidationDidStart, - ): ((err?: ReadonlyArray) => void) | void; + ): GraphQLRequestListenerValidationDidEnd; didResolveOperation?( requestContext: GraphQLRequestContextDidResolveOperation, ): ValueOrPromise; @@ -68,7 +75,7 @@ export interface GraphQLRequestListener> { ): ValueOrPromise; executionDidStart?( requestContext: GraphQLRequestContextExecutionDidStart, - ): ((err?: Error) => void) | void; + ): GraphQLRequestListenerExecutionDidEnd; willSendResponse?( requestContext: GraphQLRequestContextWillSendResponse, ): ValueOrPromise; From 41ed6fc10b0a435d283daae24434e4df56755f4f Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 14 Apr 2020 10:14:22 +0300 Subject: [PATCH 392/642] fix: error message which is confusing. --- packages/apollo-engine-reporting/src/agent.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-engine-reporting/src/agent.ts b/packages/apollo-engine-reporting/src/agent.ts index cab2ec9d982..32ae147934a 100644 --- a/packages/apollo-engine-reporting/src/agent.ts +++ b/packages/apollo-engine-reporting/src/agent.ts @@ -499,7 +499,7 @@ export class EngineReportingAgent { }): Promise { if (!documentAST && !queryString) { // This shouldn't happen: one of those options must be passed to runQuery. - throw new Error('No queryString or parsedQuery?'); + throw new Error('No queryString or documentAST?'); } const cacheKey = signatureCacheKey(queryHash, operationName); From accba87fa06b85abd389e608d02cdfe413dd10c0 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Fri, 3 Apr 2020 19:51:14 +0300 Subject: [PATCH 393/642] no-op: Rename incorrect `calculateCacheControlHeaders` var in tests. It should have long been `calculateHttpHeaders`, but the falsy-ness of it means that it still did what it was meant to do. --- packages/apollo-server-integration-testsuite/src/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-integration-testsuite/src/index.ts b/packages/apollo-server-integration-testsuite/src/index.ts index ccfe6891bd4..676018c67c9 100644 --- a/packages/apollo-server-integration-testsuite/src/index.ts +++ b/packages/apollo-server-integration-testsuite/src/index.ts @@ -433,7 +433,7 @@ export default (createApp: CreateAppFunc, destroyApp?: DestroyAppFunc) => { cacheControl: { defaultMaxAge: 5, stripFormattedExtensions: false, - calculateCacheControlHeaders: false, + calculateHttpHeaders: false, }, }, }); From 39024ce3d8e19d1ac8a4ba78295d79f801401acb Mon Sep 17 00:00:00 2001 From: Trevor Scheer Date: Wed, 15 Apr 2020 08:15:48 -0700 Subject: [PATCH 394/642] Remove empty `wp-graphql` plugin from federation list --- docs/source/federation/other-servers.md | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/source/federation/other-servers.md b/docs/source/federation/other-servers.md index ddb6957a7ed..78b4bf8e597 100644 --- a/docs/source/federation/other-servers.md +++ b/docs/source/federation/other-servers.md @@ -11,7 +11,6 @@ The following is a list of known open source GraphQL server libraries that have | Java | graphql-java | [federation-jvm](https://github.com/apollographql/federation-jvm) | | Kotlin | graphql-java | [graphql-kotlin](https://github.com/ExpediaGroup/graphql-kotlin) | | PHP | graphql-php | [php-graphql-federation](https://github.com/pascaldevink/php-graphql-federation) | -| PHP | wp-graphql | [wp-graphql-federation](https://github.com/wp-graphql/wp-graphql-federation) | | Python | ariadne | [ariadne](https://github.com/mirumee/ariadne) | | Python | graphene | [graphene-federation](https://github.com/preply/graphene-federation) | | Ruby | graphql-ruby | [apollo-federation-ruby](https://github.com/Gusto/apollo-federation-ruby) | From ab35c45163a4541cb54ffbdb25a8aeda65c92574 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 26 Mar 2020 21:57:30 +0200 Subject: [PATCH 395/642] Add support for `willResolveField` and `didResolveField`. This adds two of the life-cycle hooks which were available in the `graphql-extensions` API but missing from the new request pipeline plugin API. These omissions have stood in the way of our own ability to migrate our Apollo-related extensions (e.g. `apollo-cache-control`, `apollo-engine-reporting` in federated and non-federated forms, `apollo-tracing`) to the new plugin API and our intention to deprecate that API which was never intended to be public (and was certainly never documented!). That's not to say that any of the effort to do those migrations is easy (it will absolutely not be), however, this unblocks those efforts. --- .../apollo-server-core/src/requestPipeline.ts | 12 +- .../src/requestPipelineAPI.ts | 155 ++++++++++++++++++ .../apollo-server-plugin-base/src/index.ts | 6 + 3 files changed, 172 insertions(+), 1 deletion(-) diff --git a/packages/apollo-server-core/src/requestPipeline.ts b/packages/apollo-server-core/src/requestPipeline.ts index 07a640c1924..6393d82c95a 100644 --- a/packages/apollo-server-core/src/requestPipeline.ts +++ b/packages/apollo-server-core/src/requestPipeline.ts @@ -17,7 +17,11 @@ import { enableGraphQLExtensions, } from 'graphql-extensions'; import { DataSource } from 'apollo-datasource'; -import { PersistedQueryOptions } from '.'; +import { + PersistedQueryOptions, + symbolRequestListenerDispatcher, + enablePluginsForSchemaResolvers, +} from '.'; import { CacheControlExtension, CacheControlExtensionOptions, @@ -127,6 +131,9 @@ export async function processGraphQLRequest( (requestContext.context as any)._extensionStack = extensionStack; const dispatcher = initializeRequestListenerDispatcher(); + Object.defineProperty(requestContext.context, symbolRequestListenerDispatcher, { + value: dispatcher, + }); await initializeDataSources(); @@ -571,6 +578,8 @@ export async function processGraphQLRequest( function initializeRequestListenerDispatcher(): Dispatcher< GraphQLRequestListener > { + enablePluginsForSchemaResolvers(config.schema); + const requestListeners: GraphQLRequestListener[] = []; if (config.plugins) { for (const plugin of config.plugins) { @@ -633,3 +642,4 @@ export async function processGraphQLRequest( } } } + diff --git a/packages/apollo-server-core/src/requestPipelineAPI.ts b/packages/apollo-server-core/src/requestPipelineAPI.ts index 47301b3f4fd..39e8857e4f3 100644 --- a/packages/apollo-server-core/src/requestPipelineAPI.ts +++ b/packages/apollo-server-core/src/requestPipelineAPI.ts @@ -1,3 +1,16 @@ +import { + GraphQLField, + getNamedType, + GraphQLObjectType, + GraphQLSchema, + ResponsePath, +} from 'graphql/type'; +import { defaultFieldResolver } from "graphql/execution"; +import { FieldNode } from "graphql/language"; +import { Dispatcher } from "./utils/dispatcher"; +import { GraphQLRequestListener } from "apollo-server-plugin-base"; +import { GraphQLObjectResolver } from "@apollographql/apollo-tools"; + export { GraphQLServiceContext, GraphQLRequest, @@ -10,3 +23,145 @@ export { GraphQLExecutor, GraphQLExecutionResult, } from 'apollo-server-types'; + +export const symbolRequestListenerDispatcher = + Symbol("apolloServerRequestListenerDispatcher"); +export const symbolPluginsEnabled = Symbol("apolloServerPluginsEnabled"); + +export function enablePluginsForSchemaResolvers( + schema: GraphQLSchema & { [symbolPluginsEnabled]?: boolean }, +) { + if (schema[symbolPluginsEnabled]) { + return schema; + } + Object.defineProperty(schema, symbolPluginsEnabled, { + value: true, + }); + + forEachField(schema, wrapField); + + return schema; +} + +function wrapField(field: GraphQLField): void { + const fieldResolver = field.resolve || defaultFieldResolver; + + field.resolve = (source, args, context, info) => { + // This is a bit of a hack, but since `ResponsePath` is a linked list, + // a new object gets created every time a path segment is added. + // So we can use that to share our `whenObjectResolved` promise across + // all field resolvers for the same object. + const parentPath = info.path.prev as ResponsePath & { + __fields?: Record>; + __whenObjectResolved?: Promise; + }; + + // The technique for implementing a "did resolve field" is accomplished by + // returning a function from the `willResolveField` handler. The + // dispatcher will return a callback which will invoke all of those handlers + // and we'll save that to call when the object resolution is complete. + const endHandler = context && context[symbolRequestListenerDispatcher] && + (context[symbolRequestListenerDispatcher] as Dispatcher) + .invokeDidStartHook('willResolveField', source, args, context, info) || + ((_err: Error | null, _result?: any) => { /* do nothing */ }); + + const resolveObject: GraphQLObjectResolver< + any, + any + > = (info.parentType as any).resolveObject; + + let whenObjectResolved: Promise | undefined; + + if (parentPath && resolveObject) { + if (!parentPath.__fields) { + parentPath.__fields = {}; + } + + parentPath.__fields[info.fieldName] = info.fieldNodes; + + whenObjectResolved = parentPath.__whenObjectResolved; + if (!whenObjectResolved) { + // Use `Promise.resolve().then()` to delay executing + // `resolveObject()` so we can collect all the fields first. + whenObjectResolved = Promise.resolve().then(() => { + return resolveObject(source, parentPath.__fields!, context, info); + }); + parentPath.__whenObjectResolved = whenObjectResolved; + } + } + + try { + let result: any; + if (whenObjectResolved) { + result = whenObjectResolved.then((resolvedObject: any) => { + return fieldResolver(resolvedObject, args, context, info); + }); + } else { + result = fieldResolver(source, args, context, info); + } + + // Call the stack's handlers either immediately (if result is not a + // Promise) or once the Promise is done. Then return that same + // maybe-Promise value. + whenResultIsFinished(result, endHandler); + return result; + } catch (error) { + // Normally it's a bad sign to see an error both handled and + // re-thrown. But it is useful to allow extensions to track errors while + // still handling them in the normal GraphQL way. + endHandler(error); + throw error; + } + };; +} + +function isPromise(x: any): boolean { + return x && typeof x.then === 'function'; +} + +// Given result (which may be a Promise or an array some of whose elements are +// promises) Promises, set up 'callback' to be invoked when result is fully +// resolved. +export function whenResultIsFinished( + result: any, + callback: (err: Error | null, result?: any) => void, +) { + if (isPromise(result)) { + result.then((r: any) => callback(null, r), (err: Error) => callback(err)); + } else if (Array.isArray(result)) { + if (result.some(isPromise)) { + Promise.all(result).then( + (r: any) => callback(null, r), + (err: Error) => callback(err), + ); + } else { + callback(null, result); + } + } else { + callback(null, result); + } +} + +function forEachField(schema: GraphQLSchema, fn: FieldIteratorFn): void { + const typeMap = schema.getTypeMap(); + Object.keys(typeMap).forEach(typeName => { + const type = typeMap[typeName]; + + if ( + !getNamedType(type).name.startsWith('__') && + type instanceof GraphQLObjectType + ) { + const fields = type.getFields(); + Object.keys(fields).forEach(fieldName => { + const field = fields[fieldName]; + fn(field, typeName, fieldName); + }); + } + }); +} + +type FieldIteratorFn = ( + fieldDef: GraphQLField, + typeName: string, + fieldName: string, +) => void; diff --git a/packages/apollo-server-plugin-base/src/index.ts b/packages/apollo-server-plugin-base/src/index.ts index 6d89ea815cd..2f671030974 100644 --- a/packages/apollo-server-plugin-base/src/index.ts +++ b/packages/apollo-server-plugin-base/src/index.ts @@ -13,6 +13,7 @@ import { GraphQLRequestContextExecutionDidStart, GraphQLRequestContextWillSendResponse, } from 'apollo-server-types'; +import { GraphQLFieldResolver } from "graphql"; // We re-export all of these so plugin authors only need to depend on a single // package. The overall concept of `apollo-server-types` and this package @@ -51,6 +52,8 @@ export type GraphQLRequestListenerValidationDidEnd = ((err?: ReadonlyArray) => void) | void; export type GraphQLRequestListenerExecutionDidEnd = ((err?: Error) => void) | void; +export type GraphQLRequestListenerDidResolveField = + ((error: Error | null, result?: any) => void) | void export interface GraphQLRequestListener> { parsingDidStart?( @@ -76,6 +79,9 @@ export interface GraphQLRequestListener> { executionDidStart?( requestContext: GraphQLRequestContextExecutionDidStart, ): GraphQLRequestListenerExecutionDidEnd; + willResolveField?( + ...fieldResolverArgs: Parameters> + ): GraphQLRequestListenerDidResolveField; willSendResponse?( requestContext: GraphQLRequestContextWillSendResponse, ): ValueOrPromise; From 835a68df2d08eb902d43f4395ddba26d46b37169 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Wed, 15 Apr 2020 12:10:51 +0300 Subject: [PATCH 396/642] chore: Convert `schemaHash` from `string` to a faux-paque type. By default, TypeScript uses structural typing (as opposed to nominal typing) Put another way, if it looks like the type and walks like that type, then TypeScript lets it be a type. That's often okay, but it leaves a lot to be desired since a `string` of one type can just be passed in as `string` for that type and TypeScript won't complain. Flow offers opaque types which solve this, but TypeScript doesn't offer this (yet?). This Faux-paque type can be used to gain nominal-esque typing, which is incredibly beneficial during re-factors! For the `schemaHash`, in particular, this is very much a string representation that serves a very particular purpose. Passing it incorrectly somewhere could be problematic, but we can avoid that (particularly as I embark on some re-factoring with it momentarily), by typing it as a more-opaque type prior to refactoring. Such passing around of strings can be common, for example, in positional parameters of functions: like a function that receives five strings, but a parameter ends up being misaligned with its destination. With structural typing, it's completely possible to miss that, but `SchemaHash` will _always_ be a `SchemaHash` with this fauxpaque-typing. Happy to not land this, but I think it provides some value. Input appreciated! --- packages/apollo-engine-reporting/src/agent.ts | 6 +++--- packages/apollo-engine-reporting/src/extension.ts | 9 +++++++-- packages/apollo-server-core/src/ApolloServer.ts | 4 ++-- .../apollo-server-core/src/utils/schemaHash.ts | 5 +++-- packages/apollo-server-types/src/index.ts | 15 ++++++++++++++- 5 files changed, 29 insertions(+), 10 deletions(-) diff --git a/packages/apollo-engine-reporting/src/agent.ts b/packages/apollo-engine-reporting/src/agent.ts index ef5f0f4f076..dd522203b71 100644 --- a/packages/apollo-engine-reporting/src/agent.ts +++ b/packages/apollo-engine-reporting/src/agent.ts @@ -12,7 +12,7 @@ import { fetch, RequestAgent, Response } from 'apollo-server-env'; import retry from 'async-retry'; import { EngineReportingExtension } from './extension'; -import { GraphQLRequestContext, Logger } from 'apollo-server-types'; +import { GraphQLRequestContext, Logger, SchemaHash } from 'apollo-server-types'; import { InMemoryLRUCache } from 'apollo-server-caching'; import { defaultEngineReportingSignature } from 'apollo-graphql'; @@ -202,7 +202,7 @@ export interface AddTraceArgs { trace: Trace; operationName: string; queryHash: string; - schemaHash: string; + schemaHash: SchemaHash; queryString?: string; documentAST?: DocumentNode; } @@ -278,7 +278,7 @@ export class EngineReportingAgent { handleLegacyOptions(this.options); } - public newExtension(schemaHash: string): EngineReportingExtension { + public newExtension(schemaHash: SchemaHash): EngineReportingExtension { return new EngineReportingExtension( this.options, this.addTrace.bind(this), diff --git a/packages/apollo-engine-reporting/src/extension.ts b/packages/apollo-engine-reporting/src/extension.ts index a9199e88fd4..aacc702dcb1 100644 --- a/packages/apollo-engine-reporting/src/extension.ts +++ b/packages/apollo-engine-reporting/src/extension.ts @@ -1,4 +1,9 @@ -import { GraphQLRequestContext, WithRequired, Logger } from 'apollo-server-types'; +import { + GraphQLRequestContext, + WithRequired, + Logger, + SchemaHash, +} from 'apollo-server-types'; import { Request, Headers } from 'apollo-server-env'; import { GraphQLResolveInfo, @@ -42,7 +47,7 @@ export class EngineReportingExtension public constructor( options: EngineReportingOptions, addTrace: (args: AddTraceArgs) => Promise, - private schemaHash: string, + private schemaHash: SchemaHash, ) { this.options = { ...options, diff --git a/packages/apollo-server-core/src/ApolloServer.ts b/packages/apollo-server-core/src/ApolloServer.ts index 5b94b5ea022..e3a6b4d74b1 100644 --- a/packages/apollo-server-core/src/ApolloServer.ts +++ b/packages/apollo-server-core/src/ApolloServer.ts @@ -69,7 +69,7 @@ import { import { Headers } from 'apollo-server-env'; import { buildServiceDefinition } from '@apollographql/apollo-tools'; -import { Logger } from "apollo-server-types"; +import { Logger, SchemaHash } from "apollo-server-types"; const NoIntrospection = (context: ValidationContext) => ({ Field(node: FieldDefinitionNode) { @@ -134,7 +134,7 @@ type SchemaDerivedData = { // on the same operation to be executed immediately. documentStore?: InMemoryLRUCache; schema: GraphQLSchema; - schemaHash: string; + schemaHash: SchemaHash; extensions: Array<() => GraphQLExtension>; }; diff --git a/packages/apollo-server-core/src/utils/schemaHash.ts b/packages/apollo-server-core/src/utils/schemaHash.ts index 7c30c6e751d..7137b9dac6c 100644 --- a/packages/apollo-server-core/src/utils/schemaHash.ts +++ b/packages/apollo-server-core/src/utils/schemaHash.ts @@ -4,8 +4,9 @@ import { getIntrospectionQuery, IntrospectionSchema } from 'graphql/utilities'; import stableStringify from 'fast-json-stable-stringify'; import { GraphQLSchema } from 'graphql/type'; import createSHA from './createSHA'; +import { SchemaHash } from "apollo-server-types"; -export function generateSchemaHash(schema: GraphQLSchema): string { +export function generateSchemaHash(schema: GraphQLSchema): SchemaHash { const introspectionQuery = getIntrospectionQuery(); const documentAST = parse(introspectionQuery); const result = execute(schema, documentAST) as ExecutionResult; @@ -40,5 +41,5 @@ export function generateSchemaHash(schema: GraphQLSchema): string { return createSHA('sha512') .update(stringifiedSchema) - .digest('hex'); + .digest('hex') as SchemaHash; } diff --git a/packages/apollo-server-types/src/index.ts b/packages/apollo-server-types/src/index.ts index 40d2639e4ff..5602aeea762 100644 --- a/packages/apollo-server-types/src/index.ts +++ b/packages/apollo-server-types/src/index.ts @@ -18,10 +18,23 @@ export type WithRequired = T & Required>; type Mutable = { -readonly [P in keyof T]: T[P] }; + // By default, TypeScript uses structural typing (as opposed to nominal typing) + // Put another way, if it looks like the type and walks like that type, then + // TypeScript lets it be a type. + // + // That's often okay, but it leaves a lot to be desired since a `string` of one + // type can just be passed in as `string` for that type and TypeScript won't + // complain. Flow offers opaque types which solve this, but TypeScript doesn't + // offer this (yet?). This Faux-paque type can be used to gain nominal-esque + // typing, which is incredibly beneficial during re-factors! + type Fauxpaque = K & { __fauxpaque: T }; + + export type SchemaHash = Fauxpaque; + export interface GraphQLServiceContext { logger: Logger; schema: GraphQLSchema; - schemaHash: string; + schemaHash: SchemaHash; engine: { serviceID?: string; apiKeyHash?: string; From ab3855db6f2442ceb553a1b7d27f0dd52ee403cc Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 14 Apr 2020 20:38:01 +0300 Subject: [PATCH 397/642] Introduce a plugin test harness to facilitate testing of plugins. This test harness is meant to avoid the need to do the more heavy execution which the request pipeline itself does within `processGraphQLRequest`. I'm not prepared to make this a public-facing harness just yet, but I have reason to believe that it could be beneficial for external plugin authors to take advantage of something like this - possibly within the context of `apollo-server-plugin-base`. There's perhaps a best-of-both-worlds approach here where the request pipeline could be tested against a more precise plugin API contract, but I'm deferring that work for now. --- .../src/utils/pluginTestHarness.ts | 145 ++++++++++++++++++ 1 file changed, 145 insertions(+) create mode 100644 packages/apollo-server-core/src/utils/pluginTestHarness.ts diff --git a/packages/apollo-server-core/src/utils/pluginTestHarness.ts b/packages/apollo-server-core/src/utils/pluginTestHarness.ts new file mode 100644 index 00000000000..daff8f35dce --- /dev/null +++ b/packages/apollo-server-core/src/utils/pluginTestHarness.ts @@ -0,0 +1,145 @@ +import { + WithRequired, + GraphQLRequest, + GraphQLRequestContextExecutionDidStart, + GraphQLResponse, + ValueOrPromise, + GraphQLRequestContextWillSendResponse, + GraphQLRequestContext, +} from 'apollo-server-types'; +import { GraphQLSchema, GraphQLObjectType, GraphQLString } from 'graphql/type'; +import { CacheHint } from 'apollo-cache-control'; +import { + enablePluginsForSchemaResolvers, + symbolRequestListenerDispatcher, +} from '../requestPipelineAPI'; +import { ApolloServerPlugin } from 'apollo-server-plugin-base'; +import { InMemoryLRUCache } from 'apollo-server-caching'; +import { Dispatcher } from './dispatcher'; + +// This test harness guarantees the presence of `query`. +type IPluginTestHarnessGraphqlRequest = WithRequired; +type IPluginTestHarnessExecutionDidStart = + GraphQLRequestContextExecutionDidStart & { + request: IPluginTestHarnessGraphqlRequest, + }; + +export default async function pluginTestHarness({ + pluginInstance, + schema, + graphqlRequest, + overallCachePolicy, + executor, + context = Object.create(null) +}: { + /** + * An instance of the plugin to test. + */ + pluginInstance: ApolloServerPlugin, + + /** + * The optional schema that will be received by the executor. If not + * specified, a simple default schema will be created. In either case, + * the schema will be mutated by wrapping the resolvers with the + * `willResolveField` instrumentation that will allow it to respond to + * that lifecycle hook's implementations plugins. + */ + schema?: GraphQLSchema; + + /** + * The `GraphQLRequest` which will be received by the `executor`. The + * `query` is required, and this doesn't support anything more exotic, + * like automated persisted queries (APQ). + */ + graphqlRequest: IPluginTestHarnessGraphqlRequest; + + /** + * Overall cache control policy. + */ + overallCachePolicy?: Required; + + /** + * This method will be executed to retrieve the response. + */ + executor: ( + requestContext: IPluginTestHarnessExecutionDidStart, + ) => ValueOrPromise; + + /** + * (optional) To provide a user context, if necessary. + */ + context?: TContext; +}): Promise> { + + if (!schema) { + schema = new GraphQLSchema({ + query: new GraphQLObjectType({ + name: 'RootQueryType', + fields: { + hello: { + type: GraphQLString, + resolve() { + return 'hello world'; + } + } + } + }) + }); + } + + enablePluginsForSchemaResolvers(schema); + + const requestContext: GraphQLRequestContext = { + logger: console, + request: graphqlRequest, + metrics: Object.create(null), + source: graphqlRequest.query, + cache: new InMemoryLRUCache(), + context, + }; + + requestContext.overallCachePolicy = overallCachePolicy; + + if (typeof pluginInstance.requestDidStart !== "function") { + throw new Error("Should be impossible as the plugin is defined."); + } + + const listener = pluginInstance.requestDidStart(requestContext); + + if (!listener) { + throw new Error("Should be impossible to not have a listener."); + } + + if (typeof listener.willResolveField !== 'function') { + throw new Error("Should be impossible to not have 'willResolveField'."); + } + + const dispatcher = new Dispatcher([listener]); + + // Put the dispatcher on the context so `willResolveField` can access it. + Object.defineProperty(requestContext.context, symbolRequestListenerDispatcher, { + value: dispatcher, + }); + + const executionDidEnd = dispatcher.invokeDidStartHook( + "executionDidStart", + requestContext as IPluginTestHarnessExecutionDidStart, + ); + + try { + // `response` is readonly, so we'll cast to `any` to assign to it. + (requestContext.response as any) = await executor( + requestContext as IPluginTestHarnessExecutionDidStart, + ); + executionDidEnd(); + } catch (executionError) { + executionDidEnd(executionError); + } + + await dispatcher.invokeHookAsync( + "willSendResponse", + requestContext as GraphQLRequestContextWillSendResponse, + ); + + return requestContext as GraphQLRequestContextWillSendResponse; +} From 6009d8a00278e5d56377887b6a7c0aa902ef2391 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 30 Mar 2020 15:02:44 +0300 Subject: [PATCH 398/642] refactor: Introduce "tracing" plugin and switch request pipeline to use it. This commit introduces a `plugin` (named) export from the `apollo-tracing` package, which uses the new "plugin" hooks rather than the previous implementation (exported as `TracingExtension`) which uses the soon-to-be-deprecated "extensions" hooks. The functionality is intended to be identical, in spirit. Since the delta of the commits was otherwise confusing, I've left the `TracingExtension` present and exported and will remove it in a subsequent commit. Briefly summarizing what the necessary changes were: 1. We no longer use a class instance to house the extension, which was necessitated by the `graphql-extensions` API. This means that uses of `this` have been replaced with function scoped variables by the same name. 2. The logic which actually does the formatting (previously handled by the `format` method in `graphql-extension`, now takes place within the plugin API's `willSendResponse` method. --- package-lock.json | 1 + .../apollo-server-core/src/ApolloServer.ts | 9 +- .../apollo-server-core/src/requestPipeline.ts | 6 -- packages/apollo-tracing/package.json | 1 + packages/apollo-tracing/src/index.ts | 93 ++++++++++++++++++- packages/apollo-tracing/tsconfig.json | 1 + 6 files changed, 101 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index 20a701000e3..31bec050eb2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4652,6 +4652,7 @@ "version": "file:packages/apollo-tracing", "requires": { "apollo-server-env": "file:packages/apollo-server-env", + "apollo-server-plugin-base": "file:packages/apollo-server-plugin-base", "graphql-extensions": "file:packages/graphql-extensions" } }, diff --git a/packages/apollo-server-core/src/ApolloServer.ts b/packages/apollo-server-core/src/ApolloServer.ts index 5b94b5ea022..73df1ba5673 100644 --- a/packages/apollo-server-core/src/ApolloServer.ts +++ b/packages/apollo-server-core/src/ApolloServer.ts @@ -70,6 +70,7 @@ import { import { Headers } from 'apollo-server-env'; import { buildServiceDefinition } from '@apollographql/apollo-tools'; import { Logger } from "apollo-server-types"; +import { plugin as pluginTracing } from "apollo-tracing"; const NoIntrospection = (context: ValidationContext) => ({ Field(node: FieldDefinitionNode) { @@ -783,11 +784,13 @@ export class ApolloServerBase { } private ensurePluginInstantiation(plugins?: PluginDefinition[]): void { - if (!plugins || !plugins.length) { - return; + const pluginsToInit = [...plugins || []]; + + if (this.config.tracing) { + pluginsToInit.push(pluginTracing()) } - this.plugins = plugins.map(plugin => { + this.plugins = pluginsToInit.map(plugin => { if (typeof plugin === 'function') { return plugin(); } diff --git a/packages/apollo-server-core/src/requestPipeline.ts b/packages/apollo-server-core/src/requestPipeline.ts index 6393d82c95a..34ce061a5e1 100644 --- a/packages/apollo-server-core/src/requestPipeline.ts +++ b/packages/apollo-server-core/src/requestPipeline.ts @@ -26,7 +26,6 @@ import { CacheControlExtension, CacheControlExtensionOptions, } from 'apollo-cache-control'; -import { TracingExtension } from 'apollo-tracing'; import { ApolloError, fromGraphQLError, @@ -95,7 +94,6 @@ export interface GraphQLRequestPipelineConfig { dataSources?: () => DataSources; extensions?: Array<() => GraphQLExtension>; - tracing?: boolean; persistedQueries?: PersistedQueryOptions; cacheControl?: CacheControlExtensionOptions; @@ -600,10 +598,6 @@ export async function processGraphQLRequest( // objects. const extensions = config.extensions ? config.extensions.map(f => f()) : []; - if (config.tracing) { - extensions.push(new TracingExtension()); - } - if (config.cacheControl) { cacheControlExtension = new CacheControlExtension(config.cacheControl); extensions.push(cacheControlExtension); diff --git a/packages/apollo-tracing/package.json b/packages/apollo-tracing/package.json index 6fe6e4434d9..316cc83aa61 100644 --- a/packages/apollo-tracing/package.json +++ b/packages/apollo-tracing/package.json @@ -12,6 +12,7 @@ }, "dependencies": { "apollo-server-env": "file:../apollo-server-env", + "apollo-server-plugin-base": "file:../apollo-server-plugin-base", "graphql-extensions": "file:../graphql-extensions" }, "peerDependencies": { diff --git a/packages/apollo-tracing/src/index.ts b/packages/apollo-tracing/src/index.ts index 9c31c22ed54..fee8e9792f5 100644 --- a/packages/apollo-tracing/src/index.ts +++ b/packages/apollo-tracing/src/index.ts @@ -4,7 +4,7 @@ import { GraphQLResolveInfo, GraphQLType, } from 'graphql'; - +import { ApolloServerPlugin } from "apollo-server-plugin-base"; import { GraphQLExtension } from 'graphql-extensions'; export interface TracingFormat { @@ -33,6 +33,97 @@ interface ResolverCall { endOffset?: HighResolutionTime; } +export const plugin = (_futureOptions = {}) => (): ApolloServerPlugin => ({ + requestDidStart() { + let startWallTime: Date | undefined; + let endWallTime: Date | undefined; + let startHrTime: HighResolutionTime | undefined; + let duration: HighResolutionTime | undefined; + const resolverCalls: ResolverCall[] = []; + + startWallTime = new Date(); + startHrTime = process.hrtime(); + + return { + executionDidStart() { + // It's a little odd that we record the end time after execution rather + // than at the end of the whole request, but because we need to include + // our formatted trace in the request itself, we have to record it + // before the request is over! It's also odd that we don't do traces for + // parse or validation errors, but runQuery doesn't currently support + // that, as format() is only invoked after execution. + return () => { + duration = process.hrtime(startHrTime); + endWallTime = new Date(); + }; + }, + willResolveField(...args) { + const [, , , info] = args; + + const resolverCall: ResolverCall = { + path: info.path, + fieldName: info.fieldName, + parentType: info.parentType, + returnType: info.returnType, + startOffset: process.hrtime(startHrTime), + }; + + resolverCalls.push(resolverCall); + + return () => { + resolverCall.endOffset = process.hrtime(startHrTime); + }; + }, + willSendResponse({ response }) { + // In the event that we are called prior to the initialization of + // critical date metrics, we'll return undefined to signal that the + // extension did not format properly. Any undefined extension + // results are simply purged by the graphql-extensions module. + if ( + typeof startWallTime === 'undefined' || + typeof endWallTime === 'undefined' || + typeof duration === 'undefined' + ) { + return; + } + + const extensions = + response.extensions || (response.extensions = Object.create(null)); + + if (typeof extensions.tracing !== 'undefined') { + throw new Error("The tracing information already existed."); + } + + // Set the extensions. + extensions.tracing = { + version: 1, + startTime: startWallTime.toISOString(), + endTime: endWallTime.toISOString(), + duration: durationHrTimeToNanos(duration), + execution: { + resolvers: resolverCalls.map(resolverCall => { + const startOffset = durationHrTimeToNanos( + resolverCall.startOffset, + ); + const duration = resolverCall.endOffset + ? durationHrTimeToNanos(resolverCall.endOffset) - startOffset + : 0; + return { + path: [...responsePathAsArray(resolverCall.path)], + parentType: resolverCall.parentType.toString(), + fieldName: resolverCall.fieldName, + returnType: resolverCall.returnType.toString(), + startOffset, + duration, + }; + }), + }, + }; + }, + }; + }, +}) + export class TracingExtension implements GraphQLExtension { private startWallTime?: Date; diff --git a/packages/apollo-tracing/tsconfig.json b/packages/apollo-tracing/tsconfig.json index 0de28001c29..1276353ea04 100644 --- a/packages/apollo-tracing/tsconfig.json +++ b/packages/apollo-tracing/tsconfig.json @@ -8,5 +8,6 @@ "exclude": ["**/__tests__", "**/__mocks__"], "references": [ { "path": "../graphql-extensions" }, + { "path": "../apollo-server-plugin-base" }, ] } From 8ec39c98ffbeb4c695a72a24ec1fc768545be2c8 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 30 Mar 2020 15:58:06 +0300 Subject: [PATCH 399/642] eliminate!: Remove deprecated `TracingExtension`. This follows-up 672fa0953 and removes the no-longer used/necessary `TracingExtension` extension which uses the soon-to-be-deprecated `graphql-extensions` API, now that it has been replaced with an implementation that uses the plugin API. --- package-lock.json | 3 +- packages/apollo-tracing/package.json | 3 +- packages/apollo-tracing/src/index.ts | 91 --------------------------- packages/apollo-tracing/tsconfig.json | 1 - 4 files changed, 2 insertions(+), 96 deletions(-) diff --git a/package-lock.json b/package-lock.json index 31bec050eb2..9264f6152ca 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4652,8 +4652,7 @@ "version": "file:packages/apollo-tracing", "requires": { "apollo-server-env": "file:packages/apollo-server-env", - "apollo-server-plugin-base": "file:packages/apollo-server-plugin-base", - "graphql-extensions": "file:packages/graphql-extensions" + "apollo-server-plugin-base": "file:packages/apollo-server-plugin-base" } }, "apollo-utilities": { diff --git a/packages/apollo-tracing/package.json b/packages/apollo-tracing/package.json index 316cc83aa61..99a169b435c 100644 --- a/packages/apollo-tracing/package.json +++ b/packages/apollo-tracing/package.json @@ -12,8 +12,7 @@ }, "dependencies": { "apollo-server-env": "file:../apollo-server-env", - "apollo-server-plugin-base": "file:../apollo-server-plugin-base", - "graphql-extensions": "file:../graphql-extensions" + "apollo-server-plugin-base": "file:../apollo-server-plugin-base" }, "peerDependencies": { "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0" diff --git a/packages/apollo-tracing/src/index.ts b/packages/apollo-tracing/src/index.ts index fee8e9792f5..31ba20a6f18 100644 --- a/packages/apollo-tracing/src/index.ts +++ b/packages/apollo-tracing/src/index.ts @@ -1,11 +1,9 @@ import { ResponsePath, responsePathAsArray, - GraphQLResolveInfo, GraphQLType, } from 'graphql'; import { ApolloServerPlugin } from "apollo-server-plugin-base"; -import { GraphQLExtension } from 'graphql-extensions'; export interface TracingFormat { version: 1; @@ -124,95 +122,6 @@ export const plugin = (_futureOptions = {}) => (): ApolloServerPlugin => ({ }, }) -export class TracingExtension - implements GraphQLExtension { - private startWallTime?: Date; - private endWallTime?: Date; - private startHrTime?: HighResolutionTime; - private duration?: HighResolutionTime; - - private resolverCalls: ResolverCall[] = []; - - public requestDidStart() { - this.startWallTime = new Date(); - this.startHrTime = process.hrtime(); - } - - public executionDidStart() { - // It's a little odd that we record the end time after execution rather than - // at the end of the whole request, but because we need to include our - // formatted trace in the request itself, we have to record it before the - // request is over! It's also odd that we don't do traces for parse or - // validation errors, but runQuery doesn't currently support that, as - // format() is only invoked after execution. - return () => { - this.duration = process.hrtime(this.startHrTime); - this.endWallTime = new Date(); - }; - } - - public willResolveField( - _source: any, - _args: { [argName: string]: any }, - _context: TContext, - info: GraphQLResolveInfo, - ) { - const resolverCall: ResolverCall = { - path: info.path, - fieldName: info.fieldName, - parentType: info.parentType, - returnType: info.returnType, - startOffset: process.hrtime(this.startHrTime), - }; - - this.resolverCalls.push(resolverCall); - - return () => { - resolverCall.endOffset = process.hrtime(this.startHrTime); - }; - } - - public format(): [string, TracingFormat] | undefined { - // In the event that we are called prior to the initialization of critical - // date metrics, we'll return undefined to signal that the extension did not - // format properly. Any undefined extension results are simply purged by - // the graphql-extensions module. - if ( - typeof this.startWallTime === 'undefined' || - typeof this.endWallTime === 'undefined' || - typeof this.duration === 'undefined' - ) { - return; - } - - return [ - 'tracing', - { - version: 1, - startTime: this.startWallTime.toISOString(), - endTime: this.endWallTime.toISOString(), - duration: durationHrTimeToNanos(this.duration), - execution: { - resolvers: this.resolverCalls.map(resolverCall => { - const startOffset = durationHrTimeToNanos(resolverCall.startOffset); - const duration = resolverCall.endOffset - ? durationHrTimeToNanos(resolverCall.endOffset) - startOffset - : 0; - return { - path: [...responsePathAsArray(resolverCall.path)], - parentType: resolverCall.parentType.toString(), - fieldName: resolverCall.fieldName, - returnType: resolverCall.returnType.toString(), - startOffset, - duration, - }; - }), - }, - }, - ]; - } -} - type HighResolutionTime = [number, number]; // Converts an hrtime array (as returned from process.hrtime) to nanoseconds. diff --git a/packages/apollo-tracing/tsconfig.json b/packages/apollo-tracing/tsconfig.json index 1276353ea04..29dff935854 100644 --- a/packages/apollo-tracing/tsconfig.json +++ b/packages/apollo-tracing/tsconfig.json @@ -7,7 +7,6 @@ "include": ["src/**/*"], "exclude": ["**/__tests__", "**/__mocks__"], "references": [ - { "path": "../graphql-extensions" }, { "path": "../apollo-server-plugin-base" }, ] } From 11df5aaab6dc55e542c7217b32efef3c7c1adbbb Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 15 Apr 2020 23:48:39 +0000 Subject: [PATCH 400/642] chore(deps): update dependency gatsby-theme-apollo-docs to v4.1.5 (#3994) Co-authored-by: Renovate Bot --- docs/package-lock.json | 144 ++++++++++++++++++++++------------------- docs/package.json | 2 +- 2 files changed, 77 insertions(+), 69 deletions(-) diff --git a/docs/package-lock.json b/docs/package-lock.json index 6a3f90865a6..5478034fbbc 100644 --- a/docs/package-lock.json +++ b/docs/package-lock.json @@ -74,13 +74,20 @@ } }, "@babel/types": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.0.tgz", - "integrity": "sha512-BS9JKfXkzzJl8RluW4JGknzpiUV7ZrvTayM6yfqLTVBEnFtyowVIOu6rqxRd5cVO6yGoWf4T8u8dgK9oB+GCng==", + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.5.tgz", + "integrity": "sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==", "requires": { - "@babel/helper-validator-identifier": "^7.9.0", + "@babel/helper-validator-identifier": "^7.9.5", "lodash": "^4.17.13", "to-fast-properties": "^2.0.0" + }, + "dependencies": { + "@babel/helper-validator-identifier": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz", + "integrity": "sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==" + } } }, "debug": { @@ -3986,9 +3993,9 @@ } }, "babel-plugin-emotion": { - "version": "10.0.29", - "resolved": "https://registry.npmjs.org/babel-plugin-emotion/-/babel-plugin-emotion-10.0.29.tgz", - "integrity": "sha512-7Jpi1OCxjyz0k163lKtqP+LHMg5z3S6A7vMBfHnF06l2unmtsOmFDzZBpGf0CWo1G4m8UACfVcDJiSiRuu/cSw==", + "version": "10.0.33", + "resolved": "https://registry.npmjs.org/babel-plugin-emotion/-/babel-plugin-emotion-10.0.33.tgz", + "integrity": "sha512-bxZbTTGz0AJQDHm8k6Rf3RQJ8tX2scsfsRyKVgAbiUPUNIRtlK+7JxP+TAd1kRLABFxe0CFm2VdK4ePkoA9FxQ==", "requires": { "@babel/helper-module-imports": "^7.0.0", "@emotion/hash": "0.8.0", @@ -5985,9 +5992,9 @@ "integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==" }, "css-selector-parser": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/css-selector-parser/-/css-selector-parser-1.3.0.tgz", - "integrity": "sha1-XxrUPi2O77/cME/NOaUhZklD4+s=" + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/css-selector-parser/-/css-selector-parser-1.4.1.tgz", + "integrity": "sha512-HYPSb7y/Z7BNDCOrakL4raGO2zltZkbeXyAd6Tg9obzix6QhzxCotdBl6VT0Dv4vZfJGVz3WL/xaEI9Ly3ul0g==" }, "css-selector-tokenizer": { "version": "0.7.2", @@ -8405,9 +8412,9 @@ "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" }, "mkdirp": { - "version": "0.5.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.4.tgz", - "integrity": "sha512-iG9AK/dJLtJ0XNgTuDbSyNS3zECqDlAhnQW4CsNxBG3LQJBbHmRX1egw39DmtOdCAqY+dKXV+sgPgilNWUKMVw==", + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", + "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", "requires": { "minimist": "^1.2.5" } @@ -10091,9 +10098,9 @@ } }, "gatsby-plugin-mdx": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/gatsby-plugin-mdx/-/gatsby-plugin-mdx-1.1.4.tgz", - "integrity": "sha512-id2/LALN7eseTGN05v1n16XCYggrl2UTzWOJOQME9rh25jNK+KT5ywaPY6vNYimeAW7wWdad3rl6hORpv4L6yw==", + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/gatsby-plugin-mdx/-/gatsby-plugin-mdx-1.1.7.tgz", + "integrity": "sha512-CTEeZQQ/hYDPv9mX06259zwiQc67OGBPzigBL8ZEMSgg5ANzzfR143Wd74RGPvT04GnMNjfWKcg8yBPTf75EaA==", "requires": { "@babel/core": "^7.8.7", "@babel/generator": "^7.8.8", @@ -10164,16 +10171,26 @@ } }, "@babel/generator": { - "version": "7.9.4", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.4.tgz", - "integrity": "sha512-rjP8ahaDy/ouhrvCoU1E5mqaitWrxwuNGU+dy1EpaoK48jZay4MdkskKGIMHLZNewg8sAsqpGSREJwP0zH3YQA==", + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.5.tgz", + "integrity": "sha512-GbNIxVB3ZJe3tLeDm1HSn2AhuD/mVcyLDpgtLXa5tplmWrJdF/elxB56XNqCuD6szyNkDi6wuoKXln3QeBmCHQ==", "requires": { - "@babel/types": "^7.9.0", + "@babel/types": "^7.9.5", "jsesc": "^2.5.1", "lodash": "^4.17.13", "source-map": "^0.5.0" } }, + "@babel/helper-function-name": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz", + "integrity": "sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==", + "requires": { + "@babel/helper-get-function-arity": "^7.8.3", + "@babel/template": "^7.8.3", + "@babel/types": "^7.9.5" + } + }, "@babel/helper-plugin-utils": { "version": "7.8.3", "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", @@ -10205,29 +10222,36 @@ } }, "@babel/traverse": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.0.tgz", - "integrity": "sha512-jAZQj0+kn4WTHO5dUZkZKhbFrqZE7K5LAQ5JysMnmvGij+wOdr+8lWqPeW0BcF4wFwrEXXtdGO7wcV6YPJcf3w==", + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.5.tgz", + "integrity": "sha512-c4gH3jsvSuGUezlP6rzSJ6jf8fYjLj3hsMZRx/nX0h+fmHN0w+ekubRrHPqnMec0meycA2nwCsJ7dC8IPem2FQ==", "requires": { "@babel/code-frame": "^7.8.3", - "@babel/generator": "^7.9.0", - "@babel/helper-function-name": "^7.8.3", + "@babel/generator": "^7.9.5", + "@babel/helper-function-name": "^7.9.5", "@babel/helper-split-export-declaration": "^7.8.3", "@babel/parser": "^7.9.0", - "@babel/types": "^7.9.0", + "@babel/types": "^7.9.5", "debug": "^4.1.0", "globals": "^11.1.0", "lodash": "^4.17.13" } }, "@babel/types": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.0.tgz", - "integrity": "sha512-BS9JKfXkzzJl8RluW4JGknzpiUV7ZrvTayM6yfqLTVBEnFtyowVIOu6rqxRd5cVO6yGoWf4T8u8dgK9oB+GCng==", + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.5.tgz", + "integrity": "sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==", "requires": { - "@babel/helper-validator-identifier": "^7.9.0", + "@babel/helper-validator-identifier": "^7.9.5", "lodash": "^4.17.13", "to-fast-properties": "^2.0.0" + }, + "dependencies": { + "@babel/helper-validator-identifier": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz", + "integrity": "sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==" + } } }, "debug": { @@ -10326,9 +10350,9 @@ } }, "gatsby-plugin-react-helmet": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/gatsby-plugin-react-helmet/-/gatsby-plugin-react-helmet-3.2.1.tgz", - "integrity": "sha512-5oarZdVvp3k3keG26eVFagVHLYw7wCGs/MXRYQg8MEyJewU3X4Uc0eo7qu4TM5EIuZ2ekaL14r86RB6RM5TORA==", + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/gatsby-plugin-react-helmet/-/gatsby-plugin-react-helmet-3.2.2.tgz", + "integrity": "sha512-mPd7gefGIxqAuxFJgDuttR9+DnRLKLrCh61ND1iLSeOp9GoYS/qH8Rhka6fkpmBXOtUVyujzaUthhB/ll/a4RA==", "requires": { "@babel/runtime": "^7.8.7" }, @@ -10651,14 +10675,6 @@ "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" }, - "get-stream": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", - "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", - "requires": { - "pump": "^3.0.0" - } - }, "got": { "version": "9.6.0", "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz", @@ -10816,9 +10832,9 @@ } }, "gatsby-theme-apollo-docs": { - "version": "4.1.4", - "resolved": "https://registry.npmjs.org/gatsby-theme-apollo-docs/-/gatsby-theme-apollo-docs-4.1.4.tgz", - "integrity": "sha512-TFJwN0z+J3dpNmQ07q9TxboSbVu1mw7xzTn76LLGGnCxwbPqLoPqqU8iy2naGXFkfV6pplUtpKG7rBl8saoyJg==", + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/gatsby-theme-apollo-docs/-/gatsby-theme-apollo-docs-4.1.5.tgz", + "integrity": "sha512-iI+g5BtuLncEFSZIZRL0zhnOXSVXqLarj/GeMf2BczLQPLSj8cG+59RisBPfRPd8Z5M1LDgqmhO+ZV3cLx25aA==", "requires": { "@mdx-js/mdx": "^1.1.0", "@mdx-js/react": "^1.0.27", @@ -10971,9 +10987,9 @@ } }, "mdast-util-toc": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/mdast-util-toc/-/mdast-util-toc-5.0.2.tgz", - "integrity": "sha512-IeihbQLXrnCs/427dVzCp3ffvSPpdx/Mc2WWYAdVaS+MFqdKZHlJylGWAA1cGPewhEVyITsWrlXJ/b2d80Wsnw==", + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/mdast-util-toc/-/mdast-util-toc-5.0.3.tgz", + "integrity": "sha512-A3xzcgC1XFHK0+abFmbINOxjwo7Bi0Nsfp3yTgTy5JHo2q2V6YZ5BVJreDWoK3szcLlSMvHqe8WPbjY50wAkow==", "requires": { "@types/mdast": "^3.0.3", "@types/unist": "^2.0.3", @@ -14097,9 +14113,9 @@ "integrity": "sha512-2j4DAdlBOkiSZIsaXk4mTE3sRS02yBHAtfy127xRV3bQUFqXkjHCHLW6Scv7DwNRbIWNHH8zpnz9zMaKXIdvYw==" }, "mermaid": { - "version": "8.4.8", - "resolved": "https://registry.npmjs.org/mermaid/-/mermaid-8.4.8.tgz", - "integrity": "sha512-sumTNBFwMX7oMQgogdr3NhgTeQOiwcEsm23rQ4KHGW7tpmvMwER1S+1gjCSSnqlmM/zw7Ga7oesYCYicKboRwQ==", + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/mermaid/-/mermaid-8.5.0.tgz", + "integrity": "sha512-fZf4GAzkqWuSwo5L+BmzaBwWPudHkxL3M/t1RmS9Dvc2mcnv6hdhMaeC7poARpHaSGwkpb74LL81qXj+vAsVBg==", "requires": { "@braintree/sanitize-url": "^3.1.0", "crypto-random-string": "^3.0.1", @@ -16224,9 +16240,9 @@ } }, "prismjs": { - "version": "1.19.0", - "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.19.0.tgz", - "integrity": "sha512-IVFtbW9mCWm9eOIaEkNyo2Vl4NnEifis2GQ7/MLRG5TQe6t+4Sj9J5QWI9i3v+SS43uZBlCAOn+zYTVYQcPXJw==", + "version": "1.20.0", + "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.20.0.tgz", + "integrity": "sha512-AEDjSrVNkynnw6A+B1DsFkd6AVdTnp+/WoUixFRULlCLZVRZlVQMVWio/16jv7G1FscUxQxOQhWwApgbnxr6kQ==", "requires": { "clipboard": "^2.0.0" } @@ -17952,9 +17968,9 @@ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, "sanitize-html": { - "version": "1.22.1", - "resolved": "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.22.1.tgz", - "integrity": "sha512-++IMC00KfMQc45UWZJlhWOlS9eMrME38sFG9GXfR+k6oBo9JXSYQgTOZCl9j3v/smFTRNT9XNwz5DseFdMY+2Q==", + "version": "1.23.0", + "resolved": "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.23.0.tgz", + "integrity": "sha512-7MgUrbZpaig6zHwuHjpNqhkiuutFPWWoFY/RmdtEnvrFKMLafzSHfFyOozVpKWytkZIUhbYu3VQ/93OmYdo3ag==", "requires": { "chalk": "^2.4.1", "htmlparser2": "^4.1.0", @@ -19984,19 +20000,11 @@ "integrity": "sha512-+O8/qh/Qj8CgC6eYBVBykMrNtp5Gebn4dlGD/kKXVkJNDwyrAwSIqwz8CDf+tsAIWVycKcku6gIXJ0qwx/ZXaQ==" }, "uglify-js": { - "version": "3.8.1", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.8.1.tgz", - "integrity": "sha512-W7KxyzeaQmZvUFbGj4+YFshhVrMBGSg2IbcYAjGWGvx8DHvJMclbTDMpffdxFUGPBHjIytk7KJUR/KUXstUGDw==", + "version": "3.9.1", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.9.1.tgz", + "integrity": "sha512-JUPoL1jHsc9fOjVFHdQIhqEEJsQvfKDjlubcCilu8U26uZ73qOg8VsN8O1jbuei44ZPlwL7kmbAdM4tzaUvqnA==", "requires": { - "commander": "~2.20.3", - "source-map": "~0.6.1" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" - } + "commander": "~2.20.3" } }, "unc-path-regex": { diff --git a/docs/package.json b/docs/package.json index b5655a94a87..29bec67eb05 100644 --- a/docs/package.json +++ b/docs/package.json @@ -7,7 +7,7 @@ }, "dependencies": { "gatsby": "2.20.17", - "gatsby-theme-apollo-docs": "4.1.4", + "gatsby-theme-apollo-docs": "4.1.5", "react": "16.13.1", "react-dom": "16.13.1" } From dae59a5bbee72c4f7de8eb71f8fa4f0f3afe1f2f Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 16 Apr 2020 12:23:08 +0300 Subject: [PATCH 401/642] Allow an optional `logger` to be passed into the test harness. Great idea! Ref: https://github.com/apollographql/apollo-server/pull/3990#discussion_r409134354 cc @trevor-scheer --- .../apollo-server-core/src/utils/pluginTestHarness.ts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/apollo-server-core/src/utils/pluginTestHarness.ts b/packages/apollo-server-core/src/utils/pluginTestHarness.ts index daff8f35dce..0afa7dfde96 100644 --- a/packages/apollo-server-core/src/utils/pluginTestHarness.ts +++ b/packages/apollo-server-core/src/utils/pluginTestHarness.ts @@ -6,6 +6,7 @@ import { ValueOrPromise, GraphQLRequestContextWillSendResponse, GraphQLRequestContext, + Logger, } from 'apollo-server-types'; import { GraphQLSchema, GraphQLObjectType, GraphQLString } from 'graphql/type'; import { CacheHint } from 'apollo-cache-control'; @@ -27,6 +28,7 @@ type IPluginTestHarnessExecutionDidStart = export default async function pluginTestHarness({ pluginInstance, schema, + logger, graphqlRequest, overallCachePolicy, executor, @@ -46,6 +48,11 @@ export default async function pluginTestHarness({ */ schema?: GraphQLSchema; + /** + * An optional logger (Defaults to `console`) + */ + logger?: Logger; + /** * The `GraphQLRequest` which will be received by the `executor`. The * `query` is required, and this doesn't support anything more exotic, @@ -90,7 +97,7 @@ export default async function pluginTestHarness({ enablePluginsForSchemaResolvers(schema); const requestContext: GraphQLRequestContext = { - logger: console, + logger: logger || console, request: graphqlRequest, metrics: Object.create(null), source: graphqlRequest.query, From 7af676b190c07a13fc22b8ef6a03d2567c074e72 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 16 Apr 2020 12:29:26 +0300 Subject: [PATCH 402/642] fix: report APQ hit/registration when `sendHeaders` is disabled. (#3986) * fix: report APQ hit/registration when `sendHeaders` is disabled. This APQ flag reporting was almost surely changed incorrectly in #2931 and not caught during review, causing this APQ boolean to not be properly set when the request was, in fact, an APQ request, unless `sendHeaders` was enabled - which it is _not_ by default after the change that released it. Ref: https://github.com/apollographql/apollo-server/pull/2931/files#diff-24ae042112f9dcc18543ac851c4d8f7cR97-R102 * Add CHANGELOG.md for #3986. --- CHANGELOG.md | 2 +- packages/apollo-engine-reporting/src/extension.ts | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9f6db09c1a6..702c2f70706 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ The version headers in this history reflect the versions of Apollo Server itself ### vNEXT > 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. When a release is being prepared, a new header will be (manually) created below and the the appropriate changes within that release will be moved into the new section. - +- `apollo-engine-reporting`: Fix inadvertant conditional formatting which prevented automated persisted query (APQ) hits and misses from being reported to Apollo Graph Manager. [PR #3986](https://github.com/apollographql/apollo-server/pull/3986) - `apollo-server-lambda`: Support file uploads on AWS Lambda [Issue #1419](https://github.com/apollographql/apollo-server/issues/1419) [Issue #1703](https://github.com/apollographql/apollo-server/issues/1703) [PR #3926](https://github.com/apollographql/apollo-server/pull/3926) - **breaking** `apollo-engine-reporting-protobuf`: Drop legacy fields that were never used by `apollo-engine-reporting`. Added new fields `StatsContext` to allow `apollo-server` to send summary stats instead of full traces, and renamed `FullTracesReport` to `Report` and `Traces` to `TracesAndStats` since reports now can include stats as well as traces. diff --git a/packages/apollo-engine-reporting/src/extension.ts b/packages/apollo-engine-reporting/src/extension.ts index a9199e88fd4..6c90f6bf384 100644 --- a/packages/apollo-engine-reporting/src/extension.ts +++ b/packages/apollo-engine-reporting/src/extension.ts @@ -101,13 +101,13 @@ export class EngineReportingExtension o.request.headers, this.options.sendHeaders, ); + } - if (o.requestContext.metrics.persistedQueryHit) { - this.treeBuilder.trace.persistedQueryHit = true; - } - if (o.requestContext.metrics.persistedQueryRegister) { - this.treeBuilder.trace.persistedQueryRegister = true; - } + if (o.requestContext.metrics.persistedQueryHit) { + this.treeBuilder.trace.persistedQueryHit = true; + } + if (o.requestContext.metrics.persistedQueryRegister) { + this.treeBuilder.trace.persistedQueryRegister = true; } if (o.variables) { From 25efd195e37453d8dcfb0a1f4a77fce90e1373b4 Mon Sep 17 00:00:00 2001 From: Sunli Date: Thu, 16 Apr 2020 17:45:21 +0800 Subject: [PATCH 403/642] docs: Add async-graphql to third-party federation support (#3968) --- docs/source/federation/other-servers.md | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/docs/source/federation/other-servers.md b/docs/source/federation/other-servers.md index 78b4bf8e597..76fb9fef08a 100644 --- a/docs/source/federation/other-servers.md +++ b/docs/source/federation/other-servers.md @@ -5,14 +5,16 @@ sidebar_title: Third-party support The following is a list of known open source GraphQL server libraries that have built-in support for Apollo Federation. -| Language | Framework | Library | -| ----------- | ------------ | -------------------------------------------------------------------------------- | -| Go | gqlgen | [gqlgen](https://github.com/99designs/gqlgen/tree/master/plugin/federation) | -| Java | graphql-java | [federation-jvm](https://github.com/apollographql/federation-jvm) | -| Kotlin | graphql-java | [graphql-kotlin](https://github.com/ExpediaGroup/graphql-kotlin) | -| PHP | graphql-php | [php-graphql-federation](https://github.com/pascaldevink/php-graphql-federation) | -| Python | ariadne | [ariadne](https://github.com/mirumee/ariadne) | -| Python | graphene | [graphene-federation](https://github.com/preply/graphene-federation) | -| Ruby | graphql-ruby | [apollo-federation-ruby](https://github.com/Gusto/apollo-federation-ruby) | +| Language | Framework | Library | +| ----------- | ------------- | -------------------------------------------------------------------------------- | +| Go | gqlgen | [gqlgen](https://github.com/99designs/gqlgen/tree/master/plugin/federation) | +| Java | graphql-java | [federation-jvm](https://github.com/apollographql/federation-jvm) | +| Kotlin | graphql-java | [graphql-kotlin](https://github.com/ExpediaGroup/graphql-kotlin) | +| PHP | graphql-php | [php-graphql-federation](https://github.com/pascaldevink/php-graphql-federation) | +| PHP | wp-graphql | [wp-graphql-federation](https://github.com/wp-graphql/wp-graphql-federation) | +| Python | ariadne | [ariadne](https://github.com/mirumee/ariadne) | +| Python | graphene | [graphene-federation](https://github.com/preply/graphene-federation) | +| Ruby | graphql-ruby | [apollo-federation-ruby](https://github.com/Gusto/apollo-federation-ruby) | +| Rust | async-graphql | [async-graphql](https://github.com/sunli829/async-graphql) | Do you maintain a library that implements Apollo Federation that isn't listed here? Please [submit a PR](https://github.com/apollographql/apollo-server/tree/master/docs/source/federation/other-servers.md) to be added to the list! From 46211b371718beae696a781aa27c204966cb51e9 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 16 Apr 2020 12:45:57 +0300 Subject: [PATCH 404/642] types: Use named types for plugin "DidEnd" hooks. (#3985) Some of the "didStart" request life-cycle hooks permit returning a "didEnd" function from them which will be invoked upon completion. This wasn't always immediately clear by looking at the in-line signature, but providing named types should make it marginally easier to recognize this in the typings. --- packages/apollo-server-plugin-base/src/index.ts | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/packages/apollo-server-plugin-base/src/index.ts b/packages/apollo-server-plugin-base/src/index.ts index 5ca040fd617..6d89ea815cd 100644 --- a/packages/apollo-server-plugin-base/src/index.ts +++ b/packages/apollo-server-plugin-base/src/index.ts @@ -45,13 +45,20 @@ export interface ApolloServerPlugin = Recor ): GraphQLRequestListener | void; } +export type GraphQLRequestListenerParsingDidEnd = + ((err?: Error) => void) | void; +export type GraphQLRequestListenerValidationDidEnd = + ((err?: ReadonlyArray) => void) | void; +export type GraphQLRequestListenerExecutionDidEnd = + ((err?: Error) => void) | void; + export interface GraphQLRequestListener> { parsingDidStart?( requestContext: GraphQLRequestContextParsingDidStart, - ): ((err?: Error) => void) | void; + ): GraphQLRequestListenerParsingDidEnd; validationDidStart?( requestContext: GraphQLRequestContextValidationDidStart, - ): ((err?: ReadonlyArray) => void) | void; + ): GraphQLRequestListenerValidationDidEnd; didResolveOperation?( requestContext: GraphQLRequestContextDidResolveOperation, ): ValueOrPromise; @@ -68,7 +75,7 @@ export interface GraphQLRequestListener> { ): ValueOrPromise; executionDidStart?( requestContext: GraphQLRequestContextExecutionDidStart, - ): ((err?: Error) => void) | void; + ): GraphQLRequestListenerExecutionDidEnd; willSendResponse?( requestContext: GraphQLRequestContextWillSendResponse, ): ValueOrPromise; From 771683f3205e3b61075e84856a059b24091251aa Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 16 Apr 2020 12:54:51 +0300 Subject: [PATCH 405/642] chore: Convert `schemaHash` from `string` to a faux-paque type. (#3989) By default, TypeScript uses structural typing (as opposed to nominal typing) Put another way, if it looks like the type and walks like that type, then TypeScript lets it be a type. That's often okay, but it leaves a lot to be desired since a `string` of one type can just be passed in as `string` for that type and TypeScript won't complain. Flow offers opaque types which solve this, but TypeScript doesn't offer this (yet?). This Faux-paque type can be used to gain nominal-esque typing, which is incredibly beneficial during re-factors! For the `schemaHash`, in particular, this is very much a string representation that serves a very particular purpose. Passing it incorrectly somewhere could be problematic, but we can avoid that (particularly as I embark on some re-factoring with it momentarily), by typing it as a more-opaque type prior to refactoring. Such passing around of strings can be common, for example, in positional parameters of functions: like a function that receives five strings, but a parameter ends up being misaligned with its destination. With structural typing, it's completely possible to miss that, but `SchemaHash` will _always_ be a `SchemaHash` with this fauxpaque-typing. Happy to not land this, but I think it provides some value. Input appreciated! --- packages/apollo-engine-reporting/src/agent.ts | 6 +++--- packages/apollo-engine-reporting/src/extension.ts | 9 +++++++-- packages/apollo-server-core/src/ApolloServer.ts | 4 ++-- .../apollo-server-core/src/utils/schemaHash.ts | 5 +++-- packages/apollo-server-types/src/index.ts | 15 ++++++++++++++- 5 files changed, 29 insertions(+), 10 deletions(-) diff --git a/packages/apollo-engine-reporting/src/agent.ts b/packages/apollo-engine-reporting/src/agent.ts index ef5f0f4f076..dd522203b71 100644 --- a/packages/apollo-engine-reporting/src/agent.ts +++ b/packages/apollo-engine-reporting/src/agent.ts @@ -12,7 +12,7 @@ import { fetch, RequestAgent, Response } from 'apollo-server-env'; import retry from 'async-retry'; import { EngineReportingExtension } from './extension'; -import { GraphQLRequestContext, Logger } from 'apollo-server-types'; +import { GraphQLRequestContext, Logger, SchemaHash } from 'apollo-server-types'; import { InMemoryLRUCache } from 'apollo-server-caching'; import { defaultEngineReportingSignature } from 'apollo-graphql'; @@ -202,7 +202,7 @@ export interface AddTraceArgs { trace: Trace; operationName: string; queryHash: string; - schemaHash: string; + schemaHash: SchemaHash; queryString?: string; documentAST?: DocumentNode; } @@ -278,7 +278,7 @@ export class EngineReportingAgent { handleLegacyOptions(this.options); } - public newExtension(schemaHash: string): EngineReportingExtension { + public newExtension(schemaHash: SchemaHash): EngineReportingExtension { return new EngineReportingExtension( this.options, this.addTrace.bind(this), diff --git a/packages/apollo-engine-reporting/src/extension.ts b/packages/apollo-engine-reporting/src/extension.ts index a9199e88fd4..aacc702dcb1 100644 --- a/packages/apollo-engine-reporting/src/extension.ts +++ b/packages/apollo-engine-reporting/src/extension.ts @@ -1,4 +1,9 @@ -import { GraphQLRequestContext, WithRequired, Logger } from 'apollo-server-types'; +import { + GraphQLRequestContext, + WithRequired, + Logger, + SchemaHash, +} from 'apollo-server-types'; import { Request, Headers } from 'apollo-server-env'; import { GraphQLResolveInfo, @@ -42,7 +47,7 @@ export class EngineReportingExtension public constructor( options: EngineReportingOptions, addTrace: (args: AddTraceArgs) => Promise, - private schemaHash: string, + private schemaHash: SchemaHash, ) { this.options = { ...options, diff --git a/packages/apollo-server-core/src/ApolloServer.ts b/packages/apollo-server-core/src/ApolloServer.ts index 5b94b5ea022..e3a6b4d74b1 100644 --- a/packages/apollo-server-core/src/ApolloServer.ts +++ b/packages/apollo-server-core/src/ApolloServer.ts @@ -69,7 +69,7 @@ import { import { Headers } from 'apollo-server-env'; import { buildServiceDefinition } from '@apollographql/apollo-tools'; -import { Logger } from "apollo-server-types"; +import { Logger, SchemaHash } from "apollo-server-types"; const NoIntrospection = (context: ValidationContext) => ({ Field(node: FieldDefinitionNode) { @@ -134,7 +134,7 @@ type SchemaDerivedData = { // on the same operation to be executed immediately. documentStore?: InMemoryLRUCache; schema: GraphQLSchema; - schemaHash: string; + schemaHash: SchemaHash; extensions: Array<() => GraphQLExtension>; }; diff --git a/packages/apollo-server-core/src/utils/schemaHash.ts b/packages/apollo-server-core/src/utils/schemaHash.ts index 7c30c6e751d..7137b9dac6c 100644 --- a/packages/apollo-server-core/src/utils/schemaHash.ts +++ b/packages/apollo-server-core/src/utils/schemaHash.ts @@ -4,8 +4,9 @@ import { getIntrospectionQuery, IntrospectionSchema } from 'graphql/utilities'; import stableStringify from 'fast-json-stable-stringify'; import { GraphQLSchema } from 'graphql/type'; import createSHA from './createSHA'; +import { SchemaHash } from "apollo-server-types"; -export function generateSchemaHash(schema: GraphQLSchema): string { +export function generateSchemaHash(schema: GraphQLSchema): SchemaHash { const introspectionQuery = getIntrospectionQuery(); const documentAST = parse(introspectionQuery); const result = execute(schema, documentAST) as ExecutionResult; @@ -40,5 +41,5 @@ export function generateSchemaHash(schema: GraphQLSchema): string { return createSHA('sha512') .update(stringifiedSchema) - .digest('hex'); + .digest('hex') as SchemaHash; } diff --git a/packages/apollo-server-types/src/index.ts b/packages/apollo-server-types/src/index.ts index 40d2639e4ff..5602aeea762 100644 --- a/packages/apollo-server-types/src/index.ts +++ b/packages/apollo-server-types/src/index.ts @@ -18,10 +18,23 @@ export type WithRequired = T & Required>; type Mutable = { -readonly [P in keyof T]: T[P] }; + // By default, TypeScript uses structural typing (as opposed to nominal typing) + // Put another way, if it looks like the type and walks like that type, then + // TypeScript lets it be a type. + // + // That's often okay, but it leaves a lot to be desired since a `string` of one + // type can just be passed in as `string` for that type and TypeScript won't + // complain. Flow offers opaque types which solve this, but TypeScript doesn't + // offer this (yet?). This Faux-paque type can be used to gain nominal-esque + // typing, which is incredibly beneficial during re-factors! + type Fauxpaque = K & { __fauxpaque: T }; + + export type SchemaHash = Fauxpaque; + export interface GraphQLServiceContext { logger: Logger; schema: GraphQLSchema; - schemaHash: string; + schemaHash: SchemaHash; engine: { serviceID?: string; apiKeyHash?: string; From 0d31d1b452e7e0c38c2292ba9f740e10d610d701 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 16 Apr 2020 14:35:40 +0300 Subject: [PATCH 406/642] Apply suggestions from code review Co-Authored-By: Trevor Scheer --- packages/apollo-server-core/src/requestPipelineAPI.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/apollo-server-core/src/requestPipelineAPI.ts b/packages/apollo-server-core/src/requestPipelineAPI.ts index 39e8857e4f3..734d5277471 100644 --- a/packages/apollo-server-core/src/requestPipelineAPI.ts +++ b/packages/apollo-server-core/src/requestPipelineAPI.ts @@ -144,16 +144,14 @@ export function whenResultIsFinished( function forEachField(schema: GraphQLSchema, fn: FieldIteratorFn): void { const typeMap = schema.getTypeMap(); - Object.keys(typeMap).forEach(typeName => { - const type = typeMap[typeName]; + Object.entries(typeMap).forEach(([typeName, type]) => { if ( !getNamedType(type).name.startsWith('__') && type instanceof GraphQLObjectType ) { const fields = type.getFields(); - Object.keys(fields).forEach(fieldName => { - const field = fields[fieldName]; + Object.entries(fields).forEach(([fieldName, field]) => { fn(field, typeName, fieldName); }); } From 7e4cc4b7d99aeaffe6a27b2cf97b98d7713c2a5c Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 16 Apr 2020 13:55:16 +0300 Subject: [PATCH 407/642] Clear up error message in defense mechanism against existing `tracing`. This package should never have already set it itself prior to this point, but the circumstance exists that something (anything) else could have already used the `extensions` sink to attach a value. This guards against that. --- packages/apollo-tracing/src/index.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/apollo-tracing/src/index.ts b/packages/apollo-tracing/src/index.ts index 31ba20a6f18..b5cb8ec5cc3 100644 --- a/packages/apollo-tracing/src/index.ts +++ b/packages/apollo-tracing/src/index.ts @@ -5,6 +5,8 @@ import { } from 'graphql'; import { ApolloServerPlugin } from "apollo-server-plugin-base"; +const { PACKAGE_NAME } = require("../package.json").name; + export interface TracingFormat { version: 1; startTime: string; @@ -88,8 +90,11 @@ export const plugin = (_futureOptions = {}) => (): ApolloServerPlugin => ({ const extensions = response.extensions || (response.extensions = Object.create(null)); + // Be defensive and make sure nothing else (other plugin, etc.) has + // already used the `tracing` property on `extensions`. if (typeof extensions.tracing !== 'undefined') { - throw new Error("The tracing information already existed."); + throw new Error(PACKAGE_NAME + ": Could not add `tracing` to " + + "`extensions` since `tracing` was unexpectedly already present."); } // Set the extensions. From 4b59b02b0da2602ea1f0bcb399687ad170699e07 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 16 Apr 2020 15:25:04 +0300 Subject: [PATCH 408/642] Rejigger `ensurePluginInstantiation` to accommodate upcoming changes. Inspired by landing some PRs separately and a merge commit that could have been avoided, but also inspired by the following comment by @trevor-scheer whicih made it clear my organization was just a _bit_ off. Ref: https://github.com/apollographql/apollo-server/pull/3991#discussion_r409502262 --- packages/apollo-server-core/src/ApolloServer.ts | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/packages/apollo-server-core/src/ApolloServer.ts b/packages/apollo-server-core/src/ApolloServer.ts index 5b94b5ea022..bea27fea464 100644 --- a/packages/apollo-server-core/src/ApolloServer.ts +++ b/packages/apollo-server-core/src/ApolloServer.ts @@ -782,12 +782,16 @@ export class ApolloServerBase { return sdlFieldType.name == 'String'; } - private ensurePluginInstantiation(plugins?: PluginDefinition[]): void { - if (!plugins || !plugins.length) { - return; - } + private ensurePluginInstantiation(plugins: PluginDefinition[] = []): void { + const pluginsToInit: PluginDefinition[] = []; + + // Internal plugins should be added to `pluginsToInit` here. + // User's plugins, provided as an argument to this method, will be added + // at the end of that list so they take precidence. + // A follow-up commit will actually introduce this. - this.plugins = plugins.map(plugin => { + pluginsToInit.push(...plugins); + this.plugins = pluginsToInit.map(plugin => { if (typeof plugin === 'function') { return plugin(); } From fecea35b7cceaf6aaa1181bea32b34929b649b2b Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 16 Apr 2020 15:34:45 +0300 Subject: [PATCH 409/642] Update README.md for `apollo-tracing`. --- packages/apollo-tracing/README.md | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/packages/apollo-tracing/README.md b/packages/apollo-tracing/README.md index ffaab016414..f23149a579a 100644 --- a/packages/apollo-tracing/README.md +++ b/packages/apollo-tracing/README.md @@ -12,14 +12,13 @@ This data can be consumed by [Apollo Graph Manager](https://www.apollographql.co Apollo Server includes built-in support for tracing from version 1.1.0 onwards. -The only code change required is to add `tracing: true` to the options passed to the Apollo Server middleware function for your framework of choice. For example, for Express: +The only code change required is to add `tracing: true` to the options passed to the `ApolloServer` constructor options for your integration of choice. For example, for [`apollo-server-express`](https://npm.im/apollo-server-express): ```javascript -app.use('/graphql', bodyParser.json(), graphqlExpress({ +const { ApolloServer } = require('apollo-server-express'); + +const server = new ApolloServer({ schema, - context: {}, tracing: true, -})); +}); ``` - -> If you are using `express-graphql`, we recommend you switch to Apollo Server. Both `express-graphql` and Apollo Server are based on the [`graphql-js`](https://github.com/graphql/graphql-js) reference implementation, and switching should only require changing a few lines of code. From 3e9188fb81ad7a103cdb17a6707a29275866c464 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 16 Apr 2020 15:36:48 +0300 Subject: [PATCH 410/642] Add CHANGELOG.md for #3991. --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9f6db09c1a6..a32e400dd26 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ The version headers in this history reflect the versions of Apollo Server itself > 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. When a release is being prepared, a new header will be (manually) created below and the the appropriate changes within that release will be moved into the new section. - `apollo-server-lambda`: Support file uploads on AWS Lambda [Issue #1419](https://github.com/apollographql/apollo-server/issues/1419) [Issue #1703](https://github.com/apollographql/apollo-server/issues/1703) [PR #3926](https://github.com/apollographql/apollo-server/pull/3926) +- `apollo-tracing`: This package's internal integration with Apollo Server has been switched from using the soon-to-be-deprecated`graphql-extensions` API to using [the request pipeline plugin API](https://www.apollographql.com/docs/apollo-server/integrations/plugins/). Behavior should remain otherwise the same. [PR #3991](https://github.com/apollographql/apollo-server/pull/3991) - **breaking** `apollo-engine-reporting-protobuf`: Drop legacy fields that were never used by `apollo-engine-reporting`. Added new fields `StatsContext` to allow `apollo-server` to send summary stats instead of full traces, and renamed `FullTracesReport` to `Report` and `Traces` to `TracesAndStats` since reports now can include stats as well as traces. ### v2.12.0 From 68cbc938ff709078efc8a1e726300e61222f6b8b Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 30 Mar 2020 15:02:44 +0300 Subject: [PATCH 411/642] refactor: Introduce "cache-control" plugin and switch req. pipeline to it. Similar to 6009d8a00278e, which migrated the tracing package to the plugin API, this commit introduces a `plugin` (named) export from the `apollo-cache-control` module. It similarly accomplishes that by duplicating the behavior of the `CacheControlExtension` which leveraged the soon-to-be-deprecated `graphql-extensions`. The functionality, again, is intended to be identical in spirit. Since the delta of the commits was otherwise even _more_ confusing, I've left the `CacheControlExtension` present and exported and will remove it in a subsequent commit. Briefly summarizing what the necessary changes were: 1. We no longer use a class instance to house the extension, which was necessitated by the `graphql-extensions` API. This means that uses of `this` have been replaced with function scoped variables by the same name. 2. The logic which actually does the formatting (previously handled by the `format` method in `graphql-extension`, now takes place within the plugin API's `willSendResponse` method. 3. Rather than leaning on plugin-specific behavior from within the request pipeline, the `apollo-cache-control` plugin now makes a number of assertions throughout its various life-cycle methods to ensure that the `overallCachePolicy` is calculated. 4. Switch tests to use the new `pluginTestHarness` method for testing plugins which was introduced in eec87a6c6dead7fd (#3990). --- package-lock.json | 1 + packages/apollo-cache-control/package.json | 3 +- .../__tests__/cacheControlExtension.test.ts | 162 ++++++++++----- .../src/__tests__/collectCacheControlHints.ts | 33 +-- packages/apollo-cache-control/src/index.ts | 188 ++++++++++++++++++ packages/apollo-cache-control/tsconfig.json | 1 + .../apollo-server-core/src/ApolloServer.ts | 60 +++--- .../apollo-server-core/src/requestPipeline.ts | 25 --- .../apollo-server-core/src/runHttpQuery.ts | 4 - 9 files changed, 353 insertions(+), 124 deletions(-) diff --git a/package-lock.json b/package-lock.json index 20a701000e3..519c1acc2ed 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4277,6 +4277,7 @@ "version": "file:packages/apollo-cache-control", "requires": { "apollo-server-env": "file:packages/apollo-server-env", + "apollo-server-plugin-base": "file:packages/apollo-server-plugin-base", "graphql-extensions": "file:packages/graphql-extensions" } }, diff --git a/packages/apollo-cache-control/package.json b/packages/apollo-cache-control/package.json index a14de3e4b15..23b4e1f583a 100644 --- a/packages/apollo-cache-control/package.json +++ b/packages/apollo-cache-control/package.json @@ -12,7 +12,8 @@ }, "dependencies": { "apollo-server-env": "file:../apollo-server-env", - "graphql-extensions": "file:../graphql-extensions" + "graphql-extensions": "file:../graphql-extensions", + "apollo-server-plugin-base": "file:../apollo-server-plugin-base" }, "peerDependencies": { "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0" diff --git a/packages/apollo-cache-control/src/__tests__/cacheControlExtension.test.ts b/packages/apollo-cache-control/src/__tests__/cacheControlExtension.test.ts index 29a6e0d195d..ff4d1fb75eb 100644 --- a/packages/apollo-cache-control/src/__tests__/cacheControlExtension.test.ts +++ b/packages/apollo-cache-control/src/__tests__/cacheControlExtension.test.ts @@ -1,59 +1,110 @@ import { ResponsePath, GraphQLError } from 'graphql'; import { GraphQLResponse } from 'graphql-extensions'; import { Headers } from 'apollo-server-env'; -import { CacheControlExtension, CacheScope } from '../'; +import { + CacheScope, + CacheControlExtensionOptions, + CacheHint, + __testing__, + plugin, +} from '../'; +const { addHint, computeOverallCachePolicy } = __testing__; +import { + GraphQLRequestContextWillSendResponse, +} from 'apollo-server-plugin-base'; +import pluginTestHarness from 'apollo-server-core/dist/utils/pluginTestHarness'; describe('CacheControlExtension', () => { - let cacheControlExtension: CacheControlExtension; - - beforeEach(() => { - cacheControlExtension = new CacheControlExtension(); - }); - describe('willSendResponse', () => { - let graphqlResponse: GraphQLResponse; + function makePluginWithOptions({ + pluginInitializationOptions, + overallCachePolicy, + errors = false, + }: { + pluginInitializationOptions?: CacheControlExtensionOptions; + overallCachePolicy?: Required; + errors?: boolean; + } = Object.create(null)) { + const pluginInstance = plugin(pluginInitializationOptions); + + return pluginTestHarness({ + pluginInstance, + overallCachePolicy, + graphqlRequest: { query: 'does not matter' }, + executor: () => { + const response: GraphQLResponse = { + http: { + headers: new Headers(), + }, + data: { test: 'test' }, + }; + + if (errors) { + response.errors = [new GraphQLError('Test Error')]; + } + + return response; + }, + }); + } - beforeEach(() => { - cacheControlExtension.options.calculateHttpHeaders = true; - cacheControlExtension.computeOverallCachePolicy = () => ({ + describe('HTTP cache-control header', () => { + const overallCachePolicy: Required = { maxAge: 300, scope: CacheScope.Public, - }); - graphqlResponse = { - http: { - headers: new Headers(), - }, - data: { test: 'test' }, }; - }); - it('sets cache-control header', () => { - cacheControlExtension.willSendResponse && - cacheControlExtension.willSendResponse({ graphqlResponse }); - expect(graphqlResponse.http!.headers.get('Cache-Control')).toBe( - 'max-age=300, public', - ); - }); + it('is set when calculateHttpHeaders is set to true', async () => { + const requestContext = await makePluginWithOptions({ + pluginInitializationOptions: { + calculateHttpHeaders: true, + }, + overallCachePolicy, + }); + expect(requestContext.response.http!.headers.get('Cache-Control')).toBe( + 'max-age=300, public', + ); + }); - const shouldNotSetCacheControlHeader = () => { - cacheControlExtension.willSendResponse && - cacheControlExtension.willSendResponse({ graphqlResponse }); - expect(graphqlResponse.http!.headers.get('Cache-Control')).toBeNull(); - }; + const shouldNotSetCacheControlHeader = ( + requestContext: GraphQLRequestContextWillSendResponse, + ) => { + expect( + requestContext.response.http!.headers.get('Cache-Control'), + ).toBeNull(); + }; - it('does not set cache-control header if calculateHttpHeaders is set to false', () => { - cacheControlExtension.options.calculateHttpHeaders = false; - shouldNotSetCacheControlHeader(); - }); + it('is not set when calculateHttpHeaders is set to false', async () => { + const requestContext = await makePluginWithOptions({ + pluginInitializationOptions: { + calculateHttpHeaders: false, + }, + overallCachePolicy, + }); + shouldNotSetCacheControlHeader(requestContext); + }); - it('does not set cache-control header if graphqlResponse has errors', () => { - graphqlResponse.errors = [new GraphQLError('Test Error')]; - shouldNotSetCacheControlHeader(); - }); + it('is not set if response has errors', async () => { + const requestContext = await makePluginWithOptions({ + pluginInitializationOptions: { + calculateHttpHeaders: false, + }, + overallCachePolicy, + errors: true, + }); + shouldNotSetCacheControlHeader(requestContext); + }); - it('does not set cache-control header if there is no overall cache policy', () => { - cacheControlExtension.computeOverallCachePolicy = () => undefined; - shouldNotSetCacheControlHeader(); + it('does not set cache-control header if there is no overall cache policy', async () => { + const requestContext = await makePluginWithOptions({ + pluginInitializationOptions: { + calculateHttpHeaders: false, + }, + overallCachePolicy: undefined, + errors: true, + }); + shouldNotSetCacheControlHeader(requestContext); + }); }); }); @@ -71,46 +122,49 @@ describe('CacheControlExtension', () => { prev: responseSubPath, }; + const hints = new Map(); + afterEach(() => hints.clear()); + it('returns undefined without cache hints', () => { - const cachePolicy = cacheControlExtension.computeOverallCachePolicy(); + const cachePolicy = computeOverallCachePolicy(hints); expect(cachePolicy).toBeUndefined(); }); it('returns lowest max age value', () => { - cacheControlExtension.addHint(responsePath, { maxAge: 10 }); - cacheControlExtension.addHint(responseSubPath, { maxAge: 20 }); + addHint(hints, responsePath, { maxAge: 10 }); + addHint(hints, responseSubPath, { maxAge: 20 }); - const cachePolicy = cacheControlExtension.computeOverallCachePolicy(); + const cachePolicy = computeOverallCachePolicy(hints); expect(cachePolicy).toHaveProperty('maxAge', 10); }); it('returns undefined if any cache hint has a maxAge of 0', () => { - cacheControlExtension.addHint(responsePath, { maxAge: 120 }); - cacheControlExtension.addHint(responseSubPath, { maxAge: 0 }); - cacheControlExtension.addHint(responseSubSubPath, { maxAge: 20 }); + addHint(hints, responsePath, { maxAge: 120 }); + addHint(hints, responseSubPath, { maxAge: 0 }); + addHint(hints, responseSubSubPath, { maxAge: 20 }); - const cachePolicy = cacheControlExtension.computeOverallCachePolicy(); + const cachePolicy = computeOverallCachePolicy(hints); expect(cachePolicy).toBeUndefined(); }); it('returns PUBLIC scope by default', () => { - cacheControlExtension.addHint(responsePath, { maxAge: 10 }); + addHint(hints, responsePath, { maxAge: 10 }); - const cachePolicy = cacheControlExtension.computeOverallCachePolicy(); + const cachePolicy = computeOverallCachePolicy(hints); expect(cachePolicy).toHaveProperty('scope', CacheScope.Public); }); it('returns PRIVATE scope if any cache hint has PRIVATE scope', () => { - cacheControlExtension.addHint(responsePath, { + addHint(hints, responsePath, { maxAge: 10, scope: CacheScope.Public, }); - cacheControlExtension.addHint(responseSubPath, { + addHint(hints, responseSubPath, { maxAge: 10, scope: CacheScope.Private, }); - const cachePolicy = cacheControlExtension.computeOverallCachePolicy(); + const cachePolicy = computeOverallCachePolicy(hints); expect(cachePolicy).toHaveProperty('scope', CacheScope.Private); }); }); diff --git a/packages/apollo-cache-control/src/__tests__/collectCacheControlHints.ts b/packages/apollo-cache-control/src/__tests__/collectCacheControlHints.ts index e69e8bc448e..fdadf7d7ca4 100644 --- a/packages/apollo-cache-control/src/__tests__/collectCacheControlHints.ts +++ b/packages/apollo-cache-control/src/__tests__/collectCacheControlHints.ts @@ -1,38 +1,41 @@ import { GraphQLSchema, graphql } from 'graphql'; - -import { - enableGraphQLExtensions, - GraphQLExtensionStack, -} from 'graphql-extensions'; import { - CacheControlExtension, CacheHint, CacheControlExtensionOptions, + plugin, } from '../'; +import pluginTestHarness from 'apollo-server-core/dist/utils/pluginTestHarness'; export async function collectCacheControlHints( schema: GraphQLSchema, source: string, options?: CacheControlExtensionOptions, ): Promise { - enableGraphQLExtensions(schema); // Because this test helper looks at the formatted extensions, we always want - // to include them. - const cacheControlExtension = new CacheControlExtension({ + // to include them in the response rather than allow them to be stripped + // out. + const pluginInstance = plugin({ ...options, stripFormattedExtensions: false, }); - const response = await graphql({ + const requestContext = await pluginTestHarness({ + pluginInstance, schema, - source, - contextValue: { - _extensionStack: new GraphQLExtensionStack([cacheControlExtension]), + graphqlRequest: { + query: source, }, + executor: async (requestContext) => { + return await graphql({ + schema, + source: requestContext.request.query, + contextValue: requestContext.context, + }); + } }); - expect(response.errors).toBeUndefined(); + expect(requestContext.response.errors).toBeUndefined(); - return cacheControlExtension.format()[1].hints; + return requestContext.response.extensions!.cacheControl.hints; } diff --git a/packages/apollo-cache-control/src/index.ts b/packages/apollo-cache-control/src/index.ts index fa37370f03e..f1a9a944e42 100644 --- a/packages/apollo-cache-control/src/index.ts +++ b/packages/apollo-cache-control/src/index.ts @@ -7,6 +7,7 @@ import { ResponsePath, responsePathAsArray, } from 'graphql'; +import { ApolloServerPlugin } from "apollo-server-plugin-base"; import { GraphQLExtension, GraphQLResponse } from 'graphql-extensions'; @@ -49,6 +50,151 @@ declare module 'apollo-server-types' { } } +type MapResponsePathHints = Map; + +export const plugin = ( + options: CacheControlExtensionOptions = Object.create(null), +): ApolloServerPlugin => ({ + requestDidStart(requestContext) { + const defaultMaxAge: number = options.defaultMaxAge || 0; + const hints: MapResponsePathHints = new Map(); + + + function setOverallCachePolicyWhenUnset() { + if (!requestContext.overallCachePolicy) { + requestContext.overallCachePolicy = computeOverallCachePolicy(hints); + } + } + + return { + willResolveField(...args) { + const [, , , info] = args; + let hint: CacheHint = {}; + + // If this field's resolver returns an object or interface, look for + // hints on that return type. + const targetType = getNamedType(info.returnType); + if ( + targetType instanceof GraphQLObjectType || + targetType instanceof GraphQLInterfaceType + ) { + if (targetType.astNode) { + hint = mergeHints( + hint, + cacheHintFromDirectives(targetType.astNode.directives), + ); + } + } + + // Look for hints on the field itself (on its parent type), taking + // precedence over previously calculated hints. + const fieldDef = info.parentType.getFields()[info.fieldName]; + if (fieldDef.astNode) { + hint = mergeHints( + hint, + cacheHintFromDirectives(fieldDef.astNode.directives), + ); + } + + // If this resolver returns an object or is a root field and we haven't + // seen an explicit maxAge hint, set the maxAge to 0 (uncached) or the + // default if specified in the constructor. (Non-object fields by + // default are assumed to inherit their cacheability from their parents. + // But on the other hand, while root non-object fields can get explicit + // hints from their definition on the Query/Mutation object, if that + // doesn't exist then there's no parent field that would assign the + // default maxAge, so we do it here.) + if ( + (targetType instanceof GraphQLObjectType || + targetType instanceof GraphQLInterfaceType || + !info.path.prev) && + hint.maxAge === undefined + ) { + hint.maxAge = defaultMaxAge; + } + + if (hint.maxAge !== undefined || hint.scope !== undefined) { + addHint(hints, info.path, hint); + } + + info.cacheControl = { + setCacheHint: (hint: CacheHint) => { + addHint(hints, info.path, hint); + }, + cacheHint: hint, + }; + }, + + responseForOperation() { + // We are not supplying an answer, we are only setting the cache + // policy if it's not set! Therefore, we return null. + setOverallCachePolicyWhenUnset(); + return null; + }, + + executionDidStart() { + return () => setOverallCachePolicyWhenUnset(); + }, + + willSendResponse(requestContext) { + const { + response, + overallCachePolicy: overallCachePolicyOverride, + } = requestContext; + + // If there are any errors, we don't consider this cacheable. + if (response.errors) { + return; + } + + // Use the override by default, but if it's not overridden, set our + // own computation onto the `requestContext` for other plugins to read. + const overallCachePolicy = + overallCachePolicyOverride || + (requestContext.overallCachePolicy = + computeOverallCachePolicy(hints)); + + if ( + overallCachePolicy && + options.calculateHttpHeaders && + response.http + ) { + response.http.headers.set( + 'Cache-Control', + `max-age=${ + overallCachePolicy.maxAge + }, ${overallCachePolicy.scope.toLowerCase()}`, + ); + } + + // We should have to explicitly ask to leave the formatted extension in, + // or pass the old-school `cacheControl: true` (as interpreted by + // apollo-server-core/ApolloServer), in order to include the + // engineproxy-aimed extensions. Specifically, we want users of + // apollo-server-plugin-response-cache to be able to specify + // `cacheControl: {defaultMaxAge: 600}` without accidentally turning on + // the extension formatting. + if (options.stripFormattedExtensions !== false) return; + + const extensions = + response.extensions || (response.extensions = Object.create(null)); + + if (typeof extensions.cacheControl !== 'undefined') { + throw new Error("The cacheControl information already existed."); + } + + extensions.cacheControl = { + version: 1, + hints: Array.from(hints).map(([path, hint]) => ({ + path: [...responsePathAsArray(path)], + ...hint, + })), + }; + } + } + } +}); + export class CacheControlExtension implements GraphQLExtension { private defaultMaxAge: number; @@ -255,3 +401,45 @@ function mergeHints( scope: otherHint.scope || hint.scope, }; } + +function computeOverallCachePolicy( + hints: MapResponsePathHints, +): Required | undefined { + let lowestMaxAge: number | undefined = undefined; + let scope: CacheScope = CacheScope.Public; + + for (const hint of hints.values()) { + if (hint.maxAge !== undefined) { + lowestMaxAge = + lowestMaxAge !== undefined + ? Math.min(lowestMaxAge, hint.maxAge) + : hint.maxAge; + } + if (hint.scope === CacheScope.Private) { + scope = CacheScope.Private; + } + } + + // If maxAge is 0, then we consider it uncacheable so it doesn't matter what + // the scope was. + return lowestMaxAge + ? { + maxAge: lowestMaxAge, + scope, + } + : undefined; +} + +function addHint(hints: MapResponsePathHints, path: ResponsePath, hint: CacheHint) { + const existingCacheHint = hints.get(path); + if (existingCacheHint) { + hints.set(path, mergeHints(existingCacheHint, hint)); + } else { + hints.set(path, hint); + } +} + +export const __testing__ = { + addHint, + computeOverallCachePolicy, +}; diff --git a/packages/apollo-cache-control/tsconfig.json b/packages/apollo-cache-control/tsconfig.json index 0de28001c29..1276353ea04 100644 --- a/packages/apollo-cache-control/tsconfig.json +++ b/packages/apollo-cache-control/tsconfig.json @@ -8,5 +8,6 @@ "exclude": ["**/__tests__", "**/__mocks__"], "references": [ { "path": "../graphql-extensions" }, + { "path": "../apollo-server-plugin-base" }, ] } diff --git a/packages/apollo-server-core/src/ApolloServer.ts b/packages/apollo-server-core/src/ApolloServer.ts index bea27fea464..8bddf49873a 100644 --- a/packages/apollo-server-core/src/ApolloServer.ts +++ b/packages/apollo-server-core/src/ApolloServer.ts @@ -70,6 +70,10 @@ import { import { Headers } from 'apollo-server-env'; import { buildServiceDefinition } from '@apollographql/apollo-tools'; import { Logger } from "apollo-server-types"; +import { + plugin as pluginCacheControl, + CacheControlExtensionOptions, +} from 'apollo-cache-control'; const NoIntrospection = (context: ValidationContext) => ({ Field(node: FieldDefinitionNode) { @@ -190,6 +194,7 @@ export class ApolloServerBase { playground, plugins, gateway, + cacheControl, experimental_approximateDocumentStoreMiB, ...requestOptions } = config; @@ -249,31 +254,6 @@ export class ApolloServerBase { : noIntro; } - if (requestOptions.cacheControl !== false) { - if ( - typeof requestOptions.cacheControl === 'boolean' && - requestOptions.cacheControl === true - ) { - // cacheControl: true means that the user needs the cache-control - // extensions. This means we are running the proxy, so we should not - // strip out the cache control extension and not add cache-control headers - requestOptions.cacheControl = { - stripFormattedExtensions: false, - calculateHttpHeaders: false, - defaultMaxAge: 0, - }; - } else { - // Default behavior is to run default header calculation and return - // no cacheControl extensions - requestOptions.cacheControl = { - stripFormattedExtensions: true, - calculateHttpHeaders: true, - defaultMaxAge: 0, - ...requestOptions.cacheControl, - }; - } - } - if (!requestOptions.cache) { requestOptions.cache = new InMemoryLRUCache(); } @@ -790,7 +770,37 @@ export class ApolloServerBase { // at the end of that list so they take precidence. // A follow-up commit will actually introduce this. + // Enable cache control unless it was explicitly disabled. + if (this.config.cacheControl !== false) { + let cacheControlOptions: CacheControlExtensionOptions = {}; + if ( + typeof this.config.cacheControl === 'boolean' && + this.config.cacheControl === true + ) { + // cacheControl: true means that the user needs the cache-control + // extensions. This means we are running the proxy, so we should not + // strip out the cache control extension and not add cache-control headers + cacheControlOptions = { + stripFormattedExtensions: false, + calculateHttpHeaders: false, + defaultMaxAge: 0, + }; + } else { + // Default behavior is to run default header calculation and return + // no cacheControl extensions + cacheControlOptions = { + stripFormattedExtensions: true, + calculateHttpHeaders: true, + defaultMaxAge: 0, + ...this.config.cacheControl, + }; + } + + pluginsToInit.push(pluginCacheControl(cacheControlOptions)); + } + pluginsToInit.push(...plugins); + this.plugins = pluginsToInit.map(plugin => { if (typeof plugin === 'function') { return plugin(); diff --git a/packages/apollo-server-core/src/requestPipeline.ts b/packages/apollo-server-core/src/requestPipeline.ts index 6393d82c95a..4751f44eb8f 100644 --- a/packages/apollo-server-core/src/requestPipeline.ts +++ b/packages/apollo-server-core/src/requestPipeline.ts @@ -22,10 +22,6 @@ import { symbolRequestListenerDispatcher, enablePluginsForSchemaResolvers, } from '.'; -import { - CacheControlExtension, - CacheControlExtensionOptions, -} from 'apollo-cache-control'; import { TracingExtension } from 'apollo-tracing'; import { ApolloError, @@ -97,7 +93,6 @@ export interface GraphQLRequestPipelineConfig { extensions?: Array<() => GraphQLExtension>; tracing?: boolean; persistedQueries?: PersistedQueryOptions; - cacheControl?: CacheControlExtensionOptions; formatError?: (error: GraphQLError) => GraphQLFormattedError; formatResponse?: ( @@ -126,7 +121,6 @@ export async function processGraphQLRequest( // all of our own machinery will certainly set it now. const logger = requestContext.logger || console; - let cacheControlExtension: CacheControlExtension | undefined; const extensionStack = initializeExtensionStack(); (requestContext.context as any)._extensionStack = extensionStack; @@ -390,20 +384,6 @@ export async function processGraphQLRequest( } } - if (cacheControlExtension) { - if (requestContext.overallCachePolicy) { - // If we read this response from a cache and it already has its own - // policy, teach that to cacheControlExtension so that it'll use the - // saved policy for HTTP headers. (If cacheControlExtension was a - // plugin, it could just read from the requestContext, but it isn't.) - cacheControlExtension.overrideOverallCachePolicy( - requestContext.overallCachePolicy, - ); - } else { - requestContext.overallCachePolicy = cacheControlExtension.computeOverallCachePolicy(); - } - } - const formattedExtensions = extensionStack.format(); if (Object.keys(formattedExtensions).length > 0) { response.extensions = formattedExtensions; @@ -604,11 +584,6 @@ export async function processGraphQLRequest( extensions.push(new TracingExtension()); } - if (config.cacheControl) { - cacheControlExtension = new CacheControlExtension(config.cacheControl); - extensions.push(cacheControlExtension); - } - return new GraphQLExtensionStack(extensions); } diff --git a/packages/apollo-server-core/src/runHttpQuery.ts b/packages/apollo-server-core/src/runHttpQuery.ts index c229fe87cf7..b02ce408fb0 100644 --- a/packages/apollo-server-core/src/runHttpQuery.ts +++ b/packages/apollo-server-core/src/runHttpQuery.ts @@ -17,7 +17,6 @@ import { GraphQLRequestContext, GraphQLResponse, } from './requestPipeline'; -import { CacheControlExtensionOptions } from 'apollo-cache-control'; import { ApolloServerPlugin } from 'apollo-server-plugin-base'; import { WithRequired, GraphQLExecutionResult } from 'apollo-server-types'; @@ -173,9 +172,6 @@ export async function runHttpQuery( // cacheControl defaults will also have been set if a boolean argument is // passed in. cache: options.cache!, - cacheControl: options.cacheControl as - | CacheControlExtensionOptions - | undefined, dataSources: options.dataSources, documentStore: options.documentStore, From 8db08b3b4d8be774be30178542b58a861d4bae3b Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 6 Apr 2020 20:46:55 +0300 Subject: [PATCH 412/642] eliminate! Remove now-unnecessary `apollo-cache-control` extension. Which has been replaced by the plugin API introduced in 68cbc938ff709078. --- package-lock.json | 3 +- packages/apollo-cache-control/package.json | 1 - ...ion.test.ts => cacheControlPlugin.test.ts} | 4 +- packages/apollo-cache-control/src/index.ts | 162 ------------------ packages/apollo-cache-control/tsconfig.json | 1 - 5 files changed, 3 insertions(+), 168 deletions(-) rename packages/apollo-cache-control/src/__tests__/{cacheControlExtension.test.ts => cacheControlPlugin.test.ts} (98%) diff --git a/package-lock.json b/package-lock.json index 519c1acc2ed..81f495d1916 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4277,8 +4277,7 @@ "version": "file:packages/apollo-cache-control", "requires": { "apollo-server-env": "file:packages/apollo-server-env", - "apollo-server-plugin-base": "file:packages/apollo-server-plugin-base", - "graphql-extensions": "file:packages/graphql-extensions" + "apollo-server-plugin-base": "file:packages/apollo-server-plugin-base" } }, "apollo-datasource": { diff --git a/packages/apollo-cache-control/package.json b/packages/apollo-cache-control/package.json index 23b4e1f583a..e4bb0cf3fbd 100644 --- a/packages/apollo-cache-control/package.json +++ b/packages/apollo-cache-control/package.json @@ -12,7 +12,6 @@ }, "dependencies": { "apollo-server-env": "file:../apollo-server-env", - "graphql-extensions": "file:../graphql-extensions", "apollo-server-plugin-base": "file:../apollo-server-plugin-base" }, "peerDependencies": { diff --git a/packages/apollo-cache-control/src/__tests__/cacheControlExtension.test.ts b/packages/apollo-cache-control/src/__tests__/cacheControlPlugin.test.ts similarity index 98% rename from packages/apollo-cache-control/src/__tests__/cacheControlExtension.test.ts rename to packages/apollo-cache-control/src/__tests__/cacheControlPlugin.test.ts index ff4d1fb75eb..a29cbbf02b1 100644 --- a/packages/apollo-cache-control/src/__tests__/cacheControlExtension.test.ts +++ b/packages/apollo-cache-control/src/__tests__/cacheControlPlugin.test.ts @@ -1,5 +1,4 @@ import { ResponsePath, GraphQLError } from 'graphql'; -import { GraphQLResponse } from 'graphql-extensions'; import { Headers } from 'apollo-server-env'; import { CacheScope, @@ -11,10 +10,11 @@ import { const { addHint, computeOverallCachePolicy } = __testing__; import { GraphQLRequestContextWillSendResponse, + GraphQLResponse, } from 'apollo-server-plugin-base'; import pluginTestHarness from 'apollo-server-core/dist/utils/pluginTestHarness'; -describe('CacheControlExtension', () => { +describe('plugin', () => { describe('willSendResponse', () => { function makePluginWithOptions({ pluginInitializationOptions, diff --git a/packages/apollo-cache-control/src/index.ts b/packages/apollo-cache-control/src/index.ts index f1a9a944e42..de847c31106 100644 --- a/packages/apollo-cache-control/src/index.ts +++ b/packages/apollo-cache-control/src/index.ts @@ -3,14 +3,11 @@ import { getNamedType, GraphQLInterfaceType, GraphQLObjectType, - GraphQLResolveInfo, ResponsePath, responsePathAsArray, } from 'graphql'; import { ApolloServerPlugin } from "apollo-server-plugin-base"; -import { GraphQLExtension, GraphQLResponse } from 'graphql-extensions'; - export interface CacheControlFormat { version: 1; hints: ({ path: (string | number)[] } & CacheHint)[]; @@ -195,165 +192,6 @@ export const plugin = ( } }); -export class CacheControlExtension - implements GraphQLExtension { - private defaultMaxAge: number; - - constructor(public options: CacheControlExtensionOptions = {}) { - this.defaultMaxAge = options.defaultMaxAge || 0; - } - - private hints: Map = new Map(); - private overallCachePolicyOverride?: Required; - - willResolveField( - _source: any, - _args: { [argName: string]: any }, - _context: TContext, - info: GraphQLResolveInfo, - ) { - let hint: CacheHint = {}; - - // If this field's resolver returns an object or interface, look for hints - // on that return type. - const targetType = getNamedType(info.returnType); - if ( - targetType instanceof GraphQLObjectType || - targetType instanceof GraphQLInterfaceType - ) { - if (targetType.astNode) { - hint = mergeHints( - hint, - cacheHintFromDirectives(targetType.astNode.directives), - ); - } - } - - // Look for hints on the field itself (on its parent type), taking - // precedence over previously calculated hints. - const fieldDef = info.parentType.getFields()[info.fieldName]; - if (fieldDef.astNode) { - hint = mergeHints( - hint, - cacheHintFromDirectives(fieldDef.astNode.directives), - ); - } - - // If this resolver returns an object or is a root field and we haven't seen - // an explicit maxAge hint, set the maxAge to 0 (uncached) or the default if - // specified in the constructor. (Non-object fields by default are assumed - // to inherit their cacheability from their parents. But on the other hand, - // while root non-object fields can get explicit hints from their definition - // on the Query/Mutation object, if that doesn't exist then there's no - // parent field that would assign the default maxAge, so we do it here.) - if ( - (targetType instanceof GraphQLObjectType || - targetType instanceof GraphQLInterfaceType || - !info.path.prev) && - hint.maxAge === undefined - ) { - hint.maxAge = this.defaultMaxAge; - } - - if (hint.maxAge !== undefined || hint.scope !== undefined) { - this.addHint(info.path, hint); - } - - info.cacheControl = { - setCacheHint: (hint: CacheHint) => { - this.addHint(info.path, hint); - }, - cacheHint: hint, - }; - } - - addHint(path: ResponsePath, hint: CacheHint) { - const existingCacheHint = this.hints.get(path); - if (existingCacheHint) { - this.hints.set(path, mergeHints(existingCacheHint, hint)); - } else { - this.hints.set(path, hint); - } - } - - format(): [string, CacheControlFormat] | undefined { - // We should have to explicitly ask to leave the formatted extension in, or - // pass the old-school `cacheControl: true` (as interpreted by - // apollo-server-core/ApolloServer), in order to include the - // engineproxy-aimed extensions. Specifically, we want users of - // apollo-server-plugin-response-cache to be able to specify - // `cacheControl: {defaultMaxAge: 600}` without accidentally turning on the - // extension formatting. - if (this.options.stripFormattedExtensions !== false) return; - - return [ - 'cacheControl', - { - version: 1, - hints: Array.from(this.hints).map(([path, hint]) => ({ - path: [...responsePathAsArray(path)], - ...hint, - })), - }, - ]; - } - - public willSendResponse?(o: { graphqlResponse: GraphQLResponse }) { - if ( - !this.options.calculateHttpHeaders || - !o.graphqlResponse.http || - o.graphqlResponse.errors - ) { - return; - } - - const overallCachePolicy = this.computeOverallCachePolicy(); - - if (overallCachePolicy) { - o.graphqlResponse.http.headers.set( - 'Cache-Control', - `max-age=${ - overallCachePolicy.maxAge - }, ${overallCachePolicy.scope.toLowerCase()}`, - ); - } - } - - public overrideOverallCachePolicy(overallCachePolicy: Required) { - this.overallCachePolicyOverride = overallCachePolicy; - } - - computeOverallCachePolicy(): Required | undefined { - if (this.overallCachePolicyOverride) { - return this.overallCachePolicyOverride; - } - - let lowestMaxAge: number | undefined = undefined; - let scope: CacheScope = CacheScope.Public; - - for (const hint of this.hints.values()) { - if (hint.maxAge !== undefined) { - lowestMaxAge = - lowestMaxAge !== undefined - ? Math.min(lowestMaxAge, hint.maxAge) - : hint.maxAge; - } - if (hint.scope === CacheScope.Private) { - scope = CacheScope.Private; - } - } - - // If maxAge is 0, then we consider it uncacheable so it doesn't matter what - // the scope was. - return lowestMaxAge - ? { - maxAge: lowestMaxAge, - scope, - } - : undefined; - } -} - function cacheHintFromDirectives( directives: ReadonlyArray | undefined, ): CacheHint | undefined { diff --git a/packages/apollo-cache-control/tsconfig.json b/packages/apollo-cache-control/tsconfig.json index 1276353ea04..29dff935854 100644 --- a/packages/apollo-cache-control/tsconfig.json +++ b/packages/apollo-cache-control/tsconfig.json @@ -7,7 +7,6 @@ "include": ["src/**/*"], "exclude": ["**/__tests__", "**/__mocks__"], "references": [ - { "path": "../graphql-extensions" }, { "path": "../apollo-server-plugin-base" }, ] } From 0e5619c3dfe57e4cfb8c1a753a30f5645b07cc4f Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Wed, 15 Apr 2020 12:18:41 +0300 Subject: [PATCH 413/642] Place `schema` and `schemaHash` on the `GraphQLRequestContext`. Particularly with multiple schemas in-flight at the same time, plugins need a way to understand which schema is being operated on. Presently, while `serverWillStart` can give you the `schema` as part of its `GraphQLServiceContext`, there isn't (yet) an `onSchemaChange` (and I'm not certain there will be, right now!). Even if that did exist though, with the introduction of the gateway, it's absolutely possible that there are multiple overlapping requests with different schemas (even if the server doesn't explicitly support the configuration of multiple independent schemas right now). --- packages/apollo-server-core/src/ApolloServer.ts | 6 +++++- packages/apollo-server-core/src/graphqlOptions.ts | 2 ++ packages/apollo-server-core/src/runHttpQuery.ts | 3 +++ packages/apollo-server-core/src/utils/pluginTestHarness.ts | 3 +++ packages/apollo-server-types/src/index.ts | 3 +++ 5 files changed, 16 insertions(+), 1 deletion(-) diff --git a/packages/apollo-server-core/src/ApolloServer.ts b/packages/apollo-server-core/src/ApolloServer.ts index bea27fea464..2ccc287eefe 100644 --- a/packages/apollo-server-core/src/ApolloServer.ts +++ b/packages/apollo-server-core/src/ApolloServer.ts @@ -819,7 +819,8 @@ export class ApolloServerBase { protected async graphQLServerOptions( integrationContextArgument?: Record, ): Promise { - const { schema, documentStore, extensions } = await this.schemaDerivedData; + const { schema, schemaHash, documentStore, extensions } + = await this.schemaDerivedData; let context: Context = this.context ? this.context : {}; @@ -837,6 +838,7 @@ export class ApolloServerBase { return { schema, + schemaHash, logger: this.logger, plugins: this.plugins, documentStore, @@ -866,6 +868,8 @@ export class ApolloServerBase { const requestCtx: GraphQLRequestContext = { logger: this.logger, + schema: options.schema, + schemaHash: options.schemaHash, request, context: options.context || Object.create(null), cache: options.cache!, diff --git a/packages/apollo-server-core/src/graphqlOptions.ts b/packages/apollo-server-core/src/graphqlOptions.ts index e6da70d37b0..b4c6f1a7b86 100644 --- a/packages/apollo-server-core/src/graphqlOptions.ts +++ b/packages/apollo-server-core/src/graphqlOptions.ts @@ -18,6 +18,7 @@ import { GraphQLResponse, GraphQLRequestContext, Logger, + SchemaHash, } from 'apollo-server-types'; /* @@ -42,6 +43,7 @@ export interface GraphQLServerOptions< TRootValue = any > { schema: GraphQLSchema; + schemaHash: SchemaHash; logger?: Logger; formatError?: (error: GraphQLError) => GraphQLFormattedError; rootValue?: ((parsedQuery: DocumentNode) => TRootValue) | TRootValue; diff --git a/packages/apollo-server-core/src/runHttpQuery.ts b/packages/apollo-server-core/src/runHttpQuery.ts index c229fe87cf7..67f3cde40ab 100644 --- a/packages/apollo-server-core/src/runHttpQuery.ts +++ b/packages/apollo-server-core/src/runHttpQuery.ts @@ -161,6 +161,7 @@ export async function runHttpQuery( const config = { schema: options.schema, + schemaHash: options.schemaHash, logger: options.logger, rootValue: options.rootValue, context: options.context || {}, @@ -256,6 +257,8 @@ export async function processHTTPRequest( // exported since perhaps as far back as Apollo Server 1.x. Therefore, // for compatibility reasons, we'll default to `console`. logger: options.logger || console, + schema: options.schema, + schemaHash: options.schemaHash, request, response: { http: { diff --git a/packages/apollo-server-core/src/utils/pluginTestHarness.ts b/packages/apollo-server-core/src/utils/pluginTestHarness.ts index 0afa7dfde96..52277e50f34 100644 --- a/packages/apollo-server-core/src/utils/pluginTestHarness.ts +++ b/packages/apollo-server-core/src/utils/pluginTestHarness.ts @@ -17,6 +17,7 @@ import { import { ApolloServerPlugin } from 'apollo-server-plugin-base'; import { InMemoryLRUCache } from 'apollo-server-caching'; import { Dispatcher } from './dispatcher'; +import { generateSchemaHash } from "./schemaHash"; // This test harness guarantees the presence of `query`. type IPluginTestHarnessGraphqlRequest = WithRequired; @@ -98,6 +99,8 @@ export default async function pluginTestHarness({ const requestContext: GraphQLRequestContext = { logger: logger || console, + schema, + schemaHash: generateSchemaHash(schema), request: graphqlRequest, metrics: Object.create(null), source: graphqlRequest.query, diff --git a/packages/apollo-server-types/src/index.ts b/packages/apollo-server-types/src/index.ts index 40d2639e4ff..edfc9c64f76 100644 --- a/packages/apollo-server-types/src/index.ts +++ b/packages/apollo-server-types/src/index.ts @@ -65,6 +65,9 @@ export interface GraphQLRequestContext> { logger: Logger; + readonly schema: GraphQLSchema; + readonly schemaHash: SchemaHash; + readonly context: TContext; readonly cache: KeyValueCache; From de7ba72b50ff539fc33b59cf88553527b6e99a70 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 30 Mar 2020 15:02:44 +0300 Subject: [PATCH 414/642] refactor: Graph Manager (Engine) reporting "extensions" become "plugins". Similar to 6009d8a00 (#3991) and 68cbc938 (#3997), which migrated the tracing and cache-control extensions to the (newer) request pipeline plugin API, this commit introduces: - Internally, a `plugin` named export which is utilized by the `agent`'s `newExtension` method to provide a plugin which is instrumented to transmit metrics to Apollo Graph Manager. This plugin is meant to replicate the behavior of the `EngineReportingExtension` class which, as of this commit, still lives besides it. - Externally, a `federatedPlugin` exported on the main module of the `apollo-engine-reporting` package. This plugin is meant to replicate the behavior of the `EngineFederatedTracingExtension` class (also exported on the main module) which, again as of this commit, still lives besides it! Again, the delta of the commits seemed more confusing by allowing a natural `diff` to be made of it, I've left the extensions in place so they can be compared - presumably side-by-side in an editor - on the same commit. An (immediate) subsequent commit will remove the extension. --- packages/apollo-engine-reporting/package.json | 1 + .../src/__tests__/extension.test.ts | 56 ++---- packages/apollo-engine-reporting/src/agent.ts | 11 +- .../apollo-engine-reporting/src/extension.ts | 174 ++++++++++++++++++ .../src/federatedExtension.ts | 62 +++++++ packages/apollo-engine-reporting/src/index.ts | 2 +- .../src/treeBuilder.ts | 2 +- .../apollo-engine-reporting/tsconfig.json | 1 + .../apollo-server-core/src/ApolloServer.ts | 70 ++++--- 9 files changed, 297 insertions(+), 82 deletions(-) diff --git a/packages/apollo-engine-reporting/package.json b/packages/apollo-engine-reporting/package.json index df8036f35cb..fa666882864 100644 --- a/packages/apollo-engine-reporting/package.json +++ b/packages/apollo-engine-reporting/package.json @@ -18,6 +18,7 @@ "apollo-server-errors": "file:../apollo-server-errors", "apollo-server-types": "file:../apollo-server-types", "async-retry": "^1.2.1", + "apollo-server-plugin-base": "file:../apollo-server-plugin-base", "graphql-extensions": "file:../graphql-extensions" }, "peerDependencies": { diff --git a/packages/apollo-engine-reporting/src/__tests__/extension.test.ts b/packages/apollo-engine-reporting/src/__tests__/extension.test.ts index 14b50c73cfd..8520f902f36 100644 --- a/packages/apollo-engine-reporting/src/__tests__/extension.test.ts +++ b/packages/apollo-engine-reporting/src/__tests__/extension.test.ts @@ -1,19 +1,11 @@ import { makeExecutableSchema, addMockFunctionsToSchema } from 'graphql-tools'; -import { - GraphQLExtensionStack, - enableGraphQLExtensions, -} from 'graphql-extensions'; import { graphql, GraphQLError } from 'graphql'; import { Request } from 'node-fetch'; -import { - EngineReportingExtension, - makeTraceDetails, - makeHTTPRequestHeaders, -} from '../extension'; +import { makeTraceDetails, makeHTTPRequestHeaders, plugin } from '../extension'; import { Headers } from 'apollo-server-env'; -import { InMemoryLRUCache } from 'apollo-server-caching'; import { AddTraceArgs } from '../agent'; import { Trace } from 'apollo-engine-reporting-protobuf'; +import pluginTestHarness from 'apollo-server-core/dist/utils/pluginTestHarness'; it('trace construction', async () => { const typeDefs = ` @@ -53,41 +45,33 @@ it('trace construction', async () => { const schema = makeExecutableSchema({ typeDefs }); addMockFunctionsToSchema({ schema }); - enableGraphQLExtensions(schema); const traces: Array = []; async function addTrace(args: AddTraceArgs) { traces.push(args); } - const reportingExtension = new EngineReportingExtension( - {}, - addTrace, - 'schema-hash', - ); - const stack = new GraphQLExtensionStack([reportingExtension]); - const requestDidEnd = stack.requestDidStart({ - request: new Request('http://localhost:123/foo'), - queryString: query, - requestContext: { - request: { - query, - operationName: 'q', - extensions: { - clientName: 'testing suite', - }, + const pluginInstance = plugin({ /* no options!*/ }, addTrace); + + pluginTestHarness({ + pluginInstance, + schema, + graphqlRequest: { + query, + operationName: 'q', + extensions: { + clientName: 'testing suite', }, - context: {}, - cache: new InMemoryLRUCache(), + http: new Request('http://localhost:123/foo'), + }, + executor: async ({ request: { query: source }}) => { + return await graphql({ + schema, + source, + }); }, - context: {}, - }); - await graphql({ - schema, - source: query, - contextValue: { _extensionStack: stack }, }); - requestDidEnd(); + // XXX actually write some tests }); diff --git a/packages/apollo-engine-reporting/src/agent.ts b/packages/apollo-engine-reporting/src/agent.ts index dd522203b71..d98861bea3b 100644 --- a/packages/apollo-engine-reporting/src/agent.ts +++ b/packages/apollo-engine-reporting/src/agent.ts @@ -11,10 +11,11 @@ import { import { fetch, RequestAgent, Response } from 'apollo-server-env'; import retry from 'async-retry'; -import { EngineReportingExtension } from './extension'; +import { plugin } from './extension'; import { GraphQLRequestContext, Logger, SchemaHash } from 'apollo-server-types'; import { InMemoryLRUCache } from 'apollo-server-caching'; import { defaultEngineReportingSignature } from 'apollo-graphql'; +import { ApolloServerPlugin } from "apollo-server-plugin-base"; export interface ClientInfo { clientName?: string; @@ -278,12 +279,8 @@ export class EngineReportingAgent { handleLegacyOptions(this.options); } - public newExtension(schemaHash: SchemaHash): EngineReportingExtension { - return new EngineReportingExtension( - this.options, - this.addTrace.bind(this), - schemaHash, - ); + public newExtension(): ApolloServerPlugin { + return plugin(this.options, this.addTrace.bind(this)); } public async addTrace({ diff --git a/packages/apollo-engine-reporting/src/extension.ts b/packages/apollo-engine-reporting/src/extension.ts index aacc702dcb1..00e0a18da6c 100644 --- a/packages/apollo-engine-reporting/src/extension.ts +++ b/packages/apollo-engine-reporting/src/extension.ts @@ -22,6 +22,9 @@ import { SendValuesBaseOptions, } from './agent'; import { EngineReportingTreeBuilder } from './treeBuilder'; +import { ApolloServerPlugin } from "apollo-server-plugin-base"; + +type Mutable = { -readonly [P in keyof T]: T[P] }; const clientNameHeaderKey = 'apollographql-client-name'; const clientReferenceIdHeaderKey = 'apollographql-client-reference-id'; @@ -208,6 +211,177 @@ export class EngineReportingExtension } } +// This plugin is instantiated once at server start-up. Each request that the +// server processes will invoke the `requestDidStart` method which will produce +// a trace (in protobuf Trace format) for that single request. When the request +// is done, it passes the Trace back to its associated EngineReportingAgent via +// the addTrace callback. This class isn't for direct use; its constructor is a +// private API for communicating with EngineReportingAgent. +export const plugin = ( + options: EngineReportingOptions = Object.create(null), + addTrace: (args: AddTraceArgs) => Promise, + // schemaHash: string, +): ApolloServerPlugin => { + const logger: Logger = options.logger || console; + const generateClientInfo: GenerateClientInfo = + options.generateClientInfo || defaultGenerateClientInfo; + + + return { + requestDidStart(requestContext) { + let queryString: string | undefined; + const treeBuilder: EngineReportingTreeBuilder = + new EngineReportingTreeBuilder({ + rewriteError: options.rewriteError, + logger: requestContext.logger || logger, + }); + + const metrics: NonNullable = + ((requestContext as Mutable) + .metrics = requestContext.metrics || Object.create(null)); + + treeBuilder.startTiming(); + metrics.startHrTime = treeBuilder.startHrTime; + + if (requestContext.request.http) { + treeBuilder.trace.http = new Trace.HTTP({ + method: + Trace.HTTP.Method[ + requestContext.request.http + .method as keyof typeof Trace.HTTP.Method + ] || Trace.HTTP.Method.UNKNOWN, + // Host and path are not used anywhere on the backend, so let's not bother + // trying to parse request.url to get them, which is a potential + // source of bugs because integrations have different behavior here. + // On Node's HTTP module, request.url only includes the path + // (see https://nodejs.org/api/http.html#http_message_url) + // The same is true on Lambda (where we pass event.path) + // But on environments like Cloudflare we do get a complete URL. + host: null, + path: null, + }); + } + + let preflightDone: boolean = false; + function ensurePreflight() { + if (preflightDone) return; + preflightDone = true; + + if (options.sendHeaders) { + if (requestContext.request.http && treeBuilder.trace.http) { + makeHTTPRequestHeaders( + treeBuilder.trace.http, + requestContext.request.http.headers, + options.sendHeaders, + ); + } + } + + if (metrics.persistedQueryHit) { + treeBuilder.trace.persistedQueryHit = true; + } + if (metrics.persistedQueryRegister) { + treeBuilder.trace.persistedQueryRegister = true; + } + + // Generally, we'll get queryString here and not parsedQuery; we only get + // parsedQuery if you're using an OperationStore. In normal cases we'll + // get our documentAST in the execution callback after it is parsed. + queryString = requestContext.source; + + if (requestContext.request.variables) { + treeBuilder.trace.details = makeTraceDetails( + requestContext.request.variables, + options.sendVariableValues, + queryString, + ); + } + + const clientInfo = generateClientInfo(requestContext); + if (clientInfo) { + // While clientAddress could be a part of the protobuf, we'll ignore it for + // now, since the backend does not group by it and Engine frontend will not + // support it in the short term + const { clientName, clientVersion, clientReferenceId } = clientInfo; + // the backend makes the choice of mapping clientName => clientReferenceId if + // no custom reference id is provided + treeBuilder.trace.clientVersion = clientVersion || ''; + treeBuilder.trace.clientReferenceId = clientReferenceId || ''; + treeBuilder.trace.clientName = clientName || ''; + } + } + + let endDone: boolean = false; + function didEnd() { + if (endDone) return; + endDone = true; + treeBuilder.stopTiming(); + + treeBuilder.trace.fullQueryCacheHit = !!metrics.responseCacheHit; + treeBuilder.trace.forbiddenOperation = !!metrics.forbiddenOperation; + treeBuilder.trace.registeredOperation = !!metrics.registeredOperation; + + // If the user did not explicitly specify an operation name (which we + // would have saved in `executionDidStart`), but the request pipeline made + // it far enough to figure out what the operation name must be and store + // it on requestContext.operationName, use that name. (Note that this + // depends on the assumption that the RequestContext passed to + // requestDidStart, which does not yet have operationName, will be mutated + // to add operationName later.) + const operationName = requestContext.operationName || ''; + + // If this was a federated operation and we're the gateway, add the query plan + // to the trace. + if (metrics.queryPlanTrace) { + treeBuilder.trace.queryPlan = metrics.queryPlanTrace; + } + + addTrace({ + operationName, + queryHash: requestContext.queryHash!, + documentAST: requestContext.document, + queryString, + trace: treeBuilder.trace, + schemaHash: requestContext.schemaHash, + }); + } + + return { + parsingDidStart() { + ensurePreflight(); + }, + + validationDidStart() { + ensurePreflight(); + }, + + didResolveOperation() { + ensurePreflight(); + }, + + executionDidStart() { + ensurePreflight(); + return didEnd; + }, + + willResolveField(...args) { + const [, , , info] = args; + return treeBuilder.willResolveField(info); + // We could save the error into the trace during the end handler, but + // it won't have all the information that graphql-js adds to it later, + // like 'locations'. + }, + + didEncounterErrors({ errors }) { + ensurePreflight(); + treeBuilder.didEncounterErrors(errors); + didEnd(); + }, + }; + } + }; +}; + // Helpers for producing traces. function defaultGenerateClientInfo({ request }: GraphQLRequestContext) { diff --git a/packages/apollo-engine-reporting/src/federatedExtension.ts b/packages/apollo-engine-reporting/src/federatedExtension.ts index 711c95fbf6e..a811cd04149 100644 --- a/packages/apollo-engine-reporting/src/federatedExtension.ts +++ b/packages/apollo-engine-reporting/src/federatedExtension.ts @@ -4,6 +4,68 @@ import { Trace } from 'apollo-engine-reporting-protobuf'; import { GraphQLRequestContext } from 'apollo-server-types'; import { EngineReportingTreeBuilder } from './treeBuilder'; +import { ApolloServerPlugin } from "apollo-server-plugin-base"; +import { EngineReportingOptions } from "./agent"; + +type FederatedReportingOptions = Pick, 'rewriteError'> + +export const plugin = ( + options: FederatedReportingOptions = Object.create(null), +): ApolloServerPlugin => { + return { + requestDidStart(requestContext) { + const treeBuilder: EngineReportingTreeBuilder = + new EngineReportingTreeBuilder({ + rewriteError: options.rewriteError, + }); + + // XXX Provide a mechanism to customize this logic. + const http = requestContext.request.http; + if ( + !http || + !http.headers || + http.headers.get('apollo-federation-include-trace') !== 'ftv1' + ) { + return; + } + + treeBuilder.startTiming(); + + return { + willResolveField(...args) { + const [ , , , info] = args; + return treeBuilder.willResolveField(info); + }, + + didEncounterErrors({ errors }) { + treeBuilder.didEncounterErrors(errors); + }, + + willSendResponse({ response }) { + // We record the end time at the latest possible time: right before serializing the trace. + // If we wait any longer, the time we record won't actually be sent anywhere! + treeBuilder.stopTiming(); + + const encodedUint8Array = Trace.encode(treeBuilder.trace).finish(); + const encodedBuffer = Buffer.from( + encodedUint8Array, + encodedUint8Array.byteOffset, + encodedUint8Array.byteLength, + ); + + const extensions = + response.extensions || (response.extensions = Object.create(null)); + + if (typeof extensions.ftv1 !== "undefined") { + throw new Error("The `ftv1` `extensions` were already present."); + } + + extensions.ftv1 = encodedBuffer.toString('base64'); + } + } + }, + } +}; export class EngineFederatedTracingExtension implements GraphQLExtension { diff --git a/packages/apollo-engine-reporting/src/index.ts b/packages/apollo-engine-reporting/src/index.ts index 5770edf02c3..36c7e53a85f 100644 --- a/packages/apollo-engine-reporting/src/index.ts +++ b/packages/apollo-engine-reporting/src/index.ts @@ -1,2 +1,2 @@ export { EngineReportingOptions, EngineReportingAgent } from './agent'; -export { EngineFederatedTracingExtension } from './federatedExtension'; +export { plugin as federatedPlugin } from './federatedExtension'; diff --git a/packages/apollo-engine-reporting/src/treeBuilder.ts b/packages/apollo-engine-reporting/src/treeBuilder.ts index a10535bbe23..f38283d572f 100644 --- a/packages/apollo-engine-reporting/src/treeBuilder.ts +++ b/packages/apollo-engine-reporting/src/treeBuilder.ts @@ -78,7 +78,7 @@ export class EngineReportingTreeBuilder { }; } - public didEncounterErrors(errors: GraphQLError[]) { + public didEncounterErrors(errors: readonly GraphQLError[]) { errors.forEach(err => { if ( err instanceof PersistedQueryNotFoundError || diff --git a/packages/apollo-engine-reporting/tsconfig.json b/packages/apollo-engine-reporting/tsconfig.json index ca382f1094c..1e8b57f68f2 100644 --- a/packages/apollo-engine-reporting/tsconfig.json +++ b/packages/apollo-engine-reporting/tsconfig.json @@ -10,5 +10,6 @@ { "path": "../graphql-extensions" }, { "path": "../apollo-server-errors" }, { "path": "../apollo-server-types" }, + { "path": "../apollo-server-plugin-base" }, ] } diff --git a/packages/apollo-server-core/src/ApolloServer.ts b/packages/apollo-server-core/src/ApolloServer.ts index 4ae62ad9889..56afdc34a1c 100644 --- a/packages/apollo-server-core/src/ApolloServer.ts +++ b/packages/apollo-server-core/src/ApolloServer.ts @@ -225,10 +225,6 @@ export class ApolloServerBase { this.parseOptions = parseOptions; this.context = context; - // Plugins will be instantiated if they aren't already, and this.plugins - // is populated accordingly. - this.ensurePluginInstantiation(plugins); - // While reading process.env is slow, a server should only be constructed // once per run, so we place the env check inside the constructor. If env // should be used outside of the constructor context, place it as a private @@ -413,6 +409,11 @@ export class ApolloServerBase { } else { throw new Error("Unexpected error: Unable to resolve a valid GraphQLSchema. Please file an issue with a reproduction of this error, if possible."); } + + // Plugins will be instantiated if they aren't already, and this.plugins + // is populated accordingly. + this.ensurePluginInstantiation(plugins); + } // used by integrations to synchronize the path with subscriptions, some @@ -562,39 +563,6 @@ export class ApolloServerBase { const extensions = []; - const schemaIsFederated = this.schemaIsFederated(schema); - const { engine } = this.config; - // Keep this extension second so it wraps everything, except error formatting - if (this.engineReportingAgent) { - if (schemaIsFederated) { - // XXX users can configure a federated Apollo Server to send metrics, but the - // Gateway should be responsible for that. It's possible that users are running - // their own gateway or running a federated service on its own. Nonetheless, in - // the likely case it was accidental, we warn users that they should only report - // metrics from the Gateway. - this.logger.warn( - "It looks like you're running a federated schema and you've configured your service " + - 'to report metrics to Apollo Graph Manager. You should only configure your Apollo gateway ' + - 'to report metrics to Apollo Graph Manager.', - ); - } - extensions.push(() => - this.engineReportingAgent!.newExtension(schemaHash), - ); - } else if (engine !== false && schemaIsFederated) { - // We haven't configured this app to use Engine directly. But it looks like - // we are a federated service backend, so we should be capable of including - // our trace in a response extension if we are asked to by the gateway. - const { - EngineFederatedTracingExtension, - } = require('apollo-engine-reporting'); - const rewriteError = - engine && typeof engine === 'object' ? engine.rewriteError : undefined; - extensions.push( - () => new EngineFederatedTracingExtension({ rewriteError }), - ); - } - // Note: doRunQuery will add its own extensions if you set tracing, // or cacheControl. extensions.push(...(_extensions || [])); @@ -789,6 +757,34 @@ export class ApolloServerBase { // User's plugins, provided as an argument to this method, will be added // at the end of that list so they take precidence. // A follow-up commit will actually introduce this. + // Also, TODO, remove this comment. + + const federatedSchema = this.schema && this.schemaIsFederated(this.schema); + const { engine } = this.config; + // Keep this extension second so it wraps everything, except error formatting + if (this.engineReportingAgent) { + if (federatedSchema) { + // XXX users can configure a federated Apollo Server to send metrics, but the + // Gateway should be responsible for that. It's possible that users are running + // their own gateway or running a federated service on its own. Nonetheless, in + // the likely case it was accidental, we warn users that they should only report + // metrics from the Gateway. + this.logger.warn( + "It looks like you're running a federated schema and you've configured your service " + + 'to report metrics to Apollo Graph Manager. You should only configure your Apollo gateway ' + + 'to report metrics to Apollo Graph Manager.', + ); + } + pluginsToInit.push(this.engineReportingAgent!.newExtension()); + } else if (engine !== false && federatedSchema) { + // We haven't configured this app to use Engine directly. But it looks like + // we are a federated service backend, so we should be capable of including + // our trace in a response extension if we are asked to by the gateway. + const { federatedPlugin } = require('apollo-engine-reporting'); + const rewriteError = + engine && typeof engine === 'object' ? engine.rewriteError : undefined; + pluginsToInit.push(federatedPlugin({ rewriteError })); + } pluginsToInit.push(...plugins); this.plugins = pluginsToInit.map(plugin => { From 78a4cb77edc7c7f11b68f5969a6e85b75e75b6e7 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 14 Apr 2020 17:24:42 +0300 Subject: [PATCH 415/642] fix: Keep special-cased errors (e.g. APQ not found) as unreported. This fixes the failing tests which correctly surfaced on the last commit. Previously, prior to the new plugin API, the Apollo Engine Reporting mechanism was implemented using `graphql-extensions`, the API for which didn't invoke `requestDidStart` until _after_ APQ had been negotiated. The new plugin API starts its `requestDidStart` _before_ APQ validation and various other assertions which weren't included in the `requestDidStart` life-cycle, even if they perhaps should be in terms of error reporting. The new plugin API is able to properly capture such errors within its `didEncounterErrors` lifecycle hook (thanks to https://github.com/apollographql/apollo-server/pull/3614, which intentionally captures these failures so plugin authors can accurately react to them), however, for behavioral consistency reasons, we will still special-case those errors and maintain the legacy behavior to avoid a breaking change. We can reconsider this in a future version of Apollo Engine Reporting (AS3, perhaps!). Ref: https://github.com/apollographql/apollo-server/pull/3614 Ref: https://github.com/apollographql/apollo-server/issues/3627 Ref: https://github.com/apollographql/apollo-server/issues/3638 --- .../apollo-engine-reporting/src/extension.ts | 44 +++++++++++++++++++ .../src/treeBuilder.ts | 14 +----- 2 files changed, 45 insertions(+), 13 deletions(-) diff --git a/packages/apollo-engine-reporting/src/extension.ts b/packages/apollo-engine-reporting/src/extension.ts index 00e0a18da6c..d3964fd0914 100644 --- a/packages/apollo-engine-reporting/src/extension.ts +++ b/packages/apollo-engine-reporting/src/extension.ts @@ -3,6 +3,7 @@ import { WithRequired, Logger, SchemaHash, + InvalidGraphQLRequestError, } from 'apollo-server-types'; import { Request, Headers } from 'apollo-server-env'; import { @@ -23,6 +24,10 @@ import { } from './agent'; import { EngineReportingTreeBuilder } from './treeBuilder'; import { ApolloServerPlugin } from "apollo-server-plugin-base"; +import { + PersistedQueryNotFoundError, + PersistedQueryNotSupportedError, +} from 'apollo-server-errors'; type Mutable = { -readonly [P in keyof T]: T[P] }; @@ -373,6 +378,12 @@ export const plugin = ( }, didEncounterErrors({ errors }) { + // We don't report some special-cased errors to Graph Manager. + // See the definition of this function for the reasons. + if (allUnreportableSpecialCasedErrors(errors)) { + return; + } + ensurePreflight(); treeBuilder.didEncounterErrors(errors); didEnd(); @@ -382,6 +393,39 @@ export const plugin = ( }; }; +/** + * Previously, prior to the new plugin API, the Apollo Engine Reporting + * mechanism was implemented using `graphql-extensions`, the API for which + * didn't invoke `requestDidStart` until _after_ APQ had been negotiated. + * + * The new plugin API starts its `requestDidStart` _before_ APQ validation and + * various other assertions which weren't included in the `requestDidStart` + * life-cycle, even if they perhaps should be in terms of error reporting. + * + * The new plugin API is able to properly capture such errors within its + * `didEncounterErrors` lifecycle hook, however, for behavioral consistency + * reasons, we will still special-case those errors and maintain the legacy + * behavior to avoid a breaking change. We can reconsider this in a future + * version of Apollo Engine Reporting (AS3, perhaps!). + * + * @param errors A list of errors to scan for special-cased instances. + */ +function allUnreportableSpecialCasedErrors( + errors: readonly GraphQLError[], +): boolean { + return errors.every(err => { + if ( + err instanceof PersistedQueryNotFoundError || + err instanceof PersistedQueryNotSupportedError || + err instanceof InvalidGraphQLRequestError + ) { + return true; + } + + return false; + }); +} + // Helpers for producing traces. function defaultGenerateClientInfo({ request }: GraphQLRequestContext) { diff --git a/packages/apollo-engine-reporting/src/treeBuilder.ts b/packages/apollo-engine-reporting/src/treeBuilder.ts index f38283d572f..27bfe9376ba 100644 --- a/packages/apollo-engine-reporting/src/treeBuilder.ts +++ b/packages/apollo-engine-reporting/src/treeBuilder.ts @@ -1,10 +1,6 @@ import { GraphQLError, GraphQLResolveInfo, ResponsePath } from 'graphql'; import { Trace, google } from 'apollo-engine-reporting-protobuf'; -import { - PersistedQueryNotFoundError, - PersistedQueryNotSupportedError, -} from 'apollo-server-errors'; -import { InvalidGraphQLRequestError, Logger } from 'apollo-server-types'; +import { Logger } from 'apollo-server-types'; function internalError(message: string) { return new Error(`[internal apollo-server error] ${message}`); @@ -80,14 +76,6 @@ export class EngineReportingTreeBuilder { public didEncounterErrors(errors: readonly GraphQLError[]) { errors.forEach(err => { - if ( - err instanceof PersistedQueryNotFoundError || - err instanceof PersistedQueryNotSupportedError || - err instanceof InvalidGraphQLRequestError - ) { - return; - } - // This is an error from a federated service. We will already be reporting // it in the nested Trace in the query plan. // From c67a6dfe0c5d352ac92a44a80711b2c89bbc820b Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Wed, 15 Apr 2020 13:35:34 +0300 Subject: [PATCH 416/642] eliminate!: Remove now deprecated `EngineReportingExtension`. The plugin implementation brought in de7ba72b50ff5 supersedes the need for this implementation! --- package-lock.json | 4 +- packages/apollo-engine-reporting/package.json | 3 +- .../{extension.test.ts => plugin.test.ts} | 2 +- packages/apollo-engine-reporting/src/agent.ts | 2 +- .../src/federatedExtension.ts | 147 ------------- .../src/federatedPlugin.ts | 66 ++++++ packages/apollo-engine-reporting/src/index.ts | 2 +- .../src/{extension.ts => plugin.ts} | 193 +----------------- .../apollo-engine-reporting/tsconfig.json | 1 - 9 files changed, 74 insertions(+), 346 deletions(-) rename packages/apollo-engine-reporting/src/__tests__/{extension.test.ts => plugin.test.ts} (99%) delete mode 100644 packages/apollo-engine-reporting/src/federatedExtension.ts create mode 100644 packages/apollo-engine-reporting/src/federatedPlugin.ts rename packages/apollo-engine-reporting/src/{extension.ts => plugin.ts} (66%) diff --git a/package-lock.json b/package-lock.json index 20a701000e3..1b638d12e8d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4305,9 +4305,9 @@ "apollo-server-caching": "file:packages/apollo-server-caching", "apollo-server-env": "file:packages/apollo-server-env", "apollo-server-errors": "file:packages/apollo-server-errors", + "apollo-server-plugin-base": "file:packages/apollo-server-plugin-base", "apollo-server-types": "file:packages/apollo-server-types", - "async-retry": "^1.2.1", - "graphql-extensions": "file:packages/graphql-extensions" + "async-retry": "^1.2.1" } }, "apollo-engine-reporting-protobuf": { diff --git a/packages/apollo-engine-reporting/package.json b/packages/apollo-engine-reporting/package.json index fa666882864..05f26ccdd9a 100644 --- a/packages/apollo-engine-reporting/package.json +++ b/packages/apollo-engine-reporting/package.json @@ -18,8 +18,7 @@ "apollo-server-errors": "file:../apollo-server-errors", "apollo-server-types": "file:../apollo-server-types", "async-retry": "^1.2.1", - "apollo-server-plugin-base": "file:../apollo-server-plugin-base", - "graphql-extensions": "file:../graphql-extensions" + "apollo-server-plugin-base": "file:../apollo-server-plugin-base" }, "peerDependencies": { "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0" diff --git a/packages/apollo-engine-reporting/src/__tests__/extension.test.ts b/packages/apollo-engine-reporting/src/__tests__/plugin.test.ts similarity index 99% rename from packages/apollo-engine-reporting/src/__tests__/extension.test.ts rename to packages/apollo-engine-reporting/src/__tests__/plugin.test.ts index 8520f902f36..2a8d3313b12 100644 --- a/packages/apollo-engine-reporting/src/__tests__/extension.test.ts +++ b/packages/apollo-engine-reporting/src/__tests__/plugin.test.ts @@ -1,7 +1,7 @@ import { makeExecutableSchema, addMockFunctionsToSchema } from 'graphql-tools'; import { graphql, GraphQLError } from 'graphql'; import { Request } from 'node-fetch'; -import { makeTraceDetails, makeHTTPRequestHeaders, plugin } from '../extension'; +import { makeTraceDetails, makeHTTPRequestHeaders, plugin } from '../plugin'; import { Headers } from 'apollo-server-env'; import { AddTraceArgs } from '../agent'; import { Trace } from 'apollo-engine-reporting-protobuf'; diff --git a/packages/apollo-engine-reporting/src/agent.ts b/packages/apollo-engine-reporting/src/agent.ts index d98861bea3b..71de2c2f08c 100644 --- a/packages/apollo-engine-reporting/src/agent.ts +++ b/packages/apollo-engine-reporting/src/agent.ts @@ -11,7 +11,7 @@ import { import { fetch, RequestAgent, Response } from 'apollo-server-env'; import retry from 'async-retry'; -import { plugin } from './extension'; +import { plugin } from './plugin'; import { GraphQLRequestContext, Logger, SchemaHash } from 'apollo-server-types'; import { InMemoryLRUCache } from 'apollo-server-caching'; import { defaultEngineReportingSignature } from 'apollo-graphql'; diff --git a/packages/apollo-engine-reporting/src/federatedExtension.ts b/packages/apollo-engine-reporting/src/federatedExtension.ts deleted file mode 100644 index a811cd04149..00000000000 --- a/packages/apollo-engine-reporting/src/federatedExtension.ts +++ /dev/null @@ -1,147 +0,0 @@ -import { GraphQLResolveInfo, GraphQLError } from 'graphql'; -import { GraphQLExtension } from 'graphql-extensions'; -import { Trace } from 'apollo-engine-reporting-protobuf'; -import { GraphQLRequestContext } from 'apollo-server-types'; - -import { EngineReportingTreeBuilder } from './treeBuilder'; -import { ApolloServerPlugin } from "apollo-server-plugin-base"; -import { EngineReportingOptions } from "./agent"; - -type FederatedReportingOptions = Pick, 'rewriteError'> - -export const plugin = ( - options: FederatedReportingOptions = Object.create(null), -): ApolloServerPlugin => { - return { - requestDidStart(requestContext) { - const treeBuilder: EngineReportingTreeBuilder = - new EngineReportingTreeBuilder({ - rewriteError: options.rewriteError, - }); - - // XXX Provide a mechanism to customize this logic. - const http = requestContext.request.http; - if ( - !http || - !http.headers || - http.headers.get('apollo-federation-include-trace') !== 'ftv1' - ) { - return; - } - - treeBuilder.startTiming(); - - return { - willResolveField(...args) { - const [ , , , info] = args; - return treeBuilder.willResolveField(info); - }, - - didEncounterErrors({ errors }) { - treeBuilder.didEncounterErrors(errors); - }, - - willSendResponse({ response }) { - // We record the end time at the latest possible time: right before serializing the trace. - // If we wait any longer, the time we record won't actually be sent anywhere! - treeBuilder.stopTiming(); - - const encodedUint8Array = Trace.encode(treeBuilder.trace).finish(); - const encodedBuffer = Buffer.from( - encodedUint8Array, - encodedUint8Array.byteOffset, - encodedUint8Array.byteLength, - ); - - const extensions = - response.extensions || (response.extensions = Object.create(null)); - - if (typeof extensions.ftv1 !== "undefined") { - throw new Error("The `ftv1` `extensions` were already present."); - } - - extensions.ftv1 = encodedBuffer.toString('base64'); - } - } - }, - } -}; - -export class EngineFederatedTracingExtension - implements GraphQLExtension { - private enabled = false; - private done = false; - private treeBuilder: EngineReportingTreeBuilder; - - public constructor(options: { - rewriteError?: (err: GraphQLError) => GraphQLError | null; - }) { - this.treeBuilder = new EngineReportingTreeBuilder({ - rewriteError: options.rewriteError, - }); - } - - public requestDidStart(o: { - requestContext: GraphQLRequestContext; - }) { - // XXX Provide a mechanism to customize this logic. - const http = o.requestContext.request.http; - if ( - http && - http.headers.get('apollo-federation-include-trace') === 'ftv1' - ) { - this.enabled = true; - } - - if (this.enabled) { - this.treeBuilder.startTiming(); - } - } - - public willResolveField( - _source: any, - _args: { [argName: string]: any }, - _context: TContext, - info: GraphQLResolveInfo, - ): ((error: Error | null, result: any) => void) | void { - if (this.enabled) { - return this.treeBuilder.willResolveField(info); - } - } - - public didEncounterErrors(errors: GraphQLError[]) { - if (this.enabled) { - this.treeBuilder.didEncounterErrors(errors); - } - } - - // The ftv1 extension is a base64'd Trace protobuf containing only the - // durationNs, startTime, endTime, and root fields. - // - // Note: format() is only called after executing an operation, and - // specifically isn't called for parse or validation errors. Parse and validation - // errors in a federated backend will get reported to the end user as a downstream - // error but will not get reported to Engine (because Engine filters out downstream - // errors)! See #3091. - public format(): [string, string] | undefined { - if (!this.enabled) { - return; - } - if (this.done) { - throw Error('format called twice?'); - } - - // We record the end time at the latest possible time: right before serializing the trace. - // If we wait any longer, the time we record won't actually be sent anywhere! - this.treeBuilder.stopTiming(); - this.done = true; - - const encodedUint8Array = Trace.encode(this.treeBuilder.trace).finish(); - const encodedBuffer = Buffer.from( - encodedUint8Array, - encodedUint8Array.byteOffset, - encodedUint8Array.byteLength, - ); - return ['ftv1', encodedBuffer.toString('base64')]; - } -} diff --git a/packages/apollo-engine-reporting/src/federatedPlugin.ts b/packages/apollo-engine-reporting/src/federatedPlugin.ts new file mode 100644 index 00000000000..5bad85c252b --- /dev/null +++ b/packages/apollo-engine-reporting/src/federatedPlugin.ts @@ -0,0 +1,66 @@ +import { Trace } from 'apollo-engine-reporting-protobuf'; +import { EngineReportingTreeBuilder } from './treeBuilder'; +import { ApolloServerPlugin } from "apollo-server-plugin-base"; +import { EngineReportingOptions } from "./agent"; + +type FederatedReportingOptions = Pick, 'rewriteError'> + +const federatedPlugin = ( + options: FederatedReportingOptions = Object.create(null), +): ApolloServerPlugin => { + return { + requestDidStart(requestContext) { + const treeBuilder: EngineReportingTreeBuilder = + new EngineReportingTreeBuilder({ + rewriteError: options.rewriteError, + }); + + // XXX Provide a mechanism to customize this logic. + const http = requestContext.request.http; + if ( + !http || + !http.headers || + http.headers.get('apollo-federation-include-trace') !== 'ftv1' + ) { + return; + } + + treeBuilder.startTiming(); + + return { + willResolveField(...args) { + const [ , , , info] = args; + return treeBuilder.willResolveField(info); + }, + + didEncounterErrors({ errors }) { + treeBuilder.didEncounterErrors(errors); + }, + + willSendResponse({ response }) { + // We record the end time at the latest possible time: right before serializing the trace. + // If we wait any longer, the time we record won't actually be sent anywhere! + treeBuilder.stopTiming(); + + const encodedUint8Array = Trace.encode(treeBuilder.trace).finish(); + const encodedBuffer = Buffer.from( + encodedUint8Array, + encodedUint8Array.byteOffset, + encodedUint8Array.byteLength, + ); + + const extensions = + response.extensions || (response.extensions = Object.create(null)); + + if (typeof extensions.ftv1 !== "undefined") { + throw new Error("The `ftv1` `extensions` were already present."); + } + + extensions.ftv1 = encodedBuffer.toString('base64'); + } + } + }, + } +}; + +export default federatedPlugin; diff --git a/packages/apollo-engine-reporting/src/index.ts b/packages/apollo-engine-reporting/src/index.ts index 36c7e53a85f..82b73e73ad9 100644 --- a/packages/apollo-engine-reporting/src/index.ts +++ b/packages/apollo-engine-reporting/src/index.ts @@ -1,2 +1,2 @@ export { EngineReportingOptions, EngineReportingAgent } from './agent'; -export { plugin as federatedPlugin } from './federatedExtension'; +export { default as federatedPlugin } from './federatedPlugin'; diff --git a/packages/apollo-engine-reporting/src/extension.ts b/packages/apollo-engine-reporting/src/plugin.ts similarity index 66% rename from packages/apollo-engine-reporting/src/extension.ts rename to packages/apollo-engine-reporting/src/plugin.ts index d3964fd0914..a0179b30ef6 100644 --- a/packages/apollo-engine-reporting/src/extension.ts +++ b/packages/apollo-engine-reporting/src/plugin.ts @@ -1,18 +1,10 @@ import { GraphQLRequestContext, - WithRequired, Logger, - SchemaHash, InvalidGraphQLRequestError, } from 'apollo-server-types'; -import { Request, Headers } from 'apollo-server-env'; -import { - GraphQLResolveInfo, - DocumentNode, - ExecutionArgs, - GraphQLError, -} from 'graphql'; -import { GraphQLExtension, EndHandler } from 'graphql-extensions'; +import { Headers } from 'apollo-server-env'; +import { GraphQLError } from 'graphql'; import { Trace } from 'apollo-engine-reporting-protobuf'; import { @@ -35,187 +27,6 @@ const clientNameHeaderKey = 'apollographql-client-name'; const clientReferenceIdHeaderKey = 'apollographql-client-reference-id'; const clientVersionHeaderKey = 'apollographql-client-version'; -// EngineReportingExtension is the per-request GraphQLExtension which creates a -// trace (in protobuf Trace format) for a single request. When the request is -// done, it passes the Trace back to its associated EngineReportingAgent via the -// addTrace callback in its constructor. This class isn't for direct use; its -// constructor is a private API for communicating with EngineReportingAgent. -// Its public methods all implement the GraphQLExtension interface. -export class EngineReportingExtension - implements GraphQLExtension { - private logger: Logger = console; - private treeBuilder: EngineReportingTreeBuilder; - private explicitOperationName?: string | null; - private queryString?: string; - private documentAST?: DocumentNode; - private options: EngineReportingOptions; - private addTrace: (args: AddTraceArgs) => Promise; - private generateClientInfo: GenerateClientInfo; - - public constructor( - options: EngineReportingOptions, - addTrace: (args: AddTraceArgs) => Promise, - private schemaHash: SchemaHash, - ) { - this.options = { - ...options, - }; - if (options.logger) this.logger = options.logger; - this.addTrace = addTrace; - this.generateClientInfo = - options.generateClientInfo || defaultGenerateClientInfo; - - this.treeBuilder = new EngineReportingTreeBuilder({ - rewriteError: options.rewriteError, - logger: this.logger, - }); - } - - public requestDidStart(o: { - request: Request; - queryString?: string; - parsedQuery?: DocumentNode; - variables?: Record; - context: TContext; - extensions?: Record; - requestContext: WithRequired< - GraphQLRequestContext, - 'metrics' | 'queryHash' - >; - }): EndHandler { - this.treeBuilder.startTiming(); - o.requestContext.metrics.startHrTime = this.treeBuilder.startHrTime; - - // Generally, we'll get queryString here and not parsedQuery; we only get - // parsedQuery if you're using an OperationStore. In normal cases we'll get - // our documentAST in the execution callback after it is parsed. - const queryHash = o.requestContext.queryHash; - this.queryString = o.queryString; - this.documentAST = o.parsedQuery; - - this.treeBuilder.trace.http = new Trace.HTTP({ - method: - Trace.HTTP.Method[o.request.method as keyof typeof Trace.HTTP.Method] || - Trace.HTTP.Method.UNKNOWN, - // Host and path are not used anywhere on the backend, so let's not bother - // trying to parse request.url to get them, which is a potential - // source of bugs because integrations have different behavior here. - // On Node's HTTP module, request.url only includes the path - // (see https://nodejs.org/api/http.html#http_message_url) - // The same is true on Lambda (where we pass event.path) - // But on environments like Cloudflare we do get a complete URL. - host: null, - path: null, - }); - - if (this.options.sendHeaders) { - makeHTTPRequestHeaders( - this.treeBuilder.trace.http, - o.request.headers, - this.options.sendHeaders, - ); - - if (o.requestContext.metrics.persistedQueryHit) { - this.treeBuilder.trace.persistedQueryHit = true; - } - if (o.requestContext.metrics.persistedQueryRegister) { - this.treeBuilder.trace.persistedQueryRegister = true; - } - } - - if (o.variables) { - this.treeBuilder.trace.details = makeTraceDetails( - o.variables, - this.options.sendVariableValues, - o.queryString, - ); - } - - const clientInfo = this.generateClientInfo(o.requestContext); - if (clientInfo) { - // While clientAddress could be a part of the protobuf, we'll ignore it for - // now, since the backend does not group by it and Engine frontend will not - // support it in the short term - const { clientName, clientVersion, clientReferenceId } = clientInfo; - // the backend makes the choice of mapping clientName => clientReferenceId if - // no custom reference id is provided - this.treeBuilder.trace.clientVersion = clientVersion || ''; - this.treeBuilder.trace.clientReferenceId = clientReferenceId || ''; - this.treeBuilder.trace.clientName = clientName || ''; - } - - return () => { - this.treeBuilder.stopTiming(); - - this.treeBuilder.trace.fullQueryCacheHit = !!o.requestContext.metrics - .responseCacheHit; - this.treeBuilder.trace.forbiddenOperation = !!o.requestContext.metrics - .forbiddenOperation; - this.treeBuilder.trace.registeredOperation = !!o.requestContext.metrics - .registeredOperation; - - // If the user did not explicitly specify an operation name (which we - // would have saved in `executionDidStart`), but the request pipeline made - // it far enough to figure out what the operation name must be and store - // it on requestContext.operationName, use that name. (Note that this - // depends on the assumption that the RequestContext passed to - // requestDidStart, which does not yet have operationName, will be mutated - // to add operationName later.) - const operationName = - this.explicitOperationName || o.requestContext.operationName || ''; - const documentAST = this.documentAST || o.requestContext.document; - - // If this was a federated operation and we're the gateway, add the query plan - // to the trace. - if (o.requestContext.metrics.queryPlanTrace) { - this.treeBuilder.trace.queryPlan = - o.requestContext.metrics.queryPlanTrace; - } - - this.addTrace({ - operationName, - queryHash, - documentAST, - queryString: this.queryString || '', - trace: this.treeBuilder.trace, - schemaHash: this.schemaHash, - }); - }; - } - - public executionDidStart(o: { executionArgs: ExecutionArgs }) { - // If the operationName is explicitly provided, save it. Note: this is the - // operationName provided by the user. It might be empty if they're relying on - // the "just use the only operation I sent" behavior, even if that operation - // has a name. - // - // It's possible that execution is about to fail because this operation - // isn't actually in the document. We want to know the name in that case - // too, which is why it's important that we save the name now, and not just - // rely on requestContext.operationName (which will be null in this case). - if (o.executionArgs.operationName) { - this.explicitOperationName = o.executionArgs.operationName; - } - this.documentAST = o.executionArgs.document; - } - - public willResolveField( - _source: any, - _args: { [argName: string]: any }, - _context: TContext, - info: GraphQLResolveInfo, - ): ((error: Error | null, result: any) => void) | void { - return this.treeBuilder.willResolveField(info); - // We could save the error into the trace during the end handler, but it - // won't have all the information that graphql-js adds to it later, like - // 'locations'. - } - - public didEncounterErrors(errors: GraphQLError[]) { - this.treeBuilder.didEncounterErrors(errors); - } -} - // This plugin is instantiated once at server start-up. Each request that the // server processes will invoke the `requestDidStart` method which will produce // a trace (in protobuf Trace format) for that single request. When the request diff --git a/packages/apollo-engine-reporting/tsconfig.json b/packages/apollo-engine-reporting/tsconfig.json index 1e8b57f68f2..ea64c712362 100644 --- a/packages/apollo-engine-reporting/tsconfig.json +++ b/packages/apollo-engine-reporting/tsconfig.json @@ -7,7 +7,6 @@ "include": ["src/**/*"], "exclude": ["**/__tests__", "**/__mocks__"], "references": [ - { "path": "../graphql-extensions" }, { "path": "../apollo-server-errors" }, { "path": "../apollo-server-types" }, { "path": "../apollo-server-plugin-base" }, From efbddbfaddf139c5f00467a17673d743584e11b7 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Fri, 17 Apr 2020 08:10:41 +0300 Subject: [PATCH 417/642] Update packages/apollo-server-core/src/ApolloServer.ts --- packages/apollo-server-core/src/ApolloServer.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/apollo-server-core/src/ApolloServer.ts b/packages/apollo-server-core/src/ApolloServer.ts index 4ae62ad9889..eaeb1a09f41 100644 --- a/packages/apollo-server-core/src/ApolloServer.ts +++ b/packages/apollo-server-core/src/ApolloServer.ts @@ -819,8 +819,12 @@ export class ApolloServerBase { protected async graphQLServerOptions( integrationContextArgument?: Record, ): Promise { - const { schema, schemaHash, documentStore, extensions } - = await this.schemaDerivedData; + const { + schema, + schemaHash, + documentStore, + extensions, + } = await this.schemaDerivedData; let context: Context = this.context ? this.context : {}; From c120b3459e895f153006b029c051185a3e92858e Mon Sep 17 00:00:00 2001 From: Gavi Galloway Date: Fri, 17 Apr 2020 17:53:46 -0700 Subject: [PATCH 418/642] Regression test for #3832 (#3977) See PR #3832 for full details --- .../__fixtures__/schemas/documents.ts | 34 +++++++++++++ .../src/__tests__/buildQueryPlan.test.ts | 49 ++++++++++++++++++- 2 files changed, 82 insertions(+), 1 deletion(-) create mode 100644 packages/apollo-gateway/src/__tests__/__fixtures__/schemas/documents.ts diff --git a/packages/apollo-gateway/src/__tests__/__fixtures__/schemas/documents.ts b/packages/apollo-gateway/src/__tests__/__fixtures__/schemas/documents.ts new file mode 100644 index 00000000000..896d76b862f --- /dev/null +++ b/packages/apollo-gateway/src/__tests__/__fixtures__/schemas/documents.ts @@ -0,0 +1,34 @@ +import gql from 'graphql-tag'; + +export const name = 'unionsWithNameCollisions'; +export const typeDefs = gql` + directive @stream on FIELD + directive @transform(from: String!) on FIELD + + extend type Query { + body: Body! + } + + union Body = Image | Text + + type Image { + name: String! + # Same as option below but the type is different + attributes: ImageAttributes! + } + + type Text { + name: String! + # Same as option above but the type is different + attributes: TextAttributes! + } + + type ImageAttributes { + url: String! + } + + type TextAttributes { + bold: Boolean + text: String + } +`; diff --git a/packages/apollo-gateway/src/__tests__/buildQueryPlan.test.ts b/packages/apollo-gateway/src/__tests__/buildQueryPlan.test.ts index 71b1449a398..156f7f93c41 100644 --- a/packages/apollo-gateway/src/__tests__/buildQueryPlan.test.ts +++ b/packages/apollo-gateway/src/__tests__/buildQueryPlan.test.ts @@ -25,7 +25,7 @@ describe('buildQueryPlan', () => { beforeEach(() => { const serviceMap = Object.fromEntries( - ['accounts', 'product', 'inventory', 'reviews', 'books'].map( + ['accounts', 'product', 'inventory', 'reviews', 'books', 'documents'].map( serviceName => { return [ serviceName, @@ -54,6 +54,53 @@ describe('buildQueryPlan', () => { } }); + it(`should not confuse union types with overlapping field names`, () => { + const query = gql` + query { + body { + ...on Image { + attributes { + url + } + } + ...on Text { + attributes { + bold + text + } + } + } + } + `; + + const queryPlan = buildQueryPlan( + buildOperationContext(schema, query, undefined), + ); + + expect(queryPlan).toMatchInlineSnapshot(` + QueryPlan { + Fetch(service: "documents") { + { + body { + __typename + ... on Image { + attributes { + url + } + } + ... on Text { + attributes { + bold + text + } + } + } + } + }, + } + `); + }); + it(`should use a single fetch when requesting a root field from one service`, () => { const query = gql` query { From 501ea94ac1c7e2b969a0f3ca2d73e1720691ce85 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 18 Apr 2020 08:13:29 +0000 Subject: [PATCH 419/642] chore(deps): update dependency gatsby to v2.20.24 (#3975) Co-authored-by: Renovate Bot --- docs/package-lock.json | 1534 +++++++++++++++++++++++++++++++++++----- docs/package.json | 2 +- 2 files changed, 1354 insertions(+), 182 deletions(-) diff --git a/docs/package-lock.json b/docs/package-lock.json index 5478034fbbc..12b6999cb20 100644 --- a/docs/package-lock.json +++ b/docs/package-lock.json @@ -2222,6 +2222,11 @@ } } }, + "@babel/standalone": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/standalone/-/standalone-7.9.5.tgz", + "integrity": "sha512-J6mHRjRUh4pKCd1uz5ghF2LpUwMuGwxy4z+TM+jbvt0dM6NiXd8Z2UOD1ftmGfkuAuDYlgcz4fm62MIjt8iUlg==" + }, "@babel/template": { "version": "7.8.3", "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.3.tgz", @@ -2493,6 +2498,63 @@ "@hapi/hoek": "^8.3.0" } }, + "@jest/types": { + "version": "25.3.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.3.0.tgz", + "integrity": "sha512-UkaDNewdqXAmCDbN2GlUM6amDKS78eCqiw/UmF5nE0mmLTd6moJkiZJML/X52Ke3LH7Swhw883IRXq8o9nWjVw==", + "requires": { + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^1.1.1", + "@types/yargs": "^15.0.0", + "chalk": "^3.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" + }, + "supports-color": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, "@mapbox/hast-util-table-cell-style": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/@mapbox/hast-util-table-cell-style/-/hast-util-table-cell-style-0.1.3.tgz", @@ -2541,6 +2603,16 @@ "resolved": "https://registry.npmjs.org/@mdx-js/react/-/react-1.5.8.tgz", "integrity": "sha512-L3rehITVxqDHOPJFGBSHKt3Mv/p3MENYlGIwLNYU89/iVqTLMD/vz8hL9RQtKqRoMbKuWpzzLlKIObqJzthNYg==" }, + "@mdx-js/runtime": { + "version": "1.5.8", + "resolved": "https://registry.npmjs.org/@mdx-js/runtime/-/runtime-1.5.8.tgz", + "integrity": "sha512-eiF6IOv8+FuUp1Eit5hRiteZ658EtZtqTc1hJ0V9pgBqmT0DswiD/8h1M5+kWItWOtNbvc6Cz7oHMHD3PrfAzA==", + "requires": { + "@mdx-js/mdx": "^1.5.8", + "@mdx-js/react": "^1.5.8", + "buble-jsx-only": "^0.19.8" + } + }, "@mdx-js/util": { "version": "1.5.8", "resolved": "https://registry.npmjs.org/@mdx-js/util/-/util-1.5.8.tgz", @@ -2894,15 +2966,37 @@ "resolved": "https://registry.npmjs.org/@types/history/-/history-4.7.5.tgz", "integrity": "sha512-wLD/Aq2VggCJXSjxEwrMafIP51Z+13H78nXIX0ABEuIGhmB5sNGbR113MOKo+yfw+RDo1ZU3DM6yfnnRF/+ouw==" }, + "@types/istanbul-lib-coverage": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz", + "integrity": "sha512-hRJD2ahnnpLgsj6KWMYSrmXkM3rm2Dl1qkx6IOFD5FnuNPXJIG5L0dhgKXCYTRMGzU4n0wImQ/xfmRc4POUFlg==" + }, + "@types/istanbul-lib-report": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz", + "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==", + "requires": { + "@types/istanbul-lib-coverage": "*" + } + }, + "@types/istanbul-reports": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.1.tgz", + "integrity": "sha512-UpYjBi8xefVChsCoBpKShdxTllC9pwISirfoZsUa2AAdQg/Jd2KQGtSbw+ya7GPo7x/wAPlH6JBhKhAsXUEZNA==", + "requires": { + "@types/istanbul-lib-coverage": "*", + "@types/istanbul-lib-report": "*" + } + }, "@types/json-schema": { "version": "7.0.4", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.4.tgz", "integrity": "sha512-8+KAKzEvSUdeo+kmqnKrqgeE+LcA0tjYWFY7RPProVYwnqDjukzO+3b6dLD56rYX5TdWejnEOLJYOIeh4CXKuA==" }, "@types/lodash": { - "version": "4.14.149", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.149.tgz", - "integrity": "sha512-ijGqzZt/b7BfzcK9vTrS6MFljQRPn5BFWOx8oE0GYxribu6uV+aA9zZuXI1zc/etK9E8nrgdoF2+LgUw7+9tJQ==" + "version": "4.14.150", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.150.tgz", + "integrity": "sha512-kMNLM5JBcasgYscD9x/Gvr6lTAv2NVgsKtet/hm93qMyf/D1pt+7jeEZklKJKxMVmXjxbRVQQGfqDSfipYCO6w==" }, "@types/mdast": { "version": "3.0.3", @@ -3013,6 +3107,19 @@ "vfile-message": "*" } }, + "@types/yargs": { + "version": "15.0.4", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.4.tgz", + "integrity": "sha512-9T1auFmbPZoxHz0enUFlUuKRy3it01R+hlggyVUMtnCTQRunsQYifnSGb8hET4Xo8yiC0o0r1paW3ud5+rbURg==", + "requires": { + "@types/yargs-parser": "*" + } + }, + "@types/yargs-parser": { + "version": "15.0.0", + "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-15.0.0.tgz", + "integrity": "sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==" + }, "@types/yoga-layout": { "version": "1.9.1", "resolved": "https://registry.npmjs.org/@types/yoga-layout/-/yoga-layout-1.9.1.tgz", @@ -3020,42 +3127,42 @@ "optional": true }, "@typescript-eslint/eslint-plugin": { - "version": "2.27.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.27.0.tgz", - "integrity": "sha512-/my+vVHRN7zYgcp0n4z5A6HAK7bvKGBiswaM5zIlOQczsxj/aiD7RcgD+dvVFuwFaGh5+kM7XA6Q6PN0bvb1tw==", + "version": "2.28.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.28.0.tgz", + "integrity": "sha512-w0Ugcq2iatloEabQP56BRWJowliXUP5Wv6f9fKzjJmDW81hOTBxRoJ4LoEOxRpz9gcY51Libytd2ba3yLmSOfg==", "requires": { - "@typescript-eslint/experimental-utils": "2.27.0", + "@typescript-eslint/experimental-utils": "2.28.0", "functional-red-black-tree": "^1.0.1", "regexpp": "^3.0.0", "tsutils": "^3.17.1" } }, "@typescript-eslint/experimental-utils": { - "version": "2.27.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.27.0.tgz", - "integrity": "sha512-vOsYzjwJlY6E0NJRXPTeCGqjv5OHgRU1kzxHKWJVPjDYGbPgLudBXjIlc+OD1hDBZ4l1DLbOc5VjofKahsu9Jw==", + "version": "2.28.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.28.0.tgz", + "integrity": "sha512-4SL9OWjvFbHumM/Zh/ZeEjUFxrYKtdCi7At4GyKTbQlrj1HcphIDXlje4Uu4cY+qzszR5NdVin4CCm6AXCjd6w==", "requires": { "@types/json-schema": "^7.0.3", - "@typescript-eslint/typescript-estree": "2.27.0", + "@typescript-eslint/typescript-estree": "2.28.0", "eslint-scope": "^5.0.0", "eslint-utils": "^2.0.0" } }, "@typescript-eslint/parser": { - "version": "2.27.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.27.0.tgz", - "integrity": "sha512-HFUXZY+EdwrJXZo31DW4IS1ujQW3krzlRjBrFRrJcMDh0zCu107/nRfhk/uBasO8m0NVDbBF5WZKcIUMRO7vPg==", + "version": "2.28.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.28.0.tgz", + "integrity": "sha512-RqPybRDquui9d+K86lL7iPqH6Dfp9461oyqvlXMNtap+PyqYbkY5dB7LawQjDzot99fqzvS0ZLZdfe+1Bt3Jgw==", "requires": { "@types/eslint-visitor-keys": "^1.0.0", - "@typescript-eslint/experimental-utils": "2.27.0", - "@typescript-eslint/typescript-estree": "2.27.0", + "@typescript-eslint/experimental-utils": "2.28.0", + "@typescript-eslint/typescript-estree": "2.28.0", "eslint-visitor-keys": "^1.1.0" } }, "@typescript-eslint/typescript-estree": { - "version": "2.27.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.27.0.tgz", - "integrity": "sha512-t2miCCJIb/FU8yArjAvxllxbTiyNqaXJag7UOpB5DVoM3+xnjeOngtqlJkLRnMtzaRcJhe3CIR9RmL40omubhg==", + "version": "2.28.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.28.0.tgz", + "integrity": "sha512-HDr8MP9wfwkiuqzRVkuM3BeDrOC4cKbO5a6BymZBHUt5y/2pL0BXD6I/C/ceq2IZoHWhcASk+5/zo+dwgu9V8Q==", "requires": { "debug": "^4.1.1", "eslint-visitor-keys": "^1.1.0", @@ -3081,6 +3188,14 @@ } } }, + "@urql/core": { + "version": "1.10.9", + "resolved": "https://registry.npmjs.org/@urql/core/-/core-1.10.9.tgz", + "integrity": "sha512-AyAx/hd+Ilvf+IB0+TOYOrryrIsEgTM3sqiRzY9TfSjAerl67SMn1xQmIBx5+Mo98RRyOyC+wlkIp1EuWLMyxA==", + "requires": { + "wonka": "^4.0.9" + } + }, "@webassemblyjs/ast": { "version": "1.9.0", "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz", @@ -3277,6 +3392,11 @@ "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.1.tgz", "integrity": "sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==" }, + "acorn-dynamic-import": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz", + "integrity": "sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw==" + }, "acorn-jsx": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.2.0.tgz", @@ -3462,6 +3582,11 @@ "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz", "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==" }, + "arr-rotate": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/arr-rotate/-/arr-rotate-1.0.0.tgz", + "integrity": "sha512-yOzOZcR9Tn7enTF66bqKorGGH0F36vcPaSWg8fO0c0UYb3LX3VMXj5ZxEqQLNOecAhlRJ7wYZja5i4jTlnbIfQ==" + }, "arr-union": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz", @@ -3784,14 +3909,14 @@ } }, "caniuse-lite": { - "version": "1.0.30001040", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001040.tgz", - "integrity": "sha512-Ep0tEPeI5wCvmJNrXjE3etgfI+lkl1fTDU6Y3ZH1mhrjkPlVI9W4pcKbMo+BQLpEWKVYYp2EmYaRsqpPC3k7lQ==" + "version": "1.0.30001042", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001042.tgz", + "integrity": "sha512-igMQ4dlqnf4tWv0xjaaE02op9AJ2oQzXKjWf4EuAHFN694Uo9/EfPVIPJcmn2WkU9RqozCxx5e2KPcVClHDbDw==" }, "electron-to-chromium": { - "version": "1.3.403", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.403.tgz", - "integrity": "sha512-JaoxV4RzdBAZOnsF4dAlZ2ijJW72MbqO5lNfOBHUWiBQl3Rwe+mk2RCUMrRI3rSClLJ8HSNQNqcry12H+0ZjFw==" + "version": "1.3.413", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.413.tgz", + "integrity": "sha512-Jm1Rrd3siqYHO3jftZwDljL2LYQafj3Kki5r+udqE58d0i91SkjItVJ5RwlJn9yko8i7MOcoidVKjQlgSdd1hg==" }, "node-releases": { "version": "1.1.53", @@ -4072,9 +4197,9 @@ } }, "babel-plugin-remove-graphql-queries": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/babel-plugin-remove-graphql-queries/-/babel-plugin-remove-graphql-queries-2.8.1.tgz", - "integrity": "sha512-c/JNri17WypqZNnMsX2PweMe8e5hsJcYNO/VnUBX9iUIvmKBjd143RaUQq0xYa6bpQF0kzpTFVR0sOp+cQlBOQ==" + "version": "2.8.3", + "resolved": "https://registry.npmjs.org/babel-plugin-remove-graphql-queries/-/babel-plugin-remove-graphql-queries-2.8.3.tgz", + "integrity": "sha512-BVux5WSXstiZzZuff7hD7F3WjBPq4V/sDgsT7EosXUNAoShht3msg1pFhJx+Id4jq/VNGEy+lfUzmAvBklIYeA==" }, "babel-plugin-syntax-jsx": { "version": "6.18.0", @@ -4087,9 +4212,9 @@ "integrity": "sha512-eqj0hVcJUR57/Ug2zE1Yswsw4LhuqqHhD+8v120T1cl3kjg76QwtyBrdIk4WVwK+lAhBJVYCd/v+4nc4y+8JsA==" }, "babel-preset-gatsby": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/babel-preset-gatsby/-/babel-preset-gatsby-0.3.1.tgz", - "integrity": "sha512-oT/GA1b3xi9xssdwWep874zxD8RZSBg2iL7QHy+emcgkJbYBQJC4NItw561tZGIQqVBJJx8sRaw3V94d1vupOQ==", + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/babel-preset-gatsby/-/babel-preset-gatsby-0.3.3.tgz", + "integrity": "sha512-C3SJlC6ygjijn33pmVyYzteiqwBjFg2VfKEXqEBuy+thOXLtmqAIES62am++ynOW9PGynwgQXb24XoOERqUvbw==", "requires": { "@babel/plugin-proposal-class-properties": "^7.8.3", "@babel/plugin-proposal-nullish-coalescing-operator": "^7.8.3", @@ -4103,7 +4228,7 @@ "babel-plugin-dynamic-import-node": "^2.3.0", "babel-plugin-macros": "^2.8.0", "babel-plugin-transform-react-remove-prop-types": "^0.4.24", - "gatsby-core-utils": "^1.1.1" + "gatsby-core-utils": "^1.1.3" }, "dependencies": { "@babel/runtime": { @@ -4114,6 +4239,16 @@ "regenerator-runtime": "^0.13.4" } }, + "gatsby-core-utils": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.1.3.tgz", + "integrity": "sha512-PntSiNCFo1/ZKjp00qgLBj2jdwY7M+maV21RXb1k7Ud9Vv9j0dGQsaVb9YXFTqXAf8bG0Xyqsqq4mPU1iNYLDw==", + "requires": { + "ci-info": "2.0.0", + "configstore": "^5.0.1", + "node-object-hash": "^2.0.0" + } + }, "regenerator-runtime": { "version": "0.13.5", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", @@ -4620,6 +4755,27 @@ } } }, + "buble-jsx-only": { + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/buble-jsx-only/-/buble-jsx-only-0.19.8.tgz", + "integrity": "sha512-7AW19pf7PrKFnGTEDzs6u9+JZqQwM1VnLS19OlqYDhXomtFFknnoQJAPHeg84RMFWAvOhYrG7harizJNwUKJsA==", + "requires": { + "acorn": "^6.1.1", + "acorn-dynamic-import": "^4.0.0", + "acorn-jsx": "^5.0.1", + "chalk": "^2.4.2", + "magic-string": "^0.25.3", + "minimist": "^1.2.0", + "regexpu-core": "^4.5.4" + }, + "dependencies": { + "acorn": { + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz", + "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==" + } + } + }, "buffer": { "version": "4.9.2", "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz", @@ -5278,9 +5434,9 @@ } }, "cli-width": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz", - "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=" + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz", + "integrity": "sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==" }, "clipboard": { "version": "2.0.6", @@ -5469,9 +5625,9 @@ "integrity": "sha512-GHuDRO12Sypu2cV70d1dkA2EUmXHgntrzbpvOB+Qy+49ypNfGgFQIC2fhhXbnyrJRynDCAARsT7Ou0M6hirpfw==" }, "command-exists": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/command-exists/-/command-exists-1.2.8.tgz", - "integrity": "sha512-PM54PkseWbiiD/mMsbvW351/u+dafwTJ0ye2qB60G1aGQP9j3xK2gmMDc+R34L3nDtx4qMCitXT75mkbkGJDLw==" + "version": "1.2.9", + "resolved": "https://registry.npmjs.org/command-exists/-/command-exists-1.2.9.tgz", + "integrity": "sha512-LTQ/SGc+s0Xc0Fu5WaKnR0YiygZkm9eKFvyS+fRsU7/ZWFF8ykFM6Pc9aCVf1+xasOOZpO3BAVgVrKvsqKHV7w==" }, "commander": { "version": "2.20.3", @@ -6740,6 +6896,15 @@ "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-6.0.0.tgz", "integrity": "sha512-oSyFlqaTHCItVRGK5RmrmjB+CmaMOW7IaNA/kdxqhoa6d17j/5ce9O9eWXmV/KEdRwqpQA+Vqe8a8Bsybu4YnA==" }, + "detect-newline": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-1.0.3.tgz", + "integrity": "sha1-6XsQA4d9cMCa8a81v63/Fo3kkg0=", + "requires": { + "get-stdin": "^4.0.1", + "minimist": "^1.1.0" + } + }, "detect-node": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz", @@ -6810,9 +6975,9 @@ } }, "@types/node": { - "version": "8.10.59", - "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.59.tgz", - "integrity": "sha512-8RkBivJrDCyPpBXhVZcjh7cQxVBSmRk9QM7hOketZzp6Tg79c0N8kkpAIito9bnJ3HCVCHVYz+KHTEbfQNfeVQ==" + "version": "8.10.60", + "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.60.tgz", + "integrity": "sha512-YjPbypHFuiOV0bTgeF07HpEEqhmHaZqYNSdCKeBJa+yFoQ/7BC+FpJcwmi34xUIIRVFktnUyP1dPU8U0612GOg==" }, "configstore": { "version": "3.1.2", @@ -6891,6 +7056,11 @@ } } }, + "diff-sequences": { + "version": "25.2.6", + "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-25.2.6.tgz", + "integrity": "sha512-Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg==" + }, "diffie-hellman": { "version": "5.0.3", "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz", @@ -7126,9 +7296,9 @@ } }, "engine.io": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.4.0.tgz", - "integrity": "sha512-XCyYVWzcHnK5cMz7G4VTu2W7zJS7SM1QkcelghyIk/FmobWBtXE7fwhBusEKvCSqc3bMh8fNFMlUkCKTFRxH2w==", + "version": "3.4.1", + "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.4.1.tgz", + "integrity": "sha512-8MfIfF1/IIfxuc2gv5K+XlFZczw/BpTvqBdl0E2fBLkYQp4miv4LuDTVtYt4yMyaIFLEr4vtaSgV4mjvll8Crw==", "requires": { "accepts": "~1.3.4", "base64id": "2.0.0", @@ -7154,9 +7324,9 @@ } }, "engine.io-client": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.4.0.tgz", - "integrity": "sha512-a4J5QO2k99CM2a0b12IznnyQndoEvtA4UAldhGzKqnHf42I3Qs2W5SPnDvatZRcMaNZs4IevVicBPayxYt6FwA==", + "version": "3.4.1", + "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.4.1.tgz", + "integrity": "sha512-RJNmA+A9Js+8Aoq815xpGAsgWH1VoSYM//2VgIiu9lNOaHFfLpTjH4tOzktBpjIs5lvOfiNY1dwf+NuU6D38Mw==", "requires": { "component-emitter": "1.2.1", "component-inherit": "0.0.3", @@ -7643,9 +7813,9 @@ "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" }, "resolve": { - "version": "1.15.1", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.15.1.tgz", - "integrity": "sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w==", + "version": "1.16.1", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.16.1.tgz", + "integrity": "sha512-rmAglCSqWWMrrBv/XM6sW0NuRFiKViw/W4d9EbC4pt+49H8JwHy+mcGmALTEg504AUDcLTvb1T2q3E9AnmY+ig==", "requires": { "path-parse": "^1.0.6" } @@ -7895,9 +8065,9 @@ } }, "resolve": { - "version": "1.15.1", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.15.1.tgz", - "integrity": "sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w==", + "version": "1.16.1", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.16.1.tgz", + "integrity": "sha512-rmAglCSqWWMrrBv/XM6sW0NuRFiKViw/W4d9EbC4pt+49H8JwHy+mcGmALTEg504AUDcLTvb1T2q3E9AnmY+ig==", "requires": { "path-parse": "^1.0.6" } @@ -7972,17 +8142,17 @@ "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==" }, "esquery": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.2.0.tgz", - "integrity": "sha512-weltsSqdeWIX9G2qQZz7KlTRJdkkOCTPgLYJUz1Hacf48R4YOwGPHO3+ORfWedqJKbq5WQmsgK90n+pFLIKt/Q==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.3.1.tgz", + "integrity": "sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==", "requires": { - "estraverse": "^5.0.0" + "estraverse": "^5.1.0" }, "dependencies": { "estraverse": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.0.0.tgz", - "integrity": "sha512-j3acdrMzqrxmJTNj5dbr1YbjacrYgAxVMeF0gK16E3j494mOe7xygM/ZLIguEQ0ETwAg2hlJCtHRGav+y0Ny5A==" + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.1.0.tgz", + "integrity": "sha512-FyohXK+R0vE+y1nHLoBM7ZTyqRpqAlhdZHCWIWEviFLiGB8b04H6bQs8G+XTthacvT8VuwvteiP7RJSxMs8UEw==" } } }, @@ -8028,9 +8198,9 @@ "integrity": "sha512-WjOTn0LIbaN08z/8gNt3GYAomAdm6cZ2lr/QdvhTTEipr5KR6lds2ziUH+p/Iob4Lk6NClKhwPOmn1NjQEcJCg==" }, "eventemitter3": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.0.tgz", - "integrity": "sha512-qerSRB0p+UDEssxTtm6EDKcE7W4OaoisfIMl4CngyEhjpYglocpNg6UEqCvemdGhosAsg4sO2dXJOdyBifPGCg==" + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.2.tgz", + "integrity": "sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q==" }, "events": { "version": "3.1.0", @@ -9374,9 +9544,9 @@ } }, "gatsby": { - "version": "2.20.17", - "resolved": "https://registry.npmjs.org/gatsby/-/gatsby-2.20.17.tgz", - "integrity": "sha512-ikwsR5dbuhjrz9K01PHwuBGAxjUpjMxLHOKXqTV/ZfKtAPmZVRoMDMzD4284bGXUFsxYQNKSJogxAph5Mlj+Ug==", + "version": "2.20.24", + "resolved": "https://registry.npmjs.org/gatsby/-/gatsby-2.20.24.tgz", + "integrity": "sha512-zFr6eSf+RyeIj8MtECbVJQECI38Y6cud+A/7oNzEE2KR1oDO4BDj+BMW4zEn2NcI6HbFjRBdqE0MLZ7RFuAw4Q==", "requires": { "@babel/code-frame": "^7.8.3", "@babel/core": "^7.8.7", @@ -9399,8 +9569,8 @@ "babel-loader": "^8.0.6", "babel-plugin-add-module-exports": "^0.3.3", "babel-plugin-dynamic-import-node": "^2.3.0", - "babel-plugin-remove-graphql-queries": "^2.8.1", - "babel-preset-gatsby": "^0.3.1", + "babel-plugin-remove-graphql-queries": "^2.8.3", + "babel-preset-gatsby": "^0.3.3", "better-opn": "1.0.0", "better-queue": "^3.8.10", "bluebird": "^3.7.2", @@ -9439,13 +9609,13 @@ "flat": "^4.1.0", "fs-exists-cached": "1.0.0", "fs-extra": "^8.1.0", - "gatsby-cli": "^2.11.7", - "gatsby-core-utils": "^1.1.1", - "gatsby-graphiql-explorer": "^0.3.1", - "gatsby-link": "^2.3.2", - "gatsby-plugin-page-creator": "^2.2.1", - "gatsby-react-router-scroll": "^2.2.1", - "gatsby-telemetry": "^1.2.3", + "gatsby-cli": "^2.11.10", + "gatsby-core-utils": "^1.1.3", + "gatsby-graphiql-explorer": "^0.3.3", + "gatsby-link": "^2.3.4", + "gatsby-plugin-page-creator": "^2.2.3", + "gatsby-react-router-scroll": "^2.2.2", + "gatsby-telemetry": "^1.2.5", "glob": "^7.1.6", "got": "8.3.2", "graphql": "^14.6.0", @@ -9713,9 +9883,9 @@ } }, "gatsby-cli": { - "version": "2.11.7", - "resolved": "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-2.11.7.tgz", - "integrity": "sha512-LORyxuKmZPX+0SGZcD1WXWVZYIcXzIZchENk3hY73WlARNj+qs+0y/+OR7wToydLoTu/iHQ/WZPF4mkwxvIiQQ==", + "version": "2.11.10", + "resolved": "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-2.11.10.tgz", + "integrity": "sha512-6u886DvQHvesP0KaSwJIt+gPd3NtMYheEiU51Y2GDrCMu2SRur+cuILE9vP7s2g3Vf5crURf+BaaTGeuhTLPOg==", "requires": { "@babel/code-frame": "^7.8.3", "@babel/runtime": "^7.8.7", @@ -9732,8 +9902,9 @@ "execa": "^3.4.0", "fs-exists-cached": "^1.0.0", "fs-extra": "^8.1.0", - "gatsby-core-utils": "^1.1.1", - "gatsby-telemetry": "^1.2.3", + "gatsby-core-utils": "^1.1.3", + "gatsby-recipes": "^0.0.7", + "gatsby-telemetry": "^1.2.5", "hosted-git-info": "^3.0.4", "ink": "^2.7.1", "ink-spinner": "^3.0.1", @@ -9772,6 +9943,16 @@ } } }, + "gatsby-core-utils": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.1.3.tgz", + "integrity": "sha512-PntSiNCFo1/ZKjp00qgLBj2jdwY7M+maV21RXb1k7Ud9Vv9j0dGQsaVb9YXFTqXAf8bG0Xyqsqq4mPU1iNYLDw==", + "requires": { + "ci-info": "2.0.0", + "configstore": "^5.0.1", + "node-object-hash": "^2.0.0" + } + }, "get-caller-file": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz", @@ -9967,9 +10148,9 @@ } }, "gatsby-graphiql-explorer": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/gatsby-graphiql-explorer/-/gatsby-graphiql-explorer-0.3.1.tgz", - "integrity": "sha512-HTW0ST3zQGxOORCpmRKhy4lO48SwA9QHBfVBTm8zUWh5jgJOtDZa+O0CLxEieQhdb54lRt/PuZlozJCYFLEkYA==", + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/gatsby-graphiql-explorer/-/gatsby-graphiql-explorer-0.3.3.tgz", + "integrity": "sha512-C41yQrbLWQcnnRWd3cPG/rumW3l4aEmuTOZ/5vS7lPGF3pSu4/r+8Z90U9uHHnByeHR7eBCgcJ3jg7yfD9IduQ==", "requires": { "@babel/runtime": "^7.8.7" }, @@ -9990,9 +10171,9 @@ } }, "gatsby-link": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/gatsby-link/-/gatsby-link-2.3.2.tgz", - "integrity": "sha512-A4aC6EEux/zumpgWnMlqcLhDq80uwzuCVrYfPVBxs/fFifVzzrMIvsPFhqw5w3l5DHC3XkxP4Y3TZq+EhypJhA==", + "version": "2.3.4", + "resolved": "https://registry.npmjs.org/gatsby-link/-/gatsby-link-2.3.4.tgz", + "integrity": "sha512-+C58Faa5eLImwnY8Kcl6/lAm/5fZtC1w8H2UhT2BodCCtMq/4kIHGpBrltrcRKkXgrQhHcokg8BqhLJOKTUpVw==", "requires": { "@babel/runtime": "^7.8.7", "@types/reach__router": "^1.3.3", @@ -10015,15 +10196,15 @@ } }, "gatsby-page-utils": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/gatsby-page-utils/-/gatsby-page-utils-0.1.1.tgz", - "integrity": "sha512-g4ETSZM7wlMycHPKwQ7QqxkqnwbXCgwg2Sqh2DyCsd5qwtPm6RrQht3cnbsKAeuo7gWsbqzv088YGa3krrIREw==", + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/gatsby-page-utils/-/gatsby-page-utils-0.1.3.tgz", + "integrity": "sha512-X2XfuDGq0nMR53V8TaLtCi7SDGxS8pHPDFiNTRlkGMcDsFZlR/7T6PaIj3Ih062P4hN1GZyemHWDbEIzfOm4BA==", "requires": { "@babel/runtime": "^7.8.7", "bluebird": "^3.7.2", "chokidar": "3.3.1", "fs-exists-cached": "^1.0.0", - "gatsby-core-utils": "^1.1.1", + "gatsby-core-utils": "^1.1.3", "glob": "^7.1.6", "lodash": "^4.17.15", "micromatch": "^3.1.10" @@ -10042,6 +10223,16 @@ "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" }, + "gatsby-core-utils": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.1.3.tgz", + "integrity": "sha512-PntSiNCFo1/ZKjp00qgLBj2jdwY7M+maV21RXb1k7Ud9Vv9j0dGQsaVb9YXFTqXAf8bG0Xyqsqq4mPU1iNYLDw==", + "requires": { + "ci-info": "2.0.0", + "configstore": "^5.0.1", + "node-object-hash": "^2.0.0" + } + }, "regenerator-runtime": { "version": "0.13.5", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", @@ -10298,14 +10489,14 @@ } }, "gatsby-plugin-page-creator": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/gatsby-plugin-page-creator/-/gatsby-plugin-page-creator-2.2.1.tgz", - "integrity": "sha512-RRlk7FUScyEj1S6PlGpdj/lrJmps+rl7sQNauOBCIGt3Sod5alin0l8aQJa/ldpI6DIPbp4PWIpqkPsWxED/LA==", + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/gatsby-plugin-page-creator/-/gatsby-plugin-page-creator-2.2.3.tgz", + "integrity": "sha512-GHrzg1clFvYzO/KgpiEuLQNa9janJEA18xqzV9zrpe9+bEJ/no6jLWQOeyPhhwkKdlLb+XUMJEdX5RspozVZhA==", "requires": { "@babel/runtime": "^7.8.7", "bluebird": "^3.7.2", "fs-exists-cached": "^1.0.0", - "gatsby-page-utils": "^0.1.1", + "gatsby-page-utils": "^0.1.3", "glob": "^7.1.6", "lodash": "^4.17.15", "micromatch": "^3.1.10" @@ -10383,9 +10574,9 @@ "integrity": "sha512-54REIMe79qFBAwpcnWHBkvEE9CKoEVkefF9rDXai0k642r91SZ4UeWFuAmsegPG+sPVub7tHfHu/2LVXK1I9kg==" }, "gatsby-react-router-scroll": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/gatsby-react-router-scroll/-/gatsby-react-router-scroll-2.2.1.tgz", - "integrity": "sha512-mkaG6NNIbWPNiU8Wj3aawUQa7AqI42Skrnh0VCLUCSDvUgCjOJOZfxM0FVPA/masNiVsCprq3a6xz7fmW93jgQ==", + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/gatsby-react-router-scroll/-/gatsby-react-router-scroll-2.2.2.tgz", + "integrity": "sha512-XifGP9mm0epJ3uKZ5VSem271nDDz4PtOpfj7XVtIplq9WnFbxvOT9GGVgXe2oyGNA9uuw/9ZOGR8IsgQprcCYQ==", "requires": { "@babel/runtime": "^7.8.7", "scroll-behavior": "^0.9.12", @@ -10415,78 +10606,473 @@ } } }, - "gatsby-remark-autolink-headers": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/gatsby-remark-autolink-headers/-/gatsby-remark-autolink-headers-2.2.1.tgz", - "integrity": "sha512-FqTq9rh9fRxdlX1V3InXSAoZQyBcZ3mI5zNiNagO+DRNZCSve3YVKTDmMZ7a7GXx5Bz7QTPBB993wk2OcRSIFg==", + "gatsby-recipes": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/gatsby-recipes/-/gatsby-recipes-0.0.7.tgz", + "integrity": "sha512-WTO7+EU0n3aEGgaY1UyLoCDtk3MB9o5L3YssnlFwiFBcuHC43jE94UHPORpZ+7vMYU+1VeKGjqJqjlfTOAdv9Q==", "requires": { - "@babel/runtime": "^7.8.7", - "github-slugger": "^1.3.0", + "@babel/core": "^7.8.7", + "@babel/standalone": "^7.9.5", + "@hapi/joi": "^15.1.1", + "@mdx-js/mdx": "^1.5.8", + "@mdx-js/react": "^1.5.8", + "@mdx-js/runtime": "^1.5.8", + "acorn": "^7.1.1", + "acorn-jsx": "^5.2.0", + "babel-core": "7.0.0-bridge.0", + "babel-eslint": "^10.1.0", + "babel-loader": "^8.0.6", + "babel-plugin-add-module-exports": "^0.3.3", + "babel-plugin-dynamic-import-node": "^2.3.0", + "babel-plugin-remove-graphql-queries": "^2.8.3", + "babel-preset-gatsby": "^0.3.3", + "detect-port": "^1.3.0", + "event-source-polyfill": "^1.0.12", + "execa": "^4.0.0", + "express": "^4.17.1", + "express-graphql": "^0.9.0", + "fs-extra": "^8.1.0", + "gatsby-core-utils": "^1.1.3", + "gatsby-telemetry": "^1.2.5", + "glob": "^7.1.6", + "graphql": "^14.6.0", + "graphql-subscriptions": "^1.1.0", + "graphql-type-json": "^0.3.1", + "html-tag-names": "^1.1.5", + "humanize-list": "^1.0.1", + "import-jsx": "^4.0.0", + "ink-box": "^1.0.0", + "ink-link": "^1.0.0", + "ink-select-input": "^3.1.2", + "is-blank": "^2.1.0", + "is-newline": "^1.0.0", + "is-relative": "^1.0.0", + "is-string": "^1.0.5", + "is-url": "^1.2.4", + "jest-diff": "^25.3.0", "lodash": "^4.17.15", - "mdast-util-to-string": "^1.1.0", - "unist-util-visit": "^1.4.1" + "mkdirp": "^0.5.1", + "pkg-dir": "^4.2.0", + "prettier": "^2.0.4", + "remark-stringify": "^8.0.0", + "single-trailing-newline": "^1.0.0", + "style-to-object": "^0.3.0", + "subscriptions-transport-ws": "^0.9.16", + "svg-tag-names": "^2.0.1", + "unist-util-remove": "^2.0.0", + "unist-util-visit": "^2.0.2", + "url-loader": "^1.1.2", + "urql": "^1.9.5", + "ws": "^7.2.3", + "xstate": "^4.8.0" }, "dependencies": { - "@babel/runtime": { - "version": "7.9.2", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz", - "integrity": "sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==", + "@babel/code-frame": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", + "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", "requires": { - "regenerator-runtime": "^0.13.4" + "@babel/highlight": "^7.8.3" } }, - "regenerator-runtime": { - "version": "0.13.5", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", - "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==" - }, - "unist-util-visit": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.4.1.tgz", - "integrity": "sha512-AvGNk7Bb//EmJZyhtRUnNMEpId/AZ5Ph/KUpTI09WHQuDZHKovQ1oEv3mfmKpWKtoMzyMC4GLBm1Zy5k12fjIw==", + "@babel/core": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.0.tgz", + "integrity": "sha512-kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==", "requires": { - "unist-util-visit-parents": "^2.0.0" + "@babel/code-frame": "^7.8.3", + "@babel/generator": "^7.9.0", + "@babel/helper-module-transforms": "^7.9.0", + "@babel/helpers": "^7.9.0", + "@babel/parser": "^7.9.0", + "@babel/template": "^7.8.6", + "@babel/traverse": "^7.9.0", + "@babel/types": "^7.9.0", + "convert-source-map": "^1.7.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.1", + "json5": "^2.1.2", + "lodash": "^4.17.13", + "resolve": "^1.3.2", + "semver": "^5.4.1", + "source-map": "^0.5.0" } - } - } - }, - "gatsby-remark-check-links": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/gatsby-remark-check-links/-/gatsby-remark-check-links-2.1.0.tgz", - "integrity": "sha512-TbhT8oVlAgJfxe0WUQWDOb0kLkMUYo1N4AfFstejClPWO4OjRlznt3IMW3weQkwuweiovF5cxVpQcFrkCGVFBw==", - "requires": { - "unist-util-visit": "^1.4.1" - }, - "dependencies": { - "unist-util-visit": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.4.1.tgz", - "integrity": "sha512-AvGNk7Bb//EmJZyhtRUnNMEpId/AZ5Ph/KUpTI09WHQuDZHKovQ1oEv3mfmKpWKtoMzyMC4GLBm1Zy5k12fjIw==", + }, + "@babel/generator": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.5.tgz", + "integrity": "sha512-GbNIxVB3ZJe3tLeDm1HSn2AhuD/mVcyLDpgtLXa5tplmWrJdF/elxB56XNqCuD6szyNkDi6wuoKXln3QeBmCHQ==", "requires": { - "unist-util-visit-parents": "^2.0.0" + "@babel/types": "^7.9.5", + "jsesc": "^2.5.1", + "lodash": "^4.17.13", + "source-map": "^0.5.0" } - } - } - }, - "gatsby-remark-code-titles": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/gatsby-remark-code-titles/-/gatsby-remark-code-titles-1.1.0.tgz", - "integrity": "sha512-RuNqziXi99eBIj5NJP0TgdzAxzWFL+ArGRb3961Ff9Tto/nCvmyqR1qySaWKXtkOgeqoVUlqAFNUCyEAyNuc8w==", - "requires": { - "query-string": "~6.0.0", - "unist-util-visit": "~1.3.0" - }, - "dependencies": { - "query-string": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/query-string/-/query-string-6.0.0.tgz", - "integrity": "sha1-i485RHtz6CkNb141gXeSGOkXEUI=", + }, + "@babel/helper-function-name": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz", + "integrity": "sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==", "requires": { - "decode-uri-component": "^0.2.0", - "strict-uri-encode": "^2.0.0" + "@babel/helper-get-function-arity": "^7.8.3", + "@babel/template": "^7.8.3", + "@babel/types": "^7.9.5" } }, - "strict-uri-encode": { + "@babel/highlight": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz", + "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==", + "requires": { + "@babel/helper-validator-identifier": "^7.9.0", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" + } + }, + "@babel/parser": { + "version": "7.9.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz", + "integrity": "sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==" + }, + "@babel/template": { + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz", + "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==", + "requires": { + "@babel/code-frame": "^7.8.3", + "@babel/parser": "^7.8.6", + "@babel/types": "^7.8.6" + } + }, + "@babel/traverse": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.5.tgz", + "integrity": "sha512-c4gH3jsvSuGUezlP6rzSJ6jf8fYjLj3hsMZRx/nX0h+fmHN0w+ekubRrHPqnMec0meycA2nwCsJ7dC8IPem2FQ==", + "requires": { + "@babel/code-frame": "^7.8.3", + "@babel/generator": "^7.9.5", + "@babel/helper-function-name": "^7.9.5", + "@babel/helper-split-export-declaration": "^7.8.3", + "@babel/parser": "^7.9.0", + "@babel/types": "^7.9.5", + "debug": "^4.1.0", + "globals": "^11.1.0", + "lodash": "^4.17.13" + } + }, + "@babel/types": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.5.tgz", + "integrity": "sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==", + "requires": { + "@babel/helper-validator-identifier": "^7.9.5", + "lodash": "^4.17.13", + "to-fast-properties": "^2.0.0" + }, + "dependencies": { + "@babel/helper-validator-identifier": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz", + "integrity": "sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==" + } + } + }, + "cross-spawn": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.2.tgz", + "integrity": "sha512-PD6G8QG3S4FK/XCGFbEQrDqO2AnMMsy0meR7lerlIOHAAbkuavGU/pOqprrlvfTNjvowivTeBsjebAL0NSoMxw==", + "requires": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + } + }, + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "requires": { + "ms": "^2.1.1" + } + }, + "execa": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-4.0.0.tgz", + "integrity": "sha512-JbDUxwV3BoT5ZVXQrSVbAiaXhXUkIwvbhPIwZ0N13kX+5yCzOhUNdocxB/UQRuYOHRYYwAxKYwJYc0T4D12pDA==", + "requires": { + "cross-spawn": "^7.0.0", + "get-stream": "^5.0.0", + "human-signals": "^1.1.1", + "is-stream": "^2.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^4.0.0", + "onetime": "^5.1.0", + "signal-exit": "^3.0.2", + "strip-final-newline": "^2.0.0" + } + }, + "find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "requires": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + } + }, + "gatsby-core-utils": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.1.3.tgz", + "integrity": "sha512-PntSiNCFo1/ZKjp00qgLBj2jdwY7M+maV21RXb1k7Ud9Vv9j0dGQsaVb9YXFTqXAf8bG0Xyqsqq4mPU1iNYLDw==", + "requires": { + "ci-info": "2.0.0", + "configstore": "^5.0.1", + "node-object-hash": "^2.0.0" + } + }, + "get-stream": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz", + "integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==", + "requires": { + "pump": "^3.0.0" + } + }, + "is-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz", + "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==" + }, + "locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "requires": { + "p-locate": "^4.1.0" + } + }, + "markdown-table": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-2.0.0.tgz", + "integrity": "sha512-Ezda85ToJUBhM6WGaG6veasyym+Tbs3cMAw/ZhOPqXiYsr0jgocBV3j3nx+4lk47plLlIqjwuTm/ywVI+zjJ/A==", + "requires": { + "repeat-string": "^1.0.0" + } + }, + "mdast-util-compact": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/mdast-util-compact/-/mdast-util-compact-2.0.1.tgz", + "integrity": "sha512-7GlnT24gEwDrdAwEHrU4Vv5lLWrEer4KOkAiKT9nYstsTad7Oc1TwqT2zIMKRdZF7cTuaf+GA1E4Kv7jJh8mPA==", + "requires": { + "unist-util-visit": "^2.0.0" + } + }, + "mimic-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==" + }, + "npm-run-path": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", + "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", + "requires": { + "path-key": "^3.0.0" + } + }, + "onetime": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz", + "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==", + "requires": { + "mimic-fn": "^2.1.0" + } + }, + "p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "requires": { + "p-limit": "^2.2.0" + } + }, + "parse-entities": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-2.0.0.tgz", + "integrity": "sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==", + "requires": { + "character-entities": "^1.0.0", + "character-entities-legacy": "^1.0.0", + "character-reference-invalid": "^1.0.0", + "is-alphanumerical": "^1.0.0", + "is-decimal": "^1.0.0", + "is-hexadecimal": "^1.0.0" + } + }, + "path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==" + }, + "path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==" + }, + "pkg-dir": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", + "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", + "requires": { + "find-up": "^4.0.0" + } + }, + "prettier": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.0.4.tgz", + "integrity": "sha512-SVJIQ51spzFDvh4fIbCLvciiDMCrRhlN3mbZvv/+ycjvmF5E73bKdGfU8QDLNmjYJf+lsGnDBC4UUnvTe5OO0w==" + }, + "remark-stringify": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/remark-stringify/-/remark-stringify-8.0.0.tgz", + "integrity": "sha512-cABVYVloFH+2ZI5bdqzoOmemcz/ZuhQSH6W6ZNYnLojAUUn3xtX7u+6BpnYp35qHoGr2NFBsERV14t4vCIeW8w==", + "requires": { + "ccount": "^1.0.0", + "is-alphanumeric": "^1.0.0", + "is-decimal": "^1.0.0", + "is-whitespace-character": "^1.0.0", + "longest-streak": "^2.0.1", + "markdown-escapes": "^1.0.0", + "markdown-table": "^2.0.0", + "mdast-util-compact": "^2.0.0", + "parse-entities": "^2.0.0", + "repeat-string": "^1.5.4", + "state-toggle": "^1.0.0", + "stringify-entities": "^3.0.0", + "unherit": "^1.0.4", + "xtend": "^4.0.1" + } + }, + "shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "requires": { + "shebang-regex": "^3.0.0" + } + }, + "shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==" + }, + "stringify-entities": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-3.0.0.tgz", + "integrity": "sha512-h7NJJIssprqlyjHT2eQt2W1F+MCcNmwPGlKb0bWEdET/3N44QN3QbUF/ueKCgAssyKRZ3Br9rQ7FcXjHr0qLHw==", + "requires": { + "character-entities-html4": "^1.0.0", + "character-entities-legacy": "^1.0.0", + "is-alphanumerical": "^1.0.0", + "is-decimal": "^1.0.2", + "is-hexadecimal": "^1.0.0" + } + }, + "unist-util-is": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.0.2.tgz", + "integrity": "sha512-Ofx8uf6haexJwI1gxWMGg6I/dLnF2yE+KibhD3/diOqY2TinLcqHXCV6OI5gFVn3xQqDH+u0M625pfKwIwgBKQ==" + }, + "unist-util-remove": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/unist-util-remove/-/unist-util-remove-2.0.0.tgz", + "integrity": "sha512-HwwWyNHKkeg/eXRnE11IpzY8JT55JNM1YCwwU9YNCnfzk6s8GhPXrVBBZWiwLeATJbI7euvoGSzcy9M29UeW3g==", + "requires": { + "unist-util-is": "^4.0.0" + } + }, + "which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "requires": { + "isexe": "^2.0.0" + } + } + } + }, + "gatsby-remark-autolink-headers": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/gatsby-remark-autolink-headers/-/gatsby-remark-autolink-headers-2.2.1.tgz", + "integrity": "sha512-FqTq9rh9fRxdlX1V3InXSAoZQyBcZ3mI5zNiNagO+DRNZCSve3YVKTDmMZ7a7GXx5Bz7QTPBB993wk2OcRSIFg==", + "requires": { + "@babel/runtime": "^7.8.7", + "github-slugger": "^1.3.0", + "lodash": "^4.17.15", + "mdast-util-to-string": "^1.1.0", + "unist-util-visit": "^1.4.1" + }, + "dependencies": { + "@babel/runtime": { + "version": "7.9.2", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz", + "integrity": "sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==", + "requires": { + "regenerator-runtime": "^0.13.4" + } + }, + "regenerator-runtime": { + "version": "0.13.5", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", + "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==" + }, + "unist-util-visit": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.4.1.tgz", + "integrity": "sha512-AvGNk7Bb//EmJZyhtRUnNMEpId/AZ5Ph/KUpTI09WHQuDZHKovQ1oEv3mfmKpWKtoMzyMC4GLBm1Zy5k12fjIw==", + "requires": { + "unist-util-visit-parents": "^2.0.0" + } + } + } + }, + "gatsby-remark-check-links": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/gatsby-remark-check-links/-/gatsby-remark-check-links-2.1.0.tgz", + "integrity": "sha512-TbhT8oVlAgJfxe0WUQWDOb0kLkMUYo1N4AfFstejClPWO4OjRlznt3IMW3weQkwuweiovF5cxVpQcFrkCGVFBw==", + "requires": { + "unist-util-visit": "^1.4.1" + }, + "dependencies": { + "unist-util-visit": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.4.1.tgz", + "integrity": "sha512-AvGNk7Bb//EmJZyhtRUnNMEpId/AZ5Ph/KUpTI09WHQuDZHKovQ1oEv3mfmKpWKtoMzyMC4GLBm1Zy5k12fjIw==", + "requires": { + "unist-util-visit-parents": "^2.0.0" + } + } + } + }, + "gatsby-remark-code-titles": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/gatsby-remark-code-titles/-/gatsby-remark-code-titles-1.1.0.tgz", + "integrity": "sha512-RuNqziXi99eBIj5NJP0TgdzAxzWFL+ArGRb3961Ff9Tto/nCvmyqR1qySaWKXtkOgeqoVUlqAFNUCyEAyNuc8w==", + "requires": { + "query-string": "~6.0.0", + "unist-util-visit": "~1.3.0" + }, + "dependencies": { + "query-string": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/query-string/-/query-string-6.0.0.tgz", + "integrity": "sha1-i485RHtz6CkNb141gXeSGOkXEUI=", + "requires": { + "decode-uri-component": "^0.2.0", + "strict-uri-encode": "^2.0.0" + } + }, + "strict-uri-encode": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz", "integrity": "sha1-ucczDHBChi9rFC3CdLvMWGbONUY=" @@ -10734,9 +11320,9 @@ } }, "gatsby-telemetry": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-1.2.3.tgz", - "integrity": "sha512-butEEIfuGAWZ9cVISrS6XVXMFPweFTDNO2Z5jj+mA1GkHlriahF4BtbVX3b4miQbQW16g2TfzNw/ztwIUfy0RQ==", + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-1.2.5.tgz", + "integrity": "sha512-FK/Y1VICsWEFWYLawu3hUF4K+/D1amh6Wmco8oKNGK6+uV6ZjLdGUInmLP1DmpC2O932DuHYr3zjbqta5+6+bg==", "requires": { "@babel/code-frame": "^7.8.3", "@babel/runtime": "^7.8.7", @@ -10745,7 +11331,7 @@ "configstore": "^5.0.1", "envinfo": "^7.5.0", "fs-extra": "^8.1.0", - "gatsby-core-utils": "^1.1.1", + "gatsby-core-utils": "^1.1.3", "git-up": "4.0.1", "is-docker": "2.0.0", "lodash": "^4.17.15", @@ -10788,6 +11374,16 @@ "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" }, + "gatsby-core-utils": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.1.3.tgz", + "integrity": "sha512-PntSiNCFo1/ZKjp00qgLBj2jdwY7M+maV21RXb1k7Ud9Vv9j0dGQsaVb9YXFTqXAf8bG0Xyqsqq4mPU1iNYLDw==", + "requires": { + "ci-info": "2.0.0", + "configstore": "^5.0.1", + "node-object-hash": "^2.0.0" + } + }, "node-fetch": { "version": "2.6.0", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz", @@ -11144,6 +11740,11 @@ "resolved": "https://registry.npmjs.org/get-port/-/get-port-3.2.0.tgz", "integrity": "sha1-3Xzn3hh8Bsi/NTeWrHHgmfCYDrw=" }, + "get-stdin": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", + "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=" + }, "get-stream": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", @@ -11422,6 +12023,13 @@ "requires": { "graphql-type-json": "^0.2.4", "object-path": "^0.11.4" + }, + "dependencies": { + "graphql-type-json": { + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/graphql-type-json/-/graphql-type-json-0.2.4.tgz", + "integrity": "sha512-/tq02ayMQjrG4oDFDRLLrPk0KvJXue0nVXoItBe7uAdbNXjQUu+HYCBdAmPLQoseVzUKKMzrhq2P/sfI76ON6w==" + } } }, "graphql-config": { @@ -11453,16 +12061,16 @@ } }, "graphql-playground-html": { - "version": "1.6.15", - "resolved": "https://registry.npmjs.org/graphql-playground-html/-/graphql-playground-html-1.6.15.tgz", - "integrity": "sha512-yRTKAOybHD6Lcb2/u4jkSkBzcz+Ppje8NmQuA0jn8Ou9T44qjm4vVwqkOW5ciugR/t4s5NilaWgvdbPMocfS6g==" + "version": "1.6.19", + "resolved": "https://registry.npmjs.org/graphql-playground-html/-/graphql-playground-html-1.6.19.tgz", + "integrity": "sha512-cLAqoOlxHbGj/LBpr4l2BE9qXf3g8ShjQqU2daVueITI/3wIkcDQTaQaQp+HWv0uaX0dCsgMCFW/TooLj8yJOg==" }, "graphql-playground-middleware-express": { - "version": "1.7.13", - "resolved": "https://registry.npmjs.org/graphql-playground-middleware-express/-/graphql-playground-middleware-express-1.7.13.tgz", - "integrity": "sha512-dsB+3JSRGkaSE5GIZHKuOhAw0Ay/vXsqDiLPQNiu9vKg7291heA9g3jZHuDkGuHnsMzgFSNCHb6ovcN7KU4xpw==", + "version": "1.7.14", + "resolved": "https://registry.npmjs.org/graphql-playground-middleware-express/-/graphql-playground-middleware-express-1.7.14.tgz", + "integrity": "sha512-EqoAhbRBd7rEEEDFfvECQVmZnC4cOEmRc5goiiZldozt2GZB2UBK3/7p0DAtflg6S1w6SNUR8Tg9cDLjiL1Dew==", "requires": { - "graphql-playground-html": "^1.6.15" + "graphql-playground-html": "^1.6.19" } }, "graphql-request": { @@ -11473,10 +12081,18 @@ "cross-fetch": "2.2.2" } }, + "graphql-subscriptions": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/graphql-subscriptions/-/graphql-subscriptions-1.1.0.tgz", + "integrity": "sha512-6WzlBFC0lWmXJbIVE8OgFgXIP4RJi3OQgTPa0DVMsDXdpRDjTsM1K9wfl5HSYX7R87QAGlvcv2Y4BIZa/ItonA==", + "requires": { + "iterall": "^1.2.1" + } + }, "graphql-type-json": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/graphql-type-json/-/graphql-type-json-0.2.4.tgz", - "integrity": "sha512-/tq02ayMQjrG4oDFDRLLrPk0KvJXue0nVXoItBe7uAdbNXjQUu+HYCBdAmPLQoseVzUKKMzrhq2P/sfI76ON6w==" + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/graphql-type-json/-/graphql-type-json-0.3.1.tgz", + "integrity": "sha512-1lPkUXQ2L8o+ERLzVAuc3rzc/E6pGF+6HnjihCVTK0VzR0jCuUd92FqNxoHdfILXqOn2L6b4y47TBxiPyieUVA==" }, "gray-matter": { "version": "4.0.2", @@ -11861,9 +12477,9 @@ "integrity": "sha512-P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ==" }, "html-entities": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz", - "integrity": "sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=" + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.3.1.tgz", + "integrity": "sha512-rhE/4Z3hIhzHAUKbW8jVcCyuT5oJCXXqhN/6mXXVCpzTmvJnoH2HL/bt3EZ6p55jbFJBeAe1ZNpL5BugLujxNA==" }, "html-minifier": { "version": "4.0.0", @@ -11879,6 +12495,11 @@ "uglify-js": "^3.5.1" } }, + "html-tag-names": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/html-tag-names/-/html-tag-names-1.1.5.tgz", + "integrity": "sha512-aI5tKwNTBzOZApHIynaAwecLBv8TlZTEy/P4Sj2SzzAhBrGuI8yGZ0UIXVPQzOHGS+to2mjb04iy6VWt/8+d8A==" + }, "html-void-elements": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/html-void-elements/-/html-void-elements-1.0.5.tgz", @@ -11956,6 +12577,13 @@ "eventemitter3": "^4.0.0", "follow-redirects": "^1.0.0", "requires-port": "^1.0.0" + }, + "dependencies": { + "eventemitter3": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.0.tgz", + "integrity": "sha512-qerSRB0p+UDEssxTtm6EDKcE7W4OaoisfIMl4CngyEhjpYglocpNg6UEqCvemdGhosAsg4sO2dXJOdyBifPGCg==" + } } }, "http-proxy-middleware": { @@ -11998,6 +12626,11 @@ "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz", "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==" }, + "humanize-list": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/humanize-list/-/humanize-list-1.0.1.tgz", + "integrity": "sha1-5+cZxgpdWEjo4KXtXwqIVJbCOf0=" + }, "hyphenate-style-name": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/hyphenate-style-name/-/hyphenate-style-name-1.0.3.tgz", @@ -12097,6 +12730,85 @@ "resolve-from": "^3.0.0" } }, + "import-jsx": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/import-jsx/-/import-jsx-4.0.0.tgz", + "integrity": "sha512-CnjJ2BZFJzbFDmYG5S47xPQjMlSbZLyLJuG4znzL4TdPtJBxHtFP1xVmR+EYX4synFSldiY3B6m00XkPM3zVnA==", + "requires": { + "@babel/core": "^7.5.5", + "@babel/plugin-proposal-object-rest-spread": "^7.5.5", + "@babel/plugin-transform-destructuring": "^7.5.0", + "@babel/plugin-transform-react-jsx": "^7.3.0", + "caller-path": "^2.0.0", + "find-cache-dir": "^3.2.0", + "make-dir": "^3.0.2", + "resolve-from": "^3.0.0", + "rimraf": "^3.0.0" + }, + "dependencies": { + "find-cache-dir": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz", + "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==", + "requires": { + "commondir": "^1.0.1", + "make-dir": "^3.0.2", + "pkg-dir": "^4.1.0" + } + }, + "find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "requires": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + } + }, + "locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "requires": { + "p-locate": "^4.1.0" + } + }, + "make-dir": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.0.2.tgz", + "integrity": "sha512-rYKABKutXa6vXTXhoV18cBE7PaewPXHe/Bdq4v+ZLMhxbWApkFFplT0LcbMW+6BbjnQXzZ/sAvSE/JdguApG5w==", + "requires": { + "semver": "^6.0.0" + } + }, + "p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "requires": { + "p-limit": "^2.2.0" + } + }, + "path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==" + }, + "pkg-dir": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", + "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", + "requires": { + "find-up": "^4.0.0" + } + }, + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + } + } + }, "import-lazy": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz", @@ -12354,6 +13066,158 @@ } } }, + "ink-box": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/ink-box/-/ink-box-1.0.0.tgz", + "integrity": "sha512-wD2ldWX9lcE/6+flKbAJ0TZF7gKbTH8CRdhEor6DD8d+V0hPITrrGeST2reDBpCia8wiqHrdxrqTyafwtmVanA==", + "requires": { + "boxen": "^3.0.0", + "prop-types": "^15.7.2" + }, + "dependencies": { + "ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==" + }, + "boxen": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/boxen/-/boxen-3.2.0.tgz", + "integrity": "sha512-cU4J/+NodM3IHdSL2yN8bqYqnmlBTidDR4RC7nJs61ZmtGz8VZzM3HLQX0zY5mrSmPtR3xWwsq2jOUQqFZN8+A==", + "requires": { + "ansi-align": "^3.0.0", + "camelcase": "^5.3.1", + "chalk": "^2.4.2", + "cli-boxes": "^2.2.0", + "string-width": "^3.0.0", + "term-size": "^1.2.0", + "type-fest": "^0.3.0", + "widest-line": "^2.0.0" + } + }, + "cross-spawn": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", + "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", + "requires": { + "lru-cache": "^4.0.1", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + }, + "execa": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz", + "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", + "requires": { + "cross-spawn": "^5.0.1", + "get-stream": "^3.0.0", + "is-stream": "^1.1.0", + "npm-run-path": "^2.0.0", + "p-finally": "^1.0.0", + "signal-exit": "^3.0.0", + "strip-eof": "^1.0.0" + } + }, + "get-stream": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", + "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=" + }, + "lru-cache": { + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", + "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", + "requires": { + "pseudomap": "^1.0.2", + "yallist": "^2.1.2" + } + }, + "string-width": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "requires": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + } + }, + "strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "requires": { + "ansi-regex": "^4.1.0" + } + }, + "term-size": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/term-size/-/term-size-1.2.0.tgz", + "integrity": "sha1-RYuDiH8oj8Vtb/+/rSYuJmOO+mk=", + "requires": { + "execa": "^0.7.0" + } + }, + "type-fest": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.3.1.tgz", + "integrity": "sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ==" + }, + "widest-line": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-2.0.1.tgz", + "integrity": "sha512-Ba5m9/Fa4Xt9eb2ELXt77JxVDV8w7qQrH0zS/TWSJdLyAwQjWoOzpzj5lwVftDz6n/EOu3tNACS84v509qwnJA==", + "requires": { + "string-width": "^2.1.1" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=" + }, + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "requires": { + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" + } + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "requires": { + "ansi-regex": "^3.0.0" + } + } + } + } + } + }, + "ink-link": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/ink-link/-/ink-link-1.1.0.tgz", + "integrity": "sha512-a716nYz4YDPu8UOA2PwabTZgTvZa3SYB/70yeXVmTOKFAEdMbJyGSVeNuB7P+aM2olzDj9AGVchA7W5QytF9uA==", + "requires": { + "prop-types": "^15.7.2", + "terminal-link": "^2.1.1" + } + }, + "ink-select-input": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/ink-select-input/-/ink-select-input-3.1.2.tgz", + "integrity": "sha512-PaLraGx8A54GhSkTNzZI8bgY0elAoa1jSPPe5Q52B5VutcBoJc4HE3ICDwsEGJ88l1Hw6AWjpeoqrq82a8uQPA==", + "requires": { + "arr-rotate": "^1.0.0", + "figures": "^2.0.0", + "lodash.isequal": "^4.5.0", + "prop-types": "^15.5.10" + } + }, "ink-spinner": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/ink-spinner/-/ink-spinner-3.0.1.tgz", @@ -12599,6 +13463,15 @@ "binary-extensions": "^1.0.0" } }, + "is-blank": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-blank/-/is-blank-2.1.0.tgz", + "integrity": "sha1-aac9PA1PQX3/+yB6J5XA8OV23gQ=", + "requires": { + "is-empty": "^1.2.0", + "is-whitespace": "^0.3.0" + } + }, "is-buffer": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", @@ -12693,6 +13566,11 @@ "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.0.0.tgz", "integrity": "sha512-pJEdRugimx4fBMra5z2/5iRdZ63OhYV0vr0Dwm5+xtW4D1FvRkB8hamMIhnWfyJeDdyr/aa7BDyNbtG38VxgoQ==" }, + "is-empty": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/is-empty/-/is-empty-1.2.0.tgz", + "integrity": "sha1-3pu1snhzigWgsJpX4ftNSjQan2s=" + }, "is-extendable": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", @@ -12776,6 +13654,14 @@ "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz", "integrity": "sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=" }, + "is-newline": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-newline/-/is-newline-1.0.0.tgz", + "integrity": "sha1-8KrJfMmsC0uUr4xVoBzzaQ9Dbjg=", + "requires": { + "newline-regex": "^0.2.0" + } + }, "is-npm": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-3.0.0.tgz", @@ -12969,6 +13855,11 @@ "upper-case": "^1.1.0" } }, + "is-url": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz", + "integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==" + }, "is-valid-path": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/is-valid-path/-/is-valid-path-0.1.1.tgz", @@ -12977,6 +13868,11 @@ "is-invalid-path": "^0.1.0" } }, + "is-whitespace": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/is-whitespace/-/is-whitespace-0.3.0.tgz", + "integrity": "sha1-Fjnssb4DauxppUy7QBz77XEUq38=" + }, "is-whitespace-character": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/is-whitespace-character/-/is-whitespace-character-1.0.4.tgz", @@ -13050,6 +13946,68 @@ "resolved": "https://registry.npmjs.org/iterall/-/iterall-1.3.0.tgz", "integrity": "sha512-QZ9qOMdF+QLHxy1QIpUHUU1D5pS2CG2P69LF6L6CPjPYA/XMOmKV3PZpawHoAjHNyB0swdVTRxdYT4tbBbxqwg==" }, + "jest-diff": { + "version": "25.3.0", + "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-25.3.0.tgz", + "integrity": "sha512-vyvs6RPoVdiwARwY4kqFWd4PirPLm2dmmkNzKqo38uZOzJvLee87yzDjIZLmY1SjM3XR5DwsUH+cdQ12vgqi1w==", + "requires": { + "chalk": "^3.0.0", + "diff-sequences": "^25.2.6", + "jest-get-type": "^25.2.6", + "pretty-format": "^25.3.0" + }, + "dependencies": { + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" + }, + "supports-color": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, + "jest-get-type": { + "version": "25.2.6", + "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-25.2.6.tgz", + "integrity": "sha512-DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig==" + }, "jest-worker": { "version": "24.9.0", "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.9.0.tgz", @@ -13700,6 +14658,11 @@ "resolved": "https://registry.npmjs.org/lodash.foreach/-/lodash.foreach-4.5.0.tgz", "integrity": "sha1-Gmo16s5AEoDH8G3d7DUWWrJ+PlM=" }, + "lodash.isequal": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz", + "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=" + }, "lodash.isplainobject": { "version": "4.0.6", "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", @@ -13783,9 +14746,9 @@ } }, "loglevel": { - "version": "1.6.7", - "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.7.tgz", - "integrity": "sha512-cY2eLFrQSAfVPhCgH1s7JI73tMbg9YC3v3+ZHVW67sBS7UxWzNEk/ZBbSfLykBWHp33dqqtOv82gjhKEi81T/A==" + "version": "1.6.8", + "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.8.tgz", + "integrity": "sha512-bsU7+gc9AJ2SqpzxwU3+1fedl8zAntbtC5XYlt3s2j1hJcn2PsXSmgN8TaLG/J1/2mod4+cE/3vNL70/c1RNCA==" }, "lokijs": { "version": "1.5.8", @@ -14506,6 +15469,11 @@ "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz", "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==" }, + "newline-regex": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/newline-regex/-/newline-regex-0.2.1.tgz", + "integrity": "sha1-RpbYaQRe4VCbg6rDpY1Kk7vtkm4=" + }, "next-tick": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz", @@ -14775,9 +15743,71 @@ "integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==" }, "object-is": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.0.2.tgz", - "integrity": "sha512-Epah+btZd5wrrfjkJZq1AOB9O6OxUQto45hzFd7lXGrpHPGE0W1k+426yrZV+k6NJOzLNNW/nVsmZdIWsAqoOQ==" + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.2.tgz", + "integrity": "sha512-5lHCz+0uufF6wZ7CRFWJN3hp8Jqblpgve06U5CMQ3f//6iDjPr2PEo9MWCjEssDsa+UZEL4PkFpr+BMop6aKzQ==", + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.5" + }, + "dependencies": { + "es-abstract": { + "version": "1.17.5", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz", + "integrity": "sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==", + "requires": { + "es-to-primitive": "^1.2.1", + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1", + "is-callable": "^1.1.5", + "is-regex": "^1.0.5", + "object-inspect": "^1.7.0", + "object-keys": "^1.1.1", + "object.assign": "^4.1.0", + "string.prototype.trimleft": "^2.1.1", + "string.prototype.trimright": "^2.1.1" + } + }, + "has-symbols": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", + "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==" + }, + "is-callable": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz", + "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==" + }, + "is-regex": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz", + "integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==", + "requires": { + "has": "^1.0.3" + } + }, + "string.prototype.trimleft": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz", + "integrity": "sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw==", + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.5", + "string.prototype.trimstart": "^1.0.0" + } + }, + "string.prototype.trimright": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz", + "integrity": "sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg==", + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.5", + "string.prototype.trimend": "^1.0.0" + } + } + } }, "object-keys": { "version": "1.1.1", @@ -16239,6 +17269,51 @@ "utila": "~0.4" } }, + "pretty-format": { + "version": "25.3.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.3.0.tgz", + "integrity": "sha512-wToHwF8bkQknIcFkBqNfKu4+UZqnrLn/Vr+wwKQwwvPzkBfDDKp/qIabFqdgtoi5PEnM8LFByVsOrHoa3SpTVA==", + "requires": { + "@jest/types": "^25.3.0", + "ansi-regex": "^5.0.0", + "ansi-styles": "^4.0.0", + "react-is": "^16.12.0" + }, + "dependencies": { + "ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==" + }, + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "react-is": { + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" + } + } + }, "prismjs": { "version": "1.20.0", "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.20.0.tgz", @@ -18036,9 +19111,9 @@ } }, "schema-utils": { - "version": "2.6.5", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.6.5.tgz", - "integrity": "sha512-5KXuwKziQrTVHh8j/Uxz+QUbxkaLW9X/86NBlx/gnKgtsZA2GIVMUn17qWhRFwF8jdYb3Dig5hRO/W5mZqy6SQ==", + "version": "2.6.6", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.6.6.tgz", + "integrity": "sha512-wHutF/WPSbIi9x6ctjGGk2Hvl0VOz5l3EKEuKbjPlB30mKZUzb9A5k9yEXRX3pwyqVLPvpfZZEllaFq/M718hA==", "requires": { "ajv": "^6.12.0", "ajv-keywords": "^3.4.1" @@ -18468,6 +19543,14 @@ } } }, + "single-trailing-newline": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/single-trailing-newline/-/single-trailing-newline-1.0.0.tgz", + "integrity": "sha1-gfCtKtZFGBlFyAlSpcFBSZLulmQ=", + "requires": { + "detect-newline": "^1.0.3" + } + }, "sisteransi": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", @@ -19546,6 +20629,28 @@ "resolved": "https://registry.npmjs.org/stylis/-/stylis-3.5.0.tgz", "integrity": "sha512-pP7yXN6dwMzAR29Q0mBrabPCe0/mNO1MSr93bhay+hcZondvMMTpeGyd8nbhYJdyperNT2DRxONQuUGcJr5iPw==" }, + "subscriptions-transport-ws": { + "version": "0.9.16", + "resolved": "https://registry.npmjs.org/subscriptions-transport-ws/-/subscriptions-transport-ws-0.9.16.tgz", + "integrity": "sha512-pQdoU7nC+EpStXnCfh/+ho0zE0Z+ma+i7xvj7bkXKb1dvYHSZxgRPaU6spRP+Bjzow67c/rRDoix5RT0uU9omw==", + "requires": { + "backo2": "^1.0.2", + "eventemitter3": "^3.1.0", + "iterall": "^1.2.1", + "symbol-observable": "^1.0.4", + "ws": "^5.2.0" + }, + "dependencies": { + "ws": { + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz", + "integrity": "sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA==", + "requires": { + "async-limiter": "~1.0.0" + } + } + } + }, "sudo-prompt": { "version": "8.2.5", "resolved": "https://registry.npmjs.org/sudo-prompt/-/sudo-prompt-8.2.5.tgz", @@ -19559,11 +20664,40 @@ "has-flag": "^3.0.0" } }, + "supports-hyperlinks": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz", + "integrity": "sha512-zoE5/e+dnEijk6ASB6/qrK+oYdm2do1hjoLWrqUC/8WEIW1gbxFcKuBof7sW8ArN6e+AYvsE8HBGiVRWL/F5CA==", + "requires": { + "has-flag": "^4.0.0", + "supports-color": "^7.0.0" + }, + "dependencies": { + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" + }, + "supports-color": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, "svg-parser": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/svg-parser/-/svg-parser-2.0.4.tgz", "integrity": "sha512-e4hG1hRwoOdRb37cIMSgzNsxyzKfayW6VOflrwvR+/bzrkyxY/31WkbgnQpgtrNp1SdpJvpUAGTa/ZoiPNDuRQ==" }, + "svg-tag-names": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/svg-tag-names/-/svg-tag-names-2.0.1.tgz", + "integrity": "sha512-BEZ508oR+X/b5sh7bT0RqDJ7GhTpezjj3P1D4kugrOaPs6HijviWksoQ63PS81vZn0QCjZmVKjHDBniTo+Domg==" + }, "svgo": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz", @@ -19671,6 +20805,30 @@ "resolved": "https://registry.npmjs.org/term-size/-/term-size-2.2.0.tgz", "integrity": "sha512-a6sumDlzyHVJWb8+YofY4TW112G6p2FCPEAFk+59gIYHv3XHRhm9ltVQ9kli4hNWeQBwSpe8cRN25x0ROunMOw==" }, + "terminal-link": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz", + "integrity": "sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==", + "requires": { + "ansi-escapes": "^4.2.1", + "supports-hyperlinks": "^2.0.0" + }, + "dependencies": { + "ansi-escapes": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz", + "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==", + "requires": { + "type-fest": "^0.11.0" + } + }, + "type-fest": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz", + "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==" + } + } + }, "terser": { "version": "4.4.0", "resolved": "https://registry.npmjs.org/terser/-/terser-4.4.0.tgz", @@ -20603,6 +21761,15 @@ "resolved": "https://registry.npmjs.org/url-to-options/-/url-to-options-1.0.1.tgz", "integrity": "sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k=" }, + "urql": { + "version": "1.9.6", + "resolved": "https://registry.npmjs.org/urql/-/urql-1.9.6.tgz", + "integrity": "sha512-n4RTViR0KuNlcz97pYBQ7ojZzEzhCYgylhhmhE2hOhlvb+bqEdt83ZymmtSnhw9Qi17Xc/GgSjE7itYw385JCA==", + "requires": { + "@urql/core": "^1.10.8", + "wonka": "^4.0.9" + } + }, "use": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz", @@ -21258,6 +22425,11 @@ "pify": "^4.0.1" } }, + "wonka": { + "version": "4.0.9", + "resolved": "https://registry.npmjs.org/wonka/-/wonka-4.0.9.tgz", + "integrity": "sha512-he7Nn1254ToUN03zLbJok6QxKdRJd46/QHm8nUcJNViXQnCutCuUgAbZvzoxrX+VXzGb4sCFolC4XhkHsmvdaA==" + }, "word-wrap": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", diff --git a/docs/package.json b/docs/package.json index 29bec67eb05..be88648555f 100644 --- a/docs/package.json +++ b/docs/package.json @@ -6,7 +6,7 @@ "serve": "gatsby serve" }, "dependencies": { - "gatsby": "2.20.17", + "gatsby": "2.20.24", "gatsby-theme-apollo-docs": "4.1.5", "react": "16.13.1", "react-dom": "16.13.1" From ac06bd324a2c86dab8c58becc8bd491b39f076a9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 18 Apr 2020 09:14:39 +0000 Subject: [PATCH 420/642] chore(deps): update dependency @types/node to v8.10.60 (#4005) Co-authored-by: Renovate Bot --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index e833d18a7f2..bd9cb1d045b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3936,9 +3936,9 @@ } }, "@types/node": { - "version": "8.10.59", - "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.59.tgz", - "integrity": "sha512-8RkBivJrDCyPpBXhVZcjh7cQxVBSmRk9QM7hOketZzp6Tg79c0N8kkpAIito9bnJ3HCVCHVYz+KHTEbfQNfeVQ==" + "version": "8.10.60", + "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.60.tgz", + "integrity": "sha512-YjPbypHFuiOV0bTgeF07HpEEqhmHaZqYNSdCKeBJa+yFoQ/7BC+FpJcwmi34xUIIRVFktnUyP1dPU8U0612GOg==" }, "@types/node-fetch": { "version": "2.3.2", diff --git a/package.json b/package.json index 909d144fd5b..1a779148dbf 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,7 @@ "@types/memcached": "2.2.6", "@types/micro": "7.3.3", "@types/nock": "10.0.3", - "@types/node": "8.10.59", + "@types/node": "8.10.60", "@types/node-fetch": "2.3.2", "@types/qs-middleware": "1.0.1", "@types/request": "2.48.4", From e11c08ab18ac500644c019b6ca5781d645723fe7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 18 Apr 2020 10:15:45 +0000 Subject: [PATCH 421/642] chore(deps): update dependency @types/aws-lambda to v8.10.50 (#4003) Co-authored-by: Renovate Bot --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index bd9cb1d045b..e7bd795ac2a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3525,9 +3525,9 @@ } }, "@types/aws-lambda": { - "version": "8.10.48", - "resolved": "https://registry.npmjs.org/@types/aws-lambda/-/aws-lambda-8.10.48.tgz", - "integrity": "sha512-+qFDcssXvrdXIxBbKCJp0atg94TJVJSt5sx3Cu6LOQX/EV2mbInjgxGeKuLmFFBjoxD7G6fSytZoeC6A9fzTuw==" + "version": "8.10.50", + "resolved": "https://registry.npmjs.org/@types/aws-lambda/-/aws-lambda-8.10.50.tgz", + "integrity": "sha512-RDzmQ5mO1f0BViKiuOudENZmoCACEa461nTRVtxhsAiEqGCgwdhCYN0aFgk42X5+ELAiqJKbv2mK0LkopYRYQg==" }, "@types/babel__core": { "version": "7.1.0", diff --git a/package.json b/package.json index 1a779148dbf..1d095fe1a7e 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ }, "devDependencies": { "@types/async-retry": "1.4.1", - "@types/aws-lambda": "8.10.48", + "@types/aws-lambda": "8.10.50", "@types/body-parser": "1.19.0", "@types/bunyan": "1.8.6", "@types/connect": "3.4.33", From 8a9134b73ff9b53be9952477e284de8cfd6c96f5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 18 Apr 2020 18:19:30 +0000 Subject: [PATCH 422/642] chore(deps): update dependency gatsby to v2.20.25 (#4009) Co-authored-by: Renovate Bot --- docs/package-lock.json | 23 ++++++++++++----------- docs/package.json | 2 +- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/docs/package-lock.json b/docs/package-lock.json index 12b6999cb20..816ae93d9b1 100644 --- a/docs/package-lock.json +++ b/docs/package-lock.json @@ -9544,9 +9544,9 @@ } }, "gatsby": { - "version": "2.20.24", - "resolved": "https://registry.npmjs.org/gatsby/-/gatsby-2.20.24.tgz", - "integrity": "sha512-zFr6eSf+RyeIj8MtECbVJQECI38Y6cud+A/7oNzEE2KR1oDO4BDj+BMW4zEn2NcI6HbFjRBdqE0MLZ7RFuAw4Q==", + "version": "2.20.25", + "resolved": "https://registry.npmjs.org/gatsby/-/gatsby-2.20.25.tgz", + "integrity": "sha512-K+qO3Trb6Hhg4TGsQuElDn+Q5P1PSVM2h2tANq/jUF62on9m/aUKz/KUb/mQiEPP2PcgdgIBESHhjrIbBqUBSw==", "requires": { "@babel/code-frame": "^7.8.3", "@babel/core": "^7.8.7", @@ -9609,7 +9609,7 @@ "flat": "^4.1.0", "fs-exists-cached": "1.0.0", "fs-extra": "^8.1.0", - "gatsby-cli": "^2.11.10", + "gatsby-cli": "^2.11.11", "gatsby-core-utils": "^1.1.3", "gatsby-graphiql-explorer": "^0.3.3", "gatsby-link": "^2.3.4", @@ -9883,9 +9883,9 @@ } }, "gatsby-cli": { - "version": "2.11.10", - "resolved": "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-2.11.10.tgz", - "integrity": "sha512-6u886DvQHvesP0KaSwJIt+gPd3NtMYheEiU51Y2GDrCMu2SRur+cuILE9vP7s2g3Vf5crURf+BaaTGeuhTLPOg==", + "version": "2.11.11", + "resolved": "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-2.11.11.tgz", + "integrity": "sha512-VW7dli1sh8LF9hHQGD58ESYBKCrm1vTijSSA/LgOm+AL2WuTDsyQA0aYL4vI5HBR98DrEvZSzZcATyubdzG+pQ==", "requires": { "@babel/code-frame": "^7.8.3", "@babel/runtime": "^7.8.7", @@ -9903,7 +9903,7 @@ "fs-exists-cached": "^1.0.0", "fs-extra": "^8.1.0", "gatsby-core-utils": "^1.1.3", - "gatsby-recipes": "^0.0.7", + "gatsby-recipes": "^0.0.8", "gatsby-telemetry": "^1.2.5", "hosted-git-info": "^3.0.4", "ink": "^2.7.1", @@ -10607,9 +10607,9 @@ } }, "gatsby-recipes": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/gatsby-recipes/-/gatsby-recipes-0.0.7.tgz", - "integrity": "sha512-WTO7+EU0n3aEGgaY1UyLoCDtk3MB9o5L3YssnlFwiFBcuHC43jE94UHPORpZ+7vMYU+1VeKGjqJqjlfTOAdv9Q==", + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/gatsby-recipes/-/gatsby-recipes-0.0.8.tgz", + "integrity": "sha512-EkfRUg8bGyxe5icK7yxXvE3w2n+Z1ZfEFcQpLB8cbPLU1C0qJPIFRF1BVi9cJWWyrB5F2EWcRs1ieD9dv6HivQ==", "requires": { "@babel/core": "^7.8.7", "@babel/standalone": "^7.9.5", @@ -10626,6 +10626,7 @@ "babel-plugin-dynamic-import-node": "^2.3.0", "babel-plugin-remove-graphql-queries": "^2.8.3", "babel-preset-gatsby": "^0.3.3", + "cors": "^2.8.5", "detect-port": "^1.3.0", "event-source-polyfill": "^1.0.12", "execa": "^4.0.0", diff --git a/docs/package.json b/docs/package.json index be88648555f..bcfb49f46e1 100644 --- a/docs/package.json +++ b/docs/package.json @@ -6,7 +6,7 @@ "serve": "gatsby serve" }, "dependencies": { - "gatsby": "2.20.24", + "gatsby": "2.20.25", "gatsby-theme-apollo-docs": "4.1.5", "react": "16.13.1", "react-dom": "16.13.1" From a65536d6c2b83357ab46046516a7114bd658defb Mon Sep 17 00:00:00 2001 From: Blake Jackson Date: Sat, 18 Apr 2020 13:18:36 -0500 Subject: [PATCH 423/642] REVERT ME: Changed jest to only test gateway requires. Added vscode debugger config." --- .vscode/launch.json | 35 +++++++++++++++++++++++++++++++++++ jest.config.base.js | 2 +- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 .vscode/launch.json diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 00000000000..19fe8b0983b --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,35 @@ +{ + "version": "0.2.0", + "configurations": [ + { + "type": "node", + "request": "launch", + "name": "Jest All", + "program": "${workspaceFolder}/node_modules/.bin/jest", + "args": ["--runInBand"], + "console": "integratedTerminal", + "internalConsoleOptions": "neverOpen", + "disableOptimisticBPs": true, + "windows": { + "program": "${workspaceFolder}/node_modules/jest/bin/jest", + } + }, + { + "type": "node", + "request": "launch", + "name": "Jest Current File", + "program": "${workspaceFolder}/node_modules/.bin/jest", + "args": [ + "${fileBasenameNoExtension}", + "--config", + "jest.config.js" + ], + "console": "integratedTerminal", + "internalConsoleOptions": "neverOpen", + "disableOptimisticBPs": true, + "windows": { + "program": "${workspaceFolder}/node_modules/jest/bin/jest", + } + } + ] +} diff --git a/jest.config.base.js b/jest.config.base.js index d033e9227a0..662f0e95355 100644 --- a/jest.config.base.js +++ b/jest.config.base.js @@ -7,7 +7,7 @@ module.exports = { ], preset: "ts-jest", testMatch: null, - testRegex: "/__tests__/.*\\.test\\.(js|ts)$", + testRegex: "/apollo-gateway/src/__tests__/integration/requires\\.test\\.(js|ts)$", testPathIgnorePatterns: [ "/node_modules/", "/dist/" From d77fb83a73cb3e4636f5a49baeacfb2c4869a087 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 18 Apr 2020 19:21:06 +0000 Subject: [PATCH 424/642] chore(deps): update dependency graphql-tools to v4.0.8 (#4006) Co-authored-by: Renovate Bot --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index e7bd795ac2a..dda9b6a6210 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8332,11 +8332,11 @@ "integrity": "sha512-4FOv3ZKfA4WdOKJeHdz6B3F/vxBLSgmBcGeAFPf4n1F64ltJUvOOerNj0rsJxONQGdhUMynQIvd6LzB+1J5oKA==" }, "graphql-tools": { - "version": "4.0.7", - "resolved": "https://registry.npmjs.org/graphql-tools/-/graphql-tools-4.0.7.tgz", - "integrity": "sha512-rApl8sT8t/W1uQRcwzxMYyUBiCl/XicluApiDkNze5TX/GR0BSTQMjM2UcRGdTmkbsb1Eqq6afkyyeG/zMxZYQ==", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/graphql-tools/-/graphql-tools-4.0.8.tgz", + "integrity": "sha512-MW+ioleBrwhRjalKjYaLQbr+920pHBgy9vM/n47sswtns8+96sRn5M/G+J1eu7IMeKWiN/9p6tmwCHU7552VJg==", "requires": { - "apollo-link": "^1.2.3", + "apollo-link": "^1.2.14", "apollo-utilities": "^1.0.1", "deprecated-decorator": "^0.1.6", "iterall": "^1.1.3", diff --git a/package.json b/package.json index 1d095fe1a7e..478560d82b9 100644 --- a/package.json +++ b/package.json @@ -101,7 +101,7 @@ "graphql": "14.6.0", "graphql-subscriptions": "1.1.0", "graphql-tag": "2.10.3", - "graphql-tools": "4.0.7", + "graphql-tools": "4.0.8", "hapi": "17.8.5", "ioredis": "4.16.1", "jest": "24.9.0", From eea100aba16ba07c1a974d91bbbcf385c27f83d5 Mon Sep 17 00:00:00 2001 From: Blake Jackson Date: Sat, 18 Apr 2020 14:31:29 -0500 Subject: [PATCH 425/642] Set up framework for new tests. --- .../__tests__/integration/requires.test.ts | 138 +++++++++++++++++- 1 file changed, 136 insertions(+), 2 deletions(-) diff --git a/packages/apollo-gateway/src/__tests__/integration/requires.test.ts b/packages/apollo-gateway/src/__tests__/integration/requires.test.ts index c45ce25fd1a..8c98a977221 100644 --- a/packages/apollo-gateway/src/__tests__/integration/requires.test.ts +++ b/packages/apollo-gateway/src/__tests__/integration/requires.test.ts @@ -1,12 +1,16 @@ import gql from 'graphql-tag'; -import { execute } from '../execution-utils'; +import { execute, ServiceDefinitionModule } from '../execution-utils'; +import { astSerializer, queryPlanSerializer } from '../../snapshotSerializers'; import * as accounts from '../__fixtures__/schemas/accounts'; import * as books from '../__fixtures__/schemas/books'; import * as inventory from '../__fixtures__/schemas/inventory'; import * as product from '../__fixtures__/schemas/product'; import * as reviews from '../__fixtures__/schemas/reviews'; -it('supports passing additional fields defined by a requires', async () => { +expect.addSnapshotSerializer(astSerializer); +expect.addSnapshotSerializer(queryPlanSerializer); + +it('supports passing additional scalar fields defined by a requires', async () => { const query = gql` query GetReviwedBookNames { me { @@ -47,3 +51,133 @@ it('supports passing additional fields defined by a requires', async () => { expect(queryPlan).toCallService('product'); expect(queryPlan).toCallService('books'); }); + + +const publisherService: ServiceDefinitionModule = { + name: 'publisher', + typeDefs: gql` + type Publisher { + id: ID! + name: String! + } + + extend type User @key(fields: "id") { + id: ID! @external + organization: Organization! @external + publisher: Publisher! @requires(fields: "organization { name address { country } }") + publisherCity: String! @requires(fields: "organization { address { city coordinates { type value }}}") + } + + type Organization { + name: String! + address: Address + } + + type Address { + city: String! + country: String! + coordinates: [Coordinate!]! + } + + type Coordinate { + type: CoordinateType! + value: Float! + } + + enum CoordinateType { + LATITUDE + LONGITUDE + } + `, + resolvers: { + User: { + publisher(user) { + return { + id: 1, + name: user.organization.name + ' ' + user.organization.address.country, + } + }, + publisherCity(user) { + return user.organization.address.city + ' ' + user.organization.address.coordinates.map((coordinate: any) => coordinate.value).join(' '); + }, + }, + }, +}; + +const userService: ServiceDefinitionModule = { + name: 'user', + typeDefs: gql` + type Query { + me: User + } + + type User @key(fields: "id") { + id: ID! + name: String! + organization: Organization! + } + + type Organization { + name: String! + address: Address + } + + type Address { + city: String! + country: String! + coordinates: [Coordinate!]! + } + + type Coordinate { + type: CoordinateType! + value: Float! + } + + enum CoordinateType { + LATITUDE + LONGITUDE + } + `, + resolvers: { + Query: { + me() { + return { + id: 'abc', + name: 'meme', + organization: { + name: 'org 1', + address: { + city: 'New York', + country: 'USA', + coordinates: [ + {type: 'LATITUDE', value: 123}, + {type: 'LONGITUDE', value: 321}, + ] + } + } + } + } + } + }, +}; + +it('supports passing additional deeply nested fields defined by a requires', async () => { + const query = gql` + query Me { + me { + name + publisher { + id + name + } + publisherCity + } + } + `; + + const { data, queryPlan } = await execute([userService, publisherService], { + query, + }); + + console.log(data) +}); From 8679721f3392b95003e9e941d4cae4dd145ac243 Mon Sep 17 00:00:00 2001 From: Blake Jackson Date: Sat, 18 Apr 2020 21:30:12 -0500 Subject: [PATCH 426/642] Initial POC. --- packages/apollo-gateway/src/FieldSet.ts | 36 ++++++++++- .../__tests__/integration/requires.test.ts | 64 ++++++++++++++++++- .../__tests__/integration/value-types.test.ts | 2 +- 3 files changed, 99 insertions(+), 3 deletions(-) diff --git a/packages/apollo-gateway/src/FieldSet.ts b/packages/apollo-gateway/src/FieldSet.ts index 02cf29a2ff5..265bc23933e 100644 --- a/packages/apollo-gateway/src/FieldSet.ts +++ b/packages/apollo-gateway/src/FieldSet.ts @@ -147,6 +147,40 @@ function mergeSelectionSets(fieldNodes: FieldNode[]): SelectionSetNode { return { kind: 'SelectionSet', - selections, + selections: mergeSelectionsSetsInternal(selections), }; } + +function mergeSelectionsSetsInternal(fieldNodes: SelectionNode[]): SelectionNode[] { + const scalars: SelectionNode[] = []; + const selectionMap: Map = new Map(); + + for (const fieldNode of fieldNodes) { + // @ts-ignore + if (!fieldNode.selectionSet) { + scalars.push(fieldNode); + continue; + } + // @ts-ignore + const name = fieldNode.name?.value || fieldNode.typeCondition.name.value + const selections: {field: SelectionNode[], selections: SelectionNode[]} = selectionMap.get(name) || {field: [fieldNode], selections: []}; + // @ts-ignore + selections.selections.push(...fieldNode.selectionSet.selections); + selections.field.push(fieldNode); + selectionMap.set(name, selections) + } + + const result = Array.from(selectionMap.values()).map(selection => { + // @ts-ignore + const name = selection.field[0].name?.value || selection.field[0].typeCondition.name.value + const field = selectionMap.get(name)?.field[0]; + // @ts-ignore + const clone = {...field} + // @ts-ignore + clone.selectionSet?.selections = mergeSelectionsSetsInternal(selection.selections) + return clone; + }) + result.unshift(...scalars); + + return result.flat(); +} diff --git a/packages/apollo-gateway/src/__tests__/integration/requires.test.ts b/packages/apollo-gateway/src/__tests__/integration/requires.test.ts index 8c98a977221..3d1644617bd 100644 --- a/packages/apollo-gateway/src/__tests__/integration/requires.test.ts +++ b/packages/apollo-gateway/src/__tests__/integration/requires.test.ts @@ -179,5 +179,67 @@ it('supports passing additional deeply nested fields defined by a requires', asy query, }); - console.log(data) + console.log(data); + expect(queryPlan).toMatchInlineSnapshot(` + QueryPlan { + Sequence { + Fetch(service: "user") { + { + me { + name + __typename + id + organization { + name + address { + country + city + city + coordinates { + type + value + type + value + } + } + } + } + } + }, + Flatten(path: "me") { + Fetch(service: "publisher") { + { + ... on User { + __typename + id + organization { + name + address { + country + city + city + coordinates { + type + value + type + value + } + } + } + } + } => + { + ... on User { + publisher { + id + name + } + publisherCity + } + } + }, + }, + }, + } + `); }); diff --git a/packages/apollo-gateway/src/__tests__/integration/value-types.test.ts b/packages/apollo-gateway/src/__tests__/integration/value-types.test.ts index 725dad6e343..0675d6f2466 100644 --- a/packages/apollo-gateway/src/__tests__/integration/value-types.test.ts +++ b/packages/apollo-gateway/src/__tests__/integration/value-types.test.ts @@ -71,6 +71,7 @@ describe('value types', () => { } ... on Furniture { upc + __typename metadata { __typename ... on KeyValue { @@ -82,7 +83,6 @@ describe('value types', () => { message } } - __typename } } } From 51cc797b49f3c5e31570a36627ce291911428ee1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 20 Apr 2020 12:40:53 +0300 Subject: [PATCH 427/642] chore(deps): update dependency jest to v25 (#3717) Co-authored-by: Renovate Bot --- package-lock.json | 7236 +++++++++++++++++++++++++++++++-------------- package.json | 4 +- 2 files changed, 5046 insertions(+), 2194 deletions(-) diff --git a/package-lock.json b/package-lock.json index dda9b6a6210..9f84c4ebb14 100644 --- a/package-lock.json +++ b/package-lock.json @@ -403,12 +403,353 @@ "@babel/types": "^7.0.0" } }, + "@babel/helper-member-expression-to-functions": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.8.3.tgz", + "integrity": "sha512-fO4Egq88utkQFjbPrSHGmGLFqmrshs11d46WI+WZDESt7Wu7wN2G2Iu+NMMZJFDOVRHAMIkB5SNh30NtwCA7RA==", + "dev": true, + "requires": { + "@babel/types": "^7.8.3" + }, + "dependencies": { + "@babel/types": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.5.tgz", + "integrity": "sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.9.5", + "lodash": "^4.17.13", + "to-fast-properties": "^2.0.0" + } + } + } + }, + "@babel/helper-module-imports": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz", + "integrity": "sha512-R0Bx3jippsbAEtzkpZ/6FIiuzOURPcMjHp+Z6xPe6DtApDJx+w7UYyOLanZqO8+wKR9G10s/FmHXvxaMd9s6Kg==", + "dev": true, + "requires": { + "@babel/types": "^7.8.3" + }, + "dependencies": { + "@babel/types": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.5.tgz", + "integrity": "sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.9.5", + "lodash": "^4.17.13", + "to-fast-properties": "^2.0.0" + } + } + } + }, + "@babel/helper-module-transforms": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz", + "integrity": "sha512-0FvKyu0gpPfIQ8EkxlrAydOWROdHpBmiCiRwLkUiBGhCUPRRbVD2/tm3sFr/c/GWFrQ/ffutGUAnx7V0FzT2wA==", + "dev": true, + "requires": { + "@babel/helper-module-imports": "^7.8.3", + "@babel/helper-replace-supers": "^7.8.6", + "@babel/helper-simple-access": "^7.8.3", + "@babel/helper-split-export-declaration": "^7.8.3", + "@babel/template": "^7.8.6", + "@babel/types": "^7.9.0", + "lodash": "^4.17.13" + }, + "dependencies": { + "@babel/code-frame": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", + "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", + "dev": true, + "requires": { + "@babel/highlight": "^7.8.3" + } + }, + "@babel/helper-split-export-declaration": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz", + "integrity": "sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==", + "dev": true, + "requires": { + "@babel/types": "^7.8.3" + } + }, + "@babel/highlight": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz", + "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.9.0", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" + } + }, + "@babel/parser": { + "version": "7.9.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz", + "integrity": "sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==", + "dev": true + }, + "@babel/template": { + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz", + "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.8.3", + "@babel/parser": "^7.8.6", + "@babel/types": "^7.8.6" + } + }, + "@babel/types": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.5.tgz", + "integrity": "sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.9.5", + "lodash": "^4.17.13", + "to-fast-properties": "^2.0.0" + } + } + } + }, + "@babel/helper-optimise-call-expression": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.8.3.tgz", + "integrity": "sha512-Kag20n86cbO2AvHca6EJsvqAd82gc6VMGule4HwebwMlwkpXuVqrNRj6CkCV2sKxgi9MyAUnZVnZ6lJ1/vKhHQ==", + "dev": true, + "requires": { + "@babel/types": "^7.8.3" + }, + "dependencies": { + "@babel/types": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.5.tgz", + "integrity": "sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.9.5", + "lodash": "^4.17.13", + "to-fast-properties": "^2.0.0" + } + } + } + }, "@babel/helper-plugin-utils": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz", "integrity": "sha512-CYAOUCARwExnEixLdB6sDm2dIJ/YgEAKDM1MOeMeZu9Ld/bDgVo8aiWrXwcY7OBh+1Ea2uUcVRcxKk0GJvW7QA==", "dev": true }, + "@babel/helper-replace-supers": { + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.8.6.tgz", + "integrity": "sha512-PeMArdA4Sv/Wf4zXwBKPqVj7n9UF/xg6slNRtZW84FM7JpE1CbG8B612FyM4cxrf4fMAMGO0kR7voy1ForHHFA==", + "dev": true, + "requires": { + "@babel/helper-member-expression-to-functions": "^7.8.3", + "@babel/helper-optimise-call-expression": "^7.8.3", + "@babel/traverse": "^7.8.6", + "@babel/types": "^7.8.6" + }, + "dependencies": { + "@babel/code-frame": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", + "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", + "dev": true, + "requires": { + "@babel/highlight": "^7.8.3" + } + }, + "@babel/generator": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.5.tgz", + "integrity": "sha512-GbNIxVB3ZJe3tLeDm1HSn2AhuD/mVcyLDpgtLXa5tplmWrJdF/elxB56XNqCuD6szyNkDi6wuoKXln3QeBmCHQ==", + "dev": true, + "requires": { + "@babel/types": "^7.9.5", + "jsesc": "^2.5.1", + "lodash": "^4.17.13", + "source-map": "^0.5.0" + } + }, + "@babel/helper-function-name": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz", + "integrity": "sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==", + "dev": true, + "requires": { + "@babel/helper-get-function-arity": "^7.8.3", + "@babel/template": "^7.8.3", + "@babel/types": "^7.9.5" + } + }, + "@babel/helper-get-function-arity": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz", + "integrity": "sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==", + "dev": true, + "requires": { + "@babel/types": "^7.8.3" + } + }, + "@babel/helper-split-export-declaration": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz", + "integrity": "sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==", + "dev": true, + "requires": { + "@babel/types": "^7.8.3" + } + }, + "@babel/highlight": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz", + "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.9.0", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" + } + }, + "@babel/parser": { + "version": "7.9.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz", + "integrity": "sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==", + "dev": true + }, + "@babel/template": { + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz", + "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.8.3", + "@babel/parser": "^7.8.6", + "@babel/types": "^7.8.6" + } + }, + "@babel/traverse": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.5.tgz", + "integrity": "sha512-c4gH3jsvSuGUezlP6rzSJ6jf8fYjLj3hsMZRx/nX0h+fmHN0w+ekubRrHPqnMec0meycA2nwCsJ7dC8IPem2FQ==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.8.3", + "@babel/generator": "^7.9.5", + "@babel/helper-function-name": "^7.9.5", + "@babel/helper-split-export-declaration": "^7.8.3", + "@babel/parser": "^7.9.0", + "@babel/types": "^7.9.5", + "debug": "^4.1.0", + "globals": "^11.1.0", + "lodash": "^4.17.13" + } + }, + "@babel/types": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.5.tgz", + "integrity": "sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.9.5", + "lodash": "^4.17.13", + "to-fast-properties": "^2.0.0" + } + }, + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true + } + } + }, + "@babel/helper-simple-access": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.8.3.tgz", + "integrity": "sha512-VNGUDjx5cCWg4vvCTR8qQ7YJYZ+HBjxOgXEl7ounz+4Sn7+LMD3CFrCTEU6/qXKbA2nKg21CwhhBzO0RpRbdCw==", + "dev": true, + "requires": { + "@babel/template": "^7.8.3", + "@babel/types": "^7.8.3" + }, + "dependencies": { + "@babel/code-frame": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", + "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", + "dev": true, + "requires": { + "@babel/highlight": "^7.8.3" + } + }, + "@babel/highlight": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz", + "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.9.0", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" + } + }, + "@babel/parser": { + "version": "7.9.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz", + "integrity": "sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==", + "dev": true + }, + "@babel/template": { + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz", + "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.8.3", + "@babel/parser": "^7.8.6", + "@babel/types": "^7.8.6" + } + }, + "@babel/types": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.5.tgz", + "integrity": "sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.9.5", + "lodash": "^4.17.13", + "to-fast-properties": "^2.0.0" + } + } + } + }, "@babel/helper-split-export-declaration": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0.tgz", @@ -418,6 +759,12 @@ "@babel/types": "^7.0.0" } }, + "@babel/helper-validator-identifier": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz", + "integrity": "sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==", + "dev": true + }, "@babel/helpers": { "version": "7.3.1", "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.3.1.tgz", @@ -446,6 +793,125 @@ "integrity": "sha512-tXZCqWtlOOP4wgCp6RjRvLmfuhnqTLy9VHwRochJBCP2nDm27JnnuFEnXFASVyQNHk36jD1tAammsCEEqgscIQ==", "dev": true }, + "@babel/plugin-syntax-async-generators": { + "version": "7.8.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz", + "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "dependencies": { + "@babel/helper-plugin-utils": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", + "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==", + "dev": true + } + } + }, + "@babel/plugin-syntax-bigint": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz", + "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "dependencies": { + "@babel/helper-plugin-utils": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", + "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==", + "dev": true + } + } + }, + "@babel/plugin-syntax-class-properties": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.8.3.tgz", + "integrity": "sha512-UcAyQWg2bAN647Q+O811tG9MrJ38Z10jjhQdKNAL8fsyPzE3cCN/uT+f55cFVY4aGO4jqJAvmqsuY3GQDwAoXg==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.8.3" + }, + "dependencies": { + "@babel/helper-plugin-utils": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", + "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==", + "dev": true + } + } + }, + "@babel/plugin-syntax-json-strings": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz", + "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "dependencies": { + "@babel/helper-plugin-utils": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", + "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==", + "dev": true + } + } + }, + "@babel/plugin-syntax-logical-assignment-operators": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.8.3.tgz", + "integrity": "sha512-Zpg2Sgc++37kuFl6ppq2Q7Awc6E6AIW671x5PY8E/f7MCIyPPGK/EoeZXvvY3P42exZ3Q4/t3YOzP/HiN79jDg==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.8.3" + }, + "dependencies": { + "@babel/helper-plugin-utils": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", + "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==", + "dev": true + } + } + }, + "@babel/plugin-syntax-nullish-coalescing-operator": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz", + "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "dependencies": { + "@babel/helper-plugin-utils": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", + "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==", + "dev": true + } + } + }, + "@babel/plugin-syntax-numeric-separator": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.8.3.tgz", + "integrity": "sha512-H7dCMAdN83PcCmqmkHB5dtp+Xa9a6LKSvA2hiFBC/5alSHxM5VgWZXFqDi0YFe8XNGT6iCa+z4V4zSt/PdZ7Dw==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.8.3" + }, + "dependencies": { + "@babel/helper-plugin-utils": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", + "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==", + "dev": true + } + } + }, "@babel/plugin-syntax-object-rest-spread": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.2.0.tgz", @@ -455,6 +921,40 @@ "@babel/helper-plugin-utils": "^7.0.0" } }, + "@babel/plugin-syntax-optional-catch-binding": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz", + "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "dependencies": { + "@babel/helper-plugin-utils": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", + "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==", + "dev": true + } + } + }, + "@babel/plugin-syntax-optional-chaining": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz", + "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "dependencies": { + "@babel/helper-plugin-utils": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", + "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==", + "dev": true + } + } + }, "@babel/template": { "version": "7.2.2", "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.2.2.tgz", @@ -511,6 +1011,12 @@ "to-fast-properties": "^2.0.0" } }, + "@bcoe/v8-coverage": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz", + "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==", + "dev": true + }, "@cnakazawa/watch": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.3.tgz", @@ -647,190 +1153,193 @@ } } }, - "@jest/console": { - "version": "24.7.1", - "resolved": "https://registry.npmjs.org/@jest/console/-/console-24.7.1.tgz", - "integrity": "sha512-iNhtIy2M8bXlAOULWVTUxmnelTLFneTNEkHCgPmgd+zNwy9zVddJ6oS5rZ9iwoscNdT5mMwUd0C51v/fSlzItg==", - "dev": true, - "requires": { - "@jest/source-map": "^24.3.0", - "chalk": "^2.0.1", - "slash": "^2.0.0" - } - }, - "@jest/core": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/core/-/core-24.9.0.tgz", - "integrity": "sha512-Fogg3s4wlAr1VX7q+rhV9RVnUv5tD7VuWfYy1+whMiWUrvl7U3QJSJyWcDio9Lq2prqYsZaeTv2Rz24pWGkJ2A==", + "@istanbuljs/load-nyc-config": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.0.0.tgz", + "integrity": "sha512-ZR0rq/f/E4f4XcgnDvtMWXCUJpi8eO0rssVhmztsZqLIEFA9UUP9zmpE0VxlM+kv/E1ul2I876Fwil2ayptDVg==", "dev": true, "requires": { - "@jest/console": "^24.7.1", - "@jest/reporters": "^24.9.0", - "@jest/test-result": "^24.9.0", - "@jest/transform": "^24.9.0", - "@jest/types": "^24.9.0", - "ansi-escapes": "^3.0.0", - "chalk": "^2.0.1", - "exit": "^0.1.2", - "graceful-fs": "^4.1.15", - "jest-changed-files": "^24.9.0", - "jest-config": "^24.9.0", - "jest-haste-map": "^24.9.0", - "jest-message-util": "^24.9.0", - "jest-regex-util": "^24.3.0", - "jest-resolve": "^24.9.0", - "jest-resolve-dependencies": "^24.9.0", - "jest-runner": "^24.9.0", - "jest-runtime": "^24.9.0", - "jest-snapshot": "^24.9.0", - "jest-util": "^24.9.0", - "jest-validate": "^24.9.0", - "jest-watcher": "^24.9.0", - "micromatch": "^3.1.10", - "p-each-series": "^1.0.0", - "realpath-native": "^1.1.0", - "rimraf": "^2.5.4", - "slash": "^2.0.0", - "strip-ansi": "^5.0.0" + "camelcase": "^5.3.1", + "find-up": "^4.1.0", + "js-yaml": "^3.13.1", + "resolve-from": "^5.0.0" }, "dependencies": { - "@jest/environment": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-24.9.0.tgz", - "integrity": "sha512-5A1QluTPhvdIPFYnO3sZC3smkNeXPVELz7ikPbhUj0bQjB07EoE9qtLrem14ZUYWdVayYbsjVwIiL4WBIMV4aQ==", + "find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", "dev": true, "requires": { - "@jest/fake-timers": "^24.9.0", - "@jest/transform": "^24.9.0", - "@jest/types": "^24.9.0", - "jest-mock": "^24.9.0" + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" } }, - "@jest/fake-timers": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-24.9.0.tgz", - "integrity": "sha512-eWQcNa2YSwzXWIMC5KufBh3oWRIijrQFROsIqt6v/NS9Io/gknw1jsAC9c+ih/RQX4A3O7SeWAhQeN0goKhT9A==", + "locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", "dev": true, "requires": { - "@jest/types": "^24.9.0", - "jest-message-util": "^24.9.0", - "jest-mock": "^24.9.0" + "p-locate": "^4.1.0" } }, - "@jest/source-map": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-24.9.0.tgz", - "integrity": "sha512-/Xw7xGlsZb4MJzNDgB7PW5crou5JqWiBQaz6xyPd3ArOg2nfn/PunV8+olXbbEZzNl591o5rWKE9BRDaFAuIBg==", + "p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", "dev": true, "requires": { - "callsites": "^3.0.0", - "graceful-fs": "^4.1.15", - "source-map": "^0.6.0" + "p-limit": "^2.2.0" } }, - "@jest/test-result": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-24.9.0.tgz", - "integrity": "sha512-XEFrHbBonBJ8dGp2JmF8kP/nQI/ImPpygKHwQ/SY+es59Z3L5PI4Qb9TQQMAEeYsThG1xF0k6tmG0tIKATNiiA==", + "path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true + }, + "resolve-from": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", + "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", + "dev": true + } + } + }, + "@istanbuljs/schema": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.2.tgz", + "integrity": "sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==", + "dev": true + }, + "@jest/console": { + "version": "24.7.1", + "resolved": "https://registry.npmjs.org/@jest/console/-/console-24.7.1.tgz", + "integrity": "sha512-iNhtIy2M8bXlAOULWVTUxmnelTLFneTNEkHCgPmgd+zNwy9zVddJ6oS5rZ9iwoscNdT5mMwUd0C51v/fSlzItg==", + "dev": true, + "requires": { + "@jest/source-map": "^24.3.0", + "chalk": "^2.0.1", + "slash": "^2.0.0" + } + }, + "@jest/core": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/@jest/core/-/core-25.4.0.tgz", + "integrity": "sha512-h1x9WSVV0+TKVtATGjyQIMJENs8aF6eUjnCoi4jyRemYZmekLr8EJOGQqTWEX8W6SbZ6Skesy9pGXrKeAolUJw==", + "dev": true, + "requires": { + "@jest/console": "^25.4.0", + "@jest/reporters": "^25.4.0", + "@jest/test-result": "^25.4.0", + "@jest/transform": "^25.4.0", + "@jest/types": "^25.4.0", + "ansi-escapes": "^4.2.1", + "chalk": "^3.0.0", + "exit": "^0.1.2", + "graceful-fs": "^4.2.3", + "jest-changed-files": "^25.4.0", + "jest-config": "^25.4.0", + "jest-haste-map": "^25.4.0", + "jest-message-util": "^25.4.0", + "jest-regex-util": "^25.2.6", + "jest-resolve": "^25.4.0", + "jest-resolve-dependencies": "^25.4.0", + "jest-runner": "^25.4.0", + "jest-runtime": "^25.4.0", + "jest-snapshot": "^25.4.0", + "jest-util": "^25.4.0", + "jest-validate": "^25.4.0", + "jest-watcher": "^25.4.0", + "micromatch": "^4.0.2", + "p-each-series": "^2.1.0", + "realpath-native": "^2.0.0", + "rimraf": "^3.0.0", + "slash": "^3.0.0", + "strip-ansi": "^6.0.0" + }, + "dependencies": { + "@babel/generator": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.5.tgz", + "integrity": "sha512-GbNIxVB3ZJe3tLeDm1HSn2AhuD/mVcyLDpgtLXa5tplmWrJdF/elxB56XNqCuD6szyNkDi6wuoKXln3QeBmCHQ==", "dev": true, "requires": { - "@jest/console": "^24.9.0", - "@jest/types": "^24.9.0", - "@types/istanbul-lib-coverage": "^2.0.0" + "@babel/types": "^7.9.5", + "jsesc": "^2.5.1", + "lodash": "^4.17.13", + "source-map": "^0.5.0" }, "dependencies": { - "@jest/console": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/console/-/console-24.9.0.tgz", - "integrity": "sha512-Zuj6b8TnKXi3q4ymac8EQfc3ea/uhLeCGThFqXeC8H9/raaH8ARPUTdId+XyGd03Z4In0/VjD2OYFcBF09fNLQ==", - "dev": true, - "requires": { - "@jest/source-map": "^24.9.0", - "chalk": "^2.0.1", - "slash": "^2.0.0" - } + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true } } }, - "@jest/test-sequencer": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-24.9.0.tgz", - "integrity": "sha512-6qqsU4o0kW1dvA95qfNog8v8gkRN9ph6Lz7r96IvZpHdNipP2cBcb07J1Z45mz/VIS01OHJ3pY8T5fUY38tg4A==", + "@babel/helper-function-name": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz", + "integrity": "sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==", "dev": true, "requires": { - "@jest/test-result": "^24.9.0", - "jest-haste-map": "^24.9.0", - "jest-runner": "^24.9.0", - "jest-runtime": "^24.9.0" + "@babel/helper-get-function-arity": "^7.8.3", + "@babel/template": "^7.8.3", + "@babel/types": "^7.9.5" } }, - "@jest/transform": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-24.9.0.tgz", - "integrity": "sha512-TcQUmyNRxV94S0QpMOnZl0++6RMiqpbH/ZMccFB/amku6Uwvyb1cjYX7xkp5nGNkbX4QPH/FcB6q1HBTHynLmQ==", + "@babel/helper-get-function-arity": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz", + "integrity": "sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==", "dev": true, "requires": { - "@babel/core": "^7.1.0", - "@jest/types": "^24.9.0", - "babel-plugin-istanbul": "^5.1.0", - "chalk": "^2.0.1", - "convert-source-map": "^1.4.0", - "fast-json-stable-stringify": "^2.0.0", - "graceful-fs": "^4.1.15", - "jest-haste-map": "^24.9.0", - "jest-regex-util": "^24.9.0", - "jest-util": "^24.9.0", - "micromatch": "^3.1.10", - "pirates": "^4.0.1", - "realpath-native": "^1.1.0", - "slash": "^2.0.0", - "source-map": "^0.6.1", - "write-file-atomic": "2.4.1" - }, - "dependencies": { - "jest-regex-util": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-24.9.0.tgz", - "integrity": "sha512-05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA==", - "dev": true - } + "@babel/types": "^7.8.3" } }, - "@jest/types": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz", - "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==", + "@babel/helper-split-export-declaration": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz", + "integrity": "sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==", "dev": true, "requires": { - "@types/istanbul-lib-coverage": "^2.0.0", - "@types/istanbul-reports": "^1.1.1", - "@types/yargs": "^13.0.0" + "@babel/types": "^7.8.3" } }, - "@types/yargs": { - "version": "13.0.2", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.2.tgz", - "integrity": "sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ==", + "@babel/helpers": { + "version": "7.9.2", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.2.tgz", + "integrity": "sha512-JwLvzlXVPjO8eU9c/wF9/zOIN7X6h8DYf7mG4CiFRZRvZNKEF5dQ3H3V+ASkHoIB3mWhatgl5ONhyqHRI6MppA==", "dev": true, "requires": { - "@types/yargs-parser": "*" + "@babel/template": "^7.8.3", + "@babel/traverse": "^7.9.0", + "@babel/types": "^7.9.0" } }, - "babel-jest": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-24.9.0.tgz", - "integrity": "sha512-ntuddfyiN+EhMw58PTNL1ph4C9rECiQXjI4nMMBKBaNjXvqLdkXpPRcMSr4iyBrJg/+wz9brFUD6RhOAT6r4Iw==", + "@babel/highlight": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz", + "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==", "dev": true, "requires": { - "@jest/transform": "^24.9.0", - "@jest/types": "^24.9.0", - "@types/babel__core": "^7.1.0", - "babel-plugin-istanbul": "^5.1.0", - "babel-preset-jest": "^24.9.0", - "chalk": "^2.4.2", - "slash": "^2.0.0" + "@babel/helper-validator-identifier": "^7.9.0", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" }, "dependencies": { + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "^1.9.0" + } + }, "chalk": { "version": "2.4.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", @@ -842,6 +1351,27 @@ "supports-color": "^5.3.0" } }, + "color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "dev": true, + "requires": { + "color-name": "1.1.3" + } + }, + "color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", + "dev": true + }, + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "dev": true + }, "supports-color": { "version": "5.5.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", @@ -853,1205 +1383,966 @@ } } }, - "babel-plugin-jest-hoist": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-24.9.0.tgz", - "integrity": "sha512-2EMA2P8Vp7lG0RAzr4HXqtYwacfMErOuv1U3wrvxHX6rD1sV6xS3WXG3r8TRQ2r6w8OhvSdWt+z41hQNwNm3Xw==", - "dev": true, - "requires": { - "@types/babel__traverse": "^7.0.6" - } - }, - "babel-preset-jest": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-24.9.0.tgz", - "integrity": "sha512-izTUuhE4TMfTRPF92fFwD2QfdXaZW08qvWTFCI51V8rW5x00UuPgc3ajRoWofXOuxjfcOM5zzSYsQS3H8KGCAg==", - "dev": true, - "requires": { - "@babel/plugin-syntax-object-rest-spread": "^7.0.0", - "babel-plugin-jest-hoist": "^24.9.0" - } - }, - "callsites": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", - "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", - "dev": true - }, - "camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", + "@babel/parser": { + "version": "7.9.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz", + "integrity": "sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==", "dev": true }, - "cliui": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", - "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", + "@babel/template": { + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz", + "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==", "dev": true, "requires": { - "string-width": "^3.1.0", - "strip-ansi": "^5.2.0", - "wrap-ansi": "^5.1.0" + "@babel/code-frame": "^7.8.3", + "@babel/parser": "^7.8.6", + "@babel/types": "^7.8.6" }, "dependencies": { - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "@babel/code-frame": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", + "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", "dev": true, "requires": { - "ansi-regex": "^4.1.0" + "@babel/highlight": "^7.8.3" } } } }, - "diff-sequences": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-24.9.0.tgz", - "integrity": "sha512-Dj6Wk3tWyTE+Fo1rW8v0Xhwk80um6yFYKbuAxc9c3EZxIHFDYwbi34Uk42u1CdnIiVorvt4RmlSDjIPyzGC2ew==", - "dev": true - }, - "expect": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/expect/-/expect-24.9.0.tgz", - "integrity": "sha512-wvVAx8XIol3Z5m9zvZXiyZOQ+sRJqNTIm6sGjdWlaZIeupQGO3WbYI+15D/AmEwZywL6wtJkbAbJtzkOfBuR0Q==", + "@babel/traverse": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.5.tgz", + "integrity": "sha512-c4gH3jsvSuGUezlP6rzSJ6jf8fYjLj3hsMZRx/nX0h+fmHN0w+ekubRrHPqnMec0meycA2nwCsJ7dC8IPem2FQ==", "dev": true, "requires": { - "@jest/types": "^24.9.0", - "ansi-styles": "^3.2.0", - "jest-get-type": "^24.9.0", - "jest-matcher-utils": "^24.9.0", - "jest-message-util": "^24.9.0", - "jest-regex-util": "^24.9.0" + "@babel/code-frame": "^7.8.3", + "@babel/generator": "^7.9.5", + "@babel/helper-function-name": "^7.9.5", + "@babel/helper-split-export-declaration": "^7.8.3", + "@babel/parser": "^7.9.0", + "@babel/types": "^7.9.5", + "debug": "^4.1.0", + "globals": "^11.1.0", + "lodash": "^4.17.13" }, "dependencies": { - "jest-regex-util": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-24.9.0.tgz", - "integrity": "sha512-05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA==", - "dev": true + "@babel/code-frame": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", + "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", + "dev": true, + "requires": { + "@babel/highlight": "^7.8.3" + } } } }, - "get-caller-file": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", - "dev": true - }, - "jest-config": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-24.9.0.tgz", - "integrity": "sha512-RATtQJtVYQrp7fvWg6f5y3pEFj9I+H8sWw4aKxnDZ96mob5i5SD6ZEGWgMLXQ4LE8UurrjbdlLWdUeo+28QpfQ==", + "@babel/types": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.5.tgz", + "integrity": "sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==", "dev": true, "requires": { - "@babel/core": "^7.1.0", - "@jest/test-sequencer": "^24.9.0", - "@jest/types": "^24.9.0", - "babel-jest": "^24.9.0", - "chalk": "^2.0.1", - "glob": "^7.1.1", - "jest-environment-jsdom": "^24.9.0", - "jest-environment-node": "^24.9.0", - "jest-get-type": "^24.9.0", - "jest-jasmine2": "^24.9.0", - "jest-regex-util": "^24.3.0", - "jest-resolve": "^24.9.0", - "jest-util": "^24.9.0", - "jest-validate": "^24.9.0", - "micromatch": "^3.1.10", - "pretty-format": "^24.9.0", - "realpath-native": "^1.1.0" + "@babel/helper-validator-identifier": "^7.9.5", + "lodash": "^4.17.13", + "to-fast-properties": "^2.0.0" } }, - "jest-diff": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-24.9.0.tgz", - "integrity": "sha512-qMfrTs8AdJE2iqrTp0hzh7kTd2PQWrsFyj9tORoKmu32xjPjeE4NyjVRDz8ybYwqS2ik8N4hsIpiVTyFeo2lBQ==", + "@jest/console": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/@jest/console/-/console-25.4.0.tgz", + "integrity": "sha512-CfE0erx4hdJ6t7RzAcE1wLG6ZzsHSmybvIBQDoCkDM1QaSeWL9wJMzID/2BbHHa7ll9SsbbK43HjbERbBaFX2A==", "dev": true, "requires": { - "chalk": "^2.0.1", - "diff-sequences": "^24.9.0", - "jest-get-type": "^24.9.0", - "pretty-format": "^24.9.0" + "@jest/types": "^25.4.0", + "chalk": "^3.0.0", + "jest-message-util": "^25.4.0", + "jest-util": "^25.4.0", + "slash": "^3.0.0" } }, - "jest-each": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-24.9.0.tgz", - "integrity": "sha512-ONi0R4BvW45cw8s2Lrx8YgbeXL1oCQ/wIDwmsM3CqM/nlblNCPmnC3IPQlMbRFZu3wKdQ2U8BqM6lh3LJ5Bsog==", + "@jest/environment": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-25.4.0.tgz", + "integrity": "sha512-KDctiak4mu7b4J6BIoN/+LUL3pscBzoUCP+EtSPd2tK9fqyDY5OF+CmkBywkFWezS9tyH5ACOQNtpjtueEDH6Q==", "dev": true, "requires": { - "@jest/types": "^24.9.0", - "chalk": "^2.0.1", - "jest-get-type": "^24.9.0", - "jest-util": "^24.9.0", - "pretty-format": "^24.9.0" + "@jest/fake-timers": "^25.4.0", + "@jest/types": "^25.4.0", + "jest-mock": "^25.4.0" } }, - "jest-environment-jsdom": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-24.9.0.tgz", - "integrity": "sha512-Zv9FV9NBRzLuALXjvRijO2351DRQeLYXtpD4xNvfoVFw21IOKNhZAEUKcbiEtjTkm2GsJ3boMVgkaR7rN8qetA==", + "@jest/fake-timers": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-25.4.0.tgz", + "integrity": "sha512-lI9z+VOmVX4dPPFzyj0vm+UtaB8dCJJ852lcDnY0uCPRvZAaVGnMwBBc1wxtf+h7Vz6KszoOvKAt4QijDnHDkg==", "dev": true, "requires": { - "@jest/environment": "^24.9.0", - "@jest/fake-timers": "^24.9.0", - "@jest/types": "^24.9.0", - "jest-mock": "^24.9.0", - "jest-util": "^24.9.0", - "jsdom": "^11.5.1" + "@jest/types": "^25.4.0", + "jest-message-util": "^25.4.0", + "jest-mock": "^25.4.0", + "jest-util": "^25.4.0", + "lolex": "^5.0.0" } }, - "jest-environment-node": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-24.9.0.tgz", - "integrity": "sha512-6d4V2f4nxzIzwendo27Tr0aFm+IXWa0XEUnaH6nU0FMaozxovt+sfRvh4J47wL1OvF83I3SSTu0XK+i4Bqe7uA==", + "@jest/source-map": { + "version": "25.2.6", + "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-25.2.6.tgz", + "integrity": "sha512-VuIRZF8M2zxYFGTEhkNSvQkUKafQro4y+mwUxy5ewRqs5N/ynSFUODYp3fy1zCnbCMy1pz3k+u57uCqx8QRSQQ==", "dev": true, "requires": { - "@jest/environment": "^24.9.0", - "@jest/fake-timers": "^24.9.0", - "@jest/types": "^24.9.0", - "jest-mock": "^24.9.0", - "jest-util": "^24.9.0" + "callsites": "^3.0.0", + "graceful-fs": "^4.2.3", + "source-map": "^0.6.0" } }, - "jest-get-type": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-24.9.0.tgz", - "integrity": "sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q==", - "dev": true - }, - "jest-haste-map": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-24.9.0.tgz", - "integrity": "sha512-kfVFmsuWui2Sj1Rp1AJ4D9HqJwE4uwTlS/vO+eRUaMmd54BFpli2XhMQnPC2k4cHFVbB2Q2C+jtI1AGLgEnCjQ==", + "@jest/test-result": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-25.4.0.tgz", + "integrity": "sha512-8BAKPaMCHlL941eyfqhWbmp3MebtzywlxzV+qtngQ3FH+RBqnoSAhNEPj4MG7d2NVUrMOVfrwuzGpVIK+QnMAA==", "dev": true, "requires": { - "@jest/types": "^24.9.0", - "anymatch": "^2.0.0", - "fb-watchman": "^2.0.0", - "fsevents": "^1.2.7", - "graceful-fs": "^4.1.15", - "invariant": "^2.2.4", - "jest-serializer": "^24.9.0", - "jest-util": "^24.9.0", - "jest-worker": "^24.9.0", - "micromatch": "^3.1.10", - "sane": "^4.0.3", - "walker": "^1.0.7" + "@jest/console": "^25.4.0", + "@jest/types": "^25.4.0", + "@types/istanbul-lib-coverage": "^2.0.0", + "collect-v8-coverage": "^1.0.0" } }, - "jest-jasmine2": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-24.9.0.tgz", - "integrity": "sha512-Cq7vkAgaYKp+PsX+2/JbTarrk0DmNhsEtqBXNwUHkdlbrTBLtMJINADf2mf5FkowNsq8evbPc07/qFO0AdKTzw==", + "@jest/test-sequencer": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-25.4.0.tgz", + "integrity": "sha512-240cI+nsM3attx2bMp9uGjjHrwrpvxxrZi8Tyqp/cfOzl98oZXVakXBgxODGyBYAy/UGXPKXLvNc2GaqItrsJg==", "dev": true, "requires": { - "@babel/traverse": "^7.1.0", - "@jest/environment": "^24.9.0", - "@jest/test-result": "^24.9.0", - "@jest/types": "^24.9.0", - "chalk": "^2.0.1", - "co": "^4.6.0", - "expect": "^24.9.0", - "is-generator-fn": "^2.0.0", - "jest-each": "^24.9.0", - "jest-matcher-utils": "^24.9.0", - "jest-message-util": "^24.9.0", - "jest-runtime": "^24.9.0", - "jest-snapshot": "^24.9.0", - "jest-util": "^24.9.0", - "pretty-format": "^24.9.0", - "throat": "^4.0.0" + "@jest/test-result": "^25.4.0", + "jest-haste-map": "^25.4.0", + "jest-runner": "^25.4.0", + "jest-runtime": "^25.4.0" } }, - "jest-leak-detector": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-24.9.0.tgz", - "integrity": "sha512-tYkFIDsiKTGwb2FG1w8hX9V0aUb2ot8zY/2nFg087dUageonw1zrLMP4W6zsRO59dPkTSKie+D4rhMuP9nRmrA==", + "@jest/transform": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-25.4.0.tgz", + "integrity": "sha512-t1w2S6V1sk++1HHsxboWxPEuSpN8pxEvNrZN+Ud/knkROWtf8LeUmz73A4ezE8476a5AM00IZr9a8FO9x1+j3g==", "dev": true, "requires": { - "jest-get-type": "^24.9.0", - "pretty-format": "^24.9.0" + "@babel/core": "^7.1.0", + "@jest/types": "^25.4.0", + "babel-plugin-istanbul": "^6.0.0", + "chalk": "^3.0.0", + "convert-source-map": "^1.4.0", + "fast-json-stable-stringify": "^2.0.0", + "graceful-fs": "^4.2.3", + "jest-haste-map": "^25.4.0", + "jest-regex-util": "^25.2.6", + "jest-util": "^25.4.0", + "micromatch": "^4.0.2", + "pirates": "^4.0.1", + "realpath-native": "^2.0.0", + "slash": "^3.0.0", + "source-map": "^0.6.1", + "write-file-atomic": "^3.0.0" } }, - "jest-matcher-utils": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-24.9.0.tgz", - "integrity": "sha512-OZz2IXsu6eaiMAwe67c1T+5tUAtQyQx27/EMEkbFAGiw52tB9em+uGbzpcgYVpA8wl0hlxKPZxrly4CXU/GjHA==", + "@jest/types": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.4.0.tgz", + "integrity": "sha512-XBeaWNzw2PPnGW5aXvZt3+VO60M+34RY3XDsCK5tW7kyj3RK0XClRutCfjqcBuaR2aBQTbluEDME9b5MB9UAPw==", "dev": true, "requires": { - "chalk": "^2.0.1", - "jest-diff": "^24.9.0", - "jest-get-type": "^24.9.0", - "pretty-format": "^24.9.0" + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^1.1.1", + "@types/yargs": "^15.0.0", + "chalk": "^3.0.0" } }, - "jest-message-util": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-24.9.0.tgz", - "integrity": "sha512-oCj8FiZ3U0hTP4aSui87P4L4jC37BtQwUMqk+zk/b11FR19BJDeZsZAvIHutWnmtw7r85UmR3CEWZ0HWU2mAlw==", + "@types/babel__core": { + "version": "7.1.7", + "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.7.tgz", + "integrity": "sha512-RL62NqSFPCDK2FM1pSDH0scHpJvsXtZNiYlMB73DgPBaG1E38ZYVL+ei5EkWRbr+KC4YNiAUNBnRj+bgwpgjMw==", "dev": true, "requires": { - "@babel/code-frame": "^7.0.0", - "@jest/test-result": "^24.9.0", - "@jest/types": "^24.9.0", - "@types/stack-utils": "^1.0.1", - "chalk": "^2.0.1", - "micromatch": "^3.1.10", - "slash": "^2.0.0", - "stack-utils": "^1.0.1" + "@babel/parser": "^7.1.0", + "@babel/types": "^7.0.0", + "@types/babel__generator": "*", + "@types/babel__template": "*", + "@types/babel__traverse": "*" } }, - "jest-mock": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-24.9.0.tgz", - "integrity": "sha512-3BEYN5WbSq9wd+SyLDES7AHnjH9A/ROBwmz7l2y+ol+NtSFO8DYiEBzoO1CeFc9a8DYy10EO4dDFVv/wN3zl1w==", + "acorn": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.1.tgz", + "integrity": "sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==", + "dev": true + }, + "acorn-globals": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.4.tgz", + "integrity": "sha512-clfQEh21R+D0leSbUdWf3OcfqyaCSAQ8Ryq00bofSekfr9W8u1jyYZo6ir0xu9Gtcf7BjcHJpnbZH7JOCpP60A==", "dev": true, "requires": { - "@jest/types": "^24.9.0" + "acorn": "^6.0.1", + "acorn-walk": "^6.0.1" + }, + "dependencies": { + "acorn": { + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz", + "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==", + "dev": true + } } }, - "jest-resolve": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-24.9.0.tgz", - "integrity": "sha512-TaLeLVL1l08YFZAt3zaPtjiVvyy4oSA6CRe+0AFPPVX3Q/VI0giIWWoAvoS5L96vj9Dqxj4fB5p2qrHCmTU/MQ==", + "ansi-escapes": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz", + "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==", "dev": true, "requires": { - "@jest/types": "^24.9.0", - "browser-resolve": "^1.11.3", - "chalk": "^2.0.1", - "jest-pnp-resolver": "^1.2.1", - "realpath-native": "^1.1.0" + "type-fest": "^0.11.0" } }, - "jest-runner": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-24.9.0.tgz", - "integrity": "sha512-KksJQyI3/0mhcfspnxxEOBueGrd5E4vV7ADQLT9ESaCzz02WnbdbKWIf5Mkaucoaj7obQckYPVX6JJhgUcoWWg==", + "ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "dev": true + }, + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", "dev": true, "requires": { - "@jest/console": "^24.7.1", - "@jest/environment": "^24.9.0", - "@jest/test-result": "^24.9.0", - "@jest/types": "^24.9.0", - "chalk": "^2.4.2", - "exit": "^0.1.2", - "graceful-fs": "^4.1.15", - "jest-config": "^24.9.0", - "jest-docblock": "^24.3.0", - "jest-haste-map": "^24.9.0", - "jest-jasmine2": "^24.9.0", - "jest-leak-detector": "^24.9.0", - "jest-message-util": "^24.9.0", - "jest-resolve": "^24.9.0", - "jest-runtime": "^24.9.0", - "jest-util": "^24.9.0", - "jest-worker": "^24.6.0", - "source-map-support": "^0.5.6", - "throat": "^4.0.0" - }, - "dependencies": { - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" } }, - "jest-runtime": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-24.9.0.tgz", - "integrity": "sha512-8oNqgnmF3v2J6PVRM2Jfuj8oX3syKmaynlDMMKQ4iyzbQzIG6th5ub/lM2bCMTmoTKM3ykcUYI2Pw9xwNtjMnw==", + "anymatch": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz", + "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==", "dev": true, "requires": { - "@jest/console": "^24.7.1", - "@jest/environment": "^24.9.0", - "@jest/source-map": "^24.3.0", - "@jest/transform": "^24.9.0", - "@jest/types": "^24.9.0", - "@types/yargs": "^13.0.0", - "chalk": "^2.0.1", - "exit": "^0.1.2", - "glob": "^7.1.3", - "graceful-fs": "^4.1.15", - "jest-config": "^24.9.0", - "jest-haste-map": "^24.9.0", - "jest-message-util": "^24.9.0", - "jest-mock": "^24.9.0", - "jest-regex-util": "^24.3.0", - "jest-resolve": "^24.9.0", - "jest-snapshot": "^24.9.0", - "jest-util": "^24.9.0", - "jest-validate": "^24.9.0", - "realpath-native": "^1.1.0", - "slash": "^2.0.0", - "strip-bom": "^3.0.0", - "yargs": "^13.3.0" + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" } }, - "jest-serializer": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-24.9.0.tgz", - "integrity": "sha512-DxYipDr8OvfrKH3Kel6NdED3OXxjvxXZ1uIY2I9OFbGg+vUkkg7AGvi65qbhbWNPvDckXmzMPbK3u3HaDO49bQ==", - "dev": true - }, - "jest-snapshot": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-24.9.0.tgz", - "integrity": "sha512-uI/rszGSs73xCM0l+up7O7a40o90cnrk429LOiK3aeTvfC0HHmldbd81/B7Ix81KSFe1lwkbl7GnBGG4UfuDew==", + "babel-jest": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-25.4.0.tgz", + "integrity": "sha512-p+epx4K0ypmHuCnd8BapfyOwWwosNCYhedetQey1awddtfmEX0MmdxctGl956uwUmjwXR5VSS5xJcGX9DvdIog==", "dev": true, "requires": { - "@babel/types": "^7.0.0", - "@jest/types": "^24.9.0", - "chalk": "^2.0.1", - "expect": "^24.9.0", - "jest-diff": "^24.9.0", - "jest-get-type": "^24.9.0", - "jest-matcher-utils": "^24.9.0", - "jest-message-util": "^24.9.0", - "jest-resolve": "^24.9.0", - "mkdirp": "^0.5.1", - "natural-compare": "^1.4.0", - "pretty-format": "^24.9.0", - "semver": "^6.2.0" + "@jest/transform": "^25.4.0", + "@jest/types": "^25.4.0", + "@types/babel__core": "^7.1.7", + "babel-plugin-istanbul": "^6.0.0", + "babel-preset-jest": "^25.4.0", + "chalk": "^3.0.0", + "slash": "^3.0.0" } }, - "jest-util": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-24.9.0.tgz", - "integrity": "sha512-x+cZU8VRmOJxbA1K5oDBdxQmdq0OIdADarLxk0Mq+3XS4jgvhG/oKGWcIDCtPG0HgjxOYvF+ilPJQsAyXfbNOg==", + "babel-plugin-istanbul": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz", + "integrity": "sha512-AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ==", "dev": true, "requires": { - "@jest/console": "^24.9.0", - "@jest/fake-timers": "^24.9.0", - "@jest/source-map": "^24.9.0", - "@jest/test-result": "^24.9.0", - "@jest/types": "^24.9.0", - "callsites": "^3.0.0", - "chalk": "^2.0.1", - "graceful-fs": "^4.1.15", - "is-ci": "^2.0.0", - "mkdirp": "^0.5.1", - "slash": "^2.0.0", - "source-map": "^0.6.0" - }, - "dependencies": { - "@jest/console": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/console/-/console-24.9.0.tgz", - "integrity": "sha512-Zuj6b8TnKXi3q4ymac8EQfc3ea/uhLeCGThFqXeC8H9/raaH8ARPUTdId+XyGd03Z4In0/VjD2OYFcBF09fNLQ==", - "dev": true, - "requires": { - "@jest/source-map": "^24.9.0", - "chalk": "^2.0.1", - "slash": "^2.0.0" - } - } + "@babel/helper-plugin-utils": "^7.0.0", + "@istanbuljs/load-nyc-config": "^1.0.0", + "@istanbuljs/schema": "^0.1.2", + "istanbul-lib-instrument": "^4.0.0", + "test-exclude": "^6.0.0" } }, - "jest-validate": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-24.9.0.tgz", - "integrity": "sha512-HPIt6C5ACwiqSiwi+OfSSHbK8sG7akG8eATl+IPKaeIjtPOeBUd/g3J7DghugzxrGjI93qS/+RPKe1H6PqvhRQ==", + "babel-plugin-jest-hoist": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-25.4.0.tgz", + "integrity": "sha512-M3a10JCtTyKevb0MjuH6tU+cP/NVQZ82QPADqI1RQYY1OphztsCeIeQmTsHmF/NS6m0E51Zl4QNsI3odXSQF5w==", "dev": true, "requires": { - "@jest/types": "^24.9.0", - "camelcase": "^5.3.1", - "chalk": "^2.0.1", - "jest-get-type": "^24.9.0", - "leven": "^3.1.0", - "pretty-format": "^24.9.0" + "@types/babel__traverse": "^7.0.6" } }, - "jest-worker": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.9.0.tgz", - "integrity": "sha512-51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw==", + "babel-preset-jest": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-25.4.0.tgz", + "integrity": "sha512-PwFiEWflHdu3JCeTr0Pb9NcHHE34qWFnPQRVPvqQITx4CsDCzs6o05923I10XvLvn9nNsRHuiVgB72wG/90ZHQ==", "dev": true, "requires": { - "merge-stream": "^2.0.0", - "supports-color": "^6.1.0" + "babel-plugin-jest-hoist": "^25.4.0", + "babel-preset-current-node-syntax": "^0.1.2" } }, - "leven": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz", - "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==", - "dev": true - }, - "merge-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", - "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", - "dev": true - }, - "pretty-format": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz", - "integrity": "sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==", + "braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", "dev": true, "requires": { - "@jest/types": "^24.9.0", - "ansi-regex": "^4.0.0", - "ansi-styles": "^3.2.0", - "react-is": "^16.8.4" + "fill-range": "^7.0.1" } }, - "require-main-filename": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", - "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", - "dev": true - }, - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "callsites": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", "dev": true }, - "string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "chalk": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", "dev": true, "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" } }, - "supports-color": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", - "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "cliui": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", + "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==", "dev": true, "requires": { - "has-flag": "^3.0.0" + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^6.2.0" } }, - "wrap-ansi": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", - "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, "requires": { - "ansi-styles": "^3.2.0", - "string-width": "^3.0.0", - "strip-ansi": "^5.0.0" + "color-name": "~1.1.4" } }, - "yargs": { - "version": "13.3.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz", - "integrity": "sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==", + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "cssom": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz", + "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==", + "dev": true + }, + "cssstyle": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.2.0.tgz", + "integrity": "sha512-sEb3XFPx3jNnCAMtqrXPDeSgQr+jojtCeNf8cvMNMh1cG970+lljssvQDzPq6lmmJu2Vhqood/gtEomBiHOGnA==", "dev": true, "requires": { - "cliui": "^5.0.0", - "find-up": "^3.0.0", - "get-caller-file": "^2.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", - "set-blocking": "^2.0.0", - "string-width": "^3.0.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^13.1.1" + "cssom": "~0.3.6" + }, + "dependencies": { + "cssom": { + "version": "0.3.8", + "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz", + "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==", + "dev": true + } } }, - "yargs-parser": { - "version": "13.1.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz", - "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==", + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", "dev": true, "requires": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" + "ms": "^2.1.1" } - } - } - }, - "@jest/environment": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-24.9.0.tgz", - "integrity": "sha512-5A1QluTPhvdIPFYnO3sZC3smkNeXPVELz7ikPbhUj0bQjB07EoE9qtLrem14ZUYWdVayYbsjVwIiL4WBIMV4aQ==", - "dev": true, - "requires": { - "@jest/fake-timers": "^24.9.0", - "@jest/transform": "^24.9.0", - "@jest/types": "^24.9.0", - "jest-mock": "^24.9.0" - }, - "dependencies": { - "@jest/types": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz", - "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==", + }, + "deepmerge": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz", + "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==", + "dev": true + }, + "detect-newline": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz", + "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==", + "dev": true + }, + "diff-sequences": { + "version": "25.2.6", + "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-25.2.6.tgz", + "integrity": "sha512-Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg==", + "dev": true + }, + "emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, + "expect": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/expect/-/expect-25.4.0.tgz", + "integrity": "sha512-7BDIX99BTi12/sNGJXA9KMRcby4iAmu1xccBOhyKCyEhjcVKS3hPmHdA/4nSI9QGIOkUropKqr3vv7WMDM5lvQ==", "dev": true, "requires": { - "@types/istanbul-lib-coverage": "^2.0.0", - "@types/istanbul-reports": "^1.1.1", - "@types/yargs": "^13.0.0" + "@jest/types": "^25.4.0", + "ansi-styles": "^4.0.0", + "jest-get-type": "^25.2.6", + "jest-matcher-utils": "^25.4.0", + "jest-message-util": "^25.4.0", + "jest-regex-util": "^25.2.6" } }, - "@types/yargs": { - "version": "13.0.2", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.2.tgz", - "integrity": "sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ==", + "fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", "dev": true, "requires": { - "@types/yargs-parser": "*" + "to-regex-range": "^5.0.1" } - } - } - }, - "@jest/fake-timers": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-24.9.0.tgz", - "integrity": "sha512-eWQcNa2YSwzXWIMC5KufBh3oWRIijrQFROsIqt6v/NS9Io/gknw1jsAC9c+ih/RQX4A3O7SeWAhQeN0goKhT9A==", - "dev": true, - "requires": { - "@jest/types": "^24.9.0", - "jest-message-util": "^24.9.0", - "jest-mock": "^24.9.0" - }, - "dependencies": { - "@jest/types": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz", - "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==", + }, + "find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", "dev": true, "requires": { - "@types/istanbul-lib-coverage": "^2.0.0", - "@types/istanbul-reports": "^1.1.1", - "@types/yargs": "^13.0.0" + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" } }, - "@types/yargs": { - "version": "13.0.2", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.2.tgz", - "integrity": "sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ==", + "fsevents": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.2.tgz", + "integrity": "sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==", "dev": true, - "requires": { - "@types/yargs-parser": "*" - } - } - } - }, - "@jest/reporters": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-24.9.0.tgz", - "integrity": "sha512-mu4X0yjaHrffOsWmVLzitKmmmWSQ3GGuefgNscUSWNiUNcEOSEQk9k3pERKEQVBb0Cnn88+UESIsZEMH3o88Gw==", - "dev": true, - "requires": { - "@jest/environment": "^24.9.0", - "@jest/test-result": "^24.9.0", - "@jest/transform": "^24.9.0", - "@jest/types": "^24.9.0", - "chalk": "^2.0.1", - "exit": "^0.1.2", - "glob": "^7.1.2", - "istanbul-lib-coverage": "^2.0.2", - "istanbul-lib-instrument": "^3.0.1", - "istanbul-lib-report": "^2.0.4", - "istanbul-lib-source-maps": "^3.0.1", - "istanbul-reports": "^2.2.6", - "jest-haste-map": "^24.9.0", - "jest-resolve": "^24.9.0", - "jest-runtime": "^24.9.0", - "jest-util": "^24.9.0", - "jest-worker": "^24.6.0", - "node-notifier": "^5.4.2", - "slash": "^2.0.0", - "source-map": "^0.6.0", - "string-length": "^2.0.0" - }, - "dependencies": { - "@jest/console": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/console/-/console-24.9.0.tgz", - "integrity": "sha512-Zuj6b8TnKXi3q4ymac8EQfc3ea/uhLeCGThFqXeC8H9/raaH8ARPUTdId+XyGd03Z4In0/VjD2OYFcBF09fNLQ==", - "dev": true, - "requires": { - "@jest/source-map": "^24.9.0", - "chalk": "^2.0.1", - "slash": "^2.0.0" - } - }, - "@jest/environment": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-24.9.0.tgz", - "integrity": "sha512-5A1QluTPhvdIPFYnO3sZC3smkNeXPVELz7ikPbhUj0bQjB07EoE9qtLrem14ZUYWdVayYbsjVwIiL4WBIMV4aQ==", - "dev": true, - "requires": { - "@jest/fake-timers": "^24.9.0", - "@jest/transform": "^24.9.0", - "@jest/types": "^24.9.0", - "jest-mock": "^24.9.0" - } - }, - "@jest/fake-timers": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-24.9.0.tgz", - "integrity": "sha512-eWQcNa2YSwzXWIMC5KufBh3oWRIijrQFROsIqt6v/NS9Io/gknw1jsAC9c+ih/RQX4A3O7SeWAhQeN0goKhT9A==", - "dev": true, - "requires": { - "@jest/types": "^24.9.0", - "jest-message-util": "^24.9.0", - "jest-mock": "^24.9.0" - } + "optional": true }, - "@jest/source-map": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-24.9.0.tgz", - "integrity": "sha512-/Xw7xGlsZb4MJzNDgB7PW5crou5JqWiBQaz6xyPd3ArOg2nfn/PunV8+olXbbEZzNl591o5rWKE9BRDaFAuIBg==", + "glob": { + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", + "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", "dev": true, "requires": { - "callsites": "^3.0.0", - "graceful-fs": "^4.1.15", - "source-map": "^0.6.0" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, - "@jest/test-result": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-24.9.0.tgz", - "integrity": "sha512-XEFrHbBonBJ8dGp2JmF8kP/nQI/ImPpygKHwQ/SY+es59Z3L5PI4Qb9TQQMAEeYsThG1xF0k6tmG0tIKATNiiA==", - "dev": true, - "requires": { - "@jest/console": "^24.9.0", - "@jest/types": "^24.9.0", - "@types/istanbul-lib-coverage": "^2.0.0" - } + "graceful-fs": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz", + "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==", + "dev": true }, - "@jest/test-sequencer": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-24.9.0.tgz", - "integrity": "sha512-6qqsU4o0kW1dvA95qfNog8v8gkRN9ph6Lz7r96IvZpHdNipP2cBcb07J1Z45mz/VIS01OHJ3pY8T5fUY38tg4A==", - "dev": true, - "requires": { - "@jest/test-result": "^24.9.0", - "jest-haste-map": "^24.9.0", - "jest-runner": "^24.9.0", - "jest-runtime": "^24.9.0" - } + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true }, - "@jest/transform": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-24.9.0.tgz", - "integrity": "sha512-TcQUmyNRxV94S0QpMOnZl0++6RMiqpbH/ZMccFB/amku6Uwvyb1cjYX7xkp5nGNkbX4QPH/FcB6q1HBTHynLmQ==", - "dev": true, - "requires": { - "@babel/core": "^7.1.0", - "@jest/types": "^24.9.0", - "babel-plugin-istanbul": "^5.1.0", - "chalk": "^2.0.1", - "convert-source-map": "^1.4.0", - "fast-json-stable-stringify": "^2.0.0", - "graceful-fs": "^4.1.15", - "jest-haste-map": "^24.9.0", - "jest-regex-util": "^24.9.0", - "jest-util": "^24.9.0", - "micromatch": "^3.1.10", - "pirates": "^4.0.1", - "realpath-native": "^1.1.0", - "slash": "^2.0.0", - "source-map": "^0.6.1", - "write-file-atomic": "2.4.1" - } + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true }, - "@jest/types": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz", - "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==", - "dev": true, - "requires": { - "@types/istanbul-lib-coverage": "^2.0.0", - "@types/istanbul-reports": "^1.1.1", - "@types/yargs": "^13.0.0" - } + "is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true }, - "@types/yargs": { - "version": "13.0.2", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.2.tgz", - "integrity": "sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ==", - "dev": true, - "requires": { - "@types/yargs-parser": "*" - } + "istanbul-lib-coverage": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz", + "integrity": "sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==", + "dev": true }, - "babel-jest": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-24.9.0.tgz", - "integrity": "sha512-ntuddfyiN+EhMw58PTNL1ph4C9rECiQXjI4nMMBKBaNjXvqLdkXpPRcMSr4iyBrJg/+wz9brFUD6RhOAT6r4Iw==", + "istanbul-lib-instrument": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.1.tgz", + "integrity": "sha512-imIchxnodll7pvQBYOqUu88EufLCU56LMeFPZZM/fJZ1irYcYdqroaV+ACK1Ila8ls09iEYArp+nqyC6lW1Vfg==", "dev": true, "requires": { - "@jest/transform": "^24.9.0", - "@jest/types": "^24.9.0", - "@types/babel__core": "^7.1.0", - "babel-plugin-istanbul": "^5.1.0", - "babel-preset-jest": "^24.9.0", - "chalk": "^2.4.2", - "slash": "^2.0.0" + "@babel/core": "^7.7.5", + "@babel/parser": "^7.7.5", + "@babel/template": "^7.7.4", + "@babel/traverse": "^7.7.4", + "@istanbuljs/schema": "^0.1.2", + "istanbul-lib-coverage": "^3.0.0", + "semver": "^6.3.0" }, "dependencies": { - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "@babel/code-frame": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", + "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", "dev": true, "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" + "@babel/highlight": "^7.8.3" } }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "@babel/core": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.0.tgz", + "integrity": "sha512-kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==", "dev": true, "requires": { - "has-flag": "^3.0.0" + "@babel/code-frame": "^7.8.3", + "@babel/generator": "^7.9.0", + "@babel/helper-module-transforms": "^7.9.0", + "@babel/helpers": "^7.9.0", + "@babel/parser": "^7.9.0", + "@babel/template": "^7.8.6", + "@babel/traverse": "^7.9.0", + "@babel/types": "^7.9.0", + "convert-source-map": "^1.7.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.1", + "json5": "^2.1.2", + "lodash": "^4.17.13", + "resolve": "^1.3.2", + "semver": "^5.4.1", + "source-map": "^0.5.0" + }, + "dependencies": { + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true + } + } + }, + "convert-source-map": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz", + "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.1" } + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true } } }, - "babel-plugin-jest-hoist": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-24.9.0.tgz", - "integrity": "sha512-2EMA2P8Vp7lG0RAzr4HXqtYwacfMErOuv1U3wrvxHX6rD1sV6xS3WXG3r8TRQ2r6w8OhvSdWt+z41hQNwNm3Xw==", - "dev": true, - "requires": { - "@types/babel__traverse": "^7.0.6" - } - }, - "babel-preset-jest": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-24.9.0.tgz", - "integrity": "sha512-izTUuhE4TMfTRPF92fFwD2QfdXaZW08qvWTFCI51V8rW5x00UuPgc3ajRoWofXOuxjfcOM5zzSYsQS3H8KGCAg==", - "dev": true, - "requires": { - "@babel/plugin-syntax-object-rest-spread": "^7.0.0", - "babel-plugin-jest-hoist": "^24.9.0" - } - }, - "callsites": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", - "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", - "dev": true - }, - "camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", - "dev": true - }, - "cliui": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", - "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", - "dev": true, - "requires": { - "string-width": "^3.1.0", - "strip-ansi": "^5.2.0", - "wrap-ansi": "^5.1.0" - } - }, - "diff-sequences": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-24.9.0.tgz", - "integrity": "sha512-Dj6Wk3tWyTE+Fo1rW8v0Xhwk80um6yFYKbuAxc9c3EZxIHFDYwbi34Uk42u1CdnIiVorvt4RmlSDjIPyzGC2ew==", - "dev": true - }, - "expect": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/expect/-/expect-24.9.0.tgz", - "integrity": "sha512-wvVAx8XIol3Z5m9zvZXiyZOQ+sRJqNTIm6sGjdWlaZIeupQGO3WbYI+15D/AmEwZywL6wtJkbAbJtzkOfBuR0Q==", - "dev": true, - "requires": { - "@jest/types": "^24.9.0", - "ansi-styles": "^3.2.0", - "jest-get-type": "^24.9.0", - "jest-matcher-utils": "^24.9.0", - "jest-message-util": "^24.9.0", - "jest-regex-util": "^24.9.0" - } - }, - "get-caller-file": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", - "dev": true - }, "jest-config": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-24.9.0.tgz", - "integrity": "sha512-RATtQJtVYQrp7fvWg6f5y3pEFj9I+H8sWw4aKxnDZ96mob5i5SD6ZEGWgMLXQ4LE8UurrjbdlLWdUeo+28QpfQ==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-25.4.0.tgz", + "integrity": "sha512-egT9aKYxMyMSQV1aqTgam0SkI5/I2P9qrKexN5r2uuM2+68ypnc+zPGmfUxK7p1UhE7dYH9SLBS7yb+TtmT1AA==", "dev": true, "requires": { "@babel/core": "^7.1.0", - "@jest/test-sequencer": "^24.9.0", - "@jest/types": "^24.9.0", - "babel-jest": "^24.9.0", - "chalk": "^2.0.1", + "@jest/test-sequencer": "^25.4.0", + "@jest/types": "^25.4.0", + "babel-jest": "^25.4.0", + "chalk": "^3.0.0", + "deepmerge": "^4.2.2", "glob": "^7.1.1", - "jest-environment-jsdom": "^24.9.0", - "jest-environment-node": "^24.9.0", - "jest-get-type": "^24.9.0", - "jest-jasmine2": "^24.9.0", - "jest-regex-util": "^24.3.0", - "jest-resolve": "^24.9.0", - "jest-util": "^24.9.0", - "jest-validate": "^24.9.0", - "micromatch": "^3.1.10", - "pretty-format": "^24.9.0", - "realpath-native": "^1.1.0" + "jest-environment-jsdom": "^25.4.0", + "jest-environment-node": "^25.4.0", + "jest-get-type": "^25.2.6", + "jest-jasmine2": "^25.4.0", + "jest-regex-util": "^25.2.6", + "jest-resolve": "^25.4.0", + "jest-util": "^25.4.0", + "jest-validate": "^25.4.0", + "micromatch": "^4.0.2", + "pretty-format": "^25.4.0", + "realpath-native": "^2.0.0" } }, "jest-diff": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-24.9.0.tgz", - "integrity": "sha512-qMfrTs8AdJE2iqrTp0hzh7kTd2PQWrsFyj9tORoKmu32xjPjeE4NyjVRDz8ybYwqS2ik8N4hsIpiVTyFeo2lBQ==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-25.4.0.tgz", + "integrity": "sha512-kklLbJVXW0y8UKOWOdYhI6TH5MG6QAxrWiBMgQaPIuhj3dNFGirKCd+/xfplBXICQ7fI+3QcqHm9p9lWu1N6ug==", "dev": true, "requires": { - "chalk": "^2.0.1", - "diff-sequences": "^24.9.0", - "jest-get-type": "^24.9.0", - "pretty-format": "^24.9.0" + "chalk": "^3.0.0", + "diff-sequences": "^25.2.6", + "jest-get-type": "^25.2.6", + "pretty-format": "^25.4.0" + } + }, + "jest-docblock": { + "version": "25.3.0", + "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-25.3.0.tgz", + "integrity": "sha512-aktF0kCar8+zxRHxQZwxMy70stc9R1mOmrLsT5VO3pIT0uzGRSDAXxSlz4NqQWpuLjPpuMhPRl7H+5FRsvIQAg==", + "dev": true, + "requires": { + "detect-newline": "^3.0.0" } }, "jest-each": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-24.9.0.tgz", - "integrity": "sha512-ONi0R4BvW45cw8s2Lrx8YgbeXL1oCQ/wIDwmsM3CqM/nlblNCPmnC3IPQlMbRFZu3wKdQ2U8BqM6lh3LJ5Bsog==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-25.4.0.tgz", + "integrity": "sha512-lwRIJ8/vQU/6vq3nnSSUw1Y3nz5tkYSFIywGCZpUBd6WcRgpn8NmJoQICojbpZmsJOJNHm0BKdyuJ6Xdx+eDQQ==", "dev": true, "requires": { - "@jest/types": "^24.9.0", - "chalk": "^2.0.1", - "jest-get-type": "^24.9.0", - "jest-util": "^24.9.0", - "pretty-format": "^24.9.0" + "@jest/types": "^25.4.0", + "chalk": "^3.0.0", + "jest-get-type": "^25.2.6", + "jest-util": "^25.4.0", + "pretty-format": "^25.4.0" } }, "jest-environment-jsdom": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-24.9.0.tgz", - "integrity": "sha512-Zv9FV9NBRzLuALXjvRijO2351DRQeLYXtpD4xNvfoVFw21IOKNhZAEUKcbiEtjTkm2GsJ3boMVgkaR7rN8qetA==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-25.4.0.tgz", + "integrity": "sha512-KTitVGMDrn2+pt7aZ8/yUTuS333w3pWt1Mf88vMntw7ZSBNDkRS6/4XLbFpWXYfWfp1FjcjQTOKzbK20oIehWQ==", "dev": true, "requires": { - "@jest/environment": "^24.9.0", - "@jest/fake-timers": "^24.9.0", - "@jest/types": "^24.9.0", - "jest-mock": "^24.9.0", - "jest-util": "^24.9.0", - "jsdom": "^11.5.1" + "@jest/environment": "^25.4.0", + "@jest/fake-timers": "^25.4.0", + "@jest/types": "^25.4.0", + "jest-mock": "^25.4.0", + "jest-util": "^25.4.0", + "jsdom": "^15.2.1" } }, "jest-environment-node": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-24.9.0.tgz", - "integrity": "sha512-6d4V2f4nxzIzwendo27Tr0aFm+IXWa0XEUnaH6nU0FMaozxovt+sfRvh4J47wL1OvF83I3SSTu0XK+i4Bqe7uA==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-25.4.0.tgz", + "integrity": "sha512-wryZ18vsxEAKFH7Z74zi/y/SyI1j6UkVZ6QsllBuT/bWlahNfQjLNwFsgh/5u7O957dYFoXj4yfma4n4X6kU9A==", "dev": true, "requires": { - "@jest/environment": "^24.9.0", - "@jest/fake-timers": "^24.9.0", - "@jest/types": "^24.9.0", - "jest-mock": "^24.9.0", - "jest-util": "^24.9.0" + "@jest/environment": "^25.4.0", + "@jest/fake-timers": "^25.4.0", + "@jest/types": "^25.4.0", + "jest-mock": "^25.4.0", + "jest-util": "^25.4.0", + "semver": "^6.3.0" } }, "jest-get-type": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-24.9.0.tgz", - "integrity": "sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q==", + "version": "25.2.6", + "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-25.2.6.tgz", + "integrity": "sha512-DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig==", "dev": true }, "jest-haste-map": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-24.9.0.tgz", - "integrity": "sha512-kfVFmsuWui2Sj1Rp1AJ4D9HqJwE4uwTlS/vO+eRUaMmd54BFpli2XhMQnPC2k4cHFVbB2Q2C+jtI1AGLgEnCjQ==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-25.4.0.tgz", + "integrity": "sha512-5EoCe1gXfGC7jmXbKzqxESrgRcaO3SzWXGCnvp9BcT0CFMyrB1Q6LIsjl9RmvmJGQgW297TCfrdgiy574Rl9HQ==", "dev": true, "requires": { - "@jest/types": "^24.9.0", - "anymatch": "^2.0.0", + "@jest/types": "^25.4.0", + "anymatch": "^3.0.3", "fb-watchman": "^2.0.0", - "fsevents": "^1.2.7", - "graceful-fs": "^4.1.15", - "invariant": "^2.2.4", - "jest-serializer": "^24.9.0", - "jest-util": "^24.9.0", - "jest-worker": "^24.9.0", - "micromatch": "^3.1.10", + "fsevents": "^2.1.2", + "graceful-fs": "^4.2.3", + "jest-serializer": "^25.2.6", + "jest-util": "^25.4.0", + "jest-worker": "^25.4.0", + "micromatch": "^4.0.2", "sane": "^4.0.3", - "walker": "^1.0.7" - }, - "dependencies": { - "jest-worker": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.9.0.tgz", - "integrity": "sha512-51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw==", - "dev": true, - "requires": { - "merge-stream": "^2.0.0", - "supports-color": "^6.1.0" - } - } + "walker": "^1.0.7", + "which": "^2.0.2" } }, "jest-jasmine2": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-24.9.0.tgz", - "integrity": "sha512-Cq7vkAgaYKp+PsX+2/JbTarrk0DmNhsEtqBXNwUHkdlbrTBLtMJINADf2mf5FkowNsq8evbPc07/qFO0AdKTzw==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-25.4.0.tgz", + "integrity": "sha512-QccxnozujVKYNEhMQ1vREiz859fPN/XklOzfQjm2j9IGytAkUbSwjFRBtQbHaNZ88cItMpw02JnHGsIdfdpwxQ==", "dev": true, "requires": { "@babel/traverse": "^7.1.0", - "@jest/environment": "^24.9.0", - "@jest/test-result": "^24.9.0", - "@jest/types": "^24.9.0", - "chalk": "^2.0.1", + "@jest/environment": "^25.4.0", + "@jest/source-map": "^25.2.6", + "@jest/test-result": "^25.4.0", + "@jest/types": "^25.4.0", + "chalk": "^3.0.0", "co": "^4.6.0", - "expect": "^24.9.0", + "expect": "^25.4.0", "is-generator-fn": "^2.0.0", - "jest-each": "^24.9.0", - "jest-matcher-utils": "^24.9.0", - "jest-message-util": "^24.9.0", - "jest-runtime": "^24.9.0", - "jest-snapshot": "^24.9.0", - "jest-util": "^24.9.0", - "pretty-format": "^24.9.0", - "throat": "^4.0.0" + "jest-each": "^25.4.0", + "jest-matcher-utils": "^25.4.0", + "jest-message-util": "^25.4.0", + "jest-runtime": "^25.4.0", + "jest-snapshot": "^25.4.0", + "jest-util": "^25.4.0", + "pretty-format": "^25.4.0", + "throat": "^5.0.0" } }, "jest-leak-detector": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-24.9.0.tgz", - "integrity": "sha512-tYkFIDsiKTGwb2FG1w8hX9V0aUb2ot8zY/2nFg087dUageonw1zrLMP4W6zsRO59dPkTSKie+D4rhMuP9nRmrA==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-25.4.0.tgz", + "integrity": "sha512-7Y6Bqfv2xWsB+7w44dvZuLs5SQ//fzhETgOGG7Gq3TTGFdYvAgXGwV8z159RFZ6fXiCPm/szQ90CyfVos9JIFQ==", "dev": true, "requires": { - "jest-get-type": "^24.9.0", - "pretty-format": "^24.9.0" + "jest-get-type": "^25.2.6", + "pretty-format": "^25.4.0" } }, "jest-matcher-utils": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-24.9.0.tgz", - "integrity": "sha512-OZz2IXsu6eaiMAwe67c1T+5tUAtQyQx27/EMEkbFAGiw52tB9em+uGbzpcgYVpA8wl0hlxKPZxrly4CXU/GjHA==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-25.4.0.tgz", + "integrity": "sha512-yPMdtj7YDgXhnGbc66bowk8AkQ0YwClbbwk3Kzhn5GVDrciiCr27U4NJRbrqXbTdtxjImONITg2LiRIw650k5A==", "dev": true, "requires": { - "chalk": "^2.0.1", - "jest-diff": "^24.9.0", - "jest-get-type": "^24.9.0", - "pretty-format": "^24.9.0" + "chalk": "^3.0.0", + "jest-diff": "^25.4.0", + "jest-get-type": "^25.2.6", + "pretty-format": "^25.4.0" } }, "jest-message-util": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-24.9.0.tgz", - "integrity": "sha512-oCj8FiZ3U0hTP4aSui87P4L4jC37BtQwUMqk+zk/b11FR19BJDeZsZAvIHutWnmtw7r85UmR3CEWZ0HWU2mAlw==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-25.4.0.tgz", + "integrity": "sha512-LYY9hRcVGgMeMwmdfh9tTjeux1OjZHMusq/E5f3tJN+dAoVVkJtq5ZUEPIcB7bpxDUt2zjUsrwg0EGgPQ+OhXQ==", "dev": true, "requires": { "@babel/code-frame": "^7.0.0", - "@jest/test-result": "^24.9.0", - "@jest/types": "^24.9.0", + "@jest/types": "^25.4.0", "@types/stack-utils": "^1.0.1", - "chalk": "^2.0.1", - "micromatch": "^3.1.10", - "slash": "^2.0.0", + "chalk": "^3.0.0", + "micromatch": "^4.0.2", + "slash": "^3.0.0", "stack-utils": "^1.0.1" } }, "jest-mock": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-24.9.0.tgz", - "integrity": "sha512-3BEYN5WbSq9wd+SyLDES7AHnjH9A/ROBwmz7l2y+ol+NtSFO8DYiEBzoO1CeFc9a8DYy10EO4dDFVv/wN3zl1w==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-25.4.0.tgz", + "integrity": "sha512-MdazSfcYAUjJjuVTTnusLPzE0pE4VXpOUzWdj8sbM+q6abUjm3bATVPXFqTXrxSieR8ocpvQ9v/QaQCftioQFg==", "dev": true, "requires": { - "@jest/types": "^24.9.0" + "@jest/types": "^25.4.0" } }, "jest-regex-util": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-24.9.0.tgz", - "integrity": "sha512-05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA==", + "version": "25.2.6", + "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-25.2.6.tgz", + "integrity": "sha512-KQqf7a0NrtCkYmZZzodPftn7fL1cq3GQAFVMn5Hg8uKx/fIenLEobNanUxb7abQ1sjADHBseG/2FGpsv/wr+Qw==", "dev": true }, "jest-resolve": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-24.9.0.tgz", - "integrity": "sha512-TaLeLVL1l08YFZAt3zaPtjiVvyy4oSA6CRe+0AFPPVX3Q/VI0giIWWoAvoS5L96vj9Dqxj4fB5p2qrHCmTU/MQ==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-25.4.0.tgz", + "integrity": "sha512-wOsKqVDFWUiv8BtLMCC6uAJ/pHZkfFgoBTgPtmYlsprAjkxrr2U++ZnB3l5ykBMd2O24lXvf30SMAjJIW6k2aA==", "dev": true, "requires": { - "@jest/types": "^24.9.0", + "@jest/types": "^25.4.0", "browser-resolve": "^1.11.3", - "chalk": "^2.0.1", + "chalk": "^3.0.0", "jest-pnp-resolver": "^1.2.1", - "realpath-native": "^1.1.0" - } - }, - "jest-runner": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-24.9.0.tgz", - "integrity": "sha512-KksJQyI3/0mhcfspnxxEOBueGrd5E4vV7ADQLT9ESaCzz02WnbdbKWIf5Mkaucoaj7obQckYPVX6JJhgUcoWWg==", - "dev": true, - "requires": { - "@jest/console": "^24.7.1", - "@jest/environment": "^24.9.0", - "@jest/test-result": "^24.9.0", - "@jest/types": "^24.9.0", - "chalk": "^2.4.2", - "exit": "^0.1.2", - "graceful-fs": "^4.1.15", - "jest-config": "^24.9.0", - "jest-docblock": "^24.3.0", - "jest-haste-map": "^24.9.0", - "jest-jasmine2": "^24.9.0", - "jest-leak-detector": "^24.9.0", - "jest-message-util": "^24.9.0", - "jest-resolve": "^24.9.0", - "jest-runtime": "^24.9.0", - "jest-util": "^24.9.0", - "jest-worker": "^24.6.0", - "source-map-support": "^0.5.6", - "throat": "^4.0.0" + "read-pkg-up": "^7.0.1", + "realpath-native": "^2.0.0", + "resolve": "^1.15.1", + "slash": "^3.0.0" }, "dependencies": { - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "resolve": { + "version": "1.16.1", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.16.1.tgz", + "integrity": "sha512-rmAglCSqWWMrrBv/XM6sW0NuRFiKViw/W4d9EbC4pt+49H8JwHy+mcGmALTEg504AUDcLTvb1T2q3E9AnmY+ig==", "dev": true, "requires": { - "has-flag": "^3.0.0" + "path-parse": "^1.0.6" } } } }, - "jest-runtime": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-24.9.0.tgz", - "integrity": "sha512-8oNqgnmF3v2J6PVRM2Jfuj8oX3syKmaynlDMMKQ4iyzbQzIG6th5ub/lM2bCMTmoTKM3ykcUYI2Pw9xwNtjMnw==", + "jest-runner": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-25.4.0.tgz", + "integrity": "sha512-wWQSbVgj2e/1chFdMRKZdvlmA6p1IPujhpLT7TKNtCSl1B0PGBGvJjCaiBal/twaU2yfk8VKezHWexM8IliBfA==", "dev": true, "requires": { - "@jest/console": "^24.7.1", - "@jest/environment": "^24.9.0", - "@jest/source-map": "^24.3.0", - "@jest/transform": "^24.9.0", - "@jest/types": "^24.9.0", - "@types/yargs": "^13.0.0", - "chalk": "^2.0.1", + "@jest/console": "^25.4.0", + "@jest/environment": "^25.4.0", + "@jest/test-result": "^25.4.0", + "@jest/types": "^25.4.0", + "chalk": "^3.0.0", + "exit": "^0.1.2", + "graceful-fs": "^4.2.3", + "jest-config": "^25.4.0", + "jest-docblock": "^25.3.0", + "jest-haste-map": "^25.4.0", + "jest-jasmine2": "^25.4.0", + "jest-leak-detector": "^25.4.0", + "jest-message-util": "^25.4.0", + "jest-resolve": "^25.4.0", + "jest-runtime": "^25.4.0", + "jest-util": "^25.4.0", + "jest-worker": "^25.4.0", + "source-map-support": "^0.5.6", + "throat": "^5.0.0" + } + }, + "jest-runtime": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-25.4.0.tgz", + "integrity": "sha512-lgNJlCDULtXu9FumnwCyWlOub8iytijwsPNa30BKrSNtgoT6NUMXOPrZvsH06U6v0wgD/Igwz13nKA2wEKU2VA==", + "dev": true, + "requires": { + "@jest/console": "^25.4.0", + "@jest/environment": "^25.4.0", + "@jest/source-map": "^25.2.6", + "@jest/test-result": "^25.4.0", + "@jest/transform": "^25.4.0", + "@jest/types": "^25.4.0", + "@types/yargs": "^15.0.0", + "chalk": "^3.0.0", + "collect-v8-coverage": "^1.0.0", "exit": "^0.1.2", "glob": "^7.1.3", - "graceful-fs": "^4.1.15", - "jest-config": "^24.9.0", - "jest-haste-map": "^24.9.0", - "jest-message-util": "^24.9.0", - "jest-mock": "^24.9.0", - "jest-regex-util": "^24.3.0", - "jest-resolve": "^24.9.0", - "jest-snapshot": "^24.9.0", - "jest-util": "^24.9.0", - "jest-validate": "^24.9.0", - "realpath-native": "^1.1.0", - "slash": "^2.0.0", - "strip-bom": "^3.0.0", - "yargs": "^13.3.0" + "graceful-fs": "^4.2.3", + "jest-config": "^25.4.0", + "jest-haste-map": "^25.4.0", + "jest-message-util": "^25.4.0", + "jest-mock": "^25.4.0", + "jest-regex-util": "^25.2.6", + "jest-resolve": "^25.4.0", + "jest-snapshot": "^25.4.0", + "jest-util": "^25.4.0", + "jest-validate": "^25.4.0", + "realpath-native": "^2.0.0", + "slash": "^3.0.0", + "strip-bom": "^4.0.0", + "yargs": "^15.3.1" } }, "jest-serializer": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-24.9.0.tgz", - "integrity": "sha512-DxYipDr8OvfrKH3Kel6NdED3OXxjvxXZ1uIY2I9OFbGg+vUkkg7AGvi65qbhbWNPvDckXmzMPbK3u3HaDO49bQ==", + "version": "25.2.6", + "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-25.2.6.tgz", + "integrity": "sha512-RMVCfZsezQS2Ww4kB5HJTMaMJ0asmC0BHlnobQC6yEtxiFKIxohFA4QSXSabKwSggaNkqxn6Z2VwdFCjhUWuiQ==", "dev": true }, "jest-snapshot": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-24.9.0.tgz", - "integrity": "sha512-uI/rszGSs73xCM0l+up7O7a40o90cnrk429LOiK3aeTvfC0HHmldbd81/B7Ix81KSFe1lwkbl7GnBGG4UfuDew==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-25.4.0.tgz", + "integrity": "sha512-J4CJ0X2SaGheYRZdLz9CRHn9jUknVmlks4UBeu270hPAvdsauFXOhx9SQP2JtRzhnR3cvro/9N9KP83/uvFfRg==", "dev": true, "requires": { "@babel/types": "^7.0.0", - "@jest/types": "^24.9.0", - "chalk": "^2.0.1", - "expect": "^24.9.0", - "jest-diff": "^24.9.0", - "jest-get-type": "^24.9.0", - "jest-matcher-utils": "^24.9.0", - "jest-message-util": "^24.9.0", - "jest-resolve": "^24.9.0", - "mkdirp": "^0.5.1", + "@jest/types": "^25.4.0", + "@types/prettier": "^1.19.0", + "chalk": "^3.0.0", + "expect": "^25.4.0", + "jest-diff": "^25.4.0", + "jest-get-type": "^25.2.6", + "jest-matcher-utils": "^25.4.0", + "jest-message-util": "^25.4.0", + "jest-resolve": "^25.4.0", + "make-dir": "^3.0.0", "natural-compare": "^1.4.0", - "pretty-format": "^24.9.0", - "semver": "^6.2.0" + "pretty-format": "^25.4.0", + "semver": "^6.3.0" } }, "jest-util": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-24.9.0.tgz", - "integrity": "sha512-x+cZU8VRmOJxbA1K5oDBdxQmdq0OIdADarLxk0Mq+3XS4jgvhG/oKGWcIDCtPG0HgjxOYvF+ilPJQsAyXfbNOg==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-25.4.0.tgz", + "integrity": "sha512-WSZD59sBtAUjLv1hMeKbNZXmMcrLRWcYqpO8Dz8b4CeCTZpfNQw2q9uwrYAD+BbJoLJlu4ezVPwtAmM/9/SlZA==", "dev": true, "requires": { - "@jest/console": "^24.9.0", - "@jest/fake-timers": "^24.9.0", - "@jest/source-map": "^24.9.0", - "@jest/test-result": "^24.9.0", - "@jest/types": "^24.9.0", - "callsites": "^3.0.0", - "chalk": "^2.0.1", - "graceful-fs": "^4.1.15", + "@jest/types": "^25.4.0", + "chalk": "^3.0.0", "is-ci": "^2.0.0", - "mkdirp": "^0.5.1", - "slash": "^2.0.0", - "source-map": "^0.6.0" + "make-dir": "^3.0.0" } }, "jest-validate": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-24.9.0.tgz", - "integrity": "sha512-HPIt6C5ACwiqSiwi+OfSSHbK8sG7akG8eATl+IPKaeIjtPOeBUd/g3J7DghugzxrGjI93qS/+RPKe1H6PqvhRQ==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-25.4.0.tgz", + "integrity": "sha512-hvjmes/EFVJSoeP1yOl8qR8mAtMR3ToBkZeXrD/ZS9VxRyWDqQ/E1C5ucMTeSmEOGLipvdlyipiGbHJ+R1MQ0g==", "dev": true, "requires": { - "@jest/types": "^24.9.0", + "@jest/types": "^25.4.0", "camelcase": "^5.3.1", - "chalk": "^2.0.1", - "jest-get-type": "^24.9.0", + "chalk": "^3.0.0", + "jest-get-type": "^25.2.6", "leven": "^3.1.0", - "pretty-format": "^24.9.0" + "pretty-format": "^25.4.0" } }, - "leven": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz", - "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==", - "dev": true + "jest-worker": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-25.4.0.tgz", + "integrity": "sha512-ghAs/1FtfYpMmYQ0AHqxV62XPvKdUDIBBApMZfly+E9JEmYh2K45G0R5dWxx986RN12pRCxsViwQVtGl+N4whw==", + "dev": true, + "requires": { + "merge-stream": "^2.0.0", + "supports-color": "^7.0.0" + } + }, + "jsdom": { + "version": "15.2.1", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-15.2.1.tgz", + "integrity": "sha512-fAl1W0/7T2G5vURSyxBzrJ1LSdQn6Tr5UX/xD4PXDx/PDgwygedfW6El/KIj3xJ7FU61TTYnc/l/B7P49Eqt6g==", + "dev": true, + "requires": { + "abab": "^2.0.0", + "acorn": "^7.1.0", + "acorn-globals": "^4.3.2", + "array-equal": "^1.0.0", + "cssom": "^0.4.1", + "cssstyle": "^2.0.0", + "data-urls": "^1.1.0", + "domexception": "^1.0.1", + "escodegen": "^1.11.1", + "html-encoding-sniffer": "^1.0.2", + "nwsapi": "^2.2.0", + "parse5": "5.1.0", + "pn": "^1.1.0", + "request": "^2.88.0", + "request-promise-native": "^1.0.7", + "saxes": "^3.1.9", + "symbol-tree": "^3.2.2", + "tough-cookie": "^3.0.1", + "w3c-hr-time": "^1.0.1", + "w3c-xmlserializer": "^1.1.2", + "webidl-conversions": "^4.0.2", + "whatwg-encoding": "^1.0.5", + "whatwg-mimetype": "^2.3.0", + "whatwg-url": "^7.0.0", + "ws": "^7.0.0", + "xml-name-validator": "^3.0.0" + } + }, + "json5": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz", + "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==", + "dev": true, + "requires": { + "minimist": "^1.2.5" + } + }, + "locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dev": true, + "requires": { + "p-locate": "^4.1.0" + } + }, + "make-dir": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.0.2.tgz", + "integrity": "sha512-rYKABKutXa6vXTXhoV18cBE7PaewPXHe/Bdq4v+ZLMhxbWApkFFplT0LcbMW+6BbjnQXzZ/sAvSE/JdguApG5w==", + "dev": true, + "requires": { + "semver": "^6.0.0" + } }, "merge-stream": { "version": "2.0.0", @@ -2059,92 +2350,313 @@ "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", "dev": true }, + "micromatch": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz", + "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==", + "dev": true, + "requires": { + "braces": "^3.0.1", + "picomatch": "^2.0.5" + } + }, + "minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", + "dev": true + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "dev": true + }, + "nwsapi": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz", + "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==", + "dev": true + }, + "p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dev": true, + "requires": { + "p-limit": "^2.2.0" + } + }, + "parse-json": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.0.0.tgz", + "integrity": "sha512-OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "error-ex": "^1.3.1", + "json-parse-better-errors": "^1.0.1", + "lines-and-columns": "^1.1.6" + } + }, + "parse5": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.0.tgz", + "integrity": "sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ==", + "dev": true + }, + "path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true + }, "pretty-format": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz", - "integrity": "sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.4.0.tgz", + "integrity": "sha512-PI/2dpGjXK5HyXexLPZU/jw5T9Q6S1YVXxxVxco+LIqzUFHXIbKZKdUVt7GcX7QUCr31+3fzhi4gN4/wUYPVxQ==", "dev": true, "requires": { - "@jest/types": "^24.9.0", - "ansi-regex": "^4.0.0", - "ansi-styles": "^3.2.0", - "react-is": "^16.8.4" + "@jest/types": "^25.4.0", + "ansi-regex": "^5.0.0", + "ansi-styles": "^4.0.0", + "react-is": "^16.12.0" + } + }, + "react-is": { + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", + "dev": true + }, + "read-pkg": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz", + "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==", + "dev": true, + "requires": { + "@types/normalize-package-data": "^2.4.0", + "normalize-package-data": "^2.5.0", + "parse-json": "^5.0.0", + "type-fest": "^0.6.0" + }, + "dependencies": { + "type-fest": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz", + "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==", + "dev": true + } + } + }, + "read-pkg-up": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz", + "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==", + "dev": true, + "requires": { + "find-up": "^4.1.0", + "read-pkg": "^5.2.0", + "type-fest": "^0.8.1" + }, + "dependencies": { + "type-fest": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", + "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", + "dev": true + } } }, + "realpath-native": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/realpath-native/-/realpath-native-2.0.0.tgz", + "integrity": "sha512-v1SEYUOXXdbBZK8ZuNgO4TBjamPsiSgcFr0aP+tEKpQZK8vooEUqV6nm6Cv502mX4NF2EfsnVqtNAHG+/6Ur1Q==", + "dev": true + }, "require-main-filename": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", "dev": true }, + "rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "dev": true, + "requires": { + "glob": "^7.1.3" + } + }, "semver": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", "dev": true }, + "slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true + }, "string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", + "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", "dev": true, "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" } }, "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", "dev": true, "requires": { - "ansi-regex": "^4.1.0" + "ansi-regex": "^5.0.0" } }, + "strip-bom": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz", + "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==", + "dev": true + }, "supports-color": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", - "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", "dev": true, "requires": { - "has-flag": "^3.0.0" + "has-flag": "^4.0.0" + } + }, + "test-exclude": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", + "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==", + "dev": true, + "requires": { + "@istanbuljs/schema": "^0.1.2", + "glob": "^7.1.4", + "minimatch": "^3.0.4" + } + }, + "throat": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/throat/-/throat-5.0.0.tgz", + "integrity": "sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA==", + "dev": true + }, + "to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "requires": { + "is-number": "^7.0.0" + } + }, + "tough-cookie": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz", + "integrity": "sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==", + "dev": true, + "requires": { + "ip-regex": "^2.1.0", + "psl": "^1.1.28", + "punycode": "^2.1.1" + } + }, + "type-fest": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz", + "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==", + "dev": true + }, + "whatwg-url": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz", + "integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==", + "dev": true, + "requires": { + "lodash.sortby": "^4.7.0", + "tr46": "^1.0.1", + "webidl-conversions": "^4.0.2" + } + }, + "which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, + "requires": { + "isexe": "^2.0.0" } }, "wrap-ansi": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", - "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", + "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", "dev": true, "requires": { - "ansi-styles": "^3.2.0", - "string-width": "^3.0.0", - "strip-ansi": "^5.0.0" + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + } + }, + "write-file-atomic": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz", + "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==", + "dev": true, + "requires": { + "imurmurhash": "^0.1.4", + "is-typedarray": "^1.0.0", + "signal-exit": "^3.0.2", + "typedarray-to-buffer": "^3.1.5" } }, + "ws": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.2.3.tgz", + "integrity": "sha512-HTDl9G9hbkNDk98naoR/cHDws7+EyYMOdL1BmjsZXRUjf7d+MficC4B7HLUPlSiho0vg+CWKrGIt/VJBd1xunQ==", + "dev": true + }, "yargs": { - "version": "13.3.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz", - "integrity": "sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==", + "version": "15.3.1", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.3.1.tgz", + "integrity": "sha512-92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA==", "dev": true, "requires": { - "cliui": "^5.0.0", - "find-up": "^3.0.0", + "cliui": "^6.0.0", + "decamelize": "^1.2.0", + "find-up": "^4.1.0", "get-caller-file": "^2.0.1", "require-directory": "^2.1.1", "require-main-filename": "^2.0.0", "set-blocking": "^2.0.0", - "string-width": "^3.0.0", + "string-width": "^4.2.0", "which-module": "^2.0.0", "y18n": "^4.0.0", - "yargs-parser": "^13.1.1" + "yargs-parser": "^18.1.1" } }, "yargs-parser": { - "version": "13.1.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz", - "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==", + "version": "18.1.3", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz", + "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==", "dev": true, "requires": { "camelcase": "^5.0.0", @@ -2153,58 +2665,18 @@ } } }, - "@jest/source-map": { - "version": "24.3.0", - "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-24.3.0.tgz", - "integrity": "sha512-zALZt1t2ou8le/crCeeiRYzvdnTzaIlpOWaet45lNSqNJUnXbppUUFR4ZUAlzgDmKee4Q5P/tKXypI1RiHwgag==", - "dev": true, - "requires": { - "callsites": "^3.0.0", - "graceful-fs": "^4.1.15", - "source-map": "^0.6.0" - }, - "dependencies": { - "callsites": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.0.0.tgz", - "integrity": "sha512-tWnkwu9YEq2uzlBDI4RcLn8jrFvF9AOi8PxDNU3hZZjJcjkcRAq3vCI+vZcg1SuxISDYe86k9VZFwAxDiJGoAw==", - "dev": true - } - } - }, - "@jest/test-result": { + "@jest/environment": { "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-24.9.0.tgz", - "integrity": "sha512-XEFrHbBonBJ8dGp2JmF8kP/nQI/ImPpygKHwQ/SY+es59Z3L5PI4Qb9TQQMAEeYsThG1xF0k6tmG0tIKATNiiA==", + "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-24.9.0.tgz", + "integrity": "sha512-5A1QluTPhvdIPFYnO3sZC3smkNeXPVELz7ikPbhUj0bQjB07EoE9qtLrem14ZUYWdVayYbsjVwIiL4WBIMV4aQ==", "dev": true, "requires": { - "@jest/console": "^24.9.0", + "@jest/fake-timers": "^24.9.0", + "@jest/transform": "^24.9.0", "@jest/types": "^24.9.0", - "@types/istanbul-lib-coverage": "^2.0.0" + "jest-mock": "^24.9.0" }, "dependencies": { - "@jest/console": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/console/-/console-24.9.0.tgz", - "integrity": "sha512-Zuj6b8TnKXi3q4ymac8EQfc3ea/uhLeCGThFqXeC8H9/raaH8ARPUTdId+XyGd03Z4In0/VjD2OYFcBF09fNLQ==", - "dev": true, - "requires": { - "@jest/source-map": "^24.9.0", - "chalk": "^2.0.1", - "slash": "^2.0.0" - } - }, - "@jest/source-map": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-24.9.0.tgz", - "integrity": "sha512-/Xw7xGlsZb4MJzNDgB7PW5crou5JqWiBQaz6xyPd3ArOg2nfn/PunV8+olXbbEZzNl591o5rWKE9BRDaFAuIBg==", - "dev": true, - "requires": { - "callsites": "^3.0.0", - "graceful-fs": "^4.1.15", - "source-map": "^0.6.0" - } - }, "@jest/types": { "version": "24.9.0", "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz", @@ -2224,49 +2696,18 @@ "requires": { "@types/yargs-parser": "*" } - }, - "callsites": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", - "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", - "dev": true } } }, - "@jest/test-sequencer": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-24.9.0.tgz", - "integrity": "sha512-6qqsU4o0kW1dvA95qfNog8v8gkRN9ph6Lz7r96IvZpHdNipP2cBcb07J1Z45mz/VIS01OHJ3pY8T5fUY38tg4A==", - "dev": true, - "requires": { - "@jest/test-result": "^24.9.0", - "jest-haste-map": "^24.9.0", - "jest-runner": "^24.9.0", - "jest-runtime": "^24.9.0" - } - }, - "@jest/transform": { + "@jest/fake-timers": { "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-24.9.0.tgz", - "integrity": "sha512-TcQUmyNRxV94S0QpMOnZl0++6RMiqpbH/ZMccFB/amku6Uwvyb1cjYX7xkp5nGNkbX4QPH/FcB6q1HBTHynLmQ==", + "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-24.9.0.tgz", + "integrity": "sha512-eWQcNa2YSwzXWIMC5KufBh3oWRIijrQFROsIqt6v/NS9Io/gknw1jsAC9c+ih/RQX4A3O7SeWAhQeN0goKhT9A==", "dev": true, "requires": { - "@babel/core": "^7.1.0", "@jest/types": "^24.9.0", - "babel-plugin-istanbul": "^5.1.0", - "chalk": "^2.0.1", - "convert-source-map": "^1.4.0", - "fast-json-stable-stringify": "^2.0.0", - "graceful-fs": "^4.1.15", - "jest-haste-map": "^24.9.0", - "jest-regex-util": "^24.9.0", - "jest-util": "^24.9.0", - "micromatch": "^3.1.10", - "pirates": "^4.0.1", - "realpath-native": "^1.1.0", - "slash": "^2.0.0", - "source-map": "^0.6.1", - "write-file-atomic": "2.4.1" + "jest-message-util": "^24.9.0", + "jest-mock": "^24.9.0" }, "dependencies": { "@jest/types": { @@ -2288,118 +2729,1045 @@ "requires": { "@types/yargs-parser": "*" } - }, - "jest-regex-util": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-24.9.0.tgz", - "integrity": "sha512-05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA==", - "dev": true } } }, - "@jest/types": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz", - "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==", - "requires": { - "@types/istanbul-lib-coverage": "^2.0.0", - "@types/istanbul-reports": "^1.1.1", - "@types/yargs": "^13.0.0" + "@jest/reporters": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-25.4.0.tgz", + "integrity": "sha512-bhx/buYbZgLZm4JWLcRJ/q9Gvmd3oUh7k2V7gA4ZYBx6J28pIuykIouclRdiAC6eGVX1uRZT+GK4CQJLd/PwPg==", + "dev": true, + "requires": { + "@bcoe/v8-coverage": "^0.2.3", + "@jest/console": "^25.4.0", + "@jest/test-result": "^25.4.0", + "@jest/transform": "^25.4.0", + "@jest/types": "^25.4.0", + "chalk": "^3.0.0", + "collect-v8-coverage": "^1.0.0", + "exit": "^0.1.2", + "glob": "^7.1.2", + "istanbul-lib-coverage": "^3.0.0", + "istanbul-lib-instrument": "^4.0.0", + "istanbul-lib-report": "^3.0.0", + "istanbul-lib-source-maps": "^4.0.0", + "istanbul-reports": "^3.0.2", + "jest-haste-map": "^25.4.0", + "jest-resolve": "^25.4.0", + "jest-util": "^25.4.0", + "jest-worker": "^25.4.0", + "node-notifier": "^6.0.0", + "slash": "^3.0.0", + "source-map": "^0.6.0", + "string-length": "^3.1.0", + "terminal-link": "^2.0.0", + "v8-to-istanbul": "^4.1.3" }, "dependencies": { - "@types/yargs": { - "version": "13.0.2", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.2.tgz", - "integrity": "sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ==", + "@babel/generator": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.5.tgz", + "integrity": "sha512-GbNIxVB3ZJe3tLeDm1HSn2AhuD/mVcyLDpgtLXa5tplmWrJdF/elxB56XNqCuD6szyNkDi6wuoKXln3QeBmCHQ==", + "dev": true, "requires": { - "@types/yargs-parser": "*" + "@babel/types": "^7.9.5", + "jsesc": "^2.5.1", + "lodash": "^4.17.13", + "source-map": "^0.5.0" + }, + "dependencies": { + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true + } } - } - } - }, - "@koa/cors": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/@koa/cors/-/cors-2.2.3.tgz", - "integrity": "sha512-tCVVXa39ETsit5kGBtEWWimjLn1sDaeu8+0phgb8kT3GmBDZOykkI3ZO8nMjV2p3MGkJI4K5P+bxR8Ztq0bwsA==", - "requires": { - "vary": "^1.1.2" - } - }, - "@lerna/add": { - "version": "3.20.0", - "resolved": "https://registry.npmjs.org/@lerna/add/-/add-3.20.0.tgz", - "integrity": "sha512-AnH1oRIEEg/VDa3SjYq4x1/UglEAvrZuV0WssHUMN81RTZgQk3we+Mv3qZNddrZ/fBcZu2IAdN/EQ3+ie2JxKQ==", - "dev": true, - "requires": { - "@evocateur/pacote": "^9.6.3", - "@lerna/bootstrap": "3.20.0", - "@lerna/command": "3.18.5", - "@lerna/filter-options": "3.20.0", - "@lerna/npm-conf": "3.16.0", - "@lerna/validation-error": "3.13.0", - "dedent": "^0.7.0", - "npm-package-arg": "^6.1.0", - "p-map": "^2.1.0", - "semver": "^6.2.0" - }, - "dependencies": { - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - } - } - }, - "@lerna/bootstrap": { - "version": "3.20.0", - "resolved": "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-3.20.0.tgz", - "integrity": "sha512-Wylullx3uthKE7r4izo09qeRGL20Y5yONlQEjPCfnbxCC2Elu+QcPu4RC6kqKQ7b+g7pdC3OOgcHZjngrwr5XQ==", - "dev": true, - "requires": { - "@lerna/command": "3.18.5", - "@lerna/filter-options": "3.20.0", - "@lerna/has-npm-version": "3.16.5", - "@lerna/npm-install": "3.16.5", - "@lerna/package-graph": "3.18.5", - "@lerna/pulse-till-done": "3.13.0", - "@lerna/rimraf-dir": "3.16.5", - "@lerna/run-lifecycle": "3.16.2", - "@lerna/run-topologically": "3.18.5", - "@lerna/symlink-binary": "3.17.0", - "@lerna/symlink-dependencies": "3.17.0", - "@lerna/validation-error": "3.13.0", - "dedent": "^0.7.0", - "get-port": "^4.2.0", - "multimatch": "^3.0.0", - "npm-package-arg": "^6.1.0", - "npmlog": "^4.1.2", - "p-finally": "^1.0.0", - "p-map": "^2.1.0", - "p-map-series": "^1.0.0", - "p-waterfall": "^1.0.0", - "read-package-tree": "^5.1.6", - "semver": "^6.2.0" - }, - "dependencies": { - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + }, + "@babel/helper-function-name": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz", + "integrity": "sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==", + "dev": true, + "requires": { + "@babel/helper-get-function-arity": "^7.8.3", + "@babel/template": "^7.8.3", + "@babel/types": "^7.9.5" + } + }, + "@babel/helper-get-function-arity": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz", + "integrity": "sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==", + "dev": true, + "requires": { + "@babel/types": "^7.8.3" + } + }, + "@babel/helper-split-export-declaration": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz", + "integrity": "sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==", + "dev": true, + "requires": { + "@babel/types": "^7.8.3" + } + }, + "@babel/helpers": { + "version": "7.9.2", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.2.tgz", + "integrity": "sha512-JwLvzlXVPjO8eU9c/wF9/zOIN7X6h8DYf7mG4CiFRZRvZNKEF5dQ3H3V+ASkHoIB3mWhatgl5ONhyqHRI6MppA==", + "dev": true, + "requires": { + "@babel/template": "^7.8.3", + "@babel/traverse": "^7.9.0", + "@babel/types": "^7.9.0" + } + }, + "@babel/highlight": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz", + "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.9.0", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "^1.9.0" + } + }, + "chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, + "requires": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + } + }, + "color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "dev": true, + "requires": { + "color-name": "1.1.3" + } + }, + "color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", + "dev": true + }, + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "dev": true + }, + "supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, + "@babel/parser": { + "version": "7.9.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz", + "integrity": "sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==", "dev": true - } - } - }, - "@lerna/changed": { - "version": "3.20.0", - "resolved": "https://registry.npmjs.org/@lerna/changed/-/changed-3.20.0.tgz", - "integrity": "sha512-+hzMFSldbRPulZ0vbKk6RD9f36gaH3Osjx34wrrZ62VB4pKmjyuS/rxVYkCA3viPLHoiIw2F8zHM5BdYoDSbjw==", - "dev": true, - "requires": { - "@lerna/collect-updates": "3.20.0", - "@lerna/command": "3.18.5", - "@lerna/listable": "3.18.5", - "@lerna/output": "3.13.0" + }, + "@babel/template": { + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz", + "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.8.3", + "@babel/parser": "^7.8.6", + "@babel/types": "^7.8.6" + }, + "dependencies": { + "@babel/code-frame": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", + "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", + "dev": true, + "requires": { + "@babel/highlight": "^7.8.3" + } + } + } + }, + "@babel/traverse": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.5.tgz", + "integrity": "sha512-c4gH3jsvSuGUezlP6rzSJ6jf8fYjLj3hsMZRx/nX0h+fmHN0w+ekubRrHPqnMec0meycA2nwCsJ7dC8IPem2FQ==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.8.3", + "@babel/generator": "^7.9.5", + "@babel/helper-function-name": "^7.9.5", + "@babel/helper-split-export-declaration": "^7.8.3", + "@babel/parser": "^7.9.0", + "@babel/types": "^7.9.5", + "debug": "^4.1.0", + "globals": "^11.1.0", + "lodash": "^4.17.13" + }, + "dependencies": { + "@babel/code-frame": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", + "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", + "dev": true, + "requires": { + "@babel/highlight": "^7.8.3" + } + } + } + }, + "@babel/types": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.5.tgz", + "integrity": "sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.9.5", + "lodash": "^4.17.13", + "to-fast-properties": "^2.0.0" + } + }, + "@jest/console": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/@jest/console/-/console-25.4.0.tgz", + "integrity": "sha512-CfE0erx4hdJ6t7RzAcE1wLG6ZzsHSmybvIBQDoCkDM1QaSeWL9wJMzID/2BbHHa7ll9SsbbK43HjbERbBaFX2A==", + "dev": true, + "requires": { + "@jest/types": "^25.4.0", + "chalk": "^3.0.0", + "jest-message-util": "^25.4.0", + "jest-util": "^25.4.0", + "slash": "^3.0.0" + } + }, + "@jest/test-result": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-25.4.0.tgz", + "integrity": "sha512-8BAKPaMCHlL941eyfqhWbmp3MebtzywlxzV+qtngQ3FH+RBqnoSAhNEPj4MG7d2NVUrMOVfrwuzGpVIK+QnMAA==", + "dev": true, + "requires": { + "@jest/console": "^25.4.0", + "@jest/types": "^25.4.0", + "@types/istanbul-lib-coverage": "^2.0.0", + "collect-v8-coverage": "^1.0.0" + } + }, + "@jest/transform": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-25.4.0.tgz", + "integrity": "sha512-t1w2S6V1sk++1HHsxboWxPEuSpN8pxEvNrZN+Ud/knkROWtf8LeUmz73A4ezE8476a5AM00IZr9a8FO9x1+j3g==", + "dev": true, + "requires": { + "@babel/core": "^7.1.0", + "@jest/types": "^25.4.0", + "babel-plugin-istanbul": "^6.0.0", + "chalk": "^3.0.0", + "convert-source-map": "^1.4.0", + "fast-json-stable-stringify": "^2.0.0", + "graceful-fs": "^4.2.3", + "jest-haste-map": "^25.4.0", + "jest-regex-util": "^25.2.6", + "jest-util": "^25.4.0", + "micromatch": "^4.0.2", + "pirates": "^4.0.1", + "realpath-native": "^2.0.0", + "slash": "^3.0.0", + "source-map": "^0.6.1", + "write-file-atomic": "^3.0.0" + } + }, + "@jest/types": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.4.0.tgz", + "integrity": "sha512-XBeaWNzw2PPnGW5aXvZt3+VO60M+34RY3XDsCK5tW7kyj3RK0XClRutCfjqcBuaR2aBQTbluEDME9b5MB9UAPw==", + "dev": true, + "requires": { + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^1.1.1", + "@types/yargs": "^15.0.0", + "chalk": "^3.0.0" + } + }, + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "dev": true, + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "anymatch": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz", + "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==", + "dev": true, + "requires": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + } + }, + "babel-plugin-istanbul": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz", + "integrity": "sha512-AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.0.0", + "@istanbuljs/load-nyc-config": "^1.0.0", + "@istanbuljs/schema": "^0.1.2", + "istanbul-lib-instrument": "^4.0.0", + "test-exclude": "^6.0.0" + } + }, + "braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "dev": true, + "requires": { + "fill-range": "^7.0.1" + } + }, + "chalk": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + }, + "fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "dev": true, + "requires": { + "to-regex-range": "^5.0.1" + } + }, + "find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dev": true, + "requires": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + } + }, + "fsevents": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.2.tgz", + "integrity": "sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==", + "dev": true, + "optional": true + }, + "graceful-fs": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz", + "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true + }, + "istanbul-lib-coverage": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz", + "integrity": "sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==", + "dev": true + }, + "istanbul-lib-instrument": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.1.tgz", + "integrity": "sha512-imIchxnodll7pvQBYOqUu88EufLCU56LMeFPZZM/fJZ1irYcYdqroaV+ACK1Ila8ls09iEYArp+nqyC6lW1Vfg==", + "dev": true, + "requires": { + "@babel/core": "^7.7.5", + "@babel/parser": "^7.7.5", + "@babel/template": "^7.7.4", + "@babel/traverse": "^7.7.4", + "@istanbuljs/schema": "^0.1.2", + "istanbul-lib-coverage": "^3.0.0", + "semver": "^6.3.0" + }, + "dependencies": { + "@babel/code-frame": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", + "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", + "dev": true, + "requires": { + "@babel/highlight": "^7.8.3" + } + }, + "@babel/core": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.0.tgz", + "integrity": "sha512-kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.8.3", + "@babel/generator": "^7.9.0", + "@babel/helper-module-transforms": "^7.9.0", + "@babel/helpers": "^7.9.0", + "@babel/parser": "^7.9.0", + "@babel/template": "^7.8.6", + "@babel/traverse": "^7.9.0", + "@babel/types": "^7.9.0", + "convert-source-map": "^1.7.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.1", + "json5": "^2.1.2", + "lodash": "^4.17.13", + "resolve": "^1.3.2", + "semver": "^5.4.1", + "source-map": "^0.5.0" + }, + "dependencies": { + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true + } + } + }, + "convert-source-map": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz", + "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.1" + } + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true + } + } + }, + "jest-haste-map": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-25.4.0.tgz", + "integrity": "sha512-5EoCe1gXfGC7jmXbKzqxESrgRcaO3SzWXGCnvp9BcT0CFMyrB1Q6LIsjl9RmvmJGQgW297TCfrdgiy574Rl9HQ==", + "dev": true, + "requires": { + "@jest/types": "^25.4.0", + "anymatch": "^3.0.3", + "fb-watchman": "^2.0.0", + "fsevents": "^2.1.2", + "graceful-fs": "^4.2.3", + "jest-serializer": "^25.2.6", + "jest-util": "^25.4.0", + "jest-worker": "^25.4.0", + "micromatch": "^4.0.2", + "sane": "^4.0.3", + "walker": "^1.0.7", + "which": "^2.0.2" + } + }, + "jest-message-util": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-25.4.0.tgz", + "integrity": "sha512-LYY9hRcVGgMeMwmdfh9tTjeux1OjZHMusq/E5f3tJN+dAoVVkJtq5ZUEPIcB7bpxDUt2zjUsrwg0EGgPQ+OhXQ==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "@jest/types": "^25.4.0", + "@types/stack-utils": "^1.0.1", + "chalk": "^3.0.0", + "micromatch": "^4.0.2", + "slash": "^3.0.0", + "stack-utils": "^1.0.1" + } + }, + "jest-regex-util": { + "version": "25.2.6", + "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-25.2.6.tgz", + "integrity": "sha512-KQqf7a0NrtCkYmZZzodPftn7fL1cq3GQAFVMn5Hg8uKx/fIenLEobNanUxb7abQ1sjADHBseG/2FGpsv/wr+Qw==", + "dev": true + }, + "jest-resolve": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-25.4.0.tgz", + "integrity": "sha512-wOsKqVDFWUiv8BtLMCC6uAJ/pHZkfFgoBTgPtmYlsprAjkxrr2U++ZnB3l5ykBMd2O24lXvf30SMAjJIW6k2aA==", + "dev": true, + "requires": { + "@jest/types": "^25.4.0", + "browser-resolve": "^1.11.3", + "chalk": "^3.0.0", + "jest-pnp-resolver": "^1.2.1", + "read-pkg-up": "^7.0.1", + "realpath-native": "^2.0.0", + "resolve": "^1.15.1", + "slash": "^3.0.0" + }, + "dependencies": { + "resolve": { + "version": "1.16.1", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.16.1.tgz", + "integrity": "sha512-rmAglCSqWWMrrBv/XM6sW0NuRFiKViw/W4d9EbC4pt+49H8JwHy+mcGmALTEg504AUDcLTvb1T2q3E9AnmY+ig==", + "dev": true, + "requires": { + "path-parse": "^1.0.6" + } + } + } + }, + "jest-serializer": { + "version": "25.2.6", + "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-25.2.6.tgz", + "integrity": "sha512-RMVCfZsezQS2Ww4kB5HJTMaMJ0asmC0BHlnobQC6yEtxiFKIxohFA4QSXSabKwSggaNkqxn6Z2VwdFCjhUWuiQ==", + "dev": true + }, + "jest-util": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-25.4.0.tgz", + "integrity": "sha512-WSZD59sBtAUjLv1hMeKbNZXmMcrLRWcYqpO8Dz8b4CeCTZpfNQw2q9uwrYAD+BbJoLJlu4ezVPwtAmM/9/SlZA==", + "dev": true, + "requires": { + "@jest/types": "^25.4.0", + "chalk": "^3.0.0", + "is-ci": "^2.0.0", + "make-dir": "^3.0.0" + } + }, + "jest-worker": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-25.4.0.tgz", + "integrity": "sha512-ghAs/1FtfYpMmYQ0AHqxV62XPvKdUDIBBApMZfly+E9JEmYh2K45G0R5dWxx986RN12pRCxsViwQVtGl+N4whw==", + "dev": true, + "requires": { + "merge-stream": "^2.0.0", + "supports-color": "^7.0.0" + } + }, + "json5": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz", + "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==", + "dev": true, + "requires": { + "minimist": "^1.2.5" + } + }, + "locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dev": true, + "requires": { + "p-locate": "^4.1.0" + } + }, + "make-dir": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.0.2.tgz", + "integrity": "sha512-rYKABKutXa6vXTXhoV18cBE7PaewPXHe/Bdq4v+ZLMhxbWApkFFplT0LcbMW+6BbjnQXzZ/sAvSE/JdguApG5w==", + "dev": true, + "requires": { + "semver": "^6.0.0" + } + }, + "merge-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", + "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", + "dev": true + }, + "micromatch": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz", + "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==", + "dev": true, + "requires": { + "braces": "^3.0.1", + "picomatch": "^2.0.5" + } + }, + "minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", + "dev": true + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "dev": true + }, + "p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dev": true, + "requires": { + "p-limit": "^2.2.0" + } + }, + "parse-json": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.0.0.tgz", + "integrity": "sha512-OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "error-ex": "^1.3.1", + "json-parse-better-errors": "^1.0.1", + "lines-and-columns": "^1.1.6" + } + }, + "path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true + }, + "read-pkg": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz", + "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==", + "dev": true, + "requires": { + "@types/normalize-package-data": "^2.4.0", + "normalize-package-data": "^2.5.0", + "parse-json": "^5.0.0", + "type-fest": "^0.6.0" + }, + "dependencies": { + "type-fest": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz", + "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==", + "dev": true + } + } + }, + "read-pkg-up": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz", + "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==", + "dev": true, + "requires": { + "find-up": "^4.1.0", + "read-pkg": "^5.2.0", + "type-fest": "^0.8.1" + } + }, + "realpath-native": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/realpath-native/-/realpath-native-2.0.0.tgz", + "integrity": "sha512-v1SEYUOXXdbBZK8ZuNgO4TBjamPsiSgcFr0aP+tEKpQZK8vooEUqV6nm6Cv502mX4NF2EfsnVqtNAHG+/6Ur1Q==", + "dev": true + }, + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true + }, + "slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true + }, + "supports-color": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + }, + "test-exclude": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", + "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==", + "dev": true, + "requires": { + "@istanbuljs/schema": "^0.1.2", + "glob": "^7.1.4", + "minimatch": "^3.0.4" + }, + "dependencies": { + "glob": { + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", + "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", + "dev": true, + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + } + } + }, + "to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "requires": { + "is-number": "^7.0.0" + } + }, + "type-fest": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", + "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", + "dev": true + }, + "which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, + "requires": { + "isexe": "^2.0.0" + } + }, + "write-file-atomic": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz", + "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==", + "dev": true, + "requires": { + "imurmurhash": "^0.1.4", + "is-typedarray": "^1.0.0", + "signal-exit": "^3.0.2", + "typedarray-to-buffer": "^3.1.5" + } + } + } + }, + "@jest/source-map": { + "version": "24.3.0", + "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-24.3.0.tgz", + "integrity": "sha512-zALZt1t2ou8le/crCeeiRYzvdnTzaIlpOWaet45lNSqNJUnXbppUUFR4ZUAlzgDmKee4Q5P/tKXypI1RiHwgag==", + "dev": true, + "requires": { + "callsites": "^3.0.0", + "graceful-fs": "^4.1.15", + "source-map": "^0.6.0" + }, + "dependencies": { + "callsites": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.0.0.tgz", + "integrity": "sha512-tWnkwu9YEq2uzlBDI4RcLn8jrFvF9AOi8PxDNU3hZZjJcjkcRAq3vCI+vZcg1SuxISDYe86k9VZFwAxDiJGoAw==", + "dev": true + } + } + }, + "@jest/test-result": { + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-24.9.0.tgz", + "integrity": "sha512-XEFrHbBonBJ8dGp2JmF8kP/nQI/ImPpygKHwQ/SY+es59Z3L5PI4Qb9TQQMAEeYsThG1xF0k6tmG0tIKATNiiA==", + "dev": true, + "requires": { + "@jest/console": "^24.9.0", + "@jest/types": "^24.9.0", + "@types/istanbul-lib-coverage": "^2.0.0" + }, + "dependencies": { + "@jest/console": { + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/@jest/console/-/console-24.9.0.tgz", + "integrity": "sha512-Zuj6b8TnKXi3q4ymac8EQfc3ea/uhLeCGThFqXeC8H9/raaH8ARPUTdId+XyGd03Z4In0/VjD2OYFcBF09fNLQ==", + "dev": true, + "requires": { + "@jest/source-map": "^24.9.0", + "chalk": "^2.0.1", + "slash": "^2.0.0" + } + }, + "@jest/source-map": { + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-24.9.0.tgz", + "integrity": "sha512-/Xw7xGlsZb4MJzNDgB7PW5crou5JqWiBQaz6xyPd3ArOg2nfn/PunV8+olXbbEZzNl591o5rWKE9BRDaFAuIBg==", + "dev": true, + "requires": { + "callsites": "^3.0.0", + "graceful-fs": "^4.1.15", + "source-map": "^0.6.0" + } + }, + "@jest/types": { + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz", + "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==", + "dev": true, + "requires": { + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^1.1.1", + "@types/yargs": "^13.0.0" + } + }, + "@types/yargs": { + "version": "13.0.2", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.2.tgz", + "integrity": "sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ==", + "dev": true, + "requires": { + "@types/yargs-parser": "*" + } + }, + "callsites": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "dev": true + } + } + }, + "@jest/test-sequencer": { + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-24.9.0.tgz", + "integrity": "sha512-6qqsU4o0kW1dvA95qfNog8v8gkRN9ph6Lz7r96IvZpHdNipP2cBcb07J1Z45mz/VIS01OHJ3pY8T5fUY38tg4A==", + "dev": true, + "requires": { + "@jest/test-result": "^24.9.0", + "jest-haste-map": "^24.9.0", + "jest-runner": "^24.9.0", + "jest-runtime": "^24.9.0" + } + }, + "@jest/transform": { + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-24.9.0.tgz", + "integrity": "sha512-TcQUmyNRxV94S0QpMOnZl0++6RMiqpbH/ZMccFB/amku6Uwvyb1cjYX7xkp5nGNkbX4QPH/FcB6q1HBTHynLmQ==", + "dev": true, + "requires": { + "@babel/core": "^7.1.0", + "@jest/types": "^24.9.0", + "babel-plugin-istanbul": "^5.1.0", + "chalk": "^2.0.1", + "convert-source-map": "^1.4.0", + "fast-json-stable-stringify": "^2.0.0", + "graceful-fs": "^4.1.15", + "jest-haste-map": "^24.9.0", + "jest-regex-util": "^24.9.0", + "jest-util": "^24.9.0", + "micromatch": "^3.1.10", + "pirates": "^4.0.1", + "realpath-native": "^1.1.0", + "slash": "^2.0.0", + "source-map": "^0.6.1", + "write-file-atomic": "2.4.1" + }, + "dependencies": { + "@jest/types": { + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz", + "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==", + "dev": true, + "requires": { + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^1.1.1", + "@types/yargs": "^13.0.0" + } + }, + "@types/yargs": { + "version": "13.0.2", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.2.tgz", + "integrity": "sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ==", + "dev": true, + "requires": { + "@types/yargs-parser": "*" + } + }, + "jest-regex-util": { + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-24.9.0.tgz", + "integrity": "sha512-05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA==", + "dev": true + } + } + }, + "@jest/types": { + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz", + "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==", + "requires": { + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^1.1.1", + "@types/yargs": "^13.0.0" + }, + "dependencies": { + "@types/yargs": { + "version": "13.0.2", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.2.tgz", + "integrity": "sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ==", + "requires": { + "@types/yargs-parser": "*" + } + } + } + }, + "@koa/cors": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/@koa/cors/-/cors-2.2.3.tgz", + "integrity": "sha512-tCVVXa39ETsit5kGBtEWWimjLn1sDaeu8+0phgb8kT3GmBDZOykkI3ZO8nMjV2p3MGkJI4K5P+bxR8Ztq0bwsA==", + "requires": { + "vary": "^1.1.2" + } + }, + "@lerna/add": { + "version": "3.20.0", + "resolved": "https://registry.npmjs.org/@lerna/add/-/add-3.20.0.tgz", + "integrity": "sha512-AnH1oRIEEg/VDa3SjYq4x1/UglEAvrZuV0WssHUMN81RTZgQk3we+Mv3qZNddrZ/fBcZu2IAdN/EQ3+ie2JxKQ==", + "dev": true, + "requires": { + "@evocateur/pacote": "^9.6.3", + "@lerna/bootstrap": "3.20.0", + "@lerna/command": "3.18.5", + "@lerna/filter-options": "3.20.0", + "@lerna/npm-conf": "3.16.0", + "@lerna/validation-error": "3.13.0", + "dedent": "^0.7.0", + "npm-package-arg": "^6.1.0", + "p-map": "^2.1.0", + "semver": "^6.2.0" + }, + "dependencies": { + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true + } + } + }, + "@lerna/bootstrap": { + "version": "3.20.0", + "resolved": "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-3.20.0.tgz", + "integrity": "sha512-Wylullx3uthKE7r4izo09qeRGL20Y5yONlQEjPCfnbxCC2Elu+QcPu4RC6kqKQ7b+g7pdC3OOgcHZjngrwr5XQ==", + "dev": true, + "requires": { + "@lerna/command": "3.18.5", + "@lerna/filter-options": "3.20.0", + "@lerna/has-npm-version": "3.16.5", + "@lerna/npm-install": "3.16.5", + "@lerna/package-graph": "3.18.5", + "@lerna/pulse-till-done": "3.13.0", + "@lerna/rimraf-dir": "3.16.5", + "@lerna/run-lifecycle": "3.16.2", + "@lerna/run-topologically": "3.18.5", + "@lerna/symlink-binary": "3.17.0", + "@lerna/symlink-dependencies": "3.17.0", + "@lerna/validation-error": "3.13.0", + "dedent": "^0.7.0", + "get-port": "^4.2.0", + "multimatch": "^3.0.0", + "npm-package-arg": "^6.1.0", + "npmlog": "^4.1.2", + "p-finally": "^1.0.0", + "p-map": "^2.1.0", + "p-map-series": "^1.0.0", + "p-waterfall": "^1.0.0", + "read-package-tree": "^5.1.6", + "semver": "^6.2.0" + }, + "dependencies": { + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true + } + } + }, + "@lerna/changed": { + "version": "3.20.0", + "resolved": "https://registry.npmjs.org/@lerna/changed/-/changed-3.20.0.tgz", + "integrity": "sha512-+hzMFSldbRPulZ0vbKk6RD9f36gaH3Osjx34wrrZ62VB4pKmjyuS/rxVYkCA3viPLHoiIw2F8zHM5BdYoDSbjw==", + "dev": true, + "requires": { + "@lerna/collect-updates": "3.20.0", + "@lerna/command": "3.18.5", + "@lerna/listable": "3.18.5", + "@lerna/output": "3.13.0" } }, "@lerna/check-working-tree": { @@ -3500,6 +4868,15 @@ "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz", "integrity": "sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA=" }, + "@sinonjs/commons": { + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.7.2.tgz", + "integrity": "sha512-+DUO6pnp3udV/v2VfUWgaY5BIE1IfT7lLfeDzPVeMT1XKkaAp9LgSI9x5RtrFQoZ9Oi0PgXQQHPaoKu7dCjVxw==", + "dev": true, + "requires": { + "type-detect": "4.0.8" + } + }, "@types/accepts": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/@types/accepts/-/accepts-1.3.5.tgz", @@ -3612,6 +4989,12 @@ "integrity": "sha512-qS0VHlL6eBUUoUeBnI/ASCffoniS62zdV6IUtLSIjGKmRhZNawotaOMsTYivZOTZVktfe9koAJkD9XFac7tEEg==", "dev": true }, + "@types/color-name": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz", + "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==", + "dev": true + }, "@types/connect": { "version": "3.4.33", "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.33.tgz", @@ -3769,12 +5152,125 @@ } }, "@types/jest": { - "version": "24.9.1", - "resolved": "https://registry.npmjs.org/@types/jest/-/jest-24.9.1.tgz", - "integrity": "sha512-Fb38HkXSVA4L8fGKEZ6le5bB8r6MRWlOCZbVuWZcmOMSCd2wCYOwN1ibj8daIoV9naq7aaOZjrLCoCMptKU/4Q==", + "version": "25.2.1", + "resolved": "https://registry.npmjs.org/@types/jest/-/jest-25.2.1.tgz", + "integrity": "sha512-msra1bCaAeEdkSyA0CZ6gW1ukMIvZ5YoJkdXw/qhQdsuuDlFTcEUrUw8CLCPt2rVRUfXlClVvK2gvPs9IokZaA==", "dev": true, "requires": { - "jest-diff": "^24.3.0" + "jest-diff": "^25.2.1", + "pretty-format": "^25.2.1" + }, + "dependencies": { + "@jest/types": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.4.0.tgz", + "integrity": "sha512-XBeaWNzw2PPnGW5aXvZt3+VO60M+34RY3XDsCK5tW7kyj3RK0XClRutCfjqcBuaR2aBQTbluEDME9b5MB9UAPw==", + "dev": true, + "requires": { + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^1.1.1", + "@types/yargs": "^15.0.0", + "chalk": "^3.0.0" + } + }, + "ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "dev": true + }, + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "dev": true, + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "diff-sequences": { + "version": "25.2.6", + "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-25.2.6.tgz", + "integrity": "sha512-Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "jest-diff": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-25.4.0.tgz", + "integrity": "sha512-kklLbJVXW0y8UKOWOdYhI6TH5MG6QAxrWiBMgQaPIuhj3dNFGirKCd+/xfplBXICQ7fI+3QcqHm9p9lWu1N6ug==", + "dev": true, + "requires": { + "chalk": "^3.0.0", + "diff-sequences": "^25.2.6", + "jest-get-type": "^25.2.6", + "pretty-format": "^25.4.0" + } + }, + "jest-get-type": { + "version": "25.2.6", + "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-25.2.6.tgz", + "integrity": "sha512-DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig==", + "dev": true + }, + "pretty-format": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.4.0.tgz", + "integrity": "sha512-PI/2dpGjXK5HyXexLPZU/jw5T9Q6S1YVXxxVxco+LIqzUFHXIbKZKdUVt7GcX7QUCr31+3fzhi4gN4/wUYPVxQ==", + "dev": true, + "requires": { + "@jest/types": "^25.4.0", + "ansi-regex": "^5.0.0", + "ansi-styles": "^4.0.0", + "react-is": "^16.12.0" + } + }, + "react-is": { + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", + "dev": true + }, + "supports-color": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } } }, "@types/joi": { @@ -3949,6 +5445,12 @@ "@types/node": "*" } }, + "@types/normalize-package-data": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz", + "integrity": "sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==", + "dev": true + }, "@types/pino": { "version": "4.16.1", "resolved": "https://registry.npmjs.org/@types/pino/-/pino-4.16.1.tgz", @@ -3965,6 +5467,12 @@ "integrity": "sha1-v6ohUb4rHWEJzGn3+qnawsujuyA=", "dev": true }, + "@types/prettier": { + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-1.19.1.tgz", + "integrity": "sha512-5qOlnZscTn4xxM5MeGXAMOsIOIKIbh9e85zJWfBRVPlRMEVawzoPhINYbRGkBZCI8LxvBe7tJCdWiarA99OZfQ==", + "dev": true + }, "@types/qs": { "version": "6.5.3", "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.5.3.tgz", @@ -4069,6 +5577,15 @@ "@types/node": "*" } }, + "@types/yargs": { + "version": "15.0.4", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.4.tgz", + "integrity": "sha512-9T1auFmbPZoxHz0enUFlUuKRy3it01R+hlggyVUMtnCTQRunsQYifnSGb8hET4Xo8yiC0o0r1paW3ud5+rbURg==", + "dev": true, + "requires": { + "@types/yargs-parser": "*" + } + }, "@types/yargs-parser": { "version": "13.0.0", "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-13.0.0.tgz", @@ -4973,6 +6490,41 @@ "@types/babel__traverse": "^7.0.6" } }, + "babel-preset-current-node-syntax": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-0.1.2.tgz", + "integrity": "sha512-u/8cS+dEiK1SFILbOC8/rUI3ml9lboKuuMvZ/4aQnQmhecQAgPw5ew066C1ObnEAUmlx7dv/s2z52psWEtLNiw==", + "dev": true, + "requires": { + "@babel/plugin-syntax-async-generators": "^7.8.4", + "@babel/plugin-syntax-bigint": "^7.8.3", + "@babel/plugin-syntax-class-properties": "^7.8.3", + "@babel/plugin-syntax-json-strings": "^7.8.3", + "@babel/plugin-syntax-logical-assignment-operators": "^7.8.3", + "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", + "@babel/plugin-syntax-numeric-separator": "^7.8.3", + "@babel/plugin-syntax-object-rest-spread": "^7.8.3", + "@babel/plugin-syntax-optional-catch-binding": "^7.8.3", + "@babel/plugin-syntax-optional-chaining": "^7.8.3" + }, + "dependencies": { + "@babel/helper-plugin-utils": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", + "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==", + "dev": true + }, + "@babel/plugin-syntax-object-rest-spread": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz", + "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + } + } + } + }, "babel-preset-jest": { "version": "24.9.0", "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-24.9.0.tgz", @@ -5609,6 +7161,12 @@ } } }, + "collect-v8-coverage": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz", + "integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==", + "dev": true + }, "collection-visit": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz", @@ -7795,6 +9353,12 @@ "integrity": "sha512-KGDOARWVga7+rnB3z9Sd2Letx515owfk0hSxHGuqjANb1M+x2bGZGqHLiozPsYMdM2OubeMni/Hpwmjq6qIUhA==", "dev": true }, + "gensync": { + "version": "1.0.0-beta.1", + "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz", + "integrity": "sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==", + "dev": true + }, "get-caller-file": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", @@ -8358,19 +9922,8 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz", "integrity": "sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=", - "dev": true - }, - "handlebars": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.1.2.tgz", - "integrity": "sha512-nvfrjqvt9xQ8Z/w0ijewdD/vvWDTOweBUm96NTr66Wfvo1mJenBLwcYmPs3TIBP5ruzYGD7Hx/DaM9RmhroGPw==", "dev": true, - "requires": { - "neo-async": "^2.6.0", - "optimist": "^0.6.1", - "source-map": "^0.6.1", - "uglify-js": "^3.1.4" - } + "optional": true }, "hapi": { "version": "17.8.5", @@ -8793,6 +10346,12 @@ "whatwg-encoding": "^1.0.1" } }, + "html-escaper": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", + "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", + "dev": true + }, "http-assert": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/http-assert/-/http-assert-1.4.1.tgz", @@ -8880,6 +10439,12 @@ } } }, + "human-signals": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz", + "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==", + "dev": true + }, "humanize-ms": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz", @@ -9099,6 +10664,12 @@ "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=" }, + "ip-regex": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz", + "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=", + "dev": true + }, "ipaddr.js": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.8.0.tgz", @@ -9358,10 +10929,11 @@ "dev": true }, "is-wsl": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.1.0.tgz", - "integrity": "sha512-pFTjpv/x5HRj8kbZ/Msxi9VrvtOMRBqaDi3OIcbwPI3OuH+r3lLxVWukLITBaOGJIbA/w2+M1eVmVa4XNQlAmQ==", - "dev": true + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.1.1.tgz", + "integrity": "sha512-umZHcSrwlDHo2TGMXv0DZ8dIUGunZ2Iv68YZnrmCiBPkZ4aaOhtv7pXJKeki9k3qJ3RJr0cDyitcl5wEH3AYog==", + "dev": true, + "optional": true }, "isarray": { "version": "0.0.1", @@ -9417,62 +10989,611 @@ } }, "istanbul-lib-report": { - "version": "2.0.8", - "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-2.0.8.tgz", - "integrity": "sha512-fHBeG573EIihhAblwgxrSenp0Dby6tJMFR/HvlerBsrCTD5bkUuoNtn3gVh29ZCS824cGGBPn7Sg7cNk+2xUsQ==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz", + "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==", "dev": true, "requires": { - "istanbul-lib-coverage": "^2.0.5", - "make-dir": "^2.1.0", - "supports-color": "^6.1.0" + "istanbul-lib-coverage": "^3.0.0", + "make-dir": "^3.0.0", + "supports-color": "^7.1.0" }, "dependencies": { + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, "istanbul-lib-coverage": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz", - "integrity": "sha512-8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz", + "integrity": "sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==", + "dev": true + }, + "make-dir": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.0.2.tgz", + "integrity": "sha512-rYKABKutXa6vXTXhoV18cBE7PaewPXHe/Bdq4v+ZLMhxbWApkFFplT0LcbMW+6BbjnQXzZ/sAvSE/JdguApG5w==", + "dev": true, + "requires": { + "semver": "^6.0.0" + } + }, + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true + }, + "supports-color": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, + "istanbul-lib-source-maps": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz", + "integrity": "sha512-c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg==", + "dev": true, + "requires": { + "debug": "^4.1.1", + "istanbul-lib-coverage": "^3.0.0", + "source-map": "^0.6.1" + }, + "dependencies": { + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + }, + "istanbul-lib-coverage": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz", + "integrity": "sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==", + "dev": true + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + } + } + }, + "istanbul-reports": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.0.2.tgz", + "integrity": "sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw==", + "dev": true, + "requires": { + "html-escaper": "^2.0.0", + "istanbul-lib-report": "^3.0.0" + } + }, + "iterall": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/iterall/-/iterall-1.2.2.tgz", + "integrity": "sha512-yynBb1g+RFUPY64fTrFv7nsjRrENBQJaX2UL+2Szc9REFrSNm1rpSXHGzhmAy7a9uv3vlvgBlXnf9RqmPH1/DA==" + }, + "jackpot": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/jackpot/-/jackpot-0.0.6.tgz", + "integrity": "sha1-PP8GQoXL9m9OqyWTyQvOgWqCGEk=", + "requires": { + "retry": "0.6.0" + }, + "dependencies": { + "retry": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/retry/-/retry-0.6.0.tgz", + "integrity": "sha1-HAEHEyeab9Ho3vKK8MP/GHHKpTc=" + } + } + }, + "jest": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest/-/jest-25.4.0.tgz", + "integrity": "sha512-XWipOheGB4wai5JfCYXd6vwsWNwM/dirjRoZgAa7H2wd8ODWbli2AiKjqG8AYhyx+8+5FBEdpO92VhGlBydzbw==", + "dev": true, + "requires": { + "@jest/core": "^25.4.0", + "import-local": "^3.0.2", + "jest-cli": "^25.4.0" + }, + "dependencies": { + "@babel/generator": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.5.tgz", + "integrity": "sha512-GbNIxVB3ZJe3tLeDm1HSn2AhuD/mVcyLDpgtLXa5tplmWrJdF/elxB56XNqCuD6szyNkDi6wuoKXln3QeBmCHQ==", + "dev": true, + "requires": { + "@babel/types": "^7.9.5", + "jsesc": "^2.5.1", + "lodash": "^4.17.13", + "source-map": "^0.5.0" + }, + "dependencies": { + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true + } + } + }, + "@babel/helper-function-name": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz", + "integrity": "sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==", + "dev": true, + "requires": { + "@babel/helper-get-function-arity": "^7.8.3", + "@babel/template": "^7.8.3", + "@babel/types": "^7.9.5" + } + }, + "@babel/helper-get-function-arity": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz", + "integrity": "sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==", + "dev": true, + "requires": { + "@babel/types": "^7.8.3" + } + }, + "@babel/helper-split-export-declaration": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz", + "integrity": "sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==", + "dev": true, + "requires": { + "@babel/types": "^7.8.3" + } + }, + "@babel/helpers": { + "version": "7.9.2", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.2.tgz", + "integrity": "sha512-JwLvzlXVPjO8eU9c/wF9/zOIN7X6h8DYf7mG4CiFRZRvZNKEF5dQ3H3V+ASkHoIB3mWhatgl5ONhyqHRI6MppA==", + "dev": true, + "requires": { + "@babel/template": "^7.8.3", + "@babel/traverse": "^7.9.0", + "@babel/types": "^7.9.0" + }, + "dependencies": { + "@babel/code-frame": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", + "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", + "dev": true, + "requires": { + "@babel/highlight": "^7.8.3" + } + }, + "@babel/traverse": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.5.tgz", + "integrity": "sha512-c4gH3jsvSuGUezlP6rzSJ6jf8fYjLj3hsMZRx/nX0h+fmHN0w+ekubRrHPqnMec0meycA2nwCsJ7dC8IPem2FQ==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.8.3", + "@babel/generator": "^7.9.5", + "@babel/helper-function-name": "^7.9.5", + "@babel/helper-split-export-declaration": "^7.8.3", + "@babel/parser": "^7.9.0", + "@babel/types": "^7.9.5", + "debug": "^4.1.0", + "globals": "^11.1.0", + "lodash": "^4.17.13" + } + } + } + }, + "@babel/highlight": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz", + "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.9.0", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "^1.9.0" + } + }, + "chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, + "requires": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + } + }, + "color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "dev": true, + "requires": { + "color-name": "1.1.3" + } + }, + "color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", + "dev": true + }, + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "dev": true + }, + "supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, + "@babel/parser": { + "version": "7.9.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz", + "integrity": "sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==", + "dev": true + }, + "@babel/template": { + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz", + "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.8.3", + "@babel/parser": "^7.8.6", + "@babel/types": "^7.8.6" + }, + "dependencies": { + "@babel/code-frame": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", + "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", + "dev": true, + "requires": { + "@babel/highlight": "^7.8.3" + } + } + } + }, + "@babel/types": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.5.tgz", + "integrity": "sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.9.5", + "lodash": "^4.17.13", + "to-fast-properties": "^2.0.0" + } + }, + "@jest/console": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/@jest/console/-/console-25.4.0.tgz", + "integrity": "sha512-CfE0erx4hdJ6t7RzAcE1wLG6ZzsHSmybvIBQDoCkDM1QaSeWL9wJMzID/2BbHHa7ll9SsbbK43HjbERbBaFX2A==", + "dev": true, + "requires": { + "@jest/types": "^25.4.0", + "chalk": "^3.0.0", + "jest-message-util": "^25.4.0", + "jest-util": "^25.4.0", + "slash": "^3.0.0" + } + }, + "@jest/environment": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-25.4.0.tgz", + "integrity": "sha512-KDctiak4mu7b4J6BIoN/+LUL3pscBzoUCP+EtSPd2tK9fqyDY5OF+CmkBywkFWezS9tyH5ACOQNtpjtueEDH6Q==", + "dev": true, + "requires": { + "@jest/fake-timers": "^25.4.0", + "@jest/types": "^25.4.0", + "jest-mock": "^25.4.0" + } + }, + "@jest/fake-timers": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-25.4.0.tgz", + "integrity": "sha512-lI9z+VOmVX4dPPFzyj0vm+UtaB8dCJJ852lcDnY0uCPRvZAaVGnMwBBc1wxtf+h7Vz6KszoOvKAt4QijDnHDkg==", + "dev": true, + "requires": { + "@jest/types": "^25.4.0", + "jest-message-util": "^25.4.0", + "jest-mock": "^25.4.0", + "jest-util": "^25.4.0", + "lolex": "^5.0.0" + } + }, + "@jest/source-map": { + "version": "25.2.6", + "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-25.2.6.tgz", + "integrity": "sha512-VuIRZF8M2zxYFGTEhkNSvQkUKafQro4y+mwUxy5ewRqs5N/ynSFUODYp3fy1zCnbCMy1pz3k+u57uCqx8QRSQQ==", + "dev": true, + "requires": { + "callsites": "^3.0.0", + "graceful-fs": "^4.2.3", + "source-map": "^0.6.0" + } + }, + "@jest/test-result": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-25.4.0.tgz", + "integrity": "sha512-8BAKPaMCHlL941eyfqhWbmp3MebtzywlxzV+qtngQ3FH+RBqnoSAhNEPj4MG7d2NVUrMOVfrwuzGpVIK+QnMAA==", + "dev": true, + "requires": { + "@jest/console": "^25.4.0", + "@jest/types": "^25.4.0", + "@types/istanbul-lib-coverage": "^2.0.0", + "collect-v8-coverage": "^1.0.0" + } + }, + "@jest/test-sequencer": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-25.4.0.tgz", + "integrity": "sha512-240cI+nsM3attx2bMp9uGjjHrwrpvxxrZi8Tyqp/cfOzl98oZXVakXBgxODGyBYAy/UGXPKXLvNc2GaqItrsJg==", + "dev": true, + "requires": { + "@jest/test-result": "^25.4.0", + "jest-haste-map": "^25.4.0", + "jest-runner": "^25.4.0", + "jest-runtime": "^25.4.0" + } + }, + "@jest/transform": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-25.4.0.tgz", + "integrity": "sha512-t1w2S6V1sk++1HHsxboWxPEuSpN8pxEvNrZN+Ud/knkROWtf8LeUmz73A4ezE8476a5AM00IZr9a8FO9x1+j3g==", + "dev": true, + "requires": { + "@babel/core": "^7.1.0", + "@jest/types": "^25.4.0", + "babel-plugin-istanbul": "^6.0.0", + "chalk": "^3.0.0", + "convert-source-map": "^1.4.0", + "fast-json-stable-stringify": "^2.0.0", + "graceful-fs": "^4.2.3", + "jest-haste-map": "^25.4.0", + "jest-regex-util": "^25.2.6", + "jest-util": "^25.4.0", + "micromatch": "^4.0.2", + "pirates": "^4.0.1", + "realpath-native": "^2.0.0", + "slash": "^3.0.0", + "source-map": "^0.6.1", + "write-file-atomic": "^3.0.0" + } + }, + "@jest/types": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.4.0.tgz", + "integrity": "sha512-XBeaWNzw2PPnGW5aXvZt3+VO60M+34RY3XDsCK5tW7kyj3RK0XClRutCfjqcBuaR2aBQTbluEDME9b5MB9UAPw==", + "dev": true, + "requires": { + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^1.1.1", + "@types/yargs": "^15.0.0", + "chalk": "^3.0.0" + } + }, + "@types/babel__core": { + "version": "7.1.7", + "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.7.tgz", + "integrity": "sha512-RL62NqSFPCDK2FM1pSDH0scHpJvsXtZNiYlMB73DgPBaG1E38ZYVL+ei5EkWRbr+KC4YNiAUNBnRj+bgwpgjMw==", + "dev": true, + "requires": { + "@babel/parser": "^7.1.0", + "@babel/types": "^7.0.0", + "@types/babel__generator": "*", + "@types/babel__template": "*", + "@types/babel__traverse": "*" + } + }, + "acorn": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.1.tgz", + "integrity": "sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==", "dev": true }, - "make-dir": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz", - "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==", + "acorn-globals": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.4.tgz", + "integrity": "sha512-clfQEh21R+D0leSbUdWf3OcfqyaCSAQ8Ryq00bofSekfr9W8u1jyYZo6ir0xu9Gtcf7BjcHJpnbZH7JOCpP60A==", "dev": true, "requires": { - "pify": "^4.0.1", - "semver": "^5.6.0" + "acorn": "^6.0.1", + "acorn-walk": "^6.0.1" + }, + "dependencies": { + "acorn": { + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz", + "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==", + "dev": true + } } }, - "pify": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", - "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", + "ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", "dev": true }, - "supports-color": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", - "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", "dev": true, "requires": { - "has-flag": "^3.0.0" + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" } - } - } - }, - "istanbul-lib-source-maps": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.6.tgz", - "integrity": "sha512-R47KzMtDJH6X4/YW9XTx+jrLnZnscW4VpNN+1PViSYTejLVPWv7oov+Duf8YQSPyVRUvueQqz1TcsC6mooZTXw==", - "dev": true, - "requires": { - "debug": "^4.1.1", - "istanbul-lib-coverage": "^2.0.5", - "make-dir": "^2.1.0", - "rimraf": "^2.6.3", - "source-map": "^0.6.1" - }, - "dependencies": { + }, + "anymatch": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz", + "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==", + "dev": true, + "requires": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + } + }, + "babel-jest": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-25.4.0.tgz", + "integrity": "sha512-p+epx4K0ypmHuCnd8BapfyOwWwosNCYhedetQey1awddtfmEX0MmdxctGl956uwUmjwXR5VSS5xJcGX9DvdIog==", + "dev": true, + "requires": { + "@jest/transform": "^25.4.0", + "@jest/types": "^25.4.0", + "@types/babel__core": "^7.1.7", + "babel-plugin-istanbul": "^6.0.0", + "babel-preset-jest": "^25.4.0", + "chalk": "^3.0.0", + "slash": "^3.0.0" + } + }, + "babel-plugin-istanbul": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz", + "integrity": "sha512-AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.0.0", + "@istanbuljs/load-nyc-config": "^1.0.0", + "@istanbuljs/schema": "^0.1.2", + "istanbul-lib-instrument": "^4.0.0", + "test-exclude": "^6.0.0" + } + }, + "babel-plugin-jest-hoist": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-25.4.0.tgz", + "integrity": "sha512-M3a10JCtTyKevb0MjuH6tU+cP/NVQZ82QPADqI1RQYY1OphztsCeIeQmTsHmF/NS6m0E51Zl4QNsI3odXSQF5w==", + "dev": true, + "requires": { + "@types/babel__traverse": "^7.0.6" + } + }, + "babel-preset-jest": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-25.4.0.tgz", + "integrity": "sha512-PwFiEWflHdu3JCeTr0Pb9NcHHE34qWFnPQRVPvqQITx4CsDCzs6o05923I10XvLvn9nNsRHuiVgB72wG/90ZHQ==", + "dev": true, + "requires": { + "babel-plugin-jest-hoist": "^25.4.0", + "babel-preset-current-node-syntax": "^0.1.2" + } + }, + "braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "dev": true, + "requires": { + "fill-range": "^7.0.1" + } + }, + "callsites": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "dev": true + }, + "chalk": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "cliui": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", + "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==", + "dev": true, + "requires": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^6.2.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "cssom": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz", + "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==", + "dev": true + }, + "cssstyle": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.2.0.tgz", + "integrity": "sha512-sEb3XFPx3jNnCAMtqrXPDeSgQr+jojtCeNf8cvMNMh1cG970+lljssvQDzPq6lmmJu2Vhqood/gtEomBiHOGnA==", + "dev": true, + "requires": { + "cssom": "~0.3.6" + }, + "dependencies": { + "cssom": { + "version": "0.3.8", + "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz", + "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==", + "dev": true + } + } + }, "debug": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", @@ -9482,802 +11603,1155 @@ "ms": "^2.1.1" } }, - "istanbul-lib-coverage": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz", - "integrity": "sha512-8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA==", + "deepmerge": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz", + "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==", "dev": true }, - "make-dir": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz", - "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==", + "detect-newline": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz", + "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==", + "dev": true + }, + "diff-sequences": { + "version": "25.2.6", + "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-25.2.6.tgz", + "integrity": "sha512-Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg==", + "dev": true + }, + "emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, + "expect": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/expect/-/expect-25.4.0.tgz", + "integrity": "sha512-7BDIX99BTi12/sNGJXA9KMRcby4iAmu1xccBOhyKCyEhjcVKS3hPmHdA/4nSI9QGIOkUropKqr3vv7WMDM5lvQ==", "dev": true, "requires": { - "pify": "^4.0.1", - "semver": "^5.6.0" + "@jest/types": "^25.4.0", + "ansi-styles": "^4.0.0", + "jest-get-type": "^25.2.6", + "jest-matcher-utils": "^25.4.0", + "jest-message-util": "^25.4.0", + "jest-regex-util": "^25.2.6" } }, - "ms": { + "fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "dev": true, + "requires": { + "to-regex-range": "^5.0.1" + } + }, + "find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dev": true, + "requires": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + } + }, + "fsevents": { "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.2.tgz", + "integrity": "sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==", + "dev": true, + "optional": true + }, + "graceful-fs": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz", + "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==", "dev": true }, - "pify": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", - "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true - } - } - }, - "istanbul-reports": { - "version": "2.2.6", - "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-2.2.6.tgz", - "integrity": "sha512-SKi4rnMyLBKe0Jy2uUdx28h8oG7ph2PPuQPvIAh31d+Ci+lSiEu4C+h3oBPuJ9+mPKhOyW0M8gY4U5NM1WLeXA==", - "dev": true, - "requires": { - "handlebars": "^4.1.2" - } - }, - "iterall": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/iterall/-/iterall-1.2.2.tgz", - "integrity": "sha512-yynBb1g+RFUPY64fTrFv7nsjRrENBQJaX2UL+2Szc9REFrSNm1rpSXHGzhmAy7a9uv3vlvgBlXnf9RqmPH1/DA==" - }, - "jackpot": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/jackpot/-/jackpot-0.0.6.tgz", - "integrity": "sha1-PP8GQoXL9m9OqyWTyQvOgWqCGEk=", - "requires": { - "retry": "0.6.0" - }, - "dependencies": { - "retry": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/retry/-/retry-0.6.0.tgz", - "integrity": "sha1-HAEHEyeab9Ho3vKK8MP/GHHKpTc=" - } - } - }, - "jest": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest/-/jest-24.9.0.tgz", - "integrity": "sha512-YvkBL1Zm7d2B1+h5fHEOdyjCG+sGMz4f8D86/0HiqJ6MB4MnDc8FgP5vdWsGnemOQro7lnYo8UakZ3+5A0jxGw==", - "dev": true, - "requires": { - "import-local": "^2.0.0", - "jest-cli": "^24.9.0" - }, - "dependencies": { - "@jest/console": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/console/-/console-24.9.0.tgz", - "integrity": "sha512-Zuj6b8TnKXi3q4ymac8EQfc3ea/uhLeCGThFqXeC8H9/raaH8ARPUTdId+XyGd03Z4In0/VjD2OYFcBF09fNLQ==", + }, + "import-local": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.2.tgz", + "integrity": "sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA==", + "dev": true, + "requires": { + "pkg-dir": "^4.2.0", + "resolve-cwd": "^3.0.0" + } + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true + }, + "is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true + }, + "istanbul-lib-coverage": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz", + "integrity": "sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==", + "dev": true + }, + "istanbul-lib-instrument": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.1.tgz", + "integrity": "sha512-imIchxnodll7pvQBYOqUu88EufLCU56LMeFPZZM/fJZ1irYcYdqroaV+ACK1Ila8ls09iEYArp+nqyC6lW1Vfg==", + "dev": true, + "requires": { + "@babel/core": "^7.7.5", + "@babel/parser": "^7.7.5", + "@babel/template": "^7.7.4", + "@babel/traverse": "^7.7.4", + "@istanbuljs/schema": "^0.1.2", + "istanbul-lib-coverage": "^3.0.0", + "semver": "^6.3.0" + }, + "dependencies": { + "@babel/code-frame": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", + "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", + "dev": true, + "requires": { + "@babel/highlight": "^7.8.3" + } + }, + "@babel/core": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.0.tgz", + "integrity": "sha512-kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.8.3", + "@babel/generator": "^7.9.0", + "@babel/helper-module-transforms": "^7.9.0", + "@babel/helpers": "^7.9.0", + "@babel/parser": "^7.9.0", + "@babel/template": "^7.8.6", + "@babel/traverse": "^7.9.0", + "@babel/types": "^7.9.0", + "convert-source-map": "^1.7.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.1", + "json5": "^2.1.2", + "lodash": "^4.17.13", + "resolve": "^1.3.2", + "semver": "^5.4.1", + "source-map": "^0.5.0" + }, + "dependencies": { + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true + } + } + }, + "@babel/traverse": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.5.tgz", + "integrity": "sha512-c4gH3jsvSuGUezlP6rzSJ6jf8fYjLj3hsMZRx/nX0h+fmHN0w+ekubRrHPqnMec0meycA2nwCsJ7dC8IPem2FQ==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.8.3", + "@babel/generator": "^7.9.5", + "@babel/helper-function-name": "^7.9.5", + "@babel/helper-split-export-declaration": "^7.8.3", + "@babel/parser": "^7.9.0", + "@babel/types": "^7.9.5", + "debug": "^4.1.0", + "globals": "^11.1.0", + "lodash": "^4.17.13" + } + }, + "convert-source-map": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz", + "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.1" + } + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true + } + } + }, + "jest-cli": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-25.4.0.tgz", + "integrity": "sha512-usyrj1lzCJZMRN1r3QEdnn8e6E6yCx/QN7+B1sLoA68V7f3WlsxSSQfy0+BAwRiF4Hz2eHauf11GZG3PIfWTXQ==", "dev": true, "requires": { - "@jest/source-map": "^24.9.0", - "chalk": "^2.0.1", - "slash": "^2.0.0" + "@jest/core": "^25.4.0", + "@jest/test-result": "^25.4.0", + "@jest/types": "^25.4.0", + "chalk": "^3.0.0", + "exit": "^0.1.2", + "import-local": "^3.0.2", + "is-ci": "^2.0.0", + "jest-config": "^25.4.0", + "jest-util": "^25.4.0", + "jest-validate": "^25.4.0", + "prompts": "^2.0.1", + "realpath-native": "^2.0.0", + "yargs": "^15.3.1" } }, - "@jest/environment": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-24.9.0.tgz", - "integrity": "sha512-5A1QluTPhvdIPFYnO3sZC3smkNeXPVELz7ikPbhUj0bQjB07EoE9qtLrem14ZUYWdVayYbsjVwIiL4WBIMV4aQ==", + "jest-config": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-25.4.0.tgz", + "integrity": "sha512-egT9aKYxMyMSQV1aqTgam0SkI5/I2P9qrKexN5r2uuM2+68ypnc+zPGmfUxK7p1UhE7dYH9SLBS7yb+TtmT1AA==", "dev": true, "requires": { - "@jest/fake-timers": "^24.9.0", - "@jest/transform": "^24.9.0", - "@jest/types": "^24.9.0", - "jest-mock": "^24.9.0" + "@babel/core": "^7.1.0", + "@jest/test-sequencer": "^25.4.0", + "@jest/types": "^25.4.0", + "babel-jest": "^25.4.0", + "chalk": "^3.0.0", + "deepmerge": "^4.2.2", + "glob": "^7.1.1", + "jest-environment-jsdom": "^25.4.0", + "jest-environment-node": "^25.4.0", + "jest-get-type": "^25.2.6", + "jest-jasmine2": "^25.4.0", + "jest-regex-util": "^25.2.6", + "jest-resolve": "^25.4.0", + "jest-util": "^25.4.0", + "jest-validate": "^25.4.0", + "micromatch": "^4.0.2", + "pretty-format": "^25.4.0", + "realpath-native": "^2.0.0" } }, - "@jest/fake-timers": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-24.9.0.tgz", - "integrity": "sha512-eWQcNa2YSwzXWIMC5KufBh3oWRIijrQFROsIqt6v/NS9Io/gknw1jsAC9c+ih/RQX4A3O7SeWAhQeN0goKhT9A==", + "jest-diff": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-25.4.0.tgz", + "integrity": "sha512-kklLbJVXW0y8UKOWOdYhI6TH5MG6QAxrWiBMgQaPIuhj3dNFGirKCd+/xfplBXICQ7fI+3QcqHm9p9lWu1N6ug==", "dev": true, "requires": { - "@jest/types": "^24.9.0", - "jest-message-util": "^24.9.0", - "jest-mock": "^24.9.0" + "chalk": "^3.0.0", + "diff-sequences": "^25.2.6", + "jest-get-type": "^25.2.6", + "pretty-format": "^25.4.0" } }, - "@jest/source-map": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-24.9.0.tgz", - "integrity": "sha512-/Xw7xGlsZb4MJzNDgB7PW5crou5JqWiBQaz6xyPd3ArOg2nfn/PunV8+olXbbEZzNl591o5rWKE9BRDaFAuIBg==", + "jest-docblock": { + "version": "25.3.0", + "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-25.3.0.tgz", + "integrity": "sha512-aktF0kCar8+zxRHxQZwxMy70stc9R1mOmrLsT5VO3pIT0uzGRSDAXxSlz4NqQWpuLjPpuMhPRl7H+5FRsvIQAg==", "dev": true, "requires": { - "callsites": "^3.0.0", - "graceful-fs": "^4.1.15", - "source-map": "^0.6.0" + "detect-newline": "^3.0.0" } }, - "@jest/test-result": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-24.9.0.tgz", - "integrity": "sha512-XEFrHbBonBJ8dGp2JmF8kP/nQI/ImPpygKHwQ/SY+es59Z3L5PI4Qb9TQQMAEeYsThG1xF0k6tmG0tIKATNiiA==", + "jest-each": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-25.4.0.tgz", + "integrity": "sha512-lwRIJ8/vQU/6vq3nnSSUw1Y3nz5tkYSFIywGCZpUBd6WcRgpn8NmJoQICojbpZmsJOJNHm0BKdyuJ6Xdx+eDQQ==", "dev": true, "requires": { - "@jest/console": "^24.9.0", - "@jest/types": "^24.9.0", - "@types/istanbul-lib-coverage": "^2.0.0" + "@jest/types": "^25.4.0", + "chalk": "^3.0.0", + "jest-get-type": "^25.2.6", + "jest-util": "^25.4.0", + "pretty-format": "^25.4.0" } }, - "@jest/test-sequencer": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-24.9.0.tgz", - "integrity": "sha512-6qqsU4o0kW1dvA95qfNog8v8gkRN9ph6Lz7r96IvZpHdNipP2cBcb07J1Z45mz/VIS01OHJ3pY8T5fUY38tg4A==", + "jest-environment-jsdom": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-25.4.0.tgz", + "integrity": "sha512-KTitVGMDrn2+pt7aZ8/yUTuS333w3pWt1Mf88vMntw7ZSBNDkRS6/4XLbFpWXYfWfp1FjcjQTOKzbK20oIehWQ==", "dev": true, "requires": { - "@jest/test-result": "^24.9.0", - "jest-haste-map": "^24.9.0", - "jest-runner": "^24.9.0", - "jest-runtime": "^24.9.0" + "@jest/environment": "^25.4.0", + "@jest/fake-timers": "^25.4.0", + "@jest/types": "^25.4.0", + "jest-mock": "^25.4.0", + "jest-util": "^25.4.0", + "jsdom": "^15.2.1" } }, - "@jest/transform": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-24.9.0.tgz", - "integrity": "sha512-TcQUmyNRxV94S0QpMOnZl0++6RMiqpbH/ZMccFB/amku6Uwvyb1cjYX7xkp5nGNkbX4QPH/FcB6q1HBTHynLmQ==", + "jest-environment-node": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-25.4.0.tgz", + "integrity": "sha512-wryZ18vsxEAKFH7Z74zi/y/SyI1j6UkVZ6QsllBuT/bWlahNfQjLNwFsgh/5u7O957dYFoXj4yfma4n4X6kU9A==", "dev": true, "requires": { - "@babel/core": "^7.1.0", - "@jest/types": "^24.9.0", - "babel-plugin-istanbul": "^5.1.0", - "chalk": "^2.0.1", - "convert-source-map": "^1.4.0", - "fast-json-stable-stringify": "^2.0.0", - "graceful-fs": "^4.1.15", - "jest-haste-map": "^24.9.0", - "jest-regex-util": "^24.9.0", - "jest-util": "^24.9.0", - "micromatch": "^3.1.10", - "pirates": "^4.0.1", - "realpath-native": "^1.1.0", - "slash": "^2.0.0", - "source-map": "^0.6.1", - "write-file-atomic": "2.4.1" - }, - "dependencies": { - "jest-regex-util": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-24.9.0.tgz", - "integrity": "sha512-05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA==", - "dev": true - } + "@jest/environment": "^25.4.0", + "@jest/fake-timers": "^25.4.0", + "@jest/types": "^25.4.0", + "jest-mock": "^25.4.0", + "jest-util": "^25.4.0", + "semver": "^6.3.0" } }, - "@jest/types": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz", - "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==", + "jest-get-type": { + "version": "25.2.6", + "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-25.2.6.tgz", + "integrity": "sha512-DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig==", + "dev": true + }, + "jest-haste-map": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-25.4.0.tgz", + "integrity": "sha512-5EoCe1gXfGC7jmXbKzqxESrgRcaO3SzWXGCnvp9BcT0CFMyrB1Q6LIsjl9RmvmJGQgW297TCfrdgiy574Rl9HQ==", "dev": true, "requires": { - "@types/istanbul-lib-coverage": "^2.0.0", - "@types/istanbul-reports": "^1.1.1", - "@types/yargs": "^13.0.0" + "@jest/types": "^25.4.0", + "anymatch": "^3.0.3", + "fb-watchman": "^2.0.0", + "fsevents": "^2.1.2", + "graceful-fs": "^4.2.3", + "jest-serializer": "^25.2.6", + "jest-util": "^25.4.0", + "jest-worker": "^25.4.0", + "micromatch": "^4.0.2", + "sane": "^4.0.3", + "walker": "^1.0.7", + "which": "^2.0.2" } }, - "@types/yargs": { - "version": "13.0.2", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.2.tgz", - "integrity": "sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ==", + "jest-jasmine2": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-25.4.0.tgz", + "integrity": "sha512-QccxnozujVKYNEhMQ1vREiz859fPN/XklOzfQjm2j9IGytAkUbSwjFRBtQbHaNZ88cItMpw02JnHGsIdfdpwxQ==", "dev": true, "requires": { - "@types/yargs-parser": "*" + "@babel/traverse": "^7.1.0", + "@jest/environment": "^25.4.0", + "@jest/source-map": "^25.2.6", + "@jest/test-result": "^25.4.0", + "@jest/types": "^25.4.0", + "chalk": "^3.0.0", + "co": "^4.6.0", + "expect": "^25.4.0", + "is-generator-fn": "^2.0.0", + "jest-each": "^25.4.0", + "jest-matcher-utils": "^25.4.0", + "jest-message-util": "^25.4.0", + "jest-runtime": "^25.4.0", + "jest-snapshot": "^25.4.0", + "jest-util": "^25.4.0", + "pretty-format": "^25.4.0", + "throat": "^5.0.0" } }, - "babel-jest": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-24.9.0.tgz", - "integrity": "sha512-ntuddfyiN+EhMw58PTNL1ph4C9rECiQXjI4nMMBKBaNjXvqLdkXpPRcMSr4iyBrJg/+wz9brFUD6RhOAT6r4Iw==", + "jest-leak-detector": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-25.4.0.tgz", + "integrity": "sha512-7Y6Bqfv2xWsB+7w44dvZuLs5SQ//fzhETgOGG7Gq3TTGFdYvAgXGwV8z159RFZ6fXiCPm/szQ90CyfVos9JIFQ==", "dev": true, "requires": { - "@jest/transform": "^24.9.0", - "@jest/types": "^24.9.0", - "@types/babel__core": "^7.1.0", - "babel-plugin-istanbul": "^5.1.0", - "babel-preset-jest": "^24.9.0", - "chalk": "^2.4.2", - "slash": "^2.0.0" + "jest-get-type": "^25.2.6", + "pretty-format": "^25.4.0" + } + }, + "jest-matcher-utils": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-25.4.0.tgz", + "integrity": "sha512-yPMdtj7YDgXhnGbc66bowk8AkQ0YwClbbwk3Kzhn5GVDrciiCr27U4NJRbrqXbTdtxjImONITg2LiRIw650k5A==", + "dev": true, + "requires": { + "chalk": "^3.0.0", + "jest-diff": "^25.4.0", + "jest-get-type": "^25.2.6", + "pretty-format": "^25.4.0" + } + }, + "jest-message-util": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-25.4.0.tgz", + "integrity": "sha512-LYY9hRcVGgMeMwmdfh9tTjeux1OjZHMusq/E5f3tJN+dAoVVkJtq5ZUEPIcB7bpxDUt2zjUsrwg0EGgPQ+OhXQ==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "@jest/types": "^25.4.0", + "@types/stack-utils": "^1.0.1", + "chalk": "^3.0.0", + "micromatch": "^4.0.2", + "slash": "^3.0.0", + "stack-utils": "^1.0.1" + } + }, + "jest-mock": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-25.4.0.tgz", + "integrity": "sha512-MdazSfcYAUjJjuVTTnusLPzE0pE4VXpOUzWdj8sbM+q6abUjm3bATVPXFqTXrxSieR8ocpvQ9v/QaQCftioQFg==", + "dev": true, + "requires": { + "@jest/types": "^25.4.0" + } + }, + "jest-regex-util": { + "version": "25.2.6", + "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-25.2.6.tgz", + "integrity": "sha512-KQqf7a0NrtCkYmZZzodPftn7fL1cq3GQAFVMn5Hg8uKx/fIenLEobNanUxb7abQ1sjADHBseG/2FGpsv/wr+Qw==", + "dev": true + }, + "jest-resolve": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-25.4.0.tgz", + "integrity": "sha512-wOsKqVDFWUiv8BtLMCC6uAJ/pHZkfFgoBTgPtmYlsprAjkxrr2U++ZnB3l5ykBMd2O24lXvf30SMAjJIW6k2aA==", + "dev": true, + "requires": { + "@jest/types": "^25.4.0", + "browser-resolve": "^1.11.3", + "chalk": "^3.0.0", + "jest-pnp-resolver": "^1.2.1", + "read-pkg-up": "^7.0.1", + "realpath-native": "^2.0.0", + "resolve": "^1.15.1", + "slash": "^3.0.0" }, "dependencies": { - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "resolve": { + "version": "1.16.1", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.16.1.tgz", + "integrity": "sha512-rmAglCSqWWMrrBv/XM6sW0NuRFiKViw/W4d9EbC4pt+49H8JwHy+mcGmALTEg504AUDcLTvb1T2q3E9AnmY+ig==", "dev": true, "requires": { - "has-flag": "^3.0.0" + "path-parse": "^1.0.6" } } } }, - "babel-plugin-jest-hoist": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-24.9.0.tgz", - "integrity": "sha512-2EMA2P8Vp7lG0RAzr4HXqtYwacfMErOuv1U3wrvxHX6rD1sV6xS3WXG3r8TRQ2r6w8OhvSdWt+z41hQNwNm3Xw==", + "jest-runner": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-25.4.0.tgz", + "integrity": "sha512-wWQSbVgj2e/1chFdMRKZdvlmA6p1IPujhpLT7TKNtCSl1B0PGBGvJjCaiBal/twaU2yfk8VKezHWexM8IliBfA==", "dev": true, "requires": { - "@types/babel__traverse": "^7.0.6" + "@jest/console": "^25.4.0", + "@jest/environment": "^25.4.0", + "@jest/test-result": "^25.4.0", + "@jest/types": "^25.4.0", + "chalk": "^3.0.0", + "exit": "^0.1.2", + "graceful-fs": "^4.2.3", + "jest-config": "^25.4.0", + "jest-docblock": "^25.3.0", + "jest-haste-map": "^25.4.0", + "jest-jasmine2": "^25.4.0", + "jest-leak-detector": "^25.4.0", + "jest-message-util": "^25.4.0", + "jest-resolve": "^25.4.0", + "jest-runtime": "^25.4.0", + "jest-util": "^25.4.0", + "jest-worker": "^25.4.0", + "source-map-support": "^0.5.6", + "throat": "^5.0.0" } }, - "babel-preset-jest": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-24.9.0.tgz", - "integrity": "sha512-izTUuhE4TMfTRPF92fFwD2QfdXaZW08qvWTFCI51V8rW5x00UuPgc3ajRoWofXOuxjfcOM5zzSYsQS3H8KGCAg==", - "dev": true, - "requires": { - "@babel/plugin-syntax-object-rest-spread": "^7.0.0", - "babel-plugin-jest-hoist": "^24.9.0" + "jest-runtime": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-25.4.0.tgz", + "integrity": "sha512-lgNJlCDULtXu9FumnwCyWlOub8iytijwsPNa30BKrSNtgoT6NUMXOPrZvsH06U6v0wgD/Igwz13nKA2wEKU2VA==", + "dev": true, + "requires": { + "@jest/console": "^25.4.0", + "@jest/environment": "^25.4.0", + "@jest/source-map": "^25.2.6", + "@jest/test-result": "^25.4.0", + "@jest/transform": "^25.4.0", + "@jest/types": "^25.4.0", + "@types/yargs": "^15.0.0", + "chalk": "^3.0.0", + "collect-v8-coverage": "^1.0.0", + "exit": "^0.1.2", + "glob": "^7.1.3", + "graceful-fs": "^4.2.3", + "jest-config": "^25.4.0", + "jest-haste-map": "^25.4.0", + "jest-message-util": "^25.4.0", + "jest-mock": "^25.4.0", + "jest-regex-util": "^25.2.6", + "jest-resolve": "^25.4.0", + "jest-snapshot": "^25.4.0", + "jest-util": "^25.4.0", + "jest-validate": "^25.4.0", + "realpath-native": "^2.0.0", + "slash": "^3.0.0", + "strip-bom": "^4.0.0", + "yargs": "^15.3.1" } }, - "callsites": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", - "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "jest-serializer": { + "version": "25.2.6", + "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-25.2.6.tgz", + "integrity": "sha512-RMVCfZsezQS2Ww4kB5HJTMaMJ0asmC0BHlnobQC6yEtxiFKIxohFA4QSXSabKwSggaNkqxn6Z2VwdFCjhUWuiQ==", "dev": true }, - "camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", - "dev": true + "jest-snapshot": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-25.4.0.tgz", + "integrity": "sha512-J4CJ0X2SaGheYRZdLz9CRHn9jUknVmlks4UBeu270hPAvdsauFXOhx9SQP2JtRzhnR3cvro/9N9KP83/uvFfRg==", + "dev": true, + "requires": { + "@babel/types": "^7.0.0", + "@jest/types": "^25.4.0", + "@types/prettier": "^1.19.0", + "chalk": "^3.0.0", + "expect": "^25.4.0", + "jest-diff": "^25.4.0", + "jest-get-type": "^25.2.6", + "jest-matcher-utils": "^25.4.0", + "jest-message-util": "^25.4.0", + "jest-resolve": "^25.4.0", + "make-dir": "^3.0.0", + "natural-compare": "^1.4.0", + "pretty-format": "^25.4.0", + "semver": "^6.3.0" + } }, - "cliui": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", - "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", + "jest-util": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-25.4.0.tgz", + "integrity": "sha512-WSZD59sBtAUjLv1hMeKbNZXmMcrLRWcYqpO8Dz8b4CeCTZpfNQw2q9uwrYAD+BbJoLJlu4ezVPwtAmM/9/SlZA==", "dev": true, "requires": { - "string-width": "^3.1.0", - "strip-ansi": "^5.2.0", - "wrap-ansi": "^5.1.0" + "@jest/types": "^25.4.0", + "chalk": "^3.0.0", + "is-ci": "^2.0.0", + "make-dir": "^3.0.0" } }, - "diff-sequences": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-24.9.0.tgz", - "integrity": "sha512-Dj6Wk3tWyTE+Fo1rW8v0Xhwk80um6yFYKbuAxc9c3EZxIHFDYwbi34Uk42u1CdnIiVorvt4RmlSDjIPyzGC2ew==", - "dev": true + "jest-validate": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-25.4.0.tgz", + "integrity": "sha512-hvjmes/EFVJSoeP1yOl8qR8mAtMR3ToBkZeXrD/ZS9VxRyWDqQ/E1C5ucMTeSmEOGLipvdlyipiGbHJ+R1MQ0g==", + "dev": true, + "requires": { + "@jest/types": "^25.4.0", + "camelcase": "^5.3.1", + "chalk": "^3.0.0", + "jest-get-type": "^25.2.6", + "leven": "^3.1.0", + "pretty-format": "^25.4.0" + } }, - "expect": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/expect/-/expect-24.9.0.tgz", - "integrity": "sha512-wvVAx8XIol3Z5m9zvZXiyZOQ+sRJqNTIm6sGjdWlaZIeupQGO3WbYI+15D/AmEwZywL6wtJkbAbJtzkOfBuR0Q==", + "jest-worker": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-25.4.0.tgz", + "integrity": "sha512-ghAs/1FtfYpMmYQ0AHqxV62XPvKdUDIBBApMZfly+E9JEmYh2K45G0R5dWxx986RN12pRCxsViwQVtGl+N4whw==", "dev": true, "requires": { - "@jest/types": "^24.9.0", - "ansi-styles": "^3.2.0", - "jest-get-type": "^24.9.0", - "jest-matcher-utils": "^24.9.0", - "jest-message-util": "^24.9.0", - "jest-regex-util": "^24.9.0" - }, - "dependencies": { - "jest-regex-util": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-24.9.0.tgz", - "integrity": "sha512-05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA==", - "dev": true - } + "merge-stream": "^2.0.0", + "supports-color": "^7.0.0" + } + }, + "jsdom": { + "version": "15.2.1", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-15.2.1.tgz", + "integrity": "sha512-fAl1W0/7T2G5vURSyxBzrJ1LSdQn6Tr5UX/xD4PXDx/PDgwygedfW6El/KIj3xJ7FU61TTYnc/l/B7P49Eqt6g==", + "dev": true, + "requires": { + "abab": "^2.0.0", + "acorn": "^7.1.0", + "acorn-globals": "^4.3.2", + "array-equal": "^1.0.0", + "cssom": "^0.4.1", + "cssstyle": "^2.0.0", + "data-urls": "^1.1.0", + "domexception": "^1.0.1", + "escodegen": "^1.11.1", + "html-encoding-sniffer": "^1.0.2", + "nwsapi": "^2.2.0", + "parse5": "5.1.0", + "pn": "^1.1.0", + "request": "^2.88.0", + "request-promise-native": "^1.0.7", + "saxes": "^3.1.9", + "symbol-tree": "^3.2.2", + "tough-cookie": "^3.0.1", + "w3c-hr-time": "^1.0.1", + "w3c-xmlserializer": "^1.1.2", + "webidl-conversions": "^4.0.2", + "whatwg-encoding": "^1.0.5", + "whatwg-mimetype": "^2.3.0", + "whatwg-url": "^7.0.0", + "ws": "^7.0.0", + "xml-name-validator": "^3.0.0" + } + }, + "json5": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz", + "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==", + "dev": true, + "requires": { + "minimist": "^1.2.5" } }, - "get-caller-file": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", - "dev": true + "locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dev": true, + "requires": { + "p-locate": "^4.1.0" + } }, - "jest-cli": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-24.9.0.tgz", - "integrity": "sha512-+VLRKyitT3BWoMeSUIHRxV/2g8y9gw91Jh5z2UmXZzkZKpbC08CSehVxgHUwTpy+HwGcns/tqafQDJW7imYvGg==", + "make-dir": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.0.2.tgz", + "integrity": "sha512-rYKABKutXa6vXTXhoV18cBE7PaewPXHe/Bdq4v+ZLMhxbWApkFFplT0LcbMW+6BbjnQXzZ/sAvSE/JdguApG5w==", "dev": true, "requires": { - "@jest/core": "^24.9.0", - "@jest/test-result": "^24.9.0", - "@jest/types": "^24.9.0", - "chalk": "^2.0.1", - "exit": "^0.1.2", - "import-local": "^2.0.0", - "is-ci": "^2.0.0", - "jest-config": "^24.9.0", - "jest-util": "^24.9.0", - "jest-validate": "^24.9.0", - "prompts": "^2.0.1", - "realpath-native": "^1.1.0", - "yargs": "^13.3.0" + "semver": "^6.0.0" } }, - "jest-config": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-24.9.0.tgz", - "integrity": "sha512-RATtQJtVYQrp7fvWg6f5y3pEFj9I+H8sWw4aKxnDZ96mob5i5SD6ZEGWgMLXQ4LE8UurrjbdlLWdUeo+28QpfQ==", + "merge-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", + "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", + "dev": true + }, + "micromatch": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz", + "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==", "dev": true, "requires": { - "@babel/core": "^7.1.0", - "@jest/test-sequencer": "^24.9.0", - "@jest/types": "^24.9.0", - "babel-jest": "^24.9.0", - "chalk": "^2.0.1", - "glob": "^7.1.1", - "jest-environment-jsdom": "^24.9.0", - "jest-environment-node": "^24.9.0", - "jest-get-type": "^24.9.0", - "jest-jasmine2": "^24.9.0", - "jest-regex-util": "^24.3.0", - "jest-resolve": "^24.9.0", - "jest-util": "^24.9.0", - "jest-validate": "^24.9.0", - "micromatch": "^3.1.10", - "pretty-format": "^24.9.0", - "realpath-native": "^1.1.0" + "braces": "^3.0.1", + "picomatch": "^2.0.5" } }, - "jest-diff": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-24.9.0.tgz", - "integrity": "sha512-qMfrTs8AdJE2iqrTp0hzh7kTd2PQWrsFyj9tORoKmu32xjPjeE4NyjVRDz8ybYwqS2ik8N4hsIpiVTyFeo2lBQ==", + "minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", + "dev": true + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "dev": true + }, + "nwsapi": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz", + "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==", + "dev": true + }, + "p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", "dev": true, "requires": { - "chalk": "^2.0.1", - "diff-sequences": "^24.9.0", - "jest-get-type": "^24.9.0", - "pretty-format": "^24.9.0" + "p-limit": "^2.2.0" } }, - "jest-each": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-24.9.0.tgz", - "integrity": "sha512-ONi0R4BvW45cw8s2Lrx8YgbeXL1oCQ/wIDwmsM3CqM/nlblNCPmnC3IPQlMbRFZu3wKdQ2U8BqM6lh3LJ5Bsog==", + "parse-json": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.0.0.tgz", + "integrity": "sha512-OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw==", "dev": true, "requires": { - "@jest/types": "^24.9.0", - "chalk": "^2.0.1", - "jest-get-type": "^24.9.0", - "jest-util": "^24.9.0", - "pretty-format": "^24.9.0" + "@babel/code-frame": "^7.0.0", + "error-ex": "^1.3.1", + "json-parse-better-errors": "^1.0.1", + "lines-and-columns": "^1.1.6" } }, - "jest-environment-jsdom": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-24.9.0.tgz", - "integrity": "sha512-Zv9FV9NBRzLuALXjvRijO2351DRQeLYXtpD4xNvfoVFw21IOKNhZAEUKcbiEtjTkm2GsJ3boMVgkaR7rN8qetA==", + "parse5": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.0.tgz", + "integrity": "sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ==", + "dev": true + }, + "path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true + }, + "pkg-dir": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", + "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", "dev": true, "requires": { - "@jest/environment": "^24.9.0", - "@jest/fake-timers": "^24.9.0", - "@jest/types": "^24.9.0", - "jest-mock": "^24.9.0", - "jest-util": "^24.9.0", - "jsdom": "^11.5.1" + "find-up": "^4.0.0" } }, - "jest-environment-node": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-24.9.0.tgz", - "integrity": "sha512-6d4V2f4nxzIzwendo27Tr0aFm+IXWa0XEUnaH6nU0FMaozxovt+sfRvh4J47wL1OvF83I3SSTu0XK+i4Bqe7uA==", + "pretty-format": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.4.0.tgz", + "integrity": "sha512-PI/2dpGjXK5HyXexLPZU/jw5T9Q6S1YVXxxVxco+LIqzUFHXIbKZKdUVt7GcX7QUCr31+3fzhi4gN4/wUYPVxQ==", "dev": true, "requires": { - "@jest/environment": "^24.9.0", - "@jest/fake-timers": "^24.9.0", - "@jest/types": "^24.9.0", - "jest-mock": "^24.9.0", - "jest-util": "^24.9.0" + "@jest/types": "^25.4.0", + "ansi-regex": "^5.0.0", + "ansi-styles": "^4.0.0", + "react-is": "^16.12.0" } }, - "jest-get-type": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-24.9.0.tgz", - "integrity": "sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q==", + "react-is": { + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", "dev": true }, - "jest-haste-map": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-24.9.0.tgz", - "integrity": "sha512-kfVFmsuWui2Sj1Rp1AJ4D9HqJwE4uwTlS/vO+eRUaMmd54BFpli2XhMQnPC2k4cHFVbB2Q2C+jtI1AGLgEnCjQ==", + "read-pkg": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz", + "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==", "dev": true, "requires": { - "@jest/types": "^24.9.0", - "anymatch": "^2.0.0", - "fb-watchman": "^2.0.0", - "fsevents": "^1.2.7", - "graceful-fs": "^4.1.15", - "invariant": "^2.2.4", - "jest-serializer": "^24.9.0", - "jest-util": "^24.9.0", - "jest-worker": "^24.9.0", - "micromatch": "^3.1.10", - "sane": "^4.0.3", - "walker": "^1.0.7" + "@types/normalize-package-data": "^2.4.0", + "normalize-package-data": "^2.5.0", + "parse-json": "^5.0.0", + "type-fest": "^0.6.0" + }, + "dependencies": { + "type-fest": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz", + "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==", + "dev": true + } } }, - "jest-jasmine2": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-24.9.0.tgz", - "integrity": "sha512-Cq7vkAgaYKp+PsX+2/JbTarrk0DmNhsEtqBXNwUHkdlbrTBLtMJINADf2mf5FkowNsq8evbPc07/qFO0AdKTzw==", + "read-pkg-up": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz", + "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==", "dev": true, "requires": { - "@babel/traverse": "^7.1.0", - "@jest/environment": "^24.9.0", - "@jest/test-result": "^24.9.0", - "@jest/types": "^24.9.0", - "chalk": "^2.0.1", - "co": "^4.6.0", - "expect": "^24.9.0", - "is-generator-fn": "^2.0.0", - "jest-each": "^24.9.0", - "jest-matcher-utils": "^24.9.0", - "jest-message-util": "^24.9.0", - "jest-runtime": "^24.9.0", - "jest-snapshot": "^24.9.0", - "jest-util": "^24.9.0", - "pretty-format": "^24.9.0", - "throat": "^4.0.0" + "find-up": "^4.1.0", + "read-pkg": "^5.2.0", + "type-fest": "^0.8.1" } }, - "jest-leak-detector": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-24.9.0.tgz", - "integrity": "sha512-tYkFIDsiKTGwb2FG1w8hX9V0aUb2ot8zY/2nFg087dUageonw1zrLMP4W6zsRO59dPkTSKie+D4rhMuP9nRmrA==", - "dev": true, - "requires": { - "jest-get-type": "^24.9.0", - "pretty-format": "^24.9.0" - } + "realpath-native": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/realpath-native/-/realpath-native-2.0.0.tgz", + "integrity": "sha512-v1SEYUOXXdbBZK8ZuNgO4TBjamPsiSgcFr0aP+tEKpQZK8vooEUqV6nm6Cv502mX4NF2EfsnVqtNAHG+/6Ur1Q==", + "dev": true }, - "jest-matcher-utils": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-24.9.0.tgz", - "integrity": "sha512-OZz2IXsu6eaiMAwe67c1T+5tUAtQyQx27/EMEkbFAGiw52tB9em+uGbzpcgYVpA8wl0hlxKPZxrly4CXU/GjHA==", + "require-main-filename": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", + "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", + "dev": true + }, + "resolve-cwd": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz", + "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==", "dev": true, "requires": { - "chalk": "^2.0.1", - "jest-diff": "^24.9.0", - "jest-get-type": "^24.9.0", - "pretty-format": "^24.9.0" + "resolve-from": "^5.0.0" } }, - "jest-message-util": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-24.9.0.tgz", - "integrity": "sha512-oCj8FiZ3U0hTP4aSui87P4L4jC37BtQwUMqk+zk/b11FR19BJDeZsZAvIHutWnmtw7r85UmR3CEWZ0HWU2mAlw==", + "resolve-from": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", + "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", + "dev": true + }, + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true + }, + "slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true + }, + "string-width": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", + "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", "dev": true, "requires": { - "@babel/code-frame": "^7.0.0", - "@jest/test-result": "^24.9.0", - "@jest/types": "^24.9.0", - "@types/stack-utils": "^1.0.1", - "chalk": "^2.0.1", - "micromatch": "^3.1.10", - "slash": "^2.0.0", - "stack-utils": "^1.0.1" + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" } }, - "jest-mock": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-24.9.0.tgz", - "integrity": "sha512-3BEYN5WbSq9wd+SyLDES7AHnjH9A/ROBwmz7l2y+ol+NtSFO8DYiEBzoO1CeFc9a8DYy10EO4dDFVv/wN3zl1w==", + "strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", "dev": true, "requires": { - "@jest/types": "^24.9.0" + "ansi-regex": "^5.0.0" } }, - "jest-resolve": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-24.9.0.tgz", - "integrity": "sha512-TaLeLVL1l08YFZAt3zaPtjiVvyy4oSA6CRe+0AFPPVX3Q/VI0giIWWoAvoS5L96vj9Dqxj4fB5p2qrHCmTU/MQ==", + "strip-bom": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz", + "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==", + "dev": true + }, + "supports-color": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", "dev": true, "requires": { - "@jest/types": "^24.9.0", - "browser-resolve": "^1.11.3", - "chalk": "^2.0.1", - "jest-pnp-resolver": "^1.2.1", - "realpath-native": "^1.1.0" + "has-flag": "^4.0.0" } }, - "jest-runner": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-24.9.0.tgz", - "integrity": "sha512-KksJQyI3/0mhcfspnxxEOBueGrd5E4vV7ADQLT9ESaCzz02WnbdbKWIf5Mkaucoaj7obQckYPVX6JJhgUcoWWg==", + "test-exclude": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", + "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==", "dev": true, "requires": { - "@jest/console": "^24.7.1", - "@jest/environment": "^24.9.0", - "@jest/test-result": "^24.9.0", - "@jest/types": "^24.9.0", - "chalk": "^2.4.2", - "exit": "^0.1.2", - "graceful-fs": "^4.1.15", - "jest-config": "^24.9.0", - "jest-docblock": "^24.3.0", - "jest-haste-map": "^24.9.0", - "jest-jasmine2": "^24.9.0", - "jest-leak-detector": "^24.9.0", - "jest-message-util": "^24.9.0", - "jest-resolve": "^24.9.0", - "jest-runtime": "^24.9.0", - "jest-util": "^24.9.0", - "jest-worker": "^24.6.0", - "source-map-support": "^0.5.6", - "throat": "^4.0.0" + "@istanbuljs/schema": "^0.1.2", + "glob": "^7.1.4", + "minimatch": "^3.0.4" }, "dependencies": { - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "glob": { + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", + "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", "dev": true, "requires": { - "has-flag": "^3.0.0" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } } } }, - "jest-runtime": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-24.9.0.tgz", - "integrity": "sha512-8oNqgnmF3v2J6PVRM2Jfuj8oX3syKmaynlDMMKQ4iyzbQzIG6th5ub/lM2bCMTmoTKM3ykcUYI2Pw9xwNtjMnw==", + "throat": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/throat/-/throat-5.0.0.tgz", + "integrity": "sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA==", + "dev": true + }, + "to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", "dev": true, "requires": { - "@jest/console": "^24.7.1", - "@jest/environment": "^24.9.0", - "@jest/source-map": "^24.3.0", - "@jest/transform": "^24.9.0", - "@jest/types": "^24.9.0", - "@types/yargs": "^13.0.0", - "chalk": "^2.0.1", - "exit": "^0.1.2", - "glob": "^7.1.3", - "graceful-fs": "^4.1.15", - "jest-config": "^24.9.0", - "jest-haste-map": "^24.9.0", - "jest-message-util": "^24.9.0", - "jest-mock": "^24.9.0", - "jest-regex-util": "^24.3.0", - "jest-resolve": "^24.9.0", - "jest-snapshot": "^24.9.0", - "jest-util": "^24.9.0", - "jest-validate": "^24.9.0", - "realpath-native": "^1.1.0", - "slash": "^2.0.0", - "strip-bom": "^3.0.0", - "yargs": "^13.3.0" + "is-number": "^7.0.0" } }, - "jest-serializer": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-24.9.0.tgz", - "integrity": "sha512-DxYipDr8OvfrKH3Kel6NdED3OXxjvxXZ1uIY2I9OFbGg+vUkkg7AGvi65qbhbWNPvDckXmzMPbK3u3HaDO49bQ==", + "tough-cookie": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz", + "integrity": "sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==", + "dev": true, + "requires": { + "ip-regex": "^2.1.0", + "psl": "^1.1.28", + "punycode": "^2.1.1" + } + }, + "type-fest": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", + "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", "dev": true }, - "jest-snapshot": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-24.9.0.tgz", - "integrity": "sha512-uI/rszGSs73xCM0l+up7O7a40o90cnrk429LOiK3aeTvfC0HHmldbd81/B7Ix81KSFe1lwkbl7GnBGG4UfuDew==", + "whatwg-url": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz", + "integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==", "dev": true, "requires": { - "@babel/types": "^7.0.0", - "@jest/types": "^24.9.0", - "chalk": "^2.0.1", - "expect": "^24.9.0", - "jest-diff": "^24.9.0", - "jest-get-type": "^24.9.0", - "jest-matcher-utils": "^24.9.0", - "jest-message-util": "^24.9.0", - "jest-resolve": "^24.9.0", - "mkdirp": "^0.5.1", - "natural-compare": "^1.4.0", - "pretty-format": "^24.9.0", - "semver": "^6.2.0" + "lodash.sortby": "^4.7.0", + "tr46": "^1.0.1", + "webidl-conversions": "^4.0.2" } }, - "jest-util": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-24.9.0.tgz", - "integrity": "sha512-x+cZU8VRmOJxbA1K5oDBdxQmdq0OIdADarLxk0Mq+3XS4jgvhG/oKGWcIDCtPG0HgjxOYvF+ilPJQsAyXfbNOg==", + "which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", "dev": true, "requires": { - "@jest/console": "^24.9.0", - "@jest/fake-timers": "^24.9.0", - "@jest/source-map": "^24.9.0", - "@jest/test-result": "^24.9.0", - "@jest/types": "^24.9.0", - "callsites": "^3.0.0", - "chalk": "^2.0.1", - "graceful-fs": "^4.1.15", - "is-ci": "^2.0.0", - "mkdirp": "^0.5.1", - "slash": "^2.0.0", - "source-map": "^0.6.0" + "isexe": "^2.0.0" } }, - "jest-validate": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-24.9.0.tgz", - "integrity": "sha512-HPIt6C5ACwiqSiwi+OfSSHbK8sG7akG8eATl+IPKaeIjtPOeBUd/g3J7DghugzxrGjI93qS/+RPKe1H6PqvhRQ==", + "wrap-ansi": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", + "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", "dev": true, "requires": { - "@jest/types": "^24.9.0", - "camelcase": "^5.3.1", - "chalk": "^2.0.1", - "jest-get-type": "^24.9.0", - "leven": "^3.1.0", - "pretty-format": "^24.9.0" + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" } }, - "jest-worker": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.9.0.tgz", - "integrity": "sha512-51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw==", + "write-file-atomic": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz", + "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==", "dev": true, "requires": { - "merge-stream": "^2.0.0", - "supports-color": "^6.1.0" + "imurmurhash": "^0.1.4", + "is-typedarray": "^1.0.0", + "signal-exit": "^3.0.2", + "typedarray-to-buffer": "^3.1.5" } }, - "leven": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz", - "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==", + "ws": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.2.3.tgz", + "integrity": "sha512-HTDl9G9hbkNDk98naoR/cHDws7+EyYMOdL1BmjsZXRUjf7d+MficC4B7HLUPlSiho0vg+CWKrGIt/VJBd1xunQ==", "dev": true }, - "merge-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", - "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", - "dev": true + "yargs": { + "version": "15.3.1", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.3.1.tgz", + "integrity": "sha512-92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA==", + "dev": true, + "requires": { + "cliui": "^6.0.0", + "decamelize": "^1.2.0", + "find-up": "^4.1.0", + "get-caller-file": "^2.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^2.0.0", + "set-blocking": "^2.0.0", + "string-width": "^4.2.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^18.1.1" + } }, - "pretty-format": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz", - "integrity": "sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==", + "yargs-parser": { + "version": "18.1.3", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz", + "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==", "dev": true, "requires": { - "@jest/types": "^24.9.0", - "ansi-regex": "^4.0.0", - "ansi-styles": "^3.2.0", - "react-is": "^16.8.4" + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" + } + } + } + }, + "jest-changed-files": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-25.4.0.tgz", + "integrity": "sha512-VR/rfJsEs4BVMkwOTuStRyS630fidFVekdw/lBaBQjx9KK3VZFOZ2c0fsom2fRp8pMCrCTP6LGna00o/DXGlqA==", + "dev": true, + "requires": { + "@jest/types": "^25.4.0", + "execa": "^3.2.0", + "throat": "^5.0.0" + }, + "dependencies": { + "@jest/types": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.4.0.tgz", + "integrity": "sha512-XBeaWNzw2PPnGW5aXvZt3+VO60M+34RY3XDsCK5tW7kyj3RK0XClRutCfjqcBuaR2aBQTbluEDME9b5MB9UAPw==", + "dev": true, + "requires": { + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^1.1.1", + "@types/yargs": "^15.0.0", + "chalk": "^3.0.0" } }, - "require-main-filename": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", - "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", - "dev": true + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "dev": true, + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } }, - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true + "chalk": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } }, - "string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" + "color-name": "~1.1.4" } }, - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "cross-spawn": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.2.tgz", + "integrity": "sha512-PD6G8QG3S4FK/XCGFbEQrDqO2AnMMsy0meR7lerlIOHAAbkuavGU/pOqprrlvfTNjvowivTeBsjebAL0NSoMxw==", "dev": true, "requires": { - "ansi-regex": "^4.1.0" + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" } }, - "supports-color": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", - "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "execa": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-3.4.0.tgz", + "integrity": "sha512-r9vdGQk4bmCuK1yKQu1KTwcT2zwfWdbdaXfCtAh+5nU/4fSX+JAb7vZGvI5naJrQlvONrEB20jeruESI69530g==", "dev": true, "requires": { - "has-flag": "^3.0.0" + "cross-spawn": "^7.0.0", + "get-stream": "^5.0.0", + "human-signals": "^1.1.1", + "is-stream": "^2.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^4.0.0", + "onetime": "^5.1.0", + "p-finally": "^2.0.0", + "signal-exit": "^3.0.2", + "strip-final-newline": "^2.0.0" } }, - "wrap-ansi": { + "get-stream": { "version": "5.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", - "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz", + "integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==", "dev": true, "requires": { - "ansi-styles": "^3.2.0", - "string-width": "^3.0.0", - "strip-ansi": "^5.0.0" + "pump": "^3.0.0" } }, - "yargs": { - "version": "13.3.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz", - "integrity": "sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==", + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "is-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz", + "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==", + "dev": true + }, + "merge-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", + "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", + "dev": true + }, + "mimic-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "dev": true + }, + "npm-run-path": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", + "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", "dev": true, "requires": { - "cliui": "^5.0.0", - "find-up": "^3.0.0", - "get-caller-file": "^2.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", - "set-blocking": "^2.0.0", - "string-width": "^3.0.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^13.1.1" + "path-key": "^3.0.0" } }, - "yargs-parser": { - "version": "13.1.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz", - "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==", + "onetime": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz", + "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==", "dev": true, "requires": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" + "mimic-fn": "^2.1.0" } - } - } - }, - "jest-changed-files": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-24.9.0.tgz", - "integrity": "sha512-6aTWpe2mHF0DhL28WjdkO8LyGjs3zItPET4bMSeXU6T3ub4FPMw+mcOcbdGXQOAfmLcxofD23/5Bl9Z4AkFwqg==", - "dev": true, - "requires": { - "@jest/types": "^24.9.0", - "execa": "^1.0.0", - "throat": "^4.0.0" - }, - "dependencies": { - "@jest/types": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz", - "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==", + }, + "p-finally": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-2.0.1.tgz", + "integrity": "sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw==", + "dev": true + }, + "path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true + }, + "shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", "dev": true, "requires": { - "@types/istanbul-lib-coverage": "^2.0.0", - "@types/istanbul-reports": "^1.1.1", - "@types/yargs": "^13.0.0" + "shebang-regex": "^3.0.0" } }, - "@types/yargs": { - "version": "13.0.2", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.2.tgz", - "integrity": "sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ==", + "shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true + }, + "supports-color": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", "dev": true, "requires": { - "@types/yargs-parser": "*" + "has-flag": "^4.0.0" + } + }, + "throat": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/throat/-/throat-5.0.0.tgz", + "integrity": "sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA==", + "dev": true + }, + "which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, + "requires": { + "isexe": "^2.0.0" } } } @@ -10974,193 +13448,335 @@ } }, "jest-resolve-dependencies": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-24.9.0.tgz", - "integrity": "sha512-Fm7b6AlWnYhT0BXy4hXpactHIqER7erNgIsIozDXWl5dVm+k8XdGVe1oTg1JyaFnOxarMEbax3wyRJqGP2Pq+g==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-25.4.0.tgz", + "integrity": "sha512-A0eoZXx6kLiuG1Ui7wITQPl04HwjLErKIJTt8GR3c7UoDAtzW84JtCrgrJ6Tkw6c6MwHEyAaLk7dEPml5pf48A==", "dev": true, "requires": { - "@jest/types": "^24.9.0", - "jest-regex-util": "^24.3.0", - "jest-snapshot": "^24.9.0" + "@jest/types": "^25.4.0", + "jest-regex-util": "^25.2.6", + "jest-snapshot": "^25.4.0" }, "dependencies": { - "@jest/console": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/console/-/console-24.9.0.tgz", - "integrity": "sha512-Zuj6b8TnKXi3q4ymac8EQfc3ea/uhLeCGThFqXeC8H9/raaH8ARPUTdId+XyGd03Z4In0/VjD2OYFcBF09fNLQ==", + "@jest/types": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.4.0.tgz", + "integrity": "sha512-XBeaWNzw2PPnGW5aXvZt3+VO60M+34RY3XDsCK5tW7kyj3RK0XClRutCfjqcBuaR2aBQTbluEDME9b5MB9UAPw==", "dev": true, "requires": { - "@jest/source-map": "^24.9.0", - "chalk": "^2.0.1", - "slash": "^2.0.0" + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^1.1.1", + "@types/yargs": "^15.0.0", + "chalk": "^3.0.0" } }, - "@jest/source-map": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-24.9.0.tgz", - "integrity": "sha512-/Xw7xGlsZb4MJzNDgB7PW5crou5JqWiBQaz6xyPd3ArOg2nfn/PunV8+olXbbEZzNl591o5rWKE9BRDaFAuIBg==", + "ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "dev": true + }, + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", "dev": true, "requires": { - "callsites": "^3.0.0", - "graceful-fs": "^4.1.15", - "source-map": "^0.6.0" + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" } }, - "@jest/test-result": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-24.9.0.tgz", - "integrity": "sha512-XEFrHbBonBJ8dGp2JmF8kP/nQI/ImPpygKHwQ/SY+es59Z3L5PI4Qb9TQQMAEeYsThG1xF0k6tmG0tIKATNiiA==", + "braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", "dev": true, "requires": { - "@jest/console": "^24.9.0", - "@jest/types": "^24.9.0", - "@types/istanbul-lib-coverage": "^2.0.0" + "fill-range": "^7.0.1" } }, - "@jest/types": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz", - "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==", + "chalk": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", "dev": true, "requires": { - "@types/istanbul-lib-coverage": "^2.0.0", - "@types/istanbul-reports": "^1.1.1", - "@types/yargs": "^13.0.0" + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" } }, - "@types/yargs": { - "version": "13.0.2", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.2.tgz", - "integrity": "sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ==", + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, "requires": { - "@types/yargs-parser": "*" + "color-name": "~1.1.4" } }, - "callsites": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", - "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, "diff-sequences": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-24.9.0.tgz", - "integrity": "sha512-Dj6Wk3tWyTE+Fo1rW8v0Xhwk80um6yFYKbuAxc9c3EZxIHFDYwbi34Uk42u1CdnIiVorvt4RmlSDjIPyzGC2ew==", + "version": "25.2.6", + "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-25.2.6.tgz", + "integrity": "sha512-Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg==", "dev": true }, "expect": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/expect/-/expect-24.9.0.tgz", - "integrity": "sha512-wvVAx8XIol3Z5m9zvZXiyZOQ+sRJqNTIm6sGjdWlaZIeupQGO3WbYI+15D/AmEwZywL6wtJkbAbJtzkOfBuR0Q==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/expect/-/expect-25.4.0.tgz", + "integrity": "sha512-7BDIX99BTi12/sNGJXA9KMRcby4iAmu1xccBOhyKCyEhjcVKS3hPmHdA/4nSI9QGIOkUropKqr3vv7WMDM5lvQ==", "dev": true, "requires": { - "@jest/types": "^24.9.0", - "ansi-styles": "^3.2.0", - "jest-get-type": "^24.9.0", - "jest-matcher-utils": "^24.9.0", - "jest-message-util": "^24.9.0", - "jest-regex-util": "^24.9.0" - }, - "dependencies": { - "jest-regex-util": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-24.9.0.tgz", - "integrity": "sha512-05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA==", - "dev": true - } + "@jest/types": "^25.4.0", + "ansi-styles": "^4.0.0", + "jest-get-type": "^25.2.6", + "jest-matcher-utils": "^25.4.0", + "jest-message-util": "^25.4.0", + "jest-regex-util": "^25.2.6" + } + }, + "fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "dev": true, + "requires": { + "to-regex-range": "^5.0.1" } }, + "find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dev": true, + "requires": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + } + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true + }, "jest-diff": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-24.9.0.tgz", - "integrity": "sha512-qMfrTs8AdJE2iqrTp0hzh7kTd2PQWrsFyj9tORoKmu32xjPjeE4NyjVRDz8ybYwqS2ik8N4hsIpiVTyFeo2lBQ==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-25.4.0.tgz", + "integrity": "sha512-kklLbJVXW0y8UKOWOdYhI6TH5MG6QAxrWiBMgQaPIuhj3dNFGirKCd+/xfplBXICQ7fI+3QcqHm9p9lWu1N6ug==", "dev": true, "requires": { - "chalk": "^2.0.1", - "diff-sequences": "^24.9.0", - "jest-get-type": "^24.9.0", - "pretty-format": "^24.9.0" + "chalk": "^3.0.0", + "diff-sequences": "^25.2.6", + "jest-get-type": "^25.2.6", + "pretty-format": "^25.4.0" } }, "jest-get-type": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-24.9.0.tgz", - "integrity": "sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q==", + "version": "25.2.6", + "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-25.2.6.tgz", + "integrity": "sha512-DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig==", "dev": true }, "jest-matcher-utils": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-24.9.0.tgz", - "integrity": "sha512-OZz2IXsu6eaiMAwe67c1T+5tUAtQyQx27/EMEkbFAGiw52tB9em+uGbzpcgYVpA8wl0hlxKPZxrly4CXU/GjHA==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-25.4.0.tgz", + "integrity": "sha512-yPMdtj7YDgXhnGbc66bowk8AkQ0YwClbbwk3Kzhn5GVDrciiCr27U4NJRbrqXbTdtxjImONITg2LiRIw650k5A==", "dev": true, "requires": { - "chalk": "^2.0.1", - "jest-diff": "^24.9.0", - "jest-get-type": "^24.9.0", - "pretty-format": "^24.9.0" + "chalk": "^3.0.0", + "jest-diff": "^25.4.0", + "jest-get-type": "^25.2.6", + "pretty-format": "^25.4.0" } }, "jest-message-util": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-24.9.0.tgz", - "integrity": "sha512-oCj8FiZ3U0hTP4aSui87P4L4jC37BtQwUMqk+zk/b11FR19BJDeZsZAvIHutWnmtw7r85UmR3CEWZ0HWU2mAlw==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-25.4.0.tgz", + "integrity": "sha512-LYY9hRcVGgMeMwmdfh9tTjeux1OjZHMusq/E5f3tJN+dAoVVkJtq5ZUEPIcB7bpxDUt2zjUsrwg0EGgPQ+OhXQ==", "dev": true, "requires": { "@babel/code-frame": "^7.0.0", - "@jest/test-result": "^24.9.0", - "@jest/types": "^24.9.0", + "@jest/types": "^25.4.0", "@types/stack-utils": "^1.0.1", - "chalk": "^2.0.1", - "micromatch": "^3.1.10", - "slash": "^2.0.0", + "chalk": "^3.0.0", + "micromatch": "^4.0.2", + "slash": "^3.0.0", "stack-utils": "^1.0.1" } }, + "jest-regex-util": { + "version": "25.2.6", + "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-25.2.6.tgz", + "integrity": "sha512-KQqf7a0NrtCkYmZZzodPftn7fL1cq3GQAFVMn5Hg8uKx/fIenLEobNanUxb7abQ1sjADHBseG/2FGpsv/wr+Qw==", + "dev": true + }, "jest-resolve": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-24.9.0.tgz", - "integrity": "sha512-TaLeLVL1l08YFZAt3zaPtjiVvyy4oSA6CRe+0AFPPVX3Q/VI0giIWWoAvoS5L96vj9Dqxj4fB5p2qrHCmTU/MQ==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-25.4.0.tgz", + "integrity": "sha512-wOsKqVDFWUiv8BtLMCC6uAJ/pHZkfFgoBTgPtmYlsprAjkxrr2U++ZnB3l5ykBMd2O24lXvf30SMAjJIW6k2aA==", "dev": true, "requires": { - "@jest/types": "^24.9.0", + "@jest/types": "^25.4.0", "browser-resolve": "^1.11.3", - "chalk": "^2.0.1", + "chalk": "^3.0.0", "jest-pnp-resolver": "^1.2.1", - "realpath-native": "^1.1.0" + "read-pkg-up": "^7.0.1", + "realpath-native": "^2.0.0", + "resolve": "^1.15.1", + "slash": "^3.0.0" + } + }, + "jest-snapshot": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-25.4.0.tgz", + "integrity": "sha512-J4CJ0X2SaGheYRZdLz9CRHn9jUknVmlks4UBeu270hPAvdsauFXOhx9SQP2JtRzhnR3cvro/9N9KP83/uvFfRg==", + "dev": true, + "requires": { + "@babel/types": "^7.0.0", + "@jest/types": "^25.4.0", + "@types/prettier": "^1.19.0", + "chalk": "^3.0.0", + "expect": "^25.4.0", + "jest-diff": "^25.4.0", + "jest-get-type": "^25.2.6", + "jest-matcher-utils": "^25.4.0", + "jest-message-util": "^25.4.0", + "jest-resolve": "^25.4.0", + "make-dir": "^3.0.0", + "natural-compare": "^1.4.0", + "pretty-format": "^25.4.0", + "semver": "^6.3.0" + } + }, + "locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dev": true, + "requires": { + "p-locate": "^4.1.0" + } + }, + "make-dir": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.0.2.tgz", + "integrity": "sha512-rYKABKutXa6vXTXhoV18cBE7PaewPXHe/Bdq4v+ZLMhxbWApkFFplT0LcbMW+6BbjnQXzZ/sAvSE/JdguApG5w==", + "dev": true, + "requires": { + "semver": "^6.0.0" + } + }, + "micromatch": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz", + "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==", + "dev": true, + "requires": { + "braces": "^3.0.1", + "picomatch": "^2.0.5" + } + }, + "p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dev": true, + "requires": { + "p-limit": "^2.2.0" + } + }, + "parse-json": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.0.0.tgz", + "integrity": "sha512-OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "error-ex": "^1.3.1", + "json-parse-better-errors": "^1.0.1", + "lines-and-columns": "^1.1.6" + } + }, + "path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true + }, + "pretty-format": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.4.0.tgz", + "integrity": "sha512-PI/2dpGjXK5HyXexLPZU/jw5T9Q6S1YVXxxVxco+LIqzUFHXIbKZKdUVt7GcX7QUCr31+3fzhi4gN4/wUYPVxQ==", + "dev": true, + "requires": { + "@jest/types": "^25.4.0", + "ansi-regex": "^5.0.0", + "ansi-styles": "^4.0.0", + "react-is": "^16.12.0" + } + }, + "react-is": { + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", + "dev": true + }, + "read-pkg": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz", + "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==", + "dev": true, + "requires": { + "@types/normalize-package-data": "^2.4.0", + "normalize-package-data": "^2.5.0", + "parse-json": "^5.0.0", + "type-fest": "^0.6.0" + }, + "dependencies": { + "type-fest": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz", + "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==", + "dev": true + } } }, - "jest-snapshot": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-24.9.0.tgz", - "integrity": "sha512-uI/rszGSs73xCM0l+up7O7a40o90cnrk429LOiK3aeTvfC0HHmldbd81/B7Ix81KSFe1lwkbl7GnBGG4UfuDew==", + "read-pkg-up": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz", + "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==", "dev": true, "requires": { - "@babel/types": "^7.0.0", - "@jest/types": "^24.9.0", - "chalk": "^2.0.1", - "expect": "^24.9.0", - "jest-diff": "^24.9.0", - "jest-get-type": "^24.9.0", - "jest-matcher-utils": "^24.9.0", - "jest-message-util": "^24.9.0", - "jest-resolve": "^24.9.0", - "mkdirp": "^0.5.1", - "natural-compare": "^1.4.0", - "pretty-format": "^24.9.0", - "semver": "^6.2.0" + "find-up": "^4.1.0", + "read-pkg": "^5.2.0", + "type-fest": "^0.8.1" } }, - "pretty-format": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz", - "integrity": "sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==", + "realpath-native": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/realpath-native/-/realpath-native-2.0.0.tgz", + "integrity": "sha512-v1SEYUOXXdbBZK8ZuNgO4TBjamPsiSgcFr0aP+tEKpQZK8vooEUqV6nm6Cv502mX4NF2EfsnVqtNAHG+/6Ur1Q==", + "dev": true + }, + "resolve": { + "version": "1.16.1", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.16.1.tgz", + "integrity": "sha512-rmAglCSqWWMrrBv/XM6sW0NuRFiKViw/W4d9EbC4pt+49H8JwHy+mcGmALTEg504AUDcLTvb1T2q3E9AnmY+ig==", "dev": true, "requires": { - "@jest/types": "^24.9.0", - "ansi-regex": "^4.0.0", - "ansi-styles": "^3.2.0", - "react-is": "^16.8.4" + "path-parse": "^1.0.6" } }, "semver": { @@ -11168,6 +13784,36 @@ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", "dev": true + }, + "slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true + }, + "supports-color": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + }, + "to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "requires": { + "is-number": "^7.0.0" + } + }, + "type-fest": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", + "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", + "dev": true } } }, @@ -11598,134 +14244,211 @@ } }, "jest-watcher": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-24.9.0.tgz", - "integrity": "sha512-+/fLOfKPXXYJDYlks62/4R4GoT+GU1tYZed99JSCOsmzkkF7727RqKrjNAxtfO4YpGv11wybgRvCjR73lK2GZw==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-25.4.0.tgz", + "integrity": "sha512-36IUfOSRELsKLB7k25j/wutx0aVuHFN6wO94gPNjQtQqFPa2rkOymmx9rM5EzbF3XBZZ2oqD9xbRVoYa2w86gw==", "dev": true, "requires": { - "@jest/test-result": "^24.9.0", - "@jest/types": "^24.9.0", - "@types/yargs": "^13.0.0", - "ansi-escapes": "^3.0.0", - "chalk": "^2.0.1", - "jest-util": "^24.9.0", - "string-length": "^2.0.0" + "@jest/test-result": "^25.4.0", + "@jest/types": "^25.4.0", + "ansi-escapes": "^4.2.1", + "chalk": "^3.0.0", + "jest-util": "^25.4.0", + "string-length": "^3.1.0" }, "dependencies": { "@jest/console": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/console/-/console-24.9.0.tgz", - "integrity": "sha512-Zuj6b8TnKXi3q4ymac8EQfc3ea/uhLeCGThFqXeC8H9/raaH8ARPUTdId+XyGd03Z4In0/VjD2OYFcBF09fNLQ==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/@jest/console/-/console-25.4.0.tgz", + "integrity": "sha512-CfE0erx4hdJ6t7RzAcE1wLG6ZzsHSmybvIBQDoCkDM1QaSeWL9wJMzID/2BbHHa7ll9SsbbK43HjbERbBaFX2A==", "dev": true, "requires": { - "@jest/source-map": "^24.9.0", - "chalk": "^2.0.1", - "slash": "^2.0.0" + "@jest/types": "^25.4.0", + "chalk": "^3.0.0", + "jest-message-util": "^25.4.0", + "jest-util": "^25.4.0", + "slash": "^3.0.0" } }, - "@jest/fake-timers": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-24.9.0.tgz", - "integrity": "sha512-eWQcNa2YSwzXWIMC5KufBh3oWRIijrQFROsIqt6v/NS9Io/gknw1jsAC9c+ih/RQX4A3O7SeWAhQeN0goKhT9A==", + "@jest/test-result": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-25.4.0.tgz", + "integrity": "sha512-8BAKPaMCHlL941eyfqhWbmp3MebtzywlxzV+qtngQ3FH+RBqnoSAhNEPj4MG7d2NVUrMOVfrwuzGpVIK+QnMAA==", "dev": true, "requires": { - "@jest/types": "^24.9.0", - "jest-message-util": "^24.9.0", - "jest-mock": "^24.9.0" + "@jest/console": "^25.4.0", + "@jest/types": "^25.4.0", + "@types/istanbul-lib-coverage": "^2.0.0", + "collect-v8-coverage": "^1.0.0" } }, - "@jest/source-map": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-24.9.0.tgz", - "integrity": "sha512-/Xw7xGlsZb4MJzNDgB7PW5crou5JqWiBQaz6xyPd3ArOg2nfn/PunV8+olXbbEZzNl591o5rWKE9BRDaFAuIBg==", + "@jest/types": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.4.0.tgz", + "integrity": "sha512-XBeaWNzw2PPnGW5aXvZt3+VO60M+34RY3XDsCK5tW7kyj3RK0XClRutCfjqcBuaR2aBQTbluEDME9b5MB9UAPw==", "dev": true, "requires": { - "callsites": "^3.0.0", - "graceful-fs": "^4.1.15", - "source-map": "^0.6.0" + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^1.1.1", + "@types/yargs": "^15.0.0", + "chalk": "^3.0.0" } }, - "@jest/test-result": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-24.9.0.tgz", - "integrity": "sha512-XEFrHbBonBJ8dGp2JmF8kP/nQI/ImPpygKHwQ/SY+es59Z3L5PI4Qb9TQQMAEeYsThG1xF0k6tmG0tIKATNiiA==", + "ansi-escapes": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz", + "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==", "dev": true, "requires": { - "@jest/console": "^24.9.0", - "@jest/types": "^24.9.0", - "@types/istanbul-lib-coverage": "^2.0.0" + "type-fest": "^0.11.0" } }, - "@jest/types": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz", - "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==", + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", "dev": true, "requires": { - "@types/istanbul-lib-coverage": "^2.0.0", - "@types/istanbul-reports": "^1.1.1", - "@types/yargs": "^13.0.0" + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" } }, - "@types/yargs": { - "version": "13.0.2", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.2.tgz", - "integrity": "sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ==", + "braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", "dev": true, "requires": { - "@types/yargs-parser": "*" + "fill-range": "^7.0.1" } }, - "callsites": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", - "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "chalk": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "dev": true, + "requires": { + "to-regex-range": "^5.0.1" + } + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", "dev": true }, "jest-message-util": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-24.9.0.tgz", - "integrity": "sha512-oCj8FiZ3U0hTP4aSui87P4L4jC37BtQwUMqk+zk/b11FR19BJDeZsZAvIHutWnmtw7r85UmR3CEWZ0HWU2mAlw==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-25.4.0.tgz", + "integrity": "sha512-LYY9hRcVGgMeMwmdfh9tTjeux1OjZHMusq/E5f3tJN+dAoVVkJtq5ZUEPIcB7bpxDUt2zjUsrwg0EGgPQ+OhXQ==", "dev": true, "requires": { "@babel/code-frame": "^7.0.0", - "@jest/test-result": "^24.9.0", - "@jest/types": "^24.9.0", + "@jest/types": "^25.4.0", "@types/stack-utils": "^1.0.1", - "chalk": "^2.0.1", - "micromatch": "^3.1.10", - "slash": "^2.0.0", + "chalk": "^3.0.0", + "micromatch": "^4.0.2", + "slash": "^3.0.0", "stack-utils": "^1.0.1" } }, - "jest-mock": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-24.9.0.tgz", - "integrity": "sha512-3BEYN5WbSq9wd+SyLDES7AHnjH9A/ROBwmz7l2y+ol+NtSFO8DYiEBzoO1CeFc9a8DYy10EO4dDFVv/wN3zl1w==", + "jest-util": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-25.4.0.tgz", + "integrity": "sha512-WSZD59sBtAUjLv1hMeKbNZXmMcrLRWcYqpO8Dz8b4CeCTZpfNQw2q9uwrYAD+BbJoLJlu4ezVPwtAmM/9/SlZA==", "dev": true, "requires": { - "@jest/types": "^24.9.0" + "@jest/types": "^25.4.0", + "chalk": "^3.0.0", + "is-ci": "^2.0.0", + "make-dir": "^3.0.0" } }, - "jest-util": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-24.9.0.tgz", - "integrity": "sha512-x+cZU8VRmOJxbA1K5oDBdxQmdq0OIdADarLxk0Mq+3XS4jgvhG/oKGWcIDCtPG0HgjxOYvF+ilPJQsAyXfbNOg==", + "make-dir": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.0.2.tgz", + "integrity": "sha512-rYKABKutXa6vXTXhoV18cBE7PaewPXHe/Bdq4v+ZLMhxbWApkFFplT0LcbMW+6BbjnQXzZ/sAvSE/JdguApG5w==", "dev": true, "requires": { - "@jest/console": "^24.9.0", - "@jest/fake-timers": "^24.9.0", - "@jest/source-map": "^24.9.0", - "@jest/test-result": "^24.9.0", - "@jest/types": "^24.9.0", - "callsites": "^3.0.0", - "chalk": "^2.0.1", - "graceful-fs": "^4.1.15", - "is-ci": "^2.0.0", - "mkdirp": "^0.5.1", - "slash": "^2.0.0", - "source-map": "^0.6.0" + "semver": "^6.0.0" + } + }, + "micromatch": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz", + "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==", + "dev": true, + "requires": { + "braces": "^3.0.1", + "picomatch": "^2.0.5" + } + }, + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true + }, + "slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true + }, + "supports-color": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + }, + "to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "requires": { + "is-number": "^7.0.0" } + }, + "type-fest": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz", + "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==", + "dev": true } } }, @@ -12094,6 +14817,12 @@ "readable-stream": "^3.1.1" } }, + "lines-and-columns": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz", + "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=", + "dev": true + }, "load-json-file": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz", @@ -12271,6 +15000,15 @@ "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.4.tgz", "integrity": "sha512-p0b6mOGKcGa+7nnmKbpzR6qloPbrgLcnio++E+14Vo/XffOGwZtRpUhr8dTH/x2oCMmEoIU0Zwm3ZauhvYD17g==" }, + "lolex": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/lolex/-/lolex-5.1.2.tgz", + "integrity": "sha512-h4hmjAvHTmd+25JSwrtTIuwbKdwg5NzZVRMLn9saij4SZaepCrTCxPr35H/3bjwfMJtN+t3CX8672UIkglz28A==", + "dev": true, + "requires": { + "@sinonjs/commons": "^1.7.0" + } + }, "long": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz", @@ -13234,13 +15972,14 @@ "dev": true }, "node-notifier": { - "version": "5.4.2", - "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-5.4.2.tgz", - "integrity": "sha512-85nkTziazE2dR4pyoLxMwz0b9MmxFQPVXYs/WlWI7CPtBkARJOV+89khdNjpbclXIJDECQYnTvh1xuZV3WHkCA==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-6.0.0.tgz", + "integrity": "sha512-SVfQ/wMw+DesunOm5cKqr6yDcvUTDl/yc97ybGHMrteNEY6oekXpNpS3lZwgLlwz0FLgHoiW28ZpmBHUDg37cw==", "dev": true, + "optional": true, "requires": { "growly": "^1.3.0", - "is-wsl": "^2.1.0", + "is-wsl": "^2.1.1", "semver": "^6.3.0", "shellwords": "^0.1.1", "which": "^1.3.1" @@ -13250,7 +15989,8 @@ "version": "6.3.0", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true + "dev": true, + "optional": true } } }, @@ -13619,13 +16359,10 @@ } }, "p-each-series": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-1.0.0.tgz", - "integrity": "sha1-kw89Et0fUOdDRFeiLNbwSsatf3E=", - "dev": true, - "requires": { - "p-reduce": "^1.0.0" - } + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-2.1.0.tgz", + "integrity": "sha512-ZuRs1miPT4HrjFa+9fRfOFXxGJfORgelKV9f9nNOWw2gl6gVsRaVDOQP0+MI0G0wGKns1Yacsu0GjOFbTK0JFQ==", + "dev": true }, "p-finally": { "version": "1.0.0", @@ -13855,6 +16592,12 @@ "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=", "dev": true }, + "picomatch": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz", + "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==", + "dev": true + }, "pify": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", @@ -13991,13 +16734,13 @@ } }, "prompts": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.2.1.tgz", - "integrity": "sha512-VObPvJiWPhpZI6C5m60XOzTfnYg/xc/an+r9VYymj9WJW3B/DIH+REzjpAACPf8brwPeP+7vz3bIim3S+AaMjw==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.3.2.tgz", + "integrity": "sha512-Q06uKs2CkNYVID0VqwfAl9mipo99zkBv/n2JtWY89Yxa3ZabWSrs0e2KTudKVa3peLUvYXMefDqIleLPVUBZMA==", "dev": true, "requires": { "kleur": "^3.0.3", - "sisteransi": "^1.0.3" + "sisteransi": "^1.0.4" } }, "promzard": { @@ -14610,6 +17353,15 @@ "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", "dev": true }, + "saxes": { + "version": "3.1.11", + "resolved": "https://registry.npmjs.org/saxes/-/saxes-3.1.11.tgz", + "integrity": "sha512-Ydydq3zC+WYDJK1+gRxRapLIED9PWeSuuS41wqyoRmzvhhh9nc+QQrVMKJYzJFULazeGhzSV0QleN2wD3boh2g==", + "dev": true, + "requires": { + "xmlchars": "^2.1.1" + } + }, "semver": { "version": "5.6.0", "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz", @@ -14742,7 +17494,8 @@ "version": "0.1.1", "resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz", "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==", - "dev": true + "dev": true, + "optional": true }, "signal-exit": { "version": "3.0.2", @@ -14773,9 +17526,9 @@ } }, "sisteransi": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.3.tgz", - "integrity": "sha512-SbEG75TzH8G7eVXFSN5f9EExILKfly7SUvVY5DhhYLvfhKqhDFY0OzevWa/zwak0RLRfWS5AvfMWpd9gJvr5Yg==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", + "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==", "dev": true }, "slash": { @@ -15182,28 +17935,22 @@ "integrity": "sha1-gIudDlb8Jz2Am6VzOOkpkZoanxo=" }, "string-length": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/string-length/-/string-length-2.0.0.tgz", - "integrity": "sha1-1A27aGo6zpYMHP/KVivyxF+DY+0=", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-length/-/string-length-3.1.0.tgz", + "integrity": "sha512-Ttp5YvkGm5v9Ijagtaz1BnN+k9ObpvS0eIBblPMp2YWL8FBmi9qblQ9fexc2k/CXFgrTIteU3jAw3payCnwSTA==", "dev": true, "requires": { "astral-regex": "^1.0.0", - "strip-ansi": "^4.0.0" + "strip-ansi": "^5.2.0" }, "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true - }, "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", "dev": true, "requires": { - "ansi-regex": "^3.0.0" + "ansi-regex": "^4.1.0" } } } @@ -15275,6 +18022,12 @@ "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=", "dev": true }, + "strip-final-newline": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", + "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", + "dev": true + }, "strip-indent": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz", @@ -15411,6 +18164,33 @@ "has-flag": "^3.0.0" } }, + "supports-hyperlinks": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz", + "integrity": "sha512-zoE5/e+dnEijk6ASB6/qrK+oYdm2do1hjoLWrqUC/8WEIW1gbxFcKuBof7sW8ArN6e+AYvsE8HBGiVRWL/F5CA==", + "dev": true, + "requires": { + "has-flag": "^4.0.0", + "supports-color": "^7.0.0" + }, + "dependencies": { + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "supports-color": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, "symbol-observable": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz", @@ -15506,6 +18286,33 @@ "uuid": "^3.0.1" } }, + "terminal-link": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz", + "integrity": "sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==", + "dev": true, + "requires": { + "ansi-escapes": "^4.2.1", + "supports-hyperlinks": "^2.0.0" + }, + "dependencies": { + "ansi-escapes": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz", + "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==", + "dev": true, + "requires": { + "type-fest": "^0.11.0" + } + }, + "type-fest": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz", + "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==", + "dev": true + } + } + }, "test-exclude": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-5.1.0.tgz", @@ -15829,6 +18636,15 @@ "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=", "dev": true }, + "typedarray-to-buffer": { + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", + "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==", + "dev": true, + "requires": { + "is-typedarray": "^1.0.0" + } + }, "typescript": { "version": "3.8.3", "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.8.3.tgz", @@ -16023,6 +18839,25 @@ "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz", "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==" }, + "v8-to-istanbul": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-4.1.3.tgz", + "integrity": "sha512-sAjOC+Kki6aJVbUOXJbcR0MnbfjvBzwKZazEJymA2IX49uoOdEdk+4fBq5cXgYgiyKtAyrrJNtBZdOeDIF+Fng==", + "dev": true, + "requires": { + "@types/istanbul-lib-coverage": "^2.0.1", + "convert-source-map": "^1.6.0", + "source-map": "^0.7.3" + }, + "dependencies": { + "source-map": { + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", + "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==", + "dev": true + } + } + }, "validate-npm-package-license": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", @@ -16067,6 +18902,17 @@ "browser-process-hrtime": "^0.1.2" } }, + "w3c-xmlserializer": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-1.1.2.tgz", + "integrity": "sha512-p10l/ayESzrBMYWRID6xbuCKh2Fp77+sA0doRuGn4tTIMrrZVeqfpKjXHY+oDh3K4nLdPgNwMTVP6Vp4pvqbNg==", + "dev": true, + "requires": { + "domexception": "^1.0.1", + "webidl-conversions": "^4.0.2", + "xml-name-validator": "^3.0.0" + } + }, "walker": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz", @@ -16361,6 +19207,12 @@ "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==", "dev": true }, + "xmlchars": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz", + "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==", + "dev": true + }, "xtend": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", diff --git a/package.json b/package.json index 478560d82b9..d31c3f8137b 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "@types/fast-json-stable-stringify": "2.0.0", "@types/hapi": "17.8.7", "@types/ioredis": "4.14.9", - "@types/jest": "24.9.1", + "@types/jest": "25.2.1", "@types/koa-router": "7.4.0", "@types/lodash": "4.14.149", "@types/lodash.sortby": "4.7.6", @@ -104,7 +104,7 @@ "graphql-tools": "4.0.8", "hapi": "17.8.5", "ioredis": "4.16.1", - "jest": "24.9.0", + "jest": "25.4.0", "jest-config": "24.9.0", "jest-junit": "10.0.0", "jest-matcher-utils": "24.9.0", From 83345c3a05e392678103e4b07b98d796f0b73e26 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 20 Apr 2020 14:31:23 +0300 Subject: [PATCH 428/642] chore(deps): update dependency ts-jest to v25 (#3722) Co-authored-by: Renovate Bot --- package-lock.json | 85 +++++++++++++++++++++++++++++++++++++---------- package.json | 2 +- 2 files changed, 69 insertions(+), 18 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9f84c4ebb14..e42e7c90dd0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15057,9 +15057,9 @@ } }, "make-error": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.5.tgz", - "integrity": "sha512-c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g==", + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", + "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==", "dev": true }, "make-fetch-happen": { @@ -18541,9 +18541,9 @@ } }, "ts-jest": { - "version": "24.3.0", - "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-24.3.0.tgz", - "integrity": "sha512-Hb94C/+QRIgjVZlJyiWwouYUF+siNJHJHknyspaOcZ+OQAIdFG/UrdQVXw/0B8Z3No34xkUXZJpOTy9alOWdVQ==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-25.4.0.tgz", + "integrity": "sha512-+0ZrksdaquxGUBwSdTIcdX7VXdwLIlSRsyjivVA9gcO+Cvr6ByqDhu/mi5+HCcb6cMkiQp5xZ8qRO7/eCqLeyw==", "dev": true, "requires": { "bs-logger": "0.x", @@ -18552,25 +18552,76 @@ "json5": "2.x", "lodash.memoize": "4.x", "make-error": "1.x", - "mkdirp": "0.x", + "micromatch": "4.x", + "mkdirp": "1.x", "resolve": "1.x", - "semver": "^5.5", - "yargs-parser": "10.x" + "semver": "6.x", + "yargs-parser": "18.x" }, "dependencies": { - "camelcase": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", - "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", + "braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "dev": true, + "requires": { + "fill-range": "^7.0.1" + } + }, + "fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "dev": true, + "requires": { + "to-regex-range": "^5.0.1" + } + }, + "is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true + }, + "micromatch": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz", + "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==", + "dev": true, + "requires": { + "braces": "^3.0.1", + "picomatch": "^2.0.5" + } + }, + "mkdirp": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", "dev": true }, + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true + }, + "to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "requires": { + "is-number": "^7.0.0" + } + }, "yargs-parser": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz", - "integrity": "sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==", + "version": "18.1.3", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz", + "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==", "dev": true, "requires": { - "camelcase": "^4.1.0" + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" } } } diff --git a/package.json b/package.json index d31c3f8137b..f6a47701768 100644 --- a/package.json +++ b/package.json @@ -123,7 +123,7 @@ "subscriptions-transport-ws": "0.9.16", "supertest": "4.0.2", "test-listen": "1.1.0", - "ts-jest": "24.3.0", + "ts-jest": "25.4.0", "typescript": "3.8.3", "winston": "3.2.1", "winston-transport": "4.3.0", From 7605bf696889e0ade4f9d953d49b79c5b68f12bd Mon Sep 17 00:00:00 2001 From: Jesse Shawl Date: Mon, 20 Apr 2020 06:36:08 -0500 Subject: [PATCH 429/642] Fix error in sample code (#4008) This change fixes the error `"Expected Iterable, but did not find one for field \"Book.author\"."` --- docs/source/data/resolvers.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/data/resolvers.mdx b/docs/source/data/resolvers.mdx index a5df93920b8..8b26c71469c 100644 --- a/docs/source/data/resolvers.mdx +++ b/docs/source/data/resolvers.mdx @@ -262,7 +262,7 @@ const typeDefs = gql` # A book has a title and author type Book { title: String! - author: [Author!] + author: Author! } # An author has a name From fe9ff9f9392eadf9d1f34a720c3a10f471ea3e8f Mon Sep 17 00:00:00 2001 From: David <12038670+learnitmyway@users.noreply.github.com> Date: Mon, 20 Apr 2020 13:36:34 +0200 Subject: [PATCH 430/642] Update resolvers.mdx (#3960) From b741b4ec0c72650118e21ca5abb36ecf34fa66ad Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 20 Apr 2020 14:47:25 +0300 Subject: [PATCH 431/642] chore(deps): update dependency jest-config to v25 (#3718) Co-authored-by: Renovate Bot --- package-lock.json | 3558 +++++++++++++++++++++++++++++++-------------- package.json | 2 +- 2 files changed, 2446 insertions(+), 1114 deletions(-) diff --git a/package-lock.json b/package-lock.json index e42e7c90dd0..3ba5749be4d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -912,15 +912,6 @@ } } }, - "@babel/plugin-syntax-object-rest-spread": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.2.0.tgz", - "integrity": "sha512-t0JKGgqk2We+9may3t0xDdmneaXmyxq0xieYcKHxIsrJO64n1OiMWNUtc5gQK1PA0NpdCRrtZp4z+IUaKugrSA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.0.0" - } - }, "@babel/plugin-syntax-optional-catch-binding": { "version": "7.8.3", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz", @@ -1214,14 +1205,86 @@ "dev": true }, "@jest/console": { - "version": "24.7.1", - "resolved": "https://registry.npmjs.org/@jest/console/-/console-24.7.1.tgz", - "integrity": "sha512-iNhtIy2M8bXlAOULWVTUxmnelTLFneTNEkHCgPmgd+zNwy9zVddJ6oS5rZ9iwoscNdT5mMwUd0C51v/fSlzItg==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/@jest/console/-/console-25.4.0.tgz", + "integrity": "sha512-CfE0erx4hdJ6t7RzAcE1wLG6ZzsHSmybvIBQDoCkDM1QaSeWL9wJMzID/2BbHHa7ll9SsbbK43HjbERbBaFX2A==", "dev": true, "requires": { - "@jest/source-map": "^24.3.0", - "chalk": "^2.0.1", - "slash": "^2.0.0" + "@jest/types": "^25.4.0", + "chalk": "^3.0.0", + "jest-message-util": "^25.4.0", + "jest-util": "^25.4.0", + "slash": "^3.0.0" + }, + "dependencies": { + "@jest/types": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.4.0.tgz", + "integrity": "sha512-XBeaWNzw2PPnGW5aXvZt3+VO60M+34RY3XDsCK5tW7kyj3RK0XClRutCfjqcBuaR2aBQTbluEDME9b5MB9UAPw==", + "dev": true, + "requires": { + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^1.1.1", + "@types/yargs": "^15.0.0", + "chalk": "^3.0.0" + } + }, + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "dev": true, + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true + }, + "supports-color": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } } }, "@jest/core": { @@ -2666,68 +2729,153 @@ } }, "@jest/environment": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-24.9.0.tgz", - "integrity": "sha512-5A1QluTPhvdIPFYnO3sZC3smkNeXPVELz7ikPbhUj0bQjB07EoE9qtLrem14ZUYWdVayYbsjVwIiL4WBIMV4aQ==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-25.4.0.tgz", + "integrity": "sha512-KDctiak4mu7b4J6BIoN/+LUL3pscBzoUCP+EtSPd2tK9fqyDY5OF+CmkBywkFWezS9tyH5ACOQNtpjtueEDH6Q==", "dev": true, "requires": { - "@jest/fake-timers": "^24.9.0", - "@jest/transform": "^24.9.0", - "@jest/types": "^24.9.0", - "jest-mock": "^24.9.0" + "@jest/fake-timers": "^25.4.0", + "@jest/types": "^25.4.0", + "jest-mock": "^25.4.0" }, "dependencies": { "@jest/types": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz", - "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.4.0.tgz", + "integrity": "sha512-XBeaWNzw2PPnGW5aXvZt3+VO60M+34RY3XDsCK5tW7kyj3RK0XClRutCfjqcBuaR2aBQTbluEDME9b5MB9UAPw==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^1.1.1", - "@types/yargs": "^13.0.0" + "@types/yargs": "^15.0.0", + "chalk": "^3.0.0" } }, - "@types/yargs": { - "version": "13.0.2", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.2.tgz", - "integrity": "sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ==", + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", "dev": true, "requires": { - "@types/yargs-parser": "*" + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "supports-color": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" } } } }, "@jest/fake-timers": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-24.9.0.tgz", - "integrity": "sha512-eWQcNa2YSwzXWIMC5KufBh3oWRIijrQFROsIqt6v/NS9Io/gknw1jsAC9c+ih/RQX4A3O7SeWAhQeN0goKhT9A==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-25.4.0.tgz", + "integrity": "sha512-lI9z+VOmVX4dPPFzyj0vm+UtaB8dCJJ852lcDnY0uCPRvZAaVGnMwBBc1wxtf+h7Vz6KszoOvKAt4QijDnHDkg==", "dev": true, "requires": { - "@jest/types": "^24.9.0", - "jest-message-util": "^24.9.0", - "jest-mock": "^24.9.0" + "@jest/types": "^25.4.0", + "jest-message-util": "^25.4.0", + "jest-mock": "^25.4.0", + "jest-util": "^25.4.0", + "lolex": "^5.0.0" }, "dependencies": { "@jest/types": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz", - "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.4.0.tgz", + "integrity": "sha512-XBeaWNzw2PPnGW5aXvZt3+VO60M+34RY3XDsCK5tW7kyj3RK0XClRutCfjqcBuaR2aBQTbluEDME9b5MB9UAPw==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^1.1.1", - "@types/yargs": "^13.0.0" + "@types/yargs": "^15.0.0", + "chalk": "^3.0.0" } }, - "@types/yargs": { - "version": "13.0.2", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.2.tgz", - "integrity": "sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ==", + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", "dev": true, "requires": { - "@types/yargs-parser": "*" + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "supports-color": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" } } } @@ -3522,146 +3670,270 @@ } }, "@jest/source-map": { - "version": "24.3.0", - "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-24.3.0.tgz", - "integrity": "sha512-zALZt1t2ou8le/crCeeiRYzvdnTzaIlpOWaet45lNSqNJUnXbppUUFR4ZUAlzgDmKee4Q5P/tKXypI1RiHwgag==", + "version": "25.2.6", + "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-25.2.6.tgz", + "integrity": "sha512-VuIRZF8M2zxYFGTEhkNSvQkUKafQro4y+mwUxy5ewRqs5N/ynSFUODYp3fy1zCnbCMy1pz3k+u57uCqx8QRSQQ==", "dev": true, "requires": { "callsites": "^3.0.0", - "graceful-fs": "^4.1.15", + "graceful-fs": "^4.2.3", "source-map": "^0.6.0" }, "dependencies": { "callsites": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.0.0.tgz", - "integrity": "sha512-tWnkwu9YEq2uzlBDI4RcLn8jrFvF9AOi8PxDNU3hZZjJcjkcRAq3vCI+vZcg1SuxISDYe86k9VZFwAxDiJGoAw==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "dev": true + }, + "graceful-fs": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz", + "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==", "dev": true } } }, "@jest/test-result": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-24.9.0.tgz", - "integrity": "sha512-XEFrHbBonBJ8dGp2JmF8kP/nQI/ImPpygKHwQ/SY+es59Z3L5PI4Qb9TQQMAEeYsThG1xF0k6tmG0tIKATNiiA==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-25.4.0.tgz", + "integrity": "sha512-8BAKPaMCHlL941eyfqhWbmp3MebtzywlxzV+qtngQ3FH+RBqnoSAhNEPj4MG7d2NVUrMOVfrwuzGpVIK+QnMAA==", "dev": true, "requires": { - "@jest/console": "^24.9.0", - "@jest/types": "^24.9.0", - "@types/istanbul-lib-coverage": "^2.0.0" + "@jest/console": "^25.4.0", + "@jest/types": "^25.4.0", + "@types/istanbul-lib-coverage": "^2.0.0", + "collect-v8-coverage": "^1.0.0" }, "dependencies": { - "@jest/console": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/console/-/console-24.9.0.tgz", - "integrity": "sha512-Zuj6b8TnKXi3q4ymac8EQfc3ea/uhLeCGThFqXeC8H9/raaH8ARPUTdId+XyGd03Z4In0/VjD2OYFcBF09fNLQ==", + "@jest/types": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.4.0.tgz", + "integrity": "sha512-XBeaWNzw2PPnGW5aXvZt3+VO60M+34RY3XDsCK5tW7kyj3RK0XClRutCfjqcBuaR2aBQTbluEDME9b5MB9UAPw==", "dev": true, "requires": { - "@jest/source-map": "^24.9.0", - "chalk": "^2.0.1", - "slash": "^2.0.0" + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^1.1.1", + "@types/yargs": "^15.0.0", + "chalk": "^3.0.0" } }, - "@jest/source-map": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-24.9.0.tgz", - "integrity": "sha512-/Xw7xGlsZb4MJzNDgB7PW5crou5JqWiBQaz6xyPd3ArOg2nfn/PunV8+olXbbEZzNl591o5rWKE9BRDaFAuIBg==", + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", "dev": true, "requires": { - "callsites": "^3.0.0", - "graceful-fs": "^4.1.15", - "source-map": "^0.6.0" + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" } }, - "@jest/types": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz", - "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==", - "dev": true, - "requires": { - "@types/istanbul-lib-coverage": "^2.0.0", - "@types/istanbul-reports": "^1.1.1", - "@types/yargs": "^13.0.0" + "chalk": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" } }, - "@types/yargs": { - "version": "13.0.2", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.2.tgz", - "integrity": "sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ==", + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, "requires": { - "@types/yargs-parser": "*" + "color-name": "~1.1.4" } }, - "callsites": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", - "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true + }, + "supports-color": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } } } }, "@jest/test-sequencer": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-24.9.0.tgz", - "integrity": "sha512-6qqsU4o0kW1dvA95qfNog8v8gkRN9ph6Lz7r96IvZpHdNipP2cBcb07J1Z45mz/VIS01OHJ3pY8T5fUY38tg4A==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-25.4.0.tgz", + "integrity": "sha512-240cI+nsM3attx2bMp9uGjjHrwrpvxxrZi8Tyqp/cfOzl98oZXVakXBgxODGyBYAy/UGXPKXLvNc2GaqItrsJg==", "dev": true, "requires": { - "@jest/test-result": "^24.9.0", - "jest-haste-map": "^24.9.0", - "jest-runner": "^24.9.0", - "jest-runtime": "^24.9.0" + "@jest/test-result": "^25.4.0", + "jest-haste-map": "^25.4.0", + "jest-runner": "^25.4.0", + "jest-runtime": "^25.4.0" } }, "@jest/transform": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-24.9.0.tgz", - "integrity": "sha512-TcQUmyNRxV94S0QpMOnZl0++6RMiqpbH/ZMccFB/amku6Uwvyb1cjYX7xkp5nGNkbX4QPH/FcB6q1HBTHynLmQ==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-25.4.0.tgz", + "integrity": "sha512-t1w2S6V1sk++1HHsxboWxPEuSpN8pxEvNrZN+Ud/knkROWtf8LeUmz73A4ezE8476a5AM00IZr9a8FO9x1+j3g==", "dev": true, "requires": { "@babel/core": "^7.1.0", - "@jest/types": "^24.9.0", - "babel-plugin-istanbul": "^5.1.0", - "chalk": "^2.0.1", + "@jest/types": "^25.4.0", + "babel-plugin-istanbul": "^6.0.0", + "chalk": "^3.0.0", "convert-source-map": "^1.4.0", "fast-json-stable-stringify": "^2.0.0", - "graceful-fs": "^4.1.15", - "jest-haste-map": "^24.9.0", - "jest-regex-util": "^24.9.0", - "jest-util": "^24.9.0", - "micromatch": "^3.1.10", + "graceful-fs": "^4.2.3", + "jest-haste-map": "^25.4.0", + "jest-regex-util": "^25.2.6", + "jest-util": "^25.4.0", + "micromatch": "^4.0.2", "pirates": "^4.0.1", - "realpath-native": "^1.1.0", - "slash": "^2.0.0", + "realpath-native": "^2.0.0", + "slash": "^3.0.0", "source-map": "^0.6.1", - "write-file-atomic": "2.4.1" + "write-file-atomic": "^3.0.0" }, "dependencies": { "@jest/types": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz", - "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.4.0.tgz", + "integrity": "sha512-XBeaWNzw2PPnGW5aXvZt3+VO60M+34RY3XDsCK5tW7kyj3RK0XClRutCfjqcBuaR2aBQTbluEDME9b5MB9UAPw==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^1.1.1", - "@types/yargs": "^13.0.0" + "@types/yargs": "^15.0.0", + "chalk": "^3.0.0" } }, - "@types/yargs": { - "version": "13.0.2", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.2.tgz", - "integrity": "sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ==", + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", "dev": true, "requires": { - "@types/yargs-parser": "*" + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" } }, - "jest-regex-util": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-24.9.0.tgz", - "integrity": "sha512-05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA==", + "braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "dev": true, + "requires": { + "fill-range": "^7.0.1" + } + }, + "chalk": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "dev": true, + "requires": { + "to-regex-range": "^5.0.1" + } + }, + "graceful-fs": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz", + "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true + }, + "micromatch": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz", + "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==", + "dev": true, + "requires": { + "braces": "^3.0.1", + "picomatch": "^2.0.5" + } + }, + "slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", "dev": true + }, + "supports-color": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + }, + "to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "requires": { + "is-number": "^7.0.0" + } + }, + "write-file-atomic": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz", + "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==", + "dev": true, + "requires": { + "imurmurhash": "^0.1.4", + "is-typedarray": "^1.0.0", + "signal-exit": "^3.0.2", + "typedarray-to-buffer": "^3.1.5" + } } } }, @@ -4907,9 +5179,9 @@ "integrity": "sha512-RDzmQ5mO1f0BViKiuOudENZmoCACEa461nTRVtxhsAiEqGCgwdhCYN0aFgk42X5+ELAiqJKbv2mK0LkopYRYQg==" }, "@types/babel__core": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.0.tgz", - "integrity": "sha512-wJTeJRt7BToFx3USrCDs2BhEi4ijBInTQjOIukj6a/5tEkwpFMVZ+1ppgmE+Q/FQyc5P/VWUbx7I9NELrKruHA==", + "version": "7.1.7", + "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.7.tgz", + "integrity": "sha512-RL62NqSFPCDK2FM1pSDH0scHpJvsXtZNiYlMB73DgPBaG1E38ZYVL+ei5EkWRbr+KC4YNiAUNBnRj+bgwpgjMw==", "dev": true, "requires": { "@babel/parser": "^7.1.0", @@ -5657,15 +5929,15 @@ } }, "acorn": { - "version": "5.7.3", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz", - "integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.1.tgz", + "integrity": "sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==", "dev": true }, "acorn-globals": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.0.tgz", - "integrity": "sha512-hMtHj3s5RnuhvHPowpBYvJVj3rAar82JiDQHvGs1zO0l10ocX/xEdBShNHTJaboucJUsScghp74pH3s7EnHHQw==", + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.4.tgz", + "integrity": "sha512-clfQEh21R+D0leSbUdWf3OcfqyaCSAQ8Ryq00bofSekfr9W8u1jyYZo6ir0xu9Gtcf7BjcHJpnbZH7JOCpP60A==", "dev": true, "requires": { "acorn": "^6.0.1", @@ -5673,9 +5945,9 @@ }, "dependencies": { "acorn": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.1.1.tgz", - "integrity": "sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==", + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz", + "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==", "dev": true } } @@ -6423,79 +6695,118 @@ "dev": true }, "babel-jest": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-24.9.0.tgz", - "integrity": "sha512-ntuddfyiN+EhMw58PTNL1ph4C9rECiQXjI4nMMBKBaNjXvqLdkXpPRcMSr4iyBrJg/+wz9brFUD6RhOAT6r4Iw==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-25.4.0.tgz", + "integrity": "sha512-p+epx4K0ypmHuCnd8BapfyOwWwosNCYhedetQey1awddtfmEX0MmdxctGl956uwUmjwXR5VSS5xJcGX9DvdIog==", "dev": true, "requires": { - "@jest/transform": "^24.9.0", - "@jest/types": "^24.9.0", - "@types/babel__core": "^7.1.0", - "babel-plugin-istanbul": "^5.1.0", - "babel-preset-jest": "^24.9.0", - "chalk": "^2.4.2", - "slash": "^2.0.0" + "@jest/transform": "^25.4.0", + "@jest/types": "^25.4.0", + "@types/babel__core": "^7.1.7", + "babel-plugin-istanbul": "^6.0.0", + "babel-preset-jest": "^25.4.0", + "chalk": "^3.0.0", + "slash": "^3.0.0" }, "dependencies": { "@jest/types": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz", - "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.4.0.tgz", + "integrity": "sha512-XBeaWNzw2PPnGW5aXvZt3+VO60M+34RY3XDsCK5tW7kyj3RK0XClRutCfjqcBuaR2aBQTbluEDME9b5MB9UAPw==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^1.1.1", - "@types/yargs": "^13.0.0" + "@types/yargs": "^15.0.0", + "chalk": "^3.0.0" } }, - "@types/yargs": { - "version": "13.0.2", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.2.tgz", - "integrity": "sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ==", + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", "dev": true, "requires": { - "@types/yargs-parser": "*" + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" } }, "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", "dev": true, "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" } - } - } - }, - "babel-plugin-istanbul": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-5.1.1.tgz", - "integrity": "sha512-RNNVv2lsHAXJQsEJ5jonQwrJVWK8AcZpG1oxhnjCUaAjL7xahYLANhPUZbzEQHjKy1NMYUwn+0NPKQc8iSY4xQ==", - "dev": true, - "requires": { - "find-up": "^3.0.0", - "istanbul-lib-instrument": "^3.0.0", - "test-exclude": "^5.0.0" - } - }, - "babel-plugin-jest-hoist": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-24.9.0.tgz", - "integrity": "sha512-2EMA2P8Vp7lG0RAzr4HXqtYwacfMErOuv1U3wrvxHX6rD1sV6xS3WXG3r8TRQ2r6w8OhvSdWt+z41hQNwNm3Xw==", - "dev": true, - "requires": { - "@types/babel__traverse": "^7.0.6" - } - }, - "babel-preset-current-node-syntax": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-0.1.2.tgz", - "integrity": "sha512-u/8cS+dEiK1SFILbOC8/rUI3ml9lboKuuMvZ/4aQnQmhecQAgPw5ew066C1ObnEAUmlx7dv/s2z52psWEtLNiw==", - "dev": true, - "requires": { + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true + }, + "supports-color": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, + "babel-plugin-istanbul": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz", + "integrity": "sha512-AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.0.0", + "@istanbuljs/load-nyc-config": "^1.0.0", + "@istanbuljs/schema": "^0.1.2", + "istanbul-lib-instrument": "^4.0.0", + "test-exclude": "^6.0.0" + } + }, + "babel-plugin-jest-hoist": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-25.4.0.tgz", + "integrity": "sha512-M3a10JCtTyKevb0MjuH6tU+cP/NVQZ82QPADqI1RQYY1OphztsCeIeQmTsHmF/NS6m0E51Zl4QNsI3odXSQF5w==", + "dev": true, + "requires": { + "@types/babel__traverse": "^7.0.6" + } + }, + "babel-preset-current-node-syntax": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-0.1.2.tgz", + "integrity": "sha512-u/8cS+dEiK1SFILbOC8/rUI3ml9lboKuuMvZ/4aQnQmhecQAgPw5ew066C1ObnEAUmlx7dv/s2z52psWEtLNiw==", + "dev": true, + "requires": { "@babel/plugin-syntax-async-generators": "^7.8.4", "@babel/plugin-syntax-bigint": "^7.8.3", "@babel/plugin-syntax-class-properties": "^7.8.3", @@ -6526,13 +6837,13 @@ } }, "babel-preset-jest": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-24.9.0.tgz", - "integrity": "sha512-izTUuhE4TMfTRPF92fFwD2QfdXaZW08qvWTFCI51V8rW5x00UuPgc3ajRoWofXOuxjfcOM5zzSYsQS3H8KGCAg==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-25.4.0.tgz", + "integrity": "sha512-PwFiEWflHdu3JCeTr0Pb9NcHHE34qWFnPQRVPvqQITx4CsDCzs6o05923I10XvLvn9nNsRHuiVgB72wG/90ZHQ==", "dev": true, "requires": { - "@babel/plugin-syntax-object-rest-spread": "^7.0.0", - "babel-plugin-jest-hoist": "^24.9.0" + "babel-plugin-jest-hoist": "^25.4.0", + "babel-preset-current-node-syntax": "^0.1.2" } }, "backo2": { @@ -7848,18 +8159,26 @@ } }, "cssom": { - "version": "0.3.6", - "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.6.tgz", - "integrity": "sha512-DtUeseGk9/GBW0hl0vVPpU22iHL6YB5BUX7ml1hB+GMpo0NX5G4voX3kdWiMSEguFtcW3Vh3djqNF4aIe6ne0A==", + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz", + "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==", "dev": true }, "cssstyle": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-1.2.1.tgz", - "integrity": "sha512-7DYm8qe+gPx/h77QlCyFmX80+fGaE/6A/Ekl0zaszYOubvySO2saYFdQ78P29D0UsULxFKCetDGNaNRUdSF+2A==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.2.0.tgz", + "integrity": "sha512-sEb3XFPx3jNnCAMtqrXPDeSgQr+jojtCeNf8cvMNMh1cG970+lljssvQDzPq6lmmJu2Vhqood/gtEomBiHOGnA==", "dev": true, "requires": { - "cssom": "0.3.x" + "cssom": "~0.3.6" + }, + "dependencies": { + "cssom": { + "version": "0.3.8", + "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz", + "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==", + "dev": true + } } }, "currently-unhandled": { @@ -7995,13 +8314,6 @@ "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz", "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=" }, - "deep-extend": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", - "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", - "dev": true, - "optional": true - }, "deep-freeze": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/deep-freeze/-/deep-freeze-0.0.1.tgz", @@ -8120,17 +8432,10 @@ "integrity": "sha1-OHHMCmoALow+Wzz38zYmRnXwa50=", "dev": true }, - "detect-libc": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", - "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=", - "dev": true, - "optional": true - }, "detect-newline": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-2.1.0.tgz", - "integrity": "sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I=", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz", + "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==", "dev": true }, "dezalgo": { @@ -8512,91 +8817,139 @@ } }, "expect": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/expect/-/expect-24.9.0.tgz", - "integrity": "sha512-wvVAx8XIol3Z5m9zvZXiyZOQ+sRJqNTIm6sGjdWlaZIeupQGO3WbYI+15D/AmEwZywL6wtJkbAbJtzkOfBuR0Q==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/expect/-/expect-25.4.0.tgz", + "integrity": "sha512-7BDIX99BTi12/sNGJXA9KMRcby4iAmu1xccBOhyKCyEhjcVKS3hPmHdA/4nSI9QGIOkUropKqr3vv7WMDM5lvQ==", "dev": true, "requires": { - "@jest/types": "^24.9.0", - "ansi-styles": "^3.2.0", - "jest-get-type": "^24.9.0", - "jest-matcher-utils": "^24.9.0", - "jest-message-util": "^24.9.0", - "jest-regex-util": "^24.9.0" + "@jest/types": "^25.4.0", + "ansi-styles": "^4.0.0", + "jest-get-type": "^25.2.6", + "jest-matcher-utils": "^25.4.0", + "jest-message-util": "^25.4.0", + "jest-regex-util": "^25.2.6" }, "dependencies": { "@jest/types": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz", - "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.4.0.tgz", + "integrity": "sha512-XBeaWNzw2PPnGW5aXvZt3+VO60M+34RY3XDsCK5tW7kyj3RK0XClRutCfjqcBuaR2aBQTbluEDME9b5MB9UAPw==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^1.1.1", - "@types/yargs": "^13.0.0" + "@types/yargs": "^15.0.0", + "chalk": "^3.0.0" } }, - "@types/yargs": { - "version": "13.0.2", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.2.tgz", - "integrity": "sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ==", + "ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "dev": true + }, + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", "dev": true, "requires": { - "@types/yargs-parser": "*" + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" } }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, "diff-sequences": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-24.9.0.tgz", - "integrity": "sha512-Dj6Wk3tWyTE+Fo1rW8v0Xhwk80um6yFYKbuAxc9c3EZxIHFDYwbi34Uk42u1CdnIiVorvt4RmlSDjIPyzGC2ew==", + "version": "25.2.6", + "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-25.2.6.tgz", + "integrity": "sha512-Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true }, "jest-diff": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-24.9.0.tgz", - "integrity": "sha512-qMfrTs8AdJE2iqrTp0hzh7kTd2PQWrsFyj9tORoKmu32xjPjeE4NyjVRDz8ybYwqS2ik8N4hsIpiVTyFeo2lBQ==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-25.4.0.tgz", + "integrity": "sha512-kklLbJVXW0y8UKOWOdYhI6TH5MG6QAxrWiBMgQaPIuhj3dNFGirKCd+/xfplBXICQ7fI+3QcqHm9p9lWu1N6ug==", "dev": true, "requires": { - "chalk": "^2.0.1", - "diff-sequences": "^24.9.0", - "jest-get-type": "^24.9.0", - "pretty-format": "^24.9.0" + "chalk": "^3.0.0", + "diff-sequences": "^25.2.6", + "jest-get-type": "^25.2.6", + "pretty-format": "^25.4.0" } }, "jest-get-type": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-24.9.0.tgz", - "integrity": "sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q==", + "version": "25.2.6", + "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-25.2.6.tgz", + "integrity": "sha512-DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig==", "dev": true }, "jest-matcher-utils": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-24.9.0.tgz", - "integrity": "sha512-OZz2IXsu6eaiMAwe67c1T+5tUAtQyQx27/EMEkbFAGiw52tB9em+uGbzpcgYVpA8wl0hlxKPZxrly4CXU/GjHA==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-25.4.0.tgz", + "integrity": "sha512-yPMdtj7YDgXhnGbc66bowk8AkQ0YwClbbwk3Kzhn5GVDrciiCr27U4NJRbrqXbTdtxjImONITg2LiRIw650k5A==", "dev": true, "requires": { - "chalk": "^2.0.1", - "jest-diff": "^24.9.0", - "jest-get-type": "^24.9.0", - "pretty-format": "^24.9.0" + "chalk": "^3.0.0", + "jest-diff": "^25.4.0", + "jest-get-type": "^25.2.6", + "pretty-format": "^25.4.0" } }, - "jest-regex-util": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-24.9.0.tgz", - "integrity": "sha512-05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA==", + "pretty-format": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.4.0.tgz", + "integrity": "sha512-PI/2dpGjXK5HyXexLPZU/jw5T9Q6S1YVXxxVxco+LIqzUFHXIbKZKdUVt7GcX7QUCr31+3fzhi4gN4/wUYPVxQ==", + "dev": true, + "requires": { + "@jest/types": "^25.4.0", + "ansi-regex": "^5.0.0", + "ansi-styles": "^4.0.0", + "react-is": "^16.12.0" + } + }, + "react-is": { + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", "dev": true }, - "pretty-format": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz", - "integrity": "sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==", + "supports-color": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", "dev": true, "requires": { - "@jest/types": "^24.9.0", - "ansi-regex": "^4.0.0", - "ansi-styles": "^3.2.0", - "react-is": "^16.8.4" + "has-flag": "^4.0.0" } } } @@ -9299,15 +9652,11 @@ "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, "fsevents": { - "version": "1.2.9", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz", - "integrity": "sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.2.tgz", + "integrity": "sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==", "dev": true, - "optional": true, - "requires": { - "nan": "^2.12.1", - "node-pre-gyp": "^0.12.0" - } + "optional": true }, "function-bind": { "version": "1.1.1", @@ -10619,15 +10968,6 @@ } } }, - "invariant": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz", - "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==", - "dev": true, - "requires": { - "loose-envify": "^1.0.0" - } - }, "ioredis": { "version": "4.16.1", "resolved": "https://registry.npmjs.org/ioredis/-/ioredis-4.16.1.tgz", @@ -10968,66 +11308,268 @@ "dev": true }, "istanbul-lib-coverage": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz", - "integrity": "sha512-dKWuzRGCs4G+67VfW9pBFFz2Jpi4vSp/k7zBcJ888ofV5Mi1g5CUML5GvMvV6u9Cjybftu+E8Cgp+k0dI1E5lw==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz", + "integrity": "sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==", "dev": true }, "istanbul-lib-instrument": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-3.1.0.tgz", - "integrity": "sha512-ooVllVGT38HIk8MxDj/OIHXSYvH+1tq/Vb38s8ixt9GoJadXska4WkGY+0wkmtYCZNYtaARniH/DixUGGLZ0uA==", - "dev": true, - "requires": { - "@babel/generator": "^7.0.0", - "@babel/parser": "^7.0.0", - "@babel/template": "^7.0.0", - "@babel/traverse": "^7.0.0", - "@babel/types": "^7.0.0", - "istanbul-lib-coverage": "^2.0.3", - "semver": "^5.5.0" - } - }, - "istanbul-lib-report": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz", - "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.1.tgz", + "integrity": "sha512-imIchxnodll7pvQBYOqUu88EufLCU56LMeFPZZM/fJZ1irYcYdqroaV+ACK1Ila8ls09iEYArp+nqyC6lW1Vfg==", "dev": true, "requires": { + "@babel/core": "^7.7.5", + "@babel/parser": "^7.7.5", + "@babel/template": "^7.7.4", + "@babel/traverse": "^7.7.4", + "@istanbuljs/schema": "^0.1.2", "istanbul-lib-coverage": "^3.0.0", - "make-dir": "^3.0.0", - "supports-color": "^7.1.0" + "semver": "^6.3.0" }, "dependencies": { - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "istanbul-lib-coverage": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz", - "integrity": "sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==", - "dev": true - }, - "make-dir": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.0.2.tgz", - "integrity": "sha512-rYKABKutXa6vXTXhoV18cBE7PaewPXHe/Bdq4v+ZLMhxbWApkFFplT0LcbMW+6BbjnQXzZ/sAvSE/JdguApG5w==", + "@babel/code-frame": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", + "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", "dev": true, "requires": { - "semver": "^6.0.0" + "@babel/highlight": "^7.8.3" } }, - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - }, - "supports-color": { - "version": "7.1.0", + "@babel/core": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.0.tgz", + "integrity": "sha512-kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.8.3", + "@babel/generator": "^7.9.0", + "@babel/helper-module-transforms": "^7.9.0", + "@babel/helpers": "^7.9.0", + "@babel/parser": "^7.9.0", + "@babel/template": "^7.8.6", + "@babel/traverse": "^7.9.0", + "@babel/types": "^7.9.0", + "convert-source-map": "^1.7.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.1", + "json5": "^2.1.2", + "lodash": "^4.17.13", + "resolve": "^1.3.2", + "semver": "^5.4.1", + "source-map": "^0.5.0" + }, + "dependencies": { + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true + } + } + }, + "@babel/generator": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.5.tgz", + "integrity": "sha512-GbNIxVB3ZJe3tLeDm1HSn2AhuD/mVcyLDpgtLXa5tplmWrJdF/elxB56XNqCuD6szyNkDi6wuoKXln3QeBmCHQ==", + "dev": true, + "requires": { + "@babel/types": "^7.9.5", + "jsesc": "^2.5.1", + "lodash": "^4.17.13", + "source-map": "^0.5.0" + } + }, + "@babel/helper-function-name": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz", + "integrity": "sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==", + "dev": true, + "requires": { + "@babel/helper-get-function-arity": "^7.8.3", + "@babel/template": "^7.8.3", + "@babel/types": "^7.9.5" + } + }, + "@babel/helper-get-function-arity": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz", + "integrity": "sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==", + "dev": true, + "requires": { + "@babel/types": "^7.8.3" + } + }, + "@babel/helper-split-export-declaration": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz", + "integrity": "sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==", + "dev": true, + "requires": { + "@babel/types": "^7.8.3" + } + }, + "@babel/helpers": { + "version": "7.9.2", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.2.tgz", + "integrity": "sha512-JwLvzlXVPjO8eU9c/wF9/zOIN7X6h8DYf7mG4CiFRZRvZNKEF5dQ3H3V+ASkHoIB3mWhatgl5ONhyqHRI6MppA==", + "dev": true, + "requires": { + "@babel/template": "^7.8.3", + "@babel/traverse": "^7.9.0", + "@babel/types": "^7.9.0" + } + }, + "@babel/highlight": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz", + "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.9.0", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" + } + }, + "@babel/parser": { + "version": "7.9.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz", + "integrity": "sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==", + "dev": true + }, + "@babel/template": { + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz", + "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.8.3", + "@babel/parser": "^7.8.6", + "@babel/types": "^7.8.6" + } + }, + "@babel/traverse": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.5.tgz", + "integrity": "sha512-c4gH3jsvSuGUezlP6rzSJ6jf8fYjLj3hsMZRx/nX0h+fmHN0w+ekubRrHPqnMec0meycA2nwCsJ7dC8IPem2FQ==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.8.3", + "@babel/generator": "^7.9.5", + "@babel/helper-function-name": "^7.9.5", + "@babel/helper-split-export-declaration": "^7.8.3", + "@babel/parser": "^7.9.0", + "@babel/types": "^7.9.5", + "debug": "^4.1.0", + "globals": "^11.1.0", + "lodash": "^4.17.13" + } + }, + "@babel/types": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.5.tgz", + "integrity": "sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.9.5", + "lodash": "^4.17.13", + "to-fast-properties": "^2.0.0" + } + }, + "convert-source-map": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz", + "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.1" + } + }, + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + }, + "json5": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz", + "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==", + "dev": true, + "requires": { + "minimist": "^1.2.5" + } + }, + "minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", + "dev": true + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true + } + } + }, + "istanbul-lib-report": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz", + "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==", + "dev": true, + "requires": { + "istanbul-lib-coverage": "^3.0.0", + "make-dir": "^3.0.0", + "supports-color": "^7.1.0" + }, + "dependencies": { + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "istanbul-lib-coverage": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz", + "integrity": "sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==", + "dev": true + }, + "make-dir": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.0.2.tgz", + "integrity": "sha512-rYKABKutXa6vXTXhoV18cBE7PaewPXHe/Bdq4v+ZLMhxbWApkFFplT0LcbMW+6BbjnQXzZ/sAvSE/JdguApG5w==", + "dev": true, + "requires": { + "semver": "^6.0.0" + } + }, + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true + }, + "supports-color": { + "version": "7.1.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", "dev": true, @@ -12757,92 +13299,184 @@ } }, "jest-config": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-24.9.0.tgz", - "integrity": "sha512-RATtQJtVYQrp7fvWg6f5y3pEFj9I+H8sWw4aKxnDZ96mob5i5SD6ZEGWgMLXQ4LE8UurrjbdlLWdUeo+28QpfQ==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-25.4.0.tgz", + "integrity": "sha512-egT9aKYxMyMSQV1aqTgam0SkI5/I2P9qrKexN5r2uuM2+68ypnc+zPGmfUxK7p1UhE7dYH9SLBS7yb+TtmT1AA==", "dev": true, "requires": { "@babel/core": "^7.1.0", - "@jest/test-sequencer": "^24.9.0", - "@jest/types": "^24.9.0", - "babel-jest": "^24.9.0", - "chalk": "^2.0.1", + "@jest/test-sequencer": "^25.4.0", + "@jest/types": "^25.4.0", + "babel-jest": "^25.4.0", + "chalk": "^3.0.0", + "deepmerge": "^4.2.2", "glob": "^7.1.1", - "jest-environment-jsdom": "^24.9.0", - "jest-environment-node": "^24.9.0", - "jest-get-type": "^24.9.0", - "jest-jasmine2": "^24.9.0", - "jest-regex-util": "^24.3.0", - "jest-resolve": "^24.9.0", - "jest-util": "^24.9.0", - "jest-validate": "^24.9.0", - "micromatch": "^3.1.10", - "pretty-format": "^24.9.0", - "realpath-native": "^1.1.0" + "jest-environment-jsdom": "^25.4.0", + "jest-environment-node": "^25.4.0", + "jest-get-type": "^25.2.6", + "jest-jasmine2": "^25.4.0", + "jest-regex-util": "^25.2.6", + "jest-resolve": "^25.4.0", + "jest-util": "^25.4.0", + "jest-validate": "^25.4.0", + "micromatch": "^4.0.2", + "pretty-format": "^25.4.0", + "realpath-native": "^2.0.0" }, "dependencies": { "@jest/types": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz", - "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.4.0.tgz", + "integrity": "sha512-XBeaWNzw2PPnGW5aXvZt3+VO60M+34RY3XDsCK5tW7kyj3RK0XClRutCfjqcBuaR2aBQTbluEDME9b5MB9UAPw==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^1.1.1", - "@types/yargs": "^13.0.0" + "@types/yargs": "^15.0.0", + "chalk": "^3.0.0" } }, - "@types/yargs": { - "version": "13.0.2", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.2.tgz", - "integrity": "sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ==", + "ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "dev": true + }, + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", "dev": true, "requires": { - "@types/yargs-parser": "*" + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" } }, - "camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", - "dev": true - }, - "jest-get-type": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-24.9.0.tgz", - "integrity": "sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q==", + "braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "dev": true, + "requires": { + "fill-range": "^7.0.1" + } + }, + "chalk": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "deepmerge": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz", + "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==", + "dev": true + }, + "fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "dev": true, + "requires": { + "to-regex-range": "^5.0.1" + } + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true + }, + "jest-get-type": { + "version": "25.2.6", + "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-25.2.6.tgz", + "integrity": "sha512-DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig==", "dev": true }, "jest-validate": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-24.9.0.tgz", - "integrity": "sha512-HPIt6C5ACwiqSiwi+OfSSHbK8sG7akG8eATl+IPKaeIjtPOeBUd/g3J7DghugzxrGjI93qS/+RPKe1H6PqvhRQ==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-25.4.0.tgz", + "integrity": "sha512-hvjmes/EFVJSoeP1yOl8qR8mAtMR3ToBkZeXrD/ZS9VxRyWDqQ/E1C5ucMTeSmEOGLipvdlyipiGbHJ+R1MQ0g==", "dev": true, "requires": { - "@jest/types": "^24.9.0", + "@jest/types": "^25.4.0", "camelcase": "^5.3.1", - "chalk": "^2.0.1", - "jest-get-type": "^24.9.0", + "chalk": "^3.0.0", + "jest-get-type": "^25.2.6", "leven": "^3.1.0", - "pretty-format": "^24.9.0" + "pretty-format": "^25.4.0" } }, - "leven": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz", - "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==", - "dev": true + "micromatch": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz", + "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==", + "dev": true, + "requires": { + "braces": "^3.0.1", + "picomatch": "^2.0.5" + } }, "pretty-format": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz", - "integrity": "sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.4.0.tgz", + "integrity": "sha512-PI/2dpGjXK5HyXexLPZU/jw5T9Q6S1YVXxxVxco+LIqzUFHXIbKZKdUVt7GcX7QUCr31+3fzhi4gN4/wUYPVxQ==", "dev": true, "requires": { - "@jest/types": "^24.9.0", - "ansi-regex": "^4.0.0", - "ansi-styles": "^3.2.0", - "react-is": "^16.8.4" + "@jest/types": "^25.4.0", + "ansi-regex": "^5.0.0", + "ansi-styles": "^4.0.0", + "react-is": "^16.12.0" + } + }, + "react-is": { + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", + "dev": true + }, + "supports-color": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + }, + "to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "requires": { + "is-number": "^7.0.0" } } } @@ -12900,134 +13534,279 @@ } }, "jest-docblock": { - "version": "24.3.0", - "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-24.3.0.tgz", - "integrity": "sha512-nlANmF9Yq1dufhFlKG9rasfQlrY7wINJbo3q01tu56Jv5eBU5jirylhF2O5ZBnLxzOVBGRDz/9NAwNyBtG4Nyg==", + "version": "25.3.0", + "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-25.3.0.tgz", + "integrity": "sha512-aktF0kCar8+zxRHxQZwxMy70stc9R1mOmrLsT5VO3pIT0uzGRSDAXxSlz4NqQWpuLjPpuMhPRl7H+5FRsvIQAg==", "dev": true, "requires": { - "detect-newline": "^2.1.0" + "detect-newline": "^3.0.0" } }, "jest-each": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-24.9.0.tgz", - "integrity": "sha512-ONi0R4BvW45cw8s2Lrx8YgbeXL1oCQ/wIDwmsM3CqM/nlblNCPmnC3IPQlMbRFZu3wKdQ2U8BqM6lh3LJ5Bsog==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-25.4.0.tgz", + "integrity": "sha512-lwRIJ8/vQU/6vq3nnSSUw1Y3nz5tkYSFIywGCZpUBd6WcRgpn8NmJoQICojbpZmsJOJNHm0BKdyuJ6Xdx+eDQQ==", "dev": true, "requires": { - "@jest/types": "^24.9.0", - "chalk": "^2.0.1", - "jest-get-type": "^24.9.0", - "jest-util": "^24.9.0", - "pretty-format": "^24.9.0" + "@jest/types": "^25.4.0", + "chalk": "^3.0.0", + "jest-get-type": "^25.2.6", + "jest-util": "^25.4.0", + "pretty-format": "^25.4.0" }, "dependencies": { "@jest/types": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz", - "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.4.0.tgz", + "integrity": "sha512-XBeaWNzw2PPnGW5aXvZt3+VO60M+34RY3XDsCK5tW7kyj3RK0XClRutCfjqcBuaR2aBQTbluEDME9b5MB9UAPw==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^1.1.1", - "@types/yargs": "^13.0.0" + "@types/yargs": "^15.0.0", + "chalk": "^3.0.0" } }, - "@types/yargs": { - "version": "13.0.2", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.2.tgz", - "integrity": "sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ==", + "ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "dev": true + }, + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", "dev": true, "requires": { - "@types/yargs-parser": "*" + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" } }, + "chalk": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, "jest-get-type": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-24.9.0.tgz", - "integrity": "sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q==", + "version": "25.2.6", + "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-25.2.6.tgz", + "integrity": "sha512-DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig==", "dev": true }, "pretty-format": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz", - "integrity": "sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.4.0.tgz", + "integrity": "sha512-PI/2dpGjXK5HyXexLPZU/jw5T9Q6S1YVXxxVxco+LIqzUFHXIbKZKdUVt7GcX7QUCr31+3fzhi4gN4/wUYPVxQ==", "dev": true, "requires": { - "@jest/types": "^24.9.0", - "ansi-regex": "^4.0.0", - "ansi-styles": "^3.2.0", - "react-is": "^16.8.4" + "@jest/types": "^25.4.0", + "ansi-regex": "^5.0.0", + "ansi-styles": "^4.0.0", + "react-is": "^16.12.0" + } + }, + "react-is": { + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", + "dev": true + }, + "supports-color": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" } } } }, "jest-environment-jsdom": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-24.9.0.tgz", - "integrity": "sha512-Zv9FV9NBRzLuALXjvRijO2351DRQeLYXtpD4xNvfoVFw21IOKNhZAEUKcbiEtjTkm2GsJ3boMVgkaR7rN8qetA==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-25.4.0.tgz", + "integrity": "sha512-KTitVGMDrn2+pt7aZ8/yUTuS333w3pWt1Mf88vMntw7ZSBNDkRS6/4XLbFpWXYfWfp1FjcjQTOKzbK20oIehWQ==", "dev": true, "requires": { - "@jest/environment": "^24.9.0", - "@jest/fake-timers": "^24.9.0", - "@jest/types": "^24.9.0", - "jest-mock": "^24.9.0", - "jest-util": "^24.9.0", - "jsdom": "^11.5.1" + "@jest/environment": "^25.4.0", + "@jest/fake-timers": "^25.4.0", + "@jest/types": "^25.4.0", + "jest-mock": "^25.4.0", + "jest-util": "^25.4.0", + "jsdom": "^15.2.1" }, "dependencies": { "@jest/types": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz", - "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.4.0.tgz", + "integrity": "sha512-XBeaWNzw2PPnGW5aXvZt3+VO60M+34RY3XDsCK5tW7kyj3RK0XClRutCfjqcBuaR2aBQTbluEDME9b5MB9UAPw==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^1.1.1", - "@types/yargs": "^13.0.0" + "@types/yargs": "^15.0.0", + "chalk": "^3.0.0" } }, - "@types/yargs": { - "version": "13.0.2", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.2.tgz", - "integrity": "sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ==", + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", "dev": true, "requires": { - "@types/yargs-parser": "*" + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" } - } - } - }, - "jest-environment-node": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-24.9.0.tgz", - "integrity": "sha512-6d4V2f4nxzIzwendo27Tr0aFm+IXWa0XEUnaH6nU0FMaozxovt+sfRvh4J47wL1OvF83I3SSTu0XK+i4Bqe7uA==", + }, + "chalk": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "supports-color": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, + "jest-environment-node": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-25.4.0.tgz", + "integrity": "sha512-wryZ18vsxEAKFH7Z74zi/y/SyI1j6UkVZ6QsllBuT/bWlahNfQjLNwFsgh/5u7O957dYFoXj4yfma4n4X6kU9A==", "dev": true, "requires": { - "@jest/environment": "^24.9.0", - "@jest/fake-timers": "^24.9.0", - "@jest/types": "^24.9.0", - "jest-mock": "^24.9.0", - "jest-util": "^24.9.0" + "@jest/environment": "^25.4.0", + "@jest/fake-timers": "^25.4.0", + "@jest/types": "^25.4.0", + "jest-mock": "^25.4.0", + "jest-util": "^25.4.0", + "semver": "^6.3.0" }, "dependencies": { "@jest/types": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz", - "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.4.0.tgz", + "integrity": "sha512-XBeaWNzw2PPnGW5aXvZt3+VO60M+34RY3XDsCK5tW7kyj3RK0XClRutCfjqcBuaR2aBQTbluEDME9b5MB9UAPw==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^1.1.1", - "@types/yargs": "^13.0.0" + "@types/yargs": "^15.0.0", + "chalk": "^3.0.0" } }, - "@types/yargs": { - "version": "13.0.2", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.2.tgz", - "integrity": "sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ==", + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", "dev": true, "requires": { - "@types/yargs-parser": "*" + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true + }, + "supports-color": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" } } } @@ -13039,162 +13818,308 @@ "dev": true }, "jest-haste-map": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-24.9.0.tgz", - "integrity": "sha512-kfVFmsuWui2Sj1Rp1AJ4D9HqJwE4uwTlS/vO+eRUaMmd54BFpli2XhMQnPC2k4cHFVbB2Q2C+jtI1AGLgEnCjQ==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-25.4.0.tgz", + "integrity": "sha512-5EoCe1gXfGC7jmXbKzqxESrgRcaO3SzWXGCnvp9BcT0CFMyrB1Q6LIsjl9RmvmJGQgW297TCfrdgiy574Rl9HQ==", "dev": true, "requires": { - "@jest/types": "^24.9.0", - "anymatch": "^2.0.0", + "@jest/types": "^25.4.0", + "anymatch": "^3.0.3", "fb-watchman": "^2.0.0", - "fsevents": "^1.2.7", - "graceful-fs": "^4.1.15", - "invariant": "^2.2.4", - "jest-serializer": "^24.9.0", - "jest-util": "^24.9.0", - "jest-worker": "^24.9.0", - "micromatch": "^3.1.10", + "fsevents": "^2.1.2", + "graceful-fs": "^4.2.3", + "jest-serializer": "^25.2.6", + "jest-util": "^25.4.0", + "jest-worker": "^25.4.0", + "micromatch": "^4.0.2", "sane": "^4.0.3", - "walker": "^1.0.7" + "walker": "^1.0.7", + "which": "^2.0.2" }, "dependencies": { "@jest/types": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz", - "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.4.0.tgz", + "integrity": "sha512-XBeaWNzw2PPnGW5aXvZt3+VO60M+34RY3XDsCK5tW7kyj3RK0XClRutCfjqcBuaR2aBQTbluEDME9b5MB9UAPw==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^1.1.1", - "@types/yargs": "^13.0.0" + "@types/yargs": "^15.0.0", + "chalk": "^3.0.0" } }, - "@types/yargs": { - "version": "13.0.2", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.2.tgz", - "integrity": "sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ==", + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", "dev": true, "requires": { - "@types/yargs-parser": "*" + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" } }, - "jest-worker": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.9.0.tgz", - "integrity": "sha512-51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw==", + "anymatch": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz", + "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==", "dev": true, "requires": { - "merge-stream": "^2.0.0", - "supports-color": "^6.1.0" + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" } }, - "merge-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", - "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", + "braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "dev": true, + "requires": { + "fill-range": "^7.0.1" + } + }, + "chalk": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "dev": true, + "requires": { + "to-regex-range": "^5.0.1" + } + }, + "graceful-fs": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz", + "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true + }, + "micromatch": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz", + "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==", + "dev": true, + "requires": { + "braces": "^3.0.1", + "picomatch": "^2.0.5" + } + }, + "normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", "dev": true }, "supports-color": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", - "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + }, + "to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", "dev": true, "requires": { - "has-flag": "^3.0.0" + "is-number": "^7.0.0" + } + }, + "which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, + "requires": { + "isexe": "^2.0.0" } } } }, "jest-jasmine2": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-24.9.0.tgz", - "integrity": "sha512-Cq7vkAgaYKp+PsX+2/JbTarrk0DmNhsEtqBXNwUHkdlbrTBLtMJINADf2mf5FkowNsq8evbPc07/qFO0AdKTzw==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-25.4.0.tgz", + "integrity": "sha512-QccxnozujVKYNEhMQ1vREiz859fPN/XklOzfQjm2j9IGytAkUbSwjFRBtQbHaNZ88cItMpw02JnHGsIdfdpwxQ==", "dev": true, "requires": { "@babel/traverse": "^7.1.0", - "@jest/environment": "^24.9.0", - "@jest/test-result": "^24.9.0", - "@jest/types": "^24.9.0", - "chalk": "^2.0.1", + "@jest/environment": "^25.4.0", + "@jest/source-map": "^25.2.6", + "@jest/test-result": "^25.4.0", + "@jest/types": "^25.4.0", + "chalk": "^3.0.0", "co": "^4.6.0", - "expect": "^24.9.0", + "expect": "^25.4.0", "is-generator-fn": "^2.0.0", - "jest-each": "^24.9.0", - "jest-matcher-utils": "^24.9.0", - "jest-message-util": "^24.9.0", - "jest-runtime": "^24.9.0", - "jest-snapshot": "^24.9.0", - "jest-util": "^24.9.0", - "pretty-format": "^24.9.0", - "throat": "^4.0.0" + "jest-each": "^25.4.0", + "jest-matcher-utils": "^25.4.0", + "jest-message-util": "^25.4.0", + "jest-runtime": "^25.4.0", + "jest-snapshot": "^25.4.0", + "jest-util": "^25.4.0", + "pretty-format": "^25.4.0", + "throat": "^5.0.0" }, "dependencies": { "@jest/types": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz", - "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.4.0.tgz", + "integrity": "sha512-XBeaWNzw2PPnGW5aXvZt3+VO60M+34RY3XDsCK5tW7kyj3RK0XClRutCfjqcBuaR2aBQTbluEDME9b5MB9UAPw==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^1.1.1", - "@types/yargs": "^13.0.0" + "@types/yargs": "^15.0.0", + "chalk": "^3.0.0" } }, - "@types/yargs": { - "version": "13.0.2", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.2.tgz", - "integrity": "sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ==", + "ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "dev": true + }, + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", "dev": true, "requires": { - "@types/yargs-parser": "*" + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" } }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, "diff-sequences": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-24.9.0.tgz", - "integrity": "sha512-Dj6Wk3tWyTE+Fo1rW8v0Xhwk80um6yFYKbuAxc9c3EZxIHFDYwbi34Uk42u1CdnIiVorvt4RmlSDjIPyzGC2ew==", + "version": "25.2.6", + "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-25.2.6.tgz", + "integrity": "sha512-Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true }, "jest-diff": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-24.9.0.tgz", - "integrity": "sha512-qMfrTs8AdJE2iqrTp0hzh7kTd2PQWrsFyj9tORoKmu32xjPjeE4NyjVRDz8ybYwqS2ik8N4hsIpiVTyFeo2lBQ==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-25.4.0.tgz", + "integrity": "sha512-kklLbJVXW0y8UKOWOdYhI6TH5MG6QAxrWiBMgQaPIuhj3dNFGirKCd+/xfplBXICQ7fI+3QcqHm9p9lWu1N6ug==", "dev": true, "requires": { - "chalk": "^2.0.1", - "diff-sequences": "^24.9.0", - "jest-get-type": "^24.9.0", - "pretty-format": "^24.9.0" + "chalk": "^3.0.0", + "diff-sequences": "^25.2.6", + "jest-get-type": "^25.2.6", + "pretty-format": "^25.4.0" } }, "jest-get-type": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-24.9.0.tgz", - "integrity": "sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q==", + "version": "25.2.6", + "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-25.2.6.tgz", + "integrity": "sha512-DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig==", "dev": true }, "jest-matcher-utils": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-24.9.0.tgz", - "integrity": "sha512-OZz2IXsu6eaiMAwe67c1T+5tUAtQyQx27/EMEkbFAGiw52tB9em+uGbzpcgYVpA8wl0hlxKPZxrly4CXU/GjHA==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-25.4.0.tgz", + "integrity": "sha512-yPMdtj7YDgXhnGbc66bowk8AkQ0YwClbbwk3Kzhn5GVDrciiCr27U4NJRbrqXbTdtxjImONITg2LiRIw650k5A==", "dev": true, "requires": { - "chalk": "^2.0.1", - "jest-diff": "^24.9.0", - "jest-get-type": "^24.9.0", - "pretty-format": "^24.9.0" + "chalk": "^3.0.0", + "jest-diff": "^25.4.0", + "jest-get-type": "^25.2.6", + "pretty-format": "^25.4.0" } }, "pretty-format": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz", - "integrity": "sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.4.0.tgz", + "integrity": "sha512-PI/2dpGjXK5HyXexLPZU/jw5T9Q6S1YVXxxVxco+LIqzUFHXIbKZKdUVt7GcX7QUCr31+3fzhi4gN4/wUYPVxQ==", "dev": true, "requires": { - "@jest/types": "^24.9.0", - "ansi-regex": "^4.0.0", - "ansi-styles": "^3.2.0", - "react-is": "^16.8.4" + "@jest/types": "^25.4.0", + "ansi-regex": "^5.0.0", + "ansi-styles": "^4.0.0", + "react-is": "^16.12.0" + } + }, + "react-is": { + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", + "dev": true + }, + "supports-color": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" } } } @@ -13230,51 +14155,105 @@ } }, "jest-leak-detector": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-24.9.0.tgz", - "integrity": "sha512-tYkFIDsiKTGwb2FG1w8hX9V0aUb2ot8zY/2nFg087dUageonw1zrLMP4W6zsRO59dPkTSKie+D4rhMuP9nRmrA==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-25.4.0.tgz", + "integrity": "sha512-7Y6Bqfv2xWsB+7w44dvZuLs5SQ//fzhETgOGG7Gq3TTGFdYvAgXGwV8z159RFZ6fXiCPm/szQ90CyfVos9JIFQ==", "dev": true, "requires": { - "jest-get-type": "^24.9.0", - "pretty-format": "^24.9.0" + "jest-get-type": "^25.2.6", + "pretty-format": "^25.4.0" }, "dependencies": { "@jest/types": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz", - "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.4.0.tgz", + "integrity": "sha512-XBeaWNzw2PPnGW5aXvZt3+VO60M+34RY3XDsCK5tW7kyj3RK0XClRutCfjqcBuaR2aBQTbluEDME9b5MB9UAPw==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^1.1.1", - "@types/yargs": "^13.0.0" + "@types/yargs": "^15.0.0", + "chalk": "^3.0.0" } }, - "@types/yargs": { - "version": "13.0.2", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.2.tgz", - "integrity": "sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ==", + "ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "dev": true + }, + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", "dev": true, "requires": { - "@types/yargs-parser": "*" + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" } }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, "jest-get-type": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-24.9.0.tgz", - "integrity": "sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q==", + "version": "25.2.6", + "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-25.2.6.tgz", + "integrity": "sha512-DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig==", "dev": true }, "pretty-format": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz", - "integrity": "sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.4.0.tgz", + "integrity": "sha512-PI/2dpGjXK5HyXexLPZU/jw5T9Q6S1YVXxxVxco+LIqzUFHXIbKZKdUVt7GcX7QUCr31+3fzhi4gN4/wUYPVxQ==", "dev": true, "requires": { - "@jest/types": "^24.9.0", - "ansi-regex": "^4.0.0", - "ansi-styles": "^3.2.0", - "react-is": "^16.8.4" + "@jest/types": "^25.4.0", + "ansi-regex": "^5.0.0", + "ansi-styles": "^4.0.0", + "react-is": "^16.12.0" + } + }, + "react-is": { + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", + "dev": true + }, + "supports-color": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" } } } @@ -13332,70 +14311,202 @@ } }, "jest-message-util": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-24.9.0.tgz", - "integrity": "sha512-oCj8FiZ3U0hTP4aSui87P4L4jC37BtQwUMqk+zk/b11FR19BJDeZsZAvIHutWnmtw7r85UmR3CEWZ0HWU2mAlw==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-25.4.0.tgz", + "integrity": "sha512-LYY9hRcVGgMeMwmdfh9tTjeux1OjZHMusq/E5f3tJN+dAoVVkJtq5ZUEPIcB7bpxDUt2zjUsrwg0EGgPQ+OhXQ==", "dev": true, "requires": { "@babel/code-frame": "^7.0.0", - "@jest/test-result": "^24.9.0", - "@jest/types": "^24.9.0", + "@jest/types": "^25.4.0", "@types/stack-utils": "^1.0.1", - "chalk": "^2.0.1", - "micromatch": "^3.1.10", - "slash": "^2.0.0", + "chalk": "^3.0.0", + "micromatch": "^4.0.2", + "slash": "^3.0.0", "stack-utils": "^1.0.1" }, "dependencies": { "@jest/types": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz", - "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.4.0.tgz", + "integrity": "sha512-XBeaWNzw2PPnGW5aXvZt3+VO60M+34RY3XDsCK5tW7kyj3RK0XClRutCfjqcBuaR2aBQTbluEDME9b5MB9UAPw==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^1.1.1", - "@types/yargs": "^13.0.0" + "@types/yargs": "^15.0.0", + "chalk": "^3.0.0" + } + }, + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "dev": true, + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "dev": true, + "requires": { + "fill-range": "^7.0.1" + } + }, + "chalk": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "dev": true, + "requires": { + "to-regex-range": "^5.0.1" + } + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true + }, + "micromatch": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz", + "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==", + "dev": true, + "requires": { + "braces": "^3.0.1", + "picomatch": "^2.0.5" + } + }, + "slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true + }, + "supports-color": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" } }, - "@types/yargs": { - "version": "13.0.2", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.2.tgz", - "integrity": "sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ==", + "to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", "dev": true, "requires": { - "@types/yargs-parser": "*" + "is-number": "^7.0.0" } } } }, "jest-mock": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-24.9.0.tgz", - "integrity": "sha512-3BEYN5WbSq9wd+SyLDES7AHnjH9A/ROBwmz7l2y+ol+NtSFO8DYiEBzoO1CeFc9a8DYy10EO4dDFVv/wN3zl1w==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-25.4.0.tgz", + "integrity": "sha512-MdazSfcYAUjJjuVTTnusLPzE0pE4VXpOUzWdj8sbM+q6abUjm3bATVPXFqTXrxSieR8ocpvQ9v/QaQCftioQFg==", "dev": true, "requires": { - "@jest/types": "^24.9.0" + "@jest/types": "^25.4.0" }, "dependencies": { "@jest/types": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz", - "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.4.0.tgz", + "integrity": "sha512-XBeaWNzw2PPnGW5aXvZt3+VO60M+34RY3XDsCK5tW7kyj3RK0XClRutCfjqcBuaR2aBQTbluEDME9b5MB9UAPw==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^1.1.1", - "@types/yargs": "^13.0.0" + "@types/yargs": "^15.0.0", + "chalk": "^3.0.0" } }, - "@types/yargs": { - "version": "13.0.2", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.2.tgz", - "integrity": "sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ==", + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", "dev": true, "requires": { - "@types/yargs-parser": "*" + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "supports-color": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" } } } @@ -13407,42 +14518,102 @@ "dev": true }, "jest-regex-util": { - "version": "24.3.0", - "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-24.3.0.tgz", - "integrity": "sha512-tXQR1NEOyGlfylyEjg1ImtScwMq8Oh3iJbGTjN7p0J23EuVX1MA8rwU69K4sLbCmwzgCUbVkm0FkSF9TdzOhtg==", + "version": "25.2.6", + "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-25.2.6.tgz", + "integrity": "sha512-KQqf7a0NrtCkYmZZzodPftn7fL1cq3GQAFVMn5Hg8uKx/fIenLEobNanUxb7abQ1sjADHBseG/2FGpsv/wr+Qw==", "dev": true }, "jest-resolve": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-24.9.0.tgz", - "integrity": "sha512-TaLeLVL1l08YFZAt3zaPtjiVvyy4oSA6CRe+0AFPPVX3Q/VI0giIWWoAvoS5L96vj9Dqxj4fB5p2qrHCmTU/MQ==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-25.4.0.tgz", + "integrity": "sha512-wOsKqVDFWUiv8BtLMCC6uAJ/pHZkfFgoBTgPtmYlsprAjkxrr2U++ZnB3l5ykBMd2O24lXvf30SMAjJIW6k2aA==", "dev": true, "requires": { - "@jest/types": "^24.9.0", + "@jest/types": "^25.4.0", "browser-resolve": "^1.11.3", - "chalk": "^2.0.1", + "chalk": "^3.0.0", "jest-pnp-resolver": "^1.2.1", - "realpath-native": "^1.1.0" + "read-pkg-up": "^7.0.1", + "realpath-native": "^2.0.0", + "resolve": "^1.15.1", + "slash": "^3.0.0" }, "dependencies": { "@jest/types": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz", - "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.4.0.tgz", + "integrity": "sha512-XBeaWNzw2PPnGW5aXvZt3+VO60M+34RY3XDsCK5tW7kyj3RK0XClRutCfjqcBuaR2aBQTbluEDME9b5MB9UAPw==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^1.1.1", - "@types/yargs": "^13.0.0" + "@types/yargs": "^15.0.0", + "chalk": "^3.0.0" } }, - "@types/yargs": { - "version": "13.0.2", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.2.tgz", - "integrity": "sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ==", + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", "dev": true, "requires": { - "@types/yargs-parser": "*" + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "resolve": { + "version": "1.16.1", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.16.1.tgz", + "integrity": "sha512-rmAglCSqWWMrrBv/XM6sW0NuRFiKViw/W4d9EbC4pt+49H8JwHy+mcGmALTEg504AUDcLTvb1T2q3E9AnmY+ig==", + "dev": true, + "requires": { + "path-parse": "^1.0.6" + } + }, + "slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true + }, + "supports-color": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" } } } @@ -13785,10 +14956,122 @@ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", "dev": true }, - "slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true + }, + "supports-color": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + }, + "to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "requires": { + "is-number": "^7.0.0" + } + }, + "type-fest": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", + "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", + "dev": true + } + } + }, + "jest-runner": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-25.4.0.tgz", + "integrity": "sha512-wWQSbVgj2e/1chFdMRKZdvlmA6p1IPujhpLT7TKNtCSl1B0PGBGvJjCaiBal/twaU2yfk8VKezHWexM8IliBfA==", + "dev": true, + "requires": { + "@jest/console": "^25.4.0", + "@jest/environment": "^25.4.0", + "@jest/test-result": "^25.4.0", + "@jest/types": "^25.4.0", + "chalk": "^3.0.0", + "exit": "^0.1.2", + "graceful-fs": "^4.2.3", + "jest-config": "^25.4.0", + "jest-docblock": "^25.3.0", + "jest-haste-map": "^25.4.0", + "jest-jasmine2": "^25.4.0", + "jest-leak-detector": "^25.4.0", + "jest-message-util": "^25.4.0", + "jest-resolve": "^25.4.0", + "jest-runtime": "^25.4.0", + "jest-util": "^25.4.0", + "jest-worker": "^25.4.0", + "source-map-support": "^0.5.6", + "throat": "^5.0.0" + }, + "dependencies": { + "@jest/types": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.4.0.tgz", + "integrity": "sha512-XBeaWNzw2PPnGW5aXvZt3+VO60M+34RY3XDsCK5tW7kyj3RK0XClRutCfjqcBuaR2aBQTbluEDME9b5MB9UAPw==", + "dev": true, + "requires": { + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^1.1.1", + "@types/yargs": "^15.0.0", + "chalk": "^3.0.0" + } + }, + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "dev": true, + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "graceful-fs": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz", + "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true }, "supports-color": { @@ -13799,255 +15082,277 @@ "requires": { "has-flag": "^4.0.0" } - }, - "to-regex-range": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "dev": true, - "requires": { - "is-number": "^7.0.0" - } - }, - "type-fest": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", - "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", - "dev": true } } }, - "jest-runner": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-24.9.0.tgz", - "integrity": "sha512-KksJQyI3/0mhcfspnxxEOBueGrd5E4vV7ADQLT9ESaCzz02WnbdbKWIf5Mkaucoaj7obQckYPVX6JJhgUcoWWg==", + "jest-runtime": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-25.4.0.tgz", + "integrity": "sha512-lgNJlCDULtXu9FumnwCyWlOub8iytijwsPNa30BKrSNtgoT6NUMXOPrZvsH06U6v0wgD/Igwz13nKA2wEKU2VA==", "dev": true, "requires": { - "@jest/console": "^24.7.1", - "@jest/environment": "^24.9.0", - "@jest/test-result": "^24.9.0", - "@jest/types": "^24.9.0", - "chalk": "^2.4.2", + "@jest/console": "^25.4.0", + "@jest/environment": "^25.4.0", + "@jest/source-map": "^25.2.6", + "@jest/test-result": "^25.4.0", + "@jest/transform": "^25.4.0", + "@jest/types": "^25.4.0", + "@types/yargs": "^15.0.0", + "chalk": "^3.0.0", + "collect-v8-coverage": "^1.0.0", "exit": "^0.1.2", - "graceful-fs": "^4.1.15", - "jest-config": "^24.9.0", - "jest-docblock": "^24.3.0", - "jest-haste-map": "^24.9.0", - "jest-jasmine2": "^24.9.0", - "jest-leak-detector": "^24.9.0", - "jest-message-util": "^24.9.0", - "jest-resolve": "^24.9.0", - "jest-runtime": "^24.9.0", - "jest-util": "^24.9.0", - "jest-worker": "^24.6.0", - "source-map-support": "^0.5.6", - "throat": "^4.0.0" + "glob": "^7.1.3", + "graceful-fs": "^4.2.3", + "jest-config": "^25.4.0", + "jest-haste-map": "^25.4.0", + "jest-message-util": "^25.4.0", + "jest-mock": "^25.4.0", + "jest-regex-util": "^25.2.6", + "jest-resolve": "^25.4.0", + "jest-snapshot": "^25.4.0", + "jest-util": "^25.4.0", + "jest-validate": "^25.4.0", + "realpath-native": "^2.0.0", + "slash": "^3.0.0", + "strip-bom": "^4.0.0", + "yargs": "^15.3.1" }, "dependencies": { "@jest/types": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz", - "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.4.0.tgz", + "integrity": "sha512-XBeaWNzw2PPnGW5aXvZt3+VO60M+34RY3XDsCK5tW7kyj3RK0XClRutCfjqcBuaR2aBQTbluEDME9b5MB9UAPw==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^1.1.1", - "@types/yargs": "^13.0.0" + "@types/yargs": "^15.0.0", + "chalk": "^3.0.0" } }, - "@types/yargs": { - "version": "13.0.2", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.2.tgz", - "integrity": "sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ==", + "ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "dev": true + }, + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", "dev": true, "requires": { - "@types/yargs-parser": "*" + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" } }, "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", "dev": true, "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" } - } - } - }, - "jest-runtime": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-24.9.0.tgz", - "integrity": "sha512-8oNqgnmF3v2J6PVRM2Jfuj8oX3syKmaynlDMMKQ4iyzbQzIG6th5ub/lM2bCMTmoTKM3ykcUYI2Pw9xwNtjMnw==", - "dev": true, - "requires": { - "@jest/console": "^24.7.1", - "@jest/environment": "^24.9.0", - "@jest/source-map": "^24.3.0", - "@jest/transform": "^24.9.0", - "@jest/types": "^24.9.0", - "@types/yargs": "^13.0.0", - "chalk": "^2.0.1", - "exit": "^0.1.2", - "glob": "^7.1.3", - "graceful-fs": "^4.1.15", - "jest-config": "^24.9.0", - "jest-haste-map": "^24.9.0", - "jest-message-util": "^24.9.0", - "jest-mock": "^24.9.0", - "jest-regex-util": "^24.3.0", - "jest-resolve": "^24.9.0", - "jest-snapshot": "^24.9.0", - "jest-util": "^24.9.0", - "jest-validate": "^24.9.0", - "realpath-native": "^1.1.0", - "slash": "^2.0.0", - "strip-bom": "^3.0.0", - "yargs": "^13.3.0" - }, - "dependencies": { - "@jest/types": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz", - "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==", + }, + "cliui": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", + "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==", "dev": true, "requires": { - "@types/istanbul-lib-coverage": "^2.0.0", - "@types/istanbul-reports": "^1.1.1", - "@types/yargs": "^13.0.0" + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^6.2.0" } }, - "@types/yargs": { - "version": "13.0.2", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.2.tgz", - "integrity": "sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ==", + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, "requires": { - "@types/yargs-parser": "*" + "color-name": "~1.1.4" } }, - "camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, - "cliui": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", - "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", + "emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, + "find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", "dev": true, "requires": { - "string-width": "^3.1.0", - "strip-ansi": "^5.2.0", - "wrap-ansi": "^5.1.0" + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" } }, - "get-caller-file": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "graceful-fs": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz", + "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", "dev": true }, "jest-get-type": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-24.9.0.tgz", - "integrity": "sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q==", + "version": "25.2.6", + "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-25.2.6.tgz", + "integrity": "sha512-DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig==", "dev": true }, "jest-validate": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-24.9.0.tgz", - "integrity": "sha512-HPIt6C5ACwiqSiwi+OfSSHbK8sG7akG8eATl+IPKaeIjtPOeBUd/g3J7DghugzxrGjI93qS/+RPKe1H6PqvhRQ==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-25.4.0.tgz", + "integrity": "sha512-hvjmes/EFVJSoeP1yOl8qR8mAtMR3ToBkZeXrD/ZS9VxRyWDqQ/E1C5ucMTeSmEOGLipvdlyipiGbHJ+R1MQ0g==", "dev": true, "requires": { - "@jest/types": "^24.9.0", + "@jest/types": "^25.4.0", "camelcase": "^5.3.1", - "chalk": "^2.0.1", - "jest-get-type": "^24.9.0", + "chalk": "^3.0.0", + "jest-get-type": "^25.2.6", "leven": "^3.1.0", - "pretty-format": "^24.9.0" + "pretty-format": "^25.4.0" } }, - "leven": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz", - "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==", + "locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dev": true, + "requires": { + "p-locate": "^4.1.0" + } + }, + "p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dev": true, + "requires": { + "p-limit": "^2.2.0" + } + }, + "path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", "dev": true }, "pretty-format": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz", - "integrity": "sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.4.0.tgz", + "integrity": "sha512-PI/2dpGjXK5HyXexLPZU/jw5T9Q6S1YVXxxVxco+LIqzUFHXIbKZKdUVt7GcX7QUCr31+3fzhi4gN4/wUYPVxQ==", "dev": true, "requires": { - "@jest/types": "^24.9.0", - "ansi-regex": "^4.0.0", - "ansi-styles": "^3.2.0", - "react-is": "^16.8.4" + "@jest/types": "^25.4.0", + "ansi-regex": "^5.0.0", + "ansi-styles": "^4.0.0", + "react-is": "^16.12.0" } }, - "require-main-filename": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", - "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", + "react-is": { + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", + "dev": true + }, + "slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", "dev": true }, "string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", + "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", "dev": true, "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" + } + }, + "strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "dev": true, + "requires": { + "ansi-regex": "^5.0.0" } }, - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "strip-bom": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz", + "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==", + "dev": true + }, + "supports-color": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", "dev": true, "requires": { - "ansi-regex": "^4.1.0" + "has-flag": "^4.0.0" } }, "wrap-ansi": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", - "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", + "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", "dev": true, "requires": { - "ansi-styles": "^3.2.0", - "string-width": "^3.0.0", - "strip-ansi": "^5.0.0" + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" } }, "yargs": { - "version": "13.3.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz", - "integrity": "sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==", + "version": "15.3.1", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.3.1.tgz", + "integrity": "sha512-92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA==", "dev": true, "requires": { - "cliui": "^5.0.0", - "find-up": "^3.0.0", + "cliui": "^6.0.0", + "decamelize": "^1.2.0", + "find-up": "^4.1.0", "get-caller-file": "^2.0.1", "require-directory": "^2.1.1", "require-main-filename": "^2.0.0", "set-blocking": "^2.0.0", - "string-width": "^3.0.0", + "string-width": "^4.2.0", "which-module": "^2.0.0", "y18n": "^4.0.0", - "yargs-parser": "^13.1.1" + "yargs-parser": "^18.1.1" } }, "yargs-parser": { - "version": "13.1.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz", - "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==", + "version": "18.1.3", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz", + "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==", "dev": true, "requires": { "camelcase": "^5.0.0", @@ -14057,175 +15362,260 @@ } }, "jest-serializer": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-24.9.0.tgz", - "integrity": "sha512-DxYipDr8OvfrKH3Kel6NdED3OXxjvxXZ1uIY2I9OFbGg+vUkkg7AGvi65qbhbWNPvDckXmzMPbK3u3HaDO49bQ==", + "version": "25.2.6", + "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-25.2.6.tgz", + "integrity": "sha512-RMVCfZsezQS2Ww4kB5HJTMaMJ0asmC0BHlnobQC6yEtxiFKIxohFA4QSXSabKwSggaNkqxn6Z2VwdFCjhUWuiQ==", "dev": true }, "jest-snapshot": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-24.9.0.tgz", - "integrity": "sha512-uI/rszGSs73xCM0l+up7O7a40o90cnrk429LOiK3aeTvfC0HHmldbd81/B7Ix81KSFe1lwkbl7GnBGG4UfuDew==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-25.4.0.tgz", + "integrity": "sha512-J4CJ0X2SaGheYRZdLz9CRHn9jUknVmlks4UBeu270hPAvdsauFXOhx9SQP2JtRzhnR3cvro/9N9KP83/uvFfRg==", "dev": true, "requires": { "@babel/types": "^7.0.0", - "@jest/types": "^24.9.0", - "chalk": "^2.0.1", - "expect": "^24.9.0", - "jest-diff": "^24.9.0", - "jest-get-type": "^24.9.0", - "jest-matcher-utils": "^24.9.0", - "jest-message-util": "^24.9.0", - "jest-resolve": "^24.9.0", - "mkdirp": "^0.5.1", + "@jest/types": "^25.4.0", + "@types/prettier": "^1.19.0", + "chalk": "^3.0.0", + "expect": "^25.4.0", + "jest-diff": "^25.4.0", + "jest-get-type": "^25.2.6", + "jest-matcher-utils": "^25.4.0", + "jest-message-util": "^25.4.0", + "jest-resolve": "^25.4.0", + "make-dir": "^3.0.0", "natural-compare": "^1.4.0", - "pretty-format": "^24.9.0", - "semver": "^6.2.0" + "pretty-format": "^25.4.0", + "semver": "^6.3.0" }, "dependencies": { "@jest/types": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz", - "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.4.0.tgz", + "integrity": "sha512-XBeaWNzw2PPnGW5aXvZt3+VO60M+34RY3XDsCK5tW7kyj3RK0XClRutCfjqcBuaR2aBQTbluEDME9b5MB9UAPw==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^1.1.1", - "@types/yargs": "^13.0.0" + "@types/yargs": "^15.0.0", + "chalk": "^3.0.0" } }, - "@types/yargs": { - "version": "13.0.2", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.2.tgz", - "integrity": "sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ==", + "ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "dev": true + }, + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", "dev": true, "requires": { - "@types/yargs-parser": "*" + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" } }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, "diff-sequences": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-24.9.0.tgz", - "integrity": "sha512-Dj6Wk3tWyTE+Fo1rW8v0Xhwk80um6yFYKbuAxc9c3EZxIHFDYwbi34Uk42u1CdnIiVorvt4RmlSDjIPyzGC2ew==", + "version": "25.2.6", + "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-25.2.6.tgz", + "integrity": "sha512-Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true }, "jest-diff": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-24.9.0.tgz", - "integrity": "sha512-qMfrTs8AdJE2iqrTp0hzh7kTd2PQWrsFyj9tORoKmu32xjPjeE4NyjVRDz8ybYwqS2ik8N4hsIpiVTyFeo2lBQ==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-25.4.0.tgz", + "integrity": "sha512-kklLbJVXW0y8UKOWOdYhI6TH5MG6QAxrWiBMgQaPIuhj3dNFGirKCd+/xfplBXICQ7fI+3QcqHm9p9lWu1N6ug==", "dev": true, "requires": { - "chalk": "^2.0.1", - "diff-sequences": "^24.9.0", - "jest-get-type": "^24.9.0", - "pretty-format": "^24.9.0" + "chalk": "^3.0.0", + "diff-sequences": "^25.2.6", + "jest-get-type": "^25.2.6", + "pretty-format": "^25.4.0" } }, "jest-get-type": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-24.9.0.tgz", - "integrity": "sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q==", + "version": "25.2.6", + "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-25.2.6.tgz", + "integrity": "sha512-DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig==", "dev": true }, "jest-matcher-utils": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-24.9.0.tgz", - "integrity": "sha512-OZz2IXsu6eaiMAwe67c1T+5tUAtQyQx27/EMEkbFAGiw52tB9em+uGbzpcgYVpA8wl0hlxKPZxrly4CXU/GjHA==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-25.4.0.tgz", + "integrity": "sha512-yPMdtj7YDgXhnGbc66bowk8AkQ0YwClbbwk3Kzhn5GVDrciiCr27U4NJRbrqXbTdtxjImONITg2LiRIw650k5A==", "dev": true, "requires": { - "chalk": "^2.0.1", - "jest-diff": "^24.9.0", - "jest-get-type": "^24.9.0", - "pretty-format": "^24.9.0" + "chalk": "^3.0.0", + "jest-diff": "^25.4.0", + "jest-get-type": "^25.2.6", + "pretty-format": "^25.4.0" + } + }, + "make-dir": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.0.2.tgz", + "integrity": "sha512-rYKABKutXa6vXTXhoV18cBE7PaewPXHe/Bdq4v+ZLMhxbWApkFFplT0LcbMW+6BbjnQXzZ/sAvSE/JdguApG5w==", + "dev": true, + "requires": { + "semver": "^6.0.0" } }, "pretty-format": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz", - "integrity": "sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.4.0.tgz", + "integrity": "sha512-PI/2dpGjXK5HyXexLPZU/jw5T9Q6S1YVXxxVxco+LIqzUFHXIbKZKdUVt7GcX7QUCr31+3fzhi4gN4/wUYPVxQ==", "dev": true, "requires": { - "@jest/types": "^24.9.0", - "ansi-regex": "^4.0.0", - "ansi-styles": "^3.2.0", - "react-is": "^16.8.4" + "@jest/types": "^25.4.0", + "ansi-regex": "^5.0.0", + "ansi-styles": "^4.0.0", + "react-is": "^16.12.0" } }, + "react-is": { + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", + "dev": true + }, "semver": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", "dev": true + }, + "supports-color": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } } } }, "jest-util": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-24.9.0.tgz", - "integrity": "sha512-x+cZU8VRmOJxbA1K5oDBdxQmdq0OIdADarLxk0Mq+3XS4jgvhG/oKGWcIDCtPG0HgjxOYvF+ilPJQsAyXfbNOg==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-25.4.0.tgz", + "integrity": "sha512-WSZD59sBtAUjLv1hMeKbNZXmMcrLRWcYqpO8Dz8b4CeCTZpfNQw2q9uwrYAD+BbJoLJlu4ezVPwtAmM/9/SlZA==", "dev": true, "requires": { - "@jest/console": "^24.9.0", - "@jest/fake-timers": "^24.9.0", - "@jest/source-map": "^24.9.0", - "@jest/test-result": "^24.9.0", - "@jest/types": "^24.9.0", - "callsites": "^3.0.0", - "chalk": "^2.0.1", - "graceful-fs": "^4.1.15", + "@jest/types": "^25.4.0", + "chalk": "^3.0.0", "is-ci": "^2.0.0", - "mkdirp": "^0.5.1", - "slash": "^2.0.0", - "source-map": "^0.6.0" + "make-dir": "^3.0.0" }, "dependencies": { - "@jest/console": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/console/-/console-24.9.0.tgz", - "integrity": "sha512-Zuj6b8TnKXi3q4ymac8EQfc3ea/uhLeCGThFqXeC8H9/raaH8ARPUTdId+XyGd03Z4In0/VjD2OYFcBF09fNLQ==", + "@jest/types": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.4.0.tgz", + "integrity": "sha512-XBeaWNzw2PPnGW5aXvZt3+VO60M+34RY3XDsCK5tW7kyj3RK0XClRutCfjqcBuaR2aBQTbluEDME9b5MB9UAPw==", "dev": true, "requires": { - "@jest/source-map": "^24.9.0", - "chalk": "^2.0.1", - "slash": "^2.0.0" + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^1.1.1", + "@types/yargs": "^15.0.0", + "chalk": "^3.0.0" } }, - "@jest/source-map": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-24.9.0.tgz", - "integrity": "sha512-/Xw7xGlsZb4MJzNDgB7PW5crou5JqWiBQaz6xyPd3ArOg2nfn/PunV8+olXbbEZzNl591o5rWKE9BRDaFAuIBg==", + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", "dev": true, "requires": { - "callsites": "^3.0.0", - "graceful-fs": "^4.1.15", - "source-map": "^0.6.0" + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" } }, - "@jest/types": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz", - "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==", + "chalk": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", "dev": true, "requires": { - "@types/istanbul-lib-coverage": "^2.0.0", - "@types/istanbul-reports": "^1.1.1", - "@types/yargs": "^13.0.0" + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" } }, - "@types/yargs": { - "version": "13.0.2", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.2.tgz", - "integrity": "sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ==", + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "make-dir": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.0.2.tgz", + "integrity": "sha512-rYKABKutXa6vXTXhoV18cBE7PaewPXHe/Bdq4v+ZLMhxbWApkFFplT0LcbMW+6BbjnQXzZ/sAvSE/JdguApG5w==", + "dev": true, + "requires": { + "semver": "^6.0.0" + } + }, + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true + }, + "supports-color": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", "dev": true, "requires": { - "@types/yargs-parser": "*" + "has-flag": "^4.0.0" } - }, - "callsites": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", - "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", - "dev": true } } }, @@ -14453,22 +15843,28 @@ } }, "jest-worker": { - "version": "24.6.0", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.6.0.tgz", - "integrity": "sha512-jDwgW5W9qGNvpI1tNnvajh0a5IE/PuGLFmHk6aR/BZFz8tSgGw17GsDPXAJ6p91IvYDjOw8GpFbvvZGAK+DPQQ==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-25.4.0.tgz", + "integrity": "sha512-ghAs/1FtfYpMmYQ0AHqxV62XPvKdUDIBBApMZfly+E9JEmYh2K45G0R5dWxx986RN12pRCxsViwQVtGl+N4whw==", "dev": true, "requires": { - "merge-stream": "^1.0.1", - "supports-color": "^6.1.0" + "merge-stream": "^2.0.0", + "supports-color": "^7.0.0" }, "dependencies": { + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, "supports-color": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", - "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", "dev": true, "requires": { - "has-flag": "^3.0.0" + "has-flag": "^4.0.0" } } } @@ -14502,47 +15898,55 @@ "dev": true }, "jsdom": { - "version": "11.12.0", - "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-11.12.0.tgz", - "integrity": "sha512-y8Px43oyiBM13Zc1z780FrfNLJCXTL40EWlty/LXUtcjykRBNgLlCjWXpfSPBl2iv+N7koQN+dvqszHZgT/Fjw==", + "version": "15.2.1", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-15.2.1.tgz", + "integrity": "sha512-fAl1W0/7T2G5vURSyxBzrJ1LSdQn6Tr5UX/xD4PXDx/PDgwygedfW6El/KIj3xJ7FU61TTYnc/l/B7P49Eqt6g==", "dev": true, "requires": { "abab": "^2.0.0", - "acorn": "^5.5.3", - "acorn-globals": "^4.1.0", + "acorn": "^7.1.0", + "acorn-globals": "^4.3.2", "array-equal": "^1.0.0", - "cssom": ">= 0.3.2 < 0.4.0", - "cssstyle": "^1.0.0", - "data-urls": "^1.0.0", + "cssom": "^0.4.1", + "cssstyle": "^2.0.0", + "data-urls": "^1.1.0", "domexception": "^1.0.1", - "escodegen": "^1.9.1", + "escodegen": "^1.11.1", "html-encoding-sniffer": "^1.0.2", - "left-pad": "^1.3.0", - "nwsapi": "^2.0.7", - "parse5": "4.0.0", + "nwsapi": "^2.2.0", + "parse5": "5.1.0", "pn": "^1.1.0", - "request": "^2.87.0", - "request-promise-native": "^1.0.5", - "sax": "^1.2.4", + "request": "^2.88.0", + "request-promise-native": "^1.0.7", + "saxes": "^3.1.9", "symbol-tree": "^3.2.2", - "tough-cookie": "^2.3.4", + "tough-cookie": "^3.0.1", "w3c-hr-time": "^1.0.1", + "w3c-xmlserializer": "^1.1.2", "webidl-conversions": "^4.0.2", - "whatwg-encoding": "^1.0.3", - "whatwg-mimetype": "^2.1.0", - "whatwg-url": "^6.4.1", - "ws": "^5.2.0", + "whatwg-encoding": "^1.0.5", + "whatwg-mimetype": "^2.3.0", + "whatwg-url": "^7.0.0", + "ws": "^7.0.0", "xml-name-validator": "^3.0.0" }, "dependencies": { - "ws": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz", - "integrity": "sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA==", + "tough-cookie": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz", + "integrity": "sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==", "dev": true, "requires": { - "async-limiter": "~1.0.0" + "ip-regex": "^2.1.0", + "psl": "^1.1.28", + "punycode": "^2.1.1" } + }, + "ws": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.2.3.tgz", + "integrity": "sha512-HTDl9G9hbkNDk98naoR/cHDws7+EyYMOdL1BmjsZXRUjf7d+MficC4B7HLUPlSiho0vg+CWKrGIt/VJBd1xunQ==", + "dev": true } } }, @@ -14759,12 +16163,6 @@ "colornames": "^1.1.1" } }, - "left-pad": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/left-pad/-/left-pad-1.3.0.tgz", - "integrity": "sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA==", - "dev": true - }, "lerna": { "version": "3.20.2", "resolved": "https://registry.npmjs.org/lerna/-/lerna-3.20.2.tgz", @@ -15014,15 +16412,6 @@ "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz", "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==" }, - "loose-envify": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", - "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", - "dev": true, - "requires": { - "js-tokens": "^3.0.0 || ^4.0.0" - } - }, "loud-rejection": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz", @@ -15266,45 +16655,10 @@ "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=" }, "merge-stream": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", - "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", - "dev": true, - "requires": { - "readable-stream": "^2.0.1" - }, - "dependencies": { - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", - "dev": true - }, - "readable-stream": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", - "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", - "dev": true, - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, - "requires": { - "safe-buffer": "~5.1.0" - } - } - } + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", + "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", + "dev": true }, "merge2": { "version": "1.3.0", @@ -15775,13 +17129,6 @@ "thenify-all": "^1.0.0" } }, - "nan": { - "version": "2.13.2", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.13.2.tgz", - "integrity": "sha512-TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw==", - "dev": true, - "optional": true - }, "nanomatch": { "version": "1.2.13", "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz", @@ -15814,37 +17161,6 @@ "dev": true, "optional": true }, - "needle": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/needle/-/needle-2.4.0.tgz", - "integrity": "sha512-4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg==", - "dev": true, - "optional": true, - "requires": { - "debug": "^3.2.6", - "iconv-lite": "^0.4.4", - "sax": "^1.2.4" - }, - "dependencies": { - "debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", - "dev": true, - "optional": true, - "requires": { - "ms": "^2.1.1" - } - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true, - "optional": true - } - } - }, "negotiator": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz", @@ -15994,38 +17310,6 @@ } } }, - "node-pre-gyp": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz", - "integrity": "sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A==", - "dev": true, - "optional": true, - "requires": { - "detect-libc": "^1.0.2", - "mkdirp": "^0.5.1", - "needle": "^2.2.1", - "nopt": "^4.0.1", - "npm-packlist": "^1.1.6", - "npmlog": "^4.0.2", - "rc": "^1.2.7", - "rimraf": "^2.6.1", - "semver": "^5.3.0", - "tar": "^4" - }, - "dependencies": { - "nopt": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz", - "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=", - "dev": true, - "optional": true, - "requires": { - "abbrev": "1", - "osenv": "^0.1.4" - } - } - } - }, "nopt": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz", @@ -16160,9 +17444,9 @@ "dev": true }, "nwsapi": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.1.1.tgz", - "integrity": "sha512-T5GaA1J/d34AC8mkrFD2O0DR17kwJ702ZOtJOsS8RpbsQZVOC2/xYFb1i/cw+xdM54JIlMuojjDOYct8GIWtwg==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz", + "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==", "dev": true }, "oauth-sign": { @@ -16521,9 +17805,9 @@ } }, "parse5": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz", - "integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.0.tgz", + "integrity": "sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ==", "dev": true }, "parseurl": { @@ -16908,19 +18192,6 @@ } } }, - "rc": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", - "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", - "dev": true, - "optional": true, - "requires": { - "deep-extend": "^0.6.0", - "ini": "~1.3.0", - "minimist": "^1.2.0", - "strip-json-comments": "~2.0.1" - } - }, "react-is": { "version": "16.8.4", "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.8.4.tgz", @@ -16980,25 +18251,87 @@ } }, "read-pkg-up": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-4.0.0.tgz", - "integrity": "sha512-6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA==", + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz", + "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==", "dev": true, "requires": { - "find-up": "^3.0.0", - "read-pkg": "^3.0.0" + "find-up": "^4.1.0", + "read-pkg": "^5.2.0", + "type-fest": "^0.8.1" }, "dependencies": { + "find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dev": true, + "requires": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + } + }, + "locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dev": true, + "requires": { + "p-locate": "^4.1.0" + } + }, + "p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dev": true, + "requires": { + "p-limit": "^2.2.0" + } + }, + "parse-json": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.0.0.tgz", + "integrity": "sha512-OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "error-ex": "^1.3.1", + "json-parse-better-errors": "^1.0.1", + "lines-and-columns": "^1.1.6" + } + }, + "path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true + }, "read-pkg": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz", - "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz", + "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==", "dev": true, "requires": { - "load-json-file": "^4.0.0", - "normalize-package-data": "^2.3.2", - "path-type": "^3.0.0" + "@types/normalize-package-data": "^2.4.0", + "normalize-package-data": "^2.5.0", + "parse-json": "^5.0.0", + "type-fest": "^0.6.0" + }, + "dependencies": { + "type-fest": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz", + "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==", + "dev": true + } } + }, + "type-fest": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", + "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", + "dev": true } } }, @@ -17026,13 +18359,10 @@ } }, "realpath-native": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/realpath-native/-/realpath-native-1.1.0.tgz", - "integrity": "sha512-wlgPA6cCIIg9gKz0fgAPjnzh4yR/LnXovwuo9hvyGvx3h8nX4+/iLZplfUWasXpqD8BdnGnP5njOFjkUwPzvjA==", - "dev": true, - "requires": { - "util.promisify": "^1.0.0" - } + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/realpath-native/-/realpath-native-2.0.0.tgz", + "integrity": "sha512-v1SEYUOXXdbBZK8ZuNgO4TBjamPsiSgcFr0aP+tEKpQZK8vooEUqV6nm6Cv502mX4NF2EfsnVqtNAHG+/6Ur1Q==", + "dev": true }, "redent": { "version": "2.0.0", @@ -17196,9 +18526,9 @@ "dev": true }, "require-main-filename": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", - "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", + "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", "dev": true }, "resolve": { @@ -17347,12 +18677,6 @@ "walker": "~1.0.5" } }, - "sax": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", - "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", - "dev": true - }, "saxes": { "version": "3.1.11", "resolved": "https://registry.npmjs.org/saxes/-/saxes-3.1.11.tgz", @@ -18034,13 +19358,6 @@ "integrity": "sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g=", "dev": true }, - "strip-json-comments": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", - "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", - "dev": true, - "optional": true - }, "strong-log-transformer": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/strong-log-transformer/-/strong-log-transformer-2.1.0.tgz", @@ -18314,15 +19631,30 @@ } }, "test-exclude": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-5.1.0.tgz", - "integrity": "sha512-gwf0S2fFsANC55fSeSqpb8BYk6w3FDvwZxfNjeF6FRgvFa43r+7wRiA/Q0IxoRU37wB/LE8IQ4221BsNucTaCA==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", + "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==", "dev": true, "requires": { - "arrify": "^1.0.1", - "minimatch": "^3.0.4", - "read-pkg-up": "^4.0.0", - "require-main-filename": "^1.0.1" + "@istanbuljs/schema": "^0.1.2", + "glob": "^7.1.4", + "minimatch": "^3.0.4" + }, + "dependencies": { + "glob": { + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", + "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", + "dev": true, + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + } } }, "test-listen": { @@ -18362,9 +19694,9 @@ } }, "throat": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/throat/-/throat-4.1.0.tgz", - "integrity": "sha1-iQN8vJLFarGJJua6TLsgDhVnKmo=", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/throat/-/throat-5.0.0.tgz", + "integrity": "sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA==", "dev": true }, "through": { @@ -19021,9 +20353,9 @@ "dev": true }, "whatwg-url": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.5.0.tgz", - "integrity": "sha512-rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz", + "integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==", "dev": true, "requires": { "lodash.sortby": "^4.7.0", diff --git a/package.json b/package.json index f6a47701768..ad828675ce7 100644 --- a/package.json +++ b/package.json @@ -105,7 +105,7 @@ "hapi": "17.8.5", "ioredis": "4.16.1", "jest": "25.4.0", - "jest-config": "24.9.0", + "jest-config": "25.4.0", "jest-junit": "10.0.0", "jest-matcher-utils": "24.9.0", "js-sha256": "0.9.0", From 07b5d835ab1115e2815433c5b89240e1dcd260a3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 20 Apr 2020 17:58:12 +0300 Subject: [PATCH 432/642] chore(deps): update dependency @types/lodash to v4.14.150 (#4004) Co-authored-by: Renovate Bot --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3ba5749be4d..4cc8fca6b8d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5610,9 +5610,9 @@ } }, "@types/lodash": { - "version": "4.14.149", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.149.tgz", - "integrity": "sha512-ijGqzZt/b7BfzcK9vTrS6MFljQRPn5BFWOx8oE0GYxribu6uV+aA9zZuXI1zc/etK9E8nrgdoF2+LgUw7+9tJQ==", + "version": "4.14.150", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.150.tgz", + "integrity": "sha512-kMNLM5JBcasgYscD9x/Gvr6lTAv2NVgsKtet/hm93qMyf/D1pt+7jeEZklKJKxMVmXjxbRVQQGfqDSfipYCO6w==", "dev": true }, "@types/lodash.sortby": { diff --git a/package.json b/package.json index ad828675ce7..97525b6a882 100644 --- a/package.json +++ b/package.json @@ -69,7 +69,7 @@ "@types/ioredis": "4.14.9", "@types/jest": "25.2.1", "@types/koa-router": "7.4.0", - "@types/lodash": "4.14.149", + "@types/lodash": "4.14.150", "@types/lodash.sortby": "4.7.6", "@types/lodash.xorby": "4.7.6", "@types/loglevel": "1.5.4", From 52228b4facbbae675f9ff2c76ebd2e4896c6ba4a Mon Sep 17 00:00:00 2001 From: David Marvasti Date: Tue, 21 Apr 2020 10:02:05 -0400 Subject: [PATCH 433/642] Update metrics.md typo - "exected" becomes "executed" (#3929) --- docs/source/federation/metrics.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/federation/metrics.md b/docs/source/federation/metrics.md index 3f21c638b65..29278b3ec24 100644 --- a/docs/source/federation/metrics.md +++ b/docs/source/federation/metrics.md @@ -30,7 +30,7 @@ The Apollo gateway looks to the `extensions` field of all service responses for ## How traces are constructed and aggregated -The Apollo gateway constructs traces in the shape of the [query plan](https://www.apollographql.com/docs/apollo-server/federation/implementing/#inspecting-query-plans), embedding an individual `Trace` for each fetch that is performed in the query plan. This indicates the sub-query traces as well as which order they were fetched from the underlying services. The field-level statistics that the Apollo Platform aggregates from these traces are collected over the fields over which the operation was executed **in the federated services**. In other words, field stats are collected based on the operations the query planner makes rather than the operations that the clients make. On the other hand, operation-level statistics are aggregated over the operations exected **by the client**, which means that even if query-planning changes, statistics will still be corresponded to the same client-delivered operation. +The Apollo gateway constructs traces in the shape of the [query plan](https://www.apollographql.com/docs/apollo-server/federation/implementing/#inspecting-query-plans), embedding an individual `Trace` for each fetch that is performed in the query plan. This indicates the sub-query traces as well as which order they were fetched from the underlying services. The field-level statistics that the Apollo Platform aggregates from these traces are collected over the fields over which the operation was executed **in the federated services**. In other words, field stats are collected based on the operations the query planner makes rather than the operations that the clients make. On the other hand, operation-level statistics are aggregated over the operations executed **by the client**, which means that even if query-planning changes, statistics will still be corresponded to the same client-delivered operation. ## How errors work From 78edec014d488b575a71991edade2e9e95cb1614 Mon Sep 17 00:00:00 2001 From: Rui Ramos Date: Tue, 21 Apr 2020 15:02:35 +0100 Subject: [PATCH 434/642] docs: Fix typo on implementing services (#3936) --- docs/source/federation/implementing-services.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/federation/implementing-services.mdx b/docs/source/federation/implementing-services.mdx index d7330c25c8d..577bfbc8318 100644 --- a/docs/source/federation/implementing-services.mdx +++ b/docs/source/federation/implementing-services.mdx @@ -221,7 +221,7 @@ Also make sure to read about the [gateway's support for custom directives](./gat ## Securing implementing services -Because of the power and flexibility of Apollo Federation's `_entities` field, your implementing services should **not** be directly accessible by clients. Instead, only your [gateway](./gateway/) should have access to your implementing serivces. Clients then communicate with the gateway: +Because of the power and flexibility of Apollo Federation's `_entities` field, your implementing services should **not** be directly accessible by clients. Instead, only your [gateway](./gateway/) should have access to your implementing services. Clients then communicate with the gateway: From 87cc4fd33b7db5f480ec321b7ec239574f5d8f14 Mon Sep 17 00:00:00 2001 From: Aaron Powell Date: Wed, 22 Apr 2020 19:15:47 +1000 Subject: [PATCH 435/642] docs(azure): Reference correct URI in instructions. (#3945) * Fixing two things that caught me out First thing is the URL has `apollo-sample` when the function name is `graphql`. Next, it's best to not install the `graphql` package directly as you may have a version mismatch with what's depended on by apollo. For example, I ended up with `graphql@15` when the dependency is `graphql@14` and as a result hit https://github.com/apollographql/apollo-link/issues/910 in TypeScript. * Update docs/source/deployment/azure-functions.md Co-authored-by: Jesse Rosenberger --- docs/source/deployment/azure-functions.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/deployment/azure-functions.md b/docs/source/deployment/azure-functions.md index d56bfcb43f6..61267b48b22 100644 --- a/docs/source/deployment/azure-functions.md +++ b/docs/source/deployment/azure-functions.md @@ -37,7 +37,7 @@ Http Functions: graphql: http://localhost:7071/api/graphql ``` -Go to [http://localhost:7071/api/apollo-example?name=Apollo](http://localhost:7071/api/apollo-example?name=Apollo) and verify if the text with the content: **Hello Apollo** is appearing at your browser. +Go to [http://localhost:7071/api/graphql?name=Apollo](http://localhost:7071/api/apollo-example?name=Apollo) and verify if the text with the content: **Hello Apollo** is appearing at your browser. If you would like to remove the `api` from the url structure, set the prefix in your `host.json` file like below: From 181852ab5bfafbe68fe4d210ac54f6d05679cac5 Mon Sep 17 00:00:00 2001 From: Dan Dascalescu Date: Wed, 22 Apr 2020 21:19:08 +1200 Subject: [PATCH 436/642] docs: kill two typos in one line (#4014) --- docs/source/api/graphql-tools.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/api/graphql-tools.md b/docs/source/api/graphql-tools.md index f115e9eb818..07975f8af9b 100644 --- a/docs/source/api/graphql-tools.md +++ b/docs/source/api/graphql-tools.md @@ -223,7 +223,7 @@ const resolvers = { ### context: { [key: string]: any } -GraphQL context that is going to be past to subschema execution or subsciption call. +GraphQL context that is going to be passed to subschema execution or subscription call. ### info: GraphQLResolveInfo From e2bd3bb38327ea7e428bb503519811542a012fd4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 22 Apr 2020 12:27:59 +0300 Subject: [PATCH 437/642] chore(deps): update dependency jest-matcher-utils to v25 (#3719) Co-authored-by: Renovate Bot Co-authored-by: Jesse Rosenberger --- package-lock.json | 218 ++++++++++++++++++++++++++++++++++------------ package.json | 2 +- 2 files changed, 164 insertions(+), 56 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4cc8fca6b8d..0aad3dde149 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8468,9 +8468,9 @@ } }, "diff-sequences": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-24.9.0.tgz", - "integrity": "sha512-Dj6Wk3tWyTE+Fo1rW8v0Xhwk80um6yFYKbuAxc9c3EZxIHFDYwbi34Uk42u1CdnIiVorvt4RmlSDjIPyzGC2ew==", + "version": "25.2.6", + "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-25.2.6.tgz", + "integrity": "sha512-Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg==", "dev": true }, "dir-glob": { @@ -13482,53 +13482,107 @@ } }, "jest-diff": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-24.9.0.tgz", - "integrity": "sha512-qMfrTs8AdJE2iqrTp0hzh7kTd2PQWrsFyj9tORoKmu32xjPjeE4NyjVRDz8ybYwqS2ik8N4hsIpiVTyFeo2lBQ==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-25.4.0.tgz", + "integrity": "sha512-kklLbJVXW0y8UKOWOdYhI6TH5MG6QAxrWiBMgQaPIuhj3dNFGirKCd+/xfplBXICQ7fI+3QcqHm9p9lWu1N6ug==", "dev": true, "requires": { - "chalk": "^2.0.1", - "diff-sequences": "^24.9.0", - "jest-get-type": "^24.9.0", - "pretty-format": "^24.9.0" + "chalk": "^3.0.0", + "diff-sequences": "^25.2.6", + "jest-get-type": "^25.2.6", + "pretty-format": "^25.4.0" }, "dependencies": { "@jest/types": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz", - "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.4.0.tgz", + "integrity": "sha512-XBeaWNzw2PPnGW5aXvZt3+VO60M+34RY3XDsCK5tW7kyj3RK0XClRutCfjqcBuaR2aBQTbluEDME9b5MB9UAPw==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^1.1.1", - "@types/yargs": "^13.0.0" + "@types/yargs": "^15.0.0", + "chalk": "^3.0.0" } }, - "@types/yargs": { - "version": "13.0.2", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.2.tgz", - "integrity": "sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ==", + "ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "dev": true + }, + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", "dev": true, "requires": { - "@types/yargs-parser": "*" + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" } }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, "jest-get-type": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-24.9.0.tgz", - "integrity": "sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q==", + "version": "25.2.6", + "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-25.2.6.tgz", + "integrity": "sha512-DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig==", "dev": true }, "pretty-format": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz", - "integrity": "sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.4.0.tgz", + "integrity": "sha512-PI/2dpGjXK5HyXexLPZU/jw5T9Q6S1YVXxxVxco+LIqzUFHXIbKZKdUVt7GcX7QUCr31+3fzhi4gN4/wUYPVxQ==", + "dev": true, + "requires": { + "@jest/types": "^25.4.0", + "ansi-regex": "^5.0.0", + "ansi-styles": "^4.0.0", + "react-is": "^16.12.0" + } + }, + "react-is": { + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", + "dev": true + }, + "supports-color": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", "dev": true, "requires": { - "@jest/types": "^24.9.0", - "ansi-regex": "^4.0.0", - "ansi-styles": "^3.2.0", - "react-is": "^16.8.4" + "has-flag": "^4.0.0" } } } @@ -14259,53 +14313,107 @@ } }, "jest-matcher-utils": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-24.9.0.tgz", - "integrity": "sha512-OZz2IXsu6eaiMAwe67c1T+5tUAtQyQx27/EMEkbFAGiw52tB9em+uGbzpcgYVpA8wl0hlxKPZxrly4CXU/GjHA==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-25.4.0.tgz", + "integrity": "sha512-yPMdtj7YDgXhnGbc66bowk8AkQ0YwClbbwk3Kzhn5GVDrciiCr27U4NJRbrqXbTdtxjImONITg2LiRIw650k5A==", "dev": true, "requires": { - "chalk": "^2.0.1", - "jest-diff": "^24.9.0", - "jest-get-type": "^24.9.0", - "pretty-format": "^24.9.0" + "chalk": "^3.0.0", + "jest-diff": "^25.4.0", + "jest-get-type": "^25.2.6", + "pretty-format": "^25.4.0" }, "dependencies": { "@jest/types": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz", - "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.4.0.tgz", + "integrity": "sha512-XBeaWNzw2PPnGW5aXvZt3+VO60M+34RY3XDsCK5tW7kyj3RK0XClRutCfjqcBuaR2aBQTbluEDME9b5MB9UAPw==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^1.1.1", - "@types/yargs": "^13.0.0" + "@types/yargs": "^15.0.0", + "chalk": "^3.0.0" } }, - "@types/yargs": { - "version": "13.0.2", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.2.tgz", - "integrity": "sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ==", + "ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "dev": true + }, + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", "dev": true, "requires": { - "@types/yargs-parser": "*" + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" } }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, "jest-get-type": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-24.9.0.tgz", - "integrity": "sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q==", + "version": "25.2.6", + "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-25.2.6.tgz", + "integrity": "sha512-DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig==", "dev": true }, "pretty-format": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz", - "integrity": "sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.4.0.tgz", + "integrity": "sha512-PI/2dpGjXK5HyXexLPZU/jw5T9Q6S1YVXxxVxco+LIqzUFHXIbKZKdUVt7GcX7QUCr31+3fzhi4gN4/wUYPVxQ==", "dev": true, "requires": { - "@jest/types": "^24.9.0", - "ansi-regex": "^4.0.0", - "ansi-styles": "^3.2.0", - "react-is": "^16.8.4" + "@jest/types": "^25.4.0", + "ansi-regex": "^5.0.0", + "ansi-styles": "^4.0.0", + "react-is": "^16.12.0" + } + }, + "react-is": { + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", + "dev": true + }, + "supports-color": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" } } } diff --git a/package.json b/package.json index 97525b6a882..c60edc6344d 100644 --- a/package.json +++ b/package.json @@ -107,7 +107,7 @@ "jest": "25.4.0", "jest-config": "25.4.0", "jest-junit": "10.0.0", - "jest-matcher-utils": "24.9.0", + "jest-matcher-utils": "25.4.0", "js-sha256": "0.9.0", "koa": "2.11.0", "lerna": "3.20.2", From 4249aa26c69454e53f4d5d36d628d58fd16ec4e2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 22 Apr 2020 09:53:05 +0000 Subject: [PATCH 438/642] chore(deps): update dependency ioredis to v4.16.3 (#3973) Co-authored-by: Renovate Bot --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0aad3dde149..4f62969a791 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10969,9 +10969,9 @@ } }, "ioredis": { - "version": "4.16.1", - "resolved": "https://registry.npmjs.org/ioredis/-/ioredis-4.16.1.tgz", - "integrity": "sha512-g76Mm9dE7BLuewncu1MimGZw5gDDjDwjoRony/VoSxSJEKAhuYncDEwYKYjtHi2NWsTNIB6XXRjE64uVa/wpKQ==", + "version": "4.16.3", + "resolved": "https://registry.npmjs.org/ioredis/-/ioredis-4.16.3.tgz", + "integrity": "sha512-Ejvcs2yW19Vq8AipvbtfcX3Ig8XG9EAyFOvGbhI/Q1QoVOK9ZdgY092kdOyOWIYBnPHjfjMJhU9qhsnp0i0K1w==", "requires": { "cluster-key-slot": "^1.1.0", "debug": "^4.1.1", diff --git a/package.json b/package.json index c60edc6344d..3b129054f15 100644 --- a/package.json +++ b/package.json @@ -103,7 +103,7 @@ "graphql-tag": "2.10.3", "graphql-tools": "4.0.8", "hapi": "17.8.5", - "ioredis": "4.16.1", + "ioredis": "4.16.3", "jest": "25.4.0", "jest-config": "25.4.0", "jest-junit": "10.0.0", From 27c0b857be8432122f1ce1f78e2919e0c1a173c7 Mon Sep 17 00:00:00 2001 From: nmarghetti Date: Wed, 22 Apr 2020 12:24:45 +0200 Subject: [PATCH 439/642] docs: Add comma to fix syntax error in "plugins" (#3950) --- docs/source/integrations/plugins.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/integrations/plugins.md b/docs/source/integrations/plugins.md index 2ab21962324..df4003d8544 100644 --- a/docs/source/integrations/plugins.md +++ b/docs/source/integrations/plugins.md @@ -99,7 +99,7 @@ const myPlugin = { parsingDidStart(requestContext) { console.log('Parsing started!'); - } + }, validationDidStart(requestContext) { console.log('Validation started!'); From 63c9df27a2e2f2075151d683958bf2b8a5735cd4 Mon Sep 17 00:00:00 2001 From: Andrew Yankovsky Date: Wed, 22 Apr 2020 13:27:18 +0300 Subject: [PATCH 440/642] =?UTF-8?q?fix(gateway):=20add=20missing=20`apollo?= =?UTF-8?q?-server-errors`=20runtime=20depend=E2=80=A6=20(#3927)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jesse Rosenberger --- package-lock.json | 1 + packages/apollo-gateway/CHANGELOG.md | 2 +- packages/apollo-gateway/package.json | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index 4f62969a791..1cbad4d55d8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -30,6 +30,7 @@ "apollo-server-caching": "file:packages/apollo-server-caching", "apollo-server-core": "file:packages/apollo-server-core", "apollo-server-env": "file:packages/apollo-server-env", + "apollo-server-errors": "file:packages/apollo-server-errors", "apollo-server-types": "file:packages/apollo-server-types", "graphql-extensions": "file:packages/graphql-extensions", "loglevel": "^1.6.1", diff --git a/packages/apollo-gateway/CHANGELOG.md b/packages/apollo-gateway/CHANGELOG.md index 6265028908e..d8ad3284690 100644 --- a/packages/apollo-gateway/CHANGELOG.md +++ b/packages/apollo-gateway/CHANGELOG.md @@ -4,7 +4,7 @@ > 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. When a release is being prepared, a new header will be (manually) created below and the the appropriate changes within that release will be moved into the new section. -- _Nothing yet! Stay tuned._ +- Add inadvertently excluded `apollo-server-errors` runtime dependency. [#3927](https://github.com/apollographql/apollo-server/pull/3927) ## 0.14.1 diff --git a/packages/apollo-gateway/package.json b/packages/apollo-gateway/package.json index 8bd67f96aee..554e39c9f78 100644 --- a/packages/apollo-gateway/package.json +++ b/packages/apollo-gateway/package.json @@ -27,6 +27,7 @@ "apollo-server-caching": "file:../apollo-server-caching", "apollo-server-core": "file:../apollo-server-core", "apollo-server-env": "file:../apollo-server-env", + "apollo-server-errors": "file:../apollo-server-errors", "apollo-server-types": "file:../apollo-server-types", "graphql-extensions": "file:../graphql-extensions", "loglevel": "^1.6.1", From 53ee2b42409dde5c8b743397ce9026720b849cae Mon Sep 17 00:00:00 2001 From: David Clark Date: Wed, 22 Apr 2020 06:52:23 -0400 Subject: [PATCH 441/642] docs: Note about using subscriptions with EventEmitter at scale. (#3709) The guide for implementing `graphql-subscriptions` (https://www.apollographql.com/docs/graphql-subscriptions/external-pubsub/) has a warning about production usage that is very easy to miss. Nothing in the main Apollo Server docs on subscriptions mentions this. In fact, I only found it because of an unrelated StackOverflow post (https://stackoverflow.com/a/43790449/2955238). This change makes the warning much harder to miss. --- docs/source/data/subscriptions.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/source/data/subscriptions.md b/docs/source/data/subscriptions.md index ae080cc65e3..a6e7c4bd4d9 100644 --- a/docs/source/data/subscriptions.md +++ b/docs/source/data/subscriptions.md @@ -234,6 +234,10 @@ const server = new ApolloServer( ## `PubSub` Implementations +> **Please note**: By default `graphql-subscriptions` exports an in-memory (`EventEmitter`) event system to re-run subscriptions. This is not suitable for running in a serious production app, because there is no way to share subscriptions and publishes across many running servers. +> +> We recommend using one of the external `PubSub` implementations listed below for production environments. + The Apollo Server implementation of `PubSub` can be replaced by another implementations of [PubSubEngine interface](https://github.com/apollographql/graphql-subscriptions/blob/master/src/pubsub-engine.ts). The community has created the following integrations: - [Redis](https://github.com/davidyaha/graphql-redis-subscriptions) @@ -245,4 +249,4 @@ The Apollo Server implementation of `PubSub` can be replaced by another implemen - [Google Cloud Firestore](https://github.com/MrBoolean/graphql-firestore-subscriptions) - [Add your implementation...](https://github.com/apollographql/apollo-server/pull/new/master) -You can implement a `PubSub` of your own, using the exported `PubSubEngine` interface from `apollo-server` or another integration. If you want to set up a GraphQL server using the `graphql-subscriptions` package, follow [this guide](https://www.apollographql.com/docs/graphql-subscriptions/). +You can implement a `PubSub` of your own, using the exported `PubSubEngine` interface from `apollo-server` or another integration. If you want to set up a GraphQL server using the `graphql-subscriptions` package (not recommended for production), follow [this guide](https://www.apollographql.com/docs/graphql-subscriptions/). From 37472047bc1a679c607a534c64882ba2a48cbb8d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 22 Apr 2020 13:59:41 +0300 Subject: [PATCH 442/642] chore(deps): update dependency @types/ws to v7 (#3689) Co-authored-by: Renovate Bot Co-authored-by: Jesse Rosenberger --- package-lock.json | 8 ++++---- package.json | 2 +- packages/apollo-server-core/package.json | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1cbad4d55d8..968efa27a2f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5843,9 +5843,9 @@ } }, "@types/ws": { - "version": "6.0.4", - "resolved": "https://registry.npmjs.org/@types/ws/-/ws-6.0.4.tgz", - "integrity": "sha512-PpPrX7SZW9re6+Ha8ojZG4Se8AZXgf0GK6zmfqEuCsY49LFDNXO3SByp44X3dFEqtB73lkCDAdUazhAjVPiNwg==", + "version": "7.2.4", + "resolved": "https://registry.npmjs.org/@types/ws/-/ws-7.2.4.tgz", + "integrity": "sha512-9S6Ask71vujkVyeEXKxjBSUV8ZUB0mjL5la4IncBoheu04bDaYyUKErh1BQcY9+WzOUOiKqz/OnpJHYckbMfNg==", "requires": { "@types/node": "*" } @@ -6238,7 +6238,7 @@ "@apollographql/apollo-tools": "^0.4.3", "@apollographql/graphql-playground-html": "1.6.24", "@types/graphql-upload": "^8.0.0", - "@types/ws": "^6.0.0", + "@types/ws": "^7.0.0", "apollo-cache-control": "file:packages/apollo-cache-control", "apollo-datasource": "file:packages/apollo-datasource", "apollo-engine-reporting": "file:packages/apollo-engine-reporting", diff --git a/package.json b/package.json index 3b129054f15..e73a893768b 100644 --- a/package.json +++ b/package.json @@ -84,7 +84,7 @@ "@types/request-promise": "4.1.46", "@types/test-listen": "1.1.0", "@types/type-is": "1.6.3", - "@types/ws": "6.0.4", + "@types/ws": "7.2.4", "apollo-fetch": "0.7.0", "apollo-link": "1.2.14", "apollo-link-http": "1.5.17", diff --git a/packages/apollo-server-core/package.json b/packages/apollo-server-core/package.json index 3615c6e02a1..626c587e85a 100644 --- a/packages/apollo-server-core/package.json +++ b/packages/apollo-server-core/package.json @@ -27,7 +27,7 @@ "@apollographql/apollo-tools": "^0.4.3", "@apollographql/graphql-playground-html": "1.6.24", "@types/graphql-upload": "^8.0.0", - "@types/ws": "^6.0.0", + "@types/ws": "^7.0.0", "apollo-cache-control": "file:../apollo-cache-control", "apollo-datasource": "file:../apollo-datasource", "apollo-engine-reporting": "file:../apollo-engine-reporting", From 1e694eb242fcded716af2545cf8f4fd54fde3ea4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 22 Apr 2020 14:23:03 +0300 Subject: [PATCH 443/642] chore(deps): update dependency pretty-format to v25 (#3721) Co-authored-by: Renovate Bot --- package-lock.json | 96 ++++++++++++++++++++++++++-- packages/apollo-gateway/package.json | 2 +- 2 files changed, 90 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 968efa27a2f..9d4dfffcb05 100644 --- a/package-lock.json +++ b/package-lock.json @@ -35,9 +35,20 @@ "graphql-extensions": "file:packages/graphql-extensions", "loglevel": "^1.6.1", "make-fetch-happen": "^7.1.1", - "pretty-format": "^24.7.0" + "pretty-format": "^25.0.0" }, "dependencies": { + "@jest/types": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.4.0.tgz", + "integrity": "sha512-XBeaWNzw2PPnGW5aXvZt3+VO60M+34RY3XDsCK5tW7kyj3RK0XClRutCfjqcBuaR2aBQTbluEDME9b5MB9UAPw==", + "requires": { + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^1.1.1", + "@types/yargs": "^15.0.0", + "chalk": "^3.0.0" + } + }, "@types/node-fetch": { "version": "2.5.4", "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.4.tgz", @@ -61,6 +72,20 @@ "humanize-ms": "^1.2.1" } }, + "ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==" + }, + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, "cacache": { "version": "14.0.0", "resolved": "https://registry.npmjs.org/cacache/-/cacache-14.0.0.tgz", @@ -87,6 +112,28 @@ "unique-filename": "^1.1.1" } }, + "chalk": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, "debug": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", @@ -121,6 +168,11 @@ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz", "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==" }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" + }, "http-proxy-agent": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-3.0.0.tgz", @@ -187,6 +239,22 @@ "aggregate-error": "^3.0.0" } }, + "pretty-format": { + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.4.0.tgz", + "integrity": "sha512-PI/2dpGjXK5HyXexLPZU/jw5T9Q6S1YVXxxVxco+LIqzUFHXIbKZKdUVt7GcX7QUCr31+3fzhi4gN4/wUYPVxQ==", + "requires": { + "@jest/types": "^25.4.0", + "ansi-regex": "^5.0.0", + "ansi-styles": "^4.0.0", + "react-is": "^16.12.0" + } + }, + "react-is": { + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" + }, "rimraf": { "version": "2.7.1", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", @@ -204,6 +272,14 @@ "minipass": "^3.1.1" } }, + "supports-color": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "requires": { + "has-flag": "^4.0.0" + } + }, "tar": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/tar/-/tar-6.0.1.tgz", @@ -3942,6 +4018,7 @@ "version": "24.9.0", "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz", "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==", + "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^1.1.1", @@ -3952,6 +4029,7 @@ "version": "13.0.2", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.2.tgz", "integrity": "sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ==", + "dev": true, "requires": { "@types/yargs-parser": "*" } @@ -5265,8 +5343,7 @@ "@types/color-name": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz", - "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==", - "dev": true + "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==" }, "@types/connect": { "version": "3.4.33", @@ -5854,7 +5931,6 @@ "version": "15.0.4", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.4.tgz", "integrity": "sha512-9T1auFmbPZoxHz0enUFlUuKRy3it01R+hlggyVUMtnCTQRunsQYifnSGb8hET4Xo8yiC0o0r1paW3ud5+rbURg==", - "dev": true, "requires": { "@types/yargs-parser": "*" } @@ -6013,12 +6089,14 @@ "ansi-regex": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==" + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "dev": true }, "ansi-styles": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, "requires": { "color-convert": "^1.9.0" } @@ -7503,6 +7581,7 @@ "version": "1.9.3", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "dev": true, "requires": { "color-name": "1.1.3" } @@ -7510,7 +7589,8 @@ "color-name": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", + "dev": true }, "color-string": { "version": "1.5.3", @@ -18093,6 +18173,7 @@ "version": "24.9.0", "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz", "integrity": "sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==", + "dev": true, "requires": { "@jest/types": "^24.9.0", "ansi-regex": "^4.0.0", @@ -18304,7 +18385,8 @@ "react-is": { "version": "16.8.4", "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.8.4.tgz", - "integrity": "sha512-PVadd+WaUDOAciICm/J1waJaSvgq+4rHE/K70j0PFqKhkTBsPv/82UGQJNXAngz1fOQLLxI6z1sEDmJDQhCTAA==" + "integrity": "sha512-PVadd+WaUDOAciICm/J1waJaSvgq+4rHE/K70j0PFqKhkTBsPv/82UGQJNXAngz1fOQLLxI6z1sEDmJDQhCTAA==", + "dev": true }, "read": { "version": "1.0.7", diff --git a/packages/apollo-gateway/package.json b/packages/apollo-gateway/package.json index 554e39c9f78..96bed7f6046 100644 --- a/packages/apollo-gateway/package.json +++ b/packages/apollo-gateway/package.json @@ -32,7 +32,7 @@ "graphql-extensions": "file:../graphql-extensions", "loglevel": "^1.6.1", "make-fetch-happen": "^7.1.1", - "pretty-format": "^24.7.0" + "pretty-format": "^25.0.0" }, "peerDependencies": { "graphql": "^14.2.1 || ^15.0.0" From b67bd1320483c8c101e974f6513576c80c5af9f5 Mon Sep 17 00:00:00 2001 From: Andy Edwards Date: Wed, 22 Apr 2020 06:34:05 -0500 Subject: [PATCH 444/642] =?UTF-8?q?feat(subscriptions):=20enable=20passing?= =?UTF-8?q?=20`WebSocket.Server`=20instead=E2=80=A6=20(#2314)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Permit passing a `WebSocket.Server` instance into `installSubscriptionHandlers`. --- CHANGELOG.md | 2 +- packages/apollo-server-core/src/ApolloServer.ts | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 100d21c435b..be9e33edfbc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ The version headers in this history reflect the versions of Apollo Server itself > 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. When a release is being prepared, a new header will be (manually) created below and the the appropriate changes within that release will be moved into the new section. -- _Nothing yet! Stay tuned._ +- Allow passing a `WebSocket.Server` to `ApolloServer.installSubscriptionHandlers`. [PR #2314](https://github.com/apollographql/apollo-server/pull/2314) ### v2.12.0 diff --git a/packages/apollo-server-core/src/ApolloServer.ts b/packages/apollo-server-core/src/ApolloServer.ts index 5b94b5ea022..25955b8509a 100644 --- a/packages/apollo-server-core/src/ApolloServer.ts +++ b/packages/apollo-server-core/src/ApolloServer.ts @@ -35,6 +35,8 @@ import { ExecutionParams, } from 'subscriptions-transport-ws'; +import WebSocket from 'ws'; + import { formatApolloErrors } from 'apollo-server-errors'; import { GraphQLServerOptions, @@ -667,7 +669,7 @@ export class ApolloServerBase { } } - public installSubscriptionHandlers(server: HttpServer) { + public installSubscriptionHandlers(server: HttpServer | WebSocket.Server) { if (!this.subscriptionServerOptions) { if (this.config.gateway) { throw Error( @@ -742,10 +744,12 @@ export class ApolloServerBase { }, keepAlive, }, - { - server, - path, - }, + server instanceof WebSocket.Server + ? server + : { + server, + path, + }, ); } From 06ff29c97a0159dab30183cf6f50320eb48fc328 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 22 Apr 2020 14:37:29 +0300 Subject: [PATCH 445/642] chore(deps): update dependency make-fetch-happen to v8 (#3872) Co-authored-by: Renovate Bot --- package-lock.json | 327 +++++++++++++-------------- packages/apollo-gateway/package.json | 2 +- 2 files changed, 161 insertions(+), 168 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9d4dfffcb05..87f32293f15 100644 --- a/package-lock.json +++ b/package-lock.json @@ -34,7 +34,7 @@ "apollo-server-types": "file:packages/apollo-server-types", "graphql-extensions": "file:packages/graphql-extensions", "loglevel": "^1.6.1", - "make-fetch-happen": "^7.1.1", + "make-fetch-happen": "^8.0.0", "pretty-format": "^25.0.0" }, "dependencies": { @@ -58,9 +58,12 @@ } }, "agent-base": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-5.1.1.tgz", - "integrity": "sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g==" + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.0.tgz", + "integrity": "sha512-j1Q7cSCqN+AwrmDd+pzgqc0/NpC655x2bUf5ZjRIO77DcNBFmh+OgRNzF6OKdCC9RSCb19fGd99+bhXFdkRNqw==", + "requires": { + "debug": "4" + } }, "agentkeepalive": { "version": "4.1.0", @@ -87,18 +90,16 @@ } }, "cacache": { - "version": "14.0.0", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-14.0.0.tgz", - "integrity": "sha512-+Nr/BnA/tjAUXza9gH8F+FSP+1HvWqCKt4c95dQr4EDVJVafbzmPZpLKCkLYexs6vSd2B/1TOXrAoNnqVPfvRA==", + "version": "15.0.0", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.0.0.tgz", + "integrity": "sha512-L0JpXHhplbJSiDGzyJJnJCTL7er7NzbBgxzVqLswEb4bO91Zbv17OUMuUeu/q0ZwKn3V+1HM4wb9tO4eVE/K8g==", "requires": { "chownr": "^1.1.2", - "figgy-pudding": "^3.5.1", "fs-minipass": "^2.0.0", "glob": "^7.1.4", - "graceful-fs": "^4.2.2", "infer-owner": "^1.0.4", "lru-cache": "^5.1.1", - "minipass": "^3.0.0", + "minipass": "^3.1.1", "minipass-collect": "^1.0.2", "minipass-flush": "^1.0.5", "minipass-pipeline": "^1.2.2", @@ -107,9 +108,35 @@ "p-map": "^3.0.0", "promise-inflight": "^1.0.1", "rimraf": "^2.7.1", - "ssri": "^7.0.0", - "tar": "^6.0.0", + "ssri": "^8.0.0", + "tar": "^6.0.1", "unique-filename": "^1.1.1" + }, + "dependencies": { + "minipass-collect": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz", + "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==", + "requires": { + "minipass": "^3.0.0" + } + }, + "minipass-flush": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz", + "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==", + "requires": { + "minipass": "^3.0.0" + } + }, + "minipass-pipeline": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.2.tgz", + "integrity": "sha512-3JS5A2DKhD2g0Gg8x3yamO0pj7YeKGwVlDS90pF++kxptwx/F+B//roxf9SqYil5tQo65bijy+dAuAFZmYOouA==", + "requires": { + "minipass": "^3.0.0" + } + } } }, "chalk": { @@ -163,35 +190,36 @@ "path-is-absolute": "^1.0.0" } }, - "graceful-fs": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz", - "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==" - }, "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" }, "http-proxy-agent": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-3.0.0.tgz", - "integrity": "sha512-uGuJaBWQWDQCJI5ip0d/VTYZW0nRrlLWXA4A7P1jrsa+f77rW2yXz315oBt6zGCF6l8C2tlMxY7ffULCj+5FhA==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz", + "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==", "requires": { - "agent-base": "5", + "@tootallnate/once": "1", + "agent-base": "6", "debug": "4" } }, + "indent-string": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", + "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==" + }, "make-fetch-happen": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-7.1.1.tgz", - "integrity": "sha512-7fNjiOXNZhNGQzG5P15nU97aZQtzPU2GVgVd7pnqnl5gnpLzMAD8bAe5YG4iW2s0PTqaZy9xGv4Wfqe872kRNQ==", + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-8.0.4.tgz", + "integrity": "sha512-hIFoqGq1db0QMiy/Atr/pI1Rs4rDV+ZdGSey2SQyF3KK3u1z4aj9mS5UdNnZkdQpA+H3pGn0J3KlEwsi2x4EqA==", "requires": { "agentkeepalive": "^4.1.0", - "cacache": "^14.0.0", - "http-cache-semantics": "^4.0.3", - "http-proxy-agent": "^3.0.0", - "https-proxy-agent": "^4.0.0", + "cacache": "^15.0.0", + "http-cache-semantics": "^4.0.4", + "http-proxy-agent": "^4.0.1", + "https-proxy-agent": "^5.0.0", "is-lambda": "^1.0.1", "lru-cache": "^5.1.1", "minipass": "^3.0.0", @@ -200,8 +228,75 @@ "minipass-flush": "^1.0.5", "minipass-pipeline": "^1.2.2", "promise-retry": "^1.1.1", - "socks-proxy-agent": "^4.0.0", - "ssri": "^7.0.1" + "socks-proxy-agent": "^5.0.0", + "ssri": "^8.0.0" + }, + "dependencies": { + "http-cache-semantics": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz", + "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==" + }, + "https-proxy-agent": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz", + "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==", + "requires": { + "agent-base": "6", + "debug": "4" + } + }, + "is-lambda": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz", + "integrity": "sha1-PZh3iZ5qU+/AFgUEzeFfgubwYdU=" + }, + "minipass-collect": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz", + "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==", + "requires": { + "minipass": "^3.0.0" + } + }, + "minipass-fetch": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.2.1.tgz", + "integrity": "sha512-ssHt0dkljEDaKmTgQ04DQgx2ag6G2gMPxA5hpcsoeTbfDgRf2fC2gNSRc6kISjD7ckCpHwwQvXxuTBK8402fXg==", + "requires": { + "encoding": "^0.1.12", + "minipass": "^3.1.0", + "minipass-pipeline": "^1.2.2", + "minipass-sized": "^1.0.3", + "minizlib": "^2.0.0" + } + }, + "minipass-flush": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz", + "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==", + "requires": { + "minipass": "^3.0.0" + } + }, + "minipass-pipeline": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.2.tgz", + "integrity": "sha512-3JS5A2DKhD2g0Gg8x3yamO0pj7YeKGwVlDS90pF++kxptwx/F+B//roxf9SqYil5tQo65bijy+dAuAFZmYOouA==", + "requires": { + "minipass": "^3.0.0" + } + }, + "socks-proxy-agent": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-5.0.0.tgz", + "integrity": "sha512-lEpa1zsWCChxiynk+lCycKuC502RxDWLKJZoIhnxrWNjLSDGYRFflHA1/228VkRcnv9TIb8w98derGbpKxJRgA==", + "requires": { + "agent-base": "6", + "debug": "4", + "socks": "^2.3.3" + } + } } }, "minipass": { @@ -222,9 +317,9 @@ } }, "mkdirp": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.3.tgz", - "integrity": "sha512-6uCP4Qc0sWsgMLy1EOqqS/3rjDHOEnsStVr/4vtAIK2Y5i2kA7lFFejYrpIyiN9w0pYf4ckeCYT9f1r1P9KX5g==" + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==" }, "ms": { "version": "2.1.2", @@ -237,6 +332,17 @@ "integrity": "sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==", "requires": { "aggregate-error": "^3.0.0" + }, + "dependencies": { + "aggregate-error": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.0.1.tgz", + "integrity": "sha512-quoaXsZ9/BLNae5yiNoUz+Nhkwz83GhWwtYFglcjEQB2NDHCIpApbqXxIFnm4Pq/Nvhrsq5sYJFyohrrxnTGAA==", + "requires": { + "clean-stack": "^2.0.0", + "indent-string": "^4.0.0" + } + } } }, "pretty-format": { @@ -264,11 +370,10 @@ } }, "ssri": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-7.1.0.tgz", - "integrity": "sha512-77/WrDZUWocK0mvA5NTRQyveUf+wsrIc6vyrxpS8tVvYBcX215QbafrJR3KtkpskIzoFLqqNuuYQvxaMjXJ/0g==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.0.tgz", + "integrity": "sha512-aq/pz989nxVYwn16Tsbj1TqFpD5LLrQxHf5zaHuieFV+R0Bbr4y8qUsOA45hXT/N4/9UNXTarBjnjVmjSOVaAA==", "requires": { - "figgy-pudding": "^3.5.1", "minipass": "^3.1.1" } }, @@ -5228,6 +5333,11 @@ "type-detect": "4.0.8" } }, + "@tootallnate/once": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", + "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==" + }, "@types/accepts": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/@types/accepts/-/accepts-1.3.5.tgz", @@ -6039,6 +6149,7 @@ "version": "4.2.1", "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.2.1.tgz", "integrity": "sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==", + "dev": true, "requires": { "es6-promisify": "^5.0.0" } @@ -6052,22 +6163,6 @@ "humanize-ms": "^1.2.1" } }, - "aggregate-error": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.0.1.tgz", - "integrity": "sha512-quoaXsZ9/BLNae5yiNoUz+Nhkwz83GhWwtYFglcjEQB2NDHCIpApbqXxIFnm4Pq/Nvhrsq5sYJFyohrrxnTGAA==", - "requires": { - "clean-stack": "^2.0.0", - "indent-string": "^4.0.0" - }, - "dependencies": { - "indent-string": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", - "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==" - } - } - }, "ajv": { "version": "6.10.0", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz", @@ -8765,12 +8860,14 @@ "es6-promise": { "version": "4.2.6", "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.6.tgz", - "integrity": "sha512-aRVgGdnmW2OiySVPUC9e6m+plolMAJKjZnQlCwNSuK5yQ0JN61DZSO1X1Ufd1foqWRAlig0rhduTCHe7sVtK5Q==" + "integrity": "sha512-aRVgGdnmW2OiySVPUC9e6m+plolMAJKjZnQlCwNSuK5yQ0JN61DZSO1X1Ufd1foqWRAlig0rhduTCHe7sVtK5Q==", + "dev": true }, "es6-promisify": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz", "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=", + "dev": true, "requires": { "es6-promise": "^4.0.3" } @@ -9435,7 +9532,8 @@ "figgy-pudding": { "version": "3.5.1", "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz", - "integrity": "sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==" + "integrity": "sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==", + "dev": true }, "figures": { "version": "2.0.0", @@ -10844,6 +10942,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz", "integrity": "sha512-zoDhWrkR3of1l9QAL8/scJZyLu8j/gBkcwcaQOZh7Gyh/+uJQzGVETdgT30akuwkpL8HTRfssqI3BZuV18teDg==", + "dev": true, "requires": { "agent-base": "5", "debug": "4" @@ -10852,12 +10951,14 @@ "agent-base": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-5.1.1.tgz", - "integrity": "sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g==" + "integrity": "sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g==", + "dev": true }, "debug": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "dev": true, "requires": { "ms": "^2.1.1" } @@ -10865,7 +10966,8 @@ "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true } } }, @@ -11240,11 +11342,6 @@ "is-extglob": "^2.1.1" } }, - "is-lambda": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz", - "integrity": "sha1-PZh3iZ5qU+/AFgUEzeFfgubwYdU=" - }, "is-number": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", @@ -17014,111 +17111,6 @@ "yallist": "^3.0.0" } }, - "minipass-collect": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz", - "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==", - "requires": { - "minipass": "^3.0.0" - }, - "dependencies": { - "minipass": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.1.tgz", - "integrity": "sha512-UFqVihv6PQgwj8/yTGvl9kPz7xIAY+R5z6XYjRInD3Gk3qx6QGSD6zEcpeG4Dy/lQnv1J6zv8ejV90hyYIKf3w==", - "requires": { - "yallist": "^4.0.0" - } - }, - "yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" - } - } - }, - "minipass-fetch": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.2.1.tgz", - "integrity": "sha512-ssHt0dkljEDaKmTgQ04DQgx2ag6G2gMPxA5hpcsoeTbfDgRf2fC2gNSRc6kISjD7ckCpHwwQvXxuTBK8402fXg==", - "requires": { - "encoding": "^0.1.12", - "minipass": "^3.1.0", - "minipass-pipeline": "^1.2.2", - "minipass-sized": "^1.0.3", - "minizlib": "^2.0.0" - }, - "dependencies": { - "minipass": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.1.tgz", - "integrity": "sha512-UFqVihv6PQgwj8/yTGvl9kPz7xIAY+R5z6XYjRInD3Gk3qx6QGSD6zEcpeG4Dy/lQnv1J6zv8ejV90hyYIKf3w==", - "requires": { - "yallist": "^4.0.0" - } - }, - "minizlib": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.0.tgz", - "integrity": "sha512-EzTZN/fjSvifSX0SlqUERCN39o6T40AMarPbv0MrarSFtIITCBh7bi+dU8nxGFHuqs9jdIAeoYoKuQAAASsPPA==", - "requires": { - "minipass": "^3.0.0", - "yallist": "^4.0.0" - } - }, - "yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" - } - } - }, - "minipass-flush": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz", - "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==", - "requires": { - "minipass": "^3.0.0" - }, - "dependencies": { - "minipass": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.1.tgz", - "integrity": "sha512-UFqVihv6PQgwj8/yTGvl9kPz7xIAY+R5z6XYjRInD3Gk3qx6QGSD6zEcpeG4Dy/lQnv1J6zv8ejV90hyYIKf3w==", - "requires": { - "yallist": "^4.0.0" - } - }, - "yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" - } - } - }, - "minipass-pipeline": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.2.tgz", - "integrity": "sha512-3JS5A2DKhD2g0Gg8x3yamO0pj7YeKGwVlDS90pF++kxptwx/F+B//roxf9SqYil5tQo65bijy+dAuAFZmYOouA==", - "requires": { - "minipass": "^3.0.0" - }, - "dependencies": { - "minipass": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.1.tgz", - "integrity": "sha512-UFqVihv6PQgwj8/yTGvl9kPz7xIAY+R5z6XYjRInD3Gk3qx6QGSD6zEcpeG4Dy/lQnv1J6zv8ejV90hyYIKf3w==", - "requires": { - "yallist": "^4.0.0" - } - }, - "yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" - } - } - }, "minipass-sized": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz", @@ -19189,6 +19181,7 @@ "version": "4.0.2", "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-4.0.2.tgz", "integrity": "sha512-NT6syHhI9LmuEMSK6Kd2V7gNv5KFZoLE7V5udWmn0de+3Mkj3UMA/AJPLyeNUVmElCurSHtUdM3ETpR3z770Wg==", + "dev": true, "requires": { "agent-base": "~4.2.1", "socks": "~2.3.2" diff --git a/packages/apollo-gateway/package.json b/packages/apollo-gateway/package.json index 96bed7f6046..918ab73d7bf 100644 --- a/packages/apollo-gateway/package.json +++ b/packages/apollo-gateway/package.json @@ -31,7 +31,7 @@ "apollo-server-types": "file:../apollo-server-types", "graphql-extensions": "file:../graphql-extensions", "loglevel": "^1.6.1", - "make-fetch-happen": "^7.1.1", + "make-fetch-happen": "^8.0.0", "pretty-format": "^25.0.0" }, "peerDependencies": { From aef39d49949c0a4ecd6fe1ac5b6bad7f56f03747 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 22 Apr 2020 14:54:01 +0300 Subject: [PATCH 446/642] chore(deps): update dependency prettier to v2 (#3913) Co-authored-by: Renovate Bot --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 87f32293f15..0a4ea74560e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18156,9 +18156,9 @@ "dev": true }, "prettier": { - "version": "1.19.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz", - "integrity": "sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.0.5.tgz", + "integrity": "sha512-7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg==", "dev": true }, "pretty-format": { diff --git a/package.json b/package.json index e73a893768b..aef1a187fc2 100644 --- a/package.json +++ b/package.json @@ -116,7 +116,7 @@ "mock-req": "0.2.0", "nock": "10.0.6", "node-fetch": "2.3.0", - "prettier": "1.19.1", + "prettier": "2.0.5", "qs-middleware": "1.0.3", "request": "2.88.2", "request-promise": "4.2.5", From c6c90212c92b20eed59931941c99b1519d2c603e Mon Sep 17 00:00:00 2001 From: Raaj Date: Wed, 22 Apr 2020 12:03:38 +0000 Subject: [PATCH 447/642] docs: Update comment for uploads. (#3566) --- docs/source/data/file-uploads.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/data/file-uploads.md b/docs/source/data/file-uploads.md index bb2370dd31f..985c81092b7 100644 --- a/docs/source/data/file-uploads.md +++ b/docs/source/data/file-uploads.md @@ -34,7 +34,7 @@ const resolvers = { singleUpload: (parent, args) => { return args.file.then(file => { //Contents of Upload scalar: https://github.com/jaydenseric/graphql-upload#class-graphqlupload - //file.stream is a node stream that contains the contents of the uploaded file + //file.createReadStream() is a readable node stream that contains the contents of the uploaded file //node stream api: https://nodejs.org/api/stream.html return file; }); From 0208a9ffae70c16944d4b4e3c39cd19728f32233 Mon Sep 17 00:00:00 2001 From: Kevin Wang Date: Wed, 22 Apr 2020 08:10:08 -0400 Subject: [PATCH 448/642] docs(lambda): Update Node.js version in README.md (#3659) --- packages/apollo-server-lambda/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-lambda/README.md b/packages/apollo-server-lambda/README.md index 2bc4c01a655..9c582a34cb8 100644 --- a/packages/apollo-server-lambda/README.md +++ b/packages/apollo-server-lambda/README.md @@ -72,7 +72,7 @@ Resources: Type: AWS::Serverless::Function Properties: Handler: graphql.handler - Runtime: nodejs8.10 + Runtime: nodejs12.x Events: AnyRequest: Type: Api From 4ff147ebae40256b628ec2ae95f1e24797567f4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dailos=20Rafael=20D=C3=ADaz=20Lara?= Date: Wed, 22 Apr 2020 13:20:22 +0100 Subject: [PATCH 449/642] docs: Clarify what passing `app` to `applyMiddleware` does. (#3673) Co-authored-by: Jesse Rosenberger --- docs/source/integrations/middleware.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/source/integrations/middleware.md b/docs/source/integrations/middleware.md index b17e8c02067..87034e184fe 100644 --- a/docs/source/integrations/middleware.md +++ b/docs/source/integrations/middleware.md @@ -42,4 +42,6 @@ app.listen({ port: 4000 }, () => In the above example, the `app` parameter you provide to `applyMiddleware` is your middleware's top-level representation of your application. In Express applications, for example, this variable is commonly named `app`. +By passing the existing `app` into `applyMiddleware`, Apollo Server can internally configure various middleware (including body parsing, the GraphQL Playground frontend, CORS support, etc.) without needing to separately apply those to the `app` with middleware mechanisms like Express.js' `app.use`. + > **Note:** When integrating with hapi, call `applyMiddleware` with `await`. From e344582cbd3ce416e55428bc090e4024876eeefd Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 22 Apr 2020 15:21:04 +0300 Subject: [PATCH 450/642] chore(deps): update dependency fastify-accepts to v1 (#3772) Co-authored-by: Renovate Bot --- package-lock.json | 46 ++++++++++++--------- packages/apollo-server-fastify/package.json | 2 +- 2 files changed, 28 insertions(+), 20 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0a4ea74560e..8edbd4859ba 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6489,10 +6489,34 @@ "@apollographql/graphql-playground-html": "1.6.24", "apollo-server-core": "file:packages/apollo-server-core", "apollo-server-types": "file:packages/apollo-server-types", - "fastify-accepts": "^0.5.0", + "fastify-accepts": "^1.0.0", "fastify-cors": "^0.2.0", "graphql-subscriptions": "^1.0.0", "graphql-tools": "^4.0.0" + }, + "dependencies": { + "fastify-accepts": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fastify-accepts/-/fastify-accepts-1.0.0.tgz", + "integrity": "sha512-JVI/zKXjVfwIAdXDZvNKM7CCEWkbTFSZQUEQxrH4KBprbopGxq3R4RSIsVxqhdkVanm90yyVcPtgEa2MnDwPyg==", + "requires": { + "accepts": "^1.3.5", + "fastify-plugin": "^1.2.0" + } + }, + "fastify-plugin": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/fastify-plugin/-/fastify-plugin-1.6.1.tgz", + "integrity": "sha512-APBcb27s+MjaBIerFirYmBLatoPCgmHZM6XP0K+nDL9k0yX8NJPWDY1RAC3bh6z+AB5ULS2j31BUfLMT3uaZ4A==", + "requires": { + "semver": "^6.3.0" + } + }, + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + } } }, "apollo-server-hapi": { @@ -9464,15 +9488,6 @@ "tiny-lru": "^2.0.0" } }, - "fastify-accepts": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/fastify-accepts/-/fastify-accepts-0.5.0.tgz", - "integrity": "sha1-wXwgEnjyv8Ub+5P/5I78T8QP02M=", - "requires": { - "accepts": "^1.3.3", - "fastify-plugin": "^0.2.1" - } - }, "fastify-cors": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/fastify-cors/-/fastify-cors-0.2.0.tgz", @@ -9497,14 +9512,6 @@ } } }, - "fastify-plugin": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/fastify-plugin/-/fastify-plugin-0.2.2.tgz", - "integrity": "sha512-oRJdjdudgCkQQUARNeh2rkbxFAmj2OhCJSVBNBLUbhS0orF+IMQ4u/bc661N1jh/wDI2J+YKmXmmHSVFQI4e7A==", - "requires": { - "semver": "^5.4.1" - } - }, "fastq": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.6.0.tgz", @@ -18872,7 +18879,8 @@ "semver": { "version": "5.6.0", "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz", - "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==" + "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==", + "dev": true }, "semver-store": { "version": "0.3.0", diff --git a/packages/apollo-server-fastify/package.json b/packages/apollo-server-fastify/package.json index 7c20f460d5a..f5d19c5b98d 100644 --- a/packages/apollo-server-fastify/package.json +++ b/packages/apollo-server-fastify/package.json @@ -28,7 +28,7 @@ "@apollographql/graphql-playground-html": "1.6.24", "apollo-server-core": "file:../apollo-server-core", "apollo-server-types": "file:../apollo-server-types", - "fastify-accepts": "^0.5.0", + "fastify-accepts": "^1.0.0", "fastify-cors": "^0.2.0", "graphql-subscriptions": "^1.0.0", "graphql-tools": "^4.0.0" From 201630ad284754248fc9ab6ebedc7506fcc3d951 Mon Sep 17 00:00:00 2001 From: Trevor Scheer Date: Wed, 22 Apr 2020 09:00:39 -0700 Subject: [PATCH 451/642] feat(gateway): relocate downstream query construction (#4018) This commit moves query construction / printing into the buildQueryPlan fn (previously in executeQueryPlan). This decision was informed by @abernix, who put together a wonderful benchmark of the gateway. We noticed that the call to graphql-js's `print` fn was incredibly expensive for large queries. To offset the cost of this, this diff now hoists all of this work into `buildQueryPlan`, where the result will ultimately be cached. --- packages/apollo-gateway/CHANGELOG.md | 1 + packages/apollo-gateway/src/QueryPlan.ts | 1 + packages/apollo-gateway/src/buildQueryPlan.ts | 157 ++++++++++++++++-- .../apollo-gateway/src/executeQueryPlan.ts | 97 +---------- 4 files changed, 149 insertions(+), 107 deletions(-) diff --git a/packages/apollo-gateway/CHANGELOG.md b/packages/apollo-gateway/CHANGELOG.md index d8ad3284690..4ad3d7d698d 100644 --- a/packages/apollo-gateway/CHANGELOG.md +++ b/packages/apollo-gateway/CHANGELOG.md @@ -4,6 +4,7 @@ > 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. When a release is being prepared, a new header will be (manually) created below and the the appropriate changes within that release will be moved into the new section. +- Cache stringified representations of downstream query bodies within the query plan to address performance implications incurred by repeatedly `print`ing the same`DocumentNode`s with the `graphql` printer. This improvement is more pronounced on larger documents. [PR #4018](https://github.com/apollographql/apollo-server/pull/4018) - Add inadvertently excluded `apollo-server-errors` runtime dependency. [#3927](https://github.com/apollographql/apollo-server/pull/3927) ## 0.14.1 diff --git a/packages/apollo-gateway/src/QueryPlan.ts b/packages/apollo-gateway/src/QueryPlan.ts index 0899b2a7653..07f38ae9a96 100644 --- a/packages/apollo-gateway/src/QueryPlan.ts +++ b/packages/apollo-gateway/src/QueryPlan.ts @@ -42,6 +42,7 @@ export interface FetchNode { variableUsages?: { [name: string]: VariableDefinitionNode }; requires?: SelectionSetNode; internalFragments: Set; + source: string; } export interface FlattenNode { kind: 'Flatten'; diff --git a/packages/apollo-gateway/src/buildQueryPlan.ts b/packages/apollo-gateway/src/buildQueryPlan.ts index f6264408585..b2761fad112 100644 --- a/packages/apollo-gateway/src/buildQueryPlan.ts +++ b/packages/apollo-gateway/src/buildQueryPlan.ts @@ -26,6 +26,9 @@ import { TypeNameMetaFieldDef, visit, VariableDefinitionNode, + OperationTypeNode, + print, + stripIgnoredCharacters, } from 'graphql'; import { Field, @@ -104,34 +107,60 @@ export function buildQueryPlan( function executionNodeForGroup( context: QueryPlanningContext, - group: FetchGroup, + { + serviceName, + fields, + requiredFields, + internalFragments, + mergeAt, + dependentGroups, + }: FetchGroup, parentType?: GraphQLCompositeType, ): PlanNode { - const selectionSet = selectionSetFromFieldSet(group.fields, parentType); + const selectionSet = selectionSetFromFieldSet(fields, parentType); + const requires = + requiredFields.length > 0 + ? selectionSetFromFieldSet(requiredFields) + : undefined; + const variableUsages = context.getVariableUsages( + selectionSet, + internalFragments, + ); + + const operation = requires + ? operationForEntitiesFetch({ + selectionSet, + variableUsages, + internalFragments, + }) + : operationForRootFetch({ + selectionSet, + variableUsages, + internalFragments, + operation: context.operation.operation, + }); const fetchNode: FetchNode = { kind: 'Fetch', - serviceName: group.serviceName, + serviceName, selectionSet, - requires: - group.requiredFields && group.requiredFields.length > 0 - ? selectionSetFromFieldSet(group.requiredFields) - : undefined, - variableUsages: context.getVariableUsages(selectionSet, group.internalFragments), - internalFragments: group.internalFragments + requires, + variableUsages, + internalFragments, + source: stripIgnoredCharacters(print(operation)), }; const node: PlanNode = - group.mergeAt && group.mergeAt.length > 0 + mergeAt && mergeAt.length > 0 ? { kind: 'Flatten', - path: group.mergeAt, + path: mergeAt, node: fetchNode, } : fetchNode; - if (group.dependentGroups.length > 0) { - const dependentNodes = group.dependentGroups.map(dependentGroup => + if (dependentGroups.length > 0) { + const dependentNodes = dependentGroups.map(dependentGroup => executionNodeForGroup(context, dependentGroup), ); @@ -141,6 +170,108 @@ function executionNodeForGroup( } } +interface VariableUsages { + [name: string]: VariableDefinitionNode +} + +function mapFetchNodeToVariableDefinitions( + variableUsages: VariableUsages, +): VariableDefinitionNode[] { + return variableUsages ? Object.values(variableUsages) : []; +} + +function operationForRootFetch({ + selectionSet, + variableUsages, + internalFragments, + operation = 'query', +}: { + selectionSet: SelectionSetNode; + variableUsages: VariableUsages; + internalFragments: Set; + operation?: OperationTypeNode; +}): DocumentNode { + return { + kind: Kind.DOCUMENT, + definitions: [ + { + kind: Kind.OPERATION_DEFINITION, + operation, + selectionSet, + variableDefinitions: mapFetchNodeToVariableDefinitions(variableUsages), + }, + ...internalFragments, + ], + }; +} + +function operationForEntitiesFetch({ + selectionSet, + variableUsages, + internalFragments, +}: { + selectionSet: SelectionSetNode; + variableUsages: VariableUsages; + internalFragments: Set; +}): DocumentNode { + const representationsVariable = { + kind: Kind.VARIABLE, + name: { kind: Kind.NAME, value: 'representations' }, + }; + + return { + kind: Kind.DOCUMENT, + definitions: [ + { + kind: Kind.OPERATION_DEFINITION, + operation: 'query', + variableDefinitions: ([ + { + kind: Kind.VARIABLE_DEFINITION, + variable: representationsVariable, + type: { + kind: Kind.NON_NULL_TYPE, + type: { + kind: Kind.LIST_TYPE, + type: { + kind: Kind.NON_NULL_TYPE, + type: { + kind: Kind.NAMED_TYPE, + name: { kind: Kind.NAME, value: '_Any' }, + }, + }, + }, + }, + }, + ] as VariableDefinitionNode[]).concat( + mapFetchNodeToVariableDefinitions(variableUsages), + ), + selectionSet: { + kind: Kind.SELECTION_SET, + selections: [ + { + kind: Kind.FIELD, + name: { kind: Kind.NAME, value: '_entities' }, + arguments: [ + { + kind: Kind.ARGUMENT, + name: { + kind: Kind.NAME, + value: representationsVariable.name.value, + }, + value: representationsVariable, + }, + ], + selectionSet, + }, + ], + }, + }, + ...internalFragments, + ], + }; +} + // Wraps the given nodes in a ParallelNode or SequenceNode, unless there's only // one node, in which case it is returned directly. Any nodes of the same kind // in the given list have their sub-nodes flattened into the list: ie, diff --git a/packages/apollo-gateway/src/executeQueryPlan.ts b/packages/apollo-gateway/src/executeQueryPlan.ts index 0527065f252..72116c8e83d 100644 --- a/packages/apollo-gateway/src/executeQueryPlan.ts +++ b/packages/apollo-gateway/src/executeQueryPlan.ts @@ -7,14 +7,9 @@ import { execute, GraphQLError, Kind, - OperationTypeNode, - print, SelectionSetNode, TypeNameMetaFieldDef, - VariableDefinitionNode, GraphQLFieldResolver, - stripIgnoredCharacters, - DocumentNode, } from 'graphql'; import { Trace, google } from 'apollo-engine-reporting-protobuf'; import { GraphQLDataSource } from './datasources/types'; @@ -208,8 +203,6 @@ async function executeFetch( throw new Error(`Couldn't find service with name "${fetch.serviceName}"`); } - const operationType = context.operationContext.operation.operation; - const entities = Array.isArray(results) ? results : [results]; if (entities.length < 1) return; @@ -229,7 +222,7 @@ async function executeFetch( if (!fetch.requires) { const dataReceivedFromService = await sendOperation( context, - operationForRootFetch(fetch, operationType), + fetch.source, variables, ); @@ -256,7 +249,7 @@ async function executeFetch( const dataReceivedFromService = await sendOperation( context, - operationForEntitiesFetch(fetch), + fetch.source, { ...variables, representations }, ); @@ -288,10 +281,9 @@ async function executeFetch( async function sendOperation( context: ExecutionContext, - operation: DocumentNode, + source: string, variables: Record, ): Promise { - const source = stripIgnoredCharacters(print(operation)); // We declare this as 'any' because it is missing url and method, which // GraphQLRequest.http is supposed to have if it exists. let http: any; @@ -480,89 +472,6 @@ function downstreamServiceError( ); } -function mapFetchNodeToVariableDefinitions( - node: FetchNode, -): VariableDefinitionNode[] { - return node.variableUsages ? Object.values(node.variableUsages) : []; -} - -function operationForRootFetch( - fetch: FetchNode, - operation: OperationTypeNode = 'query', -): DocumentNode { - return { - kind: Kind.DOCUMENT, - definitions: [ - { - kind: Kind.OPERATION_DEFINITION, - operation, - selectionSet: fetch.selectionSet, - variableDefinitions: mapFetchNodeToVariableDefinitions(fetch), - }, - ...fetch.internalFragments, - ], - }; -} - -function operationForEntitiesFetch(fetch: FetchNode): DocumentNode { - const representationsVariable = { - kind: Kind.VARIABLE, - name: { kind: Kind.NAME, value: 'representations' }, - }; - - return { - kind: Kind.DOCUMENT, - definitions: [ - { - kind: Kind.OPERATION_DEFINITION, - operation: 'query', - variableDefinitions: ([ - { - kind: Kind.VARIABLE_DEFINITION, - variable: representationsVariable, - type: { - kind: Kind.NON_NULL_TYPE, - type: { - kind: Kind.LIST_TYPE, - type: { - kind: Kind.NON_NULL_TYPE, - type: { - kind: Kind.NAMED_TYPE, - name: { kind: Kind.NAME, value: '_Any' }, - }, - }, - }, - }, - }, - ] as VariableDefinitionNode[]).concat( - mapFetchNodeToVariableDefinitions(fetch), - ), - selectionSet: { - kind: Kind.SELECTION_SET, - selections: [ - { - kind: Kind.FIELD, - name: { kind: Kind.NAME, value: '_entities' }, - arguments: [ - { - kind: Kind.ARGUMENT, - name: { - kind: Kind.NAME, - value: representationsVariable.name.value, - }, - value: representationsVariable, - }, - ], - selectionSet: fetch.selectionSet, - }, - ], - }, - }, - ...fetch.internalFragments - ], - }; -} - export const defaultFieldResolverWithAliasSupport: GraphQLFieldResolver< any, any From 26ea671550b8a98ba1b8bae8741491fa70ca61ac Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 22 Apr 2020 16:17:55 +0000 Subject: [PATCH 452/642] chore(deps): update dependency apollo-graphql to v0.4.3 (#300) Co-authored-by: Renovate Bot --- packages/apollo-server-plugin-operation-registry/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/package.json b/packages/apollo-server-plugin-operation-registry/package.json index bbe472065c5..4f8d795543e 100644 --- a/packages/apollo-server-plugin-operation-registry/package.json +++ b/packages/apollo-server-plugin-operation-registry/package.json @@ -11,7 +11,7 @@ "node": ">=8" }, "dependencies": { - "apollo-graphql": "0.4.1", + "apollo-graphql": "0.4.3", "apollo-server-caching": "^0.5.0", "apollo-server-errors": "^2.2.0", "apollo-server-plugin-base": "^0.7.0", From f20c4201ea279eb32dc3d60abd2b05d559a67e82 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 23 Apr 2020 08:14:24 +0000 Subject: [PATCH 453/642] chore(deps): update dependency gatsby-theme-apollo-docs to v4.1.6 (#4025) Co-authored-by: Renovate Bot --- docs/package-lock.json | 97 ++++++++++++++++++++---------------------- docs/package.json | 2 +- 2 files changed, 46 insertions(+), 53 deletions(-) diff --git a/docs/package-lock.json b/docs/package-lock.json index 816ae93d9b1..ab4cfed2bae 100644 --- a/docs/package-lock.json +++ b/docs/package-lock.json @@ -6286,9 +6286,9 @@ "integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=" }, "d3": { - "version": "5.15.1", - "resolved": "https://registry.npmjs.org/d3/-/d3-5.15.1.tgz", - "integrity": "sha512-Xu9gT6Lm0jH3wWJJSRomFwqnGGi3YAfWIfxNFl4++YVgYOjo3F8V2idAG3nJBgpZOkD0/RHPZX6F4k6tzgOvYw==", + "version": "5.16.0", + "resolved": "https://registry.npmjs.org/d3/-/d3-5.16.0.tgz", + "integrity": "sha512-4PL5hHaHwX4m7Zr1UapXW23apo6pexCgdetdJ5kTmADpG/7T9Gkxw0M0tf/pjoB63ezCCm0u5UaFYy2aMt0Mcw==", "requires": { "d3-array": "1", "d3-axis": "1", @@ -6360,9 +6360,9 @@ "integrity": "sha512-ii0/r5f4sjKNTfh84Di+DpztYwqKhEyUlKoPrzUFfeSkWxjW49xU2QzO9qrPrNkpdI0XJkfzvmTu8V2Zylln6A==" }, "d3-color": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-1.4.0.tgz", - "integrity": "sha512-TzNPeJy2+iEepfiL92LAAB7fvnp/dV2YwANPVHdDWmYMm23qIJBYww3qT8I8C1wXrmrg4UWs7BKc2tKIgyjzHg==" + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-1.4.1.tgz", + "integrity": "sha512-p2sTHSLCJI2QKunbGb7ocOh7DgTAn8IrLx21QRc/BSnodXM4sv6aLQlnfpvehFMLZEfBc6g9pH9SWQccFYfJ9Q==" }, "d3-contour": { "version": "1.3.2", @@ -6426,9 +6426,9 @@ "integrity": "sha512-TWks25e7t8/cqctxCmxpUuzZN11QxIA7YrMbram94zMQ0PXjE4LVIMe/f6a4+xxL8HQ3OsAFULOINQi1pE62Aw==" }, "d3-geo": { - "version": "1.11.9", - "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-1.11.9.tgz", - "integrity": "sha512-9edcH6J3s/Aa3KJITWqFJbyB/8q3mMlA9Fi7z6yy+FAYMnRaxmC7jBhUnsINxVWD14GmqX3DK8uk7nV6/Ekt4A==", + "version": "1.12.0", + "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-1.12.0.tgz", + "integrity": "sha512-NalZVW+6/SpbKcnl+BCO67m8gX+nGeJdo6oGL9H6BRUGUL1e+AtPcP4vE4TwCQ/gl8y5KE7QvBzrLn+HsKIl+w==", "requires": { "d3-array": "1" } @@ -10138,9 +10138,9 @@ } }, "gatsby-core-utils": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.1.1.tgz", - "integrity": "sha512-EboPcBx37YQVUKN9JH753S54nDxjRmOefbR0i08KTmaVgQ1lZnDXJr8JfrImmMqupZlOkPQX1mWlXfp+r1jGhA==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.1.3.tgz", + "integrity": "sha512-PntSiNCFo1/ZKjp00qgLBj2jdwY7M+maV21RXb1k7Ud9Vv9j0dGQsaVb9YXFTqXAf8bG0Xyqsqq4mPU1iNYLDw==", "requires": { "ci-info": "2.0.0", "configstore": "^5.0.1", @@ -10241,9 +10241,9 @@ } }, "gatsby-plugin-emotion": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/gatsby-plugin-emotion/-/gatsby-plugin-emotion-4.2.1.tgz", - "integrity": "sha512-ygXxkpnWJdDOAgb1XA9TbVCRLkaAYTFLTsqVQXMBhnrknb5iPNO+MP0fZ5LRqWgBALyJ629nxs0efUpnT/RSWw==", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/gatsby-plugin-emotion/-/gatsby-plugin-emotion-4.2.2.tgz", + "integrity": "sha512-EbMmHRUi0q1C3XzXuQ4rUJt4L2kdJsd419iyXVniV9y8V82V5PFrr/FFMeo4ibCO3KxWqCELlpAvstW/Hkjy+w==", "requires": { "@babel/runtime": "^7.8.7", "@emotion/babel-preset-css-prop": "^10.0.27" @@ -10265,9 +10265,9 @@ } }, "gatsby-plugin-less": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/gatsby-plugin-less/-/gatsby-plugin-less-3.1.1.tgz", - "integrity": "sha512-H0LQXy2DpwD1UW3bEuE8RHk2yNfOcZGFjzYH9URPUAzxuOo6bhPyNxKJ8tLcvarqwYiJIWFFivDMv0IqgBJ16Q==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/gatsby-plugin-less/-/gatsby-plugin-less-3.1.3.tgz", + "integrity": "sha512-tj2kVK1Brrma0goXQ58z7Kk/zW8JT1Btf1Qo9NXH90FOEHB8OgwAs7lgJfj0FfXdWy6+sQlCnnpBcMSnS+I+/g==", "requires": { "@babel/runtime": "^7.8.7", "less-loader": "^5.0.0" @@ -10289,9 +10289,9 @@ } }, "gatsby-plugin-mdx": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/gatsby-plugin-mdx/-/gatsby-plugin-mdx-1.1.7.tgz", - "integrity": "sha512-CTEeZQQ/hYDPv9mX06259zwiQc67OGBPzigBL8ZEMSgg5ANzzfR143Wd74RGPvT04GnMNjfWKcg8yBPTf75EaA==", + "version": "1.1.10", + "resolved": "https://registry.npmjs.org/gatsby-plugin-mdx/-/gatsby-plugin-mdx-1.1.10.tgz", + "integrity": "sha512-qoOjJYXUF9wRHHnnaVgmXY2UVOqohY2eB/12JqUdCUAnrm76W1RLfQPk+9BiHKObknrgcWNIHj1nJz2FDtLgkw==", "requires": { "@babel/core": "^7.8.7", "@babel/generator": "^7.8.8", @@ -10308,7 +10308,7 @@ "escape-string-regexp": "^1.0.5", "eval": "^0.1.4", "fs-extra": "^8.1.0", - "gatsby-core-utils": "^1.1.1", + "gatsby-core-utils": "^1.1.3", "gray-matter": "^4.0.2", "json5": "^2.1.2", "loader-utils": "^1.4.0", @@ -10541,9 +10541,9 @@ } }, "gatsby-plugin-react-helmet": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/gatsby-plugin-react-helmet/-/gatsby-plugin-react-helmet-3.2.2.tgz", - "integrity": "sha512-mPd7gefGIxqAuxFJgDuttR9+DnRLKLrCh61ND1iLSeOp9GoYS/qH8Rhka6fkpmBXOtUVyujzaUthhB/ll/a4RA==", + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/gatsby-plugin-react-helmet/-/gatsby-plugin-react-helmet-3.2.4.tgz", + "integrity": "sha512-AHmmhodv7E8+qkHC5W0XSTgoQb1iHMB15Jn4NnEnDz696pZ448g1MCnX3bEMGCjYg2wHKJlo29EVoa4z5dS5lw==", "requires": { "@babel/runtime": "^7.8.7" }, @@ -11003,9 +11003,9 @@ } }, "gatsby-remark-autolink-headers": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/gatsby-remark-autolink-headers/-/gatsby-remark-autolink-headers-2.2.1.tgz", - "integrity": "sha512-FqTq9rh9fRxdlX1V3InXSAoZQyBcZ3mI5zNiNagO+DRNZCSve3YVKTDmMZ7a7GXx5Bz7QTPBB993wk2OcRSIFg==", + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/gatsby-remark-autolink-headers/-/gatsby-remark-autolink-headers-2.2.3.tgz", + "integrity": "sha512-xPU2FPniRaNu/9z4szPmkTrx7NlDoaOUTxlPyTSD4vynuphZGBonGMiqb2BOj03RHIeKEvRAp3dhvIMSJ+TPsQ==", "requires": { "@babel/runtime": "^7.8.7", "github-slugger": "^1.3.0", @@ -11094,9 +11094,9 @@ } }, "gatsby-remark-copy-linked-files": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/gatsby-remark-copy-linked-files/-/gatsby-remark-copy-linked-files-2.2.1.tgz", - "integrity": "sha512-xTy52n0K+fF4aXCNYkpH1HdhYy47GwLG2tE5H+xIisyEQiCr5XA555yQdS0U4MRtDZEyfX4TB+XTwaNhOgTPgw==", + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/gatsby-remark-copy-linked-files/-/gatsby-remark-copy-linked-files-2.2.3.tgz", + "integrity": "sha512-jjJ9CROLjFKMxCN80Y+JnsYe5+HaYBh1Ad4OJCa22Ib4C14pn1Qs+81kNquUDfGZntXxCtNomyxQ/G41qKOMLQ==", "requires": { "@babel/runtime": "^7.8.7", "cheerio": "^1.0.0-rc.3", @@ -11187,9 +11187,9 @@ } }, "gatsby-remark-prismjs": { - "version": "3.4.1", - "resolved": "https://registry.npmjs.org/gatsby-remark-prismjs/-/gatsby-remark-prismjs-3.4.1.tgz", - "integrity": "sha512-DPg4PjalrElXXZ3KZRiWiJiHIsXaee51nN2hCoGC2hfaXW8VdSjXhpBSSps9OWuB+QNmdTp/EP3FDiiwImjpUw==", + "version": "3.4.4", + "resolved": "https://registry.npmjs.org/gatsby-remark-prismjs/-/gatsby-remark-prismjs-3.4.4.tgz", + "integrity": "sha512-SeGnwJdeipWIGBXq0yUvC4YjUD1Y3ue0qBRygH6L9v7dqjS0B8jXATbWHBE+wOTlPXU/jzU1V5XpgyixJoyo2Q==", "requires": { "@babel/runtime": "^7.8.7", "parse-numeric-range": "^0.0.2", @@ -11228,9 +11228,9 @@ } }, "gatsby-source-filesystem": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/gatsby-source-filesystem/-/gatsby-source-filesystem-2.2.2.tgz", - "integrity": "sha512-uHHCiTp8/q9JF0Yr14Q5aJZ07jUJSV6HJSnrSVnEIF4PfRQkVJG5FHQULmxJUXWQhIoy17EGuzqVjxMsFY69QA==", + "version": "2.2.4", + "resolved": "https://registry.npmjs.org/gatsby-source-filesystem/-/gatsby-source-filesystem-2.2.4.tgz", + "integrity": "sha512-Tf5HKAYcVmVFj7DhWi7+opDH312em8vkuoH/fTVLReBrN0yfi8maDha9EaZj4lL1fTtLk6WG0TwOM6GkyYiqgw==", "requires": { "@babel/runtime": "^7.8.7", "better-queue": "^3.8.10", @@ -11238,7 +11238,7 @@ "chokidar": "3.3.1", "file-type": "^12.4.2", "fs-extra": "^8.1.0", - "gatsby-core-utils": "^1.1.1", + "gatsby-core-utils": "^1.1.3", "got": "^9.6.0", "md5-file": "^3.2.3", "mime": "^2.4.4", @@ -11429,9 +11429,9 @@ } }, "gatsby-theme-apollo-docs": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/gatsby-theme-apollo-docs/-/gatsby-theme-apollo-docs-4.1.5.tgz", - "integrity": "sha512-iI+g5BtuLncEFSZIZRL0zhnOXSVXqLarj/GeMf2BczLQPLSj8cG+59RisBPfRPd8Z5M1LDgqmhO+ZV3cLx25aA==", + "version": "4.1.6", + "resolved": "https://registry.npmjs.org/gatsby-theme-apollo-docs/-/gatsby-theme-apollo-docs-4.1.6.tgz", + "integrity": "sha512-wkt1rdWkv9/hxCNsPwsvuDRMemevgi71JEIkXpAn6YuNwW9pxyxvazWW7r6UvFj+t+H1BQI4ejmb/UhIdOt9MQ==", "requires": { "@mdx-js/mdx": "^1.1.0", "@mdx-js/react": "^1.0.27", @@ -11462,13 +11462,13 @@ } }, "gatsby-transformer-remark": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/gatsby-transformer-remark/-/gatsby-transformer-remark-2.7.1.tgz", - "integrity": "sha512-9geE8itjePDvaa0uWmyRgi2emPt9ut420YyjaNJ1/4eZw9Yj8zAuCdancw7j1buhL0UAxgQ2YseO6+MWTHEoMw==", + "version": "2.7.4", + "resolved": "https://registry.npmjs.org/gatsby-transformer-remark/-/gatsby-transformer-remark-2.7.4.tgz", + "integrity": "sha512-p/eMLpL5KcRM7ZBPk/C4TE95woS5aqzqkpyRPrATf03MbpAEQFCwpfvCf2P62IKF2PBMMMtd1LmS/1NZV+On2w==", "requires": { "@babel/runtime": "^7.8.7", "bluebird": "^3.7.2", - "gatsby-core-utils": "^1.1.1", + "gatsby-core-utils": "^1.1.3", "gray-matter": "^4.0.2", "hast-util-raw": "^4.0.0", "hast-util-to-html": "^4.0.1", @@ -16195,13 +16195,6 @@ "integrity": "sha512-6QfeouDf236N+MAxHch0CVIy8o/KBnmhttKjxZoOkUlzqU+u9rZgEyXH3OdckhTgawbqf5rpzmyR+07+Lv0+zg==", "requires": { "eventemitter3": "^3.1.0" - }, - "dependencies": { - "eventemitter3": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.2.tgz", - "integrity": "sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q==" - } } }, "p-retry": { diff --git a/docs/package.json b/docs/package.json index bcfb49f46e1..51c499aa443 100644 --- a/docs/package.json +++ b/docs/package.json @@ -7,7 +7,7 @@ }, "dependencies": { "gatsby": "2.20.25", - "gatsby-theme-apollo-docs": "4.1.5", + "gatsby-theme-apollo-docs": "4.1.6", "react": "16.13.1", "react-dom": "16.13.1" } From e076e7d70e67c88a37df931079f11db1f87d7a62 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 23 Apr 2020 11:47:11 +0300 Subject: [PATCH 454/642] =?UTF-8?q?chore(deps):=20update=20dependency=20@a?= =?UTF-8?q?pollographql/apollo-tools=20to=20v=E2=80=A6=20(#4021)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Renovate Bot --- package-lock.json | 22 +++++++++++----------- package.json | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8edbd4859ba..4ea93fcb910 100644 --- a/package-lock.json +++ b/package-lock.json @@ -433,28 +433,28 @@ } }, "@apollographql/apollo-tools": { - "version": "0.4.5", - "resolved": "https://registry.npmjs.org/@apollographql/apollo-tools/-/apollo-tools-0.4.5.tgz", - "integrity": "sha512-KOZC4Y+JM4iQQ7P4CVC878Ee7ya0QoHApGHu4klwjwZkYyOdWIvbML7JfXOUb/AfCO4DFmJfHCjRdAX09Ga6sQ==", + "version": "0.4.7", + "resolved": "https://registry.npmjs.org/@apollographql/apollo-tools/-/apollo-tools-0.4.7.tgz", + "integrity": "sha512-6QjZz6aLq6QXHgJ1AmSg4C4cBmhF5z3g7LPsk4g+zJoWKxiFuSIbrTe12ETtn6wgPq//e5p2agbXYydIjqs7gw==", "requires": { - "apollo-env": "^0.6.2" + "apollo-env": "^0.6.4" }, "dependencies": { "@types/node-fetch": { - "version": "2.5.5", - "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.5.tgz", - "integrity": "sha512-IWwjsyYjGw+em3xTvWVQi5MgYKbRs0du57klfTaZkv/B24AEQ/p/IopNeqIYNy3EsfHOpg8ieQSDomPcsYMHpA==", + "version": "2.5.6", + "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.6.tgz", + "integrity": "sha512-2w0NTwMWF1d3NJMK0Uiq2UNN8htVCyOWOD0jIPjPgC5Ph/YP4dVhs9YxxcMcuLuwAslz0dVEcZQUaqkLs3IzOQ==", "requires": { "@types/node": "*", "form-data": "^3.0.0" } }, "apollo-env": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/apollo-env/-/apollo-env-0.6.2.tgz", - "integrity": "sha512-Vb/doL1ZbzkNDJCQ6kYGOrphRx63rMERYo3MT2pzm2pNEdm6AK60InMgJaeh3RLK3cjGllOXFAgP8IY+m+TaEg==", + "version": "0.6.4", + "resolved": "https://registry.npmjs.org/apollo-env/-/apollo-env-0.6.4.tgz", + "integrity": "sha512-8tGDMFv3sZLd76b/ZAo8GbdWU5Qt3VEUWSB+FLN41p/hVShZw0XIo2s/i8pVCTAhaWiEiD0Cr+d/zi0/h5UTxA==", "requires": { - "@types/node-fetch": "2.5.5", + "@types/node-fetch": "2.5.6", "core-js": "^3.0.1", "node-fetch": "^2.2.0", "sha.js": "^2.4.11" diff --git a/package.json b/package.json index aef1a187fc2..701ef50f356 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "node": ">=6" }, "dependencies": { - "@apollographql/apollo-tools": "0.4.5", + "@apollographql/apollo-tools": "0.4.7", "@apollo/federation": "file:packages/apollo-federation", "@apollo/gateway": "file:packages/apollo-gateway", "apollo-cache-control": "file:packages/apollo-cache-control", From 275945de9c097bb7a3fe83947e51151b28914728 Mon Sep 17 00:00:00 2001 From: Adam Zionts Date: Thu, 23 Apr 2020 06:53:26 -0700 Subject: [PATCH 455/642] Support engine.graphVariant and APOLLO_GRAPH_VARIANT. (#3924) Co-authored-by: Adam Zionts --- CHANGELOG.md | 2 +- docs/source/federation/metrics.md | 2 +- packages/apollo-engine-reporting/src/agent.ts | 32 ++++++++++--- packages/apollo-gateway/CHANGELOG.md | 1 + .../apollo-server-core/src/ApolloServer.ts | 19 +------- .../src/__tests__/ApolloServerBase.test.ts | 46 +++++++++++++++++++ 6 files changed, 77 insertions(+), 25 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index be9e33edfbc..2af3579f897 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,9 +6,9 @@ The version headers in this history reflect the versions of Apollo Server itself - [__CHANGELOG for `@apollo/federation`__](https://github.com/apollographql/apollo-server/blob/master/packages/apollo-federation/CHANGELOG.md) ### vNEXT - > 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. When a release is being prepared, a new header will be (manually) created below and the the appropriate changes within that release will be moved into the new section. +- `apollo-engine-reporting`: Deprecated the `APOLLO_SCHEMA_TAG` environment variable in favor of its new name, `APOLLO_GRAPH_VARIANT`. Similarly, within the `engine` configuration object, the `schemaTag` property has been renamed `graphVariant`. The functionality remains otherwise unchanged, but their new names mirror the name used within Apollo Graph Manager. Continued use of the now-deprecated names will result in deprecation warnings and support will be dropped completely in the next "major" update. To avoid misconfiguration, a runtime error will be thrown if _both_ new and deprecated names are set. [PR #3855](https://github.com/apollographql/apollo-server/pull/3855) - Allow passing a `WebSocket.Server` to `ApolloServer.installSubscriptionHandlers`. [PR #2314](https://github.com/apollographql/apollo-server/pull/2314) ### v2.12.0 diff --git a/docs/source/federation/metrics.md b/docs/source/federation/metrics.md index 29278b3ec24..154cb196ae6 100644 --- a/docs/source/federation/metrics.md +++ b/docs/source/federation/metrics.md @@ -20,7 +20,7 @@ Ensure that all dependencies on `apollo-server` are at version `2.7.0` or higher These options will cause the Apollo gateway to collect tracing information from the underlying federated services and pass them on, along with the query plan, to the Apollo metrics ingress. Currently, only Apollo Server supports detailed metrics insights as an implementing service, but we would love to work with you to implement the protocol in other languages! -> NOTE: By default, metrics will be reported to the `current` variant. To change the variant for reporting, set the `ENGINE_GRAPH_VARIANT` environment variable. +> NOTE: By default, metrics will be reported to the `current` variant. To change the variant for reporting, set the `APOLLO_GRAPH_VARIANT` environment variable. ## How tracing data is exposed from a federated service diff --git a/packages/apollo-engine-reporting/src/agent.ts b/packages/apollo-engine-reporting/src/agent.ts index 32ae147934a..75a3d285711 100644 --- a/packages/apollo-engine-reporting/src/agent.ts +++ b/packages/apollo-engine-reporting/src/agent.ts @@ -45,6 +45,29 @@ export type GenerateClientInfo = ( requestContext: GraphQLRequestContext, ) => ClientInfo; +// AS3: Drop support for deprecated bits. +export function getEngineGraphVariant(engine: EngineReportingOptions | boolean | undefined, logger: Logger = console): string | undefined { + if (engine === false) { + return; + } else if (typeof engine === 'object' && (engine.graphVariant || engine.schemaTag)) { + if (engine.graphVariant && engine.schemaTag) { + throw new Error('Cannot set both engine.graphVariant and engine.schemaTag. Please use engine.graphVariant.'); + } + if (engine.schemaTag) { + logger.warn('[Deprecation warning] Usage of engine.schemaTag is deprecated. Please use engine.graphVariant instead.'); + } + return engine.graphVariant || engine.schemaTag; + } else { + if (process.env.ENGINE_SCHEMA_TAG) { + logger.warn('[Deprecation warning] Usage of ENGINE_SCHEMA_TAG is deprecated. Please use APOLLO_GRAPH_VARIANT instead.'); + } + if (process.env.ENGINE_SCHEMA_TAG && process.env.APOLLO_GRAPH_VARIANT) { + throw new Error('Cannot set both ENGINE_SCHEMA_TAG and APOLLO_GRAPH_VARIANT. Please use APOLLO_GRAPH_VARIANT.') + } + return process.env.APOLLO_GRAPH_VARIANT || process.env.ENGINE_SCHEMA_TAG; + } +} + export interface EngineReportingOptions { /** * API key for the service. Get this from @@ -222,6 +245,7 @@ export class EngineReportingAgent { private options: EngineReportingOptions; private logger: Logger = console; private apiKey: string; + private graphVariant: string; private reports: { [schemaHash: string]: FullTracesReport } = Object.create( null, ); @@ -240,6 +264,7 @@ export class EngineReportingAgent { this.options = options; if (options.logger) this.logger = options.logger; this.apiKey = options.apiKey || process.env.ENGINE_API_KEY || ''; + this.graphVariant = getEngineGraphVariant(options, this.logger) || ''; if (!this.apiKey) { throw new Error( 'To use EngineReportingAgent, you must specify an API key via the apiKey option or the ENGINE_API_KEY environment variable.', @@ -303,12 +328,7 @@ export class EngineReportingAgent { this.reportHeaders[schemaHash] = new ReportHeader({ ...serviceHeaderDefaults, schemaHash, - schemaTag: - this.options.graphVariant - || this.options.schemaTag - || process.env.APOLLO_GRAPH_VARIANT - || process.env.ENGINE_SCHEMA_TAG - || '', + schemaTag: this.graphVariant, }); // initializes this.reports[reportHash] this.resetReport(schemaHash); diff --git a/packages/apollo-gateway/CHANGELOG.md b/packages/apollo-gateway/CHANGELOG.md index 4ad3d7d698d..e6f2dbfd589 100644 --- a/packages/apollo-gateway/CHANGELOG.md +++ b/packages/apollo-gateway/CHANGELOG.md @@ -4,6 +4,7 @@ > 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. When a release is being prepared, a new header will be (manually) created below and the the appropriate changes within that release will be moved into the new section. +- Deprecated the `APOLLO_SCHEMA_TAG` environment variable in favor of its new name, `APOLLO_GRAPH_VARIANT`. The functionality remains otherwise identical, but the new name mirrors the name used within Apollo Graph Manager. Use of the now-deprecated name will result in a deprecation warning and support will be dropped completely in a future "major" update. To avoid misconfiguration, runtime errors will be thrown if the new and deprecated name are _both_ set. [#3855](https://github.com/apollographql/apollo-server/pull/3855) - Cache stringified representations of downstream query bodies within the query plan to address performance implications incurred by repeatedly `print`ing the same`DocumentNode`s with the `graphql` printer. This improvement is more pronounced on larger documents. [PR #4018](https://github.com/apollographql/apollo-server/pull/4018) - Add inadvertently excluded `apollo-server-errors` runtime dependency. [#3927](https://github.com/apollographql/apollo-server/pull/3927) diff --git a/packages/apollo-server-core/src/ApolloServer.ts b/packages/apollo-server-core/src/ApolloServer.ts index 25955b8509a..67872846dfa 100644 --- a/packages/apollo-server-core/src/ApolloServer.ts +++ b/packages/apollo-server-core/src/ApolloServer.ts @@ -71,6 +71,7 @@ import { import { Headers } from 'apollo-server-env'; import { buildServiceDefinition } from '@apollographql/apollo-tools'; +import {getEngineGraphVariant} from "apollo-engine-reporting/dist/agent"; import { Logger } from "apollo-server-types"; const NoIntrospection = (context: ValidationContext) => ({ @@ -98,22 +99,6 @@ function getEngineApiKey(engine: Config['engine']): string | undefined { return; } -function getEngineGraphVariant(engine: Config['engine']): string | undefined { - if (engine === false) { - return; - } else if (typeof engine === 'object' && (engine.graphVariant || engine.schemaTag)) { - return engine.graphVariant || engine.schemaTag; - } else { - if (process.env.ENGINE_SCHEMA_TAG) { - console.warn('[Deprecation warning] Usage of ENGINE_SCHEMA_TAG is deprecated. Please use APOLLO_GRAPH_VARIANT instead.'); - } - if (process.env.ENGINE_SCHEMA_TAG && process.env.APOLLO_GRAPH_VARIANT) { - throw new Error('Cannot set both ENGINE_SCHEMA_TAG and APOLLO_GRAPH_VARIANT. Please use APOLLO_GRAPH_VARIANT.') - } - return process.env.APOLLO_GRAPH_VARIANT || process.env.ENGINE_SCHEMA_TAG; - } -} - function getEngineServiceId(engine: Config['engine']): string | undefined { const engineApiKey = getEngineApiKey(engine); if (engineApiKey) { @@ -446,7 +431,7 @@ export class ApolloServerBase { ), ); - const graphVariant = getEngineGraphVariant(engine); + const graphVariant = getEngineGraphVariant(engine, this.logger); const engineConfig = this.engineApiKeyHash && this.engineServiceId ? { diff --git a/packages/apollo-server-core/src/__tests__/ApolloServerBase.test.ts b/packages/apollo-server-core/src/__tests__/ApolloServerBase.test.ts index 27af9c3347f..fc6440092cc 100644 --- a/packages/apollo-server-core/src/__tests__/ApolloServerBase.test.ts +++ b/packages/apollo-server-core/src/__tests__/ApolloServerBase.test.ts @@ -30,6 +30,52 @@ describe('ApolloServerBase construction', () => { ).not.toThrow(); }); + it('succeeds when passed a graphVariant in construction', () => { + let serverBase; + expect( + () => + new ApolloServerBase({ + typeDefs, + resolvers, + engine: { + graphVariant: 'foo', + apiKey: 'not:real:key', + }, + }).stop() + ).not.toThrow(); + }); + + it('spits out a deprecation warning when passed a schemaTag in construction', () => { + const spyConsoleWarn = jest.spyOn(console, 'warn').mockImplementation(); + expect( + () => + new ApolloServerBase({ + typeDefs, + resolvers, + engine: { + schemaTag: 'foo', + apiKey: 'not:real:key', + }, + }).stop() + ).not.toThrow(); + expect(spyConsoleWarn).toBeCalled(); + spyConsoleWarn.mockRestore(); + }); + + it('throws when passed a schemaTag and graphVariant in construction', () => { + expect( + () => + new ApolloServerBase({ + schema: buildServiceDefinition([{ typeDefs, resolvers }]).schema, + engine: { + schemaTag: 'foo', + graphVariant: 'heck', + apiKey: 'not:real:key', + }, + }), + ).toThrow(); + }); + it('throws when a GraphQLSchema is not provided to the schema configuration option', () => { expect(() => { new ApolloServerBase({ From fa42e36ff6601a7e7bd0b48fb4eb5ea9b6e71173 Mon Sep 17 00:00:00 2001 From: Michael Watson Date: Thu, 23 Apr 2020 08:02:58 -0700 Subject: [PATCH 456/642] deprecate ENGINE_API_KEY after introducing APOLLO_KEY (#3923) Co-authored-by: Adam Zionts Co-authored-by: Adam Zionts --- CHANGELOG.md | 2 + package-lock.json | 1 + packages/apollo-engine-reporting/src/agent.ts | 35 ++++++++++++-- packages/apollo-gateway/CHANGELOG.md | 4 +- .../apollo-server-core/src/ApolloServer.ts | 22 ++------- .../src/__tests__/ApolloServerBase.test.ts | 47 +++++++++++++++++++ 6 files changed, 88 insertions(+), 23 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2af3579f897..ccbbe7fac65 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,8 +6,10 @@ The version headers in this history reflect the versions of Apollo Server itself - [__CHANGELOG for `@apollo/federation`__](https://github.com/apollographql/apollo-server/blob/master/packages/apollo-federation/CHANGELOG.md) ### vNEXT + > 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. When a release is being prepared, a new header will be (manually) created below and the the appropriate changes within that release will be moved into the new section. +- `apollo-engine-reporting`: Deprecate the `ENGINE_API_KEY` environment variable in favor of its new name, `APOLLO_KEY`. Continued use of `ENGINE_API_KEY` will result in deprecation warnings and support for it will be removed in a future major version. [#3923](https://github.com/apollographql/apollo-server/pull/3923) - `apollo-engine-reporting`: Deprecated the `APOLLO_SCHEMA_TAG` environment variable in favor of its new name, `APOLLO_GRAPH_VARIANT`. Similarly, within the `engine` configuration object, the `schemaTag` property has been renamed `graphVariant`. The functionality remains otherwise unchanged, but their new names mirror the name used within Apollo Graph Manager. Continued use of the now-deprecated names will result in deprecation warnings and support will be dropped completely in the next "major" update. To avoid misconfiguration, a runtime error will be thrown if _both_ new and deprecated names are set. [PR #3855](https://github.com/apollographql/apollo-server/pull/3855) - Allow passing a `WebSocket.Server` to `ApolloServer.installSubscriptionHandlers`. [PR #2314](https://github.com/apollographql/apollo-server/pull/2314) diff --git a/package-lock.json b/package-lock.json index 4ea93fcb910..c6976be992c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6391,6 +6391,7 @@ "version": "file:packages/apollo-server-cloud-functions", "requires": { "@apollographql/graphql-playground-html": "1.6.24", + "apollo-engine-reporting": "file:packages/apollo-engine-reporting", "apollo-server-core": "file:packages/apollo-server-core", "apollo-server-env": "file:packages/apollo-server-env", "apollo-server-types": "file:packages/apollo-server-types", diff --git a/packages/apollo-engine-reporting/src/agent.ts b/packages/apollo-engine-reporting/src/agent.ts index 75a3d285711..dcac41dddfe 100644 --- a/packages/apollo-engine-reporting/src/agent.ts +++ b/packages/apollo-engine-reporting/src/agent.ts @@ -16,6 +16,8 @@ import { GraphQLRequestContext, Logger } from 'apollo-server-types'; import { InMemoryLRUCache } from 'apollo-server-caching'; import { defaultEngineReportingSignature } from 'apollo-graphql'; +let warnedOnDeprecatedApiKey = false; + export interface ClientInfo { clientName?: string; clientVersion?: string; @@ -45,7 +47,30 @@ export type GenerateClientInfo = ( requestContext: GraphQLRequestContext, ) => ClientInfo; -// AS3: Drop support for deprecated bits. +// AS3: Drop support for deprecated `ENGINE_API_KEY`. +export function getEngineApiKey( + {engine, skipWarn = false, logger= console }: + {engine: EngineReportingOptions | boolean | undefined, skipWarn?: boolean, logger?: Logger } + ) { + if (typeof engine === 'object') { + if (engine.apiKey) { + return engine.apiKey; + } + } + const legacyApiKeyFromEnv = process.env.ENGINE_API_KEY; + const apiKeyFromEnv = process.env.APOLLO_KEY; + + if(legacyApiKeyFromEnv && apiKeyFromEnv && !skipWarn) { + logger.warn(`Both ENGINE_API_KEY (deprecated) and APOLLO_KEY are set; defaulting to APOLLO_KEY.`); + } + if(legacyApiKeyFromEnv && !warnedOnDeprecatedApiKey && !skipWarn) { + logger.warn(`[deprecated] Setting the key via ENGINE_API_KEY is deprecated and will not be supported in future versions.`); + warnedOnDeprecatedApiKey = true; + } + return apiKeyFromEnv || legacyApiKeyFromEnv || '' +} + +// AS3: Drop support for deprecated `ENGINE_SCHEMA_TAG`. export function getEngineGraphVariant(engine: EngineReportingOptions | boolean | undefined, logger: Logger = console): string | undefined { if (engine === false) { return; @@ -242,9 +267,9 @@ const serviceHeaderDefaults = { // EngineReportingExtensions for each request and sends batches of trace reports // to the Engine server. export class EngineReportingAgent { - private options: EngineReportingOptions; + private readonly options: EngineReportingOptions; + private readonly apiKey: string; private logger: Logger = console; - private apiKey: string; private graphVariant: string; private reports: { [schemaHash: string]: FullTracesReport } = Object.create( null, @@ -262,12 +287,12 @@ export class EngineReportingAgent { public constructor(options: EngineReportingOptions = {}) { this.options = options; + this.apiKey = getEngineApiKey({engine: this.options, skipWarn: false, logger: this.logger}); if (options.logger) this.logger = options.logger; - this.apiKey = options.apiKey || process.env.ENGINE_API_KEY || ''; this.graphVariant = getEngineGraphVariant(options, this.logger) || ''; if (!this.apiKey) { throw new Error( - 'To use EngineReportingAgent, you must specify an API key via the apiKey option or the ENGINE_API_KEY environment variable.', + `To use EngineReportingAgent, you must specify an API key via the apiKey option or the APOLLO_KEY environment variable.`, ); } diff --git a/packages/apollo-gateway/CHANGELOG.md b/packages/apollo-gateway/CHANGELOG.md index e6f2dbfd589..bce2b5e9103 100644 --- a/packages/apollo-gateway/CHANGELOG.md +++ b/packages/apollo-gateway/CHANGELOG.md @@ -4,7 +4,8 @@ > 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. When a release is being prepared, a new header will be (manually) created below and the the appropriate changes within that release will be moved into the new section. -- Deprecated the `APOLLO_SCHEMA_TAG` environment variable in favor of its new name, `APOLLO_GRAPH_VARIANT`. The functionality remains otherwise identical, but the new name mirrors the name used within Apollo Graph Manager. Use of the now-deprecated name will result in a deprecation warning and support will be dropped completely in a future "major" update. To avoid misconfiguration, runtime errors will be thrown if the new and deprecated name are _both_ set. [#3855](https://github.com/apollographql/apollo-server/pull/3855) +- Deprecated the `ENGINE_API_KEY` environment variable in favor of its new name, `APOLLO_KEY`. Continued use of `ENGINE_API_KEY` will result in deprecation warnings being printed to the server console. Support for `ENGINE_API_KEY` will be removed in a future, major update. [#3923](https://github.com/apollographql/apollo-server/pull/3923) +- Deprecated the `APOLLO_SCHEMA_TAG` environment variable in favor of its new name, `APOLLO_GRAPH_VARIANT`. The functionality remains otherwise identical, but the new name mirrors the name used within Apollo Graph Manager. Use of the now-deprecated name will result in a deprecation warning being printed to the server console. Support will be removed entirely in a future, major update. To avoid misconfiguration, runtime errors will be thrown if the new and deprecated name are _both_ set. [#3855](https://github.com/apollographql/apollo-server/pull/3855) - Cache stringified representations of downstream query bodies within the query plan to address performance implications incurred by repeatedly `print`ing the same`DocumentNode`s with the `graphql` printer. This improvement is more pronounced on larger documents. [PR #4018](https://github.com/apollographql/apollo-server/pull/4018) - Add inadvertently excluded `apollo-server-errors` runtime dependency. [#3927](https://github.com/apollographql/apollo-server/pull/3927) @@ -29,6 +30,7 @@ - Implement retry logic for requests to GCS [PR #3836](https://github.com/apollographql/apollo-server/pull/3836) Note: coupled with this change is a small alteration in how the gateway polls GCS for updates in managed mode. Previously, the tick was on a specific interval. Now, every tick starts after the round of fetches to GCS completes. For more details, see the linked PR. - Gateway issues health checks to downstream services via `serviceHealthCheck` configuration option. Note: expected behavior differs between managed and unmanaged federation. See PR for new test cases and documentation. [#3930](https://github.com/apollographql/apollo-server/pull/3930) + ## 0.13.2 - __BREAKING__: The behavior and signature of `RemoteGraphQLDataSource`'s `didReceiveResponse` method has been changed. No changes are necessary _unless_ your implementation has overridden the default behavior of this method by either extending the class and overriding the method or by providing `didReceiveResponse` as a parameter to the `RemoteGraphQLDataSource`'s constructor options. Implementations which have provided their own `didReceiveResponse` using either of these methods should view the PR linked here for details on what has changed. [PR #3743](https://github.com/apollographql/apollo-server/pull/3743) diff --git a/packages/apollo-server-core/src/ApolloServer.ts b/packages/apollo-server-core/src/ApolloServer.ts index 67872846dfa..f5de66b3c20 100644 --- a/packages/apollo-server-core/src/ApolloServer.ts +++ b/packages/apollo-server-core/src/ApolloServer.ts @@ -71,7 +71,7 @@ import { import { Headers } from 'apollo-server-env'; import { buildServiceDefinition } from '@apollographql/apollo-tools'; -import {getEngineGraphVariant} from "apollo-engine-reporting/dist/agent"; +import { getEngineApiKey, getEngineGraphVariant } from "apollo-engine-reporting/dist/agent"; import { Logger } from "apollo-server-types"; const NoIntrospection = (context: ValidationContext) => ({ @@ -87,20 +87,8 @@ const NoIntrospection = (context: ValidationContext) => ({ }, }); -function getEngineApiKey(engine: Config['engine']): string | undefined { - const keyFromEnv = process.env.ENGINE_API_KEY || ''; - if (engine === false) { - return; - } else if (typeof engine === 'object' && engine.apiKey) { - return engine.apiKey; - } else if (keyFromEnv) { - return keyFromEnv; - } - return; -} - -function getEngineServiceId(engine: Config['engine']): string | undefined { - const engineApiKey = getEngineApiKey(engine); +function getEngineServiceId(engine: Config['engine'], logger: Logger): string | undefined { + const engineApiKey = getEngineApiKey({engine, skipWarn: true, logger} ); if (engineApiKey) { return engineApiKey.split(':', 2)[1]; } @@ -330,8 +318,8 @@ export class ApolloServerBase { // service ID from the API key for plugins which only needs service ID. // The truthiness of this value can also be used in other forks of logic // related to Engine, as is the case with EngineReportingAgent just below. - this.engineServiceId = getEngineServiceId(engine); - const apiKey = getEngineApiKey(engine); + this.engineServiceId = getEngineServiceId(engine, this.logger); + const apiKey = getEngineApiKey({engine, skipWarn: true, logger: this.logger}); if (apiKey) { this.engineApiKeyHash = createSHA('sha512') .update(apiKey) diff --git a/packages/apollo-server-core/src/__tests__/ApolloServerBase.test.ts b/packages/apollo-server-core/src/__tests__/ApolloServerBase.test.ts index fc6440092cc..52013e02fe6 100644 --- a/packages/apollo-server-core/src/__tests__/ApolloServerBase.test.ts +++ b/packages/apollo-server-core/src/__tests__/ApolloServerBase.test.ts @@ -94,3 +94,50 @@ describe('ApolloServerBase construction', () => { ); }); }); + +describe('environment variables', () => { + const OLD_ENV = process.env; + + beforeEach(() => { + jest.resetModules(); + process.env = { ...OLD_ENV }; + delete process.env.ENGINE_API_KEY; + delete process.env.APOLLO_KEY; + }); + + afterEach(() => { + process.env = OLD_ENV; + }); + + it('constructs a reporting agent with the ENGINE_API_KEY (deprecated) environment variable and warns', async () => { + // set the variables + process.env.ENGINE_API_KEY = 'just:fake:stuff'; + const spyConsoleWarn = jest.spyOn(console, 'warn').mockImplementation(); + + const server = new ApolloServerBase({ + typeDefs, + resolvers + }); + + await server.stop(); + expect(spyConsoleWarn).toHaveBeenCalledTimes(1); + spyConsoleWarn.mockReset(); + }); + + it('warns with both the legacy env var and new env var set', async () => { + // set the variables + process.env.ENGINE_API_KEY = 'just:fake:stuff'; + process.env.APOLLO_KEY = 'also:fake:stuff'; + const spyConsoleWarn = jest.spyOn(console, 'warn').mockImplementation(); + + const server = new ApolloServerBase({ + typeDefs, + resolvers + }); + + await server.stop(); + // Once for deprecation, once for double-set + expect(spyConsoleWarn).toHaveBeenCalledTimes(2); + spyConsoleWarn.mockReset(); + }); +}); From 0c73f3180a960ff5f94ea87466a7c5aab986a03e Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 23 Apr 2020 19:27:13 +0300 Subject: [PATCH 457/642] Release - apollo-cache-control@0.10.0-alpha.1 - apollo-datasource-rest@0.9.0-alpha.1 - apollo-engine-reporting-protobuf@0.5.0-alpha.1 - apollo-engine-reporting@1.8.0-alpha.1 - @apollo/federation@0.15.0-alpha.1 - @apollo/gateway@0.15.0-alpha.1 - apollo-server-azure-functions@2.13.0-alpha.1 - apollo-server-cloud-functions@2.13.0-alpha.1 - apollo-server-cloudflare@2.13.0-alpha.1 - apollo-server-core@2.13.0-alpha.1 - apollo-server-express@2.13.0-alpha.1 - apollo-server-fastify@2.13.0-alpha.1 - apollo-server-hapi@2.13.0-alpha.1 - apollo-server-integration-testsuite@2.13.0-alpha.1 - apollo-server-koa@2.13.0-alpha.1 - apollo-server-lambda@2.13.0-alpha.1 - apollo-server-micro@2.13.0-alpha.1 - apollo-server-plugin-base@0.8.0-alpha.1 - apollo-server-plugin-response-cache@0.5.0-alpha.1 - apollo-server-testing@2.13.0-alpha.1 - apollo-server-types@0.4.0-alpha.1 - apollo-server@2.13.0-alpha.1 - apollo-tracing@0.10.0-alpha.1 - graphql-extensions@0.12.0-alpha.1 --- packages/apollo-cache-control/package.json | 2 +- packages/apollo-datasource-rest/package.json | 2 +- packages/apollo-engine-reporting-protobuf/package-lock.json | 2 +- packages/apollo-engine-reporting-protobuf/package.json | 2 +- packages/apollo-engine-reporting/package.json | 2 +- packages/apollo-federation/package.json | 2 +- packages/apollo-gateway/package.json | 2 +- packages/apollo-server-azure-functions/package.json | 2 +- packages/apollo-server-cloud-functions/package.json | 2 +- packages/apollo-server-cloudflare/package.json | 2 +- packages/apollo-server-core/package.json | 2 +- packages/apollo-server-express/package.json | 2 +- packages/apollo-server-fastify/package.json | 2 +- packages/apollo-server-hapi/package.json | 2 +- packages/apollo-server-integration-testsuite/package.json | 2 +- packages/apollo-server-koa/package.json | 2 +- packages/apollo-server-lambda/package.json | 2 +- packages/apollo-server-micro/package.json | 2 +- packages/apollo-server-plugin-base/package.json | 2 +- packages/apollo-server-plugin-response-cache/package.json | 2 +- packages/apollo-server-testing/package.json | 2 +- packages/apollo-server-types/package.json | 2 +- packages/apollo-server/package.json | 2 +- packages/apollo-tracing/package.json | 2 +- packages/graphql-extensions/package.json | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/packages/apollo-cache-control/package.json b/packages/apollo-cache-control/package.json index a14de3e4b15..8b6b7b444b0 100644 --- a/packages/apollo-cache-control/package.json +++ b/packages/apollo-cache-control/package.json @@ -1,6 +1,6 @@ { "name": "apollo-cache-control", - "version": "0.10.0-alpha.0", + "version": "0.10.0-alpha.1", "description": "A GraphQL extension for cache control", "main": "./dist/index.js", "types": "./dist/index.d.ts", diff --git a/packages/apollo-datasource-rest/package.json b/packages/apollo-datasource-rest/package.json index 704b5874340..1a304e20930 100644 --- a/packages/apollo-datasource-rest/package.json +++ b/packages/apollo-datasource-rest/package.json @@ -1,6 +1,6 @@ { "name": "apollo-datasource-rest", - "version": "0.9.0-alpha.0", + "version": "0.9.0-alpha.1", "author": "opensource@apollographql.com", "license": "MIT", "repository": { diff --git a/packages/apollo-engine-reporting-protobuf/package-lock.json b/packages/apollo-engine-reporting-protobuf/package-lock.json index 9ccfb67a783..fbc3e9535a2 100644 --- a/packages/apollo-engine-reporting-protobuf/package-lock.json +++ b/packages/apollo-engine-reporting-protobuf/package-lock.json @@ -1,6 +1,6 @@ { "name": "apollo-engine-reporting-protobuf", - "version": "0.5.0-alpha.0", + "version": "0.5.0-alpha.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/packages/apollo-engine-reporting-protobuf/package.json b/packages/apollo-engine-reporting-protobuf/package.json index f724ec97560..21d224ef598 100644 --- a/packages/apollo-engine-reporting-protobuf/package.json +++ b/packages/apollo-engine-reporting-protobuf/package.json @@ -1,6 +1,6 @@ { "name": "apollo-engine-reporting-protobuf", - "version": "0.5.0-alpha.0", + "version": "0.5.0-alpha.1", "description": "Protobuf format for Apollo Engine", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-engine-reporting/package.json b/packages/apollo-engine-reporting/package.json index df8036f35cb..89543e29668 100644 --- a/packages/apollo-engine-reporting/package.json +++ b/packages/apollo-engine-reporting/package.json @@ -1,6 +1,6 @@ { "name": "apollo-engine-reporting", - "version": "1.8.0-alpha.0", + "version": "1.8.0-alpha.1", "description": "Send reports about your GraphQL services to Apollo Graph Manager (previously known as Apollo Engine)", "main": "./dist/index.js", "types": "./dist/index.d.ts", diff --git a/packages/apollo-federation/package.json b/packages/apollo-federation/package.json index a3729b6909a..2a8976b6e11 100644 --- a/packages/apollo-federation/package.json +++ b/packages/apollo-federation/package.json @@ -1,6 +1,6 @@ { "name": "@apollo/federation", - "version": "0.15.0-alpha.0", + "version": "0.15.0-alpha.1", "description": "Apollo Federation Utilities", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-gateway/package.json b/packages/apollo-gateway/package.json index ba375693db1..1f19b91e344 100644 --- a/packages/apollo-gateway/package.json +++ b/packages/apollo-gateway/package.json @@ -1,6 +1,6 @@ { "name": "@apollo/gateway", - "version": "0.15.0-alpha.0", + "version": "0.15.0-alpha.1", "description": "Apollo Gateway", "author": "opensource@apollographql.com", "main": "dist/index.js", diff --git a/packages/apollo-server-azure-functions/package.json b/packages/apollo-server-azure-functions/package.json index fe8a9dd0fb7..a5cc5e11401 100644 --- a/packages/apollo-server-azure-functions/package.json +++ b/packages/apollo-server-azure-functions/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-azure-functions", - "version": "2.13.0-alpha.0", + "version": "2.13.0-alpha.1", "description": "Production-ready Node.js GraphQL server for Azure Functions", "keywords": [ "GraphQL", diff --git a/packages/apollo-server-cloud-functions/package.json b/packages/apollo-server-cloud-functions/package.json index acd666fb18e..105ec5d8913 100644 --- a/packages/apollo-server-cloud-functions/package.json +++ b/packages/apollo-server-cloud-functions/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-cloud-functions", - "version": "2.13.0-alpha.0", + "version": "2.13.0-alpha.1", "description": "Production-ready Node.js GraphQL server for Google Cloud Functions", "keywords": [ "GraphQL", diff --git a/packages/apollo-server-cloudflare/package.json b/packages/apollo-server-cloudflare/package.json index fed35d9c09d..d8cd2ebac98 100644 --- a/packages/apollo-server-cloudflare/package.json +++ b/packages/apollo-server-cloudflare/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-cloudflare", - "version": "2.13.0-alpha.0", + "version": "2.13.0-alpha.1", "description": "Production-ready Node.js GraphQL server for Cloudflare workers", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-core/package.json b/packages/apollo-server-core/package.json index ea5cd40b910..6452e8cf97c 100644 --- a/packages/apollo-server-core/package.json +++ b/packages/apollo-server-core/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-core", - "version": "2.13.0-alpha.0", + "version": "2.13.0-alpha.1", "description": "Core engine for Apollo GraphQL server", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-express/package.json b/packages/apollo-server-express/package.json index 7c0fa05eded..d05270a6f36 100644 --- a/packages/apollo-server-express/package.json +++ b/packages/apollo-server-express/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-express", - "version": "2.13.0-alpha.0", + "version": "2.13.0-alpha.1", "description": "Production-ready Node.js GraphQL server for Express and Connect", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-fastify/package.json b/packages/apollo-server-fastify/package.json index cdb8b55ed66..728fa980da3 100644 --- a/packages/apollo-server-fastify/package.json +++ b/packages/apollo-server-fastify/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-fastify", - "version": "2.13.0-alpha.0", + "version": "2.13.0-alpha.1", "description": "Production-ready Node.js GraphQL server for Fastify", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-hapi/package.json b/packages/apollo-server-hapi/package.json index 2ca383df716..b147765fc98 100644 --- a/packages/apollo-server-hapi/package.json +++ b/packages/apollo-server-hapi/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-hapi", - "version": "2.13.0-alpha.0", + "version": "2.13.0-alpha.1", "description": "Production-ready Node.js GraphQL server for Hapi", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-integration-testsuite/package.json b/packages/apollo-server-integration-testsuite/package.json index 0e96cb4ae8f..12987b6ee66 100644 --- a/packages/apollo-server-integration-testsuite/package.json +++ b/packages/apollo-server-integration-testsuite/package.json @@ -1,7 +1,7 @@ { "name": "apollo-server-integration-testsuite", "private": true, - "version": "2.13.0-alpha.0", + "version": "2.13.0-alpha.1", "description": "Apollo Server Integrations testsuite", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-koa/package.json b/packages/apollo-server-koa/package.json index 1ebdffedfbc..479541cdf92 100644 --- a/packages/apollo-server-koa/package.json +++ b/packages/apollo-server-koa/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-koa", - "version": "2.13.0-alpha.0", + "version": "2.13.0-alpha.1", "description": "Production-ready Node.js GraphQL server for Koa", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-lambda/package.json b/packages/apollo-server-lambda/package.json index a61246cfd72..8e4c51d0095 100644 --- a/packages/apollo-server-lambda/package.json +++ b/packages/apollo-server-lambda/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-lambda", - "version": "2.13.0-alpha.0", + "version": "2.13.0-alpha.1", "description": "Production-ready Node.js GraphQL server for AWS Lambda", "keywords": [ "GraphQL", diff --git a/packages/apollo-server-micro/package.json b/packages/apollo-server-micro/package.json index 1bff9664b56..f708dd7f602 100644 --- a/packages/apollo-server-micro/package.json +++ b/packages/apollo-server-micro/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-micro", - "version": "2.13.0-alpha.0", + "version": "2.13.0-alpha.1", "description": "Production-ready Node.js GraphQL server for Micro", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-plugin-base/package.json b/packages/apollo-server-plugin-base/package.json index 8d92d6f4170..f4cf9e7c178 100644 --- a/packages/apollo-server-plugin-base/package.json +++ b/packages/apollo-server-plugin-base/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-plugin-base", - "version": "0.8.0-alpha.0", + "version": "0.8.0-alpha.1", "description": "Apollo Server plugin base classes", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-plugin-response-cache/package.json b/packages/apollo-server-plugin-response-cache/package.json index 5884edb1b71..7359779f548 100644 --- a/packages/apollo-server-plugin-response-cache/package.json +++ b/packages/apollo-server-plugin-response-cache/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-plugin-response-cache", - "version": "0.5.0-alpha.0", + "version": "0.5.0-alpha.1", "description": "Apollo Server full query response cache", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-testing/package.json b/packages/apollo-server-testing/package.json index a0d8e72d84d..e94f64cb4c8 100644 --- a/packages/apollo-server-testing/package.json +++ b/packages/apollo-server-testing/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-testing", - "version": "2.13.0-alpha.0", + "version": "2.13.0-alpha.1", "description": "Test utils for apollo-server", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-types/package.json b/packages/apollo-server-types/package.json index 0b00970488d..05e60912a6e 100644 --- a/packages/apollo-server-types/package.json +++ b/packages/apollo-server-types/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-types", - "version": "0.4.0-alpha.0", + "version": "0.4.0-alpha.1", "description": "Apollo Server shared types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server/package.json b/packages/apollo-server/package.json index 5669ad553a3..f117aac3c58 100644 --- a/packages/apollo-server/package.json +++ b/packages/apollo-server/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server", - "version": "2.13.0-alpha.0", + "version": "2.13.0-alpha.1", "description": "Production ready GraphQL Server", "author": "opensource@apollographql.com", "main": "dist/index.js", diff --git a/packages/apollo-tracing/package.json b/packages/apollo-tracing/package.json index 6fe6e4434d9..e658f153fa8 100644 --- a/packages/apollo-tracing/package.json +++ b/packages/apollo-tracing/package.json @@ -1,6 +1,6 @@ { "name": "apollo-tracing", - "version": "0.10.0-alpha.0", + "version": "0.10.0-alpha.1", "description": "Collect and expose trace data for GraphQL requests", "main": "./dist/index.js", "types": "./dist/index.d.ts", diff --git a/packages/graphql-extensions/package.json b/packages/graphql-extensions/package.json index 137b8a44d3b..269094c00f2 100644 --- a/packages/graphql-extensions/package.json +++ b/packages/graphql-extensions/package.json @@ -1,6 +1,6 @@ { "name": "graphql-extensions", - "version": "0.12.0-alpha.0", + "version": "0.12.0-alpha.1", "description": "Add extensions to GraphQL servers", "main": "./dist/index.js", "types": "./dist/index.d.ts", From 7f2e019feaad1e668ed7f7dff6940319c3d46e63 Mon Sep 17 00:00:00 2001 From: Blake Jackson Date: Thu, 23 Apr 2020 18:23:58 -0500 Subject: [PATCH 458/642] Updated tests. --- .../__tests__/integration/requires.test.ts | 389 +++++++++++------- 1 file changed, 240 insertions(+), 149 deletions(-) diff --git a/packages/apollo-gateway/src/__tests__/integration/requires.test.ts b/packages/apollo-gateway/src/__tests__/integration/requires.test.ts index 3d1644617bd..ce10770745c 100644 --- a/packages/apollo-gateway/src/__tests__/integration/requires.test.ts +++ b/packages/apollo-gateway/src/__tests__/integration/requires.test.ts @@ -53,193 +53,284 @@ it('supports passing additional scalar fields defined by a requires', async () = }); -const publisherService: ServiceDefinitionModule = { - name: 'publisher', + + + +const serviceA: ServiceDefinitionModule = { + name: 'serviceA', typeDefs: gql` - type Publisher { + type Query { + me: A + } + type A @key(fields: "id") { id: ID! name: String! + nested1: Nested1! + nested2: Nested2! + nested3: Nested3! } - - extend type User @key(fields: "id") { - id: ID! @external - organization: Organization! @external - publisher: Publisher! @requires(fields: "organization { name address { country } }") - publisherCity: String! @requires(fields: "organization { address { city coordinates { type value }}}") + type Nested1 { + nameA: String! + nameB: String! + nested2: Nested2 } - - type Organization { - name: String! - address: Address + type Nested2 { + nameA: String! + nameB: String! + nameC: String! + nameD: String! + nested3: [Nested3!]! } - - type Address { - city: String! - country: String! - coordinates: [Coordinate!]! + type Nested3 { + nameA: String! + nameB: String! + nameC: String! + nameD: String! + nameE: String! + nested4: Nested4! } - - type Coordinate { - type: CoordinateType! - value: Float! + type Nested4 @key(fields: "id") { + id: ID! + nameA: String! + nameB: String! + nameC: String! + nested5: Nested5! } - - enum CoordinateType { - LATITUDE - LONGITUDE + type Nested5 { + id: ID! + nameA: String! + nameB: String! } `, resolvers: { - User: { - publisher(user) { + Query: { + me() { return { - id: 1, - name: user.organization.name + ' ' + user.organization.address.country, + id: '1', + name: 'name', + nested1: { + nameA: "nested1.nameA", + nameB: "nested1.nameB", + nested2: { + nameA: "nested1.nested2.nameA", + nameB: "nested1.nested2.nameB", + nameC: "nested1.nested2.nameC", + nameD: "nested1.nested2.nameD", + nested3: { + nameA: "nested1.nested2.nested3.nameA", + nameB: "nested1.nested2.nested3.nameB", + nameC: "nested1.nested2.nested3.nameC", + nameD: "nested1.nested2.nested3.nameD", + nameE: "nested1.nested2.nested3.nameE", + nested4: { + nameA: "nested1.nested2.nested3.nested4.nameA", + nameB: "nested1.nested2.nested3.nested4.nameB", + nameD: "nested1.nested2.nested3.nested4.nameC", + nested5: { + nameA: "nested1.nested2.nested3.nested4.nested5.nameA", + nameB: "nested1.nested2.nested3.nested4.nested5.nameB", + } + } + } + } + }, + nested2: { + nameA: "nested2.nameA", + nameB: "nested2.nameB", + nameC: "nested2.nameC", + nameD: "nested2.nameD", + nested3: { + nameA: "nested2.nested3.nameA", + nameB: "nested2.nested3.nameB", + nameC: "nested2.nested3.nameC", + nameD: "nested2.nested3.nameD", + nameE: "nested2.nested3.nameE", + nested4: { + nameA: "nested2.nested3.nested4.nameA", + nameB: "nested2.nested3.nested4.nameB", + nameC: "nested2.nested3.nested4.nameC", + nested5: { + nameA: "nested2.nested3.nested4.nested5.nameA", + nameB: "nested2.nested3.nested4.nested5.nameB", + } + } + } + }, + nested3: { + nameA: "nested3.nameA", + nameB: "nested3.nameB", + nameC: "nested3.nameC", + nameD: "nested3.nameD", + nameE: "nested3.nameE", + nested4: { + nameA: "nested3.nested4.nameA", + nameB: "nested3.nested4.nameB", + nameC: "nested3.nested4.nameC", + nested5: { + nameA: "nested3.nested4.nested5.nameA", + nameB: "nested3.nested4.nested5.nameB", + } + } + } } - }, - publisherCity(user) { - return user.organization.address.city + ' ' + user.organization.address.coordinates.map((coordinate: any) => coordinate.value).join(' '); - }, - }, + } + } }, }; -const userService: ServiceDefinitionModule = { - name: 'user', +const serviceB: ServiceDefinitionModule = { + name: 'serviceB', typeDefs: gql` - type Query { - me: User + extend type A @key(fields: "id") { + id: ID! @external + nested1: Nested1! @external + nested2: Nested2! @external + nested3: Nested3! @external + calculated1: String! @requires(fields: "nested1 { nameA nested2 { nameA } }") + calculated2: String! @requires(fields: "nested1 { nameB nested2 { nameB nested3 { nameA } } }") + calculated3: String! @requires(fields: "nested1 { nested2 { nested3 { nameB } } } nested2 { nameC nested3 { nameC } }") + calculated4: String! @requires(fields: "nested2 { nameD nested3 { nameD nested4 { nameA } } }") + calculated5: String! @requires(fields: "nested2 { nested3 { nested4 { nameB nested5 { nameA nameB } } } } nested3 { nameE nested4 { nameC } }") } - - type User @key(fields: "id") { - id: ID! - name: String! - organization: Organization! + type Nested1 { + nameA: String! + nameB: String! + nested2: Nested2 } - - type Organization { - name: String! - address: Address + type Nested2 { + nameA: String! + nameB: String! + nameC: String! + nameD: String! + nested3: [Nested3!]! } - - type Address { - city: String! - country: String! - coordinates: [Coordinate!]! + type Nested3 { + nameA: String! + nameB: String! + nameC: String! + nameD: String! + nameE: String! + nested4: Nested4! } - - type Coordinate { - type: CoordinateType! - value: Float! + extend type Nested4 @key(fields: "id") { + id: ID! @external + nameA: String! @external + nameB: String! @external + nameC: String! @external + nested5: Nested5! @external } - - enum CoordinateType { - LATITUDE - LONGITUDE + type Nested5 { + id: ID! + nameA: String! + nameB: String! } `, resolvers: { - Query: { - me() { - return { - id: 'abc', - name: 'meme', - organization: { - name: 'org 1', - address: { - city: 'New York', - country: 'USA', - coordinates: [ - {type: 'LATITUDE', value: 123}, - {type: 'LONGITUDE', value: 321}, - ] - } - } - } - } - } + A: { + calculated1(parent) { + return parent.nested1.nameA + ' ' + parent.nested1.nested2.nameA; + }, + calculated2(parent) { + return parent.nested1.nameB + ' ' + parent.nested1.nested2.nameB + ' ' + parent.nested1.nested2.nested3.nameA; + }, + calculated3(parent) { + return parent.nested1.nested2.nested3.nameB + ' ' + parent.nested2.nameC + ' ' + parent.nested2.nested3.nameC; + }, + calculated4(parent) { + return parent.nested2.nameD + ' ' + parent.nested2.nested3.nameD + ' ' + parent.nested2.nested3.nested4.nameA; + }, + calculated5(parent) { + return parent.nested2.nested3.nested4.nameB + ' ' + + parent.nested2.nested3.nested4.nested5.nameA + ' ' + + parent.nested2.nested3.nested4.nested5.nameB + ' ' + + parent.nested3.nameA + ' ' + + parent.nested3.nested4.nameC; + }, + }, }, }; -it('supports passing additional deeply nested fields defined by a requires', async () => { + + +it('supports multiple arbitrarily nested fields defined by a requires', async () => { const query = gql` query Me { me { name - publisher { - id - name - } - publisherCity + calculated1 + calculated2 + calculated3 + calculated4 + calculated5 } } `; - const { data, queryPlan } = await execute([userService, publisherService], { + const { data, queryPlan } = await execute([serviceA, serviceB], { query, }); console.log(data); - expect(queryPlan).toMatchInlineSnapshot(` - QueryPlan { - Sequence { - Fetch(service: "user") { - { - me { - name - __typename - id - organization { - name - address { - country - city - city - coordinates { - type - value - type - value - } - } - } - } - } - }, - Flatten(path: "me") { - Fetch(service: "publisher") { - { - ... on User { - __typename - id - organization { - name - address { - country - city - city - coordinates { - type - value - type - value - } - } - } - } - } => - { - ... on User { - publisher { - id - name - } - publisherCity - } - } - }, - }, - }, - } - `); + // expect(queryPlan).toMatchInlineSnapshot(` + // QueryPlan { + // Sequence { + // Fetch(service: "user") { + // { + // me { + // name + // __typename + // id + // organization { + // name + // address { + // country + // city + // city + // coordinates { + // type + // value + // type + // value + // } + // } + // } + // } + // } + // }, + // Flatten(path: "me") { + // Fetch(service: "publisher") { + // { + // ... on User { + // __typename + // id + // organization { + // name + // address { + // country + // city + // city + // coordinates { + // type + // value + // type + // value + // } + // } + // } + // } + // } => + // { + // ... on User { + // publisher { + // id + // name + // } + // publisherCity + // } + // } + // }, + // }, + // }, + // } + // `); }); From 5a1d41247d324d2af0fea970afe8201ed6fbb634 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 25 Apr 2020 08:12:28 +0000 Subject: [PATCH 459/642] chore(deps): update dependency @types/aws-lambda to v8.10.51 (#4034) Co-authored-by: Renovate Bot --- package-lock.json | 7 +++---- package.json | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index c6976be992c..c74090044f5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5363,9 +5363,9 @@ } }, "@types/aws-lambda": { - "version": "8.10.50", - "resolved": "https://registry.npmjs.org/@types/aws-lambda/-/aws-lambda-8.10.50.tgz", - "integrity": "sha512-RDzmQ5mO1f0BViKiuOudENZmoCACEa461nTRVtxhsAiEqGCgwdhCYN0aFgk42X5+ELAiqJKbv2mK0LkopYRYQg==" + "version": "8.10.51", + "resolved": "https://registry.npmjs.org/@types/aws-lambda/-/aws-lambda-8.10.51.tgz", + "integrity": "sha512-XK7RerpXj4r+IO0r7qIeNqUSU6L4qhPMwNhISxozJJiUX/jdXj9WYzTShRVisEcUQHXgJ4TTBqTArM8f9Mjb8g==" }, "@types/babel__core": { "version": "7.1.7", @@ -6391,7 +6391,6 @@ "version": "file:packages/apollo-server-cloud-functions", "requires": { "@apollographql/graphql-playground-html": "1.6.24", - "apollo-engine-reporting": "file:packages/apollo-engine-reporting", "apollo-server-core": "file:packages/apollo-server-core", "apollo-server-env": "file:packages/apollo-server-env", "apollo-server-types": "file:packages/apollo-server-types", diff --git a/package.json b/package.json index 701ef50f356..ded65d3923c 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ }, "devDependencies": { "@types/async-retry": "1.4.1", - "@types/aws-lambda": "8.10.50", + "@types/aws-lambda": "8.10.51", "@types/body-parser": "1.19.0", "@types/bunyan": "1.8.6", "@types/connect": "3.4.33", From f884cfe1d8d50a638693321b2aee5f5c898437d2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 25 Apr 2020 10:11:10 +0000 Subject: [PATCH 460/642] chore(deps): update dependency gatsby to v2.20.35 (#4035) Co-authored-by: Renovate Bot --- docs/package-lock.json | 648 ++++++++++++++++++++++++++++++++--------- docs/package.json | 2 +- 2 files changed, 504 insertions(+), 146 deletions(-) diff --git a/docs/package-lock.json b/docs/package-lock.json index ab4cfed2bae..3b598b4668d 100644 --- a/docs/package-lock.json +++ b/docs/package-lock.json @@ -2499,9 +2499,9 @@ } }, "@jest/types": { - "version": "25.3.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.3.0.tgz", - "integrity": "sha512-UkaDNewdqXAmCDbN2GlUM6amDKS78eCqiw/UmF5nE0mmLTd6moJkiZJML/X52Ke3LH7Swhw883IRXq8o9nWjVw==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.4.0.tgz", + "integrity": "sha512-XBeaWNzw2PPnGW5aXvZt3+VO60M+34RY3XDsCK5tW7kyj3RK0XClRutCfjqcBuaR2aBQTbluEDME9b5MB9UAPw==", "requires": { "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^1.1.1", @@ -2604,13 +2604,350 @@ "integrity": "sha512-L3rehITVxqDHOPJFGBSHKt3Mv/p3MENYlGIwLNYU89/iVqTLMD/vz8hL9RQtKqRoMbKuWpzzLlKIObqJzthNYg==" }, "@mdx-js/runtime": { - "version": "1.5.8", - "resolved": "https://registry.npmjs.org/@mdx-js/runtime/-/runtime-1.5.8.tgz", - "integrity": "sha512-eiF6IOv8+FuUp1Eit5hRiteZ658EtZtqTc1hJ0V9pgBqmT0DswiD/8h1M5+kWItWOtNbvc6Cz7oHMHD3PrfAzA==", + "version": "1.5.9", + "resolved": "https://registry.npmjs.org/@mdx-js/runtime/-/runtime-1.5.9.tgz", + "integrity": "sha512-h6nkjaRPXe9uNnXBObxxqHguOcXacpWqoBke5NJDPiDdaBlSl5RYG0JziKbgmJFRNEn2RkQlk/YPT46BghB7Fw==", "requires": { - "@mdx-js/mdx": "^1.5.8", - "@mdx-js/react": "^1.5.8", + "@mdx-js/mdx": "^1.5.9", + "@mdx-js/react": "^1.5.9", "buble-jsx-only": "^0.19.8" + }, + "dependencies": { + "@babel/code-frame": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", + "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", + "requires": { + "@babel/highlight": "^7.8.3" + } + }, + "@babel/core": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.0.tgz", + "integrity": "sha512-kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==", + "requires": { + "@babel/code-frame": "^7.8.3", + "@babel/generator": "^7.9.0", + "@babel/helper-module-transforms": "^7.9.0", + "@babel/helpers": "^7.9.0", + "@babel/parser": "^7.9.0", + "@babel/template": "^7.8.6", + "@babel/traverse": "^7.9.0", + "@babel/types": "^7.9.0", + "convert-source-map": "^1.7.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.1", + "json5": "^2.1.2", + "lodash": "^4.17.13", + "resolve": "^1.3.2", + "semver": "^5.4.1", + "source-map": "^0.5.0" + } + }, + "@babel/generator": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.5.tgz", + "integrity": "sha512-GbNIxVB3ZJe3tLeDm1HSn2AhuD/mVcyLDpgtLXa5tplmWrJdF/elxB56XNqCuD6szyNkDi6wuoKXln3QeBmCHQ==", + "requires": { + "@babel/types": "^7.9.5", + "jsesc": "^2.5.1", + "lodash": "^4.17.13", + "source-map": "^0.5.0" + } + }, + "@babel/helper-function-name": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz", + "integrity": "sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==", + "requires": { + "@babel/helper-get-function-arity": "^7.8.3", + "@babel/template": "^7.8.3", + "@babel/types": "^7.9.5" + } + }, + "@babel/helper-plugin-utils": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", + "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" + }, + "@babel/highlight": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz", + "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==", + "requires": { + "@babel/helper-validator-identifier": "^7.9.0", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" + } + }, + "@babel/parser": { + "version": "7.9.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz", + "integrity": "sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==" + }, + "@babel/plugin-proposal-object-rest-spread": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.5.tgz", + "integrity": "sha512-VP2oXvAf7KCYTthbUHwBlewbl1Iq059f6seJGsxMizaCdgHIeczOr7FBqELhSqfkIl04Fi8okzWzl63UKbQmmg==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.3", + "@babel/plugin-syntax-object-rest-spread": "^7.8.0", + "@babel/plugin-transform-parameters": "^7.9.5" + } + }, + "@babel/plugin-transform-parameters": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.9.5.tgz", + "integrity": "sha512-0+1FhHnMfj6lIIhVvS4KGQJeuhe1GI//h5uptK4PvLt+BGBxsoUJbd3/IW002yk//6sZPlFgsG1hY6OHLcy6kA==", + "requires": { + "@babel/helper-get-function-arity": "^7.8.3", + "@babel/helper-plugin-utils": "^7.8.3" + } + }, + "@babel/template": { + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz", + "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==", + "requires": { + "@babel/code-frame": "^7.8.3", + "@babel/parser": "^7.8.6", + "@babel/types": "^7.8.6" + } + }, + "@babel/traverse": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.5.tgz", + "integrity": "sha512-c4gH3jsvSuGUezlP6rzSJ6jf8fYjLj3hsMZRx/nX0h+fmHN0w+ekubRrHPqnMec0meycA2nwCsJ7dC8IPem2FQ==", + "requires": { + "@babel/code-frame": "^7.8.3", + "@babel/generator": "^7.9.5", + "@babel/helper-function-name": "^7.9.5", + "@babel/helper-split-export-declaration": "^7.8.3", + "@babel/parser": "^7.9.0", + "@babel/types": "^7.9.5", + "debug": "^4.1.0", + "globals": "^11.1.0", + "lodash": "^4.17.13" + } + }, + "@babel/types": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.5.tgz", + "integrity": "sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==", + "requires": { + "@babel/helper-validator-identifier": "^7.9.5", + "lodash": "^4.17.13", + "to-fast-properties": "^2.0.0" + }, + "dependencies": { + "@babel/helper-validator-identifier": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz", + "integrity": "sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==" + } + } + }, + "@mdx-js/mdx": { + "version": "1.5.9", + "resolved": "https://registry.npmjs.org/@mdx-js/mdx/-/mdx-1.5.9.tgz", + "integrity": "sha512-K/qYIWwV5+V1ChVHga3ZzXlXtEuNsBOt/QI54K+DvD4ayu9WdbBv/953JdC2ZPrHQek48WIbKBH27omZPA6ZPA==", + "requires": { + "@babel/core": "7.9.0", + "@babel/plugin-syntax-jsx": "7.8.3", + "@babel/plugin-syntax-object-rest-spread": "7.8.3", + "@mdx-js/util": "^1.5.9", + "babel-plugin-apply-mdx-type-prop": "^1.5.9", + "babel-plugin-extract-import-names": "^1.5.9", + "camelcase-css": "2.0.1", + "detab": "2.0.3", + "hast-util-raw": "5.0.2", + "lodash.uniq": "4.5.0", + "mdast-util-to-hast": "8.2.0", + "remark-footnotes": "1.0.0", + "remark-mdx": "^1.5.9", + "remark-parse": "8.0.1", + "remark-squeeze-paragraphs": "4.0.0", + "style-to-object": "0.3.0", + "unified": "9.0.0", + "unist-builder": "2.0.3", + "unist-util-visit": "2.0.2" + } + }, + "@mdx-js/react": { + "version": "1.5.9", + "resolved": "https://registry.npmjs.org/@mdx-js/react/-/react-1.5.9.tgz", + "integrity": "sha512-rengdUSedIdIQbXPSeafItCacTYocARAjUA51b6R1KNHmz+59efz7UmyTKr73viJQZ98ouu7iRGmOTtjRrbbWA==" + }, + "@mdx-js/util": { + "version": "1.5.9", + "resolved": "https://registry.npmjs.org/@mdx-js/util/-/util-1.5.9.tgz", + "integrity": "sha512-hty9ftw/RENS+6pEXTy4vi46CO7cDRdhcELxCaklcGTuxeqi9OROJ+oi03RJd2O2V+3wY5geGAdXKlPQCOTE/Q==" + }, + "babel-plugin-apply-mdx-type-prop": { + "version": "1.5.9", + "resolved": "https://registry.npmjs.org/babel-plugin-apply-mdx-type-prop/-/babel-plugin-apply-mdx-type-prop-1.5.9.tgz", + "integrity": "sha512-3uNQ4Zo/TjOaB0E98m6ez2Xfrb7IYAs5BB4b8zQXggPCCppg5kjQEe8AglH6F6b94+q7Qv/cNTnoNqGXs6RBEA==", + "requires": { + "@babel/helper-plugin-utils": "7.8.3", + "@mdx-js/util": "^1.5.9" + } + }, + "babel-plugin-extract-import-names": { + "version": "1.5.9", + "resolved": "https://registry.npmjs.org/babel-plugin-extract-import-names/-/babel-plugin-extract-import-names-1.5.9.tgz", + "integrity": "sha512-0V3/VJClG/pUn7wnlmWByJdhJklZWD4XvR9P+Q7wDWs9kS48lmmB5Pp6+zvbTBBQGlqJB5/bBtwMRm4zdoPNzg==", + "requires": { + "@babel/helper-plugin-utils": "7.8.3" + } + }, + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "requires": { + "ms": "^2.1.1" + } + }, + "is-buffer": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz", + "integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==" + }, + "is-plain-obj": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", + "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==" + }, + "mdast-squeeze-paragraphs": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/mdast-squeeze-paragraphs/-/mdast-squeeze-paragraphs-4.0.0.tgz", + "integrity": "sha512-zxdPn69hkQ1rm4J+2Cs2j6wDEv7O17TfXTJ33tl/+JPIoEmtV9t2ZzBM5LPHE8QlHsmVD8t3vPKCyY3oH+H8MQ==", + "requires": { + "unist-util-remove": "^2.0.0" + } + }, + "mdast-util-definitions": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/mdast-util-definitions/-/mdast-util-definitions-2.0.1.tgz", + "integrity": "sha512-Co+DQ6oZlUzvUR7JCpP249PcexxygiaKk9axJh+eRzHDZJk2julbIdKB4PXHVxdBuLzvJ1Izb+YDpj2deGMOuA==", + "requires": { + "unist-util-visit": "^2.0.0" + } + }, + "mdast-util-to-hast": { + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-8.2.0.tgz", + "integrity": "sha512-WjH/KXtqU66XyTJQ7tg7sjvTw1OQcVV0hKdFh3BgHPwZ96fSBCQ/NitEHsN70Mmnggt+5eUUC7pCnK+2qGQnCA==", + "requires": { + "collapse-white-space": "^1.0.0", + "detab": "^2.0.0", + "mdast-util-definitions": "^2.0.0", + "mdurl": "^1.0.0", + "trim-lines": "^1.0.0", + "unist-builder": "^2.0.0", + "unist-util-generated": "^1.0.0", + "unist-util-position": "^3.0.0", + "unist-util-visit": "^2.0.0" + } + }, + "parse-entities": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-2.0.0.tgz", + "integrity": "sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==", + "requires": { + "character-entities": "^1.0.0", + "character-entities-legacy": "^1.0.0", + "character-reference-invalid": "^1.0.0", + "is-alphanumerical": "^1.0.0", + "is-decimal": "^1.0.0", + "is-hexadecimal": "^1.0.0" + } + }, + "remark-mdx": { + "version": "1.5.9", + "resolved": "https://registry.npmjs.org/remark-mdx/-/remark-mdx-1.5.9.tgz", + "integrity": "sha512-HFr/VOVoJ2lnZsN090wttFTcqXIker49S5JT3Tem8SKMeQoRA9Pl+iIlEOZau+C9w6ISZj79l6nwzrflAa5VDA==", + "requires": { + "@babel/core": "7.9.0", + "@babel/helper-plugin-utils": "7.8.3", + "@babel/plugin-proposal-object-rest-spread": "7.9.5", + "@babel/plugin-syntax-jsx": "7.8.3", + "@mdx-js/util": "^1.5.9", + "is-alphabetical": "1.0.4", + "remark-parse": "8.0.1", + "unified": "9.0.0" + } + }, + "remark-parse": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-8.0.1.tgz", + "integrity": "sha512-Ye/5W57tdQZWsfkuVyRq9SUWRgECHnDsMuyUMzdSKpTbNPkZeGtoYfsrkeSi4+Xyl0mhcPPddHITXPcCPHrl3w==", + "requires": { + "ccount": "^1.0.0", + "collapse-white-space": "^1.0.2", + "is-alphabetical": "^1.0.0", + "is-decimal": "^1.0.0", + "is-whitespace-character": "^1.0.0", + "is-word-character": "^1.0.0", + "markdown-escapes": "^1.0.0", + "parse-entities": "^2.0.0", + "repeat-string": "^1.5.4", + "state-toggle": "^1.0.0", + "trim": "0.0.1", + "trim-trailing-lines": "^1.0.0", + "unherit": "^1.0.4", + "unist-util-remove-position": "^2.0.0", + "vfile-location": "^3.0.0", + "xtend": "^4.0.1" + } + }, + "remark-squeeze-paragraphs": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/remark-squeeze-paragraphs/-/remark-squeeze-paragraphs-4.0.0.tgz", + "integrity": "sha512-8qRqmL9F4nuLPIgl92XUuxI3pFxize+F1H0e/W3llTk0UsjJaj01+RrirkMw7P21RKe4X6goQhYRSvNWX+70Rw==", + "requires": { + "mdast-squeeze-paragraphs": "^4.0.0" + } + }, + "unified": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/unified/-/unified-9.0.0.tgz", + "integrity": "sha512-ssFo33gljU3PdlWLjNp15Inqb77d6JnJSfyplGJPT/a+fNRNyCBeveBAYJdO5khKdF6WVHa/yYCC7Xl6BDwZUQ==", + "requires": { + "bail": "^1.0.0", + "extend": "^3.0.0", + "is-buffer": "^2.0.0", + "is-plain-obj": "^2.0.0", + "trough": "^1.0.0", + "vfile": "^4.0.0" + } + }, + "unist-util-is": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.0.2.tgz", + "integrity": "sha512-Ofx8uf6haexJwI1gxWMGg6I/dLnF2yE+KibhD3/diOqY2TinLcqHXCV6OI5gFVn3xQqDH+u0M625pfKwIwgBKQ==" + }, + "unist-util-remove": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/unist-util-remove/-/unist-util-remove-2.0.0.tgz", + "integrity": "sha512-HwwWyNHKkeg/eXRnE11IpzY8JT55JNM1YCwwU9YNCnfzk6s8GhPXrVBBZWiwLeATJbI7euvoGSzcy9M29UeW3g==", + "requires": { + "unist-util-is": "^4.0.0" + } + }, + "unist-util-remove-position": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-2.0.1.tgz", + "integrity": "sha512-fDZsLYIe2uT+oGFnuZmy73K6ZxOPG/Qcm+w7jbEjaFcJgbQ6cqjs/eSPzXhsmGpAsWPkqZM9pYjww5QTn3LHMA==", + "requires": { + "unist-util-visit": "^2.0.0" + } + }, + "vfile-location": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/vfile-location/-/vfile-location-3.0.1.tgz", + "integrity": "sha512-yYBO06eeN/Ki6Kh1QAkgzYpWT1d3Qln+ZCtSbJqFExPl1S3y2qqotJQXoh6qEvl/jDlgpUJolBn3PItVnnZRqQ==" + } } }, "@mdx-js/util": { @@ -3127,42 +3464,42 @@ "optional": true }, "@typescript-eslint/eslint-plugin": { - "version": "2.28.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.28.0.tgz", - "integrity": "sha512-w0Ugcq2iatloEabQP56BRWJowliXUP5Wv6f9fKzjJmDW81hOTBxRoJ4LoEOxRpz9gcY51Libytd2ba3yLmSOfg==", + "version": "2.29.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.29.0.tgz", + "integrity": "sha512-X/YAY7azKirENm4QRpT7OVmzok02cSkqeIcLmdz6gXUQG4Hk0Fi9oBAynSAyNXeGdMRuZvjBa0c1Lu0dn/u6VA==", "requires": { - "@typescript-eslint/experimental-utils": "2.28.0", + "@typescript-eslint/experimental-utils": "2.29.0", "functional-red-black-tree": "^1.0.1", "regexpp": "^3.0.0", "tsutils": "^3.17.1" } }, "@typescript-eslint/experimental-utils": { - "version": "2.28.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.28.0.tgz", - "integrity": "sha512-4SL9OWjvFbHumM/Zh/ZeEjUFxrYKtdCi7At4GyKTbQlrj1HcphIDXlje4Uu4cY+qzszR5NdVin4CCm6AXCjd6w==", + "version": "2.29.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.29.0.tgz", + "integrity": "sha512-H/6VJr6eWYstyqjWXBP2Nn1hQJyvJoFdDtsHxGiD+lEP7piGnGpb/ZQd+z1ZSB1F7dN+WsxUDh8+S4LwI+f3jw==", "requires": { "@types/json-schema": "^7.0.3", - "@typescript-eslint/typescript-estree": "2.28.0", + "@typescript-eslint/typescript-estree": "2.29.0", "eslint-scope": "^5.0.0", "eslint-utils": "^2.0.0" } }, "@typescript-eslint/parser": { - "version": "2.28.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.28.0.tgz", - "integrity": "sha512-RqPybRDquui9d+K86lL7iPqH6Dfp9461oyqvlXMNtap+PyqYbkY5dB7LawQjDzot99fqzvS0ZLZdfe+1Bt3Jgw==", + "version": "2.29.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.29.0.tgz", + "integrity": "sha512-H78M+jcu5Tf6m/5N8iiFblUUv+HJDguMSdFfzwa6vSg9lKR8Mk9BsgeSjO8l2EshKnJKcbv0e8IDDOvSNjl0EA==", "requires": { "@types/eslint-visitor-keys": "^1.0.0", - "@typescript-eslint/experimental-utils": "2.28.0", - "@typescript-eslint/typescript-estree": "2.28.0", + "@typescript-eslint/experimental-utils": "2.29.0", + "@typescript-eslint/typescript-estree": "2.29.0", "eslint-visitor-keys": "^1.1.0" } }, "@typescript-eslint/typescript-estree": { - "version": "2.28.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.28.0.tgz", - "integrity": "sha512-HDr8MP9wfwkiuqzRVkuM3BeDrOC4cKbO5a6BymZBHUt5y/2pL0BXD6I/C/ceq2IZoHWhcASk+5/zo+dwgu9V8Q==", + "version": "2.29.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.29.0.tgz", + "integrity": "sha512-3YGbtnWy4az16Egy5Fj5CckkVlpIh0MADtAQza+jiMADRSKkjdpzZp/5WuvwK/Qib3Z0HtzrDFeWanS99dNhnA==", "requires": { "debug": "^4.1.1", "eslint-visitor-keys": "^1.1.0", @@ -3189,9 +3526,9 @@ } }, "@urql/core": { - "version": "1.10.9", - "resolved": "https://registry.npmjs.org/@urql/core/-/core-1.10.9.tgz", - "integrity": "sha512-AyAx/hd+Ilvf+IB0+TOYOrryrIsEgTM3sqiRzY9TfSjAerl67SMn1xQmIBx5+Mo98RRyOyC+wlkIp1EuWLMyxA==", + "version": "1.11.5", + "resolved": "https://registry.npmjs.org/@urql/core/-/core-1.11.5.tgz", + "integrity": "sha512-id341sUsA5NQqftKFMV2d8AtV1h+cX68+QVZOfueZPCLyLTt8JlZQOn8/uFJQ2vlg3swNMvqtWAGytqMZNutSg==", "requires": { "wonka": "^4.0.9" } @@ -3898,25 +4235,25 @@ }, "dependencies": { "browserslist": { - "version": "4.11.1", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.11.1.tgz", - "integrity": "sha512-DCTr3kDrKEYNw6Jb9HFxVLQNaue8z+0ZfRBRjmCunKDEXEBajKDj2Y+Uelg+Pi29OnvaSGwjOsnRyNEkXzHg5g==", + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.12.0.tgz", + "integrity": "sha512-UH2GkcEDSI0k/lRkuDSzFl9ZZ87skSy9w2XAn1MsZnL+4c4rqbBd3e82UWHbYDpztABrPBhZsTEeuxVfHppqDg==", "requires": { - "caniuse-lite": "^1.0.30001038", - "electron-to-chromium": "^1.3.390", + "caniuse-lite": "^1.0.30001043", + "electron-to-chromium": "^1.3.413", "node-releases": "^1.1.53", "pkg-up": "^2.0.0" } }, "caniuse-lite": { - "version": "1.0.30001042", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001042.tgz", - "integrity": "sha512-igMQ4dlqnf4tWv0xjaaE02op9AJ2oQzXKjWf4EuAHFN694Uo9/EfPVIPJcmn2WkU9RqozCxx5e2KPcVClHDbDw==" + "version": "1.0.30001046", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001046.tgz", + "integrity": "sha512-CsGjBRYWG6FvgbyGy+hBbaezpwiqIOLkxQPY4A4Ea49g1eNsnQuESB+n4QM0BKii1j80MyJ26Ir5ywTQkbRE4g==" }, "electron-to-chromium": { - "version": "1.3.413", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.413.tgz", - "integrity": "sha512-Jm1Rrd3siqYHO3jftZwDljL2LYQafj3Kki5r+udqE58d0i91SkjItVJ5RwlJn9yko8i7MOcoidVKjQlgSdd1hg==" + "version": "1.3.418", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.418.tgz", + "integrity": "sha512-i2QrQtHes5fK/F9QGG5XacM5WKEuR322fxTYF9e8O9Gu0mc0WmjjwGpV8c7Htso6Zf2Di18lc3SIPxmMeRFBug==" }, "node-releases": { "version": "1.1.53", @@ -4197,9 +4534,9 @@ } }, "babel-plugin-remove-graphql-queries": { - "version": "2.8.3", - "resolved": "https://registry.npmjs.org/babel-plugin-remove-graphql-queries/-/babel-plugin-remove-graphql-queries-2.8.3.tgz", - "integrity": "sha512-BVux5WSXstiZzZuff7hD7F3WjBPq4V/sDgsT7EosXUNAoShht3msg1pFhJx+Id4jq/VNGEy+lfUzmAvBklIYeA==" + "version": "2.8.5", + "resolved": "https://registry.npmjs.org/babel-plugin-remove-graphql-queries/-/babel-plugin-remove-graphql-queries-2.8.5.tgz", + "integrity": "sha512-MnGJM4mYyhBS7xl0VUjbRk9ETRRl8H64nvg5VE3TPKPPVfRrdpUwYz0iCzFxixY+VCVkT407Wmu10Bh9AYL2SQ==" }, "babel-plugin-syntax-jsx": { "version": "6.18.0", @@ -4212,9 +4549,9 @@ "integrity": "sha512-eqj0hVcJUR57/Ug2zE1Yswsw4LhuqqHhD+8v120T1cl3kjg76QwtyBrdIk4WVwK+lAhBJVYCd/v+4nc4y+8JsA==" }, "babel-preset-gatsby": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/babel-preset-gatsby/-/babel-preset-gatsby-0.3.3.tgz", - "integrity": "sha512-C3SJlC6ygjijn33pmVyYzteiqwBjFg2VfKEXqEBuy+thOXLtmqAIES62am++ynOW9PGynwgQXb24XoOERqUvbw==", + "version": "0.3.6", + "resolved": "https://registry.npmjs.org/babel-preset-gatsby/-/babel-preset-gatsby-0.3.6.tgz", + "integrity": "sha512-3BZhFENS8KxP5Y0Y+XX8hntdfFkG3MRg5upwAeeM/P+k7wO0mBrUMNl+6ekYV1yEQabfMJq1sJG00w58r0KCMA==", "requires": { "@babel/plugin-proposal-class-properties": "^7.8.3", "@babel/plugin-proposal-nullish-coalescing-operator": "^7.8.3", @@ -4228,7 +4565,7 @@ "babel-plugin-dynamic-import-node": "^2.3.0", "babel-plugin-macros": "^2.8.0", "babel-plugin-transform-react-remove-prop-types": "^0.4.24", - "gatsby-core-utils": "^1.1.3" + "gatsby-core-utils": "^1.1.4" }, "dependencies": { "@babel/runtime": { @@ -4240,9 +4577,9 @@ } }, "gatsby-core-utils": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.1.3.tgz", - "integrity": "sha512-PntSiNCFo1/ZKjp00qgLBj2jdwY7M+maV21RXb1k7Ud9Vv9j0dGQsaVb9YXFTqXAf8bG0Xyqsqq4mPU1iNYLDw==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.1.4.tgz", + "integrity": "sha512-cXUB9PiPGqHzbFlwnJMgd9ezXb1goWOufh8oJglxp4x7vlPKUjPWpVG0UkwF6HNunpreN4WD8Jex5ed/dxEgtw==", "requires": { "ci-info": "2.0.0", "configstore": "^5.0.1", @@ -5328,8 +5665,7 @@ "cli-spinners": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-1.3.1.tgz", - "integrity": "sha512-1QL4544moEsDVH9T/l6Cemov/37iv1RtoKf7NJ04A60+4MREXNfx/QvavbH6QoGdsD4N4Mwy49cmaINR/o2mdg==", - "optional": true + "integrity": "sha512-1QL4544moEsDVH9T/l6Cemov/37iv1RtoKf7NJ04A60+4MREXNfx/QvavbH6QoGdsD4N4Mwy49cmaINR/o2mdg==" }, "cli-table3": { "version": "0.5.1", @@ -5668,9 +6004,9 @@ }, "dependencies": { "mime-db": { - "version": "1.43.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz", - "integrity": "sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ==" + "version": "1.44.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz", + "integrity": "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==" } } }, @@ -7813,9 +8149,9 @@ "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" }, "resolve": { - "version": "1.16.1", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.16.1.tgz", - "integrity": "sha512-rmAglCSqWWMrrBv/XM6sW0NuRFiKViw/W4d9EbC4pt+49H8JwHy+mcGmALTEg504AUDcLTvb1T2q3E9AnmY+ig==", + "version": "1.17.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz", + "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==", "requires": { "path-parse": "^1.0.6" } @@ -8065,9 +8401,9 @@ } }, "resolve": { - "version": "1.16.1", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.16.1.tgz", - "integrity": "sha512-rmAglCSqWWMrrBv/XM6sW0NuRFiKViw/W4d9EbC4pt+49H8JwHy+mcGmALTEg504AUDcLTvb1T2q3E9AnmY+ig==", + "version": "1.17.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz", + "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==", "requires": { "path-parse": "^1.0.6" } @@ -9544,9 +9880,9 @@ } }, "gatsby": { - "version": "2.20.25", - "resolved": "https://registry.npmjs.org/gatsby/-/gatsby-2.20.25.tgz", - "integrity": "sha512-K+qO3Trb6Hhg4TGsQuElDn+Q5P1PSVM2h2tANq/jUF62on9m/aUKz/KUb/mQiEPP2PcgdgIBESHhjrIbBqUBSw==", + "version": "2.20.35", + "resolved": "https://registry.npmjs.org/gatsby/-/gatsby-2.20.35.tgz", + "integrity": "sha512-WAjsMc28vkvd4xfQqxd2sdnxgY/ydcw6x1TGUbbtNQCRDNdpdls7iVSyUqPnZnry3vdDDc/V3KBaNTGpx1etqA==", "requires": { "@babel/code-frame": "^7.8.3", "@babel/core": "^7.8.7", @@ -9569,8 +9905,8 @@ "babel-loader": "^8.0.6", "babel-plugin-add-module-exports": "^0.3.3", "babel-plugin-dynamic-import-node": "^2.3.0", - "babel-plugin-remove-graphql-queries": "^2.8.3", - "babel-preset-gatsby": "^0.3.3", + "babel-plugin-remove-graphql-queries": "^2.8.5", + "babel-preset-gatsby": "^0.3.6", "better-opn": "1.0.0", "better-queue": "^3.8.10", "bluebird": "^3.7.2", @@ -9609,13 +9945,13 @@ "flat": "^4.1.0", "fs-exists-cached": "1.0.0", "fs-extra": "^8.1.0", - "gatsby-cli": "^2.11.11", - "gatsby-core-utils": "^1.1.3", - "gatsby-graphiql-explorer": "^0.3.3", - "gatsby-link": "^2.3.4", - "gatsby-plugin-page-creator": "^2.2.3", - "gatsby-react-router-scroll": "^2.2.2", - "gatsby-telemetry": "^1.2.5", + "gatsby-cli": "^2.11.21", + "gatsby-core-utils": "^1.1.4", + "gatsby-graphiql-explorer": "^0.3.5", + "gatsby-link": "^2.3.5", + "gatsby-plugin-page-creator": "^2.2.4", + "gatsby-react-router-scroll": "^2.2.3", + "gatsby-telemetry": "^1.2.6", "glob": "^7.1.6", "got": "8.3.2", "graphql": "^14.6.0", @@ -9883,9 +10219,9 @@ } }, "gatsby-cli": { - "version": "2.11.11", - "resolved": "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-2.11.11.tgz", - "integrity": "sha512-VW7dli1sh8LF9hHQGD58ESYBKCrm1vTijSSA/LgOm+AL2WuTDsyQA0aYL4vI5HBR98DrEvZSzZcATyubdzG+pQ==", + "version": "2.11.21", + "resolved": "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-2.11.21.tgz", + "integrity": "sha512-qGN9Jwxb84UyVDiQe5FJsuP6XCSn8W0wE3q6/wNv4U3EoyqPWpWZXtcc0at3uyJPOgDZF8O5S5j95ZzdkGeTiQ==", "requires": { "@babel/code-frame": "^7.8.3", "@babel/runtime": "^7.8.7", @@ -9902,9 +10238,9 @@ "execa": "^3.4.0", "fs-exists-cached": "^1.0.0", "fs-extra": "^8.1.0", - "gatsby-core-utils": "^1.1.3", - "gatsby-recipes": "^0.0.8", - "gatsby-telemetry": "^1.2.5", + "gatsby-core-utils": "^1.1.4", + "gatsby-recipes": "^0.0.18", + "gatsby-telemetry": "^1.2.6", "hosted-git-info": "^3.0.4", "ink": "^2.7.1", "ink-spinner": "^3.0.1", @@ -9944,9 +10280,9 @@ } }, "gatsby-core-utils": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.1.3.tgz", - "integrity": "sha512-PntSiNCFo1/ZKjp00qgLBj2jdwY7M+maV21RXb1k7Ud9Vv9j0dGQsaVb9YXFTqXAf8bG0Xyqsqq4mPU1iNYLDw==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.1.4.tgz", + "integrity": "sha512-cXUB9PiPGqHzbFlwnJMgd9ezXb1goWOufh8oJglxp4x7vlPKUjPWpVG0UkwF6HNunpreN4WD8Jex5ed/dxEgtw==", "requires": { "ci-info": "2.0.0", "configstore": "^5.0.1", @@ -10148,9 +10484,9 @@ } }, "gatsby-graphiql-explorer": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/gatsby-graphiql-explorer/-/gatsby-graphiql-explorer-0.3.3.tgz", - "integrity": "sha512-C41yQrbLWQcnnRWd3cPG/rumW3l4aEmuTOZ/5vS7lPGF3pSu4/r+8Z90U9uHHnByeHR7eBCgcJ3jg7yfD9IduQ==", + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/gatsby-graphiql-explorer/-/gatsby-graphiql-explorer-0.3.5.tgz", + "integrity": "sha512-leGZY7oZHurMlb1fDgyzaUMhvuiw+EbtrQtD5O9niNpGPCCtrHVeYaYDx/Kh+udtwe5YMYKkZ+YjteQKg7ezEg==", "requires": { "@babel/runtime": "^7.8.7" }, @@ -10171,9 +10507,9 @@ } }, "gatsby-link": { - "version": "2.3.4", - "resolved": "https://registry.npmjs.org/gatsby-link/-/gatsby-link-2.3.4.tgz", - "integrity": "sha512-+C58Faa5eLImwnY8Kcl6/lAm/5fZtC1w8H2UhT2BodCCtMq/4kIHGpBrltrcRKkXgrQhHcokg8BqhLJOKTUpVw==", + "version": "2.3.5", + "resolved": "https://registry.npmjs.org/gatsby-link/-/gatsby-link-2.3.5.tgz", + "integrity": "sha512-FzagAbg+hW+3YEfo9YUxwDoReB3w5AnsImYf3RkF7Z0HDW+YfYNFh8pg+iItlGXW+eVKZJavMz5lbqpD6H/m3w==", "requires": { "@babel/runtime": "^7.8.7", "@types/reach__router": "^1.3.3", @@ -10196,15 +10532,15 @@ } }, "gatsby-page-utils": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/gatsby-page-utils/-/gatsby-page-utils-0.1.3.tgz", - "integrity": "sha512-X2XfuDGq0nMR53V8TaLtCi7SDGxS8pHPDFiNTRlkGMcDsFZlR/7T6PaIj3Ih062P4hN1GZyemHWDbEIzfOm4BA==", + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/gatsby-page-utils/-/gatsby-page-utils-0.1.4.tgz", + "integrity": "sha512-TFZJZ5Nl4u0ZUUvKsm16MXZEMB9P8QCndHtkLQpNsrlUz4hiSYcb3uPgAm0WPBNL+R4PXsaXyaCysKDeMKMpGQ==", "requires": { "@babel/runtime": "^7.8.7", "bluebird": "^3.7.2", "chokidar": "3.3.1", "fs-exists-cached": "^1.0.0", - "gatsby-core-utils": "^1.1.3", + "gatsby-core-utils": "^1.1.4", "glob": "^7.1.6", "lodash": "^4.17.15", "micromatch": "^3.1.10" @@ -10224,9 +10560,9 @@ "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" }, "gatsby-core-utils": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.1.3.tgz", - "integrity": "sha512-PntSiNCFo1/ZKjp00qgLBj2jdwY7M+maV21RXb1k7Ud9Vv9j0dGQsaVb9YXFTqXAf8bG0Xyqsqq4mPU1iNYLDw==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.1.4.tgz", + "integrity": "sha512-cXUB9PiPGqHzbFlwnJMgd9ezXb1goWOufh8oJglxp4x7vlPKUjPWpVG0UkwF6HNunpreN4WD8Jex5ed/dxEgtw==", "requires": { "ci-info": "2.0.0", "configstore": "^5.0.1", @@ -10489,14 +10825,14 @@ } }, "gatsby-plugin-page-creator": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/gatsby-plugin-page-creator/-/gatsby-plugin-page-creator-2.2.3.tgz", - "integrity": "sha512-GHrzg1clFvYzO/KgpiEuLQNa9janJEA18xqzV9zrpe9+bEJ/no6jLWQOeyPhhwkKdlLb+XUMJEdX5RspozVZhA==", + "version": "2.2.4", + "resolved": "https://registry.npmjs.org/gatsby-plugin-page-creator/-/gatsby-plugin-page-creator-2.2.4.tgz", + "integrity": "sha512-14GjgnEJMfi59zyXTMpBoAPPmF19H+2dDCbeDJ1CgbuO5P9jTsOTaKGnrtjdt9uFVV598IaEdKu2ztpXjxkeyw==", "requires": { "@babel/runtime": "^7.8.7", "bluebird": "^3.7.2", "fs-exists-cached": "^1.0.0", - "gatsby-page-utils": "^0.1.3", + "gatsby-page-utils": "^0.1.4", "glob": "^7.1.6", "lodash": "^4.17.15", "micromatch": "^3.1.10" @@ -10574,9 +10910,9 @@ "integrity": "sha512-54REIMe79qFBAwpcnWHBkvEE9CKoEVkefF9rDXai0k642r91SZ4UeWFuAmsegPG+sPVub7tHfHu/2LVXK1I9kg==" }, "gatsby-react-router-scroll": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/gatsby-react-router-scroll/-/gatsby-react-router-scroll-2.2.2.tgz", - "integrity": "sha512-XifGP9mm0epJ3uKZ5VSem271nDDz4PtOpfj7XVtIplq9WnFbxvOT9GGVgXe2oyGNA9uuw/9ZOGR8IsgQprcCYQ==", + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/gatsby-react-router-scroll/-/gatsby-react-router-scroll-2.2.3.tgz", + "integrity": "sha512-14A4NCGl266bXAZCZZySCL/D0+d5SckRGYdBF9uNwLjTdYbcBWlSkiKT6nanqSdQDA+VIun1SGpqsmIr0I5XXw==", "requires": { "@babel/runtime": "^7.8.7", "scroll-behavior": "^0.9.12", @@ -10607,12 +10943,15 @@ } }, "gatsby-recipes": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/gatsby-recipes/-/gatsby-recipes-0.0.8.tgz", - "integrity": "sha512-EkfRUg8bGyxe5icK7yxXvE3w2n+Z1ZfEFcQpLB8cbPLU1C0qJPIFRF1BVi9cJWWyrB5F2EWcRs1ieD9dv6HivQ==", + "version": "0.0.18", + "resolved": "https://registry.npmjs.org/gatsby-recipes/-/gatsby-recipes-0.0.18.tgz", + "integrity": "sha512-mxpZ22XP7an/RHPSbvslpCS/CVkGR4Rrojzh/f9r1UxlAS/Ba/GJ/1fAn9Pp+755aNIR9ditf1vRUBOML0G6+Q==", "requires": { "@babel/core": "^7.8.7", + "@babel/generator": "^7.9.5", "@babel/standalone": "^7.9.5", + "@babel/template": "^7.8.6", + "@babel/types": "^7.9.5", "@hapi/joi": "^15.1.1", "@mdx-js/mdx": "^1.5.8", "@mdx-js/react": "^1.5.8", @@ -10624,8 +10963,8 @@ "babel-loader": "^8.0.6", "babel-plugin-add-module-exports": "^0.3.3", "babel-plugin-dynamic-import-node": "^2.3.0", - "babel-plugin-remove-graphql-queries": "^2.8.3", - "babel-preset-gatsby": "^0.3.3", + "babel-plugin-remove-graphql-queries": "^2.8.5", + "babel-preset-gatsby": "^0.3.6", "cors": "^2.8.5", "detect-port": "^1.3.0", "event-source-polyfill": "^1.0.12", @@ -10633,10 +10972,11 @@ "express": "^4.17.1", "express-graphql": "^0.9.0", "fs-extra": "^8.1.0", - "gatsby-core-utils": "^1.1.3", - "gatsby-telemetry": "^1.2.5", + "gatsby-core-utils": "^1.1.4", + "gatsby-telemetry": "^1.2.6", "glob": "^7.1.6", "graphql": "^14.6.0", + "graphql-compose": "^6.3.8", "graphql-subscriptions": "^1.1.0", "graphql-type-json": "^0.3.1", "html-tag-names": "^1.1.5", @@ -10645,6 +10985,7 @@ "ink-box": "^1.0.0", "ink-link": "^1.0.0", "ink-select-input": "^3.1.2", + "ink-spinner": "^3.0.1", "is-blank": "^2.1.0", "is-newline": "^1.0.0", "is-relative": "^1.0.0", @@ -10656,6 +10997,7 @@ "pkg-dir": "^4.2.0", "prettier": "^2.0.4", "remark-stringify": "^8.0.0", + "semver": "^7.3.2", "single-trailing-newline": "^1.0.0", "style-to-object": "^0.3.0", "subscriptions-transport-ws": "^0.9.16", @@ -10697,6 +11039,13 @@ "resolve": "^1.3.2", "semver": "^5.4.1", "source-map": "^0.5.0" + }, + "dependencies": { + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + } } }, "@babel/generator": { @@ -10822,9 +11171,9 @@ } }, "gatsby-core-utils": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.1.3.tgz", - "integrity": "sha512-PntSiNCFo1/ZKjp00qgLBj2jdwY7M+maV21RXb1k7Ud9Vv9j0dGQsaVb9YXFTqXAf8bG0Xyqsqq4mPU1iNYLDw==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.1.4.tgz", + "integrity": "sha512-cXUB9PiPGqHzbFlwnJMgd9ezXb1goWOufh8oJglxp4x7vlPKUjPWpVG0UkwF6HNunpreN4WD8Jex5ed/dxEgtw==", "requires": { "ci-info": "2.0.0", "configstore": "^5.0.1", @@ -10929,9 +11278,9 @@ } }, "prettier": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.0.4.tgz", - "integrity": "sha512-SVJIQ51spzFDvh4fIbCLvciiDMCrRhlN3mbZvv/+ycjvmF5E73bKdGfU8QDLNmjYJf+lsGnDBC4UUnvTe5OO0w==" + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.0.5.tgz", + "integrity": "sha512-7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg==" }, "remark-stringify": { "version": "8.0.0", @@ -10954,6 +11303,11 @@ "xtend": "^4.0.1" } }, + "semver": { + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", + "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==" + }, "shebang-command": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", @@ -11321,9 +11675,9 @@ } }, "gatsby-telemetry": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-1.2.5.tgz", - "integrity": "sha512-FK/Y1VICsWEFWYLawu3hUF4K+/D1amh6Wmco8oKNGK6+uV6ZjLdGUInmLP1DmpC2O932DuHYr3zjbqta5+6+bg==", + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-1.2.6.tgz", + "integrity": "sha512-dPR7Ij+dkNyQQ/eHt2OFD793txv+LXN7NhZIsCT20NV7UUlPFtN+xOjmj1eRGQXe0bbgNZis24A7zN18vwKi7Q==", "requires": { "@babel/code-frame": "^7.8.3", "@babel/runtime": "^7.8.7", @@ -11332,7 +11686,7 @@ "configstore": "^5.0.1", "envinfo": "^7.5.0", "fs-extra": "^8.1.0", - "gatsby-core-utils": "^1.1.3", + "gatsby-core-utils": "^1.1.4", "git-up": "4.0.1", "is-docker": "2.0.0", "lodash": "^4.17.15", @@ -11376,9 +11730,9 @@ "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" }, "gatsby-core-utils": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.1.3.tgz", - "integrity": "sha512-PntSiNCFo1/ZKjp00qgLBj2jdwY7M+maV21RXb1k7Ud9Vv9j0dGQsaVb9YXFTqXAf8bG0Xyqsqq4mPU1iNYLDw==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.1.4.tgz", + "integrity": "sha512-cXUB9PiPGqHzbFlwnJMgd9ezXb1goWOufh8oJglxp4x7vlPKUjPWpVG0UkwF6HNunpreN4WD8Jex5ed/dxEgtw==", "requires": { "ci-info": "2.0.0", "configstore": "^5.0.1", @@ -12775,9 +13129,9 @@ } }, "make-dir": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.0.2.tgz", - "integrity": "sha512-rYKABKutXa6vXTXhoV18cBE7PaewPXHe/Bdq4v+ZLMhxbWApkFFplT0LcbMW+6BbjnQXzZ/sAvSE/JdguApG5w==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", + "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", "requires": { "semver": "^6.0.0" } @@ -13223,7 +13577,6 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/ink-spinner/-/ink-spinner-3.0.1.tgz", "integrity": "sha512-AVR4Z/NXDQ7dT5ltWcCzFS9Dd4T8eaO//E2UO8VYNiJcZpPCSJ11o5A0UVPcMlZxGbGD6ikUFDR3ZgPUQk5haQ==", - "optional": true, "requires": { "cli-spinners": "^1.0.0", "prop-types": "^15.5.10" @@ -13948,14 +14301,14 @@ "integrity": "sha512-QZ9qOMdF+QLHxy1QIpUHUU1D5pS2CG2P69LF6L6CPjPYA/XMOmKV3PZpawHoAjHNyB0swdVTRxdYT4tbBbxqwg==" }, "jest-diff": { - "version": "25.3.0", - "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-25.3.0.tgz", - "integrity": "sha512-vyvs6RPoVdiwARwY4kqFWd4PirPLm2dmmkNzKqo38uZOzJvLee87yzDjIZLmY1SjM3XR5DwsUH+cdQ12vgqi1w==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-25.4.0.tgz", + "integrity": "sha512-kklLbJVXW0y8UKOWOdYhI6TH5MG6QAxrWiBMgQaPIuhj3dNFGirKCd+/xfplBXICQ7fI+3QcqHm9p9lWu1N6ug==", "requires": { "chalk": "^3.0.0", "diff-sequences": "^25.2.6", "jest-get-type": "^25.2.6", - "pretty-format": "^25.3.0" + "pretty-format": "^25.4.0" }, "dependencies": { "ansi-styles": { @@ -15417,9 +15770,9 @@ "integrity": "sha1-Cr+2rYNXGLn7Te8GdOBmV6lUN1w=" }, "nan": { - "version": "2.14.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz", - "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==", + "version": "2.14.1", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz", + "integrity": "sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==", "optional": true }, "nano-css": { @@ -17264,11 +17617,11 @@ } }, "pretty-format": { - "version": "25.3.0", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.3.0.tgz", - "integrity": "sha512-wToHwF8bkQknIcFkBqNfKu4+UZqnrLn/Vr+wwKQwwvPzkBfDDKp/qIabFqdgtoi5PEnM8LFByVsOrHoa3SpTVA==", + "version": "25.4.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.4.0.tgz", + "integrity": "sha512-PI/2dpGjXK5HyXexLPZU/jw5T9Q6S1YVXxxVxco+LIqzUFHXIbKZKdUVt7GcX7QUCr31+3fzhi4gN4/wUYPVxQ==", "requires": { - "@jest/types": "^25.3.0", + "@jest/types": "^25.4.0", "ansi-regex": "^5.0.0", "ansi-styles": "^4.0.0", "react-is": "^16.12.0" @@ -18466,6 +18819,11 @@ } } }, + "remark-footnotes": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/remark-footnotes/-/remark-footnotes-1.0.0.tgz", + "integrity": "sha512-X9Ncj4cj3/CIvLI2Z9IobHtVi8FVdUrdJkCNaL9kdX8ohfsi18DXHsCVd/A7ssARBdccdDb5ODnt62WuEWaM/g==" + }, "remark-mdx": { "version": "1.5.8", "resolved": "https://registry.npmjs.org/remark-mdx/-/remark-mdx-1.5.8.tgz", @@ -19114,9 +19472,9 @@ }, "dependencies": { "ajv": { - "version": "6.12.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz", - "integrity": "sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==", + "version": "6.12.2", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz", + "integrity": "sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==", "requires": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -19920,9 +20278,9 @@ } }, "spdx-exceptions": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz", - "integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==" + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz", + "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==" }, "spdx-expression-parse": { "version": "3.0.0", @@ -21756,11 +22114,11 @@ "integrity": "sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k=" }, "urql": { - "version": "1.9.6", - "resolved": "https://registry.npmjs.org/urql/-/urql-1.9.6.tgz", - "integrity": "sha512-n4RTViR0KuNlcz97pYBQ7ojZzEzhCYgylhhmhE2hOhlvb+bqEdt83ZymmtSnhw9Qi17Xc/GgSjE7itYw385JCA==", + "version": "1.9.7", + "resolved": "https://registry.npmjs.org/urql/-/urql-1.9.7.tgz", + "integrity": "sha512-zMLVeoAzY+C/RQGXjYYNC/XMqzMoyF1xjMNELTz4FNwXMEnk1wfCbgcQBbHyRVPql/9/CjY9Igq7AxUfY67Y5Q==", "requires": { - "@urql/core": "^1.10.8", + "@urql/core": "^1.11.0", "wonka": "^4.0.9" } }, diff --git a/docs/package.json b/docs/package.json index 51c499aa443..e1c64ed18a1 100644 --- a/docs/package.json +++ b/docs/package.json @@ -6,7 +6,7 @@ "serve": "gatsby serve" }, "dependencies": { - "gatsby": "2.20.25", + "gatsby": "2.20.35", "gatsby-theme-apollo-docs": "4.1.6", "react": "16.13.1", "react-dom": "16.13.1" From e44bb72baafbeaa90885ed7275a7df34c4183c98 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 25 Apr 2020 10:55:19 +0000 Subject: [PATCH 461/642] chore(deps): update dependency gatsby-theme-apollo-docs to v4.2.0 (#4033) Co-authored-by: Renovate Bot --- docs/package-lock.json | 103 ++++++++++++++++++++++++----------------- docs/package.json | 2 +- 2 files changed, 62 insertions(+), 43 deletions(-) diff --git a/docs/package-lock.json b/docs/package-lock.json index 3b598b4668d..c42e9330ff1 100644 --- a/docs/package-lock.json +++ b/docs/package-lock.json @@ -10474,9 +10474,9 @@ } }, "gatsby-core-utils": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.1.3.tgz", - "integrity": "sha512-PntSiNCFo1/ZKjp00qgLBj2jdwY7M+maV21RXb1k7Ud9Vv9j0dGQsaVb9YXFTqXAf8bG0Xyqsqq4mPU1iNYLDw==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.1.4.tgz", + "integrity": "sha512-cXUB9PiPGqHzbFlwnJMgd9ezXb1goWOufh8oJglxp4x7vlPKUjPWpVG0UkwF6HNunpreN4WD8Jex5ed/dxEgtw==", "requires": { "ci-info": "2.0.0", "configstore": "^5.0.1", @@ -10577,9 +10577,9 @@ } }, "gatsby-plugin-emotion": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/gatsby-plugin-emotion/-/gatsby-plugin-emotion-4.2.2.tgz", - "integrity": "sha512-EbMmHRUi0q1C3XzXuQ4rUJt4L2kdJsd419iyXVniV9y8V82V5PFrr/FFMeo4ibCO3KxWqCELlpAvstW/Hkjy+w==", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/gatsby-plugin-emotion/-/gatsby-plugin-emotion-4.2.3.tgz", + "integrity": "sha512-RXkfO5kciogZrpF4/jyQwDcF4g2qdh9qDuagRMdRse887MVqKb+VG+x0KRx+0cg7cGiyg8xOfbTplBB+E0Z88A==", "requires": { "@babel/runtime": "^7.8.7", "@emotion/babel-preset-css-prop": "^10.0.27" @@ -10600,10 +10600,34 @@ } } }, + "gatsby-plugin-google-analytics": { + "version": "2.2.5", + "resolved": "https://registry.npmjs.org/gatsby-plugin-google-analytics/-/gatsby-plugin-google-analytics-2.2.5.tgz", + "integrity": "sha512-pB03ICMXMcCSf8Qq/h0Pd0J3JpSpBPp78JJv8rDDfD3Ly6+SWuREBdkrq1d3CpwJ3ANGiaH3aGtN7ztlwmoXsw==", + "requires": { + "@babel/runtime": "^7.8.7", + "minimatch": "3.0.4" + }, + "dependencies": { + "@babel/runtime": { + "version": "7.9.2", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz", + "integrity": "sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==", + "requires": { + "regenerator-runtime": "^0.13.4" + } + }, + "regenerator-runtime": { + "version": "0.13.5", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", + "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==" + } + } + }, "gatsby-plugin-less": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/gatsby-plugin-less/-/gatsby-plugin-less-3.1.3.tgz", - "integrity": "sha512-tj2kVK1Brrma0goXQ58z7Kk/zW8JT1Btf1Qo9NXH90FOEHB8OgwAs7lgJfj0FfXdWy6+sQlCnnpBcMSnS+I+/g==", + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/gatsby-plugin-less/-/gatsby-plugin-less-3.1.4.tgz", + "integrity": "sha512-+mJwl8WV4mOEcOdvPkSrDsT+Ph0KskDgltszq5Y17muqJfNtrYMxyHCBF6wbSW/OjLghD+fc6+eXb/p2GW8ngQ==", "requires": { "@babel/runtime": "^7.8.7", "less-loader": "^5.0.0" @@ -10625,9 +10649,9 @@ } }, "gatsby-plugin-mdx": { - "version": "1.1.10", - "resolved": "https://registry.npmjs.org/gatsby-plugin-mdx/-/gatsby-plugin-mdx-1.1.10.tgz", - "integrity": "sha512-qoOjJYXUF9wRHHnnaVgmXY2UVOqohY2eB/12JqUdCUAnrm76W1RLfQPk+9BiHKObknrgcWNIHj1nJz2FDtLgkw==", + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/gatsby-plugin-mdx/-/gatsby-plugin-mdx-1.1.11.tgz", + "integrity": "sha512-7Bo4DCCFjK28FFI2G6ixGgMfsHaHPCPVxMAwJUeHGAgr7UX1lTTqrDbkQgcGgkGEWpQcV+IbXxLCY9aX7vyPsA==", "requires": { "@babel/core": "^7.8.7", "@babel/generator": "^7.8.8", @@ -10644,7 +10668,7 @@ "escape-string-regexp": "^1.0.5", "eval": "^0.1.4", "fs-extra": "^8.1.0", - "gatsby-core-utils": "^1.1.3", + "gatsby-core-utils": "^1.1.4", "gray-matter": "^4.0.2", "json5": "^2.1.2", "loader-utils": "^1.4.0", @@ -10877,9 +10901,9 @@ } }, "gatsby-plugin-react-helmet": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/gatsby-plugin-react-helmet/-/gatsby-plugin-react-helmet-3.2.4.tgz", - "integrity": "sha512-AHmmhodv7E8+qkHC5W0XSTgoQb1iHMB15Jn4NnEnDz696pZ448g1MCnX3bEMGCjYg2wHKJlo29EVoa4z5dS5lw==", + "version": "3.2.5", + "resolved": "https://registry.npmjs.org/gatsby-plugin-react-helmet/-/gatsby-plugin-react-helmet-3.2.5.tgz", + "integrity": "sha512-Lbt1kWBAQE1RsZHxPxYov+M9X7PNaQuzfOS6Cplfp7+dN+Dm7lOe/iLMP/vM/GLCEyxJnY072JyIb6XkBgH5ZA==", "requires": { "@babel/runtime": "^7.8.7" }, @@ -10899,11 +10923,6 @@ } } }, - "gatsby-plugin-segment-js": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/gatsby-plugin-segment-js/-/gatsby-plugin-segment-js-3.1.0.tgz", - "integrity": "sha512-oBcIY+riNehfyQXp8PEGVQTz/VPt/+k2aXCh/bNZSR4HhjEAXafcSCReS2xzs/3IJRa3gH0+NOZvRU8peXDb/w==" - }, "gatsby-plugin-svgr": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/gatsby-plugin-svgr/-/gatsby-plugin-svgr-2.0.2.tgz", @@ -11357,9 +11376,9 @@ } }, "gatsby-remark-autolink-headers": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/gatsby-remark-autolink-headers/-/gatsby-remark-autolink-headers-2.2.3.tgz", - "integrity": "sha512-xPU2FPniRaNu/9z4szPmkTrx7NlDoaOUTxlPyTSD4vynuphZGBonGMiqb2BOj03RHIeKEvRAp3dhvIMSJ+TPsQ==", + "version": "2.2.4", + "resolved": "https://registry.npmjs.org/gatsby-remark-autolink-headers/-/gatsby-remark-autolink-headers-2.2.4.tgz", + "integrity": "sha512-5FRB9u3WrLTWnFELvbozbI93ALHbe+S39UmI+VqEHGtZsQb+a6PBos9cPTT7YvJ1qugXpuBjTVtjr1gNqffMsA==", "requires": { "@babel/runtime": "^7.8.7", "github-slugger": "^1.3.0", @@ -11448,9 +11467,9 @@ } }, "gatsby-remark-copy-linked-files": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/gatsby-remark-copy-linked-files/-/gatsby-remark-copy-linked-files-2.2.3.tgz", - "integrity": "sha512-jjJ9CROLjFKMxCN80Y+JnsYe5+HaYBh1Ad4OJCa22Ib4C14pn1Qs+81kNquUDfGZntXxCtNomyxQ/G41qKOMLQ==", + "version": "2.2.4", + "resolved": "https://registry.npmjs.org/gatsby-remark-copy-linked-files/-/gatsby-remark-copy-linked-files-2.2.4.tgz", + "integrity": "sha512-UxtoTrIAqqn+yghka6+nhFsmPgVUEBH2zITRV7RSOcdDgZoTOvrKxpKAoZkEsK/TSFzSZXDiJLDNSTzI598Udw==", "requires": { "@babel/runtime": "^7.8.7", "cheerio": "^1.0.0-rc.3", @@ -11541,9 +11560,9 @@ } }, "gatsby-remark-prismjs": { - "version": "3.4.4", - "resolved": "https://registry.npmjs.org/gatsby-remark-prismjs/-/gatsby-remark-prismjs-3.4.4.tgz", - "integrity": "sha512-SeGnwJdeipWIGBXq0yUvC4YjUD1Y3ue0qBRygH6L9v7dqjS0B8jXATbWHBE+wOTlPXU/jzU1V5XpgyixJoyo2Q==", + "version": "3.4.5", + "resolved": "https://registry.npmjs.org/gatsby-remark-prismjs/-/gatsby-remark-prismjs-3.4.5.tgz", + "integrity": "sha512-vw3VgHm4/o0xtxCBtfLztLU/fRHgdb6skTJ3DXlALCOaXqJ5cQjM8iShg3j5gOiEuMa7xxFUTaIAwKmMK0WbfQ==", "requires": { "@babel/runtime": "^7.8.7", "parse-numeric-range": "^0.0.2", @@ -11582,9 +11601,9 @@ } }, "gatsby-source-filesystem": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/gatsby-source-filesystem/-/gatsby-source-filesystem-2.2.4.tgz", - "integrity": "sha512-Tf5HKAYcVmVFj7DhWi7+opDH312em8vkuoH/fTVLReBrN0yfi8maDha9EaZj4lL1fTtLk6WG0TwOM6GkyYiqgw==", + "version": "2.2.5", + "resolved": "https://registry.npmjs.org/gatsby-source-filesystem/-/gatsby-source-filesystem-2.2.5.tgz", + "integrity": "sha512-mZ8gPENU6iykLuoSJTb6bSydaJek7b7LwOPWpzThsdz/WiqhdfUV18SSP0G9/Eq62Tr6QUOLrmk4dBG5vI5Vmg==", "requires": { "@babel/runtime": "^7.8.7", "better-queue": "^3.8.10", @@ -11592,7 +11611,7 @@ "chokidar": "3.3.1", "file-type": "^12.4.2", "fs-extra": "^8.1.0", - "gatsby-core-utils": "^1.1.3", + "gatsby-core-utils": "^1.1.4", "got": "^9.6.0", "md5-file": "^3.2.3", "mime": "^2.4.4", @@ -11783,15 +11802,15 @@ } }, "gatsby-theme-apollo-docs": { - "version": "4.1.6", - "resolved": "https://registry.npmjs.org/gatsby-theme-apollo-docs/-/gatsby-theme-apollo-docs-4.1.6.tgz", - "integrity": "sha512-wkt1rdWkv9/hxCNsPwsvuDRMemevgi71JEIkXpAn6YuNwW9pxyxvazWW7r6UvFj+t+H1BQI4ejmb/UhIdOt9MQ==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/gatsby-theme-apollo-docs/-/gatsby-theme-apollo-docs-4.2.0.tgz", + "integrity": "sha512-Fj79lLEumW18d1GRNj/mbdAfvdfJPxzbojQhrxAVvqFEHH6DaM6cYK/Ockg8NwHbPAYK3Qe22EHfl/Cn8WYq/A==", "requires": { "@mdx-js/mdx": "^1.1.0", "@mdx-js/react": "^1.0.27", + "gatsby-plugin-google-analytics": "^2.2.5", "gatsby-plugin-mdx": "^1.0.23", "gatsby-plugin-printer": "1.0.x", - "gatsby-plugin-segment-js": "^3.0.1", "gatsby-remark-autolink-headers": "^2.0.16", "gatsby-remark-check-links": "^2.1.0", "gatsby-remark-code-titles": "^1.1.0", @@ -11816,13 +11835,13 @@ } }, "gatsby-transformer-remark": { - "version": "2.7.4", - "resolved": "https://registry.npmjs.org/gatsby-transformer-remark/-/gatsby-transformer-remark-2.7.4.tgz", - "integrity": "sha512-p/eMLpL5KcRM7ZBPk/C4TE95woS5aqzqkpyRPrATf03MbpAEQFCwpfvCf2P62IKF2PBMMMtd1LmS/1NZV+On2w==", + "version": "2.7.5", + "resolved": "https://registry.npmjs.org/gatsby-transformer-remark/-/gatsby-transformer-remark-2.7.5.tgz", + "integrity": "sha512-/2vehj+Ev7zpAF1OL0jqttjrCU0Ti2SXRwYbYtAo/AkXTM/Wn6yA7gLUOT74eM/Q2DosKcQVB3rkob/uJiXayQ==", "requires": { "@babel/runtime": "^7.8.7", "bluebird": "^3.7.2", - "gatsby-core-utils": "^1.1.3", + "gatsby-core-utils": "^1.1.4", "gray-matter": "^4.0.2", "hast-util-raw": "^4.0.0", "hast-util-to-html": "^4.0.1", diff --git a/docs/package.json b/docs/package.json index e1c64ed18a1..c8c76b76236 100644 --- a/docs/package.json +++ b/docs/package.json @@ -7,7 +7,7 @@ }, "dependencies": { "gatsby": "2.20.35", - "gatsby-theme-apollo-docs": "4.1.6", + "gatsby-theme-apollo-docs": "4.2.0", "react": "16.13.1", "react-dom": "16.13.1" } From bb4d9e62c8599c684d841b688907b42d4c157d77 Mon Sep 17 00:00:00 2001 From: Blake Jackson Date: Sun, 26 Apr 2020 12:53:53 -0500 Subject: [PATCH 462/642] Updated tests to include requires on nested entities. --- .../__tests__/integration/requires.test.ts | 180 ++++++++---------- 1 file changed, 80 insertions(+), 100 deletions(-) diff --git a/packages/apollo-gateway/src/__tests__/integration/requires.test.ts b/packages/apollo-gateway/src/__tests__/integration/requires.test.ts index ce10770745c..5326e318dc1 100644 --- a/packages/apollo-gateway/src/__tests__/integration/requires.test.ts +++ b/packages/apollo-gateway/src/__tests__/integration/requires.test.ts @@ -67,7 +67,6 @@ const serviceA: ServiceDefinitionModule = { name: String! nested1: Nested1! nested2: Nested2! - nested3: Nested3! } type Nested1 { nameA: String! @@ -81,23 +80,14 @@ const serviceA: ServiceDefinitionModule = { nameD: String! nested3: [Nested3!]! } - type Nested3 { - nameA: String! - nameB: String! - nameC: String! - nameD: String! - nameE: String! - nested4: Nested4! - } - type Nested4 @key(fields: "id") { + type Nested3 @key(fields: "id") { id: ID! nameA: String! nameB: String! nameC: String! - nested5: Nested5! + nested4: Nested4! } - type Nested5 { - id: ID! + type Nested4 { nameA: String! nameB: String! } @@ -109,72 +99,42 @@ const serviceA: ServiceDefinitionModule = { id: '1', name: 'name', nested1: { - nameA: "nested1.nameA", - nameB: "nested1.nameB", + nameA: 'nested1.nameA', + nameB: 'nested1.nameB', nested2: { - nameA: "nested1.nested2.nameA", - nameB: "nested1.nested2.nameB", - nameC: "nested1.nested2.nameC", - nameD: "nested1.nested2.nameD", + nameA: 'nested1.nested2.nameA', + nameB: 'nested1.nested2.nameB', + nameC: 'nested1.nested2.nameC', + nameD: 'nested1.nested2.nameD', nested3: { - nameA: "nested1.nested2.nested3.nameA", - nameB: "nested1.nested2.nested3.nameB", - nameC: "nested1.nested2.nested3.nameC", - nameD: "nested1.nested2.nested3.nameD", - nameE: "nested1.nested2.nested3.nameE", + nameA: 'nested1.nested2.nested3.nameA', + nameB: 'nested1.nested2.nested3.nameB', + nameC: 'nested1.nested2.nested3.nameC', nested4: { - nameA: "nested1.nested2.nested3.nested4.nameA", - nameB: "nested1.nested2.nested3.nested4.nameB", - nameD: "nested1.nested2.nested3.nested4.nameC", - nested5: { - nameA: "nested1.nested2.nested3.nested4.nested5.nameA", - nameB: "nested1.nested2.nested3.nested4.nested5.nameB", - } - } - } - } + nameA: 'nested1.nested2.nested3.nested4.nameA', + nameB: 'nested1.nested2.nested3.nested4.nameB', + }, + }, + }, }, nested2: { - nameA: "nested2.nameA", - nameB: "nested2.nameB", - nameC: "nested2.nameC", - nameD: "nested2.nameD", + nameA: 'nested2.nameA', + nameB: 'nested2.nameB', + nameC: 'nested2.nameC', + nameD: 'nested2.nameD', nested3: { - nameA: "nested2.nested3.nameA", - nameB: "nested2.nested3.nameB", - nameC: "nested2.nested3.nameC", - nameD: "nested2.nested3.nameD", - nameE: "nested2.nested3.nameE", + nameA: 'nested2.nested3.nameA', + nameB: 'nested2.nested3.nameB', + nameC: 'nested2.nested3.nameC', nested4: { - nameA: "nested2.nested3.nested4.nameA", - nameB: "nested2.nested3.nested4.nameB", - nameC: "nested2.nested3.nested4.nameC", - nested5: { - nameA: "nested2.nested3.nested4.nested5.nameA", - nameB: "nested2.nested3.nested4.nested5.nameB", - } - } - } + nameA: 'nested2.nested3.nested4.nameA', + nameB: 'nested2.nested3.nested4.nameB', + }, + }, }, - nested3: { - nameA: "nested3.nameA", - nameB: "nested3.nameB", - nameC: "nested3.nameC", - nameD: "nested3.nameD", - nameE: "nested3.nameE", - nested4: { - nameA: "nested3.nested4.nameA", - nameB: "nested3.nested4.nameB", - nameC: "nested3.nested4.nameC", - nested5: { - nameA: "nested3.nested4.nested5.nameA", - nameB: "nested3.nested4.nested5.nameB", - } - } - } - } - } - } + }; + }, + }, }, }; @@ -185,12 +145,20 @@ const serviceB: ServiceDefinitionModule = { id: ID! @external nested1: Nested1! @external nested2: Nested2! @external - nested3: Nested3! @external - calculated1: String! @requires(fields: "nested1 { nameA nested2 { nameA } }") - calculated2: String! @requires(fields: "nested1 { nameB nested2 { nameB nested3 { nameA } } }") - calculated3: String! @requires(fields: "nested1 { nested2 { nested3 { nameB } } } nested2 { nameC nested3 { nameC } }") - calculated4: String! @requires(fields: "nested2 { nameD nested3 { nameD nested4 { nameA } } }") - calculated5: String! @requires(fields: "nested2 { nested3 { nested4 { nameB nested5 { nameA nameB } } } } nested3 { nameE nested4 { nameC } }") + calculated1: String! + @requires(fields: "nested1 { nameA nested2 { nameA } }") + calculated2: String! + @requires( + fields: "nested1 { nameB nested2 { nameB nested3 { nameA } } }" + ) + calculated3: String! + @requires( + fields: "nested1 { nested2 { nested3 { nameB } } } nested2 { nameC nested3 { nameC } }" + ) + calculated4: String! + @requires( + fields: "nested2 { nameC nameD nested3 { nested4 { nameA } } }" + ) } type Nested1 { nameA: String! @@ -204,23 +172,15 @@ const serviceB: ServiceDefinitionModule = { nameD: String! nested3: [Nested3!]! } - type Nested3 { - nameA: String! - nameB: String! - nameC: String! - nameD: String! - nameE: String! - nested4: Nested4! - } - extend type Nested4 @key(fields: "id") { + extend type Nested3 @key(fields: "id") { id: ID! @external nameA: String! @external nameB: String! @external nameC: String! @external - nested5: Nested5! @external + nested4: Nested4! @external + calculated5: String! @requires(fields: "nested4 { nameB }") } - type Nested5 { - id: ID! + type Nested4 { nameA: String! nameB: String! } @@ -231,27 +191,41 @@ const serviceB: ServiceDefinitionModule = { return parent.nested1.nameA + ' ' + parent.nested1.nested2.nameA; }, calculated2(parent) { - return parent.nested1.nameB + ' ' + parent.nested1.nested2.nameB + ' ' + parent.nested1.nested2.nested3.nameA; + return ( + parent.nested1.nameB + + ' ' + + parent.nested1.nested2.nameB + + ' ' + + parent.nested1.nested2.nested3.nameA + ); }, calculated3(parent) { - return parent.nested1.nested2.nested3.nameB + ' ' + parent.nested2.nameC + ' ' + parent.nested2.nested3.nameC; + return ( + parent.nested1.nested2.nested3.nameB + + ' ' + + parent.nested2.nameC + + ' ' + + parent.nested2.nested3.nameC + ); }, calculated4(parent) { - return parent.nested2.nameD + ' ' + parent.nested2.nested3.nameD + ' ' + parent.nested2.nested3.nested4.nameA; + return ( + parent.nested2.nameD + + ' ' + + parent.nested2.nested3.nameD + + ' ' + + parent.nested2.nested3.nested4.nameA + ); }, + }, + Nested3: { calculated5(parent) { - return parent.nested2.nested3.nested4.nameB + ' ' - + parent.nested2.nested3.nested4.nested5.nameA + ' ' - + parent.nested2.nested3.nested4.nested5.nameB + ' ' - + parent.nested3.nameA + ' ' - + parent.nested3.nested4.nameC; + return parent.nested4.nameB; }, }, }, }; - - it('supports multiple arbitrarily nested fields defined by a requires', async () => { const query = gql` query Me { @@ -261,7 +235,13 @@ it('supports multiple arbitrarily nested fields defined by a requires', async () calculated2 calculated3 calculated4 - calculated5 + nested1 { + nested2 { + nested3 { + calculated5 + } + } + } } } `; From 421a179fe6a3207fe9954e46e77cda28df2eecad Mon Sep 17 00:00:00 2001 From: Blake Jackson Date: Sun, 26 Apr 2020 13:09:23 -0500 Subject: [PATCH 463/642] Added expected case to test. --- .../__tests__/integration/requires.test.ts | 76 ++++++++++++------- 1 file changed, 49 insertions(+), 27 deletions(-) diff --git a/packages/apollo-gateway/src/__tests__/integration/requires.test.ts b/packages/apollo-gateway/src/__tests__/integration/requires.test.ts index 5326e318dc1..7b410892789 100644 --- a/packages/apollo-gateway/src/__tests__/integration/requires.test.ts +++ b/packages/apollo-gateway/src/__tests__/integration/requires.test.ts @@ -52,10 +52,6 @@ it('supports passing additional scalar fields defined by a requires', async () = expect(queryPlan).toCallService('books'); }); - - - - const serviceA: ServiceDefinitionModule = { name: 'serviceA', typeDefs: gql` @@ -106,15 +102,18 @@ const serviceA: ServiceDefinitionModule = { nameB: 'nested1.nested2.nameB', nameC: 'nested1.nested2.nameC', nameD: 'nested1.nested2.nameD', - nested3: { - nameA: 'nested1.nested2.nested3.nameA', - nameB: 'nested1.nested2.nested3.nameB', - nameC: 'nested1.nested2.nested3.nameC', - nested4: { - nameA: 'nested1.nested2.nested3.nested4.nameA', - nameB: 'nested1.nested2.nested3.nested4.nameB', + nested3: [ + { + id: '2', + nameA: 'nested1.nested2.nested3.nameA', + nameB: 'nested1.nested2.nested3.nameB', + nameC: 'nested1.nested2.nested3.nameC', + nested4: { + nameA: 'nested1.nested2.nested3.nested4.nameA', + nameB: 'nested1.nested2.nested3.nested4.nameB', + }, }, - }, + ], }, }, nested2: { @@ -122,15 +121,18 @@ const serviceA: ServiceDefinitionModule = { nameB: 'nested2.nameB', nameC: 'nested2.nameC', nameD: 'nested2.nameD', - nested3: { - nameA: 'nested2.nested3.nameA', - nameB: 'nested2.nested3.nameB', - nameC: 'nested2.nested3.nameC', - nested4: { - nameA: 'nested2.nested3.nested4.nameA', - nameB: 'nested2.nested3.nested4.nameB', + nested3: [ + { + id: '3', + nameA: 'nested2.nested3.nameA', + nameB: 'nested2.nested3.nameB', + nameC: 'nested2.nested3.nameC', + nested4: { + nameA: 'nested2.nested3.nested4.nameA', + nameB: 'nested2.nested3.nested4.nameB', + }, }, - }, + ], }, }; }, @@ -210,11 +212,13 @@ const serviceB: ServiceDefinitionModule = { }, calculated4(parent) { return ( + parent.nested2.nameC + + ' ' + parent.nested2.nameD + ' ' + - parent.nested2.nested3.nameD + + parent.nested2.nested3[0].nameD + ' ' + - parent.nested2.nested3.nested4.nameA + parent.nested2.nested3[0].nested4.nameA ); }, }, @@ -235,11 +239,9 @@ it('supports multiple arbitrarily nested fields defined by a requires', async () calculated2 calculated3 calculated4 - nested1 { - nested2 { - nested3 { - calculated5 - } + nested2 { + nested3 { + calculated5 } } } @@ -250,6 +252,26 @@ it('supports multiple arbitrarily nested fields defined by a requires', async () query, }); + expect(data).toEqual({ + me: { + name: 'name', + calculated1: 'nested1.nameA nested1.nested2.nameA', + calculated2: + 'nested1.nameB nested1.nested2.nameB nested1.nested2.nested3.nameA', + calculated3: + 'nested1.nested2.nested3.nameB nested2.nameC nested2.nested3.nameC', + calculated4: + 'nested2.nameC nested2.nameD nested2.nested3.nameD nested2.nested3.nested4.nameA', + nested2: { + nested3: [ + { + calculated5: 'nested2.nested3.nested4.nameB', + }, + ], + }, + }, + }); + console.log(data); // expect(queryPlan).toMatchInlineSnapshot(` // QueryPlan { From a50f80d17b01fb436fb850b8f1a7d8161d35b02d Mon Sep 17 00:00:00 2001 From: Blake Jackson Date: Sun, 26 Apr 2020 14:35:49 -0500 Subject: [PATCH 464/642] Updated test to get passing case. --- .../__tests__/integration/requires.test.ts | 191 +++++++++++------- 1 file changed, 121 insertions(+), 70 deletions(-) diff --git a/packages/apollo-gateway/src/__tests__/integration/requires.test.ts b/packages/apollo-gateway/src/__tests__/integration/requires.test.ts index 7b410892789..fc1b7a89c64 100644 --- a/packages/apollo-gateway/src/__tests__/integration/requires.test.ts +++ b/packages/apollo-gateway/src/__tests__/integration/requires.test.ts @@ -198,16 +198,16 @@ const serviceB: ServiceDefinitionModule = { ' ' + parent.nested1.nested2.nameB + ' ' + - parent.nested1.nested2.nested3.nameA + parent.nested1.nested2.nested3[0].nameA ); }, calculated3(parent) { return ( - parent.nested1.nested2.nested3.nameB + + parent.nested1.nested2.nested3[0].nameB + ' ' + parent.nested2.nameC + ' ' + - parent.nested2.nested3.nameC + parent.nested2.nested3[0].nameC ); }, calculated4(parent) { @@ -216,8 +216,6 @@ const serviceB: ServiceDefinitionModule = { ' ' + parent.nested2.nameD + ' ' + - parent.nested2.nested3[0].nameD + - ' ' + parent.nested2.nested3[0].nested4.nameA ); }, @@ -260,8 +258,7 @@ it('supports multiple arbitrarily nested fields defined by a requires', async () 'nested1.nameB nested1.nested2.nameB nested1.nested2.nested3.nameA', calculated3: 'nested1.nested2.nested3.nameB nested2.nameC nested2.nested3.nameC', - calculated4: - 'nested2.nameC nested2.nameD nested2.nested3.nameD nested2.nested3.nested4.nameA', + calculated4: 'nested2.nameC nested2.nameD nested2.nested3.nested4.nameA', nested2: { nested3: [ { @@ -272,67 +269,121 @@ it('supports multiple arbitrarily nested fields defined by a requires', async () }, }); - console.log(data); - // expect(queryPlan).toMatchInlineSnapshot(` - // QueryPlan { - // Sequence { - // Fetch(service: "user") { - // { - // me { - // name - // __typename - // id - // organization { - // name - // address { - // country - // city - // city - // coordinates { - // type - // value - // type - // value - // } - // } - // } - // } - // } - // }, - // Flatten(path: "me") { - // Fetch(service: "publisher") { - // { - // ... on User { - // __typename - // id - // organization { - // name - // address { - // country - // city - // city - // coordinates { - // type - // value - // type - // value - // } - // } - // } - // } - // } => - // { - // ... on User { - // publisher { - // id - // name - // } - // publisherCity - // } - // } - // }, - // }, - // }, - // } - // `); + expect(queryPlan).toMatchInlineSnapshot(` + QueryPlan { + Sequence { + Fetch(service: "serviceA") { + { + me { + name + __typename + id + nested1 { + nameA + nameB + nested2 { + nameA + nameB + nameB + nested3 { + nameA + nameB + nameA + nameB + nameB + } + } + } + nested2 { + nameC + nameC + nameD + nested3 { + nameC + __typename + id + nested4 { + nameA + nameB + nameA + nameB + } + } + } + } + } + }, + Parallel { + Flatten(path: "me") { + Fetch(service: "serviceB") { + { + ... on A { + __typename + id + nested1 { + nameA + nameB + nested2 { + nameA + nameB + nameB + nested3 { + nameA + nameB + nameA + nameB + nameB + } + } + } + nested2 { + nameC + nameC + nameD + nested3 { + nameC + __typename + id + nested4 { + nameA + nameB + nameA + nameB + } + } + } + } + } => + { + ... on A { + calculated1 + calculated2 + calculated3 + calculated4 + } + } + }, + }, + Flatten(path: "me.nested2.nested3.@") { + Fetch(service: "serviceB") { + { + ... on Nested3 { + __typename + id + nested4 { + nameB + } + } + } => + { + ... on Nested3 { + calculated5 + } + } + }, + }, + }, + }, + } + `); }); From 36dc7ce6542f32476d0ed0a676ffff53f1c6cb60 Mon Sep 17 00:00:00 2001 From: Blake Jackson Date: Sun, 26 Apr 2020 15:07:29 -0500 Subject: [PATCH 465/642] Added duplicate scalars check. --- packages/apollo-gateway/src/FieldSet.ts | 5 ++++- .../src/__tests__/integration/requires.test.ts | 14 -------------- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/packages/apollo-gateway/src/FieldSet.ts b/packages/apollo-gateway/src/FieldSet.ts index 265bc23933e..e56189a3774 100644 --- a/packages/apollo-gateway/src/FieldSet.ts +++ b/packages/apollo-gateway/src/FieldSet.ts @@ -158,7 +158,10 @@ function mergeSelectionsSetsInternal(fieldNodes: SelectionNode[]): SelectionNode for (const fieldNode of fieldNodes) { // @ts-ignore if (!fieldNode.selectionSet) { - scalars.push(fieldNode); + // @ts-ignore + if (!scalars.find(scalar => scalar.name.value === fieldNode.name.value)) { + scalars.push(fieldNode); + } continue; } // @ts-ignore diff --git a/packages/apollo-gateway/src/__tests__/integration/requires.test.ts b/packages/apollo-gateway/src/__tests__/integration/requires.test.ts index fc1b7a89c64..ef349d39365 100644 --- a/packages/apollo-gateway/src/__tests__/integration/requires.test.ts +++ b/packages/apollo-gateway/src/__tests__/integration/requires.test.ts @@ -284,18 +284,13 @@ it('supports multiple arbitrarily nested fields defined by a requires', async () nested2 { nameA nameB - nameB nested3 { nameA nameB - nameA - nameB - nameB } } } nested2 { - nameC nameC nameD nested3 { @@ -305,8 +300,6 @@ it('supports multiple arbitrarily nested fields defined by a requires', async () nested4 { nameA nameB - nameA - nameB } } } @@ -326,18 +319,13 @@ it('supports multiple arbitrarily nested fields defined by a requires', async () nested2 { nameA nameB - nameB nested3 { nameA nameB - nameA - nameB - nameB } } } nested2 { - nameC nameC nameD nested3 { @@ -347,8 +335,6 @@ it('supports multiple arbitrarily nested fields defined by a requires', async () nested4 { nameA nameB - nameA - nameB } } } From 7ca68407e7eb7ce17ff10bea512f2150fa10aba7 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 27 Apr 2020 11:38:53 +0000 Subject: [PATCH 466/642] Correct typo of "precidence". Ref: https://github.com/apollographql/apollo-server/pull/3988#discussion_r414657251 --- packages/apollo-server-core/src/ApolloServer.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-core/src/ApolloServer.ts b/packages/apollo-server-core/src/ApolloServer.ts index e1df311b704..84e6019a908 100644 --- a/packages/apollo-server-core/src/ApolloServer.ts +++ b/packages/apollo-server-core/src/ApolloServer.ts @@ -787,7 +787,7 @@ export class ApolloServerBase { // Internal plugins should be added to `pluginsToInit` here. // User's plugins, provided as an argument to this method, will be added - // at the end of that list so they take precidence. + // at the end of that list so they take precedence. // A follow-up commit will actually introduce this. pluginsToInit.push(...plugins); From cd754b0f6c8b1cbf55284439ecc5821b500025b2 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 27 Apr 2020 12:22:21 +0000 Subject: [PATCH 467/642] noop: Remove trailing line. --- packages/apollo-server-core/src/requestPipeline.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/apollo-server-core/src/requestPipeline.ts b/packages/apollo-server-core/src/requestPipeline.ts index 6393d82c95a..f373d38104e 100644 --- a/packages/apollo-server-core/src/requestPipeline.ts +++ b/packages/apollo-server-core/src/requestPipeline.ts @@ -642,4 +642,3 @@ export async function processGraphQLRequest( } } } - From 11e885cc1f7e0c007a0af3e877c78e604245761b Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 27 Apr 2020 14:15:36 +0000 Subject: [PATCH 468/642] Relocate schema instrumentation to `utils/schemaInstrumentation.ts`. The `requestPipelineAPI.ts`'s purpose was originally to keep typings by themselves. It was compiled using a separate TypeScript compilation stage to avoid some circular dependencies within the repository itself. However, it still proved to be problematic since it required external packages which depended on the entire `apollo-server-core` just to utilize those types (e.g. plugins!) The work in #2990 offloaded the types to their own package that could be depended on but the assertion in [[1]] correctly notes that introducing new functionality, which is largely incompatible with the original intent of the `requestPipelineAPI` file (even though it is now deprecated) is largely a step backward. Therefore, this moves the functionality to a new file called `schemaInstrumentation`, as suggested in the following comment. [1]: https://github.com/apollographql/apollo-server/pull/3988/files#r414666538 --- .../apollo-server-core/src/requestPipeline.ts | 4 +- .../src/requestPipelineAPI.ts | 153 ------------------ .../src/utils/pluginTestHarness.ts | 2 +- .../src/utils/schemaInstrumentation.ts | 146 +++++++++++++++++ 4 files changed, 149 insertions(+), 156 deletions(-) create mode 100644 packages/apollo-server-core/src/utils/schemaInstrumentation.ts diff --git a/packages/apollo-server-core/src/requestPipeline.ts b/packages/apollo-server-core/src/requestPipeline.ts index f373d38104e..00ff1c33522 100644 --- a/packages/apollo-server-core/src/requestPipeline.ts +++ b/packages/apollo-server-core/src/requestPipeline.ts @@ -17,11 +17,11 @@ import { enableGraphQLExtensions, } from 'graphql-extensions'; import { DataSource } from 'apollo-datasource'; +import { PersistedQueryOptions } from '.'; import { - PersistedQueryOptions, symbolRequestListenerDispatcher, enablePluginsForSchemaResolvers, -} from '.'; +} from "./utils/schemaInstrumentation" import { CacheControlExtension, CacheControlExtensionOptions, diff --git a/packages/apollo-server-core/src/requestPipelineAPI.ts b/packages/apollo-server-core/src/requestPipelineAPI.ts index 734d5277471..47301b3f4fd 100644 --- a/packages/apollo-server-core/src/requestPipelineAPI.ts +++ b/packages/apollo-server-core/src/requestPipelineAPI.ts @@ -1,16 +1,3 @@ -import { - GraphQLField, - getNamedType, - GraphQLObjectType, - GraphQLSchema, - ResponsePath, -} from 'graphql/type'; -import { defaultFieldResolver } from "graphql/execution"; -import { FieldNode } from "graphql/language"; -import { Dispatcher } from "./utils/dispatcher"; -import { GraphQLRequestListener } from "apollo-server-plugin-base"; -import { GraphQLObjectResolver } from "@apollographql/apollo-tools"; - export { GraphQLServiceContext, GraphQLRequest, @@ -23,143 +10,3 @@ export { GraphQLExecutor, GraphQLExecutionResult, } from 'apollo-server-types'; - -export const symbolRequestListenerDispatcher = - Symbol("apolloServerRequestListenerDispatcher"); -export const symbolPluginsEnabled = Symbol("apolloServerPluginsEnabled"); - -export function enablePluginsForSchemaResolvers( - schema: GraphQLSchema & { [symbolPluginsEnabled]?: boolean }, -) { - if (schema[symbolPluginsEnabled]) { - return schema; - } - Object.defineProperty(schema, symbolPluginsEnabled, { - value: true, - }); - - forEachField(schema, wrapField); - - return schema; -} - -function wrapField(field: GraphQLField): void { - const fieldResolver = field.resolve || defaultFieldResolver; - - field.resolve = (source, args, context, info) => { - // This is a bit of a hack, but since `ResponsePath` is a linked list, - // a new object gets created every time a path segment is added. - // So we can use that to share our `whenObjectResolved` promise across - // all field resolvers for the same object. - const parentPath = info.path.prev as ResponsePath & { - __fields?: Record>; - __whenObjectResolved?: Promise; - }; - - // The technique for implementing a "did resolve field" is accomplished by - // returning a function from the `willResolveField` handler. The - // dispatcher will return a callback which will invoke all of those handlers - // and we'll save that to call when the object resolution is complete. - const endHandler = context && context[symbolRequestListenerDispatcher] && - (context[symbolRequestListenerDispatcher] as Dispatcher) - .invokeDidStartHook('willResolveField', source, args, context, info) || - ((_err: Error | null, _result?: any) => { /* do nothing */ }); - - const resolveObject: GraphQLObjectResolver< - any, - any - > = (info.parentType as any).resolveObject; - - let whenObjectResolved: Promise | undefined; - - if (parentPath && resolveObject) { - if (!parentPath.__fields) { - parentPath.__fields = {}; - } - - parentPath.__fields[info.fieldName] = info.fieldNodes; - - whenObjectResolved = parentPath.__whenObjectResolved; - if (!whenObjectResolved) { - // Use `Promise.resolve().then()` to delay executing - // `resolveObject()` so we can collect all the fields first. - whenObjectResolved = Promise.resolve().then(() => { - return resolveObject(source, parentPath.__fields!, context, info); - }); - parentPath.__whenObjectResolved = whenObjectResolved; - } - } - - try { - let result: any; - if (whenObjectResolved) { - result = whenObjectResolved.then((resolvedObject: any) => { - return fieldResolver(resolvedObject, args, context, info); - }); - } else { - result = fieldResolver(source, args, context, info); - } - - // Call the stack's handlers either immediately (if result is not a - // Promise) or once the Promise is done. Then return that same - // maybe-Promise value. - whenResultIsFinished(result, endHandler); - return result; - } catch (error) { - // Normally it's a bad sign to see an error both handled and - // re-thrown. But it is useful to allow extensions to track errors while - // still handling them in the normal GraphQL way. - endHandler(error); - throw error; - } - };; -} - -function isPromise(x: any): boolean { - return x && typeof x.then === 'function'; -} - -// Given result (which may be a Promise or an array some of whose elements are -// promises) Promises, set up 'callback' to be invoked when result is fully -// resolved. -export function whenResultIsFinished( - result: any, - callback: (err: Error | null, result?: any) => void, -) { - if (isPromise(result)) { - result.then((r: any) => callback(null, r), (err: Error) => callback(err)); - } else if (Array.isArray(result)) { - if (result.some(isPromise)) { - Promise.all(result).then( - (r: any) => callback(null, r), - (err: Error) => callback(err), - ); - } else { - callback(null, result); - } - } else { - callback(null, result); - } -} - -function forEachField(schema: GraphQLSchema, fn: FieldIteratorFn): void { - const typeMap = schema.getTypeMap(); - Object.entries(typeMap).forEach(([typeName, type]) => { - - if ( - !getNamedType(type).name.startsWith('__') && - type instanceof GraphQLObjectType - ) { - const fields = type.getFields(); - Object.entries(fields).forEach(([fieldName, field]) => { - fn(field, typeName, fieldName); - }); - } - }); -} - -type FieldIteratorFn = ( - fieldDef: GraphQLField, - typeName: string, - fieldName: string, -) => void; diff --git a/packages/apollo-server-core/src/utils/pluginTestHarness.ts b/packages/apollo-server-core/src/utils/pluginTestHarness.ts index 0afa7dfde96..aed8e007f07 100644 --- a/packages/apollo-server-core/src/utils/pluginTestHarness.ts +++ b/packages/apollo-server-core/src/utils/pluginTestHarness.ts @@ -13,7 +13,7 @@ import { CacheHint } from 'apollo-cache-control'; import { enablePluginsForSchemaResolvers, symbolRequestListenerDispatcher, -} from '../requestPipelineAPI'; +} from './schemaInstrumentation'; import { ApolloServerPlugin } from 'apollo-server-plugin-base'; import { InMemoryLRUCache } from 'apollo-server-caching'; import { Dispatcher } from './dispatcher'; diff --git a/packages/apollo-server-core/src/utils/schemaInstrumentation.ts b/packages/apollo-server-core/src/utils/schemaInstrumentation.ts new file mode 100644 index 00000000000..ba01b452783 --- /dev/null +++ b/packages/apollo-server-core/src/utils/schemaInstrumentation.ts @@ -0,0 +1,146 @@ +import { GraphQLSchema, GraphQLField, ResponsePath, getNamedType, GraphQLObjectType } from "graphql/type"; +import { defaultFieldResolver } from "graphql/execution"; +import { FieldNode } from "graphql/language"; +import { Dispatcher } from "./dispatcher"; +import { GraphQLRequestListener } from "apollo-server-plugin-base"; +import { GraphQLObjectResolver } from "@apollographql/apollo-tools"; + +export const symbolRequestListenerDispatcher = + Symbol("apolloServerRequestListenerDispatcher"); +export const symbolPluginsEnabled = Symbol("apolloServerPluginsEnabled"); + +export function enablePluginsForSchemaResolvers( + schema: GraphQLSchema & { [symbolPluginsEnabled]?: boolean }, +) { + if (schema[symbolPluginsEnabled]) { + return schema; + } + Object.defineProperty(schema, symbolPluginsEnabled, { + value: true, + }); + + forEachField(schema, wrapField); + + return schema; +} + +function wrapField(field: GraphQLField): void { + const fieldResolver = field.resolve || defaultFieldResolver; + + field.resolve = (source, args, context, info) => { + // This is a bit of a hack, but since `ResponsePath` is a linked list, + // a new object gets created every time a path segment is added. + // So we can use that to share our `whenObjectResolved` promise across + // all field resolvers for the same object. + const parentPath = info.path.prev as ResponsePath & { + __fields?: Record>; + __whenObjectResolved?: Promise; + }; + + // The technique for implementing a "did resolve field" is accomplished by + // returning a function from the `willResolveField` handler. The + // dispatcher will return a callback which will invoke all of those handlers + // and we'll save that to call when the object resolution is complete. + const endHandler = context && context[symbolRequestListenerDispatcher] && + (context[symbolRequestListenerDispatcher] as Dispatcher) + .invokeDidStartHook('willResolveField', source, args, context, info) || + ((_err: Error | null, _result?: any) => { /* do nothing */ }); + + const resolveObject: GraphQLObjectResolver< + any, + any + > = (info.parentType as any).resolveObject; + + let whenObjectResolved: Promise | undefined; + + if (parentPath && resolveObject) { + if (!parentPath.__fields) { + parentPath.__fields = {}; + } + + parentPath.__fields[info.fieldName] = info.fieldNodes; + + whenObjectResolved = parentPath.__whenObjectResolved; + if (!whenObjectResolved) { + // Use `Promise.resolve().then()` to delay executing + // `resolveObject()` so we can collect all the fields first. + whenObjectResolved = Promise.resolve().then(() => { + return resolveObject(source, parentPath.__fields!, context, info); + }); + parentPath.__whenObjectResolved = whenObjectResolved; + } + } + + try { + let result: any; + if (whenObjectResolved) { + result = whenObjectResolved.then((resolvedObject: any) => { + return fieldResolver(resolvedObject, args, context, info); + }); + } else { + result = fieldResolver(source, args, context, info); + } + + // Call the stack's handlers either immediately (if result is not a + // Promise) or once the Promise is done. Then return that same + // maybe-Promise value. + whenResultIsFinished(result, endHandler); + return result; + } catch (error) { + // Normally it's a bad sign to see an error both handled and + // re-thrown. But it is useful to allow extensions to track errors while + // still handling them in the normal GraphQL way. + endHandler(error); + throw error; + } + };; +} + +function isPromise(x: any): boolean { + return x && typeof x.then === 'function'; +} + +// Given result (which may be a Promise or an array some of whose elements are +// promises) Promises, set up 'callback' to be invoked when result is fully +// resolved. +export function whenResultIsFinished( + result: any, + callback: (err: Error | null, result?: any) => void, +) { + if (isPromise(result)) { + result.then((r: any) => callback(null, r), (err: Error) => callback(err)); + } else if (Array.isArray(result)) { + if (result.some(isPromise)) { + Promise.all(result).then( + (r: any) => callback(null, r), + (err: Error) => callback(err), + ); + } else { + callback(null, result); + } + } else { + callback(null, result); + } +} + +function forEachField(schema: GraphQLSchema, fn: FieldIteratorFn): void { + const typeMap = schema.getTypeMap(); + Object.entries(typeMap).forEach(([typeName, type]) => { + + if ( + !getNamedType(type).name.startsWith('__') && + type instanceof GraphQLObjectType + ) { + const fields = type.getFields(); + Object.entries(fields).forEach(([fieldName, field]) => { + fn(field, typeName, fieldName); + }); + } + }); +} + +type FieldIteratorFn = ( + fieldDef: GraphQLField, + typeName: string, + fieldName: string, +) => void; From 231817ef2d4a632e5158552b5357195b3d1f308d Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 27 Apr 2020 16:52:09 +0000 Subject: [PATCH 469/642] Import `PersistedQueryOptions` from private, rather than public, API. Ref: https://github.com/apollographql/apollo-server/pull/3988#discussion_r414657906 --- packages/apollo-server-core/src/requestPipeline.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-core/src/requestPipeline.ts b/packages/apollo-server-core/src/requestPipeline.ts index 00ff1c33522..89d0d599218 100644 --- a/packages/apollo-server-core/src/requestPipeline.ts +++ b/packages/apollo-server-core/src/requestPipeline.ts @@ -17,7 +17,7 @@ import { enableGraphQLExtensions, } from 'graphql-extensions'; import { DataSource } from 'apollo-datasource'; -import { PersistedQueryOptions } from '.'; +import { PersistedQueryOptions } from './graphqlOptions'; import { symbolRequestListenerDispatcher, enablePluginsForSchemaResolvers, From dce4a241435107d463126224d22f403cfd4110e6 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 27 Apr 2020 17:33:00 +0000 Subject: [PATCH 470/642] fix!: Rename AERs `newExtension` to `newPlugin` to match new usage. Ref: #3998 --- packages/apollo-engine-reporting/src/agent.ts | 2 +- packages/apollo-server-core/src/ApolloServer.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/apollo-engine-reporting/src/agent.ts b/packages/apollo-engine-reporting/src/agent.ts index 71de2c2f08c..6931425e666 100644 --- a/packages/apollo-engine-reporting/src/agent.ts +++ b/packages/apollo-engine-reporting/src/agent.ts @@ -279,7 +279,7 @@ export class EngineReportingAgent { handleLegacyOptions(this.options); } - public newExtension(): ApolloServerPlugin { + public newPlugin(): ApolloServerPlugin { return plugin(this.options, this.addTrace.bind(this)); } diff --git a/packages/apollo-server-core/src/ApolloServer.ts b/packages/apollo-server-core/src/ApolloServer.ts index 56afdc34a1c..aad31015c9c 100644 --- a/packages/apollo-server-core/src/ApolloServer.ts +++ b/packages/apollo-server-core/src/ApolloServer.ts @@ -775,7 +775,7 @@ export class ApolloServerBase { 'to report metrics to Apollo Graph Manager.', ); } - pluginsToInit.push(this.engineReportingAgent!.newExtension()); + pluginsToInit.push(this.engineReportingAgent!.newPlugin()); } else if (engine !== false && federatedSchema) { // We haven't configured this app to use Engine directly. But it looks like // we are a federated service backend, so we should be capable of including From a8ab841e2cdd0ba8030c914329003b8ec30a438b Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 27 Apr 2020 17:41:42 +0000 Subject: [PATCH 471/642] no-op: Add back comment about `ftv1` trace format. This was inadvertently removed in the re-factor. Ref: https://github.com/apollographql/apollo-server/pull/3998/files#r414901517 --- packages/apollo-engine-reporting/src/federatedPlugin.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/apollo-engine-reporting/src/federatedPlugin.ts b/packages/apollo-engine-reporting/src/federatedPlugin.ts index 5bad85c252b..81d168f9b18 100644 --- a/packages/apollo-engine-reporting/src/federatedPlugin.ts +++ b/packages/apollo-engine-reporting/src/federatedPlugin.ts @@ -5,6 +5,8 @@ import { EngineReportingOptions } from "./agent"; type FederatedReportingOptions = Pick, 'rewriteError'> +// This ftv1 plugin produces a base64'd Trace protobuf containing only the +// durationNs, startTime, endTime, and root fields. const federatedPlugin = ( options: FederatedReportingOptions = Object.create(null), ): ApolloServerPlugin => { From 4043e1175ac51b6e71c6dc3058ee7a070a257f80 Mon Sep 17 00:00:00 2001 From: Blake Jackson Date: Mon, 27 Apr 2020 15:08:10 -0500 Subject: [PATCH 472/642] Cleaned up implementation. --- packages/apollo-gateway/src/FieldSet.ts | 60 ++++++++----------- .../__tests__/integration/requires.test.ts | 16 ++--- 2 files changed, 34 insertions(+), 42 deletions(-) diff --git a/packages/apollo-gateway/src/FieldSet.ts b/packages/apollo-gateway/src/FieldSet.ts index e56189a3774..4c2089bb2dc 100644 --- a/packages/apollo-gateway/src/FieldSet.ts +++ b/packages/apollo-gateway/src/FieldSet.ts @@ -10,6 +10,7 @@ import { GraphQLObjectType, } from 'graphql'; import { getResponseName } from './utilities/graphql'; +import _ from 'lodash'; export interface Field< TParent extends GraphQLCompositeType = GraphQLCompositeType @@ -147,43 +148,34 @@ function mergeSelectionSets(fieldNodes: FieldNode[]): SelectionSetNode { return { kind: 'SelectionSet', - selections: mergeSelectionsSetsInternal(selections), + selections: mergeFieldNodeSelectionSets(selections), }; } -function mergeSelectionsSetsInternal(fieldNodes: SelectionNode[]): SelectionNode[] { - const scalars: SelectionNode[] = []; - const selectionMap: Map = new Map(); - - for (const fieldNode of fieldNodes) { - // @ts-ignore - if (!fieldNode.selectionSet) { - // @ts-ignore - if (!scalars.find(scalar => scalar.name.value === fieldNode.name.value)) { - scalars.push(fieldNode); +function mergeFieldNodeSelectionSets( + selectionNodes: SelectionNode[], +): SelectionNode[] { + const [fieldNodes, fragmentNodes] = _(selectionNodes) + .partition( + (node: SelectionNode): node is FieldNode => node.kind === 'Field', + ) + .value(); + + const mergedFieldNodes = _(fieldNodes) + .groupBy((node) => node.name.value) + .values() + .map((nodesWithSameName) => { + const node = nodesWithSameName[0]; + if (node.selectionSet) { + node.selectionSet.selections = mergeFieldNodeSelectionSets( + nodesWithSameName.flatMap( + (node) => node.selectionSet?.selections || [], + ), + ); } - continue; - } - // @ts-ignore - const name = fieldNode.name?.value || fieldNode.typeCondition.name.value - const selections: {field: SelectionNode[], selections: SelectionNode[]} = selectionMap.get(name) || {field: [fieldNode], selections: []}; - // @ts-ignore - selections.selections.push(...fieldNode.selectionSet.selections); - selections.field.push(fieldNode); - selectionMap.set(name, selections) - } + return node; + }) + .value(); - const result = Array.from(selectionMap.values()).map(selection => { - // @ts-ignore - const name = selection.field[0].name?.value || selection.field[0].typeCondition.name.value - const field = selectionMap.get(name)?.field[0]; - // @ts-ignore - const clone = {...field} - // @ts-ignore - clone.selectionSet?.selections = mergeSelectionsSetsInternal(selection.selections) - return clone; - }) - result.unshift(...scalars); - - return result.flat(); + return [...mergedFieldNodes, ...fragmentNodes]; } diff --git a/packages/apollo-gateway/src/__tests__/integration/requires.test.ts b/packages/apollo-gateway/src/__tests__/integration/requires.test.ts index ef349d39365..9aa4c6fe8e2 100644 --- a/packages/apollo-gateway/src/__tests__/integration/requires.test.ts +++ b/packages/apollo-gateway/src/__tests__/integration/requires.test.ts @@ -280,7 +280,6 @@ it('supports multiple arbitrarily nested fields defined by a requires', async () id nested1 { nameA - nameB nested2 { nameA nameB @@ -289,19 +288,20 @@ it('supports multiple arbitrarily nested fields defined by a requires', async () nameB } } + nameB } nested2 { nameC - nameD nested3 { nameC - __typename - id nested4 { nameA nameB } + __typename + id } + nameD } } } @@ -315,7 +315,6 @@ it('supports multiple arbitrarily nested fields defined by a requires', async () id nested1 { nameA - nameB nested2 { nameA nameB @@ -324,19 +323,20 @@ it('supports multiple arbitrarily nested fields defined by a requires', async () nameB } } + nameB } nested2 { nameC - nameD nested3 { nameC - __typename - id nested4 { nameA nameB } + __typename + id } + nameD } } } => From fc05e8d6a32973cbca6561eb140d240040117e66 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 28 Apr 2020 11:34:34 +0000 Subject: [PATCH 473/642] Use optional chaining when accessing optional `request.http.headers`. ...and destructuring. --- packages/apollo-engine-reporting/src/federatedPlugin.ts | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/apollo-engine-reporting/src/federatedPlugin.ts b/packages/apollo-engine-reporting/src/federatedPlugin.ts index 81d168f9b18..bf1b04627f6 100644 --- a/packages/apollo-engine-reporting/src/federatedPlugin.ts +++ b/packages/apollo-engine-reporting/src/federatedPlugin.ts @@ -11,19 +11,14 @@ const federatedPlugin = ( options: FederatedReportingOptions = Object.create(null), ): ApolloServerPlugin => { return { - requestDidStart(requestContext) { + requestDidStart({ request: { http } }) { const treeBuilder: EngineReportingTreeBuilder = new EngineReportingTreeBuilder({ rewriteError: options.rewriteError, }); // XXX Provide a mechanism to customize this logic. - const http = requestContext.request.http; - if ( - !http || - !http.headers || - http.headers.get('apollo-federation-include-trace') !== 'ftv1' - ) { + if (http?.headers.get('apollo-federation-include-trace') !== 'ftv1') { return; } From 48eab7efa0893182452680ba383df218da862273 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 28 Apr 2020 12:27:11 +0000 Subject: [PATCH 474/642] Ensure `metrics` is present before plugin initialization. This eliminates the need to guard for the presence of `metrics` on the `requestContext` within plugins who are calling `requestDidStart`. Ref: https://github.com/apollographql/apollo-server/pull/3998#discussion_r414906840 --- packages/apollo-server-core/src/ApolloServer.ts | 1 + .../apollo-server-core/src/requestPipeline.ts | 15 ++++++++++----- packages/apollo-server-types/src/index.ts | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/packages/apollo-server-core/src/ApolloServer.ts b/packages/apollo-server-core/src/ApolloServer.ts index aad31015c9c..5f020df75e0 100644 --- a/packages/apollo-server-core/src/ApolloServer.ts +++ b/packages/apollo-server-core/src/ApolloServer.ts @@ -869,6 +869,7 @@ export class ApolloServerBase { request, context: options.context || Object.create(null), cache: options.cache!, + metrics: {}, response: { http: { headers: new Headers(), diff --git a/packages/apollo-server-core/src/requestPipeline.ts b/packages/apollo-server-core/src/requestPipeline.ts index 6393d82c95a..d7958763c98 100644 --- a/packages/apollo-server-core/src/requestPipeline.ts +++ b/packages/apollo-server-core/src/requestPipeline.ts @@ -126,6 +126,16 @@ export async function processGraphQLRequest( // all of our own machinery will certainly set it now. const logger = requestContext.logger || console; + // If request context's `metrics` already exists, preserve it, but _ensure_ it + // exists there and shorthand it for use throughout this function. As of this + // comment, the sole known case where `metrics` already exists is when the + // `captureTraces` property is present and set to the result of the boolean + // `reporting` option on the legacy (V1) server options, here: + // https://git.io/Jfmsb. I suspect this disappears when this is the direct + // entry into request processing, rather than through, e.g. `runHttpQuery`. + const metrics = requestContext.metrics = + requestContext.metrics || Object.create(null); + let cacheControlExtension: CacheControlExtension | undefined; const extensionStack = initializeExtensionStack(); (requestContext.context as any)._extensionStack = extensionStack; @@ -137,11 +147,6 @@ export async function processGraphQLRequest( await initializeDataSources(); - const metrics = requestContext.metrics || Object.create(null); - if (!requestContext.metrics) { - requestContext.metrics = metrics; - } - const request = requestContext.request; let { query, extensions } = request; diff --git a/packages/apollo-server-types/src/index.ts b/packages/apollo-server-types/src/index.ts index fcf42426b1d..e9c7cdd5445 100644 --- a/packages/apollo-server-types/src/index.ts +++ b/packages/apollo-server-types/src/index.ts @@ -104,7 +104,7 @@ export interface GraphQLRequestContext> { */ readonly errors?: ReadonlyArray; - readonly metrics?: GraphQLRequestMetrics; + readonly metrics: GraphQLRequestMetrics; debug?: boolean; } From 1807fa8735491f91f53c19e5dabdf27d34142b99 Mon Sep 17 00:00:00 2001 From: Sunli Date: Tue, 28 Apr 2020 20:51:39 +0800 Subject: [PATCH 475/642] docs: Update URL for async-graphql (#4041) --- docs/source/federation/other-servers.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/federation/other-servers.md b/docs/source/federation/other-servers.md index 76fb9fef08a..1b8caa7055b 100644 --- a/docs/source/federation/other-servers.md +++ b/docs/source/federation/other-servers.md @@ -15,6 +15,6 @@ The following is a list of known open source GraphQL server libraries that have | Python | ariadne | [ariadne](https://github.com/mirumee/ariadne) | | Python | graphene | [graphene-federation](https://github.com/preply/graphene-federation) | | Ruby | graphql-ruby | [apollo-federation-ruby](https://github.com/Gusto/apollo-federation-ruby) | -| Rust | async-graphql | [async-graphql](https://github.com/sunli829/async-graphql) | +| Rust | async-graphql | [async-graphql](https://github.com/async-graphql/async-graphql) | Do you maintain a library that implements Apollo Federation that isn't listed here? Please [submit a PR](https://github.com/apollographql/apollo-server/tree/master/docs/source/federation/other-servers.md) to be added to the list! From fe39b6c554f4bc1bc92b64f75da640a31b8d79c2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 28 Apr 2020 15:52:03 +0300 Subject: [PATCH 476/642] chore(deps): update dependency gatsby to v2.20.36 (#4036) --- docs/package-lock.json | 90 ++++++++++-------------------------------- docs/package.json | 2 +- 2 files changed, 21 insertions(+), 71 deletions(-) diff --git a/docs/package-lock.json b/docs/package-lock.json index c42e9330ff1..2d985b0e04b 100644 --- a/docs/package-lock.json +++ b/docs/package-lock.json @@ -4246,9 +4246,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001046", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001046.tgz", - "integrity": "sha512-CsGjBRYWG6FvgbyGy+hBbaezpwiqIOLkxQPY4A4Ea49g1eNsnQuESB+n4QM0BKii1j80MyJ26Ir5ywTQkbRE4g==" + "version": "1.0.30001048", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001048.tgz", + "integrity": "sha512-g1iSHKVxornw0K8LG9LLdf+Fxnv7T1Z+mMsf0/YYLclQX4Cd522Ap0Lrw6NFqHgezit78dtyWxzlV2Xfc7vgRg==" }, "electron-to-chromium": { "version": "1.3.418", @@ -4576,16 +4576,6 @@ "regenerator-runtime": "^0.13.4" } }, - "gatsby-core-utils": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.1.4.tgz", - "integrity": "sha512-cXUB9PiPGqHzbFlwnJMgd9ezXb1goWOufh8oJglxp4x7vlPKUjPWpVG0UkwF6HNunpreN4WD8Jex5ed/dxEgtw==", - "requires": { - "ci-info": "2.0.0", - "configstore": "^5.0.1", - "node-object-hash": "^2.0.0" - } - }, "regenerator-runtime": { "version": "0.13.5", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", @@ -9880,9 +9870,9 @@ } }, "gatsby": { - "version": "2.20.35", - "resolved": "https://registry.npmjs.org/gatsby/-/gatsby-2.20.35.tgz", - "integrity": "sha512-WAjsMc28vkvd4xfQqxd2sdnxgY/ydcw6x1TGUbbtNQCRDNdpdls7iVSyUqPnZnry3vdDDc/V3KBaNTGpx1etqA==", + "version": "2.20.36", + "resolved": "https://registry.npmjs.org/gatsby/-/gatsby-2.20.36.tgz", + "integrity": "sha512-op/rtiWTATX0e8EoQIm4xfXIb4zDkpUzx5sORBCoe1I13lX/q/Z3f6FM80WmFih89VngC9juXN7oGS8TF8GHxA==", "requires": { "@babel/code-frame": "^7.8.3", "@babel/core": "^7.8.7", @@ -9945,7 +9935,7 @@ "flat": "^4.1.0", "fs-exists-cached": "1.0.0", "fs-extra": "^8.1.0", - "gatsby-cli": "^2.11.21", + "gatsby-cli": "^2.11.22", "gatsby-core-utils": "^1.1.4", "gatsby-graphiql-explorer": "^0.3.5", "gatsby-link": "^2.3.5", @@ -10219,9 +10209,9 @@ } }, "gatsby-cli": { - "version": "2.11.21", - "resolved": "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-2.11.21.tgz", - "integrity": "sha512-qGN9Jwxb84UyVDiQe5FJsuP6XCSn8W0wE3q6/wNv4U3EoyqPWpWZXtcc0at3uyJPOgDZF8O5S5j95ZzdkGeTiQ==", + "version": "2.11.22", + "resolved": "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-2.11.22.tgz", + "integrity": "sha512-lU3uXiTASgbpb/iT4vvdOFST7H9LNSx54I6XG/cYOJ2z7ezB2JshuetLdfhb1HqwniIscvX60hbibcCKBd4YIw==", "requires": { "@babel/code-frame": "^7.8.3", "@babel/runtime": "^7.8.7", @@ -10239,7 +10229,7 @@ "fs-exists-cached": "^1.0.0", "fs-extra": "^8.1.0", "gatsby-core-utils": "^1.1.4", - "gatsby-recipes": "^0.0.18", + "gatsby-recipes": "^0.0.19", "gatsby-telemetry": "^1.2.6", "hosted-git-info": "^3.0.4", "ink": "^2.7.1", @@ -10279,16 +10269,6 @@ } } }, - "gatsby-core-utils": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.1.4.tgz", - "integrity": "sha512-cXUB9PiPGqHzbFlwnJMgd9ezXb1goWOufh8oJglxp4x7vlPKUjPWpVG0UkwF6HNunpreN4WD8Jex5ed/dxEgtw==", - "requires": { - "ci-info": "2.0.0", - "configstore": "^5.0.1", - "node-object-hash": "^2.0.0" - } - }, "get-caller-file": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz", @@ -10559,16 +10539,6 @@ "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" }, - "gatsby-core-utils": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.1.4.tgz", - "integrity": "sha512-cXUB9PiPGqHzbFlwnJMgd9ezXb1goWOufh8oJglxp4x7vlPKUjPWpVG0UkwF6HNunpreN4WD8Jex5ed/dxEgtw==", - "requires": { - "ci-info": "2.0.0", - "configstore": "^5.0.1", - "node-object-hash": "^2.0.0" - } - }, "regenerator-runtime": { "version": "0.13.5", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", @@ -10962,9 +10932,9 @@ } }, "gatsby-recipes": { - "version": "0.0.18", - "resolved": "https://registry.npmjs.org/gatsby-recipes/-/gatsby-recipes-0.0.18.tgz", - "integrity": "sha512-mxpZ22XP7an/RHPSbvslpCS/CVkGR4Rrojzh/f9r1UxlAS/Ba/GJ/1fAn9Pp+755aNIR9ditf1vRUBOML0G6+Q==", + "version": "0.0.19", + "resolved": "https://registry.npmjs.org/gatsby-recipes/-/gatsby-recipes-0.0.19.tgz", + "integrity": "sha512-591V5j+jhP1CmgANiBwWsAWbKTsZ9t5Uor4hYtnbTfx2ZefIVTd65fgvE/ajioPbAQ14USd/Z3yplHQ8Ne9Hfw==", "requires": { "@babel/core": "^7.8.7", "@babel/generator": "^7.9.5", @@ -11189,16 +11159,6 @@ "path-exists": "^4.0.0" } }, - "gatsby-core-utils": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.1.4.tgz", - "integrity": "sha512-cXUB9PiPGqHzbFlwnJMgd9ezXb1goWOufh8oJglxp4x7vlPKUjPWpVG0UkwF6HNunpreN4WD8Jex5ed/dxEgtw==", - "requires": { - "ci-info": "2.0.0", - "configstore": "^5.0.1", - "node-object-hash": "^2.0.0" - } - }, "get-stream": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz", @@ -11748,16 +11708,6 @@ "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" }, - "gatsby-core-utils": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.1.4.tgz", - "integrity": "sha512-cXUB9PiPGqHzbFlwnJMgd9ezXb1goWOufh8oJglxp4x7vlPKUjPWpVG0UkwF6HNunpreN4WD8Jex5ed/dxEgtw==", - "requires": { - "ci-info": "2.0.0", - "configstore": "^5.0.1", - "node-object-hash": "^2.0.0" - } - }, "node-fetch": { "version": "2.6.0", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz", @@ -14110,9 +14060,9 @@ } }, "is-promise": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz", - "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=" + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz", + "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==" }, "is-reference": { "version": "1.1.4", @@ -22882,9 +22832,9 @@ } }, "ws": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.2.3.tgz", - "integrity": "sha512-HTDl9G9hbkNDk98naoR/cHDws7+EyYMOdL1BmjsZXRUjf7d+MficC4B7HLUPlSiho0vg+CWKrGIt/VJBd1xunQ==" + "version": "7.2.5", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.2.5.tgz", + "integrity": "sha512-C34cIU4+DB2vMyAbmEKossWq2ZQDr6QEyuuCzWrM9zfw1sGc0mYiJ0UnG9zzNykt49C2Fi34hvr2vssFQRS6EA==" }, "x-is-string": { "version": "0.1.0", diff --git a/docs/package.json b/docs/package.json index c8c76b76236..32691db901b 100644 --- a/docs/package.json +++ b/docs/package.json @@ -6,7 +6,7 @@ "serve": "gatsby serve" }, "dependencies": { - "gatsby": "2.20.35", + "gatsby": "2.20.36", "gatsby-theme-apollo-docs": "4.2.0", "react": "16.13.1", "react-dom": "16.13.1" From 35d24da70765a740ece8d02def9b91dcb3a218e0 Mon Sep 17 00:00:00 2001 From: Roman Kudryashov Date: Tue, 28 Apr 2020 15:52:58 +0300 Subject: [PATCH 477/642] docs: add `graphql-java-federation` to server implementation list (#3777) --- docs/source/federation/other-servers.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/source/federation/other-servers.md b/docs/source/federation/other-servers.md index 1b8caa7055b..4e8c9738ac6 100644 --- a/docs/source/federation/other-servers.md +++ b/docs/source/federation/other-servers.md @@ -9,6 +9,7 @@ The following is a list of known open source GraphQL server libraries that have | ----------- | ------------- | -------------------------------------------------------------------------------- | | Go | gqlgen | [gqlgen](https://github.com/99designs/gqlgen/tree/master/plugin/federation) | | Java | graphql-java | [federation-jvm](https://github.com/apollographql/federation-jvm) | +| Java | graphql-java | [graphql-java-federation](https://github.com/rkudryashov/graphql-java-federation)| | Kotlin | graphql-java | [graphql-kotlin](https://github.com/ExpediaGroup/graphql-kotlin) | | PHP | graphql-php | [php-graphql-federation](https://github.com/pascaldevink/php-graphql-federation) | | PHP | wp-graphql | [wp-graphql-federation](https://github.com/wp-graphql/wp-graphql-federation) | From 98bae446d37704939bd7e0bf010503c66215dfd8 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 28 Apr 2020 15:53:57 +0300 Subject: [PATCH 478/642] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a32e400dd26..361931c8bef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,7 @@ The version headers in this history reflect the versions of Apollo Server itself > 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. When a release is being prepared, a new header will be (manually) created below and the the appropriate changes within that release will be moved into the new section. - `apollo-server-lambda`: Support file uploads on AWS Lambda [Issue #1419](https://github.com/apollographql/apollo-server/issues/1419) [Issue #1703](https://github.com/apollographql/apollo-server/issues/1703) [PR #3926](https://github.com/apollographql/apollo-server/pull/3926) -- `apollo-tracing`: This package's internal integration with Apollo Server has been switched from using the soon-to-be-deprecated`graphql-extensions` API to using [the request pipeline plugin API](https://www.apollographql.com/docs/apollo-server/integrations/plugins/). Behavior should remain otherwise the same. [PR #3991](https://github.com/apollographql/apollo-server/pull/3991) +- `apollo-tracing`: This package is considered deprecated and — along with its `tracing: Boolean` configuration option on the `ApolloServer` constructor options — will cease to exist in Apollo Server 3.x. Until that occurs, we've updated the _internal_ integration of this package with Apollo Server itself to use the newer [request pipeline plugin API](https://www.apollographql.com/docs/apollo-server/integrations/plugins/), rather than the _also_ soon-to-be-deprecated-`graphql-extensions` API it previously leveraged. The behavior should remain otherwise the same. [PR #3991](https://github.com/apollographql/apollo-server/pull/3991) - **breaking** `apollo-engine-reporting-protobuf`: Drop legacy fields that were never used by `apollo-engine-reporting`. Added new fields `StatsContext` to allow `apollo-server` to send summary stats instead of full traces, and renamed `FullTracesReport` to `Report` and `Traces` to `TracesAndStats` since reports now can include stats as well as traces. ### v2.12.0 From 8ca5d112b38796c28a1e2d7211af169136c8bf5b Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 28 Apr 2020 12:33:53 +0000 Subject: [PATCH 479/642] Remove guard around `metrics` which is unnecessary after 48eab7efa. --- packages/apollo-engine-reporting/src/plugin.ts | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/packages/apollo-engine-reporting/src/plugin.ts b/packages/apollo-engine-reporting/src/plugin.ts index a0179b30ef6..661e0c03e2b 100644 --- a/packages/apollo-engine-reporting/src/plugin.ts +++ b/packages/apollo-engine-reporting/src/plugin.ts @@ -21,8 +21,6 @@ import { PersistedQueryNotSupportedError, } from 'apollo-server-errors'; -type Mutable = { -readonly [P in keyof T]: T[P] }; - const clientNameHeaderKey = 'apollographql-client-name'; const clientReferenceIdHeaderKey = 'apollographql-client-reference-id'; const clientVersionHeaderKey = 'apollographql-client-version'; @@ -52,11 +50,9 @@ export const plugin = ( logger: requestContext.logger || logger, }); - const metrics: NonNullable = - ((requestContext as Mutable) - .metrics = requestContext.metrics || Object.create(null)); - treeBuilder.startTiming(); + + const metrics = requestContext.metrics; metrics.startHrTime = treeBuilder.startHrTime; if (requestContext.request.http) { From 0658df5e50283c3985ff3e3717bdff8de2adab9d Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 28 Apr 2020 13:21:58 +0000 Subject: [PATCH 480/642] Move `Trace.HTTP` init inside of `ensurePreflight`. As noted in review within [[1]], there wasn't really a compelling reason for this to be kept separately from the other tree-building bits which existed within `ensurePreflight`. [1]: https://github.com/apollographql/apollo-server/pull/3998#discussion_r414911267 --- .../apollo-engine-reporting/src/plugin.ts | 40 +++++++++---------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/packages/apollo-engine-reporting/src/plugin.ts b/packages/apollo-engine-reporting/src/plugin.ts index 661e0c03e2b..dd42f28b434 100644 --- a/packages/apollo-engine-reporting/src/plugin.ts +++ b/packages/apollo-engine-reporting/src/plugin.ts @@ -55,32 +55,30 @@ export const plugin = ( const metrics = requestContext.metrics; metrics.startHrTime = treeBuilder.startHrTime; - if (requestContext.request.http) { - treeBuilder.trace.http = new Trace.HTTP({ - method: - Trace.HTTP.Method[ - requestContext.request.http - .method as keyof typeof Trace.HTTP.Method - ] || Trace.HTTP.Method.UNKNOWN, - // Host and path are not used anywhere on the backend, so let's not bother - // trying to parse request.url to get them, which is a potential - // source of bugs because integrations have different behavior here. - // On Node's HTTP module, request.url only includes the path - // (see https://nodejs.org/api/http.html#http_message_url) - // The same is true on Lambda (where we pass event.path) - // But on environments like Cloudflare we do get a complete URL. - host: null, - path: null, - }); - } - let preflightDone: boolean = false; function ensurePreflight() { if (preflightDone) return; preflightDone = true; - if (options.sendHeaders) { - if (requestContext.request.http && treeBuilder.trace.http) { + if (requestContext.request.http) { + treeBuilder.trace.http = new Trace.HTTP({ + method: + Trace.HTTP.Method[ + requestContext.request.http + .method as keyof typeof Trace.HTTP.Method + ] || Trace.HTTP.Method.UNKNOWN, + // Host and path are not used anywhere on the backend, so let's not bother + // trying to parse request.url to get them, which is a potential + // source of bugs because integrations have different behavior here. + // On Node's HTTP module, request.url only includes the path + // (see https://nodejs.org/api/http.html#http_message_url) + // The same is true on Lambda (where we pass event.path) + // But on environments like Cloudflare we do get a complete URL. + host: null, + path: null, + }); + + if (options.sendHeaders) { makeHTTPRequestHeaders( treeBuilder.trace.http, requestContext.request.http.headers, From fc966a4b5d383d7a0d893839e4b05d9c5b87afaa Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 28 Apr 2020 13:34:10 +0000 Subject: [PATCH 481/642] Remove unnecessary `queryString` assignment and related comment. --- packages/apollo-engine-reporting/src/plugin.ts | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/packages/apollo-engine-reporting/src/plugin.ts b/packages/apollo-engine-reporting/src/plugin.ts index dd42f28b434..4416d422567 100644 --- a/packages/apollo-engine-reporting/src/plugin.ts +++ b/packages/apollo-engine-reporting/src/plugin.ts @@ -43,7 +43,6 @@ export const plugin = ( return { requestDidStart(requestContext) { - let queryString: string | undefined; const treeBuilder: EngineReportingTreeBuilder = new EngineReportingTreeBuilder({ rewriteError: options.rewriteError, @@ -94,16 +93,11 @@ export const plugin = ( treeBuilder.trace.persistedQueryRegister = true; } - // Generally, we'll get queryString here and not parsedQuery; we only get - // parsedQuery if you're using an OperationStore. In normal cases we'll - // get our documentAST in the execution callback after it is parsed. - queryString = requestContext.source; - if (requestContext.request.variables) { treeBuilder.trace.details = makeTraceDetails( requestContext.request.variables, options.sendVariableValues, - queryString, + requestContext.source, ); } @@ -150,7 +144,7 @@ export const plugin = ( operationName, queryHash: requestContext.queryHash!, documentAST: requestContext.document, - queryString, + queryString: requestContext.source, trace: treeBuilder.trace, schemaHash: requestContext.schemaHash, }); From 766c7384c8296a5a552973ede24f013fb355dab5 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 28 Apr 2020 13:47:47 +0000 Subject: [PATCH 482/642] Destructure some `requestContext` properties for brevity. --- .../apollo-engine-reporting/src/plugin.ts | 28 +++++++++++-------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/packages/apollo-engine-reporting/src/plugin.ts b/packages/apollo-engine-reporting/src/plugin.ts index 4416d422567..289114eece4 100644 --- a/packages/apollo-engine-reporting/src/plugin.ts +++ b/packages/apollo-engine-reporting/src/plugin.ts @@ -43,15 +43,23 @@ export const plugin = ( return { requestDidStart(requestContext) { + // We still need the entire `requestContext` to pass through to the + // `generateClientInfo` method, but we'll destructure for brevity within. + const { + metrics, + logger: requestLogger, + schemaHash, + request: { http, variables }, + } = requestContext; + const treeBuilder: EngineReportingTreeBuilder = new EngineReportingTreeBuilder({ rewriteError: options.rewriteError, - logger: requestContext.logger || logger, + logger: requestLogger || logger, }); treeBuilder.startTiming(); - const metrics = requestContext.metrics; metrics.startHrTime = treeBuilder.startHrTime; let preflightDone: boolean = false; @@ -59,13 +67,11 @@ export const plugin = ( if (preflightDone) return; preflightDone = true; - if (requestContext.request.http) { + if (http) { treeBuilder.trace.http = new Trace.HTTP({ method: - Trace.HTTP.Method[ - requestContext.request.http - .method as keyof typeof Trace.HTTP.Method - ] || Trace.HTTP.Method.UNKNOWN, + Trace.HTTP.Method[http.method as keyof typeof Trace.HTTP.Method] + || Trace.HTTP.Method.UNKNOWN, // Host and path are not used anywhere on the backend, so let's not bother // trying to parse request.url to get them, which is a potential // source of bugs because integrations have different behavior here. @@ -80,7 +86,7 @@ export const plugin = ( if (options.sendHeaders) { makeHTTPRequestHeaders( treeBuilder.trace.http, - requestContext.request.http.headers, + http.headers, options.sendHeaders, ); } @@ -93,9 +99,9 @@ export const plugin = ( treeBuilder.trace.persistedQueryRegister = true; } - if (requestContext.request.variables) { + if (variables) { treeBuilder.trace.details = makeTraceDetails( - requestContext.request.variables, + variables, options.sendVariableValues, requestContext.source, ); @@ -146,7 +152,7 @@ export const plugin = ( documentAST: requestContext.document, queryString: requestContext.source, trace: treeBuilder.trace, - schemaHash: requestContext.schemaHash, + schemaHash, }); } From f4aad306d1737dc411635c9538aaef992776ccf0 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 28 Apr 2020 13:52:10 +0000 Subject: [PATCH 483/642] chore!: Use `document` / `source` rather than `documentAST` / `queryString`. The use of `document` and `source` is the standard within the plugin API and the request pipeline, so these names should be more natural going forward. This wouldn't have been possible without a breaking change, but we're already doing that. --- packages/apollo-engine-reporting/src/agent.ts | 30 +++++++++---------- .../apollo-engine-reporting/src/plugin.ts | 4 +-- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/packages/apollo-engine-reporting/src/agent.ts b/packages/apollo-engine-reporting/src/agent.ts index 6931425e666..0bde648580f 100644 --- a/packages/apollo-engine-reporting/src/agent.ts +++ b/packages/apollo-engine-reporting/src/agent.ts @@ -204,8 +204,8 @@ export interface AddTraceArgs { operationName: string; queryHash: string; schemaHash: SchemaHash; - queryString?: string; - documentAST?: DocumentNode; + source?: string; + document?: DocumentNode; } const serviceHeaderDefaults = { @@ -286,9 +286,9 @@ export class EngineReportingAgent { public async addTrace({ trace, queryHash, - documentAST, + document, operationName, - queryString, + source, schemaHash, }: AddTraceArgs): Promise { // Ignore traces that come in after stop(). @@ -320,8 +320,8 @@ export class EngineReportingAgent { const signature = await this.getTraceSignature({ queryHash, - documentAST, - queryString, + document, + source, operationName, }); @@ -486,17 +486,17 @@ export class EngineReportingAgent { private async getTraceSignature({ queryHash, operationName, - documentAST, - queryString, + document, + source, }: { queryHash: string; operationName: string; - documentAST?: DocumentNode; - queryString?: string; + document?: DocumentNode; + source?: string; }): Promise { - if (!documentAST && !queryString) { + if (!document && !source) { // This shouldn't happen: one of those options must be passed to runQuery. - throw new Error('No queryString or parsedQuery?'); + throw new Error('No document or source?'); } const cacheKey = signatureCacheKey(queryHash, operationName); @@ -511,7 +511,7 @@ export class EngineReportingAgent { return cachedSignature; } - if (!documentAST) { + if (!document) { // We didn't get an AST, possibly because of a parse failure. Let's just // use the full query string. // @@ -519,12 +519,12 @@ export class EngineReportingAgent { // hides literals, you might end up sending literals for queries // that fail parsing or validation. Provide some way to mask them // anyway? - return queryString as string; + return source as string; } const generatedSignature = ( this.options.calculateSignature || defaultEngineReportingSignature - )(documentAST, operationName); + )(document, operationName); // Intentionally not awaited so the cache can be written to at leisure. this.signatureCache.set(cacheKey, generatedSignature); diff --git a/packages/apollo-engine-reporting/src/plugin.ts b/packages/apollo-engine-reporting/src/plugin.ts index 289114eece4..cc950c558eb 100644 --- a/packages/apollo-engine-reporting/src/plugin.ts +++ b/packages/apollo-engine-reporting/src/plugin.ts @@ -149,8 +149,8 @@ export const plugin = ( addTrace({ operationName, queryHash: requestContext.queryHash!, - documentAST: requestContext.document, - queryString: requestContext.source, + document: requestContext.document, + source: requestContext.source, trace: treeBuilder.trace, schemaHash, }); From 6b0c83cf3a787d9b3d035a0a171e86cbf5442d9c Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 28 Apr 2020 17:52:33 +0000 Subject: [PATCH 484/642] Expand on comment about the `ftv1` extension. Per @glasser's https://github.com/apollographql/apollo-server/commit/a8ab841e#r38802002 --- packages/apollo-engine-reporting/src/federatedPlugin.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/apollo-engine-reporting/src/federatedPlugin.ts b/packages/apollo-engine-reporting/src/federatedPlugin.ts index bf1b04627f6..e69e6cc92e4 100644 --- a/packages/apollo-engine-reporting/src/federatedPlugin.ts +++ b/packages/apollo-engine-reporting/src/federatedPlugin.ts @@ -6,7 +6,10 @@ import { EngineReportingOptions } from "./agent"; type FederatedReportingOptions = Pick, 'rewriteError'> // This ftv1 plugin produces a base64'd Trace protobuf containing only the -// durationNs, startTime, endTime, and root fields. +// durationNs, startTime, endTime, and root fields. This output is placed +// on the `extensions`.`ftv1` property of the response. The Apollo Gateway +// utilizes this data to construct the full trace and submit it to Apollo +// Graph Manager ingress. const federatedPlugin = ( options: FederatedReportingOptions = Object.create(null), ): ApolloServerPlugin => { From 7002bb7ac7c961121eb49a14e2177b1fff6fc9d7 Mon Sep 17 00:00:00 2001 From: Paul Daniels Date: Wed, 29 Apr 2020 22:10:23 +0800 Subject: [PATCH 485/642] Add caliban to the list of federation support (#4038) --- docs/source/federation/other-servers.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/source/federation/other-servers.md b/docs/source/federation/other-servers.md index 4e8c9738ac6..2cfa5020241 100644 --- a/docs/source/federation/other-servers.md +++ b/docs/source/federation/other-servers.md @@ -15,6 +15,7 @@ The following is a list of known open source GraphQL server libraries that have | PHP | wp-graphql | [wp-graphql-federation](https://github.com/wp-graphql/wp-graphql-federation) | | Python | ariadne | [ariadne](https://github.com/mirumee/ariadne) | | Python | graphene | [graphene-federation](https://github.com/preply/graphene-federation) | +| Scala | caliban | [caliban](https://github.com/ghostdogpr/caliban) | | Ruby | graphql-ruby | [apollo-federation-ruby](https://github.com/Gusto/apollo-federation-ruby) | | Rust | async-graphql | [async-graphql](https://github.com/async-graphql/async-graphql) | From d91231d31f6a26e2b0748242b2f78cc4d4107397 Mon Sep 17 00:00:00 2001 From: Yu <39558084+yuuyu00@users.noreply.github.com> Date: Wed, 29 Apr 2020 23:13:42 +0900 Subject: [PATCH 486/642] docs: fix typo in CHANGELOG.md. (#4045) --- CHANGELOG.md | 2 +- packages/apollo-engine-reporting-protobuf/README.md | 2 +- packages/apollo-federation/CHANGELOG.md | 2 +- packages/apollo-gateway/CHANGELOG.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ccbbe7fac65..09bb55ff65c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ The version headers in this history reflect the versions of Apollo Server itself ### vNEXT -> 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. When a release is being prepared, a new header will be (manually) created below and the the appropriate changes within that release will be moved into the new section. +> 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. 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`: Deprecate the `ENGINE_API_KEY` environment variable in favor of its new name, `APOLLO_KEY`. Continued use of `ENGINE_API_KEY` will result in deprecation warnings and support for it will be removed in a future major version. [#3923](https://github.com/apollographql/apollo-server/pull/3923) - `apollo-engine-reporting`: Deprecated the `APOLLO_SCHEMA_TAG` environment variable in favor of its new name, `APOLLO_GRAPH_VARIANT`. Similarly, within the `engine` configuration object, the `schemaTag` property has been renamed `graphVariant`. The functionality remains otherwise unchanged, but their new names mirror the name used within Apollo Graph Manager. Continued use of the now-deprecated names will result in deprecation warnings and support will be dropped completely in the next "major" update. To avoid misconfiguration, a runtime error will be thrown if _both_ new and deprecated names are set. [PR #3855](https://github.com/apollographql/apollo-server/pull/3855) diff --git a/packages/apollo-engine-reporting-protobuf/README.md b/packages/apollo-engine-reporting-protobuf/README.md index 8e2721f2e00..1a9129e974b 100644 --- a/packages/apollo-engine-reporting-protobuf/README.md +++ b/packages/apollo-engine-reporting-protobuf/README.md @@ -22,7 +22,7 @@ Currently, this package generates a majority of its code with `reports.proto` file. The output is generated with the `prepare` npm script. The root of the repository provides the `devDependencies` necessary to build -these definitions (e.g. `pbjs`, `pbts`, `protobuf`, etc.) and the the `prepare` +these definitions (e.g. `pbjs`, `pbts`, `protobuf`, etc.) and the `prepare` npm script is invoked programmatically via the monorepo tooling (e.g. Lerna) thanks to _this_ module's `postinstall` script. Therefore, when making changes to this module, `npx lerna run prepare` should be run from the **root** diff --git a/packages/apollo-federation/CHANGELOG.md b/packages/apollo-federation/CHANGELOG.md index 872e00aa816..9f91d8204d3 100644 --- a/packages/apollo-federation/CHANGELOG.md +++ b/packages/apollo-federation/CHANGELOG.md @@ -2,7 +2,7 @@ ### vNEXT -> 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. When a release is being prepared, a new header will be (manually) created below and the the appropriate changes within that release will be moved into the new section. +> 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. 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. - _Nothing yet! Stay tuned._ diff --git a/packages/apollo-gateway/CHANGELOG.md b/packages/apollo-gateway/CHANGELOG.md index bce2b5e9103..206c9675d4d 100644 --- a/packages/apollo-gateway/CHANGELOG.md +++ b/packages/apollo-gateway/CHANGELOG.md @@ -2,7 +2,7 @@ ### vNEXT -> 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. When a release is being prepared, a new header will be (manually) created below and the the appropriate changes within that release will be moved into the new section. +> 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. 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. - Deprecated the `ENGINE_API_KEY` environment variable in favor of its new name, `APOLLO_KEY`. Continued use of `ENGINE_API_KEY` will result in deprecation warnings being printed to the server console. Support for `ENGINE_API_KEY` will be removed in a future, major update. [#3923](https://github.com/apollographql/apollo-server/pull/3923) - Deprecated the `APOLLO_SCHEMA_TAG` environment variable in favor of its new name, `APOLLO_GRAPH_VARIANT`. The functionality remains otherwise identical, but the new name mirrors the name used within Apollo Graph Manager. Use of the now-deprecated name will result in a deprecation warning being printed to the server console. Support will be removed entirely in a future, major update. To avoid misconfiguration, runtime errors will be thrown if the new and deprecated name are _both_ set. [#3855](https://github.com/apollographql/apollo-server/pull/3855) From c3d388b732a1eedb5c312622f179b9ca56f30c76 Mon Sep 17 00:00:00 2001 From: Marchenko Alexandr Date: Wed, 29 Apr 2020 17:17:17 +0300 Subject: [PATCH 487/642] fix for #3962 become windows friendly (#4044) --- packages/apollo-engine-reporting-protobuf/package.json | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/apollo-engine-reporting-protobuf/package.json b/packages/apollo-engine-reporting-protobuf/package.json index 51e3e80ba08..204693b41da 100644 --- a/packages/apollo-engine-reporting-protobuf/package.json +++ b/packages/apollo-engine-reporting-protobuf/package.json @@ -5,9 +5,13 @@ "main": "dist/index.js", "types": "dist/index.d.ts", "scripts": { - "prepare": "npm run pbjs && npm run pbts && cp src/* dist", - "pbjs": "bash -c 'mkdir -p dist && apollo-pbjs --target static-module --out dist/protobuf.js --wrap commonjs --force-number <(grep -v \"package mdg.engine.proto\" src/reports.proto)'", - "pbts": "apollo-pbts -o dist/protobuf.d.ts dist/protobuf.js" + "clean": "git clean -fdX -- dist", + "prepare": "npm run clean && mkdir dist && npm run prepare:proto && npm run pbjs && npm run pbts && cp src/* dist", + "pbjs": "apollo-pbjs --target static-module --out dist/protobuf.js --wrap commonjs --force-number dist/reports.proto", + "pbts": "apollo-pbts -o dist/protobuf.d.ts dist/protobuf.js", + "prepare:proto": "npm run prepare:proto:nix -s || npm run prepare:proto:win -s", + "prepare:proto:nix": "grep -v \"package mdg.engine.proto\" src/reports.proto > dist/reports.proto", + "prepare:proto:win": "type src\\reports.proto | findstr /V \"package mdg.engine.proto\" > dist/reports.proto" }, "repository": { "type": "git", From 378f4580d762563913ae08210d2d175496c035a5 Mon Sep 17 00:00:00 2001 From: Marchenko Alexandr Date: Wed, 29 Apr 2020 17:19:11 +0300 Subject: [PATCH 488/642] fix for #3961 (#4043) --- packages/apollo-server-env/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-env/package.json b/packages/apollo-server-env/package.json index 6bdf84e0a74..9330d1d161b 100644 --- a/packages/apollo-server-env/package.json +++ b/packages/apollo-server-env/package.json @@ -15,7 +15,7 @@ "browser": "dist/index.browser.js", "types": "dist/index.d.ts", "scripts": { - "clean": "rm -rf dist", + "clean": "git clean -fdX -- dist", "compile": "tsc && cp src/*.d.ts dist", "prepare": "npm run clean && npm run compile" }, From d7f7ccb831f21e6f63f477fee8bc5cc218e5f261 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 30 Apr 2020 18:18:45 +0300 Subject: [PATCH 489/642] Drop support for Node.js 8 and 10 in Gateway. (#4031) --- packages/apollo-gateway/CHANGELOG.md | 1 + packages/apollo-gateway/jest.config.js | 2 +- packages/apollo-gateway/package.json | 2 +- packages/apollo-gateway/tsconfig.json | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/apollo-gateway/CHANGELOG.md b/packages/apollo-gateway/CHANGELOG.md index 8431f5a4292..fb4679f9378 100644 --- a/packages/apollo-gateway/CHANGELOG.md +++ b/packages/apollo-gateway/CHANGELOG.md @@ -17,6 +17,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline > 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. When a release is being prepared, a new header will be (manually) created below and the the appropriate changes within that release will be moved into the new section. +- __BREAKING__: Drop support for Node.js 8 and Node.js 10. This is being done primarily for performance gains which stand to be seen by transpiling to a newer ECMAScript target. For more details, see the related PR. [#4031](https://github.com/apollographql/apollo-server/pull/4031) - Deprecated the `ENGINE_API_KEY` environment variable in favor of its new name, `APOLLO_KEY`. Continued use of `ENGINE_API_KEY` will result in deprecation warnings being printed to the server console. Support for `ENGINE_API_KEY` will be removed in a future, major update. [#3923](https://github.com/apollographql/apollo-server/pull/3923) - Deprecated the `APOLLO_SCHEMA_TAG` environment variable in favor of its new name, `APOLLO_GRAPH_VARIANT`. The functionality remains otherwise identical, but the new name mirrors the name used within Apollo Graph Manager. Use of the now-deprecated name will result in a deprecation warning being printed to the server console. Support will be removed entirely in a future, major update. To avoid misconfiguration, runtime errors will be thrown if the new and deprecated name are _both_ set. [#3855](https://github.com/apollographql/apollo-server/pull/3855) - Cache stringified representations of downstream query bodies within the query plan to address performance implications incurred by repeatedly `print`ing the same`DocumentNode`s with the `graphql` printer. This improvement is more pronounced on larger documents. [PR #4018](https://github.com/apollographql/apollo-server/pull/4018) diff --git a/packages/apollo-gateway/jest.config.js b/packages/apollo-gateway/jest.config.js index 29528a49090..ae9d3e7cef4 100644 --- a/packages/apollo-gateway/jest.config.js +++ b/packages/apollo-gateway/jest.config.js @@ -10,7 +10,7 @@ const additionalConfig = { setupFilesAfterEnv: [path.resolve(__dirname, './src/__tests__/testSetup.ts')], testPathIgnorePatterns: [ ...config.testPathIgnorePatterns, - ...NODE_MAJOR_VERSION === 6 ? [""] : [] + ...NODE_MAJOR_VERSION < 12 ? [""] : [] ] }; diff --git a/packages/apollo-gateway/package.json b/packages/apollo-gateway/package.json index 1f19b91e344..5fac4b1c593 100644 --- a/packages/apollo-gateway/package.json +++ b/packages/apollo-gateway/package.json @@ -12,7 +12,7 @@ "Javascript" ], "engines": { - "node": ">=8" + "node": ">=12.13.0" }, "license": "MIT", "publishConfig": { diff --git a/packages/apollo-gateway/tsconfig.json b/packages/apollo-gateway/tsconfig.json index 36be67985df..a97b77c7ebd 100644 --- a/packages/apollo-gateway/tsconfig.json +++ b/packages/apollo-gateway/tsconfig.json @@ -1,6 +1,7 @@ { "extends": "../../tsconfig.base", "compilerOptions": { + "target": "es2019", "rootDir": "./src", "outDir": "./dist" }, From f32c6779d691a76513e14639b323cb13042f580c Mon Sep 17 00:00:00 2001 From: Trevor Scheer Date: Fri, 1 May 2020 11:59:40 -0700 Subject: [PATCH 490/642] Release - apollo-server-plugin-operation-registry@0.3.1 --- packages/apollo-server-plugin-operation-registry/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/package.json b/packages/apollo-server-plugin-operation-registry/package.json index bbe472065c5..4bca1154e2f 100644 --- a/packages/apollo-server-plugin-operation-registry/package.json +++ b/packages/apollo-server-plugin-operation-registry/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-plugin-operation-registry", - "version": "0.3.0", + "version": "0.3.1", "description": "Apollo Server operation registry", "main": "dist/index.js", "types": "dist/index.d.ts", From cad00f2167cf41a40ec26b388d5542af9f7e385d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 2 May 2020 08:12:55 +0000 Subject: [PATCH 491/642] chore(deps): update dependency gatsby to v2.21.9 (#4057) Co-authored-by: Renovate Bot --- docs/package-lock.json | 1588 +++++++++++++++++++++++++++++++--------- docs/package.json | 2 +- 2 files changed, 1263 insertions(+), 327 deletions(-) diff --git a/docs/package-lock.json b/docs/package-lock.json index 2d985b0e04b..c65d8f1dcd4 100644 --- a/docs/package-lock.json +++ b/docs/package-lock.json @@ -1755,9 +1755,9 @@ } }, "@babel/plugin-transform-runtime": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.9.0.tgz", - "integrity": "sha512-pUu9VSf3kI1OqbWINQ7MaugnitRss1z533436waNXp+0N3ur3zfut37sXiQMxkuCF4VUjwZucen/quskCh7NHw==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.9.6.tgz", + "integrity": "sha512-qcmiECD0mYOjOIt8YHNsAP1SxPooC/rDmfmiSK9BNY72EitdSc7l44WTEklaWuFtbOEBjNhWWyph/kOImbNJ4w==", "requires": { "@babel/helper-module-imports": "^7.8.3", "@babel/helper-plugin-utils": "^7.8.3", @@ -2207,9 +2207,9 @@ } }, "@babel/runtime-corejs3": { - "version": "7.9.2", - "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.9.2.tgz", - "integrity": "sha512-HHxmgxbIzOfFlZ+tdeRKtaxWOMUoCG5Mu3wKeUmOxjYrwb3AAHgnmtCUbPPK11/raIWLIBK250t8E2BPO0p7jA==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.9.6.tgz", + "integrity": "sha512-6toWAfaALQjt3KMZQc6fABqZwUDDuWzz+cAfPhqyEnzxvdWOAkjwPNxgF8xlmo7OWLsSjaKjsskpKHRLaMArOA==", "requires": { "core-js-pure": "^3.0.0", "regenerator-runtime": "^0.13.4" @@ -2223,9 +2223,9 @@ } }, "@babel/standalone": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/standalone/-/standalone-7.9.5.tgz", - "integrity": "sha512-J6mHRjRUh4pKCd1uz5ghF2LpUwMuGwxy4z+TM+jbvt0dM6NiXd8Z2UOD1ftmGfkuAuDYlgcz4fm62MIjt8iUlg==" + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/standalone/-/standalone-7.9.6.tgz", + "integrity": "sha512-UE0vm/4vuwzGgGNY9wR78ft3DUcHvAU0o/esXas2qjUL8yHMAEc04OmLkb3dfkUwlqbQ4+vC1OLBzwhcoIqLsA==" }, "@babel/template": { "version": "7.8.3", @@ -2499,9 +2499,9 @@ } }, "@jest/types": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.4.0.tgz", - "integrity": "sha512-XBeaWNzw2PPnGW5aXvZt3+VO60M+34RY3XDsCK5tW7kyj3RK0XClRutCfjqcBuaR2aBQTbluEDME9b5MB9UAPw==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz", + "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==", "requires": { "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^1.1.1", @@ -2604,12 +2604,12 @@ "integrity": "sha512-L3rehITVxqDHOPJFGBSHKt3Mv/p3MENYlGIwLNYU89/iVqTLMD/vz8hL9RQtKqRoMbKuWpzzLlKIObqJzthNYg==" }, "@mdx-js/runtime": { - "version": "1.5.9", - "resolved": "https://registry.npmjs.org/@mdx-js/runtime/-/runtime-1.5.9.tgz", - "integrity": "sha512-h6nkjaRPXe9uNnXBObxxqHguOcXacpWqoBke5NJDPiDdaBlSl5RYG0JziKbgmJFRNEn2RkQlk/YPT46BghB7Fw==", + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/@mdx-js/runtime/-/runtime-1.6.1.tgz", + "integrity": "sha512-aqBheB4Qj/zj/YpfXoI2csQor4xSDgIzm1R8OgHXd6ePdZRxPLtwoQUgEHN/M40yq8QsRE+edvH5wlQeBXhJyw==", "requires": { - "@mdx-js/mdx": "^1.5.9", - "@mdx-js/react": "^1.5.9", + "@mdx-js/mdx": "^1.6.1", + "@mdx-js/react": "^1.6.1", "buble-jsx-only": "^0.19.8" }, "dependencies": { @@ -2645,11 +2645,11 @@ } }, "@babel/generator": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.5.tgz", - "integrity": "sha512-GbNIxVB3ZJe3tLeDm1HSn2AhuD/mVcyLDpgtLXa5tplmWrJdF/elxB56XNqCuD6szyNkDi6wuoKXln3QeBmCHQ==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.6.tgz", + "integrity": "sha512-+htwWKJbH2bL72HRluF8zumBxzuX0ZZUFl3JLNyoUjM/Ho8wnVpPXM6aUz8cfKDqQ/h7zHqKt4xzJteUosckqQ==", "requires": { - "@babel/types": "^7.9.5", + "@babel/types": "^7.9.6", "jsesc": "^2.5.1", "lodash": "^4.17.13", "source-map": "^0.5.0" @@ -2681,9 +2681,9 @@ } }, "@babel/parser": { - "version": "7.9.4", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz", - "integrity": "sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==" + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.6.tgz", + "integrity": "sha512-AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q==" }, "@babel/plugin-proposal-object-rest-spread": { "version": "7.9.5", @@ -2715,25 +2715,25 @@ } }, "@babel/traverse": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.5.tgz", - "integrity": "sha512-c4gH3jsvSuGUezlP6rzSJ6jf8fYjLj3hsMZRx/nX0h+fmHN0w+ekubRrHPqnMec0meycA2nwCsJ7dC8IPem2FQ==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.6.tgz", + "integrity": "sha512-b3rAHSjbxy6VEAvlxM8OV/0X4XrG72zoxme6q1MOoe2vd0bEc+TwayhuC1+Dfgqh1QEG+pj7atQqvUprHIccsg==", "requires": { "@babel/code-frame": "^7.8.3", - "@babel/generator": "^7.9.5", + "@babel/generator": "^7.9.6", "@babel/helper-function-name": "^7.9.5", "@babel/helper-split-export-declaration": "^7.8.3", - "@babel/parser": "^7.9.0", - "@babel/types": "^7.9.5", + "@babel/parser": "^7.9.6", + "@babel/types": "^7.9.6", "debug": "^4.1.0", "globals": "^11.1.0", "lodash": "^4.17.13" } }, "@babel/types": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.5.tgz", - "integrity": "sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.6.tgz", + "integrity": "sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA==", "requires": { "@babel/helper-validator-identifier": "^7.9.5", "lodash": "^4.17.13", @@ -2748,24 +2748,24 @@ } }, "@mdx-js/mdx": { - "version": "1.5.9", - "resolved": "https://registry.npmjs.org/@mdx-js/mdx/-/mdx-1.5.9.tgz", - "integrity": "sha512-K/qYIWwV5+V1ChVHga3ZzXlXtEuNsBOt/QI54K+DvD4ayu9WdbBv/953JdC2ZPrHQek48WIbKBH27omZPA6ZPA==", + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/@mdx-js/mdx/-/mdx-1.6.1.tgz", + "integrity": "sha512-DLnHbYZGoXSzfIHKgEtsO4qP8029YbdyJvC746PwfPNrRyGciPsqgWmfz/nEXt/fg+UMBG/6/cZaZx/hvyxnyg==", "requires": { "@babel/core": "7.9.0", "@babel/plugin-syntax-jsx": "7.8.3", "@babel/plugin-syntax-object-rest-spread": "7.8.3", - "@mdx-js/util": "^1.5.9", - "babel-plugin-apply-mdx-type-prop": "^1.5.9", - "babel-plugin-extract-import-names": "^1.5.9", + "@mdx-js/util": "^1.6.1", + "babel-plugin-apply-mdx-type-prop": "^1.6.1", + "babel-plugin-extract-import-names": "^1.6.1", "camelcase-css": "2.0.1", "detab": "2.0.3", "hast-util-raw": "5.0.2", "lodash.uniq": "4.5.0", "mdast-util-to-hast": "8.2.0", "remark-footnotes": "1.0.0", - "remark-mdx": "^1.5.9", - "remark-parse": "8.0.1", + "remark-mdx": "^1.6.1", + "remark-parse": "8.0.2", "remark-squeeze-paragraphs": "4.0.0", "style-to-object": "0.3.0", "unified": "9.0.0", @@ -2774,28 +2774,28 @@ } }, "@mdx-js/react": { - "version": "1.5.9", - "resolved": "https://registry.npmjs.org/@mdx-js/react/-/react-1.5.9.tgz", - "integrity": "sha512-rengdUSedIdIQbXPSeafItCacTYocARAjUA51b6R1KNHmz+59efz7UmyTKr73viJQZ98ouu7iRGmOTtjRrbbWA==" + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/@mdx-js/react/-/react-1.6.1.tgz", + "integrity": "sha512-jXBSWdWFPK2fs3johKb0hQFsf/x/C24XQYQwMhj8FxwlBgf7+NGATwXFs6pGkKd5/JfK9HXmbOcQ78MYoIZyxA==" }, "@mdx-js/util": { - "version": "1.5.9", - "resolved": "https://registry.npmjs.org/@mdx-js/util/-/util-1.5.9.tgz", - "integrity": "sha512-hty9ftw/RENS+6pEXTy4vi46CO7cDRdhcELxCaklcGTuxeqi9OROJ+oi03RJd2O2V+3wY5geGAdXKlPQCOTE/Q==" + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/@mdx-js/util/-/util-1.6.1.tgz", + "integrity": "sha512-A3TBBjg5iVo8S4TTG0VrW8G9YNLob4+M6rALKjY8Sxr9zPExWQ7iTPUSvJVE7YhF9E08EQMubx1vRal3jtpJ9Q==" }, "babel-plugin-apply-mdx-type-prop": { - "version": "1.5.9", - "resolved": "https://registry.npmjs.org/babel-plugin-apply-mdx-type-prop/-/babel-plugin-apply-mdx-type-prop-1.5.9.tgz", - "integrity": "sha512-3uNQ4Zo/TjOaB0E98m6ez2Xfrb7IYAs5BB4b8zQXggPCCppg5kjQEe8AglH6F6b94+q7Qv/cNTnoNqGXs6RBEA==", + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/babel-plugin-apply-mdx-type-prop/-/babel-plugin-apply-mdx-type-prop-1.6.1.tgz", + "integrity": "sha512-chjmLo1x7fCpDRICGUlbkwf2E6sMVG9jjG6PtPBWnQfMEjgV03Gh0jSVGbZJsEUxcMqOpHSsIXvPz1sYip6X3g==", "requires": { "@babel/helper-plugin-utils": "7.8.3", - "@mdx-js/util": "^1.5.9" + "@mdx-js/util": "^1.6.1" } }, "babel-plugin-extract-import-names": { - "version": "1.5.9", - "resolved": "https://registry.npmjs.org/babel-plugin-extract-import-names/-/babel-plugin-extract-import-names-1.5.9.tgz", - "integrity": "sha512-0V3/VJClG/pUn7wnlmWByJdhJklZWD4XvR9P+Q7wDWs9kS48lmmB5Pp6+zvbTBBQGlqJB5/bBtwMRm4zdoPNzg==", + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/babel-plugin-extract-import-names/-/babel-plugin-extract-import-names-1.6.1.tgz", + "integrity": "sha512-u0uRrPyygx4RlNva1aqz7DM9UBpsQJQZ4NyakHVJF18s73H/iiyXuc+X7k+9tHeN0WKLsohQUGzGLli6z5a0Zw==", "requires": { "@babel/helper-plugin-utils": "7.8.3" } @@ -2864,24 +2864,24 @@ } }, "remark-mdx": { - "version": "1.5.9", - "resolved": "https://registry.npmjs.org/remark-mdx/-/remark-mdx-1.5.9.tgz", - "integrity": "sha512-HFr/VOVoJ2lnZsN090wttFTcqXIker49S5JT3Tem8SKMeQoRA9Pl+iIlEOZau+C9w6ISZj79l6nwzrflAa5VDA==", + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/remark-mdx/-/remark-mdx-1.6.1.tgz", + "integrity": "sha512-UyCqqYFv9l5dstX29QpdqMprBHyUYUEQHOUe0MdFUIm1XATxfVGHbRPtVBFz4ccd5NV1UL/rmsruo9WOswwmpQ==", "requires": { "@babel/core": "7.9.0", "@babel/helper-plugin-utils": "7.8.3", "@babel/plugin-proposal-object-rest-spread": "7.9.5", "@babel/plugin-syntax-jsx": "7.8.3", - "@mdx-js/util": "^1.5.9", + "@mdx-js/util": "^1.6.1", "is-alphabetical": "1.0.4", - "remark-parse": "8.0.1", + "remark-parse": "8.0.2", "unified": "9.0.0" } }, "remark-parse": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-8.0.1.tgz", - "integrity": "sha512-Ye/5W57tdQZWsfkuVyRq9SUWRgECHnDsMuyUMzdSKpTbNPkZeGtoYfsrkeSi4+Xyl0mhcPPddHITXPcCPHrl3w==", + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-8.0.2.tgz", + "integrity": "sha512-eMI6kMRjsAGpMXXBAywJwiwAse+KNpmt+BK55Oofy4KvBZEqUDj6mWbGLJZrujoPIPPxDXzn3T9baRlpsm2jnQ==", "requires": { "ccount": "^1.0.0", "collapse-white-space": "^1.0.2", @@ -3377,9 +3377,9 @@ "integrity": "sha512-ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw==" }, "@types/reach__router": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/@types/reach__router/-/reach__router-1.3.4.tgz", - "integrity": "sha512-DZgYfxUIlVSjvf0AvBbYNbpXLrTFNNpU1HrvCRbnMtx3nvGUUWC1/zlAe4dD4FCPFtc+LQuIPEsDiTb0zQkthg==", + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/@types/reach__router/-/reach__router-1.3.5.tgz", + "integrity": "sha512-h0NbqXN/tJuBY/xggZSej1SKQEstbHO7J/omt1tYoFGmj3YXOodZKbbqD4mNDh7zvEGYd7YFrac1LTtAr3xsYQ==", "requires": { "@types/history": "*", "@types/react": "*" @@ -3464,42 +3464,42 @@ "optional": true }, "@typescript-eslint/eslint-plugin": { - "version": "2.29.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.29.0.tgz", - "integrity": "sha512-X/YAY7azKirENm4QRpT7OVmzok02cSkqeIcLmdz6gXUQG4Hk0Fi9oBAynSAyNXeGdMRuZvjBa0c1Lu0dn/u6VA==", + "version": "2.30.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.30.0.tgz", + "integrity": "sha512-PGejii0qIZ9Q40RB2jIHyUpRWs1GJuHP1pkoCiaeicfwO9z7Fx03NQzupuyzAmv+q9/gFNHu7lo1ByMXe8PNyg==", "requires": { - "@typescript-eslint/experimental-utils": "2.29.0", + "@typescript-eslint/experimental-utils": "2.30.0", "functional-red-black-tree": "^1.0.1", "regexpp": "^3.0.0", "tsutils": "^3.17.1" } }, "@typescript-eslint/experimental-utils": { - "version": "2.29.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.29.0.tgz", - "integrity": "sha512-H/6VJr6eWYstyqjWXBP2Nn1hQJyvJoFdDtsHxGiD+lEP7piGnGpb/ZQd+z1ZSB1F7dN+WsxUDh8+S4LwI+f3jw==", + "version": "2.30.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.30.0.tgz", + "integrity": "sha512-L3/tS9t+hAHksy8xuorhOzhdefN0ERPDWmR9CclsIGOUqGKy6tqc/P+SoXeJRye5gazkuPO0cK9MQRnolykzkA==", "requires": { "@types/json-schema": "^7.0.3", - "@typescript-eslint/typescript-estree": "2.29.0", + "@typescript-eslint/typescript-estree": "2.30.0", "eslint-scope": "^5.0.0", "eslint-utils": "^2.0.0" } }, "@typescript-eslint/parser": { - "version": "2.29.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.29.0.tgz", - "integrity": "sha512-H78M+jcu5Tf6m/5N8iiFblUUv+HJDguMSdFfzwa6vSg9lKR8Mk9BsgeSjO8l2EshKnJKcbv0e8IDDOvSNjl0EA==", + "version": "2.30.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.30.0.tgz", + "integrity": "sha512-9kDOxzp0K85UnpmPJqUzdWaCNorYYgk1yZmf4IKzpeTlSAclnFsrLjfwD9mQExctLoLoGAUXq1co+fbr+3HeFw==", "requires": { "@types/eslint-visitor-keys": "^1.0.0", - "@typescript-eslint/experimental-utils": "2.29.0", - "@typescript-eslint/typescript-estree": "2.29.0", + "@typescript-eslint/experimental-utils": "2.30.0", + "@typescript-eslint/typescript-estree": "2.30.0", "eslint-visitor-keys": "^1.1.0" } }, "@typescript-eslint/typescript-estree": { - "version": "2.29.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.29.0.tgz", - "integrity": "sha512-3YGbtnWy4az16Egy5Fj5CckkVlpIh0MADtAQza+jiMADRSKkjdpzZp/5WuvwK/Qib3Z0HtzrDFeWanS99dNhnA==", + "version": "2.30.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.30.0.tgz", + "integrity": "sha512-nI5WOechrA0qAhnr+DzqwmqHsx7Ulr/+0H7bWCcClDhhWkSyZR5BmTvnBEyONwJCTWHfc5PAQExX24VD26IAVw==", "requires": { "debug": "^4.1.1", "eslint-visitor-keys": "^1.1.0", @@ -3526,11 +3526,11 @@ } }, "@urql/core": { - "version": "1.11.5", - "resolved": "https://registry.npmjs.org/@urql/core/-/core-1.11.5.tgz", - "integrity": "sha512-id341sUsA5NQqftKFMV2d8AtV1h+cX68+QVZOfueZPCLyLTt8JlZQOn8/uFJQ2vlg3swNMvqtWAGytqMZNutSg==", + "version": "1.11.7", + "resolved": "https://registry.npmjs.org/@urql/core/-/core-1.11.7.tgz", + "integrity": "sha512-0LGOfohIoCmBf66QEV8pdwehJUZkViGZLmwPoHwcZUx1ONgKsGTzjdNBdNnvCzfuaRLlsXj8r7GmO5M6oVKjsg==", "requires": { - "wonka": "^4.0.9" + "wonka": "^4.0.10" } }, "@webassemblyjs/ast": { @@ -4251,9 +4251,9 @@ "integrity": "sha512-g1iSHKVxornw0K8LG9LLdf+Fxnv7T1Z+mMsf0/YYLclQX4Cd522Ap0Lrw6NFqHgezit78dtyWxzlV2Xfc7vgRg==" }, "electron-to-chromium": { - "version": "1.3.418", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.418.tgz", - "integrity": "sha512-i2QrQtHes5fK/F9QGG5XacM5WKEuR322fxTYF9e8O9Gu0mc0WmjjwGpV8c7Htso6Zf2Di18lc3SIPxmMeRFBug==" + "version": "1.3.427", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.427.tgz", + "integrity": "sha512-/rG5G7Opcw68/Yrb4qYkz07h3bESVRJjUl4X/FrKLXzoUJleKm6D7K7rTTz8V5LUWnd+BbTOyxJX2XprRqHD8A==" }, "node-releases": { "version": "1.1.53", @@ -4534,9 +4534,9 @@ } }, "babel-plugin-remove-graphql-queries": { - "version": "2.8.5", - "resolved": "https://registry.npmjs.org/babel-plugin-remove-graphql-queries/-/babel-plugin-remove-graphql-queries-2.8.5.tgz", - "integrity": "sha512-MnGJM4mYyhBS7xl0VUjbRk9ETRRl8H64nvg5VE3TPKPPVfRrdpUwYz0iCzFxixY+VCVkT407Wmu10Bh9AYL2SQ==" + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/babel-plugin-remove-graphql-queries/-/babel-plugin-remove-graphql-queries-2.9.0.tgz", + "integrity": "sha512-lvunFJ/JPhQHh5nOGepg1V5aX4zmbBgrd7qjlBObvQHF7Enz0yh6PznKnwtIX54i+bMOrWPUjCZUPXg3Xs+FLQ==" }, "babel-plugin-syntax-jsx": { "version": "6.18.0", @@ -4549,37 +4549,349 @@ "integrity": "sha512-eqj0hVcJUR57/Ug2zE1Yswsw4LhuqqHhD+8v120T1cl3kjg76QwtyBrdIk4WVwK+lAhBJVYCd/v+4nc4y+8JsA==" }, "babel-preset-gatsby": { - "version": "0.3.6", - "resolved": "https://registry.npmjs.org/babel-preset-gatsby/-/babel-preset-gatsby-0.3.6.tgz", - "integrity": "sha512-3BZhFENS8KxP5Y0Y+XX8hntdfFkG3MRg5upwAeeM/P+k7wO0mBrUMNl+6ekYV1yEQabfMJq1sJG00w58r0KCMA==", + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/babel-preset-gatsby/-/babel-preset-gatsby-0.4.0.tgz", + "integrity": "sha512-LbzP0CYBhSb9Y/rniMS2tgvtn3/8Yk1wEQ4McxuCemZkhvcCEPsqN38vqFkhn74MTQIwY8o0v9DgKE42N50c+Q==", "requires": { "@babel/plugin-proposal-class-properties": "^7.8.3", "@babel/plugin-proposal-nullish-coalescing-operator": "^7.8.3", - "@babel/plugin-proposal-optional-chaining": "^7.8.3", + "@babel/plugin-proposal-optional-chaining": "^7.9.0", "@babel/plugin-syntax-dynamic-import": "^7.8.3", - "@babel/plugin-transform-runtime": "^7.8.3", + "@babel/plugin-transform-runtime": "^7.9.0", "@babel/plugin-transform-spread": "^7.8.3", - "@babel/preset-env": "^7.8.7", - "@babel/preset-react": "^7.8.3", - "@babel/runtime": "^7.8.7", - "babel-plugin-dynamic-import-node": "^2.3.0", + "@babel/preset-env": "^7.9.5", + "@babel/preset-react": "^7.9.4", + "@babel/runtime": "^7.9.2", + "babel-plugin-dynamic-import-node": "^2.3.3", "babel-plugin-macros": "^2.8.0", "babel-plugin-transform-react-remove-prop-types": "^0.4.24", - "gatsby-core-utils": "^1.1.4" + "gatsby-core-utils": "^1.2.0" }, "dependencies": { + "@babel/compat-data": { + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.9.6.tgz", + "integrity": "sha512-5QPTrNen2bm7RBc7dsOmcA5hbrS4O2Vhmk5XOL4zWW/zD/hV0iinpefDlkm+tBBy8kDtFaaeEvmAqt+nURAV2g==", + "requires": { + "browserslist": "^4.11.1", + "invariant": "^2.2.4", + "semver": "^5.5.0" + } + }, + "@babel/helper-compilation-targets": { + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.9.6.tgz", + "integrity": "sha512-x2Nvu0igO0ejXzx09B/1fGBxY9NXQlBW2kZsSxCJft+KHN8t9XWzIvFxtPHnBOAXpVsdxZKZFbRUC8TsNKajMw==", + "requires": { + "@babel/compat-data": "^7.9.6", + "browserslist": "^4.11.1", + "invariant": "^2.2.4", + "levenary": "^1.1.1", + "semver": "^5.5.0" + } + }, + "@babel/helper-create-regexp-features-plugin": { + "version": "7.8.8", + "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.8.tgz", + "integrity": "sha512-LYVPdwkrQEiX9+1R29Ld/wTrmQu1SSKYnuOk3g0CkcZMA1p0gsNxJFj/3gBdaJ7Cg0Fnek5z0DsMULePP7Lrqg==", + "requires": { + "@babel/helper-annotate-as-pure": "^7.8.3", + "@babel/helper-regex": "^7.8.3", + "regexpu-core": "^4.7.0" + } + }, + "@babel/helper-function-name": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz", + "integrity": "sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==", + "requires": { + "@babel/helper-get-function-arity": "^7.8.3", + "@babel/template": "^7.8.3", + "@babel/types": "^7.9.5" + } + }, + "@babel/helper-plugin-utils": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", + "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" + }, + "@babel/helper-regex": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.8.3.tgz", + "integrity": "sha512-BWt0QtYv/cg/NecOAZMdcn/waj/5P26DR4mVLXfFtDokSR6fyuG0Pj+e2FqtSME+MqED1khnSMulkmGl8qWiUQ==", + "requires": { + "lodash": "^4.17.13" + } + }, + "@babel/helper-validator-identifier": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz", + "integrity": "sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==" + }, + "@babel/plugin-proposal-object-rest-spread": { + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.6.tgz", + "integrity": "sha512-Ga6/fhGqA9Hj+y6whNpPv8psyaK5xzrQwSPsGPloVkvmH+PqW1ixdnfJ9uIO06OjQNYol3PMnfmJ8vfZtkzF+A==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.3", + "@babel/plugin-syntax-object-rest-spread": "^7.8.0", + "@babel/plugin-transform-parameters": "^7.9.5" + } + }, + "@babel/plugin-proposal-unicode-property-regex": { + "version": "7.8.8", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.8.tgz", + "integrity": "sha512-EVhjVsMpbhLw9ZfHWSx2iy13Q8Z/eg8e8ccVWt23sWQK5l1UdkoLJPN5w69UA4uITGBnEZD2JOe4QOHycYKv8A==", + "requires": { + "@babel/helper-create-regexp-features-plugin": "^7.8.8", + "@babel/helper-plugin-utils": "^7.8.3" + } + }, + "@babel/plugin-transform-classes": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.9.5.tgz", + "integrity": "sha512-x2kZoIuLC//O5iA7PEvecB105o7TLzZo8ofBVhP79N+DO3jaX+KYfww9TQcfBEZD0nikNyYcGB1IKtRq36rdmg==", + "requires": { + "@babel/helper-annotate-as-pure": "^7.8.3", + "@babel/helper-define-map": "^7.8.3", + "@babel/helper-function-name": "^7.9.5", + "@babel/helper-optimise-call-expression": "^7.8.3", + "@babel/helper-plugin-utils": "^7.8.3", + "@babel/helper-replace-supers": "^7.8.6", + "@babel/helper-split-export-declaration": "^7.8.3", + "globals": "^11.1.0" + } + }, + "@babel/plugin-transform-destructuring": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.9.5.tgz", + "integrity": "sha512-j3OEsGel8nHL/iusv/mRd5fYZ3DrOxWC82x0ogmdN/vHfAP4MYw+AFKYanzWlktNwikKvlzUV//afBW5FTp17Q==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.3" + } + }, + "@babel/plugin-transform-dotall-regex": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.8.3.tgz", + "integrity": "sha512-kLs1j9Nn4MQoBYdRXH6AeaXMbEJFaFu/v1nQkvib6QzTj8MZI5OQzqmD83/2jEM1z0DLilra5aWO5YpyC0ALIw==", + "requires": { + "@babel/helper-create-regexp-features-plugin": "^7.8.3", + "@babel/helper-plugin-utils": "^7.8.3" + } + }, + "@babel/plugin-transform-modules-amd": { + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.9.6.tgz", + "integrity": "sha512-zoT0kgC3EixAyIAU+9vfaUVKTv9IxBDSabgHoUCBP6FqEJ+iNiN7ip7NBKcYqbfUDfuC2mFCbM7vbu4qJgOnDw==", + "requires": { + "@babel/helper-module-transforms": "^7.9.0", + "@babel/helper-plugin-utils": "^7.8.3", + "babel-plugin-dynamic-import-node": "^2.3.3" + } + }, + "@babel/plugin-transform-modules-commonjs": { + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.6.tgz", + "integrity": "sha512-7H25fSlLcn+iYimmsNe3uK1at79IE6SKW9q0/QeEHTMC9MdOZ+4bA+T1VFB5fgOqBWoqlifXRzYD0JPdmIrgSQ==", + "requires": { + "@babel/helper-module-transforms": "^7.9.0", + "@babel/helper-plugin-utils": "^7.8.3", + "@babel/helper-simple-access": "^7.8.3", + "babel-plugin-dynamic-import-node": "^2.3.3" + } + }, + "@babel/plugin-transform-modules-systemjs": { + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.9.6.tgz", + "integrity": "sha512-NW5XQuW3N2tTHim8e1b7qGy7s0kZ2OH3m5octc49K1SdAKGxYxeIx7hiIz05kS1R2R+hOWcsr1eYwcGhrdHsrg==", + "requires": { + "@babel/helper-hoist-variables": "^7.8.3", + "@babel/helper-module-transforms": "^7.9.0", + "@babel/helper-plugin-utils": "^7.8.3", + "babel-plugin-dynamic-import-node": "^2.3.3" + } + }, + "@babel/plugin-transform-parameters": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.9.5.tgz", + "integrity": "sha512-0+1FhHnMfj6lIIhVvS4KGQJeuhe1GI//h5uptK4PvLt+BGBxsoUJbd3/IW002yk//6sZPlFgsG1hY6OHLcy6kA==", + "requires": { + "@babel/helper-get-function-arity": "^7.8.3", + "@babel/helper-plugin-utils": "^7.8.3" + } + }, + "@babel/preset-env": { + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.9.6.tgz", + "integrity": "sha512-0gQJ9RTzO0heXOhzftog+a/WyOuqMrAIugVYxMYf83gh1CQaQDjMtsOpqOwXyDL/5JcWsrCm8l4ju8QC97O7EQ==", + "requires": { + "@babel/compat-data": "^7.9.6", + "@babel/helper-compilation-targets": "^7.9.6", + "@babel/helper-module-imports": "^7.8.3", + "@babel/helper-plugin-utils": "^7.8.3", + "@babel/plugin-proposal-async-generator-functions": "^7.8.3", + "@babel/plugin-proposal-dynamic-import": "^7.8.3", + "@babel/plugin-proposal-json-strings": "^7.8.3", + "@babel/plugin-proposal-nullish-coalescing-operator": "^7.8.3", + "@babel/plugin-proposal-numeric-separator": "^7.8.3", + "@babel/plugin-proposal-object-rest-spread": "^7.9.6", + "@babel/plugin-proposal-optional-catch-binding": "^7.8.3", + "@babel/plugin-proposal-optional-chaining": "^7.9.0", + "@babel/plugin-proposal-unicode-property-regex": "^7.8.3", + "@babel/plugin-syntax-async-generators": "^7.8.0", + "@babel/plugin-syntax-dynamic-import": "^7.8.0", + "@babel/plugin-syntax-json-strings": "^7.8.0", + "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0", + "@babel/plugin-syntax-numeric-separator": "^7.8.0", + "@babel/plugin-syntax-object-rest-spread": "^7.8.0", + "@babel/plugin-syntax-optional-catch-binding": "^7.8.0", + "@babel/plugin-syntax-optional-chaining": "^7.8.0", + "@babel/plugin-syntax-top-level-await": "^7.8.3", + "@babel/plugin-transform-arrow-functions": "^7.8.3", + "@babel/plugin-transform-async-to-generator": "^7.8.3", + "@babel/plugin-transform-block-scoped-functions": "^7.8.3", + "@babel/plugin-transform-block-scoping": "^7.8.3", + "@babel/plugin-transform-classes": "^7.9.5", + "@babel/plugin-transform-computed-properties": "^7.8.3", + "@babel/plugin-transform-destructuring": "^7.9.5", + "@babel/plugin-transform-dotall-regex": "^7.8.3", + "@babel/plugin-transform-duplicate-keys": "^7.8.3", + "@babel/plugin-transform-exponentiation-operator": "^7.8.3", + "@babel/plugin-transform-for-of": "^7.9.0", + "@babel/plugin-transform-function-name": "^7.8.3", + "@babel/plugin-transform-literals": "^7.8.3", + "@babel/plugin-transform-member-expression-literals": "^7.8.3", + "@babel/plugin-transform-modules-amd": "^7.9.6", + "@babel/plugin-transform-modules-commonjs": "^7.9.6", + "@babel/plugin-transform-modules-systemjs": "^7.9.6", + "@babel/plugin-transform-modules-umd": "^7.9.0", + "@babel/plugin-transform-named-capturing-groups-regex": "^7.8.3", + "@babel/plugin-transform-new-target": "^7.8.3", + "@babel/plugin-transform-object-super": "^7.8.3", + "@babel/plugin-transform-parameters": "^7.9.5", + "@babel/plugin-transform-property-literals": "^7.8.3", + "@babel/plugin-transform-regenerator": "^7.8.7", + "@babel/plugin-transform-reserved-words": "^7.8.3", + "@babel/plugin-transform-shorthand-properties": "^7.8.3", + "@babel/plugin-transform-spread": "^7.8.3", + "@babel/plugin-transform-sticky-regex": "^7.8.3", + "@babel/plugin-transform-template-literals": "^7.8.3", + "@babel/plugin-transform-typeof-symbol": "^7.8.4", + "@babel/plugin-transform-unicode-regex": "^7.8.3", + "@babel/preset-modules": "^0.1.3", + "@babel/types": "^7.9.6", + "browserslist": "^4.11.1", + "core-js-compat": "^3.6.2", + "invariant": "^2.2.2", + "levenary": "^1.1.1", + "semver": "^5.5.0" + } + }, "@babel/runtime": { - "version": "7.9.2", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz", - "integrity": "sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.6.tgz", + "integrity": "sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==", "requires": { "regenerator-runtime": "^0.13.4" } }, + "@babel/types": { + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.6.tgz", + "integrity": "sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA==", + "requires": { + "@babel/helper-validator-identifier": "^7.9.5", + "lodash": "^4.17.13", + "to-fast-properties": "^2.0.0" + } + }, + "babel-plugin-dynamic-import-node": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz", + "integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==", + "requires": { + "object.assign": "^4.1.0" + } + }, + "browserslist": { + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.12.0.tgz", + "integrity": "sha512-UH2GkcEDSI0k/lRkuDSzFl9ZZ87skSy9w2XAn1MsZnL+4c4rqbBd3e82UWHbYDpztABrPBhZsTEeuxVfHppqDg==", + "requires": { + "caniuse-lite": "^1.0.30001043", + "electron-to-chromium": "^1.3.413", + "node-releases": "^1.1.53", + "pkg-up": "^2.0.0" + } + }, + "caniuse-lite": { + "version": "1.0.30001048", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001048.tgz", + "integrity": "sha512-g1iSHKVxornw0K8LG9LLdf+Fxnv7T1Z+mMsf0/YYLclQX4Cd522Ap0Lrw6NFqHgezit78dtyWxzlV2Xfc7vgRg==" + }, + "electron-to-chromium": { + "version": "1.3.427", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.427.tgz", + "integrity": "sha512-/rG5G7Opcw68/Yrb4qYkz07h3bESVRJjUl4X/FrKLXzoUJleKm6D7K7rTTz8V5LUWnd+BbTOyxJX2XprRqHD8A==" + }, + "gatsby-core-utils": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.2.0.tgz", + "integrity": "sha512-JBsVbniXObn26Hms8Je1vJdhMW04GesochBVLcaTraZC5dfqZDExPix65jrye/voC0YfFtXIngm59yspYZm1OQ==", + "requires": { + "ci-info": "2.0.0", + "configstore": "^5.0.1", + "node-object-hash": "^2.0.0" + } + }, + "jsesc": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", + "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=" + }, + "node-releases": { + "version": "1.1.53", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.53.tgz", + "integrity": "sha512-wp8zyQVwef2hpZ/dJH7SfSrIPD6YoJz6BDQDpGEkcA0s3LpAQoxBIYmfIq6QAhC1DhwsyCgTaTTcONwX8qzCuQ==" + }, + "regenerate-unicode-properties": { + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz", + "integrity": "sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==", + "requires": { + "regenerate": "^1.4.0" + } + }, "regenerator-runtime": { "version": "0.13.5", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==" + }, + "regexpu-core": { + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.0.tgz", + "integrity": "sha512-TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ==", + "requires": { + "regenerate": "^1.4.0", + "regenerate-unicode-properties": "^8.2.0", + "regjsgen": "^0.5.1", + "regjsparser": "^0.6.4", + "unicode-match-property-ecmascript": "^1.0.4", + "unicode-match-property-value-ecmascript": "^1.2.0" + } + }, + "regjsparser": { + "version": "0.6.4", + "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.4.tgz", + "integrity": "sha512-64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==", + "requires": { + "jsesc": "~0.5.0" + } + }, + "unicode-match-property-value-ecmascript": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz", + "integrity": "sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==" } } }, @@ -5244,11 +5556,10 @@ } }, "cache-manager-fs-hash": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/cache-manager-fs-hash/-/cache-manager-fs-hash-0.0.7.tgz", - "integrity": "sha512-7X+FPItAJf1tKKqJx6ljDJQc0fgSR5B+KPxFQLj+vYSL4q9XdrCbZldgsNb6wueRuIooj01wt0FubB08zaefRg==", + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/cache-manager-fs-hash/-/cache-manager-fs-hash-0.0.8.tgz", + "integrity": "sha512-U4N81RiwyUVSAutgfWxW1sV6YJRk9QgizCRXOqdEevMDNA+0uiXtnZTHYfg11RKyJnX+yXsaPsJHloIylk4ZhQ==", "requires": { - "es6-promisify": "^6.0.0", "lockfile": "^1.0.4" } }, @@ -7729,9 +8040,9 @@ "integrity": "sha512-D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw==" }, "envinfo": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.5.0.tgz", - "integrity": "sha512-jDgnJaF/Btomk+m3PZDTTCb5XIIIX3zYItnCRfF73zVgvinLoRomuhi75Y4su0PtQxWz4v66XnLLckyvyJTOIQ==" + "version": "7.5.1", + "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.5.1.tgz", + "integrity": "sha512-hQBkDf2iO4Nv0CNHpCuSBeaSrveU6nThVxFGTrq/eDlV716UQk09zChaJae4mZRsos1x4YLY2TaH3LHUae3ZmQ==" }, "eol": { "version": "0.9.1", @@ -7794,11 +8105,6 @@ "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz", "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==" }, - "es6-promisify": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-6.1.0.tgz", - "integrity": "sha512-jCsk2fpfEFusVv1MDkF4Uf0hAzIKNDMgR6LyOIw6a3jwkN1sCgWzuwgnsHY9YSQ8n8P31HoncvE0LC44cpWTrw==" - }, "escape-html": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", @@ -9870,16 +10176,16 @@ } }, "gatsby": { - "version": "2.20.36", - "resolved": "https://registry.npmjs.org/gatsby/-/gatsby-2.20.36.tgz", - "integrity": "sha512-op/rtiWTATX0e8EoQIm4xfXIb4zDkpUzx5sORBCoe1I13lX/q/Z3f6FM80WmFih89VngC9juXN7oGS8TF8GHxA==", + "version": "2.21.9", + "resolved": "https://registry.npmjs.org/gatsby/-/gatsby-2.21.9.tgz", + "integrity": "sha512-pvMJQqt2AsJYdNRe9KJjenJc5m0rhrleApqMRiKT5RBYWOGuGMh9Y7xZ0R20FoJPs6SIKErJAZ6DVTkD4WaE3w==", "requires": { "@babel/code-frame": "^7.8.3", - "@babel/core": "^7.8.7", - "@babel/parser": "^7.8.8", + "@babel/core": "^7.9.0", + "@babel/parser": "^7.9.4", "@babel/polyfill": "^7.8.7", - "@babel/runtime": "^7.8.7", - "@babel/traverse": "^7.8.6", + "@babel/runtime": "^7.9.2", + "@babel/traverse": "^7.9.5", "@hapi/joi": "^15.1.1", "@mikaelkristiansson/domready": "^1.0.10", "@pieh/friendly-errors-webpack-plugin": "1.7.0-chalk-2", @@ -9888,23 +10194,23 @@ "@typescript-eslint/eslint-plugin": "^2.24.0", "@typescript-eslint/parser": "^2.24.0", "address": "1.1.2", - "autoprefixer": "^9.7.4", + "autoprefixer": "^9.7.6", "axios": "^0.19.2", "babel-core": "7.0.0-bridge.0", "babel-eslint": "^10.1.0", - "babel-loader": "^8.0.6", + "babel-loader": "^8.1.0", "babel-plugin-add-module-exports": "^0.3.3", - "babel-plugin-dynamic-import-node": "^2.3.0", - "babel-plugin-remove-graphql-queries": "^2.8.5", - "babel-preset-gatsby": "^0.3.6", + "babel-plugin-dynamic-import-node": "^2.3.3", + "babel-plugin-remove-graphql-queries": "^2.9.0", + "babel-preset-gatsby": "^0.4.0", "better-opn": "1.0.0", "better-queue": "^3.8.10", "bluebird": "^3.7.2", - "browserslist": "^4.9.1", + "browserslist": "^4.12.0", "cache-manager": "^2.11.1", - "cache-manager-fs-hash": "^0.0.7", + "cache-manager-fs-hash": "^0.0.8", "chalk": "^2.4.2", - "chokidar": "3.3.1", + "chokidar": "3.4.0", "common-tags": "^1.8.0", "compression": "^1.7.4", "convert-hrtime": "^3.0.0", @@ -9912,18 +10218,18 @@ "core-js": "^2.6.11", "cors": "^2.8.5", "css-loader": "^1.0.1", - "date-fns": "^2.11.0", + "date-fns": "^2.12.0", "debug": "^3.2.6", "del": "^5.1.0", "detect-port": "^1.3.0", "devcert": "^1.1.0", "dotenv": "^8.2.0", "eslint": "^6.8.0", - "eslint-config-react-app": "^5.2.0", + "eslint-config-react-app": "^5.2.1", "eslint-loader": "^2.2.1", "eslint-plugin-flowtype": "^3.13.0", "eslint-plugin-graphql": "^3.1.1", - "eslint-plugin-import": "^2.20.1", + "eslint-plugin-import": "^2.20.2", "eslint-plugin-jsx-a11y": "^6.2.3", "eslint-plugin-react": "^7.19.0", "eslint-plugin-react-hooks": "^1.7.0", @@ -9935,18 +10241,18 @@ "flat": "^4.1.0", "fs-exists-cached": "1.0.0", "fs-extra": "^8.1.0", - "gatsby-cli": "^2.11.22", - "gatsby-core-utils": "^1.1.4", - "gatsby-graphiql-explorer": "^0.3.5", - "gatsby-link": "^2.3.5", - "gatsby-plugin-page-creator": "^2.2.4", - "gatsby-react-router-scroll": "^2.2.3", - "gatsby-telemetry": "^1.2.6", + "gatsby-cli": "^2.12.7", + "gatsby-core-utils": "^1.2.0", + "gatsby-graphiql-explorer": "^0.4.0", + "gatsby-link": "^2.4.0", + "gatsby-plugin-page-creator": "^2.3.0", + "gatsby-react-router-scroll": "^2.3.0", + "gatsby-telemetry": "^1.3.1", "glob": "^7.1.6", "got": "8.3.2", "graphql": "^14.6.0", "graphql-compose": "^6.3.8", - "graphql-playground-middleware-express": "^1.7.12", + "graphql-playground-middleware-express": "^1.7.14", "hasha": "^5.2.0", "invariant": "^2.2.4", "is-relative": "^1.0.0", @@ -9975,9 +10281,9 @@ "parseurl": "^1.3.3", "physical-cpu-count": "^2.0.0", "pnp-webpack-plugin": "^1.6.4", - "postcss-flexbugs-fixes": "^4.2.0", + "postcss-flexbugs-fixes": "^4.2.1", "postcss-loader": "^3.0.0", - "prompts": "^2.3.1", + "prompts": "^2.3.2", "prop-types": "^15.7.2", "raw-loader": "^0.5.1", "react-dev-utils": "^4.2.3", @@ -9989,7 +10295,7 @@ "semver": "^5.7.1", "shallow-compare": "^1.2.2", "sift": "^5.1.0", - "signal-exit": "^3.0.2", + "signal-exit": "^3.0.3", "slugify": "^1.4.0", "socket.io": "^2.3.0", "stack-trace": "^0.0.10", @@ -10002,14 +10308,14 @@ "util.promisify": "^1.0.1", "uuid": "^3.4.0", "v8-compile-cache": "^1.1.2", - "webpack": "~4.42.0", + "webpack": "~4.43.0", "webpack-dev-middleware": "^3.7.2", "webpack-dev-server": "^3.10.3", "webpack-hot-middleware": "^2.25.0", "webpack-merge": "^4.2.2", "webpack-stats-plugin": "^0.3.1", - "xstate": "^4.8.0", - "yaml-loader": "^0.5.0" + "xstate": "^4.9.1", + "yaml-loader": "^0.6.0" }, "dependencies": { "@babel/code-frame": { @@ -10021,18 +10327,18 @@ } }, "@babel/core": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.0.tgz", - "integrity": "sha512-kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.6.tgz", + "integrity": "sha512-nD3deLvbsApbHAHttzIssYqgb883yU/d9roe4RZymBCDaZryMJDbptVpEpeQuRh4BJ+SYI8le9YGxKvFEvl1Wg==", "requires": { "@babel/code-frame": "^7.8.3", - "@babel/generator": "^7.9.0", + "@babel/generator": "^7.9.6", "@babel/helper-module-transforms": "^7.9.0", - "@babel/helpers": "^7.9.0", - "@babel/parser": "^7.9.0", + "@babel/helpers": "^7.9.6", + "@babel/parser": "^7.9.6", "@babel/template": "^7.8.6", - "@babel/traverse": "^7.9.0", - "@babel/types": "^7.9.0", + "@babel/traverse": "^7.9.6", + "@babel/types": "^7.9.6", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.1", @@ -10054,11 +10360,11 @@ } }, "@babel/generator": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.5.tgz", - "integrity": "sha512-GbNIxVB3ZJe3tLeDm1HSn2AhuD/mVcyLDpgtLXa5tplmWrJdF/elxB56XNqCuD6szyNkDi6wuoKXln3QeBmCHQ==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.6.tgz", + "integrity": "sha512-+htwWKJbH2bL72HRluF8zumBxzuX0ZZUFl3JLNyoUjM/Ho8wnVpPXM6aUz8cfKDqQ/h7zHqKt4xzJteUosckqQ==", "requires": { - "@babel/types": "^7.9.5", + "@babel/types": "^7.9.6", "jsesc": "^2.5.1", "lodash": "^4.17.13", "source-map": "^0.5.0" @@ -10074,8 +10380,18 @@ "@babel/types": "^7.9.5" } }, - "@babel/highlight": { - "version": "7.9.0", + "@babel/helpers": { + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.6.tgz", + "integrity": "sha512-tI4bUbldloLcHWoRUMAj4g1bF313M/o6fBKhIsb3QnGVPwRm9JsNf/gqMkQ7zjqReABiffPV6RWj7hEglID5Iw==", + "requires": { + "@babel/template": "^7.8.3", + "@babel/traverse": "^7.9.6", + "@babel/types": "^7.9.6" + } + }, + "@babel/highlight": { + "version": "7.9.0", "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz", "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==", "requires": { @@ -10085,14 +10401,14 @@ } }, "@babel/parser": { - "version": "7.9.4", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz", - "integrity": "sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==" + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.6.tgz", + "integrity": "sha512-AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q==" }, "@babel/runtime": { - "version": "7.9.2", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz", - "integrity": "sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.6.tgz", + "integrity": "sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==", "requires": { "regenerator-runtime": "^0.13.4" } @@ -10108,16 +10424,16 @@ } }, "@babel/traverse": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.5.tgz", - "integrity": "sha512-c4gH3jsvSuGUezlP6rzSJ6jf8fYjLj3hsMZRx/nX0h+fmHN0w+ekubRrHPqnMec0meycA2nwCsJ7dC8IPem2FQ==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.6.tgz", + "integrity": "sha512-b3rAHSjbxy6VEAvlxM8OV/0X4XrG72zoxme6q1MOoe2vd0bEc+TwayhuC1+Dfgqh1QEG+pj7atQqvUprHIccsg==", "requires": { "@babel/code-frame": "^7.8.3", - "@babel/generator": "^7.9.5", + "@babel/generator": "^7.9.6", "@babel/helper-function-name": "^7.9.5", "@babel/helper-split-export-declaration": "^7.8.3", - "@babel/parser": "^7.9.0", - "@babel/types": "^7.9.5", + "@babel/parser": "^7.9.6", + "@babel/types": "^7.9.6", "debug": "^4.1.0", "globals": "^11.1.0", "lodash": "^4.17.13" @@ -10134,9 +10450,9 @@ } }, "@babel/types": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.5.tgz", - "integrity": "sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.6.tgz", + "integrity": "sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA==", "requires": { "@babel/helper-validator-identifier": "^7.9.5", "lodash": "^4.17.13", @@ -10155,11 +10471,86 @@ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==" }, + "anymatch": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz", + "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==", + "requires": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + }, + "dependencies": { + "normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==" + } + } + }, + "babel-plugin-dynamic-import-node": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz", + "integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==", + "requires": { + "object.assign": "^4.1.0" + } + }, + "binary-extensions": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz", + "integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==" + }, "bluebird": { "version": "3.7.2", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" }, + "braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "requires": { + "fill-range": "^7.0.1" + } + }, + "browserslist": { + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.12.0.tgz", + "integrity": "sha512-UH2GkcEDSI0k/lRkuDSzFl9ZZ87skSy9w2XAn1MsZnL+4c4rqbBd3e82UWHbYDpztABrPBhZsTEeuxVfHppqDg==", + "requires": { + "caniuse-lite": "^1.0.30001043", + "electron-to-chromium": "^1.3.413", + "node-releases": "^1.1.53", + "pkg-up": "^2.0.0" + } + }, + "caniuse-lite": { + "version": "1.0.30001048", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001048.tgz", + "integrity": "sha512-g1iSHKVxornw0K8LG9LLdf+Fxnv7T1Z+mMsf0/YYLclQX4Cd522Ap0Lrw6NFqHgezit78dtyWxzlV2Xfc7vgRg==" + }, + "chokidar": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.0.tgz", + "integrity": "sha512-aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ==", + "requires": { + "anymatch": "~3.1.1", + "braces": "~3.0.2", + "fsevents": "~2.1.2", + "glob-parent": "~5.1.0", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.4.0" + }, + "dependencies": { + "normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==" + } + } + }, "cliui": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz", @@ -10190,6 +10581,11 @@ "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz", "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==" }, + "electron-to-chromium": { + "version": "1.3.427", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.427.tgz", + "integrity": "sha512-/rG5G7Opcw68/Yrb4qYkz07h3bESVRJjUl4X/FrKLXzoUJleKm6D7K7rTTz8V5LUWnd+BbTOyxJX2XprRqHD8A==" + }, "es-abstract": { "version": "1.17.5", "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz", @@ -10208,29 +10604,43 @@ "string.prototype.trimright": "^2.1.1" } }, + "fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "requires": { + "to-regex-range": "^5.0.1" + } + }, + "fsevents": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz", + "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==", + "optional": true + }, "gatsby-cli": { - "version": "2.11.22", - "resolved": "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-2.11.22.tgz", - "integrity": "sha512-lU3uXiTASgbpb/iT4vvdOFST7H9LNSx54I6XG/cYOJ2z7ezB2JshuetLdfhb1HqwniIscvX60hbibcCKBd4YIw==", + "version": "2.12.7", + "resolved": "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-2.12.7.tgz", + "integrity": "sha512-FxvvV0ITo+hb8pFWHfwIaPugYQR0i4VRH22srLstJtTUZlnlT0YzLLUi+xCOc5Yo/bsLbR3W+4KLtiNC5BoAOQ==", "requires": { "@babel/code-frame": "^7.8.3", - "@babel/runtime": "^7.8.7", + "@babel/runtime": "^7.9.2", "@hapi/joi": "^15.1.1", "better-opn": "^1.0.0", "bluebird": "^3.7.2", "chalk": "^2.4.2", - "clipboardy": "^2.2.0", + "clipboardy": "^2.3.0", "common-tags": "^1.8.0", "configstore": "^5.0.1", "convert-hrtime": "^3.0.0", "core-js": "^2.6.11", - "envinfo": "^7.5.0", + "envinfo": "^7.5.1", "execa": "^3.4.0", "fs-exists-cached": "^1.0.0", "fs-extra": "^8.1.0", - "gatsby-core-utils": "^1.1.4", - "gatsby-recipes": "^0.0.19", - "gatsby-telemetry": "^1.2.6", + "gatsby-core-utils": "^1.2.0", + "gatsby-recipes": "^0.1.8", + "gatsby-telemetry": "^1.3.1", "hosted-git-info": "^3.0.4", "ink": "^2.7.1", "ink-spinner": "^3.0.1", @@ -10242,12 +10652,12 @@ "opentracing": "^0.14.4", "pretty-error": "^2.1.1", "progress": "^2.0.3", - "prompts": "^2.3.1", + "prompts": "^2.3.2", "react": "^16.8.0", "redux": "^4.0.5", "resolve-cwd": "^2.0.0", "semver": "^6.3.0", - "signal-exit": "^3.0.2", + "signal-exit": "^3.0.3", "source-map": "0.7.3", "stack-trace": "^0.0.10", "strip-ansi": "^5.2.0", @@ -10269,11 +10679,29 @@ } } }, + "gatsby-core-utils": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.2.0.tgz", + "integrity": "sha512-JBsVbniXObn26Hms8Je1vJdhMW04GesochBVLcaTraZC5dfqZDExPix65jrye/voC0YfFtXIngm59yspYZm1OQ==", + "requires": { + "ci-info": "2.0.0", + "configstore": "^5.0.1", + "node-object-hash": "^2.0.0" + } + }, "get-caller-file": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz", "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==" }, + "glob-parent": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz", + "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==", + "requires": { + "is-glob": "^4.0.1" + } + }, "has-symbols": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", @@ -10287,6 +10715,14 @@ "lru-cache": "^5.1.1" } }, + "is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "requires": { + "binary-extensions": "^2.0.0" + } + }, "is-callable": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz", @@ -10300,6 +10736,11 @@ "number-is-nan": "^1.0.0" } }, + "is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==" + }, "is-regex": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz", @@ -10321,6 +10762,11 @@ "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz", "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==" }, + "node-releases": { + "version": "1.1.53", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.53.tgz", + "integrity": "sha512-wp8zyQVwef2hpZ/dJH7SfSrIPD6YoJz6BDQDpGEkcA0s3LpAQoxBIYmfIq6QAhC1DhwsyCgTaTTcONwX8qzCuQ==" + }, "object.getownpropertydescriptors": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz", @@ -10330,6 +10776,21 @@ "es-abstract": "^1.17.0-next.1" } }, + "readdirp": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz", + "integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==", + "requires": { + "picomatch": "^2.2.1" + }, + "dependencies": { + "picomatch": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz", + "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==" + } + } + }, "regenerator-runtime": { "version": "0.13.5", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", @@ -10340,6 +10801,11 @@ "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=" }, + "signal-exit": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz", + "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==" + }, "string.prototype.trimleft": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz", @@ -10368,6 +10834,14 @@ "ansi-regex": "^4.1.0" } }, + "to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "requires": { + "is-number": "^7.0.0" + } + }, "util.promisify": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz", @@ -10418,6 +10892,11 @@ } } }, + "xstate": { + "version": "4.9.1", + "resolved": "https://registry.npmjs.org/xstate/-/xstate-4.9.1.tgz", + "integrity": "sha512-cfNnRaBebnr1tvs0nHBUTyomfJx36+8MWwXceyNTZfjyELMM8nIoiBDcUzfKmpNlnAvs2ZPREos19cw6Zl4nng==" + }, "yallist": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", @@ -10464,17 +10943,17 @@ } }, "gatsby-graphiql-explorer": { - "version": "0.3.5", - "resolved": "https://registry.npmjs.org/gatsby-graphiql-explorer/-/gatsby-graphiql-explorer-0.3.5.tgz", - "integrity": "sha512-leGZY7oZHurMlb1fDgyzaUMhvuiw+EbtrQtD5O9niNpGPCCtrHVeYaYDx/Kh+udtwe5YMYKkZ+YjteQKg7ezEg==", + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/gatsby-graphiql-explorer/-/gatsby-graphiql-explorer-0.4.0.tgz", + "integrity": "sha512-BddSKv1WgLnwmj0S/xyUt5jWCgWedZPuqjweMX6EwUBh36uKaI962VyRbwqE/pLdmKBMOU7u9zjNBcK5LXKbxA==", "requires": { - "@babel/runtime": "^7.8.7" + "@babel/runtime": "^7.9.2" }, "dependencies": { "@babel/runtime": { - "version": "7.9.2", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz", - "integrity": "sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.6.tgz", + "integrity": "sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==", "requires": { "regenerator-runtime": "^0.13.4" } @@ -10487,19 +10966,19 @@ } }, "gatsby-link": { - "version": "2.3.5", - "resolved": "https://registry.npmjs.org/gatsby-link/-/gatsby-link-2.3.5.tgz", - "integrity": "sha512-FzagAbg+hW+3YEfo9YUxwDoReB3w5AnsImYf3RkF7Z0HDW+YfYNFh8pg+iItlGXW+eVKZJavMz5lbqpD6H/m3w==", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/gatsby-link/-/gatsby-link-2.4.0.tgz", + "integrity": "sha512-ElaUagFLlPqtLFZc7wd9RxckfMRf45Ro1X5QZi6Lz9wNQzpT/cCYzARgfcfEbM5Dsg3/p0mIQR1+0Cbjqk+1tQ==", "requires": { - "@babel/runtime": "^7.8.7", + "@babel/runtime": "^7.9.2", "@types/reach__router": "^1.3.3", "prop-types": "^15.7.2" }, "dependencies": { "@babel/runtime": { - "version": "7.9.2", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz", - "integrity": "sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.6.tgz", + "integrity": "sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==", "requires": { "regenerator-runtime": "^0.13.4" } @@ -10512,37 +10991,147 @@ } }, "gatsby-page-utils": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/gatsby-page-utils/-/gatsby-page-utils-0.1.4.tgz", - "integrity": "sha512-TFZJZ5Nl4u0ZUUvKsm16MXZEMB9P8QCndHtkLQpNsrlUz4hiSYcb3uPgAm0WPBNL+R4PXsaXyaCysKDeMKMpGQ==", + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/gatsby-page-utils/-/gatsby-page-utils-0.2.0.tgz", + "integrity": "sha512-kyvFYjGXWNKRignUaspko0TFrBufUPB0+uA+w30A81Jzc2FjD5e2yYByRBb7/pGPrHXXm7TySBt9n4/KVkXD2g==", "requires": { - "@babel/runtime": "^7.8.7", + "@babel/runtime": "^7.9.2", "bluebird": "^3.7.2", - "chokidar": "3.3.1", + "chokidar": "3.4.0", "fs-exists-cached": "^1.0.0", - "gatsby-core-utils": "^1.1.4", + "gatsby-core-utils": "^1.2.0", "glob": "^7.1.6", "lodash": "^4.17.15", "micromatch": "^3.1.10" }, "dependencies": { "@babel/runtime": { - "version": "7.9.2", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz", - "integrity": "sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.6.tgz", + "integrity": "sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==", "requires": { "regenerator-runtime": "^0.13.4" } }, + "anymatch": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz", + "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==", + "requires": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + } + }, + "binary-extensions": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz", + "integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==" + }, "bluebird": { "version": "3.7.2", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" }, + "braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "requires": { + "fill-range": "^7.0.1" + } + }, + "chokidar": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.0.tgz", + "integrity": "sha512-aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ==", + "requires": { + "anymatch": "~3.1.1", + "braces": "~3.0.2", + "fsevents": "~2.1.2", + "glob-parent": "~5.1.0", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.4.0" + } + }, + "fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "requires": { + "to-regex-range": "^5.0.1" + } + }, + "fsevents": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz", + "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==", + "optional": true + }, + "gatsby-core-utils": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.2.0.tgz", + "integrity": "sha512-JBsVbniXObn26Hms8Je1vJdhMW04GesochBVLcaTraZC5dfqZDExPix65jrye/voC0YfFtXIngm59yspYZm1OQ==", + "requires": { + "ci-info": "2.0.0", + "configstore": "^5.0.1", + "node-object-hash": "^2.0.0" + } + }, + "glob-parent": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz", + "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==", + "requires": { + "is-glob": "^4.0.1" + } + }, + "is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "requires": { + "binary-extensions": "^2.0.0" + } + }, + "is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==" + }, + "normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==" + }, + "readdirp": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz", + "integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==", + "requires": { + "picomatch": "^2.2.1" + }, + "dependencies": { + "picomatch": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz", + "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==" + } + } + }, "regenerator-runtime": { "version": "0.13.5", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==" + }, + "to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "requires": { + "is-number": "^7.0.0" + } } } }, @@ -10819,23 +11408,23 @@ } }, "gatsby-plugin-page-creator": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/gatsby-plugin-page-creator/-/gatsby-plugin-page-creator-2.2.4.tgz", - "integrity": "sha512-14GjgnEJMfi59zyXTMpBoAPPmF19H+2dDCbeDJ1CgbuO5P9jTsOTaKGnrtjdt9uFVV598IaEdKu2ztpXjxkeyw==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/gatsby-plugin-page-creator/-/gatsby-plugin-page-creator-2.3.0.tgz", + "integrity": "sha512-5FWntUeutF1YUJUy0EHuZE6xBFOljIXSVFJ9gOoQbLUrFw7ba3OW6a7DBruteRX6oOWaQ3YtjGgGOEbpsP3lTQ==", "requires": { - "@babel/runtime": "^7.8.7", + "@babel/runtime": "^7.9.2", "bluebird": "^3.7.2", "fs-exists-cached": "^1.0.0", - "gatsby-page-utils": "^0.1.4", + "gatsby-page-utils": "^0.2.0", "glob": "^7.1.6", "lodash": "^4.17.15", "micromatch": "^3.1.10" }, "dependencies": { "@babel/runtime": { - "version": "7.9.2", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz", - "integrity": "sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.6.tgz", + "integrity": "sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==", "requires": { "regenerator-runtime": "^0.13.4" } @@ -10899,19 +11488,19 @@ "integrity": "sha512-54REIMe79qFBAwpcnWHBkvEE9CKoEVkefF9rDXai0k642r91SZ4UeWFuAmsegPG+sPVub7tHfHu/2LVXK1I9kg==" }, "gatsby-react-router-scroll": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/gatsby-react-router-scroll/-/gatsby-react-router-scroll-2.2.3.tgz", - "integrity": "sha512-14A4NCGl266bXAZCZZySCL/D0+d5SckRGYdBF9uNwLjTdYbcBWlSkiKT6nanqSdQDA+VIun1SGpqsmIr0I5XXw==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/gatsby-react-router-scroll/-/gatsby-react-router-scroll-2.3.0.tgz", + "integrity": "sha512-P0XR2G61pRJDO5FPe6l9GFgu3B55v0WNRBzA+H8edXtAOqFavTdfVg/CANEBu/7m0fRmUaZ8hFmvMX56ptbQ5Q==", "requires": { - "@babel/runtime": "^7.8.7", + "@babel/runtime": "^7.9.2", "scroll-behavior": "^0.9.12", "warning": "^3.0.0" }, "dependencies": { "@babel/runtime": { - "version": "7.9.2", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz", - "integrity": "sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.6.tgz", + "integrity": "sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==", "requires": { "regenerator-runtime": "^0.13.4" } @@ -10932,28 +11521,28 @@ } }, "gatsby-recipes": { - "version": "0.0.19", - "resolved": "https://registry.npmjs.org/gatsby-recipes/-/gatsby-recipes-0.0.19.tgz", - "integrity": "sha512-591V5j+jhP1CmgANiBwWsAWbKTsZ9t5Uor4hYtnbTfx2ZefIVTd65fgvE/ajioPbAQ14USd/Z3yplHQ8Ne9Hfw==", + "version": "0.1.8", + "resolved": "https://registry.npmjs.org/gatsby-recipes/-/gatsby-recipes-0.1.8.tgz", + "integrity": "sha512-tpt7mzAWxyOAHxNQRh0ocrDjiRTqYNuzTBUCT24np9FFFpJO+5JMuhESC8W6BI+UyrCiYwwAu8TGfhWGCbDyOQ==", "requires": { - "@babel/core": "^7.8.7", + "@babel/core": "^7.9.0", "@babel/generator": "^7.9.5", "@babel/standalone": "^7.9.5", "@babel/template": "^7.8.6", "@babel/types": "^7.9.5", "@hapi/joi": "^15.1.1", - "@mdx-js/mdx": "^1.5.8", - "@mdx-js/react": "^1.5.8", - "@mdx-js/runtime": "^1.5.8", + "@mdx-js/mdx": "^1.6.0", + "@mdx-js/react": "^1.6.0", + "@mdx-js/runtime": "^1.6.0", "acorn": "^7.1.1", "acorn-jsx": "^5.2.0", "babel-core": "7.0.0-bridge.0", "babel-eslint": "^10.1.0", - "babel-loader": "^8.0.6", + "babel-loader": "^8.1.0", "babel-plugin-add-module-exports": "^0.3.3", - "babel-plugin-dynamic-import-node": "^2.3.0", - "babel-plugin-remove-graphql-queries": "^2.8.5", - "babel-preset-gatsby": "^0.3.6", + "babel-plugin-dynamic-import-node": "^2.3.3", + "babel-plugin-remove-graphql-queries": "^2.9.0", + "babel-preset-gatsby": "^0.4.0", "cors": "^2.8.5", "detect-port": "^1.3.0", "event-source-polyfill": "^1.0.12", @@ -10961,8 +11550,8 @@ "express": "^4.17.1", "express-graphql": "^0.9.0", "fs-extra": "^8.1.0", - "gatsby-core-utils": "^1.1.4", - "gatsby-telemetry": "^1.2.6", + "gatsby-core-utils": "^1.2.0", + "gatsby-telemetry": "^1.3.1", "glob": "^7.1.6", "graphql": "^14.6.0", "graphql-compose": "^6.3.8", @@ -10972,19 +11561,20 @@ "humanize-list": "^1.0.1", "import-jsx": "^4.0.0", "ink-box": "^1.0.0", - "ink-link": "^1.0.0", + "ink-link": "^1.1.0", "ink-select-input": "^3.1.2", "ink-spinner": "^3.0.1", + "is-binary-path": "^2.1.0", "is-blank": "^2.1.0", "is-newline": "^1.0.0", "is-relative": "^1.0.0", "is-string": "^1.0.5", "is-url": "^1.2.4", - "jest-diff": "^25.3.0", + "jest-diff": "^25.4.0", "lodash": "^4.17.15", "mkdirp": "^0.5.1", "pkg-dir": "^4.2.0", - "prettier": "^2.0.4", + "prettier": "^2.0.5", "remark-stringify": "^8.0.0", "semver": "^7.3.2", "single-trailing-newline": "^1.0.0", @@ -10994,9 +11584,9 @@ "unist-util-remove": "^2.0.0", "unist-util-visit": "^2.0.2", "url-loader": "^1.1.2", - "urql": "^1.9.5", - "ws": "^7.2.3", - "xstate": "^4.8.0" + "urql": "^1.9.7", + "ws": "^7.2.5", + "xstate": "^4.9.1" }, "dependencies": { "@babel/code-frame": { @@ -11008,18 +11598,18 @@ } }, "@babel/core": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.0.tgz", - "integrity": "sha512-kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.6.tgz", + "integrity": "sha512-nD3deLvbsApbHAHttzIssYqgb883yU/d9roe4RZymBCDaZryMJDbptVpEpeQuRh4BJ+SYI8le9YGxKvFEvl1Wg==", "requires": { "@babel/code-frame": "^7.8.3", - "@babel/generator": "^7.9.0", + "@babel/generator": "^7.9.6", "@babel/helper-module-transforms": "^7.9.0", - "@babel/helpers": "^7.9.0", - "@babel/parser": "^7.9.0", + "@babel/helpers": "^7.9.6", + "@babel/parser": "^7.9.6", "@babel/template": "^7.8.6", - "@babel/traverse": "^7.9.0", - "@babel/types": "^7.9.0", + "@babel/traverse": "^7.9.6", + "@babel/types": "^7.9.6", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.1", @@ -11038,11 +11628,11 @@ } }, "@babel/generator": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.5.tgz", - "integrity": "sha512-GbNIxVB3ZJe3tLeDm1HSn2AhuD/mVcyLDpgtLXa5tplmWrJdF/elxB56XNqCuD6szyNkDi6wuoKXln3QeBmCHQ==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.6.tgz", + "integrity": "sha512-+htwWKJbH2bL72HRluF8zumBxzuX0ZZUFl3JLNyoUjM/Ho8wnVpPXM6aUz8cfKDqQ/h7zHqKt4xzJteUosckqQ==", "requires": { - "@babel/types": "^7.9.5", + "@babel/types": "^7.9.6", "jsesc": "^2.5.1", "lodash": "^4.17.13", "source-map": "^0.5.0" @@ -11058,6 +11648,21 @@ "@babel/types": "^7.9.5" } }, + "@babel/helper-plugin-utils": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", + "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" + }, + "@babel/helpers": { + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.6.tgz", + "integrity": "sha512-tI4bUbldloLcHWoRUMAj4g1bF313M/o6fBKhIsb3QnGVPwRm9JsNf/gqMkQ7zjqReABiffPV6RWj7hEglID5Iw==", + "requires": { + "@babel/template": "^7.8.3", + "@babel/traverse": "^7.9.6", + "@babel/types": "^7.9.6" + } + }, "@babel/highlight": { "version": "7.9.0", "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz", @@ -11069,9 +11674,28 @@ } }, "@babel/parser": { - "version": "7.9.4", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz", - "integrity": "sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==" + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.6.tgz", + "integrity": "sha512-AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q==" + }, + "@babel/plugin-proposal-object-rest-spread": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.5.tgz", + "integrity": "sha512-VP2oXvAf7KCYTthbUHwBlewbl1Iq059f6seJGsxMizaCdgHIeczOr7FBqELhSqfkIl04Fi8okzWzl63UKbQmmg==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.3", + "@babel/plugin-syntax-object-rest-spread": "^7.8.0", + "@babel/plugin-transform-parameters": "^7.9.5" + } + }, + "@babel/plugin-transform-parameters": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.9.5.tgz", + "integrity": "sha512-0+1FhHnMfj6lIIhVvS4KGQJeuhe1GI//h5uptK4PvLt+BGBxsoUJbd3/IW002yk//6sZPlFgsG1hY6OHLcy6kA==", + "requires": { + "@babel/helper-get-function-arity": "^7.8.3", + "@babel/helper-plugin-utils": "^7.8.3" + } }, "@babel/template": { "version": "7.8.6", @@ -11082,27 +11706,27 @@ "@babel/parser": "^7.8.6", "@babel/types": "^7.8.6" } - }, - "@babel/traverse": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.5.tgz", - "integrity": "sha512-c4gH3jsvSuGUezlP6rzSJ6jf8fYjLj3hsMZRx/nX0h+fmHN0w+ekubRrHPqnMec0meycA2nwCsJ7dC8IPem2FQ==", + }, + "@babel/traverse": { + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.6.tgz", + "integrity": "sha512-b3rAHSjbxy6VEAvlxM8OV/0X4XrG72zoxme6q1MOoe2vd0bEc+TwayhuC1+Dfgqh1QEG+pj7atQqvUprHIccsg==", "requires": { "@babel/code-frame": "^7.8.3", - "@babel/generator": "^7.9.5", + "@babel/generator": "^7.9.6", "@babel/helper-function-name": "^7.9.5", "@babel/helper-split-export-declaration": "^7.8.3", - "@babel/parser": "^7.9.0", - "@babel/types": "^7.9.5", + "@babel/parser": "^7.9.6", + "@babel/types": "^7.9.6", "debug": "^4.1.0", "globals": "^11.1.0", "lodash": "^4.17.13" } }, "@babel/types": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.5.tgz", - "integrity": "sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.6.tgz", + "integrity": "sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA==", "requires": { "@babel/helper-validator-identifier": "^7.9.5", "lodash": "^4.17.13", @@ -11116,6 +11740,102 @@ } } }, + "@mdx-js/mdx": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/@mdx-js/mdx/-/mdx-1.6.1.tgz", + "integrity": "sha512-DLnHbYZGoXSzfIHKgEtsO4qP8029YbdyJvC746PwfPNrRyGciPsqgWmfz/nEXt/fg+UMBG/6/cZaZx/hvyxnyg==", + "requires": { + "@babel/core": "7.9.0", + "@babel/plugin-syntax-jsx": "7.8.3", + "@babel/plugin-syntax-object-rest-spread": "7.8.3", + "@mdx-js/util": "^1.6.1", + "babel-plugin-apply-mdx-type-prop": "^1.6.1", + "babel-plugin-extract-import-names": "^1.6.1", + "camelcase-css": "2.0.1", + "detab": "2.0.3", + "hast-util-raw": "5.0.2", + "lodash.uniq": "4.5.0", + "mdast-util-to-hast": "8.2.0", + "remark-footnotes": "1.0.0", + "remark-mdx": "^1.6.1", + "remark-parse": "8.0.2", + "remark-squeeze-paragraphs": "4.0.0", + "style-to-object": "0.3.0", + "unified": "9.0.0", + "unist-builder": "2.0.3", + "unist-util-visit": "2.0.2" + }, + "dependencies": { + "@babel/core": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.0.tgz", + "integrity": "sha512-kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==", + "requires": { + "@babel/code-frame": "^7.8.3", + "@babel/generator": "^7.9.0", + "@babel/helper-module-transforms": "^7.9.0", + "@babel/helpers": "^7.9.0", + "@babel/parser": "^7.9.0", + "@babel/template": "^7.8.6", + "@babel/traverse": "^7.9.0", + "@babel/types": "^7.9.0", + "convert-source-map": "^1.7.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.1", + "json5": "^2.1.2", + "lodash": "^4.17.13", + "resolve": "^1.3.2", + "semver": "^5.4.1", + "source-map": "^0.5.0" + } + }, + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + } + } + }, + "@mdx-js/react": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/@mdx-js/react/-/react-1.6.1.tgz", + "integrity": "sha512-jXBSWdWFPK2fs3johKb0hQFsf/x/C24XQYQwMhj8FxwlBgf7+NGATwXFs6pGkKd5/JfK9HXmbOcQ78MYoIZyxA==" + }, + "@mdx-js/util": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/@mdx-js/util/-/util-1.6.1.tgz", + "integrity": "sha512-A3TBBjg5iVo8S4TTG0VrW8G9YNLob4+M6rALKjY8Sxr9zPExWQ7iTPUSvJVE7YhF9E08EQMubx1vRal3jtpJ9Q==" + }, + "babel-plugin-apply-mdx-type-prop": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/babel-plugin-apply-mdx-type-prop/-/babel-plugin-apply-mdx-type-prop-1.6.1.tgz", + "integrity": "sha512-chjmLo1x7fCpDRICGUlbkwf2E6sMVG9jjG6PtPBWnQfMEjgV03Gh0jSVGbZJsEUxcMqOpHSsIXvPz1sYip6X3g==", + "requires": { + "@babel/helper-plugin-utils": "7.8.3", + "@mdx-js/util": "^1.6.1" + } + }, + "babel-plugin-dynamic-import-node": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz", + "integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==", + "requires": { + "object.assign": "^4.1.0" + } + }, + "babel-plugin-extract-import-names": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/babel-plugin-extract-import-names/-/babel-plugin-extract-import-names-1.6.1.tgz", + "integrity": "sha512-u0uRrPyygx4RlNva1aqz7DM9UBpsQJQZ4NyakHVJF18s73H/iiyXuc+X7k+9tHeN0WKLsohQUGzGLli6z5a0Zw==", + "requires": { + "@babel/helper-plugin-utils": "7.8.3" + } + }, + "binary-extensions": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz", + "integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==" + }, "cross-spawn": { "version": "7.0.2", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.2.tgz", @@ -11159,6 +11879,16 @@ "path-exists": "^4.0.0" } }, + "gatsby-core-utils": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.2.0.tgz", + "integrity": "sha512-JBsVbniXObn26Hms8Je1vJdhMW04GesochBVLcaTraZC5dfqZDExPix65jrye/voC0YfFtXIngm59yspYZm1OQ==", + "requires": { + "ci-info": "2.0.0", + "configstore": "^5.0.1", + "node-object-hash": "^2.0.0" + } + }, "get-stream": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz", @@ -11167,6 +11897,24 @@ "pump": "^3.0.0" } }, + "is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "requires": { + "binary-extensions": "^2.0.0" + } + }, + "is-buffer": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz", + "integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==" + }, + "is-plain-obj": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", + "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==" + }, "is-stream": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz", @@ -11188,6 +11936,14 @@ "repeat-string": "^1.0.0" } }, + "mdast-squeeze-paragraphs": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/mdast-squeeze-paragraphs/-/mdast-squeeze-paragraphs-4.0.0.tgz", + "integrity": "sha512-zxdPn69hkQ1rm4J+2Cs2j6wDEv7O17TfXTJ33tl/+JPIoEmtV9t2ZzBM5LPHE8QlHsmVD8t3vPKCyY3oH+H8MQ==", + "requires": { + "unist-util-remove": "^2.0.0" + } + }, "mdast-util-compact": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/mdast-util-compact/-/mdast-util-compact-2.0.1.tgz", @@ -11196,6 +11952,30 @@ "unist-util-visit": "^2.0.0" } }, + "mdast-util-definitions": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/mdast-util-definitions/-/mdast-util-definitions-2.0.1.tgz", + "integrity": "sha512-Co+DQ6oZlUzvUR7JCpP249PcexxygiaKk9axJh+eRzHDZJk2julbIdKB4PXHVxdBuLzvJ1Izb+YDpj2deGMOuA==", + "requires": { + "unist-util-visit": "^2.0.0" + } + }, + "mdast-util-to-hast": { + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-8.2.0.tgz", + "integrity": "sha512-WjH/KXtqU66XyTJQ7tg7sjvTw1OQcVV0hKdFh3BgHPwZ96fSBCQ/NitEHsN70Mmnggt+5eUUC7pCnK+2qGQnCA==", + "requires": { + "collapse-white-space": "^1.0.0", + "detab": "^2.0.0", + "mdast-util-definitions": "^2.0.0", + "mdurl": "^1.0.0", + "trim-lines": "^1.0.0", + "unist-builder": "^2.0.0", + "unist-util-generated": "^1.0.0", + "unist-util-position": "^3.0.0", + "unist-util-visit": "^2.0.0" + } + }, "mimic-fn": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", @@ -11261,6 +12041,82 @@ "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.0.5.tgz", "integrity": "sha512-7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg==" }, + "remark-mdx": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/remark-mdx/-/remark-mdx-1.6.1.tgz", + "integrity": "sha512-UyCqqYFv9l5dstX29QpdqMprBHyUYUEQHOUe0MdFUIm1XATxfVGHbRPtVBFz4ccd5NV1UL/rmsruo9WOswwmpQ==", + "requires": { + "@babel/core": "7.9.0", + "@babel/helper-plugin-utils": "7.8.3", + "@babel/plugin-proposal-object-rest-spread": "7.9.5", + "@babel/plugin-syntax-jsx": "7.8.3", + "@mdx-js/util": "^1.6.1", + "is-alphabetical": "1.0.4", + "remark-parse": "8.0.2", + "unified": "9.0.0" + }, + "dependencies": { + "@babel/core": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.0.tgz", + "integrity": "sha512-kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==", + "requires": { + "@babel/code-frame": "^7.8.3", + "@babel/generator": "^7.9.0", + "@babel/helper-module-transforms": "^7.9.0", + "@babel/helpers": "^7.9.0", + "@babel/parser": "^7.9.0", + "@babel/template": "^7.8.6", + "@babel/traverse": "^7.9.0", + "@babel/types": "^7.9.0", + "convert-source-map": "^1.7.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.1", + "json5": "^2.1.2", + "lodash": "^4.17.13", + "resolve": "^1.3.2", + "semver": "^5.4.1", + "source-map": "^0.5.0" + } + }, + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + } + } + }, + "remark-parse": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-8.0.2.tgz", + "integrity": "sha512-eMI6kMRjsAGpMXXBAywJwiwAse+KNpmt+BK55Oofy4KvBZEqUDj6mWbGLJZrujoPIPPxDXzn3T9baRlpsm2jnQ==", + "requires": { + "ccount": "^1.0.0", + "collapse-white-space": "^1.0.2", + "is-alphabetical": "^1.0.0", + "is-decimal": "^1.0.0", + "is-whitespace-character": "^1.0.0", + "is-word-character": "^1.0.0", + "markdown-escapes": "^1.0.0", + "parse-entities": "^2.0.0", + "repeat-string": "^1.5.4", + "state-toggle": "^1.0.0", + "trim": "0.0.1", + "trim-trailing-lines": "^1.0.0", + "unherit": "^1.0.4", + "unist-util-remove-position": "^2.0.0", + "vfile-location": "^3.0.0", + "xtend": "^4.0.1" + } + }, + "remark-squeeze-paragraphs": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/remark-squeeze-paragraphs/-/remark-squeeze-paragraphs-4.0.0.tgz", + "integrity": "sha512-8qRqmL9F4nuLPIgl92XUuxI3pFxize+F1H0e/W3llTk0UsjJaj01+RrirkMw7P21RKe4X6goQhYRSvNWX+70Rw==", + "requires": { + "mdast-squeeze-paragraphs": "^4.0.0" + } + }, "remark-stringify": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/remark-stringify/-/remark-stringify-8.0.0.tgz", @@ -11312,6 +12168,19 @@ "is-hexadecimal": "^1.0.0" } }, + "unified": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/unified/-/unified-9.0.0.tgz", + "integrity": "sha512-ssFo33gljU3PdlWLjNp15Inqb77d6JnJSfyplGJPT/a+fNRNyCBeveBAYJdO5khKdF6WVHa/yYCC7Xl6BDwZUQ==", + "requires": { + "bail": "^1.0.0", + "extend": "^3.0.0", + "is-buffer": "^2.0.0", + "is-plain-obj": "^2.0.0", + "trough": "^1.0.0", + "vfile": "^4.0.0" + } + }, "unist-util-is": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.0.2.tgz", @@ -11325,6 +12194,19 @@ "unist-util-is": "^4.0.0" } }, + "unist-util-remove-position": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-2.0.1.tgz", + "integrity": "sha512-fDZsLYIe2uT+oGFnuZmy73K6ZxOPG/Qcm+w7jbEjaFcJgbQ6cqjs/eSPzXhsmGpAsWPkqZM9pYjww5QTn3LHMA==", + "requires": { + "unist-util-visit": "^2.0.0" + } + }, + "vfile-location": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/vfile-location/-/vfile-location-3.0.1.tgz", + "integrity": "sha512-yYBO06eeN/Ki6Kh1QAkgzYpWT1d3Qln+ZCtSbJqFExPl1S3y2qqotJQXoh6qEvl/jDlgpUJolBn3PItVnnZRqQ==" + }, "which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", @@ -11332,6 +12214,11 @@ "requires": { "isexe": "^2.0.0" } + }, + "xstate": { + "version": "4.9.1", + "resolved": "https://registry.npmjs.org/xstate/-/xstate-4.9.1.tgz", + "integrity": "sha512-cfNnRaBebnr1tvs0nHBUTyomfJx36+8MWwXceyNTZfjyELMM8nIoiBDcUzfKmpNlnAvs2ZPREos19cw6Zl4nng==" } } }, @@ -11654,18 +12541,18 @@ } }, "gatsby-telemetry": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-1.2.6.tgz", - "integrity": "sha512-dPR7Ij+dkNyQQ/eHt2OFD793txv+LXN7NhZIsCT20NV7UUlPFtN+xOjmj1eRGQXe0bbgNZis24A7zN18vwKi7Q==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-1.3.1.tgz", + "integrity": "sha512-UOuRSbNrRkWIi7vzwI2gxd5b+pY0HXuvrhdzB/B/SCUkDaxfKf0LIsLIjtnSAKUrNNxNKnec0jSGk3PJdUNh4g==", "requires": { "@babel/code-frame": "^7.8.3", - "@babel/runtime": "^7.8.7", + "@babel/runtime": "^7.9.2", "bluebird": "^3.7.2", "boxen": "^4.2.0", "configstore": "^5.0.1", - "envinfo": "^7.5.0", + "envinfo": "^7.5.1", "fs-extra": "^8.1.0", - "gatsby-core-utils": "^1.1.4", + "gatsby-core-utils": "^1.2.0", "git-up": "4.0.1", "is-docker": "2.0.0", "lodash": "^4.17.15", @@ -11696,9 +12583,9 @@ } }, "@babel/runtime": { - "version": "7.9.2", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz", - "integrity": "sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.6.tgz", + "integrity": "sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==", "requires": { "regenerator-runtime": "^0.13.4" } @@ -11708,6 +12595,16 @@ "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" }, + "gatsby-core-utils": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.2.0.tgz", + "integrity": "sha512-JBsVbniXObn26Hms8Je1vJdhMW04GesochBVLcaTraZC5dfqZDExPix65jrye/voC0YfFtXIngm59yspYZm1OQ==", + "requires": { + "ci-info": "2.0.0", + "configstore": "^5.0.1", + "node-object-hash": "^2.0.0" + } + }, "node-fetch": { "version": "2.6.0", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz", @@ -14059,11 +14956,6 @@ "isobject": "^3.0.1" } }, - "is-promise": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz", - "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==" - }, "is-reference": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-1.1.4.tgz", @@ -14270,14 +15162,14 @@ "integrity": "sha512-QZ9qOMdF+QLHxy1QIpUHUU1D5pS2CG2P69LF6L6CPjPYA/XMOmKV3PZpawHoAjHNyB0swdVTRxdYT4tbBbxqwg==" }, "jest-diff": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-25.4.0.tgz", - "integrity": "sha512-kklLbJVXW0y8UKOWOdYhI6TH5MG6QAxrWiBMgQaPIuhj3dNFGirKCd+/xfplBXICQ7fI+3QcqHm9p9lWu1N6ug==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-25.5.0.tgz", + "integrity": "sha512-z1kygetuPiREYdNIumRpAHY6RXiGmp70YHptjdaxTWGmA085W3iCnXNx0DhflK3vwrKmrRWyY1wUpkPMVxMK7A==", "requires": { "chalk": "^3.0.0", "diff-sequences": "^25.2.6", "jest-get-type": "^25.2.6", - "pretty-format": "^25.4.0" + "pretty-format": "^25.5.0" }, "dependencies": { "ansi-styles": { @@ -15677,9 +16569,9 @@ } }, "moment": { - "version": "2.24.0", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz", - "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==" + "version": "2.25.1", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.25.1.tgz", + "integrity": "sha512-nRKMf9wDS4Fkyd0C9LXh2FFXinD+iwbJ5p/lh3CHitW9kZbRbJ8hCruiadiIXZVbeAqKZzqcTvHnK3mRhFjb6w==" }, "moment-mini": { "version": "2.24.0", @@ -16927,9 +17819,9 @@ } }, "portfinder": { - "version": "1.0.25", - "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.25.tgz", - "integrity": "sha512-6ElJnHBbxVA1XSLgBp7G1FiCkQdlqGzuF7DswL5tcea+E8UpuvPU7beVAjjRwCioTS9ZluNbu+ZyRvgTsmqEBg==", + "version": "1.0.26", + "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.26.tgz", + "integrity": "sha512-Xi7mKxJHHMI3rIUrnm/jjUgwhbYMkp/XKEcZX3aG4BrumLpq3nmoQMX+ClYnDZnZ/New7IatC1no5RX0zo1vXQ==", "requires": { "async": "^2.6.2", "debug": "^3.1.1", @@ -17054,9 +17946,9 @@ } }, "postcss-flexbugs-fixes": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-4.2.0.tgz", - "integrity": "sha512-QRE0n3hpkxxS/OGvzOa+PDuy4mh/Jg4o9ui22/ko5iGYOG3M5dfJabjnAZjTdh2G9F85c7Hv8hWcEDEKW/xceQ==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-4.2.1.tgz", + "integrity": "sha512-9SiofaZ9CWpQWxOwRh1b/r85KD5y7GgvsNt1056k6OYLvWUun0czCvogfJgylC22uJTwW1KzY3Gz65NZRlvoiQ==", "requires": { "postcss": "^7.0.26" } @@ -17552,9 +18444,9 @@ } }, "postcss-value-parser": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.0.3.tgz", - "integrity": "sha512-N7h4pG+Nnu5BEIzyeaaIYWs0LI5XC40OrRh5L60z0QjFsqGWcHcbkBvpe1WYpcIS9yQ8sOi/vIPt1ejQCrMVrg==" + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz", + "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==" }, "prelude-ls": { "version": "1.1.2", @@ -17586,11 +18478,11 @@ } }, "pretty-format": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.4.0.tgz", - "integrity": "sha512-PI/2dpGjXK5HyXexLPZU/jw5T9Q6S1YVXxxVxco+LIqzUFHXIbKZKdUVt7GcX7QUCr31+3fzhi4gN4/wUYPVxQ==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.5.0.tgz", + "integrity": "sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ==", "requires": { - "@jest/types": "^25.4.0", + "@jest/types": "^25.5.0", "ansi-regex": "^5.0.0", "ansi-styles": "^4.0.0", "react-is": "^16.12.0" @@ -18246,9 +19138,9 @@ } }, "react-hot-loader": { - "version": "4.12.20", - "resolved": "https://registry.npmjs.org/react-hot-loader/-/react-hot-loader-4.12.20.tgz", - "integrity": "sha512-lPlv1HVizi0lsi+UFACBJaydtRYILWkfHAC/lyCs6ZlAxlOZRQIfYHDqiGaRvL/GF7zyti+Qn9XpnDAUvdFA4A==", + "version": "4.12.21", + "resolved": "https://registry.npmjs.org/react-hot-loader/-/react-hot-loader-4.12.21.tgz", + "integrity": "sha512-Ynxa6ROfWUeKWsTHxsrL2KMzujxJVPjs385lmB2t5cHUxdoRPGind9F00tOkdc1l5WBleOF4XEAMILY1KPIIDA==", "requires": { "fast-levenshtein": "^2.0.6", "global": "^4.3.0", @@ -19299,12 +20191,9 @@ } }, "run-async": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.0.tgz", - "integrity": "sha512-xJTbh/d7Lm7SBhc1tNvTpeCHaEzoyxPrqNlvSdMfBTYwaY++UJFyXUOxAtsRUXjlqOfj8luNaR9vjCh4KeV+pg==", - "requires": { - "is-promise": "^2.1.0" - } + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz", + "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==" }, "run-parallel": { "version": "1.1.9", @@ -22280,15 +23169,15 @@ "integrity": "sha512-wYxSGajtmoP4WxfejAPIr4l0fVh+jeMXZb08wNc0tMg6xsfZXj3cECqIK0G7ZAqUq0PP8WlMDtaOGVBTAWztNw==" }, "webpack": { - "version": "4.42.1", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.42.1.tgz", - "integrity": "sha512-SGfYMigqEfdGchGhFFJ9KyRpQKnipvEvjc1TwrXEPCM6H5Wywu10ka8o3KGrMzSMxMQKt8aCHUFh5DaQ9UmyRg==", + "version": "4.43.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.43.0.tgz", + "integrity": "sha512-GW1LjnPipFW2Y78OOab8NJlCflB7EFskMih2AHdvjbpKMeDJqEgSx24cXXXiPS65+WSwVyxtDsJH6jGX2czy+g==", "requires": { "@webassemblyjs/ast": "1.9.0", "@webassemblyjs/helper-module-context": "1.9.0", "@webassemblyjs/wasm-edit": "1.9.0", "@webassemblyjs/wasm-parser": "1.9.0", - "acorn": "^6.2.1", + "acorn": "^6.4.1", "ajv": "^6.10.2", "ajv-keywords": "^3.4.1", "chrome-trace-event": "^1.0.2", @@ -22305,7 +23194,7 @@ "schema-utils": "^1.0.0", "tapable": "^1.1.3", "terser-webpack-plugin": "^1.4.3", - "watchpack": "^1.6.0", + "watchpack": "^1.6.1", "webpack-sources": "^1.4.1" }, "dependencies": { @@ -22747,9 +23636,9 @@ } }, "wonka": { - "version": "4.0.9", - "resolved": "https://registry.npmjs.org/wonka/-/wonka-4.0.9.tgz", - "integrity": "sha512-he7Nn1254ToUN03zLbJok6QxKdRJd46/QHm8nUcJNViXQnCutCuUgAbZvzoxrX+VXzGb4sCFolC4XhkHsmvdaA==" + "version": "4.0.13", + "resolved": "https://registry.npmjs.org/wonka/-/wonka-4.0.13.tgz", + "integrity": "sha512-aWg92IVvbP/kp+q9rw+k/Uw3C/S2J0dTDNhEhivGVH3GXJZgpFk2nuyVtiS7Y1d0UG3m4jvOrR7bPXim6D/TBg==" }, "word-wrap": { "version": "1.2.3", @@ -22888,11 +23777,58 @@ } }, "yaml-loader": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/yaml-loader/-/yaml-loader-0.5.0.tgz", - "integrity": "sha512-p9QIzcFSNm4mCw/m5NdyMfN4RE4aFZJWRRb01ERVNGCym8VNbKtw3OYZXnvUIkim6U/EjqE/2yIh9F/msShH9A==", + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/yaml-loader/-/yaml-loader-0.6.0.tgz", + "integrity": "sha512-1bNiLelumURyj+zvVHOv8Y3dpCri0F2S+DCcmps0pA1zWRLjS+FhZQg4o3aUUDYESh73+pKZNI18bj7stpReow==", "requires": { - "js-yaml": "^3.5.2" + "loader-utils": "^1.4.0", + "yaml": "^1.8.3" + }, + "dependencies": { + "@babel/runtime": { + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.6.tgz", + "integrity": "sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==", + "requires": { + "regenerator-runtime": "^0.13.4" + } + }, + "emojis-list": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", + "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==" + }, + "json5": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", + "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", + "requires": { + "minimist": "^1.2.0" + } + }, + "loader-utils": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz", + "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==", + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^1.0.1" + } + }, + "regenerator-runtime": { + "version": "0.13.5", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", + "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==" + }, + "yaml": { + "version": "1.9.2", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.9.2.tgz", + "integrity": "sha512-HPT7cGGI0DuRcsO51qC1j9O16Dh1mZ2bnXwsi0jrSpsLz0WxOLSLXfkABVl6bZO629py3CU+OMJtpNHDLB97kg==", + "requires": { + "@babel/runtime": "^7.9.2" + } + } } }, "yargs": { diff --git a/docs/package.json b/docs/package.json index 32691db901b..6bebb022c80 100644 --- a/docs/package.json +++ b/docs/package.json @@ -6,7 +6,7 @@ "serve": "gatsby serve" }, "dependencies": { - "gatsby": "2.20.36", + "gatsby": "2.21.9", "gatsby-theme-apollo-docs": "4.2.0", "react": "16.13.1", "react-dom": "16.13.1" From 72866c62f6c31d54c8f386b5ef5fc902dfff8989 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 2 May 2020 10:13:57 +0000 Subject: [PATCH 492/642] chore(deps): update dependency gatsby-theme-apollo-docs to v4.2.2 (#4048) Co-authored-by: Renovate Bot --- docs/package-lock.json | 1275 +++++++++++++++++++++++++++++----------- docs/package.json | 2 +- 2 files changed, 945 insertions(+), 332 deletions(-) diff --git a/docs/package-lock.json b/docs/package-lock.json index c65d8f1dcd4..ee4bbddd4b0 100644 --- a/docs/package-lock.json +++ b/docs/package-lock.json @@ -24,13 +24,41 @@ } }, "@babel/compat-data": { - "version": "7.8.6", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.8.6.tgz", - "integrity": "sha512-CurCIKPTkS25Mb8mz267vU95vy+TyUpnctEX2lV33xWNmHAfjruztgiPBbXZRh3xZZy1CYvGx6XfxyTVS+sk7Q==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.9.6.tgz", + "integrity": "sha512-5QPTrNen2bm7RBc7dsOmcA5hbrS4O2Vhmk5XOL4zWW/zD/hV0iinpefDlkm+tBBy8kDtFaaeEvmAqt+nURAV2g==", "requires": { - "browserslist": "^4.8.5", + "browserslist": "^4.11.1", "invariant": "^2.2.4", "semver": "^5.5.0" + }, + "dependencies": { + "browserslist": { + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.12.0.tgz", + "integrity": "sha512-UH2GkcEDSI0k/lRkuDSzFl9ZZ87skSy9w2XAn1MsZnL+4c4rqbBd3e82UWHbYDpztABrPBhZsTEeuxVfHppqDg==", + "requires": { + "caniuse-lite": "^1.0.30001043", + "electron-to-chromium": "^1.3.413", + "node-releases": "^1.1.53", + "pkg-up": "^2.0.0" + } + }, + "caniuse-lite": { + "version": "1.0.30001048", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001048.tgz", + "integrity": "sha512-g1iSHKVxornw0K8LG9LLdf+Fxnv7T1Z+mMsf0/YYLclQX4Cd522Ap0Lrw6NFqHgezit78dtyWxzlV2Xfc7vgRg==" + }, + "electron-to-chromium": { + "version": "1.3.427", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.427.tgz", + "integrity": "sha512-/rG5G7Opcw68/Yrb4qYkz07h3bESVRJjUl4X/FrKLXzoUJleKm6D7K7rTTz8V5LUWnd+BbTOyxJX2XprRqHD8A==" + }, + "node-releases": { + "version": "1.1.53", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.53.tgz", + "integrity": "sha512-wp8zyQVwef2hpZ/dJH7SfSrIPD6YoJz6BDQDpGEkcA0s3LpAQoxBIYmfIq6QAhC1DhwsyCgTaTTcONwX8qzCuQ==" + } } }, "@babel/core": { @@ -224,15 +252,43 @@ } }, "@babel/helper-compilation-targets": { - "version": "7.8.7", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.8.7.tgz", - "integrity": "sha512-4mWm8DCK2LugIS+p1yArqvG1Pf162upsIsjE7cNBjez+NjliQpVhj20obE520nao0o14DaTnFJv+Fw5a0JpoUw==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.9.6.tgz", + "integrity": "sha512-x2Nvu0igO0ejXzx09B/1fGBxY9NXQlBW2kZsSxCJft+KHN8t9XWzIvFxtPHnBOAXpVsdxZKZFbRUC8TsNKajMw==", "requires": { - "@babel/compat-data": "^7.8.6", - "browserslist": "^4.9.1", + "@babel/compat-data": "^7.9.6", + "browserslist": "^4.11.1", "invariant": "^2.2.4", "levenary": "^1.1.1", "semver": "^5.5.0" + }, + "dependencies": { + "browserslist": { + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.12.0.tgz", + "integrity": "sha512-UH2GkcEDSI0k/lRkuDSzFl9ZZ87skSy9w2XAn1MsZnL+4c4rqbBd3e82UWHbYDpztABrPBhZsTEeuxVfHppqDg==", + "requires": { + "caniuse-lite": "^1.0.30001043", + "electron-to-chromium": "^1.3.413", + "node-releases": "^1.1.53", + "pkg-up": "^2.0.0" + } + }, + "caniuse-lite": { + "version": "1.0.30001048", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001048.tgz", + "integrity": "sha512-g1iSHKVxornw0K8LG9LLdf+Fxnv7T1Z+mMsf0/YYLclQX4Cd522Ap0Lrw6NFqHgezit78dtyWxzlV2Xfc7vgRg==" + }, + "electron-to-chromium": { + "version": "1.3.427", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.427.tgz", + "integrity": "sha512-/rG5G7Opcw68/Yrb4qYkz07h3bESVRJjUl4X/FrKLXzoUJleKm6D7K7rTTz8V5LUWnd+BbTOyxJX2XprRqHD8A==" + }, + "node-releases": { + "version": "1.1.53", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.53.tgz", + "integrity": "sha512-wp8zyQVwef2hpZ/dJH7SfSrIPD6YoJz6BDQDpGEkcA0s3LpAQoxBIYmfIq6QAhC1DhwsyCgTaTTcONwX8qzCuQ==" + } } }, "@babel/helper-create-class-features-plugin": { @@ -1284,13 +1340,13 @@ } }, "@babel/plugin-transform-classes": { - "version": "7.9.2", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.9.2.tgz", - "integrity": "sha512-TC2p3bPzsfvSsqBZo0kJnuelnoK9O3welkUpqSqBQuBF6R5MN2rysopri8kNvtlGIb2jmUO7i15IooAZJjZuMQ==", + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.9.5.tgz", + "integrity": "sha512-x2kZoIuLC//O5iA7PEvecB105o7TLzZo8ofBVhP79N+DO3jaX+KYfww9TQcfBEZD0nikNyYcGB1IKtRq36rdmg==", "requires": { "@babel/helper-annotate-as-pure": "^7.8.3", "@babel/helper-define-map": "^7.8.3", - "@babel/helper-function-name": "^7.8.3", + "@babel/helper-function-name": "^7.9.5", "@babel/helper-optimise-call-expression": "^7.8.3", "@babel/helper-plugin-utils": "^7.8.3", "@babel/helper-replace-supers": "^7.8.6", @@ -1298,10 +1354,35 @@ "globals": "^11.1.0" }, "dependencies": { + "@babel/helper-function-name": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz", + "integrity": "sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==", + "requires": { + "@babel/helper-get-function-arity": "^7.8.3", + "@babel/template": "^7.8.3", + "@babel/types": "^7.9.5" + } + }, "@babel/helper-plugin-utils": { "version": "7.8.3", "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" + }, + "@babel/helper-validator-identifier": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz", + "integrity": "sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==" + }, + "@babel/types": { + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.6.tgz", + "integrity": "sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA==", + "requires": { + "@babel/helper-validator-identifier": "^7.9.5", + "lodash": "^4.17.13", + "to-fast-properties": "^2.0.0" + } } } }, @@ -1437,13 +1518,13 @@ } }, "@babel/plugin-transform-modules-amd": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.9.0.tgz", - "integrity": "sha512-vZgDDF003B14O8zJy0XXLnPH4sg+9X5hFBBGN1V+B2rgrB+J2xIypSN6Rk9imB2hSTHQi5OHLrFWsZab1GMk+Q==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.9.6.tgz", + "integrity": "sha512-zoT0kgC3EixAyIAU+9vfaUVKTv9IxBDSabgHoUCBP6FqEJ+iNiN7ip7NBKcYqbfUDfuC2mFCbM7vbu4qJgOnDw==", "requires": { "@babel/helper-module-transforms": "^7.9.0", "@babel/helper-plugin-utils": "^7.8.3", - "babel-plugin-dynamic-import-node": "^2.3.0" + "babel-plugin-dynamic-import-node": "^2.3.3" }, "dependencies": { "@babel/helper-plugin-utils": { @@ -1454,14 +1535,14 @@ } }, "@babel/plugin-transform-modules-commonjs": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.0.tgz", - "integrity": "sha512-qzlCrLnKqio4SlgJ6FMMLBe4bySNis8DFn1VkGmOcxG9gqEyPIOzeQrA//u0HAKrWpJlpZbZMPB1n/OPa4+n8g==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.6.tgz", + "integrity": "sha512-7H25fSlLcn+iYimmsNe3uK1at79IE6SKW9q0/QeEHTMC9MdOZ+4bA+T1VFB5fgOqBWoqlifXRzYD0JPdmIrgSQ==", "requires": { "@babel/helper-module-transforms": "^7.9.0", "@babel/helper-plugin-utils": "^7.8.3", "@babel/helper-simple-access": "^7.8.3", - "babel-plugin-dynamic-import-node": "^2.3.0" + "babel-plugin-dynamic-import-node": "^2.3.3" }, "dependencies": { "@babel/helper-plugin-utils": { @@ -1472,14 +1553,14 @@ } }, "@babel/plugin-transform-modules-systemjs": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.9.0.tgz", - "integrity": "sha512-FsiAv/nao/ud2ZWy4wFacoLOm5uxl0ExSQ7ErvP7jpoihLR6Cq90ilOFyX9UXct3rbtKsAiZ9kFt5XGfPe/5SQ==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.9.6.tgz", + "integrity": "sha512-NW5XQuW3N2tTHim8e1b7qGy7s0kZ2OH3m5octc49K1SdAKGxYxeIx7hiIz05kS1R2R+hOWcsr1eYwcGhrdHsrg==", "requires": { "@babel/helper-hoist-variables": "^7.8.3", "@babel/helper-module-transforms": "^7.9.0", "@babel/helper-plugin-utils": "^7.8.3", - "babel-plugin-dynamic-import-node": "^2.3.0" + "babel-plugin-dynamic-import-node": "^2.3.3" }, "dependencies": { "@babel/helper-plugin-utils": { @@ -1604,9 +1685,9 @@ } }, "@babel/plugin-transform-parameters": { - "version": "7.9.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.9.3.tgz", - "integrity": "sha512-fzrQFQhp7mIhOzmOtPiKffvCYQSK10NR8t6BBz2yPbeUHb9OLW8RZGtgDRBn8z2hGcwvKDL3vC7ojPTLNxmqEg==", + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.9.5.tgz", + "integrity": "sha512-0+1FhHnMfj6lIIhVvS4KGQJeuhe1GI//h5uptK4PvLt+BGBxsoUJbd3/IW002yk//6sZPlFgsG1hY6OHLcy6kA==", "requires": { "@babel/helper-get-function-arity": "^7.8.3", "@babel/helper-plugin-utils": "^7.8.3" @@ -1858,19 +1939,126 @@ } }, "@babel/plugin-transform-typescript": { - "version": "7.9.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.9.4.tgz", - "integrity": "sha512-yeWeUkKx2auDbSxRe8MusAG+n4m9BFY/v+lPjmQDgOFX5qnySkUY5oXzkp6FwPdsYqnKay6lorXYdC0n3bZO7w==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.9.6.tgz", + "integrity": "sha512-8OvsRdvpt3Iesf2qsAn+YdlwAJD7zJ+vhFZmDCa4b8dTp7MmHtKk5FF2mCsGxjZwuwsy/yIIay/nLmxST1ctVQ==", "requires": { - "@babel/helper-create-class-features-plugin": "^7.8.3", + "@babel/helper-create-class-features-plugin": "^7.9.6", "@babel/helper-plugin-utils": "^7.8.3", "@babel/plugin-syntax-typescript": "^7.8.3" }, "dependencies": { + "@babel/code-frame": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", + "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", + "requires": { + "@babel/highlight": "^7.8.3" + } + }, + "@babel/generator": { + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.6.tgz", + "integrity": "sha512-+htwWKJbH2bL72HRluF8zumBxzuX0ZZUFl3JLNyoUjM/Ho8wnVpPXM6aUz8cfKDqQ/h7zHqKt4xzJteUosckqQ==", + "requires": { + "@babel/types": "^7.9.6", + "jsesc": "^2.5.1", + "lodash": "^4.17.13", + "source-map": "^0.5.0" + } + }, + "@babel/helper-create-class-features-plugin": { + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.9.6.tgz", + "integrity": "sha512-6N9IeuyHvMBRyjNYOMJHrhwtu4WJMrYf8hVbEHD3pbbbmNOk1kmXSQs7bA4dYDUaIx4ZEzdnvo6NwC3WHd/Qow==", + "requires": { + "@babel/helper-function-name": "^7.9.5", + "@babel/helper-member-expression-to-functions": "^7.8.3", + "@babel/helper-optimise-call-expression": "^7.8.3", + "@babel/helper-plugin-utils": "^7.8.3", + "@babel/helper-replace-supers": "^7.9.6", + "@babel/helper-split-export-declaration": "^7.8.3" + } + }, + "@babel/helper-function-name": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz", + "integrity": "sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==", + "requires": { + "@babel/helper-get-function-arity": "^7.8.3", + "@babel/template": "^7.8.3", + "@babel/types": "^7.9.5" + } + }, "@babel/helper-plugin-utils": { "version": "7.8.3", "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" + }, + "@babel/helper-replace-supers": { + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.9.6.tgz", + "integrity": "sha512-qX+chbxkbArLyCImk3bWV+jB5gTNU/rsze+JlcF6Nf8tVTigPJSI1o1oBow/9Resa1yehUO9lIipsmu9oG4RzA==", + "requires": { + "@babel/helper-member-expression-to-functions": "^7.8.3", + "@babel/helper-optimise-call-expression": "^7.8.3", + "@babel/traverse": "^7.9.6", + "@babel/types": "^7.9.6" + } + }, + "@babel/helper-validator-identifier": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz", + "integrity": "sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==" + }, + "@babel/highlight": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz", + "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==", + "requires": { + "@babel/helper-validator-identifier": "^7.9.0", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" + } + }, + "@babel/parser": { + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.6.tgz", + "integrity": "sha512-AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q==" + }, + "@babel/traverse": { + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.6.tgz", + "integrity": "sha512-b3rAHSjbxy6VEAvlxM8OV/0X4XrG72zoxme6q1MOoe2vd0bEc+TwayhuC1+Dfgqh1QEG+pj7atQqvUprHIccsg==", + "requires": { + "@babel/code-frame": "^7.8.3", + "@babel/generator": "^7.9.6", + "@babel/helper-function-name": "^7.9.5", + "@babel/helper-split-export-declaration": "^7.8.3", + "@babel/parser": "^7.9.6", + "@babel/types": "^7.9.6", + "debug": "^4.1.0", + "globals": "^11.1.0", + "lodash": "^4.17.13" + } + }, + "@babel/types": { + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.6.tgz", + "integrity": "sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA==", + "requires": { + "@babel/helper-validator-identifier": "^7.9.5", + "lodash": "^4.17.13", + "to-fast-properties": "^2.0.0" + } + }, + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "requires": { + "ms": "^2.1.1" + } } } }, @@ -1964,12 +2152,12 @@ } }, "@babel/preset-env": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.9.0.tgz", - "integrity": "sha512-712DeRXT6dyKAM/FMbQTV/FvRCms2hPCx+3weRjZ8iQVQWZejWWk1wwG6ViWMyqb/ouBbGOl5b6aCk0+j1NmsQ==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.9.6.tgz", + "integrity": "sha512-0gQJ9RTzO0heXOhzftog+a/WyOuqMrAIugVYxMYf83gh1CQaQDjMtsOpqOwXyDL/5JcWsrCm8l4ju8QC97O7EQ==", "requires": { - "@babel/compat-data": "^7.9.0", - "@babel/helper-compilation-targets": "^7.8.7", + "@babel/compat-data": "^7.9.6", + "@babel/helper-compilation-targets": "^7.9.6", "@babel/helper-module-imports": "^7.8.3", "@babel/helper-plugin-utils": "^7.8.3", "@babel/plugin-proposal-async-generator-functions": "^7.8.3", @@ -1977,7 +2165,7 @@ "@babel/plugin-proposal-json-strings": "^7.8.3", "@babel/plugin-proposal-nullish-coalescing-operator": "^7.8.3", "@babel/plugin-proposal-numeric-separator": "^7.8.3", - "@babel/plugin-proposal-object-rest-spread": "^7.9.0", + "@babel/plugin-proposal-object-rest-spread": "^7.9.6", "@babel/plugin-proposal-optional-catch-binding": "^7.8.3", "@babel/plugin-proposal-optional-chaining": "^7.9.0", "@babel/plugin-proposal-unicode-property-regex": "^7.8.3", @@ -1994,9 +2182,9 @@ "@babel/plugin-transform-async-to-generator": "^7.8.3", "@babel/plugin-transform-block-scoped-functions": "^7.8.3", "@babel/plugin-transform-block-scoping": "^7.8.3", - "@babel/plugin-transform-classes": "^7.9.0", + "@babel/plugin-transform-classes": "^7.9.5", "@babel/plugin-transform-computed-properties": "^7.8.3", - "@babel/plugin-transform-destructuring": "^7.8.3", + "@babel/plugin-transform-destructuring": "^7.9.5", "@babel/plugin-transform-dotall-regex": "^7.8.3", "@babel/plugin-transform-duplicate-keys": "^7.8.3", "@babel/plugin-transform-exponentiation-operator": "^7.8.3", @@ -2004,14 +2192,14 @@ "@babel/plugin-transform-function-name": "^7.8.3", "@babel/plugin-transform-literals": "^7.8.3", "@babel/plugin-transform-member-expression-literals": "^7.8.3", - "@babel/plugin-transform-modules-amd": "^7.9.0", - "@babel/plugin-transform-modules-commonjs": "^7.9.0", - "@babel/plugin-transform-modules-systemjs": "^7.9.0", + "@babel/plugin-transform-modules-amd": "^7.9.6", + "@babel/plugin-transform-modules-commonjs": "^7.9.6", + "@babel/plugin-transform-modules-systemjs": "^7.9.6", "@babel/plugin-transform-modules-umd": "^7.9.0", "@babel/plugin-transform-named-capturing-groups-regex": "^7.8.3", "@babel/plugin-transform-new-target": "^7.8.3", "@babel/plugin-transform-object-super": "^7.8.3", - "@babel/plugin-transform-parameters": "^7.8.7", + "@babel/plugin-transform-parameters": "^7.9.5", "@babel/plugin-transform-property-literals": "^7.8.3", "@babel/plugin-transform-regenerator": "^7.8.7", "@babel/plugin-transform-reserved-words": "^7.8.3", @@ -2022,24 +2210,14 @@ "@babel/plugin-transform-typeof-symbol": "^7.8.4", "@babel/plugin-transform-unicode-regex": "^7.8.3", "@babel/preset-modules": "^0.1.3", - "@babel/types": "^7.9.0", - "browserslist": "^4.9.1", + "@babel/types": "^7.9.6", + "browserslist": "^4.11.1", "core-js-compat": "^3.6.2", "invariant": "^2.2.2", "levenary": "^1.1.1", "semver": "^5.5.0" }, "dependencies": { - "@babel/compat-data": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.9.0.tgz", - "integrity": "sha512-zeFQrr+284Ekvd9e7KAX954LkapWiOmQtsfHirhxqfdlX6MEC32iRE+pqUGlYIBchdevaCwvzxWGSy/YBNI85g==", - "requires": { - "browserslist": "^4.9.1", - "invariant": "^2.2.4", - "semver": "^5.5.0" - } - }, "@babel/helper-create-regexp-features-plugin": { "version": "7.8.8", "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.8.tgz", @@ -2063,22 +2241,19 @@ "lodash": "^4.17.13" } }, - "@babel/plugin-proposal-object-rest-spread": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.0.tgz", - "integrity": "sha512-UgqBv6bjq4fDb8uku9f+wcm1J7YxJ5nT7WO/jBr0cl0PLKb7t1O6RNR1kZbjgx2LQtsDI9hwoQVmn0yhXeQyow==", - "requires": { - "@babel/helper-plugin-utils": "^7.8.3", - "@babel/plugin-syntax-object-rest-spread": "^7.8.0" - } + "@babel/helper-validator-identifier": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz", + "integrity": "sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==" }, - "@babel/plugin-proposal-optional-chaining": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.9.0.tgz", - "integrity": "sha512-NDn5tu3tcv4W30jNhmc2hyD5c56G6cXx4TesJubhxrJeCvuuMpttxr0OnNCqbZGhFjLrg+NIhxxC+BK5F6yS3w==", + "@babel/plugin-proposal-object-rest-spread": { + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.6.tgz", + "integrity": "sha512-Ga6/fhGqA9Hj+y6whNpPv8psyaK5xzrQwSPsGPloVkvmH+PqW1ixdnfJ9uIO06OjQNYol3PMnfmJ8vfZtkzF+A==", "requires": { "@babel/helper-plugin-utils": "^7.8.3", - "@babel/plugin-syntax-optional-chaining": "^7.8.0" + "@babel/plugin-syntax-object-rest-spread": "^7.8.0", + "@babel/plugin-transform-parameters": "^7.9.5" } }, "@babel/plugin-proposal-unicode-property-regex": { @@ -2090,6 +2265,14 @@ "@babel/helper-plugin-utils": "^7.8.3" } }, + "@babel/plugin-transform-destructuring": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.9.5.tgz", + "integrity": "sha512-j3OEsGel8nHL/iusv/mRd5fYZ3DrOxWC82x0ogmdN/vHfAP4MYw+AFKYanzWlktNwikKvlzUV//afBW5FTp17Q==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.3" + } + }, "@babel/plugin-transform-dotall-regex": { "version": "7.8.3", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.8.3.tgz", @@ -2100,20 +2283,46 @@ } }, "@babel/types": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.0.tgz", - "integrity": "sha512-BS9JKfXkzzJl8RluW4JGknzpiUV7ZrvTayM6yfqLTVBEnFtyowVIOu6rqxRd5cVO6yGoWf4T8u8dgK9oB+GCng==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.6.tgz", + "integrity": "sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA==", "requires": { - "@babel/helper-validator-identifier": "^7.9.0", + "@babel/helper-validator-identifier": "^7.9.5", "lodash": "^4.17.13", "to-fast-properties": "^2.0.0" } }, + "browserslist": { + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.12.0.tgz", + "integrity": "sha512-UH2GkcEDSI0k/lRkuDSzFl9ZZ87skSy9w2XAn1MsZnL+4c4rqbBd3e82UWHbYDpztABrPBhZsTEeuxVfHppqDg==", + "requires": { + "caniuse-lite": "^1.0.30001043", + "electron-to-chromium": "^1.3.413", + "node-releases": "^1.1.53", + "pkg-up": "^2.0.0" + } + }, + "caniuse-lite": { + "version": "1.0.30001048", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001048.tgz", + "integrity": "sha512-g1iSHKVxornw0K8LG9LLdf+Fxnv7T1Z+mMsf0/YYLclQX4Cd522Ap0Lrw6NFqHgezit78dtyWxzlV2Xfc7vgRg==" + }, + "electron-to-chromium": { + "version": "1.3.427", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.427.tgz", + "integrity": "sha512-/rG5G7Opcw68/Yrb4qYkz07h3bESVRJjUl4X/FrKLXzoUJleKm6D7K7rTTz8V5LUWnd+BbTOyxJX2XprRqHD8A==" + }, "jsesc": { "version": "0.5.0", "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=" }, + "node-releases": { + "version": "1.1.53", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.53.tgz", + "integrity": "sha512-wp8zyQVwef2hpZ/dJH7SfSrIPD6YoJz6BDQDpGEkcA0s3LpAQoxBIYmfIq6QAhC1DhwsyCgTaTTcONwX8qzCuQ==" + }, "regenerate-unicode-properties": { "version": "8.2.0", "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz", @@ -2552,56 +2761,177 @@ "requires": { "has-flag": "^4.0.0" } - } - } - }, - "@mapbox/hast-util-table-cell-style": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/@mapbox/hast-util-table-cell-style/-/hast-util-table-cell-style-0.1.3.tgz", - "integrity": "sha512-QsEsh5YaDvHoMQ2YHdvZy2iDnU3GgKVBTcHf6cILyoWDZtPSdlG444pL/ioPYO/GpXSfODBb9sefEetfC4v9oA==", - "requires": { - "unist-util-visit": "^1.3.0" - }, - "dependencies": { - "unist-util-visit": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.4.1.tgz", - "integrity": "sha512-AvGNk7Bb//EmJZyhtRUnNMEpId/AZ5Ph/KUpTI09WHQuDZHKovQ1oEv3mfmKpWKtoMzyMC4GLBm1Zy5k12fjIw==", + } + } + }, + "@mapbox/hast-util-table-cell-style": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/@mapbox/hast-util-table-cell-style/-/hast-util-table-cell-style-0.1.3.tgz", + "integrity": "sha512-QsEsh5YaDvHoMQ2YHdvZy2iDnU3GgKVBTcHf6cILyoWDZtPSdlG444pL/ioPYO/GpXSfODBb9sefEetfC4v9oA==", + "requires": { + "unist-util-visit": "^1.3.0" + }, + "dependencies": { + "unist-util-visit": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.4.1.tgz", + "integrity": "sha512-AvGNk7Bb//EmJZyhtRUnNMEpId/AZ5Ph/KUpTI09WHQuDZHKovQ1oEv3mfmKpWKtoMzyMC4GLBm1Zy5k12fjIw==", + "requires": { + "unist-util-visit-parents": "^2.0.0" + } + } + } + }, + "@mdx-js/mdx": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/@mdx-js/mdx/-/mdx-1.6.1.tgz", + "integrity": "sha512-DLnHbYZGoXSzfIHKgEtsO4qP8029YbdyJvC746PwfPNrRyGciPsqgWmfz/nEXt/fg+UMBG/6/cZaZx/hvyxnyg==", + "requires": { + "@babel/core": "7.9.0", + "@babel/plugin-syntax-jsx": "7.8.3", + "@babel/plugin-syntax-object-rest-spread": "7.8.3", + "@mdx-js/util": "^1.6.1", + "babel-plugin-apply-mdx-type-prop": "^1.6.1", + "babel-plugin-extract-import-names": "^1.6.1", + "camelcase-css": "2.0.1", + "detab": "2.0.3", + "hast-util-raw": "5.0.2", + "lodash.uniq": "4.5.0", + "mdast-util-to-hast": "8.2.0", + "remark-footnotes": "1.0.0", + "remark-mdx": "^1.6.1", + "remark-parse": "8.0.2", + "remark-squeeze-paragraphs": "4.0.0", + "style-to-object": "0.3.0", + "unified": "9.0.0", + "unist-builder": "2.0.3", + "unist-util-visit": "2.0.2" + }, + "dependencies": { + "@babel/code-frame": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", + "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", + "requires": { + "@babel/highlight": "^7.8.3" + } + }, + "@babel/core": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.0.tgz", + "integrity": "sha512-kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==", + "requires": { + "@babel/code-frame": "^7.8.3", + "@babel/generator": "^7.9.0", + "@babel/helper-module-transforms": "^7.9.0", + "@babel/helpers": "^7.9.0", + "@babel/parser": "^7.9.0", + "@babel/template": "^7.8.6", + "@babel/traverse": "^7.9.0", + "@babel/types": "^7.9.0", + "convert-source-map": "^1.7.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.1", + "json5": "^2.1.2", + "lodash": "^4.17.13", + "resolve": "^1.3.2", + "semver": "^5.4.1", + "source-map": "^0.5.0" + } + }, + "@babel/generator": { + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.6.tgz", + "integrity": "sha512-+htwWKJbH2bL72HRluF8zumBxzuX0ZZUFl3JLNyoUjM/Ho8wnVpPXM6aUz8cfKDqQ/h7zHqKt4xzJteUosckqQ==", + "requires": { + "@babel/types": "^7.9.6", + "jsesc": "^2.5.1", + "lodash": "^4.17.13", + "source-map": "^0.5.0" + } + }, + "@babel/helper-function-name": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz", + "integrity": "sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==", + "requires": { + "@babel/helper-get-function-arity": "^7.8.3", + "@babel/template": "^7.8.3", + "@babel/types": "^7.9.5" + } + }, + "@babel/highlight": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz", + "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==", + "requires": { + "@babel/helper-validator-identifier": "^7.9.0", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" + } + }, + "@babel/parser": { + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.6.tgz", + "integrity": "sha512-AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q==" + }, + "@babel/template": { + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz", + "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==", + "requires": { + "@babel/code-frame": "^7.8.3", + "@babel/parser": "^7.8.6", + "@babel/types": "^7.8.6" + } + }, + "@babel/traverse": { + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.6.tgz", + "integrity": "sha512-b3rAHSjbxy6VEAvlxM8OV/0X4XrG72zoxme6q1MOoe2vd0bEc+TwayhuC1+Dfgqh1QEG+pj7atQqvUprHIccsg==", + "requires": { + "@babel/code-frame": "^7.8.3", + "@babel/generator": "^7.9.6", + "@babel/helper-function-name": "^7.9.5", + "@babel/helper-split-export-declaration": "^7.8.3", + "@babel/parser": "^7.9.6", + "@babel/types": "^7.9.6", + "debug": "^4.1.0", + "globals": "^11.1.0", + "lodash": "^4.17.13" + } + }, + "@babel/types": { + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.6.tgz", + "integrity": "sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA==", + "requires": { + "@babel/helper-validator-identifier": "^7.9.5", + "lodash": "^4.17.13", + "to-fast-properties": "^2.0.0" + }, + "dependencies": { + "@babel/helper-validator-identifier": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz", + "integrity": "sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==" + } + } + }, + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", "requires": { - "unist-util-visit-parents": "^2.0.0" + "ms": "^2.1.1" } } } }, - "@mdx-js/mdx": { - "version": "1.5.8", - "resolved": "https://registry.npmjs.org/@mdx-js/mdx/-/mdx-1.5.8.tgz", - "integrity": "sha512-OzanPTN0p9GZOEVeEuEa8QsjxxGyfFOOnI/+V1oC1su9UIN4KUg1k4n/hWTZC+VZhdW1Lfj6+Ho8nIs6L+pbDA==", - "requires": { - "@babel/core": "7.8.4", - "@babel/plugin-syntax-jsx": "7.8.3", - "@babel/plugin-syntax-object-rest-spread": "7.8.3", - "@mdx-js/util": "^1.5.8", - "babel-plugin-apply-mdx-type-prop": "^1.5.8", - "babel-plugin-extract-import-names": "^1.5.8", - "camelcase-css": "2.0.1", - "detab": "2.0.3", - "hast-util-raw": "5.0.2", - "lodash.uniq": "4.5.0", - "mdast-util-to-hast": "7.0.0", - "remark-mdx": "^1.5.8", - "remark-parse": "7.0.2", - "remark-squeeze-paragraphs": "3.0.4", - "style-to-object": "0.3.0", - "unified": "8.4.2", - "unist-builder": "2.0.3", - "unist-util-visit": "2.0.2" - } - }, "@mdx-js/react": { - "version": "1.5.8", - "resolved": "https://registry.npmjs.org/@mdx-js/react/-/react-1.5.8.tgz", - "integrity": "sha512-L3rehITVxqDHOPJFGBSHKt3Mv/p3MENYlGIwLNYU89/iVqTLMD/vz8hL9RQtKqRoMbKuWpzzLlKIObqJzthNYg==" + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/@mdx-js/react/-/react-1.6.1.tgz", + "integrity": "sha512-jXBSWdWFPK2fs3johKb0hQFsf/x/C24XQYQwMhj8FxwlBgf7+NGATwXFs6pGkKd5/JfK9HXmbOcQ78MYoIZyxA==" }, "@mdx-js/runtime": { "version": "1.6.1", @@ -2951,9 +3281,9 @@ } }, "@mdx-js/util": { - "version": "1.5.8", - "resolved": "https://registry.npmjs.org/@mdx-js/util/-/util-1.5.8.tgz", - "integrity": "sha512-a7Gjjw8bfBSertA/pTWBA/9WKEhgaSxvQE2NTSUzaknrzGFOhs4alZSHh3RHmSFdSWv5pUuzAgsWseMLhWEVkQ==" + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/@mdx-js/util/-/util-1.6.1.tgz", + "integrity": "sha512-A3TBBjg5iVo8S4TTG0VrW8G9YNLob4+M6rALKjY8Sxr9zPExWQ7iTPUSvJVE7YhF9E08EQMubx1vRal3jtpJ9Q==" }, "@mikaelkristiansson/domready": { "version": "1.0.10", @@ -3755,16 +4085,6 @@ "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==", "requires": { "es6-promisify": "^5.0.0" - }, - "dependencies": { - "es6-promisify": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz", - "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=", - "requires": { - "es6-promise": "^4.0.3" - } - } } }, "aggregate-error": { @@ -4431,12 +4751,12 @@ } }, "babel-plugin-apply-mdx-type-prop": { - "version": "1.5.8", - "resolved": "https://registry.npmjs.org/babel-plugin-apply-mdx-type-prop/-/babel-plugin-apply-mdx-type-prop-1.5.8.tgz", - "integrity": "sha512-xYp5F9mAnZdDRFSd1vF3XQ0GQUbIulCpnuht2jCmK30GAHL8szVL7TgzwhEGamQ6yJmP/gEyYNM9OR5D2n26eA==", + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/babel-plugin-apply-mdx-type-prop/-/babel-plugin-apply-mdx-type-prop-1.6.1.tgz", + "integrity": "sha512-chjmLo1x7fCpDRICGUlbkwf2E6sMVG9jjG6PtPBWnQfMEjgV03Gh0jSVGbZJsEUxcMqOpHSsIXvPz1sYip6X3g==", "requires": { "@babel/helper-plugin-utils": "7.8.3", - "@mdx-js/util": "^1.5.8" + "@mdx-js/util": "^1.6.1" }, "dependencies": { "@babel/helper-plugin-utils": { @@ -4447,9 +4767,9 @@ } }, "babel-plugin-dynamic-import-node": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz", - "integrity": "sha512-o6qFkpeQEBxcqt0XYlWzAVxNCSCZdUgcR8IRlhD/8DylxjjO4foPcvTW0GGKa/cVt3rvxZ7o5ippJ+/0nvLhlQ==", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz", + "integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==", "requires": { "object.assign": "^4.1.0" } @@ -4472,9 +4792,9 @@ } }, "babel-plugin-extract-import-names": { - "version": "1.5.8", - "resolved": "https://registry.npmjs.org/babel-plugin-extract-import-names/-/babel-plugin-extract-import-names-1.5.8.tgz", - "integrity": "sha512-LcLfP8ZRBZMdMAXHLugyvvd5PY0gMmLMWFogWAUsG32X6TYW2Eavx+il2bw73KDbW+UdCC1bAJ3NuU25T1MI3g==", + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/babel-plugin-extract-import-names/-/babel-plugin-extract-import-names-1.6.1.tgz", + "integrity": "sha512-u0uRrPyygx4RlNva1aqz7DM9UBpsQJQZ4NyakHVJF18s73H/iiyXuc+X7k+9tHeN0WKLsohQUGzGLli6z5a0Zw==", "requires": { "@babel/helper-plugin-utils": "7.8.3" }, @@ -5783,9 +6103,9 @@ } }, "chokidar": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.3.1.tgz", - "integrity": "sha512-4QYCEWOcK3OJrxwvyyAOxFuhpvOVCYkr33LPfFNBjAD/w3sEzWsp2BUOkI4l9bHvWioAd0rc6NlHUOEaWkTeqg==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.0.tgz", + "integrity": "sha512-aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ==", "requires": { "anymatch": "~3.1.1", "braces": "~3.0.2", @@ -5794,7 +6114,7 @@ "is-binary-path": "~2.1.0", "is-glob": "~4.0.1", "normalize-path": "~3.0.0", - "readdirp": "~3.3.0" + "readdirp": "~3.4.0" }, "dependencies": { "anymatch": { @@ -5828,9 +6148,9 @@ } }, "fsevents": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.2.tgz", - "integrity": "sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz", + "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==", "optional": true }, "glob-parent": { @@ -5860,11 +6180,18 @@ "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==" }, "readdirp": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.3.0.tgz", - "integrity": "sha512-zz0pAkSPOXXm1viEwygWIPSPkcBYjW1xU5j/JBh5t9bGCJwa6f9+BJa6VaB2g+b55yVrmXzqkyLf4xaWYM0IkQ==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz", + "integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==", "requires": { - "picomatch": "^2.0.7" + "picomatch": "^2.2.1" + }, + "dependencies": { + "picomatch": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz", + "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==" + } } }, "to-regex-range": { @@ -8105,6 +8432,14 @@ "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz", "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==" }, + "es6-promisify": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz", + "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=", + "requires": { + "es6-promise": "^4.0.3" + } + }, "escape-html": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", @@ -10933,9 +11268,9 @@ } }, "gatsby-core-utils": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.1.4.tgz", - "integrity": "sha512-cXUB9PiPGqHzbFlwnJMgd9ezXb1goWOufh8oJglxp4x7vlPKUjPWpVG0UkwF6HNunpreN4WD8Jex5ed/dxEgtw==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.2.0.tgz", + "integrity": "sha512-JBsVbniXObn26Hms8Je1vJdhMW04GesochBVLcaTraZC5dfqZDExPix65jrye/voC0YfFtXIngm59yspYZm1OQ==", "requires": { "ci-info": "2.0.0", "configstore": "^5.0.1", @@ -11136,18 +11471,18 @@ } }, "gatsby-plugin-emotion": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/gatsby-plugin-emotion/-/gatsby-plugin-emotion-4.2.3.tgz", - "integrity": "sha512-RXkfO5kciogZrpF4/jyQwDcF4g2qdh9qDuagRMdRse887MVqKb+VG+x0KRx+0cg7cGiyg8xOfbTplBB+E0Z88A==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/gatsby-plugin-emotion/-/gatsby-plugin-emotion-4.3.0.tgz", + "integrity": "sha512-e4Z+xaaRdkmMY1qmTnNPzSJYkP/M9fOYm9mE/2sssDWvH5UwlmDPUMxMuDxDO722mbbB9RGEHxX4ElrsXH7Gcg==", "requires": { - "@babel/runtime": "^7.8.7", + "@babel/runtime": "^7.9.2", "@emotion/babel-preset-css-prop": "^10.0.27" }, "dependencies": { "@babel/runtime": { - "version": "7.9.2", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz", - "integrity": "sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.6.tgz", + "integrity": "sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==", "requires": { "regenerator-runtime": "^0.13.4" } @@ -11160,18 +11495,18 @@ } }, "gatsby-plugin-google-analytics": { - "version": "2.2.5", - "resolved": "https://registry.npmjs.org/gatsby-plugin-google-analytics/-/gatsby-plugin-google-analytics-2.2.5.tgz", - "integrity": "sha512-pB03ICMXMcCSf8Qq/h0Pd0J3JpSpBPp78JJv8rDDfD3Ly6+SWuREBdkrq1d3CpwJ3ANGiaH3aGtN7ztlwmoXsw==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/gatsby-plugin-google-analytics/-/gatsby-plugin-google-analytics-2.3.0.tgz", + "integrity": "sha512-ekXMjLpkoRT6eYC8eOEOhSDLsSBPBsZ6JQydvcmDqy/cCgc+B66icPlqd4G/Lst13Ede2z2cOMuntEsEXf6CvA==", "requires": { - "@babel/runtime": "^7.8.7", + "@babel/runtime": "^7.9.2", "minimatch": "3.0.4" }, "dependencies": { "@babel/runtime": { - "version": "7.9.2", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz", - "integrity": "sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.6.tgz", + "integrity": "sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==", "requires": { "regenerator-runtime": "^0.13.4" } @@ -11184,18 +11519,18 @@ } }, "gatsby-plugin-less": { - "version": "3.1.4", - "resolved": "https://registry.npmjs.org/gatsby-plugin-less/-/gatsby-plugin-less-3.1.4.tgz", - "integrity": "sha512-+mJwl8WV4mOEcOdvPkSrDsT+Ph0KskDgltszq5Y17muqJfNtrYMxyHCBF6wbSW/OjLghD+fc6+eXb/p2GW8ngQ==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/gatsby-plugin-less/-/gatsby-plugin-less-3.2.0.tgz", + "integrity": "sha512-MqaC7zEa4dKIcm9anr5Z7Ny3B5BBQcWHk5VErWEgn3ptFLVGoNF+pscOB6SOkk78xm2GCiwm29dylMpdrI7x3A==", "requires": { - "@babel/runtime": "^7.8.7", + "@babel/runtime": "^7.9.2", "less-loader": "^5.0.0" }, "dependencies": { "@babel/runtime": { - "version": "7.9.2", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz", - "integrity": "sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.6.tgz", + "integrity": "sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==", "requires": { "regenerator-runtime": "^0.13.4" } @@ -11208,17 +11543,17 @@ } }, "gatsby-plugin-mdx": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/gatsby-plugin-mdx/-/gatsby-plugin-mdx-1.1.11.tgz", - "integrity": "sha512-7Bo4DCCFjK28FFI2G6ixGgMfsHaHPCPVxMAwJUeHGAgr7UX1lTTqrDbkQgcGgkGEWpQcV+IbXxLCY9aX7vyPsA==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/gatsby-plugin-mdx/-/gatsby-plugin-mdx-1.2.4.tgz", + "integrity": "sha512-4sSrTcJh6HCTttljxh1UbAeXvZ1byD3U2gKji8r6Hv0x79Dfi3K22FIqupnSLIWWuKiCxNBgCtmRAEhuWGbFrQ==", "requires": { - "@babel/core": "^7.8.7", - "@babel/generator": "^7.8.8", + "@babel/core": "^7.9.0", + "@babel/generator": "^7.9.5", "@babel/helper-plugin-utils": "^7.8.3", - "@babel/plugin-proposal-object-rest-spread": "^7.8.3", - "@babel/preset-env": "^7.8.7", - "@babel/preset-react": "^7.8.3", - "@babel/types": "^7.8.7", + "@babel/plugin-proposal-object-rest-spread": "^7.9.5", + "@babel/preset-env": "^7.9.5", + "@babel/preset-react": "^7.9.4", + "@babel/types": "^7.9.5", "camelcase-css": "^2.0.1", "change-case": "^3.1.0", "core-js": "2", @@ -11227,9 +11562,9 @@ "escape-string-regexp": "^1.0.5", "eval": "^0.1.4", "fs-extra": "^8.1.0", - "gatsby-core-utils": "^1.1.4", + "gatsby-core-utils": "^1.2.0", "gray-matter": "^4.0.2", - "json5": "^2.1.2", + "json5": "^2.1.3", "loader-utils": "^1.4.0", "lodash": "^4.17.15", "mdast-util-to-string": "^1.1.0", @@ -11258,18 +11593,18 @@ } }, "@babel/core": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.0.tgz", - "integrity": "sha512-kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.6.tgz", + "integrity": "sha512-nD3deLvbsApbHAHttzIssYqgb883yU/d9roe4RZymBCDaZryMJDbptVpEpeQuRh4BJ+SYI8le9YGxKvFEvl1Wg==", "requires": { "@babel/code-frame": "^7.8.3", - "@babel/generator": "^7.9.0", + "@babel/generator": "^7.9.6", "@babel/helper-module-transforms": "^7.9.0", - "@babel/helpers": "^7.9.0", - "@babel/parser": "^7.9.0", + "@babel/helpers": "^7.9.6", + "@babel/parser": "^7.9.6", "@babel/template": "^7.8.6", - "@babel/traverse": "^7.9.0", - "@babel/types": "^7.9.0", + "@babel/traverse": "^7.9.6", + "@babel/types": "^7.9.6", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.1", @@ -11281,11 +11616,11 @@ } }, "@babel/generator": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.5.tgz", - "integrity": "sha512-GbNIxVB3ZJe3tLeDm1HSn2AhuD/mVcyLDpgtLXa5tplmWrJdF/elxB56XNqCuD6szyNkDi6wuoKXln3QeBmCHQ==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.6.tgz", + "integrity": "sha512-+htwWKJbH2bL72HRluF8zumBxzuX0ZZUFl3JLNyoUjM/Ho8wnVpPXM6aUz8cfKDqQ/h7zHqKt4xzJteUosckqQ==", "requires": { - "@babel/types": "^7.9.5", + "@babel/types": "^7.9.6", "jsesc": "^2.5.1", "lodash": "^4.17.13", "source-map": "^0.5.0" @@ -11306,6 +11641,16 @@ "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" }, + "@babel/helpers": { + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.6.tgz", + "integrity": "sha512-tI4bUbldloLcHWoRUMAj4g1bF313M/o6fBKhIsb3QnGVPwRm9JsNf/gqMkQ7zjqReABiffPV6RWj7hEglID5Iw==", + "requires": { + "@babel/template": "^7.8.3", + "@babel/traverse": "^7.9.6", + "@babel/types": "^7.9.6" + } + }, "@babel/highlight": { "version": "7.9.0", "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz", @@ -11317,9 +11662,19 @@ } }, "@babel/parser": { - "version": "7.9.4", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz", - "integrity": "sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==" + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.6.tgz", + "integrity": "sha512-AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q==" + }, + "@babel/plugin-proposal-object-rest-spread": { + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.6.tgz", + "integrity": "sha512-Ga6/fhGqA9Hj+y6whNpPv8psyaK5xzrQwSPsGPloVkvmH+PqW1ixdnfJ9uIO06OjQNYol3PMnfmJ8vfZtkzF+A==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.3", + "@babel/plugin-syntax-object-rest-spread": "^7.8.0", + "@babel/plugin-transform-parameters": "^7.9.5" + } }, "@babel/template": { "version": "7.8.6", @@ -11332,25 +11687,25 @@ } }, "@babel/traverse": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.5.tgz", - "integrity": "sha512-c4gH3jsvSuGUezlP6rzSJ6jf8fYjLj3hsMZRx/nX0h+fmHN0w+ekubRrHPqnMec0meycA2nwCsJ7dC8IPem2FQ==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.6.tgz", + "integrity": "sha512-b3rAHSjbxy6VEAvlxM8OV/0X4XrG72zoxme6q1MOoe2vd0bEc+TwayhuC1+Dfgqh1QEG+pj7atQqvUprHIccsg==", "requires": { "@babel/code-frame": "^7.8.3", - "@babel/generator": "^7.9.5", + "@babel/generator": "^7.9.6", "@babel/helper-function-name": "^7.9.5", "@babel/helper-split-export-declaration": "^7.8.3", - "@babel/parser": "^7.9.0", - "@babel/types": "^7.9.5", + "@babel/parser": "^7.9.6", + "@babel/types": "^7.9.6", "debug": "^4.1.0", "globals": "^11.1.0", "lodash": "^4.17.13" } }, "@babel/types": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.5.tgz", - "integrity": "sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.6.tgz", + "integrity": "sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA==", "requires": { "@babel/helper-validator-identifier": "^7.9.5", "lodash": "^4.17.13", @@ -11377,6 +11732,19 @@ "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==" }, + "is-plain-obj": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", + "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==" + }, + "json5": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz", + "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==", + "requires": { + "minimist": "^1.2.5" + } + }, "loader-utils": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz", @@ -11397,6 +11765,31 @@ } } }, + "minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" + }, + "unified": { + "version": "8.4.2", + "resolved": "https://registry.npmjs.org/unified/-/unified-8.4.2.tgz", + "integrity": "sha512-JCrmN13jI4+h9UAyKEoGcDZV+i1E7BLFuG7OsaDvTXI5P0qhHX+vZO/kOhz9jn8HGENDKbwSeB0nVOg4gVStGA==", + "requires": { + "bail": "^1.0.0", + "extend": "^3.0.0", + "is-plain-obj": "^2.0.0", + "trough": "^1.0.0", + "vfile": "^4.0.0" + } + }, + "unist-util-remove": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/unist-util-remove/-/unist-util-remove-1.0.3.tgz", + "integrity": "sha512-mB6nCHCQK0pQffUAcCVmKgIWzG/AXs/V8qpS8K72tMPtOSCMSjDeMc5yN+Ye8rB0FhcE+JvW++o1xRNc0R+++g==", + "requires": { + "unist-util-is": "^3.0.0" + } + }, "unist-util-visit": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.4.1.tgz", @@ -11460,17 +11853,17 @@ } }, "gatsby-plugin-react-helmet": { - "version": "3.2.5", - "resolved": "https://registry.npmjs.org/gatsby-plugin-react-helmet/-/gatsby-plugin-react-helmet-3.2.5.tgz", - "integrity": "sha512-Lbt1kWBAQE1RsZHxPxYov+M9X7PNaQuzfOS6Cplfp7+dN+Dm7lOe/iLMP/vM/GLCEyxJnY072JyIb6XkBgH5ZA==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/gatsby-plugin-react-helmet/-/gatsby-plugin-react-helmet-3.3.0.tgz", + "integrity": "sha512-Z0G2/+fvX+FRkvd5H5VezJKlWNz39P6SZnPliIk6tGbKP4RIry5xdZYmyd3bn+IsyNvm2GmDoTQfOSqxsYNweQ==", "requires": { - "@babel/runtime": "^7.8.7" + "@babel/runtime": "^7.9.2" }, "dependencies": { "@babel/runtime": { - "version": "7.9.2", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz", - "integrity": "sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.6.tgz", + "integrity": "sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==", "requires": { "regenerator-runtime": "^0.13.4" } @@ -12223,11 +12616,11 @@ } }, "gatsby-remark-autolink-headers": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/gatsby-remark-autolink-headers/-/gatsby-remark-autolink-headers-2.2.4.tgz", - "integrity": "sha512-5FRB9u3WrLTWnFELvbozbI93ALHbe+S39UmI+VqEHGtZsQb+a6PBos9cPTT7YvJ1qugXpuBjTVtjr1gNqffMsA==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/gatsby-remark-autolink-headers/-/gatsby-remark-autolink-headers-2.3.0.tgz", + "integrity": "sha512-lU8nr81lL+ZGJGJWhiKxZplQADRrZCnCelmtSw5Lvx4aViHfDbewAc+CDyUeXJeQZ8lod76t3X8beWpzePQCHw==", "requires": { - "@babel/runtime": "^7.8.7", + "@babel/runtime": "^7.9.2", "github-slugger": "^1.3.0", "lodash": "^4.17.15", "mdast-util-to-string": "^1.1.0", @@ -12235,9 +12628,9 @@ }, "dependencies": { "@babel/runtime": { - "version": "7.9.2", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz", - "integrity": "sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.6.tgz", + "integrity": "sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==", "requires": { "regenerator-runtime": "^0.13.4" } @@ -12314,11 +12707,11 @@ } }, "gatsby-remark-copy-linked-files": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/gatsby-remark-copy-linked-files/-/gatsby-remark-copy-linked-files-2.2.4.tgz", - "integrity": "sha512-UxtoTrIAqqn+yghka6+nhFsmPgVUEBH2zITRV7RSOcdDgZoTOvrKxpKAoZkEsK/TSFzSZXDiJLDNSTzI598Udw==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/gatsby-remark-copy-linked-files/-/gatsby-remark-copy-linked-files-2.3.1.tgz", + "integrity": "sha512-XXWFiLt/+me+GnxTYWX1HncgsfjFw2QwwZUSX6fx7bilXlW1Rn7DO/Lw3vMGJFTsk7R0eoWeWMX60PeXkhA2GA==", "requires": { - "@babel/runtime": "^7.8.7", + "@babel/runtime": "^7.9.2", "cheerio": "^1.0.0-rc.3", "fs-extra": "^8.1.0", "is-relative-url": "^3.0.0", @@ -12329,9 +12722,9 @@ }, "dependencies": { "@babel/runtime": { - "version": "7.9.2", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz", - "integrity": "sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.6.tgz", + "integrity": "sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==", "requires": { "regenerator-runtime": "^0.13.4" } @@ -12407,19 +12800,19 @@ } }, "gatsby-remark-prismjs": { - "version": "3.4.5", - "resolved": "https://registry.npmjs.org/gatsby-remark-prismjs/-/gatsby-remark-prismjs-3.4.5.tgz", - "integrity": "sha512-vw3VgHm4/o0xtxCBtfLztLU/fRHgdb6skTJ3DXlALCOaXqJ5cQjM8iShg3j5gOiEuMa7xxFUTaIAwKmMK0WbfQ==", + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/gatsby-remark-prismjs/-/gatsby-remark-prismjs-3.5.0.tgz", + "integrity": "sha512-ADzpWUaJJB+5bshybw4AC1f1mPZwENgoemlsAl7uBxjZ1B9HIubzKPXFNTyrGdaTkJs49Z6id9QCnZfHdefHtg==", "requires": { - "@babel/runtime": "^7.8.7", + "@babel/runtime": "^7.9.2", "parse-numeric-range": "^0.0.2", "unist-util-visit": "^1.4.1" }, "dependencies": { "@babel/runtime": { - "version": "7.9.2", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz", - "integrity": "sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.6.tgz", + "integrity": "sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==", "requires": { "regenerator-runtime": "^0.13.4" } @@ -12448,17 +12841,17 @@ } }, "gatsby-source-filesystem": { - "version": "2.2.5", - "resolved": "https://registry.npmjs.org/gatsby-source-filesystem/-/gatsby-source-filesystem-2.2.5.tgz", - "integrity": "sha512-mZ8gPENU6iykLuoSJTb6bSydaJek7b7LwOPWpzThsdz/WiqhdfUV18SSP0G9/Eq62Tr6QUOLrmk4dBG5vI5Vmg==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/gatsby-source-filesystem/-/gatsby-source-filesystem-2.3.0.tgz", + "integrity": "sha512-SUJbbl4hYyvudGImU86amxIfqYoYpkITlY0lHV7azeAQj3199ZUqO0hGwbl4MZ5fNwwQEbANEUbsoPkyc/QUZQ==", "requires": { - "@babel/runtime": "^7.8.7", + "@babel/runtime": "^7.9.2", "better-queue": "^3.8.10", "bluebird": "^3.7.2", - "chokidar": "3.3.1", + "chokidar": "3.4.0", "file-type": "^12.4.2", "fs-extra": "^8.1.0", - "gatsby-core-utils": "^1.1.4", + "gatsby-core-utils": "^1.2.0", "got": "^9.6.0", "md5-file": "^3.2.3", "mime": "^2.4.4", @@ -12466,13 +12859,13 @@ "progress": "^2.0.3", "read-chunk": "^3.2.0", "valid-url": "^1.0.9", - "xstate": "^4.8.0" + "xstate": "^4.9.1" }, "dependencies": { "@babel/runtime": { - "version": "7.9.2", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz", - "integrity": "sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.6.tgz", + "integrity": "sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==", "requires": { "regenerator-runtime": "^0.13.4" } @@ -12649,9 +13042,9 @@ } }, "gatsby-theme-apollo-docs": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/gatsby-theme-apollo-docs/-/gatsby-theme-apollo-docs-4.2.0.tgz", - "integrity": "sha512-Fj79lLEumW18d1GRNj/mbdAfvdfJPxzbojQhrxAVvqFEHH6DaM6cYK/Ockg8NwHbPAYK3Qe22EHfl/Cn8WYq/A==", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/gatsby-theme-apollo-docs/-/gatsby-theme-apollo-docs-4.2.2.tgz", + "integrity": "sha512-WB7f4Dtd1PErgru1OQqGLfPJnab+2kI1J2/+9MCvFxfOVaZefCBOwqExZn7dahnD5QpsTIbG+7YDefeHt8ItDw==", "requires": { "@mdx-js/mdx": "^1.1.0", "@mdx-js/react": "^1.0.27", @@ -12682,13 +13075,13 @@ } }, "gatsby-transformer-remark": { - "version": "2.7.5", - "resolved": "https://registry.npmjs.org/gatsby-transformer-remark/-/gatsby-transformer-remark-2.7.5.tgz", - "integrity": "sha512-/2vehj+Ev7zpAF1OL0jqttjrCU0Ti2SXRwYbYtAo/AkXTM/Wn6yA7gLUOT74eM/Q2DosKcQVB3rkob/uJiXayQ==", + "version": "2.8.4", + "resolved": "https://registry.npmjs.org/gatsby-transformer-remark/-/gatsby-transformer-remark-2.8.4.tgz", + "integrity": "sha512-F+8n4LbdY8f9wZIXSeROUAGqkR6M91YmTThX5U7ngtR1QFozKGICEEjiRne1+nUBZV4EPXMhb6h4sZizssAjog==", "requires": { - "@babel/runtime": "^7.8.7", + "@babel/runtime": "^7.9.2", "bluebird": "^3.7.2", - "gatsby-core-utils": "^1.1.4", + "gatsby-core-utils": "^1.2.0", "gray-matter": "^4.0.2", "hast-util-raw": "^4.0.0", "hast-util-to-html": "^4.0.1", @@ -12701,7 +13094,7 @@ "remark-retext": "^3.1.3", "remark-stringify": "6.0.4", "retext-english": "^3.0.4", - "sanitize-html": "^1.22.1", + "sanitize-html": "^1.23.0", "underscore.string": "^3.3.5", "unified": "^6.2.0", "unist-util-remove-position": "^1.1.4", @@ -12710,9 +13103,9 @@ }, "dependencies": { "@babel/runtime": { - "version": "7.9.2", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz", - "integrity": "sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.6.tgz", + "integrity": "sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==", "requires": { "regenerator-runtime": "^0.13.4" } @@ -12785,6 +13178,14 @@ "space-separated-tokens": "^1.0.0" } }, + "mdast-util-definitions": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/mdast-util-definitions/-/mdast-util-definitions-1.2.5.tgz", + "integrity": "sha512-CJXEdoLfiISCDc2JB6QLb79pYfI6+GcIH+W2ox9nMc7od0Pz+bovcHsiq29xAQY6ayqe/9CsK2VzkSJdg1pFYA==", + "requires": { + "unist-util-visit": "^1.0.0" + } + }, "mdast-util-to-hast": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-3.0.4.tgz", @@ -12843,6 +13244,19 @@ } } }, + "parse-entities": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-1.2.2.tgz", + "integrity": "sha512-NzfpbxW/NPrzZ/yYSoQxyqUZMZXIdCfE0OIN4ESsnptHJECoUk3FZktxNuzQf4tjt5UEopnxpYJbvYuxIFDdsg==", + "requires": { + "character-entities": "^1.0.0", + "character-entities-legacy": "^1.0.0", + "character-reference-invalid": "^1.0.0", + "is-alphanumerical": "^1.0.0", + "is-decimal": "^1.0.0", + "is-hexadecimal": "^1.0.0" + } + }, "property-information": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/property-information/-/property-information-4.2.0.tgz", @@ -12912,6 +13326,14 @@ "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-2.1.3.tgz", "integrity": "sha512-4WbQX2iwfr/+PfM4U3zd2VNXY+dWtZsN1fLnWEi2QQXA4qyDYAZcDMfXUX0Cu6XZUHHAO9q4nyxxLT4Awk1qUA==" }, + "unist-util-remove-position": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-1.1.4.tgz", + "integrity": "sha512-tLqd653ArxJIPnKII6LMZwH+mb5q+n/GtXQZo6S6csPRs5zB0u79Yw8ouR3wTw8wxvdJFhpP6Y7jorWdCgLO0A==", + "requires": { + "unist-util-visit": "^1.1.0" + } + }, "unist-util-stringify-position": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-1.1.2.tgz", @@ -12936,6 +13358,11 @@ "vfile-message": "^1.0.0" } }, + "vfile-location": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/vfile-location/-/vfile-location-2.0.6.tgz", + "integrity": "sha512-sSFdyCP3G6Ka0CEmN83A2YCMKIieHx0EDaj5IDP4g1pa5ZJ4FJDvpO0WODLxo4LUX4oe52gmSCK7Jw4SBghqxA==" + }, "vfile-message": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-1.1.1.tgz", @@ -16108,11 +16535,11 @@ } }, "mdast-squeeze-paragraphs": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/mdast-squeeze-paragraphs/-/mdast-squeeze-paragraphs-3.0.5.tgz", - "integrity": "sha512-xX6Vbe348Y/rukQlG4W3xH+7v4ZlzUbSY4HUIQCuYrF2DrkcHx584mCaFxkWoDZKNUfyLZItHC9VAqX3kIP7XA==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/mdast-squeeze-paragraphs/-/mdast-squeeze-paragraphs-4.0.0.tgz", + "integrity": "sha512-zxdPn69hkQ1rm4J+2Cs2j6wDEv7O17TfXTJ33tl/+JPIoEmtV9t2ZzBM5LPHE8QlHsmVD8t3vPKCyY3oH+H8MQ==", "requires": { - "unist-util-remove": "^1.0.0" + "unist-util-remove": "^2.0.0" } }, "mdast-util-compact": { @@ -16134,32 +16561,22 @@ } }, "mdast-util-definitions": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/mdast-util-definitions/-/mdast-util-definitions-1.2.5.tgz", - "integrity": "sha512-CJXEdoLfiISCDc2JB6QLb79pYfI6+GcIH+W2ox9nMc7od0Pz+bovcHsiq29xAQY6ayqe/9CsK2VzkSJdg1pFYA==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/mdast-util-definitions/-/mdast-util-definitions-2.0.1.tgz", + "integrity": "sha512-Co+DQ6oZlUzvUR7JCpP249PcexxygiaKk9axJh+eRzHDZJk2julbIdKB4PXHVxdBuLzvJ1Izb+YDpj2deGMOuA==", "requires": { - "unist-util-visit": "^1.0.0" - }, - "dependencies": { - "unist-util-visit": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.4.1.tgz", - "integrity": "sha512-AvGNk7Bb//EmJZyhtRUnNMEpId/AZ5Ph/KUpTI09WHQuDZHKovQ1oEv3mfmKpWKtoMzyMC4GLBm1Zy5k12fjIw==", - "requires": { - "unist-util-visit-parents": "^2.0.0" - } - } + "unist-util-visit": "^2.0.0" } }, "mdast-util-to-hast": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-7.0.0.tgz", - "integrity": "sha512-vxnXKSZgvPG2grZM3kxaF052pxsLtq8TPAkiMkqYj1nFTOazYUPXt3LFYIEB6Ws/IX7Uyvljzk64kD6DwZl/wQ==", + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-8.2.0.tgz", + "integrity": "sha512-WjH/KXtqU66XyTJQ7tg7sjvTw1OQcVV0hKdFh3BgHPwZ96fSBCQ/NitEHsN70Mmnggt+5eUUC7pCnK+2qGQnCA==", "requires": { "collapse-white-space": "^1.0.0", "detab": "^2.0.0", - "mdast-util-definitions": "^1.2.0", - "mdurl": "^1.0.1", + "mdast-util-definitions": "^2.0.0", + "mdurl": "^1.0.0", "trim-lines": "^1.0.0", "unist-builder": "^2.0.0", "unist-util-generated": "^1.0.0", @@ -16176,6 +16593,13 @@ "repeat-string": "^1.5.2", "unist-util-position": "^3.0.0", "vfile-location": "^2.0.0" + }, + "dependencies": { + "vfile-location": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/vfile-location/-/vfile-location-2.0.6.tgz", + "integrity": "sha512-sSFdyCP3G6Ka0CEmN83A2YCMKIieHx0EDaj5IDP4g1pa5ZJ4FJDvpO0WODLxo4LUX4oe52gmSCK7Jw4SBghqxA==" + } } }, "mdast-util-to-string": { @@ -17531,9 +17955,9 @@ } }, "parse-entities": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-1.2.2.tgz", - "integrity": "sha512-NzfpbxW/NPrzZ/yYSoQxyqUZMZXIdCfE0OIN4ESsnptHJECoUk3FZktxNuzQf4tjt5UEopnxpYJbvYuxIFDdsg==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-2.0.0.tgz", + "integrity": "sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==", "requires": { "character-entities": "^1.0.0", "character-entities-legacy": "^1.0.0", @@ -19617,6 +20041,19 @@ "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz", "integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==" }, + "parse-entities": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-1.2.2.tgz", + "integrity": "sha512-NzfpbxW/NPrzZ/yYSoQxyqUZMZXIdCfE0OIN4ESsnptHJECoUk3FZktxNuzQf4tjt5UEopnxpYJbvYuxIFDdsg==", + "requires": { + "character-entities": "^1.0.0", + "character-entities-legacy": "^1.0.0", + "character-reference-invalid": "^1.0.0", + "is-alphanumerical": "^1.0.0", + "is-decimal": "^1.0.0", + "is-hexadecimal": "^1.0.0" + } + }, "remark-parse": { "version": "6.0.3", "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-6.0.3.tgz", @@ -19654,11 +20091,27 @@ "x-is-string": "^0.1.0" } }, + "unist-util-remove-position": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-1.1.4.tgz", + "integrity": "sha512-tLqd653ArxJIPnKII6LMZwH+mb5q+n/GtXQZo6S6csPRs5zB0u79Yw8ouR3wTw8wxvdJFhpP6Y7jorWdCgLO0A==", + "requires": { + "unist-util-visit": "^1.1.0" + } + }, "unist-util-stringify-position": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-1.1.2.tgz", "integrity": "sha512-pNCVrk64LZv1kElr0N1wPiHEUoXNVFERp+mlTg/s9R5Lwg87f9bM/3sQB99w+N9D/qnM9ar3+AKDBwo/gm/iQQ==" }, + "unist-util-visit": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.4.1.tgz", + "integrity": "sha512-AvGNk7Bb//EmJZyhtRUnNMEpId/AZ5Ph/KUpTI09WHQuDZHKovQ1oEv3mfmKpWKtoMzyMC4GLBm1Zy5k12fjIw==", + "requires": { + "unist-util-visit-parents": "^2.0.0" + } + }, "vfile": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/vfile/-/vfile-3.0.1.tgz", @@ -19670,6 +20123,11 @@ "vfile-message": "^1.0.0" } }, + "vfile-location": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/vfile-location/-/vfile-location-2.0.6.tgz", + "integrity": "sha512-sSFdyCP3G6Ka0CEmN83A2YCMKIieHx0EDaj5IDP4g1pa5ZJ4FJDvpO0WODLxo4LUX4oe52gmSCK7Jw4SBghqxA==" + }, "vfile-message": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-1.1.1.tgz", @@ -19686,46 +20144,175 @@ "integrity": "sha512-X9Ncj4cj3/CIvLI2Z9IobHtVi8FVdUrdJkCNaL9kdX8ohfsi18DXHsCVd/A7ssARBdccdDb5ODnt62WuEWaM/g==" }, "remark-mdx": { - "version": "1.5.8", - "resolved": "https://registry.npmjs.org/remark-mdx/-/remark-mdx-1.5.8.tgz", - "integrity": "sha512-wtqqsDuO/mU/ucEo/CDp0L8SPdS2oOE6PRsMm+lQ9TLmqgep4MBmyH8bLpoc8Wf7yjNmae/5yBzUN1YUvR/SsQ==", + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/remark-mdx/-/remark-mdx-1.6.1.tgz", + "integrity": "sha512-UyCqqYFv9l5dstX29QpdqMprBHyUYUEQHOUe0MdFUIm1XATxfVGHbRPtVBFz4ccd5NV1UL/rmsruo9WOswwmpQ==", "requires": { - "@babel/core": "7.8.4", + "@babel/core": "7.9.0", "@babel/helper-plugin-utils": "7.8.3", - "@babel/plugin-proposal-object-rest-spread": "7.8.3", + "@babel/plugin-proposal-object-rest-spread": "7.9.5", "@babel/plugin-syntax-jsx": "7.8.3", - "@mdx-js/util": "^1.5.8", + "@mdx-js/util": "^1.6.1", "is-alphabetical": "1.0.4", - "remark-parse": "7.0.2", - "unified": "8.4.2" + "remark-parse": "8.0.2", + "unified": "9.0.0" }, "dependencies": { + "@babel/code-frame": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", + "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", + "requires": { + "@babel/highlight": "^7.8.3" + } + }, + "@babel/core": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.0.tgz", + "integrity": "sha512-kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==", + "requires": { + "@babel/code-frame": "^7.8.3", + "@babel/generator": "^7.9.0", + "@babel/helper-module-transforms": "^7.9.0", + "@babel/helpers": "^7.9.0", + "@babel/parser": "^7.9.0", + "@babel/template": "^7.8.6", + "@babel/traverse": "^7.9.0", + "@babel/types": "^7.9.0", + "convert-source-map": "^1.7.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.1", + "json5": "^2.1.2", + "lodash": "^4.17.13", + "resolve": "^1.3.2", + "semver": "^5.4.1", + "source-map": "^0.5.0" + } + }, + "@babel/generator": { + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.6.tgz", + "integrity": "sha512-+htwWKJbH2bL72HRluF8zumBxzuX0ZZUFl3JLNyoUjM/Ho8wnVpPXM6aUz8cfKDqQ/h7zHqKt4xzJteUosckqQ==", + "requires": { + "@babel/types": "^7.9.6", + "jsesc": "^2.5.1", + "lodash": "^4.17.13", + "source-map": "^0.5.0" + } + }, + "@babel/helper-function-name": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz", + "integrity": "sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==", + "requires": { + "@babel/helper-get-function-arity": "^7.8.3", + "@babel/template": "^7.8.3", + "@babel/types": "^7.9.5" + } + }, "@babel/helper-plugin-utils": { "version": "7.8.3", "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" + }, + "@babel/highlight": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz", + "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==", + "requires": { + "@babel/helper-validator-identifier": "^7.9.0", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" + } + }, + "@babel/parser": { + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.6.tgz", + "integrity": "sha512-AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q==" + }, + "@babel/plugin-proposal-object-rest-spread": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.5.tgz", + "integrity": "sha512-VP2oXvAf7KCYTthbUHwBlewbl1Iq059f6seJGsxMizaCdgHIeczOr7FBqELhSqfkIl04Fi8okzWzl63UKbQmmg==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.3", + "@babel/plugin-syntax-object-rest-spread": "^7.8.0", + "@babel/plugin-transform-parameters": "^7.9.5" + } + }, + "@babel/template": { + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz", + "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==", + "requires": { + "@babel/code-frame": "^7.8.3", + "@babel/parser": "^7.8.6", + "@babel/types": "^7.8.6" + } + }, + "@babel/traverse": { + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.6.tgz", + "integrity": "sha512-b3rAHSjbxy6VEAvlxM8OV/0X4XrG72zoxme6q1MOoe2vd0bEc+TwayhuC1+Dfgqh1QEG+pj7atQqvUprHIccsg==", + "requires": { + "@babel/code-frame": "^7.8.3", + "@babel/generator": "^7.9.6", + "@babel/helper-function-name": "^7.9.5", + "@babel/helper-split-export-declaration": "^7.8.3", + "@babel/parser": "^7.9.6", + "@babel/types": "^7.9.6", + "debug": "^4.1.0", + "globals": "^11.1.0", + "lodash": "^4.17.13" + } + }, + "@babel/types": { + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.6.tgz", + "integrity": "sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA==", + "requires": { + "@babel/helper-validator-identifier": "^7.9.5", + "lodash": "^4.17.13", + "to-fast-properties": "^2.0.0" + }, + "dependencies": { + "@babel/helper-validator-identifier": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz", + "integrity": "sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==" + } + } + }, + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "requires": { + "ms": "^2.1.1" + } } } }, "remark-parse": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-7.0.2.tgz", - "integrity": "sha512-9+my0lQS80IQkYXsMA8Sg6m9QfXYJBnXjWYN5U+kFc5/n69t+XZVXU/ZBYr3cYH8FheEGf1v87rkFDhJ8bVgMA==", + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-8.0.2.tgz", + "integrity": "sha512-eMI6kMRjsAGpMXXBAywJwiwAse+KNpmt+BK55Oofy4KvBZEqUDj6mWbGLJZrujoPIPPxDXzn3T9baRlpsm2jnQ==", "requires": { + "ccount": "^1.0.0", "collapse-white-space": "^1.0.2", "is-alphabetical": "^1.0.0", "is-decimal": "^1.0.0", "is-whitespace-character": "^1.0.0", "is-word-character": "^1.0.0", "markdown-escapes": "^1.0.0", - "parse-entities": "^1.1.0", + "parse-entities": "^2.0.0", "repeat-string": "^1.5.4", "state-toggle": "^1.0.0", "trim": "0.0.1", "trim-trailing-lines": "^1.0.0", "unherit": "^1.0.4", - "unist-util-remove-position": "^1.0.0", - "vfile-location": "^2.0.0", + "unist-util-remove-position": "^2.0.0", + "vfile-location": "^3.0.0", "xtend": "^4.0.1" } }, @@ -19753,6 +20340,14 @@ "web-namespaces": "^1.1.2" } }, + "mdast-util-definitions": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/mdast-util-definitions/-/mdast-util-definitions-1.2.5.tgz", + "integrity": "sha512-CJXEdoLfiISCDc2JB6QLb79pYfI6+GcIH+W2ox9nMc7od0Pz+bovcHsiq29xAQY6ayqe/9CsK2VzkSJdg1pFYA==", + "requires": { + "unist-util-visit": "^1.0.0" + } + }, "mdast-util-to-hast": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-4.0.0.tgz", @@ -19811,11 +20406,11 @@ } }, "remark-squeeze-paragraphs": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/remark-squeeze-paragraphs/-/remark-squeeze-paragraphs-3.0.4.tgz", - "integrity": "sha512-Wmz5Yj9q+W1oryo8BV17JrOXZgUKVcpJ2ApE2pwnoHwhFKSk4Wp2PmFNbmJMgYSqAdFwfkoe+TSYop5Fy8wMgA==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/remark-squeeze-paragraphs/-/remark-squeeze-paragraphs-4.0.0.tgz", + "integrity": "sha512-8qRqmL9F4nuLPIgl92XUuxI3pFxize+F1H0e/W3llTk0UsjJaj01+RrirkMw7P21RKe4X6goQhYRSvNWX+70Rw==", "requires": { - "mdast-squeeze-paragraphs": "^3.0.0" + "mdast-squeeze-paragraphs": "^4.0.0" } }, "remark-stringify": { @@ -19837,6 +20432,21 @@ "stringify-entities": "^1.0.1", "unherit": "^1.0.4", "xtend": "^4.0.1" + }, + "dependencies": { + "parse-entities": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-1.2.2.tgz", + "integrity": "sha512-NzfpbxW/NPrzZ/yYSoQxyqUZMZXIdCfE0OIN4ESsnptHJECoUk3FZktxNuzQf4tjt5UEopnxpYJbvYuxIFDdsg==", + "requires": { + "character-entities": "^1.0.0", + "character-entities-legacy": "^1.0.0", + "character-reference-invalid": "^1.0.0", + "is-alphanumerical": "^1.0.0", + "is-decimal": "^1.0.0", + "is-hexadecimal": "^1.0.0" + } + } } }, "remark-typescript": { @@ -22423,17 +23033,23 @@ "integrity": "sha512-L5RAqCfXqAwR3RriF8pM0lU0w4Ryf/GgzONwi6KnL1taJQa7x1TCxdJnILX59WIGOwR57IVxn7Nej0fz1Ny6fw==" }, "unified": { - "version": "8.4.2", - "resolved": "https://registry.npmjs.org/unified/-/unified-8.4.2.tgz", - "integrity": "sha512-JCrmN13jI4+h9UAyKEoGcDZV+i1E7BLFuG7OsaDvTXI5P0qhHX+vZO/kOhz9jn8HGENDKbwSeB0nVOg4gVStGA==", + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/unified/-/unified-9.0.0.tgz", + "integrity": "sha512-ssFo33gljU3PdlWLjNp15Inqb77d6JnJSfyplGJPT/a+fNRNyCBeveBAYJdO5khKdF6WVHa/yYCC7Xl6BDwZUQ==", "requires": { "bail": "^1.0.0", "extend": "^3.0.0", + "is-buffer": "^2.0.0", "is-plain-obj": "^2.0.0", "trough": "^1.0.0", "vfile": "^4.0.0" }, "dependencies": { + "is-buffer": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz", + "integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==" + }, "is-plain-obj": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", @@ -22523,29 +23139,26 @@ "integrity": "sha512-w+PkwCbYSFw8vpgWD0v7zRCl1FpY3fjDSQ3/N/wNd9Ffa4gPi8+4keqt99N3XW6F99t/mUzp2xAhNmfKWp95QA==" }, "unist-util-remove": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/unist-util-remove/-/unist-util-remove-1.0.3.tgz", - "integrity": "sha512-mB6nCHCQK0pQffUAcCVmKgIWzG/AXs/V8qpS8K72tMPtOSCMSjDeMc5yN+Ye8rB0FhcE+JvW++o1xRNc0R+++g==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/unist-util-remove/-/unist-util-remove-2.0.0.tgz", + "integrity": "sha512-HwwWyNHKkeg/eXRnE11IpzY8JT55JNM1YCwwU9YNCnfzk6s8GhPXrVBBZWiwLeATJbI7euvoGSzcy9M29UeW3g==", "requires": { - "unist-util-is": "^3.0.0" + "unist-util-is": "^4.0.0" + }, + "dependencies": { + "unist-util-is": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.0.2.tgz", + "integrity": "sha512-Ofx8uf6haexJwI1gxWMGg6I/dLnF2yE+KibhD3/diOqY2TinLcqHXCV6OI5gFVn3xQqDH+u0M625pfKwIwgBKQ==" + } } }, "unist-util-remove-position": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-1.1.4.tgz", - "integrity": "sha512-tLqd653ArxJIPnKII6LMZwH+mb5q+n/GtXQZo6S6csPRs5zB0u79Yw8ouR3wTw8wxvdJFhpP6Y7jorWdCgLO0A==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-2.0.1.tgz", + "integrity": "sha512-fDZsLYIe2uT+oGFnuZmy73K6ZxOPG/Qcm+w7jbEjaFcJgbQ6cqjs/eSPzXhsmGpAsWPkqZM9pYjww5QTn3LHMA==", "requires": { - "unist-util-visit": "^1.1.0" - }, - "dependencies": { - "unist-util-visit": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.4.1.tgz", - "integrity": "sha512-AvGNk7Bb//EmJZyhtRUnNMEpId/AZ5Ph/KUpTI09WHQuDZHKovQ1oEv3mfmKpWKtoMzyMC4GLBm1Zy5k12fjIw==", - "requires": { - "unist-util-visit-parents": "^2.0.0" - } - } + "unist-util-visit": "^2.0.0" } }, "unist-util-select": { @@ -23088,9 +23701,9 @@ } }, "vfile-location": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/vfile-location/-/vfile-location-2.0.6.tgz", - "integrity": "sha512-sSFdyCP3G6Ka0CEmN83A2YCMKIieHx0EDaj5IDP4g1pa5ZJ4FJDvpO0WODLxo4LUX4oe52gmSCK7Jw4SBghqxA==" + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/vfile-location/-/vfile-location-3.0.1.tgz", + "integrity": "sha512-yYBO06eeN/Ki6Kh1QAkgzYpWT1d3Qln+ZCtSbJqFExPl1S3y2qqotJQXoh6qEvl/jDlgpUJolBn3PItVnnZRqQ==" }, "vfile-message": { "version": "2.0.4", @@ -23749,9 +24362,9 @@ } }, "xstate": { - "version": "4.8.0", - "resolved": "https://registry.npmjs.org/xstate/-/xstate-4.8.0.tgz", - "integrity": "sha512-xHSYQtCHLkcrFRxa5lK4Lp1rnKt00a80jcKFMQiMBuE+6MvTYv7twwqYpzjsJoKFjGZB3GGEpZAuY1dmlPTh/g==" + "version": "4.9.1", + "resolved": "https://registry.npmjs.org/xstate/-/xstate-4.9.1.tgz", + "integrity": "sha512-cfNnRaBebnr1tvs0nHBUTyomfJx36+8MWwXceyNTZfjyELMM8nIoiBDcUzfKmpNlnAvs2ZPREos19cw6Zl4nng==" }, "xtend": { "version": "4.0.2", diff --git a/docs/package.json b/docs/package.json index 6bebb022c80..413d6843974 100644 --- a/docs/package.json +++ b/docs/package.json @@ -7,7 +7,7 @@ }, "dependencies": { "gatsby": "2.21.9", - "gatsby-theme-apollo-docs": "4.2.0", + "gatsby-theme-apollo-docs": "4.2.2", "react": "16.13.1", "react-dom": "16.13.1" } From af5d53f898c67d4b0b365fe0816e851e987113fb Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 2 May 2020 12:13:19 +0000 Subject: [PATCH 493/642] chore(deps): update dependency @types/ioredis to v4.16.0 (#4056) Co-authored-by: Renovate Bot --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index c74090044f5..bdeaf20e18a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5572,9 +5572,9 @@ "integrity": "sha512-TZDqvFW4nQwL9DVSNJIJu4lPLttKgzRF58COa7Vs42Ki/MrhIqUbeIw0MWn4kGLiZLXB7oCBibm7nkSjPkzfKQ==" }, "@types/ioredis": { - "version": "4.14.9", - "resolved": "https://registry.npmjs.org/@types/ioredis/-/ioredis-4.14.9.tgz", - "integrity": "sha512-yNdzppM6vY4DYqXCnt4A3PXArxsMWeJCYxFlyl4AJKrNSGMEAP9TPcXR+8Q6zh9glcCtxmwMQhi4pwdqqHH3OA==", + "version": "4.16.0", + "resolved": "https://registry.npmjs.org/@types/ioredis/-/ioredis-4.16.0.tgz", + "integrity": "sha512-fxR2oHLj0NIqdM9OT8/hwPmlHI05i77UVfP9deys8+ZutZuo0SneA7FvXm2Kage6drQyl8F5gHWiTGK0lXaCCA==", "dev": true, "requires": { "@types/node": "*" diff --git a/package.json b/package.json index ded65d3923c..8f843c59506 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "@types/connect": "3.4.33", "@types/fast-json-stable-stringify": "2.0.0", "@types/hapi": "17.8.7", - "@types/ioredis": "4.14.9", + "@types/ioredis": "4.16.0", "@types/jest": "25.2.1", "@types/koa-router": "7.4.0", "@types/lodash": "4.14.150", From e1ec3c6a6494006a0c2ff7493c17b6821f6ed387 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 2 May 2020 13:13:10 +0000 Subject: [PATCH 494/642] chore(deps): update dependency jest to v25.5.4 (#4058) Co-authored-by: Renovate Bot --- package-lock.json | 3269 ++++++++++++++------------------------------- package.json | 2 +- 2 files changed, 1029 insertions(+), 2242 deletions(-) diff --git a/package-lock.json b/package-lock.json index bdeaf20e18a..41fb911d8f0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1470,33 +1470,33 @@ } }, "@jest/core": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/@jest/core/-/core-25.4.0.tgz", - "integrity": "sha512-h1x9WSVV0+TKVtATGjyQIMJENs8aF6eUjnCoi4jyRemYZmekLr8EJOGQqTWEX8W6SbZ6Skesy9pGXrKeAolUJw==", + "version": "25.5.4", + "resolved": "https://registry.npmjs.org/@jest/core/-/core-25.5.4.tgz", + "integrity": "sha512-3uSo7laYxF00Dg/DMgbn4xMJKmDdWvZnf89n8Xj/5/AeQ2dOQmn6b6Hkj/MleyzZWXpwv+WSdYWl4cLsy2JsoA==", "dev": true, "requires": { - "@jest/console": "^25.4.0", - "@jest/reporters": "^25.4.0", - "@jest/test-result": "^25.4.0", - "@jest/transform": "^25.4.0", - "@jest/types": "^25.4.0", + "@jest/console": "^25.5.0", + "@jest/reporters": "^25.5.1", + "@jest/test-result": "^25.5.0", + "@jest/transform": "^25.5.1", + "@jest/types": "^25.5.0", "ansi-escapes": "^4.2.1", "chalk": "^3.0.0", "exit": "^0.1.2", - "graceful-fs": "^4.2.3", - "jest-changed-files": "^25.4.0", - "jest-config": "^25.4.0", - "jest-haste-map": "^25.4.0", - "jest-message-util": "^25.4.0", + "graceful-fs": "^4.2.4", + "jest-changed-files": "^25.5.0", + "jest-config": "^25.5.4", + "jest-haste-map": "^25.5.1", + "jest-message-util": "^25.5.0", "jest-regex-util": "^25.2.6", - "jest-resolve": "^25.4.0", - "jest-resolve-dependencies": "^25.4.0", - "jest-runner": "^25.4.0", - "jest-runtime": "^25.4.0", - "jest-snapshot": "^25.4.0", - "jest-util": "^25.4.0", - "jest-validate": "^25.4.0", - "jest-watcher": "^25.4.0", + "jest-resolve": "^25.5.1", + "jest-resolve-dependencies": "^25.5.4", + "jest-runner": "^25.5.4", + "jest-runtime": "^25.5.4", + "jest-snapshot": "^25.5.1", + "jest-util": "^25.5.0", + "jest-validate": "^25.5.0", + "jest-watcher": "^25.5.0", "micromatch": "^4.0.2", "p-each-series": "^2.1.0", "realpath-native": "^2.0.0", @@ -1505,66 +1505,6 @@ "strip-ansi": "^6.0.0" }, "dependencies": { - "@babel/generator": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.5.tgz", - "integrity": "sha512-GbNIxVB3ZJe3tLeDm1HSn2AhuD/mVcyLDpgtLXa5tplmWrJdF/elxB56XNqCuD6szyNkDi6wuoKXln3QeBmCHQ==", - "dev": true, - "requires": { - "@babel/types": "^7.9.5", - "jsesc": "^2.5.1", - "lodash": "^4.17.13", - "source-map": "^0.5.0" - }, - "dependencies": { - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true - } - } - }, - "@babel/helper-function-name": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz", - "integrity": "sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==", - "dev": true, - "requires": { - "@babel/helper-get-function-arity": "^7.8.3", - "@babel/template": "^7.8.3", - "@babel/types": "^7.9.5" - } - }, - "@babel/helper-get-function-arity": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz", - "integrity": "sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==", - "dev": true, - "requires": { - "@babel/types": "^7.8.3" - } - }, - "@babel/helper-split-export-declaration": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz", - "integrity": "sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==", - "dev": true, - "requires": { - "@babel/types": "^7.8.3" - } - }, - "@babel/helpers": { - "version": "7.9.2", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.2.tgz", - "integrity": "sha512-JwLvzlXVPjO8eU9c/wF9/zOIN7X6h8DYf7mG4CiFRZRvZNKEF5dQ3H3V+ASkHoIB3mWhatgl5ONhyqHRI6MppA==", - "dev": true, - "requires": { - "@babel/template": "^7.8.3", - "@babel/traverse": "^7.9.0", - "@babel/types": "^7.9.0" - } - }, "@babel/highlight": { "version": "7.9.0", "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz", @@ -1629,9 +1569,9 @@ } }, "@babel/parser": { - "version": "7.9.4", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz", - "integrity": "sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.6.tgz", + "integrity": "sha512-AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q==", "dev": true }, "@babel/template": { @@ -1653,136 +1593,109 @@ "requires": { "@babel/highlight": "^7.8.3" } - } - } - }, - "@babel/traverse": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.5.tgz", - "integrity": "sha512-c4gH3jsvSuGUezlP6rzSJ6jf8fYjLj3hsMZRx/nX0h+fmHN0w+ekubRrHPqnMec0meycA2nwCsJ7dC8IPem2FQ==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.8.3", - "@babel/generator": "^7.9.5", - "@babel/helper-function-name": "^7.9.5", - "@babel/helper-split-export-declaration": "^7.8.3", - "@babel/parser": "^7.9.0", - "@babel/types": "^7.9.5", - "debug": "^4.1.0", - "globals": "^11.1.0", - "lodash": "^4.17.13" - }, - "dependencies": { - "@babel/code-frame": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", - "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", + }, + "@babel/types": { + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.6.tgz", + "integrity": "sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA==", "dev": true, "requires": { - "@babel/highlight": "^7.8.3" + "@babel/helper-validator-identifier": "^7.9.5", + "lodash": "^4.17.13", + "to-fast-properties": "^2.0.0" } } } }, - "@babel/types": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.5.tgz", - "integrity": "sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==", - "dev": true, - "requires": { - "@babel/helper-validator-identifier": "^7.9.5", - "lodash": "^4.17.13", - "to-fast-properties": "^2.0.0" - } - }, "@jest/console": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/@jest/console/-/console-25.4.0.tgz", - "integrity": "sha512-CfE0erx4hdJ6t7RzAcE1wLG6ZzsHSmybvIBQDoCkDM1QaSeWL9wJMzID/2BbHHa7ll9SsbbK43HjbERbBaFX2A==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/@jest/console/-/console-25.5.0.tgz", + "integrity": "sha512-T48kZa6MK1Y6k4b89sexwmSF4YLeZS/Udqg3Jj3jG/cHH+N/sLFCEoXEDMOKugJQ9FxPN1osxIknvKkxt6MKyw==", "dev": true, "requires": { - "@jest/types": "^25.4.0", + "@jest/types": "^25.5.0", "chalk": "^3.0.0", - "jest-message-util": "^25.4.0", - "jest-util": "^25.4.0", + "jest-message-util": "^25.5.0", + "jest-util": "^25.5.0", "slash": "^3.0.0" } }, "@jest/environment": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-25.4.0.tgz", - "integrity": "sha512-KDctiak4mu7b4J6BIoN/+LUL3pscBzoUCP+EtSPd2tK9fqyDY5OF+CmkBywkFWezS9tyH5ACOQNtpjtueEDH6Q==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-25.5.0.tgz", + "integrity": "sha512-U2VXPEqL07E/V7pSZMSQCvV5Ea4lqOlT+0ZFijl/i316cRMHvZ4qC+jBdryd+lmRetjQo0YIQr6cVPNxxK87mA==", "dev": true, "requires": { - "@jest/fake-timers": "^25.4.0", - "@jest/types": "^25.4.0", - "jest-mock": "^25.4.0" + "@jest/fake-timers": "^25.5.0", + "@jest/types": "^25.5.0", + "jest-mock": "^25.5.0" } }, "@jest/fake-timers": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-25.4.0.tgz", - "integrity": "sha512-lI9z+VOmVX4dPPFzyj0vm+UtaB8dCJJ852lcDnY0uCPRvZAaVGnMwBBc1wxtf+h7Vz6KszoOvKAt4QijDnHDkg==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-25.5.0.tgz", + "integrity": "sha512-9y2+uGnESw/oyOI3eww9yaxdZyHq7XvprfP/eeoCsjqKYts2yRlsHS/SgjPDV8FyMfn2nbMy8YzUk6nyvdLOpQ==", "dev": true, "requires": { - "@jest/types": "^25.4.0", - "jest-message-util": "^25.4.0", - "jest-mock": "^25.4.0", - "jest-util": "^25.4.0", + "@jest/types": "^25.5.0", + "jest-message-util": "^25.5.0", + "jest-mock": "^25.5.0", + "jest-util": "^25.5.0", "lolex": "^5.0.0" } }, "@jest/source-map": { - "version": "25.2.6", - "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-25.2.6.tgz", - "integrity": "sha512-VuIRZF8M2zxYFGTEhkNSvQkUKafQro4y+mwUxy5ewRqs5N/ynSFUODYp3fy1zCnbCMy1pz3k+u57uCqx8QRSQQ==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-25.5.0.tgz", + "integrity": "sha512-eIGx0xN12yVpMcPaVpjXPnn3N30QGJCJQSkEDUt9x1fI1Gdvb07Ml6K5iN2hG7NmMP6FDmtPEssE3z6doOYUwQ==", "dev": true, "requires": { "callsites": "^3.0.0", - "graceful-fs": "^4.2.3", + "graceful-fs": "^4.2.4", "source-map": "^0.6.0" } }, "@jest/test-result": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-25.4.0.tgz", - "integrity": "sha512-8BAKPaMCHlL941eyfqhWbmp3MebtzywlxzV+qtngQ3FH+RBqnoSAhNEPj4MG7d2NVUrMOVfrwuzGpVIK+QnMAA==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-25.5.0.tgz", + "integrity": "sha512-oV+hPJgXN7IQf/fHWkcS99y0smKLU2czLBJ9WA0jHITLst58HpQMtzSYxzaBvYc6U5U6jfoMthqsUlUlbRXs0A==", "dev": true, "requires": { - "@jest/console": "^25.4.0", - "@jest/types": "^25.4.0", + "@jest/console": "^25.5.0", + "@jest/types": "^25.5.0", "@types/istanbul-lib-coverage": "^2.0.0", "collect-v8-coverage": "^1.0.0" } }, "@jest/test-sequencer": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-25.4.0.tgz", - "integrity": "sha512-240cI+nsM3attx2bMp9uGjjHrwrpvxxrZi8Tyqp/cfOzl98oZXVakXBgxODGyBYAy/UGXPKXLvNc2GaqItrsJg==", + "version": "25.5.4", + "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-25.5.4.tgz", + "integrity": "sha512-pTJGEkSeg1EkCO2YWq6hbFvKNXk8ejqlxiOg1jBNLnWrgXOkdY6UmqZpwGFXNnRt9B8nO1uWMzLLZ4eCmhkPNA==", "dev": true, "requires": { - "@jest/test-result": "^25.4.0", - "jest-haste-map": "^25.4.0", - "jest-runner": "^25.4.0", - "jest-runtime": "^25.4.0" + "@jest/test-result": "^25.5.0", + "graceful-fs": "^4.2.4", + "jest-haste-map": "^25.5.1", + "jest-runner": "^25.5.4", + "jest-runtime": "^25.5.4" } }, "@jest/transform": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-25.4.0.tgz", - "integrity": "sha512-t1w2S6V1sk++1HHsxboWxPEuSpN8pxEvNrZN+Ud/knkROWtf8LeUmz73A4ezE8476a5AM00IZr9a8FO9x1+j3g==", + "version": "25.5.1", + "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-25.5.1.tgz", + "integrity": "sha512-Y8CEoVwXb4QwA6Y/9uDkn0Xfz0finGkieuV0xkdF9UtZGJeLukD5nLkaVrVsODB1ojRWlaoD0AJZpVHCSnJEvg==", "dev": true, "requires": { "@babel/core": "^7.1.0", - "@jest/types": "^25.4.0", + "@jest/types": "^25.5.0", "babel-plugin-istanbul": "^6.0.0", "chalk": "^3.0.0", "convert-source-map": "^1.4.0", "fast-json-stable-stringify": "^2.0.0", - "graceful-fs": "^4.2.3", - "jest-haste-map": "^25.4.0", + "graceful-fs": "^4.2.4", + "jest-haste-map": "^25.5.1", "jest-regex-util": "^25.2.6", - "jest-util": "^25.4.0", + "jest-util": "^25.5.0", "micromatch": "^4.0.2", "pirates": "^4.0.1", "realpath-native": "^2.0.0", @@ -1792,9 +1705,9 @@ } }, "@jest/types": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.4.0.tgz", - "integrity": "sha512-XBeaWNzw2PPnGW5aXvZt3+VO60M+34RY3XDsCK5tW7kyj3RK0XClRutCfjqcBuaR2aBQTbluEDME9b5MB9UAPw==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz", + "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -1803,43 +1716,6 @@ "chalk": "^3.0.0" } }, - "@types/babel__core": { - "version": "7.1.7", - "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.7.tgz", - "integrity": "sha512-RL62NqSFPCDK2FM1pSDH0scHpJvsXtZNiYlMB73DgPBaG1E38ZYVL+ei5EkWRbr+KC4YNiAUNBnRj+bgwpgjMw==", - "dev": true, - "requires": { - "@babel/parser": "^7.1.0", - "@babel/types": "^7.0.0", - "@types/babel__generator": "*", - "@types/babel__template": "*", - "@types/babel__traverse": "*" - } - }, - "acorn": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.1.tgz", - "integrity": "sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==", - "dev": true - }, - "acorn-globals": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.4.tgz", - "integrity": "sha512-clfQEh21R+D0leSbUdWf3OcfqyaCSAQ8Ryq00bofSekfr9W8u1jyYZo6ir0xu9Gtcf7BjcHJpnbZH7JOCpP60A==", - "dev": true, - "requires": { - "acorn": "^6.0.1", - "acorn-walk": "^6.0.1" - }, - "dependencies": { - "acorn": { - "version": "6.4.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz", - "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==", - "dev": true - } - } - }, "ansi-escapes": { "version": "4.3.1", "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz", @@ -1876,49 +1752,39 @@ } }, "babel-jest": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-25.4.0.tgz", - "integrity": "sha512-p+epx4K0ypmHuCnd8BapfyOwWwosNCYhedetQey1awddtfmEX0MmdxctGl956uwUmjwXR5VSS5xJcGX9DvdIog==", + "version": "25.5.1", + "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-25.5.1.tgz", + "integrity": "sha512-9dA9+GmMjIzgPnYtkhBg73gOo/RHqPmLruP3BaGL4KEX3Dwz6pI8auSN8G8+iuEG90+GSswyKvslN+JYSaacaQ==", "dev": true, "requires": { - "@jest/transform": "^25.4.0", - "@jest/types": "^25.4.0", + "@jest/transform": "^25.5.1", + "@jest/types": "^25.5.0", "@types/babel__core": "^7.1.7", "babel-plugin-istanbul": "^6.0.0", - "babel-preset-jest": "^25.4.0", + "babel-preset-jest": "^25.5.0", "chalk": "^3.0.0", + "graceful-fs": "^4.2.4", "slash": "^3.0.0" } }, - "babel-plugin-istanbul": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz", - "integrity": "sha512-AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.0.0", - "@istanbuljs/load-nyc-config": "^1.0.0", - "@istanbuljs/schema": "^0.1.2", - "istanbul-lib-instrument": "^4.0.0", - "test-exclude": "^6.0.0" - } - }, "babel-plugin-jest-hoist": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-25.4.0.tgz", - "integrity": "sha512-M3a10JCtTyKevb0MjuH6tU+cP/NVQZ82QPADqI1RQYY1OphztsCeIeQmTsHmF/NS6m0E51Zl4QNsI3odXSQF5w==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-25.5.0.tgz", + "integrity": "sha512-u+/W+WAjMlvoocYGTwthAiQSxDcJAyHpQ6oWlHdFZaaN+Rlk8Q7iiwDPg2lN/FyJtAYnKjFxbn7xus4HCFkg5g==", "dev": true, "requires": { + "@babel/template": "^7.3.3", + "@babel/types": "^7.3.3", "@types/babel__traverse": "^7.0.6" } }, "babel-preset-jest": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-25.4.0.tgz", - "integrity": "sha512-PwFiEWflHdu3JCeTr0Pb9NcHHE34qWFnPQRVPvqQITx4CsDCzs6o05923I10XvLvn9nNsRHuiVgB72wG/90ZHQ==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-25.5.0.tgz", + "integrity": "sha512-8ZczygctQkBU+63DtSOKGh7tFL0CeCuz+1ieud9lJ1WPQ9O6A1a/r+LGn6Y705PA6whHQ3T1XuB/PmpfNYf8Fw==", "dev": true, "requires": { - "babel-plugin-jest-hoist": "^25.4.0", + "babel-plugin-jest-hoist": "^25.5.0", "babel-preset-current-node-syntax": "^0.1.2" } }, @@ -1973,56 +1839,12 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, - "cssom": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz", - "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==", - "dev": true - }, - "cssstyle": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.2.0.tgz", - "integrity": "sha512-sEb3XFPx3jNnCAMtqrXPDeSgQr+jojtCeNf8cvMNMh1cG970+lljssvQDzPq6lmmJu2Vhqood/gtEomBiHOGnA==", - "dev": true, - "requires": { - "cssom": "~0.3.6" - }, - "dependencies": { - "cssom": { - "version": "0.3.8", - "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz", - "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==", - "dev": true - } - } - }, - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } - }, "deepmerge": { "version": "4.2.2", "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz", "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==", "dev": true }, - "detect-newline": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz", - "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==", - "dev": true - }, - "diff-sequences": { - "version": "25.2.6", - "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-25.2.6.tgz", - "integrity": "sha512-Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg==", - "dev": true - }, "emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", @@ -2030,16 +1852,16 @@ "dev": true }, "expect": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/expect/-/expect-25.4.0.tgz", - "integrity": "sha512-7BDIX99BTi12/sNGJXA9KMRcby4iAmu1xccBOhyKCyEhjcVKS3hPmHdA/4nSI9QGIOkUropKqr3vv7WMDM5lvQ==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/expect/-/expect-25.5.0.tgz", + "integrity": "sha512-w7KAXo0+6qqZZhovCaBVPSIqQp7/UTcx4M9uKt2m6pd2VB1voyC8JizLRqeEqud3AAVP02g+hbErDu5gu64tlA==", "dev": true, "requires": { - "@jest/types": "^25.4.0", + "@jest/types": "^25.5.0", "ansi-styles": "^4.0.0", "jest-get-type": "^25.2.6", - "jest-matcher-utils": "^25.4.0", - "jest-message-util": "^25.4.0", + "jest-matcher-utils": "^25.5.0", + "jest-message-util": "^25.5.0", "jest-regex-util": "^25.2.6" } }, @@ -2062,31 +1884,10 @@ "path-exists": "^4.0.0" } }, - "fsevents": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.2.tgz", - "integrity": "sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==", - "dev": true, - "optional": true - }, - "glob": { - "version": "7.1.6", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", - "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, "graceful-fs": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz", - "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==", + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==", "dev": true }, "has-flag": { @@ -2107,170 +1908,83 @@ "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", "dev": true }, - "istanbul-lib-coverage": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz", - "integrity": "sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==", - "dev": true - }, - "istanbul-lib-instrument": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.1.tgz", - "integrity": "sha512-imIchxnodll7pvQBYOqUu88EufLCU56LMeFPZZM/fJZ1irYcYdqroaV+ACK1Ila8ls09iEYArp+nqyC6lW1Vfg==", - "dev": true, - "requires": { - "@babel/core": "^7.7.5", - "@babel/parser": "^7.7.5", - "@babel/template": "^7.7.4", - "@babel/traverse": "^7.7.4", - "@istanbuljs/schema": "^0.1.2", - "istanbul-lib-coverage": "^3.0.0", - "semver": "^6.3.0" - }, - "dependencies": { - "@babel/code-frame": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", - "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", - "dev": true, - "requires": { - "@babel/highlight": "^7.8.3" - } - }, - "@babel/core": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.0.tgz", - "integrity": "sha512-kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.8.3", - "@babel/generator": "^7.9.0", - "@babel/helper-module-transforms": "^7.9.0", - "@babel/helpers": "^7.9.0", - "@babel/parser": "^7.9.0", - "@babel/template": "^7.8.6", - "@babel/traverse": "^7.9.0", - "@babel/types": "^7.9.0", - "convert-source-map": "^1.7.0", - "debug": "^4.1.0", - "gensync": "^1.0.0-beta.1", - "json5": "^2.1.2", - "lodash": "^4.17.13", - "resolve": "^1.3.2", - "semver": "^5.4.1", - "source-map": "^0.5.0" - }, - "dependencies": { - "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "dev": true - } - } - }, - "convert-source-map": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz", - "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==", - "dev": true, - "requires": { - "safe-buffer": "~5.1.1" - } - }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true - } - } - }, "jest-config": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-25.4.0.tgz", - "integrity": "sha512-egT9aKYxMyMSQV1aqTgam0SkI5/I2P9qrKexN5r2uuM2+68ypnc+zPGmfUxK7p1UhE7dYH9SLBS7yb+TtmT1AA==", + "version": "25.5.4", + "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-25.5.4.tgz", + "integrity": "sha512-SZwR91SwcdK6bz7Gco8qL7YY2sx8tFJYzvg216DLihTWf+LKY/DoJXpM9nTzYakSyfblbqeU48p/p7Jzy05Atg==", "dev": true, "requires": { "@babel/core": "^7.1.0", - "@jest/test-sequencer": "^25.4.0", - "@jest/types": "^25.4.0", - "babel-jest": "^25.4.0", + "@jest/test-sequencer": "^25.5.4", + "@jest/types": "^25.5.0", + "babel-jest": "^25.5.1", "chalk": "^3.0.0", "deepmerge": "^4.2.2", "glob": "^7.1.1", - "jest-environment-jsdom": "^25.4.0", - "jest-environment-node": "^25.4.0", + "graceful-fs": "^4.2.4", + "jest-environment-jsdom": "^25.5.0", + "jest-environment-node": "^25.5.0", "jest-get-type": "^25.2.6", - "jest-jasmine2": "^25.4.0", + "jest-jasmine2": "^25.5.4", "jest-regex-util": "^25.2.6", - "jest-resolve": "^25.4.0", - "jest-util": "^25.4.0", - "jest-validate": "^25.4.0", + "jest-resolve": "^25.5.1", + "jest-util": "^25.5.0", + "jest-validate": "^25.5.0", "micromatch": "^4.0.2", - "pretty-format": "^25.4.0", + "pretty-format": "^25.5.0", "realpath-native": "^2.0.0" } }, "jest-diff": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-25.4.0.tgz", - "integrity": "sha512-kklLbJVXW0y8UKOWOdYhI6TH5MG6QAxrWiBMgQaPIuhj3dNFGirKCd+/xfplBXICQ7fI+3QcqHm9p9lWu1N6ug==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-25.5.0.tgz", + "integrity": "sha512-z1kygetuPiREYdNIumRpAHY6RXiGmp70YHptjdaxTWGmA085W3iCnXNx0DhflK3vwrKmrRWyY1wUpkPMVxMK7A==", "dev": true, "requires": { "chalk": "^3.0.0", "diff-sequences": "^25.2.6", "jest-get-type": "^25.2.6", - "pretty-format": "^25.4.0" - } - }, - "jest-docblock": { - "version": "25.3.0", - "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-25.3.0.tgz", - "integrity": "sha512-aktF0kCar8+zxRHxQZwxMy70stc9R1mOmrLsT5VO3pIT0uzGRSDAXxSlz4NqQWpuLjPpuMhPRl7H+5FRsvIQAg==", - "dev": true, - "requires": { - "detect-newline": "^3.0.0" + "pretty-format": "^25.5.0" } }, "jest-each": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-25.4.0.tgz", - "integrity": "sha512-lwRIJ8/vQU/6vq3nnSSUw1Y3nz5tkYSFIywGCZpUBd6WcRgpn8NmJoQICojbpZmsJOJNHm0BKdyuJ6Xdx+eDQQ==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-25.5.0.tgz", + "integrity": "sha512-QBogUxna3D8vtiItvn54xXde7+vuzqRrEeaw8r1s+1TG9eZLVJE5ZkKoSUlqFwRjnlaA4hyKGiu9OlkFIuKnjA==", "dev": true, "requires": { - "@jest/types": "^25.4.0", + "@jest/types": "^25.5.0", "chalk": "^3.0.0", "jest-get-type": "^25.2.6", - "jest-util": "^25.4.0", - "pretty-format": "^25.4.0" + "jest-util": "^25.5.0", + "pretty-format": "^25.5.0" } }, "jest-environment-jsdom": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-25.4.0.tgz", - "integrity": "sha512-KTitVGMDrn2+pt7aZ8/yUTuS333w3pWt1Mf88vMntw7ZSBNDkRS6/4XLbFpWXYfWfp1FjcjQTOKzbK20oIehWQ==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-25.5.0.tgz", + "integrity": "sha512-7Jr02ydaq4jaWMZLY+Skn8wL5nVIYpWvmeatOHL3tOcV3Zw8sjnPpx+ZdeBfc457p8jCR9J6YCc+Lga0oIy62A==", "dev": true, "requires": { - "@jest/environment": "^25.4.0", - "@jest/fake-timers": "^25.4.0", - "@jest/types": "^25.4.0", - "jest-mock": "^25.4.0", - "jest-util": "^25.4.0", + "@jest/environment": "^25.5.0", + "@jest/fake-timers": "^25.5.0", + "@jest/types": "^25.5.0", + "jest-mock": "^25.5.0", + "jest-util": "^25.5.0", "jsdom": "^15.2.1" } }, "jest-environment-node": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-25.4.0.tgz", - "integrity": "sha512-wryZ18vsxEAKFH7Z74zi/y/SyI1j6UkVZ6QsllBuT/bWlahNfQjLNwFsgh/5u7O957dYFoXj4yfma4n4X6kU9A==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-25.5.0.tgz", + "integrity": "sha512-iuxK6rQR2En9EID+2k+IBs5fCFd919gVVK5BeND82fYeLWPqvRcFNPKu9+gxTwfB5XwBGBvZ0HFQa+cHtIoslA==", "dev": true, "requires": { - "@jest/environment": "^25.4.0", - "@jest/fake-timers": "^25.4.0", - "@jest/types": "^25.4.0", - "jest-mock": "^25.4.0", - "jest-util": "^25.4.0", + "@jest/environment": "^25.5.0", + "@jest/fake-timers": "^25.5.0", + "@jest/types": "^25.5.0", + "jest-mock": "^25.5.0", + "jest-util": "^25.5.0", "semver": "^6.3.0" } }, @@ -2281,19 +1995,20 @@ "dev": true }, "jest-haste-map": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-25.4.0.tgz", - "integrity": "sha512-5EoCe1gXfGC7jmXbKzqxESrgRcaO3SzWXGCnvp9BcT0CFMyrB1Q6LIsjl9RmvmJGQgW297TCfrdgiy574Rl9HQ==", + "version": "25.5.1", + "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-25.5.1.tgz", + "integrity": "sha512-dddgh9UZjV7SCDQUrQ+5t9yy8iEgKc1AKqZR9YDww8xsVOtzPQSMVLDChc21+g29oTRexb9/B0bIlZL+sWmvAQ==", "dev": true, "requires": { - "@jest/types": "^25.4.0", + "@jest/types": "^25.5.0", + "@types/graceful-fs": "^4.1.2", "anymatch": "^3.0.3", "fb-watchman": "^2.0.0", "fsevents": "^2.1.2", - "graceful-fs": "^4.2.3", - "jest-serializer": "^25.2.6", - "jest-util": "^25.4.0", - "jest-worker": "^25.4.0", + "graceful-fs": "^4.2.4", + "jest-serializer": "^25.5.0", + "jest-util": "^25.5.0", + "jest-worker": "^25.5.0", "micromatch": "^4.0.2", "sane": "^4.0.3", "walker": "^1.0.7", @@ -2301,163 +2016,149 @@ } }, "jest-jasmine2": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-25.4.0.tgz", - "integrity": "sha512-QccxnozujVKYNEhMQ1vREiz859fPN/XklOzfQjm2j9IGytAkUbSwjFRBtQbHaNZ88cItMpw02JnHGsIdfdpwxQ==", + "version": "25.5.4", + "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-25.5.4.tgz", + "integrity": "sha512-9acbWEfbmS8UpdcfqnDO+uBUgKa/9hcRh983IHdM+pKmJPL77G0sWAAK0V0kr5LK3a8cSBfkFSoncXwQlRZfkQ==", "dev": true, "requires": { "@babel/traverse": "^7.1.0", - "@jest/environment": "^25.4.0", - "@jest/source-map": "^25.2.6", - "@jest/test-result": "^25.4.0", - "@jest/types": "^25.4.0", + "@jest/environment": "^25.5.0", + "@jest/source-map": "^25.5.0", + "@jest/test-result": "^25.5.0", + "@jest/types": "^25.5.0", "chalk": "^3.0.0", "co": "^4.6.0", - "expect": "^25.4.0", + "expect": "^25.5.0", "is-generator-fn": "^2.0.0", - "jest-each": "^25.4.0", - "jest-matcher-utils": "^25.4.0", - "jest-message-util": "^25.4.0", - "jest-runtime": "^25.4.0", - "jest-snapshot": "^25.4.0", - "jest-util": "^25.4.0", - "pretty-format": "^25.4.0", + "jest-each": "^25.5.0", + "jest-matcher-utils": "^25.5.0", + "jest-message-util": "^25.5.0", + "jest-runtime": "^25.5.4", + "jest-snapshot": "^25.5.1", + "jest-util": "^25.5.0", + "pretty-format": "^25.5.0", "throat": "^5.0.0" } }, "jest-leak-detector": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-25.4.0.tgz", - "integrity": "sha512-7Y6Bqfv2xWsB+7w44dvZuLs5SQ//fzhETgOGG7Gq3TTGFdYvAgXGwV8z159RFZ6fXiCPm/szQ90CyfVos9JIFQ==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-25.5.0.tgz", + "integrity": "sha512-rV7JdLsanS8OkdDpZtgBf61L5xZ4NnYLBq72r6ldxahJWWczZjXawRsoHyXzibM5ed7C2QRjpp6ypgwGdKyoVA==", "dev": true, "requires": { "jest-get-type": "^25.2.6", - "pretty-format": "^25.4.0" + "pretty-format": "^25.5.0" } }, "jest-matcher-utils": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-25.4.0.tgz", - "integrity": "sha512-yPMdtj7YDgXhnGbc66bowk8AkQ0YwClbbwk3Kzhn5GVDrciiCr27U4NJRbrqXbTdtxjImONITg2LiRIw650k5A==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-25.5.0.tgz", + "integrity": "sha512-VWI269+9JS5cpndnpCwm7dy7JtGQT30UHfrnM3mXl22gHGt/b7NkjBqXfbhZ8V4B7ANUsjK18PlSBmG0YH7gjw==", "dev": true, "requires": { "chalk": "^3.0.0", - "jest-diff": "^25.4.0", + "jest-diff": "^25.5.0", "jest-get-type": "^25.2.6", - "pretty-format": "^25.4.0" + "pretty-format": "^25.5.0" } }, "jest-message-util": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-25.4.0.tgz", - "integrity": "sha512-LYY9hRcVGgMeMwmdfh9tTjeux1OjZHMusq/E5f3tJN+dAoVVkJtq5ZUEPIcB7bpxDUt2zjUsrwg0EGgPQ+OhXQ==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-25.5.0.tgz", + "integrity": "sha512-ezddz3YCT/LT0SKAmylVyWWIGYoKHOFOFXx3/nA4m794lfVUskMcwhip6vTgdVrOtYdjeQeis2ypzes9mZb4EA==", "dev": true, "requires": { "@babel/code-frame": "^7.0.0", - "@jest/types": "^25.4.0", + "@jest/types": "^25.5.0", "@types/stack-utils": "^1.0.1", "chalk": "^3.0.0", + "graceful-fs": "^4.2.4", "micromatch": "^4.0.2", "slash": "^3.0.0", "stack-utils": "^1.0.1" } }, "jest-mock": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-25.4.0.tgz", - "integrity": "sha512-MdazSfcYAUjJjuVTTnusLPzE0pE4VXpOUzWdj8sbM+q6abUjm3bATVPXFqTXrxSieR8ocpvQ9v/QaQCftioQFg==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-25.5.0.tgz", + "integrity": "sha512-eXWuTV8mKzp/ovHc5+3USJMYsTBhyQ+5A1Mak35dey/RG8GlM4YWVylZuGgVXinaW6tpvk/RSecmF37FKUlpXA==", "dev": true, "requires": { - "@jest/types": "^25.4.0" + "@jest/types": "^25.5.0" } }, - "jest-regex-util": { - "version": "25.2.6", - "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-25.2.6.tgz", - "integrity": "sha512-KQqf7a0NrtCkYmZZzodPftn7fL1cq3GQAFVMn5Hg8uKx/fIenLEobNanUxb7abQ1sjADHBseG/2FGpsv/wr+Qw==", - "dev": true - }, "jest-resolve": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-25.4.0.tgz", - "integrity": "sha512-wOsKqVDFWUiv8BtLMCC6uAJ/pHZkfFgoBTgPtmYlsprAjkxrr2U++ZnB3l5ykBMd2O24lXvf30SMAjJIW6k2aA==", + "version": "25.5.1", + "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-25.5.1.tgz", + "integrity": "sha512-Hc09hYch5aWdtejsUZhA+vSzcotf7fajSlPA6EZPE1RmPBAD39XtJhvHWFStid58iit4IPDLI/Da4cwdDmAHiQ==", "dev": true, "requires": { - "@jest/types": "^25.4.0", + "@jest/types": "^25.5.0", "browser-resolve": "^1.11.3", "chalk": "^3.0.0", + "graceful-fs": "^4.2.4", "jest-pnp-resolver": "^1.2.1", "read-pkg-up": "^7.0.1", "realpath-native": "^2.0.0", - "resolve": "^1.15.1", + "resolve": "^1.17.0", "slash": "^3.0.0" - }, - "dependencies": { - "resolve": { - "version": "1.16.1", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.16.1.tgz", - "integrity": "sha512-rmAglCSqWWMrrBv/XM6sW0NuRFiKViw/W4d9EbC4pt+49H8JwHy+mcGmALTEg504AUDcLTvb1T2q3E9AnmY+ig==", - "dev": true, - "requires": { - "path-parse": "^1.0.6" - } - } } }, "jest-runner": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-25.4.0.tgz", - "integrity": "sha512-wWQSbVgj2e/1chFdMRKZdvlmA6p1IPujhpLT7TKNtCSl1B0PGBGvJjCaiBal/twaU2yfk8VKezHWexM8IliBfA==", + "version": "25.5.4", + "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-25.5.4.tgz", + "integrity": "sha512-V/2R7fKZo6blP8E9BL9vJ8aTU4TH2beuqGNxHbxi6t14XzTb+x90B3FRgdvuHm41GY8ch4xxvf0ATH4hdpjTqg==", "dev": true, "requires": { - "@jest/console": "^25.4.0", - "@jest/environment": "^25.4.0", - "@jest/test-result": "^25.4.0", - "@jest/types": "^25.4.0", + "@jest/console": "^25.5.0", + "@jest/environment": "^25.5.0", + "@jest/test-result": "^25.5.0", + "@jest/types": "^25.5.0", "chalk": "^3.0.0", "exit": "^0.1.2", - "graceful-fs": "^4.2.3", - "jest-config": "^25.4.0", + "graceful-fs": "^4.2.4", + "jest-config": "^25.5.4", "jest-docblock": "^25.3.0", - "jest-haste-map": "^25.4.0", - "jest-jasmine2": "^25.4.0", - "jest-leak-detector": "^25.4.0", - "jest-message-util": "^25.4.0", - "jest-resolve": "^25.4.0", - "jest-runtime": "^25.4.0", - "jest-util": "^25.4.0", - "jest-worker": "^25.4.0", + "jest-haste-map": "^25.5.1", + "jest-jasmine2": "^25.5.4", + "jest-leak-detector": "^25.5.0", + "jest-message-util": "^25.5.0", + "jest-resolve": "^25.5.1", + "jest-runtime": "^25.5.4", + "jest-util": "^25.5.0", + "jest-worker": "^25.5.0", "source-map-support": "^0.5.6", "throat": "^5.0.0" } }, "jest-runtime": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-25.4.0.tgz", - "integrity": "sha512-lgNJlCDULtXu9FumnwCyWlOub8iytijwsPNa30BKrSNtgoT6NUMXOPrZvsH06U6v0wgD/Igwz13nKA2wEKU2VA==", - "dev": true, - "requires": { - "@jest/console": "^25.4.0", - "@jest/environment": "^25.4.0", - "@jest/source-map": "^25.2.6", - "@jest/test-result": "^25.4.0", - "@jest/transform": "^25.4.0", - "@jest/types": "^25.4.0", + "version": "25.5.4", + "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-25.5.4.tgz", + "integrity": "sha512-RWTt8LeWh3GvjYtASH2eezkc8AehVoWKK20udV6n3/gC87wlTbE1kIA+opCvNWyyPeBs6ptYsc6nyHUb1GlUVQ==", + "dev": true, + "requires": { + "@jest/console": "^25.5.0", + "@jest/environment": "^25.5.0", + "@jest/globals": "^25.5.2", + "@jest/source-map": "^25.5.0", + "@jest/test-result": "^25.5.0", + "@jest/transform": "^25.5.1", + "@jest/types": "^25.5.0", "@types/yargs": "^15.0.0", "chalk": "^3.0.0", "collect-v8-coverage": "^1.0.0", "exit": "^0.1.2", "glob": "^7.1.3", - "graceful-fs": "^4.2.3", - "jest-config": "^25.4.0", - "jest-haste-map": "^25.4.0", - "jest-message-util": "^25.4.0", - "jest-mock": "^25.4.0", + "graceful-fs": "^4.2.4", + "jest-config": "^25.5.4", + "jest-haste-map": "^25.5.1", + "jest-message-util": "^25.5.0", + "jest-mock": "^25.5.0", "jest-regex-util": "^25.2.6", - "jest-resolve": "^25.4.0", - "jest-snapshot": "^25.4.0", - "jest-util": "^25.4.0", - "jest-validate": "^25.4.0", + "jest-resolve": "^25.5.1", + "jest-snapshot": "^25.5.1", + "jest-util": "^25.5.0", + "jest-validate": "^25.5.0", "realpath-native": "^2.0.0", "slash": "^3.0.0", "strip-bom": "^4.0.0", @@ -2465,112 +2166,74 @@ } }, "jest-serializer": { - "version": "25.2.6", - "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-25.2.6.tgz", - "integrity": "sha512-RMVCfZsezQS2Ww4kB5HJTMaMJ0asmC0BHlnobQC6yEtxiFKIxohFA4QSXSabKwSggaNkqxn6Z2VwdFCjhUWuiQ==", - "dev": true + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-25.5.0.tgz", + "integrity": "sha512-LxD8fY1lByomEPflwur9o4e2a5twSQ7TaVNLlFUuToIdoJuBt8tzHfCsZ42Ok6LkKXWzFWf3AGmheuLAA7LcCA==", + "dev": true, + "requires": { + "graceful-fs": "^4.2.4" + } }, "jest-snapshot": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-25.4.0.tgz", - "integrity": "sha512-J4CJ0X2SaGheYRZdLz9CRHn9jUknVmlks4UBeu270hPAvdsauFXOhx9SQP2JtRzhnR3cvro/9N9KP83/uvFfRg==", + "version": "25.5.1", + "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-25.5.1.tgz", + "integrity": "sha512-C02JE1TUe64p2v1auUJ2ze5vcuv32tkv9PyhEb318e8XOKF7MOyXdJ7kdjbvrp3ChPLU2usI7Rjxs97Dj5P0uQ==", "dev": true, "requires": { "@babel/types": "^7.0.0", - "@jest/types": "^25.4.0", + "@jest/types": "^25.5.0", "@types/prettier": "^1.19.0", "chalk": "^3.0.0", - "expect": "^25.4.0", - "jest-diff": "^25.4.0", + "expect": "^25.5.0", + "graceful-fs": "^4.2.4", + "jest-diff": "^25.5.0", "jest-get-type": "^25.2.6", - "jest-matcher-utils": "^25.4.0", - "jest-message-util": "^25.4.0", - "jest-resolve": "^25.4.0", + "jest-matcher-utils": "^25.5.0", + "jest-message-util": "^25.5.0", + "jest-resolve": "^25.5.1", "make-dir": "^3.0.0", "natural-compare": "^1.4.0", - "pretty-format": "^25.4.0", + "pretty-format": "^25.5.0", "semver": "^6.3.0" } }, "jest-util": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-25.4.0.tgz", - "integrity": "sha512-WSZD59sBtAUjLv1hMeKbNZXmMcrLRWcYqpO8Dz8b4CeCTZpfNQw2q9uwrYAD+BbJoLJlu4ezVPwtAmM/9/SlZA==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-25.5.0.tgz", + "integrity": "sha512-KVlX+WWg1zUTB9ktvhsg2PXZVdkI1NBevOJSkTKYAyXyH4QSvh+Lay/e/v+bmaFfrkfx43xD8QTfgobzlEXdIA==", "dev": true, "requires": { - "@jest/types": "^25.4.0", + "@jest/types": "^25.5.0", "chalk": "^3.0.0", + "graceful-fs": "^4.2.4", "is-ci": "^2.0.0", "make-dir": "^3.0.0" } }, "jest-validate": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-25.4.0.tgz", - "integrity": "sha512-hvjmes/EFVJSoeP1yOl8qR8mAtMR3ToBkZeXrD/ZS9VxRyWDqQ/E1C5ucMTeSmEOGLipvdlyipiGbHJ+R1MQ0g==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-25.5.0.tgz", + "integrity": "sha512-okUFKqhZIpo3jDdtUXUZ2LxGUZJIlfdYBvZb1aczzxrlyMlqdnnws9MOxezoLGhSaFc2XYaHNReNQfj5zPIWyQ==", "dev": true, "requires": { - "@jest/types": "^25.4.0", + "@jest/types": "^25.5.0", "camelcase": "^5.3.1", "chalk": "^3.0.0", "jest-get-type": "^25.2.6", "leven": "^3.1.0", - "pretty-format": "^25.4.0" + "pretty-format": "^25.5.0" } }, "jest-worker": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-25.4.0.tgz", - "integrity": "sha512-ghAs/1FtfYpMmYQ0AHqxV62XPvKdUDIBBApMZfly+E9JEmYh2K45G0R5dWxx986RN12pRCxsViwQVtGl+N4whw==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-25.5.0.tgz", + "integrity": "sha512-/dsSmUkIy5EBGfv/IjjqmFxrNAUpBERfGs1oHROyD7yxjG/w+t0GOJDX8O1k32ySmd7+a5IhnJU2qQFcJ4n1vw==", "dev": true, "requires": { "merge-stream": "^2.0.0", "supports-color": "^7.0.0" } }, - "jsdom": { - "version": "15.2.1", - "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-15.2.1.tgz", - "integrity": "sha512-fAl1W0/7T2G5vURSyxBzrJ1LSdQn6Tr5UX/xD4PXDx/PDgwygedfW6El/KIj3xJ7FU61TTYnc/l/B7P49Eqt6g==", - "dev": true, - "requires": { - "abab": "^2.0.0", - "acorn": "^7.1.0", - "acorn-globals": "^4.3.2", - "array-equal": "^1.0.0", - "cssom": "^0.4.1", - "cssstyle": "^2.0.0", - "data-urls": "^1.1.0", - "domexception": "^1.0.1", - "escodegen": "^1.11.1", - "html-encoding-sniffer": "^1.0.2", - "nwsapi": "^2.2.0", - "parse5": "5.1.0", - "pn": "^1.1.0", - "request": "^2.88.0", - "request-promise-native": "^1.0.7", - "saxes": "^3.1.9", - "symbol-tree": "^3.2.2", - "tough-cookie": "^3.0.1", - "w3c-hr-time": "^1.0.1", - "w3c-xmlserializer": "^1.1.2", - "webidl-conversions": "^4.0.2", - "whatwg-encoding": "^1.0.5", - "whatwg-mimetype": "^2.3.0", - "whatwg-url": "^7.0.0", - "ws": "^7.0.0", - "xml-name-validator": "^3.0.0" - } - }, - "json5": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz", - "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==", - "dev": true, - "requires": { - "minimist": "^1.2.5" - } - }, "locate-path": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", @@ -2581,20 +2244,14 @@ } }, "make-dir": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.0.2.tgz", - "integrity": "sha512-rYKABKutXa6vXTXhoV18cBE7PaewPXHe/Bdq4v+ZLMhxbWApkFFplT0LcbMW+6BbjnQXzZ/sAvSE/JdguApG5w==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", + "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", "dev": true, "requires": { "semver": "^6.0.0" } }, - "merge-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", - "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", - "dev": true - }, "micromatch": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz", @@ -2605,30 +2262,12 @@ "picomatch": "^2.0.5" } }, - "minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", - "dev": true - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - }, "normalize-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", "dev": true }, - "nwsapi": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz", - "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==", - "dev": true - }, "p-locate": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", @@ -2638,24 +2277,6 @@ "p-limit": "^2.2.0" } }, - "parse-json": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.0.0.tgz", - "integrity": "sha512-OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.0.0", - "error-ex": "^1.3.1", - "json-parse-better-errors": "^1.0.1", - "lines-and-columns": "^1.1.6" - } - }, - "parse5": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.0.tgz", - "integrity": "sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ==", - "dev": true - }, "path-exists": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", @@ -2663,12 +2284,12 @@ "dev": true }, "pretty-format": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.4.0.tgz", - "integrity": "sha512-PI/2dpGjXK5HyXexLPZU/jw5T9Q6S1YVXxxVxco+LIqzUFHXIbKZKdUVt7GcX7QUCr31+3fzhi4gN4/wUYPVxQ==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.5.0.tgz", + "integrity": "sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ==", "dev": true, "requires": { - "@jest/types": "^25.4.0", + "@jest/types": "^25.5.0", "ansi-regex": "^5.0.0", "ansi-styles": "^4.0.0", "react-is": "^16.12.0" @@ -2680,57 +2301,15 @@ "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", "dev": true }, - "read-pkg": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz", - "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==", - "dev": true, - "requires": { - "@types/normalize-package-data": "^2.4.0", - "normalize-package-data": "^2.5.0", - "parse-json": "^5.0.0", - "type-fest": "^0.6.0" - }, - "dependencies": { - "type-fest": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz", - "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==", - "dev": true - } - } - }, - "read-pkg-up": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz", - "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==", + "resolve": { + "version": "1.17.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz", + "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==", "dev": true, "requires": { - "find-up": "^4.1.0", - "read-pkg": "^5.2.0", - "type-fest": "^0.8.1" - }, - "dependencies": { - "type-fest": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", - "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", - "dev": true - } + "path-parse": "^1.0.6" } }, - "realpath-native": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/realpath-native/-/realpath-native-2.0.0.tgz", - "integrity": "sha512-v1SEYUOXXdbBZK8ZuNgO4TBjamPsiSgcFr0aP+tEKpQZK8vooEUqV6nm6Cv502mX4NF2EfsnVqtNAHG+/6Ur1Q==", - "dev": true - }, - "require-main-filename": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", - "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", - "dev": true - }, "rimraf": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", @@ -2787,23 +2366,6 @@ "has-flag": "^4.0.0" } }, - "test-exclude": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", - "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==", - "dev": true, - "requires": { - "@istanbuljs/schema": "^0.1.2", - "glob": "^7.1.4", - "minimatch": "^3.0.4" - } - }, - "throat": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/throat/-/throat-5.0.0.tgz", - "integrity": "sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA==", - "dev": true - }, "to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", @@ -2813,34 +2375,12 @@ "is-number": "^7.0.0" } }, - "tough-cookie": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz", - "integrity": "sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==", - "dev": true, - "requires": { - "ip-regex": "^2.1.0", - "psl": "^1.1.28", - "punycode": "^2.1.1" - } - }, "type-fest": { "version": "0.11.0", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz", "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==", "dev": true }, - "whatwg-url": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz", - "integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==", - "dev": true, - "requires": { - "lodash.sortby": "^4.7.0", - "tr46": "^1.0.1", - "webidl-conversions": "^4.0.2" - } - }, "which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", @@ -2873,12 +2413,6 @@ "typedarray-to-buffer": "^3.1.5" } }, - "ws": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.2.3.tgz", - "integrity": "sha512-HTDl9G9hbkNDk98naoR/cHDws7+EyYMOdL1BmjsZXRUjf7d+MficC4B7HLUPlSiho0vg+CWKrGIt/VJBd1xunQ==", - "dev": true - }, "yargs": { "version": "15.3.1", "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.3.1.tgz", @@ -3062,269 +2596,355 @@ } } }, - "@jest/reporters": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-25.4.0.tgz", - "integrity": "sha512-bhx/buYbZgLZm4JWLcRJ/q9Gvmd3oUh7k2V7gA4ZYBx6J28pIuykIouclRdiAC6eGVX1uRZT+GK4CQJLd/PwPg==", + "@jest/globals": { + "version": "25.5.2", + "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-25.5.2.tgz", + "integrity": "sha512-AgAS/Ny7Q2RCIj5kZ+0MuKM1wbF0WMLxbCVl/GOMoCNbODRdJ541IxJ98xnZdVSZXivKpJlNPIWa3QmY0l4CXA==", "dev": true, "requires": { - "@bcoe/v8-coverage": "^0.2.3", - "@jest/console": "^25.4.0", - "@jest/test-result": "^25.4.0", - "@jest/transform": "^25.4.0", - "@jest/types": "^25.4.0", - "chalk": "^3.0.0", - "collect-v8-coverage": "^1.0.0", - "exit": "^0.1.2", - "glob": "^7.1.2", - "istanbul-lib-coverage": "^3.0.0", - "istanbul-lib-instrument": "^4.0.0", - "istanbul-lib-report": "^3.0.0", - "istanbul-lib-source-maps": "^4.0.0", - "istanbul-reports": "^3.0.2", - "jest-haste-map": "^25.4.0", - "jest-resolve": "^25.4.0", - "jest-util": "^25.4.0", - "jest-worker": "^25.4.0", - "node-notifier": "^6.0.0", - "slash": "^3.0.0", - "source-map": "^0.6.0", - "string-length": "^3.1.0", - "terminal-link": "^2.0.0", - "v8-to-istanbul": "^4.1.3" + "@jest/environment": "^25.5.0", + "@jest/types": "^25.5.0", + "expect": "^25.5.0" }, "dependencies": { - "@babel/generator": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.5.tgz", - "integrity": "sha512-GbNIxVB3ZJe3tLeDm1HSn2AhuD/mVcyLDpgtLXa5tplmWrJdF/elxB56XNqCuD6szyNkDi6wuoKXln3QeBmCHQ==", + "@jest/environment": { + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-25.5.0.tgz", + "integrity": "sha512-U2VXPEqL07E/V7pSZMSQCvV5Ea4lqOlT+0ZFijl/i316cRMHvZ4qC+jBdryd+lmRetjQo0YIQr6cVPNxxK87mA==", "dev": true, "requires": { - "@babel/types": "^7.9.5", - "jsesc": "^2.5.1", - "lodash": "^4.17.13", - "source-map": "^0.5.0" - }, - "dependencies": { - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true - } + "@jest/fake-timers": "^25.5.0", + "@jest/types": "^25.5.0", + "jest-mock": "^25.5.0" } }, - "@babel/helper-function-name": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz", - "integrity": "sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==", + "@jest/fake-timers": { + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-25.5.0.tgz", + "integrity": "sha512-9y2+uGnESw/oyOI3eww9yaxdZyHq7XvprfP/eeoCsjqKYts2yRlsHS/SgjPDV8FyMfn2nbMy8YzUk6nyvdLOpQ==", "dev": true, "requires": { - "@babel/helper-get-function-arity": "^7.8.3", - "@babel/template": "^7.8.3", - "@babel/types": "^7.9.5" + "@jest/types": "^25.5.0", + "jest-message-util": "^25.5.0", + "jest-mock": "^25.5.0", + "jest-util": "^25.5.0", + "lolex": "^5.0.0" } }, - "@babel/helper-get-function-arity": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz", - "integrity": "sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==", + "@jest/types": { + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz", + "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==", "dev": true, "requires": { - "@babel/types": "^7.8.3" + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^1.1.1", + "@types/yargs": "^15.0.0", + "chalk": "^3.0.0" } }, - "@babel/helper-split-export-declaration": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz", - "integrity": "sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==", + "ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "dev": true + }, + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", "dev": true, "requires": { - "@babel/types": "^7.8.3" + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" } }, - "@babel/helpers": { - "version": "7.9.2", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.2.tgz", - "integrity": "sha512-JwLvzlXVPjO8eU9c/wF9/zOIN7X6h8DYf7mG4CiFRZRvZNKEF5dQ3H3V+ASkHoIB3mWhatgl5ONhyqHRI6MppA==", + "braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", "dev": true, "requires": { - "@babel/template": "^7.8.3", - "@babel/traverse": "^7.9.0", - "@babel/types": "^7.9.0" + "fill-range": "^7.0.1" } }, - "@babel/highlight": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz", - "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==", + "chalk": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", "dev": true, "requires": { - "@babel/helper-validator-identifier": "^7.9.0", - "chalk": "^2.0.0", - "js-tokens": "^4.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "requires": { - "color-name": "1.1.3" - } - }, - "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", - "dev": true - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" } }, - "@babel/parser": { - "version": "7.9.4", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz", - "integrity": "sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==", + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, - "@babel/template": { - "version": "7.8.6", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz", - "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==", + "expect": { + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/expect/-/expect-25.5.0.tgz", + "integrity": "sha512-w7KAXo0+6qqZZhovCaBVPSIqQp7/UTcx4M9uKt2m6pd2VB1voyC8JizLRqeEqud3AAVP02g+hbErDu5gu64tlA==", "dev": true, "requires": { - "@babel/code-frame": "^7.8.3", - "@babel/parser": "^7.8.6", - "@babel/types": "^7.8.6" - }, - "dependencies": { - "@babel/code-frame": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", - "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", - "dev": true, - "requires": { - "@babel/highlight": "^7.8.3" - } - } + "@jest/types": "^25.5.0", + "ansi-styles": "^4.0.0", + "jest-get-type": "^25.2.6", + "jest-matcher-utils": "^25.5.0", + "jest-message-util": "^25.5.0", + "jest-regex-util": "^25.2.6" } }, - "@babel/traverse": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.5.tgz", - "integrity": "sha512-c4gH3jsvSuGUezlP6rzSJ6jf8fYjLj3hsMZRx/nX0h+fmHN0w+ekubRrHPqnMec0meycA2nwCsJ7dC8IPem2FQ==", + "fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", "dev": true, "requires": { - "@babel/code-frame": "^7.8.3", - "@babel/generator": "^7.9.5", - "@babel/helper-function-name": "^7.9.5", - "@babel/helper-split-export-declaration": "^7.8.3", - "@babel/parser": "^7.9.0", - "@babel/types": "^7.9.5", - "debug": "^4.1.0", - "globals": "^11.1.0", - "lodash": "^4.17.13" - }, - "dependencies": { - "@babel/code-frame": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", - "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", - "dev": true, - "requires": { - "@babel/highlight": "^7.8.3" - } - } + "to-regex-range": "^5.0.1" } }, - "@babel/types": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.5.tgz", - "integrity": "sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==", + "graceful-fs": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true + }, + "jest-diff": { + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-25.5.0.tgz", + "integrity": "sha512-z1kygetuPiREYdNIumRpAHY6RXiGmp70YHptjdaxTWGmA085W3iCnXNx0DhflK3vwrKmrRWyY1wUpkPMVxMK7A==", "dev": true, "requires": { - "@babel/helper-validator-identifier": "^7.9.5", - "lodash": "^4.17.13", - "to-fast-properties": "^2.0.0" + "chalk": "^3.0.0", + "diff-sequences": "^25.2.6", + "jest-get-type": "^25.2.6", + "pretty-format": "^25.5.0" } }, + "jest-get-type": { + "version": "25.2.6", + "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-25.2.6.tgz", + "integrity": "sha512-DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig==", + "dev": true + }, + "jest-matcher-utils": { + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-25.5.0.tgz", + "integrity": "sha512-VWI269+9JS5cpndnpCwm7dy7JtGQT30UHfrnM3mXl22gHGt/b7NkjBqXfbhZ8V4B7ANUsjK18PlSBmG0YH7gjw==", + "dev": true, + "requires": { + "chalk": "^3.0.0", + "jest-diff": "^25.5.0", + "jest-get-type": "^25.2.6", + "pretty-format": "^25.5.0" + } + }, + "jest-message-util": { + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-25.5.0.tgz", + "integrity": "sha512-ezddz3YCT/LT0SKAmylVyWWIGYoKHOFOFXx3/nA4m794lfVUskMcwhip6vTgdVrOtYdjeQeis2ypzes9mZb4EA==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "@jest/types": "^25.5.0", + "@types/stack-utils": "^1.0.1", + "chalk": "^3.0.0", + "graceful-fs": "^4.2.4", + "micromatch": "^4.0.2", + "slash": "^3.0.0", + "stack-utils": "^1.0.1" + } + }, + "jest-mock": { + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-25.5.0.tgz", + "integrity": "sha512-eXWuTV8mKzp/ovHc5+3USJMYsTBhyQ+5A1Mak35dey/RG8GlM4YWVylZuGgVXinaW6tpvk/RSecmF37FKUlpXA==", + "dev": true, + "requires": { + "@jest/types": "^25.5.0" + } + }, + "jest-util": { + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-25.5.0.tgz", + "integrity": "sha512-KVlX+WWg1zUTB9ktvhsg2PXZVdkI1NBevOJSkTKYAyXyH4QSvh+Lay/e/v+bmaFfrkfx43xD8QTfgobzlEXdIA==", + "dev": true, + "requires": { + "@jest/types": "^25.5.0", + "chalk": "^3.0.0", + "graceful-fs": "^4.2.4", + "is-ci": "^2.0.0", + "make-dir": "^3.0.0" + } + }, + "make-dir": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", + "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", + "dev": true, + "requires": { + "semver": "^6.0.0" + } + }, + "micromatch": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz", + "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==", + "dev": true, + "requires": { + "braces": "^3.0.1", + "picomatch": "^2.0.5" + } + }, + "pretty-format": { + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.5.0.tgz", + "integrity": "sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ==", + "dev": true, + "requires": { + "@jest/types": "^25.5.0", + "ansi-regex": "^5.0.0", + "ansi-styles": "^4.0.0", + "react-is": "^16.12.0" + } + }, + "react-is": { + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", + "dev": true + }, + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true + }, + "slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true + }, + "supports-color": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + }, + "to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "requires": { + "is-number": "^7.0.0" + } + } + } + }, + "@jest/reporters": { + "version": "25.5.1", + "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-25.5.1.tgz", + "integrity": "sha512-3jbd8pPDTuhYJ7vqiHXbSwTJQNavczPs+f1kRprRDxETeE3u6srJ+f0NPuwvOmk+lmunZzPkYWIFZDLHQPkviw==", + "dev": true, + "requires": { + "@bcoe/v8-coverage": "^0.2.3", + "@jest/console": "^25.5.0", + "@jest/test-result": "^25.5.0", + "@jest/transform": "^25.5.1", + "@jest/types": "^25.5.0", + "chalk": "^3.0.0", + "collect-v8-coverage": "^1.0.0", + "exit": "^0.1.2", + "glob": "^7.1.2", + "graceful-fs": "^4.2.4", + "istanbul-lib-coverage": "^3.0.0", + "istanbul-lib-instrument": "^4.0.0", + "istanbul-lib-report": "^3.0.0", + "istanbul-lib-source-maps": "^4.0.0", + "istanbul-reports": "^3.0.2", + "jest-haste-map": "^25.5.1", + "jest-resolve": "^25.5.1", + "jest-util": "^25.5.0", + "jest-worker": "^25.5.0", + "node-notifier": "^6.0.0", + "slash": "^3.0.0", + "source-map": "^0.6.0", + "string-length": "^3.1.0", + "terminal-link": "^2.0.0", + "v8-to-istanbul": "^4.1.3" + }, + "dependencies": { "@jest/console": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/@jest/console/-/console-25.4.0.tgz", - "integrity": "sha512-CfE0erx4hdJ6t7RzAcE1wLG6ZzsHSmybvIBQDoCkDM1QaSeWL9wJMzID/2BbHHa7ll9SsbbK43HjbERbBaFX2A==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/@jest/console/-/console-25.5.0.tgz", + "integrity": "sha512-T48kZa6MK1Y6k4b89sexwmSF4YLeZS/Udqg3Jj3jG/cHH+N/sLFCEoXEDMOKugJQ9FxPN1osxIknvKkxt6MKyw==", "dev": true, "requires": { - "@jest/types": "^25.4.0", + "@jest/types": "^25.5.0", "chalk": "^3.0.0", - "jest-message-util": "^25.4.0", - "jest-util": "^25.4.0", + "jest-message-util": "^25.5.0", + "jest-util": "^25.5.0", "slash": "^3.0.0" } }, "@jest/test-result": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-25.4.0.tgz", - "integrity": "sha512-8BAKPaMCHlL941eyfqhWbmp3MebtzywlxzV+qtngQ3FH+RBqnoSAhNEPj4MG7d2NVUrMOVfrwuzGpVIK+QnMAA==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-25.5.0.tgz", + "integrity": "sha512-oV+hPJgXN7IQf/fHWkcS99y0smKLU2czLBJ9WA0jHITLst58HpQMtzSYxzaBvYc6U5U6jfoMthqsUlUlbRXs0A==", "dev": true, "requires": { - "@jest/console": "^25.4.0", - "@jest/types": "^25.4.0", + "@jest/console": "^25.5.0", + "@jest/types": "^25.5.0", "@types/istanbul-lib-coverage": "^2.0.0", "collect-v8-coverage": "^1.0.0" } }, "@jest/transform": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-25.4.0.tgz", - "integrity": "sha512-t1w2S6V1sk++1HHsxboWxPEuSpN8pxEvNrZN+Ud/knkROWtf8LeUmz73A4ezE8476a5AM00IZr9a8FO9x1+j3g==", + "version": "25.5.1", + "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-25.5.1.tgz", + "integrity": "sha512-Y8CEoVwXb4QwA6Y/9uDkn0Xfz0finGkieuV0xkdF9UtZGJeLukD5nLkaVrVsODB1ojRWlaoD0AJZpVHCSnJEvg==", "dev": true, "requires": { "@babel/core": "^7.1.0", - "@jest/types": "^25.4.0", + "@jest/types": "^25.5.0", "babel-plugin-istanbul": "^6.0.0", "chalk": "^3.0.0", "convert-source-map": "^1.4.0", "fast-json-stable-stringify": "^2.0.0", - "graceful-fs": "^4.2.3", - "jest-haste-map": "^25.4.0", + "graceful-fs": "^4.2.4", + "jest-haste-map": "^25.5.1", "jest-regex-util": "^25.2.6", - "jest-util": "^25.4.0", + "jest-util": "^25.5.0", "micromatch": "^4.0.2", "pirates": "^4.0.1", "realpath-native": "^2.0.0", @@ -3334,9 +2954,9 @@ } }, "@jest/types": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.4.0.tgz", - "integrity": "sha512-XBeaWNzw2PPnGW5aXvZt3+VO60M+34RY3XDsCK5tW7kyj3RK0XClRutCfjqcBuaR2aBQTbluEDME9b5MB9UAPw==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz", + "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -3365,19 +2985,6 @@ "picomatch": "^2.0.4" } }, - "babel-plugin-istanbul": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz", - "integrity": "sha512-AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.0.0", - "@istanbuljs/load-nyc-config": "^1.0.0", - "@istanbuljs/schema": "^0.1.2", - "istanbul-lib-instrument": "^4.0.0", - "test-exclude": "^6.0.0" - } - }, "braces": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", @@ -3412,152 +3019,48 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } - }, "fill-range": { "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", - "dev": true, - "requires": { - "to-regex-range": "^5.0.1" - } - }, - "find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "dev": true, - "requires": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - } - }, - "fsevents": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.2.tgz", - "integrity": "sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==", - "dev": true, - "optional": true - }, - "graceful-fs": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz", - "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==", - "dev": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "dev": true - }, - "istanbul-lib-coverage": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz", - "integrity": "sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==", - "dev": true - }, - "istanbul-lib-instrument": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.1.tgz", - "integrity": "sha512-imIchxnodll7pvQBYOqUu88EufLCU56LMeFPZZM/fJZ1irYcYdqroaV+ACK1Ila8ls09iEYArp+nqyC6lW1Vfg==", - "dev": true, - "requires": { - "@babel/core": "^7.7.5", - "@babel/parser": "^7.7.5", - "@babel/template": "^7.7.4", - "@babel/traverse": "^7.7.4", - "@istanbuljs/schema": "^0.1.2", - "istanbul-lib-coverage": "^3.0.0", - "semver": "^6.3.0" - }, - "dependencies": { - "@babel/code-frame": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", - "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", - "dev": true, - "requires": { - "@babel/highlight": "^7.8.3" - } - }, - "@babel/core": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.0.tgz", - "integrity": "sha512-kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.8.3", - "@babel/generator": "^7.9.0", - "@babel/helper-module-transforms": "^7.9.0", - "@babel/helpers": "^7.9.0", - "@babel/parser": "^7.9.0", - "@babel/template": "^7.8.6", - "@babel/traverse": "^7.9.0", - "@babel/types": "^7.9.0", - "convert-source-map": "^1.7.0", - "debug": "^4.1.0", - "gensync": "^1.0.0-beta.1", - "json5": "^2.1.2", - "lodash": "^4.17.13", - "resolve": "^1.3.2", - "semver": "^5.4.1", - "source-map": "^0.5.0" - }, - "dependencies": { - "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "dev": true - } - } - }, - "convert-source-map": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz", - "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==", - "dev": true, - "requires": { - "safe-buffer": "~5.1.1" - } - }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true - } + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "dev": true, + "requires": { + "to-regex-range": "^5.0.1" } }, + "graceful-fs": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true + }, "jest-haste-map": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-25.4.0.tgz", - "integrity": "sha512-5EoCe1gXfGC7jmXbKzqxESrgRcaO3SzWXGCnvp9BcT0CFMyrB1Q6LIsjl9RmvmJGQgW297TCfrdgiy574Rl9HQ==", + "version": "25.5.1", + "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-25.5.1.tgz", + "integrity": "sha512-dddgh9UZjV7SCDQUrQ+5t9yy8iEgKc1AKqZR9YDww8xsVOtzPQSMVLDChc21+g29oTRexb9/B0bIlZL+sWmvAQ==", "dev": true, "requires": { - "@jest/types": "^25.4.0", + "@jest/types": "^25.5.0", + "@types/graceful-fs": "^4.1.2", "anymatch": "^3.0.3", "fb-watchman": "^2.0.0", "fsevents": "^2.1.2", - "graceful-fs": "^4.2.3", - "jest-serializer": "^25.2.6", - "jest-util": "^25.4.0", - "jest-worker": "^25.4.0", + "graceful-fs": "^4.2.4", + "jest-serializer": "^25.5.0", + "jest-util": "^25.5.0", + "jest-worker": "^25.5.0", "micromatch": "^4.0.2", "sane": "^4.0.3", "walker": "^1.0.7", @@ -3565,114 +3068,79 @@ } }, "jest-message-util": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-25.4.0.tgz", - "integrity": "sha512-LYY9hRcVGgMeMwmdfh9tTjeux1OjZHMusq/E5f3tJN+dAoVVkJtq5ZUEPIcB7bpxDUt2zjUsrwg0EGgPQ+OhXQ==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-25.5.0.tgz", + "integrity": "sha512-ezddz3YCT/LT0SKAmylVyWWIGYoKHOFOFXx3/nA4m794lfVUskMcwhip6vTgdVrOtYdjeQeis2ypzes9mZb4EA==", "dev": true, "requires": { "@babel/code-frame": "^7.0.0", - "@jest/types": "^25.4.0", + "@jest/types": "^25.5.0", "@types/stack-utils": "^1.0.1", "chalk": "^3.0.0", + "graceful-fs": "^4.2.4", "micromatch": "^4.0.2", "slash": "^3.0.0", "stack-utils": "^1.0.1" } }, - "jest-regex-util": { - "version": "25.2.6", - "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-25.2.6.tgz", - "integrity": "sha512-KQqf7a0NrtCkYmZZzodPftn7fL1cq3GQAFVMn5Hg8uKx/fIenLEobNanUxb7abQ1sjADHBseG/2FGpsv/wr+Qw==", - "dev": true - }, "jest-resolve": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-25.4.0.tgz", - "integrity": "sha512-wOsKqVDFWUiv8BtLMCC6uAJ/pHZkfFgoBTgPtmYlsprAjkxrr2U++ZnB3l5ykBMd2O24lXvf30SMAjJIW6k2aA==", + "version": "25.5.1", + "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-25.5.1.tgz", + "integrity": "sha512-Hc09hYch5aWdtejsUZhA+vSzcotf7fajSlPA6EZPE1RmPBAD39XtJhvHWFStid58iit4IPDLI/Da4cwdDmAHiQ==", "dev": true, "requires": { - "@jest/types": "^25.4.0", + "@jest/types": "^25.5.0", "browser-resolve": "^1.11.3", "chalk": "^3.0.0", + "graceful-fs": "^4.2.4", "jest-pnp-resolver": "^1.2.1", "read-pkg-up": "^7.0.1", "realpath-native": "^2.0.0", - "resolve": "^1.15.1", + "resolve": "^1.17.0", "slash": "^3.0.0" - }, - "dependencies": { - "resolve": { - "version": "1.16.1", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.16.1.tgz", - "integrity": "sha512-rmAglCSqWWMrrBv/XM6sW0NuRFiKViw/W4d9EbC4pt+49H8JwHy+mcGmALTEg504AUDcLTvb1T2q3E9AnmY+ig==", - "dev": true, - "requires": { - "path-parse": "^1.0.6" - } - } } }, "jest-serializer": { - "version": "25.2.6", - "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-25.2.6.tgz", - "integrity": "sha512-RMVCfZsezQS2Ww4kB5HJTMaMJ0asmC0BHlnobQC6yEtxiFKIxohFA4QSXSabKwSggaNkqxn6Z2VwdFCjhUWuiQ==", - "dev": true + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-25.5.0.tgz", + "integrity": "sha512-LxD8fY1lByomEPflwur9o4e2a5twSQ7TaVNLlFUuToIdoJuBt8tzHfCsZ42Ok6LkKXWzFWf3AGmheuLAA7LcCA==", + "dev": true, + "requires": { + "graceful-fs": "^4.2.4" + } }, "jest-util": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-25.4.0.tgz", - "integrity": "sha512-WSZD59sBtAUjLv1hMeKbNZXmMcrLRWcYqpO8Dz8b4CeCTZpfNQw2q9uwrYAD+BbJoLJlu4ezVPwtAmM/9/SlZA==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-25.5.0.tgz", + "integrity": "sha512-KVlX+WWg1zUTB9ktvhsg2PXZVdkI1NBevOJSkTKYAyXyH4QSvh+Lay/e/v+bmaFfrkfx43xD8QTfgobzlEXdIA==", "dev": true, "requires": { - "@jest/types": "^25.4.0", + "@jest/types": "^25.5.0", "chalk": "^3.0.0", + "graceful-fs": "^4.2.4", "is-ci": "^2.0.0", "make-dir": "^3.0.0" } }, "jest-worker": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-25.4.0.tgz", - "integrity": "sha512-ghAs/1FtfYpMmYQ0AHqxV62XPvKdUDIBBApMZfly+E9JEmYh2K45G0R5dWxx986RN12pRCxsViwQVtGl+N4whw==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-25.5.0.tgz", + "integrity": "sha512-/dsSmUkIy5EBGfv/IjjqmFxrNAUpBERfGs1oHROyD7yxjG/w+t0GOJDX8O1k32ySmd7+a5IhnJU2qQFcJ4n1vw==", "dev": true, "requires": { "merge-stream": "^2.0.0", "supports-color": "^7.0.0" } }, - "json5": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz", - "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==", - "dev": true, - "requires": { - "minimist": "^1.2.5" - } - }, - "locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "dev": true, - "requires": { - "p-locate": "^4.1.0" - } - }, "make-dir": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.0.2.tgz", - "integrity": "sha512-rYKABKutXa6vXTXhoV18cBE7PaewPXHe/Bdq4v+ZLMhxbWApkFFplT0LcbMW+6BbjnQXzZ/sAvSE/JdguApG5w==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", + "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", "dev": true, "requires": { "semver": "^6.0.0" } }, - "merge-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", - "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", - "dev": true - }, "micromatch": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz", @@ -3683,88 +3151,21 @@ "picomatch": "^2.0.5" } }, - "minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", - "dev": true - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - }, "normalize-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", "dev": true }, - "p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "dev": true, - "requires": { - "p-limit": "^2.2.0" - } - }, - "parse-json": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.0.0.tgz", - "integrity": "sha512-OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.0.0", - "error-ex": "^1.3.1", - "json-parse-better-errors": "^1.0.1", - "lines-and-columns": "^1.1.6" - } - }, - "path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true - }, - "read-pkg": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz", - "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==", - "dev": true, - "requires": { - "@types/normalize-package-data": "^2.4.0", - "normalize-package-data": "^2.5.0", - "parse-json": "^5.0.0", - "type-fest": "^0.6.0" - }, - "dependencies": { - "type-fest": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz", - "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==", - "dev": true - } - } - }, - "read-pkg-up": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz", - "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==", + "resolve": { + "version": "1.17.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz", + "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==", "dev": true, "requires": { - "find-up": "^4.1.0", - "read-pkg": "^5.2.0", - "type-fest": "^0.8.1" + "path-parse": "^1.0.6" } }, - "realpath-native": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/realpath-native/-/realpath-native-2.0.0.tgz", - "integrity": "sha512-v1SEYUOXXdbBZK8ZuNgO4TBjamPsiSgcFr0aP+tEKpQZK8vooEUqV6nm6Cv502mX4NF2EfsnVqtNAHG+/6Ur1Q==", - "dev": true - }, "semver": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", @@ -3786,33 +3187,6 @@ "has-flag": "^4.0.0" } }, - "test-exclude": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", - "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==", - "dev": true, - "requires": { - "@istanbuljs/schema": "^0.1.2", - "glob": "^7.1.4", - "minimatch": "^3.0.4" - }, - "dependencies": { - "glob": { - "version": "7.1.6", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", - "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - } - } - }, "to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", @@ -3822,12 +3196,6 @@ "is-number": "^7.0.0" } }, - "type-fest": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", - "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", - "dev": true - }, "which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", @@ -5539,6 +4907,15 @@ "@types/node": "*" } }, + "@types/graceful-fs": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.3.tgz", + "integrity": "sha512-AiHRaEB50LQg0pZmm659vNBb9f4SJ0qrAnteuzhSeAUcJKxoYgEnprg/83kppCnc2zvtCKbdZry1a5pVY3lOTQ==", + "dev": true, + "requires": { + "@types/node": "*" + } + }, "@types/graphql-upload": { "version": "8.0.3", "resolved": "https://registry.npmjs.org/@types/graphql-upload/-/graphql-upload-8.0.3.tgz", @@ -11732,16 +11109,10 @@ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true }, - "istanbul-lib-coverage": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz", - "integrity": "sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==", - "dev": true - }, "make-dir": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.0.2.tgz", - "integrity": "sha512-rYKABKutXa6vXTXhoV18cBE7PaewPXHe/Bdq4v+ZLMhxbWApkFFplT0LcbMW+6BbjnQXzZ/sAvSE/JdguApG5w==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", + "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", "dev": true, "requires": { "semver": "^6.0.0" @@ -11784,12 +11155,6 @@ "ms": "^2.1.1" } }, - "istanbul-lib-coverage": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz", - "integrity": "sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==", - "dev": true - }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", @@ -11820,113 +11185,25 @@ "requires": { "retry": "0.6.0" }, - "dependencies": { - "retry": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/retry/-/retry-0.6.0.tgz", - "integrity": "sha1-HAEHEyeab9Ho3vKK8MP/GHHKpTc=" - } - } - }, - "jest": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest/-/jest-25.4.0.tgz", - "integrity": "sha512-XWipOheGB4wai5JfCYXd6vwsWNwM/dirjRoZgAa7H2wd8ODWbli2AiKjqG8AYhyx+8+5FBEdpO92VhGlBydzbw==", - "dev": true, - "requires": { - "@jest/core": "^25.4.0", - "import-local": "^3.0.2", - "jest-cli": "^25.4.0" - }, - "dependencies": { - "@babel/generator": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.5.tgz", - "integrity": "sha512-GbNIxVB3ZJe3tLeDm1HSn2AhuD/mVcyLDpgtLXa5tplmWrJdF/elxB56XNqCuD6szyNkDi6wuoKXln3QeBmCHQ==", - "dev": true, - "requires": { - "@babel/types": "^7.9.5", - "jsesc": "^2.5.1", - "lodash": "^4.17.13", - "source-map": "^0.5.0" - }, - "dependencies": { - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true - } - } - }, - "@babel/helper-function-name": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz", - "integrity": "sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==", - "dev": true, - "requires": { - "@babel/helper-get-function-arity": "^7.8.3", - "@babel/template": "^7.8.3", - "@babel/types": "^7.9.5" - } - }, - "@babel/helper-get-function-arity": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz", - "integrity": "sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==", - "dev": true, - "requires": { - "@babel/types": "^7.8.3" - } - }, - "@babel/helper-split-export-declaration": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz", - "integrity": "sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==", - "dev": true, - "requires": { - "@babel/types": "^7.8.3" - } - }, - "@babel/helpers": { - "version": "7.9.2", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.2.tgz", - "integrity": "sha512-JwLvzlXVPjO8eU9c/wF9/zOIN7X6h8DYf7mG4CiFRZRvZNKEF5dQ3H3V+ASkHoIB3mWhatgl5ONhyqHRI6MppA==", - "dev": true, - "requires": { - "@babel/template": "^7.8.3", - "@babel/traverse": "^7.9.0", - "@babel/types": "^7.9.0" - }, - "dependencies": { - "@babel/code-frame": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", - "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", - "dev": true, - "requires": { - "@babel/highlight": "^7.8.3" - } - }, - "@babel/traverse": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.5.tgz", - "integrity": "sha512-c4gH3jsvSuGUezlP6rzSJ6jf8fYjLj3hsMZRx/nX0h+fmHN0w+ekubRrHPqnMec0meycA2nwCsJ7dC8IPem2FQ==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.8.3", - "@babel/generator": "^7.9.5", - "@babel/helper-function-name": "^7.9.5", - "@babel/helper-split-export-declaration": "^7.8.3", - "@babel/parser": "^7.9.0", - "@babel/types": "^7.9.5", - "debug": "^4.1.0", - "globals": "^11.1.0", - "lodash": "^4.17.13" - } - } - } - }, + "dependencies": { + "retry": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/retry/-/retry-0.6.0.tgz", + "integrity": "sha1-HAEHEyeab9Ho3vKK8MP/GHHKpTc=" + } + } + }, + "jest": { + "version": "25.5.4", + "resolved": "https://registry.npmjs.org/jest/-/jest-25.5.4.tgz", + "integrity": "sha512-hHFJROBTqZahnO+X+PMtT6G2/ztqAZJveGqz//FnWWHurizkD05PQGzRZOhF3XP6z7SJmL+5tCfW8qV06JypwQ==", + "dev": true, + "requires": { + "@jest/core": "^25.5.4", + "import-local": "^3.0.2", + "jest-cli": "^25.5.4" + }, + "dependencies": { "@babel/highlight": { "version": "7.9.0", "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz", @@ -11991,9 +11268,9 @@ } }, "@babel/parser": { - "version": "7.9.4", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz", - "integrity": "sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.6.tgz", + "integrity": "sha512-AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q==", "dev": true }, "@babel/template": { @@ -12015,108 +11292,109 @@ "requires": { "@babel/highlight": "^7.8.3" } + }, + "@babel/types": { + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.6.tgz", + "integrity": "sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.9.5", + "lodash": "^4.17.13", + "to-fast-properties": "^2.0.0" + } } } }, - "@babel/types": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.5.tgz", - "integrity": "sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==", - "dev": true, - "requires": { - "@babel/helper-validator-identifier": "^7.9.5", - "lodash": "^4.17.13", - "to-fast-properties": "^2.0.0" - } - }, "@jest/console": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/@jest/console/-/console-25.4.0.tgz", - "integrity": "sha512-CfE0erx4hdJ6t7RzAcE1wLG6ZzsHSmybvIBQDoCkDM1QaSeWL9wJMzID/2BbHHa7ll9SsbbK43HjbERbBaFX2A==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/@jest/console/-/console-25.5.0.tgz", + "integrity": "sha512-T48kZa6MK1Y6k4b89sexwmSF4YLeZS/Udqg3Jj3jG/cHH+N/sLFCEoXEDMOKugJQ9FxPN1osxIknvKkxt6MKyw==", "dev": true, "requires": { - "@jest/types": "^25.4.0", + "@jest/types": "^25.5.0", "chalk": "^3.0.0", - "jest-message-util": "^25.4.0", - "jest-util": "^25.4.0", + "jest-message-util": "^25.5.0", + "jest-util": "^25.5.0", "slash": "^3.0.0" } }, "@jest/environment": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-25.4.0.tgz", - "integrity": "sha512-KDctiak4mu7b4J6BIoN/+LUL3pscBzoUCP+EtSPd2tK9fqyDY5OF+CmkBywkFWezS9tyH5ACOQNtpjtueEDH6Q==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-25.5.0.tgz", + "integrity": "sha512-U2VXPEqL07E/V7pSZMSQCvV5Ea4lqOlT+0ZFijl/i316cRMHvZ4qC+jBdryd+lmRetjQo0YIQr6cVPNxxK87mA==", "dev": true, "requires": { - "@jest/fake-timers": "^25.4.0", - "@jest/types": "^25.4.0", - "jest-mock": "^25.4.0" + "@jest/fake-timers": "^25.5.0", + "@jest/types": "^25.5.0", + "jest-mock": "^25.5.0" } }, "@jest/fake-timers": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-25.4.0.tgz", - "integrity": "sha512-lI9z+VOmVX4dPPFzyj0vm+UtaB8dCJJ852lcDnY0uCPRvZAaVGnMwBBc1wxtf+h7Vz6KszoOvKAt4QijDnHDkg==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-25.5.0.tgz", + "integrity": "sha512-9y2+uGnESw/oyOI3eww9yaxdZyHq7XvprfP/eeoCsjqKYts2yRlsHS/SgjPDV8FyMfn2nbMy8YzUk6nyvdLOpQ==", "dev": true, "requires": { - "@jest/types": "^25.4.0", - "jest-message-util": "^25.4.0", - "jest-mock": "^25.4.0", - "jest-util": "^25.4.0", + "@jest/types": "^25.5.0", + "jest-message-util": "^25.5.0", + "jest-mock": "^25.5.0", + "jest-util": "^25.5.0", "lolex": "^5.0.0" } }, "@jest/source-map": { - "version": "25.2.6", - "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-25.2.6.tgz", - "integrity": "sha512-VuIRZF8M2zxYFGTEhkNSvQkUKafQro4y+mwUxy5ewRqs5N/ynSFUODYp3fy1zCnbCMy1pz3k+u57uCqx8QRSQQ==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-25.5.0.tgz", + "integrity": "sha512-eIGx0xN12yVpMcPaVpjXPnn3N30QGJCJQSkEDUt9x1fI1Gdvb07Ml6K5iN2hG7NmMP6FDmtPEssE3z6doOYUwQ==", "dev": true, "requires": { "callsites": "^3.0.0", - "graceful-fs": "^4.2.3", + "graceful-fs": "^4.2.4", "source-map": "^0.6.0" } }, "@jest/test-result": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-25.4.0.tgz", - "integrity": "sha512-8BAKPaMCHlL941eyfqhWbmp3MebtzywlxzV+qtngQ3FH+RBqnoSAhNEPj4MG7d2NVUrMOVfrwuzGpVIK+QnMAA==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-25.5.0.tgz", + "integrity": "sha512-oV+hPJgXN7IQf/fHWkcS99y0smKLU2czLBJ9WA0jHITLst58HpQMtzSYxzaBvYc6U5U6jfoMthqsUlUlbRXs0A==", "dev": true, "requires": { - "@jest/console": "^25.4.0", - "@jest/types": "^25.4.0", + "@jest/console": "^25.5.0", + "@jest/types": "^25.5.0", "@types/istanbul-lib-coverage": "^2.0.0", "collect-v8-coverage": "^1.0.0" } }, "@jest/test-sequencer": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-25.4.0.tgz", - "integrity": "sha512-240cI+nsM3attx2bMp9uGjjHrwrpvxxrZi8Tyqp/cfOzl98oZXVakXBgxODGyBYAy/UGXPKXLvNc2GaqItrsJg==", + "version": "25.5.4", + "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-25.5.4.tgz", + "integrity": "sha512-pTJGEkSeg1EkCO2YWq6hbFvKNXk8ejqlxiOg1jBNLnWrgXOkdY6UmqZpwGFXNnRt9B8nO1uWMzLLZ4eCmhkPNA==", "dev": true, "requires": { - "@jest/test-result": "^25.4.0", - "jest-haste-map": "^25.4.0", - "jest-runner": "^25.4.0", - "jest-runtime": "^25.4.0" + "@jest/test-result": "^25.5.0", + "graceful-fs": "^4.2.4", + "jest-haste-map": "^25.5.1", + "jest-runner": "^25.5.4", + "jest-runtime": "^25.5.4" } }, "@jest/transform": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-25.4.0.tgz", - "integrity": "sha512-t1w2S6V1sk++1HHsxboWxPEuSpN8pxEvNrZN+Ud/knkROWtf8LeUmz73A4ezE8476a5AM00IZr9a8FO9x1+j3g==", + "version": "25.5.1", + "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-25.5.1.tgz", + "integrity": "sha512-Y8CEoVwXb4QwA6Y/9uDkn0Xfz0finGkieuV0xkdF9UtZGJeLukD5nLkaVrVsODB1ojRWlaoD0AJZpVHCSnJEvg==", "dev": true, "requires": { "@babel/core": "^7.1.0", - "@jest/types": "^25.4.0", + "@jest/types": "^25.5.0", "babel-plugin-istanbul": "^6.0.0", "chalk": "^3.0.0", "convert-source-map": "^1.4.0", "fast-json-stable-stringify": "^2.0.0", - "graceful-fs": "^4.2.3", - "jest-haste-map": "^25.4.0", + "graceful-fs": "^4.2.4", + "jest-haste-map": "^25.5.1", "jest-regex-util": "^25.2.6", - "jest-util": "^25.4.0", + "jest-util": "^25.5.0", "micromatch": "^4.0.2", "pirates": "^4.0.1", "realpath-native": "^2.0.0", @@ -12126,9 +11404,9 @@ } }, "@jest/types": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.4.0.tgz", - "integrity": "sha512-XBeaWNzw2PPnGW5aXvZt3+VO60M+34RY3XDsCK5tW7kyj3RK0XClRutCfjqcBuaR2aBQTbluEDME9b5MB9UAPw==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz", + "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -12137,43 +11415,6 @@ "chalk": "^3.0.0" } }, - "@types/babel__core": { - "version": "7.1.7", - "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.7.tgz", - "integrity": "sha512-RL62NqSFPCDK2FM1pSDH0scHpJvsXtZNiYlMB73DgPBaG1E38ZYVL+ei5EkWRbr+KC4YNiAUNBnRj+bgwpgjMw==", - "dev": true, - "requires": { - "@babel/parser": "^7.1.0", - "@babel/types": "^7.0.0", - "@types/babel__generator": "*", - "@types/babel__template": "*", - "@types/babel__traverse": "*" - } - }, - "acorn": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.1.tgz", - "integrity": "sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==", - "dev": true - }, - "acorn-globals": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.4.tgz", - "integrity": "sha512-clfQEh21R+D0leSbUdWf3OcfqyaCSAQ8Ryq00bofSekfr9W8u1jyYZo6ir0xu9Gtcf7BjcHJpnbZH7JOCpP60A==", - "dev": true, - "requires": { - "acorn": "^6.0.1", - "acorn-walk": "^6.0.1" - }, - "dependencies": { - "acorn": { - "version": "6.4.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz", - "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==", - "dev": true - } - } - }, "ansi-regex": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", @@ -12201,49 +11442,39 @@ } }, "babel-jest": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-25.4.0.tgz", - "integrity": "sha512-p+epx4K0ypmHuCnd8BapfyOwWwosNCYhedetQey1awddtfmEX0MmdxctGl956uwUmjwXR5VSS5xJcGX9DvdIog==", + "version": "25.5.1", + "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-25.5.1.tgz", + "integrity": "sha512-9dA9+GmMjIzgPnYtkhBg73gOo/RHqPmLruP3BaGL4KEX3Dwz6pI8auSN8G8+iuEG90+GSswyKvslN+JYSaacaQ==", "dev": true, "requires": { - "@jest/transform": "^25.4.0", - "@jest/types": "^25.4.0", + "@jest/transform": "^25.5.1", + "@jest/types": "^25.5.0", "@types/babel__core": "^7.1.7", "babel-plugin-istanbul": "^6.0.0", - "babel-preset-jest": "^25.4.0", + "babel-preset-jest": "^25.5.0", "chalk": "^3.0.0", + "graceful-fs": "^4.2.4", "slash": "^3.0.0" } }, - "babel-plugin-istanbul": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz", - "integrity": "sha512-AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.0.0", - "@istanbuljs/load-nyc-config": "^1.0.0", - "@istanbuljs/schema": "^0.1.2", - "istanbul-lib-instrument": "^4.0.0", - "test-exclude": "^6.0.0" - } - }, "babel-plugin-jest-hoist": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-25.4.0.tgz", - "integrity": "sha512-M3a10JCtTyKevb0MjuH6tU+cP/NVQZ82QPADqI1RQYY1OphztsCeIeQmTsHmF/NS6m0E51Zl4QNsI3odXSQF5w==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-25.5.0.tgz", + "integrity": "sha512-u+/W+WAjMlvoocYGTwthAiQSxDcJAyHpQ6oWlHdFZaaN+Rlk8Q7iiwDPg2lN/FyJtAYnKjFxbn7xus4HCFkg5g==", "dev": true, "requires": { + "@babel/template": "^7.3.3", + "@babel/types": "^7.3.3", "@types/babel__traverse": "^7.0.6" } }, "babel-preset-jest": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-25.4.0.tgz", - "integrity": "sha512-PwFiEWflHdu3JCeTr0Pb9NcHHE34qWFnPQRVPvqQITx4CsDCzs6o05923I10XvLvn9nNsRHuiVgB72wG/90ZHQ==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-25.5.0.tgz", + "integrity": "sha512-8ZczygctQkBU+63DtSOKGh7tFL0CeCuz+1ieud9lJ1WPQ9O6A1a/r+LGn6Y705PA6whHQ3T1XuB/PmpfNYf8Fw==", "dev": true, "requires": { - "babel-plugin-jest-hoist": "^25.4.0", + "babel-plugin-jest-hoist": "^25.5.0", "babel-preset-current-node-syntax": "^0.1.2" } }, @@ -12298,56 +11529,12 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, - "cssom": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz", - "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==", - "dev": true - }, - "cssstyle": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.2.0.tgz", - "integrity": "sha512-sEb3XFPx3jNnCAMtqrXPDeSgQr+jojtCeNf8cvMNMh1cG970+lljssvQDzPq6lmmJu2Vhqood/gtEomBiHOGnA==", - "dev": true, - "requires": { - "cssom": "~0.3.6" - }, - "dependencies": { - "cssom": { - "version": "0.3.8", - "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz", - "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==", - "dev": true - } - } - }, - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } - }, "deepmerge": { "version": "4.2.2", "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz", "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==", "dev": true }, - "detect-newline": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz", - "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==", - "dev": true - }, - "diff-sequences": { - "version": "25.2.6", - "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-25.2.6.tgz", - "integrity": "sha512-Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg==", - "dev": true - }, "emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", @@ -12355,16 +11542,16 @@ "dev": true }, "expect": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/expect/-/expect-25.4.0.tgz", - "integrity": "sha512-7BDIX99BTi12/sNGJXA9KMRcby4iAmu1xccBOhyKCyEhjcVKS3hPmHdA/4nSI9QGIOkUropKqr3vv7WMDM5lvQ==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/expect/-/expect-25.5.0.tgz", + "integrity": "sha512-w7KAXo0+6qqZZhovCaBVPSIqQp7/UTcx4M9uKt2m6pd2VB1voyC8JizLRqeEqud3AAVP02g+hbErDu5gu64tlA==", "dev": true, "requires": { - "@jest/types": "^25.4.0", + "@jest/types": "^25.5.0", "ansi-styles": "^4.0.0", "jest-get-type": "^25.2.6", - "jest-matcher-utils": "^25.4.0", - "jest-message-util": "^25.4.0", + "jest-matcher-utils": "^25.5.0", + "jest-message-util": "^25.5.0", "jest-regex-util": "^25.2.6" } }, @@ -12387,17 +11574,10 @@ "path-exists": "^4.0.0" } }, - "fsevents": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.2.tgz", - "integrity": "sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==", - "dev": true, - "optional": true - }, "graceful-fs": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz", - "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==", + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==", "dev": true }, "has-flag": { @@ -12428,208 +11608,105 @@ "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", "dev": true }, - "istanbul-lib-coverage": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz", - "integrity": "sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==", - "dev": true - }, - "istanbul-lib-instrument": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.1.tgz", - "integrity": "sha512-imIchxnodll7pvQBYOqUu88EufLCU56LMeFPZZM/fJZ1irYcYdqroaV+ACK1Ila8ls09iEYArp+nqyC6lW1Vfg==", - "dev": true, - "requires": { - "@babel/core": "^7.7.5", - "@babel/parser": "^7.7.5", - "@babel/template": "^7.7.4", - "@babel/traverse": "^7.7.4", - "@istanbuljs/schema": "^0.1.2", - "istanbul-lib-coverage": "^3.0.0", - "semver": "^6.3.0" - }, - "dependencies": { - "@babel/code-frame": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", - "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", - "dev": true, - "requires": { - "@babel/highlight": "^7.8.3" - } - }, - "@babel/core": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.0.tgz", - "integrity": "sha512-kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.8.3", - "@babel/generator": "^7.9.0", - "@babel/helper-module-transforms": "^7.9.0", - "@babel/helpers": "^7.9.0", - "@babel/parser": "^7.9.0", - "@babel/template": "^7.8.6", - "@babel/traverse": "^7.9.0", - "@babel/types": "^7.9.0", - "convert-source-map": "^1.7.0", - "debug": "^4.1.0", - "gensync": "^1.0.0-beta.1", - "json5": "^2.1.2", - "lodash": "^4.17.13", - "resolve": "^1.3.2", - "semver": "^5.4.1", - "source-map": "^0.5.0" - }, - "dependencies": { - "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "dev": true - } - } - }, - "@babel/traverse": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.5.tgz", - "integrity": "sha512-c4gH3jsvSuGUezlP6rzSJ6jf8fYjLj3hsMZRx/nX0h+fmHN0w+ekubRrHPqnMec0meycA2nwCsJ7dC8IPem2FQ==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.8.3", - "@babel/generator": "^7.9.5", - "@babel/helper-function-name": "^7.9.5", - "@babel/helper-split-export-declaration": "^7.8.3", - "@babel/parser": "^7.9.0", - "@babel/types": "^7.9.5", - "debug": "^4.1.0", - "globals": "^11.1.0", - "lodash": "^4.17.13" - } - }, - "convert-source-map": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz", - "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==", - "dev": true, - "requires": { - "safe-buffer": "~5.1.1" - } - }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true - } - } - }, "jest-cli": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-25.4.0.tgz", - "integrity": "sha512-usyrj1lzCJZMRN1r3QEdnn8e6E6yCx/QN7+B1sLoA68V7f3WlsxSSQfy0+BAwRiF4Hz2eHauf11GZG3PIfWTXQ==", + "version": "25.5.4", + "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-25.5.4.tgz", + "integrity": "sha512-rG8uJkIiOUpnREh1768/N3n27Cm+xPFkSNFO91tgg+8o2rXeVLStz+vkXkGr4UtzH6t1SNbjwoiswd7p4AhHTw==", "dev": true, "requires": { - "@jest/core": "^25.4.0", - "@jest/test-result": "^25.4.0", - "@jest/types": "^25.4.0", + "@jest/core": "^25.5.4", + "@jest/test-result": "^25.5.0", + "@jest/types": "^25.5.0", "chalk": "^3.0.0", "exit": "^0.1.2", + "graceful-fs": "^4.2.4", "import-local": "^3.0.2", "is-ci": "^2.0.0", - "jest-config": "^25.4.0", - "jest-util": "^25.4.0", - "jest-validate": "^25.4.0", + "jest-config": "^25.5.4", + "jest-util": "^25.5.0", + "jest-validate": "^25.5.0", "prompts": "^2.0.1", "realpath-native": "^2.0.0", "yargs": "^15.3.1" } }, "jest-config": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-25.4.0.tgz", - "integrity": "sha512-egT9aKYxMyMSQV1aqTgam0SkI5/I2P9qrKexN5r2uuM2+68ypnc+zPGmfUxK7p1UhE7dYH9SLBS7yb+TtmT1AA==", + "version": "25.5.4", + "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-25.5.4.tgz", + "integrity": "sha512-SZwR91SwcdK6bz7Gco8qL7YY2sx8tFJYzvg216DLihTWf+LKY/DoJXpM9nTzYakSyfblbqeU48p/p7Jzy05Atg==", "dev": true, "requires": { "@babel/core": "^7.1.0", - "@jest/test-sequencer": "^25.4.0", - "@jest/types": "^25.4.0", - "babel-jest": "^25.4.0", + "@jest/test-sequencer": "^25.5.4", + "@jest/types": "^25.5.0", + "babel-jest": "^25.5.1", "chalk": "^3.0.0", "deepmerge": "^4.2.2", "glob": "^7.1.1", - "jest-environment-jsdom": "^25.4.0", - "jest-environment-node": "^25.4.0", + "graceful-fs": "^4.2.4", + "jest-environment-jsdom": "^25.5.0", + "jest-environment-node": "^25.5.0", "jest-get-type": "^25.2.6", - "jest-jasmine2": "^25.4.0", + "jest-jasmine2": "^25.5.4", "jest-regex-util": "^25.2.6", - "jest-resolve": "^25.4.0", - "jest-util": "^25.4.0", - "jest-validate": "^25.4.0", + "jest-resolve": "^25.5.1", + "jest-util": "^25.5.0", + "jest-validate": "^25.5.0", "micromatch": "^4.0.2", - "pretty-format": "^25.4.0", + "pretty-format": "^25.5.0", "realpath-native": "^2.0.0" } }, "jest-diff": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-25.4.0.tgz", - "integrity": "sha512-kklLbJVXW0y8UKOWOdYhI6TH5MG6QAxrWiBMgQaPIuhj3dNFGirKCd+/xfplBXICQ7fI+3QcqHm9p9lWu1N6ug==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-25.5.0.tgz", + "integrity": "sha512-z1kygetuPiREYdNIumRpAHY6RXiGmp70YHptjdaxTWGmA085W3iCnXNx0DhflK3vwrKmrRWyY1wUpkPMVxMK7A==", "dev": true, "requires": { "chalk": "^3.0.0", "diff-sequences": "^25.2.6", "jest-get-type": "^25.2.6", - "pretty-format": "^25.4.0" - } - }, - "jest-docblock": { - "version": "25.3.0", - "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-25.3.0.tgz", - "integrity": "sha512-aktF0kCar8+zxRHxQZwxMy70stc9R1mOmrLsT5VO3pIT0uzGRSDAXxSlz4NqQWpuLjPpuMhPRl7H+5FRsvIQAg==", - "dev": true, - "requires": { - "detect-newline": "^3.0.0" + "pretty-format": "^25.5.0" } }, "jest-each": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-25.4.0.tgz", - "integrity": "sha512-lwRIJ8/vQU/6vq3nnSSUw1Y3nz5tkYSFIywGCZpUBd6WcRgpn8NmJoQICojbpZmsJOJNHm0BKdyuJ6Xdx+eDQQ==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-25.5.0.tgz", + "integrity": "sha512-QBogUxna3D8vtiItvn54xXde7+vuzqRrEeaw8r1s+1TG9eZLVJE5ZkKoSUlqFwRjnlaA4hyKGiu9OlkFIuKnjA==", "dev": true, "requires": { - "@jest/types": "^25.4.0", + "@jest/types": "^25.5.0", "chalk": "^3.0.0", "jest-get-type": "^25.2.6", - "jest-util": "^25.4.0", - "pretty-format": "^25.4.0" + "jest-util": "^25.5.0", + "pretty-format": "^25.5.0" } }, "jest-environment-jsdom": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-25.4.0.tgz", - "integrity": "sha512-KTitVGMDrn2+pt7aZ8/yUTuS333w3pWt1Mf88vMntw7ZSBNDkRS6/4XLbFpWXYfWfp1FjcjQTOKzbK20oIehWQ==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-25.5.0.tgz", + "integrity": "sha512-7Jr02ydaq4jaWMZLY+Skn8wL5nVIYpWvmeatOHL3tOcV3Zw8sjnPpx+ZdeBfc457p8jCR9J6YCc+Lga0oIy62A==", "dev": true, "requires": { - "@jest/environment": "^25.4.0", - "@jest/fake-timers": "^25.4.0", - "@jest/types": "^25.4.0", - "jest-mock": "^25.4.0", - "jest-util": "^25.4.0", + "@jest/environment": "^25.5.0", + "@jest/fake-timers": "^25.5.0", + "@jest/types": "^25.5.0", + "jest-mock": "^25.5.0", + "jest-util": "^25.5.0", "jsdom": "^15.2.1" } }, "jest-environment-node": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-25.4.0.tgz", - "integrity": "sha512-wryZ18vsxEAKFH7Z74zi/y/SyI1j6UkVZ6QsllBuT/bWlahNfQjLNwFsgh/5u7O957dYFoXj4yfma4n4X6kU9A==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-25.5.0.tgz", + "integrity": "sha512-iuxK6rQR2En9EID+2k+IBs5fCFd919gVVK5BeND82fYeLWPqvRcFNPKu9+gxTwfB5XwBGBvZ0HFQa+cHtIoslA==", "dev": true, "requires": { - "@jest/environment": "^25.4.0", - "@jest/fake-timers": "^25.4.0", - "@jest/types": "^25.4.0", - "jest-mock": "^25.4.0", - "jest-util": "^25.4.0", + "@jest/environment": "^25.5.0", + "@jest/fake-timers": "^25.5.0", + "@jest/types": "^25.5.0", + "jest-mock": "^25.5.0", + "jest-util": "^25.5.0", "semver": "^6.3.0" } }, @@ -12640,19 +11717,20 @@ "dev": true }, "jest-haste-map": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-25.4.0.tgz", - "integrity": "sha512-5EoCe1gXfGC7jmXbKzqxESrgRcaO3SzWXGCnvp9BcT0CFMyrB1Q6LIsjl9RmvmJGQgW297TCfrdgiy574Rl9HQ==", + "version": "25.5.1", + "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-25.5.1.tgz", + "integrity": "sha512-dddgh9UZjV7SCDQUrQ+5t9yy8iEgKc1AKqZR9YDww8xsVOtzPQSMVLDChc21+g29oTRexb9/B0bIlZL+sWmvAQ==", "dev": true, "requires": { - "@jest/types": "^25.4.0", + "@jest/types": "^25.5.0", + "@types/graceful-fs": "^4.1.2", "anymatch": "^3.0.3", "fb-watchman": "^2.0.0", "fsevents": "^2.1.2", - "graceful-fs": "^4.2.3", - "jest-serializer": "^25.2.6", - "jest-util": "^25.4.0", - "jest-worker": "^25.4.0", + "graceful-fs": "^4.2.4", + "jest-serializer": "^25.5.0", + "jest-util": "^25.5.0", + "jest-worker": "^25.5.0", "micromatch": "^4.0.2", "sane": "^4.0.3", "walker": "^1.0.7", @@ -12660,163 +11738,149 @@ } }, "jest-jasmine2": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-25.4.0.tgz", - "integrity": "sha512-QccxnozujVKYNEhMQ1vREiz859fPN/XklOzfQjm2j9IGytAkUbSwjFRBtQbHaNZ88cItMpw02JnHGsIdfdpwxQ==", + "version": "25.5.4", + "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-25.5.4.tgz", + "integrity": "sha512-9acbWEfbmS8UpdcfqnDO+uBUgKa/9hcRh983IHdM+pKmJPL77G0sWAAK0V0kr5LK3a8cSBfkFSoncXwQlRZfkQ==", "dev": true, "requires": { "@babel/traverse": "^7.1.0", - "@jest/environment": "^25.4.0", - "@jest/source-map": "^25.2.6", - "@jest/test-result": "^25.4.0", - "@jest/types": "^25.4.0", + "@jest/environment": "^25.5.0", + "@jest/source-map": "^25.5.0", + "@jest/test-result": "^25.5.0", + "@jest/types": "^25.5.0", "chalk": "^3.0.0", "co": "^4.6.0", - "expect": "^25.4.0", + "expect": "^25.5.0", "is-generator-fn": "^2.0.0", - "jest-each": "^25.4.0", - "jest-matcher-utils": "^25.4.0", - "jest-message-util": "^25.4.0", - "jest-runtime": "^25.4.0", - "jest-snapshot": "^25.4.0", - "jest-util": "^25.4.0", - "pretty-format": "^25.4.0", + "jest-each": "^25.5.0", + "jest-matcher-utils": "^25.5.0", + "jest-message-util": "^25.5.0", + "jest-runtime": "^25.5.4", + "jest-snapshot": "^25.5.1", + "jest-util": "^25.5.0", + "pretty-format": "^25.5.0", "throat": "^5.0.0" } }, "jest-leak-detector": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-25.4.0.tgz", - "integrity": "sha512-7Y6Bqfv2xWsB+7w44dvZuLs5SQ//fzhETgOGG7Gq3TTGFdYvAgXGwV8z159RFZ6fXiCPm/szQ90CyfVos9JIFQ==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-25.5.0.tgz", + "integrity": "sha512-rV7JdLsanS8OkdDpZtgBf61L5xZ4NnYLBq72r6ldxahJWWczZjXawRsoHyXzibM5ed7C2QRjpp6ypgwGdKyoVA==", "dev": true, "requires": { "jest-get-type": "^25.2.6", - "pretty-format": "^25.4.0" + "pretty-format": "^25.5.0" } }, "jest-matcher-utils": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-25.4.0.tgz", - "integrity": "sha512-yPMdtj7YDgXhnGbc66bowk8AkQ0YwClbbwk3Kzhn5GVDrciiCr27U4NJRbrqXbTdtxjImONITg2LiRIw650k5A==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-25.5.0.tgz", + "integrity": "sha512-VWI269+9JS5cpndnpCwm7dy7JtGQT30UHfrnM3mXl22gHGt/b7NkjBqXfbhZ8V4B7ANUsjK18PlSBmG0YH7gjw==", "dev": true, "requires": { "chalk": "^3.0.0", - "jest-diff": "^25.4.0", + "jest-diff": "^25.5.0", "jest-get-type": "^25.2.6", - "pretty-format": "^25.4.0" + "pretty-format": "^25.5.0" } }, "jest-message-util": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-25.4.0.tgz", - "integrity": "sha512-LYY9hRcVGgMeMwmdfh9tTjeux1OjZHMusq/E5f3tJN+dAoVVkJtq5ZUEPIcB7bpxDUt2zjUsrwg0EGgPQ+OhXQ==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-25.5.0.tgz", + "integrity": "sha512-ezddz3YCT/LT0SKAmylVyWWIGYoKHOFOFXx3/nA4m794lfVUskMcwhip6vTgdVrOtYdjeQeis2ypzes9mZb4EA==", "dev": true, "requires": { "@babel/code-frame": "^7.0.0", - "@jest/types": "^25.4.0", + "@jest/types": "^25.5.0", "@types/stack-utils": "^1.0.1", "chalk": "^3.0.0", + "graceful-fs": "^4.2.4", "micromatch": "^4.0.2", "slash": "^3.0.0", "stack-utils": "^1.0.1" } }, "jest-mock": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-25.4.0.tgz", - "integrity": "sha512-MdazSfcYAUjJjuVTTnusLPzE0pE4VXpOUzWdj8sbM+q6abUjm3bATVPXFqTXrxSieR8ocpvQ9v/QaQCftioQFg==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-25.5.0.tgz", + "integrity": "sha512-eXWuTV8mKzp/ovHc5+3USJMYsTBhyQ+5A1Mak35dey/RG8GlM4YWVylZuGgVXinaW6tpvk/RSecmF37FKUlpXA==", "dev": true, "requires": { - "@jest/types": "^25.4.0" + "@jest/types": "^25.5.0" } }, - "jest-regex-util": { - "version": "25.2.6", - "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-25.2.6.tgz", - "integrity": "sha512-KQqf7a0NrtCkYmZZzodPftn7fL1cq3GQAFVMn5Hg8uKx/fIenLEobNanUxb7abQ1sjADHBseG/2FGpsv/wr+Qw==", - "dev": true - }, "jest-resolve": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-25.4.0.tgz", - "integrity": "sha512-wOsKqVDFWUiv8BtLMCC6uAJ/pHZkfFgoBTgPtmYlsprAjkxrr2U++ZnB3l5ykBMd2O24lXvf30SMAjJIW6k2aA==", + "version": "25.5.1", + "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-25.5.1.tgz", + "integrity": "sha512-Hc09hYch5aWdtejsUZhA+vSzcotf7fajSlPA6EZPE1RmPBAD39XtJhvHWFStid58iit4IPDLI/Da4cwdDmAHiQ==", "dev": true, "requires": { - "@jest/types": "^25.4.0", + "@jest/types": "^25.5.0", "browser-resolve": "^1.11.3", "chalk": "^3.0.0", + "graceful-fs": "^4.2.4", "jest-pnp-resolver": "^1.2.1", "read-pkg-up": "^7.0.1", "realpath-native": "^2.0.0", - "resolve": "^1.15.1", + "resolve": "^1.17.0", "slash": "^3.0.0" - }, - "dependencies": { - "resolve": { - "version": "1.16.1", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.16.1.tgz", - "integrity": "sha512-rmAglCSqWWMrrBv/XM6sW0NuRFiKViw/W4d9EbC4pt+49H8JwHy+mcGmALTEg504AUDcLTvb1T2q3E9AnmY+ig==", - "dev": true, - "requires": { - "path-parse": "^1.0.6" - } - } } }, "jest-runner": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-25.4.0.tgz", - "integrity": "sha512-wWQSbVgj2e/1chFdMRKZdvlmA6p1IPujhpLT7TKNtCSl1B0PGBGvJjCaiBal/twaU2yfk8VKezHWexM8IliBfA==", + "version": "25.5.4", + "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-25.5.4.tgz", + "integrity": "sha512-V/2R7fKZo6blP8E9BL9vJ8aTU4TH2beuqGNxHbxi6t14XzTb+x90B3FRgdvuHm41GY8ch4xxvf0ATH4hdpjTqg==", "dev": true, "requires": { - "@jest/console": "^25.4.0", - "@jest/environment": "^25.4.0", - "@jest/test-result": "^25.4.0", - "@jest/types": "^25.4.0", + "@jest/console": "^25.5.0", + "@jest/environment": "^25.5.0", + "@jest/test-result": "^25.5.0", + "@jest/types": "^25.5.0", "chalk": "^3.0.0", "exit": "^0.1.2", - "graceful-fs": "^4.2.3", - "jest-config": "^25.4.0", + "graceful-fs": "^4.2.4", + "jest-config": "^25.5.4", "jest-docblock": "^25.3.0", - "jest-haste-map": "^25.4.0", - "jest-jasmine2": "^25.4.0", - "jest-leak-detector": "^25.4.0", - "jest-message-util": "^25.4.0", - "jest-resolve": "^25.4.0", - "jest-runtime": "^25.4.0", - "jest-util": "^25.4.0", - "jest-worker": "^25.4.0", + "jest-haste-map": "^25.5.1", + "jest-jasmine2": "^25.5.4", + "jest-leak-detector": "^25.5.0", + "jest-message-util": "^25.5.0", + "jest-resolve": "^25.5.1", + "jest-runtime": "^25.5.4", + "jest-util": "^25.5.0", + "jest-worker": "^25.5.0", "source-map-support": "^0.5.6", "throat": "^5.0.0" } }, "jest-runtime": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-25.4.0.tgz", - "integrity": "sha512-lgNJlCDULtXu9FumnwCyWlOub8iytijwsPNa30BKrSNtgoT6NUMXOPrZvsH06U6v0wgD/Igwz13nKA2wEKU2VA==", - "dev": true, - "requires": { - "@jest/console": "^25.4.0", - "@jest/environment": "^25.4.0", - "@jest/source-map": "^25.2.6", - "@jest/test-result": "^25.4.0", - "@jest/transform": "^25.4.0", - "@jest/types": "^25.4.0", + "version": "25.5.4", + "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-25.5.4.tgz", + "integrity": "sha512-RWTt8LeWh3GvjYtASH2eezkc8AehVoWKK20udV6n3/gC87wlTbE1kIA+opCvNWyyPeBs6ptYsc6nyHUb1GlUVQ==", + "dev": true, + "requires": { + "@jest/console": "^25.5.0", + "@jest/environment": "^25.5.0", + "@jest/globals": "^25.5.2", + "@jest/source-map": "^25.5.0", + "@jest/test-result": "^25.5.0", + "@jest/transform": "^25.5.1", + "@jest/types": "^25.5.0", "@types/yargs": "^15.0.0", "chalk": "^3.0.0", "collect-v8-coverage": "^1.0.0", "exit": "^0.1.2", "glob": "^7.1.3", - "graceful-fs": "^4.2.3", - "jest-config": "^25.4.0", - "jest-haste-map": "^25.4.0", - "jest-message-util": "^25.4.0", - "jest-mock": "^25.4.0", + "graceful-fs": "^4.2.4", + "jest-config": "^25.5.4", + "jest-haste-map": "^25.5.1", + "jest-message-util": "^25.5.0", + "jest-mock": "^25.5.0", "jest-regex-util": "^25.2.6", - "jest-resolve": "^25.4.0", - "jest-snapshot": "^25.4.0", - "jest-util": "^25.4.0", - "jest-validate": "^25.4.0", + "jest-resolve": "^25.5.1", + "jest-snapshot": "^25.5.1", + "jest-util": "^25.5.0", + "jest-validate": "^25.5.0", "realpath-native": "^2.0.0", "slash": "^3.0.0", "strip-bom": "^4.0.0", @@ -12824,112 +11888,74 @@ } }, "jest-serializer": { - "version": "25.2.6", - "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-25.2.6.tgz", - "integrity": "sha512-RMVCfZsezQS2Ww4kB5HJTMaMJ0asmC0BHlnobQC6yEtxiFKIxohFA4QSXSabKwSggaNkqxn6Z2VwdFCjhUWuiQ==", - "dev": true + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-25.5.0.tgz", + "integrity": "sha512-LxD8fY1lByomEPflwur9o4e2a5twSQ7TaVNLlFUuToIdoJuBt8tzHfCsZ42Ok6LkKXWzFWf3AGmheuLAA7LcCA==", + "dev": true, + "requires": { + "graceful-fs": "^4.2.4" + } }, "jest-snapshot": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-25.4.0.tgz", - "integrity": "sha512-J4CJ0X2SaGheYRZdLz9CRHn9jUknVmlks4UBeu270hPAvdsauFXOhx9SQP2JtRzhnR3cvro/9N9KP83/uvFfRg==", + "version": "25.5.1", + "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-25.5.1.tgz", + "integrity": "sha512-C02JE1TUe64p2v1auUJ2ze5vcuv32tkv9PyhEb318e8XOKF7MOyXdJ7kdjbvrp3ChPLU2usI7Rjxs97Dj5P0uQ==", "dev": true, "requires": { "@babel/types": "^7.0.0", - "@jest/types": "^25.4.0", + "@jest/types": "^25.5.0", "@types/prettier": "^1.19.0", "chalk": "^3.0.0", - "expect": "^25.4.0", - "jest-diff": "^25.4.0", + "expect": "^25.5.0", + "graceful-fs": "^4.2.4", + "jest-diff": "^25.5.0", "jest-get-type": "^25.2.6", - "jest-matcher-utils": "^25.4.0", - "jest-message-util": "^25.4.0", - "jest-resolve": "^25.4.0", + "jest-matcher-utils": "^25.5.0", + "jest-message-util": "^25.5.0", + "jest-resolve": "^25.5.1", "make-dir": "^3.0.0", "natural-compare": "^1.4.0", - "pretty-format": "^25.4.0", + "pretty-format": "^25.5.0", "semver": "^6.3.0" } }, "jest-util": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-25.4.0.tgz", - "integrity": "sha512-WSZD59sBtAUjLv1hMeKbNZXmMcrLRWcYqpO8Dz8b4CeCTZpfNQw2q9uwrYAD+BbJoLJlu4ezVPwtAmM/9/SlZA==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-25.5.0.tgz", + "integrity": "sha512-KVlX+WWg1zUTB9ktvhsg2PXZVdkI1NBevOJSkTKYAyXyH4QSvh+Lay/e/v+bmaFfrkfx43xD8QTfgobzlEXdIA==", "dev": true, "requires": { - "@jest/types": "^25.4.0", + "@jest/types": "^25.5.0", "chalk": "^3.0.0", + "graceful-fs": "^4.2.4", "is-ci": "^2.0.0", "make-dir": "^3.0.0" } }, "jest-validate": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-25.4.0.tgz", - "integrity": "sha512-hvjmes/EFVJSoeP1yOl8qR8mAtMR3ToBkZeXrD/ZS9VxRyWDqQ/E1C5ucMTeSmEOGLipvdlyipiGbHJ+R1MQ0g==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-25.5.0.tgz", + "integrity": "sha512-okUFKqhZIpo3jDdtUXUZ2LxGUZJIlfdYBvZb1aczzxrlyMlqdnnws9MOxezoLGhSaFc2XYaHNReNQfj5zPIWyQ==", "dev": true, "requires": { - "@jest/types": "^25.4.0", + "@jest/types": "^25.5.0", "camelcase": "^5.3.1", "chalk": "^3.0.0", "jest-get-type": "^25.2.6", "leven": "^3.1.0", - "pretty-format": "^25.4.0" + "pretty-format": "^25.5.0" } }, "jest-worker": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-25.4.0.tgz", - "integrity": "sha512-ghAs/1FtfYpMmYQ0AHqxV62XPvKdUDIBBApMZfly+E9JEmYh2K45G0R5dWxx986RN12pRCxsViwQVtGl+N4whw==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-25.5.0.tgz", + "integrity": "sha512-/dsSmUkIy5EBGfv/IjjqmFxrNAUpBERfGs1oHROyD7yxjG/w+t0GOJDX8O1k32ySmd7+a5IhnJU2qQFcJ4n1vw==", "dev": true, "requires": { "merge-stream": "^2.0.0", "supports-color": "^7.0.0" } }, - "jsdom": { - "version": "15.2.1", - "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-15.2.1.tgz", - "integrity": "sha512-fAl1W0/7T2G5vURSyxBzrJ1LSdQn6Tr5UX/xD4PXDx/PDgwygedfW6El/KIj3xJ7FU61TTYnc/l/B7P49Eqt6g==", - "dev": true, - "requires": { - "abab": "^2.0.0", - "acorn": "^7.1.0", - "acorn-globals": "^4.3.2", - "array-equal": "^1.0.0", - "cssom": "^0.4.1", - "cssstyle": "^2.0.0", - "data-urls": "^1.1.0", - "domexception": "^1.0.1", - "escodegen": "^1.11.1", - "html-encoding-sniffer": "^1.0.2", - "nwsapi": "^2.2.0", - "parse5": "5.1.0", - "pn": "^1.1.0", - "request": "^2.88.0", - "request-promise-native": "^1.0.7", - "saxes": "^3.1.9", - "symbol-tree": "^3.2.2", - "tough-cookie": "^3.0.1", - "w3c-hr-time": "^1.0.1", - "w3c-xmlserializer": "^1.1.2", - "webidl-conversions": "^4.0.2", - "whatwg-encoding": "^1.0.5", - "whatwg-mimetype": "^2.3.0", - "whatwg-url": "^7.0.0", - "ws": "^7.0.0", - "xml-name-validator": "^3.0.0" - } - }, - "json5": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz", - "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==", - "dev": true, - "requires": { - "minimist": "^1.2.5" - } - }, "locate-path": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", @@ -12940,20 +11966,14 @@ } }, "make-dir": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.0.2.tgz", - "integrity": "sha512-rYKABKutXa6vXTXhoV18cBE7PaewPXHe/Bdq4v+ZLMhxbWApkFFplT0LcbMW+6BbjnQXzZ/sAvSE/JdguApG5w==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", + "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", "dev": true, "requires": { "semver": "^6.0.0" } }, - "merge-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", - "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", - "dev": true - }, "micromatch": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz", @@ -12964,57 +11984,21 @@ "picomatch": "^2.0.5" } }, - "minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", - "dev": true - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - }, "normalize-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", "dev": true }, - "nwsapi": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz", - "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==", - "dev": true - }, "p-locate": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "dev": true, - "requires": { - "p-limit": "^2.2.0" - } - }, - "parse-json": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.0.0.tgz", - "integrity": "sha512-OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw==", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", "dev": true, "requires": { - "@babel/code-frame": "^7.0.0", - "error-ex": "^1.3.1", - "json-parse-better-errors": "^1.0.1", - "lines-and-columns": "^1.1.6" + "p-limit": "^2.2.0" } }, - "parse5": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.0.tgz", - "integrity": "sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ==", - "dev": true - }, "path-exists": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", @@ -13031,12 +12015,12 @@ } }, "pretty-format": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.4.0.tgz", - "integrity": "sha512-PI/2dpGjXK5HyXexLPZU/jw5T9Q6S1YVXxxVxco+LIqzUFHXIbKZKdUVt7GcX7QUCr31+3fzhi4gN4/wUYPVxQ==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.5.0.tgz", + "integrity": "sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ==", "dev": true, "requires": { - "@jest/types": "^25.4.0", + "@jest/types": "^25.5.0", "ansi-regex": "^5.0.0", "ansi-styles": "^4.0.0", "react-is": "^16.12.0" @@ -13048,49 +12032,15 @@ "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", "dev": true }, - "read-pkg": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz", - "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==", - "dev": true, - "requires": { - "@types/normalize-package-data": "^2.4.0", - "normalize-package-data": "^2.5.0", - "parse-json": "^5.0.0", - "type-fest": "^0.6.0" - }, - "dependencies": { - "type-fest": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz", - "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==", - "dev": true - } - } - }, - "read-pkg-up": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz", - "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==", + "resolve": { + "version": "1.17.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz", + "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==", "dev": true, "requires": { - "find-up": "^4.1.0", - "read-pkg": "^5.2.0", - "type-fest": "^0.8.1" + "path-parse": "^1.0.6" } }, - "realpath-native": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/realpath-native/-/realpath-native-2.0.0.tgz", - "integrity": "sha512-v1SEYUOXXdbBZK8ZuNgO4TBjamPsiSgcFr0aP+tEKpQZK8vooEUqV6nm6Cv502mX4NF2EfsnVqtNAHG+/6Ur1Q==", - "dev": true - }, - "require-main-filename": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", - "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", - "dev": true - }, "resolve-cwd": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz", @@ -13153,39 +12103,6 @@ "has-flag": "^4.0.0" } }, - "test-exclude": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", - "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==", - "dev": true, - "requires": { - "@istanbuljs/schema": "^0.1.2", - "glob": "^7.1.4", - "minimatch": "^3.0.4" - }, - "dependencies": { - "glob": { - "version": "7.1.6", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", - "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - } - } - }, - "throat": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/throat/-/throat-5.0.0.tgz", - "integrity": "sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA==", - "dev": true - }, "to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", @@ -13195,34 +12112,6 @@ "is-number": "^7.0.0" } }, - "tough-cookie": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz", - "integrity": "sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==", - "dev": true, - "requires": { - "ip-regex": "^2.1.0", - "psl": "^1.1.28", - "punycode": "^2.1.1" - } - }, - "type-fest": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", - "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", - "dev": true - }, - "whatwg-url": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz", - "integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==", - "dev": true, - "requires": { - "lodash.sortby": "^4.7.0", - "tr46": "^1.0.1", - "webidl-conversions": "^4.0.2" - } - }, "which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", @@ -13255,12 +12144,6 @@ "typedarray-to-buffer": "^3.1.5" } }, - "ws": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.2.3.tgz", - "integrity": "sha512-HTDl9G9hbkNDk98naoR/cHDws7+EyYMOdL1BmjsZXRUjf7d+MficC4B7HLUPlSiho0vg+CWKrGIt/VJBd1xunQ==", - "dev": true - }, "yargs": { "version": "15.3.1", "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.3.1.tgz", @@ -13293,20 +12176,20 @@ } }, "jest-changed-files": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-25.4.0.tgz", - "integrity": "sha512-VR/rfJsEs4BVMkwOTuStRyS630fidFVekdw/lBaBQjx9KK3VZFOZ2c0fsom2fRp8pMCrCTP6LGna00o/DXGlqA==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-25.5.0.tgz", + "integrity": "sha512-EOw9QEqapsDT7mKF162m8HFzRPbmP8qJQny6ldVOdOVBz3ACgPm/1nAn5fPQ/NDaYhX/AHkrGwwkCncpAVSXcw==", "dev": true, "requires": { - "@jest/types": "^25.4.0", + "@jest/types": "^25.5.0", "execa": "^3.2.0", "throat": "^5.0.0" }, "dependencies": { "@jest/types": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.4.0.tgz", - "integrity": "sha512-XBeaWNzw2PPnGW5aXvZt3+VO60M+34RY3XDsCK5tW7kyj3RK0XClRutCfjqcBuaR2aBQTbluEDME9b5MB9UAPw==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz", + "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -13400,12 +12283,6 @@ "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==", "dev": true }, - "merge-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", - "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", - "dev": true - }, "mimic-fn": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", @@ -13466,12 +12343,6 @@ "has-flag": "^4.0.0" } }, - "throat": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/throat/-/throat-5.0.0.tgz", - "integrity": "sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA==", - "dev": true - }, "which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", @@ -14912,20 +13783,20 @@ } }, "jest-resolve-dependencies": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-25.4.0.tgz", - "integrity": "sha512-A0eoZXx6kLiuG1Ui7wITQPl04HwjLErKIJTt8GR3c7UoDAtzW84JtCrgrJ6Tkw6c6MwHEyAaLk7dEPml5pf48A==", + "version": "25.5.4", + "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-25.5.4.tgz", + "integrity": "sha512-yFmbPd+DAQjJQg88HveObcGBA32nqNZ02fjYmtL16t1xw9bAttSn5UGRRhzMHIQbsep7znWvAvnD4kDqOFM0Uw==", "dev": true, "requires": { - "@jest/types": "^25.4.0", + "@jest/types": "^25.5.0", "jest-regex-util": "^25.2.6", - "jest-snapshot": "^25.4.0" + "jest-snapshot": "^25.5.1" }, "dependencies": { "@jest/types": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.4.0.tgz", - "integrity": "sha512-XBeaWNzw2PPnGW5aXvZt3+VO60M+34RY3XDsCK5tW7kyj3RK0XClRutCfjqcBuaR2aBQTbluEDME9b5MB9UAPw==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz", + "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -14984,23 +13855,17 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, - "diff-sequences": { - "version": "25.2.6", - "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-25.2.6.tgz", - "integrity": "sha512-Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg==", - "dev": true - }, "expect": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/expect/-/expect-25.4.0.tgz", - "integrity": "sha512-7BDIX99BTi12/sNGJXA9KMRcby4iAmu1xccBOhyKCyEhjcVKS3hPmHdA/4nSI9QGIOkUropKqr3vv7WMDM5lvQ==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/expect/-/expect-25.5.0.tgz", + "integrity": "sha512-w7KAXo0+6qqZZhovCaBVPSIqQp7/UTcx4M9uKt2m6pd2VB1voyC8JizLRqeEqud3AAVP02g+hbErDu5gu64tlA==", "dev": true, "requires": { - "@jest/types": "^25.4.0", + "@jest/types": "^25.5.0", "ansi-styles": "^4.0.0", "jest-get-type": "^25.2.6", - "jest-matcher-utils": "^25.4.0", - "jest-message-util": "^25.4.0", + "jest-matcher-utils": "^25.5.0", + "jest-message-util": "^25.5.0", "jest-regex-util": "^25.2.6" } }, @@ -15013,15 +13878,11 @@ "to-regex-range": "^5.0.1" } }, - "find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "dev": true, - "requires": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - } + "graceful-fs": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==", + "dev": true }, "has-flag": { "version": "4.0.0", @@ -15036,15 +13897,15 @@ "dev": true }, "jest-diff": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-25.4.0.tgz", - "integrity": "sha512-kklLbJVXW0y8UKOWOdYhI6TH5MG6QAxrWiBMgQaPIuhj3dNFGirKCd+/xfplBXICQ7fI+3QcqHm9p9lWu1N6ug==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-25.5.0.tgz", + "integrity": "sha512-z1kygetuPiREYdNIumRpAHY6RXiGmp70YHptjdaxTWGmA085W3iCnXNx0DhflK3vwrKmrRWyY1wUpkPMVxMK7A==", "dev": true, "requires": { "chalk": "^3.0.0", "diff-sequences": "^25.2.6", "jest-get-type": "^25.2.6", - "pretty-format": "^25.4.0" + "pretty-format": "^25.5.0" } }, "jest-get-type": { @@ -15054,89 +13915,77 @@ "dev": true }, "jest-matcher-utils": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-25.4.0.tgz", - "integrity": "sha512-yPMdtj7YDgXhnGbc66bowk8AkQ0YwClbbwk3Kzhn5GVDrciiCr27U4NJRbrqXbTdtxjImONITg2LiRIw650k5A==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-25.5.0.tgz", + "integrity": "sha512-VWI269+9JS5cpndnpCwm7dy7JtGQT30UHfrnM3mXl22gHGt/b7NkjBqXfbhZ8V4B7ANUsjK18PlSBmG0YH7gjw==", "dev": true, "requires": { "chalk": "^3.0.0", - "jest-diff": "^25.4.0", + "jest-diff": "^25.5.0", "jest-get-type": "^25.2.6", - "pretty-format": "^25.4.0" + "pretty-format": "^25.5.0" } }, "jest-message-util": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-25.4.0.tgz", - "integrity": "sha512-LYY9hRcVGgMeMwmdfh9tTjeux1OjZHMusq/E5f3tJN+dAoVVkJtq5ZUEPIcB7bpxDUt2zjUsrwg0EGgPQ+OhXQ==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-25.5.0.tgz", + "integrity": "sha512-ezddz3YCT/LT0SKAmylVyWWIGYoKHOFOFXx3/nA4m794lfVUskMcwhip6vTgdVrOtYdjeQeis2ypzes9mZb4EA==", "dev": true, "requires": { "@babel/code-frame": "^7.0.0", - "@jest/types": "^25.4.0", + "@jest/types": "^25.5.0", "@types/stack-utils": "^1.0.1", "chalk": "^3.0.0", + "graceful-fs": "^4.2.4", "micromatch": "^4.0.2", "slash": "^3.0.0", "stack-utils": "^1.0.1" } }, - "jest-regex-util": { - "version": "25.2.6", - "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-25.2.6.tgz", - "integrity": "sha512-KQqf7a0NrtCkYmZZzodPftn7fL1cq3GQAFVMn5Hg8uKx/fIenLEobNanUxb7abQ1sjADHBseG/2FGpsv/wr+Qw==", - "dev": true - }, "jest-resolve": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-25.4.0.tgz", - "integrity": "sha512-wOsKqVDFWUiv8BtLMCC6uAJ/pHZkfFgoBTgPtmYlsprAjkxrr2U++ZnB3l5ykBMd2O24lXvf30SMAjJIW6k2aA==", + "version": "25.5.1", + "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-25.5.1.tgz", + "integrity": "sha512-Hc09hYch5aWdtejsUZhA+vSzcotf7fajSlPA6EZPE1RmPBAD39XtJhvHWFStid58iit4IPDLI/Da4cwdDmAHiQ==", "dev": true, "requires": { - "@jest/types": "^25.4.0", + "@jest/types": "^25.5.0", "browser-resolve": "^1.11.3", "chalk": "^3.0.0", + "graceful-fs": "^4.2.4", "jest-pnp-resolver": "^1.2.1", "read-pkg-up": "^7.0.1", "realpath-native": "^2.0.0", - "resolve": "^1.15.1", + "resolve": "^1.17.0", "slash": "^3.0.0" } }, "jest-snapshot": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-25.4.0.tgz", - "integrity": "sha512-J4CJ0X2SaGheYRZdLz9CRHn9jUknVmlks4UBeu270hPAvdsauFXOhx9SQP2JtRzhnR3cvro/9N9KP83/uvFfRg==", + "version": "25.5.1", + "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-25.5.1.tgz", + "integrity": "sha512-C02JE1TUe64p2v1auUJ2ze5vcuv32tkv9PyhEb318e8XOKF7MOyXdJ7kdjbvrp3ChPLU2usI7Rjxs97Dj5P0uQ==", "dev": true, "requires": { "@babel/types": "^7.0.0", - "@jest/types": "^25.4.0", + "@jest/types": "^25.5.0", "@types/prettier": "^1.19.0", "chalk": "^3.0.0", - "expect": "^25.4.0", - "jest-diff": "^25.4.0", + "expect": "^25.5.0", + "graceful-fs": "^4.2.4", + "jest-diff": "^25.5.0", "jest-get-type": "^25.2.6", - "jest-matcher-utils": "^25.4.0", - "jest-message-util": "^25.4.0", - "jest-resolve": "^25.4.0", + "jest-matcher-utils": "^25.5.0", + "jest-message-util": "^25.5.0", + "jest-resolve": "^25.5.1", "make-dir": "^3.0.0", "natural-compare": "^1.4.0", - "pretty-format": "^25.4.0", + "pretty-format": "^25.5.0", "semver": "^6.3.0" } }, - "locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "dev": true, - "requires": { - "p-locate": "^4.1.0" - } - }, "make-dir": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.0.2.tgz", - "integrity": "sha512-rYKABKutXa6vXTXhoV18cBE7PaewPXHe/Bdq4v+ZLMhxbWApkFFplT0LcbMW+6BbjnQXzZ/sAvSE/JdguApG5w==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", + "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", "dev": true, "requires": { "semver": "^6.0.0" @@ -15152,40 +14001,13 @@ "picomatch": "^2.0.5" } }, - "p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "dev": true, - "requires": { - "p-limit": "^2.2.0" - } - }, - "parse-json": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.0.0.tgz", - "integrity": "sha512-OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.0.0", - "error-ex": "^1.3.1", - "json-parse-better-errors": "^1.0.1", - "lines-and-columns": "^1.1.6" - } - }, - "path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true - }, "pretty-format": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.4.0.tgz", - "integrity": "sha512-PI/2dpGjXK5HyXexLPZU/jw5T9Q6S1YVXxxVxco+LIqzUFHXIbKZKdUVt7GcX7QUCr31+3fzhi4gN4/wUYPVxQ==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.5.0.tgz", + "integrity": "sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ==", "dev": true, "requires": { - "@jest/types": "^25.4.0", + "@jest/types": "^25.5.0", "ansi-regex": "^5.0.0", "ansi-styles": "^4.0.0", "react-is": "^16.12.0" @@ -15197,47 +14019,10 @@ "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", "dev": true }, - "read-pkg": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz", - "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==", - "dev": true, - "requires": { - "@types/normalize-package-data": "^2.4.0", - "normalize-package-data": "^2.5.0", - "parse-json": "^5.0.0", - "type-fest": "^0.6.0" - }, - "dependencies": { - "type-fest": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz", - "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==", - "dev": true - } - } - }, - "read-pkg-up": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz", - "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==", - "dev": true, - "requires": { - "find-up": "^4.1.0", - "read-pkg": "^5.2.0", - "type-fest": "^0.8.1" - } - }, - "realpath-native": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/realpath-native/-/realpath-native-2.0.0.tgz", - "integrity": "sha512-v1SEYUOXXdbBZK8ZuNgO4TBjamPsiSgcFr0aP+tEKpQZK8vooEUqV6nm6Cv502mX4NF2EfsnVqtNAHG+/6Ur1Q==", - "dev": true - }, "resolve": { - "version": "1.16.1", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.16.1.tgz", - "integrity": "sha512-rmAglCSqWWMrrBv/XM6sW0NuRFiKViw/W4d9EbC4pt+49H8JwHy+mcGmALTEg504AUDcLTvb1T2q3E9AnmY+ig==", + "version": "1.17.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz", + "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==", "dev": true, "requires": { "path-parse": "^1.0.6" @@ -15272,12 +14057,6 @@ "requires": { "is-number": "^7.0.0" } - }, - "type-fest": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", - "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", - "dev": true } } }, @@ -15927,48 +14706,48 @@ } }, "jest-watcher": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-25.4.0.tgz", - "integrity": "sha512-36IUfOSRELsKLB7k25j/wutx0aVuHFN6wO94gPNjQtQqFPa2rkOymmx9rM5EzbF3XBZZ2oqD9xbRVoYa2w86gw==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-25.5.0.tgz", + "integrity": "sha512-XrSfJnVASEl+5+bb51V0Q7WQx65dTSk7NL4yDdVjPnRNpM0hG+ncFmDYJo9O8jaSRcAitVbuVawyXCRoxGrT5Q==", "dev": true, "requires": { - "@jest/test-result": "^25.4.0", - "@jest/types": "^25.4.0", + "@jest/test-result": "^25.5.0", + "@jest/types": "^25.5.0", "ansi-escapes": "^4.2.1", "chalk": "^3.0.0", - "jest-util": "^25.4.0", + "jest-util": "^25.5.0", "string-length": "^3.1.0" }, "dependencies": { "@jest/console": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/@jest/console/-/console-25.4.0.tgz", - "integrity": "sha512-CfE0erx4hdJ6t7RzAcE1wLG6ZzsHSmybvIBQDoCkDM1QaSeWL9wJMzID/2BbHHa7ll9SsbbK43HjbERbBaFX2A==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/@jest/console/-/console-25.5.0.tgz", + "integrity": "sha512-T48kZa6MK1Y6k4b89sexwmSF4YLeZS/Udqg3Jj3jG/cHH+N/sLFCEoXEDMOKugJQ9FxPN1osxIknvKkxt6MKyw==", "dev": true, "requires": { - "@jest/types": "^25.4.0", + "@jest/types": "^25.5.0", "chalk": "^3.0.0", - "jest-message-util": "^25.4.0", - "jest-util": "^25.4.0", + "jest-message-util": "^25.5.0", + "jest-util": "^25.5.0", "slash": "^3.0.0" } }, "@jest/test-result": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-25.4.0.tgz", - "integrity": "sha512-8BAKPaMCHlL941eyfqhWbmp3MebtzywlxzV+qtngQ3FH+RBqnoSAhNEPj4MG7d2NVUrMOVfrwuzGpVIK+QnMAA==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-25.5.0.tgz", + "integrity": "sha512-oV+hPJgXN7IQf/fHWkcS99y0smKLU2czLBJ9WA0jHITLst58HpQMtzSYxzaBvYc6U5U6jfoMthqsUlUlbRXs0A==", "dev": true, "requires": { - "@jest/console": "^25.4.0", - "@jest/types": "^25.4.0", + "@jest/console": "^25.5.0", + "@jest/types": "^25.5.0", "@types/istanbul-lib-coverage": "^2.0.0", "collect-v8-coverage": "^1.0.0" } }, "@jest/types": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.4.0.tgz", - "integrity": "sha512-XBeaWNzw2PPnGW5aXvZt3+VO60M+34RY3XDsCK5tW7kyj3RK0XClRutCfjqcBuaR2aBQTbluEDME9b5MB9UAPw==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz", + "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -16039,6 +14818,12 @@ "to-regex-range": "^5.0.1" } }, + "graceful-fs": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==", + "dev": true + }, "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", @@ -16052,36 +14837,38 @@ "dev": true }, "jest-message-util": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-25.4.0.tgz", - "integrity": "sha512-LYY9hRcVGgMeMwmdfh9tTjeux1OjZHMusq/E5f3tJN+dAoVVkJtq5ZUEPIcB7bpxDUt2zjUsrwg0EGgPQ+OhXQ==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-25.5.0.tgz", + "integrity": "sha512-ezddz3YCT/LT0SKAmylVyWWIGYoKHOFOFXx3/nA4m794lfVUskMcwhip6vTgdVrOtYdjeQeis2ypzes9mZb4EA==", "dev": true, "requires": { "@babel/code-frame": "^7.0.0", - "@jest/types": "^25.4.0", + "@jest/types": "^25.5.0", "@types/stack-utils": "^1.0.1", "chalk": "^3.0.0", + "graceful-fs": "^4.2.4", "micromatch": "^4.0.2", "slash": "^3.0.0", "stack-utils": "^1.0.1" } }, "jest-util": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-25.4.0.tgz", - "integrity": "sha512-WSZD59sBtAUjLv1hMeKbNZXmMcrLRWcYqpO8Dz8b4CeCTZpfNQw2q9uwrYAD+BbJoLJlu4ezVPwtAmM/9/SlZA==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-25.5.0.tgz", + "integrity": "sha512-KVlX+WWg1zUTB9ktvhsg2PXZVdkI1NBevOJSkTKYAyXyH4QSvh+Lay/e/v+bmaFfrkfx43xD8QTfgobzlEXdIA==", "dev": true, "requires": { - "@jest/types": "^25.4.0", + "@jest/types": "^25.5.0", "chalk": "^3.0.0", + "graceful-fs": "^4.2.4", "is-ci": "^2.0.0", "make-dir": "^3.0.0" } }, "make-dir": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.0.2.tgz", - "integrity": "sha512-rYKABKutXa6vXTXhoV18cBE7PaewPXHe/Bdq4v+ZLMhxbWApkFFplT0LcbMW+6BbjnQXzZ/sAvSE/JdguApG5w==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", + "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", "dev": true, "requires": { "semver": "^6.0.0" diff --git a/package.json b/package.json index 8f843c59506..d1ddcf91e5c 100644 --- a/package.json +++ b/package.json @@ -104,7 +104,7 @@ "graphql-tools": "4.0.8", "hapi": "17.8.5", "ioredis": "4.16.3", - "jest": "25.4.0", + "jest": "25.5.4", "jest-config": "25.4.0", "jest-junit": "10.0.0", "jest-matcher-utils": "25.4.0", From 12ad66c1ad3d95acc81813754eac7796bfb16540 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 2 May 2020 15:12:03 +0000 Subject: [PATCH 495/642] chore(deps): update dependency jest-config to v25.5.4 (#4059) Co-authored-by: Renovate Bot --- package-lock.json | 820 ++++++++++++++++++++++++++-------------------- package.json | 2 +- 2 files changed, 461 insertions(+), 361 deletions(-) diff --git a/package-lock.json b/package-lock.json index 41fb911d8f0..b270f6cd6f1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1387,22 +1387,22 @@ "dev": true }, "@jest/console": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/@jest/console/-/console-25.4.0.tgz", - "integrity": "sha512-CfE0erx4hdJ6t7RzAcE1wLG6ZzsHSmybvIBQDoCkDM1QaSeWL9wJMzID/2BbHHa7ll9SsbbK43HjbERbBaFX2A==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/@jest/console/-/console-25.5.0.tgz", + "integrity": "sha512-T48kZa6MK1Y6k4b89sexwmSF4YLeZS/Udqg3Jj3jG/cHH+N/sLFCEoXEDMOKugJQ9FxPN1osxIknvKkxt6MKyw==", "dev": true, "requires": { - "@jest/types": "^25.4.0", + "@jest/types": "^25.5.0", "chalk": "^3.0.0", - "jest-message-util": "^25.4.0", - "jest-util": "^25.4.0", + "jest-message-util": "^25.5.0", + "jest-util": "^25.5.0", "slash": "^3.0.0" }, "dependencies": { "@jest/types": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.4.0.tgz", - "integrity": "sha512-XBeaWNzw2PPnGW5aXvZt3+VO60M+34RY3XDsCK5tW7kyj3RK0XClRutCfjqcBuaR2aBQTbluEDME9b5MB9UAPw==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz", + "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -2445,20 +2445,20 @@ } }, "@jest/environment": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-25.4.0.tgz", - "integrity": "sha512-KDctiak4mu7b4J6BIoN/+LUL3pscBzoUCP+EtSPd2tK9fqyDY5OF+CmkBywkFWezS9tyH5ACOQNtpjtueEDH6Q==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-25.5.0.tgz", + "integrity": "sha512-U2VXPEqL07E/V7pSZMSQCvV5Ea4lqOlT+0ZFijl/i316cRMHvZ4qC+jBdryd+lmRetjQo0YIQr6cVPNxxK87mA==", "dev": true, "requires": { - "@jest/fake-timers": "^25.4.0", - "@jest/types": "^25.4.0", - "jest-mock": "^25.4.0" + "@jest/fake-timers": "^25.5.0", + "@jest/types": "^25.5.0", + "jest-mock": "^25.5.0" }, "dependencies": { "@jest/types": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.4.0.tgz", - "integrity": "sha512-XBeaWNzw2PPnGW5aXvZt3+VO60M+34RY3XDsCK5tW7kyj3RK0XClRutCfjqcBuaR2aBQTbluEDME9b5MB9UAPw==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz", + "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -2520,22 +2520,22 @@ } }, "@jest/fake-timers": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-25.4.0.tgz", - "integrity": "sha512-lI9z+VOmVX4dPPFzyj0vm+UtaB8dCJJ852lcDnY0uCPRvZAaVGnMwBBc1wxtf+h7Vz6KszoOvKAt4QijDnHDkg==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-25.5.0.tgz", + "integrity": "sha512-9y2+uGnESw/oyOI3eww9yaxdZyHq7XvprfP/eeoCsjqKYts2yRlsHS/SgjPDV8FyMfn2nbMy8YzUk6nyvdLOpQ==", "dev": true, "requires": { - "@jest/types": "^25.4.0", - "jest-message-util": "^25.4.0", - "jest-mock": "^25.4.0", - "jest-util": "^25.4.0", + "@jest/types": "^25.5.0", + "jest-message-util": "^25.5.0", + "jest-mock": "^25.5.0", + "jest-util": "^25.5.0", "lolex": "^5.0.0" }, "dependencies": { "@jest/types": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.4.0.tgz", - "integrity": "sha512-XBeaWNzw2PPnGW5aXvZt3+VO60M+34RY3XDsCK5tW7kyj3RK0XClRutCfjqcBuaR2aBQTbluEDME9b5MB9UAPw==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz", + "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -3220,13 +3220,13 @@ } }, "@jest/source-map": { - "version": "25.2.6", - "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-25.2.6.tgz", - "integrity": "sha512-VuIRZF8M2zxYFGTEhkNSvQkUKafQro4y+mwUxy5ewRqs5N/ynSFUODYp3fy1zCnbCMy1pz3k+u57uCqx8QRSQQ==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-25.5.0.tgz", + "integrity": "sha512-eIGx0xN12yVpMcPaVpjXPnn3N30QGJCJQSkEDUt9x1fI1Gdvb07Ml6K5iN2hG7NmMP6FDmtPEssE3z6doOYUwQ==", "dev": true, "requires": { "callsites": "^3.0.0", - "graceful-fs": "^4.2.3", + "graceful-fs": "^4.2.4", "source-map": "^0.6.0" }, "dependencies": { @@ -3237,29 +3237,29 @@ "dev": true }, "graceful-fs": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz", - "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==", + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==", "dev": true } } }, "@jest/test-result": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-25.4.0.tgz", - "integrity": "sha512-8BAKPaMCHlL941eyfqhWbmp3MebtzywlxzV+qtngQ3FH+RBqnoSAhNEPj4MG7d2NVUrMOVfrwuzGpVIK+QnMAA==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-25.5.0.tgz", + "integrity": "sha512-oV+hPJgXN7IQf/fHWkcS99y0smKLU2czLBJ9WA0jHITLst58HpQMtzSYxzaBvYc6U5U6jfoMthqsUlUlbRXs0A==", "dev": true, "requires": { - "@jest/console": "^25.4.0", - "@jest/types": "^25.4.0", + "@jest/console": "^25.5.0", + "@jest/types": "^25.5.0", "@types/istanbul-lib-coverage": "^2.0.0", "collect-v8-coverage": "^1.0.0" }, "dependencies": { "@jest/types": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.4.0.tgz", - "integrity": "sha512-XBeaWNzw2PPnGW5aXvZt3+VO60M+34RY3XDsCK5tW7kyj3RK0XClRutCfjqcBuaR2aBQTbluEDME9b5MB9UAPw==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz", + "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -3321,33 +3321,42 @@ } }, "@jest/test-sequencer": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-25.4.0.tgz", - "integrity": "sha512-240cI+nsM3attx2bMp9uGjjHrwrpvxxrZi8Tyqp/cfOzl98oZXVakXBgxODGyBYAy/UGXPKXLvNc2GaqItrsJg==", + "version": "25.5.4", + "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-25.5.4.tgz", + "integrity": "sha512-pTJGEkSeg1EkCO2YWq6hbFvKNXk8ejqlxiOg1jBNLnWrgXOkdY6UmqZpwGFXNnRt9B8nO1uWMzLLZ4eCmhkPNA==", "dev": true, "requires": { - "@jest/test-result": "^25.4.0", - "jest-haste-map": "^25.4.0", - "jest-runner": "^25.4.0", - "jest-runtime": "^25.4.0" + "@jest/test-result": "^25.5.0", + "graceful-fs": "^4.2.4", + "jest-haste-map": "^25.5.1", + "jest-runner": "^25.5.4", + "jest-runtime": "^25.5.4" + }, + "dependencies": { + "graceful-fs": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==", + "dev": true + } } }, "@jest/transform": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-25.4.0.tgz", - "integrity": "sha512-t1w2S6V1sk++1HHsxboWxPEuSpN8pxEvNrZN+Ud/knkROWtf8LeUmz73A4ezE8476a5AM00IZr9a8FO9x1+j3g==", + "version": "25.5.1", + "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-25.5.1.tgz", + "integrity": "sha512-Y8CEoVwXb4QwA6Y/9uDkn0Xfz0finGkieuV0xkdF9UtZGJeLukD5nLkaVrVsODB1ojRWlaoD0AJZpVHCSnJEvg==", "dev": true, "requires": { "@babel/core": "^7.1.0", - "@jest/types": "^25.4.0", + "@jest/types": "^25.5.0", "babel-plugin-istanbul": "^6.0.0", "chalk": "^3.0.0", "convert-source-map": "^1.4.0", "fast-json-stable-stringify": "^2.0.0", - "graceful-fs": "^4.2.3", - "jest-haste-map": "^25.4.0", + "graceful-fs": "^4.2.4", + "jest-haste-map": "^25.5.1", "jest-regex-util": "^25.2.6", - "jest-util": "^25.4.0", + "jest-util": "^25.5.0", "micromatch": "^4.0.2", "pirates": "^4.0.1", "realpath-native": "^2.0.0", @@ -3357,9 +3366,9 @@ }, "dependencies": { "@jest/types": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.4.0.tgz", - "integrity": "sha512-XBeaWNzw2PPnGW5aXvZt3+VO60M+34RY3XDsCK5tW7kyj3RK0XClRutCfjqcBuaR2aBQTbluEDME9b5MB9UAPw==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz", + "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -3422,9 +3431,9 @@ } }, "graceful-fs": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz", - "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==", + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==", "dev": true }, "has-flag": { @@ -6270,24 +6279,25 @@ "dev": true }, "babel-jest": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-25.4.0.tgz", - "integrity": "sha512-p+epx4K0ypmHuCnd8BapfyOwWwosNCYhedetQey1awddtfmEX0MmdxctGl956uwUmjwXR5VSS5xJcGX9DvdIog==", + "version": "25.5.1", + "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-25.5.1.tgz", + "integrity": "sha512-9dA9+GmMjIzgPnYtkhBg73gOo/RHqPmLruP3BaGL4KEX3Dwz6pI8auSN8G8+iuEG90+GSswyKvslN+JYSaacaQ==", "dev": true, "requires": { - "@jest/transform": "^25.4.0", - "@jest/types": "^25.4.0", + "@jest/transform": "^25.5.1", + "@jest/types": "^25.5.0", "@types/babel__core": "^7.1.7", "babel-plugin-istanbul": "^6.0.0", - "babel-preset-jest": "^25.4.0", + "babel-preset-jest": "^25.5.0", "chalk": "^3.0.0", + "graceful-fs": "^4.2.4", "slash": "^3.0.0" }, "dependencies": { "@jest/types": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.4.0.tgz", - "integrity": "sha512-XBeaWNzw2PPnGW5aXvZt3+VO60M+34RY3XDsCK5tW7kyj3RK0XClRutCfjqcBuaR2aBQTbluEDME9b5MB9UAPw==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz", + "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -6331,6 +6341,12 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, + "graceful-fs": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==", + "dev": true + }, "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", @@ -6368,12 +6384,66 @@ } }, "babel-plugin-jest-hoist": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-25.4.0.tgz", - "integrity": "sha512-M3a10JCtTyKevb0MjuH6tU+cP/NVQZ82QPADqI1RQYY1OphztsCeIeQmTsHmF/NS6m0E51Zl4QNsI3odXSQF5w==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-25.5.0.tgz", + "integrity": "sha512-u+/W+WAjMlvoocYGTwthAiQSxDcJAyHpQ6oWlHdFZaaN+Rlk8Q7iiwDPg2lN/FyJtAYnKjFxbn7xus4HCFkg5g==", "dev": true, "requires": { + "@babel/template": "^7.3.3", + "@babel/types": "^7.3.3", "@types/babel__traverse": "^7.0.6" + }, + "dependencies": { + "@babel/code-frame": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", + "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", + "dev": true, + "requires": { + "@babel/highlight": "^7.8.3" + } + }, + "@babel/highlight": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz", + "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.9.0", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" + } + }, + "@babel/parser": { + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.6.tgz", + "integrity": "sha512-AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q==", + "dev": true + }, + "@babel/template": { + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz", + "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.8.3", + "@babel/parser": "^7.8.6", + "@babel/types": "^7.8.6" + }, + "dependencies": { + "@babel/types": { + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.6.tgz", + "integrity": "sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.9.5", + "lodash": "^4.17.13", + "to-fast-properties": "^2.0.0" + } + } + } + } } }, "babel-preset-current-node-syntax": { @@ -6412,12 +6482,12 @@ } }, "babel-preset-jest": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-25.4.0.tgz", - "integrity": "sha512-PwFiEWflHdu3JCeTr0Pb9NcHHE34qWFnPQRVPvqQITx4CsDCzs6o05923I10XvLvn9nNsRHuiVgB72wG/90ZHQ==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-25.5.0.tgz", + "integrity": "sha512-8ZczygctQkBU+63DtSOKGh7tFL0CeCuz+1ieud9lJ1WPQ9O6A1a/r+LGn6Y705PA6whHQ3T1XuB/PmpfNYf8Fw==", "dev": true, "requires": { - "babel-plugin-jest-hoist": "^25.4.0", + "babel-plugin-jest-hoist": "^25.5.0", "babel-preset-current-node-syntax": "^0.1.2" } }, @@ -8396,23 +8466,23 @@ } }, "expect": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/expect/-/expect-25.4.0.tgz", - "integrity": "sha512-7BDIX99BTi12/sNGJXA9KMRcby4iAmu1xccBOhyKCyEhjcVKS3hPmHdA/4nSI9QGIOkUropKqr3vv7WMDM5lvQ==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/expect/-/expect-25.5.0.tgz", + "integrity": "sha512-w7KAXo0+6qqZZhovCaBVPSIqQp7/UTcx4M9uKt2m6pd2VB1voyC8JizLRqeEqud3AAVP02g+hbErDu5gu64tlA==", "dev": true, "requires": { - "@jest/types": "^25.4.0", + "@jest/types": "^25.5.0", "ansi-styles": "^4.0.0", "jest-get-type": "^25.2.6", - "jest-matcher-utils": "^25.4.0", - "jest-message-util": "^25.4.0", + "jest-matcher-utils": "^25.5.0", + "jest-message-util": "^25.5.0", "jest-regex-util": "^25.2.6" }, "dependencies": { "@jest/types": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.4.0.tgz", - "integrity": "sha512-XBeaWNzw2PPnGW5aXvZt3+VO60M+34RY3XDsCK5tW7kyj3RK0XClRutCfjqcBuaR2aBQTbluEDME9b5MB9UAPw==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz", + "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -8462,12 +8532,6 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, - "diff-sequences": { - "version": "25.2.6", - "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-25.2.6.tgz", - "integrity": "sha512-Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg==", - "dev": true - }, "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", @@ -8475,15 +8539,15 @@ "dev": true }, "jest-diff": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-25.4.0.tgz", - "integrity": "sha512-kklLbJVXW0y8UKOWOdYhI6TH5MG6QAxrWiBMgQaPIuhj3dNFGirKCd+/xfplBXICQ7fI+3QcqHm9p9lWu1N6ug==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-25.5.0.tgz", + "integrity": "sha512-z1kygetuPiREYdNIumRpAHY6RXiGmp70YHptjdaxTWGmA085W3iCnXNx0DhflK3vwrKmrRWyY1wUpkPMVxMK7A==", "dev": true, "requires": { "chalk": "^3.0.0", "diff-sequences": "^25.2.6", "jest-get-type": "^25.2.6", - "pretty-format": "^25.4.0" + "pretty-format": "^25.5.0" } }, "jest-get-type": { @@ -8493,24 +8557,24 @@ "dev": true }, "jest-matcher-utils": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-25.4.0.tgz", - "integrity": "sha512-yPMdtj7YDgXhnGbc66bowk8AkQ0YwClbbwk3Kzhn5GVDrciiCr27U4NJRbrqXbTdtxjImONITg2LiRIw650k5A==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-25.5.0.tgz", + "integrity": "sha512-VWI269+9JS5cpndnpCwm7dy7JtGQT30UHfrnM3mXl22gHGt/b7NkjBqXfbhZ8V4B7ANUsjK18PlSBmG0YH7gjw==", "dev": true, "requires": { "chalk": "^3.0.0", - "jest-diff": "^25.4.0", + "jest-diff": "^25.5.0", "jest-get-type": "^25.2.6", - "pretty-format": "^25.4.0" + "pretty-format": "^25.5.0" } }, "pretty-format": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.4.0.tgz", - "integrity": "sha512-PI/2dpGjXK5HyXexLPZU/jw5T9Q6S1YVXxxVxco+LIqzUFHXIbKZKdUVt7GcX7QUCr31+3fzhi4gN4/wUYPVxQ==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.5.0.tgz", + "integrity": "sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ==", "dev": true, "requires": { - "@jest/types": "^25.4.0", + "@jest/types": "^25.5.0", "ansi-regex": "^5.0.0", "ansi-styles": "^4.0.0", "react-is": "^16.12.0" @@ -12355,35 +12419,36 @@ } }, "jest-config": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-25.4.0.tgz", - "integrity": "sha512-egT9aKYxMyMSQV1aqTgam0SkI5/I2P9qrKexN5r2uuM2+68ypnc+zPGmfUxK7p1UhE7dYH9SLBS7yb+TtmT1AA==", + "version": "25.5.4", + "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-25.5.4.tgz", + "integrity": "sha512-SZwR91SwcdK6bz7Gco8qL7YY2sx8tFJYzvg216DLihTWf+LKY/DoJXpM9nTzYakSyfblbqeU48p/p7Jzy05Atg==", "dev": true, "requires": { "@babel/core": "^7.1.0", - "@jest/test-sequencer": "^25.4.0", - "@jest/types": "^25.4.0", - "babel-jest": "^25.4.0", + "@jest/test-sequencer": "^25.5.4", + "@jest/types": "^25.5.0", + "babel-jest": "^25.5.1", "chalk": "^3.0.0", "deepmerge": "^4.2.2", "glob": "^7.1.1", - "jest-environment-jsdom": "^25.4.0", - "jest-environment-node": "^25.4.0", + "graceful-fs": "^4.2.4", + "jest-environment-jsdom": "^25.5.0", + "jest-environment-node": "^25.5.0", "jest-get-type": "^25.2.6", - "jest-jasmine2": "^25.4.0", + "jest-jasmine2": "^25.5.4", "jest-regex-util": "^25.2.6", - "jest-resolve": "^25.4.0", - "jest-util": "^25.4.0", - "jest-validate": "^25.4.0", + "jest-resolve": "^25.5.1", + "jest-util": "^25.5.0", + "jest-validate": "^25.5.0", "micromatch": "^4.0.2", - "pretty-format": "^25.4.0", + "pretty-format": "^25.5.0", "realpath-native": "^2.0.0" }, "dependencies": { "@jest/types": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.4.0.tgz", - "integrity": "sha512-XBeaWNzw2PPnGW5aXvZt3+VO60M+34RY3XDsCK5tW7kyj3RK0XClRutCfjqcBuaR2aBQTbluEDME9b5MB9UAPw==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz", + "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -12457,6 +12522,12 @@ "to-regex-range": "^5.0.1" } }, + "graceful-fs": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==", + "dev": true + }, "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", @@ -12476,17 +12547,17 @@ "dev": true }, "jest-validate": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-25.4.0.tgz", - "integrity": "sha512-hvjmes/EFVJSoeP1yOl8qR8mAtMR3ToBkZeXrD/ZS9VxRyWDqQ/E1C5ucMTeSmEOGLipvdlyipiGbHJ+R1MQ0g==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-25.5.0.tgz", + "integrity": "sha512-okUFKqhZIpo3jDdtUXUZ2LxGUZJIlfdYBvZb1aczzxrlyMlqdnnws9MOxezoLGhSaFc2XYaHNReNQfj5zPIWyQ==", "dev": true, "requires": { - "@jest/types": "^25.4.0", + "@jest/types": "^25.5.0", "camelcase": "^5.3.1", "chalk": "^3.0.0", "jest-get-type": "^25.2.6", "leven": "^3.1.0", - "pretty-format": "^25.4.0" + "pretty-format": "^25.5.0" } }, "micromatch": { @@ -12500,12 +12571,12 @@ } }, "pretty-format": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.4.0.tgz", - "integrity": "sha512-PI/2dpGjXK5HyXexLPZU/jw5T9Q6S1YVXxxVxco+LIqzUFHXIbKZKdUVt7GcX7QUCr31+3fzhi4gN4/wUYPVxQ==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.5.0.tgz", + "integrity": "sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ==", "dev": true, "requires": { - "@jest/types": "^25.4.0", + "@jest/types": "^25.5.0", "ansi-regex": "^5.0.0", "ansi-styles": "^4.0.0", "react-is": "^16.12.0" @@ -12653,22 +12724,22 @@ } }, "jest-each": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-25.4.0.tgz", - "integrity": "sha512-lwRIJ8/vQU/6vq3nnSSUw1Y3nz5tkYSFIywGCZpUBd6WcRgpn8NmJoQICojbpZmsJOJNHm0BKdyuJ6Xdx+eDQQ==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-25.5.0.tgz", + "integrity": "sha512-QBogUxna3D8vtiItvn54xXde7+vuzqRrEeaw8r1s+1TG9eZLVJE5ZkKoSUlqFwRjnlaA4hyKGiu9OlkFIuKnjA==", "dev": true, "requires": { - "@jest/types": "^25.4.0", + "@jest/types": "^25.5.0", "chalk": "^3.0.0", "jest-get-type": "^25.2.6", - "jest-util": "^25.4.0", - "pretty-format": "^25.4.0" + "jest-util": "^25.5.0", + "pretty-format": "^25.5.0" }, "dependencies": { "@jest/types": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.4.0.tgz", - "integrity": "sha512-XBeaWNzw2PPnGW5aXvZt3+VO60M+34RY3XDsCK5tW7kyj3RK0XClRutCfjqcBuaR2aBQTbluEDME9b5MB9UAPw==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz", + "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -12731,12 +12802,12 @@ "dev": true }, "pretty-format": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.4.0.tgz", - "integrity": "sha512-PI/2dpGjXK5HyXexLPZU/jw5T9Q6S1YVXxxVxco+LIqzUFHXIbKZKdUVt7GcX7QUCr31+3fzhi4gN4/wUYPVxQ==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.5.0.tgz", + "integrity": "sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ==", "dev": true, "requires": { - "@jest/types": "^25.4.0", + "@jest/types": "^25.5.0", "ansi-regex": "^5.0.0", "ansi-styles": "^4.0.0", "react-is": "^16.12.0" @@ -12760,23 +12831,23 @@ } }, "jest-environment-jsdom": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-25.4.0.tgz", - "integrity": "sha512-KTitVGMDrn2+pt7aZ8/yUTuS333w3pWt1Mf88vMntw7ZSBNDkRS6/4XLbFpWXYfWfp1FjcjQTOKzbK20oIehWQ==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-25.5.0.tgz", + "integrity": "sha512-7Jr02ydaq4jaWMZLY+Skn8wL5nVIYpWvmeatOHL3tOcV3Zw8sjnPpx+ZdeBfc457p8jCR9J6YCc+Lga0oIy62A==", "dev": true, "requires": { - "@jest/environment": "^25.4.0", - "@jest/fake-timers": "^25.4.0", - "@jest/types": "^25.4.0", - "jest-mock": "^25.4.0", - "jest-util": "^25.4.0", + "@jest/environment": "^25.5.0", + "@jest/fake-timers": "^25.5.0", + "@jest/types": "^25.5.0", + "jest-mock": "^25.5.0", + "jest-util": "^25.5.0", "jsdom": "^15.2.1" }, "dependencies": { "@jest/types": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.4.0.tgz", - "integrity": "sha512-XBeaWNzw2PPnGW5aXvZt3+VO60M+34RY3XDsCK5tW7kyj3RK0XClRutCfjqcBuaR2aBQTbluEDME9b5MB9UAPw==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz", + "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -12838,23 +12909,23 @@ } }, "jest-environment-node": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-25.4.0.tgz", - "integrity": "sha512-wryZ18vsxEAKFH7Z74zi/y/SyI1j6UkVZ6QsllBuT/bWlahNfQjLNwFsgh/5u7O957dYFoXj4yfma4n4X6kU9A==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-25.5.0.tgz", + "integrity": "sha512-iuxK6rQR2En9EID+2k+IBs5fCFd919gVVK5BeND82fYeLWPqvRcFNPKu9+gxTwfB5XwBGBvZ0HFQa+cHtIoslA==", "dev": true, "requires": { - "@jest/environment": "^25.4.0", - "@jest/fake-timers": "^25.4.0", - "@jest/types": "^25.4.0", - "jest-mock": "^25.4.0", - "jest-util": "^25.4.0", + "@jest/environment": "^25.5.0", + "@jest/fake-timers": "^25.5.0", + "@jest/types": "^25.5.0", + "jest-mock": "^25.5.0", + "jest-util": "^25.5.0", "semver": "^6.3.0" }, "dependencies": { "@jest/types": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.4.0.tgz", - "integrity": "sha512-XBeaWNzw2PPnGW5aXvZt3+VO60M+34RY3XDsCK5tW7kyj3RK0XClRutCfjqcBuaR2aBQTbluEDME9b5MB9UAPw==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz", + "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -12928,19 +12999,20 @@ "dev": true }, "jest-haste-map": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-25.4.0.tgz", - "integrity": "sha512-5EoCe1gXfGC7jmXbKzqxESrgRcaO3SzWXGCnvp9BcT0CFMyrB1Q6LIsjl9RmvmJGQgW297TCfrdgiy574Rl9HQ==", + "version": "25.5.1", + "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-25.5.1.tgz", + "integrity": "sha512-dddgh9UZjV7SCDQUrQ+5t9yy8iEgKc1AKqZR9YDww8xsVOtzPQSMVLDChc21+g29oTRexb9/B0bIlZL+sWmvAQ==", "dev": true, "requires": { - "@jest/types": "^25.4.0", + "@jest/types": "^25.5.0", + "@types/graceful-fs": "^4.1.2", "anymatch": "^3.0.3", "fb-watchman": "^2.0.0", "fsevents": "^2.1.2", - "graceful-fs": "^4.2.3", - "jest-serializer": "^25.2.6", - "jest-util": "^25.4.0", - "jest-worker": "^25.4.0", + "graceful-fs": "^4.2.4", + "jest-serializer": "^25.5.0", + "jest-util": "^25.5.0", + "jest-worker": "^25.5.0", "micromatch": "^4.0.2", "sane": "^4.0.3", "walker": "^1.0.7", @@ -12948,9 +13020,9 @@ }, "dependencies": { "@jest/types": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.4.0.tgz", - "integrity": "sha512-XBeaWNzw2PPnGW5aXvZt3+VO60M+34RY3XDsCK5tW7kyj3RK0XClRutCfjqcBuaR2aBQTbluEDME9b5MB9UAPw==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz", + "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -13023,9 +13095,9 @@ } }, "graceful-fs": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz", - "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==", + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==", "dev": true }, "has-flag": { @@ -13086,34 +13158,34 @@ } }, "jest-jasmine2": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-25.4.0.tgz", - "integrity": "sha512-QccxnozujVKYNEhMQ1vREiz859fPN/XklOzfQjm2j9IGytAkUbSwjFRBtQbHaNZ88cItMpw02JnHGsIdfdpwxQ==", + "version": "25.5.4", + "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-25.5.4.tgz", + "integrity": "sha512-9acbWEfbmS8UpdcfqnDO+uBUgKa/9hcRh983IHdM+pKmJPL77G0sWAAK0V0kr5LK3a8cSBfkFSoncXwQlRZfkQ==", "dev": true, "requires": { "@babel/traverse": "^7.1.0", - "@jest/environment": "^25.4.0", - "@jest/source-map": "^25.2.6", - "@jest/test-result": "^25.4.0", - "@jest/types": "^25.4.0", + "@jest/environment": "^25.5.0", + "@jest/source-map": "^25.5.0", + "@jest/test-result": "^25.5.0", + "@jest/types": "^25.5.0", "chalk": "^3.0.0", "co": "^4.6.0", - "expect": "^25.4.0", + "expect": "^25.5.0", "is-generator-fn": "^2.0.0", - "jest-each": "^25.4.0", - "jest-matcher-utils": "^25.4.0", - "jest-message-util": "^25.4.0", - "jest-runtime": "^25.4.0", - "jest-snapshot": "^25.4.0", - "jest-util": "^25.4.0", - "pretty-format": "^25.4.0", + "jest-each": "^25.5.0", + "jest-matcher-utils": "^25.5.0", + "jest-message-util": "^25.5.0", + "jest-runtime": "^25.5.4", + "jest-snapshot": "^25.5.1", + "jest-util": "^25.5.0", + "pretty-format": "^25.5.0", "throat": "^5.0.0" }, "dependencies": { "@jest/types": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.4.0.tgz", - "integrity": "sha512-XBeaWNzw2PPnGW5aXvZt3+VO60M+34RY3XDsCK5tW7kyj3RK0XClRutCfjqcBuaR2aBQTbluEDME9b5MB9UAPw==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz", + "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -13163,12 +13235,6 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, - "diff-sequences": { - "version": "25.2.6", - "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-25.2.6.tgz", - "integrity": "sha512-Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg==", - "dev": true - }, "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", @@ -13176,15 +13242,15 @@ "dev": true }, "jest-diff": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-25.4.0.tgz", - "integrity": "sha512-kklLbJVXW0y8UKOWOdYhI6TH5MG6QAxrWiBMgQaPIuhj3dNFGirKCd+/xfplBXICQ7fI+3QcqHm9p9lWu1N6ug==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-25.5.0.tgz", + "integrity": "sha512-z1kygetuPiREYdNIumRpAHY6RXiGmp70YHptjdaxTWGmA085W3iCnXNx0DhflK3vwrKmrRWyY1wUpkPMVxMK7A==", "dev": true, "requires": { "chalk": "^3.0.0", "diff-sequences": "^25.2.6", "jest-get-type": "^25.2.6", - "pretty-format": "^25.4.0" + "pretty-format": "^25.5.0" } }, "jest-get-type": { @@ -13194,24 +13260,24 @@ "dev": true }, "jest-matcher-utils": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-25.4.0.tgz", - "integrity": "sha512-yPMdtj7YDgXhnGbc66bowk8AkQ0YwClbbwk3Kzhn5GVDrciiCr27U4NJRbrqXbTdtxjImONITg2LiRIw650k5A==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-25.5.0.tgz", + "integrity": "sha512-VWI269+9JS5cpndnpCwm7dy7JtGQT30UHfrnM3mXl22gHGt/b7NkjBqXfbhZ8V4B7ANUsjK18PlSBmG0YH7gjw==", "dev": true, "requires": { "chalk": "^3.0.0", - "jest-diff": "^25.4.0", + "jest-diff": "^25.5.0", "jest-get-type": "^25.2.6", - "pretty-format": "^25.4.0" + "pretty-format": "^25.5.0" } }, "pretty-format": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.4.0.tgz", - "integrity": "sha512-PI/2dpGjXK5HyXexLPZU/jw5T9Q6S1YVXxxVxco+LIqzUFHXIbKZKdUVt7GcX7QUCr31+3fzhi4gN4/wUYPVxQ==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.5.0.tgz", + "integrity": "sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ==", "dev": true, "requires": { - "@jest/types": "^25.4.0", + "@jest/types": "^25.5.0", "ansi-regex": "^5.0.0", "ansi-styles": "^4.0.0", "react-is": "^16.12.0" @@ -13265,19 +13331,19 @@ } }, "jest-leak-detector": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-25.4.0.tgz", - "integrity": "sha512-7Y6Bqfv2xWsB+7w44dvZuLs5SQ//fzhETgOGG7Gq3TTGFdYvAgXGwV8z159RFZ6fXiCPm/szQ90CyfVos9JIFQ==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-25.5.0.tgz", + "integrity": "sha512-rV7JdLsanS8OkdDpZtgBf61L5xZ4NnYLBq72r6ldxahJWWczZjXawRsoHyXzibM5ed7C2QRjpp6ypgwGdKyoVA==", "dev": true, "requires": { "jest-get-type": "^25.2.6", - "pretty-format": "^25.4.0" + "pretty-format": "^25.5.0" }, "dependencies": { "@jest/types": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.4.0.tgz", - "integrity": "sha512-XBeaWNzw2PPnGW5aXvZt3+VO60M+34RY3XDsCK5tW7kyj3RK0XClRutCfjqcBuaR2aBQTbluEDME9b5MB9UAPw==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz", + "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -13340,12 +13406,12 @@ "dev": true }, "pretty-format": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.4.0.tgz", - "integrity": "sha512-PI/2dpGjXK5HyXexLPZU/jw5T9Q6S1YVXxxVxco+LIqzUFHXIbKZKdUVt7GcX7QUCr31+3fzhi4gN4/wUYPVxQ==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.5.0.tgz", + "integrity": "sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ==", "dev": true, "requires": { - "@jest/types": "^25.4.0", + "@jest/types": "^25.5.0", "ansi-regex": "^5.0.0", "ansi-styles": "^4.0.0", "react-is": "^16.12.0" @@ -13475,24 +13541,25 @@ } }, "jest-message-util": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-25.4.0.tgz", - "integrity": "sha512-LYY9hRcVGgMeMwmdfh9tTjeux1OjZHMusq/E5f3tJN+dAoVVkJtq5ZUEPIcB7bpxDUt2zjUsrwg0EGgPQ+OhXQ==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-25.5.0.tgz", + "integrity": "sha512-ezddz3YCT/LT0SKAmylVyWWIGYoKHOFOFXx3/nA4m794lfVUskMcwhip6vTgdVrOtYdjeQeis2ypzes9mZb4EA==", "dev": true, "requires": { "@babel/code-frame": "^7.0.0", - "@jest/types": "^25.4.0", + "@jest/types": "^25.5.0", "@types/stack-utils": "^1.0.1", "chalk": "^3.0.0", + "graceful-fs": "^4.2.4", "micromatch": "^4.0.2", "slash": "^3.0.0", "stack-utils": "^1.0.1" }, "dependencies": { "@jest/types": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.4.0.tgz", - "integrity": "sha512-XBeaWNzw2PPnGW5aXvZt3+VO60M+34RY3XDsCK5tW7kyj3RK0XClRutCfjqcBuaR2aBQTbluEDME9b5MB9UAPw==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz", + "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -13554,6 +13621,12 @@ "to-regex-range": "^5.0.1" } }, + "graceful-fs": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==", + "dev": true + }, "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", @@ -13603,18 +13676,18 @@ } }, "jest-mock": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-25.4.0.tgz", - "integrity": "sha512-MdazSfcYAUjJjuVTTnusLPzE0pE4VXpOUzWdj8sbM+q6abUjm3bATVPXFqTXrxSieR8ocpvQ9v/QaQCftioQFg==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-25.5.0.tgz", + "integrity": "sha512-eXWuTV8mKzp/ovHc5+3USJMYsTBhyQ+5A1Mak35dey/RG8GlM4YWVylZuGgVXinaW6tpvk/RSecmF37FKUlpXA==", "dev": true, "requires": { - "@jest/types": "^25.4.0" + "@jest/types": "^25.5.0" }, "dependencies": { "@jest/types": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.4.0.tgz", - "integrity": "sha512-XBeaWNzw2PPnGW5aXvZt3+VO60M+34RY3XDsCK5tW7kyj3RK0XClRutCfjqcBuaR2aBQTbluEDME9b5MB9UAPw==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz", + "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -13688,25 +13761,26 @@ "dev": true }, "jest-resolve": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-25.4.0.tgz", - "integrity": "sha512-wOsKqVDFWUiv8BtLMCC6uAJ/pHZkfFgoBTgPtmYlsprAjkxrr2U++ZnB3l5ykBMd2O24lXvf30SMAjJIW6k2aA==", + "version": "25.5.1", + "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-25.5.1.tgz", + "integrity": "sha512-Hc09hYch5aWdtejsUZhA+vSzcotf7fajSlPA6EZPE1RmPBAD39XtJhvHWFStid58iit4IPDLI/Da4cwdDmAHiQ==", "dev": true, "requires": { - "@jest/types": "^25.4.0", + "@jest/types": "^25.5.0", "browser-resolve": "^1.11.3", "chalk": "^3.0.0", + "graceful-fs": "^4.2.4", "jest-pnp-resolver": "^1.2.1", "read-pkg-up": "^7.0.1", "realpath-native": "^2.0.0", - "resolve": "^1.15.1", + "resolve": "^1.17.0", "slash": "^3.0.0" }, "dependencies": { "@jest/types": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.4.0.tgz", - "integrity": "sha512-XBeaWNzw2PPnGW5aXvZt3+VO60M+34RY3XDsCK5tW7kyj3RK0XClRutCfjqcBuaR2aBQTbluEDME9b5MB9UAPw==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz", + "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -13750,6 +13824,12 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, + "graceful-fs": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==", + "dev": true + }, "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", @@ -13757,9 +13837,9 @@ "dev": true }, "resolve": { - "version": "1.16.1", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.16.1.tgz", - "integrity": "sha512-rmAglCSqWWMrrBv/XM6sW0NuRFiKViw/W4d9EbC4pt+49H8JwHy+mcGmALTEg504AUDcLTvb1T2q3E9AnmY+ig==", + "version": "1.17.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz", + "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==", "dev": true, "requires": { "path-parse": "^1.0.6" @@ -14061,36 +14141,36 @@ } }, "jest-runner": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-25.4.0.tgz", - "integrity": "sha512-wWQSbVgj2e/1chFdMRKZdvlmA6p1IPujhpLT7TKNtCSl1B0PGBGvJjCaiBal/twaU2yfk8VKezHWexM8IliBfA==", + "version": "25.5.4", + "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-25.5.4.tgz", + "integrity": "sha512-V/2R7fKZo6blP8E9BL9vJ8aTU4TH2beuqGNxHbxi6t14XzTb+x90B3FRgdvuHm41GY8ch4xxvf0ATH4hdpjTqg==", "dev": true, "requires": { - "@jest/console": "^25.4.0", - "@jest/environment": "^25.4.0", - "@jest/test-result": "^25.4.0", - "@jest/types": "^25.4.0", + "@jest/console": "^25.5.0", + "@jest/environment": "^25.5.0", + "@jest/test-result": "^25.5.0", + "@jest/types": "^25.5.0", "chalk": "^3.0.0", "exit": "^0.1.2", - "graceful-fs": "^4.2.3", - "jest-config": "^25.4.0", + "graceful-fs": "^4.2.4", + "jest-config": "^25.5.4", "jest-docblock": "^25.3.0", - "jest-haste-map": "^25.4.0", - "jest-jasmine2": "^25.4.0", - "jest-leak-detector": "^25.4.0", - "jest-message-util": "^25.4.0", - "jest-resolve": "^25.4.0", - "jest-runtime": "^25.4.0", - "jest-util": "^25.4.0", - "jest-worker": "^25.4.0", + "jest-haste-map": "^25.5.1", + "jest-jasmine2": "^25.5.4", + "jest-leak-detector": "^25.5.0", + "jest-message-util": "^25.5.0", + "jest-resolve": "^25.5.1", + "jest-runtime": "^25.5.4", + "jest-util": "^25.5.0", + "jest-worker": "^25.5.0", "source-map-support": "^0.5.6", "throat": "^5.0.0" }, "dependencies": { "@jest/types": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.4.0.tgz", - "integrity": "sha512-XBeaWNzw2PPnGW5aXvZt3+VO60M+34RY3XDsCK5tW7kyj3RK0XClRutCfjqcBuaR2aBQTbluEDME9b5MB9UAPw==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz", + "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -14135,9 +14215,9 @@ "dev": true }, "graceful-fs": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz", - "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==", + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==", "dev": true }, "has-flag": { @@ -14158,32 +14238,33 @@ } }, "jest-runtime": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-25.4.0.tgz", - "integrity": "sha512-lgNJlCDULtXu9FumnwCyWlOub8iytijwsPNa30BKrSNtgoT6NUMXOPrZvsH06U6v0wgD/Igwz13nKA2wEKU2VA==", + "version": "25.5.4", + "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-25.5.4.tgz", + "integrity": "sha512-RWTt8LeWh3GvjYtASH2eezkc8AehVoWKK20udV6n3/gC87wlTbE1kIA+opCvNWyyPeBs6ptYsc6nyHUb1GlUVQ==", "dev": true, "requires": { - "@jest/console": "^25.4.0", - "@jest/environment": "^25.4.0", - "@jest/source-map": "^25.2.6", - "@jest/test-result": "^25.4.0", - "@jest/transform": "^25.4.0", - "@jest/types": "^25.4.0", + "@jest/console": "^25.5.0", + "@jest/environment": "^25.5.0", + "@jest/globals": "^25.5.2", + "@jest/source-map": "^25.5.0", + "@jest/test-result": "^25.5.0", + "@jest/transform": "^25.5.1", + "@jest/types": "^25.5.0", "@types/yargs": "^15.0.0", "chalk": "^3.0.0", "collect-v8-coverage": "^1.0.0", "exit": "^0.1.2", "glob": "^7.1.3", - "graceful-fs": "^4.2.3", - "jest-config": "^25.4.0", - "jest-haste-map": "^25.4.0", - "jest-message-util": "^25.4.0", - "jest-mock": "^25.4.0", + "graceful-fs": "^4.2.4", + "jest-config": "^25.5.4", + "jest-haste-map": "^25.5.1", + "jest-message-util": "^25.5.0", + "jest-mock": "^25.5.0", "jest-regex-util": "^25.2.6", - "jest-resolve": "^25.4.0", - "jest-snapshot": "^25.4.0", - "jest-util": "^25.4.0", - "jest-validate": "^25.4.0", + "jest-resolve": "^25.5.1", + "jest-snapshot": "^25.5.1", + "jest-util": "^25.5.0", + "jest-validate": "^25.5.0", "realpath-native": "^2.0.0", "slash": "^3.0.0", "strip-bom": "^4.0.0", @@ -14191,9 +14272,9 @@ }, "dependencies": { "@jest/types": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.4.0.tgz", - "integrity": "sha512-XBeaWNzw2PPnGW5aXvZt3+VO60M+34RY3XDsCK5tW7kyj3RK0XClRutCfjqcBuaR2aBQTbluEDME9b5MB9UAPw==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz", + "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -14271,9 +14352,9 @@ } }, "graceful-fs": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz", - "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==", + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==", "dev": true }, "has-flag": { @@ -14295,17 +14376,17 @@ "dev": true }, "jest-validate": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-25.4.0.tgz", - "integrity": "sha512-hvjmes/EFVJSoeP1yOl8qR8mAtMR3ToBkZeXrD/ZS9VxRyWDqQ/E1C5ucMTeSmEOGLipvdlyipiGbHJ+R1MQ0g==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-25.5.0.tgz", + "integrity": "sha512-okUFKqhZIpo3jDdtUXUZ2LxGUZJIlfdYBvZb1aczzxrlyMlqdnnws9MOxezoLGhSaFc2XYaHNReNQfj5zPIWyQ==", "dev": true, "requires": { - "@jest/types": "^25.4.0", + "@jest/types": "^25.5.0", "camelcase": "^5.3.1", "chalk": "^3.0.0", "jest-get-type": "^25.2.6", "leven": "^3.1.0", - "pretty-format": "^25.4.0" + "pretty-format": "^25.5.0" } }, "locate-path": { @@ -14333,12 +14414,12 @@ "dev": true }, "pretty-format": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.4.0.tgz", - "integrity": "sha512-PI/2dpGjXK5HyXexLPZU/jw5T9Q6S1YVXxxVxco+LIqzUFHXIbKZKdUVt7GcX7QUCr31+3fzhi4gN4/wUYPVxQ==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.5.0.tgz", + "integrity": "sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ==", "dev": true, "requires": { - "@jest/types": "^25.4.0", + "@jest/types": "^25.5.0", "ansi-regex": "^5.0.0", "ansi-styles": "^4.0.0", "react-is": "^16.12.0" @@ -14434,37 +14515,49 @@ } }, "jest-serializer": { - "version": "25.2.6", - "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-25.2.6.tgz", - "integrity": "sha512-RMVCfZsezQS2Ww4kB5HJTMaMJ0asmC0BHlnobQC6yEtxiFKIxohFA4QSXSabKwSggaNkqxn6Z2VwdFCjhUWuiQ==", - "dev": true + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-25.5.0.tgz", + "integrity": "sha512-LxD8fY1lByomEPflwur9o4e2a5twSQ7TaVNLlFUuToIdoJuBt8tzHfCsZ42Ok6LkKXWzFWf3AGmheuLAA7LcCA==", + "dev": true, + "requires": { + "graceful-fs": "^4.2.4" + }, + "dependencies": { + "graceful-fs": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==", + "dev": true + } + } }, "jest-snapshot": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-25.4.0.tgz", - "integrity": "sha512-J4CJ0X2SaGheYRZdLz9CRHn9jUknVmlks4UBeu270hPAvdsauFXOhx9SQP2JtRzhnR3cvro/9N9KP83/uvFfRg==", + "version": "25.5.1", + "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-25.5.1.tgz", + "integrity": "sha512-C02JE1TUe64p2v1auUJ2ze5vcuv32tkv9PyhEb318e8XOKF7MOyXdJ7kdjbvrp3ChPLU2usI7Rjxs97Dj5P0uQ==", "dev": true, "requires": { "@babel/types": "^7.0.0", - "@jest/types": "^25.4.0", + "@jest/types": "^25.5.0", "@types/prettier": "^1.19.0", "chalk": "^3.0.0", - "expect": "^25.4.0", - "jest-diff": "^25.4.0", + "expect": "^25.5.0", + "graceful-fs": "^4.2.4", + "jest-diff": "^25.5.0", "jest-get-type": "^25.2.6", - "jest-matcher-utils": "^25.4.0", - "jest-message-util": "^25.4.0", - "jest-resolve": "^25.4.0", + "jest-matcher-utils": "^25.5.0", + "jest-message-util": "^25.5.0", + "jest-resolve": "^25.5.1", "make-dir": "^3.0.0", "natural-compare": "^1.4.0", - "pretty-format": "^25.4.0", + "pretty-format": "^25.5.0", "semver": "^6.3.0" }, "dependencies": { "@jest/types": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.4.0.tgz", - "integrity": "sha512-XBeaWNzw2PPnGW5aXvZt3+VO60M+34RY3XDsCK5tW7kyj3RK0XClRutCfjqcBuaR2aBQTbluEDME9b5MB9UAPw==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz", + "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -14514,10 +14607,10 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, - "diff-sequences": { - "version": "25.2.6", - "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-25.2.6.tgz", - "integrity": "sha512-Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg==", + "graceful-fs": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==", "dev": true }, "has-flag": { @@ -14527,15 +14620,15 @@ "dev": true }, "jest-diff": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-25.4.0.tgz", - "integrity": "sha512-kklLbJVXW0y8UKOWOdYhI6TH5MG6QAxrWiBMgQaPIuhj3dNFGirKCd+/xfplBXICQ7fI+3QcqHm9p9lWu1N6ug==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-25.5.0.tgz", + "integrity": "sha512-z1kygetuPiREYdNIumRpAHY6RXiGmp70YHptjdaxTWGmA085W3iCnXNx0DhflK3vwrKmrRWyY1wUpkPMVxMK7A==", "dev": true, "requires": { "chalk": "^3.0.0", "diff-sequences": "^25.2.6", "jest-get-type": "^25.2.6", - "pretty-format": "^25.4.0" + "pretty-format": "^25.5.0" } }, "jest-get-type": { @@ -14545,33 +14638,33 @@ "dev": true }, "jest-matcher-utils": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-25.4.0.tgz", - "integrity": "sha512-yPMdtj7YDgXhnGbc66bowk8AkQ0YwClbbwk3Kzhn5GVDrciiCr27U4NJRbrqXbTdtxjImONITg2LiRIw650k5A==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-25.5.0.tgz", + "integrity": "sha512-VWI269+9JS5cpndnpCwm7dy7JtGQT30UHfrnM3mXl22gHGt/b7NkjBqXfbhZ8V4B7ANUsjK18PlSBmG0YH7gjw==", "dev": true, "requires": { "chalk": "^3.0.0", - "jest-diff": "^25.4.0", + "jest-diff": "^25.5.0", "jest-get-type": "^25.2.6", - "pretty-format": "^25.4.0" + "pretty-format": "^25.5.0" } }, "make-dir": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.0.2.tgz", - "integrity": "sha512-rYKABKutXa6vXTXhoV18cBE7PaewPXHe/Bdq4v+ZLMhxbWApkFFplT0LcbMW+6BbjnQXzZ/sAvSE/JdguApG5w==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", + "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", "dev": true, "requires": { "semver": "^6.0.0" } }, "pretty-format": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.4.0.tgz", - "integrity": "sha512-PI/2dpGjXK5HyXexLPZU/jw5T9Q6S1YVXxxVxco+LIqzUFHXIbKZKdUVt7GcX7QUCr31+3fzhi4gN4/wUYPVxQ==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.5.0.tgz", + "integrity": "sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ==", "dev": true, "requires": { - "@jest/types": "^25.4.0", + "@jest/types": "^25.5.0", "ansi-regex": "^5.0.0", "ansi-styles": "^4.0.0", "react-is": "^16.12.0" @@ -14601,21 +14694,22 @@ } }, "jest-util": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-25.4.0.tgz", - "integrity": "sha512-WSZD59sBtAUjLv1hMeKbNZXmMcrLRWcYqpO8Dz8b4CeCTZpfNQw2q9uwrYAD+BbJoLJlu4ezVPwtAmM/9/SlZA==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-25.5.0.tgz", + "integrity": "sha512-KVlX+WWg1zUTB9ktvhsg2PXZVdkI1NBevOJSkTKYAyXyH4QSvh+Lay/e/v+bmaFfrkfx43xD8QTfgobzlEXdIA==", "dev": true, "requires": { - "@jest/types": "^25.4.0", + "@jest/types": "^25.5.0", "chalk": "^3.0.0", + "graceful-fs": "^4.2.4", "is-ci": "^2.0.0", "make-dir": "^3.0.0" }, "dependencies": { "@jest/types": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.4.0.tgz", - "integrity": "sha512-XBeaWNzw2PPnGW5aXvZt3+VO60M+34RY3XDsCK5tW7kyj3RK0XClRutCfjqcBuaR2aBQTbluEDME9b5MB9UAPw==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz", + "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -14659,6 +14753,12 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, + "graceful-fs": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==", + "dev": true + }, "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", @@ -14666,9 +14766,9 @@ "dev": true }, "make-dir": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.0.2.tgz", - "integrity": "sha512-rYKABKutXa6vXTXhoV18cBE7PaewPXHe/Bdq4v+ZLMhxbWApkFFplT0LcbMW+6BbjnQXzZ/sAvSE/JdguApG5w==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", + "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", "dev": true, "requires": { "semver": "^6.0.0" @@ -14923,9 +15023,9 @@ } }, "jest-worker": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-25.4.0.tgz", - "integrity": "sha512-ghAs/1FtfYpMmYQ0AHqxV62XPvKdUDIBBApMZfly+E9JEmYh2K45G0R5dWxx986RN12pRCxsViwQVtGl+N4whw==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-25.5.0.tgz", + "integrity": "sha512-/dsSmUkIy5EBGfv/IjjqmFxrNAUpBERfGs1oHROyD7yxjG/w+t0GOJDX8O1k32ySmd7+a5IhnJU2qQFcJ4n1vw==", "dev": true, "requires": { "merge-stream": "^2.0.0", diff --git a/package.json b/package.json index d1ddcf91e5c..639c496f852 100644 --- a/package.json +++ b/package.json @@ -105,7 +105,7 @@ "hapi": "17.8.5", "ioredis": "4.16.3", "jest": "25.5.4", - "jest-config": "25.4.0", + "jest-config": "25.5.4", "jest-junit": "10.0.0", "jest-matcher-utils": "25.4.0", "js-sha256": "0.9.0", From 4e5c0f692564781ff3f1fc6f722a87210f63dcf6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 2 May 2020 17:13:26 +0000 Subject: [PATCH 496/642] chore(deps): update dependency jest-matcher-utils to v25.5.0 (#4060) Co-authored-by: Renovate Bot --- package-lock.json | 46 +++++++++++++++++++++++----------------------- package.json | 2 +- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/package-lock.json b/package-lock.json index b270f6cd6f1..d4232eb6998 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12609,21 +12609,21 @@ } }, "jest-diff": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-25.4.0.tgz", - "integrity": "sha512-kklLbJVXW0y8UKOWOdYhI6TH5MG6QAxrWiBMgQaPIuhj3dNFGirKCd+/xfplBXICQ7fI+3QcqHm9p9lWu1N6ug==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-25.5.0.tgz", + "integrity": "sha512-z1kygetuPiREYdNIumRpAHY6RXiGmp70YHptjdaxTWGmA085W3iCnXNx0DhflK3vwrKmrRWyY1wUpkPMVxMK7A==", "dev": true, "requires": { "chalk": "^3.0.0", "diff-sequences": "^25.2.6", "jest-get-type": "^25.2.6", - "pretty-format": "^25.4.0" + "pretty-format": "^25.5.0" }, "dependencies": { "@jest/types": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.4.0.tgz", - "integrity": "sha512-XBeaWNzw2PPnGW5aXvZt3+VO60M+34RY3XDsCK5tW7kyj3RK0XClRutCfjqcBuaR2aBQTbluEDME9b5MB9UAPw==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz", + "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -12686,12 +12686,12 @@ "dev": true }, "pretty-format": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.4.0.tgz", - "integrity": "sha512-PI/2dpGjXK5HyXexLPZU/jw5T9Q6S1YVXxxVxco+LIqzUFHXIbKZKdUVt7GcX7QUCr31+3fzhi4gN4/wUYPVxQ==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.5.0.tgz", + "integrity": "sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ==", "dev": true, "requires": { - "@jest/types": "^25.4.0", + "@jest/types": "^25.5.0", "ansi-regex": "^5.0.0", "ansi-styles": "^4.0.0", "react-is": "^16.12.0" @@ -13435,21 +13435,21 @@ } }, "jest-matcher-utils": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-25.4.0.tgz", - "integrity": "sha512-yPMdtj7YDgXhnGbc66bowk8AkQ0YwClbbwk3Kzhn5GVDrciiCr27U4NJRbrqXbTdtxjImONITg2LiRIw650k5A==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-25.5.0.tgz", + "integrity": "sha512-VWI269+9JS5cpndnpCwm7dy7JtGQT30UHfrnM3mXl22gHGt/b7NkjBqXfbhZ8V4B7ANUsjK18PlSBmG0YH7gjw==", "dev": true, "requires": { "chalk": "^3.0.0", - "jest-diff": "^25.4.0", + "jest-diff": "^25.5.0", "jest-get-type": "^25.2.6", - "pretty-format": "^25.4.0" + "pretty-format": "^25.5.0" }, "dependencies": { "@jest/types": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.4.0.tgz", - "integrity": "sha512-XBeaWNzw2PPnGW5aXvZt3+VO60M+34RY3XDsCK5tW7kyj3RK0XClRutCfjqcBuaR2aBQTbluEDME9b5MB9UAPw==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz", + "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -13512,12 +13512,12 @@ "dev": true }, "pretty-format": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.4.0.tgz", - "integrity": "sha512-PI/2dpGjXK5HyXexLPZU/jw5T9Q6S1YVXxxVxco+LIqzUFHXIbKZKdUVt7GcX7QUCr31+3fzhi4gN4/wUYPVxQ==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.5.0.tgz", + "integrity": "sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ==", "dev": true, "requires": { - "@jest/types": "^25.4.0", + "@jest/types": "^25.5.0", "ansi-regex": "^5.0.0", "ansi-styles": "^4.0.0", "react-is": "^16.12.0" diff --git a/package.json b/package.json index 639c496f852..8c8c3d9514b 100644 --- a/package.json +++ b/package.json @@ -107,7 +107,7 @@ "jest": "25.5.4", "jest-config": "25.5.4", "jest-junit": "10.0.0", - "jest-matcher-utils": "25.4.0", + "jest-matcher-utils": "25.5.0", "js-sha256": "0.9.0", "koa": "2.11.0", "lerna": "3.20.2", From c6f4bc19442897c4500d2aad6ba9d948b114e6a3 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 4 May 2020 16:56:02 +0300 Subject: [PATCH 497/642] Change deprecation messaging to be consistently prefixed. Also some word-smithing to align these similar concepts. Follows-up: https://github.com/apollographql/apollo-server/pull/3923 Follows-up: https://github.com/apollographql/apollo-server/pull/3924 --- packages/apollo-engine-reporting/src/agent.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/apollo-engine-reporting/src/agent.ts b/packages/apollo-engine-reporting/src/agent.ts index 5173b19e898..9e360846e8b 100644 --- a/packages/apollo-engine-reporting/src/agent.ts +++ b/packages/apollo-engine-reporting/src/agent.ts @@ -61,10 +61,10 @@ export function getEngineApiKey( const apiKeyFromEnv = process.env.APOLLO_KEY; if(legacyApiKeyFromEnv && apiKeyFromEnv && !skipWarn) { - logger.warn(`Both ENGINE_API_KEY (deprecated) and APOLLO_KEY are set; defaulting to APOLLO_KEY.`); + logger.warn("Using `APOLLO_KEY` since `ENGINE_API_KEY` (deprecated) is also set in the environment."); } if(legacyApiKeyFromEnv && !warnedOnDeprecatedApiKey && !skipWarn) { - logger.warn(`[deprecated] Setting the key via ENGINE_API_KEY is deprecated and will not be supported in future versions.`); + logger.warn("[deprecated] The `ENGINE_API_KEY` environment variable has been renamed to `APOLLO_KEY`."); warnedOnDeprecatedApiKey = true; } return apiKeyFromEnv || legacyApiKeyFromEnv || '' @@ -79,15 +79,15 @@ export function getEngineGraphVariant(engine: EngineReportingOptions | bool throw new Error('Cannot set both engine.graphVariant and engine.schemaTag. Please use engine.graphVariant.'); } if (engine.schemaTag) { - logger.warn('[Deprecation warning] Usage of engine.schemaTag is deprecated. Please use engine.graphVariant instead.'); + logger.warn('[deprecated] The `schemaTag` property within `engine` configuration has been renamed to `graphVariant`.'); } return engine.graphVariant || engine.schemaTag; } else { if (process.env.ENGINE_SCHEMA_TAG) { - logger.warn('[Deprecation warning] Usage of ENGINE_SCHEMA_TAG is deprecated. Please use APOLLO_GRAPH_VARIANT instead.'); + logger.warn('[deprecated] The `ENGINE_SCHEMA_TAG` environment variable has been renamed to `APOLLO_GRAPH_VARIANT`.'); } if (process.env.ENGINE_SCHEMA_TAG && process.env.APOLLO_GRAPH_VARIANT) { - throw new Error('Cannot set both ENGINE_SCHEMA_TAG and APOLLO_GRAPH_VARIANT. Please use APOLLO_GRAPH_VARIANT.') + throw new Error('`APOLLO_GRAPH_VARIANT` and `ENGINE_SCHEMA_TAG` (deprecated) environment variables must not both be set.') } return process.env.APOLLO_GRAPH_VARIANT || process.env.ENGINE_SCHEMA_TAG; } From 381cb44b78a438ffd84ab2e23a7b49b174a1b8a9 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 4 May 2020 17:21:33 +0300 Subject: [PATCH 498/642] Update CHANGELOG.md files prior to releasing. --- CHANGELOG.md | 4 ++++ packages/apollo-federation/CHANGELOG.md | 19 ++++++------------- packages/apollo-gateway/CHANGELOG.md | 25 +++++++++---------------- 3 files changed, 19 insertions(+), 29 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 41b7a73cf72..7d9c27a6bbd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,10 @@ The version headers in this history reflect the versions of Apollo Server itself > 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. When a release is being prepared, a new header will be (manually) created below and the the appropriate changes within that release will be moved into the new section. +### v2.13.0 + +> [See complete versioning details.](https://github.com/apollographql/apollo-server/commit/TODO) + - Allow passing a `WebSocket.Server` to `ApolloServer.installSubscriptionHandlers`. [PR #2314](https://github.com/apollographql/apollo-server/pull/2314) - `apollo-server-lambda`: Support file uploads on AWS Lambda [Issue #1419](https://github.com/apollographql/apollo-server/issues/1419) [Issue #1703](https://github.com/apollographql/apollo-server/issues/1703) [PR #3926](https://github.com/apollographql/apollo-server/pull/3926) - `apollo-engine-reporting`: Fix inadvertant conditional formatting which prevented automated persisted query (APQ) hits and misses from being reported to Apollo Graph Manager. [PR #3986](https://github.com/apollographql/apollo-server/pull/3986) diff --git a/packages/apollo-federation/CHANGELOG.md b/packages/apollo-federation/CHANGELOG.md index f7f76c674df..eb40d834c8b 100644 --- a/packages/apollo-federation/CHANGELOG.md +++ b/packages/apollo-federation/CHANGELOG.md @@ -1,16 +1,3 @@ -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - -# [0.15.0-alpha.0](/compare/@apollo/federation@0.14.0...@apollo/federation@0.15.0-alpha.0) (2020-04-10) - -**Note:** Version bump only for package @apollo/federation - - - - - # CHANGELOG for `@apollo/federation` ### vNEXT @@ -19,6 +6,12 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline - _Nothing yet! Stay tuned._ +## 0.15.0 + +> [See complete versioning details.](https://github.com/apollographql/apollo-server/commit/TODO) + +- Only changes in the similarly versioned `@apollo/gateway` package. + ## 0.14.1 > [See complete versioning details.](https://github.com/apollographql/apollo-server/commit/b898396e9fcd3b9092b168f9aac8466ca186fa6b) diff --git a/packages/apollo-gateway/CHANGELOG.md b/packages/apollo-gateway/CHANGELOG.md index fb4679f9378..d7bcb65fbed 100644 --- a/packages/apollo-gateway/CHANGELOG.md +++ b/packages/apollo-gateway/CHANGELOG.md @@ -1,26 +1,19 @@ -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - -# [0.15.0-alpha.0](/compare/@apollo/gateway@0.14.0...@apollo/gateway@0.15.0-alpha.0) (2020-04-10) - -**Note:** Version bump only for package @apollo/gateway - - +# CHANGELOG for `@apollo/gateway` +## vNEXT +> 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. When a release is being prepared, a new header will be (manually) created below and the the appropriate changes within that release will be moved into the new section. -# CHANGELOG for `@apollo/gateway` +- _Nothing yet! Stay tuned!_ -### vNEXT +## 0.15.0 -> 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. When a release is being prepared, a new header will be (manually) created below and the the appropriate changes within that release will be moved into the new section. +> [See complete versioning details.](https://github.com/apollographql/apollo-server/commit/TODO) - __BREAKING__: Drop support for Node.js 8 and Node.js 10. This is being done primarily for performance gains which stand to be seen by transpiling to a newer ECMAScript target. For more details, see the related PR. [#4031](https://github.com/apollographql/apollo-server/pull/4031) -- Deprecated the `ENGINE_API_KEY` environment variable in favor of its new name, `APOLLO_KEY`. Continued use of `ENGINE_API_KEY` will result in deprecation warnings being printed to the server console. Support for `ENGINE_API_KEY` will be removed in a future, major update. [#3923](https://github.com/apollographql/apollo-server/pull/3923) -- Deprecated the `APOLLO_SCHEMA_TAG` environment variable in favor of its new name, `APOLLO_GRAPH_VARIANT`. The functionality remains otherwise identical, but the new name mirrors the name used within Apollo Graph Manager. Use of the now-deprecated name will result in a deprecation warning being printed to the server console. Support will be removed entirely in a future, major update. To avoid misconfiguration, runtime errors will be thrown if the new and deprecated name are _both_ set. [#3855](https://github.com/apollographql/apollo-server/pull/3855) -- Cache stringified representations of downstream query bodies within the query plan to address performance implications incurred by repeatedly `print`ing the same`DocumentNode`s with the `graphql` printer. This improvement is more pronounced on larger documents. [PR #4018](https://github.com/apollographql/apollo-server/pull/4018) +- __Performance:__ Cache stringified representations of downstream query bodies within the query plan to address performance cost incurred by repeatedly `print`ing the same`DocumentNode`s with the `graphql` printer. This improvement is more pronounced on larger documents. [PR #4018](https://github.com/apollographql/apollo-server/pull/4018) +- __Deprecation:__ Deprecated the `ENGINE_API_KEY` environment variable in favor of its new name, `APOLLO_KEY`. The new name mirrors the name used within Apollo Graph Manager. Aside from the rename, the functionality remains otherwise identical. Continued use of `ENGINE_API_KEY` will result in deprecation warnings being printed to the server console. Support for `ENGINE_API_KEY` will be removed in a future, major update. [#3923](https://github.com/apollographql/apollo-server/pull/3923) +- __Deprecation:__ Deprecated the `APOLLO_SCHEMA_TAG` environment variable in favor of its new name, `APOLLO_GRAPH_VARIANT`. The new name mirrors the name used within Apollo Graph Manager. Aside from the rename, the functionality remains otherwise identical. Use of the now-deprecated name will result in a deprecation warning being printed to the server console. Support will be removed entirely in a future, major update. To avoid misconfiguration, runtime errors will be thrown if the new and deprecated versions are _both_ set. [#3855](https://github.com/apollographql/apollo-server/pull/3855) - Add inadvertently excluded `apollo-server-errors` runtime dependency. [#3927](https://github.com/apollographql/apollo-server/pull/3927) ## 0.14.1 From e37384a49b2bf474eed0de3e9f4a1bebaeee64c7 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 4 May 2020 17:22:07 +0300 Subject: [PATCH 499/642] Release - apollo-cache-control@0.10.0 - apollo-datasource-rest@0.9.0 - apollo-engine-reporting-protobuf@0.5.0 - apollo-engine-reporting@1.8.0 - @apollo/federation@0.15.0 - @apollo/gateway@0.15.0 - apollo-server-azure-functions@2.13.0 - apollo-server-cache-redis@1.2.0 - apollo-server-cloud-functions@2.13.0 - apollo-server-cloudflare@2.13.0 - apollo-server-core@2.13.0 - apollo-server-express@2.13.0 - apollo-server-fastify@2.13.0 - apollo-server-hapi@2.13.0 - apollo-server-integration-testsuite@2.13.0 - apollo-server-koa@2.13.0 - apollo-server-lambda@2.13.0 - apollo-server-micro@2.13.0 - apollo-server-plugin-base@0.8.0 - apollo-server-plugin-response-cache@0.5.0 - apollo-server-testing@2.13.0 - apollo-server-types@0.4.0 - apollo-server@2.13.0 - apollo-tracing@0.10.0 - graphql-extensions@0.12.0 --- packages/apollo-cache-control/package.json | 2 +- packages/apollo-datasource-rest/package.json | 2 +- packages/apollo-engine-reporting-protobuf/package-lock.json | 2 +- packages/apollo-engine-reporting-protobuf/package.json | 2 +- packages/apollo-engine-reporting/package.json | 2 +- packages/apollo-federation/package.json | 2 +- packages/apollo-gateway/package.json | 2 +- packages/apollo-server-azure-functions/package.json | 2 +- packages/apollo-server-cache-redis/package.json | 2 +- packages/apollo-server-cloud-functions/package.json | 2 +- packages/apollo-server-cloudflare/package.json | 2 +- packages/apollo-server-core/package.json | 2 +- packages/apollo-server-express/package.json | 2 +- packages/apollo-server-fastify/package.json | 2 +- packages/apollo-server-hapi/package.json | 2 +- packages/apollo-server-integration-testsuite/package.json | 2 +- packages/apollo-server-koa/package.json | 2 +- packages/apollo-server-lambda/package.json | 2 +- packages/apollo-server-micro/package.json | 2 +- packages/apollo-server-plugin-base/package.json | 2 +- packages/apollo-server-plugin-response-cache/package.json | 2 +- packages/apollo-server-testing/package.json | 2 +- packages/apollo-server-types/package.json | 2 +- packages/apollo-server/package.json | 2 +- packages/apollo-tracing/package.json | 2 +- packages/graphql-extensions/package.json | 2 +- 26 files changed, 26 insertions(+), 26 deletions(-) diff --git a/packages/apollo-cache-control/package.json b/packages/apollo-cache-control/package.json index 8b6b7b444b0..457f22c21d9 100644 --- a/packages/apollo-cache-control/package.json +++ b/packages/apollo-cache-control/package.json @@ -1,6 +1,6 @@ { "name": "apollo-cache-control", - "version": "0.10.0-alpha.1", + "version": "0.10.0", "description": "A GraphQL extension for cache control", "main": "./dist/index.js", "types": "./dist/index.d.ts", diff --git a/packages/apollo-datasource-rest/package.json b/packages/apollo-datasource-rest/package.json index 1a304e20930..f41d3583ebd 100644 --- a/packages/apollo-datasource-rest/package.json +++ b/packages/apollo-datasource-rest/package.json @@ -1,6 +1,6 @@ { "name": "apollo-datasource-rest", - "version": "0.9.0-alpha.1", + "version": "0.9.0", "author": "opensource@apollographql.com", "license": "MIT", "repository": { diff --git a/packages/apollo-engine-reporting-protobuf/package-lock.json b/packages/apollo-engine-reporting-protobuf/package-lock.json index fbc3e9535a2..a697a29cd66 100644 --- a/packages/apollo-engine-reporting-protobuf/package-lock.json +++ b/packages/apollo-engine-reporting-protobuf/package-lock.json @@ -1,6 +1,6 @@ { "name": "apollo-engine-reporting-protobuf", - "version": "0.5.0-alpha.1", + "version": "0.5.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/packages/apollo-engine-reporting-protobuf/package.json b/packages/apollo-engine-reporting-protobuf/package.json index 21d224ef598..7fff03be515 100644 --- a/packages/apollo-engine-reporting-protobuf/package.json +++ b/packages/apollo-engine-reporting-protobuf/package.json @@ -1,6 +1,6 @@ { "name": "apollo-engine-reporting-protobuf", - "version": "0.5.0-alpha.1", + "version": "0.5.0", "description": "Protobuf format for Apollo Engine", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-engine-reporting/package.json b/packages/apollo-engine-reporting/package.json index 89543e29668..f4be8e46688 100644 --- a/packages/apollo-engine-reporting/package.json +++ b/packages/apollo-engine-reporting/package.json @@ -1,6 +1,6 @@ { "name": "apollo-engine-reporting", - "version": "1.8.0-alpha.1", + "version": "1.8.0", "description": "Send reports about your GraphQL services to Apollo Graph Manager (previously known as Apollo Engine)", "main": "./dist/index.js", "types": "./dist/index.d.ts", diff --git a/packages/apollo-federation/package.json b/packages/apollo-federation/package.json index 2a8976b6e11..3742406bf85 100644 --- a/packages/apollo-federation/package.json +++ b/packages/apollo-federation/package.json @@ -1,6 +1,6 @@ { "name": "@apollo/federation", - "version": "0.15.0-alpha.1", + "version": "0.15.0", "description": "Apollo Federation Utilities", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-gateway/package.json b/packages/apollo-gateway/package.json index 5fac4b1c593..8d3bd77aaec 100644 --- a/packages/apollo-gateway/package.json +++ b/packages/apollo-gateway/package.json @@ -1,6 +1,6 @@ { "name": "@apollo/gateway", - "version": "0.15.0-alpha.1", + "version": "0.15.0", "description": "Apollo Gateway", "author": "opensource@apollographql.com", "main": "dist/index.js", diff --git a/packages/apollo-server-azure-functions/package.json b/packages/apollo-server-azure-functions/package.json index a5cc5e11401..ed39eeaacce 100644 --- a/packages/apollo-server-azure-functions/package.json +++ b/packages/apollo-server-azure-functions/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-azure-functions", - "version": "2.13.0-alpha.1", + "version": "2.13.0", "description": "Production-ready Node.js GraphQL server for Azure Functions", "keywords": [ "GraphQL", diff --git a/packages/apollo-server-cache-redis/package.json b/packages/apollo-server-cache-redis/package.json index 6690dfc75f4..d92f90f6445 100644 --- a/packages/apollo-server-cache-redis/package.json +++ b/packages/apollo-server-cache-redis/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-cache-redis", - "version": "1.2.0-alpha.0", + "version": "1.2.0", "author": "opensource@apollographql.com", "license": "MIT", "repository": { diff --git a/packages/apollo-server-cloud-functions/package.json b/packages/apollo-server-cloud-functions/package.json index 105ec5d8913..9f45fe2e544 100644 --- a/packages/apollo-server-cloud-functions/package.json +++ b/packages/apollo-server-cloud-functions/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-cloud-functions", - "version": "2.13.0-alpha.1", + "version": "2.13.0", "description": "Production-ready Node.js GraphQL server for Google Cloud Functions", "keywords": [ "GraphQL", diff --git a/packages/apollo-server-cloudflare/package.json b/packages/apollo-server-cloudflare/package.json index d8cd2ebac98..d95224fb92d 100644 --- a/packages/apollo-server-cloudflare/package.json +++ b/packages/apollo-server-cloudflare/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-cloudflare", - "version": "2.13.0-alpha.1", + "version": "2.13.0", "description": "Production-ready Node.js GraphQL server for Cloudflare workers", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-core/package.json b/packages/apollo-server-core/package.json index 6452e8cf97c..44dbb40b566 100644 --- a/packages/apollo-server-core/package.json +++ b/packages/apollo-server-core/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-core", - "version": "2.13.0-alpha.1", + "version": "2.13.0", "description": "Core engine for Apollo GraphQL server", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-express/package.json b/packages/apollo-server-express/package.json index d05270a6f36..8bfd3b5bee3 100644 --- a/packages/apollo-server-express/package.json +++ b/packages/apollo-server-express/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-express", - "version": "2.13.0-alpha.1", + "version": "2.13.0", "description": "Production-ready Node.js GraphQL server for Express and Connect", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-fastify/package.json b/packages/apollo-server-fastify/package.json index 728fa980da3..b5348e3c294 100644 --- a/packages/apollo-server-fastify/package.json +++ b/packages/apollo-server-fastify/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-fastify", - "version": "2.13.0-alpha.1", + "version": "2.13.0", "description": "Production-ready Node.js GraphQL server for Fastify", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-hapi/package.json b/packages/apollo-server-hapi/package.json index b147765fc98..ec1f78e28d1 100644 --- a/packages/apollo-server-hapi/package.json +++ b/packages/apollo-server-hapi/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-hapi", - "version": "2.13.0-alpha.1", + "version": "2.13.0", "description": "Production-ready Node.js GraphQL server for Hapi", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-integration-testsuite/package.json b/packages/apollo-server-integration-testsuite/package.json index 12987b6ee66..8c611c7f653 100644 --- a/packages/apollo-server-integration-testsuite/package.json +++ b/packages/apollo-server-integration-testsuite/package.json @@ -1,7 +1,7 @@ { "name": "apollo-server-integration-testsuite", "private": true, - "version": "2.13.0-alpha.1", + "version": "2.13.0", "description": "Apollo Server Integrations testsuite", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-koa/package.json b/packages/apollo-server-koa/package.json index 479541cdf92..7fd3a2c23a4 100644 --- a/packages/apollo-server-koa/package.json +++ b/packages/apollo-server-koa/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-koa", - "version": "2.13.0-alpha.1", + "version": "2.13.0", "description": "Production-ready Node.js GraphQL server for Koa", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-lambda/package.json b/packages/apollo-server-lambda/package.json index 8e4c51d0095..7cc35d5aeae 100644 --- a/packages/apollo-server-lambda/package.json +++ b/packages/apollo-server-lambda/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-lambda", - "version": "2.13.0-alpha.1", + "version": "2.13.0", "description": "Production-ready Node.js GraphQL server for AWS Lambda", "keywords": [ "GraphQL", diff --git a/packages/apollo-server-micro/package.json b/packages/apollo-server-micro/package.json index f708dd7f602..26aa1160bdd 100644 --- a/packages/apollo-server-micro/package.json +++ b/packages/apollo-server-micro/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-micro", - "version": "2.13.0-alpha.1", + "version": "2.13.0", "description": "Production-ready Node.js GraphQL server for Micro", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-plugin-base/package.json b/packages/apollo-server-plugin-base/package.json index f4cf9e7c178..2c30efced82 100644 --- a/packages/apollo-server-plugin-base/package.json +++ b/packages/apollo-server-plugin-base/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-plugin-base", - "version": "0.8.0-alpha.1", + "version": "0.8.0", "description": "Apollo Server plugin base classes", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-plugin-response-cache/package.json b/packages/apollo-server-plugin-response-cache/package.json index 7359779f548..77a9164f700 100644 --- a/packages/apollo-server-plugin-response-cache/package.json +++ b/packages/apollo-server-plugin-response-cache/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-plugin-response-cache", - "version": "0.5.0-alpha.1", + "version": "0.5.0", "description": "Apollo Server full query response cache", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-testing/package.json b/packages/apollo-server-testing/package.json index e94f64cb4c8..75208be5637 100644 --- a/packages/apollo-server-testing/package.json +++ b/packages/apollo-server-testing/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-testing", - "version": "2.13.0-alpha.1", + "version": "2.13.0", "description": "Test utils for apollo-server", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-types/package.json b/packages/apollo-server-types/package.json index 05e60912a6e..c82a072d584 100644 --- a/packages/apollo-server-types/package.json +++ b/packages/apollo-server-types/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-types", - "version": "0.4.0-alpha.1", + "version": "0.4.0", "description": "Apollo Server shared types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server/package.json b/packages/apollo-server/package.json index f117aac3c58..a6483da8f8a 100644 --- a/packages/apollo-server/package.json +++ b/packages/apollo-server/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server", - "version": "2.13.0-alpha.1", + "version": "2.13.0", "description": "Production ready GraphQL Server", "author": "opensource@apollographql.com", "main": "dist/index.js", diff --git a/packages/apollo-tracing/package.json b/packages/apollo-tracing/package.json index e658f153fa8..d960369db66 100644 --- a/packages/apollo-tracing/package.json +++ b/packages/apollo-tracing/package.json @@ -1,6 +1,6 @@ { "name": "apollo-tracing", - "version": "0.10.0-alpha.1", + "version": "0.10.0", "description": "Collect and expose trace data for GraphQL requests", "main": "./dist/index.js", "types": "./dist/index.d.ts", diff --git a/packages/graphql-extensions/package.json b/packages/graphql-extensions/package.json index 269094c00f2..5ff10ba85bc 100644 --- a/packages/graphql-extensions/package.json +++ b/packages/graphql-extensions/package.json @@ -1,6 +1,6 @@ { "name": "graphql-extensions", - "version": "0.12.0-alpha.1", + "version": "0.12.0", "description": "Add extensions to GraphQL servers", "main": "./dist/index.js", "types": "./dist/index.d.ts", From cda0fab180d3d689dca3367aa85f649dc35087ab Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 4 May 2020 17:23:28 +0300 Subject: [PATCH 500/642] Update CHANGELOG.md after release with complete versioning details. --- CHANGELOG.md | 4 +++- packages/apollo-federation/CHANGELOG.md | 2 +- packages/apollo-gateway/CHANGELOG.md | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7d9c27a6bbd..42380cde6d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,9 +9,11 @@ The version headers in this history reflect the versions of Apollo Server itself > 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. When a release is being prepared, a new header will be (manually) created below and the the appropriate changes within that release will be moved into the new section. +- _Nothing yet! Stay tuned!_ + ### v2.13.0 -> [See complete versioning details.](https://github.com/apollographql/apollo-server/commit/TODO) +> [See complete versioning details.](https://github.com/apollographql/apollo-server/commit/e37384a49b2bf474eed0de3e9f4a1bebaeee64c7) - Allow passing a `WebSocket.Server` to `ApolloServer.installSubscriptionHandlers`. [PR #2314](https://github.com/apollographql/apollo-server/pull/2314) - `apollo-server-lambda`: Support file uploads on AWS Lambda [Issue #1419](https://github.com/apollographql/apollo-server/issues/1419) [Issue #1703](https://github.com/apollographql/apollo-server/issues/1703) [PR #3926](https://github.com/apollographql/apollo-server/pull/3926) diff --git a/packages/apollo-federation/CHANGELOG.md b/packages/apollo-federation/CHANGELOG.md index eb40d834c8b..79354ae0985 100644 --- a/packages/apollo-federation/CHANGELOG.md +++ b/packages/apollo-federation/CHANGELOG.md @@ -8,7 +8,7 @@ ## 0.15.0 -> [See complete versioning details.](https://github.com/apollographql/apollo-server/commit/TODO) +> [See complete versioning details.](https://github.com/apollographql/apollo-server/commit/e37384a49b2bf474eed0de3e9f4a1bebaeee64c7) - Only changes in the similarly versioned `@apollo/gateway` package. diff --git a/packages/apollo-gateway/CHANGELOG.md b/packages/apollo-gateway/CHANGELOG.md index d7bcb65fbed..7aa9d3b756d 100644 --- a/packages/apollo-gateway/CHANGELOG.md +++ b/packages/apollo-gateway/CHANGELOG.md @@ -8,7 +8,7 @@ ## 0.15.0 -> [See complete versioning details.](https://github.com/apollographql/apollo-server/commit/TODO) +> [See complete versioning details.](https://github.com/apollographql/apollo-server/commit/e37384a49b2bf474eed0de3e9f4a1bebaeee64c7) - __BREAKING__: Drop support for Node.js 8 and Node.js 10. This is being done primarily for performance gains which stand to be seen by transpiling to a newer ECMAScript target. For more details, see the related PR. [#4031](https://github.com/apollographql/apollo-server/pull/4031) - __Performance:__ Cache stringified representations of downstream query bodies within the query plan to address performance cost incurred by repeatedly `print`ing the same`DocumentNode`s with the `graphql` printer. This improvement is more pronounced on larger documents. [PR #4018](https://github.com/apollographql/apollo-server/pull/4018) From 079e1c5bb25651b1edc2897535227457aac00dcc Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 4 May 2020 20:13:39 +0000 Subject: [PATCH 501/642] chore(deps): update dependency apollo-server-plugin-base to ^0.8.0 (#303) Co-authored-by: Renovate Bot --- packages/apollo-server-plugin-operation-registry/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/package.json b/packages/apollo-server-plugin-operation-registry/package.json index 45ab0c3a208..28b1c30985b 100644 --- a/packages/apollo-server-plugin-operation-registry/package.json +++ b/packages/apollo-server-plugin-operation-registry/package.json @@ -14,7 +14,7 @@ "apollo-graphql": "0.4.3", "apollo-server-caching": "^0.5.0", "apollo-server-errors": "^2.2.0", - "apollo-server-plugin-base": "^0.7.0", + "apollo-server-plugin-base": "^0.8.0", "fast-json-stable-stringify": "^2.0.0", "loglevel": "^1.6.1", "loglevel-debug": "^0.0.1", From fffb07e0e848c2c99d55f33aa6b4ac166b439e2a Mon Sep 17 00:00:00 2001 From: Blake Jackson Date: Mon, 4 May 2020 17:53:25 -0500 Subject: [PATCH 502/642] All tests passing. --- packages/apollo-gateway/src/FieldSet.ts | 8 ++++++-- .../src/__tests__/integration/complex-key.test.ts | 1 - .../src/__tests__/integration/value-types.test.ts | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/packages/apollo-gateway/src/FieldSet.ts b/packages/apollo-gateway/src/FieldSet.ts index 4c2089bb2dc..db76e450d66 100644 --- a/packages/apollo-gateway/src/FieldSet.ts +++ b/packages/apollo-gateway/src/FieldSet.ts @@ -161,7 +161,11 @@ function mergeFieldNodeSelectionSets( ) .value(); - const mergedFieldNodes = _(fieldNodes) + const [aliasedFieldNodes, nonAliasedFieldNodes] = _(fieldNodes) + .partition((node) => node.alias) + .value(); + + const mergedFieldNodes = _(nonAliasedFieldNodes) .groupBy((node) => node.name.value) .values() .map((nodesWithSameName) => { @@ -177,5 +181,5 @@ function mergeFieldNodeSelectionSets( }) .value(); - return [...mergedFieldNodes, ...fragmentNodes]; + return [...mergedFieldNodes, ...aliasedFieldNodes, ...fragmentNodes]; } diff --git a/packages/apollo-gateway/src/__tests__/integration/complex-key.test.ts b/packages/apollo-gateway/src/__tests__/integration/complex-key.test.ts index 22244ce61b5..a903759afeb 100644 --- a/packages/apollo-gateway/src/__tests__/integration/complex-key.test.ts +++ b/packages/apollo-gateway/src/__tests__/integration/complex-key.test.ts @@ -168,7 +168,6 @@ it('works fetches data correctly with complex / nested @key fields', async () => organization { id __typename - id } } } diff --git a/packages/apollo-gateway/src/__tests__/integration/value-types.test.ts b/packages/apollo-gateway/src/__tests__/integration/value-types.test.ts index 0675d6f2466..725dad6e343 100644 --- a/packages/apollo-gateway/src/__tests__/integration/value-types.test.ts +++ b/packages/apollo-gateway/src/__tests__/integration/value-types.test.ts @@ -71,7 +71,6 @@ describe('value types', () => { } ... on Furniture { upc - __typename metadata { __typename ... on KeyValue { @@ -83,6 +82,7 @@ describe('value types', () => { message } } + __typename } } } From ceb3c5615ae8030b211586d6270c3cab0d733c15 Mon Sep 17 00:00:00 2001 From: Blake Jackson Date: Mon, 4 May 2020 18:02:02 -0500 Subject: [PATCH 503/642] Added fragment regression test to catch errors that may occur with future changes. --- .../__tests__/integration/requires.test.ts | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/packages/apollo-gateway/src/__tests__/integration/requires.test.ts b/packages/apollo-gateway/src/__tests__/integration/requires.test.ts index 9aa4c6fe8e2..8554287cb43 100644 --- a/packages/apollo-gateway/src/__tests__/integration/requires.test.ts +++ b/packages/apollo-gateway/src/__tests__/integration/requires.test.ts @@ -373,3 +373,40 @@ it('supports multiple arbitrarily nested fields defined by a requires', async () } `); }); + +it('supports deeply nested fields defined by requires with fragments in user-defined queries', async () => { + const query = gql` + query Me { + me { + calculated3 + ...testFragment + } + } + + fragment testFragment on A { + nested2 { + nested3 { + nameA + } + } + } + `; + + const { data } = await execute([serviceA, serviceB], { + query, + }); + + expect(data).toEqual({ + me: { + calculated3: + 'nested1.nested2.nested3.nameB nested2.nameC nested2.nested3.nameC', + nested2: { + nested3: [ + { + nameA: 'nested2.nested3.nameA', + }, + ], + }, + }, + }); +}); From 181ab89e079d3164ed5cec85efc28865c3979207 Mon Sep 17 00:00:00 2001 From: Blake Jackson Date: Mon, 4 May 2020 18:12:02 -0500 Subject: [PATCH 504/642] Revert "REVERT ME: Changed jest to only test gateway requires. Added vscode debugger config."" This reverts commit a65536d6c2b83357ab46046516a7114bd658defb. --- .vscode/launch.json | 35 ----------------------------------- jest.config.base.js | 2 +- 2 files changed, 1 insertion(+), 36 deletions(-) delete mode 100644 .vscode/launch.json diff --git a/.vscode/launch.json b/.vscode/launch.json deleted file mode 100644 index 19fe8b0983b..00000000000 --- a/.vscode/launch.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "version": "0.2.0", - "configurations": [ - { - "type": "node", - "request": "launch", - "name": "Jest All", - "program": "${workspaceFolder}/node_modules/.bin/jest", - "args": ["--runInBand"], - "console": "integratedTerminal", - "internalConsoleOptions": "neverOpen", - "disableOptimisticBPs": true, - "windows": { - "program": "${workspaceFolder}/node_modules/jest/bin/jest", - } - }, - { - "type": "node", - "request": "launch", - "name": "Jest Current File", - "program": "${workspaceFolder}/node_modules/.bin/jest", - "args": [ - "${fileBasenameNoExtension}", - "--config", - "jest.config.js" - ], - "console": "integratedTerminal", - "internalConsoleOptions": "neverOpen", - "disableOptimisticBPs": true, - "windows": { - "program": "${workspaceFolder}/node_modules/jest/bin/jest", - } - } - ] -} diff --git a/jest.config.base.js b/jest.config.base.js index 662f0e95355..d033e9227a0 100644 --- a/jest.config.base.js +++ b/jest.config.base.js @@ -7,7 +7,7 @@ module.exports = { ], preset: "ts-jest", testMatch: null, - testRegex: "/apollo-gateway/src/__tests__/integration/requires\\.test\\.(js|ts)$", + testRegex: "/__tests__/.*\\.test\\.(js|ts)$", testPathIgnorePatterns: [ "/node_modules/", "/dist/" From 39f8871a33add27eca148bfd578d5faa5a89673c Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Wed, 6 May 2020 12:24:15 +0300 Subject: [PATCH 505/642] Remove inadvertent `lerna` "conventional commit" CHANGELOG changes. This was inadvertently (and surprisingly) applied via a test on the `release-2.13.0` branch during an alpha release (e8266d6ed, specifically). The `--conventional-commits` flag did what I'd hoped, but it should have `--no-changelog` attached to it as well to prevent this, since we currently manage these Changelogs differently. I'm intrigued by moving toward another approach here, but I want to stop short of purely automated changelogs which don't provide as much value as I think the manually curated ones we currently offer do. --- packages/apollo-cache-control/CHANGELOG.md | 13 ------------- packages/apollo-datasource-rest/CHANGELOG.md | 8 -------- .../apollo-engine-reporting-protobuf/CHANGELOG.md | 8 -------- packages/apollo-engine-reporting/CHANGELOG.md | 14 +------------- .../apollo-server-azure-functions/CHANGELOG.md | 8 -------- packages/apollo-server-cache-redis/CHANGELOG.md | 8 -------- .../apollo-server-cloud-functions/CHANGELOG.md | 8 -------- packages/apollo-server-cloudflare/CHANGELOG.md | 8 -------- packages/apollo-server-core/CHANGELOG.md | 13 ------------- packages/apollo-server-express/CHANGELOG.md | 8 -------- packages/apollo-server-fastify/CHANGELOG.md | 8 -------- packages/apollo-server-hapi/CHANGELOG.md | 8 -------- .../CHANGELOG.md | 8 -------- packages/apollo-server-koa/CHANGELOG.md | 8 -------- packages/apollo-server-lambda/CHANGELOG.md | 8 -------- packages/apollo-server-micro/CHANGELOG.md | 8 -------- packages/apollo-server-plugin-base/CHANGELOG.md | 14 +------------- .../CHANGELOG.md | 14 +------------- packages/apollo-server-testing/CHANGELOG.md | 13 ------------- packages/apollo-server-types/CHANGELOG.md | 14 +------------- packages/apollo-server/CHANGELOG.md | 13 ------------- packages/apollo-tracing/CHANGELOG.md | 8 -------- packages/graphql-extensions/CHANGELOG.md | 13 ------------- 23 files changed, 4 insertions(+), 229 deletions(-) delete mode 100644 packages/apollo-datasource-rest/CHANGELOG.md delete mode 100644 packages/apollo-engine-reporting-protobuf/CHANGELOG.md delete mode 100644 packages/apollo-server-azure-functions/CHANGELOG.md delete mode 100644 packages/apollo-server-cache-redis/CHANGELOG.md delete mode 100644 packages/apollo-server-cloud-functions/CHANGELOG.md delete mode 100644 packages/apollo-server-cloudflare/CHANGELOG.md delete mode 100644 packages/apollo-server-express/CHANGELOG.md delete mode 100644 packages/apollo-server-fastify/CHANGELOG.md delete mode 100644 packages/apollo-server-hapi/CHANGELOG.md delete mode 100644 packages/apollo-server-integration-testsuite/CHANGELOG.md delete mode 100644 packages/apollo-server-koa/CHANGELOG.md delete mode 100644 packages/apollo-server-lambda/CHANGELOG.md delete mode 100644 packages/apollo-server-micro/CHANGELOG.md delete mode 100644 packages/apollo-tracing/CHANGELOG.md diff --git a/packages/apollo-cache-control/CHANGELOG.md b/packages/apollo-cache-control/CHANGELOG.md index 257d6658b40..1e773242f21 100644 --- a/packages/apollo-cache-control/CHANGELOG.md +++ b/packages/apollo-cache-control/CHANGELOG.md @@ -1,16 +1,3 @@ -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - -# [0.10.0-alpha.0](https://github.com/apollographql/apollo-cache-control-js/compare/apollo-cache-control@0.9.1...apollo-cache-control@0.10.0-alpha.0) (2020-04-10) - -**Note:** Version bump only for package apollo-cache-control - - - - - # Changelog > **A note on ommitted versions**: Due to the way that the Apollo Server diff --git a/packages/apollo-datasource-rest/CHANGELOG.md b/packages/apollo-datasource-rest/CHANGELOG.md deleted file mode 100644 index 308412cf9a2..00000000000 --- a/packages/apollo-datasource-rest/CHANGELOG.md +++ /dev/null @@ -1,8 +0,0 @@ -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - -# [0.9.0-alpha.0](https://github.com/apollographql/apollo-server/tree/master/packages/apollo-datasource-rest/compare/apollo-datasource-rest@0.8.1...apollo-datasource-rest@0.9.0-alpha.0) (2020-04-10) - -**Note:** Version bump only for package apollo-datasource-rest diff --git a/packages/apollo-engine-reporting-protobuf/CHANGELOG.md b/packages/apollo-engine-reporting-protobuf/CHANGELOG.md deleted file mode 100644 index a115c84b5ab..00000000000 --- a/packages/apollo-engine-reporting-protobuf/CHANGELOG.md +++ /dev/null @@ -1,8 +0,0 @@ -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - -# [0.5.0-alpha.0](https://github.com/apollographql/apollo-engine-reporting/tree/master/packages/apollo-engine-reporting-protobuf/compare/apollo-engine-reporting-protobuf@0.4.4...apollo-engine-reporting-protobuf@0.5.0-alpha.0) (2020-04-10) - -**Note:** Version bump only for package apollo-engine-reporting-protobuf diff --git a/packages/apollo-engine-reporting/CHANGELOG.md b/packages/apollo-engine-reporting/CHANGELOG.md index a61592046a0..cb79cc96467 100644 --- a/packages/apollo-engine-reporting/CHANGELOG.md +++ b/packages/apollo-engine-reporting/CHANGELOG.md @@ -1,16 +1,3 @@ -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - -# [1.8.0-alpha.0](https://github.com/apollographql/apollo-engine-reporting/compare/apollo-engine-reporting@1.7.1...apollo-engine-reporting@1.8.0-alpha.0) (2020-04-10) - -**Note:** Version bump only for package apollo-engine-reporting - - - - - ### vNext # v1.0.0 @@ -20,3 +7,4 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline moved to the `apollo-graphql` package. They should be more universally helpful in that library, and should avoid tooling which needs to use them from needing to bring in all of `apollo-server-core`. + diff --git a/packages/apollo-server-azure-functions/CHANGELOG.md b/packages/apollo-server-azure-functions/CHANGELOG.md deleted file mode 100644 index 7d12d5b0b54..00000000000 --- a/packages/apollo-server-azure-functions/CHANGELOG.md +++ /dev/null @@ -1,8 +0,0 @@ -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - -# [2.13.0-alpha.0](https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-azure-functions/compare/apollo-server-azure-functions@2.12.0...apollo-server-azure-functions@2.13.0-alpha.0) (2020-04-10) - -**Note:** Version bump only for package apollo-server-azure-functions diff --git a/packages/apollo-server-cache-redis/CHANGELOG.md b/packages/apollo-server-cache-redis/CHANGELOG.md deleted file mode 100644 index 1e27de052e6..00000000000 --- a/packages/apollo-server-cache-redis/CHANGELOG.md +++ /dev/null @@ -1,8 +0,0 @@ -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - -# [1.2.0-alpha.0](https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-cache-redis/compare/apollo-server-cache-redis@1.1.6...apollo-server-cache-redis@1.2.0-alpha.0) (2020-04-10) - -**Note:** Version bump only for package apollo-server-cache-redis diff --git a/packages/apollo-server-cloud-functions/CHANGELOG.md b/packages/apollo-server-cloud-functions/CHANGELOG.md deleted file mode 100644 index 3c769188f06..00000000000 --- a/packages/apollo-server-cloud-functions/CHANGELOG.md +++ /dev/null @@ -1,8 +0,0 @@ -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - -# [2.13.0-alpha.0](https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-cloud-functions/compare/apollo-server-cloud-functions@2.12.0...apollo-server-cloud-functions@2.13.0-alpha.0) (2020-04-10) - -**Note:** Version bump only for package apollo-server-cloud-functions diff --git a/packages/apollo-server-cloudflare/CHANGELOG.md b/packages/apollo-server-cloudflare/CHANGELOG.md deleted file mode 100644 index 3d992f8fc43..00000000000 --- a/packages/apollo-server-cloudflare/CHANGELOG.md +++ /dev/null @@ -1,8 +0,0 @@ -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - -# [2.13.0-alpha.0](https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-cloudflare-workers/compare/apollo-server-cloudflare@2.12.0...apollo-server-cloudflare@2.13.0-alpha.0) (2020-04-10) - -**Note:** Version bump only for package apollo-server-cloudflare diff --git a/packages/apollo-server-core/CHANGELOG.md b/packages/apollo-server-core/CHANGELOG.md index b3652c52d60..a188c3d0e47 100644 --- a/packages/apollo-server-core/CHANGELOG.md +++ b/packages/apollo-server-core/CHANGELOG.md @@ -1,16 +1,3 @@ -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - -# [2.13.0-alpha.0](https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-core/compare/apollo-server-core@2.12.0...apollo-server-core@2.13.0-alpha.0) (2020-04-10) - -**Note:** Version bump only for package apollo-server-core - - - - - # Changelog ### vNEXT diff --git a/packages/apollo-server-express/CHANGELOG.md b/packages/apollo-server-express/CHANGELOG.md deleted file mode 100644 index 3daf80a77c2..00000000000 --- a/packages/apollo-server-express/CHANGELOG.md +++ /dev/null @@ -1,8 +0,0 @@ -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - -# [2.13.0-alpha.0](https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-express/compare/apollo-server-express@2.12.0...apollo-server-express@2.13.0-alpha.0) (2020-04-10) - -**Note:** Version bump only for package apollo-server-express diff --git a/packages/apollo-server-fastify/CHANGELOG.md b/packages/apollo-server-fastify/CHANGELOG.md deleted file mode 100644 index 9c5d2b5671d..00000000000 --- a/packages/apollo-server-fastify/CHANGELOG.md +++ /dev/null @@ -1,8 +0,0 @@ -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - -# [2.13.0-alpha.0](https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-fastify/compare/apollo-server-fastify@2.12.0...apollo-server-fastify@2.13.0-alpha.0) (2020-04-10) - -**Note:** Version bump only for package apollo-server-fastify diff --git a/packages/apollo-server-hapi/CHANGELOG.md b/packages/apollo-server-hapi/CHANGELOG.md deleted file mode 100644 index 79590278004..00000000000 --- a/packages/apollo-server-hapi/CHANGELOG.md +++ /dev/null @@ -1,8 +0,0 @@ -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - -# [2.13.0-alpha.0](https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-hapi/compare/apollo-server-hapi@2.12.0...apollo-server-hapi@2.13.0-alpha.0) (2020-04-10) - -**Note:** Version bump only for package apollo-server-hapi diff --git a/packages/apollo-server-integration-testsuite/CHANGELOG.md b/packages/apollo-server-integration-testsuite/CHANGELOG.md deleted file mode 100644 index 8b94809f115..00000000000 --- a/packages/apollo-server-integration-testsuite/CHANGELOG.md +++ /dev/null @@ -1,8 +0,0 @@ -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - -# [2.13.0-alpha.0](https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-integration-testsuite/compare/apollo-server-integration-testsuite@2.12.0...apollo-server-integration-testsuite@2.13.0-alpha.0) (2020-04-10) - -**Note:** Version bump only for package apollo-server-integration-testsuite diff --git a/packages/apollo-server-koa/CHANGELOG.md b/packages/apollo-server-koa/CHANGELOG.md deleted file mode 100644 index 24b87433bda..00000000000 --- a/packages/apollo-server-koa/CHANGELOG.md +++ /dev/null @@ -1,8 +0,0 @@ -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - -# [2.13.0-alpha.0](https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-koa/compare/apollo-server-koa@2.12.0...apollo-server-koa@2.13.0-alpha.0) (2020-04-10) - -**Note:** Version bump only for package apollo-server-koa diff --git a/packages/apollo-server-lambda/CHANGELOG.md b/packages/apollo-server-lambda/CHANGELOG.md deleted file mode 100644 index a15f1fb865c..00000000000 --- a/packages/apollo-server-lambda/CHANGELOG.md +++ /dev/null @@ -1,8 +0,0 @@ -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - -# [2.13.0-alpha.0](https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-lambda/compare/apollo-server-lambda@2.12.0...apollo-server-lambda@2.13.0-alpha.0) (2020-04-10) - -**Note:** Version bump only for package apollo-server-lambda diff --git a/packages/apollo-server-micro/CHANGELOG.md b/packages/apollo-server-micro/CHANGELOG.md deleted file mode 100644 index 92bea404e46..00000000000 --- a/packages/apollo-server-micro/CHANGELOG.md +++ /dev/null @@ -1,8 +0,0 @@ -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - -# [2.13.0-alpha.0](https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-micro/compare/apollo-server-micro@2.12.0...apollo-server-micro@2.13.0-alpha.0) (2020-04-10) - -**Note:** Version bump only for package apollo-server-micro diff --git a/packages/apollo-server-plugin-base/CHANGELOG.md b/packages/apollo-server-plugin-base/CHANGELOG.md index 612c2a1969e..ef45b84f48c 100644 --- a/packages/apollo-server-plugin-base/CHANGELOG.md +++ b/packages/apollo-server-plugin-base/CHANGELOG.md @@ -1,16 +1,4 @@ -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - -# [0.8.0-alpha.0](/compare/apollo-server-plugin-base@0.7.1...apollo-server-plugin-base@0.8.0-alpha.0) (2020-04-10) - -**Note:** Version bump only for package apollo-server-plugin-base - - - - - # Change Log ### vNEXT + diff --git a/packages/apollo-server-plugin-response-cache/CHANGELOG.md b/packages/apollo-server-plugin-response-cache/CHANGELOG.md index 0e96aa73051..ef45b84f48c 100644 --- a/packages/apollo-server-plugin-response-cache/CHANGELOG.md +++ b/packages/apollo-server-plugin-response-cache/CHANGELOG.md @@ -1,16 +1,4 @@ -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - -# [0.5.0-alpha.0](https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-plugin-response-cache/compare/apollo-server-plugin-response-cache@0.4.1...apollo-server-plugin-response-cache@0.5.0-alpha.0) (2020-04-10) - -**Note:** Version bump only for package apollo-server-plugin-response-cache - - - - - # Change Log ### vNEXT + diff --git a/packages/apollo-server-testing/CHANGELOG.md b/packages/apollo-server-testing/CHANGELOG.md index 21d0fb5fdcb..d1c2295b906 100644 --- a/packages/apollo-server-testing/CHANGELOG.md +++ b/packages/apollo-server-testing/CHANGELOG.md @@ -1,16 +1,3 @@ -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - -# [2.13.0-alpha.0](https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-testing/compare/apollo-server-testing@2.12.0...apollo-server-testing@2.13.0-alpha.0) (2020-04-10) - -**Note:** Version bump only for package apollo-server-testing - - - - - # Changelog ### vNEXT diff --git a/packages/apollo-server-types/CHANGELOG.md b/packages/apollo-server-types/CHANGELOG.md index c36c667151e..ef45b84f48c 100644 --- a/packages/apollo-server-types/CHANGELOG.md +++ b/packages/apollo-server-types/CHANGELOG.md @@ -1,16 +1,4 @@ -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - -# [0.4.0-alpha.0](/compare/apollo-server-types@0.3.1...apollo-server-types@0.4.0-alpha.0) (2020-04-10) - -**Note:** Version bump only for package apollo-server-types - - - - - # Change Log ### vNEXT + diff --git a/packages/apollo-server/CHANGELOG.md b/packages/apollo-server/CHANGELOG.md index b38a661a90f..f6c1bd04b49 100644 --- a/packages/apollo-server/CHANGELOG.md +++ b/packages/apollo-server/CHANGELOG.md @@ -1,16 +1,3 @@ -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - -# [2.13.0-alpha.0](https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server/compare/apollo-server@2.12.0...apollo-server@2.13.0-alpha.0) (2020-04-10) - -**Note:** Version bump only for package apollo-server - - - - - # Changelog ### vNEXT diff --git a/packages/apollo-tracing/CHANGELOG.md b/packages/apollo-tracing/CHANGELOG.md deleted file mode 100644 index c442f7d0a9a..00000000000 --- a/packages/apollo-tracing/CHANGELOG.md +++ /dev/null @@ -1,8 +0,0 @@ -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - -# [0.10.0-alpha.0](https://github.com/apollographql/apollo-tracing-js/compare/apollo-tracing@0.9.1...apollo-tracing@0.10.0-alpha.0) (2020-04-10) - -**Note:** Version bump only for package apollo-tracing diff --git a/packages/graphql-extensions/CHANGELOG.md b/packages/graphql-extensions/CHANGELOG.md index b587976e53f..fa589535e83 100644 --- a/packages/graphql-extensions/CHANGELOG.md +++ b/packages/graphql-extensions/CHANGELOG.md @@ -1,16 +1,3 @@ -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - -# [0.12.0-alpha.0](https://github.com/apollographql/apollo-server/compare/graphql-extensions@0.11.1...graphql-extensions@0.12.0-alpha.0) (2020-04-10) - -**Note:** Version bump only for package graphql-extensions - - - - - # Changelog ### vNext From e544af1c89ee032fcbe2cf6496f50439125d07cc Mon Sep 17 00:00:00 2001 From: Stephen Barlow Date: Wed, 6 May 2020 02:50:54 -0700 Subject: [PATCH 506/642] docs: Embed Space Camp talk in "Federation overview" (#4070) --- docs/source/federation/introduction.mdx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/source/federation/introduction.mdx b/docs/source/federation/introduction.mdx index 38f538458fa..b28f948f1f6 100644 --- a/docs/source/federation/introduction.mdx +++ b/docs/source/federation/introduction.mdx @@ -37,6 +37,10 @@ Apollo Server provides libraries for acting both as an implementing service and > Apollo Federation does not currently support [GraphQL subscription operations](https://www.apollographql.com/docs/react/data/subscriptions/). +The following presentation by [Mandi Wise](https://twitter.com/mandiwise) further describes the architecture of Apollo Federation and walks through implementing a federated graph: + + + ## Core principles ### Incremental adoption From ad9fefa43bc6488fdeb853440631ccb317d366ef Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Wed, 6 May 2020 12:36:45 +0000 Subject: [PATCH 507/642] noop: Fix unrelated typing error in `runQuery.test.ts`. --- packages/apollo-server-core/src/__tests__/runQuery.test.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/apollo-server-core/src/__tests__/runQuery.test.ts b/packages/apollo-server-core/src/__tests__/runQuery.test.ts index d4f4640ca2c..636a0c78198 100644 --- a/packages/apollo-server-core/src/__tests__/runQuery.test.ts +++ b/packages/apollo-server-core/src/__tests__/runQuery.test.ts @@ -39,6 +39,7 @@ function runQuery(options: QueryOptions): Promise { return processGraphQLRequest(options, { request, + logger: console, context: options.context || {}, debug: options.debug, cache: {} as any, From 6575625838510446aeb7deaa39540343d715f453 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 4 May 2020 12:19:47 +0000 Subject: [PATCH 508/642] Reintroduce genericism to `Dispatcher`. As I reached to introduce a dispatcher for an interface that wasn't a `GraphQLRequestListener`, it dawned on me that the dispatcher that we already had was pretty close to being correct for this prior to the changes in the linked PR/commits below ([[Ref 1]][[Ref 2]]). Within those changesets, the addition of `GrahpQLRequestListener` as a constraint to the `Dispatcher`'s `T` type was done as a matter of necessity so TypeScript could be updated to the latest version. Further analysis, with a motivation to boot, led me to believe that TypeScript was correct in its newfound determination (circa ~v3.7.3) that the `apply` method didn't exist on the keys of the interface being invoked. Concretely, I'm pretty sure there was no constraint that was actually ensuring they were functions and some degree of indirection caused TypeScript to give up trying to reconcile that. This brings back a generic property to the `Dispatcher` by using an object with `string`-key'd properties and functions as values as the constraint for the entire `Dispatcher` interface, rather than `GraphqLRequestListener` itself. Ref 1: 1169db60d61d22eeffc76287ece567774b930e3e Ref 2: https://github.com/apollographql/apollo-server/pull/3618 --- .../apollo-server-core/src/utils/dispatcher.ts | 5 ++--- packages/apollo-server-plugin-base/src/index.ts | 4 +++- packages/apollo-server-types/src/index.ts | 17 +++++++++++++++++ 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/packages/apollo-server-core/src/utils/dispatcher.ts b/packages/apollo-server-core/src/utils/dispatcher.ts index d311eaf055a..0febb020d07 100644 --- a/packages/apollo-server-core/src/utils/dispatcher.ts +++ b/packages/apollo-server-core/src/utils/dispatcher.ts @@ -1,13 +1,12 @@ -import { GraphQLRequestListener } from "apollo-server-plugin-base"; +import { AnyFunction, AnyFunctionMap } from "apollo-server-types"; -type AnyFunction = (...args: any[]) => any; type Args = F extends (...args: infer A) => any ? A : never; type AsFunction = F extends AnyFunction ? F : never; type UnwrapPromise = T extends Promise ? U : T; type DidEndHook = (...args: TArgs) => void; -export class Dispatcher { +export class Dispatcher { constructor(protected targets: T[]) {} public async invokeHookAsync( diff --git a/packages/apollo-server-plugin-base/src/index.ts b/packages/apollo-server-plugin-base/src/index.ts index 2f671030974..ffab808f0af 100644 --- a/packages/apollo-server-plugin-base/src/index.ts +++ b/packages/apollo-server-plugin-base/src/index.ts @@ -1,4 +1,5 @@ import { + AnyFunctionMap, GraphQLServiceContext, GraphQLRequestContext, GraphQLRequest, @@ -55,7 +56,8 @@ export type GraphQLRequestListenerExecutionDidEnd = export type GraphQLRequestListenerDidResolveField = ((error: Error | null, result?: any) => void) | void -export interface GraphQLRequestListener> { +export interface GraphQLRequestListener> + extends AnyFunctionMap { parsingDidStart?( requestContext: GraphQLRequestContextParsingDidStart, ): GraphQLRequestListenerParsingDidEnd; diff --git a/packages/apollo-server-types/src/index.ts b/packages/apollo-server-types/src/index.ts index 5602aeea762..196b4b7db55 100644 --- a/packages/apollo-server-types/src/index.ts +++ b/packages/apollo-server-types/src/index.ts @@ -16,6 +16,23 @@ import { Trace } from 'apollo-engine-reporting-protobuf'; export type ValueOrPromise = T | Promise; export type WithRequired = T & Required>; +/** + * It is not recommended to use this `AnyFunction` type further. + * + * This is a legacy type which aims to do what its name suggests (be the type + * for _any_ function) but it should be replaced with something from the + * TypeScript standard lib. It doesn't truly cover "any" function right now, + * and in particular doesn't consider `this`. For now, it has been brought + * here from the Apollo Server `Dispatcher`, where it was first utilized. + */ +export type AnyFunction = (...args: any[]) => any; + +/** + * A map of `AnyFunction`s which are the interface for our plugin API's + * request listeners. (e.g. `GraphQLRequestListener`s). + */ +export type AnyFunctionMap = { [key: string]: AnyFunction | undefined }; + type Mutable = { -readonly [P in keyof T]: T[P] }; // By default, TypeScript uses structural typing (as opposed to nominal typing) From d5408ac772613c5a59456aa870f3033db7bd305a Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Wed, 6 May 2020 14:24:44 +0000 Subject: [PATCH 509/642] Correct recently added plugin types to exclude `void`. I recently introduced these in 46211b371718beae696a781aa27c204966cb51e9 within #3985, with the intention of making these more understandable in auto-completion within VSCode. While the effective types that the methods where these types were used remains the same (since I've just shifted the `void` from the wrong place to the right place), removing `void` from these types is arguably a breaking change. Since that's just in the typings (and would be a compilation error, I think), and this was recently introduced recently, I'm going to adjust this for correctness now. --- .../apollo-server-plugin-base/src/index.ts | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/packages/apollo-server-plugin-base/src/index.ts b/packages/apollo-server-plugin-base/src/index.ts index ffab808f0af..9fa7edd1ac0 100644 --- a/packages/apollo-server-plugin-base/src/index.ts +++ b/packages/apollo-server-plugin-base/src/index.ts @@ -47,23 +47,21 @@ export interface ApolloServerPlugin = Recor ): GraphQLRequestListener | void; } -export type GraphQLRequestListenerParsingDidEnd = - ((err?: Error) => void) | void; +export type GraphQLRequestListenerParsingDidEnd = (err?: Error) => void; export type GraphQLRequestListenerValidationDidEnd = - ((err?: ReadonlyArray) => void) | void; -export type GraphQLRequestListenerExecutionDidEnd = - ((err?: Error) => void) | void; + ((err?: ReadonlyArray) => void); +export type GraphQLRequestListenerExecutionDidEnd = ((err?: Error) => void); export type GraphQLRequestListenerDidResolveField = - ((error: Error | null, result?: any) => void) | void + ((error: Error | null, result?: any) => void); export interface GraphQLRequestListener> extends AnyFunctionMap { parsingDidStart?( requestContext: GraphQLRequestContextParsingDidStart, - ): GraphQLRequestListenerParsingDidEnd; + ): GraphQLRequestListenerParsingDidEnd | void; validationDidStart?( requestContext: GraphQLRequestContextValidationDidStart, - ): GraphQLRequestListenerValidationDidEnd; + ): GraphQLRequestListenerValidationDidEnd | void; didResolveOperation?( requestContext: GraphQLRequestContextDidResolveOperation, ): ValueOrPromise; @@ -80,10 +78,10 @@ export interface GraphQLRequestListener> ): ValueOrPromise; executionDidStart?( requestContext: GraphQLRequestContextExecutionDidStart, - ): GraphQLRequestListenerExecutionDidEnd; + ): GraphQLRequestListenerExecutionDidEnd | void; willResolveField?( ...fieldResolverArgs: Parameters> - ): GraphQLRequestListenerDidResolveField; + ): GraphQLRequestListenerDidResolveField | void; willSendResponse?( requestContext: GraphQLRequestContextWillSendResponse, ): ValueOrPromise; From ab78e4839b0c30ae6eebbdcce75275de78ad4019 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Wed, 6 May 2020 14:28:29 +0000 Subject: [PATCH 510/642] Introduce `BaseContext` and `DefaultContext`. We use this notation in so many places to represent the context and the default context that we should stop referring to it as `Record`. This doesn't go so far as to track all of those down, but this at least makes the types exist so we can pursuit that as some point. Luckily, with structural typing, the use of this or an in-line type elsewhere should resolve to a match. --- packages/apollo-server-plugin-base/src/index.ts | 13 ++++++++++--- packages/apollo-server-types/src/index.ts | 3 +++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/packages/apollo-server-plugin-base/src/index.ts b/packages/apollo-server-plugin-base/src/index.ts index 9fa7edd1ac0..853edf34070 100644 --- a/packages/apollo-server-plugin-base/src/index.ts +++ b/packages/apollo-server-plugin-base/src/index.ts @@ -1,5 +1,7 @@ import { AnyFunctionMap, + BaseContext, + DefaultContext, GraphQLServiceContext, GraphQLRequestContext, GraphQLRequest, @@ -25,6 +27,8 @@ import { GraphQLFieldResolver } from "graphql"; // In the future, `apollo-server-types` and `apollo-server-plugin-base` will // probably roll into the same "types" package, but that is not today! export { + BaseContext, + DefaultContext, GraphQLServiceContext, GraphQLRequestContext, GraphQLRequest, @@ -40,7 +44,9 @@ export { GraphQLRequestContextWillSendResponse, }; -export interface ApolloServerPlugin = Record> { +export interface ApolloServerPlugin< + TContext extends BaseContext = DefaultContext +> { serverWillStart?(service: GraphQLServiceContext): ValueOrPromise; requestDidStart?( requestContext: GraphQLRequestContext, @@ -54,8 +60,9 @@ export type GraphQLRequestListenerExecutionDidEnd = ((err?: Error) => void); export type GraphQLRequestListenerDidResolveField = ((error: Error | null, result?: any) => void); -export interface GraphQLRequestListener> - extends AnyFunctionMap { +export interface GraphQLRequestListener< + TContext extends BaseContext = DefaultContext +> extends AnyFunctionMap { parsingDidStart?( requestContext: GraphQLRequestContextParsingDidStart, ): GraphQLRequestListenerParsingDidEnd | void; diff --git a/packages/apollo-server-types/src/index.ts b/packages/apollo-server-types/src/index.ts index 196b4b7db55..6e0cf487461 100644 --- a/packages/apollo-server-types/src/index.ts +++ b/packages/apollo-server-types/src/index.ts @@ -13,6 +13,9 @@ import { import { KeyValueCache } from 'apollo-server-caching'; import { Trace } from 'apollo-engine-reporting-protobuf'; +export type BaseContext = Record; +export type DefaultContext = BaseContext; + export type ValueOrPromise = T | Promise; export type WithRequired = T & Required>; From 9b5be32091faeb3d97c75517ecd70ab337d951b1 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Wed, 6 May 2020 14:33:00 +0000 Subject: [PATCH 511/642] tests: Add additional plugin API hook tests. These should have accompanied the initial PR which I opened to introduce the `willResolveField` and "did resolve field" hooks to the new plugin API, but alas, I didn't do that. Better late than never, and these will be refactored (in a somewhat minor way) in an upcoming commit. --- .../src/__tests__/runQuery.test.ts | 217 +++++++++++++++++- 1 file changed, 216 insertions(+), 1 deletion(-) diff --git a/packages/apollo-server-core/src/__tests__/runQuery.test.ts b/packages/apollo-server-core/src/__tests__/runQuery.test.ts index 636a0c78198..9fe5905beb2 100644 --- a/packages/apollo-server-core/src/__tests__/runQuery.test.ts +++ b/packages/apollo-server-core/src/__tests__/runQuery.test.ts @@ -19,7 +19,11 @@ import { import { processGraphQLRequest, GraphQLRequest } from '../requestPipeline'; import { Request } from 'apollo-server-env'; import { GraphQLOptions, Context as GraphQLContext } from 'apollo-server-core'; -import { ApolloServerPlugin } from 'apollo-server-plugin-base'; +import { + ApolloServerPlugin, + GraphQLRequestListenerDidResolveField, + GraphQLRequestListenerExecutionDidEnd, +} from 'apollo-server-plugin-base'; import { GraphQLRequestListener } from 'apollo-server-plugin-base'; import { InMemoryLRUCache } from 'apollo-server-caching'; @@ -513,6 +517,144 @@ describe('runQuery', () => { }); }); + describe('executionDidStart', () => { + it('called when execution starts', async () => { + const executionDidStart = jest.fn(); + await runQuery({ + schema, + queryString: '{ testString }', + plugins: [ + { + requestDidStart() { + return { + executionDidStart, + }; + }, + }, + ], + request: new MockReq(), + }); + + expect(executionDidStart).toHaveBeenCalledTimes(1); + }); + + it('works as a function returned from "executionDidStart"', async () => { + const executionDidEnd = jest.fn(); + const executionDidStart = jest.fn( + (): GraphQLRequestListenerExecutionDidEnd => executionDidEnd); + + await runQuery({ + schema, + queryString: '{ testString }', + plugins: [ + { + requestDidStart() { + return { + executionDidStart, + }; + }, + }, + ], + request: new MockReq(), + }); + + expect(executionDidStart).toHaveBeenCalledTimes(1); + expect(executionDidEnd).toHaveBeenCalledTimes(1); + }); + }); + + describe('willResolveField', () => { + it('called when resolving a field starts', async () => { + const willResolveField = jest.fn(); + + await runQuery({ + schema, + queryString: '{ testString }', + plugins: [ + { + requestDidStart() { + return { + willResolveField, + }; + }, + }, + ], + request: new MockReq(), + }); + + expect(willResolveField).toHaveBeenCalledTimes(1); + }); + + it('called once for each field being resolved', async () => { + const willResolveField = jest.fn(); + + await runQuery({ + schema, + queryString: '{ testString again:testString }', + plugins: [ + { + requestDidStart() { + return { + willResolveField, + }; + }, + }, + ], + request: new MockReq(), + }); + + expect(willResolveField).toHaveBeenCalledTimes(2); + }); + + it('calls the end handler', async () => { + const didResolveField: GraphQLRequestListenerDidResolveField = + jest.fn(); + const willResolveField = jest.fn(() => didResolveField); + + await runQuery({ + schema, + queryString: '{ testString }', + plugins: [ + { + requestDidStart() { + return { + willResolveField, + }; + }, + }, + ], + request: new MockReq(), + }); + + expect(willResolveField).toHaveBeenCalledTimes(1); + expect(didResolveField).toHaveBeenCalledTimes(1); + }); + + it('calls the end handler for each field being resolved', async () => { + const didResolveField: GraphQLRequestListenerDidResolveField = + jest.fn(); + const willResolveField = jest.fn(() => didResolveField); + + await runQuery({ + schema, + queryString: '{ testString again: testString }', + plugins: [ + { + requestDidStart() { + return { + willResolveField, + }; + }, + }, + ], + request: new MockReq(), + }); + + expect(willResolveField).toHaveBeenCalledTimes(2); + expect(didResolveField).toHaveBeenCalledTimes(2); + }); + }); + describe('didEncounterErrors', () => { const didEncounterErrors = jest.fn(); const plugins: ApolloServerPlugin[] = [ @@ -570,6 +712,79 @@ describe('runQuery', () => { expect(didEncounterErrors).not.toBeCalled(); }); }); + + describe("ordering", () => { + it('calls hooks in the expected order', async () => { + const callOrder: string[] = []; + let stopAwaiting: Function; + const toBeAwaited = new Promise(resolve => stopAwaiting = resolve); + + const didResolveField: GraphQLRequestListenerDidResolveField = + jest.fn(() => callOrder.push("didResolveField")); + + const willResolveField = jest.fn(() => { + callOrder.push("willResolveField"); + return didResolveField; + }); + + const executionDidEnd: GraphQLRequestListenerExecutionDidEnd = + jest.fn(() => callOrder.push('executionDidEnd')); + + const executionDidStart = jest.fn(() => { + callOrder.push("executionDidStart"); + return executionDidEnd; + }, + ); + + const schema = new GraphQLSchema({ + query: new GraphQLObjectType({ + name: 'QueryType', + fields: { + testString: { + type: GraphQLString, + async resolve() { + callOrder.push("beforeAwaiting"); + await toBeAwaited; + callOrder.push("afterAwaiting"); + return "it works"; + }, + }, + } + }) + }); + + Promise.resolve().then(() => stopAwaiting()); + + await runQuery({ + schema, + queryString: '{ testString }', + plugins: [ + { + requestDidStart() { + return { + executionDidStart, + willResolveField, + }; + }, + }, + ], + request: new MockReq(), + }); + + expect(executionDidStart).toHaveBeenCalledTimes(1); + expect(executionDidEnd).toHaveBeenCalledTimes(1); + expect(willResolveField).toHaveBeenCalledTimes(1); + expect(didResolveField).toHaveBeenCalledTimes(1); + expect(callOrder).toStrictEqual([ + "executionDidStart", + "willResolveField", + "beforeAwaiting", + "afterAwaiting", + "didResolveField", + "executionDidEnd", + ]); + }); + }) }); describe('parsing and validation cache', () => { From 4fa6ddd4f8d1b8f64c636e563368a955bc5fbe5f Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Wed, 6 May 2020 17:04:27 +0000 Subject: [PATCH 512/642] Introduce a `callTargets` method on the `Dispatcher`. This decomposition of the functionality that was previously embedded within the `invokeHookAsync` method will facilitate the addition of two new methods in a follow-up commit: `invokeHookSync` and `reverseInvokeHookSync`. --- .../apollo-server-core/src/utils/dispatcher.ts | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/packages/apollo-server-core/src/utils/dispatcher.ts b/packages/apollo-server-core/src/utils/dispatcher.ts index 0febb020d07..ee5226b1b6e 100644 --- a/packages/apollo-server-core/src/utils/dispatcher.ts +++ b/packages/apollo-server-core/src/utils/dispatcher.ts @@ -9,10 +9,26 @@ type DidEndHook = (...args: TArgs) => void; export class Dispatcher { constructor(protected targets: T[]) {} + private callTargets( + targets: T[], + methodName: TMethodName, + ...args: Args + ) { + return targets.map(target => { + const method = target[methodName]; + if (method && typeof method === 'function') { + return method.apply(target, args); + } + }); + } + public async invokeHookAsync( methodName: TMethodName, ...args: Args ): Promise>>[]> { + return await Promise.all( + this.callTargets(this.targets, methodName, ...args), + ); return await Promise.all( this.targets.map(target => { const method = target[methodName]; From f2a7490fff88d37c6356078b45b8b7ca10a3404e Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Wed, 6 May 2020 17:08:16 +0000 Subject: [PATCH 513/642] Switch `willResolveField` to be nested within `executionDidStart`. The original approach I took when introducing the `willResolveField` field-level wrapper to the new plugin API was to put it at the same level as other request life-cycle events, like `validationDidStart`, and `parsingDidStart`. However, that approach didn't pay respect to the structured/tree-shape that the new request pipeline aimed to bring. For example, currently, the more granular life-cycle events that take place within the _request_ (like `parsingDidStart` and `executionDidStart`), are defined by returning them from the `requestDidStart` hook. This creates a tiered structure within a plugin's implemented hooks that allow variables to be scoped appropriately and shared within a phase of the life-cycle (even sub-hooks) without needing to pin things onto the context unnecessarily. Additionally, in TypeScript, it allows us to gradually widen/narrow the scope of the types that are applied to the `requestContext` during various stages. E.g., `operationName` isn't available before the parsing phase and therefore the type of the `requestContext` within the `parsingDidStart` should, ideally, reflect that. This commit makes this real and, I think, embraces the previous spirit of the new plugin API. Further, while the initial approach I took switched from an object attached to the `context` (received by resolvers) to a `Symbol`, this commit further simplifies some of the machinery we aree exposing. Specifically, rather than attaching the entire dispatcher to the `context` (which we use from an onion wrapper that we put the schema's resolvers within) we now only attach a method which will invoke the dispatcher's `willResolveField` hook, rather than the entirety of the dispatcher's instance itself. This should hopefully reduce the category of "odd behavior" which could result if users tampered with that symbol, since it could result in unexpected behavior. --- .../src/__tests__/runQuery.test.ts | 265 +++++++++++------- .../apollo-server-core/src/requestPipeline.ts | 49 +++- .../src/utils/dispatcher.ts | 14 + .../src/utils/pluginTestHarness.ts | 61 ++-- .../src/utils/schemaInstrumentation.ts | 37 ++- .../apollo-server-plugin-base/src/index.ts | 17 +- 6 files changed, 300 insertions(+), 143 deletions(-) diff --git a/packages/apollo-server-core/src/__tests__/runQuery.test.ts b/packages/apollo-server-core/src/__tests__/runQuery.test.ts index 9fe5905beb2..9953b120714 100644 --- a/packages/apollo-server-core/src/__tests__/runQuery.test.ts +++ b/packages/apollo-server-core/src/__tests__/runQuery.test.ts @@ -21,6 +21,7 @@ import { Request } from 'apollo-server-env'; import { GraphQLOptions, Context as GraphQLContext } from 'apollo-server-core'; import { ApolloServerPlugin, + GraphQLRequestExecutionListener, GraphQLRequestListenerDidResolveField, GraphQLRequestListenerExecutionDidEnd, } from 'apollo-server-plugin-base'; @@ -538,123 +539,192 @@ describe('runQuery', () => { expect(executionDidStart).toHaveBeenCalledTimes(1); }); - it('works as a function returned from "executionDidStart"', async () => { - const executionDidEnd = jest.fn(); - const executionDidStart = jest.fn( - (): GraphQLRequestListenerExecutionDidEnd => executionDidEnd); + describe('executionDidEnd', () => { + it('works as a function returned from "executionDidStart"', async () => { + const executionDidEnd = jest.fn(); + const executionDidStart = jest.fn( + (): GraphQLRequestListenerExecutionDidEnd => executionDidEnd); - await runQuery({ - schema, - queryString: '{ testString }', - plugins: [ - { - requestDidStart() { - return { - executionDidStart, - }; + await runQuery({ + schema, + queryString: '{ testString }', + plugins: [ + { + requestDidStart() { + return { + executionDidStart, + }; + }, }, - }, - ], - request: new MockReq(), + ], + request: new MockReq(), + }); + + expect(executionDidStart).toHaveBeenCalledTimes(1); + expect(executionDidEnd).toHaveBeenCalledTimes(1); }); + it('works as a listener on an object returned from "executionDidStart"', + async () => { + const executionDidEnd = jest.fn(); + const executionDidStart = jest.fn( + (): GraphQLRequestExecutionListener => ({ + executionDidEnd, + }), + ); + + await runQuery({ + schema, + queryString: '{ testString }', + plugins: [ + { + requestDidStart() { + return { + executionDidStart, + }; + }, + }, + ], + request: new MockReq(), + } + ); + expect(executionDidStart).toHaveBeenCalledTimes(1); expect(executionDidEnd).toHaveBeenCalledTimes(1); }); - }); - describe('willResolveField', () => { - it('called when resolving a field starts', async () => { - const willResolveField = jest.fn(); - - await runQuery({ - schema, - queryString: '{ testString }', - plugins: [ - { - requestDidStart() { - return { - willResolveField, - }; - }, - }, - ], - request: new MockReq(), - }); - - expect(willResolveField).toHaveBeenCalledTimes(1); }); - it('called once for each field being resolved', async () => { - const willResolveField = jest.fn(); - - await runQuery({ - schema, - queryString: '{ testString again:testString }', - plugins: [ - { - requestDidStart() { - return { - willResolveField, - }; + describe('willResolveField', () => { + it('called when resolving a field starts', async () => { + const willResolveField = jest.fn(); + const executionDidEnd = jest.fn(); + const executionDidStart = jest.fn( + (): GraphQLRequestExecutionListener => ({ + willResolveField, + executionDidEnd, + }), + ); + + await runQuery({ + schema, + queryString: '{ testString }', + plugins: [ + { + requestDidStart() { + return { + executionDidStart, + }; + }, }, - }, - ], - request: new MockReq(), - }); - - expect(willResolveField).toHaveBeenCalledTimes(2); - }); + ], + request: new MockReq(), + }); - it('calls the end handler', async () => { - const didResolveField: GraphQLRequestListenerDidResolveField = - jest.fn(); - const willResolveField = jest.fn(() => didResolveField); + expect(executionDidStart).toHaveBeenCalledTimes(1); + expect(willResolveField).toHaveBeenCalledTimes(1); + expect(executionDidEnd).toHaveBeenCalledTimes(1); + }); - await runQuery({ - schema, - queryString: '{ testString }', - plugins: [ - { - requestDidStart() { - return { - willResolveField, - }; + it('called once for each field being resolved', async () => { + const willResolveField = jest.fn(); + const executionDidEnd = jest.fn(); + const executionDidStart = jest.fn( + (): GraphQLRequestExecutionListener => ({ + willResolveField, + executionDidEnd, + }), + ); + + await runQuery({ + schema, + queryString: '{ testString again:testString }', + plugins: [ + { + requestDidStart() { + return { + executionDidStart, + }; + }, }, - }, - ], - request: new MockReq(), + ], + request: new MockReq(), + }); + + expect(executionDidStart).toHaveBeenCalledTimes(1); + expect(willResolveField).toHaveBeenCalledTimes(2); + expect(executionDidEnd).toHaveBeenCalledTimes(1); }); - expect(willResolveField).toHaveBeenCalledTimes(1); - expect(didResolveField).toHaveBeenCalledTimes(1); - }); + it('calls the end handler', async () => { + const didResolveField: GraphQLRequestListenerDidResolveField = + jest.fn(); + const willResolveField = jest.fn(() => didResolveField); + const executionDidEnd = jest.fn(); + const executionDidStart = jest.fn( + (): GraphQLRequestExecutionListener => ({ + willResolveField, + executionDidEnd, + }), + ); + + await runQuery({ + schema, + queryString: '{ testString }', + plugins: [ + { + requestDidStart() { + return { + executionDidStart, + }; + }, + }, + ], + request: new MockReq(), + }); - it('calls the end handler for each field being resolved', async () => { - const didResolveField: GraphQLRequestListenerDidResolveField = - jest.fn(); - const willResolveField = jest.fn(() => didResolveField); + expect(executionDidStart).toHaveBeenCalledTimes(1); + expect(willResolveField).toHaveBeenCalledTimes(1); + expect(didResolveField).toHaveBeenCalledTimes(1); + expect(executionDidEnd).toHaveBeenCalledTimes(1); + }); - await runQuery({ - schema, - queryString: '{ testString again: testString }', - plugins: [ - { - requestDidStart() { - return { - willResolveField, - }; + it('calls the end handler for each field being resolved', async () => { + const didResolveField: GraphQLRequestListenerDidResolveField = + jest.fn(); + const willResolveField = jest.fn(() => didResolveField); + const executionDidEnd = jest.fn(); + const executionDidStart = jest.fn( + (): GraphQLRequestExecutionListener => ({ + willResolveField, + executionDidEnd, + }), + ); + + await runQuery({ + schema, + queryString: '{ testString again: testString }', + plugins: [ + { + requestDidStart() { + return { + executionDidStart, + }; + }, }, - }, - ], - request: new MockReq(), - }); + ], + request: new MockReq(), + }); - expect(willResolveField).toHaveBeenCalledTimes(2); - expect(didResolveField).toHaveBeenCalledTimes(2); + expect(executionDidStart).toHaveBeenCalledTimes(1); + expect(willResolveField).toHaveBeenCalledTimes(2); + expect(didResolveField).toHaveBeenCalledTimes(2); + expect(executionDidEnd).toHaveBeenCalledTimes(1); + }); }); }); + describe('didEncounterErrors', () => { const didEncounterErrors = jest.fn(); const plugins: ApolloServerPlugin[] = [ @@ -730,9 +800,10 @@ describe('runQuery', () => { const executionDidEnd: GraphQLRequestListenerExecutionDidEnd = jest.fn(() => callOrder.push('executionDidEnd')); - const executionDidStart = jest.fn(() => { + const executionDidStart = jest.fn( + (): GraphQLRequestExecutionListener => { callOrder.push("executionDidStart"); - return executionDidEnd; + return { willResolveField, executionDidEnd }; }, ); @@ -763,7 +834,6 @@ describe('runQuery', () => { requestDidStart() { return { executionDidStart, - willResolveField, }; }, }, @@ -772,7 +842,6 @@ describe('runQuery', () => { }); expect(executionDidStart).toHaveBeenCalledTimes(1); - expect(executionDidEnd).toHaveBeenCalledTimes(1); expect(willResolveField).toHaveBeenCalledTimes(1); expect(didResolveField).toHaveBeenCalledTimes(1); expect(callOrder).toStrictEqual([ diff --git a/packages/apollo-server-core/src/requestPipeline.ts b/packages/apollo-server-core/src/requestPipeline.ts index 89d0d599218..79bc9bf0fa2 100644 --- a/packages/apollo-server-core/src/requestPipeline.ts +++ b/packages/apollo-server-core/src/requestPipeline.ts @@ -19,7 +19,7 @@ import { import { DataSource } from 'apollo-datasource'; import { PersistedQueryOptions } from './graphqlOptions'; import { - symbolRequestListenerDispatcher, + symbolExecutionDispatcherWillResolveField, enablePluginsForSchemaResolvers, } from "./utils/schemaInstrumentation" import { @@ -56,6 +56,7 @@ import { GraphQLRequestContextValidationDidStart, GraphQLRequestContextWillSendResponse, GraphQLRequestContextDidEncounterErrors, + GraphQLRequestExecutionListener, } from 'apollo-server-plugin-base'; import { Dispatcher } from './utils/dispatcher'; @@ -131,10 +132,6 @@ export async function processGraphQLRequest( (requestContext.context as any)._extensionStack = extensionStack; const dispatcher = initializeRequestListenerDispatcher(); - Object.defineProperty(requestContext.context, symbolRequestListenerDispatcher, { - value: dispatcher, - }); - await initializeDataSources(); const metrics = requestContext.metrics || Object.create(null); @@ -364,11 +361,43 @@ export async function processGraphQLRequest( requestContext as GraphQLRequestContextResponseForOperation, ); if (response == null) { - const executionDidEnd = await dispatcher.invokeDidStartHook( + // This execution dispatcher code is duplicated in `pluginTestHarness` + // right now. + + const executionListeners: GraphQLRequestExecutionListener[] = []; + dispatcher.invokeHookSync( 'executionDidStart', requestContext as GraphQLRequestContextExecutionDidStart, + ).forEach(executionListener => { + if (typeof executionListener === 'function') { + executionListeners.push({ + executionDidEnd: executionListener, + }); + } else if (typeof executionListener === 'object') { + executionListeners.push(executionListener); + } + }); + + const executionDispatcher = new Dispatcher(executionListeners); + + // Create a callback that will trigger the execution dispatcher's + // `willResolveField` hook. We will attach this to the context on a + // symbol so it can be invoked by our `wrapField` method during execution. + const invokeWillResolveField: GraphQLRequestExecutionListener< + TContext + >['willResolveField'] = (...args) => + executionDispatcher.invokeDidStartHook('willResolveField', ...args); + + Object.defineProperty( + requestContext.context, + symbolExecutionDispatcherWillResolveField, + { value: invokeWillResolveField } ); + // If the schema is already enabled, this is a no-op. Otherwise, the + // schema will be augmented so it is able to invoke willResolveField. + enablePluginsForSchemaResolvers(config.schema); + try { const result = await execute( requestContext as GraphQLRequestContextExecutionDidStart, @@ -383,9 +412,9 @@ export async function processGraphQLRequest( errors: result.errors ? formatErrors(result.errors) : undefined, }; - executionDidEnd(); + executionDispatcher.reverseInvokeHookSync("executionDidEnd"); } catch (executionError) { - executionDidEnd(executionError); + executionDispatcher.reverseInvokeHookSync("executionDidEnd", executionError); return await sendErrorResponse(executionError); } } @@ -576,10 +605,8 @@ export async function processGraphQLRequest( } function initializeRequestListenerDispatcher(): Dispatcher< - GraphQLRequestListener + GraphQLRequestListener > { - enablePluginsForSchemaResolvers(config.schema); - const requestListeners: GraphQLRequestListener[] = []; if (config.plugins) { for (const plugin of config.plugins) { diff --git a/packages/apollo-server-core/src/utils/dispatcher.ts b/packages/apollo-server-core/src/utils/dispatcher.ts index ee5226b1b6e..02789591abf 100644 --- a/packages/apollo-server-core/src/utils/dispatcher.ts +++ b/packages/apollo-server-core/src/utils/dispatcher.ts @@ -39,6 +39,20 @@ export class Dispatcher { ); } + public invokeHookSync( + methodName: TMethodName, + ...args: Args + ): ReturnType>[] { + return this.callTargets(this.targets, methodName, ...args); + } + + public reverseInvokeHookSync( + methodName: TMethodName, + ...args: Args + ): ReturnType>[] { + return this.callTargets(this.targets.reverse(), methodName, ...args); + } + public async invokeHooksUntilNonNull( methodName: TMethodName, ...args: Args diff --git a/packages/apollo-server-core/src/utils/pluginTestHarness.ts b/packages/apollo-server-core/src/utils/pluginTestHarness.ts index aed8e007f07..d94c3c5d642 100644 --- a/packages/apollo-server-core/src/utils/pluginTestHarness.ts +++ b/packages/apollo-server-core/src/utils/pluginTestHarness.ts @@ -12,9 +12,12 @@ import { GraphQLSchema, GraphQLObjectType, GraphQLString } from 'graphql/type'; import { CacheHint } from 'apollo-cache-control'; import { enablePluginsForSchemaResolvers, - symbolRequestListenerDispatcher, + symbolExecutionDispatcherWillResolveField, } from './schemaInstrumentation'; -import { ApolloServerPlugin } from 'apollo-server-plugin-base'; +import { + ApolloServerPlugin, + GraphQLRequestExecutionListener, +} from 'apollo-server-plugin-base'; import { InMemoryLRUCache } from 'apollo-server-caching'; import { Dispatcher } from './dispatcher'; @@ -94,8 +97,6 @@ export default async function pluginTestHarness({ }); } - enablePluginsForSchemaResolvers(schema); - const requestContext: GraphQLRequestContext = { logger: logger || console, request: graphqlRequest, @@ -117,30 +118,56 @@ export default async function pluginTestHarness({ throw new Error("Should be impossible to not have a listener."); } - if (typeof listener.willResolveField !== 'function') { - throw new Error("Should be impossible to not have 'willResolveField'."); + const dispatcher = new Dispatcher([listener]); + + const executionListeners: GraphQLRequestExecutionListener[] = []; + + if (typeof listener.executionDidStart === 'function') { + // This execution dispatcher logic is duplicated in the request pipeline + // right now. + dispatcher.invokeHookSync( + 'executionDidStart', + requestContext as GraphQLRequestContextExecutionDidStart, + ).forEach(executionListener => { + if (typeof executionListener === 'function') { + executionListeners.push({ + executionDidEnd: executionListener, + }); + } else if (typeof executionListener === 'object') { + executionListeners.push(executionListener); + } + }); } - const dispatcher = new Dispatcher([listener]); + const executionDispatcher = new Dispatcher(executionListeners); - // Put the dispatcher on the context so `willResolveField` can access it. - Object.defineProperty(requestContext.context, symbolRequestListenerDispatcher, { - value: dispatcher, - }); + // Create a callback that will trigger the execution dispatcher's + // `willResolveField` hook. We will attach this to the context on a + // symbol so it can be invoked by our `wrapField` method during execution. + const invokeWillResolveField: GraphQLRequestExecutionListener< + TContext + >['willResolveField'] = (...args) => + executionDispatcher.invokeDidStartHook('willResolveField', ...args); - const executionDidEnd = dispatcher.invokeDidStartHook( - "executionDidStart", - requestContext as IPluginTestHarnessExecutionDidStart, + Object.defineProperty( + requestContext.context, + symbolExecutionDispatcherWillResolveField, + { value: invokeWillResolveField } ); + // If the schema is already enabled, this is a no-op. Otherwise, the + // schema will be augmented so it is able to invoke willResolveField. + enablePluginsForSchemaResolvers(schema); + try { // `response` is readonly, so we'll cast to `any` to assign to it. (requestContext.response as any) = await executor( requestContext as IPluginTestHarnessExecutionDidStart, ); - executionDidEnd(); - } catch (executionError) { - executionDidEnd(executionError); + executionDispatcher.reverseInvokeHookSync("executionDidEnd"); + + } catch (executionErr) { + executionDispatcher.reverseInvokeHookSync("executionDidEnd", executionErr); } await dispatcher.invokeHookAsync( diff --git a/packages/apollo-server-core/src/utils/schemaInstrumentation.ts b/packages/apollo-server-core/src/utils/schemaInstrumentation.ts index ba01b452783..41d3f72dd3c 100644 --- a/packages/apollo-server-core/src/utils/schemaInstrumentation.ts +++ b/packages/apollo-server-core/src/utils/schemaInstrumentation.ts @@ -1,12 +1,11 @@ import { GraphQLSchema, GraphQLField, ResponsePath, getNamedType, GraphQLObjectType } from "graphql/type"; import { defaultFieldResolver } from "graphql/execution"; import { FieldNode } from "graphql/language"; -import { Dispatcher } from "./dispatcher"; -import { GraphQLRequestListener } from "apollo-server-plugin-base"; +import { GraphQLRequestExecutionListener } from "apollo-server-plugin-base"; import { GraphQLObjectResolver } from "@apollographql/apollo-tools"; -export const symbolRequestListenerDispatcher = - Symbol("apolloServerRequestListenerDispatcher"); +export const symbolExecutionDispatcherWillResolveField = + Symbol("apolloServerExecutionDispatcherWillResolveField"); export const symbolPluginsEnabled = Symbol("apolloServerPluginsEnabled"); export function enablePluginsForSchemaResolvers( @@ -37,14 +36,22 @@ function wrapField(field: GraphQLField): void { __whenObjectResolved?: Promise; }; + const willResolveField = + context && + context[symbolExecutionDispatcherWillResolveField] && + (context[symbolExecutionDispatcherWillResolveField] as + | GraphQLRequestExecutionListener['willResolveField'] + | undefined); + // The technique for implementing a "did resolve field" is accomplished by - // returning a function from the `willResolveField` handler. The - // dispatcher will return a callback which will invoke all of those handlers - // and we'll save that to call when the object resolution is complete. - const endHandler = context && context[symbolRequestListenerDispatcher] && - (context[symbolRequestListenerDispatcher] as Dispatcher) - .invokeDidStartHook('willResolveField', source, args, context, info) || - ((_err: Error | null, _result?: any) => { /* do nothing */ }); + // returning a function from the `willResolveField` handler. While there + // may be several callbacks, depending on the number of plugins which have + // implemented a `willResolveField` hook, this hook will call them all + // as dictated by the dispatcher. We will call this when object + // resolution is complete. + const didResolveField = + typeof willResolveField === 'function' && + willResolveField(source, args, context, info); const resolveObject: GraphQLObjectResolver< any, @@ -84,13 +91,17 @@ function wrapField(field: GraphQLField): void { // Call the stack's handlers either immediately (if result is not a // Promise) or once the Promise is done. Then return that same // maybe-Promise value. - whenResultIsFinished(result, endHandler); + if (typeof didResolveField === "function") { + whenResultIsFinished(result, didResolveField); + } return result; } catch (error) { // Normally it's a bad sign to see an error both handled and // re-thrown. But it is useful to allow extensions to track errors while // still handling them in the normal GraphQL way. - endHandler(error); + if (typeof didResolveField === "function") { + didResolveField(error); + } throw error; } };; diff --git a/packages/apollo-server-plugin-base/src/index.ts b/packages/apollo-server-plugin-base/src/index.ts index 853edf34070..a90786dfd51 100644 --- a/packages/apollo-server-plugin-base/src/index.ts +++ b/packages/apollo-server-plugin-base/src/index.ts @@ -85,11 +85,20 @@ export interface GraphQLRequestListener< ): ValueOrPromise; executionDidStart?( requestContext: GraphQLRequestContextExecutionDidStart, - ): GraphQLRequestListenerExecutionDidEnd | void; - willResolveField?( - ...fieldResolverArgs: Parameters> - ): GraphQLRequestListenerDidResolveField | void; + ): + | GraphQLRequestExecutionListener + | GraphQLRequestListenerExecutionDidEnd + | void; willSendResponse?( requestContext: GraphQLRequestContextWillSendResponse, ): ValueOrPromise; } + +export interface GraphQLRequestExecutionListener< + TContext extends BaseContext = DefaultContext +> extends AnyFunctionMap { + executionDidEnd?: GraphQLRequestListenerExecutionDidEnd; + willResolveField?( + ...fieldResolverArgs: Parameters> + ): GraphQLRequestListenerDidResolveField | void; +} From 6535fcfad366f30fa98850b52e8a2da853338db0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 6 May 2020 18:13:34 +0000 Subject: [PATCH 514/642] chore(deps): update dependency @apollographql/apollo-tools to v0.4.8 (#4075) Co-authored-by: Renovate Bot --- package-lock.json | 22 +++++++++++----------- package.json | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index ec9080df78e..249bef8c6bc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -433,28 +433,28 @@ } }, "@apollographql/apollo-tools": { - "version": "0.4.7", - "resolved": "https://registry.npmjs.org/@apollographql/apollo-tools/-/apollo-tools-0.4.7.tgz", - "integrity": "sha512-6QjZz6aLq6QXHgJ1AmSg4C4cBmhF5z3g7LPsk4g+zJoWKxiFuSIbrTe12ETtn6wgPq//e5p2agbXYydIjqs7gw==", + "version": "0.4.8", + "resolved": "https://registry.npmjs.org/@apollographql/apollo-tools/-/apollo-tools-0.4.8.tgz", + "integrity": "sha512-W2+HB8Y7ifowcf3YyPHgDI05izyRtOeZ4MqIr7LbTArtmJ0ZHULWpn84SGMW7NAvTV1tFExpHlveHhnXuJfuGA==", "requires": { - "apollo-env": "^0.6.4" + "apollo-env": "^0.6.5" }, "dependencies": { "@types/node-fetch": { - "version": "2.5.6", - "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.6.tgz", - "integrity": "sha512-2w0NTwMWF1d3NJMK0Uiq2UNN8htVCyOWOD0jIPjPgC5Ph/YP4dVhs9YxxcMcuLuwAslz0dVEcZQUaqkLs3IzOQ==", + "version": "2.5.7", + "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.7.tgz", + "integrity": "sha512-o2WVNf5UhWRkxlf6eq+jMZDu7kjgpgJfl4xVNlvryc95O/6F2ld8ztKX+qu+Rjyet93WAWm5LjeX9H5FGkODvw==", "requires": { "@types/node": "*", "form-data": "^3.0.0" } }, "apollo-env": { - "version": "0.6.4", - "resolved": "https://registry.npmjs.org/apollo-env/-/apollo-env-0.6.4.tgz", - "integrity": "sha512-8tGDMFv3sZLd76b/ZAo8GbdWU5Qt3VEUWSB+FLN41p/hVShZw0XIo2s/i8pVCTAhaWiEiD0Cr+d/zi0/h5UTxA==", + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/apollo-env/-/apollo-env-0.6.5.tgz", + "integrity": "sha512-jeBUVsGymeTHYWp3me0R2CZRZrFeuSZeICZHCeRflHTfnQtlmbSXdy5E0pOyRM9CU4JfQkKDC98S1YglQj7Bzg==", "requires": { - "@types/node-fetch": "2.5.6", + "@types/node-fetch": "2.5.7", "core-js": "^3.0.1", "node-fetch": "^2.2.0", "sha.js": "^2.4.11" diff --git a/package.json b/package.json index f6847bba505..efbd640c93c 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "node": ">=6" }, "dependencies": { - "@apollographql/apollo-tools": "0.4.7", + "@apollographql/apollo-tools": "0.4.8", "@apollo/federation": "file:packages/apollo-federation", "@apollo/gateway": "file:packages/apollo-gateway", "apollo-cache-control": "file:packages/apollo-cache-control", From ba884473a10b70535a2a33ed5f6a82abaa46aed6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 6 May 2020 18:13:34 +0000 Subject: [PATCH 515/642] chore(deps): update dependency apollo-graphql to v0.4.4 (#305) Co-authored-by: Renovate Bot --- packages/apollo-server-plugin-operation-registry/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/package.json b/packages/apollo-server-plugin-operation-registry/package.json index 28b1c30985b..bbf462edc41 100644 --- a/packages/apollo-server-plugin-operation-registry/package.json +++ b/packages/apollo-server-plugin-operation-registry/package.json @@ -11,7 +11,7 @@ "node": ">=8" }, "dependencies": { - "apollo-graphql": "0.4.3", + "apollo-graphql": "0.4.4", "apollo-server-caching": "^0.5.0", "apollo-server-errors": "^2.2.0", "apollo-server-plugin-base": "^0.8.0", From 60cd32d0cc35b02fcdf57805dd450f4f07cfb55f Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 7 May 2020 07:59:34 +0000 Subject: [PATCH 516/642] tests: Introduce a test which demonstrates `fieldResolver` behavior. This commit relates to a review comment here: https://github.com/apollographql/apollo-server/pull/3988#discussion_r414676152 This test is meant to help reason about the concern brought up during PR review. Specifically, the concern was about losing functionality of passing a custom `fieldResolver` to `processGraphQLRequest`. This test aims to show that passing a `fieldResolver` to `runQuery` (which calls into `processGraphQLRequest` _nearly_ directly) and eventually gets passed directly into `graphql`'s `execute` method (in a non-federated context) will still work as expected after it's been wrapped by `wrapField` (in our schema instrumentation mechanisms) when a `willResolveField` plugin hook is defined. --- .../src/__tests__/runQuery.test.ts | 75 +++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/packages/apollo-server-core/src/__tests__/runQuery.test.ts b/packages/apollo-server-core/src/__tests__/runQuery.test.ts index 9953b120714..91c5b8ef46a 100644 --- a/packages/apollo-server-core/src/__tests__/runQuery.test.ts +++ b/packages/apollo-server-core/src/__tests__/runQuery.test.ts @@ -721,6 +721,81 @@ describe('runQuery', () => { expect(didResolveField).toHaveBeenCalledTimes(2); expect(executionDidEnd).toHaveBeenCalledTimes(1); }); + + it('uses the custom "fieldResolver" when defined', async () => { + const schemaWithResolver = new GraphQLSchema({ + query: new GraphQLObjectType({ + name: 'QueryType', + fields: { + testString: { + type: GraphQLString, + resolve() { + return "using schema-defined resolver"; + }, + }, + } + }) + }); + + const schemaWithoutResolver = new GraphQLSchema({ + query: new GraphQLObjectType({ + name: 'QueryType', + fields: { + testString: { + type: GraphQLString, + }, + } + }) + }); + + const differentFieldResolver = () => "I'm diffrnt, ya, I'm diffrnt."; + + const queryString = `{ testString } `; + + const didResolveField: GraphQLRequestListenerDidResolveField = + jest.fn(); + const willResolveField = jest.fn(() => didResolveField); + + const plugins: ApolloServerPlugin[] = [ + { + requestDidStart: () => ({ + executionDidStart: () => ({ + willResolveField, + }), + }) + }, + ]; + + const resultFromSchemaWithResolver = await runQuery({ + schema: schemaWithResolver, + queryString, + plugins, + request: new MockReq(), + fieldResolver: differentFieldResolver, + }); + + expect(willResolveField).toHaveBeenCalledTimes(1); + expect(didResolveField).toHaveBeenCalledTimes(1); + + expect(resultFromSchemaWithResolver.data).toEqual({ + testString: "using schema-defined resolver" + }); + + const resultFromSchemaWithoutResolver = await runQuery({ + schema: schemaWithoutResolver, + queryString, + plugins, + request: new MockReq(), + fieldResolver: differentFieldResolver, + }); + + expect(willResolveField).toHaveBeenCalledTimes(2); + expect(didResolveField).toHaveBeenCalledTimes(2); + + expect(resultFromSchemaWithoutResolver.data).toEqual({ + testString: "I'm diffrnt, ya, I'm diffrnt." + }); + }); }); }); From ef4ed58cb5e14bb638e4580760673de347a88de0 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 7 May 2020 09:06:38 +0000 Subject: [PATCH 517/642] Revert "Update CHANGELOG.md" This reverts the public messaging about `tracing` deprecation in commit 98bae446d37704939bd7e0bf010503c66215dfd8, for now, until we can discuss its fate a bit more, and how we intend on making up for that. --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 361931c8bef..a32e400dd26 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,7 @@ The version headers in this history reflect the versions of Apollo Server itself > 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. When a release is being prepared, a new header will be (manually) created below and the the appropriate changes within that release will be moved into the new section. - `apollo-server-lambda`: Support file uploads on AWS Lambda [Issue #1419](https://github.com/apollographql/apollo-server/issues/1419) [Issue #1703](https://github.com/apollographql/apollo-server/issues/1703) [PR #3926](https://github.com/apollographql/apollo-server/pull/3926) -- `apollo-tracing`: This package is considered deprecated and — along with its `tracing: Boolean` configuration option on the `ApolloServer` constructor options — will cease to exist in Apollo Server 3.x. Until that occurs, we've updated the _internal_ integration of this package with Apollo Server itself to use the newer [request pipeline plugin API](https://www.apollographql.com/docs/apollo-server/integrations/plugins/), rather than the _also_ soon-to-be-deprecated-`graphql-extensions` API it previously leveraged. The behavior should remain otherwise the same. [PR #3991](https://github.com/apollographql/apollo-server/pull/3991) +- `apollo-tracing`: This package's internal integration with Apollo Server has been switched from using the soon-to-be-deprecated`graphql-extensions` API to using [the request pipeline plugin API](https://www.apollographql.com/docs/apollo-server/integrations/plugins/). Behavior should remain otherwise the same. [PR #3991](https://github.com/apollographql/apollo-server/pull/3991) - **breaking** `apollo-engine-reporting-protobuf`: Drop legacy fields that were never used by `apollo-engine-reporting`. Added new fields `StatsContext` to allow `apollo-server` to send summary stats instead of full traces, and renamed `FullTracesReport` to `Report` and `Traces` to `TracesAndStats` since reports now can include stats as well as traces. ### v2.12.0 From 283e82f307774b68c560786c07cf25c717c69299 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 7 May 2020 09:59:35 +0000 Subject: [PATCH 518/642] Tweak err. message when `ftv1` is already present in `extensions` response. Ref: https://github.com/apollographql/apollo-server/pull/3998/files#r414902801 --- packages/apollo-engine-reporting/src/federatedPlugin.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/apollo-engine-reporting/src/federatedPlugin.ts b/packages/apollo-engine-reporting/src/federatedPlugin.ts index e69e6cc92e4..f02ce267fca 100644 --- a/packages/apollo-engine-reporting/src/federatedPlugin.ts +++ b/packages/apollo-engine-reporting/src/federatedPlugin.ts @@ -52,8 +52,10 @@ const federatedPlugin = ( const extensions = response.extensions || (response.extensions = Object.create(null)); + // This should only happen if another plugin is using the same name- + // space within the `extensions` object and got to it before us. if (typeof extensions.ftv1 !== "undefined") { - throw new Error("The `ftv1` `extensions` were already present."); + throw new Error("The `ftv1` extension was already present."); } extensions.ftv1 = encodedBuffer.toString('base64'); From e0949ec20b0e6eee1dc0f24e4d2e370e40012137 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 7 May 2020 10:10:17 +0000 Subject: [PATCH 519/642] Remove `TODO` comment I suggested I'd remove! Ref: https://github.com/apollographql/apollo-server/pull/3998/files#r409729299 --- packages/apollo-server-core/src/ApolloServer.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/apollo-server-core/src/ApolloServer.ts b/packages/apollo-server-core/src/ApolloServer.ts index d0f935ff36a..3baa43237f7 100644 --- a/packages/apollo-server-core/src/ApolloServer.ts +++ b/packages/apollo-server-core/src/ApolloServer.ts @@ -757,7 +757,6 @@ export class ApolloServerBase { // User's plugins, provided as an argument to this method, will be added // at the end of that list so they take precedence. // A follow-up commit will actually introduce this. - // Also, TODO, remove this comment. const federatedSchema = this.schema && this.schemaIsFederated(this.schema); const { engine } = this.config; From 39a59c5487f5340702f0e36a90f6340cd222cf6d Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 7 May 2020 11:21:38 +0000 Subject: [PATCH 520/642] types: Fix uncaught error in `runQuery.test` after #3996. --- packages/apollo-server-core/src/__tests__/runQuery.test.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/apollo-server-core/src/__tests__/runQuery.test.ts b/packages/apollo-server-core/src/__tests__/runQuery.test.ts index 91c5b8ef46a..aa5b98282ce 100644 --- a/packages/apollo-server-core/src/__tests__/runQuery.test.ts +++ b/packages/apollo-server-core/src/__tests__/runQuery.test.ts @@ -27,6 +27,7 @@ import { } from 'apollo-server-plugin-base'; import { GraphQLRequestListener } from 'apollo-server-plugin-base'; import { InMemoryLRUCache } from 'apollo-server-caching'; +import { generateSchemaHash } from "../utils/schemaHash"; // This is a temporary kludge to ensure we preserve runQuery behavior with the // GraphQLRequestProcessor refactoring. @@ -42,8 +43,13 @@ function runQuery(options: QueryOptions): Promise { http: options.request, }; + const schemaHash = generateSchemaHash(schema); + return processGraphQLRequest(options, { request, + schema: options.schema, + schemaHash, + metrics: {}, logger: console, context: options.context || {}, debug: options.debug, From efa7131f5787976e809f058114728aeff74b4bfe Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 7 May 2020 11:23:06 +0000 Subject: [PATCH 521/642] tests: Ensure `schema` and `schemaHash` are present on `requestContext`. --- .../src/__tests__/runQuery.test.ts | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/packages/apollo-server-core/src/__tests__/runQuery.test.ts b/packages/apollo-server-core/src/__tests__/runQuery.test.ts index aa5b98282ce..4b0c257a3b4 100644 --- a/packages/apollo-server-core/src/__tests__/runQuery.test.ts +++ b/packages/apollo-server-core/src/__tests__/runQuery.test.ts @@ -481,6 +481,24 @@ describe('runQuery', () => { await runOnce(); expect(requestDidStart.mock.calls.length).toBe(2); }); + + it('is called with the schema and schemaHash', async () => { + await runQuery({ + schema, + queryString: '{ testString }', + plugins: [ + { + requestDidStart, + }, + ], + request: new MockReq(), + }); + + const invocation = requestDidStart.mock.calls[0][0]; + expect(invocation).toHaveProperty('schema', schema); + expect(invocation).toHaveProperty( /* Shorter as a RegExp */ + 'schemaHash', expect.stringMatching(/^8ff87f3e0/)); + }); }); describe('parsingDidStart', () => { From e813e5b73a2bb14a93af9f91fd2ede6684c1ecae Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 7 May 2020 12:07:04 +0000 Subject: [PATCH 522/642] refactor(tests): Better helpers for APQ tests in intgr. testsuite. --- .../src/index.ts | 72 +++++++++++-------- 1 file changed, 42 insertions(+), 30 deletions(-) diff --git a/packages/apollo-server-integration-testsuite/src/index.ts b/packages/apollo-server-integration-testsuite/src/index.ts index a5dd026108f..a2618f328b7 100644 --- a/packages/apollo-server-integration-testsuite/src/index.ts +++ b/packages/apollo-server-integration-testsuite/src/index.ts @@ -18,7 +18,12 @@ import { import request from 'supertest'; -import { GraphQLOptions, Config } from 'apollo-server-core'; +import { + GraphQLOptions, + Config, + PersistedQueryOptions, + KeyValueCache, +} from 'apollo-server-core'; import gql from 'graphql-tag'; import { ValueOrPromise } from 'apollo-server-types'; import { GraphQLRequestListener } from "apollo-server-plugin-base"; @@ -1221,12 +1226,7 @@ export default (createApp: CreateAppFunc, destroyApp?: DestroyAppFunc) => { }, }; - let didEncounterErrors: jest.Mock< - ReturnType, - Parameters - >; - - function createMockCache() { + function createMockCache(): KeyValueCache { const map = new Map(); return { set: jest.fn(async (key, val) => { @@ -1237,10 +1237,13 @@ export default (createApp: CreateAppFunc, destroyApp?: DestroyAppFunc) => { }; } - beforeEach(async () => { - didEncounterErrors = jest.fn(); - const cache = createMockCache(); - app = await createApp({ + let didEncounterErrors: jest.Mock< + ReturnType, + Parameters + >; + + function createApqApp(apqOptions: PersistedQueryOptions = {}) { + return createApp({ graphqlOptions: { schema, plugins: [ @@ -1252,22 +1255,21 @@ export default (createApp: CreateAppFunc, destroyApp?: DestroyAppFunc) => { ], persistedQueries: { cache, + ...apqOptions, }, }, }); + } + + let cache: KeyValueCache; + + beforeEach(async () => { + cache = createMockCache(); + didEncounterErrors = jest.fn(); }); it('when ttlSeconds is set, passes ttl to the apq cache set call', async () => { - const cache = createMockCache(); - app = await createApp({ - graphqlOptions: { - schema, - persistedQueries: { - cache: cache, - ttl: 900, - }, - }, - }); + app = await createApqApp({ ttl: 900 }); await request(app) .post('/graphql') @@ -1287,15 +1289,7 @@ export default (createApp: CreateAppFunc, destroyApp?: DestroyAppFunc) => { it('when ttlSeconds is unset, ttl is not passed to apq cache', async () => { - const cache = createMockCache(); - app = await createApp({ - graphqlOptions: { - schema, - persistedQueries: { - cache: cache, - }, - }, - }); + app = await createApqApp(); await request(app) .post('/graphql') @@ -1315,6 +1309,8 @@ export default (createApp: CreateAppFunc, destroyApp?: DestroyAppFunc) => { ); it('errors when version is not specified', async () => { + app = await createApqApp(); + const result = await request(app) .get('/graphql') .query({ @@ -1346,6 +1342,8 @@ export default (createApp: CreateAppFunc, destroyApp?: DestroyAppFunc) => { }); it('errors when version is unsupported', async () => { + app = await createApqApp(); + const result = await request(app) .get('/graphql') .query({ @@ -1378,6 +1376,8 @@ export default (createApp: CreateAppFunc, destroyApp?: DestroyAppFunc) => { }); it('errors when hash is mismatched', async () => { + app = await createApqApp(); + const result = await request(app) .get('/graphql') .query({ @@ -1410,6 +1410,8 @@ export default (createApp: CreateAppFunc, destroyApp?: DestroyAppFunc) => { }); it('returns PersistedQueryNotFound on the first try', async () => { + app = await createApqApp(); + const result = await request(app) .post('/graphql') .send({ @@ -1432,6 +1434,8 @@ export default (createApp: CreateAppFunc, destroyApp?: DestroyAppFunc) => { ); }); it('returns result on the second try', async () => { + app = await createApqApp(); + await request(app) .post('/graphql') .send({ @@ -1465,6 +1469,8 @@ export default (createApp: CreateAppFunc, destroyApp?: DestroyAppFunc) => { }); it('returns with batched persisted queries', async () => { + app = await createApqApp(); + const errors = await request(app) .post('/graphql') .send([ @@ -1510,6 +1516,8 @@ export default (createApp: CreateAppFunc, destroyApp?: DestroyAppFunc) => { }); it('returns result on the persisted query', async () => { + app = await createApqApp(); + await request(app) .post('/graphql') .send({ @@ -1532,6 +1540,8 @@ export default (createApp: CreateAppFunc, destroyApp?: DestroyAppFunc) => { }); it('returns error when hash does not match', async () => { + app = await createApqApp(); + const response = await request(app) .post('/graphql') .send({ @@ -1549,6 +1559,8 @@ export default (createApp: CreateAppFunc, destroyApp?: DestroyAppFunc) => { }); it('returns correct result using get request', async () => { + app = await createApqApp(); + await request(app) .post('/graphql') .send({ From d91358911429b0db4866ae0b43878becb5e49134 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 7 May 2020 12:26:51 +0000 Subject: [PATCH 523/642] wip didResolveSource --- docs/source/integrations/plugins.md | 17 ++++++++++ .../src/__tests__/runQuery.test.ts | 29 ++++++++++++++++ .../apollo-server-core/src/requestPipeline.ts | 11 ++++++ .../src/index.ts | 34 ++++++++++++++++++- .../apollo-server-plugin-base/src/index.ts | 5 +++ packages/apollo-server-types/src/index.ts | 4 ++- 6 files changed, 98 insertions(+), 2 deletions(-) diff --git a/docs/source/integrations/plugins.md b/docs/source/integrations/plugins.md index df4003d8544..2c9c2600381 100644 --- a/docs/source/integrations/plugins.md +++ b/docs/source/integrations/plugins.md @@ -313,6 +313,23 @@ should not return a value. > If you're using TypeScript to create your plugin, implement the [ `GraphQLRequestListener` interface](https://github.com/apollographql/apollo-server/blob/master/packages/apollo-server-plugin-base/src/index.ts) from the `apollo-server-plugin-base` module to define functions for request lifecycle events. +### `didResolveSource` + +The `didResolveSource` event is invoked after Apollo Server has determined the +`String`-representation of the incoming operation that it will act upon. In the +event that this `String` was not directly passed in from the client, this +may be retrieved from a cache store (e.g., Automated Persisted Queries). + +At this stage, there is not a guarantee that the operation is not malformed. + +```typescript +didResolveSource?( + requestContext: WithRequired< + GraphQLRequestContext, 'source' | 'logger'>, + >, +): ValueOrPromise; +``` + ### `parsingDidStart` The `parsingDidStart` event fires whenever Apollo Server will parse a GraphQL diff --git a/packages/apollo-server-core/src/__tests__/runQuery.test.ts b/packages/apollo-server-core/src/__tests__/runQuery.test.ts index 4b0c257a3b4..54e102dae4e 100644 --- a/packages/apollo-server-core/src/__tests__/runQuery.test.ts +++ b/packages/apollo-server-core/src/__tests__/runQuery.test.ts @@ -501,6 +501,30 @@ describe('runQuery', () => { }); }); + describe('didResolveSource', () => { + const didResolveSource = jest.fn(); + it('called with the source', async () => { + await runQuery({ + schema, + queryString: '{ testString }', + plugins: [ + { + requestDidStart() { + return { + didResolveSource, + }; + }, + }, + ], + request: new MockReq(), + }); + + expect(didResolveSource).toHaveBeenCalled(); + expect(didResolveSource.mock.calls[0][0]) + .toHaveProperty('source', '{ testString }'); + }); + }); + describe('parsingDidStart', () => { const parsingDidStart = jest.fn(); it('called when parsing will result in an error', async () => { @@ -888,6 +912,9 @@ describe('runQuery', () => { let stopAwaiting: Function; const toBeAwaited = new Promise(resolve => stopAwaiting = resolve); + const didResolveSource: GraphQLRequestListener['didResolveSource'] = + jest.fn(() => { callOrder.push('didResolveSource') }); + const didResolveField: GraphQLRequestListenerDidResolveField = jest.fn(() => callOrder.push("didResolveField")); @@ -932,6 +959,7 @@ describe('runQuery', () => { { requestDidStart() { return { + didResolveSource, executionDidStart, }; }, @@ -944,6 +972,7 @@ describe('runQuery', () => { expect(willResolveField).toHaveBeenCalledTimes(1); expect(didResolveField).toHaveBeenCalledTimes(1); expect(callOrder).toStrictEqual([ + "didResolveSource", "executionDidStart", "willResolveField", "beforeAwaiting", diff --git a/packages/apollo-server-core/src/requestPipeline.ts b/packages/apollo-server-core/src/requestPipeline.ts index 8ad8536b69c..dd3b283cc43 100644 --- a/packages/apollo-server-core/src/requestPipeline.ts +++ b/packages/apollo-server-core/src/requestPipeline.ts @@ -49,6 +49,7 @@ import { import { ApolloServerPlugin, GraphQLRequestListener, + GraphQLRequestContextDidResolveSource, GraphQLRequestContextExecutionDidStart, GraphQLRequestContextResponseForOperation, GraphQLRequestContextDidResolveOperation, @@ -214,6 +215,16 @@ export async function processGraphQLRequest( requestContext.queryHash = queryHash; requestContext.source = query; + // Let the plugins know that we now have a STRING of what we hope will + // parse and validate into a document we can execute on. Unless we have + // retrieved this from our APQ cache, there's no guarantee that it is + // syntactically correct, so this string should not be trusted as a valid + // document until after it's parsed and validated. + await dispatcher.invokeHookAsync( + 'didResolveSource', + requestContext as GraphQLRequestContextDidResolveSource, + ); + const requestDidEnd = extensionStack.requestDidStart({ request: request.http!, queryString: request.query, diff --git a/packages/apollo-server-integration-testsuite/src/index.ts b/packages/apollo-server-integration-testsuite/src/index.ts index a2618f328b7..37aab04fe10 100644 --- a/packages/apollo-server-integration-testsuite/src/index.ts +++ b/packages/apollo-server-integration-testsuite/src/index.ts @@ -1242,6 +1242,11 @@ export default (createApp: CreateAppFunc, destroyApp?: DestroyAppFunc) => { Parameters >; + let didResolveSource: jest.Mock< + ReturnType, + Parameters + >; + function createApqApp(apqOptions: PersistedQueryOptions = {}) { return createApp({ graphqlOptions: { @@ -1249,7 +1254,10 @@ export default (createApp: CreateAppFunc, destroyApp?: DestroyAppFunc) => { plugins: [ { requestDidStart() { - return { didEncounterErrors }; + return { + didResolveSource, + didEncounterErrors, + }; } } ], @@ -1265,6 +1273,7 @@ export default (createApp: CreateAppFunc, destroyApp?: DestroyAppFunc) => { beforeEach(async () => { cache = createMockCache(); + didResolveSource = jest.fn(); didEncounterErrors = jest.fn(); }); @@ -1285,6 +1294,8 @@ export default (createApp: CreateAppFunc, destroyApp?: DestroyAppFunc) => { ttl: 900, }), ); + expect(didResolveSource.mock.calls[0][0]) + .toHaveProperty('source', query); }); it('when ttlSeconds is unset, ttl is not passed to apq cache', @@ -1305,6 +1316,8 @@ export default (createApp: CreateAppFunc, destroyApp?: DestroyAppFunc) => { ttl: 900, }), ); + expect(didResolveSource.mock.calls[0][0]) + .toHaveProperty('source', query); } ); @@ -1407,6 +1420,8 @@ export default (createApp: CreateAppFunc, destroyApp?: DestroyAppFunc) => { })]), }), ); + + expect(didResolveSource).not.toHaveBeenCalled(); }); it('returns PersistedQueryNotFound on the first try', async () => { @@ -1432,6 +1447,8 @@ export default (createApp: CreateAppFunc, destroyApp?: DestroyAppFunc) => { ]), }), ); + + expect(didResolveSource).not.toHaveBeenCalled(); }); it('returns result on the second try', async () => { app = await createApqApp(); @@ -1452,6 +1469,8 @@ export default (createApp: CreateAppFunc, destroyApp?: DestroyAppFunc) => { }), ); + expect(didResolveSource).not.toHaveBeenCalled(); + const result = await request(app) .post('/graphql') .send({ @@ -1464,6 +1483,9 @@ export default (createApp: CreateAppFunc, destroyApp?: DestroyAppFunc) => { // asserted above. expect(didEncounterErrors).toHaveBeenCalledTimes(1); + expect(didResolveSource.mock.calls[0][0]) + .toHaveProperty('source', query); + expect(result.body.data).toEqual({ testString: 'it works' }); expect(result.body.errors).toBeUndefined(); }); @@ -1523,6 +1545,9 @@ export default (createApp: CreateAppFunc, destroyApp?: DestroyAppFunc) => { .send({ extensions, }); + + expect(didResolveSource).not.toHaveBeenCalled(); + await request(app) .post('/graphql') .send({ @@ -1535,6 +1560,9 @@ export default (createApp: CreateAppFunc, destroyApp?: DestroyAppFunc) => { extensions, }); + expect(didResolveSource.mock.calls[0][0]) + .toHaveProperty('source', query); + expect(result.body.data).toEqual({ testString: 'it works' }); expect(result.body.errors).toBeUndefined(); }); @@ -1556,6 +1584,7 @@ export default (createApp: CreateAppFunc, destroyApp?: DestroyAppFunc) => { }); expect(response.status).toEqual(400); expect(response.error.text).toMatch(/does not match query/); + expect(didResolveSource).not.toHaveBeenCalled(); }); it('returns correct result using get request', async () => { @@ -1573,6 +1602,9 @@ export default (createApp: CreateAppFunc, destroyApp?: DestroyAppFunc) => { extensions: JSON.stringify(extensions), }); expect(result.body.data).toEqual({ testString: 'it works' }); + expect(didResolveSource.mock.calls[0][0]) + .toHaveProperty('source', query); + }); }); }); diff --git a/packages/apollo-server-plugin-base/src/index.ts b/packages/apollo-server-plugin-base/src/index.ts index a90786dfd51..aef514d38de 100644 --- a/packages/apollo-server-plugin-base/src/index.ts +++ b/packages/apollo-server-plugin-base/src/index.ts @@ -8,6 +8,7 @@ import { GraphQLResponse, ValueOrPromise, WithRequired, + GraphQLRequestContextDidResolveSource, GraphQLRequestContextParsingDidStart, GraphQLRequestContextValidationDidStart, GraphQLRequestContextDidResolveOperation, @@ -35,6 +36,7 @@ export { GraphQLResponse, ValueOrPromise, WithRequired, + GraphQLRequestContextDidResolveSource, GraphQLRequestContextParsingDidStart, GraphQLRequestContextValidationDidStart, GraphQLRequestContextDidResolveOperation, @@ -63,6 +65,9 @@ export type GraphQLRequestListenerDidResolveField = export interface GraphQLRequestListener< TContext extends BaseContext = DefaultContext > extends AnyFunctionMap { + didResolveSource?( + requestContext: GraphQLRequestContextDidResolveSource, + ): ValueOrPromise; parsingDidStart?( requestContext: GraphQLRequestContextParsingDidStart, ): GraphQLRequestListenerParsingDidEnd | void; diff --git a/packages/apollo-server-types/src/index.ts b/packages/apollo-server-types/src/index.ts index e5707818f9e..f63a8629d8d 100644 --- a/packages/apollo-server-types/src/index.ts +++ b/packages/apollo-server-types/src/index.ts @@ -151,12 +151,14 @@ export type Logger = { error(message?: any): void; } -export type GraphQLRequestContextParsingDidStart = +export type GraphQLRequestContextDidResolveSource = WithRequired, | 'metrics' | 'source' | 'queryHash' >; +export type GraphQLRequestContextParsingDidStart = + GraphQLRequestContextDidResolveSource; export type GraphQLRequestContextValidationDidStart = GraphQLRequestContextParsingDidStart & WithRequired, From 39ff086db696e5148044b4b798e4d5d83aeb5060 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 7 May 2020 12:27:09 +0000 Subject: [PATCH 524/642] other stuff --- packages/apollo-server-core/src/__tests__/runQuery.test.ts | 6 ++++++ packages/apollo-server-integration-testsuite/src/index.ts | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/apollo-server-core/src/__tests__/runQuery.test.ts b/packages/apollo-server-core/src/__tests__/runQuery.test.ts index 54e102dae4e..7e41b081932 100644 --- a/packages/apollo-server-core/src/__tests__/runQuery.test.ts +++ b/packages/apollo-server-core/src/__tests__/runQuery.test.ts @@ -912,6 +912,9 @@ describe('runQuery', () => { let stopAwaiting: Function; const toBeAwaited = new Promise(resolve => stopAwaiting = resolve); + const validationDidStart: GraphQLRequestListener['validationDidStart'] = + jest.fn(() => { callOrder.push('validationDidStart') }); + const didResolveSource: GraphQLRequestListener['didResolveSource'] = jest.fn(() => { callOrder.push('didResolveSource') }); @@ -960,6 +963,7 @@ describe('runQuery', () => { requestDidStart() { return { didResolveSource, + validationDidStart, executionDidStart, }; }, @@ -968,11 +972,13 @@ describe('runQuery', () => { request: new MockReq(), }); + expect(validationDidStart).toHaveBeenCalledTimes(1); expect(executionDidStart).toHaveBeenCalledTimes(1); expect(willResolveField).toHaveBeenCalledTimes(1); expect(didResolveField).toHaveBeenCalledTimes(1); expect(callOrder).toStrictEqual([ "didResolveSource", + "validationDidStart", "executionDidStart", "willResolveField", "beforeAwaiting", diff --git a/packages/apollo-server-integration-testsuite/src/index.ts b/packages/apollo-server-integration-testsuite/src/index.ts index 37aab04fe10..e39cb84d036 100644 --- a/packages/apollo-server-integration-testsuite/src/index.ts +++ b/packages/apollo-server-integration-testsuite/src/index.ts @@ -1289,7 +1289,7 @@ export default (createApp: CreateAppFunc, destroyApp?: DestroyAppFunc) => { expect(cache.set).toHaveBeenCalledWith( expect.stringMatching(/^apq:/), - '{testString}', + query, expect.objectContaining({ ttl: 900, }), From 129c255c766dead440412b242e93c236d21bbef3 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 7 May 2020 12:27:09 +0000 Subject: [PATCH 525/642] tests: Add further life-cycle ordering tests for parsing and validation. --- .../src/__tests__/runQuery.test.ts | 28 +++++++++++++++++++ .../src/index.ts | 2 +- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/packages/apollo-server-core/src/__tests__/runQuery.test.ts b/packages/apollo-server-core/src/__tests__/runQuery.test.ts index 91c5b8ef46a..a788c6351dc 100644 --- a/packages/apollo-server-core/src/__tests__/runQuery.test.ts +++ b/packages/apollo-server-core/src/__tests__/runQuery.test.ts @@ -24,6 +24,8 @@ import { GraphQLRequestExecutionListener, GraphQLRequestListenerDidResolveField, GraphQLRequestListenerExecutionDidEnd, + GraphQLRequestListenerParsingDidEnd, + GraphQLRequestListenerValidationDidEnd, } from 'apollo-server-plugin-base'; import { GraphQLRequestListener } from 'apollo-server-plugin-base'; import { InMemoryLRUCache } from 'apollo-server-caching'; @@ -864,6 +866,22 @@ describe('runQuery', () => { let stopAwaiting: Function; const toBeAwaited = new Promise(resolve => stopAwaiting = resolve); + const parsingDidEnd: GraphQLRequestListenerParsingDidEnd = + jest.fn(() => callOrder.push('parsingDidEnd')); + const parsingDidStart: GraphQLRequestListener['parsingDidStart'] = + jest.fn(() => { + callOrder.push('parsingDidStart'); + return parsingDidEnd; + }); + + const validationDidEnd: GraphQLRequestListenerValidationDidEnd = + jest.fn(() => callOrder.push('validationDidEnd')); + const validationDidStart: GraphQLRequestListener['validationDidStart'] = + jest.fn(() => { + callOrder.push('validationDidStart'); + return validationDidEnd; + }); + const didResolveField: GraphQLRequestListenerDidResolveField = jest.fn(() => callOrder.push("didResolveField")); @@ -908,6 +926,8 @@ describe('runQuery', () => { { requestDidStart() { return { + parsingDidStart, + validationDidStart, executionDidStart, }; }, @@ -916,10 +936,18 @@ describe('runQuery', () => { request: new MockReq(), }); + expect(parsingDidStart).toHaveBeenCalledTimes(1); + expect(parsingDidEnd).toHaveBeenCalledTimes(1); + expect(validationDidStart).toHaveBeenCalledTimes(1); + expect(validationDidEnd).toHaveBeenCalledTimes(1); expect(executionDidStart).toHaveBeenCalledTimes(1); expect(willResolveField).toHaveBeenCalledTimes(1); expect(didResolveField).toHaveBeenCalledTimes(1); expect(callOrder).toStrictEqual([ + "parsingDidStart", + "parsingDidEnd", + "validationDidStart", + "validationDidEnd", "executionDidStart", "willResolveField", "beforeAwaiting", diff --git a/packages/apollo-server-integration-testsuite/src/index.ts b/packages/apollo-server-integration-testsuite/src/index.ts index a5dd026108f..4270b2bda31 100644 --- a/packages/apollo-server-integration-testsuite/src/index.ts +++ b/packages/apollo-server-integration-testsuite/src/index.ts @@ -1278,7 +1278,7 @@ export default (createApp: CreateAppFunc, destroyApp?: DestroyAppFunc) => { expect(cache.set).toHaveBeenCalledWith( expect.stringMatching(/^apq:/), - '{testString}', + query, expect.objectContaining({ ttl: 900, }), From 66d586924821094f55ac5ca966a7cbf07b54b52f Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 7 May 2020 12:07:04 +0000 Subject: [PATCH 526/642] refactor(tests): Better helpers for APQ tests in intgr. testsuite. To be leveraged soon: https://github.com/apollographql/apollo-server/pull/3998 --- .../src/index.ts | 72 +++++++++++-------- 1 file changed, 42 insertions(+), 30 deletions(-) diff --git a/packages/apollo-server-integration-testsuite/src/index.ts b/packages/apollo-server-integration-testsuite/src/index.ts index 4270b2bda31..99a8490d60a 100644 --- a/packages/apollo-server-integration-testsuite/src/index.ts +++ b/packages/apollo-server-integration-testsuite/src/index.ts @@ -18,7 +18,12 @@ import { import request from 'supertest'; -import { GraphQLOptions, Config } from 'apollo-server-core'; +import { + GraphQLOptions, + Config, + PersistedQueryOptions, + KeyValueCache, +} from 'apollo-server-core'; import gql from 'graphql-tag'; import { ValueOrPromise } from 'apollo-server-types'; import { GraphQLRequestListener } from "apollo-server-plugin-base"; @@ -1221,12 +1226,7 @@ export default (createApp: CreateAppFunc, destroyApp?: DestroyAppFunc) => { }, }; - let didEncounterErrors: jest.Mock< - ReturnType, - Parameters - >; - - function createMockCache() { + function createMockCache(): KeyValueCache { const map = new Map(); return { set: jest.fn(async (key, val) => { @@ -1237,10 +1237,13 @@ export default (createApp: CreateAppFunc, destroyApp?: DestroyAppFunc) => { }; } - beforeEach(async () => { - didEncounterErrors = jest.fn(); - const cache = createMockCache(); - app = await createApp({ + let didEncounterErrors: jest.Mock< + ReturnType, + Parameters + >; + + function createApqApp(apqOptions: PersistedQueryOptions = {}) { + return createApp({ graphqlOptions: { schema, plugins: [ @@ -1252,22 +1255,21 @@ export default (createApp: CreateAppFunc, destroyApp?: DestroyAppFunc) => { ], persistedQueries: { cache, + ...apqOptions, }, }, }); + } + + let cache: KeyValueCache; + + beforeEach(async () => { + cache = createMockCache(); + didEncounterErrors = jest.fn(); }); it('when ttlSeconds is set, passes ttl to the apq cache set call', async () => { - const cache = createMockCache(); - app = await createApp({ - graphqlOptions: { - schema, - persistedQueries: { - cache: cache, - ttl: 900, - }, - }, - }); + app = await createApqApp({ ttl: 900 }); await request(app) .post('/graphql') @@ -1287,15 +1289,7 @@ export default (createApp: CreateAppFunc, destroyApp?: DestroyAppFunc) => { it('when ttlSeconds is unset, ttl is not passed to apq cache', async () => { - const cache = createMockCache(); - app = await createApp({ - graphqlOptions: { - schema, - persistedQueries: { - cache: cache, - }, - }, - }); + app = await createApqApp(); await request(app) .post('/graphql') @@ -1315,6 +1309,8 @@ export default (createApp: CreateAppFunc, destroyApp?: DestroyAppFunc) => { ); it('errors when version is not specified', async () => { + app = await createApqApp(); + const result = await request(app) .get('/graphql') .query({ @@ -1346,6 +1342,8 @@ export default (createApp: CreateAppFunc, destroyApp?: DestroyAppFunc) => { }); it('errors when version is unsupported', async () => { + app = await createApqApp(); + const result = await request(app) .get('/graphql') .query({ @@ -1378,6 +1376,8 @@ export default (createApp: CreateAppFunc, destroyApp?: DestroyAppFunc) => { }); it('errors when hash is mismatched', async () => { + app = await createApqApp(); + const result = await request(app) .get('/graphql') .query({ @@ -1410,6 +1410,8 @@ export default (createApp: CreateAppFunc, destroyApp?: DestroyAppFunc) => { }); it('returns PersistedQueryNotFound on the first try', async () => { + app = await createApqApp(); + const result = await request(app) .post('/graphql') .send({ @@ -1432,6 +1434,8 @@ export default (createApp: CreateAppFunc, destroyApp?: DestroyAppFunc) => { ); }); it('returns result on the second try', async () => { + app = await createApqApp(); + await request(app) .post('/graphql') .send({ @@ -1465,6 +1469,8 @@ export default (createApp: CreateAppFunc, destroyApp?: DestroyAppFunc) => { }); it('returns with batched persisted queries', async () => { + app = await createApqApp(); + const errors = await request(app) .post('/graphql') .send([ @@ -1510,6 +1516,8 @@ export default (createApp: CreateAppFunc, destroyApp?: DestroyAppFunc) => { }); it('returns result on the persisted query', async () => { + app = await createApqApp(); + await request(app) .post('/graphql') .send({ @@ -1532,6 +1540,8 @@ export default (createApp: CreateAppFunc, destroyApp?: DestroyAppFunc) => { }); it('returns error when hash does not match', async () => { + app = await createApqApp(); + const response = await request(app) .post('/graphql') .send({ @@ -1549,6 +1559,8 @@ export default (createApp: CreateAppFunc, destroyApp?: DestroyAppFunc) => { }); it('returns correct result using get request', async () => { + app = await createApqApp(); + await request(app) .post('/graphql') .send({ From 570bc4e59f8fd9df727df2de52964cbbe216ae62 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 7 May 2020 12:26:51 +0000 Subject: [PATCH 527/642] feat(plugins): Intro. `didResolveSource` to indicate availability of "source". This PR targets https://github.com/apollographql/apollo-server/pull/3988 but was prompted by a need identified during review in the following comment: https://github.com/apollographql/apollo-server/pull/3998/files#r414911049 As noted, this is tangible clunkiness which could make the implementation of the `ensurePreflight` invocations unnecessary. That defensiveness was only necessary because the extensions API - which #3988 + #3998 aims to render unnecessary - guaranteed the presence of the "source" (the text of the incoming operation) prior to invoking its `requestDidStart` method (which was actually a bit after the request had started, in reality). Hopefully this proves to be a useful life-cycle for other cases! --- docs/source/integrations/plugins.md | 17 ++++++++++ .../src/__tests__/runQuery.test.ts | 29 ++++++++++++++++ .../apollo-server-core/src/requestPipeline.ts | 11 ++++++ .../src/index.ts | 34 ++++++++++++++++++- .../apollo-server-plugin-base/src/index.ts | 5 +++ packages/apollo-server-types/src/index.ts | 4 ++- 6 files changed, 98 insertions(+), 2 deletions(-) diff --git a/docs/source/integrations/plugins.md b/docs/source/integrations/plugins.md index df4003d8544..2c9c2600381 100644 --- a/docs/source/integrations/plugins.md +++ b/docs/source/integrations/plugins.md @@ -313,6 +313,23 @@ should not return a value. > If you're using TypeScript to create your plugin, implement the [ `GraphQLRequestListener` interface](https://github.com/apollographql/apollo-server/blob/master/packages/apollo-server-plugin-base/src/index.ts) from the `apollo-server-plugin-base` module to define functions for request lifecycle events. +### `didResolveSource` + +The `didResolveSource` event is invoked after Apollo Server has determined the +`String`-representation of the incoming operation that it will act upon. In the +event that this `String` was not directly passed in from the client, this +may be retrieved from a cache store (e.g., Automated Persisted Queries). + +At this stage, there is not a guarantee that the operation is not malformed. + +```typescript +didResolveSource?( + requestContext: WithRequired< + GraphQLRequestContext, 'source' | 'logger'>, + >, +): ValueOrPromise; +``` + ### `parsingDidStart` The `parsingDidStart` event fires whenever Apollo Server will parse a GraphQL diff --git a/packages/apollo-server-core/src/__tests__/runQuery.test.ts b/packages/apollo-server-core/src/__tests__/runQuery.test.ts index a788c6351dc..3464c7ec455 100644 --- a/packages/apollo-server-core/src/__tests__/runQuery.test.ts +++ b/packages/apollo-server-core/src/__tests__/runQuery.test.ts @@ -479,6 +479,30 @@ describe('runQuery', () => { }); }); + describe('didResolveSource', () => { + const didResolveSource = jest.fn(); + it('called with the source', async () => { + await runQuery({ + schema, + queryString: '{ testString }', + plugins: [ + { + requestDidStart() { + return { + didResolveSource, + }; + }, + }, + ], + request: new MockReq(), + }); + + expect(didResolveSource).toHaveBeenCalled(); + expect(didResolveSource.mock.calls[0][0]) + .toHaveProperty('source', '{ testString }'); + }); + }); + describe('parsingDidStart', () => { const parsingDidStart = jest.fn(); it('called when parsing will result in an error', async () => { @@ -882,6 +906,9 @@ describe('runQuery', () => { return validationDidEnd; }); + const didResolveSource: GraphQLRequestListener['didResolveSource'] = + jest.fn(() => { callOrder.push('didResolveSource') }); + const didResolveField: GraphQLRequestListenerDidResolveField = jest.fn(() => callOrder.push("didResolveField")); @@ -928,6 +955,7 @@ describe('runQuery', () => { return { parsingDidStart, validationDidStart, + didResolveSource, executionDidStart, }; }, @@ -944,6 +972,7 @@ describe('runQuery', () => { expect(willResolveField).toHaveBeenCalledTimes(1); expect(didResolveField).toHaveBeenCalledTimes(1); expect(callOrder).toStrictEqual([ + "didResolveSource", "parsingDidStart", "parsingDidEnd", "validationDidStart", diff --git a/packages/apollo-server-core/src/requestPipeline.ts b/packages/apollo-server-core/src/requestPipeline.ts index 79bc9bf0fa2..074f7099528 100644 --- a/packages/apollo-server-core/src/requestPipeline.ts +++ b/packages/apollo-server-core/src/requestPipeline.ts @@ -49,6 +49,7 @@ import { import { ApolloServerPlugin, GraphQLRequestListener, + GraphQLRequestContextDidResolveSource, GraphQLRequestContextExecutionDidStart, GraphQLRequestContextResponseForOperation, GraphQLRequestContextDidResolveOperation, @@ -209,6 +210,16 @@ export async function processGraphQLRequest( requestContext.queryHash = queryHash; requestContext.source = query; + // Let the plugins know that we now have a STRING of what we hope will + // parse and validate into a document we can execute on. Unless we have + // retrieved this from our APQ cache, there's no guarantee that it is + // syntactically correct, so this string should not be trusted as a valid + // document until after it's parsed and validated. + await dispatcher.invokeHookAsync( + 'didResolveSource', + requestContext as GraphQLRequestContextDidResolveSource, + ); + const requestDidEnd = extensionStack.requestDidStart({ request: request.http!, queryString: request.query, diff --git a/packages/apollo-server-integration-testsuite/src/index.ts b/packages/apollo-server-integration-testsuite/src/index.ts index 99a8490d60a..e39cb84d036 100644 --- a/packages/apollo-server-integration-testsuite/src/index.ts +++ b/packages/apollo-server-integration-testsuite/src/index.ts @@ -1242,6 +1242,11 @@ export default (createApp: CreateAppFunc, destroyApp?: DestroyAppFunc) => { Parameters >; + let didResolveSource: jest.Mock< + ReturnType, + Parameters + >; + function createApqApp(apqOptions: PersistedQueryOptions = {}) { return createApp({ graphqlOptions: { @@ -1249,7 +1254,10 @@ export default (createApp: CreateAppFunc, destroyApp?: DestroyAppFunc) => { plugins: [ { requestDidStart() { - return { didEncounterErrors }; + return { + didResolveSource, + didEncounterErrors, + }; } } ], @@ -1265,6 +1273,7 @@ export default (createApp: CreateAppFunc, destroyApp?: DestroyAppFunc) => { beforeEach(async () => { cache = createMockCache(); + didResolveSource = jest.fn(); didEncounterErrors = jest.fn(); }); @@ -1285,6 +1294,8 @@ export default (createApp: CreateAppFunc, destroyApp?: DestroyAppFunc) => { ttl: 900, }), ); + expect(didResolveSource.mock.calls[0][0]) + .toHaveProperty('source', query); }); it('when ttlSeconds is unset, ttl is not passed to apq cache', @@ -1305,6 +1316,8 @@ export default (createApp: CreateAppFunc, destroyApp?: DestroyAppFunc) => { ttl: 900, }), ); + expect(didResolveSource.mock.calls[0][0]) + .toHaveProperty('source', query); } ); @@ -1407,6 +1420,8 @@ export default (createApp: CreateAppFunc, destroyApp?: DestroyAppFunc) => { })]), }), ); + + expect(didResolveSource).not.toHaveBeenCalled(); }); it('returns PersistedQueryNotFound on the first try', async () => { @@ -1432,6 +1447,8 @@ export default (createApp: CreateAppFunc, destroyApp?: DestroyAppFunc) => { ]), }), ); + + expect(didResolveSource).not.toHaveBeenCalled(); }); it('returns result on the second try', async () => { app = await createApqApp(); @@ -1452,6 +1469,8 @@ export default (createApp: CreateAppFunc, destroyApp?: DestroyAppFunc) => { }), ); + expect(didResolveSource).not.toHaveBeenCalled(); + const result = await request(app) .post('/graphql') .send({ @@ -1464,6 +1483,9 @@ export default (createApp: CreateAppFunc, destroyApp?: DestroyAppFunc) => { // asserted above. expect(didEncounterErrors).toHaveBeenCalledTimes(1); + expect(didResolveSource.mock.calls[0][0]) + .toHaveProperty('source', query); + expect(result.body.data).toEqual({ testString: 'it works' }); expect(result.body.errors).toBeUndefined(); }); @@ -1523,6 +1545,9 @@ export default (createApp: CreateAppFunc, destroyApp?: DestroyAppFunc) => { .send({ extensions, }); + + expect(didResolveSource).not.toHaveBeenCalled(); + await request(app) .post('/graphql') .send({ @@ -1535,6 +1560,9 @@ export default (createApp: CreateAppFunc, destroyApp?: DestroyAppFunc) => { extensions, }); + expect(didResolveSource.mock.calls[0][0]) + .toHaveProperty('source', query); + expect(result.body.data).toEqual({ testString: 'it works' }); expect(result.body.errors).toBeUndefined(); }); @@ -1556,6 +1584,7 @@ export default (createApp: CreateAppFunc, destroyApp?: DestroyAppFunc) => { }); expect(response.status).toEqual(400); expect(response.error.text).toMatch(/does not match query/); + expect(didResolveSource).not.toHaveBeenCalled(); }); it('returns correct result using get request', async () => { @@ -1573,6 +1602,9 @@ export default (createApp: CreateAppFunc, destroyApp?: DestroyAppFunc) => { extensions: JSON.stringify(extensions), }); expect(result.body.data).toEqual({ testString: 'it works' }); + expect(didResolveSource.mock.calls[0][0]) + .toHaveProperty('source', query); + }); }); }); diff --git a/packages/apollo-server-plugin-base/src/index.ts b/packages/apollo-server-plugin-base/src/index.ts index a90786dfd51..aef514d38de 100644 --- a/packages/apollo-server-plugin-base/src/index.ts +++ b/packages/apollo-server-plugin-base/src/index.ts @@ -8,6 +8,7 @@ import { GraphQLResponse, ValueOrPromise, WithRequired, + GraphQLRequestContextDidResolveSource, GraphQLRequestContextParsingDidStart, GraphQLRequestContextValidationDidStart, GraphQLRequestContextDidResolveOperation, @@ -35,6 +36,7 @@ export { GraphQLResponse, ValueOrPromise, WithRequired, + GraphQLRequestContextDidResolveSource, GraphQLRequestContextParsingDidStart, GraphQLRequestContextValidationDidStart, GraphQLRequestContextDidResolveOperation, @@ -63,6 +65,9 @@ export type GraphQLRequestListenerDidResolveField = export interface GraphQLRequestListener< TContext extends BaseContext = DefaultContext > extends AnyFunctionMap { + didResolveSource?( + requestContext: GraphQLRequestContextDidResolveSource, + ): ValueOrPromise; parsingDidStart?( requestContext: GraphQLRequestContextParsingDidStart, ): GraphQLRequestListenerParsingDidEnd | void; diff --git a/packages/apollo-server-types/src/index.ts b/packages/apollo-server-types/src/index.ts index 6e0cf487461..1a5ecd52522 100644 --- a/packages/apollo-server-types/src/index.ts +++ b/packages/apollo-server-types/src/index.ts @@ -148,12 +148,14 @@ export type Logger = { error(message?: any): void; } -export type GraphQLRequestContextParsingDidStart = +export type GraphQLRequestContextDidResolveSource = WithRequired, | 'metrics' | 'source' | 'queryHash' >; +export type GraphQLRequestContextParsingDidStart = + GraphQLRequestContextDidResolveSource; export type GraphQLRequestContextValidationDidStart = GraphQLRequestContextParsingDidStart & WithRequired, From fe971b3f332e9768b9c2ae1594239fb6b618a129 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Fri, 8 May 2020 10:01:37 +0000 Subject: [PATCH 528/642] docs: Add `didResolveSource` to plugin Mermaid workflow. --- docs/source/integrations/plugins.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/docs/source/integrations/plugins.md b/docs/source/integrations/plugins.md index 2c9c2600381..578e62f6a3e 100644 --- a/docs/source/integrations/plugins.md +++ b/docs/source/integrations/plugins.md @@ -121,17 +121,18 @@ The following diagram illustrates the sequence of events that fire for each requ ```mermaid graph TB; - request(requestDidStart) --> parsing(parsingDidStart*); + request(requestDidStart) --> resolveSource(didResolveSource); + resolveSource --"Success"--> parsing(parsingDidStart*); parsing --"Success"--> validation(validationDidStart*); - validation --"Success"--> resolve(didResolveOperation); - resolve --"Success"--> response(responseForOperation); + validation --"Success"--> resolveOperation(didResolveOperation); + resolveOperation --"Success"--> response(responseForOperation); execution(executionDidStart*); errors(didEncounterErrors); response --"Response provided"--> send; response --"No response provided"--> execution; execution --"Success"--> send(willSendResponse); - execution & resolve & parsing & validation --"Failure"--> errors; + execution & resolveSource & resolveOperation & parsing & validation --"Failure"--> errors; errors --> send; class server,request secondary; ``` From 464e4f2128fcd5bad39aab22b8b7755c9e53a29f Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Fri, 8 May 2020 10:14:57 +0000 Subject: [PATCH 529/642] noop: Add comment indicating where to find `didResolveSource` APQ tests. --- .../apollo-server-core/src/__tests__/runQuery.test.ts | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/packages/apollo-server-core/src/__tests__/runQuery.test.ts b/packages/apollo-server-core/src/__tests__/runQuery.test.ts index 3464c7ec455..228ea74f46d 100644 --- a/packages/apollo-server-core/src/__tests__/runQuery.test.ts +++ b/packages/apollo-server-core/src/__tests__/runQuery.test.ts @@ -479,6 +479,15 @@ describe('runQuery', () => { }); }); + /** + * This tests the simple invocation of the "didResolveSource" hook, but + * doesn't test one of the primary reasons why "source" isn't guaranteed + * sooner in the request life-cycle: when "source" is populated via an APQ + * cache HIT. + * + * That functionality is tested in `apollo-server-integration-testsuite`, + * within the "Persisted Queries" tests. (Search for "didResolveSource"). + */ describe('didResolveSource', () => { const didResolveSource = jest.fn(); it('called with the source', async () => { From ba37e68112266354a2504ead6bbe94fd0dc18653 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Fri, 8 May 2020 11:48:46 +0000 Subject: [PATCH 530/642] changelog: #3998 I may re-visit this consideration. --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b1aee8a1900..1e12834e9c6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,12 @@ The version headers in this history reflect the versions of Apollo Server itself > 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. 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`: The underlying integration of this plugin, which instruments and traces the graph's resolver performance and transmits these metrics to [Apollo Graph Manager](https://engine.apollographql.com/), has been changed from the (soon to be deprecated) `graphql-extensions` API to the new [request pipeline `plugins` API](https://www.apollographql.com/docs/apollo-server/integrations/plugins/). [PR #3998](https://github.com/apollographql/apollo-server/pull/3998) + + _This change should be purely an implementation detail for a majority of users_. There are, however, some special considerations which are worth noting: + + - The federated tracing plugin's `ftv1` response on `extensions` (which is present on the response from an implementing service to the gateway) is now placed on the `extensions` _after_ the `formatResponse` hook. Anyone leveraging the `extensions`.`ftv1` data from the `formatResponse` hook will find that it is no longer present at that phase. + - _Nothing yet! Stay tuned!_ ### v2.13.0 From e9edd9aef186c0185cd9ec9bc4896f6ac9c9524c Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Fri, 8 May 2020 12:25:15 +0000 Subject: [PATCH 531/642] types(e-r): Improve the typings of `didEnd`. --- .../apollo-engine-reporting/src/plugin.ts | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/packages/apollo-engine-reporting/src/plugin.ts b/packages/apollo-engine-reporting/src/plugin.ts index 2e963c247df..1b9715235ac 100644 --- a/packages/apollo-engine-reporting/src/plugin.ts +++ b/packages/apollo-engine-reporting/src/plugin.ts @@ -2,6 +2,8 @@ import { GraphQLRequestContext, Logger, InvalidGraphQLRequestError, + GraphQLRequestContextExecutionDidStart, + GraphQLRequestContextDidEncounterErrors, } from 'apollo-server-types'; import { Headers } from 'apollo-server-env'; import { GraphQLError } from 'graphql'; @@ -122,7 +124,11 @@ export const plugin = ( } let endDone: boolean = false; - function didEnd() { + function didEnd( + requestContext: + | GraphQLRequestContextExecutionDidStart + | GraphQLRequestContextDidEncounterErrors, + ) { if (endDone) return; endDone = true; treeBuilder.stopTiming(); @@ -169,11 +175,11 @@ export const plugin = ( ensurePreflight(); }, - executionDidStart() { + executionDidStart(requestContext) { ensurePreflight(); return { - executionDidEnd: didEnd, + executionDidEnd: () => didEnd(requestContext), willResolveField(...args) { const [, , , info] = args; return treeBuilder.willResolveField(info); @@ -184,16 +190,16 @@ export const plugin = ( }; }, - didEncounterErrors({ errors }) { + didEncounterErrors(requestContext) { // We don't report some special-cased errors to Graph Manager. // See the definition of this function for the reasons. - if (allUnreportableSpecialCasedErrors(errors)) { + if (allUnreportableSpecialCasedErrors(requestContext.errors)) { return; } ensurePreflight(); - treeBuilder.didEncounterErrors(errors); - didEnd(); + treeBuilder.didEncounterErrors(requestContext.errors); + didEnd(requestContext); }, }; } From b981b590328a6a321956ca851fb34d19f973aa25 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Fri, 8 May 2020 12:26:25 +0000 Subject: [PATCH 532/642] chore(e-r): Eliminate `ensurePreflight` by using (new) `didResolveSource`. Leverages new life-cycle `didResolveSource` which was introduced by [[PR #4076]] and inspired by this [[comment]]. This is much nicer! [PR #4076]: https://github.com/apollographql/apollo-server/pull/4076 [Comment]: https://github.com/apollographql/apollo-server/pull/3998/files#r414911049 --- .../apollo-engine-reporting/src/plugin.ts | 134 ++++++++---------- 1 file changed, 56 insertions(+), 78 deletions(-) diff --git a/packages/apollo-engine-reporting/src/plugin.ts b/packages/apollo-engine-reporting/src/plugin.ts index 1b9715235ac..5faa1390956 100644 --- a/packages/apollo-engine-reporting/src/plugin.ts +++ b/packages/apollo-engine-reporting/src/plugin.ts @@ -44,83 +44,46 @@ export const plugin = ( return { - requestDidStart(requestContext) { - // We still need the entire `requestContext` to pass through to the - // `generateClientInfo` method, but we'll destructure for brevity within. - const { - metrics, - logger: requestLogger, - schemaHash, - request: { http, variables }, - } = requestContext; - - const treeBuilder: EngineReportingTreeBuilder = - new EngineReportingTreeBuilder({ + requestDidStart({ + logger: requestLogger, + schemaHash, + metrics, + request: { http, variables }, + }) { + const treeBuilder: EngineReportingTreeBuilder = new EngineReportingTreeBuilder( + { rewriteError: options.rewriteError, logger: requestLogger || logger, - }); + }, + ); treeBuilder.startTiming(); metrics.startHrTime = treeBuilder.startHrTime; - let preflightDone: boolean = false; - function ensurePreflight() { - if (preflightDone) return; - preflightDone = true; - - if (http) { - treeBuilder.trace.http = new Trace.HTTP({ - method: - Trace.HTTP.Method[http.method as keyof typeof Trace.HTTP.Method] - || Trace.HTTP.Method.UNKNOWN, - // Host and path are not used anywhere on the backend, so let's not bother - // trying to parse request.url to get them, which is a potential - // source of bugs because integrations have different behavior here. - // On Node's HTTP module, request.url only includes the path - // (see https://nodejs.org/api/http.html#http_message_url) - // The same is true on Lambda (where we pass event.path) - // But on environments like Cloudflare we do get a complete URL. - host: null, - path: null, - }); - - if (options.sendHeaders) { - makeHTTPRequestHeaders( - treeBuilder.trace.http, - http.headers, - options.sendHeaders, - ); - } - } - - if (metrics.persistedQueryHit) { - treeBuilder.trace.persistedQueryHit = true; - } - if (metrics.persistedQueryRegister) { - treeBuilder.trace.persistedQueryRegister = true; - } + if (http) { + treeBuilder.trace.http = new Trace.HTTP({ + method: + Trace.HTTP.Method[http.method as keyof typeof Trace.HTTP.Method] || + Trace.HTTP.Method.UNKNOWN, + // Host and path are not used anywhere on the backend, so let's not bother + // trying to parse request.url to get them, which is a potential + // source of bugs because integrations have different behavior here. + // On Node's HTTP module, request.url only includes the path + // (see https://nodejs.org/api/http.html#http_message_url) + // The same is true on Lambda (where we pass event.path) + // But on environments like Cloudflare we do get a complete URL. + host: null, + path: null, + }); - if (variables) { - treeBuilder.trace.details = makeTraceDetails( - variables, - options.sendVariableValues, - requestContext.source, + if (options.sendHeaders) { + makeHTTPRequestHeaders( + treeBuilder.trace.http, + http.headers, + options.sendHeaders, ); } - - const clientInfo = generateClientInfo(requestContext); - if (clientInfo) { - // While clientAddress could be a part of the protobuf, we'll ignore it for - // now, since the backend does not group by it and Engine frontend will not - // support it in the short term - const { clientName, clientVersion, clientReferenceId } = clientInfo; - // the backend makes the choice of mapping clientName => clientReferenceId if - // no custom reference id is provided - treeBuilder.trace.clientVersion = clientVersion || ''; - treeBuilder.trace.clientReferenceId = clientReferenceId || ''; - treeBuilder.trace.clientName = clientName || ''; - } } let endDone: boolean = false; @@ -163,21 +126,37 @@ export const plugin = ( } return { - parsingDidStart() { - ensurePreflight(); - }, + didResolveSource(requestContext) { + if (metrics.persistedQueryHit) { + treeBuilder.trace.persistedQueryHit = true; + } + if (metrics.persistedQueryRegister) { + treeBuilder.trace.persistedQueryRegister = true; + } - validationDidStart() { - ensurePreflight(); - }, + if (variables) { + treeBuilder.trace.details = makeTraceDetails( + variables, + options.sendVariableValues, + requestContext.source, + ); + } - didResolveOperation() { - ensurePreflight(); + const clientInfo = generateClientInfo(requestContext); + if (clientInfo) { + // While clientAddress could be a part of the protobuf, we'll ignore + // it for now, since the backend does not group by it and Graph + // Manager will not support it in the short term + const { clientName, clientVersion, clientReferenceId } = clientInfo; + // the backend makes the choice of mapping clientName => clientReferenceId if + // no custom reference id is provided + treeBuilder.trace.clientVersion = clientVersion || ''; + treeBuilder.trace.clientReferenceId = clientReferenceId || ''; + treeBuilder.trace.clientName = clientName || ''; + } }, executionDidStart(requestContext) { - ensurePreflight(); - return { executionDidEnd: () => didEnd(requestContext), willResolveField(...args) { @@ -197,7 +176,6 @@ export const plugin = ( return; } - ensurePreflight(); treeBuilder.didEncounterErrors(requestContext.errors); didEnd(requestContext); }, From 6d4777da1f4dfaab3bf23523e9106e6c2abbab08 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Fri, 8 May 2020 12:34:47 +0000 Subject: [PATCH 533/642] changelog: Add note that I believe some new APQ errors are now traced. @glasser, are you able to confirm this belief and that it should be okay? --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e12834e9c6..02bef1a8293 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ The version headers in this history reflect the versions of Apollo Server itself _This change should be purely an implementation detail for a majority of users_. There are, however, some special considerations which are worth noting: - The federated tracing plugin's `ftv1` response on `extensions` (which is present on the response from an implementing service to the gateway) is now placed on the `extensions` _after_ the `formatResponse` hook. Anyone leveraging the `extensions`.`ftv1` data from the `formatResponse` hook will find that it is no longer present at that phase. + - Automated persisted query (APQ) errors [`PERSISTED_QUERY_NOT_SUPPORTED`](https://github.com/apollographql/apollo-server/blob/b981b590328a6a321956ca851fb34d19f973aa25/packages/apollo-server-errors/src/index.ts#L214-L222) and [`Unsupported persisted query version`](https://github.com/apollographql/apollo-server/blob/b981b590328a6a321956ca851fb34d19f973aa25/packages/apollo-server-core/src/requestPipeline.ts#L165) may now be reported to Graph Manager, whereas previously they were excluded from transmission. - _Nothing yet! Stay tuned!_ From bacbb175f38ab8e896e30ba5b82c6b4964535b4b Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Fri, 8 May 2020 12:45:32 +0000 Subject: [PATCH 534/642] Revert "changelog: Add note that I believe some new APQ errors are now traced." This reverts commit 6d4777da1f4dfaab3bf23523e9106e6c2abbab08. --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 02bef1a8293..1e12834e9c6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,6 @@ The version headers in this history reflect the versions of Apollo Server itself _This change should be purely an implementation detail for a majority of users_. There are, however, some special considerations which are worth noting: - The federated tracing plugin's `ftv1` response on `extensions` (which is present on the response from an implementing service to the gateway) is now placed on the `extensions` _after_ the `formatResponse` hook. Anyone leveraging the `extensions`.`ftv1` data from the `formatResponse` hook will find that it is no longer present at that phase. - - Automated persisted query (APQ) errors [`PERSISTED_QUERY_NOT_SUPPORTED`](https://github.com/apollographql/apollo-server/blob/b981b590328a6a321956ca851fb34d19f973aa25/packages/apollo-server-errors/src/index.ts#L214-L222) and [`Unsupported persisted query version`](https://github.com/apollographql/apollo-server/blob/b981b590328a6a321956ca851fb34d19f973aa25/packages/apollo-server-core/src/requestPipeline.ts#L165) may now be reported to Graph Manager, whereas previously they were excluded from transmission. - _Nothing yet! Stay tuned!_ From 59b401330064551b20339417ae26fde37ffe3857 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Fri, 8 May 2020 15:13:57 +0000 Subject: [PATCH 535/642] fix(e-r): Do not keep traces unless we resolve the "source". Previously, I introduced a work-around for this in 78a4cb77edc7c7f, though that is no longer necessary with the introduction of `didResolveSource` in https://github.com/apollographql/apollo-server/pull/4076 I'm thrilled to remove this! Ref: https://github.com/apollographql/apollo-server/pull/3998#discussion_r414916905 --- .../apollo-engine-reporting/src/plugin.ts | 59 +++++-------------- 1 file changed, 14 insertions(+), 45 deletions(-) diff --git a/packages/apollo-engine-reporting/src/plugin.ts b/packages/apollo-engine-reporting/src/plugin.ts index 5faa1390956..36915c2466c 100644 --- a/packages/apollo-engine-reporting/src/plugin.ts +++ b/packages/apollo-engine-reporting/src/plugin.ts @@ -1,12 +1,10 @@ import { GraphQLRequestContext, Logger, - InvalidGraphQLRequestError, GraphQLRequestContextExecutionDidStart, GraphQLRequestContextDidEncounterErrors, } from 'apollo-server-types'; import { Headers } from 'apollo-server-env'; -import { GraphQLError } from 'graphql'; import { Trace } from 'apollo-engine-reporting-protobuf'; import { @@ -18,10 +16,6 @@ import { } from './agent'; import { EngineReportingTreeBuilder } from './treeBuilder'; import { ApolloServerPlugin } from "apollo-server-plugin-base"; -import { - PersistedQueryNotFoundError, - PersistedQueryNotSupportedError, -} from 'apollo-server-errors'; const clientNameHeaderKey = 'apollographql-client-name'; const clientReferenceIdHeaderKey = 'apollographql-client-reference-id'; @@ -125,8 +119,19 @@ export const plugin = ( }); } + // While we start the tracing as soon as possible, we only actually report + // traces when we have resolved the source. This is largely because of + // the APQ negotiation that takes place before that resolution happens. + // This is effectively bypassing the reporting of: + // - PersistedQueryNotFoundError + // - PersistedQueryNotSupportedError + // - InvalidGraphQLRequestError + let didResolveSource: boolean = false; + return { didResolveSource(requestContext) { + didResolveSource = true; + if (metrics.persistedQueryHit) { treeBuilder.trace.persistedQueryHit = true; } @@ -170,12 +175,9 @@ export const plugin = ( }, didEncounterErrors(requestContext) { - // We don't report some special-cased errors to Graph Manager. - // See the definition of this function for the reasons. - if (allUnreportableSpecialCasedErrors(requestContext.errors)) { - return; - } - + // Search above for a comment about "didResolveSource" to see which + // of the pre-source-resolution errors we are intentionally avoiding. + if (!didResolveSource) return; treeBuilder.didEncounterErrors(requestContext.errors); didEnd(requestContext); }, @@ -184,39 +186,6 @@ export const plugin = ( }; }; -/** - * Previously, prior to the new plugin API, the Apollo Engine Reporting - * mechanism was implemented using `graphql-extensions`, the API for which - * didn't invoke `requestDidStart` until _after_ APQ had been negotiated. - * - * The new plugin API starts its `requestDidStart` _before_ APQ validation and - * various other assertions which weren't included in the `requestDidStart` - * life-cycle, even if they perhaps should be in terms of error reporting. - * - * The new plugin API is able to properly capture such errors within its - * `didEncounterErrors` lifecycle hook, however, for behavioral consistency - * reasons, we will still special-case those errors and maintain the legacy - * behavior to avoid a breaking change. We can reconsider this in a future - * version of Apollo Engine Reporting (AS3, perhaps!). - * - * @param errors A list of errors to scan for special-cased instances. - */ -function allUnreportableSpecialCasedErrors( - errors: readonly GraphQLError[], -): boolean { - return errors.every(err => { - if ( - err instanceof PersistedQueryNotFoundError || - err instanceof PersistedQueryNotSupportedError || - err instanceof InvalidGraphQLRequestError - ) { - return true; - } - - return false; - }); -} - // Helpers for producing traces. function defaultGenerateClientInfo({ request }: GraphQLRequestContext) { From 112178503611ec1275889cc121f9e43af038825f Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Fri, 8 May 2020 16:03:07 +0000 Subject: [PATCH 536/642] chore(types): Remove `DefaultContext` and just leverage `BaseContext`. They were the same structurally anyway. For some reason I thought that it looked better in the definitions within the [[Plugin types]] when I first wrote it, but I'm not caught up on it. [Plugin types]: https://github.com/apollographql/apollo-server/blob/1356f008/packages/apollo-server-plugin-base/src/index.ts#L48 --- packages/apollo-server-plugin-base/src/index.ts | 8 +++----- packages/apollo-server-types/src/index.ts | 1 - 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/packages/apollo-server-plugin-base/src/index.ts b/packages/apollo-server-plugin-base/src/index.ts index aef514d38de..448890848a6 100644 --- a/packages/apollo-server-plugin-base/src/index.ts +++ b/packages/apollo-server-plugin-base/src/index.ts @@ -1,7 +1,6 @@ import { AnyFunctionMap, BaseContext, - DefaultContext, GraphQLServiceContext, GraphQLRequestContext, GraphQLRequest, @@ -29,7 +28,6 @@ import { GraphQLFieldResolver } from "graphql"; // probably roll into the same "types" package, but that is not today! export { BaseContext, - DefaultContext, GraphQLServiceContext, GraphQLRequestContext, GraphQLRequest, @@ -47,7 +45,7 @@ export { }; export interface ApolloServerPlugin< - TContext extends BaseContext = DefaultContext + TContext extends BaseContext = BaseContext > { serverWillStart?(service: GraphQLServiceContext): ValueOrPromise; requestDidStart?( @@ -63,7 +61,7 @@ export type GraphQLRequestListenerDidResolveField = ((error: Error | null, result?: any) => void); export interface GraphQLRequestListener< - TContext extends BaseContext = DefaultContext + TContext extends BaseContext = BaseContext > extends AnyFunctionMap { didResolveSource?( requestContext: GraphQLRequestContextDidResolveSource, @@ -100,7 +98,7 @@ export interface GraphQLRequestListener< } export interface GraphQLRequestExecutionListener< - TContext extends BaseContext = DefaultContext + TContext extends BaseContext = BaseContext > extends AnyFunctionMap { executionDidEnd?: GraphQLRequestListenerExecutionDidEnd; willResolveField?( diff --git a/packages/apollo-server-types/src/index.ts b/packages/apollo-server-types/src/index.ts index 1a5ecd52522..a4ef63ed921 100644 --- a/packages/apollo-server-types/src/index.ts +++ b/packages/apollo-server-types/src/index.ts @@ -14,7 +14,6 @@ import { KeyValueCache } from 'apollo-server-caching'; import { Trace } from 'apollo-engine-reporting-protobuf'; export type BaseContext = Record; -export type DefaultContext = BaseContext; export type ValueOrPromise = T | Promise; export type WithRequired = T & Required>; From b0948a826cc31bec79f0a54ea46fa2db884ac95b Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Fri, 8 May 2020 20:37:15 +0300 Subject: [PATCH 537/642] fix: Preserve client-requested `operationName` on op. name resolution failure. Addresses feedback in below referenced [[Comment]]. If operation resolution (parsing and validating the document followed by selecting the correct operation) resulted in the population of the `operationName`, we'll use that. (For anonymous operations, `requestContext.operationName` is null, which we represent here as the empty string.) If the user explicitly specified an `operationName` in their request but operation resolution failed (due to parse or validation errors or because there is no operation with that name in the document), we still put _that_ user-supplied `operationName` in the trace. This allows the error to be better understood in Graph Manager. (We are considering changing the behavior of `operationName` in these three error cases; see [[#3465]] below for details.) [Comment]: https://github.com/apollographql/apollo-server/pull/3998#discussion_r422260422 [#3465]: https://github.com/apollographql/apollo-server/pull/3465 --- .../apollo-engine-reporting/src/plugin.ts | 25 +++++++++++++------ 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/packages/apollo-engine-reporting/src/plugin.ts b/packages/apollo-engine-reporting/src/plugin.ts index 36915c2466c..59a483dcd0a 100644 --- a/packages/apollo-engine-reporting/src/plugin.ts +++ b/packages/apollo-engine-reporting/src/plugin.ts @@ -94,14 +94,23 @@ export const plugin = ( treeBuilder.trace.forbiddenOperation = !!metrics.forbiddenOperation; treeBuilder.trace.registeredOperation = !!metrics.registeredOperation; - // If the user did not explicitly specify an operation name (which we - // would have saved in `executionDidStart`), but the request pipeline made - // it far enough to figure out what the operation name must be and store - // it on requestContext.operationName, use that name. (Note that this - // depends on the assumption that the RequestContext passed to - // requestDidStart, which does not yet have operationName, will be mutated - // to add operationName later.) - const operationName = requestContext.operationName || ''; + // If operation resolution (parsing and validating the document followed + // by selecting the correct operation) resulted in the population of the + // `operationName`, we'll use that. (For anonymous operations, + // `requestContext.operationName` is null, which we represent here as + // the empty string.) + // + // If the user explicitly specified an `operationName` in their request + // but operation resolution failed (due to parse or validation errors or + // because there is no operation with that name in the document), we + // still put _that_ user-supplied `operationName` in the trace. This + // allows the error to be better understood in Graph Manager. (We are + // considering changing the behavior of `operationName` in these three + // error cases; https://github.com/apollographql/apollo-server/pull/3465 + const operationName = + requestContext.operationName || + requestContext.request.operationName || + ''; // If this was a federated operation and we're the gateway, add the query plan // to the trace. From a926b7eedbb87abab2ec70fb03d71743985cb18d Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Fri, 8 May 2020 18:08:36 +0000 Subject: [PATCH 538/642] Use an object, rather than positional params for `willResolveField`. This should prove to be more ergonomic, and also allow us to attach other useful properties to this object (for either external or internal use) in the future. Also, adds a test to make sure we're passing _something_! Ref: https://github.com/apollographql/apollo-server/pull/3998#discussion_r414900290 --- .../src/__tests__/runQuery.test.ts | 37 +++++++++++++++++++ .../src/utils/schemaInstrumentation.ts | 2 +- .../apollo-server-plugin-base/src/index.ts | 5 ++- packages/apollo-server-types/src/index.ts | 22 +++++++++++ 4 files changed, 63 insertions(+), 3 deletions(-) diff --git a/packages/apollo-server-core/src/__tests__/runQuery.test.ts b/packages/apollo-server-core/src/__tests__/runQuery.test.ts index 228ea74f46d..53f31e64e17 100644 --- a/packages/apollo-server-core/src/__tests__/runQuery.test.ts +++ b/packages/apollo-server-core/src/__tests__/runQuery.test.ts @@ -691,6 +691,43 @@ describe('runQuery', () => { expect(executionDidEnd).toHaveBeenCalledTimes(1); }); + it('receives an object with the resolver arguments', async () => { + const willResolveField = jest.fn(); + const executionDidEnd = jest.fn(); + const executionDidStart = jest.fn( + (): GraphQLRequestExecutionListener => ({ + willResolveField, + executionDidEnd, + }), + ); + + await runQuery({ + schema, + context: { ourSpecialContext: true }, + queryString: '{ testString }', + plugins: [ + { + requestDidStart() { + return { + executionDidStart, + }; + }, + }, + ], + request: new MockReq(), + }); + + expect(executionDidStart).toHaveBeenCalledTimes(1); + expect(willResolveField).toHaveBeenCalledTimes(1); + expect(willResolveField).toHaveBeenNthCalledWith(1, { + source: undefined, + args: {}, + context: expect.objectContaining({ ourSpecialContext: true }), + info: expect.objectContaining({ fieldName: 'testString' }), + }); + expect(executionDidEnd).toHaveBeenCalledTimes(1); + }); + it('calls the end handler', async () => { const didResolveField: GraphQLRequestListenerDidResolveField = jest.fn(); diff --git a/packages/apollo-server-core/src/utils/schemaInstrumentation.ts b/packages/apollo-server-core/src/utils/schemaInstrumentation.ts index 41d3f72dd3c..119320b3de9 100644 --- a/packages/apollo-server-core/src/utils/schemaInstrumentation.ts +++ b/packages/apollo-server-core/src/utils/schemaInstrumentation.ts @@ -51,7 +51,7 @@ function wrapField(field: GraphQLField): void { // resolution is complete. const didResolveField = typeof willResolveField === 'function' && - willResolveField(source, args, context, info); + willResolveField({ source, args, context, info }); const resolveObject: GraphQLObjectResolver< any, diff --git a/packages/apollo-server-plugin-base/src/index.ts b/packages/apollo-server-plugin-base/src/index.ts index 448890848a6..91fedfcd2ca 100644 --- a/packages/apollo-server-plugin-base/src/index.ts +++ b/packages/apollo-server-plugin-base/src/index.ts @@ -7,6 +7,7 @@ import { GraphQLResponse, ValueOrPromise, WithRequired, + GraphQLFieldResolverParams, GraphQLRequestContextDidResolveSource, GraphQLRequestContextParsingDidStart, GraphQLRequestContextValidationDidStart, @@ -16,7 +17,6 @@ import { GraphQLRequestContextExecutionDidStart, GraphQLRequestContextWillSendResponse, } from 'apollo-server-types'; -import { GraphQLFieldResolver } from "graphql"; // We re-export all of these so plugin authors only need to depend on a single // package. The overall concept of `apollo-server-types` and this package @@ -34,6 +34,7 @@ export { GraphQLResponse, ValueOrPromise, WithRequired, + GraphQLFieldResolverParams, GraphQLRequestContextDidResolveSource, GraphQLRequestContextParsingDidStart, GraphQLRequestContextValidationDidStart, @@ -102,6 +103,6 @@ export interface GraphQLRequestExecutionListener< > extends AnyFunctionMap { executionDidEnd?: GraphQLRequestListenerExecutionDidEnd; willResolveField?( - ...fieldResolverArgs: Parameters> + fieldResolverParams: GraphQLFieldResolverParams ): GraphQLRequestListenerDidResolveField | void; } diff --git a/packages/apollo-server-types/src/index.ts b/packages/apollo-server-types/src/index.ts index a4ef63ed921..9dc59c5ffac 100644 --- a/packages/apollo-server-types/src/index.ts +++ b/packages/apollo-server-types/src/index.ts @@ -7,6 +7,7 @@ import { OperationDefinitionNode, DocumentNode, GraphQLError, + GraphQLResolveInfo, } from 'graphql'; // This seems like it could live in this package too. @@ -147,6 +148,27 @@ export type Logger = { error(message?: any): void; } +/** + * This is an object form of the parameters received by typical + * `graphql-js` resolvers. The function type is `GraphQLFieldResolver` + * and normally uses positional parameters. In order to facilitate better + * ergonomics in the Apollo Server plugin API, these have been converted to + * named properties on the object using their names from the upstream + * `GraphQLFieldResolver` type signature. Ergonomic wins, in this case, + * include not needing to have three unused variables in scope just because + * there was a need to access the `info` property in a wrapped plugin. + */ +export type GraphQLFieldResolverParams< + TSource, + TContext, + TArgs = { [argName: string]: any } +> = { + source: TSource; + args: TArgs; + context: TContext; + info: GraphQLResolveInfo; +}; + export type GraphQLRequestContextDidResolveSource = WithRequired, | 'metrics' From b7ea44792af147a9fad6349537753ea9184788eb Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Fri, 8 May 2020 18:12:36 +0000 Subject: [PATCH 539/642] Remove unreachable code after `callTargets` decomposition. The `callTargets` method was introduced in 4fa6ddd4f8d, but I forgot to remove the code it rendered unnecessary/aimed to replace. --- packages/apollo-server-core/src/utils/dispatcher.ts | 8 -------- 1 file changed, 8 deletions(-) diff --git a/packages/apollo-server-core/src/utils/dispatcher.ts b/packages/apollo-server-core/src/utils/dispatcher.ts index 02789591abf..0ea761700d3 100644 --- a/packages/apollo-server-core/src/utils/dispatcher.ts +++ b/packages/apollo-server-core/src/utils/dispatcher.ts @@ -29,14 +29,6 @@ export class Dispatcher { return await Promise.all( this.callTargets(this.targets, methodName, ...args), ); - return await Promise.all( - this.targets.map(target => { - const method = target[methodName]; - if (method && typeof method === 'function') { - return method.apply(target, args); - } - }), - ); } public invokeHookSync( From 6f0dee7871d8cf06fa24b4242bb03f318a0697a8 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Fri, 8 May 2020 18:25:25 +0000 Subject: [PATCH 540/642] Switch to new `willResolveField` object parameter, rather position. Implements pattern gained by a926b7eedbb87abab2ec70fb03d7174398 in #3988. Ref: https://github.com/apollographql/apollo-server/pull/3998 --- packages/apollo-cache-control/src/index.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/apollo-cache-control/src/index.ts b/packages/apollo-cache-control/src/index.ts index 5e2277c2e7c..53f8e4272fd 100644 --- a/packages/apollo-cache-control/src/index.ts +++ b/packages/apollo-cache-control/src/index.ts @@ -66,8 +66,7 @@ export const plugin = ( return { executionDidStart: () => ({ executionDidEnd: () => setOverallCachePolicyWhenUnset(), - willResolveField(...args) { - const [, , , info] = args; + willResolveField({ info }) { let hint: CacheHint = {}; // If this field's resolver returns an object or interface, look for From d85276f354b88f6bf8d26e73b7187cb22246d2da Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Fri, 8 May 2020 18:27:38 +0000 Subject: [PATCH 541/642] Switch to new `willResolveField` object parameter, rather position. Implements pattern gained by a926b7eedbb87abab2ec70fb03d7174398 in #3988. Ref: https://github.com/apollographql/apollo-server/pull/3998 --- packages/apollo-tracing/src/index.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/apollo-tracing/src/index.ts b/packages/apollo-tracing/src/index.ts index 70c541ff7bb..f6ec8a06765 100644 --- a/packages/apollo-tracing/src/index.ts +++ b/packages/apollo-tracing/src/index.ts @@ -62,9 +62,7 @@ export const plugin = (_futureOptions = {}) => (): ApolloServerPlugin => ({ endWallTime = new Date(); }, - willResolveField(...args) { - const [, , , info] = args; - + willResolveField({ info }) { const resolverCall: ResolverCall = { path: info.path, fieldName: info.fieldName, From 62fc270641faa1d5a8b023768d1b2a7c7f2e4ece Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Fri, 8 May 2020 18:28:51 +0000 Subject: [PATCH 542/642] Switch to new `willResolveField` object parameter, rather position. Implements pattern gained by a926b7eedbb87abab2ec70fb03d7174398 in #3988. Ref: https://github.com/apollographql/apollo-server/pull/3998 --- packages/apollo-engine-reporting/src/federatedPlugin.ts | 3 +-- packages/apollo-engine-reporting/src/plugin.ts | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/apollo-engine-reporting/src/federatedPlugin.ts b/packages/apollo-engine-reporting/src/federatedPlugin.ts index b5660f7183f..ce2a5580668 100644 --- a/packages/apollo-engine-reporting/src/federatedPlugin.ts +++ b/packages/apollo-engine-reporting/src/federatedPlugin.ts @@ -29,8 +29,7 @@ const federatedPlugin = ( return { executionDidStart: () => ({ - willResolveField(...args) { - const [ , , , info] = args; + willResolveField({ info }) { return treeBuilder.willResolveField(info); }, }), diff --git a/packages/apollo-engine-reporting/src/plugin.ts b/packages/apollo-engine-reporting/src/plugin.ts index 59a483dcd0a..9c75aba803b 100644 --- a/packages/apollo-engine-reporting/src/plugin.ts +++ b/packages/apollo-engine-reporting/src/plugin.ts @@ -173,8 +173,7 @@ export const plugin = ( executionDidStart(requestContext) { return { executionDidEnd: () => didEnd(requestContext), - willResolveField(...args) { - const [, , , info] = args; + willResolveField({ info }) { return treeBuilder.willResolveField(info); // We could save the error into the trace during the end handler, but // it won't have all the information that graphql-js adds to it later, From e0858d8940863bb26a3607183816960a133f79e4 Mon Sep 17 00:00:00 2001 From: Trevor Scheer Date: Fri, 8 May 2020 12:30:08 -0700 Subject: [PATCH 543/642] fix(gateway): Correctly handle unions with nested conditions that have no `possibleTypes` (#4071) Skip collectFields for INLINE_FRAGMENTs and FRAGMENT_SPREADs when they have no possibleTypes. A field with no possibleTypes can be dropped / ignored from the query since the requested field exists within an impossible condition. Thus, we can skip the collectFields step altogether for fields which have no possibleTypes. The effect of skipping this step is that invalid fields are no longer represented within the splitFields function, thereby resolving the issue. --- packages/apollo-gateway/CHANGELOG.md | 2 +- .../src/__tests__/buildQueryPlan.test.ts | 154 ++++++++++++++++++ packages/apollo-gateway/src/buildQueryPlan.ts | 31 ++-- 3 files changed, 173 insertions(+), 14 deletions(-) diff --git a/packages/apollo-gateway/CHANGELOG.md b/packages/apollo-gateway/CHANGELOG.md index 1f7efdb7ede..4e66cee7e10 100644 --- a/packages/apollo-gateway/CHANGELOG.md +++ b/packages/apollo-gateway/CHANGELOG.md @@ -4,7 +4,7 @@ > 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. 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. -- _Nothing yet! Stay tuned!_ +- __FIX__: Correctly handle unions with nested conditions that have no `possibleTypes` [#4071](https://github.com/apollographql/apollo-server/pull/4071) ## 0.15.0 diff --git a/packages/apollo-gateway/src/__tests__/buildQueryPlan.test.ts b/packages/apollo-gateway/src/__tests__/buildQueryPlan.test.ts index 156f7f93c41..b35c104bb40 100644 --- a/packages/apollo-gateway/src/__tests__/buildQueryPlan.test.ts +++ b/packages/apollo-gateway/src/__tests__/buildQueryPlan.test.ts @@ -1235,4 +1235,158 @@ describe('buildQueryPlan', () => { `); }); }); + + it(`should properly expand nested unions with inline fragments`, () => { + const query = gql` + query { + body { + ... on Image { + ... on Body { + ... on Image { + attributes { + url + } + } + ... on Text { + attributes { + bold + text + } + } + } + } + ... on Text { + attributes { + bold + } + } + } + } + `; + + const queryPlan = buildQueryPlan( + buildOperationContext(schema, query, undefined), + ); + + expect(queryPlan).toMatchInlineSnapshot(` + QueryPlan { + Fetch(service: "documents") { + { + body { + __typename + ... on Image { + attributes { + url + } + } + ... on Text { + attributes { + bold + } + } + } + } + }, + } + `); + }); + + describe('deduplicates fields / selections regardless of adjacency and type condition nesting', () => { + it('for inline fragments', () => { + const query = gql` + query { + body { + ... on Image { + ... on Text { + attributes { + bold + } + } + } + ... on Body { + ... on Text { + attributes { + bold + text + } + } + } + ... on Text { + attributes { + bold + text + } + } + } + } + `; + + const queryPlan = buildQueryPlan( + buildOperationContext(schema, query, undefined), + ); + + expect(queryPlan).toMatchInlineSnapshot(` + QueryPlan { + Fetch(service: "documents") { + { + body { + __typename + ... on Text { + attributes { + bold + text + } + } + } + } + }, + } + `); + }); + + it('for named fragment spreads', () => { + const query = gql` + fragment TextFragment on Text { + attributes { + bold + text + } + } + + query { + body { + ... on Image { + ...TextFragment + } + ... on Body { + ...TextFragment + } + ...TextFragment + } + } + `; + + const queryPlan = buildQueryPlan( + buildOperationContext(schema, query, undefined), + ); + + expect(queryPlan).toMatchInlineSnapshot(` + QueryPlan { + Fetch(service: "documents") { + { + body { + __typename + ... on Text { + attributes { + bold + text + } + } + } + } + }, + } + `); + }); + }); }); diff --git a/packages/apollo-gateway/src/buildQueryPlan.ts b/packages/apollo-gateway/src/buildQueryPlan.ts index b2761fad112..e36237cdc5b 100644 --- a/packages/apollo-gateway/src/buildQueryPlan.ts +++ b/packages/apollo-gateway/src/buildQueryPlan.ts @@ -513,9 +513,7 @@ function splitFields( groupForField: (field: Field) => FetchGroup, ) { for (const fieldsForResponseName of groupByResponseName(fields).values()) { - for (const [parentType, fieldsForParentType] of groupByParentType( - fieldsForResponseName, - )) { + for (const [parentType, fieldsForParentType] of groupByParentType(fieldsForResponseName)) { // Field nodes that share the same response name and parent type are guaranteed // to have the same field name and arguments. We only need the other nodes when // merging selection sets, to take node-specific subfields and directives @@ -524,10 +522,6 @@ function splitFields( const field = fieldsForParentType[0]; const { scope, fieldDef } = field; - // If the length of possibleTypes is zero, we're nested inside a type condition - // that's impossible to fulfill and can be excluded from the query plan altogether. - if (scope.possibleTypes.length === 0) continue; - // We skip `__typename` for root types. if (fieldDef.name === TypeNameMetaFieldDef.name) { const { schema } = context; @@ -776,7 +770,12 @@ function collectFields( const fieldDef = context.getFieldDef(scope.parentType, selection); fields.push({ scope, fieldNode: selection, fieldDef }); break; - case Kind.INLINE_FRAGMENT: + case Kind.INLINE_FRAGMENT: { + const newScope = context.newScope(getFragmentCondition(selection), scope); + if (newScope.possibleTypes.length === 0) { + break; + } + collectFields( context, context.newScope(getFragmentCondition(selection), scope), @@ -785,22 +784,28 @@ function collectFields( visitedFragmentNames, ); break; + } case Kind.FRAGMENT_SPREAD: const fragmentName = selection.name.value; - if (visitedFragmentNames[fragmentName]) { + const fragment = context.fragments[fragmentName]; + if (!fragment) { continue; } - visitedFragmentNames[fragmentName] = true; - const fragment = context.fragments[fragmentName]; - if (!fragment) { + const newScope = context.newScope(getFragmentCondition(fragment), scope); + if (newScope.possibleTypes.length === 0) { continue; } + if (visitedFragmentNames[fragmentName]) { + continue; + } + visitedFragmentNames[fragmentName] = true; + collectFields( context, - context.newScope(getFragmentCondition(fragment), scope), + newScope, fragment.selectionSet, fields, visitedFragmentNames, From 626c4b6505ed98d47855712a568fc4eba9d8ff18 Mon Sep 17 00:00:00 2001 From: Trevor Scheer Date: Fri, 8 May 2020 12:38:47 -0700 Subject: [PATCH 544/642] Release - apollo-cache-control@0.10.1-alpha.0 - apollo-datasource-rest@0.9.1-alpha.0 - apollo-datasource@0.7.1-alpha.0 - apollo-engine-reporting-protobuf@0.5.1-alpha.0 - apollo-engine-reporting@1.8.1-alpha.0 - @apollo/federation@0.15.1-alpha.0 - @apollo/gateway@0.15.1-alpha.0 - apollo-server-azure-functions@2.13.1-alpha.0 - apollo-server-cache-memcached@0.6.5-alpha.0 - apollo-server-cache-redis@1.2.1-alpha.0 - apollo-server-cloud-functions@2.13.1-alpha.0 - apollo-server-cloudflare@2.13.1-alpha.0 - apollo-server-core@2.13.1-alpha.0 - apollo-server-env@2.4.4-alpha.0 - apollo-server-express@2.13.1-alpha.0 - apollo-server-fastify@2.13.1-alpha.0 - apollo-server-hapi@2.13.1-alpha.0 - apollo-server-integration-testsuite@2.13.1-alpha.0 - apollo-server-koa@2.13.1-alpha.0 - apollo-server-lambda@2.13.1-alpha.0 - apollo-server-micro@2.13.1-alpha.0 - apollo-server-plugin-base@0.8.1-alpha.0 - apollo-server-plugin-response-cache@0.5.1-alpha.0 - apollo-server-testing@2.13.1-alpha.0 - apollo-server-types@0.4.1-alpha.0 - apollo-server@2.13.1-alpha.0 - apollo-tracing@0.10.1-alpha.0 - graphql-extensions@0.12.1-alpha.0 --- packages/apollo-cache-control/package.json | 2 +- packages/apollo-datasource-rest/package.json | 2 +- packages/apollo-datasource/package.json | 2 +- packages/apollo-engine-reporting-protobuf/package-lock.json | 2 +- packages/apollo-engine-reporting-protobuf/package.json | 2 +- packages/apollo-engine-reporting/package.json | 2 +- packages/apollo-federation/package.json | 2 +- packages/apollo-gateway/package.json | 2 +- packages/apollo-server-azure-functions/package.json | 2 +- packages/apollo-server-cache-memcached/package.json | 2 +- packages/apollo-server-cache-redis/package.json | 2 +- packages/apollo-server-cloud-functions/package.json | 2 +- packages/apollo-server-cloudflare/package.json | 2 +- packages/apollo-server-core/package.json | 2 +- packages/apollo-server-env/package.json | 2 +- packages/apollo-server-express/package.json | 2 +- packages/apollo-server-fastify/package.json | 2 +- packages/apollo-server-hapi/package.json | 2 +- packages/apollo-server-integration-testsuite/package.json | 2 +- packages/apollo-server-koa/package.json | 2 +- packages/apollo-server-lambda/package.json | 2 +- packages/apollo-server-micro/package.json | 2 +- packages/apollo-server-plugin-base/package.json | 2 +- packages/apollo-server-plugin-response-cache/package.json | 2 +- packages/apollo-server-testing/package.json | 2 +- packages/apollo-server-types/package.json | 2 +- packages/apollo-server/package.json | 2 +- packages/apollo-tracing/package.json | 2 +- packages/graphql-extensions/package.json | 2 +- 29 files changed, 29 insertions(+), 29 deletions(-) diff --git a/packages/apollo-cache-control/package.json b/packages/apollo-cache-control/package.json index 457f22c21d9..630c1e8d983 100644 --- a/packages/apollo-cache-control/package.json +++ b/packages/apollo-cache-control/package.json @@ -1,6 +1,6 @@ { "name": "apollo-cache-control", - "version": "0.10.0", + "version": "0.10.1-alpha.0", "description": "A GraphQL extension for cache control", "main": "./dist/index.js", "types": "./dist/index.d.ts", diff --git a/packages/apollo-datasource-rest/package.json b/packages/apollo-datasource-rest/package.json index f41d3583ebd..227a16649df 100644 --- a/packages/apollo-datasource-rest/package.json +++ b/packages/apollo-datasource-rest/package.json @@ -1,6 +1,6 @@ { "name": "apollo-datasource-rest", - "version": "0.9.0", + "version": "0.9.1-alpha.0", "author": "opensource@apollographql.com", "license": "MIT", "repository": { diff --git a/packages/apollo-datasource/package.json b/packages/apollo-datasource/package.json index 90116794b51..5dc85e7bfff 100644 --- a/packages/apollo-datasource/package.json +++ b/packages/apollo-datasource/package.json @@ -1,6 +1,6 @@ { "name": "apollo-datasource", - "version": "0.7.0", + "version": "0.7.1-alpha.0", "author": "opensource@apollographql.com", "license": "MIT", "repository": { diff --git a/packages/apollo-engine-reporting-protobuf/package-lock.json b/packages/apollo-engine-reporting-protobuf/package-lock.json index a697a29cd66..cdeebe199a6 100644 --- a/packages/apollo-engine-reporting-protobuf/package-lock.json +++ b/packages/apollo-engine-reporting-protobuf/package-lock.json @@ -1,6 +1,6 @@ { "name": "apollo-engine-reporting-protobuf", - "version": "0.5.0", + "version": "0.5.1-alpha.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/packages/apollo-engine-reporting-protobuf/package.json b/packages/apollo-engine-reporting-protobuf/package.json index 7e1ec4f6e29..3812458bbb2 100644 --- a/packages/apollo-engine-reporting-protobuf/package.json +++ b/packages/apollo-engine-reporting-protobuf/package.json @@ -1,6 +1,6 @@ { "name": "apollo-engine-reporting-protobuf", - "version": "0.5.0", + "version": "0.5.1-alpha.0", "description": "Protobuf format for Apollo Engine", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-engine-reporting/package.json b/packages/apollo-engine-reporting/package.json index f4be8e46688..90cc7285aca 100644 --- a/packages/apollo-engine-reporting/package.json +++ b/packages/apollo-engine-reporting/package.json @@ -1,6 +1,6 @@ { "name": "apollo-engine-reporting", - "version": "1.8.0", + "version": "1.8.1-alpha.0", "description": "Send reports about your GraphQL services to Apollo Graph Manager (previously known as Apollo Engine)", "main": "./dist/index.js", "types": "./dist/index.d.ts", diff --git a/packages/apollo-federation/package.json b/packages/apollo-federation/package.json index 3742406bf85..9dac35ea97b 100644 --- a/packages/apollo-federation/package.json +++ b/packages/apollo-federation/package.json @@ -1,6 +1,6 @@ { "name": "@apollo/federation", - "version": "0.15.0", + "version": "0.15.1-alpha.0", "description": "Apollo Federation Utilities", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-gateway/package.json b/packages/apollo-gateway/package.json index 8d3bd77aaec..28ed74c5046 100644 --- a/packages/apollo-gateway/package.json +++ b/packages/apollo-gateway/package.json @@ -1,6 +1,6 @@ { "name": "@apollo/gateway", - "version": "0.15.0", + "version": "0.15.1-alpha.0", "description": "Apollo Gateway", "author": "opensource@apollographql.com", "main": "dist/index.js", diff --git a/packages/apollo-server-azure-functions/package.json b/packages/apollo-server-azure-functions/package.json index ed39eeaacce..bc05c924e21 100644 --- a/packages/apollo-server-azure-functions/package.json +++ b/packages/apollo-server-azure-functions/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-azure-functions", - "version": "2.13.0", + "version": "2.13.1-alpha.0", "description": "Production-ready Node.js GraphQL server for Azure Functions", "keywords": [ "GraphQL", diff --git a/packages/apollo-server-cache-memcached/package.json b/packages/apollo-server-cache-memcached/package.json index b445be473e3..f83ec47ec35 100644 --- a/packages/apollo-server-cache-memcached/package.json +++ b/packages/apollo-server-cache-memcached/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-cache-memcached", - "version": "0.6.4", + "version": "0.6.5-alpha.0", "author": "opensource@apollographql.com", "license": "MIT", "repository": { diff --git a/packages/apollo-server-cache-redis/package.json b/packages/apollo-server-cache-redis/package.json index d92f90f6445..b0b57a1f926 100644 --- a/packages/apollo-server-cache-redis/package.json +++ b/packages/apollo-server-cache-redis/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-cache-redis", - "version": "1.2.0", + "version": "1.2.1-alpha.0", "author": "opensource@apollographql.com", "license": "MIT", "repository": { diff --git a/packages/apollo-server-cloud-functions/package.json b/packages/apollo-server-cloud-functions/package.json index 9f45fe2e544..28efb4db328 100644 --- a/packages/apollo-server-cloud-functions/package.json +++ b/packages/apollo-server-cloud-functions/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-cloud-functions", - "version": "2.13.0", + "version": "2.13.1-alpha.0", "description": "Production-ready Node.js GraphQL server for Google Cloud Functions", "keywords": [ "GraphQL", diff --git a/packages/apollo-server-cloudflare/package.json b/packages/apollo-server-cloudflare/package.json index d95224fb92d..520b0df54f1 100644 --- a/packages/apollo-server-cloudflare/package.json +++ b/packages/apollo-server-cloudflare/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-cloudflare", - "version": "2.13.0", + "version": "2.13.1-alpha.0", "description": "Production-ready Node.js GraphQL server for Cloudflare workers", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-core/package.json b/packages/apollo-server-core/package.json index 44dbb40b566..fe8ab96efad 100644 --- a/packages/apollo-server-core/package.json +++ b/packages/apollo-server-core/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-core", - "version": "2.13.0", + "version": "2.13.1-alpha.0", "description": "Core engine for Apollo GraphQL server", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-env/package.json b/packages/apollo-server-env/package.json index 9330d1d161b..a09556b2c5f 100644 --- a/packages/apollo-server-env/package.json +++ b/packages/apollo-server-env/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-env", - "version": "2.4.3", + "version": "2.4.4-alpha.0", "author": "opensource@apollographql.com", "license": "MIT", "repository": { diff --git a/packages/apollo-server-express/package.json b/packages/apollo-server-express/package.json index 8bfd3b5bee3..9bc73e3786a 100644 --- a/packages/apollo-server-express/package.json +++ b/packages/apollo-server-express/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-express", - "version": "2.13.0", + "version": "2.13.1-alpha.0", "description": "Production-ready Node.js GraphQL server for Express and Connect", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-fastify/package.json b/packages/apollo-server-fastify/package.json index b5348e3c294..bb044cb9246 100644 --- a/packages/apollo-server-fastify/package.json +++ b/packages/apollo-server-fastify/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-fastify", - "version": "2.13.0", + "version": "2.13.1-alpha.0", "description": "Production-ready Node.js GraphQL server for Fastify", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-hapi/package.json b/packages/apollo-server-hapi/package.json index ec1f78e28d1..bc572b8b86f 100644 --- a/packages/apollo-server-hapi/package.json +++ b/packages/apollo-server-hapi/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-hapi", - "version": "2.13.0", + "version": "2.13.1-alpha.0", "description": "Production-ready Node.js GraphQL server for Hapi", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-integration-testsuite/package.json b/packages/apollo-server-integration-testsuite/package.json index 8c611c7f653..04f8f3d3db1 100644 --- a/packages/apollo-server-integration-testsuite/package.json +++ b/packages/apollo-server-integration-testsuite/package.json @@ -1,7 +1,7 @@ { "name": "apollo-server-integration-testsuite", "private": true, - "version": "2.13.0", + "version": "2.13.1-alpha.0", "description": "Apollo Server Integrations testsuite", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-koa/package.json b/packages/apollo-server-koa/package.json index 7fd3a2c23a4..17c97ca41e3 100644 --- a/packages/apollo-server-koa/package.json +++ b/packages/apollo-server-koa/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-koa", - "version": "2.13.0", + "version": "2.13.1-alpha.0", "description": "Production-ready Node.js GraphQL server for Koa", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-lambda/package.json b/packages/apollo-server-lambda/package.json index 7cc35d5aeae..49cf6e7d4a1 100644 --- a/packages/apollo-server-lambda/package.json +++ b/packages/apollo-server-lambda/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-lambda", - "version": "2.13.0", + "version": "2.13.1-alpha.0", "description": "Production-ready Node.js GraphQL server for AWS Lambda", "keywords": [ "GraphQL", diff --git a/packages/apollo-server-micro/package.json b/packages/apollo-server-micro/package.json index 26aa1160bdd..59ea179c698 100644 --- a/packages/apollo-server-micro/package.json +++ b/packages/apollo-server-micro/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-micro", - "version": "2.13.0", + "version": "2.13.1-alpha.0", "description": "Production-ready Node.js GraphQL server for Micro", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-plugin-base/package.json b/packages/apollo-server-plugin-base/package.json index 2c30efced82..ebb16d406bc 100644 --- a/packages/apollo-server-plugin-base/package.json +++ b/packages/apollo-server-plugin-base/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-plugin-base", - "version": "0.8.0", + "version": "0.8.1-alpha.0", "description": "Apollo Server plugin base classes", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-plugin-response-cache/package.json b/packages/apollo-server-plugin-response-cache/package.json index 77a9164f700..bfcfd106111 100644 --- a/packages/apollo-server-plugin-response-cache/package.json +++ b/packages/apollo-server-plugin-response-cache/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-plugin-response-cache", - "version": "0.5.0", + "version": "0.5.1-alpha.0", "description": "Apollo Server full query response cache", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-testing/package.json b/packages/apollo-server-testing/package.json index 75208be5637..7aa3735f4f4 100644 --- a/packages/apollo-server-testing/package.json +++ b/packages/apollo-server-testing/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-testing", - "version": "2.13.0", + "version": "2.13.1-alpha.0", "description": "Test utils for apollo-server", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-types/package.json b/packages/apollo-server-types/package.json index c82a072d584..9008aab1402 100644 --- a/packages/apollo-server-types/package.json +++ b/packages/apollo-server-types/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-types", - "version": "0.4.0", + "version": "0.4.1-alpha.0", "description": "Apollo Server shared types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server/package.json b/packages/apollo-server/package.json index a6483da8f8a..e54067bc9e6 100644 --- a/packages/apollo-server/package.json +++ b/packages/apollo-server/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server", - "version": "2.13.0", + "version": "2.13.1-alpha.0", "description": "Production ready GraphQL Server", "author": "opensource@apollographql.com", "main": "dist/index.js", diff --git a/packages/apollo-tracing/package.json b/packages/apollo-tracing/package.json index d960369db66..18dd20f770c 100644 --- a/packages/apollo-tracing/package.json +++ b/packages/apollo-tracing/package.json @@ -1,6 +1,6 @@ { "name": "apollo-tracing", - "version": "0.10.0", + "version": "0.10.1-alpha.0", "description": "Collect and expose trace data for GraphQL requests", "main": "./dist/index.js", "types": "./dist/index.d.ts", diff --git a/packages/graphql-extensions/package.json b/packages/graphql-extensions/package.json index 5ff10ba85bc..c914bf53c2a 100644 --- a/packages/graphql-extensions/package.json +++ b/packages/graphql-extensions/package.json @@ -1,6 +1,6 @@ { "name": "graphql-extensions", - "version": "0.12.0", + "version": "0.12.1-alpha.0", "description": "Add extensions to GraphQL servers", "main": "./dist/index.js", "types": "./dist/index.d.ts", From 2f5f29204132c726795c32e5a8487e5fdbded95d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 9 May 2020 09:12:36 +0000 Subject: [PATCH 545/642] chore(deps): update dependency @types/ioredis to v4.16.1 (#4090) Co-authored-by: Renovate Bot --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 249bef8c6bc..b69aa5ee382 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4964,9 +4964,9 @@ "integrity": "sha512-TZDqvFW4nQwL9DVSNJIJu4lPLttKgzRF58COa7Vs42Ki/MrhIqUbeIw0MWn4kGLiZLXB7oCBibm7nkSjPkzfKQ==" }, "@types/ioredis": { - "version": "4.16.0", - "resolved": "https://registry.npmjs.org/@types/ioredis/-/ioredis-4.16.0.tgz", - "integrity": "sha512-fxR2oHLj0NIqdM9OT8/hwPmlHI05i77UVfP9deys8+ZutZuo0SneA7FvXm2Kage6drQyl8F5gHWiTGK0lXaCCA==", + "version": "4.16.1", + "resolved": "https://registry.npmjs.org/@types/ioredis/-/ioredis-4.16.1.tgz", + "integrity": "sha512-3O4gHSxQ4C0AhJVHIW4TFYsv0OqORLmiu5mgceciJrPct/ToTwRehroLU3vw5evzQgemdKx05dU6nKs5bCN1bQ==", "dev": true, "requires": { "@types/node": "*" diff --git a/package.json b/package.json index efbd640c93c..30d30708265 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "@types/connect": "3.4.33", "@types/fast-json-stable-stringify": "2.0.0", "@types/hapi": "17.8.7", - "@types/ioredis": "4.16.0", + "@types/ioredis": "4.16.1", "@types/jest": "25.2.1", "@types/koa-router": "7.4.0", "@types/lodash": "4.14.150", From c73cd163dc78ebfb25e46398339782c3a6d52801 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 11 May 2020 08:11:00 +0000 Subject: [PATCH 546/642] nit: Add missing closing paren on comment Ref: b0948a826cc31bec79f0a54ea46fa2db884ac95b --- packages/apollo-engine-reporting/src/plugin.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/apollo-engine-reporting/src/plugin.ts b/packages/apollo-engine-reporting/src/plugin.ts index 9c75aba803b..84ead380e19 100644 --- a/packages/apollo-engine-reporting/src/plugin.ts +++ b/packages/apollo-engine-reporting/src/plugin.ts @@ -105,8 +105,8 @@ export const plugin = ( // because there is no operation with that name in the document), we // still put _that_ user-supplied `operationName` in the trace. This // allows the error to be better understood in Graph Manager. (We are - // considering changing the behavior of `operationName` in these three - // error cases; https://github.com/apollographql/apollo-server/pull/3465 + // considering changing the behavior of `operationName` in these 3 error + // cases; https://github.com/apollographql/apollo-server/pull/3465) const operationName = requestContext.operationName || requestContext.request.operationName || From 41b103ebc730f2875355fc4c253c9077900ead61 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 11 May 2020 10:10:01 +0000 Subject: [PATCH 547/642] tests: Expand on tests for `willResolveField` parameters. Follows-up: a926b7eedbb87abab2ec70fb03d71743985cb18d Ref: https://github.com/apollographql/apollo-server/pull/3988#commitcomment-39044492 --- .../src/__tests__/runQuery.test.ts | 142 ++++++++++++++---- 1 file changed, 112 insertions(+), 30 deletions(-) diff --git a/packages/apollo-server-core/src/__tests__/runQuery.test.ts b/packages/apollo-server-core/src/__tests__/runQuery.test.ts index 53f31e64e17..e6c4ec5124a 100644 --- a/packages/apollo-server-core/src/__tests__/runQuery.test.ts +++ b/packages/apollo-server-core/src/__tests__/runQuery.test.ts @@ -691,41 +691,123 @@ describe('runQuery', () => { expect(executionDidEnd).toHaveBeenCalledTimes(1); }); - it('receives an object with the resolver arguments', async () => { - const willResolveField = jest.fn(); - const executionDidEnd = jest.fn(); - const executionDidStart = jest.fn( - (): GraphQLRequestExecutionListener => ({ - willResolveField, - executionDidEnd, - }), - ); + describe('receives correct resolver parameter object', () => { + it('receives undefined parent when there is no parent', async () => { + const willResolveField = jest.fn(); - await runQuery({ - schema, - context: { ourSpecialContext: true }, - queryString: '{ testString }', - plugins: [ - { - requestDidStart() { - return { - executionDidStart, - }; + await runQuery({ + schema, + queryString: '{ testString }', + plugins: [ + { + requestDidStart() { + return { + executionDidStart: () => ({ + willResolveField, + }), + }; + }, }, - }, - ], - request: new MockReq(), + ], + request: new MockReq(), + }); + + // It is called only once. + expect(willResolveField).toHaveBeenCalledTimes(1); + const call = willResolveField.mock.calls[0]; + expect(call[0]).toHaveProperty("source", undefined); + expect(call[0]).toHaveProperty("info.path.key", "testString"); + expect(call[0]).toHaveProperty("info.path.prev", undefined); }); - expect(executionDidStart).toHaveBeenCalledTimes(1); - expect(willResolveField).toHaveBeenCalledTimes(1); - expect(willResolveField).toHaveBeenNthCalledWith(1, { - source: undefined, - args: {}, - context: expect.objectContaining({ ourSpecialContext: true }), - info: expect.objectContaining({ fieldName: 'testString' }), + it('receives the parent when there is one', async () => { + const willResolveField = jest.fn(); + + await runQuery({ + schema, + queryString: '{ testObject { testString } }', + plugins: [ + { + requestDidStart() { + return { + executionDidStart: () => ({ + willResolveField, + }), + }; + }, + }, + ], + request: new MockReq(), + }); + + // It is called 1st for `testObject` and then 2nd for `testString`. + expect(willResolveField).toHaveBeenCalledTimes(2); + const [firstCall, secondCall] = willResolveField.mock.calls; + expect(firstCall[0]).toHaveProperty("source", undefined); + expect(firstCall[0]).toHaveProperty("info.path.key", "testObject"); + expect(firstCall[0]).toHaveProperty("info.path.prev", undefined); + + expect(secondCall[0]).toHaveProperty('source', { + testString: 'a very test string', + }); + expect(secondCall[0]).toHaveProperty("info.path.key", "testString"); + expect(secondCall[0]).toHaveProperty('info.path.prev', { + key: 'testObject', + prev: undefined, + }); + }); + + it('receives context', async () => { + const willResolveField = jest.fn(); + + await runQuery({ + schema, + context: { ourSpecialContext: true }, + queryString: '{ testString }', + plugins: [ + { + requestDidStart() { + return { + executionDidStart: () => ({ + willResolveField, + }), + }; + }, + }, + ], + request: new MockReq(), + }); + + expect(willResolveField).toHaveBeenCalledTimes(1); + expect(willResolveField.mock.calls[0][0]).toHaveProperty("context", + expect.objectContaining({ ourSpecialContext: true }), + ); + }); + + it('receives arguments', async () => { + const willResolveField = jest.fn(); + + await runQuery({ + schema, + queryString: '{ testArgumentValue(base: 99) }', + plugins: [ + { + requestDidStart() { + return { + executionDidStart: () => ({ + willResolveField, + }), + }; + }, + }, + ], + request: new MockReq(), + }); + + expect(willResolveField).toHaveBeenCalledTimes(1); + expect(willResolveField.mock.calls[0][0]) + .toHaveProperty("args.base", 99); }); - expect(executionDidEnd).toHaveBeenCalledTimes(1); }); it('calls the end handler', async () => { From 6564081240ee884f3d6c5522ed17f1b480a9451c Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 11 May 2020 12:30:01 +0000 Subject: [PATCH 548/642] Attach user-defined `fieldResolver` to context. Previously, the "wrapped"-ness of the new plugin API's ability to invoke the user-defined `fieldResolver` which is provided in the `GraphQLServerOptions` interface was only able to invoke a user's own `fieldResolve` by leveraging an additional wrapping of fields by `graphql-extensions`'s own `wrapField` which was an inner-layer of the onion-style wrapping. Since it was closest to the resolver, it was able obtain a reference to the `fieldResolver` which lives on an instance of the `GraphQLExtensionStack` and properly invoke the user's `fieldResolver`. This also attaches the `fieldResolver` provided by the user on a `Symbol` that is attached to the user's `context`, so we can invoke it (when defined) within the new plugin API's `wrapField`'s `field.resolve` function. Ref: https://github.com/apollographql/apollo-server/pull/3988#discussion_r414676152 --- .../apollo-server-core/src/requestPipeline.ts | 13 +++++++++++ .../src/utils/schemaInstrumentation.ts | 23 +++++++++++++++++-- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/packages/apollo-server-core/src/requestPipeline.ts b/packages/apollo-server-core/src/requestPipeline.ts index 074f7099528..eb287cb9516 100644 --- a/packages/apollo-server-core/src/requestPipeline.ts +++ b/packages/apollo-server-core/src/requestPipeline.ts @@ -21,6 +21,7 @@ import { PersistedQueryOptions } from './graphqlOptions'; import { symbolExecutionDispatcherWillResolveField, enablePluginsForSchemaResolvers, + symbolUserFieldResolver, } from "./utils/schemaInstrumentation" import { CacheControlExtension, @@ -405,6 +406,18 @@ export async function processGraphQLRequest( { value: invokeWillResolveField } ); + // If the user has provided a custom field resolver, we will attach + // it to the context so we can still invoke it after we've wrapped the + // fields with `wrapField` within `enablePluginsForSchemaResolvers` of + // the `schemaInstrumentation` module. + if (config.fieldResolver) { + Object.defineProperty( + requestContext.context, + symbolUserFieldResolver, + { value: config.fieldResolver } + ); + } + // If the schema is already enabled, this is a no-op. Otherwise, the // schema will be augmented so it is able to invoke willResolveField. enablePluginsForSchemaResolvers(config.schema); diff --git a/packages/apollo-server-core/src/utils/schemaInstrumentation.ts b/packages/apollo-server-core/src/utils/schemaInstrumentation.ts index 119320b3de9..d2393857e42 100644 --- a/packages/apollo-server-core/src/utils/schemaInstrumentation.ts +++ b/packages/apollo-server-core/src/utils/schemaInstrumentation.ts @@ -1,4 +1,11 @@ -import { GraphQLSchema, GraphQLField, ResponsePath, getNamedType, GraphQLObjectType } from "graphql/type"; +import { + GraphQLSchema, + GraphQLField, + ResponsePath, + getNamedType, + GraphQLObjectType, + GraphQLFieldResolver, +} from 'graphql/type'; import { defaultFieldResolver } from "graphql/execution"; import { FieldNode } from "graphql/language"; import { GraphQLRequestExecutionListener } from "apollo-server-plugin-base"; @@ -6,6 +13,8 @@ import { GraphQLObjectResolver } from "@apollographql/apollo-tools"; export const symbolExecutionDispatcherWillResolveField = Symbol("apolloServerExecutionDispatcherWillResolveField"); +export const symbolUserFieldResolver = + Symbol("apolloServerUserFieldResolver"); export const symbolPluginsEnabled = Symbol("apolloServerPluginsEnabled"); export function enablePluginsForSchemaResolvers( @@ -24,7 +33,7 @@ export function enablePluginsForSchemaResolvers( } function wrapField(field: GraphQLField): void { - const fieldResolver = field.resolve || defaultFieldResolver; + const originalFieldResolve = field.resolve; field.resolve = (source, args, context, info) => { // This is a bit of a hack, but since `ResponsePath` is a linked list, @@ -43,6 +52,13 @@ function wrapField(field: GraphQLField): void { | GraphQLRequestExecutionListener['willResolveField'] | undefined); + const userFieldResolver = + context && + context[symbolUserFieldResolver] && + (context[symbolUserFieldResolver] as + | GraphQLFieldResolver + | undefined); + // The technique for implementing a "did resolve field" is accomplished by // returning a function from the `willResolveField` handler. While there // may be several callbacks, depending on the number of plugins which have @@ -78,6 +94,9 @@ function wrapField(field: GraphQLField): void { } } + const fieldResolver = + originalFieldResolve || userFieldResolver || defaultFieldResolver; + try { let result: any; if (whenObjectResolved) { From 845babf695e96f20612172179df429ab7911ac55 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 11 May 2020 12:55:41 +0000 Subject: [PATCH 549/642] test: Fix error expectation which is resolver implementation dependent. With some resolvers, this will still be a resolver error, but with a different code. --- .../src/__tests__/loadServicesFromRemoteEndpoint.test.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/apollo-gateway/src/__tests__/loadServicesFromRemoteEndpoint.test.ts b/packages/apollo-gateway/src/__tests__/loadServicesFromRemoteEndpoint.test.ts index 2adf87141cc..91f3b366478 100644 --- a/packages/apollo-gateway/src/__tests__/loadServicesFromRemoteEndpoint.test.ts +++ b/packages/apollo-gateway/src/__tests__/loadServicesFromRemoteEndpoint.test.ts @@ -25,11 +25,14 @@ describe('getServiceDefinitionsFromRemoteEndpoint', () => { const dataSource = new RemoteGraphQLDataSource({ url }); const serviceList = [{ name: 'test', url, dataSource }]; + // Depending on the OS's resolver, the error may result in an error + // of `EAI_AGAIN` or `ENOTFOUND`. This `toThrowError` uses a Regex + // to match either case. await expect( getServiceDefinitionsFromRemoteEndpoint({ serviceList, serviceSdlCache, }), - ).rejects.toThrowError(/^Couldn't load service definitions for "test" at http:\/\/host-which-better-not-resolve\/graphql: request to http:\/\/host-which-better-not-resolve\/graphql failed, reason: getaddrinfo ENOTFOUND/); + ).rejects.toThrowError(/^Couldn't load service definitions for "test" at http:\/\/host-which-better-not-resolve\/graphql: request to http:\/\/host-which-better-not-resolve\/graphql failed, reason: getaddrinfo (ENOTFOUND|EAI_AGAIN)/); }); }); From e6bb91cbb1ed5e4f7badfa9b52b88d0a65d0a669 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 9 May 2020 09:12:36 +0000 Subject: [PATCH 550/642] chore(deps): update dependency @types/ioredis to v4.16.1 (#4090) Co-authored-by: Renovate Bot --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 249bef8c6bc..b69aa5ee382 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4964,9 +4964,9 @@ "integrity": "sha512-TZDqvFW4nQwL9DVSNJIJu4lPLttKgzRF58COa7Vs42Ki/MrhIqUbeIw0MWn4kGLiZLXB7oCBibm7nkSjPkzfKQ==" }, "@types/ioredis": { - "version": "4.16.0", - "resolved": "https://registry.npmjs.org/@types/ioredis/-/ioredis-4.16.0.tgz", - "integrity": "sha512-fxR2oHLj0NIqdM9OT8/hwPmlHI05i77UVfP9deys8+ZutZuo0SneA7FvXm2Kage6drQyl8F5gHWiTGK0lXaCCA==", + "version": "4.16.1", + "resolved": "https://registry.npmjs.org/@types/ioredis/-/ioredis-4.16.1.tgz", + "integrity": "sha512-3O4gHSxQ4C0AhJVHIW4TFYsv0OqORLmiu5mgceciJrPct/ToTwRehroLU3vw5evzQgemdKx05dU6nKs5bCN1bQ==", "dev": true, "requires": { "@types/node": "*" diff --git a/package.json b/package.json index efbd640c93c..30d30708265 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "@types/connect": "3.4.33", "@types/fast-json-stable-stringify": "2.0.0", "@types/hapi": "17.8.7", - "@types/ioredis": "4.16.0", + "@types/ioredis": "4.16.1", "@types/jest": "25.2.1", "@types/koa-router": "7.4.0", "@types/lodash": "4.14.150", From 2d0cf8ca83988747d3db79254ac477da6f788e69 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 11 May 2020 12:55:41 +0000 Subject: [PATCH 551/642] test: Fix error expectation which is resolver implementation dependent. With some resolvers, this will still be a resolver error, but with a different code. --- .../src/__tests__/loadServicesFromRemoteEndpoint.test.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/apollo-gateway/src/__tests__/loadServicesFromRemoteEndpoint.test.ts b/packages/apollo-gateway/src/__tests__/loadServicesFromRemoteEndpoint.test.ts index 2adf87141cc..91f3b366478 100644 --- a/packages/apollo-gateway/src/__tests__/loadServicesFromRemoteEndpoint.test.ts +++ b/packages/apollo-gateway/src/__tests__/loadServicesFromRemoteEndpoint.test.ts @@ -25,11 +25,14 @@ describe('getServiceDefinitionsFromRemoteEndpoint', () => { const dataSource = new RemoteGraphQLDataSource({ url }); const serviceList = [{ name: 'test', url, dataSource }]; + // Depending on the OS's resolver, the error may result in an error + // of `EAI_AGAIN` or `ENOTFOUND`. This `toThrowError` uses a Regex + // to match either case. await expect( getServiceDefinitionsFromRemoteEndpoint({ serviceList, serviceSdlCache, }), - ).rejects.toThrowError(/^Couldn't load service definitions for "test" at http:\/\/host-which-better-not-resolve\/graphql: request to http:\/\/host-which-better-not-resolve\/graphql failed, reason: getaddrinfo ENOTFOUND/); + ).rejects.toThrowError(/^Couldn't load service definitions for "test" at http:\/\/host-which-better-not-resolve\/graphql: request to http:\/\/host-which-better-not-resolve\/graphql failed, reason: getaddrinfo (ENOTFOUND|EAI_AGAIN)/); }); }); From c859219fbe35e175ac6b1341ef2bedbc763251ed Mon Sep 17 00:00:00 2001 From: David Glasser Date: Mon, 11 May 2020 12:05:39 -0700 Subject: [PATCH 552/642] [AS-252] gateway: normalize root operation types in reporting (#4100) --- packages/apollo-federation/CHANGELOG.md | 2 +- .../apollo-federation/src/composition/index.ts | 1 + .../src/composition/normalize.ts | 18 +++++++++--------- packages/apollo-gateway/CHANGELOG.md | 1 + .../__tests__/__fixtures__/schemas/accounts.ts | 11 ++++++++--- .../src/__tests__/buildQueryPlan.test.ts | 4 ++-- .../src/__tests__/executeQueryPlan.test.ts | 8 ++++---- .../apollo-gateway/src/executeQueryPlan.ts | 14 ++++++++++++++ 8 files changed, 40 insertions(+), 19 deletions(-) diff --git a/packages/apollo-federation/CHANGELOG.md b/packages/apollo-federation/CHANGELOG.md index b0a7e2667b7..752c94cf6ad 100644 --- a/packages/apollo-federation/CHANGELOG.md +++ b/packages/apollo-federation/CHANGELOG.md @@ -4,7 +4,7 @@ > 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. 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. -- _Nothing yet! Stay tuned._ +- Export `defaultRootOperationNameLookup` and `normalizeTypeDefs`; needed by `@apollo/gateway` to normalize root operation types when reporting to Apollo Graph Manager. [#4071](https://github.com/apollographql/apollo-server/pull/4071) ## 0.15.0 diff --git a/packages/apollo-federation/src/composition/index.ts b/packages/apollo-federation/src/composition/index.ts index 92f38fe9a62..1d30fd138bb 100644 --- a/packages/apollo-federation/src/composition/index.ts +++ b/packages/apollo-federation/src/composition/index.ts @@ -2,3 +2,4 @@ export * from './compose'; export * from './composeAndValidate'; export * from './types'; export { compositionRules } from './rules'; +export { defaultRootOperationNameLookup, normalizeTypeDefs } from './normalize'; diff --git a/packages/apollo-federation/src/composition/normalize.ts b/packages/apollo-federation/src/composition/normalize.ts index 75f423c561a..36fe58d51fe 100644 --- a/packages/apollo-federation/src/composition/normalize.ts +++ b/packages/apollo-federation/src/composition/normalize.ts @@ -15,18 +15,18 @@ export function normalizeTypeDefs(typeDefs: DocumentNode) { ); } +// Map of OperationTypeNode to its respective default root operation type name +export const defaultRootOperationNameLookup: { + [node in OperationTypeNode]: DefaultRootOperationTypeName; +} = { + query: 'Query', + mutation: 'Mutation', + subscription: 'Subscription', +}; + export function defaultRootOperationTypes( typeDefs: DocumentNode, ): DocumentNode { - // Map of OperationTypeNode to its respective default root operation type name - const defaultRootOperationNameLookup: { - [node in OperationTypeNode]: DefaultRootOperationTypeName; - } = { - query: 'Query', - mutation: 'Mutation', - subscription: 'Subscription', - }; - // Array of default root operation names const defaultRootOperationNames = Object.values( defaultRootOperationNameLookup, diff --git a/packages/apollo-gateway/CHANGELOG.md b/packages/apollo-gateway/CHANGELOG.md index 4e66cee7e10..e3c31aea821 100644 --- a/packages/apollo-gateway/CHANGELOG.md +++ b/packages/apollo-gateway/CHANGELOG.md @@ -5,6 +5,7 @@ > 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. 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. - __FIX__: Correctly handle unions with nested conditions that have no `possibleTypes` [#4071](https://github.com/apollographql/apollo-server/pull/4071) +- __FIX__: Normalize root operation types when reporting to Apollo Graph Manager. Federation always uses the default names `Query`, `Mutation`, and `Subscription` for root operation types even if downstream services choose different names; now we properly normalize traces received from downstream services in the same way. [#4100](https://github.com/apollographql/apollo-server/pull/4100) ## 0.15.0 diff --git a/packages/apollo-gateway/src/__tests__/__fixtures__/schemas/accounts.ts b/packages/apollo-gateway/src/__tests__/__fixtures__/schemas/accounts.ts index 12dcf6993de..375ea53b5e5 100644 --- a/packages/apollo-gateway/src/__tests__/__fixtures__/schemas/accounts.ts +++ b/packages/apollo-gateway/src/__tests__/__fixtures__/schemas/accounts.ts @@ -6,7 +6,12 @@ export const typeDefs = gql` directive @stream on FIELD directive @transform(from: String!) on FIELD - extend type Query { + schema { + query: RootQuery + mutation: Mutation + } + + extend type RootQuery { user(id: ID!): User me: User } @@ -36,7 +41,7 @@ export const typeDefs = gql` metadata: [UserMetadata] } - extend type Mutation { + type Mutation { login(username: String!, password: String!): User } @@ -80,7 +85,7 @@ const libraryUsers: { [name: string]: string[] } = { }; export const resolvers: GraphQLResolverMap = { - Query: { + RootQuery: { user(_, args) { return { id: args.id }; }, diff --git a/packages/apollo-gateway/src/__tests__/buildQueryPlan.test.ts b/packages/apollo-gateway/src/__tests__/buildQueryPlan.test.ts index b35c104bb40..8c8cf3f1dc0 100644 --- a/packages/apollo-gateway/src/__tests__/buildQueryPlan.test.ts +++ b/packages/apollo-gateway/src/__tests__/buildQueryPlan.test.ts @@ -5,7 +5,7 @@ import { GraphQLSchemaValidationError, } from 'apollo-graphql'; import gql from 'graphql-tag'; -import { composeServices, buildFederatedSchema } from '@apollo/federation'; +import { composeServices, buildFederatedSchema, normalizeTypeDefs } from '@apollo/federation'; import { buildQueryPlan, buildOperationContext } from '../buildQueryPlan'; @@ -45,7 +45,7 @@ describe('buildQueryPlan', () => { ({ schema, errors } = composeServices( Object.entries(serviceMap).map(([serviceName, service]) => ({ name: serviceName, - typeDefs: service.sdl(), + typeDefs: normalizeTypeDefs(service.sdl()), })), )); diff --git a/packages/apollo-gateway/src/__tests__/executeQueryPlan.test.ts b/packages/apollo-gateway/src/__tests__/executeQueryPlan.test.ts index a75f59eea97..f02aed05d1c 100644 --- a/packages/apollo-gateway/src/__tests__/executeQueryPlan.test.ts +++ b/packages/apollo-gateway/src/__tests__/executeQueryPlan.test.ts @@ -9,7 +9,7 @@ import { import gql from 'graphql-tag'; import { GraphQLRequestContext } from 'apollo-server-types'; import { AuthenticationError } from 'apollo-server-core'; -import { composeServices, buildFederatedSchema } from '@apollo/federation'; +import { composeServices, buildFederatedSchema, normalizeTypeDefs } from '@apollo/federation'; import { buildQueryPlan, buildOperationContext } from '../buildQueryPlan'; import { executeQueryPlan } from '../executeQueryPlan'; @@ -60,7 +60,7 @@ describe('executeQueryPlan', () => { ({ schema, errors } = composeServices( Object.entries(serviceMap).map(([serviceName, service]) => ({ name: serviceName, - typeDefs: service.sdl(), + typeDefs: normalizeTypeDefs(service.sdl()), })), )); @@ -104,7 +104,7 @@ describe('executeQueryPlan', () => { it(`should include an error when a root-level field errors out`, async () => { overrideResolversInService('accounts', { - Query: { + RootQuery: { me() { throw new AuthenticationError('Something went wrong'); }, @@ -151,7 +151,7 @@ describe('executeQueryPlan', () => { it(`should still include other root-level results if one root-level field errors out`, async () => { overrideResolversInService('accounts', { - Query: { + RootQuery: { me() { throw new Error('Something went wrong'); }, diff --git a/packages/apollo-gateway/src/executeQueryPlan.ts b/packages/apollo-gateway/src/executeQueryPlan.ts index 72116c8e83d..902c6552902 100644 --- a/packages/apollo-gateway/src/executeQueryPlan.ts +++ b/packages/apollo-gateway/src/executeQueryPlan.ts @@ -12,6 +12,7 @@ import { GraphQLFieldResolver, } from 'graphql'; import { Trace, google } from 'apollo-engine-reporting-protobuf'; +import { defaultRootOperationNameLookup } from '@apollo/federation'; import { GraphQLDataSource } from './datasources/types'; import { FetchNode, @@ -361,6 +362,19 @@ async function executeFetch( traceParsingFailed = true; } } + if (traceNode.trace) { + // Federation requires the root operations in the composed schema + // to have the default names (Query, Mutation, Subscription) even + // if the implementing services choose different names, so we override + // whatever the implementing service reported here. + const rootTypeName = + defaultRootOperationNameLookup[ + context.operationContext.operation.operation + ]; + traceNode.trace.root?.child?.forEach((child) => { + child.parentType = rootTypeName; + }); + } traceNode.traceParsingFailed = traceParsingFailed; } } From 8b6517c66d449122e6403aee378626ea736dd615 Mon Sep 17 00:00:00 2001 From: Trevor Scheer Date: Mon, 11 May 2020 11:28:28 -0700 Subject: [PATCH 553/642] Release - @apollo/federation@0.15.1-alpha.1 - @apollo/gateway@0.15.1-alpha.1 - apollo-server-azure-functions@2.13.1-alpha.1 - apollo-server-cloud-functions@2.13.1-alpha.1 - apollo-server-cloudflare@2.13.1-alpha.1 - apollo-server-core@2.13.1-alpha.1 - apollo-server-express@2.13.1-alpha.1 - apollo-server-fastify@2.13.1-alpha.1 - apollo-server-hapi@2.13.1-alpha.1 - apollo-server-integration-testsuite@2.13.1-alpha.1 - apollo-server-koa@2.13.1-alpha.1 - apollo-server-lambda@2.13.1-alpha.1 - apollo-server-micro@2.13.1-alpha.1 - apollo-server-testing@2.13.1-alpha.1 - apollo-server@2.13.1-alpha.1 --- packages/apollo-federation/package.json | 2 +- packages/apollo-gateway/package.json | 2 +- packages/apollo-server-azure-functions/package.json | 2 +- packages/apollo-server-cloud-functions/package.json | 2 +- packages/apollo-server-cloudflare/package.json | 2 +- packages/apollo-server-core/package.json | 2 +- packages/apollo-server-express/package.json | 2 +- packages/apollo-server-fastify/package.json | 2 +- packages/apollo-server-hapi/package.json | 2 +- packages/apollo-server-integration-testsuite/package.json | 2 +- packages/apollo-server-koa/package.json | 2 +- packages/apollo-server-lambda/package.json | 2 +- packages/apollo-server-micro/package.json | 2 +- packages/apollo-server-testing/package.json | 2 +- packages/apollo-server/package.json | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/packages/apollo-federation/package.json b/packages/apollo-federation/package.json index 9dac35ea97b..5868b112fee 100644 --- a/packages/apollo-federation/package.json +++ b/packages/apollo-federation/package.json @@ -1,6 +1,6 @@ { "name": "@apollo/federation", - "version": "0.15.1-alpha.0", + "version": "0.15.1-alpha.1", "description": "Apollo Federation Utilities", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-gateway/package.json b/packages/apollo-gateway/package.json index 28ed74c5046..999f051aed1 100644 --- a/packages/apollo-gateway/package.json +++ b/packages/apollo-gateway/package.json @@ -1,6 +1,6 @@ { "name": "@apollo/gateway", - "version": "0.15.1-alpha.0", + "version": "0.15.1-alpha.1", "description": "Apollo Gateway", "author": "opensource@apollographql.com", "main": "dist/index.js", diff --git a/packages/apollo-server-azure-functions/package.json b/packages/apollo-server-azure-functions/package.json index bc05c924e21..17e5568c11c 100644 --- a/packages/apollo-server-azure-functions/package.json +++ b/packages/apollo-server-azure-functions/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-azure-functions", - "version": "2.13.1-alpha.0", + "version": "2.13.1-alpha.1", "description": "Production-ready Node.js GraphQL server for Azure Functions", "keywords": [ "GraphQL", diff --git a/packages/apollo-server-cloud-functions/package.json b/packages/apollo-server-cloud-functions/package.json index 28efb4db328..38280cc806d 100644 --- a/packages/apollo-server-cloud-functions/package.json +++ b/packages/apollo-server-cloud-functions/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-cloud-functions", - "version": "2.13.1-alpha.0", + "version": "2.13.1-alpha.1", "description": "Production-ready Node.js GraphQL server for Google Cloud Functions", "keywords": [ "GraphQL", diff --git a/packages/apollo-server-cloudflare/package.json b/packages/apollo-server-cloudflare/package.json index 520b0df54f1..580e0dff346 100644 --- a/packages/apollo-server-cloudflare/package.json +++ b/packages/apollo-server-cloudflare/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-cloudflare", - "version": "2.13.1-alpha.0", + "version": "2.13.1-alpha.1", "description": "Production-ready Node.js GraphQL server for Cloudflare workers", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-core/package.json b/packages/apollo-server-core/package.json index fe8ab96efad..95c0eba1ae9 100644 --- a/packages/apollo-server-core/package.json +++ b/packages/apollo-server-core/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-core", - "version": "2.13.1-alpha.0", + "version": "2.13.1-alpha.1", "description": "Core engine for Apollo GraphQL server", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-express/package.json b/packages/apollo-server-express/package.json index 9bc73e3786a..c0efd7372df 100644 --- a/packages/apollo-server-express/package.json +++ b/packages/apollo-server-express/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-express", - "version": "2.13.1-alpha.0", + "version": "2.13.1-alpha.1", "description": "Production-ready Node.js GraphQL server for Express and Connect", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-fastify/package.json b/packages/apollo-server-fastify/package.json index bb044cb9246..0808e3d8ecf 100644 --- a/packages/apollo-server-fastify/package.json +++ b/packages/apollo-server-fastify/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-fastify", - "version": "2.13.1-alpha.0", + "version": "2.13.1-alpha.1", "description": "Production-ready Node.js GraphQL server for Fastify", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-hapi/package.json b/packages/apollo-server-hapi/package.json index bc572b8b86f..db77aa7f0a1 100644 --- a/packages/apollo-server-hapi/package.json +++ b/packages/apollo-server-hapi/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-hapi", - "version": "2.13.1-alpha.0", + "version": "2.13.1-alpha.1", "description": "Production-ready Node.js GraphQL server for Hapi", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-integration-testsuite/package.json b/packages/apollo-server-integration-testsuite/package.json index 04f8f3d3db1..af7a01aa58a 100644 --- a/packages/apollo-server-integration-testsuite/package.json +++ b/packages/apollo-server-integration-testsuite/package.json @@ -1,7 +1,7 @@ { "name": "apollo-server-integration-testsuite", "private": true, - "version": "2.13.1-alpha.0", + "version": "2.13.1-alpha.1", "description": "Apollo Server Integrations testsuite", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-koa/package.json b/packages/apollo-server-koa/package.json index 17c97ca41e3..81d5c0c1cff 100644 --- a/packages/apollo-server-koa/package.json +++ b/packages/apollo-server-koa/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-koa", - "version": "2.13.1-alpha.0", + "version": "2.13.1-alpha.1", "description": "Production-ready Node.js GraphQL server for Koa", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-lambda/package.json b/packages/apollo-server-lambda/package.json index 49cf6e7d4a1..323989eeeaf 100644 --- a/packages/apollo-server-lambda/package.json +++ b/packages/apollo-server-lambda/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-lambda", - "version": "2.13.1-alpha.0", + "version": "2.13.1-alpha.1", "description": "Production-ready Node.js GraphQL server for AWS Lambda", "keywords": [ "GraphQL", diff --git a/packages/apollo-server-micro/package.json b/packages/apollo-server-micro/package.json index 59ea179c698..c224881c752 100644 --- a/packages/apollo-server-micro/package.json +++ b/packages/apollo-server-micro/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-micro", - "version": "2.13.1-alpha.0", + "version": "2.13.1-alpha.1", "description": "Production-ready Node.js GraphQL server for Micro", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-testing/package.json b/packages/apollo-server-testing/package.json index 7aa3735f4f4..94669906c12 100644 --- a/packages/apollo-server-testing/package.json +++ b/packages/apollo-server-testing/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-testing", - "version": "2.13.1-alpha.0", + "version": "2.13.1-alpha.1", "description": "Test utils for apollo-server", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server/package.json b/packages/apollo-server/package.json index e54067bc9e6..6a798e41776 100644 --- a/packages/apollo-server/package.json +++ b/packages/apollo-server/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server", - "version": "2.13.1-alpha.0", + "version": "2.13.1-alpha.1", "description": "Production ready GraphQL Server", "author": "opensource@apollographql.com", "main": "dist/index.js", From 05df0790346facb64d7bf76d4520f4ba734b114c Mon Sep 17 00:00:00 2001 From: Trevor Scheer Date: Mon, 11 May 2020 12:08:12 -0700 Subject: [PATCH 554/642] Release - @apollo/federation@0.15.1 - @apollo/gateway@0.15.1 - apollo-server-azure-functions@2.13.1 - apollo-server-cloud-functions@2.13.1 - apollo-server-cloudflare@2.13.1 - apollo-server-core@2.13.1 - apollo-server-express@2.13.1 - apollo-server-fastify@2.13.1 - apollo-server-hapi@2.13.1 - apollo-server-integration-testsuite@2.13.1 - apollo-server-koa@2.13.1 - apollo-server-lambda@2.13.1 - apollo-server-micro@2.13.1 - apollo-server-testing@2.13.1 - apollo-server@2.13.1 --- packages/apollo-federation/package.json | 2 +- packages/apollo-gateway/package.json | 2 +- packages/apollo-server-azure-functions/package.json | 2 +- packages/apollo-server-cloud-functions/package.json | 2 +- packages/apollo-server-cloudflare/package.json | 2 +- packages/apollo-server-core/package.json | 2 +- packages/apollo-server-express/package.json | 2 +- packages/apollo-server-fastify/package.json | 2 +- packages/apollo-server-hapi/package.json | 2 +- packages/apollo-server-integration-testsuite/package.json | 2 +- packages/apollo-server-koa/package.json | 2 +- packages/apollo-server-lambda/package.json | 2 +- packages/apollo-server-micro/package.json | 2 +- packages/apollo-server-testing/package.json | 2 +- packages/apollo-server/package.json | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/packages/apollo-federation/package.json b/packages/apollo-federation/package.json index 5868b112fee..2b43f59ec04 100644 --- a/packages/apollo-federation/package.json +++ b/packages/apollo-federation/package.json @@ -1,6 +1,6 @@ { "name": "@apollo/federation", - "version": "0.15.1-alpha.1", + "version": "0.15.1", "description": "Apollo Federation Utilities", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-gateway/package.json b/packages/apollo-gateway/package.json index 999f051aed1..857f6a61806 100644 --- a/packages/apollo-gateway/package.json +++ b/packages/apollo-gateway/package.json @@ -1,6 +1,6 @@ { "name": "@apollo/gateway", - "version": "0.15.1-alpha.1", + "version": "0.15.1", "description": "Apollo Gateway", "author": "opensource@apollographql.com", "main": "dist/index.js", diff --git a/packages/apollo-server-azure-functions/package.json b/packages/apollo-server-azure-functions/package.json index 17e5568c11c..eadf0e112d7 100644 --- a/packages/apollo-server-azure-functions/package.json +++ b/packages/apollo-server-azure-functions/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-azure-functions", - "version": "2.13.1-alpha.1", + "version": "2.13.1", "description": "Production-ready Node.js GraphQL server for Azure Functions", "keywords": [ "GraphQL", diff --git a/packages/apollo-server-cloud-functions/package.json b/packages/apollo-server-cloud-functions/package.json index 38280cc806d..5a052be9758 100644 --- a/packages/apollo-server-cloud-functions/package.json +++ b/packages/apollo-server-cloud-functions/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-cloud-functions", - "version": "2.13.1-alpha.1", + "version": "2.13.1", "description": "Production-ready Node.js GraphQL server for Google Cloud Functions", "keywords": [ "GraphQL", diff --git a/packages/apollo-server-cloudflare/package.json b/packages/apollo-server-cloudflare/package.json index 580e0dff346..269af38d556 100644 --- a/packages/apollo-server-cloudflare/package.json +++ b/packages/apollo-server-cloudflare/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-cloudflare", - "version": "2.13.1-alpha.1", + "version": "2.13.1", "description": "Production-ready Node.js GraphQL server for Cloudflare workers", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-core/package.json b/packages/apollo-server-core/package.json index 95c0eba1ae9..941fc28ffb3 100644 --- a/packages/apollo-server-core/package.json +++ b/packages/apollo-server-core/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-core", - "version": "2.13.1-alpha.1", + "version": "2.13.1", "description": "Core engine for Apollo GraphQL server", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-express/package.json b/packages/apollo-server-express/package.json index c0efd7372df..d7d902f7796 100644 --- a/packages/apollo-server-express/package.json +++ b/packages/apollo-server-express/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-express", - "version": "2.13.1-alpha.1", + "version": "2.13.1", "description": "Production-ready Node.js GraphQL server for Express and Connect", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-fastify/package.json b/packages/apollo-server-fastify/package.json index 0808e3d8ecf..dff9ad392ac 100644 --- a/packages/apollo-server-fastify/package.json +++ b/packages/apollo-server-fastify/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-fastify", - "version": "2.13.1-alpha.1", + "version": "2.13.1", "description": "Production-ready Node.js GraphQL server for Fastify", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-hapi/package.json b/packages/apollo-server-hapi/package.json index db77aa7f0a1..d5452701029 100644 --- a/packages/apollo-server-hapi/package.json +++ b/packages/apollo-server-hapi/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-hapi", - "version": "2.13.1-alpha.1", + "version": "2.13.1", "description": "Production-ready Node.js GraphQL server for Hapi", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-integration-testsuite/package.json b/packages/apollo-server-integration-testsuite/package.json index af7a01aa58a..bd38bf50708 100644 --- a/packages/apollo-server-integration-testsuite/package.json +++ b/packages/apollo-server-integration-testsuite/package.json @@ -1,7 +1,7 @@ { "name": "apollo-server-integration-testsuite", "private": true, - "version": "2.13.1-alpha.1", + "version": "2.13.1", "description": "Apollo Server Integrations testsuite", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-koa/package.json b/packages/apollo-server-koa/package.json index 81d5c0c1cff..47eefed0f61 100644 --- a/packages/apollo-server-koa/package.json +++ b/packages/apollo-server-koa/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-koa", - "version": "2.13.1-alpha.1", + "version": "2.13.1", "description": "Production-ready Node.js GraphQL server for Koa", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-lambda/package.json b/packages/apollo-server-lambda/package.json index 323989eeeaf..f1280b4acf6 100644 --- a/packages/apollo-server-lambda/package.json +++ b/packages/apollo-server-lambda/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-lambda", - "version": "2.13.1-alpha.1", + "version": "2.13.1", "description": "Production-ready Node.js GraphQL server for AWS Lambda", "keywords": [ "GraphQL", diff --git a/packages/apollo-server-micro/package.json b/packages/apollo-server-micro/package.json index c224881c752..716036e45ac 100644 --- a/packages/apollo-server-micro/package.json +++ b/packages/apollo-server-micro/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-micro", - "version": "2.13.1-alpha.1", + "version": "2.13.1", "description": "Production-ready Node.js GraphQL server for Micro", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-testing/package.json b/packages/apollo-server-testing/package.json index 94669906c12..f597a7a05ce 100644 --- a/packages/apollo-server-testing/package.json +++ b/packages/apollo-server-testing/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-testing", - "version": "2.13.1-alpha.1", + "version": "2.13.1", "description": "Test utils for apollo-server", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server/package.json b/packages/apollo-server/package.json index 6a798e41776..caa6121936e 100644 --- a/packages/apollo-server/package.json +++ b/packages/apollo-server/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server", - "version": "2.13.1-alpha.1", + "version": "2.13.1", "description": "Production ready GraphQL Server", "author": "opensource@apollographql.com", "main": "dist/index.js", From bacc3f9e8d2dd7dc9d4f88b6987d966c244d3256 Mon Sep 17 00:00:00 2001 From: Trevor Scheer Date: Mon, 11 May 2020 12:13:52 -0700 Subject: [PATCH 555/642] Update changelogs --- packages/apollo-federation/CHANGELOG.md | 4 ++++ packages/apollo-gateway/CHANGELOG.md | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/packages/apollo-federation/CHANGELOG.md b/packages/apollo-federation/CHANGELOG.md index 752c94cf6ad..c57f832d4da 100644 --- a/packages/apollo-federation/CHANGELOG.md +++ b/packages/apollo-federation/CHANGELOG.md @@ -4,6 +4,10 @@ > 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. 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. +- _Nothing yet! Stay tuned._ + +## 0.15.1 + - Export `defaultRootOperationNameLookup` and `normalizeTypeDefs`; needed by `@apollo/gateway` to normalize root operation types when reporting to Apollo Graph Manager. [#4071](https://github.com/apollographql/apollo-server/pull/4071) ## 0.15.0 diff --git a/packages/apollo-gateway/CHANGELOG.md b/packages/apollo-gateway/CHANGELOG.md index e3c31aea821..b9d96f031db 100644 --- a/packages/apollo-gateway/CHANGELOG.md +++ b/packages/apollo-gateway/CHANGELOG.md @@ -4,6 +4,10 @@ > 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. 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. +- _Nothing yet! Stay tuned._ + +## 0.15.1 + - __FIX__: Correctly handle unions with nested conditions that have no `possibleTypes` [#4071](https://github.com/apollographql/apollo-server/pull/4071) - __FIX__: Normalize root operation types when reporting to Apollo Graph Manager. Federation always uses the default names `Query`, `Mutation`, and `Subscription` for root operation types even if downstream services choose different names; now we properly normalize traces received from downstream services in the same way. [#4100](https://github.com/apollographql/apollo-server/pull/4100) From f71b61fdc3e7deca10522ee269595d4d2e7686bc Mon Sep 17 00:00:00 2001 From: Pierre Carrier Date: Mon, 11 May 2020 16:18:36 -0400 Subject: [PATCH 556/642] apollo-gateway: split secrets, go through CDN (#4080) This commit changes the URLs for managed federation configuration. Previously loaded from the GCS buckets directly, the gateway will now request these resources from the CDNs at these URLs: * https://storage-secrets.api.apollographql.com * https://federation.api.apollographql.com For users that have safelisted or proxied the GCS buckets in their infrastructure, this is a breaking change. The listed endpoints are a replacement for the GCS buckets. --- packages/apollo-gateway/CHANGELOG.md | 2 +- .../integration/networkRequests.test.ts | 2 +- .../src/__tests__/integration/nockMocks.ts | 24 +++++++++---------- .../src/loadServicesFromStorage.ts | 4 ++-- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/packages/apollo-gateway/CHANGELOG.md b/packages/apollo-gateway/CHANGELOG.md index b9d96f031db..8d06f4f4c3e 100644 --- a/packages/apollo-gateway/CHANGELOG.md +++ b/packages/apollo-gateway/CHANGELOG.md @@ -4,7 +4,7 @@ > 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. 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. -- _Nothing yet! Stay tuned._ +- __BREAKING__: Use a content delivery network for managed configuration, fetch storage secrets and composition configuration from different domains: https://storage-secrets.api.apollographql.com and https://federation.api.apollographql.com. Please mind any firewall for outgoing traffic. ## 0.15.1 diff --git a/packages/apollo-gateway/src/__tests__/integration/networkRequests.test.ts b/packages/apollo-gateway/src/__tests__/integration/networkRequests.test.ts index 22d765b6903..3275496e2ae 100644 --- a/packages/apollo-gateway/src/__tests__/integration/networkRequests.test.ts +++ b/packages/apollo-gateway/src/__tests__/integration/networkRequests.test.ts @@ -281,7 +281,7 @@ it(`Errors when the secret isn't hosted on GCS`, async () => { await expect( gateway.load({ engine: { apiKeyHash, graphId } }), ).rejects.toThrowErrorMatchingInlineSnapshot( - `"Unable to authenticate with Apollo Graph Manager storage while fetching https://storage.googleapis.com/engine-partial-schema-prod/federated-service/storage-secret/dd55a79d467976346d229a7b12b673ce.json. Ensure that the API key is configured properly and that a federated service has been pushed. For details, see https://go.apollo.dev/g/resolve-access-denied."`, + `"Unable to authenticate with Apollo Graph Manager storage while fetching https://storage-secrets.api.apollographql.com/federated-service/storage-secret/dd55a79d467976346d229a7b12b673ce.json. Ensure that the API key is configured properly and that a federated service has been pushed. For details, see https://go.apollo.dev/g/resolve-access-denied."`, ); }); diff --git a/packages/apollo-gateway/src/__tests__/integration/nockMocks.ts b/packages/apollo-gateway/src/__tests__/integration/nockMocks.ts index 7a14eb1139c..f5515f1e8e7 100644 --- a/packages/apollo-gateway/src/__tests__/integration/nockMocks.ts +++ b/packages/apollo-gateway/src/__tests__/integration/nockMocks.ts @@ -44,23 +44,23 @@ function gcsNock(url: Parameters[0]): nock.Scope { } export function mockStorageSecret() { - return gcsNock('https://storage.googleapis.com:443').get( - `/engine-partial-schema-prod/${graphId}/storage-secret/${apiKeyHash}.json`, + return gcsNock('https://storage-secrets.api.apollographql.com:443').get( + `/${graphId}/storage-secret/${apiKeyHash}.json`, ); } export function mockStorageSecretSuccess() { - return gcsNock('https://storage.googleapis.com:443') + return gcsNock('https://storage-secrets.api.apollographql.com:443') .get( - `/engine-partial-schema-prod/${graphId}/storage-secret/${apiKeyHash}.json`, + `/${graphId}/storage-secret/${apiKeyHash}.json`, ) .reply(200, `"${storageSecret}"`); } // get composition config link, using received storage secret export function mockCompositionConfigLink() { - return gcsNock('https://storage.googleapis.com:443').get( - `/engine-partial-schema-prod/${storageSecret}/current/v1/composition-config-link`, + return gcsNock('https://federation.api.apollographql.com:443').get( + `/${storageSecret}/current/v1/composition-config-link`, ); } @@ -72,8 +72,8 @@ export function mockCompositionConfigLinkSuccess() { // get composition configs, using received composition config link export function mockCompositionConfigs() { - return gcsNock('https://storage.googleapis.com:443').get( - `/engine-partial-schema-prod/${storageSecret}/current/v1/composition-configs/composition-config-path.json`, + return gcsNock('https://federation.api.apollographql.com:443').get( + `/${storageSecret}/current/v1/composition-configs/composition-config-path.json`, ); } @@ -88,8 +88,8 @@ export function mockCompositionConfigsSuccess(services: MockService[]) { // get implementing service reference, using received composition-config export function mockImplementingServices({ gcsDefinitionPath }: MockService) { - return gcsNock('https://storage.googleapis.com:443').get( - `/engine-partial-schema-prod/${storageSecret}/current/v1/implementing-services/${accountsService}/${gcsDefinitionPath}`, + return gcsNock('https://federation.api.apollographql.com:443').get( + `/${storageSecret}/current/v1/implementing-services/${accountsService}/${gcsDefinitionPath}`, ); } @@ -103,8 +103,8 @@ export function mockImplementingServicesSuccess(service: MockService) { // get raw-partial-schema, using received composition-config export function mockRawPartialSchema({ partialSchemaPath }: MockService) { - return gcsNock('https://storage.googleapis.com:443').get( - `/engine-partial-schema-prod/${storageSecret}/current/raw-partial-schemas/${partialSchemaPath}`, + return gcsNock('https://federation.api.apollographql.com:443').get( + `/${storageSecret}/current/raw-partial-schemas/${partialSchemaPath}`, ); } diff --git a/packages/apollo-gateway/src/loadServicesFromStorage.ts b/packages/apollo-gateway/src/loadServicesFromStorage.ts index e1577a7e39a..08ada2fdff5 100644 --- a/packages/apollo-gateway/src/loadServicesFromStorage.ts +++ b/packages/apollo-gateway/src/loadServicesFromStorage.ts @@ -38,12 +38,12 @@ const urlFromEnvOrDefault = (envKey: string, fallback: string) => // Generate and cache our desired operation manifest URL. const urlPartialSchemaBase = urlFromEnvOrDefault( envOverridePartialSchemaBaseUrl, - 'https://storage.googleapis.com/engine-partial-schema-prod/', + 'https://federation.api.apollographql.com/', ); const urlStorageSecretBase: string = urlFromEnvOrDefault( envOverrideStorageSecretBaseUrl, - 'https://storage.googleapis.com/engine-partial-schema-prod/', + 'https://storage-secrets.api.apollographql.com/', ); function getStorageSecretUrl(graphId: string, apiKeyHash: string): string { From ae6e6e20dec069defddc94d3c10696dd9f3e1ab4 Mon Sep 17 00:00:00 2001 From: Trevor Scheer Date: Mon, 11 May 2020 13:20:55 -0700 Subject: [PATCH 557/642] Release - @apollo/federation@0.16.0 - @apollo/gateway@0.16.0 --- packages/apollo-federation/package.json | 2 +- packages/apollo-gateway/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/apollo-federation/package.json b/packages/apollo-federation/package.json index 2b43f59ec04..4017608c051 100644 --- a/packages/apollo-federation/package.json +++ b/packages/apollo-federation/package.json @@ -1,6 +1,6 @@ { "name": "@apollo/federation", - "version": "0.15.1", + "version": "0.16.0", "description": "Apollo Federation Utilities", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-gateway/package.json b/packages/apollo-gateway/package.json index 857f6a61806..85a18204116 100644 --- a/packages/apollo-gateway/package.json +++ b/packages/apollo-gateway/package.json @@ -1,6 +1,6 @@ { "name": "@apollo/gateway", - "version": "0.15.1", + "version": "0.16.0", "description": "Apollo Gateway", "author": "opensource@apollographql.com", "main": "dist/index.js", From f297954f845a85752ca0ec2f200e0bcd6c7f895f Mon Sep 17 00:00:00 2001 From: Trevor Scheer Date: Mon, 11 May 2020 13:33:55 -0700 Subject: [PATCH 558/642] Update changelog post-release --- packages/apollo-gateway/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/apollo-gateway/CHANGELOG.md b/packages/apollo-gateway/CHANGELOG.md index 8d06f4f4c3e..0397716aaa0 100644 --- a/packages/apollo-gateway/CHANGELOG.md +++ b/packages/apollo-gateway/CHANGELOG.md @@ -4,6 +4,10 @@ > 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. 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. +- _Nothing yet! Stay tuned._ + +## 0.16.1 + - __BREAKING__: Use a content delivery network for managed configuration, fetch storage secrets and composition configuration from different domains: https://storage-secrets.api.apollographql.com and https://federation.api.apollographql.com. Please mind any firewall for outgoing traffic. ## 0.15.1 From d04d1da8746eee02b75ff74604a460528f83fb1b Mon Sep 17 00:00:00 2001 From: Trevor Scheer Date: Mon, 11 May 2020 13:50:13 -0700 Subject: [PATCH 559/642] Fix changelog updates --- packages/apollo-federation/CHANGELOG.md | 4 ++++ packages/apollo-gateway/CHANGELOG.md | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/apollo-federation/CHANGELOG.md b/packages/apollo-federation/CHANGELOG.md index c57f832d4da..de1b2d3c5d5 100644 --- a/packages/apollo-federation/CHANGELOG.md +++ b/packages/apollo-federation/CHANGELOG.md @@ -6,6 +6,10 @@ - _Nothing yet! Stay tuned._ +## 0.16.0 + +- No changes. This package was major versioned to maintain lockstep versioning with @apollo/gateway. + ## 0.15.1 - Export `defaultRootOperationNameLookup` and `normalizeTypeDefs`; needed by `@apollo/gateway` to normalize root operation types when reporting to Apollo Graph Manager. [#4071](https://github.com/apollographql/apollo-server/pull/4071) diff --git a/packages/apollo-gateway/CHANGELOG.md b/packages/apollo-gateway/CHANGELOG.md index 0397716aaa0..86bf917bc59 100644 --- a/packages/apollo-gateway/CHANGELOG.md +++ b/packages/apollo-gateway/CHANGELOG.md @@ -6,7 +6,7 @@ - _Nothing yet! Stay tuned._ -## 0.16.1 +## 0.16.0 - __BREAKING__: Use a content delivery network for managed configuration, fetch storage secrets and composition configuration from different domains: https://storage-secrets.api.apollographql.com and https://federation.api.apollographql.com. Please mind any firewall for outgoing traffic. From 71361880b6ba284ee8d16d5091945a999b005703 Mon Sep 17 00:00:00 2001 From: Trevor Scheer Date: Mon, 11 May 2020 13:54:25 -0700 Subject: [PATCH 560/642] Add missing PR link to changelog entry --- packages/apollo-gateway/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-gateway/CHANGELOG.md b/packages/apollo-gateway/CHANGELOG.md index 86bf917bc59..6d60093e030 100644 --- a/packages/apollo-gateway/CHANGELOG.md +++ b/packages/apollo-gateway/CHANGELOG.md @@ -8,7 +8,7 @@ ## 0.16.0 -- __BREAKING__: Use a content delivery network for managed configuration, fetch storage secrets and composition configuration from different domains: https://storage-secrets.api.apollographql.com and https://federation.api.apollographql.com. Please mind any firewall for outgoing traffic. +- __BREAKING__: Use a content delivery network for managed configuration, fetch storage secrets and composition configuration from different domains: https://storage-secrets.api.apollographql.com and https://federation.api.apollographql.com. Please mind any firewall for outgoing traffic. [#4080](https://github.com/apollographql/apollo-server/pull/4080) ## 0.15.1 From f905eb1079873843844340c2d0eefa4cc7c49743 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 12 May 2020 09:21:23 +0000 Subject: [PATCH 561/642] Condense guards in `schemaInstrumentation`. Both through modern ECMAScript and removing superfluous lines. Ref: https://github.com/apollographql/apollo-server/commit/6564081240#r39093122 --- .../src/utils/schemaInstrumentation.ts | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/packages/apollo-server-core/src/utils/schemaInstrumentation.ts b/packages/apollo-server-core/src/utils/schemaInstrumentation.ts index d2393857e42..e20f94a9311 100644 --- a/packages/apollo-server-core/src/utils/schemaInstrumentation.ts +++ b/packages/apollo-server-core/src/utils/schemaInstrumentation.ts @@ -46,18 +46,14 @@ function wrapField(field: GraphQLField): void { }; const willResolveField = - context && - context[symbolExecutionDispatcherWillResolveField] && - (context[symbolExecutionDispatcherWillResolveField] as + context?.[symbolExecutionDispatcherWillResolveField] as | GraphQLRequestExecutionListener['willResolveField'] - | undefined); + | undefined; const userFieldResolver = - context && - context[symbolUserFieldResolver] && - (context[symbolUserFieldResolver] as + context?.[symbolUserFieldResolver] as | GraphQLFieldResolver - | undefined); + | undefined; // The technique for implementing a "did resolve field" is accomplished by // returning a function from the `willResolveField` handler. While there From db0e3780e4e2691ac675dcb7018bb4077c2de541 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 12 May 2020 09:36:03 +0000 Subject: [PATCH 562/642] types: Improve `Dispatcher`'s `callTargets` and `invokeHookAsync` types. This came up as a matter of discussion within the referenced [[Comment]] when reviewing #3988. The return value of `targets.map` was previously `any[]`'d which, we would hope, could be improved upon. I took a shot at improving it and struggled with the `UnwrapPromise`s when coupled with an expected `Promise` return of `invokeHookAsync`. Removing the unwrapping would seem to still get us the correct type (i.e. an array of the return value of the stingly-typed life-cycle hook, e.g. `wilSendResponse` or `didEncounterErrors`) at the invocation sites of `invokeHookAsync` within the request pipeline (e.g. [[Example]]), and seems to rid us of the `any[]` within the `Dispatcher`. Perhaps I'm missing something, but this would seem to work. I'm perhaps missing some unexpected conflict with the `ValueOrPromise` return types from the `GraphQLRequestListener` methods, but they all return `ValueOrPromise` right now any time that `invokeHookAsync` is called. [Comment]: https://github.com/apollographql/apollo-server/pull/3988/files#r421665333 [Example]: https://github.com/apollographql/apollo-server/blob/f905eb10/packages/apollo-server-core/src/requestPipeline.ts#L591-L594 --- packages/apollo-server-core/src/utils/dispatcher.ts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/apollo-server-core/src/utils/dispatcher.ts b/packages/apollo-server-core/src/utils/dispatcher.ts index 0ea761700d3..122fa9aa408 100644 --- a/packages/apollo-server-core/src/utils/dispatcher.ts +++ b/packages/apollo-server-core/src/utils/dispatcher.ts @@ -13,7 +13,7 @@ export class Dispatcher { targets: T[], methodName: TMethodName, ...args: Args - ) { + ): ReturnType>[] { return targets.map(target => { const method = target[methodName]; if (method && typeof method === 'function') { @@ -25,10 +25,9 @@ export class Dispatcher { public async invokeHookAsync( methodName: TMethodName, ...args: Args - ): Promise>>[]> { + ): Promise>[]> { return await Promise.all( - this.callTargets(this.targets, methodName, ...args), - ); + this.callTargets(this.targets, methodName, ...args)); } public invokeHookSync( From 52418a4f3732b004f581655d426d20df21c9e0be Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 12 May 2020 10:02:23 +0000 Subject: [PATCH 563/642] comment: Add note about typing question and reference to issue. Possibly fix-able in AS3. Ref: https://github.com/apollographql/apollo-server/pull/3988/files#r421632153 Ref: https://github.com/apollographql/apollo-server/issues/4103 --- packages/apollo-server-plugin-base/src/index.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/packages/apollo-server-plugin-base/src/index.ts b/packages/apollo-server-plugin-base/src/index.ts index 91fedfcd2ca..a77d6556c16 100644 --- a/packages/apollo-server-plugin-base/src/index.ts +++ b/packages/apollo-server-plugin-base/src/index.ts @@ -45,6 +45,14 @@ export { GraphQLRequestContextWillSendResponse, }; +// Typings Note! (Fix in AS3?) +// +// There are a number of types in this module which are specifying `void` as +// their return type, despite the fact that we _are_ observing the value. +// It's possible those should instead be `undefined`. For more details, see +// the issue that was logged as a result of this discovery during (unrelated) PR +// review: https://github.com/apollographql/apollo-server/issues/4103 + export interface ApolloServerPlugin< TContext extends BaseContext = BaseContext > { From 18d95fd7f30bba196f7b0b62abdcff6bcb0eae18 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 12 May 2020 10:50:35 +0000 Subject: [PATCH 564/642] comment: Leave traces/suggestions about future work. Ref: https://github.com/apollographql/apollo-server/pull/3988#discussion_r414676152 --- packages/apollo-gateway/src/executeQueryPlan.ts | 8 +++----- packages/apollo-gateway/src/index.ts | 4 ++++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/packages/apollo-gateway/src/executeQueryPlan.ts b/packages/apollo-gateway/src/executeQueryPlan.ts index 72116c8e83d..2c9c3c43787 100644 --- a/packages/apollo-gateway/src/executeQueryPlan.ts +++ b/packages/apollo-gateway/src/executeQueryPlan.ts @@ -88,11 +88,9 @@ export async function executeQueryPlan( }, rootValue: data, variableValues: requestContext.request.variables, - // FIXME: GraphQL extensions currently wraps every field and creates - // a field resolver. Because of this, when using with ApolloServer - // the defaultFieldResolver isn't called. We keep this here - // because it is the correct solution and when ApolloServer removes - // GraphQLExtensions this will be how alias support is maintained + // We have a special field resolver which ensures we support aliases. + // FIXME: It's _possible_ this will change after `graphql-extensions` is + // deprecated, though not certain. See here, also: https://git.io/Jf8cS. fieldResolver: defaultFieldResolverWithAliasSupport, })); } catch (error) { diff --git a/packages/apollo-gateway/src/index.ts b/packages/apollo-gateway/src/index.ts index 1daf6097d69..d74269f0299 100644 --- a/packages/apollo-gateway/src/index.ts +++ b/packages/apollo-gateway/src/index.ts @@ -476,6 +476,10 @@ export class ApolloGateway implements GraphQLService { this.logger.debug('Schema loaded and ready for execution'); + // FIXME: The comment below may change when `graphql-extensions` is + // removed, as it will be soon. It's not clear if this will be temporary, + // as is suggested, after that time, because we still very much need to + // do this special alias resolving. Original comment: // this is a temporary workaround for GraphQLFieldExtensions automatic // wrapping of all fields when using ApolloServer. Here we wrap all fields // with support for resolving aliases as part of the root value which From bfef89b8cc44d4bd94f9d5fcd3df8941de526360 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Wed, 13 May 2020 13:00:30 +0300 Subject: [PATCH 565/642] Release - apollo-cache-control@0.11.0-alpha.0 - apollo-datasource-rest@0.9.2-alpha.0 - apollo-engine-reporting@2.0.0-alpha.0 - @apollo/federation@0.16.1-alpha.0 - @apollo/gateway@0.16.1-alpha.0 - apollo-server-azure-functions@2.14.0-alpha.0 - apollo-server-cloud-functions@2.14.0-alpha.0 - apollo-server-cloudflare@2.14.0-alpha.0 - apollo-server-core@2.14.0-alpha.0 - apollo-server-express@2.14.0-alpha.0 - apollo-server-fastify@2.14.0-alpha.0 - apollo-server-hapi@2.14.0-alpha.0 - apollo-server-integration-testsuite@2.14.0-alpha.0 - apollo-server-koa@2.14.0-alpha.0 - apollo-server-lambda@2.14.0-alpha.0 - apollo-server-micro@2.14.0-alpha.0 - apollo-server-plugin-base@0.9.0-alpha.0 - apollo-server-plugin-response-cache@0.5.2-alpha.0 - apollo-server-testing@2.14.0-alpha.0 - apollo-server-types@0.5.0-alpha.0 - apollo-server@2.14.0-alpha.0 - apollo-tracing@0.11.0-alpha.0 - graphql-extensions@0.12.2-alpha.0 --- packages/apollo-cache-control/package.json | 2 +- packages/apollo-datasource-rest/package.json | 2 +- packages/apollo-engine-reporting/package.json | 6 +++--- packages/apollo-federation/package.json | 2 +- packages/apollo-gateway/package.json | 2 +- packages/apollo-server-azure-functions/package.json | 2 +- packages/apollo-server-cloud-functions/package.json | 2 +- packages/apollo-server-cloudflare/package.json | 2 +- packages/apollo-server-core/package.json | 2 +- packages/apollo-server-express/package.json | 2 +- packages/apollo-server-fastify/package.json | 2 +- packages/apollo-server-hapi/package.json | 2 +- packages/apollo-server-integration-testsuite/package.json | 2 +- packages/apollo-server-koa/package.json | 2 +- packages/apollo-server-lambda/package.json | 2 +- packages/apollo-server-micro/package.json | 2 +- packages/apollo-server-plugin-base/package.json | 2 +- packages/apollo-server-plugin-response-cache/package.json | 2 +- packages/apollo-server-testing/package.json | 2 +- packages/apollo-server-types/package.json | 2 +- packages/apollo-server/package.json | 2 +- packages/apollo-tracing/package.json | 2 +- packages/graphql-extensions/package.json | 2 +- 23 files changed, 25 insertions(+), 25 deletions(-) diff --git a/packages/apollo-cache-control/package.json b/packages/apollo-cache-control/package.json index bd4bf8fb3c8..b67eefeb1f5 100644 --- a/packages/apollo-cache-control/package.json +++ b/packages/apollo-cache-control/package.json @@ -1,6 +1,6 @@ { "name": "apollo-cache-control", - "version": "0.10.1-alpha.0", + "version": "0.11.0-alpha.0", "description": "A GraphQL extension for cache control", "main": "./dist/index.js", "types": "./dist/index.d.ts", diff --git a/packages/apollo-datasource-rest/package.json b/packages/apollo-datasource-rest/package.json index 227a16649df..3bc114c0c97 100644 --- a/packages/apollo-datasource-rest/package.json +++ b/packages/apollo-datasource-rest/package.json @@ -1,6 +1,6 @@ { "name": "apollo-datasource-rest", - "version": "0.9.1-alpha.0", + "version": "0.9.2-alpha.0", "author": "opensource@apollographql.com", "license": "MIT", "repository": { diff --git a/packages/apollo-engine-reporting/package.json b/packages/apollo-engine-reporting/package.json index d8d3be3fc01..93259c7143f 100644 --- a/packages/apollo-engine-reporting/package.json +++ b/packages/apollo-engine-reporting/package.json @@ -1,6 +1,6 @@ { "name": "apollo-engine-reporting", - "version": "1.8.1-alpha.0", + "version": "2.0.0-alpha.0", "description": "Send reports about your GraphQL services to Apollo Graph Manager (previously known as Apollo Engine)", "main": "./dist/index.js", "types": "./dist/index.d.ts", @@ -16,9 +16,9 @@ "apollo-server-caching": "file:../apollo-server-caching", "apollo-server-env": "file:../apollo-server-env", "apollo-server-errors": "file:../apollo-server-errors", + "apollo-server-plugin-base": "file:../apollo-server-plugin-base", "apollo-server-types": "file:../apollo-server-types", - "async-retry": "^1.2.1", - "apollo-server-plugin-base": "file:../apollo-server-plugin-base" + "async-retry": "^1.2.1" }, "peerDependencies": { "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0" diff --git a/packages/apollo-federation/package.json b/packages/apollo-federation/package.json index 4017608c051..520e31a6d76 100644 --- a/packages/apollo-federation/package.json +++ b/packages/apollo-federation/package.json @@ -1,6 +1,6 @@ { "name": "@apollo/federation", - "version": "0.16.0", + "version": "0.16.1-alpha.0", "description": "Apollo Federation Utilities", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-gateway/package.json b/packages/apollo-gateway/package.json index 85a18204116..f15746178ff 100644 --- a/packages/apollo-gateway/package.json +++ b/packages/apollo-gateway/package.json @@ -1,6 +1,6 @@ { "name": "@apollo/gateway", - "version": "0.16.0", + "version": "0.16.1-alpha.0", "description": "Apollo Gateway", "author": "opensource@apollographql.com", "main": "dist/index.js", diff --git a/packages/apollo-server-azure-functions/package.json b/packages/apollo-server-azure-functions/package.json index eadf0e112d7..92b7e2dc889 100644 --- a/packages/apollo-server-azure-functions/package.json +++ b/packages/apollo-server-azure-functions/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-azure-functions", - "version": "2.13.1", + "version": "2.14.0-alpha.0", "description": "Production-ready Node.js GraphQL server for Azure Functions", "keywords": [ "GraphQL", diff --git a/packages/apollo-server-cloud-functions/package.json b/packages/apollo-server-cloud-functions/package.json index 5a052be9758..512372a4f92 100644 --- a/packages/apollo-server-cloud-functions/package.json +++ b/packages/apollo-server-cloud-functions/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-cloud-functions", - "version": "2.13.1", + "version": "2.14.0-alpha.0", "description": "Production-ready Node.js GraphQL server for Google Cloud Functions", "keywords": [ "GraphQL", diff --git a/packages/apollo-server-cloudflare/package.json b/packages/apollo-server-cloudflare/package.json index 269af38d556..3aa62a4c99a 100644 --- a/packages/apollo-server-cloudflare/package.json +++ b/packages/apollo-server-cloudflare/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-cloudflare", - "version": "2.13.1", + "version": "2.14.0-alpha.0", "description": "Production-ready Node.js GraphQL server for Cloudflare workers", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-core/package.json b/packages/apollo-server-core/package.json index 941fc28ffb3..e9455c0c9bb 100644 --- a/packages/apollo-server-core/package.json +++ b/packages/apollo-server-core/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-core", - "version": "2.13.1", + "version": "2.14.0-alpha.0", "description": "Core engine for Apollo GraphQL server", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-express/package.json b/packages/apollo-server-express/package.json index d7d902f7796..e05007504ca 100644 --- a/packages/apollo-server-express/package.json +++ b/packages/apollo-server-express/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-express", - "version": "2.13.1", + "version": "2.14.0-alpha.0", "description": "Production-ready Node.js GraphQL server for Express and Connect", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-fastify/package.json b/packages/apollo-server-fastify/package.json index dff9ad392ac..486b37b7f42 100644 --- a/packages/apollo-server-fastify/package.json +++ b/packages/apollo-server-fastify/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-fastify", - "version": "2.13.1", + "version": "2.14.0-alpha.0", "description": "Production-ready Node.js GraphQL server for Fastify", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-hapi/package.json b/packages/apollo-server-hapi/package.json index d5452701029..d3ea90a65ac 100644 --- a/packages/apollo-server-hapi/package.json +++ b/packages/apollo-server-hapi/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-hapi", - "version": "2.13.1", + "version": "2.14.0-alpha.0", "description": "Production-ready Node.js GraphQL server for Hapi", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-integration-testsuite/package.json b/packages/apollo-server-integration-testsuite/package.json index bd38bf50708..2209aa1e452 100644 --- a/packages/apollo-server-integration-testsuite/package.json +++ b/packages/apollo-server-integration-testsuite/package.json @@ -1,7 +1,7 @@ { "name": "apollo-server-integration-testsuite", "private": true, - "version": "2.13.1", + "version": "2.14.0-alpha.0", "description": "Apollo Server Integrations testsuite", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-koa/package.json b/packages/apollo-server-koa/package.json index 47eefed0f61..54d9afa6a36 100644 --- a/packages/apollo-server-koa/package.json +++ b/packages/apollo-server-koa/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-koa", - "version": "2.13.1", + "version": "2.14.0-alpha.0", "description": "Production-ready Node.js GraphQL server for Koa", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-lambda/package.json b/packages/apollo-server-lambda/package.json index f1280b4acf6..6ad05a03219 100644 --- a/packages/apollo-server-lambda/package.json +++ b/packages/apollo-server-lambda/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-lambda", - "version": "2.13.1", + "version": "2.14.0-alpha.0", "description": "Production-ready Node.js GraphQL server for AWS Lambda", "keywords": [ "GraphQL", diff --git a/packages/apollo-server-micro/package.json b/packages/apollo-server-micro/package.json index 716036e45ac..ca221e1dcb0 100644 --- a/packages/apollo-server-micro/package.json +++ b/packages/apollo-server-micro/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-micro", - "version": "2.13.1", + "version": "2.14.0-alpha.0", "description": "Production-ready Node.js GraphQL server for Micro", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-plugin-base/package.json b/packages/apollo-server-plugin-base/package.json index ebb16d406bc..fa28b8d7560 100644 --- a/packages/apollo-server-plugin-base/package.json +++ b/packages/apollo-server-plugin-base/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-plugin-base", - "version": "0.8.1-alpha.0", + "version": "0.9.0-alpha.0", "description": "Apollo Server plugin base classes", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-plugin-response-cache/package.json b/packages/apollo-server-plugin-response-cache/package.json index bfcfd106111..698913fcbda 100644 --- a/packages/apollo-server-plugin-response-cache/package.json +++ b/packages/apollo-server-plugin-response-cache/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-plugin-response-cache", - "version": "0.5.1-alpha.0", + "version": "0.5.2-alpha.0", "description": "Apollo Server full query response cache", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-testing/package.json b/packages/apollo-server-testing/package.json index f597a7a05ce..b2048935b61 100644 --- a/packages/apollo-server-testing/package.json +++ b/packages/apollo-server-testing/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-testing", - "version": "2.13.1", + "version": "2.14.0-alpha.0", "description": "Test utils for apollo-server", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-types/package.json b/packages/apollo-server-types/package.json index 9008aab1402..881f449c6f8 100644 --- a/packages/apollo-server-types/package.json +++ b/packages/apollo-server-types/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-types", - "version": "0.4.1-alpha.0", + "version": "0.5.0-alpha.0", "description": "Apollo Server shared types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server/package.json b/packages/apollo-server/package.json index caa6121936e..c18a311839b 100644 --- a/packages/apollo-server/package.json +++ b/packages/apollo-server/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server", - "version": "2.13.1", + "version": "2.14.0-alpha.0", "description": "Production ready GraphQL Server", "author": "opensource@apollographql.com", "main": "dist/index.js", diff --git a/packages/apollo-tracing/package.json b/packages/apollo-tracing/package.json index a27bd152107..5de113417dd 100644 --- a/packages/apollo-tracing/package.json +++ b/packages/apollo-tracing/package.json @@ -1,6 +1,6 @@ { "name": "apollo-tracing", - "version": "0.10.1-alpha.0", + "version": "0.11.0-alpha.0", "description": "Collect and expose trace data for GraphQL requests", "main": "./dist/index.js", "types": "./dist/index.d.ts", diff --git a/packages/graphql-extensions/package.json b/packages/graphql-extensions/package.json index c914bf53c2a..14d98ed0e13 100644 --- a/packages/graphql-extensions/package.json +++ b/packages/graphql-extensions/package.json @@ -1,6 +1,6 @@ { "name": "graphql-extensions", - "version": "0.12.1-alpha.0", + "version": "0.12.2-alpha.0", "description": "Add extensions to GraphQL servers", "main": "./dist/index.js", "types": "./dist/index.d.ts", From adacf2d7f431751d0d84cdf2d31eca8c00f0fd8d Mon Sep 17 00:00:00 2001 From: Trevor Scheer Date: Tue, 5 May 2020 21:34:38 -0700 Subject: [PATCH 566/642] Remove unneccessary files --- .../.npmignore | 6 - .../LICENSE.md | 103 ------------------ 2 files changed, 109 deletions(-) delete mode 100644 packages/apollo-server-plugin-operation-registry/.npmignore delete mode 100644 packages/apollo-server-plugin-operation-registry/LICENSE.md diff --git a/packages/apollo-server-plugin-operation-registry/.npmignore b/packages/apollo-server-plugin-operation-registry/.npmignore deleted file mode 100644 index a165046d359..00000000000 --- a/packages/apollo-server-plugin-operation-registry/.npmignore +++ /dev/null @@ -1,6 +0,0 @@ -* -!src/**/* -!dist/**/* -dist/**/*.test.* -!package.json -!README.md diff --git a/packages/apollo-server-plugin-operation-registry/LICENSE.md b/packages/apollo-server-plugin-operation-registry/LICENSE.md deleted file mode 100644 index 926854f7e55..00000000000 --- a/packages/apollo-server-plugin-operation-registry/LICENSE.md +++ /dev/null @@ -1,103 +0,0 @@ -Copyright (c) 2018- Meteor Development Group, Inc. - -The following sets forth attribution notices for third party software that may -be contained in portions of this package. - -### `fast-json-stable-stringify` - -``` -This software is released under the MIT license: - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -the Software, and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -``` - -### `node-fetch` - -``` -The MIT License (MIT) - -Copyright (c) 2016 David Frank - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -``` - -### `loglevel` - -``` -Copyright (c) 2013 Tim Perry - -Permission is hereby granted, free of charge, to any person -obtaining a copy of this software and associated documentation -files (the "Software"), to deal in the Software without -restriction, including without limitation the rights to use, -copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the -Software is furnished to do so, subject to the following -conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -OTHER DEALINGS IN THE SOFTWARE. -``` - -### `loglevel-debug` - -``` -Copyright (c) Chen Hsin-Yi - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -the Software, and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -``` From d1c561377115d178faebb40bae7a6336dc0d4aba Mon Sep 17 00:00:00 2001 From: Trevor Scheer Date: Sat, 2 May 2020 20:46:34 -0700 Subject: [PATCH 567/642] Add monorepo plumbing for plugin package --- package-lock.json | 118 ++++++++++++++++++++++++++++++++++++++++++++ package.json | 1 + tsconfig.build.json | 1 + tsconfig.test.json | 1 + 4 files changed, 121 insertions(+) diff --git a/package-lock.json b/package-lock.json index b69aa5ee382..e3f62f3cce1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5999,6 +5999,116 @@ "apollo-server-types": "file:packages/apollo-server-types" } }, + "apollo-server-plugin-operation-registry": { + "version": "file:packages/apollo-server-plugin-operation-registry", + "requires": { + "apollo-graphql": "0.4.3", + "apollo-server-caching": "^0.5.0", + "apollo-server-errors": "^2.2.0", + "apollo-server-plugin-base": "^0.7.0", + "fast-json-stable-stringify": "^2.0.0", + "loglevel": "^1.6.1", + "loglevel-debug": "^0.0.1", + "node-fetch": "^2.3.0" + }, + "dependencies": { + "@types/node-fetch": { + "version": "2.5.6", + "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.6.tgz", + "integrity": "sha512-2w0NTwMWF1d3NJMK0Uiq2UNN8htVCyOWOD0jIPjPgC5Ph/YP4dVhs9YxxcMcuLuwAslz0dVEcZQUaqkLs3IzOQ==", + "requires": { + "@types/node": "*", + "form-data": "^3.0.0" + } + }, + "apollo-engine-reporting-protobuf": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/apollo-engine-reporting-protobuf/-/apollo-engine-reporting-protobuf-0.4.4.tgz", + "integrity": "sha512-SGrIkUR7Q/VjU8YG98xcvo340C4DaNUhg/TXOtGsMlfiJDzHwVau/Bv6zifAzBafp2lj0XND6Daj5kyT/eSI/w==", + "requires": { + "@apollo/protobufjs": "^1.0.3" + } + }, + "apollo-env": { + "version": "0.6.4", + "resolved": "https://registry.npmjs.org/apollo-env/-/apollo-env-0.6.4.tgz", + "integrity": "sha512-8tGDMFv3sZLd76b/ZAo8GbdWU5Qt3VEUWSB+FLN41p/hVShZw0XIo2s/i8pVCTAhaWiEiD0Cr+d/zi0/h5UTxA==", + "requires": { + "@types/node-fetch": "2.5.6", + "core-js": "^3.0.1", + "node-fetch": "^2.2.0", + "sha.js": "^2.4.11" + } + }, + "apollo-graphql": { + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/apollo-graphql/-/apollo-graphql-0.4.3.tgz", + "integrity": "sha512-eAl8w6TeuY0Q3x7TVqBjt4JObA34vUyctuDn2lOmkdIqlu1EKxNAnTlRtXkjQM89qUt0rK0teU8No0a2lMNGuw==", + "requires": { + "apollo-env": "^0.6.4", + "lodash.sortby": "^4.7.0" + } + }, + "apollo-server-caching": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/apollo-server-caching/-/apollo-server-caching-0.5.1.tgz", + "integrity": "sha512-L7LHZ3k9Ao5OSf2WStvQhxdsNVplRQi7kCAPfqf9Z3GBEnQ2uaL0EgO0hSmtVHfXTbk5CTRziMT1Pe87bXrFIw==", + "requires": { + "lru-cache": "^5.0.0" + } + }, + "apollo-server-env": { + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-2.4.3.tgz", + "integrity": "sha512-23R5Xo9OMYX0iyTu2/qT0EUb+AULCBriA9w8HDfMoChB8M+lFClqUkYtaTTHDfp6eoARLW8kDBhPOBavsvKAjA==", + "requires": { + "node-fetch": "^2.1.2", + "util.promisify": "^1.0.0" + } + }, + "apollo-server-errors": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/apollo-server-errors/-/apollo-server-errors-2.4.1.tgz", + "integrity": "sha512-7oEd6pUxqyWYUbQ9TA8tM0NU/3aGtXSEibo6+txUkuHe7QaxfZ2wHRp+pfT1LC1K3RXYjKj61/C2xEO19s3Kdg==" + }, + "apollo-server-plugin-base": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.7.1.tgz", + "integrity": "sha512-PRavvoWq7/Xufqc+qkDQg3Aqueq4QrPBFfoCFIjhkJ4n2d2YoqE3gTGccb8YoWusfa62ASMn6R47OdNuVtEbXw==", + "requires": { + "apollo-server-types": "^0.3.1" + } + }, + "apollo-server-types": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.3.1.tgz", + "integrity": "sha512-6nX5VC3icOGf1RZIs7/SYQZff+Cl16LQu1FHUOIk9gAMN2XjlRCyJgCeMj5YHJzQ8Mhg4BO0weWuydEg+JxLzg==", + "requires": { + "apollo-engine-reporting-protobuf": "^0.4.4", + "apollo-server-caching": "^0.5.1", + "apollo-server-env": "^2.4.3" + } + }, + "combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "requires": { + "delayed-stream": "~1.0.0" + } + }, + "form-data": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.0.tgz", + "integrity": "sha512-CKMFDglpbMi6PyN+brwB9Q/GOw0eAnsrEZDgcsH5Krhz5Od/haKHAX0NmQfha2zPPz0JpWzA7GJHGSnvCRLWsg==", + "requires": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + } + } + } + }, "apollo-server-plugin-response-cache": { "version": "file:packages/apollo-server-plugin-response-cache", "requires": { @@ -15603,6 +15713,14 @@ "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.8.tgz", "integrity": "sha512-bsU7+gc9AJ2SqpzxwU3+1fedl8zAntbtC5XYlt3s2j1hJcn2PsXSmgN8TaLG/J1/2mod4+cE/3vNL70/c1RNCA==" }, + "loglevel-debug": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/loglevel-debug/-/loglevel-debug-0.0.1.tgz", + "integrity": "sha1-ifidPboTy6iiy0YV1dOtcYn0iik=", + "requires": { + "loglevel": "^1.4.0" + } + }, "lolex": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/lolex/-/lolex-5.1.2.tgz", diff --git a/package.json b/package.json index 30d30708265..69cc4db6de4 100644 --- a/package.json +++ b/package.json @@ -52,6 +52,7 @@ "apollo-server-lambda": "file:packages/apollo-server-lambda", "apollo-server-micro": "file:packages/apollo-server-micro", "apollo-server-plugin-base": "file:packages/apollo-server-plugin-base", + "apollo-server-plugin-operation-registry": "file:packages/apollo-server-plugin-operation-registry", "apollo-server-plugin-response-cache": "file:packages/apollo-server-plugin-response-cache", "apollo-server-testing": "file:packages/apollo-server-testing", "apollo-server-types": "file:packages/apollo-server-types", diff --git a/tsconfig.build.json b/tsconfig.build.json index a7d891bfce0..8d4966f6bf9 100644 --- a/tsconfig.build.json +++ b/tsconfig.build.json @@ -27,6 +27,7 @@ { "path": "./packages/apollo-server-lambda" }, { "path": "./packages/apollo-server-micro" }, { "path": "./packages/apollo-server-plugin-base" }, + { "path": "./packages/apollo-server-plugin-operation-registry" }, { "path": "./packages/apollo-server-plugin-response-cache" }, { "path": "./packages/apollo-server-testing" }, { "path": "./packages/apollo-tracing" }, diff --git a/tsconfig.test.json b/tsconfig.test.json index e4ef6484b8f..f687ff0ada7 100644 --- a/tsconfig.test.json +++ b/tsconfig.test.json @@ -22,6 +22,7 @@ { "path": "./packages/apollo-server-koa/src/__tests__/" }, { "path": "./packages/apollo-server-lambda/src/__tests__/" }, { "path": "./packages/apollo-server-micro/src/__tests__/" }, + { "path": "./packages/apollo-server-plugin-operation-registry/src/__tests__/" }, { "path": "./packages/apollo-server-plugin-response-cache/src/__tests__/" }, ] } From 08f73332f0fdcbba45c1e7c4d7205d8008577ce6 Mon Sep 17 00:00:00 2001 From: Trevor Scheer Date: Sat, 2 May 2020 20:46:49 -0700 Subject: [PATCH 568/642] Add missing types --- types/loglevel-debug/index.d.ts | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 types/loglevel-debug/index.d.ts diff --git a/types/loglevel-debug/index.d.ts b/types/loglevel-debug/index.d.ts new file mode 100644 index 00000000000..36cf04af657 --- /dev/null +++ b/types/loglevel-debug/index.d.ts @@ -0,0 +1,4 @@ +import { Logger } from 'loglevel'; +declare module 'loglevel-debug' { + export default function(logger: Logger): any; +} From e57d075979634623607fd23f72541df7ee1447d3 Mon Sep 17 00:00:00 2001 From: Trevor Scheer Date: Thu, 14 May 2020 00:14:32 -0700 Subject: [PATCH 569/642] package-lock update --- package-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index e3f62f3cce1..d63bb9c7d48 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6002,10 +6002,10 @@ "apollo-server-plugin-operation-registry": { "version": "file:packages/apollo-server-plugin-operation-registry", "requires": { - "apollo-graphql": "0.4.3", + "apollo-graphql": "0.4.4", "apollo-server-caching": "^0.5.0", "apollo-server-errors": "^2.2.0", - "apollo-server-plugin-base": "^0.7.0", + "apollo-server-plugin-base": "^0.8.0", "fast-json-stable-stringify": "^2.0.0", "loglevel": "^1.6.1", "loglevel-debug": "^0.0.1", From 18a84dd79911faddeb5bdbffb165754d369aef37 Mon Sep 17 00:00:00 2001 From: Trevor Scheer Date: Thu, 14 May 2020 00:26:33 -0700 Subject: [PATCH 570/642] Update deps to monorepo file references --- package-lock.json | 76 ++++--------------- .../package.json | 6 +- .../tsconfig.json | 6 +- 3 files changed, 22 insertions(+), 66 deletions(-) diff --git a/package-lock.json b/package-lock.json index d63bb9c7d48..55b63fe4f20 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6003,9 +6003,9 @@ "version": "file:packages/apollo-server-plugin-operation-registry", "requires": { "apollo-graphql": "0.4.4", - "apollo-server-caching": "^0.5.0", - "apollo-server-errors": "^2.2.0", - "apollo-server-plugin-base": "^0.8.0", + "apollo-server-caching": "file:packages/apollo-server-caching", + "apollo-server-errors": "file:packages/apollo-server-errors", + "apollo-server-plugin-base": "file:packages/apollo-server-plugin-base", "fast-json-stable-stringify": "^2.0.0", "loglevel": "^1.6.1", "loglevel-debug": "^0.0.1", @@ -6013,82 +6013,34 @@ }, "dependencies": { "@types/node-fetch": { - "version": "2.5.6", - "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.6.tgz", - "integrity": "sha512-2w0NTwMWF1d3NJMK0Uiq2UNN8htVCyOWOD0jIPjPgC5Ph/YP4dVhs9YxxcMcuLuwAslz0dVEcZQUaqkLs3IzOQ==", + "version": "2.5.7", + "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.7.tgz", + "integrity": "sha512-o2WVNf5UhWRkxlf6eq+jMZDu7kjgpgJfl4xVNlvryc95O/6F2ld8ztKX+qu+Rjyet93WAWm5LjeX9H5FGkODvw==", "requires": { "@types/node": "*", "form-data": "^3.0.0" } }, - "apollo-engine-reporting-protobuf": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/apollo-engine-reporting-protobuf/-/apollo-engine-reporting-protobuf-0.4.4.tgz", - "integrity": "sha512-SGrIkUR7Q/VjU8YG98xcvo340C4DaNUhg/TXOtGsMlfiJDzHwVau/Bv6zifAzBafp2lj0XND6Daj5kyT/eSI/w==", - "requires": { - "@apollo/protobufjs": "^1.0.3" - } - }, "apollo-env": { - "version": "0.6.4", - "resolved": "https://registry.npmjs.org/apollo-env/-/apollo-env-0.6.4.tgz", - "integrity": "sha512-8tGDMFv3sZLd76b/ZAo8GbdWU5Qt3VEUWSB+FLN41p/hVShZw0XIo2s/i8pVCTAhaWiEiD0Cr+d/zi0/h5UTxA==", + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/apollo-env/-/apollo-env-0.6.5.tgz", + "integrity": "sha512-jeBUVsGymeTHYWp3me0R2CZRZrFeuSZeICZHCeRflHTfnQtlmbSXdy5E0pOyRM9CU4JfQkKDC98S1YglQj7Bzg==", "requires": { - "@types/node-fetch": "2.5.6", + "@types/node-fetch": "2.5.7", "core-js": "^3.0.1", "node-fetch": "^2.2.0", "sha.js": "^2.4.11" } }, "apollo-graphql": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/apollo-graphql/-/apollo-graphql-0.4.3.tgz", - "integrity": "sha512-eAl8w6TeuY0Q3x7TVqBjt4JObA34vUyctuDn2lOmkdIqlu1EKxNAnTlRtXkjQM89qUt0rK0teU8No0a2lMNGuw==", + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/apollo-graphql/-/apollo-graphql-0.4.4.tgz", + "integrity": "sha512-i012iRKT5nfsOaNMx4MTwHw2jrlyaF1zikpejxsGHsKIf3OngGvGh3pyw20bEmwj413OrNQpRxvvIz5A7W/8xw==", "requires": { - "apollo-env": "^0.6.4", + "apollo-env": "^0.6.5", "lodash.sortby": "^4.7.0" } }, - "apollo-server-caching": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/apollo-server-caching/-/apollo-server-caching-0.5.1.tgz", - "integrity": "sha512-L7LHZ3k9Ao5OSf2WStvQhxdsNVplRQi7kCAPfqf9Z3GBEnQ2uaL0EgO0hSmtVHfXTbk5CTRziMT1Pe87bXrFIw==", - "requires": { - "lru-cache": "^5.0.0" - } - }, - "apollo-server-env": { - "version": "2.4.3", - "resolved": "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-2.4.3.tgz", - "integrity": "sha512-23R5Xo9OMYX0iyTu2/qT0EUb+AULCBriA9w8HDfMoChB8M+lFClqUkYtaTTHDfp6eoARLW8kDBhPOBavsvKAjA==", - "requires": { - "node-fetch": "^2.1.2", - "util.promisify": "^1.0.0" - } - }, - "apollo-server-errors": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/apollo-server-errors/-/apollo-server-errors-2.4.1.tgz", - "integrity": "sha512-7oEd6pUxqyWYUbQ9TA8tM0NU/3aGtXSEibo6+txUkuHe7QaxfZ2wHRp+pfT1LC1K3RXYjKj61/C2xEO19s3Kdg==" - }, - "apollo-server-plugin-base": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.7.1.tgz", - "integrity": "sha512-PRavvoWq7/Xufqc+qkDQg3Aqueq4QrPBFfoCFIjhkJ4n2d2YoqE3gTGccb8YoWusfa62ASMn6R47OdNuVtEbXw==", - "requires": { - "apollo-server-types": "^0.3.1" - } - }, - "apollo-server-types": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.3.1.tgz", - "integrity": "sha512-6nX5VC3icOGf1RZIs7/SYQZff+Cl16LQu1FHUOIk9gAMN2XjlRCyJgCeMj5YHJzQ8Mhg4BO0weWuydEg+JxLzg==", - "requires": { - "apollo-engine-reporting-protobuf": "^0.4.4", - "apollo-server-caching": "^0.5.1", - "apollo-server-env": "^2.4.3" - } - }, "combined-stream": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", diff --git a/packages/apollo-server-plugin-operation-registry/package.json b/packages/apollo-server-plugin-operation-registry/package.json index bbf462edc41..706d752ab75 100644 --- a/packages/apollo-server-plugin-operation-registry/package.json +++ b/packages/apollo-server-plugin-operation-registry/package.json @@ -12,9 +12,9 @@ }, "dependencies": { "apollo-graphql": "0.4.4", - "apollo-server-caching": "^0.5.0", - "apollo-server-errors": "^2.2.0", - "apollo-server-plugin-base": "^0.8.0", + "apollo-server-caching": "file:../apollo-server-caching", + "apollo-server-errors": "file:../apollo-server-errors", + "apollo-server-plugin-base": "file:../apollo-server-plugin-base", "fast-json-stable-stringify": "^2.0.0", "loglevel": "^1.6.1", "loglevel-debug": "^0.0.1", diff --git a/packages/apollo-server-plugin-operation-registry/tsconfig.json b/packages/apollo-server-plugin-operation-registry/tsconfig.json index 4fcb63fe14f..daf99e740f0 100644 --- a/packages/apollo-server-plugin-operation-registry/tsconfig.json +++ b/packages/apollo-server-plugin-operation-registry/tsconfig.json @@ -6,5 +6,9 @@ }, "include": ["src/**/*"], "exclude": ["**/__tests__", "**/__mocks__"], - "references": [] + "references": [ + { "path": "../apollo-server-caching" }, + { "path": "../apollo-server-errors" }, + { "path": "../apollo-server-plugin-base" }, + ] } From e6ca68e0864323861fc6f7475547220be35e22ea Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 14 May 2020 19:38:49 +0300 Subject: [PATCH 571/642] op-reg: Update `license` and `repository` in `package.json`. --- .../apollo-server-plugin-operation-registry/package.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/package.json b/packages/apollo-server-plugin-operation-registry/package.json index 706d752ab75..033d825b529 100644 --- a/packages/apollo-server-plugin-operation-registry/package.json +++ b/packages/apollo-server-plugin-operation-registry/package.json @@ -5,8 +5,14 @@ "main": "dist/index.js", "types": "dist/index.d.ts", "keywords": [], + "author": "Apollo ", - "license": "SEE LICENSE IN LICENSE.md", + "repository": { + "type": "git", + "url": "apollographql/apollo-server", + "directory": "packages/apollo-server-plugin-operation-registry" + } + "license": "MIT", "engines": { "node": ">=8" }, From c483b5d2a1b92f1693375ab2b4e3eb11e11bd73b Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 14 May 2020 19:39:32 +0300 Subject: [PATCH 572/642] Update package.json --- packages/apollo-server-plugin-operation-registry/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-plugin-operation-registry/package.json b/packages/apollo-server-plugin-operation-registry/package.json index 033d825b529..bebfa7b9c6a 100644 --- a/packages/apollo-server-plugin-operation-registry/package.json +++ b/packages/apollo-server-plugin-operation-registry/package.json @@ -11,7 +11,7 @@ "type": "git", "url": "apollographql/apollo-server", "directory": "packages/apollo-server-plugin-operation-registry" - } + }, "license": "MIT", "engines": { "node": ">=8" From 3ec9f2420fa277568f1a3c8c074ff43babc74f67 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Fri, 15 May 2020 11:34:14 +0000 Subject: [PATCH 573/642] op-reg: Correct `CHANGELOG.md` versions and remove commercial PR links. --- .../CHANGELOG.md | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/packages/apollo-server-plugin-operation-registry/CHANGELOG.md b/packages/apollo-server-plugin-operation-registry/CHANGELOG.md index b63b24abfc6..72b47ad66b6 100644 --- a/packages/apollo-server-plugin-operation-registry/CHANGELOG.md +++ b/packages/apollo-server-plugin-operation-registry/CHANGELOG.md @@ -1,14 +1,14 @@ # Change Log -### Upcoming +### 0.3.1: -- Deprecate schemaTag option, add preferred graphVariant option [PR #295](https://github.com/apollographql/apollo-platform-commercial/pull/295) +- The `schemaTag` option is now deprecated and superseded by `graphVariant`. -### vNEXT (Currently `alpha` tag) +### 0.3.0 -- Add lifecycle hooks: `onUnregisteredOperation`, and `onForbiddenOperation`. [PR #158](https://github.com/apollographql/apollo-platform-commercial/pull/158) [PR #251](https://github.com/apollographql/apollo-platform-commercial/pull/251) [PR #TODO](https://github.com/apollographql/apollo-platform-commercial/pull/TODO) -- Prevent the polling timer from keeping the event loop active [PR #223](https://github.com/apollographql/apollo-platform-commercial/pull/223) -- Update error message for operations that are not in the operation registry. [PR #170](https://github.com/apollographql/apollo-platform-commercial/pull/170) +- Add lifecycle hooks: `onUnregisteredOperation`, and `onForbiddenOperation`. +- Prevent the polling timer from keeping the event loop active +- Update error message for operations that are not in the operation registry. ### 0.2.2 @@ -16,15 +16,15 @@ ### 0.2.1 -- Don't enable logging if `debug` was explicitly set to `false` even if `dryRun` is set to `true`. [PR #159](https://github.com/apollographql/apollo-platform-commercial/pull/159) +- Don't enable logging if `debug` was explicitly set to `false` even if `dryRun` is set to `true`. ### 0.2.0 -- Per-tag operation manifests can now be fetched for each tag that has a schema and registered operations. [PR #135](https://github.com/apollographql/apollo-platform-commercial/pull/135) -- Manifest storage path structure updated to `/${graphId}/${storageSecret}/${schemaTag}/manifest.v2.json`. The storage secret is fetched automatically using your API key. No longer uses schema hash. [PR #116](https://github.com/apollographql/apollo-platform-commercial/pull/116) -- Metrics on forbidden and registered operations are now reported to Engine [PR #132](https://github.com/apollographql/apollo-platform-commercial/pull/132) +- Per-tag operation manifests can now be fetched for each tag that has a schema and registered operations. +- Manifest storage path structure updated to `/${graphId}/${storageSecret}/${schemaTag}/manifest.v2.json`. The storage secret is fetched automatically using your API key. No longer uses schema hash. +- Metrics on forbidden and registered operations are now reported to Engine ### 0.1.0 - `apollo-server-plugin-operation-registry` -- Update operation registry plugin to use manifest v2 [#32](https://github.com/apollographql/apollo-platform-commercial/pull/32) +- Update operation registry plugin to use manifest v2 From 7762f73a7e7782eb4006f2de7a048c3f90be60f6 Mon Sep 17 00:00:00 2001 From: Stephen Barlow Date: Fri, 15 May 2020 12:15:04 -0700 Subject: [PATCH 574/642] Add names to all operations and complementary edits to schema basics --- docs/source/data/resolvers.mdx | 4 +-- docs/source/federation/entities.md | 2 +- docs/source/federation/federation-spec.md | 2 +- docs/source/federation/gateway.mdx | 2 +- docs/source/federation/introduction.mdx | 2 +- docs/source/schema/scalars-enums.md | 4 +-- docs/source/schema/schema.md | 34 +++++++++++------------ 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/docs/source/data/resolvers.mdx b/docs/source/data/resolvers.mdx index 8b26c71469c..a247d7255ca 100644 --- a/docs/source/data/resolvers.mdx +++ b/docs/source/data/resolvers.mdx @@ -198,7 +198,7 @@ type Query { Here's a valid query against that schema: ```graphql -query { +query GetBooksByLibrary { libraries { books { author { @@ -325,7 +325,7 @@ server.listen().then(({ url }) => { If we now update our query to also ask for each book's `title`: ```graphql{4} -query { +query GetBooksByLibrary { libraries { books { title diff --git a/docs/source/federation/entities.md b/docs/source/federation/entities.md index 16537b9a6b1..c55408edc53 100644 --- a/docs/source/federation/entities.md +++ b/docs/source/federation/entities.md @@ -182,7 +182,7 @@ extend type Product @key(fields: "upc") { Similar to the `reviews` relationship example above, the gateway fetches the required `upc` field from the `products` service and passes it to the `inventory` service, even if the query didn't ask for the `upc`: ```graphql -query { +query GetTopProductAvailability { topProducts { inStock } diff --git a/docs/source/federation/federation-spec.md b/docs/source/federation/federation-spec.md index 954ac3fcf59..4960fb74181 100644 --- a/docs/source/federation/federation-spec.md +++ b/docs/source/federation/federation-spec.md @@ -122,7 +122,7 @@ Queries across service boundaries will start off from the `_entities` root field For example, if we execute a query for the top product's `reviews`: ```graphql -query { +query GetTopProductReviews { topProducts { reviews { body diff --git a/docs/source/federation/gateway.mdx b/docs/source/federation/gateway.mdx index 6e0dd2e01ee..42115ddb5af 100644 --- a/docs/source/federation/gateway.mdx +++ b/docs/source/federation/gateway.mdx @@ -257,7 +257,7 @@ directive @uppercase on FIELD And here's an example of a query that uses that directive: ```graphql -query { +query GetUppercaseUsernames { users { name @uppercase } diff --git a/docs/source/federation/introduction.mdx b/docs/source/federation/introduction.mdx index b28f948f1f6..396abf77c96 100644 --- a/docs/source/federation/introduction.mdx +++ b/docs/source/federation/introduction.mdx @@ -189,7 +189,7 @@ were implemented as a single, monolithic service: ```graphql # A query that the gateway resolves by calling all three services -query { +query GetCurrentUserReviews { me { username reviews { diff --git a/docs/source/schema/scalars-enums.md b/docs/source/schema/scalars-enums.md index 24006f806b2..06c6c3cc54f 100644 --- a/docs/source/schema/scalars-enums.md +++ b/docs/source/schema/scalars-enums.md @@ -237,7 +237,7 @@ type Query { A query might look like this: ```graphql -query { +query GetAvatar { avatar(borderColor: RED) } ``` @@ -245,7 +245,7 @@ query { To pass the enum value as a variable, use a string of JSON, like so: ```graphql -query MyAvatar($color: AllowedColor) { +query GetAvatar($color: AllowedColor) { avatar(borderColor: $color) } ``` diff --git a/docs/source/schema/schema.md b/docs/source/schema/schema.md index 258c5ccbfc9..e2cd88476e0 100644 --- a/docs/source/schema/schema.md +++ b/docs/source/schema/schema.md @@ -76,18 +76,18 @@ type Author { ### The `Query` type -The `Query` type defines exactly which GraphQL queries (i.e., read operations) clients can execute against your data graph. It resembles an [object type](#object-types), but its name is always `Query`. +The `Query` type defines all of the top-level **entry points** for queries that clients execute against your data graph. It resembles an [object type](#object-types), but its name is always `Query`. -Each field of the `Query` type defines the name and return type of a different supported query. The `Query` type for our example schema might resemble the following: +Each field of the `Query` type defines the name and return type of a different entry point. The `Query` type for our example schema might resemble the following: ```graphql type Query { - getBooks: [Book] - getAuthors: [Author] + books: [Book] + authors: [Author] } ``` -This `Query` type defines two available queries: `getBooks` and `getAuthors`. Each query returns a list of the corresponding type. +This `Query` type defines two fields: `books` and `authors`. Each field returns a list of the corresponding type. With a REST-based API, books and authors would probably be returned by different endpoints (e.g., `/api/books` and `/api/authors`). The flexibility of GraphQL enables clients to query both resources with a single request. @@ -98,12 +98,12 @@ When your clients build queries to execute against your data graph, those querie Based on our example schema so far, a client could execute the following query, which requests both a list of all book titles _and_ a list of all author names: ```graphql -query { - getBooks { +query GetBooksAndAuthors { + books { title } - getAuthors { + authors { name } } @@ -114,13 +114,13 @@ Our server would then respond to the query with results that match the query's s ```json { "data": { - "getBooks": [ + "books": [ { "title": "Jurassic Park" }, ... ], - "getAuthors": [ + "authors": [ { "name": "Michael Crichton" }, @@ -132,11 +132,11 @@ Our server would then respond to the query with results that match the query's s Although it might be useful in some cases to fetch these two separate lists, a client would probably prefer to fetch a single list of books, where each book's author is included in the result. -Because our schema's `Book` type has an `author` field of type `Author`, a client could structure their query like so: +Because our schema's `Book` type has an `author` field of type `Author`, a client could instead structure their query like so: ```graphql -query { - getBooks { +query GetBooks { + books { title author { name @@ -150,7 +150,7 @@ And once again, our server would respond with results that match the query's str ```json { "data": { - "getBooks": [ + "books": [ { "title": "Jurassic Park", "author": { @@ -165,9 +165,9 @@ And once again, our server would respond with results that match the query's str ### The `Mutation` type -The `Mutation` type is similar in structure and purpose to the [`Query` type](#the-query-type). Whereas the `Query` type defines your data graph's supported _read_ operations, the `Mutation` type defines supported _write_ operations. +The `Mutation` type is similar in structure and purpose to the [`Query` type](#the-query-type). Whereas the `Query` type defines entry points for _read_ operations, the `Mutation` type defines entry points for _write_ operations. -Each field of the `Mutation` type defines the signature and return type of a different mutation. The `Mutation` type for our example schema might resemble the following: +Each field of the `Mutation` type defines the signature and return type of a different entry point. The `Mutation` type for our example schema might resemble the following: ```graphql type Mutation { @@ -182,7 +182,7 @@ This `Mutation` type defines a single available mutation, `addBook`. The mutatio Like queries, mutations match the structure of your schema's type definitions. The following mutation creates a new `Book` and requests certain fields of the created object as a return value: ```graphql -mutation { +mutation CreateBook { addBook(title: "Fox in Socks", author: "Dr. Seuss") { title author { From 8fd78ead07f978e610cc62d2d86c7e3608f17c07 Mon Sep 17 00:00:00 2001 From: Trevor Scheer Date: Fri, 15 May 2020 16:52:25 -0700 Subject: [PATCH 575/642] General gateway testing cleanup * Address linting (unused vars) * Fix TS errors in tests * Abstract fixtures a bit and ensure they're all being consumed properly cc @abernix --- .../__fixtures__/schemas/documents.ts | 2 +- .../__tests__/__fixtures__/schemas/index.ts | 33 ++++++ .../src/__tests__/buildQueryPlan.test.ts | 33 +++--- .../src/__tests__/executeQueryPlan.test.ts | 30 ++--- .../src/__tests__/execution-utils.ts | 11 +- .../__tests__/gateway/buildService.test.ts | 20 ++-- .../src/__tests__/gateway/executor.test.ts | 9 +- .../__tests__/gateway/lifecycle-hooks.test.ts | 27 +++-- .../__tests__/gateway/queryPlanCache.test.ts | 10 +- .../src/__tests__/gateway/reporting.test.ts | 9 +- .../integration/abstract-types.test.ts | 90 ++++++--------- .../src/__tests__/integration/aliases.test.ts | 52 ++++----- .../src/__tests__/integration/boolean.test.ts | 103 +++++++----------- .../__tests__/integration/complex-key.test.ts | 2 +- .../integration/custom-directives.test.ts | 39 +++---- .../integration/execution-style.test.ts | 24 +--- .../__tests__/integration/fragments.test.ts | 87 ++++++--------- .../__tests__/integration/list-key.test.ts | 2 +- .../integration/merge-arrays.test.ts | 25 +---- .../integration/multiple-key.test.ts | 4 +- .../__tests__/integration/mutations.test.ts | 60 ++++------ .../__tests__/integration/provides.test.ts | 32 ++---- .../__tests__/integration/requires.test.ts | 18 +-- .../integration/single-service.test.ts | 4 +- .../src/__tests__/integration/unions.test.ts | 2 +- .../__tests__/integration/value-types.test.ts | 21 +--- .../__tests__/integration/variables.test.ts | 55 ++++------ 27 files changed, 324 insertions(+), 480 deletions(-) create mode 100644 packages/apollo-gateway/src/__tests__/__fixtures__/schemas/index.ts diff --git a/packages/apollo-gateway/src/__tests__/__fixtures__/schemas/documents.ts b/packages/apollo-gateway/src/__tests__/__fixtures__/schemas/documents.ts index 896d76b862f..6f04d2f5de1 100644 --- a/packages/apollo-gateway/src/__tests__/__fixtures__/schemas/documents.ts +++ b/packages/apollo-gateway/src/__tests__/__fixtures__/schemas/documents.ts @@ -1,6 +1,6 @@ import gql from 'graphql-tag'; -export const name = 'unionsWithNameCollisions'; +export const name = 'documents'; export const typeDefs = gql` directive @stream on FIELD directive @transform(from: String!) on FIELD diff --git a/packages/apollo-gateway/src/__tests__/__fixtures__/schemas/index.ts b/packages/apollo-gateway/src/__tests__/__fixtures__/schemas/index.ts new file mode 100644 index 00000000000..e051f45b76a --- /dev/null +++ b/packages/apollo-gateway/src/__tests__/__fixtures__/schemas/index.ts @@ -0,0 +1,33 @@ +import * as accounts from './accounts'; +import * as books from './books'; +import * as documents from './documents'; +import * as inventory from './inventory'; +import * as product from './product'; +import * as reviews from './reviews'; + +export { + accounts, + books, + documents, + inventory, + product, + reviews, +}; + +export const fixtures = [ + accounts, + books, + documents, + inventory, + product, + reviews, +]; + +export const fixtureNames = [ + accounts.name, + product.name, + inventory.name, + reviews.name, + books.name, + documents.name, +]; diff --git a/packages/apollo-gateway/src/__tests__/buildQueryPlan.test.ts b/packages/apollo-gateway/src/__tests__/buildQueryPlan.test.ts index 8c8cf3f1dc0..52abe4def87 100644 --- a/packages/apollo-gateway/src/__tests__/buildQueryPlan.test.ts +++ b/packages/apollo-gateway/src/__tests__/buildQueryPlan.test.ts @@ -5,12 +5,17 @@ import { GraphQLSchemaValidationError, } from 'apollo-graphql'; import gql from 'graphql-tag'; -import { composeServices, buildFederatedSchema, normalizeTypeDefs } from '@apollo/federation'; +import { + composeServices, + buildFederatedSchema, + normalizeTypeDefs, +} from '@apollo/federation'; import { buildQueryPlan, buildOperationContext } from '../buildQueryPlan'; import { LocalGraphQLDataSource } from '../datasources/LocalGraphQLDataSource'; import { astSerializer, queryPlanSerializer } from '../snapshotSerializers'; +import { fixtureNames } from './__fixtures__/schemas'; expect.addSnapshotSerializer(astSerializer); expect.addSnapshotSerializer(queryPlanSerializer); @@ -25,20 +30,14 @@ describe('buildQueryPlan', () => { beforeEach(() => { const serviceMap = Object.fromEntries( - ['accounts', 'product', 'inventory', 'reviews', 'books', 'documents'].map( - serviceName => { - return [ - serviceName, - buildLocalService([ - require(path.join( - __dirname, - '__fixtures__/schemas', - serviceName, - )), - ]), - ] as [string, LocalGraphQLDataSource]; - }, - ), + fixtureNames.map((serviceName) => { + return [ + serviceName, + buildLocalService([ + require(path.join(__dirname, '__fixtures__/schemas', serviceName)), + ]), + ] as [string, LocalGraphQLDataSource]; + }), ); let errors: GraphQLError[]; @@ -58,12 +57,12 @@ describe('buildQueryPlan', () => { const query = gql` query { body { - ...on Image { + ... on Image { attributes { url } } - ...on Text { + ... on Text { attributes { bold text diff --git a/packages/apollo-gateway/src/__tests__/executeQueryPlan.test.ts b/packages/apollo-gateway/src/__tests__/executeQueryPlan.test.ts index f02aed05d1c..cbf78b8ea5a 100644 --- a/packages/apollo-gateway/src/__tests__/executeQueryPlan.test.ts +++ b/packages/apollo-gateway/src/__tests__/executeQueryPlan.test.ts @@ -9,13 +9,19 @@ import { import gql from 'graphql-tag'; import { GraphQLRequestContext } from 'apollo-server-types'; import { AuthenticationError } from 'apollo-server-core'; -import { composeServices, buildFederatedSchema, normalizeTypeDefs } from '@apollo/federation'; +import { + composeServices, + buildFederatedSchema, + normalizeTypeDefs, +} from '@apollo/federation'; import { buildQueryPlan, buildOperationContext } from '../buildQueryPlan'; import { executeQueryPlan } from '../executeQueryPlan'; import { LocalGraphQLDataSource } from '../datasources/LocalGraphQLDataSource'; import { astSerializer, queryPlanSerializer } from '../snapshotSerializers'; +import { fixtureNames } from './__fixtures__/schemas'; + expect.addSnapshotSerializer(astSerializer); expect.addSnapshotSerializer(queryPlanSerializer); @@ -40,20 +46,14 @@ describe('executeQueryPlan', () => { beforeEach(() => { serviceMap = Object.fromEntries( - ['accounts', 'product', 'inventory', 'reviews', 'books'].map( - serviceName => { - return [ - serviceName, - buildLocalService([ - require(path.join( - __dirname, - '__fixtures__/schemas', - serviceName, - )), - ]), - ] as [string, LocalGraphQLDataSource]; - }, - ), + fixtureNames.map((serviceName) => { + return [ + serviceName, + buildLocalService([ + require(path.join(__dirname, '__fixtures__/schemas', serviceName)), + ]), + ] as [string, LocalGraphQLDataSource]; + }), ); let errors: GraphQLError[]; diff --git a/packages/apollo-gateway/src/__tests__/execution-utils.ts b/packages/apollo-gateway/src/__tests__/execution-utils.ts index 6fe7328e3b0..564309bf7ff 100644 --- a/packages/apollo-gateway/src/__tests__/execution-utils.ts +++ b/packages/apollo-gateway/src/__tests__/execution-utils.ts @@ -1,10 +1,10 @@ -import { GraphQLSchema, GraphQLError, DocumentNode } from 'graphql'; +import { GraphQLSchema, GraphQLError } from 'graphql'; import { GraphQLSchemaValidationError, GraphQLSchemaModule, GraphQLResolverMap, } from 'apollo-graphql'; -import { GraphQLRequest, GraphQLExecutionResult } from 'apollo-server-types'; +import { GraphQLRequest, GraphQLExecutionResult, Logger } from 'apollo-server-types'; import { composeAndValidate, buildFederatedSchema, @@ -22,6 +22,7 @@ import { mergeDeep } from 'apollo-utilities'; import queryPlanSerializer from '../snapshotSerializers/queryPlanSerializer'; import astSerializer from '../snapshotSerializers/astSerializer'; +import gql from 'graphql-tag'; const prettyFormat = require('pretty-format'); export type ServiceDefinitionModule = ServiceDefinition & GraphQLSchemaModule; @@ -39,7 +40,8 @@ export function overrideResolversInService( export async function execute( services: ServiceDefinitionModule[], - request: GraphQLRequest & { query: DocumentNode }, + request: GraphQLRequest, + logger?: Logger, ): Promise { let schema: GraphQLSchema; const serviceMap = Object.fromEntries( @@ -65,7 +67,7 @@ export async function execute( if (errors && errors.length > 0) { throw new GraphQLSchemaValidationError(errors); } - const operationContext = buildOperationContext(schema, request.query); + const operationContext = buildOperationContext(schema, gql`${request.query}`); const queryPlan = buildQueryPlan(operationContext); @@ -76,6 +78,7 @@ export async function execute( cache: undefined as any, context: {}, request, + logger: logger || console }, operationContext, ); diff --git a/packages/apollo-gateway/src/__tests__/gateway/buildService.test.ts b/packages/apollo-gateway/src/__tests__/gateway/buildService.test.ts index 3361f7ad4b0..19bfe3ecbd1 100644 --- a/packages/apollo-gateway/src/__tests__/gateway/buildService.test.ts +++ b/packages/apollo-gateway/src/__tests__/gateway/buildService.test.ts @@ -6,11 +6,7 @@ import { ApolloServerBase as ApolloServer } from 'apollo-server-core'; import { RemoteGraphQLDataSource } from '../../datasources/RemoteGraphQLDataSource'; import { ApolloGateway, SERVICE_DEFINITION_QUERY } from '../../'; -import * as accounts from '../__fixtures__/schemas/accounts'; -import * as books from '../__fixtures__/schemas/books'; -import * as inventory from '../__fixtures__/schemas/inventory'; -import * as product from '../__fixtures__/schemas/product'; -import * as reviews from '../__fixtures__/schemas/reviews'; +import { fixtures } from '../__fixtures__/schemas/'; beforeEach(() => { fetch.mockReset(); @@ -39,12 +35,12 @@ it('calls buildService only once per service', async () => { it('correctly passes the context from ApolloServer to datasources', async () => { const gateway = new ApolloGateway({ - localServiceList: [accounts, books, inventory, product, reviews], - buildService: service => { + localServiceList: fixtures, + buildService: _service => { return new RemoteGraphQLDataSource({ url: 'https://api.example.com/foo', willSendRequest: ({ request, context }) => { - request.http.headers.set('x-user-id', context.userId); + request.http?.headers.set('x-user-id', context.userId); }, }); }, @@ -116,11 +112,11 @@ it('makes enhanced introspection request using datasource', async () => { url: 'https://api.example.com/one', }, ], - buildService: service => { + buildService: _service => { return new RemoteGraphQLDataSource({ url: 'https://api.example.com/override', willSendRequest: ({ request }) => { - request.http.headers.set('custom-header', 'some-custom-value'); + request.http?.headers.set('custom-header', 'some-custom-value'); }, }); }, @@ -166,7 +162,7 @@ it('customizes request on a per-service basis', async () => { return new RemoteGraphQLDataSource({ url: service.url, willSendRequest: ({ request }) => { - request.http.headers.set('service-name', service.name); + request.http?.headers.set('service-name', service.name); }, }); }, @@ -209,7 +205,7 @@ it('customizes request on a per-service basis', async () => { it('does not share service definition cache between gateways', async () => { let updates = 0; - const updateObserver: any = (...args: any[]) => { + const updateObserver: any = (..._args: any[]) => { updates += 1; }; diff --git a/packages/apollo-gateway/src/__tests__/gateway/executor.test.ts b/packages/apollo-gateway/src/__tests__/gateway/executor.test.ts index 7e8a7490f64..ef63f1a7d01 100644 --- a/packages/apollo-gateway/src/__tests__/gateway/executor.test.ts +++ b/packages/apollo-gateway/src/__tests__/gateway/executor.test.ts @@ -1,17 +1,12 @@ import gql from 'graphql-tag'; import { ApolloGateway } from '../../'; - -import * as accounts from '../__fixtures__/schemas/accounts'; -import * as books from '../__fixtures__/schemas/books'; -import * as inventory from '../__fixtures__/schemas/inventory'; -import * as product from '../__fixtures__/schemas/product'; -import * as reviews from '../__fixtures__/schemas/reviews'; +import { fixtures } from '../__fixtures__/schemas/'; import { ApolloServer } from "apollo-server"; describe('ApolloGateway executor', () => { it('validates requests prior to execution', async () => { const gateway = new ApolloGateway({ - localServiceList: [accounts, books, inventory, product, reviews], + localServiceList: fixtures, }); const { executor } = await gateway.load(); diff --git a/packages/apollo-gateway/src/__tests__/gateway/lifecycle-hooks.test.ts b/packages/apollo-gateway/src/__tests__/gateway/lifecycle-hooks.test.ts index bc2c77c30bf..e7a20795056 100644 --- a/packages/apollo-gateway/src/__tests__/gateway/lifecycle-hooks.test.ts +++ b/packages/apollo-gateway/src/__tests__/gateway/lifecycle-hooks.test.ts @@ -3,14 +3,25 @@ import { GatewayConfig, Experimental_UpdateServiceDefinitions, } from '../../index'; -import * as accounts from '../__fixtures__/schemas/accounts'; -import * as books from '../__fixtures__/schemas/books'; -import * as inventory from '../__fixtures__/schemas/inventory'; -import * as product from '../__fixtures__/schemas/product'; -import * as reviews from '../__fixtures__/schemas/reviews'; - -const services = [product, reviews, inventory, accounts, books]; -const serviceDefinitions = services.map((s, i) => ({ +import { + product, + reviews, + inventory, + accounts, + books, + documents, +} from '../__fixtures__/schemas/'; + +// The order of this was specified to preserve existing test coverage. Typically +// we would just import and use the `fixtures` array. +const serviceDefinitions = [ + product, + reviews, + inventory, + accounts, + books, + documents, +].map((s, i) => ({ name: s.name, typeDefs: s.typeDefs, url: `http://localhost:${i}`, diff --git a/packages/apollo-gateway/src/__tests__/gateway/queryPlanCache.test.ts b/packages/apollo-gateway/src/__tests__/gateway/queryPlanCache.test.ts index 9aa51273f2a..247ee4dd7a2 100644 --- a/packages/apollo-gateway/src/__tests__/gateway/queryPlanCache.test.ts +++ b/packages/apollo-gateway/src/__tests__/gateway/queryPlanCache.test.ts @@ -6,11 +6,7 @@ import { buildFederatedSchema } from '@apollo/federation'; import { LocalGraphQLDataSource } from '../../datasources/LocalGraphQLDataSource'; import { ApolloGateway } from '../../'; -import * as accounts from '../__fixtures__/schemas/accounts'; -import * as books from '../__fixtures__/schemas/books'; -import * as inventory from '../__fixtures__/schemas/inventory'; -import * as product from '../__fixtures__/schemas/product'; -import * as reviews from '../__fixtures__/schemas/reviews'; +import { fixtures } from '../__fixtures__/schemas/'; it('caches the query plan for a request', async () => { const planner = require('../../buildQueryPlan'); @@ -19,7 +15,7 @@ it('caches the query plan for a request', async () => { planner.buildQueryPlan = jest.fn(originalPlanner); const gateway = new ApolloGateway({ - localServiceList: [accounts, books, inventory, product, reviews], + localServiceList: fixtures, buildService: service => { return new LocalGraphQLDataSource(buildFederatedSchema([service])); }, @@ -75,7 +71,7 @@ it('supports multiple operations and operationName', async () => { `; const gateway = new ApolloGateway({ - localServiceList: [accounts, books, inventory, product, reviews], + localServiceList: fixtures, buildService: service => { return new LocalGraphQLDataSource(buildFederatedSchema([service])); }, diff --git a/packages/apollo-gateway/src/__tests__/gateway/reporting.test.ts b/packages/apollo-gateway/src/__tests__/gateway/reporting.test.ts index aa2a1662860..85eb3c2732a 100644 --- a/packages/apollo-gateway/src/__tests__/gateway/reporting.test.ts +++ b/packages/apollo-gateway/src/__tests__/gateway/reporting.test.ts @@ -11,6 +11,7 @@ import fetch from 'node-fetch'; import { ApolloGateway } from '../..'; import { Plugin, Config, Refs } from 'pretty-format'; import { Report } from 'apollo-engine-reporting-protobuf'; +import { fixtureNames } from '../__fixtures__/schemas'; // Normalize specific fields that change often (eg timestamps) to static values, // to make snapshot testing viable. (If these helpers are more generally @@ -105,13 +106,7 @@ describe('reporting', () => { backendServers = []; const serviceList = []; - for (const serviceName of [ - 'accounts', - 'product', - 'inventory', - 'reviews', - 'books', - ]) { + for (const serviceName of fixtureNames) { const { server, url } = await startFederatedServer([ require(path.join(__dirname, '../__fixtures__/schemas', serviceName)), ]); diff --git a/packages/apollo-gateway/src/__tests__/integration/abstract-types.test.ts b/packages/apollo-gateway/src/__tests__/integration/abstract-types.test.ts index 78c012f8e08..980016bb79a 100644 --- a/packages/apollo-gateway/src/__tests__/integration/abstract-types.test.ts +++ b/packages/apollo-gateway/src/__tests__/integration/abstract-types.test.ts @@ -1,10 +1,6 @@ import gql from 'graphql-tag'; import { execute } from '../execution-utils'; -import * as accounts from '../__fixtures__/schemas/accounts'; -import * as books from '../__fixtures__/schemas/books'; -import * as inventory from '../__fixtures__/schemas/inventory'; -import * as product from '../__fixtures__/schemas/product'; -import * as reviews from '../__fixtures__/schemas/reviews'; +import { fixtures } from '../__fixtures__/schemas/'; import { astSerializer, queryPlanSerializer } from '../../snapshotSerializers'; @@ -12,7 +8,7 @@ expect.addSnapshotSerializer(astSerializer); expect.addSnapshotSerializer(queryPlanSerializer); it('handles an abstract type from the base service', async () => { - const query = gql` + const query = `#graphql query GetProduct($upc: String!) { product(upc: $upc) { upc @@ -23,13 +19,10 @@ it('handles an abstract type from the base service', async () => { `; const upc = '1'; - const { data, queryPlan } = await execute( - [accounts, books, inventory, product, reviews], - { - query, - variables: { upc }, - }, - ); + const { data, queryPlan } = await execute(fixtures, { + query, + variables: { upc }, + }); expect(data).toEqual({ product: { @@ -102,7 +95,7 @@ it('handles an abstract type from the base service', async () => { }); it('can request fields on extended interfaces', async () => { - const query = gql` + const query = `#graphql query GetProduct($upc: String!) { product(upc: $upc) { inStock @@ -113,7 +106,7 @@ it('can request fields on extended interfaces', async () => { const upc = '1'; const { data, queryPlan } = await execute( - [accounts, books, inventory, product, reviews], + fixtures, { query, variables: { upc }, @@ -169,7 +162,7 @@ it('can request fields on extended interfaces', async () => { }); it('can request fields on extended types that implement an interface', async () => { - const query = gql` + const query = `#graphql query GetProduct($upc: String!) { product(upc: $upc) { inStock @@ -182,7 +175,7 @@ it('can request fields on extended types that implement an interface', async () const upc = '1'; const { data, queryPlan } = await execute( - [accounts, books, inventory, product, reviews], + fixtures, { query, variables: { upc }, @@ -239,7 +232,7 @@ it('can request fields on extended types that implement an interface', async () }); it('prunes unfilled type conditions', async () => { - const query = gql` + const query = `#graphql query GetProduct($upc: String!) { product(upc: $upc) { inStock @@ -254,13 +247,10 @@ it('prunes unfilled type conditions', async () => { `; const upc = '1'; - const { data, queryPlan } = await execute( - [accounts, books, inventory, product, reviews], - { - query, - variables: { upc }, - }, - ); + const { data, queryPlan } = await execute(fixtures, { + query, + variables: { upc }, + }); expect(data).toEqual({ product: { inStock: true, isHeavy: false } }); expect(queryPlan).toCallService('product'); @@ -313,7 +303,7 @@ it('prunes unfilled type conditions', async () => { }); it('fetches interfaces returned from other services', async () => { - const query = gql` + const query = `#graphql query GetUserAndProducts { me { reviews { @@ -328,12 +318,9 @@ it('fetches interfaces returned from other services', async () => { } `; - const { data, queryPlan } = await execute( - [accounts, books, inventory, product, reviews], - { - query, - }, - ); + const { data, queryPlan } = await execute(fixtures, { + query, + }); expect(data).toEqual({ me: { @@ -431,7 +418,7 @@ it('fetches interfaces returned from other services', async () => { }); it('fetches composite fields from a foreign type casted to an interface [@provides field]', async () => { - const query = gql` + const query = `#graphql query GetUserAndProducts { me { reviews { @@ -446,12 +433,9 @@ it('fetches composite fields from a foreign type casted to an interface [@provid } `; - const { data, queryPlan } = await execute( - [accounts, books, inventory, product, reviews], - { - query, - }, - ); + const { data, queryPlan } = await execute(fixtures, { + query, + }); expect(data).toEqual({ me: { @@ -571,7 +555,7 @@ it('fetches composite fields from a foreign type casted to an interface [@provid }); it('allows for extending an interface from another service with fields', async () => { - const query = gql` + const query = `#graphql query GetProduct($upc: String!) { product(upc: $upc) { reviews { @@ -582,13 +566,10 @@ it('allows for extending an interface from another service with fields', async ( `; const upc = '1'; - const { data, queryPlan } = await execute( - [accounts, books, inventory, product, reviews], - { - query, - variables: { upc }, - }, - ); + const { data, queryPlan } = await execute(fixtures, { + query, + variables: { upc }, + }); expect(data).toEqual({ product: { @@ -649,7 +630,7 @@ it('allows for extending an interface from another service with fields', async ( describe('unions', () => { it('handles unions from the same service', async () => { - const query = gql` + const query = `#graphql query GetUserAndProducts { me { reviews { @@ -671,12 +652,9 @@ describe('unions', () => { } `; - const { data, queryPlan } = await execute( - [accounts, books, inventory, product, reviews], - { - query, - }, - ); + const { data, queryPlan } = await execute(fixtures, { + query, + }); expect(data).toEqual({ me: { @@ -771,7 +749,7 @@ describe('unions', () => { }); it("doesn't expand interfaces with inline type conditions if all possibilities are fufilled by one service", async () => { - const query = gql` + const query = `#graphql query GetProducts { topProducts { name @@ -841,7 +819,7 @@ describe('unions', () => { // `; // const { data, queryPlan } = await execute( - // [accounts, books, inventory, product, reviews], + // fixtures, // { // query, // }, diff --git a/packages/apollo-gateway/src/__tests__/integration/aliases.test.ts b/packages/apollo-gateway/src/__tests__/integration/aliases.test.ts index f9937eadb83..f8e1da6a827 100644 --- a/packages/apollo-gateway/src/__tests__/integration/aliases.test.ts +++ b/packages/apollo-gateway/src/__tests__/integration/aliases.test.ts @@ -1,11 +1,6 @@ -import gql from 'graphql-tag'; -import { execute, printPlan } from '../execution-utils'; +import { execute } from '../execution-utils'; -import * as accounts from '../__fixtures__/schemas/accounts'; -import * as books from '../__fixtures__/schemas/books'; -import * as inventory from '../__fixtures__/schemas/inventory'; -import * as product from '../__fixtures__/schemas/product'; -import * as reviews from '../__fixtures__/schemas/reviews'; +import { fixtures } from '../__fixtures__/schemas/'; // FIXME: remove this when GraphQLExtensions is removed import { createTestClient } from 'apollo-server-testing'; @@ -15,7 +10,7 @@ import { LocalGraphQLDataSource } from '../../datasources/LocalGraphQLDataSource import { ApolloGateway } from '../../'; it('supports simple aliases', async () => { - const query = gql` + const query = `#graphql query GetProduct($upc: String!) { product(upc: $upc) { name @@ -25,13 +20,10 @@ it('supports simple aliases', async () => { `; const upc = '1'; - const { data, errors, queryPlan } = await execute( - [accounts, books, inventory, product, reviews], - { - query, - variables: { upc }, - }, - ); + const { data, queryPlan } = await execute(fixtures, { + query, + variables: { upc }, + }); expect(data).toEqual({ product: { @@ -44,7 +36,7 @@ it('supports simple aliases', async () => { }); it('supports aliases of root fields on subservices', async () => { - const query = gql` + const query = `#graphql query GetProduct($upc: String!) { product(upc: $upc) { name @@ -60,13 +52,10 @@ it('supports aliases of root fields on subservices', async () => { `; const upc = '1'; - const { data, errors, queryPlan } = await execute( - [accounts, books, inventory, product, reviews], - { - query, - variables: { upc }, - }, - ); + const { data, queryPlan } = await execute(fixtures, { + query, + variables: { upc }, + }); expect(data).toEqual({ product: { @@ -95,7 +84,7 @@ it('supports aliases of root fields on subservices', async () => { }); it('supports aliases of nested fields on subservices', async () => { - const query = gql` + const query = `#graphql query GetProduct($upc: String!) { product(upc: $upc) { name @@ -115,13 +104,10 @@ it('supports aliases of nested fields on subservices', async () => { `; const upc = '1'; - const { data, errors, queryPlan } = await execute( - [accounts, books, inventory, product, reviews], - { - query, - variables: { upc }, - }, - ); + const { data, queryPlan } = await execute(fixtures, { + query, + variables: { upc }, + }); expect(data).toEqual({ product: { @@ -160,7 +146,7 @@ it('supports aliases of nested fields on subservices', async () => { // TODO after we remove GraphQLExtensions from ApolloServer, this can go away it('supports aliases when using ApolloServer', async () => { const gateway = new ApolloGateway({ - localServiceList: [accounts, books, inventory, product, reviews], + localServiceList: fixtures, buildService: service => { return new LocalGraphQLDataSource(buildFederatedSchema([service])); }, @@ -174,7 +160,7 @@ it('supports aliases when using ApolloServer', async () => { const { query } = createTestClient(server); const result = await query({ - query: gql` + query: `#graphql query GetProduct($upc: String!) { product(upc: $upc) { title: name diff --git a/packages/apollo-gateway/src/__tests__/integration/boolean.test.ts b/packages/apollo-gateway/src/__tests__/integration/boolean.test.ts index 4940aac4202..fd7d28a7827 100644 --- a/packages/apollo-gateway/src/__tests__/integration/boolean.test.ts +++ b/packages/apollo-gateway/src/__tests__/integration/boolean.test.ts @@ -1,11 +1,6 @@ -import gql from 'graphql-tag'; import { execute } from '../execution-utils'; -import * as accounts from '../__fixtures__/schemas/accounts'; -import * as books from '../__fixtures__/schemas/books'; -import * as inventory from '../__fixtures__/schemas/inventory'; -import * as product from '../__fixtures__/schemas/product'; -import * as reviews from '../__fixtures__/schemas/reviews'; +import { fixtures } from '../__fixtures__/schemas/'; import { astSerializer, queryPlanSerializer } from '../../snapshotSerializers'; @@ -16,7 +11,7 @@ expect.addSnapshotSerializer(queryPlanSerializer); // eventually we want to do this to prevent downstream fetches that aren't needed describe('@skip', () => { it('supports @skip when a boolean condition is met', async () => { - const query = gql` + const query = `#graphql query GetReviewers { topReviews { body @@ -27,12 +22,9 @@ describe('@skip', () => { } `; - const { data, errors, queryPlan } = await execute( - [accounts, books, inventory, product, reviews], - { - query, - }, - ); + const { data, queryPlan } = await execute(fixtures, { + query, + }); expect(data).toEqual({ topReviews: [ @@ -49,7 +41,7 @@ describe('@skip', () => { }); it('supports @skip when a boolean condition is met (variable driven)', async () => { - const query = gql` + const query = `#graphql query GetReviewers($skip: Boolean!) { topReviews { body @@ -61,13 +53,10 @@ describe('@skip', () => { `; const skip = true; - const { data, queryPlan } = await execute( - [accounts, books, inventory, product, reviews], - { - query, - variables: { skip }, - }, - ); + const { data, queryPlan } = await execute(fixtures, { + query, + variables: { skip }, + }); expect(data).toEqual({ topReviews: [ @@ -85,7 +74,7 @@ describe('@skip', () => { // Data looks good here, suspect the matcher is incorrect it('supports @skip when a boolean condition is not met', async () => { - const query = gql` + const query = `#graphql query GetReviewers { topReviews { body @@ -96,12 +85,9 @@ describe('@skip', () => { } `; - const { data, queryPlan } = await execute( - [accounts, books, inventory, product, reviews], - { - query, - }, - ); + const { data, queryPlan } = await execute(fixtures, { + query, + }); expect(data).toEqual({ topReviews: [ @@ -122,7 +108,7 @@ describe('@skip', () => { // Data looks good here, suspect the matcher is incorrect it('supports @skip when a boolean condition is not met (variable driven)', async () => { - const query = gql` + const query = `#graphql query GetReviewers($skip: Boolean!) { topReviews { body @@ -134,13 +120,10 @@ describe('@skip', () => { `; const skip = false; - const { data, queryPlan } = await execute( - [accounts, books, inventory, product, reviews], - { - query, - variables: { skip }, - }, - ); + const { data, queryPlan } = await execute(fixtures, { + query, + variables: { skip }, + }); expect(data).toEqual({ topReviews: [ @@ -162,7 +145,7 @@ describe('@skip', () => { describe('@include', () => { it('supports @include when a boolean condition is not met', async () => { - const query = gql` + const query = `#graphql query GetReviewers { topReviews { body @@ -173,12 +156,9 @@ describe('@include', () => { } `; - const { data, queryPlan } = await execute( - [accounts, books, inventory, product, reviews], - { - query, - }, - ); + const { data, queryPlan } = await execute(fixtures, { + query, + }); expect(data).toEqual({ topReviews: [ @@ -195,7 +175,7 @@ describe('@include', () => { }); it('supports @include when a boolean condition is not met (variable driven)', async () => { - const query = gql` + const query = `#graphql query GetReviewers($include: Boolean!) { topReviews { body @@ -207,13 +187,10 @@ describe('@include', () => { `; const include = false; - const { data, queryPlan } = await execute( - [accounts, books, inventory, product, reviews], - { - query, - variables: { include }, - }, - ); + const { data, queryPlan } = await execute(fixtures, { + query, + variables: { include }, + }); expect(data).toEqual({ topReviews: [ @@ -232,7 +209,7 @@ describe('@include', () => { // Data looks good here, suspect the matcher is incorrect // Added the query plan snapshot for a view. it('supports @include when a boolean condition is met', async () => { - const query = gql` + const query = `#graphql query GetReviewers { topReviews { body @@ -243,12 +220,9 @@ describe('@include', () => { } `; - const { data, queryPlan } = await execute( - [accounts, books, inventory, product, reviews], - { - query, - }, - ); + const { data, queryPlan } = await execute(fixtures, { + query, + }); expect(data).toEqual({ topReviews: [ @@ -270,7 +244,7 @@ describe('@include', () => { // Data looks good here, suspect the matcher is incorrect // Added the query plan snapshot for a view. it('supports @include when a boolean condition is met (variable driven)', async () => { - const query = gql` + const query = `#graphql query GetReviewers($include: Boolean!) { topReviews { body @@ -282,13 +256,10 @@ describe('@include', () => { `; const include = true; - const { data, queryPlan } = await execute( - [accounts, books, inventory, product, reviews], - { - query, - variables: { include }, - }, - ); + const { data, queryPlan } = await execute(fixtures, { + query, + variables: { include }, + }); expect(data).toEqual({ topReviews: [ diff --git a/packages/apollo-gateway/src/__tests__/integration/complex-key.test.ts b/packages/apollo-gateway/src/__tests__/integration/complex-key.test.ts index 22244ce61b5..f6d2f479e04 100644 --- a/packages/apollo-gateway/src/__tests__/integration/complex-key.test.ts +++ b/packages/apollo-gateway/src/__tests__/integration/complex-key.test.ts @@ -103,7 +103,7 @@ const userService: ServiceDefinitionModule = { }; it('works fetches data correctly with complex / nested @key fields', async () => { - const query = gql` + const query = `#graphql query Reviews { reviews { author { diff --git a/packages/apollo-gateway/src/__tests__/integration/custom-directives.test.ts b/packages/apollo-gateway/src/__tests__/integration/custom-directives.test.ts index 99c1fe370b1..13026a82536 100644 --- a/packages/apollo-gateway/src/__tests__/integration/custom-directives.test.ts +++ b/packages/apollo-gateway/src/__tests__/integration/custom-directives.test.ts @@ -1,11 +1,7 @@ import gql from 'graphql-tag'; import { execute } from '../execution-utils'; -import * as accounts from '../__fixtures__/schemas/accounts'; -import * as books from '../__fixtures__/schemas/books'; -import * as inventory from '../__fixtures__/schemas/inventory'; -import * as product from '../__fixtures__/schemas/product'; -import * as reviews from '../__fixtures__/schemas/reviews'; +import { fixtures } from '../__fixtures__/schemas/'; import { astSerializer, queryPlanSerializer } from '../../snapshotSerializers'; @@ -14,7 +10,7 @@ expect.addSnapshotSerializer(queryPlanSerializer); describe('custom executable directives', () => { it('successfully passes directives along in requests to an underlying service', async () => { - const query = gql` + const query = `#graphql query GetReviewers { topReviews { body @stream @@ -22,12 +18,9 @@ describe('custom executable directives', () => { } `; - const { errors, queryPlan } = await execute( - [accounts, books, inventory, product, reviews], - { - query, - }, - ); + const { errors, queryPlan } = await execute(fixtures, { + query, + }); expect(errors).toBeUndefined(); expect(queryPlan).toCallService('reviews'); @@ -45,7 +38,7 @@ describe('custom executable directives', () => { }); it('successfully passes directives and their variables along in requests to underlying services', async () => { - const query = gql` + const query = `#graphql query GetReviewers { topReviews { body @stream @@ -56,12 +49,9 @@ describe('custom executable directives', () => { } `; - const { errors, queryPlan } = await execute( - [accounts, books, inventory, product, reviews], - { - query, - }, - ); + const { errors, queryPlan } = await execute(fixtures, { + query, + }); expect(errors).toBeUndefined(); expect(queryPlan).toCallService('reviews'); @@ -108,7 +98,7 @@ describe('custom executable directives', () => { `, }; - const query = gql` + const query = `#graphql query GetReviewers { topReviews { body @stream @@ -117,7 +107,7 @@ describe('custom executable directives', () => { `; expect( - execute([accounts, books, inventory, product, reviews, invalidService], { + execute([...fixtures, invalidService], { query, }), ).rejects.toThrowErrorMatchingInlineSnapshot(` @@ -125,7 +115,7 @@ describe('custom executable directives', () => { [@transform] -> Custom directives must be implemented in every service. The following services do not implement the @transform directive: invalidService. -[@invalid] -> Custom directives must be implemented in every service. The following services do not implement the @invalid directive: accounts, books, inventory, product, reviews." +[@invalid] -> Custom directives must be implemented in every service. The following services do not implement the @invalid directive: accounts, books, documents, inventory, product, reviews." `); }); @@ -137,7 +127,7 @@ describe('custom executable directives', () => { `, }; - const query = gql` + const query = `#graphql query GetReviewers { topReviews { body @stream @@ -146,7 +136,7 @@ describe('custom executable directives', () => { `; expect( - execute([accounts, books, inventory, product, reviews, invalidService], { + execute([...fixtures, invalidService], { query, }), ).rejects.toThrowErrorMatchingInlineSnapshot(` @@ -155,6 +145,7 @@ describe('custom executable directives', () => { [@stream] -> custom directives must be defined identically across all services. See below for a list of current implementations: accounts: directive @stream on FIELD books: directive @stream on FIELD + documents: directive @stream on FIELD inventory: directive @stream on FIELD product: directive @stream on FIELD reviews: directive @stream on FIELD diff --git a/packages/apollo-gateway/src/__tests__/integration/execution-style.test.ts b/packages/apollo-gateway/src/__tests__/integration/execution-style.test.ts index 2bb9308559f..e48c84121c1 100644 --- a/packages/apollo-gateway/src/__tests__/integration/execution-style.test.ts +++ b/packages/apollo-gateway/src/__tests__/integration/execution-style.test.ts @@ -1,19 +1,10 @@ -import gql from 'graphql-tag'; -import { execute, overrideResolversInService } from '../execution-utils'; +import { execute } from '../execution-utils'; -import * as accounts from '../__fixtures__/schemas/accounts'; -import * as books from '../__fixtures__/schemas/books'; -import * as inventory from '../__fixtures__/schemas/inventory'; -import * as product from '../__fixtures__/schemas/product'; -import * as reviews from '../__fixtures__/schemas/reviews'; - -async function wait(amount: number): Promise { - return new Promise(r => setTimeout(r, amount)); -} +import { fixtures } from '../__fixtures__/schemas/'; describe('query', () => { it('supports parallel root fields', async () => { - const query = gql` + const query = `#graphql query GetUserAndReviews { me { username @@ -24,12 +15,9 @@ describe('query', () => { } `; - const { data, queryPlan } = await execute( - [accounts, books, inventory, product, reviews], - { - query, - }, - ); + const { data, queryPlan } = await execute(fixtures, { + query, + }); expect(data).toEqual({ me: { username: '@ada' }, diff --git a/packages/apollo-gateway/src/__tests__/integration/fragments.test.ts b/packages/apollo-gateway/src/__tests__/integration/fragments.test.ts index cbfaded3f0c..78615779b78 100644 --- a/packages/apollo-gateway/src/__tests__/integration/fragments.test.ts +++ b/packages/apollo-gateway/src/__tests__/integration/fragments.test.ts @@ -1,16 +1,12 @@ -import gql, { disableFragmentWarnings } from 'graphql-tag'; +import { disableFragmentWarnings } from 'graphql-tag'; import { execute } from '../execution-utils'; -import * as accounts from '../__fixtures__/schemas/accounts'; -import * as books from '../__fixtures__/schemas/books'; -import * as inventory from '../__fixtures__/schemas/inventory'; -import * as product from '../__fixtures__/schemas/product'; -import * as reviews from '../__fixtures__/schemas/reviews'; +import { fixtures } from '../__fixtures__/schemas/'; beforeAll(() => { disableFragmentWarnings(); }); it('supports inline fragments (one level)', async () => { - const query = gql` + const query = `#graphql query GetUser { me { ... on User { @@ -20,12 +16,9 @@ it('supports inline fragments (one level)', async () => { } `; - const { data, queryPlan } = await execute( - [accounts, books, inventory, product, reviews], - { - query, - }, - ); + const { data, queryPlan } = await execute(fixtures, { + query, + }); expect(data).toEqual({ me: { @@ -37,7 +30,7 @@ it('supports inline fragments (one level)', async () => { }); it('supports inline fragments (multi level)', async () => { - const query = gql` + const query = `#graphql query GetUser { me { ... on User { @@ -62,12 +55,9 @@ it('supports inline fragments (multi level)', async () => { } `; - const { data, queryPlan, errors } = await execute( - [accounts, books, inventory, product, reviews], - { - query, - }, - ); + const { data, queryPlan } = await execute(fixtures, { + query, + }); expect(data).toEqual({ me: { @@ -87,7 +77,7 @@ it('supports inline fragments (multi level)', async () => { }); it('supports named fragments (one level)', async () => { - const query = gql` + const query = `#graphql query GetUser { me { ...userDetails @@ -99,12 +89,9 @@ it('supports named fragments (one level)', async () => { } `; - const { data, queryPlan } = await execute( - [accounts, books, inventory, product, reviews], - { - query, - }, - ); + const { data, queryPlan } = await execute(fixtures, { + query, + }); expect(data).toEqual({ me: { @@ -116,7 +103,7 @@ it('supports named fragments (one level)', async () => { }); it('supports multiple named fragments (one level, mixed ordering)', async () => { - const query = gql` + const query = `#graphql fragment userInfo on User { name } @@ -132,12 +119,9 @@ it('supports multiple named fragments (one level, mixed ordering)', async () => } `; - const { data, queryPlan } = await execute( - [accounts, books, inventory, product, reviews], - { - query, - }, - ); + const { data, queryPlan } = await execute(fixtures, { + query, + }); expect(data).toEqual({ me: { @@ -150,7 +134,7 @@ it('supports multiple named fragments (one level, mixed ordering)', async () => }); it('supports multiple named fragments (multi level, mixed ordering)', async () => { - const query = gql` + const query = `#graphql fragment reviewDetails on Review { body } @@ -168,12 +152,9 @@ it('supports multiple named fragments (multi level, mixed ordering)', async () = } `; - const { data, queryPlan } = await execute( - [accounts, books, inventory, product, reviews], - { - query, - }, - ); + const { data, queryPlan } = await execute(fixtures, { + query, + }); expect(data).toEqual({ me: { @@ -190,7 +171,7 @@ it('supports multiple named fragments (multi level, mixed ordering)', async () = }); it('supports variables within fragments', async () => { - const query = gql` + const query = `#graphql query GetUser($format: Boolean) { me { ...userDetails @@ -206,13 +187,10 @@ it('supports variables within fragments', async () => { `; const format = true; - const { data, queryPlan } = await execute( - [accounts, books, inventory, product, reviews], - { - query, - variables: { format }, - }, - ); + const { data, queryPlan } = await execute(fixtures, { + query, + variables: { format }, + }); expect(data).toEqual({ me: { @@ -230,7 +208,7 @@ it('supports variables within fragments', async () => { }); it('supports root fragments', async () => { - const query = gql` + const query = `#graphql query GetUser { ... on Query { me { @@ -240,12 +218,9 @@ it('supports root fragments', async () => { } `; - const { data, queryPlan } = await execute( - [accounts, books, inventory, product, reviews], - { - query, - }, - ); + const { data, queryPlan } = await execute(fixtures, { + query, + }); expect(data).toEqual({ me: { diff --git a/packages/apollo-gateway/src/__tests__/integration/list-key.test.ts b/packages/apollo-gateway/src/__tests__/integration/list-key.test.ts index e0b38657987..efc6b72222a 100644 --- a/packages/apollo-gateway/src/__tests__/integration/list-key.test.ts +++ b/packages/apollo-gateway/src/__tests__/integration/list-key.test.ts @@ -69,7 +69,7 @@ const userService: ServiceDefinitionModule = { }; it('fetches data correctly list type @key fields', async () => { - const query = gql` + const query = `#graphql query Reviews { reviews { body diff --git a/packages/apollo-gateway/src/__tests__/integration/merge-arrays.test.ts b/packages/apollo-gateway/src/__tests__/integration/merge-arrays.test.ts index bbf668c9790..d7b489c4025 100644 --- a/packages/apollo-gateway/src/__tests__/integration/merge-arrays.test.ts +++ b/packages/apollo-gateway/src/__tests__/integration/merge-arrays.test.ts @@ -1,19 +1,9 @@ -import gql from 'graphql-tag'; -import { execute, overrideResolversInService } from '../execution-utils'; - -import * as accounts from '../__fixtures__/schemas/accounts'; -import * as books from '../__fixtures__/schemas/books'; -import * as inventory from '../__fixtures__/schemas/inventory'; -import * as product from '../__fixtures__/schemas/product'; -import * as reviews from '../__fixtures__/schemas/reviews'; - -async function wait(amount: number): Promise { - return new Promise(r => setTimeout(r, amount)); -} +import { execute } from '../execution-utils'; +import { fixtures } from '../__fixtures__/schemas/'; describe('query', () => { it('supports arrays', async () => { - const query = gql` + const query = `#graphql query MergeArrays { me { # goodAddress @@ -25,12 +15,9 @@ describe('query', () => { } `; - const { data, queryPlan } = await execute( - [accounts, books, inventory, product, reviews], - { - query, - }, - ); + const { data, queryPlan } = await execute(fixtures, { + query, + }); expect(data).toEqual({ me: { diff --git a/packages/apollo-gateway/src/__tests__/integration/multiple-key.test.ts b/packages/apollo-gateway/src/__tests__/integration/multiple-key.test.ts index 64bfdca9472..5c3736ba22c 100644 --- a/packages/apollo-gateway/src/__tests__/integration/multiple-key.test.ts +++ b/packages/apollo-gateway/src/__tests__/integration/multiple-key.test.ts @@ -115,7 +115,7 @@ const userService: ServiceDefinitionModule = { }; it('fetches data correctly with multiple @key fields', async () => { - const query = gql` + const query = `#graphql query { reviews { body @@ -220,7 +220,7 @@ it('fetches data correctly with multiple @key fields', async () => { }); it('fetches keys as needed to reduce round trip queries', async () => { - const query = gql` + const query = `#graphql query { users { risk diff --git a/packages/apollo-gateway/src/__tests__/integration/mutations.test.ts b/packages/apollo-gateway/src/__tests__/integration/mutations.test.ts index 880ac00970e..ec8c9f34c06 100644 --- a/packages/apollo-gateway/src/__tests__/integration/mutations.test.ts +++ b/packages/apollo-gateway/src/__tests__/integration/mutations.test.ts @@ -1,11 +1,5 @@ -import gql from 'graphql-tag'; import { execute } from '../execution-utils'; - -import * as accounts from '../__fixtures__/schemas/accounts'; -import * as books from '../__fixtures__/schemas/books'; -import * as inventory from '../__fixtures__/schemas/inventory'; -import * as product from '../__fixtures__/schemas/product'; -import * as reviews from '../__fixtures__/schemas/reviews'; +import { fixtures, reviews, accounts } from '../__fixtures__/schemas/'; import { astSerializer, queryPlanSerializer } from '../../snapshotSerializers'; @@ -17,7 +11,7 @@ function spyOnResolver(resolverMap: any, resolverName: T) { } it('supports mutations', async () => { - const query = gql` + const query = `#graphql mutation Login($username: String!, $password: String!) { login(username: $username, password: $password) { reviews { @@ -30,13 +24,10 @@ it('supports mutations', async () => { `; const variables = { username: '@complete', password: 'css_completes_me' }; - const { data, errors, queryPlan } = await execute( - [accounts, books, inventory, product, reviews], - { - query, - variables, - }, - ); + const { data, queryPlan } = await execute(fixtures, { + query, + variables, + }); expect(data).toEqual({ login: { @@ -55,7 +46,7 @@ it('supports mutations', async () => { }); it('returning across service boundaries', async () => { - const query = gql` + const query = `#graphql mutation Review($upc: String!, $body: String!) { reviewProduct(upc: $upc, body: $body) { ... on Furniture { @@ -66,13 +57,10 @@ it('returning across service boundaries', async () => { `; const variables = { upc: '1', body: 'A great table' }; - const { data, errors, queryPlan } = await execute( - [accounts, books, inventory, product, reviews], - { - query, - variables, - }, - ); + const { data, queryPlan } = await execute(fixtures, { + query, + variables, + }); expect(data).toEqual({ reviewProduct: { @@ -91,7 +79,7 @@ it('multiple root mutations', async () => { 'reviewProduct', ); - const query = gql` + const query = `#graphql mutation LoginAndReview( $username: String! $password: String! @@ -119,13 +107,10 @@ it('multiple root mutations', async () => { upc: '1', body: 'A great table.', }; - const { data, queryPlan } = await execute( - [accounts, books, inventory, product, reviews], - { - query, - variables, - }, - ); + const { data, queryPlan } = await execute(fixtures, { + query, + variables, + }); expect(data).toEqual({ login: { @@ -155,7 +140,7 @@ it('multiple root mutations with correct service order', async () => { const updateReview = spyOnResolver(reviewsMutations, 'updateReview'); const deleteReview = spyOnResolver(reviewsMutations, 'deleteReview'); - const query = gql` + const query = `#graphql mutation LoginAndReview( $upc: String! $body: String! @@ -195,13 +180,10 @@ it('multiple root mutations with correct service order', async () => { password: 'css_completes_me', reviewId: '6', }; - const { data, queryPlan } = await execute( - [accounts, books, inventory, product, reviews], - { - query, - variables, - }, - ); + const { data, queryPlan } = await execute(fixtures, { + query, + variables, + }); expect(data).toEqual({ deleteReview: true, diff --git a/packages/apollo-gateway/src/__tests__/integration/provides.test.ts b/packages/apollo-gateway/src/__tests__/integration/provides.test.ts index 3370a3d7036..6b1a083da83 100644 --- a/packages/apollo-gateway/src/__tests__/integration/provides.test.ts +++ b/packages/apollo-gateway/src/__tests__/integration/provides.test.ts @@ -1,14 +1,8 @@ -import gql from 'graphql-tag'; import { execute, overrideResolversInService } from '../execution-utils'; - -import * as accounts from '../__fixtures__/schemas/accounts'; -import * as books from '../__fixtures__/schemas/books'; -import * as inventory from '../__fixtures__/schemas/inventory'; -import * as product from '../__fixtures__/schemas/product'; -import * as reviews from '../__fixtures__/schemas/reviews'; +import { fixtures } from '../__fixtures__/schemas/'; it('does not have to go to another service when field is given', async () => { - const query = gql` + const query = `#graphql query GetReviewers { topReviews { author { @@ -18,12 +12,9 @@ it('does not have to go to another service when field is given', async () => { } `; - const { data, queryPlan } = await execute( - [accounts, books, inventory, product, reviews], - { - query, - }, - ); + const { data, queryPlan } = await execute(fixtures, { + query, + }); expect(data).toEqual({ topReviews: [ @@ -40,6 +31,8 @@ it('does not have to go to another service when field is given', async () => { }); it('does not load fields provided even when going to other service', async () => { + const [accounts, ...restFixtures] = fixtures; + const username = jest.fn(); const localAccounts = overrideResolversInService(accounts, { User: { @@ -47,7 +40,7 @@ it('does not load fields provided even when going to other service', async () => }, }); - const query = gql` + const query = `#graphql query GetReviewers { topReviews { author { @@ -58,12 +51,9 @@ it('does not load fields provided even when going to other service', async () => } `; - const { data, queryPlan } = await execute( - [localAccounts, books, inventory, product, reviews], - { - query, - }, - ); + const { data, queryPlan } = await execute([localAccounts, ...restFixtures], { + query, + }); expect(data).toEqual({ topReviews: [ diff --git a/packages/apollo-gateway/src/__tests__/integration/requires.test.ts b/packages/apollo-gateway/src/__tests__/integration/requires.test.ts index c45ce25fd1a..e47ed5dd148 100644 --- a/packages/apollo-gateway/src/__tests__/integration/requires.test.ts +++ b/packages/apollo-gateway/src/__tests__/integration/requires.test.ts @@ -1,13 +1,8 @@ -import gql from 'graphql-tag'; import { execute } from '../execution-utils'; -import * as accounts from '../__fixtures__/schemas/accounts'; -import * as books from '../__fixtures__/schemas/books'; -import * as inventory from '../__fixtures__/schemas/inventory'; -import * as product from '../__fixtures__/schemas/product'; -import * as reviews from '../__fixtures__/schemas/reviews'; +import { fixtures } from '../__fixtures__/schemas/'; it('supports passing additional fields defined by a requires', async () => { - const query = gql` + const query = `#graphql query GetReviwedBookNames { me { reviews { @@ -21,12 +16,9 @@ it('supports passing additional fields defined by a requires', async () => { } `; - const { data, queryPlan } = await execute( - [accounts, books, inventory, product, reviews], - { - query, - }, - ); + const { data, queryPlan } = await execute(fixtures, { + query, + }); expect(data).toEqual({ me: { diff --git a/packages/apollo-gateway/src/__tests__/integration/single-service.test.ts b/packages/apollo-gateway/src/__tests__/integration/single-service.test.ts index 48b3c34e219..d81883c8f82 100644 --- a/packages/apollo-gateway/src/__tests__/integration/single-service.test.ts +++ b/packages/apollo-gateway/src/__tests__/integration/single-service.test.ts @@ -29,7 +29,7 @@ it('executes a query plan over concrete types', async () => { Query: { me }, }); - const query = gql` + const query = `#graphql query GetUser { me { id @@ -88,7 +88,7 @@ it('does not remove __typename if that is all that is requested on a value type' Query: { me }, }); - const query = gql` + const query = `#graphql query GetUser { me { account { diff --git a/packages/apollo-gateway/src/__tests__/integration/unions.test.ts b/packages/apollo-gateway/src/__tests__/integration/unions.test.ts index 9eb9d88d51b..8a6e1e0f067 100644 --- a/packages/apollo-gateway/src/__tests__/integration/unions.test.ts +++ b/packages/apollo-gateway/src/__tests__/integration/unions.test.ts @@ -6,7 +6,7 @@ expect.addSnapshotSerializer(astSerializer); expect.addSnapshotSerializer(queryPlanSerializer); it('handles multiple union type conditions that share a response name (media)', async () => { - const query = gql` + const query = `#graphql query { content { ...Audio diff --git a/packages/apollo-gateway/src/__tests__/integration/value-types.test.ts b/packages/apollo-gateway/src/__tests__/integration/value-types.test.ts index 725dad6e343..8f5297551c6 100644 --- a/packages/apollo-gateway/src/__tests__/integration/value-types.test.ts +++ b/packages/apollo-gateway/src/__tests__/integration/value-types.test.ts @@ -1,12 +1,6 @@ import gql from 'graphql-tag'; import { execute } from '../execution-utils'; - -import * as accounts from '../__fixtures__/schemas/accounts'; -import * as books from '../__fixtures__/schemas/books'; -import * as inventory from '../__fixtures__/schemas/inventory'; -import * as product from '../__fixtures__/schemas/product'; -import * as reviews from '../__fixtures__/schemas/reviews'; - +import { fixtures } from '../__fixtures__/schemas/'; import { astSerializer, queryPlanSerializer } from '../../snapshotSerializers'; expect.addSnapshotSerializer(astSerializer); @@ -14,7 +8,7 @@ expect.addSnapshotSerializer(queryPlanSerializer); describe('value types', () => { it('resolves value types within their respective services', async () => { - const query = gql` + const query = `#graphql fragment Metadata on MetadataOrError { ... on KeyValue { key @@ -48,12 +42,9 @@ describe('value types', () => { } `; - const { data, errors, queryPlan } = await execute( - [accounts, books, inventory, product, reviews], - { - query, - }, - ); + const { data, errors, queryPlan } = await execute(fixtures, { + query, + }); expect(errors).toBeUndefined(); @@ -272,7 +263,7 @@ describe('value types', () => { }, }; - const query = gql` + const query = `#graphql query Hello { valueType { id diff --git a/packages/apollo-gateway/src/__tests__/integration/variables.test.ts b/packages/apollo-gateway/src/__tests__/integration/variables.test.ts index 186db2c5493..21a794d1c21 100644 --- a/packages/apollo-gateway/src/__tests__/integration/variables.test.ts +++ b/packages/apollo-gateway/src/__tests__/integration/variables.test.ts @@ -1,14 +1,8 @@ -import gql from 'graphql-tag'; import { execute } from '../execution-utils'; - -import * as accounts from '../__fixtures__/schemas/accounts'; -import * as books from '../__fixtures__/schemas/books'; -import * as inventory from '../__fixtures__/schemas/inventory'; -import * as product from '../__fixtures__/schemas/product'; -import * as reviews from '../__fixtures__/schemas/reviews'; +import { fixtures } from '../__fixtures__/schemas/'; it('passes variables to root fields', async () => { - const query = gql` + const query = `#graphql query GetProduct($upc: String!) { product(upc: $upc) { name @@ -17,13 +11,10 @@ it('passes variables to root fields', async () => { `; const upc = '1'; - const { data, errors, queryPlan } = await execute( - [accounts, books, inventory, product, reviews], - { - query, - variables: { upc }, - }, - ); + const { data, errors, queryPlan } = await execute(fixtures, { + query, + variables: { upc }, + }); expect(errors).toBeUndefined(); expect(data).toEqual({ @@ -36,7 +27,7 @@ it('passes variables to root fields', async () => { }); it('supports default variables in a variable definition', async () => { - const query = gql` + const query = `#graphql query GetProduct($upc: String = "1") { product(upc: $upc) { name @@ -44,12 +35,9 @@ it('supports default variables in a variable definition', async () => { } `; - const { data, errors, queryPlan } = await execute( - [accounts, books, inventory, product, reviews], - { - query, - }, - ); + const { data, errors, queryPlan } = await execute(fixtures, { + query, + }); expect(errors).toBeUndefined(); expect(data).toEqual({ @@ -62,7 +50,7 @@ it('supports default variables in a variable definition', async () => { }); it('passes variables to nested services', async () => { - const query = gql` + const query = `#graphql query GetProductsForUser($format: Boolean) { me { reviews { @@ -73,13 +61,10 @@ it('passes variables to nested services', async () => { `; const format = true; - const { data, errors, queryPlan } = await execute( - [accounts, books, inventory, product, reviews], - { - query, - variables: { format }, - }, - ); + const { data, errors, queryPlan } = await execute(fixtures, { + query, + variables: { format }, + }); expect(errors).toBeUndefined(); expect(data).toEqual({ @@ -99,7 +84,7 @@ it('passes variables to nested services', async () => { }); it('works with default variables in the schema', async () => { - const query = gql` + const query = `#graphql query LibraryUser($libraryId: ID!, $userId: ID) { library(id: $libraryId) { userAccount(id: $userId) { @@ -110,10 +95,10 @@ it('works with default variables in the schema', async () => { } `; - const { data, queryPlan, errors } = await execute( - [accounts, books, inventory, product, reviews], - { query, variables: { libraryId: '1' } }, - ); + const { data, queryPlan, errors } = await execute(fixtures, { + query, + variables: { libraryId: '1' }, + }); expect(data).toEqual({ library: { From 984e748d47719d1aeba02aed32c6d3e5c2300fec Mon Sep 17 00:00:00 2001 From: Trevor Scheer Date: Fri, 15 May 2020 17:22:34 -0700 Subject: [PATCH 576/642] Simplify execute testing util API cc @abernix --- .../src/__tests__/execution-utils.ts | 7 +- .../integration/abstract-types.test.ts | 77 ++++++++----------- .../src/__tests__/integration/aliases.test.ts | 6 +- .../src/__tests__/integration/boolean.test.ts | 19 ++--- .../__tests__/integration/complex-key.test.ts | 9 ++- .../integration/custom-directives.test.ts | 22 ++++-- .../integration/execution-style.test.ts | 4 +- .../__tests__/integration/fragments.test.ts | 15 ++-- .../__tests__/integration/list-key.test.ts | 9 ++- .../integration/merge-arrays.test.ts | 3 +- .../integration/multiple-key.test.ts | 4 +- .../__tests__/integration/mutations.test.ts | 10 +-- .../__tests__/integration/provides.test.ts | 11 ++- .../__tests__/integration/requires.test.ts | 3 +- .../integration/single-service.test.ts | 40 ++++++---- .../src/__tests__/integration/unions.test.ts | 2 +- .../__tests__/integration/value-types.test.ts | 5 +- .../__tests__/integration/variables.test.ts | 9 +-- 18 files changed, 131 insertions(+), 124 deletions(-) diff --git a/packages/apollo-gateway/src/__tests__/execution-utils.ts b/packages/apollo-gateway/src/__tests__/execution-utils.ts index 564309bf7ff..92ff6102c13 100644 --- a/packages/apollo-gateway/src/__tests__/execution-utils.ts +++ b/packages/apollo-gateway/src/__tests__/execution-utils.ts @@ -23,6 +23,7 @@ import { mergeDeep } from 'apollo-utilities'; import queryPlanSerializer from '../snapshotSerializers/queryPlanSerializer'; import astSerializer from '../snapshotSerializers/astSerializer'; import gql from 'graphql-tag'; +import { fixtures } from './__fixtures__/schemas'; const prettyFormat = require('pretty-format'); export type ServiceDefinitionModule = ServiceDefinition & GraphQLSchemaModule; @@ -39,9 +40,9 @@ export function overrideResolversInService( } export async function execute( - services: ServiceDefinitionModule[], request: GraphQLRequest, - logger?: Logger, + services: ServiceDefinitionModule[] = fixtures, + logger: Logger = console, ): Promise { let schema: GraphQLSchema; const serviceMap = Object.fromEntries( @@ -78,7 +79,7 @@ export async function execute( cache: undefined as any, context: {}, request, - logger: logger || console + logger }, operationContext, ); diff --git a/packages/apollo-gateway/src/__tests__/integration/abstract-types.test.ts b/packages/apollo-gateway/src/__tests__/integration/abstract-types.test.ts index 980016bb79a..2bad0c2710d 100644 --- a/packages/apollo-gateway/src/__tests__/integration/abstract-types.test.ts +++ b/packages/apollo-gateway/src/__tests__/integration/abstract-types.test.ts @@ -1,6 +1,5 @@ import gql from 'graphql-tag'; import { execute } from '../execution-utils'; -import { fixtures } from '../__fixtures__/schemas/'; import { astSerializer, queryPlanSerializer } from '../../snapshotSerializers'; @@ -19,7 +18,7 @@ it('handles an abstract type from the base service', async () => { `; const upc = '1'; - const { data, queryPlan } = await execute(fixtures, { + const { data, queryPlan } = await execute({ query, variables: { upc }, }); @@ -105,13 +104,10 @@ it('can request fields on extended interfaces', async () => { const upc = '1'; - const { data, queryPlan } = await execute( - fixtures, - { - query, - variables: { upc }, - }, - ); + const { data, queryPlan } = await execute({ + query, + variables: { upc }, + }); expect(data).toEqual({ product: { inStock: true } }); expect(queryPlan).toCallService('product'); @@ -174,13 +170,10 @@ it('can request fields on extended types that implement an interface', async () `; const upc = '1'; - const { data, queryPlan } = await execute( - fixtures, - { - query, - variables: { upc }, - }, - ); + const { data, queryPlan } = await execute({ + query, + variables: { upc }, + }); expect(data).toEqual({ product: { inStock: true, isHeavy: false } }); expect(queryPlan).toCallService('product'); @@ -247,7 +240,7 @@ it('prunes unfilled type conditions', async () => { `; const upc = '1'; - const { data, queryPlan } = await execute(fixtures, { + const { data, queryPlan } = await execute({ query, variables: { upc }, }); @@ -318,7 +311,7 @@ it('fetches interfaces returned from other services', async () => { } `; - const { data, queryPlan } = await execute(fixtures, { + const { data, queryPlan } = await execute({ query, }); @@ -433,7 +426,7 @@ it('fetches composite fields from a foreign type casted to an interface [@provid } `; - const { data, queryPlan } = await execute(fixtures, { + const { data, queryPlan } = await execute({ query, }); @@ -566,7 +559,7 @@ it('allows for extending an interface from another service with fields', async ( `; const upc = '1'; - const { data, queryPlan } = await execute(fixtures, { + const { data, queryPlan } = await execute({ query, variables: { upc }, }); @@ -652,7 +645,7 @@ describe('unions', () => { } `; - const { data, queryPlan } = await execute(fixtures, { + const { data, queryPlan } = await execute({ query, }); @@ -757,31 +750,28 @@ describe('unions', () => { } `; - const { queryPlan, errors } = await execute( - [ - { - name: 'products', - typeDefs: gql` - extend type Query { - topProducts: [Product] - } + const { queryPlan, errors } = await execute({ query }, [ + { + name: 'products', + typeDefs: gql` + extend type Query { + topProducts: [Product] + } - interface Product { - name: String - } + interface Product { + name: String + } - type Shoe implements Product { - name: String - } + type Shoe implements Product { + name: String + } - type Car implements Product { - name: String - } - `, - }, - ], - { query }, - ); + type Car implements Product { + name: String + } + `, + }, + ]); expect(errors).toBeUndefined(); expect(queryPlan).toMatchInlineSnapshot(` @@ -819,7 +809,6 @@ describe('unions', () => { // `; // const { data, queryPlan } = await execute( - // fixtures, // { // query, // }, diff --git a/packages/apollo-gateway/src/__tests__/integration/aliases.test.ts b/packages/apollo-gateway/src/__tests__/integration/aliases.test.ts index f8e1da6a827..35480636482 100644 --- a/packages/apollo-gateway/src/__tests__/integration/aliases.test.ts +++ b/packages/apollo-gateway/src/__tests__/integration/aliases.test.ts @@ -20,7 +20,7 @@ it('supports simple aliases', async () => { `; const upc = '1'; - const { data, queryPlan } = await execute(fixtures, { + const { data, queryPlan } = await execute({ query, variables: { upc }, }); @@ -52,7 +52,7 @@ it('supports aliases of root fields on subservices', async () => { `; const upc = '1'; - const { data, queryPlan } = await execute(fixtures, { + const { data, queryPlan } = await execute({ query, variables: { upc }, }); @@ -104,7 +104,7 @@ it('supports aliases of nested fields on subservices', async () => { `; const upc = '1'; - const { data, queryPlan } = await execute(fixtures, { + const { data, queryPlan } = await execute({ query, variables: { upc }, }); diff --git a/packages/apollo-gateway/src/__tests__/integration/boolean.test.ts b/packages/apollo-gateway/src/__tests__/integration/boolean.test.ts index fd7d28a7827..08cdab71231 100644 --- a/packages/apollo-gateway/src/__tests__/integration/boolean.test.ts +++ b/packages/apollo-gateway/src/__tests__/integration/boolean.test.ts @@ -1,7 +1,4 @@ import { execute } from '../execution-utils'; - -import { fixtures } from '../__fixtures__/schemas/'; - import { astSerializer, queryPlanSerializer } from '../../snapshotSerializers'; expect.addSnapshotSerializer(astSerializer); @@ -22,7 +19,7 @@ describe('@skip', () => { } `; - const { data, queryPlan } = await execute(fixtures, { + const { data, queryPlan } = await execute({ query, }); @@ -53,7 +50,7 @@ describe('@skip', () => { `; const skip = true; - const { data, queryPlan } = await execute(fixtures, { + const { data, queryPlan } = await execute({ query, variables: { skip }, }); @@ -85,7 +82,7 @@ describe('@skip', () => { } `; - const { data, queryPlan } = await execute(fixtures, { + const { data, queryPlan } = await execute({ query, }); @@ -120,7 +117,7 @@ describe('@skip', () => { `; const skip = false; - const { data, queryPlan } = await execute(fixtures, { + const { data, queryPlan } = await execute({ query, variables: { skip }, }); @@ -156,7 +153,7 @@ describe('@include', () => { } `; - const { data, queryPlan } = await execute(fixtures, { + const { data, queryPlan } = await execute({ query, }); @@ -187,7 +184,7 @@ describe('@include', () => { `; const include = false; - const { data, queryPlan } = await execute(fixtures, { + const { data, queryPlan } = await execute({ query, variables: { include }, }); @@ -220,7 +217,7 @@ describe('@include', () => { } `; - const { data, queryPlan } = await execute(fixtures, { + const { data, queryPlan } = await execute({ query, }); @@ -256,7 +253,7 @@ describe('@include', () => { `; const include = true; - const { data, queryPlan } = await execute(fixtures, { + const { data, queryPlan } = await execute({ query, variables: { include }, }); diff --git a/packages/apollo-gateway/src/__tests__/integration/complex-key.test.ts b/packages/apollo-gateway/src/__tests__/integration/complex-key.test.ts index f6d2f479e04..01fee705894 100644 --- a/packages/apollo-gateway/src/__tests__/integration/complex-key.test.ts +++ b/packages/apollo-gateway/src/__tests__/integration/complex-key.test.ts @@ -116,9 +116,12 @@ it('works fetches data correctly with complex / nested @key fields', async () => } `; - const { data, queryPlan } = await execute([userService, reviewService], { - query, - }); + const { data, queryPlan } = await execute( + { + query, + }, + [userService, reviewService], + ); expect(data).toEqual({ reviews: [ diff --git a/packages/apollo-gateway/src/__tests__/integration/custom-directives.test.ts b/packages/apollo-gateway/src/__tests__/integration/custom-directives.test.ts index 13026a82536..3797c75c5c8 100644 --- a/packages/apollo-gateway/src/__tests__/integration/custom-directives.test.ts +++ b/packages/apollo-gateway/src/__tests__/integration/custom-directives.test.ts @@ -18,7 +18,7 @@ describe('custom executable directives', () => { } `; - const { errors, queryPlan } = await execute(fixtures, { + const { errors, queryPlan } = await execute( { query, }); @@ -49,7 +49,7 @@ describe('custom executable directives', () => { } `; - const { errors, queryPlan } = await execute(fixtures, { + const { errors, queryPlan } = await execute( { query, }); @@ -107,9 +107,12 @@ describe('custom executable directives', () => { `; expect( - execute([...fixtures, invalidService], { - query, - }), + execute( + { + query, + }, + [...fixtures, invalidService], + ), ).rejects.toThrowErrorMatchingInlineSnapshot(` "[@stream] -> Custom directives must be implemented in every service. The following services do not implement the @stream directive: invalidService. @@ -136,9 +139,12 @@ describe('custom executable directives', () => { `; expect( - execute([...fixtures, invalidService], { - query, - }), + execute( + { + query, + }, + [...fixtures, invalidService], + ), ).rejects.toThrowErrorMatchingInlineSnapshot(` "[@transform] -> Custom directives must be implemented in every service. The following services do not implement the @transform directive: invalid. diff --git a/packages/apollo-gateway/src/__tests__/integration/execution-style.test.ts b/packages/apollo-gateway/src/__tests__/integration/execution-style.test.ts index e48c84121c1..30a1088ac34 100644 --- a/packages/apollo-gateway/src/__tests__/integration/execution-style.test.ts +++ b/packages/apollo-gateway/src/__tests__/integration/execution-style.test.ts @@ -1,7 +1,5 @@ import { execute } from '../execution-utils'; -import { fixtures } from '../__fixtures__/schemas/'; - describe('query', () => { it('supports parallel root fields', async () => { const query = `#graphql @@ -15,7 +13,7 @@ describe('query', () => { } `; - const { data, queryPlan } = await execute(fixtures, { + const { data, queryPlan } = await execute({ query, }); diff --git a/packages/apollo-gateway/src/__tests__/integration/fragments.test.ts b/packages/apollo-gateway/src/__tests__/integration/fragments.test.ts index 78615779b78..7fd265b6591 100644 --- a/packages/apollo-gateway/src/__tests__/integration/fragments.test.ts +++ b/packages/apollo-gateway/src/__tests__/integration/fragments.test.ts @@ -1,6 +1,5 @@ import { disableFragmentWarnings } from 'graphql-tag'; import { execute } from '../execution-utils'; -import { fixtures } from '../__fixtures__/schemas/'; beforeAll(() => { disableFragmentWarnings(); @@ -16,7 +15,7 @@ it('supports inline fragments (one level)', async () => { } `; - const { data, queryPlan } = await execute(fixtures, { + const { data, queryPlan } = await execute({ query, }); @@ -55,7 +54,7 @@ it('supports inline fragments (multi level)', async () => { } `; - const { data, queryPlan } = await execute(fixtures, { + const { data, queryPlan } = await execute({ query, }); @@ -89,7 +88,7 @@ it('supports named fragments (one level)', async () => { } `; - const { data, queryPlan } = await execute(fixtures, { + const { data, queryPlan } = await execute({ query, }); @@ -119,7 +118,7 @@ it('supports multiple named fragments (one level, mixed ordering)', async () => } `; - const { data, queryPlan } = await execute(fixtures, { + const { data, queryPlan } = await execute({ query, }); @@ -152,7 +151,7 @@ it('supports multiple named fragments (multi level, mixed ordering)', async () = } `; - const { data, queryPlan } = await execute(fixtures, { + const { data, queryPlan } = await execute({ query, }); @@ -187,7 +186,7 @@ it('supports variables within fragments', async () => { `; const format = true; - const { data, queryPlan } = await execute(fixtures, { + const { data, queryPlan } = await execute({ query, variables: { format }, }); @@ -218,7 +217,7 @@ it('supports root fragments', async () => { } `; - const { data, queryPlan } = await execute(fixtures, { + const { data, queryPlan } = await execute({ query, }); diff --git a/packages/apollo-gateway/src/__tests__/integration/list-key.test.ts b/packages/apollo-gateway/src/__tests__/integration/list-key.test.ts index efc6b72222a..1573ecd99fe 100644 --- a/packages/apollo-gateway/src/__tests__/integration/list-key.test.ts +++ b/packages/apollo-gateway/src/__tests__/integration/list-key.test.ts @@ -80,9 +80,12 @@ it('fetches data correctly list type @key fields', async () => { } `; - const { data, queryPlan } = await execute([userService, reviewService], { - query, - }); + const { data, queryPlan } = await execute( + { + query, + }, + [userService, reviewService], + ); expect(data).toEqual({ reviews: [ diff --git a/packages/apollo-gateway/src/__tests__/integration/merge-arrays.test.ts b/packages/apollo-gateway/src/__tests__/integration/merge-arrays.test.ts index d7b489c4025..2748b0d5753 100644 --- a/packages/apollo-gateway/src/__tests__/integration/merge-arrays.test.ts +++ b/packages/apollo-gateway/src/__tests__/integration/merge-arrays.test.ts @@ -1,5 +1,4 @@ import { execute } from '../execution-utils'; -import { fixtures } from '../__fixtures__/schemas/'; describe('query', () => { it('supports arrays', async () => { @@ -15,7 +14,7 @@ describe('query', () => { } `; - const { data, queryPlan } = await execute(fixtures, { + const { data, queryPlan } = await execute({ query, }); diff --git a/packages/apollo-gateway/src/__tests__/integration/multiple-key.test.ts b/packages/apollo-gateway/src/__tests__/integration/multiple-key.test.ts index 5c3736ba22c..60450252d46 100644 --- a/packages/apollo-gateway/src/__tests__/integration/multiple-key.test.ts +++ b/packages/apollo-gateway/src/__tests__/integration/multiple-key.test.ts @@ -128,10 +128,10 @@ it('fetches data correctly with multiple @key fields', async () => { `; const { data, queryPlan, errors } = await execute( - [userService, reviewService, actuaryService], { query, }, + [userService, reviewService, actuaryService], ); expect(errors).toBeFalsy(); @@ -232,10 +232,10 @@ it('fetches keys as needed to reduce round trip queries', async () => { `; const { data, queryPlan, errors } = await execute( - [userService, reviewService, actuaryService], { query, }, + [userService, reviewService, actuaryService] ); expect(errors).toBeFalsy(); diff --git a/packages/apollo-gateway/src/__tests__/integration/mutations.test.ts b/packages/apollo-gateway/src/__tests__/integration/mutations.test.ts index ec8c9f34c06..7544f131a7c 100644 --- a/packages/apollo-gateway/src/__tests__/integration/mutations.test.ts +++ b/packages/apollo-gateway/src/__tests__/integration/mutations.test.ts @@ -1,5 +1,5 @@ import { execute } from '../execution-utils'; -import { fixtures, reviews, accounts } from '../__fixtures__/schemas/'; +import { reviews, accounts } from '../__fixtures__/schemas/'; import { astSerializer, queryPlanSerializer } from '../../snapshotSerializers'; @@ -24,7 +24,7 @@ it('supports mutations', async () => { `; const variables = { username: '@complete', password: 'css_completes_me' }; - const { data, queryPlan } = await execute(fixtures, { + const { data, queryPlan } = await execute({ query, variables, }); @@ -57,7 +57,7 @@ it('returning across service boundaries', async () => { `; const variables = { upc: '1', body: 'A great table' }; - const { data, queryPlan } = await execute(fixtures, { + const { data, queryPlan } = await execute({ query, variables, }); @@ -107,7 +107,7 @@ it('multiple root mutations', async () => { upc: '1', body: 'A great table.', }; - const { data, queryPlan } = await execute(fixtures, { + const { data, queryPlan } = await execute({ query, variables, }); @@ -180,7 +180,7 @@ it('multiple root mutations with correct service order', async () => { password: 'css_completes_me', reviewId: '6', }; - const { data, queryPlan } = await execute(fixtures, { + const { data, queryPlan } = await execute({ query, variables, }); diff --git a/packages/apollo-gateway/src/__tests__/integration/provides.test.ts b/packages/apollo-gateway/src/__tests__/integration/provides.test.ts index 6b1a083da83..c6dda3ed1c8 100644 --- a/packages/apollo-gateway/src/__tests__/integration/provides.test.ts +++ b/packages/apollo-gateway/src/__tests__/integration/provides.test.ts @@ -12,7 +12,7 @@ it('does not have to go to another service when field is given', async () => { } `; - const { data, queryPlan } = await execute(fixtures, { + const { data, queryPlan } = await execute( { query, }); @@ -51,9 +51,12 @@ it('does not load fields provided even when going to other service', async () => } `; - const { data, queryPlan } = await execute([localAccounts, ...restFixtures], { - query, - }); + const { data, queryPlan } = await execute( + { + query, + }, + [localAccounts, ...restFixtures], + ); expect(data).toEqual({ topReviews: [ diff --git a/packages/apollo-gateway/src/__tests__/integration/requires.test.ts b/packages/apollo-gateway/src/__tests__/integration/requires.test.ts index e47ed5dd148..ae1e96e1d81 100644 --- a/packages/apollo-gateway/src/__tests__/integration/requires.test.ts +++ b/packages/apollo-gateway/src/__tests__/integration/requires.test.ts @@ -1,5 +1,4 @@ import { execute } from '../execution-utils'; -import { fixtures } from '../__fixtures__/schemas/'; it('supports passing additional fields defined by a requires', async () => { const query = `#graphql @@ -16,7 +15,7 @@ it('supports passing additional fields defined by a requires', async () => { } `; - const { data, queryPlan } = await execute(fixtures, { + const { data, queryPlan } = await execute({ query, }); diff --git a/packages/apollo-gateway/src/__tests__/integration/single-service.test.ts b/packages/apollo-gateway/src/__tests__/integration/single-service.test.ts index d81883c8f82..53ab513b0a6 100644 --- a/packages/apollo-gateway/src/__tests__/integration/single-service.test.ts +++ b/packages/apollo-gateway/src/__tests__/integration/single-service.test.ts @@ -37,9 +37,12 @@ it('executes a query plan over concrete types', async () => { } } `; - const { data, queryPlan } = await execute([localAccounts], { - query, - }); + const { data, queryPlan } = await execute( + { + query, + }, + [localAccounts], + ); expect(data).toEqual({ me: { id: 1, name: 'James' } }); expect(queryPlan).toCallService('accounts'); @@ -47,15 +50,18 @@ it('executes a query plan over concrete types', async () => { }); it('does not remove __typename on root types', async () => { - const query = gql` + const query = `#graphql query GetUser { __typename } `; - const { data } = await execute([accounts], { - query, - }); + const { data } = await execute( + { + query, + }, + [accounts], + ); expect(data).toEqual({ __typename: 'Query' }); }); @@ -66,16 +72,19 @@ it('does not remove __typename if that is all that is requested on an entity', a Query: { me }, }); - const query = gql` + const query = `#graphql query GetUser { me { __typename } } `; - const { data, queryPlan } = await execute([localAccounts], { - query, - }); + const { data, queryPlan } = await execute( + { + query, + }, + [localAccounts], + ); expect(data).toEqual({ me: { __typename: 'User' } }); expect(queryPlan).toCallService('accounts'); @@ -97,9 +106,12 @@ it('does not remove __typename if that is all that is requested on a value type' } } `; - const { data, queryPlan } = await execute([localAccounts], { - query, - }); + const { data, queryPlan } = await execute( + { + query, + }, + [localAccounts], + ); expect(data).toEqual({ me: { account: { __typename: 'Account' } } }); expect(queryPlan).toCallService('accounts'); diff --git a/packages/apollo-gateway/src/__tests__/integration/unions.test.ts b/packages/apollo-gateway/src/__tests__/integration/unions.test.ts index 8a6e1e0f067..42827bb3559 100644 --- a/packages/apollo-gateway/src/__tests__/integration/unions.test.ts +++ b/packages/apollo-gateway/src/__tests__/integration/unions.test.ts @@ -25,6 +25,7 @@ it('handles multiple union type conditions that share a response name (media)', `; const { queryPlan, errors } = await execute( + { query }, [ { name: 'contentService', @@ -51,7 +52,6 @@ it('handles multiple union type conditions that share a response name (media)', }, }, ], - { query }, ); expect(errors).toBeUndefined(); diff --git a/packages/apollo-gateway/src/__tests__/integration/value-types.test.ts b/packages/apollo-gateway/src/__tests__/integration/value-types.test.ts index 8f5297551c6..58064ce1731 100644 --- a/packages/apollo-gateway/src/__tests__/integration/value-types.test.ts +++ b/packages/apollo-gateway/src/__tests__/integration/value-types.test.ts @@ -1,6 +1,5 @@ import gql from 'graphql-tag'; import { execute } from '../execution-utils'; -import { fixtures } from '../__fixtures__/schemas/'; import { astSerializer, queryPlanSerializer } from '../../snapshotSerializers'; expect.addSnapshotSerializer(astSerializer); @@ -42,7 +41,7 @@ describe('value types', () => { } `; - const { data, errors, queryPlan } = await execute(fixtures, { + const { data, errors, queryPlan } = await execute({ query, }); @@ -285,10 +284,10 @@ describe('value types', () => { `; const { data, errors, queryPlan } = await execute( - [firstService, secondService, userService], { query, }, + [firstService, secondService, userService], ); expect(errors).toBeUndefined(); diff --git a/packages/apollo-gateway/src/__tests__/integration/variables.test.ts b/packages/apollo-gateway/src/__tests__/integration/variables.test.ts index 21a794d1c21..cce4b16e6d4 100644 --- a/packages/apollo-gateway/src/__tests__/integration/variables.test.ts +++ b/packages/apollo-gateway/src/__tests__/integration/variables.test.ts @@ -1,5 +1,4 @@ import { execute } from '../execution-utils'; -import { fixtures } from '../__fixtures__/schemas/'; it('passes variables to root fields', async () => { const query = `#graphql @@ -11,7 +10,7 @@ it('passes variables to root fields', async () => { `; const upc = '1'; - const { data, errors, queryPlan } = await execute(fixtures, { + const { data, errors, queryPlan } = await execute({ query, variables: { upc }, }); @@ -35,7 +34,7 @@ it('supports default variables in a variable definition', async () => { } `; - const { data, errors, queryPlan } = await execute(fixtures, { + const { data, errors, queryPlan } = await execute({ query, }); @@ -61,7 +60,7 @@ it('passes variables to nested services', async () => { `; const format = true; - const { data, errors, queryPlan } = await execute(fixtures, { + const { data, errors, queryPlan } = await execute({ query, variables: { format }, }); @@ -95,7 +94,7 @@ it('works with default variables in the schema', async () => { } `; - const { data, queryPlan, errors } = await execute(fixtures, { + const { data, queryPlan, errors } = await execute({ query, variables: { libraryId: '1' }, }); From 6f63d55671e2199e1e5e624d410c98409d4e81ff Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 16 May 2020 07:40:31 +0000 Subject: [PATCH 577/642] chore(deps): update dependency gatsby-theme-apollo-docs to v4.2.3 (#4118) Co-authored-by: Renovate Bot --- docs/package-lock.json | 186 ++++++++++++++++++++++------------------- docs/package.json | 2 +- 2 files changed, 99 insertions(+), 89 deletions(-) diff --git a/docs/package-lock.json b/docs/package-lock.json index ee4bbddd4b0..a50f5ebeb0e 100644 --- a/docs/package-lock.json +++ b/docs/package-lock.json @@ -45,19 +45,19 @@ } }, "caniuse-lite": { - "version": "1.0.30001048", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001048.tgz", - "integrity": "sha512-g1iSHKVxornw0K8LG9LLdf+Fxnv7T1Z+mMsf0/YYLclQX4Cd522Ap0Lrw6NFqHgezit78dtyWxzlV2Xfc7vgRg==" + "version": "1.0.30001061", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001061.tgz", + "integrity": "sha512-SMICCeiNvMZnyXpuoO+ot7FHpMVPlrsR+HmfByj6nY4xYDHXLqMTbgH7ecEkDNXWkH1vaip+ZS0D7VTXwM1KYQ==" }, "electron-to-chromium": { - "version": "1.3.427", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.427.tgz", - "integrity": "sha512-/rG5G7Opcw68/Yrb4qYkz07h3bESVRJjUl4X/FrKLXzoUJleKm6D7K7rTTz8V5LUWnd+BbTOyxJX2XprRqHD8A==" + "version": "1.3.441", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.441.tgz", + "integrity": "sha512-leBfJwLuyGs1jEei2QioI+PjVMavmUIvPYidE8dCCYWLAq0uefhN3NYgDNb8WxD3uiUNnJ3ScMXg0upSlwySzQ==" }, "node-releases": { - "version": "1.1.53", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.53.tgz", - "integrity": "sha512-wp8zyQVwef2hpZ/dJH7SfSrIPD6YoJz6BDQDpGEkcA0s3LpAQoxBIYmfIq6QAhC1DhwsyCgTaTTcONwX8qzCuQ==" + "version": "1.1.55", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.55.tgz", + "integrity": "sha512-H3R3YR/8TjT5WPin/wOoHOUPHgvj8leuU/Keta/rwelEQN9pA/S2Dx8/se4pZ2LBxSd0nAGzsNzhqwa77v7F1w==" } } }, @@ -275,19 +275,19 @@ } }, "caniuse-lite": { - "version": "1.0.30001048", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001048.tgz", - "integrity": "sha512-g1iSHKVxornw0K8LG9LLdf+Fxnv7T1Z+mMsf0/YYLclQX4Cd522Ap0Lrw6NFqHgezit78dtyWxzlV2Xfc7vgRg==" + "version": "1.0.30001061", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001061.tgz", + "integrity": "sha512-SMICCeiNvMZnyXpuoO+ot7FHpMVPlrsR+HmfByj6nY4xYDHXLqMTbgH7ecEkDNXWkH1vaip+ZS0D7VTXwM1KYQ==" }, "electron-to-chromium": { - "version": "1.3.427", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.427.tgz", - "integrity": "sha512-/rG5G7Opcw68/Yrb4qYkz07h3bESVRJjUl4X/FrKLXzoUJleKm6D7K7rTTz8V5LUWnd+BbTOyxJX2XprRqHD8A==" + "version": "1.3.441", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.441.tgz", + "integrity": "sha512-leBfJwLuyGs1jEei2QioI+PjVMavmUIvPYidE8dCCYWLAq0uefhN3NYgDNb8WxD3uiUNnJ3ScMXg0upSlwySzQ==" }, "node-releases": { - "version": "1.1.53", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.53.tgz", - "integrity": "sha512-wp8zyQVwef2hpZ/dJH7SfSrIPD6YoJz6BDQDpGEkcA0s3LpAQoxBIYmfIq6QAhC1DhwsyCgTaTTcONwX8qzCuQ==" + "version": "1.1.55", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.55.tgz", + "integrity": "sha512-H3R3YR/8TjT5WPin/wOoHOUPHgvj8leuU/Keta/rwelEQN9pA/S2Dx8/se4pZ2LBxSd0nAGzsNzhqwa77v7F1w==" } } }, @@ -2304,14 +2304,14 @@ } }, "caniuse-lite": { - "version": "1.0.30001048", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001048.tgz", - "integrity": "sha512-g1iSHKVxornw0K8LG9LLdf+Fxnv7T1Z+mMsf0/YYLclQX4Cd522Ap0Lrw6NFqHgezit78dtyWxzlV2Xfc7vgRg==" + "version": "1.0.30001061", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001061.tgz", + "integrity": "sha512-SMICCeiNvMZnyXpuoO+ot7FHpMVPlrsR+HmfByj6nY4xYDHXLqMTbgH7ecEkDNXWkH1vaip+ZS0D7VTXwM1KYQ==" }, "electron-to-chromium": { - "version": "1.3.427", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.427.tgz", - "integrity": "sha512-/rG5G7Opcw68/Yrb4qYkz07h3bESVRJjUl4X/FrKLXzoUJleKm6D7K7rTTz8V5LUWnd+BbTOyxJX2XprRqHD8A==" + "version": "1.3.441", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.441.tgz", + "integrity": "sha512-leBfJwLuyGs1jEei2QioI+PjVMavmUIvPYidE8dCCYWLAq0uefhN3NYgDNb8WxD3uiUNnJ3ScMXg0upSlwySzQ==" }, "jsesc": { "version": "0.5.0", @@ -2319,9 +2319,9 @@ "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=" }, "node-releases": { - "version": "1.1.53", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.53.tgz", - "integrity": "sha512-wp8zyQVwef2hpZ/dJH7SfSrIPD6YoJz6BDQDpGEkcA0s3LpAQoxBIYmfIq6QAhC1DhwsyCgTaTTcONwX8qzCuQ==" + "version": "1.1.55", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.55.tgz", + "integrity": "sha512-H3R3YR/8TjT5WPin/wOoHOUPHgvj8leuU/Keta/rwelEQN9pA/S2Dx8/se4pZ2LBxSd0nAGzsNzhqwa77v7F1w==" }, "regenerate-unicode-properties": { "version": "8.2.0", @@ -11268,9 +11268,9 @@ } }, "gatsby-core-utils": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.2.0.tgz", - "integrity": "sha512-JBsVbniXObn26Hms8Je1vJdhMW04GesochBVLcaTraZC5dfqZDExPix65jrye/voC0YfFtXIngm59yspYZm1OQ==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.2.2.tgz", + "integrity": "sha512-EdVUq0K7C9t32V7wndldUmUGzZp8EwU8gNMc1dtI1whyDUaUuZa6zlkbkpJwbwhPhRHdao5zhvHJXydhgzTEog==", "requires": { "ci-info": "2.0.0", "configstore": "^5.0.1", @@ -11471,11 +11471,11 @@ } }, "gatsby-plugin-emotion": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/gatsby-plugin-emotion/-/gatsby-plugin-emotion-4.3.0.tgz", - "integrity": "sha512-e4Z+xaaRdkmMY1qmTnNPzSJYkP/M9fOYm9mE/2sssDWvH5UwlmDPUMxMuDxDO722mbbB9RGEHxX4ElrsXH7Gcg==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/gatsby-plugin-emotion/-/gatsby-plugin-emotion-4.3.1.tgz", + "integrity": "sha512-DlQSRQ7TlwQxbuzcUzn97lyj11k2Osk0F5J4ntHm/op35daBI4bcfLbB3B6P86nSAfOZc9427d/Rz1tgtVYqjQ==", "requires": { - "@babel/runtime": "^7.9.2", + "@babel/runtime": "^7.9.6", "@emotion/babel-preset-css-prop": "^10.0.27" }, "dependencies": { @@ -11495,11 +11495,11 @@ } }, "gatsby-plugin-google-analytics": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/gatsby-plugin-google-analytics/-/gatsby-plugin-google-analytics-2.3.0.tgz", - "integrity": "sha512-ekXMjLpkoRT6eYC8eOEOhSDLsSBPBsZ6JQydvcmDqy/cCgc+B66icPlqd4G/Lst13Ede2z2cOMuntEsEXf6CvA==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/gatsby-plugin-google-analytics/-/gatsby-plugin-google-analytics-2.3.1.tgz", + "integrity": "sha512-2dfaWVxAScwMMs00g5QJ4vHHOmj9i/3MWeC273zjpC8IW35IXw/ypcDg+O7Kh+Q/Xwok1pS+c+LREic8E08iYQ==", "requires": { - "@babel/runtime": "^7.9.2", + "@babel/runtime": "^7.9.6", "minimatch": "3.0.4" }, "dependencies": { @@ -11519,11 +11519,11 @@ } }, "gatsby-plugin-less": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/gatsby-plugin-less/-/gatsby-plugin-less-3.2.0.tgz", - "integrity": "sha512-MqaC7zEa4dKIcm9anr5Z7Ny3B5BBQcWHk5VErWEgn3ptFLVGoNF+pscOB6SOkk78xm2GCiwm29dylMpdrI7x3A==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/gatsby-plugin-less/-/gatsby-plugin-less-3.2.1.tgz", + "integrity": "sha512-SoP2vuoa+yF8H7TWvFjLzS8aUmJwKiSRbPLzxu1LIRz6bpv7Hn8ICkgf6Djh/eTlBkFqSSGowgo8yH/qszdZaw==", "requires": { - "@babel/runtime": "^7.9.2", + "@babel/runtime": "^7.9.6", "less-loader": "^5.0.0" }, "dependencies": { @@ -11543,17 +11543,17 @@ } }, "gatsby-plugin-mdx": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/gatsby-plugin-mdx/-/gatsby-plugin-mdx-1.2.4.tgz", - "integrity": "sha512-4sSrTcJh6HCTttljxh1UbAeXvZ1byD3U2gKji8r6Hv0x79Dfi3K22FIqupnSLIWWuKiCxNBgCtmRAEhuWGbFrQ==", + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/gatsby-plugin-mdx/-/gatsby-plugin-mdx-1.2.7.tgz", + "integrity": "sha512-m2yJsXkCdS1ObYYQIPgnKUrflO2MjeKkYbSBVIgROsv/RdCqT1MLbtbL4TogIYtqXjjnVeC4Jcy7SR94urvtMQ==", "requires": { - "@babel/core": "^7.9.0", - "@babel/generator": "^7.9.5", + "@babel/core": "^7.9.6", + "@babel/generator": "^7.9.6", "@babel/helper-plugin-utils": "^7.8.3", - "@babel/plugin-proposal-object-rest-spread": "^7.9.5", - "@babel/preset-env": "^7.9.5", + "@babel/plugin-proposal-object-rest-spread": "^7.9.6", + "@babel/preset-env": "^7.9.6", "@babel/preset-react": "^7.9.4", - "@babel/types": "^7.9.5", + "@babel/types": "^7.9.6", "camelcase-css": "^2.0.1", "change-case": "^3.1.0", "core-js": "2", @@ -11562,14 +11562,14 @@ "escape-string-regexp": "^1.0.5", "eval": "^0.1.4", "fs-extra": "^8.1.0", - "gatsby-core-utils": "^1.2.0", + "gatsby-core-utils": "^1.2.2", "gray-matter": "^4.0.2", "json5": "^2.1.3", "loader-utils": "^1.4.0", "lodash": "^4.17.15", "mdast-util-to-string": "^1.1.0", "mdast-util-toc": "^3.1.0", - "mime": "^2.4.4", + "mime": "^2.4.5", "p-queue": "^5.0.0", "pretty-bytes": "^5.3.0", "remark": "^10.0.1", @@ -11765,6 +11765,11 @@ } } }, + "mime": { + "version": "2.4.5", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.5.tgz", + "integrity": "sha512-3hQhEUF027BuxZjQA3s7rIv/7VCQPa27hN9u9g87sEkWaKwQPuXOkVKtOeiyUrnWqTDiOs8Ed2rwg733mB0R5w==" + }, "minimist": { "version": "1.2.5", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", @@ -11853,11 +11858,11 @@ } }, "gatsby-plugin-react-helmet": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/gatsby-plugin-react-helmet/-/gatsby-plugin-react-helmet-3.3.0.tgz", - "integrity": "sha512-Z0G2/+fvX+FRkvd5H5VezJKlWNz39P6SZnPliIk6tGbKP4RIry5xdZYmyd3bn+IsyNvm2GmDoTQfOSqxsYNweQ==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/gatsby-plugin-react-helmet/-/gatsby-plugin-react-helmet-3.3.1.tgz", + "integrity": "sha512-DZ/IWs+zlGL8N3JAcewPJJUPkl1st6/hIWQ3YphKoTK64DUIoMd2wWSJCrC6LiurS7knGHa4pdGyc5clwV1EKA==", "requires": { - "@babel/runtime": "^7.9.2" + "@babel/runtime": "^7.9.6" }, "dependencies": { "@babel/runtime": { @@ -12616,11 +12621,11 @@ } }, "gatsby-remark-autolink-headers": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/gatsby-remark-autolink-headers/-/gatsby-remark-autolink-headers-2.3.0.tgz", - "integrity": "sha512-lU8nr81lL+ZGJGJWhiKxZplQADRrZCnCelmtSw5Lvx4aViHfDbewAc+CDyUeXJeQZ8lod76t3X8beWpzePQCHw==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/gatsby-remark-autolink-headers/-/gatsby-remark-autolink-headers-2.3.2.tgz", + "integrity": "sha512-hw1O9zQPaL7D2xv9lDZpoOFtzncu/ou/EpzzLkOoMidwKnHC25R9csaZKfWlMLdXMJ3awHPs2QKvC0BPTfGCSQ==", "requires": { - "@babel/runtime": "^7.9.2", + "@babel/runtime": "^7.9.6", "github-slugger": "^1.3.0", "lodash": "^4.17.15", "mdast-util-to-string": "^1.1.0", @@ -12707,11 +12712,11 @@ } }, "gatsby-remark-copy-linked-files": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/gatsby-remark-copy-linked-files/-/gatsby-remark-copy-linked-files-2.3.1.tgz", - "integrity": "sha512-XXWFiLt/+me+GnxTYWX1HncgsfjFw2QwwZUSX6fx7bilXlW1Rn7DO/Lw3vMGJFTsk7R0eoWeWMX60PeXkhA2GA==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/gatsby-remark-copy-linked-files/-/gatsby-remark-copy-linked-files-2.3.2.tgz", + "integrity": "sha512-LzOfHSqL1zCjSR078NwTlbkwz1lUlVciD+c7VI7WpjVwJY0GVtwEZOimvDlHnNWRWPqYHjRgL1GlY0utsi+r4g==", "requires": { - "@babel/runtime": "^7.9.2", + "@babel/runtime": "^7.9.6", "cheerio": "^1.0.0-rc.3", "fs-extra": "^8.1.0", "is-relative-url": "^3.0.0", @@ -12800,11 +12805,11 @@ } }, "gatsby-remark-prismjs": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/gatsby-remark-prismjs/-/gatsby-remark-prismjs-3.5.0.tgz", - "integrity": "sha512-ADzpWUaJJB+5bshybw4AC1f1mPZwENgoemlsAl7uBxjZ1B9HIubzKPXFNTyrGdaTkJs49Z6id9QCnZfHdefHtg==", + "version": "3.5.1", + "resolved": "https://registry.npmjs.org/gatsby-remark-prismjs/-/gatsby-remark-prismjs-3.5.1.tgz", + "integrity": "sha512-Sx4aCCil916OVrDz0ZxduHT+hp2KEXxjpyV6UukvZ9q3sszz4u59uhtW4IUftA5OrFF4JWYjB73A6Do2BEZGKg==", "requires": { - "@babel/runtime": "^7.9.2", + "@babel/runtime": "^7.9.6", "parse-numeric-range": "^0.0.2", "unist-util-visit": "^1.4.1" }, @@ -12841,20 +12846,20 @@ } }, "gatsby-source-filesystem": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/gatsby-source-filesystem/-/gatsby-source-filesystem-2.3.0.tgz", - "integrity": "sha512-SUJbbl4hYyvudGImU86amxIfqYoYpkITlY0lHV7azeAQj3199ZUqO0hGwbl4MZ5fNwwQEbANEUbsoPkyc/QUZQ==", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/gatsby-source-filesystem/-/gatsby-source-filesystem-2.3.3.tgz", + "integrity": "sha512-RsA6xssBKEel2e0Rj1hQZRNtPQ1lOh2ZlpXZr3CpE3W52F8bSrGnIBnqkmp4aPmtDGYgcw3okid0UNhBmUeiuA==", "requires": { - "@babel/runtime": "^7.9.2", + "@babel/runtime": "^7.9.6", "better-queue": "^3.8.10", "bluebird": "^3.7.2", "chokidar": "3.4.0", "file-type": "^12.4.2", "fs-extra": "^8.1.0", - "gatsby-core-utils": "^1.2.0", + "gatsby-core-utils": "^1.2.2", "got": "^9.6.0", "md5-file": "^3.2.3", - "mime": "^2.4.4", + "mime": "^2.4.5", "pretty-bytes": "^5.3.0", "progress": "^2.0.3", "read-chunk": "^3.2.0", @@ -12893,6 +12898,11 @@ "url-parse-lax": "^3.0.0" } }, + "mime": { + "version": "2.4.5", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.5.tgz", + "integrity": "sha512-3hQhEUF027BuxZjQA3s7rIv/7VCQPa27hN9u9g87sEkWaKwQPuXOkVKtOeiyUrnWqTDiOs8Ed2rwg733mB0R5w==" + }, "regenerator-runtime": { "version": "0.13.5", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", @@ -13042,9 +13052,9 @@ } }, "gatsby-theme-apollo-docs": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/gatsby-theme-apollo-docs/-/gatsby-theme-apollo-docs-4.2.2.tgz", - "integrity": "sha512-WB7f4Dtd1PErgru1OQqGLfPJnab+2kI1J2/+9MCvFxfOVaZefCBOwqExZn7dahnD5QpsTIbG+7YDefeHt8ItDw==", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/gatsby-theme-apollo-docs/-/gatsby-theme-apollo-docs-4.2.3.tgz", + "integrity": "sha512-+JV2wW44xqRM7TICoHF8/rwQq+s5GOgMLBjGLpBLOj65raN/HV1dWphYK6VCUOpzFbPYV3gMeWqz5qBQf6Gh0g==", "requires": { "@mdx-js/mdx": "^1.1.0", "@mdx-js/react": "^1.0.27", @@ -13075,13 +13085,13 @@ } }, "gatsby-transformer-remark": { - "version": "2.8.4", - "resolved": "https://registry.npmjs.org/gatsby-transformer-remark/-/gatsby-transformer-remark-2.8.4.tgz", - "integrity": "sha512-F+8n4LbdY8f9wZIXSeROUAGqkR6M91YmTThX5U7ngtR1QFozKGICEEjiRne1+nUBZV4EPXMhb6h4sZizssAjog==", + "version": "2.8.8", + "resolved": "https://registry.npmjs.org/gatsby-transformer-remark/-/gatsby-transformer-remark-2.8.8.tgz", + "integrity": "sha512-nRQnATO2tUOtG5KpjssGl+GVdwsDKIgPavggiiYC+L39GTDVfF6hqEu1AsjomZyaSIB1uCBNNIfZF/aSbRQdkA==", "requires": { - "@babel/runtime": "^7.9.2", + "@babel/runtime": "^7.9.6", "bluebird": "^3.7.2", - "gatsby-core-utils": "^1.2.0", + "gatsby-core-utils": "^1.2.2", "gray-matter": "^4.0.2", "hast-util-raw": "^4.0.0", "hast-util-to-html": "^4.0.1", @@ -20893,9 +20903,9 @@ } }, "domutils": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.0.0.tgz", - "integrity": "sha512-n5SelJ1axbO636c2yUtOGia/IcJtVtlhQbFiVDBZHKV5ReJO1ViX7sFEemtuyoAnBxk5meNSYgA8V4s0271efg==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.1.0.tgz", + "integrity": "sha512-CD9M0Dm1iaHfQ1R/TI+z3/JWp/pgub0j4jIQKH89ARR4ATAV2nbaOQS5XxU9maJP5jHaPdDDQSEHuE2UmpUTKg==", "requires": { "dom-serializer": "^0.2.1", "domelementtype": "^2.0.1", @@ -22978,9 +22988,9 @@ "integrity": "sha512-+O8/qh/Qj8CgC6eYBVBykMrNtp5Gebn4dlGD/kKXVkJNDwyrAwSIqwz8CDf+tsAIWVycKcku6gIXJ0qwx/ZXaQ==" }, "uglify-js": { - "version": "3.9.1", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.9.1.tgz", - "integrity": "sha512-JUPoL1jHsc9fOjVFHdQIhqEEJsQvfKDjlubcCilu8U26uZ73qOg8VsN8O1jbuei44ZPlwL7kmbAdM4tzaUvqnA==", + "version": "3.9.3", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.9.3.tgz", + "integrity": "sha512-r5ImcL6QyzQGVimQoov3aL2ZScywrOgBXGndbWrdehKoSvGe/RmiE5Jpw/v+GvxODt6l2tpBXwA7n+qZVlHBMA==", "requires": { "commander": "~2.20.3" } diff --git a/docs/package.json b/docs/package.json index 413d6843974..aa562228911 100644 --- a/docs/package.json +++ b/docs/package.json @@ -7,7 +7,7 @@ }, "dependencies": { "gatsby": "2.21.9", - "gatsby-theme-apollo-docs": "4.2.2", + "gatsby-theme-apollo-docs": "4.2.3", "react": "16.13.1", "react-dom": "16.13.1" } From 5e8149ef12c2ed9a89e8a386cf1de1711fe5cb22 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 16 May 2020 09:31:10 +0000 Subject: [PATCH 578/642] chore(deps): update dependency @types/async-retry to v1.4.2 (#4119) Co-authored-by: Renovate Bot --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 55b63fe4f20..b0de9853670 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4731,9 +4731,9 @@ } }, "@types/async-retry": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/@types/async-retry/-/async-retry-1.4.1.tgz", - "integrity": "sha512-hDI5Ttk9SUmDLcD/Yl2VuWQRGYZjJ7aaJFeRlomUOz/iTKSE7yA55SwY87QwjiZgwhMlVAKoT1rl08UyQoheag==", + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/@types/async-retry/-/async-retry-1.4.2.tgz", + "integrity": "sha512-GUDuJURF0YiJZ+CBjNQA0+vbP/VHlJbB0sFqkzsV7EcOPRfurVonXpXKAt3w8qIjM1TEzpz6hc6POocPvHOS3w==", "dev": true, "requires": { "@types/retry": "*" diff --git a/package.json b/package.json index 69cc4db6de4..ca7e0e08c75 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "graphql-extensions": "file:packages/graphql-extensions" }, "devDependencies": { - "@types/async-retry": "1.4.1", + "@types/async-retry": "1.4.2", "@types/aws-lambda": "8.10.51", "@types/body-parser": "1.19.0", "@types/bunyan": "1.8.6", From 9d96b5703ee8ec1e433d818ba6c1a6addf70e2e3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 16 May 2020 10:32:18 +0000 Subject: [PATCH 579/642] chore(deps): update dependency @types/jest to v25.2.2 (#4121) Co-authored-by: Renovate Bot --- package-lock.json | 44 ++++++++++---------------------------------- package.json | 2 +- 2 files changed, 11 insertions(+), 35 deletions(-) diff --git a/package-lock.json b/package-lock.json index b0de9853670..da5a95d1532 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5004,9 +5004,9 @@ } }, "@types/jest": { - "version": "25.2.1", - "resolved": "https://registry.npmjs.org/@types/jest/-/jest-25.2.1.tgz", - "integrity": "sha512-msra1bCaAeEdkSyA0CZ6gW1ukMIvZ5YoJkdXw/qhQdsuuDlFTcEUrUw8CLCPt2rVRUfXlClVvK2gvPs9IokZaA==", + "version": "25.2.2", + "resolved": "https://registry.npmjs.org/@types/jest/-/jest-25.2.2.tgz", + "integrity": "sha512-aRctFbG8Pb7DSLzUt/fEtL3q/GKb9mretFuYhRub2J0q6NhzBYbx9HTQzHrWgBNIxYOlxGNVe6Z54cpbUt+Few==", "dev": true, "requires": { "jest-diff": "^25.2.1", @@ -5014,9 +5014,9 @@ }, "dependencies": { "@jest/types": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.4.0.tgz", - "integrity": "sha512-XBeaWNzw2PPnGW5aXvZt3+VO60M+34RY3XDsCK5tW7kyj3RK0XClRutCfjqcBuaR2aBQTbluEDME9b5MB9UAPw==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz", + "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -5066,43 +5066,19 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, - "diff-sequences": { - "version": "25.2.6", - "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-25.2.6.tgz", - "integrity": "sha512-Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg==", - "dev": true - }, "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true }, - "jest-diff": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-25.4.0.tgz", - "integrity": "sha512-kklLbJVXW0y8UKOWOdYhI6TH5MG6QAxrWiBMgQaPIuhj3dNFGirKCd+/xfplBXICQ7fI+3QcqHm9p9lWu1N6ug==", - "dev": true, - "requires": { - "chalk": "^3.0.0", - "diff-sequences": "^25.2.6", - "jest-get-type": "^25.2.6", - "pretty-format": "^25.4.0" - } - }, - "jest-get-type": { - "version": "25.2.6", - "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-25.2.6.tgz", - "integrity": "sha512-DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig==", - "dev": true - }, "pretty-format": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.4.0.tgz", - "integrity": "sha512-PI/2dpGjXK5HyXexLPZU/jw5T9Q6S1YVXxxVxco+LIqzUFHXIbKZKdUVt7GcX7QUCr31+3fzhi4gN4/wUYPVxQ==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.5.0.tgz", + "integrity": "sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ==", "dev": true, "requires": { - "@jest/types": "^25.4.0", + "@jest/types": "^25.5.0", "ansi-regex": "^5.0.0", "ansi-styles": "^4.0.0", "react-is": "^16.12.0" diff --git a/package.json b/package.json index ca7e0e08c75..bd8d0845d3b 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,7 @@ "@types/fast-json-stable-stringify": "2.0.0", "@types/hapi": "17.8.7", "@types/ioredis": "4.16.1", - "@types/jest": "25.2.1", + "@types/jest": "25.2.2", "@types/koa-router": "7.4.0", "@types/lodash": "4.14.150", "@types/lodash.sortby": "4.7.6", From a8602e0617eb671698d38e78409c33a585ba64c2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 16 May 2020 11:33:58 +0000 Subject: [PATCH 580/642] chore(deps): update dependency gatsby to v2.21.33 (#4091) Co-authored-by: Renovate Bot --- docs/package-lock.json | 4621 +++++++++++----------------------------- docs/package.json | 2 +- 2 files changed, 1230 insertions(+), 3393 deletions(-) diff --git a/docs/package-lock.json b/docs/package-lock.json index a50f5ebeb0e..03314c45442 100644 --- a/docs/package-lock.json +++ b/docs/package-lock.json @@ -292,15 +292,15 @@ } }, "@babel/helper-create-class-features-plugin": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.8.3.tgz", - "integrity": "sha512-qmp4pD7zeTxsv0JNecSBsEmG1ei2MqwJq4YQcK3ZWm/0t07QstWfvuV/vm3Qt5xNMFETn2SZqpMx2MQzbtq+KA==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.9.6.tgz", + "integrity": "sha512-6N9IeuyHvMBRyjNYOMJHrhwtu4WJMrYf8hVbEHD3pbbbmNOk1kmXSQs7bA4dYDUaIx4ZEzdnvo6NwC3WHd/Qow==", "requires": { - "@babel/helper-function-name": "^7.8.3", + "@babel/helper-function-name": "^7.9.5", "@babel/helper-member-expression-to-functions": "^7.8.3", "@babel/helper-optimise-call-expression": "^7.8.3", "@babel/helper-plugin-utils": "^7.8.3", - "@babel/helper-replace-supers": "^7.8.3", + "@babel/helper-replace-supers": "^7.9.6", "@babel/helper-split-export-declaration": "^7.8.3" }, "dependencies": { @@ -313,48 +313,24 @@ } }, "@babel/generator": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.8.3.tgz", - "integrity": "sha512-WjoPk8hRpDRqqzRpvaR8/gDUPkrnOOeuT2m8cNICJtZH6mwaCo3v0OKMI7Y6SM1pBtyijnLtAL0HDi41pf41ug==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.6.tgz", + "integrity": "sha512-+htwWKJbH2bL72HRluF8zumBxzuX0ZZUFl3JLNyoUjM/Ho8wnVpPXM6aUz8cfKDqQ/h7zHqKt4xzJteUosckqQ==", "requires": { - "@babel/types": "^7.8.3", + "@babel/types": "^7.9.6", "jsesc": "^2.5.1", "lodash": "^4.17.13", "source-map": "^0.5.0" } }, "@babel/helper-function-name": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.8.3.tgz", - "integrity": "sha512-BCxgX1BC2hD/oBlIFUgOCQDOPV8nSINxCwM3o93xP4P9Fq6aV5sgv2cOOITDMtCfQ+3PvHp3l689XZvAM9QyOA==", + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz", + "integrity": "sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==", "requires": { "@babel/helper-get-function-arity": "^7.8.3", "@babel/template": "^7.8.3", - "@babel/types": "^7.8.3" - } - }, - "@babel/helper-get-function-arity": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz", - "integrity": "sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==", - "requires": { - "@babel/types": "^7.8.3" - } - }, - "@babel/helper-member-expression-to-functions": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.8.3.tgz", - "integrity": "sha512-fO4Egq88utkQFjbPrSHGmGLFqmrshs11d46WI+WZDESt7Wu7wN2G2Iu+NMMZJFDOVRHAMIkB5SNh30NtwCA7RA==", - "requires": { - "@babel/types": "^7.8.3" - } - }, - "@babel/helper-optimise-call-expression": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.8.3.tgz", - "integrity": "sha512-Kag20n86cbO2AvHca6EJsvqAd82gc6VMGule4HwebwMlwkpXuVqrNRj6CkCV2sKxgi9MyAUnZVnZ6lJ1/vKhHQ==", - "requires": { - "@babel/types": "^7.8.3" + "@babel/types": "^7.9.5" } }, "@babel/helper-plugin-utils": { @@ -363,71 +339,58 @@ "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" }, "@babel/helper-replace-supers": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.8.3.tgz", - "integrity": "sha512-xOUssL6ho41U81etpLoT2RTdvdus4VfHamCuAm4AHxGr+0it5fnwoVdwUJ7GFEqCsQYzJUhcbsN9wB9apcYKFA==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.9.6.tgz", + "integrity": "sha512-qX+chbxkbArLyCImk3bWV+jB5gTNU/rsze+JlcF6Nf8tVTigPJSI1o1oBow/9Resa1yehUO9lIipsmu9oG4RzA==", "requires": { "@babel/helper-member-expression-to-functions": "^7.8.3", "@babel/helper-optimise-call-expression": "^7.8.3", - "@babel/traverse": "^7.8.3", - "@babel/types": "^7.8.3" + "@babel/traverse": "^7.9.6", + "@babel/types": "^7.9.6" } }, - "@babel/helper-split-export-declaration": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz", - "integrity": "sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==", - "requires": { - "@babel/types": "^7.8.3" - } + "@babel/helper-validator-identifier": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz", + "integrity": "sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==" }, "@babel/highlight": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.8.3.tgz", - "integrity": "sha512-PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg==", + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz", + "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==", "requires": { + "@babel/helper-validator-identifier": "^7.9.0", "chalk": "^2.0.0", - "esutils": "^2.0.2", "js-tokens": "^4.0.0" } }, "@babel/parser": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.8.3.tgz", - "integrity": "sha512-/V72F4Yp/qmHaTALizEm9Gf2eQHV3QyTL3K0cNfijwnMnb1L+LDlAubb/ZnSdGAVzVSWakujHYs1I26x66sMeQ==" - }, - "@babel/template": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.3.tgz", - "integrity": "sha512-04m87AcQgAFdvuoyiQ2kgELr2tV8B4fP/xJAVUL3Yb3bkNdMedD3d0rlSQr3PegP0cms3eHjl1F7PWlvWbU8FQ==", - "requires": { - "@babel/code-frame": "^7.8.3", - "@babel/parser": "^7.8.3", - "@babel/types": "^7.8.3" - } + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.6.tgz", + "integrity": "sha512-AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q==" }, "@babel/traverse": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.8.3.tgz", - "integrity": "sha512-we+a2lti+eEImHmEXp7bM9cTxGzxPmBiVJlLVD+FuuQMeeO7RaDbutbgeheDkw+Xe3mCfJHnGOWLswT74m2IPg==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.6.tgz", + "integrity": "sha512-b3rAHSjbxy6VEAvlxM8OV/0X4XrG72zoxme6q1MOoe2vd0bEc+TwayhuC1+Dfgqh1QEG+pj7atQqvUprHIccsg==", "requires": { "@babel/code-frame": "^7.8.3", - "@babel/generator": "^7.8.3", - "@babel/helper-function-name": "^7.8.3", + "@babel/generator": "^7.9.6", + "@babel/helper-function-name": "^7.9.5", "@babel/helper-split-export-declaration": "^7.8.3", - "@babel/parser": "^7.8.3", - "@babel/types": "^7.8.3", + "@babel/parser": "^7.9.6", + "@babel/types": "^7.9.6", "debug": "^4.1.0", "globals": "^11.1.0", "lodash": "^4.17.13" } }, "@babel/types": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.3.tgz", - "integrity": "sha512-jBD+G8+LWpMBBWvVcdr4QysjUE4mU/syrhN17o1u3gx0/WzJB1kwiVZAXRtWbsIPOwW8pF/YJV5+nmetPzepXg==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.6.tgz", + "integrity": "sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA==", "requires": { - "esutils": "^2.0.2", + "@babel/helper-validator-identifier": "^7.9.5", "lodash": "^4.17.13", "to-fast-properties": "^2.0.0" } @@ -1055,12 +1018,13 @@ } }, "@babel/plugin-proposal-object-rest-spread": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.8.3.tgz", - "integrity": "sha512-8qvuPwU/xxUCt78HocNlv0mXXo0wdh9VT1R04WU8HGOfaOob26pF+9P5/lYjN/q7DHOX1bvX60hnhOvuQUJdbA==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.6.tgz", + "integrity": "sha512-Ga6/fhGqA9Hj+y6whNpPv8psyaK5xzrQwSPsGPloVkvmH+PqW1ixdnfJ9uIO06OjQNYol3PMnfmJ8vfZtkzF+A==", "requires": { "@babel/helper-plugin-utils": "^7.8.3", - "@babel/plugin-syntax-object-rest-spread": "^7.8.0" + "@babel/plugin-syntax-object-rest-spread": "^7.8.0", + "@babel/plugin-transform-parameters": "^7.9.5" }, "dependencies": { "@babel/helper-plugin-utils": { @@ -1402,9 +1366,9 @@ } }, "@babel/plugin-transform-destructuring": { - "version": "7.8.8", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.8.8.tgz", - "integrity": "sha512-eRJu4Vs2rmttFCdhPUM3bV0Yo/xPSdPw6ML9KHs/bjB4bLA5HXlbvYXPOD5yASodGod+krjYx21xm1QmL8dCJQ==", + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.9.5.tgz", + "integrity": "sha512-j3OEsGel8nHL/iusv/mRd5fYZ3DrOxWC82x0ogmdN/vHfAP4MYw+AFKYanzWlktNwikKvlzUV//afBW5FTp17Q==", "requires": { "@babel/helper-plugin-utils": "^7.8.3" }, @@ -2941,371 +2905,34 @@ "@mdx-js/mdx": "^1.6.1", "@mdx-js/react": "^1.6.1", "buble-jsx-only": "^0.19.8" - }, - "dependencies": { - "@babel/code-frame": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", - "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", - "requires": { - "@babel/highlight": "^7.8.3" - } - }, - "@babel/core": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.0.tgz", - "integrity": "sha512-kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==", - "requires": { - "@babel/code-frame": "^7.8.3", - "@babel/generator": "^7.9.0", - "@babel/helper-module-transforms": "^7.9.0", - "@babel/helpers": "^7.9.0", - "@babel/parser": "^7.9.0", - "@babel/template": "^7.8.6", - "@babel/traverse": "^7.9.0", - "@babel/types": "^7.9.0", - "convert-source-map": "^1.7.0", - "debug": "^4.1.0", - "gensync": "^1.0.0-beta.1", - "json5": "^2.1.2", - "lodash": "^4.17.13", - "resolve": "^1.3.2", - "semver": "^5.4.1", - "source-map": "^0.5.0" - } - }, - "@babel/generator": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.6.tgz", - "integrity": "sha512-+htwWKJbH2bL72HRluF8zumBxzuX0ZZUFl3JLNyoUjM/Ho8wnVpPXM6aUz8cfKDqQ/h7zHqKt4xzJteUosckqQ==", - "requires": { - "@babel/types": "^7.9.6", - "jsesc": "^2.5.1", - "lodash": "^4.17.13", - "source-map": "^0.5.0" - } - }, - "@babel/helper-function-name": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz", - "integrity": "sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==", - "requires": { - "@babel/helper-get-function-arity": "^7.8.3", - "@babel/template": "^7.8.3", - "@babel/types": "^7.9.5" - } - }, - "@babel/helper-plugin-utils": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", - "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" - }, - "@babel/highlight": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz", - "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==", - "requires": { - "@babel/helper-validator-identifier": "^7.9.0", - "chalk": "^2.0.0", - "js-tokens": "^4.0.0" - } - }, - "@babel/parser": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.6.tgz", - "integrity": "sha512-AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q==" - }, - "@babel/plugin-proposal-object-rest-spread": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.5.tgz", - "integrity": "sha512-VP2oXvAf7KCYTthbUHwBlewbl1Iq059f6seJGsxMizaCdgHIeczOr7FBqELhSqfkIl04Fi8okzWzl63UKbQmmg==", - "requires": { - "@babel/helper-plugin-utils": "^7.8.3", - "@babel/plugin-syntax-object-rest-spread": "^7.8.0", - "@babel/plugin-transform-parameters": "^7.9.5" - } - }, - "@babel/plugin-transform-parameters": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.9.5.tgz", - "integrity": "sha512-0+1FhHnMfj6lIIhVvS4KGQJeuhe1GI//h5uptK4PvLt+BGBxsoUJbd3/IW002yk//6sZPlFgsG1hY6OHLcy6kA==", - "requires": { - "@babel/helper-get-function-arity": "^7.8.3", - "@babel/helper-plugin-utils": "^7.8.3" - } - }, - "@babel/template": { - "version": "7.8.6", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz", - "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==", - "requires": { - "@babel/code-frame": "^7.8.3", - "@babel/parser": "^7.8.6", - "@babel/types": "^7.8.6" - } - }, - "@babel/traverse": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.6.tgz", - "integrity": "sha512-b3rAHSjbxy6VEAvlxM8OV/0X4XrG72zoxme6q1MOoe2vd0bEc+TwayhuC1+Dfgqh1QEG+pj7atQqvUprHIccsg==", - "requires": { - "@babel/code-frame": "^7.8.3", - "@babel/generator": "^7.9.6", - "@babel/helper-function-name": "^7.9.5", - "@babel/helper-split-export-declaration": "^7.8.3", - "@babel/parser": "^7.9.6", - "@babel/types": "^7.9.6", - "debug": "^4.1.0", - "globals": "^11.1.0", - "lodash": "^4.17.13" - } - }, - "@babel/types": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.6.tgz", - "integrity": "sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA==", - "requires": { - "@babel/helper-validator-identifier": "^7.9.5", - "lodash": "^4.17.13", - "to-fast-properties": "^2.0.0" - }, - "dependencies": { - "@babel/helper-validator-identifier": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz", - "integrity": "sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==" - } - } - }, - "@mdx-js/mdx": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/@mdx-js/mdx/-/mdx-1.6.1.tgz", - "integrity": "sha512-DLnHbYZGoXSzfIHKgEtsO4qP8029YbdyJvC746PwfPNrRyGciPsqgWmfz/nEXt/fg+UMBG/6/cZaZx/hvyxnyg==", - "requires": { - "@babel/core": "7.9.0", - "@babel/plugin-syntax-jsx": "7.8.3", - "@babel/plugin-syntax-object-rest-spread": "7.8.3", - "@mdx-js/util": "^1.6.1", - "babel-plugin-apply-mdx-type-prop": "^1.6.1", - "babel-plugin-extract-import-names": "^1.6.1", - "camelcase-css": "2.0.1", - "detab": "2.0.3", - "hast-util-raw": "5.0.2", - "lodash.uniq": "4.5.0", - "mdast-util-to-hast": "8.2.0", - "remark-footnotes": "1.0.0", - "remark-mdx": "^1.6.1", - "remark-parse": "8.0.2", - "remark-squeeze-paragraphs": "4.0.0", - "style-to-object": "0.3.0", - "unified": "9.0.0", - "unist-builder": "2.0.3", - "unist-util-visit": "2.0.2" - } - }, - "@mdx-js/react": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/@mdx-js/react/-/react-1.6.1.tgz", - "integrity": "sha512-jXBSWdWFPK2fs3johKb0hQFsf/x/C24XQYQwMhj8FxwlBgf7+NGATwXFs6pGkKd5/JfK9HXmbOcQ78MYoIZyxA==" - }, - "@mdx-js/util": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/@mdx-js/util/-/util-1.6.1.tgz", - "integrity": "sha512-A3TBBjg5iVo8S4TTG0VrW8G9YNLob4+M6rALKjY8Sxr9zPExWQ7iTPUSvJVE7YhF9E08EQMubx1vRal3jtpJ9Q==" - }, - "babel-plugin-apply-mdx-type-prop": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/babel-plugin-apply-mdx-type-prop/-/babel-plugin-apply-mdx-type-prop-1.6.1.tgz", - "integrity": "sha512-chjmLo1x7fCpDRICGUlbkwf2E6sMVG9jjG6PtPBWnQfMEjgV03Gh0jSVGbZJsEUxcMqOpHSsIXvPz1sYip6X3g==", - "requires": { - "@babel/helper-plugin-utils": "7.8.3", - "@mdx-js/util": "^1.6.1" - } - }, - "babel-plugin-extract-import-names": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/babel-plugin-extract-import-names/-/babel-plugin-extract-import-names-1.6.1.tgz", - "integrity": "sha512-u0uRrPyygx4RlNva1aqz7DM9UBpsQJQZ4NyakHVJF18s73H/iiyXuc+X7k+9tHeN0WKLsohQUGzGLli6z5a0Zw==", - "requires": { - "@babel/helper-plugin-utils": "7.8.3" - } - }, - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "requires": { - "ms": "^2.1.1" - } - }, - "is-buffer": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz", - "integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==" - }, - "is-plain-obj": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", - "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==" - }, - "mdast-squeeze-paragraphs": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/mdast-squeeze-paragraphs/-/mdast-squeeze-paragraphs-4.0.0.tgz", - "integrity": "sha512-zxdPn69hkQ1rm4J+2Cs2j6wDEv7O17TfXTJ33tl/+JPIoEmtV9t2ZzBM5LPHE8QlHsmVD8t3vPKCyY3oH+H8MQ==", - "requires": { - "unist-util-remove": "^2.0.0" - } - }, - "mdast-util-definitions": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/mdast-util-definitions/-/mdast-util-definitions-2.0.1.tgz", - "integrity": "sha512-Co+DQ6oZlUzvUR7JCpP249PcexxygiaKk9axJh+eRzHDZJk2julbIdKB4PXHVxdBuLzvJ1Izb+YDpj2deGMOuA==", - "requires": { - "unist-util-visit": "^2.0.0" - } - }, - "mdast-util-to-hast": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-8.2.0.tgz", - "integrity": "sha512-WjH/KXtqU66XyTJQ7tg7sjvTw1OQcVV0hKdFh3BgHPwZ96fSBCQ/NitEHsN70Mmnggt+5eUUC7pCnK+2qGQnCA==", - "requires": { - "collapse-white-space": "^1.0.0", - "detab": "^2.0.0", - "mdast-util-definitions": "^2.0.0", - "mdurl": "^1.0.0", - "trim-lines": "^1.0.0", - "unist-builder": "^2.0.0", - "unist-util-generated": "^1.0.0", - "unist-util-position": "^3.0.0", - "unist-util-visit": "^2.0.0" - } - }, - "parse-entities": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-2.0.0.tgz", - "integrity": "sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==", - "requires": { - "character-entities": "^1.0.0", - "character-entities-legacy": "^1.0.0", - "character-reference-invalid": "^1.0.0", - "is-alphanumerical": "^1.0.0", - "is-decimal": "^1.0.0", - "is-hexadecimal": "^1.0.0" - } - }, - "remark-mdx": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/remark-mdx/-/remark-mdx-1.6.1.tgz", - "integrity": "sha512-UyCqqYFv9l5dstX29QpdqMprBHyUYUEQHOUe0MdFUIm1XATxfVGHbRPtVBFz4ccd5NV1UL/rmsruo9WOswwmpQ==", - "requires": { - "@babel/core": "7.9.0", - "@babel/helper-plugin-utils": "7.8.3", - "@babel/plugin-proposal-object-rest-spread": "7.9.5", - "@babel/plugin-syntax-jsx": "7.8.3", - "@mdx-js/util": "^1.6.1", - "is-alphabetical": "1.0.4", - "remark-parse": "8.0.2", - "unified": "9.0.0" - } - }, - "remark-parse": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-8.0.2.tgz", - "integrity": "sha512-eMI6kMRjsAGpMXXBAywJwiwAse+KNpmt+BK55Oofy4KvBZEqUDj6mWbGLJZrujoPIPPxDXzn3T9baRlpsm2jnQ==", - "requires": { - "ccount": "^1.0.0", - "collapse-white-space": "^1.0.2", - "is-alphabetical": "^1.0.0", - "is-decimal": "^1.0.0", - "is-whitespace-character": "^1.0.0", - "is-word-character": "^1.0.0", - "markdown-escapes": "^1.0.0", - "parse-entities": "^2.0.0", - "repeat-string": "^1.5.4", - "state-toggle": "^1.0.0", - "trim": "0.0.1", - "trim-trailing-lines": "^1.0.0", - "unherit": "^1.0.4", - "unist-util-remove-position": "^2.0.0", - "vfile-location": "^3.0.0", - "xtend": "^4.0.1" - } - }, - "remark-squeeze-paragraphs": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/remark-squeeze-paragraphs/-/remark-squeeze-paragraphs-4.0.0.tgz", - "integrity": "sha512-8qRqmL9F4nuLPIgl92XUuxI3pFxize+F1H0e/W3llTk0UsjJaj01+RrirkMw7P21RKe4X6goQhYRSvNWX+70Rw==", - "requires": { - "mdast-squeeze-paragraphs": "^4.0.0" - } - }, - "unified": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/unified/-/unified-9.0.0.tgz", - "integrity": "sha512-ssFo33gljU3PdlWLjNp15Inqb77d6JnJSfyplGJPT/a+fNRNyCBeveBAYJdO5khKdF6WVHa/yYCC7Xl6BDwZUQ==", - "requires": { - "bail": "^1.0.0", - "extend": "^3.0.0", - "is-buffer": "^2.0.0", - "is-plain-obj": "^2.0.0", - "trough": "^1.0.0", - "vfile": "^4.0.0" - } - }, - "unist-util-is": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.0.2.tgz", - "integrity": "sha512-Ofx8uf6haexJwI1gxWMGg6I/dLnF2yE+KibhD3/diOqY2TinLcqHXCV6OI5gFVn3xQqDH+u0M625pfKwIwgBKQ==" - }, - "unist-util-remove": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/unist-util-remove/-/unist-util-remove-2.0.0.tgz", - "integrity": "sha512-HwwWyNHKkeg/eXRnE11IpzY8JT55JNM1YCwwU9YNCnfzk6s8GhPXrVBBZWiwLeATJbI7euvoGSzcy9M29UeW3g==", - "requires": { - "unist-util-is": "^4.0.0" - } - }, - "unist-util-remove-position": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-2.0.1.tgz", - "integrity": "sha512-fDZsLYIe2uT+oGFnuZmy73K6ZxOPG/Qcm+w7jbEjaFcJgbQ6cqjs/eSPzXhsmGpAsWPkqZM9pYjww5QTn3LHMA==", - "requires": { - "unist-util-visit": "^2.0.0" - } - }, - "vfile-location": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/vfile-location/-/vfile-location-3.0.1.tgz", - "integrity": "sha512-yYBO06eeN/Ki6Kh1QAkgzYpWT1d3Qln+ZCtSbJqFExPl1S3y2qqotJQXoh6qEvl/jDlgpUJolBn3PItVnnZRqQ==" - } - } - }, - "@mdx-js/util": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/@mdx-js/util/-/util-1.6.1.tgz", - "integrity": "sha512-A3TBBjg5iVo8S4TTG0VrW8G9YNLob4+M6rALKjY8Sxr9zPExWQ7iTPUSvJVE7YhF9E08EQMubx1vRal3jtpJ9Q==" - }, - "@mikaelkristiansson/domready": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/@mikaelkristiansson/domready/-/domready-1.0.10.tgz", - "integrity": "sha512-6cDuZeKSCSJ1KvfEQ25Y8OXUjqDJZ+HgUs6dhASWbAX8fxVraTfPsSeRe2bN+4QJDsgUaXaMWBYfRomCr04GGg==" - }, - "@mrmlnc/readdir-enhanced": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz", - "integrity": "sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==", - "requires": { - "call-me-maybe": "^1.0.1", - "glob-to-regexp": "^0.3.0" - } - }, - "@nodelib/fs.scandir": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz", - "integrity": "sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==", - "requires": { - "@nodelib/fs.stat": "2.0.3", - "run-parallel": "^1.1.9" + } + }, + "@mdx-js/util": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/@mdx-js/util/-/util-1.6.1.tgz", + "integrity": "sha512-A3TBBjg5iVo8S4TTG0VrW8G9YNLob4+M6rALKjY8Sxr9zPExWQ7iTPUSvJVE7YhF9E08EQMubx1vRal3jtpJ9Q==" + }, + "@mikaelkristiansson/domready": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/@mikaelkristiansson/domready/-/domready-1.0.10.tgz", + "integrity": "sha512-6cDuZeKSCSJ1KvfEQ25Y8OXUjqDJZ+HgUs6dhASWbAX8fxVraTfPsSeRe2bN+4QJDsgUaXaMWBYfRomCr04GGg==" + }, + "@mrmlnc/readdir-enhanced": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz", + "integrity": "sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==", + "requires": { + "call-me-maybe": "^1.0.1", + "glob-to-regexp": "^0.3.0" + } + }, + "@nodelib/fs.scandir": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz", + "integrity": "sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==", + "requires": { + "@nodelib/fs.stat": "2.0.3", + "run-parallel": "^1.1.9" }, "dependencies": { "@nodelib/fs.stat": { @@ -3341,99 +2968,16 @@ } }, "@pmmmwh/react-refresh-webpack-plugin": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.2.0.tgz", - "integrity": "sha512-rjdNzcWroULJeD/Y0+eETy9LhM7c5tbPF+wqT5G680rwDkh3iothIPEqGAuEE2WJlXEaAq293aO6ySzsIU518Q==", + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.3.1.tgz", + "integrity": "sha512-JlbMOHNtoaLV5LR/GWpfDZht5qQqMr2E6Fcto2GcGCiVSDWN9C9wac+WNhGWaAfKh9pLOlz3EX4DkWl4Tb7sCg==", "requires": { "ansi-html": "^0.0.7", - "error-stack-parser": "^2.0.4", + "error-stack-parser": "^2.0.6", "html-entities": "^1.2.1", "lodash.debounce": "^4.0.8", - "react-dev-utils": "^9.1.0" - }, - "dependencies": { - "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==" - }, - "browserslist": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.7.0.tgz", - "integrity": "sha512-9rGNDtnj+HaahxiVV38Gn8n8Lr8REKsel68v1sPFfIGEK6uSXTY3h9acgiT1dZVtOOUtifo/Dn8daDQ5dUgVsA==", - "requires": { - "caniuse-lite": "^1.0.30000989", - "electron-to-chromium": "^1.3.247", - "node-releases": "^1.1.29" - } - }, - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "requires": { - "ms": "2.0.0" - } - }, - "detect-port-alt": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/detect-port-alt/-/detect-port-alt-1.1.6.tgz", - "integrity": "sha512-5tQykt+LqfJFBEYaDITx7S7cR7mJ/zQmLXZ2qt5w04ainYZw6tBf9dBunMjVeVOdYVRUzUOE4HkY5J7+uttb5Q==", - "requires": { - "address": "^1.0.1", - "debug": "^2.6.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" - }, - "react-dev-utils": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-9.1.0.tgz", - "integrity": "sha512-X2KYF/lIGyGwP/F/oXgGDF24nxDA2KC4b7AFto+eqzc/t838gpSGiaU8trTqHXOohuLxxc5qi1eDzsl9ucPDpg==", - "requires": { - "@babel/code-frame": "7.5.5", - "address": "1.1.2", - "browserslist": "4.7.0", - "chalk": "2.4.2", - "cross-spawn": "6.0.5", - "detect-port-alt": "1.1.6", - "escape-string-regexp": "1.0.5", - "filesize": "3.6.1", - "find-up": "3.0.0", - "fork-ts-checker-webpack-plugin": "1.5.0", - "global-modules": "2.0.0", - "globby": "8.0.2", - "gzip-size": "5.1.1", - "immer": "1.10.0", - "inquirer": "6.5.0", - "is-root": "2.1.0", - "loader-utils": "1.2.3", - "open": "^6.3.0", - "pkg-up": "2.0.0", - "react-error-overlay": "^6.0.3", - "recursive-readdir": "2.2.2", - "shell-quote": "1.7.2", - "sockjs-client": "1.4.0", - "strip-ansi": "5.2.0", - "text-table": "0.2.0" - } - }, - "react-error-overlay": { - "version": "6.0.7", - "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.7.tgz", - "integrity": "sha512-TAv1KJFh3RhqxNvhzxj6LeT5NWklP6rDr2a0jaTfsZ5wSZWHOGeqQyejUp3xxLfPt2UpyJEcVQB/zyPcmonNFA==" - }, - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "requires": { - "ansi-regex": "^4.1.0" - } - } + "native-url": "^0.2.6", + "schema-utils": "^2.6.5" } }, "@reach/router": { @@ -3634,9 +3178,9 @@ "integrity": "sha512-wLD/Aq2VggCJXSjxEwrMafIP51Z+13H78nXIX0ABEuIGhmB5sNGbR113MOKo+yfw+RDo1ZU3DM6yfnnRF/+ouw==" }, "@types/istanbul-lib-coverage": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz", - "integrity": "sha512-hRJD2ahnnpLgsj6KWMYSrmXkM3rm2Dl1qkx6IOFD5FnuNPXJIG5L0dhgKXCYTRMGzU4n0wImQ/xfmRc4POUFlg==" + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.2.tgz", + "integrity": "sha512-rsZg7eL+Xcxsxk2XlBt9KcG8nOp9iYdKCOikY9x2RFJCyOdNj4MKPQty0e8oZr29vVAzKXr1BmR+kZauti3o1w==" }, "@types/istanbul-lib-report": { "version": "3.0.0", @@ -3647,9 +3191,9 @@ } }, "@types/istanbul-reports": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.1.tgz", - "integrity": "sha512-UpYjBi8xefVChsCoBpKShdxTllC9pwISirfoZsUa2AAdQg/Jd2KQGtSbw+ya7GPo7x/wAPlH6JBhKhAsXUEZNA==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz", + "integrity": "sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==", "requires": { "@types/istanbul-lib-coverage": "*", "@types/istanbul-lib-report": "*" @@ -3661,9 +3205,9 @@ "integrity": "sha512-8+KAKzEvSUdeo+kmqnKrqgeE+LcA0tjYWFY7RPProVYwnqDjukzO+3b6dLD56rYX5TdWejnEOLJYOIeh4CXKuA==" }, "@types/lodash": { - "version": "4.14.150", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.150.tgz", - "integrity": "sha512-kMNLM5JBcasgYscD9x/Gvr6lTAv2NVgsKtet/hm93qMyf/D1pt+7jeEZklKJKxMVmXjxbRVQQGfqDSfipYCO6w==" + "version": "4.14.151", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.151.tgz", + "integrity": "sha512-Zst90IcBX5wnwSu7CAS0vvJkTjTELY4ssKbHiTnGcJgi170uiS8yQDdc3v6S77bRqYQIN1App5a1Pc2lceE5/g==" }, "@types/mdast": { "version": "3.0.3", @@ -3716,9 +3260,9 @@ } }, "@types/react": { - "version": "16.9.34", - "resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.34.tgz", - "integrity": "sha512-8AJlYMOfPe1KGLKyHpflCg5z46n0b5DbRfqDksxBLBTUpB75ypDBAO9eCUcjNwE6LCUslwTz00yyG/X9gaVtow==", + "version": "16.9.35", + "resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.35.tgz", + "integrity": "sha512-q0n0SsWcGc8nDqH2GJfWQWUOmZSJhXV64CjVN5SvcNti3TdEaA3AH0D8DwNmMdzjMAC/78tB8nAZIlV8yTz+zQ==", "requires": { "@types/prop-types": "*", "csstype": "^2.2.0" @@ -3775,9 +3319,9 @@ } }, "@types/yargs": { - "version": "15.0.4", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.4.tgz", - "integrity": "sha512-9T1auFmbPZoxHz0enUFlUuKRy3it01R+hlggyVUMtnCTQRunsQYifnSGb8hET4Xo8yiC0o0r1paW3ud5+rbURg==", + "version": "15.0.5", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz", + "integrity": "sha512-Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w==", "requires": { "@types/yargs-parser": "*" } @@ -3794,49 +3338,49 @@ "optional": true }, "@typescript-eslint/eslint-plugin": { - "version": "2.30.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.30.0.tgz", - "integrity": "sha512-PGejii0qIZ9Q40RB2jIHyUpRWs1GJuHP1pkoCiaeicfwO9z7Fx03NQzupuyzAmv+q9/gFNHu7lo1ByMXe8PNyg==", + "version": "2.33.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.33.0.tgz", + "integrity": "sha512-QV6P32Btu1sCI/kTqjTNI/8OpCYyvlGjW5vD8MpTIg+HGE5S88HtT1G+880M4bXlvXj/NjsJJG0aGcVh0DdbeQ==", "requires": { - "@typescript-eslint/experimental-utils": "2.30.0", + "@typescript-eslint/experimental-utils": "2.33.0", "functional-red-black-tree": "^1.0.1", "regexpp": "^3.0.0", "tsutils": "^3.17.1" } }, "@typescript-eslint/experimental-utils": { - "version": "2.30.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.30.0.tgz", - "integrity": "sha512-L3/tS9t+hAHksy8xuorhOzhdefN0ERPDWmR9CclsIGOUqGKy6tqc/P+SoXeJRye5gazkuPO0cK9MQRnolykzkA==", + "version": "2.33.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.33.0.tgz", + "integrity": "sha512-qzPM2AuxtMrRq78LwyZa8Qn6gcY8obkIrBs1ehqmQADwkYzTE1Pb4y2W+U3rE/iFkSWcWHG2LS6MJfj6SmHApg==", "requires": { "@types/json-schema": "^7.0.3", - "@typescript-eslint/typescript-estree": "2.30.0", + "@typescript-eslint/typescript-estree": "2.33.0", "eslint-scope": "^5.0.0", "eslint-utils": "^2.0.0" } }, "@typescript-eslint/parser": { - "version": "2.30.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.30.0.tgz", - "integrity": "sha512-9kDOxzp0K85UnpmPJqUzdWaCNorYYgk1yZmf4IKzpeTlSAclnFsrLjfwD9mQExctLoLoGAUXq1co+fbr+3HeFw==", + "version": "2.33.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.33.0.tgz", + "integrity": "sha512-AUtmwUUhJoH6yrtxZMHbRUEMsC2G6z5NSxg9KsROOGqNXasM71I8P2NihtumlWTUCRld70vqIZ6Pm4E5PAziEA==", "requires": { "@types/eslint-visitor-keys": "^1.0.0", - "@typescript-eslint/experimental-utils": "2.30.0", - "@typescript-eslint/typescript-estree": "2.30.0", + "@typescript-eslint/experimental-utils": "2.33.0", + "@typescript-eslint/typescript-estree": "2.33.0", "eslint-visitor-keys": "^1.1.0" } }, "@typescript-eslint/typescript-estree": { - "version": "2.30.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.30.0.tgz", - "integrity": "sha512-nI5WOechrA0qAhnr+DzqwmqHsx7Ulr/+0H7bWCcClDhhWkSyZR5BmTvnBEyONwJCTWHfc5PAQExX24VD26IAVw==", + "version": "2.33.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.33.0.tgz", + "integrity": "sha512-d8rY6/yUxb0+mEwTShCQF2zYQdLlqihukNfG9IUlLYz5y1CH6G/9XYbrxQLq3Z14RNvkCC6oe+OcFlyUpwUbkg==", "requires": { "debug": "^4.1.1", "eslint-visitor-keys": "^1.1.0", "glob": "^7.1.6", "is-glob": "^4.0.1", "lodash": "^4.17.15", - "semver": "^6.3.0", + "semver": "^7.3.2", "tsutils": "^3.17.1" }, "dependencies": { @@ -3849,16 +3393,16 @@ } }, "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", + "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==" } } }, "@urql/core": { - "version": "1.11.7", - "resolved": "https://registry.npmjs.org/@urql/core/-/core-1.11.7.tgz", - "integrity": "sha512-0LGOfohIoCmBf66QEV8pdwehJUZkViGZLmwPoHwcZUx1ONgKsGTzjdNBdNnvCzfuaRLlsXj8r7GmO5M6oVKjsg==", + "version": "1.11.8", + "resolved": "https://registry.npmjs.org/@urql/core/-/core-1.11.8.tgz", + "integrity": "sha512-lBlCjw3sLlblGIzRVg583IdsONUIt04f/LHI0oiEgNlPViZcRR3B31LCKyOChba/klIqSaDivaqCfzg5wyTPoQ==", "requires": { "wonka": "^4.0.10" } @@ -4208,9 +3752,9 @@ "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==" }, "arch": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/arch/-/arch-2.1.1.tgz", - "integrity": "sha512-BLM56aPo9vLLFVa8+/+pJLnrZ7QGGTVHWsCwieAWT9o9K8UeGaQbzZbGoabWLOo2ksBCztoXdqBZBplqLDDCSg==" + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/arch/-/arch-2.1.2.tgz", + "integrity": "sha512-NTBIIbAfkJeIletyABbVtdPgeKfDafR+1mZV/AyyfC1UkVkp9iUjV+wwmqtUgphHYajbI86jejBJp5e+jkGTiQ==" }, "argparse": { "version": "1.0.10", @@ -4348,12 +3892,9 @@ "integrity": "sha1-FziZ0//Rx9k4PkR5Ul2+J4yrXys=" }, "array-union": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", - "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", - "requires": { - "array-uniq": "^1.0.1" - } + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", + "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==" }, "array-uniq": { "version": "1.0.3", @@ -4438,9 +3979,10 @@ "integrity": "sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==" }, "arrify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", - "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=" + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz", + "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==", + "optional": true }, "asap": { "version": "2.0.6", @@ -4552,34 +4094,6 @@ "num2fraction": "^1.2.2", "postcss": "^7.0.27", "postcss-value-parser": "^4.0.3" - }, - "dependencies": { - "browserslist": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.12.0.tgz", - "integrity": "sha512-UH2GkcEDSI0k/lRkuDSzFl9ZZ87skSy9w2XAn1MsZnL+4c4rqbBd3e82UWHbYDpztABrPBhZsTEeuxVfHppqDg==", - "requires": { - "caniuse-lite": "^1.0.30001043", - "electron-to-chromium": "^1.3.413", - "node-releases": "^1.1.53", - "pkg-up": "^2.0.0" - } - }, - "caniuse-lite": { - "version": "1.0.30001048", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001048.tgz", - "integrity": "sha512-g1iSHKVxornw0K8LG9LLdf+Fxnv7T1Z+mMsf0/YYLclQX4Cd522Ap0Lrw6NFqHgezit78dtyWxzlV2Xfc7vgRg==" - }, - "electron-to-chromium": { - "version": "1.3.427", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.427.tgz", - "integrity": "sha512-/rG5G7Opcw68/Yrb4qYkz07h3bESVRJjUl4X/FrKLXzoUJleKm6D7K7rTTz8V5LUWnd+BbTOyxJX2XprRqHD8A==" - }, - "node-releases": { - "version": "1.1.53", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.53.tgz", - "integrity": "sha512-wp8zyQVwef2hpZ/dJH7SfSrIPD6YoJz6BDQDpGEkcA0s3LpAQoxBIYmfIq6QAhC1DhwsyCgTaTTcONwX8qzCuQ==" - } } }, "aws-sign2": { @@ -4854,9 +4368,9 @@ } }, "babel-plugin-remove-graphql-queries": { - "version": "2.9.0", - "resolved": "https://registry.npmjs.org/babel-plugin-remove-graphql-queries/-/babel-plugin-remove-graphql-queries-2.9.0.tgz", - "integrity": "sha512-lvunFJ/JPhQHh5nOGepg1V5aX4zmbBgrd7qjlBObvQHF7Enz0yh6PznKnwtIX54i+bMOrWPUjCZUPXg3Xs+FLQ==" + "version": "2.9.1", + "resolved": "https://registry.npmjs.org/babel-plugin-remove-graphql-queries/-/babel-plugin-remove-graphql-queries-2.9.1.tgz", + "integrity": "sha512-Ua41OqiQ0yUi/9ZvbdhCKCkiCAdwCSVxtf5umV1scD6mMYd70eIA9or3M2nxhqHJ2leSRCYdyu771seEICkC3Q==" }, "babel-plugin-syntax-jsx": { "version": "6.18.0", @@ -4869,349 +4383,37 @@ "integrity": "sha512-eqj0hVcJUR57/Ug2zE1Yswsw4LhuqqHhD+8v120T1cl3kjg76QwtyBrdIk4WVwK+lAhBJVYCd/v+4nc4y+8JsA==" }, "babel-preset-gatsby": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/babel-preset-gatsby/-/babel-preset-gatsby-0.4.0.tgz", - "integrity": "sha512-LbzP0CYBhSb9Y/rniMS2tgvtn3/8Yk1wEQ4McxuCemZkhvcCEPsqN38vqFkhn74MTQIwY8o0v9DgKE42N50c+Q==", + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/babel-preset-gatsby/-/babel-preset-gatsby-0.4.2.tgz", + "integrity": "sha512-PegbKTUBGCkDqwI68uF/rKrHNJ2ZP/WYiSgVa+xmseywqRtrw03kKIcmzM/j3jAOVo/efVW545KKzd2wPc9wjw==", "requires": { "@babel/plugin-proposal-class-properties": "^7.8.3", "@babel/plugin-proposal-nullish-coalescing-operator": "^7.8.3", "@babel/plugin-proposal-optional-chaining": "^7.9.0", "@babel/plugin-syntax-dynamic-import": "^7.8.3", - "@babel/plugin-transform-runtime": "^7.9.0", + "@babel/plugin-transform-runtime": "^7.9.6", "@babel/plugin-transform-spread": "^7.8.3", - "@babel/preset-env": "^7.9.5", + "@babel/preset-env": "^7.9.6", "@babel/preset-react": "^7.9.4", - "@babel/runtime": "^7.9.2", + "@babel/runtime": "^7.9.6", "babel-plugin-dynamic-import-node": "^2.3.3", "babel-plugin-macros": "^2.8.0", "babel-plugin-transform-react-remove-prop-types": "^0.4.24", - "gatsby-core-utils": "^1.2.0" + "gatsby-core-utils": "^1.2.2" }, "dependencies": { - "@babel/compat-data": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.9.6.tgz", - "integrity": "sha512-5QPTrNen2bm7RBc7dsOmcA5hbrS4O2Vhmk5XOL4zWW/zD/hV0iinpefDlkm+tBBy8kDtFaaeEvmAqt+nURAV2g==", - "requires": { - "browserslist": "^4.11.1", - "invariant": "^2.2.4", - "semver": "^5.5.0" - } - }, - "@babel/helper-compilation-targets": { + "@babel/runtime": { "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.9.6.tgz", - "integrity": "sha512-x2Nvu0igO0ejXzx09B/1fGBxY9NXQlBW2kZsSxCJft+KHN8t9XWzIvFxtPHnBOAXpVsdxZKZFbRUC8TsNKajMw==", - "requires": { - "@babel/compat-data": "^7.9.6", - "browserslist": "^4.11.1", - "invariant": "^2.2.4", - "levenary": "^1.1.1", - "semver": "^5.5.0" - } - }, - "@babel/helper-create-regexp-features-plugin": { - "version": "7.8.8", - "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.8.tgz", - "integrity": "sha512-LYVPdwkrQEiX9+1R29Ld/wTrmQu1SSKYnuOk3g0CkcZMA1p0gsNxJFj/3gBdaJ7Cg0Fnek5z0DsMULePP7Lrqg==", - "requires": { - "@babel/helper-annotate-as-pure": "^7.8.3", - "@babel/helper-regex": "^7.8.3", - "regexpu-core": "^4.7.0" - } - }, - "@babel/helper-function-name": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz", - "integrity": "sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.6.tgz", + "integrity": "sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==", "requires": { - "@babel/helper-get-function-arity": "^7.8.3", - "@babel/template": "^7.8.3", - "@babel/types": "^7.9.5" - } - }, - "@babel/helper-plugin-utils": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", - "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" - }, - "@babel/helper-regex": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.8.3.tgz", - "integrity": "sha512-BWt0QtYv/cg/NecOAZMdcn/waj/5P26DR4mVLXfFtDokSR6fyuG0Pj+e2FqtSME+MqED1khnSMulkmGl8qWiUQ==", - "requires": { - "lodash": "^4.17.13" - } - }, - "@babel/helper-validator-identifier": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz", - "integrity": "sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==" - }, - "@babel/plugin-proposal-object-rest-spread": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.6.tgz", - "integrity": "sha512-Ga6/fhGqA9Hj+y6whNpPv8psyaK5xzrQwSPsGPloVkvmH+PqW1ixdnfJ9uIO06OjQNYol3PMnfmJ8vfZtkzF+A==", - "requires": { - "@babel/helper-plugin-utils": "^7.8.3", - "@babel/plugin-syntax-object-rest-spread": "^7.8.0", - "@babel/plugin-transform-parameters": "^7.9.5" - } - }, - "@babel/plugin-proposal-unicode-property-regex": { - "version": "7.8.8", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.8.tgz", - "integrity": "sha512-EVhjVsMpbhLw9ZfHWSx2iy13Q8Z/eg8e8ccVWt23sWQK5l1UdkoLJPN5w69UA4uITGBnEZD2JOe4QOHycYKv8A==", - "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.8.8", - "@babel/helper-plugin-utils": "^7.8.3" - } - }, - "@babel/plugin-transform-classes": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.9.5.tgz", - "integrity": "sha512-x2kZoIuLC//O5iA7PEvecB105o7TLzZo8ofBVhP79N+DO3jaX+KYfww9TQcfBEZD0nikNyYcGB1IKtRq36rdmg==", - "requires": { - "@babel/helper-annotate-as-pure": "^7.8.3", - "@babel/helper-define-map": "^7.8.3", - "@babel/helper-function-name": "^7.9.5", - "@babel/helper-optimise-call-expression": "^7.8.3", - "@babel/helper-plugin-utils": "^7.8.3", - "@babel/helper-replace-supers": "^7.8.6", - "@babel/helper-split-export-declaration": "^7.8.3", - "globals": "^11.1.0" - } - }, - "@babel/plugin-transform-destructuring": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.9.5.tgz", - "integrity": "sha512-j3OEsGel8nHL/iusv/mRd5fYZ3DrOxWC82x0ogmdN/vHfAP4MYw+AFKYanzWlktNwikKvlzUV//afBW5FTp17Q==", - "requires": { - "@babel/helper-plugin-utils": "^7.8.3" - } - }, - "@babel/plugin-transform-dotall-regex": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.8.3.tgz", - "integrity": "sha512-kLs1j9Nn4MQoBYdRXH6AeaXMbEJFaFu/v1nQkvib6QzTj8MZI5OQzqmD83/2jEM1z0DLilra5aWO5YpyC0ALIw==", - "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.8.3", - "@babel/helper-plugin-utils": "^7.8.3" - } - }, - "@babel/plugin-transform-modules-amd": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.9.6.tgz", - "integrity": "sha512-zoT0kgC3EixAyIAU+9vfaUVKTv9IxBDSabgHoUCBP6FqEJ+iNiN7ip7NBKcYqbfUDfuC2mFCbM7vbu4qJgOnDw==", - "requires": { - "@babel/helper-module-transforms": "^7.9.0", - "@babel/helper-plugin-utils": "^7.8.3", - "babel-plugin-dynamic-import-node": "^2.3.3" - } - }, - "@babel/plugin-transform-modules-commonjs": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.6.tgz", - "integrity": "sha512-7H25fSlLcn+iYimmsNe3uK1at79IE6SKW9q0/QeEHTMC9MdOZ+4bA+T1VFB5fgOqBWoqlifXRzYD0JPdmIrgSQ==", - "requires": { - "@babel/helper-module-transforms": "^7.9.0", - "@babel/helper-plugin-utils": "^7.8.3", - "@babel/helper-simple-access": "^7.8.3", - "babel-plugin-dynamic-import-node": "^2.3.3" - } - }, - "@babel/plugin-transform-modules-systemjs": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.9.6.tgz", - "integrity": "sha512-NW5XQuW3N2tTHim8e1b7qGy7s0kZ2OH3m5octc49K1SdAKGxYxeIx7hiIz05kS1R2R+hOWcsr1eYwcGhrdHsrg==", - "requires": { - "@babel/helper-hoist-variables": "^7.8.3", - "@babel/helper-module-transforms": "^7.9.0", - "@babel/helper-plugin-utils": "^7.8.3", - "babel-plugin-dynamic-import-node": "^2.3.3" - } - }, - "@babel/plugin-transform-parameters": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.9.5.tgz", - "integrity": "sha512-0+1FhHnMfj6lIIhVvS4KGQJeuhe1GI//h5uptK4PvLt+BGBxsoUJbd3/IW002yk//6sZPlFgsG1hY6OHLcy6kA==", - "requires": { - "@babel/helper-get-function-arity": "^7.8.3", - "@babel/helper-plugin-utils": "^7.8.3" - } - }, - "@babel/preset-env": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.9.6.tgz", - "integrity": "sha512-0gQJ9RTzO0heXOhzftog+a/WyOuqMrAIugVYxMYf83gh1CQaQDjMtsOpqOwXyDL/5JcWsrCm8l4ju8QC97O7EQ==", - "requires": { - "@babel/compat-data": "^7.9.6", - "@babel/helper-compilation-targets": "^7.9.6", - "@babel/helper-module-imports": "^7.8.3", - "@babel/helper-plugin-utils": "^7.8.3", - "@babel/plugin-proposal-async-generator-functions": "^7.8.3", - "@babel/plugin-proposal-dynamic-import": "^7.8.3", - "@babel/plugin-proposal-json-strings": "^7.8.3", - "@babel/plugin-proposal-nullish-coalescing-operator": "^7.8.3", - "@babel/plugin-proposal-numeric-separator": "^7.8.3", - "@babel/plugin-proposal-object-rest-spread": "^7.9.6", - "@babel/plugin-proposal-optional-catch-binding": "^7.8.3", - "@babel/plugin-proposal-optional-chaining": "^7.9.0", - "@babel/plugin-proposal-unicode-property-regex": "^7.8.3", - "@babel/plugin-syntax-async-generators": "^7.8.0", - "@babel/plugin-syntax-dynamic-import": "^7.8.0", - "@babel/plugin-syntax-json-strings": "^7.8.0", - "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0", - "@babel/plugin-syntax-numeric-separator": "^7.8.0", - "@babel/plugin-syntax-object-rest-spread": "^7.8.0", - "@babel/plugin-syntax-optional-catch-binding": "^7.8.0", - "@babel/plugin-syntax-optional-chaining": "^7.8.0", - "@babel/plugin-syntax-top-level-await": "^7.8.3", - "@babel/plugin-transform-arrow-functions": "^7.8.3", - "@babel/plugin-transform-async-to-generator": "^7.8.3", - "@babel/plugin-transform-block-scoped-functions": "^7.8.3", - "@babel/plugin-transform-block-scoping": "^7.8.3", - "@babel/plugin-transform-classes": "^7.9.5", - "@babel/plugin-transform-computed-properties": "^7.8.3", - "@babel/plugin-transform-destructuring": "^7.9.5", - "@babel/plugin-transform-dotall-regex": "^7.8.3", - "@babel/plugin-transform-duplicate-keys": "^7.8.3", - "@babel/plugin-transform-exponentiation-operator": "^7.8.3", - "@babel/plugin-transform-for-of": "^7.9.0", - "@babel/plugin-transform-function-name": "^7.8.3", - "@babel/plugin-transform-literals": "^7.8.3", - "@babel/plugin-transform-member-expression-literals": "^7.8.3", - "@babel/plugin-transform-modules-amd": "^7.9.6", - "@babel/plugin-transform-modules-commonjs": "^7.9.6", - "@babel/plugin-transform-modules-systemjs": "^7.9.6", - "@babel/plugin-transform-modules-umd": "^7.9.0", - "@babel/plugin-transform-named-capturing-groups-regex": "^7.8.3", - "@babel/plugin-transform-new-target": "^7.8.3", - "@babel/plugin-transform-object-super": "^7.8.3", - "@babel/plugin-transform-parameters": "^7.9.5", - "@babel/plugin-transform-property-literals": "^7.8.3", - "@babel/plugin-transform-regenerator": "^7.8.7", - "@babel/plugin-transform-reserved-words": "^7.8.3", - "@babel/plugin-transform-shorthand-properties": "^7.8.3", - "@babel/plugin-transform-spread": "^7.8.3", - "@babel/plugin-transform-sticky-regex": "^7.8.3", - "@babel/plugin-transform-template-literals": "^7.8.3", - "@babel/plugin-transform-typeof-symbol": "^7.8.4", - "@babel/plugin-transform-unicode-regex": "^7.8.3", - "@babel/preset-modules": "^0.1.3", - "@babel/types": "^7.9.6", - "browserslist": "^4.11.1", - "core-js-compat": "^3.6.2", - "invariant": "^2.2.2", - "levenary": "^1.1.1", - "semver": "^5.5.0" - } - }, - "@babel/runtime": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.6.tgz", - "integrity": "sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==", - "requires": { - "regenerator-runtime": "^0.13.4" - } - }, - "@babel/types": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.6.tgz", - "integrity": "sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA==", - "requires": { - "@babel/helper-validator-identifier": "^7.9.5", - "lodash": "^4.17.13", - "to-fast-properties": "^2.0.0" - } - }, - "babel-plugin-dynamic-import-node": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz", - "integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==", - "requires": { - "object.assign": "^4.1.0" - } - }, - "browserslist": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.12.0.tgz", - "integrity": "sha512-UH2GkcEDSI0k/lRkuDSzFl9ZZ87skSy9w2XAn1MsZnL+4c4rqbBd3e82UWHbYDpztABrPBhZsTEeuxVfHppqDg==", - "requires": { - "caniuse-lite": "^1.0.30001043", - "electron-to-chromium": "^1.3.413", - "node-releases": "^1.1.53", - "pkg-up": "^2.0.0" - } - }, - "caniuse-lite": { - "version": "1.0.30001048", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001048.tgz", - "integrity": "sha512-g1iSHKVxornw0K8LG9LLdf+Fxnv7T1Z+mMsf0/YYLclQX4Cd522Ap0Lrw6NFqHgezit78dtyWxzlV2Xfc7vgRg==" - }, - "electron-to-chromium": { - "version": "1.3.427", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.427.tgz", - "integrity": "sha512-/rG5G7Opcw68/Yrb4qYkz07h3bESVRJjUl4X/FrKLXzoUJleKm6D7K7rTTz8V5LUWnd+BbTOyxJX2XprRqHD8A==" - }, - "gatsby-core-utils": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.2.0.tgz", - "integrity": "sha512-JBsVbniXObn26Hms8Je1vJdhMW04GesochBVLcaTraZC5dfqZDExPix65jrye/voC0YfFtXIngm59yspYZm1OQ==", - "requires": { - "ci-info": "2.0.0", - "configstore": "^5.0.1", - "node-object-hash": "^2.0.0" - } - }, - "jsesc": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", - "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=" - }, - "node-releases": { - "version": "1.1.53", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.53.tgz", - "integrity": "sha512-wp8zyQVwef2hpZ/dJH7SfSrIPD6YoJz6BDQDpGEkcA0s3LpAQoxBIYmfIq6QAhC1DhwsyCgTaTTcONwX8qzCuQ==" - }, - "regenerate-unicode-properties": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz", - "integrity": "sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==", - "requires": { - "regenerate": "^1.4.0" + "regenerator-runtime": "^0.13.4" } }, "regenerator-runtime": { "version": "0.13.5", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==" - }, - "regexpu-core": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.0.tgz", - "integrity": "sha512-TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ==", - "requires": { - "regenerate": "^1.4.0", - "regenerate-unicode-properties": "^8.2.0", - "regjsgen": "^0.5.1", - "regjsparser": "^0.6.4", - "unicode-match-property-ecmascript": "^1.0.4", - "unicode-match-property-value-ecmascript": "^1.2.0" - } - }, - "regjsparser": { - "version": "0.6.4", - "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.4.tgz", - "integrity": "sha512-64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==", - "requires": { - "jsesc": "~0.5.0" - } - }, - "unicode-match-property-value-ecmascript": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz", - "integrity": "sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==" } } }, @@ -5698,19 +4900,20 @@ } }, "browserslist": { - "version": "4.9.1", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.9.1.tgz", - "integrity": "sha512-Q0DnKq20End3raFulq6Vfp1ecB9fh8yUNV55s8sekaDDeqBaCtWlRHCUdaWyUeSSBJM7IbM6HcsyaeYqgeDhnw==", + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.12.0.tgz", + "integrity": "sha512-UH2GkcEDSI0k/lRkuDSzFl9ZZ87skSy9w2XAn1MsZnL+4c4rqbBd3e82UWHbYDpztABrPBhZsTEeuxVfHppqDg==", "requires": { - "caniuse-lite": "^1.0.30001030", - "electron-to-chromium": "^1.3.363", - "node-releases": "^1.1.50" + "caniuse-lite": "^1.0.30001043", + "electron-to-chromium": "^1.3.413", + "node-releases": "^1.1.53", + "pkg-up": "^2.0.0" }, "dependencies": { "electron-to-chromium": { - "version": "1.3.376", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.376.tgz", - "integrity": "sha512-cv/PYVz5szeMz192ngilmezyPNFkUjuynuL2vNdiqIrio440nfTDdc0JJU0TS2KHLSVCs9gBbt4CFqM+HcBnjw==" + "version": "1.3.441", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.441.tgz", + "integrity": "sha512-leBfJwLuyGs1jEei2QioI+PjVMavmUIvPYidE8dCCYWLAq0uefhN3NYgDNb8WxD3uiUNnJ3ScMXg0upSlwySzQ==" } } }, @@ -5979,9 +5182,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001035", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001035.tgz", - "integrity": "sha512-C1ZxgkuA4/bUEdMbU5WrGY4+UhMFFiXrgNAfxiMIqWgFTWfv/xsZCS2xEHT2LMq7xAZfuAnu6mcqyDl0ZR6wLQ==" + "version": "1.0.30001061", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001061.tgz", + "integrity": "sha512-SMICCeiNvMZnyXpuoO+ot7FHpMVPlrsR+HmfByj6nY4xYDHXLqMTbgH7ecEkDNXWkH1vaip+ZS0D7VTXwM1KYQ==" }, "caseless": { "version": "0.12.0", @@ -6283,11 +5486,11 @@ "integrity": "sha512-gpaBrMAizVEANOpfZp/EEUixTXDyGt7DFzdK5hU+UbWt/J0lB0w20ncZj59Z9a93xHb9u12zF5BS6i9RKbtg4w==" }, "cli-cursor": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz", - "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", + "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", "requires": { - "restore-cursor": "^2.0.0" + "restore-cursor": "^3.1.0" } }, "cli-spinners": { @@ -6519,11 +5722,6 @@ "q": "^1.1.2" } }, - "code-point-at": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", - "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" - }, "collapse-white-space": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.6.tgz", @@ -7552,9 +6750,9 @@ "integrity": "sha512-68s5jYdlvasItOJnCuI2Q9s4q98g0pCyL3HrcKJu8KNugUl8ahgmZYg38ysLTgQjjXX3H8CJLkAvWrclWfcalw==" }, "date-fns": { - "version": "2.12.0", - "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.12.0.tgz", - "integrity": "sha512-qJgn99xxKnFgB1qL4jpxU7Q2t0LOn1p8KMIveef3UZD7kqjT3tpFNNdXJelEHhE+rUgffriXriw/sOSU+cS1Hw==" + "version": "2.13.0", + "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.13.0.tgz", + "integrity": "sha512-xm0c61mevGF7f0XpCGtDTGpzEFC/1fpLXHbmFpxZZQJuvByIK2ozm6cSYuU+nxFYOPh2EuCfzUwlTEFwKG+h5w==" }, "debug": { "version": "3.2.6", @@ -7706,190 +6904,81 @@ "p-map": "^3.0.0", "rimraf": "^3.0.0", "slash": "^3.0.0" + } + }, + "delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=" + }, + "delegate": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz", + "integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw==", + "optional": true + }, + "depd": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", + "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=" + }, + "des.js": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz", + "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=", + "requires": { + "inherits": "^2.0.1", + "minimalistic-assert": "^1.0.0" + } + }, + "destroy": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", + "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=" + }, + "detab": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/detab/-/detab-2.0.3.tgz", + "integrity": "sha512-Up8P0clUVwq0FnFjDclzZsy9PadzRn5FFxrr47tQQvMHqyiFYVbpH8oXDzWtF0Q7pYy3l+RPmtBl+BsFF6wH0A==", + "requires": { + "repeat-string": "^1.5.4" + } + }, + "detect-indent": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-6.0.0.tgz", + "integrity": "sha512-oSyFlqaTHCItVRGK5RmrmjB+CmaMOW7IaNA/kdxqhoa6d17j/5ce9O9eWXmV/KEdRwqpQA+Vqe8a8Bsybu4YnA==" + }, + "detect-newline": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-1.0.3.tgz", + "integrity": "sha1-6XsQA4d9cMCa8a81v63/Fo3kkg0=", + "requires": { + "get-stdin": "^4.0.1", + "minimist": "^1.1.0" + } + }, + "detect-node": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz", + "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==" + }, + "detect-port": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/detect-port/-/detect-port-1.3.0.tgz", + "integrity": "sha512-E+B1gzkl2gqxt1IhUzwjrxBKRqx1UzC3WLONHinn8S3T6lwV/agVCyitiFOsGJ/eYuEUBvD71MZHy3Pv1G9doQ==", + "requires": { + "address": "^1.0.1", + "debug": "^2.6.0" }, "dependencies": { - "@nodelib/fs.stat": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz", - "integrity": "sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==" - }, - "array-union": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", - "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==" - }, - "braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", - "requires": { - "fill-range": "^7.0.1" - } - }, - "dir-glob": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", - "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", - "requires": { - "path-type": "^4.0.0" - } - }, - "fast-glob": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.2.tgz", - "integrity": "sha512-UDV82o4uQyljznxwMxyVRJgZZt3O5wENYojjzbaGEGZgeOxkLFf+V4cnUD+krzb2F72E18RhamkMZ7AdeggF7A==", - "requires": { - "@nodelib/fs.stat": "^2.0.2", - "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.0", - "merge2": "^1.3.0", - "micromatch": "^4.0.2", - "picomatch": "^2.2.1" - } - }, - "fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", - "requires": { - "to-regex-range": "^5.0.1" - } - }, - "glob-parent": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz", - "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==", - "requires": { - "is-glob": "^4.0.1" - } - }, - "globby": { - "version": "10.0.2", - "resolved": "https://registry.npmjs.org/globby/-/globby-10.0.2.tgz", - "integrity": "sha512-7dUi7RvCoT/xast/o/dLN53oqND4yk0nsHkhRgn9w65C4PofCLOoJ39iSOg+qVDdWQPIEj+eszMHQ+aLVwwQSg==", - "requires": { - "@types/glob": "^7.1.1", - "array-union": "^2.1.0", - "dir-glob": "^3.0.1", - "fast-glob": "^3.0.3", - "glob": "^7.1.3", - "ignore": "^5.1.1", - "merge2": "^1.2.3", - "slash": "^3.0.0" - } - }, - "ignore": { - "version": "5.1.4", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.4.tgz", - "integrity": "sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A==" - }, - "is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==" - }, - "micromatch": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz", - "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==", - "requires": { - "braces": "^3.0.1", - "picomatch": "^2.0.5" - } - }, - "picomatch": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz", - "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==" - }, - "slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==" - }, - "to-regex-range": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "requires": { - "is-number": "^7.0.0" - } - } - } - }, - "delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=" - }, - "delegate": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz", - "integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw==", - "optional": true - }, - "depd": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", - "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=" - }, - "des.js": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz", - "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=", - "requires": { - "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0" - } - }, - "destroy": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", - "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=" - }, - "detab": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/detab/-/detab-2.0.3.tgz", - "integrity": "sha512-Up8P0clUVwq0FnFjDclzZsy9PadzRn5FFxrr47tQQvMHqyiFYVbpH8oXDzWtF0Q7pYy3l+RPmtBl+BsFF6wH0A==", - "requires": { - "repeat-string": "^1.5.4" - } - }, - "detect-indent": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-6.0.0.tgz", - "integrity": "sha512-oSyFlqaTHCItVRGK5RmrmjB+CmaMOW7IaNA/kdxqhoa6d17j/5ce9O9eWXmV/KEdRwqpQA+Vqe8a8Bsybu4YnA==" - }, - "detect-newline": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-1.0.3.tgz", - "integrity": "sha1-6XsQA4d9cMCa8a81v63/Fo3kkg0=", - "requires": { - "get-stdin": "^4.0.1", - "minimist": "^1.1.0" - } - }, - "detect-node": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz", - "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==" - }, - "detect-port": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/detect-port/-/detect-port-1.3.0.tgz", - "integrity": "sha512-E+B1gzkl2gqxt1IhUzwjrxBKRqx1UzC3WLONHinn8S3T6lwV/agVCyitiFOsGJ/eYuEUBvD71MZHy3Pv1G9doQ==", - "requires": { - "address": "^1.0.1", - "debug": "^2.6.0" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "requires": { - "ms": "2.0.0" - } + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } }, "ms": { "version": "2.0.0", @@ -8036,27 +7125,11 @@ } }, "dir-glob": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz", - "integrity": "sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", + "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", "requires": { - "arrify": "^1.0.1", - "path-type": "^3.0.0" - }, - "dependencies": { - "path-type": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz", - "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", - "requires": { - "pify": "^3.0.0" - } - }, - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" - } + "path-type": "^4.0.0" } }, "dns-equal": { @@ -8288,11 +7361,11 @@ } }, "engine.io-client": { - "version": "3.4.1", - "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.4.1.tgz", - "integrity": "sha512-RJNmA+A9Js+8Aoq815xpGAsgWH1VoSYM//2VgIiu9lNOaHFfLpTjH4tOzktBpjIs5lvOfiNY1dwf+NuU6D38Mw==", + "version": "3.4.2", + "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.4.2.tgz", + "integrity": "sha512-AWjc1Xg06a6UPFOBAzJf48W1UR/qKYmv/ubgSCumo9GXgvL/xGIvo05dXoBL+2NTLMipDI7in8xK61C17L25xg==", "requires": { - "component-emitter": "1.2.1", + "component-emitter": "~1.3.0", "component-inherit": "0.0.3", "debug": "~4.1.0", "engine.io-parser": "~2.2.0", @@ -8305,11 +7378,6 @@ "yeast": "0.1.2" }, "dependencies": { - "component-emitter": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", - "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=" - }, "debug": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", @@ -8499,55 +7567,10 @@ "v8-compile-cache": "^2.0.3" }, "dependencies": { - "ansi-escapes": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz", - "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==", - "requires": { - "type-fest": "^0.11.0" - }, - "dependencies": { - "type-fest": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz", - "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==" - } - } - }, "ansi-regex": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==" - }, - "ansi-styles": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", - "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", - "requires": { - "@types/color-name": "^1.1.1", - "color-convert": "^2.0.1" - } - }, - "cli-cursor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", - "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", - "requires": { - "restore-cursor": "^3.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==" }, "debug": { "version": "4.1.1", @@ -8557,11 +7580,6 @@ "ms": "^2.1.1" } }, - "emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" - }, "eslint-utils": { "version": "1.4.3", "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz", @@ -8570,14 +7588,6 @@ "eslint-visitor-keys": "^1.1.0" } }, - "figures": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz", - "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==", - "requires": { - "escape-string-regexp": "^1.0.5" - } - }, "glob-parent": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz", @@ -8594,11 +7604,6 @@ "type-fest": "^0.8.1" } }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" - }, "ignore": { "version": "4.0.6", "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", @@ -8613,68 +7618,6 @@ "resolve-from": "^4.0.0" } }, - "inquirer": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.1.0.tgz", - "integrity": "sha512-5fJMWEmikSYu0nv/flMc475MhGbB7TSPd/2IpFV4I4rMklboCH2rQjYY5kKiYGHqUF9gvaambupcJFFG9dvReg==", - "requires": { - "ansi-escapes": "^4.2.1", - "chalk": "^3.0.0", - "cli-cursor": "^3.1.0", - "cli-width": "^2.0.0", - "external-editor": "^3.0.3", - "figures": "^3.0.0", - "lodash": "^4.17.15", - "mute-stream": "0.0.8", - "run-async": "^2.4.0", - "rxjs": "^6.5.3", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0", - "through": "^2.3.6" - }, - "dependencies": { - "chalk": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", - "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", - "requires": { - "ansi-regex": "^5.0.0" - } - } - } - }, - "is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" - }, - "mimic-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==" - }, - "mute-stream": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", - "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==" - }, - "onetime": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz", - "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==", - "requires": { - "mimic-fn": "^2.1.0" - } - }, "regexpp": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz", @@ -8685,61 +7628,17 @@ "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==" }, - "restore-cursor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", - "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", - "requires": { - "onetime": "^5.1.0", - "signal-exit": "^3.0.2" - } - }, "semver": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" }, - "string-width": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", - "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", - "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" - }, - "dependencies": { - "strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", - "requires": { - "ansi-regex": "^5.0.0" - } - } - } - }, "strip-ansi": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", "requires": { "ansi-regex": "^4.1.0" - }, - "dependencies": { - "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==" - } - } - }, - "supports-color": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", - "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", - "requires": { - "has-flag": "^4.0.0" } }, "v8-compile-cache": { @@ -8958,9 +7857,9 @@ } }, "eslint-plugin-react": { - "version": "7.19.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.19.0.tgz", - "integrity": "sha512-SPT8j72CGuAP+JFbT0sJHOB80TX/pu44gQ4vXH/cq+hQTiY2PuZ6IHkqXJV6x1b28GDdo1lbInjKUrrdUf0LOQ==", + "version": "7.20.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.20.0.tgz", + "integrity": "sha512-rqe1abd0vxMjmbPngo4NaYxTcR3Y4Hrmc/jg4T+sYz63yqlmJRknpEQfmWY+eDWPuMmix6iUIK+mv0zExjeLgA==", "requires": { "array-includes": "^3.1.1", "doctrine": "^2.1.0", @@ -8971,7 +7870,6 @@ "object.values": "^1.1.1", "prop-types": "^15.7.2", "resolve": "^1.15.1", - "semver": "^6.3.0", "string.prototype.matchall": "^4.0.2", "xregexp": "^4.3.0" }, @@ -9039,11 +7937,6 @@ "path-parse": "^1.0.6" } }, - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" - }, "string.prototype.trimleft": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz", @@ -9160,9 +8053,9 @@ } }, "event-source-polyfill": { - "version": "1.0.12", - "resolved": "https://registry.npmjs.org/event-source-polyfill/-/event-source-polyfill-1.0.12.tgz", - "integrity": "sha512-WjOTn0LIbaN08z/8gNt3GYAomAdm6cZ2lr/QdvhTTEipr5KR6lds2ziUH+p/Iob4Lk6NClKhwPOmn1NjQEcJCg==" + "version": "1.0.14", + "resolved": "https://registry.npmjs.org/event-source-polyfill/-/event-source-polyfill-1.0.14.tgz", + "integrity": "sha512-MZS70VuK1KfLXWLCzuFp03XYj9GLvr8A3HJsGqmB1svVBuQFOmItgRxz9COquAKbG1hQU8U/dUCHvop4a2Hs/A==" }, "eventemitter3": { "version": "3.1.2", @@ -9175,11 +8068,11 @@ "integrity": "sha512-Rv+u8MLHNOdMjTAFeT3nCjHn2aGlx435FP/sDHNaRhDEMwyI/aB22Kj2qIN8R0cw3z28psEQLYwxVKLsKrMgWg==" }, "eventsource": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz", - "integrity": "sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==", + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-0.1.6.tgz", + "integrity": "sha1-Cs7ehJ7X3RzMMsgRuxG5RNTykjI=", "requires": { - "original": "^1.0.0" + "original": ">=0.0.5" } }, "evp_bytestokey": { @@ -9231,11 +8124,6 @@ "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz", "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==" }, - "mimic-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==" - }, "npm-run-path": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", @@ -9244,14 +8132,6 @@ "path-key": "^3.0.0" } }, - "onetime": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz", - "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==", - "requires": { - "mimic-fn": "^2.1.0" - } - }, "p-finally": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-2.0.1.tgz", @@ -9607,9 +8487,9 @@ "integrity": "sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==" }, "fastq": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.7.0.tgz", - "integrity": "sha512-YOadQRnHd5q6PogvAR/x62BGituF2ufiEA6s8aavQANw5YKHERI4AREboX6KotzP8oX2klxYF2wcV/7bn1clfQ==", + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.8.0.tgz", + "integrity": "sha512-SMIZoZdLh/fgofivvIkmknUXyPnvxRE3DhtZ5Me3Mrsk5gyPL42F0xr51TdRXskBxHfMp+07bcYzfsYEsSQA9Q==", "requires": { "reusify": "^1.0.4" } @@ -9657,9 +8537,9 @@ "integrity": "sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==" }, "figures": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz", - "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz", + "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==", "requires": { "escape-string-regexp": "^1.0.5" } @@ -9704,9 +8584,9 @@ "optional": true }, "filesize": { - "version": "3.6.1", - "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.6.1.tgz", - "integrity": "sha512-7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg==" + "version": "3.5.11", + "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.5.11.tgz", + "integrity": "sha512-ZH7loueKBoDb7yG9esn1U+fgq7BzlzW6NRi5/rMdxIZ05dj7GFD/Xc5rq2CDt5Yq86CyfSYVyx4242QQNZbx1g==" }, "fill-range": { "version": "4.0.0", @@ -9876,47 +8756,6 @@ "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=" }, - "fork-ts-checker-webpack-plugin": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-1.5.0.tgz", - "integrity": "sha512-zEhg7Hz+KhZlBhILYpXy+Beu96gwvkROWJiTXOCyOOMMrdBIRPvsBpBqgTI4jfJGrJXcqGwJR8zsBGDmzY0jsA==", - "requires": { - "babel-code-frame": "^6.22.0", - "chalk": "^2.4.1", - "chokidar": "^2.0.4", - "micromatch": "^3.1.10", - "minimatch": "^3.0.4", - "semver": "^5.6.0", - "tapable": "^1.0.0", - "worker-rpc": "^0.1.0" - }, - "dependencies": { - "chokidar": { - "version": "2.1.8", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz", - "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==", - "requires": { - "anymatch": "^2.0.0", - "async-each": "^1.0.1", - "braces": "^2.3.2", - "fsevents": "^1.2.7", - "glob-parent": "^3.1.0", - "inherits": "^2.0.3", - "is-binary-path": "^1.0.0", - "is-glob": "^4.0.0", - "normalize-path": "^3.0.0", - "path-is-absolute": "^1.0.0", - "readdirp": "^2.2.1", - "upath": "^1.1.1" - } - }, - "normalize-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==" - } - } - }, "form-data": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", @@ -9986,521 +8825,47 @@ "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, "fsevents": { - "version": "1.2.12", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.12.tgz", - "integrity": "sha512-Ggd/Ktt7E7I8pxZRbGIs7vwqAPscSESMrCSkx2FtWeqmheJgCo2R74fTsZFCifr0VTPwqRpPv17+6b8Zp7th0Q==", + "version": "1.2.13", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", + "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", "optional": true, "requires": { "bindings": "^1.5.0", - "nan": "^2.12.1", - "node-pre-gyp": "*" + "nan": "^2.12.1" + } + }, + "function-bind": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" + }, + "functional-red-black-tree": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", + "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=" + }, + "fwd-stream": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/fwd-stream/-/fwd-stream-1.0.4.tgz", + "integrity": "sha1-7Sgcq+1G/uz5Ie4y3ExQs3KsfPo=", + "requires": { + "readable-stream": "~1.0.26-4" }, "dependencies": { - "abbrev": { - "version": "1.1.1", - "bundled": true, - "optional": true - }, - "ansi-regex": { - "version": "2.1.1", - "bundled": true, - "optional": true - }, - "aproba": { - "version": "1.2.0", - "bundled": true, - "optional": true - }, - "are-we-there-yet": { - "version": "1.1.5", - "bundled": true, - "optional": true, - "requires": { - "delegates": "^1.0.0", - "readable-stream": "^2.0.6" - } - }, - "balanced-match": { - "version": "1.0.0", - "bundled": true, - "optional": true - }, - "brace-expansion": { - "version": "1.1.11", - "bundled": true, - "optional": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "chownr": { - "version": "1.1.4", - "bundled": true, - "optional": true - }, - "code-point-at": { - "version": "1.1.0", - "bundled": true, - "optional": true - }, - "concat-map": { - "version": "0.0.1", - "bundled": true, - "optional": true - }, - "console-control-strings": { - "version": "1.1.0", - "bundled": true, - "optional": true - }, - "core-util-is": { - "version": "1.0.2", - "bundled": true, - "optional": true - }, - "debug": { - "version": "3.2.6", - "bundled": true, - "optional": true, - "requires": { - "ms": "^2.1.1" - } - }, - "deep-extend": { - "version": "0.6.0", - "bundled": true, - "optional": true - }, - "delegates": { - "version": "1.0.0", - "bundled": true, - "optional": true - }, - "detect-libc": { - "version": "1.0.3", - "bundled": true, - "optional": true - }, - "fs-minipass": { - "version": "1.2.7", - "bundled": true, - "optional": true, - "requires": { - "minipass": "^2.6.0" - } - }, - "fs.realpath": { - "version": "1.0.0", - "bundled": true, - "optional": true - }, - "gauge": { - "version": "2.7.4", - "bundled": true, - "optional": true, - "requires": { - "aproba": "^1.0.3", - "console-control-strings": "^1.0.0", - "has-unicode": "^2.0.0", - "object-assign": "^4.1.0", - "signal-exit": "^3.0.0", - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wide-align": "^1.1.0" - } - }, - "glob": { - "version": "7.1.6", - "bundled": true, - "optional": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "has-unicode": { - "version": "2.0.1", - "bundled": true, - "optional": true - }, - "iconv-lite": { - "version": "0.4.24", - "bundled": true, - "optional": true, - "requires": { - "safer-buffer": ">= 2.1.2 < 3" - } - }, - "ignore-walk": { - "version": "3.0.3", - "bundled": true, - "optional": true, - "requires": { - "minimatch": "^3.0.4" - } - }, - "inflight": { - "version": "1.0.6", - "bundled": true, - "optional": true, - "requires": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "inherits": { - "version": "2.0.4", - "bundled": true, - "optional": true - }, - "ini": { - "version": "1.3.5", - "bundled": true, - "optional": true - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "bundled": true, - "optional": true, - "requires": { - "number-is-nan": "^1.0.0" - } - }, "isarray": { - "version": "1.0.0", - "bundled": true, - "optional": true - }, - "minimatch": { - "version": "3.0.4", - "bundled": true, - "optional": true, - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "minimist": { - "version": "1.2.5", - "bundled": true, - "optional": true + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=" }, - "minipass": { - "version": "2.9.0", - "bundled": true, - "optional": true, + "readable-stream": { + "version": "1.0.34", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", + "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", "requires": { - "safe-buffer": "^5.1.2", - "yallist": "^3.0.0" - } - }, - "minizlib": { - "version": "1.3.3", - "bundled": true, - "optional": true, - "requires": { - "minipass": "^2.9.0" - } - }, - "mkdirp": { - "version": "0.5.3", - "bundled": true, - "optional": true, - "requires": { - "minimist": "^1.2.5" - } - }, - "ms": { - "version": "2.1.2", - "bundled": true, - "optional": true - }, - "needle": { - "version": "2.3.3", - "bundled": true, - "optional": true, - "requires": { - "debug": "^3.2.6", - "iconv-lite": "^0.4.4", - "sax": "^1.2.4" - } - }, - "node-pre-gyp": { - "version": "0.14.0", - "bundled": true, - "optional": true, - "requires": { - "detect-libc": "^1.0.2", - "mkdirp": "^0.5.1", - "needle": "^2.2.1", - "nopt": "^4.0.1", - "npm-packlist": "^1.1.6", - "npmlog": "^4.0.2", - "rc": "^1.2.7", - "rimraf": "^2.6.1", - "semver": "^5.3.0", - "tar": "^4.4.2" - } - }, - "nopt": { - "version": "4.0.3", - "bundled": true, - "optional": true, - "requires": { - "abbrev": "1", - "osenv": "^0.1.4" - } - }, - "npm-bundled": { - "version": "1.1.1", - "bundled": true, - "optional": true, - "requires": { - "npm-normalize-package-bin": "^1.0.1" - } - }, - "npm-normalize-package-bin": { - "version": "1.0.1", - "bundled": true, - "optional": true - }, - "npm-packlist": { - "version": "1.4.8", - "bundled": true, - "optional": true, - "requires": { - "ignore-walk": "^3.0.1", - "npm-bundled": "^1.0.1", - "npm-normalize-package-bin": "^1.0.1" - } - }, - "npmlog": { - "version": "4.1.2", - "bundled": true, - "optional": true, - "requires": { - "are-we-there-yet": "~1.1.2", - "console-control-strings": "~1.1.0", - "gauge": "~2.7.3", - "set-blocking": "~2.0.0" - } - }, - "number-is-nan": { - "version": "1.0.1", - "bundled": true, - "optional": true - }, - "object-assign": { - "version": "4.1.1", - "bundled": true, - "optional": true - }, - "once": { - "version": "1.4.0", - "bundled": true, - "optional": true, - "requires": { - "wrappy": "1" - } - }, - "os-homedir": { - "version": "1.0.2", - "bundled": true, - "optional": true - }, - "os-tmpdir": { - "version": "1.0.2", - "bundled": true, - "optional": true - }, - "osenv": { - "version": "0.1.5", - "bundled": true, - "optional": true, - "requires": { - "os-homedir": "^1.0.0", - "os-tmpdir": "^1.0.0" - } - }, - "path-is-absolute": { - "version": "1.0.1", - "bundled": true, - "optional": true - }, - "process-nextick-args": { - "version": "2.0.1", - "bundled": true, - "optional": true - }, - "rc": { - "version": "1.2.8", - "bundled": true, - "optional": true, - "requires": { - "deep-extend": "^0.6.0", - "ini": "~1.3.0", - "minimist": "^1.2.0", - "strip-json-comments": "~2.0.1" - } - }, - "readable-stream": { - "version": "2.3.7", - "bundled": true, - "optional": true, - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "rimraf": { - "version": "2.7.1", - "bundled": true, - "optional": true, - "requires": { - "glob": "^7.1.3" - } - }, - "safe-buffer": { - "version": "5.1.2", - "bundled": true, - "optional": true - }, - "safer-buffer": { - "version": "2.1.2", - "bundled": true, - "optional": true - }, - "sax": { - "version": "1.2.4", - "bundled": true, - "optional": true - }, - "semver": { - "version": "5.7.1", - "bundled": true, - "optional": true - }, - "set-blocking": { - "version": "2.0.0", - "bundled": true, - "optional": true - }, - "signal-exit": { - "version": "3.0.2", - "bundled": true, - "optional": true - }, - "string-width": { - "version": "1.0.2", - "bundled": true, - "optional": true, - "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" - } - }, - "string_decoder": { - "version": "1.1.1", - "bundled": true, - "optional": true, - "requires": { - "safe-buffer": "~5.1.0" - } - }, - "strip-ansi": { - "version": "3.0.1", - "bundled": true, - "optional": true, - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "strip-json-comments": { - "version": "2.0.1", - "bundled": true, - "optional": true - }, - "tar": { - "version": "4.4.13", - "bundled": true, - "optional": true, - "requires": { - "chownr": "^1.1.1", - "fs-minipass": "^1.2.5", - "minipass": "^2.8.6", - "minizlib": "^1.2.1", - "mkdirp": "^0.5.0", - "safe-buffer": "^5.1.2", - "yallist": "^3.0.3" - } - }, - "util-deprecate": { - "version": "1.0.2", - "bundled": true, - "optional": true - }, - "wide-align": { - "version": "1.1.3", - "bundled": true, - "optional": true, - "requires": { - "string-width": "^1.0.2 || 2" - } - }, - "wrappy": { - "version": "1.0.2", - "bundled": true, - "optional": true - }, - "yallist": { - "version": "3.1.1", - "bundled": true, - "optional": true - } - } - }, - "function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" - }, - "functional-red-black-tree": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", - "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=" - }, - "fwd-stream": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/fwd-stream/-/fwd-stream-1.0.4.tgz", - "integrity": "sha1-7Sgcq+1G/uz5Ie4y3ExQs3KsfPo=", - "requires": { - "readable-stream": "~1.0.26-4" - }, - "dependencies": { - "isarray": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=" - }, - "readable-stream": { - "version": "1.0.34", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", - "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.1", - "isarray": "0.0.1", - "string_decoder": "~0.10.x" + "core-util-is": "~1.0.0", + "inherits": "~2.0.1", + "isarray": "0.0.1", + "string_decoder": "~0.10.x" } }, "string_decoder": { @@ -10511,20 +8876,20 @@ } }, "gatsby": { - "version": "2.21.9", - "resolved": "https://registry.npmjs.org/gatsby/-/gatsby-2.21.9.tgz", - "integrity": "sha512-pvMJQqt2AsJYdNRe9KJjenJc5m0rhrleApqMRiKT5RBYWOGuGMh9Y7xZ0R20FoJPs6SIKErJAZ6DVTkD4WaE3w==", + "version": "2.21.33", + "resolved": "https://registry.npmjs.org/gatsby/-/gatsby-2.21.33.tgz", + "integrity": "sha512-/iB2RsHzCpi80M+aKYIHDpJ77WzQQ9DKkjc5r3OXJ6DXFwAstB0PXKHL3JB6hhlujdYE6k4c3e7dkZGMtxw0Gw==", "requires": { "@babel/code-frame": "^7.8.3", - "@babel/core": "^7.9.0", - "@babel/parser": "^7.9.4", + "@babel/core": "^7.9.6", + "@babel/parser": "^7.9.6", "@babel/polyfill": "^7.8.7", - "@babel/runtime": "^7.9.2", - "@babel/traverse": "^7.9.5", + "@babel/runtime": "^7.9.6", + "@babel/traverse": "^7.9.6", "@hapi/joi": "^15.1.1", "@mikaelkristiansson/domready": "^1.0.10", "@pieh/friendly-errors-webpack-plugin": "1.7.0-chalk-2", - "@pmmmwh/react-refresh-webpack-plugin": "^0.2.0", + "@pmmmwh/react-refresh-webpack-plugin": "^0.3.1", "@reach/router": "^1.3.3", "@typescript-eslint/eslint-plugin": "^2.24.0", "@typescript-eslint/parser": "^2.24.0", @@ -10536,8 +8901,8 @@ "babel-loader": "^8.1.0", "babel-plugin-add-module-exports": "^0.3.3", "babel-plugin-dynamic-import-node": "^2.3.3", - "babel-plugin-remove-graphql-queries": "^2.9.0", - "babel-preset-gatsby": "^0.4.0", + "babel-plugin-remove-graphql-queries": "^2.9.1", + "babel-preset-gatsby": "^0.4.2", "better-opn": "1.0.0", "better-queue": "^3.8.10", "bluebird": "^3.7.2", @@ -10553,7 +8918,7 @@ "core-js": "^2.6.11", "cors": "^2.8.5", "css-loader": "^1.0.1", - "date-fns": "^2.12.0", + "date-fns": "^2.13.0", "debug": "^3.2.6", "del": "^5.1.0", "detect-port": "^1.3.0", @@ -10566,7 +8931,7 @@ "eslint-plugin-graphql": "^3.1.1", "eslint-plugin-import": "^2.20.2", "eslint-plugin-jsx-a11y": "^6.2.3", - "eslint-plugin-react": "^7.19.0", + "eslint-plugin-react": "^7.20.0", "eslint-plugin-react-hooks": "^1.7.0", "event-source-polyfill": "^1.0.12", "express": "^4.17.1", @@ -10576,13 +8941,14 @@ "flat": "^4.1.0", "fs-exists-cached": "1.0.0", "fs-extra": "^8.1.0", - "gatsby-cli": "^2.12.7", - "gatsby-core-utils": "^1.2.0", - "gatsby-graphiql-explorer": "^0.4.0", - "gatsby-link": "^2.4.0", - "gatsby-plugin-page-creator": "^2.3.0", - "gatsby-react-router-scroll": "^2.3.0", - "gatsby-telemetry": "^1.3.1", + "gatsby-cli": "^2.12.21", + "gatsby-core-utils": "^1.2.2", + "gatsby-graphiql-explorer": "^0.4.1", + "gatsby-link": "^2.4.2", + "gatsby-plugin-page-creator": "^2.3.2", + "gatsby-plugin-typescript": "^2.4.2", + "gatsby-react-router-scroll": "^3.0.0", + "gatsby-telemetry": "^1.3.4", "glob": "^7.1.6", "got": "8.3.2", "graphql": "^14.6.0", @@ -10592,21 +8958,21 @@ "invariant": "^2.2.4", "is-relative": "^1.0.0", "is-relative-url": "^3.0.0", - "is-wsl": "^2.1.1", + "is-wsl": "^2.2.0", "jest-worker": "^24.9.0", "json-loader": "^0.5.7", "json-stringify-safe": "^5.0.1", "latest-version": "5.1.0", "lodash": "^4.17.15", - "lokijs": "^1.5.8", "md5": "^2.2.1", "md5-file": "^3.2.3", + "meant": "^1.0.1", "micromatch": "^3.1.10", - "mime": "^2.4.4", + "mime": "^2.4.5", "mini-css-extract-plugin": "^0.8.2", "mitt": "^1.2.0", "mkdirp": "^0.5.1", - "moment": "^2.24.0", + "moment": "^2.25.3", "name-all-modules-plugin": "^1.0.1", "normalize-path": "^2.1.1", "null-loader": "^3.0.0", @@ -10620,10 +8986,11 @@ "postcss-loader": "^3.0.0", "prompts": "^2.3.2", "prop-types": "^15.7.2", + "query-string": "^6.12.1", "raw-loader": "^0.5.1", "react-dev-utils": "^4.2.3", "react-error-overlay": "^3.0.0", - "react-hot-loader": "^4.12.20", + "react-hot-loader": "^4.12.21", "react-refresh": "^0.7.0", "redux": "^4.0.5", "redux-thunk": "^2.3.0", @@ -10645,7 +9012,7 @@ "v8-compile-cache": "^1.1.2", "webpack": "~4.43.0", "webpack-dev-middleware": "^3.7.2", - "webpack-dev-server": "^3.10.3", + "webpack-dev-server": "^3.11.0", "webpack-hot-middleware": "^2.25.0", "webpack-merge": "^4.2.2", "webpack-stats-plugin": "^0.3.1", @@ -10806,120 +9173,67 @@ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==" }, - "anymatch": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz", - "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==", - "requires": { - "normalize-path": "^3.0.0", - "picomatch": "^2.0.4" - }, - "dependencies": { - "normalize-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==" - } - } - }, - "babel-plugin-dynamic-import-node": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz", - "integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==", + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", "requires": { - "object.assign": "^4.1.0" + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" } }, - "binary-extensions": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz", - "integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==" - }, "bluebird": { "version": "3.7.2", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" }, - "braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", - "requires": { - "fill-range": "^7.0.1" - } - }, - "browserslist": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.12.0.tgz", - "integrity": "sha512-UH2GkcEDSI0k/lRkuDSzFl9ZZ87skSy9w2XAn1MsZnL+4c4rqbBd3e82UWHbYDpztABrPBhZsTEeuxVfHppqDg==", - "requires": { - "caniuse-lite": "^1.0.30001043", - "electron-to-chromium": "^1.3.413", - "node-releases": "^1.1.53", - "pkg-up": "^2.0.0" - } - }, - "caniuse-lite": { - "version": "1.0.30001048", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001048.tgz", - "integrity": "sha512-g1iSHKVxornw0K8LG9LLdf+Fxnv7T1Z+mMsf0/YYLclQX4Cd522Ap0Lrw6NFqHgezit78dtyWxzlV2Xfc7vgRg==" - }, - "chokidar": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.0.tgz", - "integrity": "sha512-aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ==", - "requires": { - "anymatch": "~3.1.1", - "braces": "~3.0.2", - "fsevents": "~2.1.2", - "glob-parent": "~5.1.0", - "is-binary-path": "~2.1.0", - "is-glob": "~4.0.1", - "normalize-path": "~3.0.0", - "readdirp": "~3.4.0" - }, - "dependencies": { - "normalize-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==" - } - } - }, "cliui": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz", - "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", + "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==", "requires": { - "string-width": "^2.1.1", - "strip-ansi": "^4.0.0", - "wrap-ansi": "^2.0.0" + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^6.2.0" }, "dependencies": { "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=" + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==" }, "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", "requires": { - "ansi-regex": "^3.0.0" + "ansi-regex": "^5.0.0" } } } }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, "core-js": { "version": "2.6.11", "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz", "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==" }, - "electron-to-chromium": { - "version": "1.3.427", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.427.tgz", - "integrity": "sha512-/rG5G7Opcw68/Yrb4qYkz07h3bESVRJjUl4X/FrKLXzoUJleKm6D7K7rTTz8V5LUWnd+BbTOyxJX2XprRqHD8A==" + "emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" }, "es-abstract": { "version": "1.17.5", @@ -10939,27 +9253,22 @@ "string.prototype.trimright": "^2.1.1" } }, - "fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", "requires": { - "to-regex-range": "^5.0.1" + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" } }, - "fsevents": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz", - "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==", - "optional": true - }, "gatsby-cli": { - "version": "2.12.7", - "resolved": "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-2.12.7.tgz", - "integrity": "sha512-FxvvV0ITo+hb8pFWHfwIaPugYQR0i4VRH22srLstJtTUZlnlT0YzLLUi+xCOc5Yo/bsLbR3W+4KLtiNC5BoAOQ==", + "version": "2.12.21", + "resolved": "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-2.12.21.tgz", + "integrity": "sha512-kJNcgMnae5m2ySWY126LT0W+pghgkzgHqUxQpqg6QCaV7FW1k0Bkf7nhKAg0uZgy9NhUpN1wb/26VeQjNFMzAg==", "requires": { "@babel/code-frame": "^7.8.3", - "@babel/runtime": "^7.9.2", + "@babel/runtime": "^7.9.6", "@hapi/joi": "^15.1.1", "better-opn": "^1.0.0", "bluebird": "^3.7.2", @@ -10973,9 +9282,9 @@ "execa": "^3.4.0", "fs-exists-cached": "^1.0.0", "fs-extra": "^8.1.0", - "gatsby-core-utils": "^1.2.0", - "gatsby-recipes": "^0.1.8", - "gatsby-telemetry": "^1.3.1", + "gatsby-core-utils": "^1.2.2", + "gatsby-recipes": "^0.1.19", + "gatsby-telemetry": "^1.3.4", "hosted-git-info": "^3.0.4", "ink": "^2.7.1", "ink-spinner": "^3.0.1", @@ -10998,7 +9307,7 @@ "strip-ansi": "^5.2.0", "update-notifier": "^3.0.1", "uuid": "3.4.0", - "yargs": "^12.0.5", + "yargs": "^15.3.1", "yurnalist": "^1.1.2" }, "dependencies": { @@ -11014,29 +9323,6 @@ } } }, - "gatsby-core-utils": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.2.0.tgz", - "integrity": "sha512-JBsVbniXObn26Hms8Je1vJdhMW04GesochBVLcaTraZC5dfqZDExPix65jrye/voC0YfFtXIngm59yspYZm1OQ==", - "requires": { - "ci-info": "2.0.0", - "configstore": "^5.0.1", - "node-object-hash": "^2.0.0" - } - }, - "get-caller-file": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz", - "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==" - }, - "glob-parent": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz", - "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==", - "requires": { - "is-glob": "^4.0.1" - } - }, "has-symbols": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", @@ -11050,31 +9336,15 @@ "lru-cache": "^5.1.1" } }, - "is-binary-path": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", - "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", - "requires": { - "binary-extensions": "^2.0.0" - } - }, "is-callable": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz", "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==" }, "is-fullwidth-code-point": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", - "requires": { - "number-is-nan": "^1.0.0" - } - }, - "is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==" + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" }, "is-regex": { "version": "1.0.5", @@ -11084,6 +9354,14 @@ "has": "^1.0.3" } }, + "locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "requires": { + "p-locate": "^4.1.0" + } + }, "lru-cache": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", @@ -11092,16 +9370,16 @@ "yallist": "^3.0.2" } }, + "mime": { + "version": "2.4.5", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.5.tgz", + "integrity": "sha512-3hQhEUF027BuxZjQA3s7rIv/7VCQPa27hN9u9g87sEkWaKwQPuXOkVKtOeiyUrnWqTDiOs8Ed2rwg733mB0R5w==" + }, "node-fetch": { "version": "2.6.0", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz", "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==" }, - "node-releases": { - "version": "1.1.53", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.53.tgz", - "integrity": "sha512-wp8zyQVwef2hpZ/dJH7SfSrIPD6YoJz6BDQDpGEkcA0s3LpAQoxBIYmfIq6QAhC1DhwsyCgTaTTcONwX8qzCuQ==" - }, "object.getownpropertydescriptors": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz", @@ -11111,36 +9389,54 @@ "es-abstract": "^1.17.0-next.1" } }, - "readdirp": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz", - "integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==", + "p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", "requires": { - "picomatch": "^2.2.1" - }, - "dependencies": { - "picomatch": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz", - "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==" - } + "p-limit": "^2.2.0" } }, + "path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==" + }, "regenerator-runtime": { "version": "0.13.5", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==" }, - "require-main-filename": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", - "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=" - }, "signal-exit": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz", "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==" }, + "string-width": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", + "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" + }, + "dependencies": { + "ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==" + }, + "strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "requires": { + "ansi-regex": "^5.0.0" + } + } + } + }, "string.prototype.trimleft": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz", @@ -11169,14 +9465,6 @@ "ansi-regex": "^4.1.0" } }, - "to-regex-range": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "requires": { - "is-number": "^7.0.0" - } - }, "util.promisify": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz", @@ -11194,72 +9482,57 @@ "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==" }, "wrap-ansi": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", - "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", + "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", "requires": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1" + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" }, "dependencies": { "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" - }, - "string-width": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", - "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" - } + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==" }, "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", "requires": { - "ansi-regex": "^2.0.0" + "ansi-regex": "^5.0.0" } } } }, - "xstate": { - "version": "4.9.1", - "resolved": "https://registry.npmjs.org/xstate/-/xstate-4.9.1.tgz", - "integrity": "sha512-cfNnRaBebnr1tvs0nHBUTyomfJx36+8MWwXceyNTZfjyELMM8nIoiBDcUzfKmpNlnAvs2ZPREos19cw6Zl4nng==" - }, "yallist": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==" }, "yargs": { - "version": "12.0.5", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz", - "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==", + "version": "15.3.1", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.3.1.tgz", + "integrity": "sha512-92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA==", "requires": { - "cliui": "^4.0.0", + "cliui": "^6.0.0", "decamelize": "^1.2.0", - "find-up": "^3.0.0", - "get-caller-file": "^1.0.1", - "os-locale": "^3.0.0", + "find-up": "^4.1.0", + "get-caller-file": "^2.0.1", "require-directory": "^2.1.1", - "require-main-filename": "^1.0.1", + "require-main-filename": "^2.0.0", "set-blocking": "^2.0.0", - "string-width": "^2.0.0", + "string-width": "^4.2.0", "which-module": "^2.0.0", - "y18n": "^3.2.1 || ^4.0.0", - "yargs-parser": "^11.1.1" + "y18n": "^4.0.0", + "yargs-parser": "^18.1.1" } }, "yargs-parser": { - "version": "11.1.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz", - "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==", + "version": "18.1.3", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz", + "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==", "requires": { "camelcase": "^5.0.0", "decamelize": "^1.2.0" @@ -11278,11 +9551,11 @@ } }, "gatsby-graphiql-explorer": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/gatsby-graphiql-explorer/-/gatsby-graphiql-explorer-0.4.0.tgz", - "integrity": "sha512-BddSKv1WgLnwmj0S/xyUt5jWCgWedZPuqjweMX6EwUBh36uKaI962VyRbwqE/pLdmKBMOU7u9zjNBcK5LXKbxA==", + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/gatsby-graphiql-explorer/-/gatsby-graphiql-explorer-0.4.1.tgz", + "integrity": "sha512-7A8KA9XtgG6EBEuHDqYe7/xzbkUwQ3FQ1JVao1WEI3EhOMxfjoT23HHIqYJ7lmMG1rQkfhhnVjvPw5Ych4I0+g==", "requires": { - "@babel/runtime": "^7.9.2" + "@babel/runtime": "^7.9.6" }, "dependencies": { "@babel/runtime": { @@ -11301,11 +9574,11 @@ } }, "gatsby-link": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/gatsby-link/-/gatsby-link-2.4.0.tgz", - "integrity": "sha512-ElaUagFLlPqtLFZc7wd9RxckfMRf45Ro1X5QZi6Lz9wNQzpT/cCYzARgfcfEbM5Dsg3/p0mIQR1+0Cbjqk+1tQ==", + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/gatsby-link/-/gatsby-link-2.4.2.tgz", + "integrity": "sha512-AmSBam4pgtw2YRzkg7noVS6WF9EE73CNjfBiGCS65kQm/sP9caLuLOqrI0l0JAUwEeCqREH1bjg47S0w9chW7w==", "requires": { - "@babel/runtime": "^7.9.2", + "@babel/runtime": "^7.9.6", "@types/reach__router": "^1.3.3", "prop-types": "^15.7.2" }, @@ -11326,15 +9599,15 @@ } }, "gatsby-page-utils": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/gatsby-page-utils/-/gatsby-page-utils-0.2.0.tgz", - "integrity": "sha512-kyvFYjGXWNKRignUaspko0TFrBufUPB0+uA+w30A81Jzc2FjD5e2yYByRBb7/pGPrHXXm7TySBt9n4/KVkXD2g==", + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/gatsby-page-utils/-/gatsby-page-utils-0.2.2.tgz", + "integrity": "sha512-A49mXefCLloYx0MimfbqxBp+eNhgbLYh10LkabWyUPp7d+S5ILCga1n+lbXkyMo+qmUGA7Pj6mhzRzvOAV+Shg==", "requires": { - "@babel/runtime": "^7.9.2", + "@babel/runtime": "^7.9.6", "bluebird": "^3.7.2", "chokidar": "3.4.0", "fs-exists-cached": "^1.0.0", - "gatsby-core-utils": "^1.2.0", + "gatsby-core-utils": "^1.2.2", "glob": "^7.1.6", "lodash": "^4.17.15", "micromatch": "^3.1.10" @@ -11348,125 +9621,15 @@ "regenerator-runtime": "^0.13.4" } }, - "anymatch": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz", - "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==", - "requires": { - "normalize-path": "^3.0.0", - "picomatch": "^2.0.4" - } - }, - "binary-extensions": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz", - "integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==" - }, "bluebird": { "version": "3.7.2", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" }, - "braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", - "requires": { - "fill-range": "^7.0.1" - } - }, - "chokidar": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.0.tgz", - "integrity": "sha512-aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ==", - "requires": { - "anymatch": "~3.1.1", - "braces": "~3.0.2", - "fsevents": "~2.1.2", - "glob-parent": "~5.1.0", - "is-binary-path": "~2.1.0", - "is-glob": "~4.0.1", - "normalize-path": "~3.0.0", - "readdirp": "~3.4.0" - } - }, - "fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", - "requires": { - "to-regex-range": "^5.0.1" - } - }, - "fsevents": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz", - "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==", - "optional": true - }, - "gatsby-core-utils": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.2.0.tgz", - "integrity": "sha512-JBsVbniXObn26Hms8Je1vJdhMW04GesochBVLcaTraZC5dfqZDExPix65jrye/voC0YfFtXIngm59yspYZm1OQ==", - "requires": { - "ci-info": "2.0.0", - "configstore": "^5.0.1", - "node-object-hash": "^2.0.0" - } - }, - "glob-parent": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz", - "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==", - "requires": { - "is-glob": "^4.0.1" - } - }, - "is-binary-path": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", - "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", - "requires": { - "binary-extensions": "^2.0.0" - } - }, - "is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==" - }, - "normalize-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==" - }, - "readdirp": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz", - "integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==", - "requires": { - "picomatch": "^2.2.1" - }, - "dependencies": { - "picomatch": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz", - "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==" - } - } - }, "regenerator-runtime": { "version": "0.13.5", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==" - }, - "to-regex-range": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "requires": { - "is-number": "^7.0.0" - } } } }, @@ -11806,14 +9969,14 @@ } }, "gatsby-plugin-page-creator": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/gatsby-plugin-page-creator/-/gatsby-plugin-page-creator-2.3.0.tgz", - "integrity": "sha512-5FWntUeutF1YUJUy0EHuZE6xBFOljIXSVFJ9gOoQbLUrFw7ba3OW6a7DBruteRX6oOWaQ3YtjGgGOEbpsP3lTQ==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/gatsby-plugin-page-creator/-/gatsby-plugin-page-creator-2.3.2.tgz", + "integrity": "sha512-jX2PCB+ho34bR/M/ig96Poh3PKyrFrkVMI0th/VevYBq4txTQl+Ca9ZBodEWD2cz2Lhy2j9/iJkoXx7nTt7knQ==", "requires": { - "@babel/runtime": "^7.9.2", + "@babel/runtime": "^7.9.6", "bluebird": "^3.7.2", "fs-exists-cached": "^1.0.0", - "gatsby-page-utils": "^0.2.0", + "gatsby-page-utils": "^0.2.2", "glob": "^7.1.6", "lodash": "^4.17.15", "micromatch": "^3.1.10" @@ -11827,50 +9990,212 @@ "regenerator-runtime": "^0.13.4" } }, - "bluebird": { - "version": "3.7.2", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", - "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" + "bluebird": { + "version": "3.7.2", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", + "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" + }, + "regenerator-runtime": { + "version": "0.13.5", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", + "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==" + } + } + }, + "gatsby-plugin-printer": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/gatsby-plugin-printer/-/gatsby-plugin-printer-1.0.8.tgz", + "integrity": "sha512-a9V1sFQxIrFx47jQJdMkRmTd6jJj3cs+YT1mfuctkmTjBvKU7+L4b3XVqkr0fyljGsAZg/Ztdgud0ccmux4rgQ==", + "requires": { + "@sindresorhus/slugify": "^0.9.1", + "babel-plugin-preval": "^3.0.1", + "fs-extra": "^8.1.0", + "puppeteer": "^1.19.0", + "rollup": "1.23.1", + "rollup-plugin-babel": "^4.3.3", + "rollup-plugin-commonjs": "^10.0.1", + "rollup-plugin-node-builtins": "^2.1.2", + "rollup-plugin-node-globals": "^1.4.0", + "rollup-plugin-node-resolve": "^5.2.0", + "rollup-plugin-replace": "^2.2.0" + } + }, + "gatsby-plugin-react-helmet": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/gatsby-plugin-react-helmet/-/gatsby-plugin-react-helmet-3.3.1.tgz", + "integrity": "sha512-DZ/IWs+zlGL8N3JAcewPJJUPkl1st6/hIWQ3YphKoTK64DUIoMd2wWSJCrC6LiurS7knGHa4pdGyc5clwV1EKA==", + "requires": { + "@babel/runtime": "^7.9.6" + }, + "dependencies": { + "@babel/runtime": { + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.6.tgz", + "integrity": "sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==", + "requires": { + "regenerator-runtime": "^0.13.4" + } + }, + "regenerator-runtime": { + "version": "0.13.5", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", + "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==" + } + } + }, + "gatsby-plugin-svgr": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/gatsby-plugin-svgr/-/gatsby-plugin-svgr-2.0.2.tgz", + "integrity": "sha512-54REIMe79qFBAwpcnWHBkvEE9CKoEVkefF9rDXai0k642r91SZ4UeWFuAmsegPG+sPVub7tHfHu/2LVXK1I9kg==" + }, + "gatsby-plugin-typescript": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/gatsby-plugin-typescript/-/gatsby-plugin-typescript-2.4.2.tgz", + "integrity": "sha512-4mtmFqtKaHNeWYL3Bh6vtO6Ay7VjNR6ZFi8lfL/hiXEEXoy8sZO/S/70qVVecbzeYS6DpKZveEKLfluRLwnDvA==", + "requires": { + "@babel/core": "^7.9.6", + "@babel/plugin-proposal-nullish-coalescing-operator": "^7.8.3", + "@babel/plugin-proposal-numeric-separator": "^7.8.3", + "@babel/plugin-proposal-optional-chaining": "^7.9.0", + "@babel/preset-typescript": "^7.9.0", + "@babel/runtime": "^7.9.6", + "babel-plugin-remove-graphql-queries": "^2.9.1" + }, + "dependencies": { + "@babel/code-frame": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", + "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", + "requires": { + "@babel/highlight": "^7.8.3" + } + }, + "@babel/core": { + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.6.tgz", + "integrity": "sha512-nD3deLvbsApbHAHttzIssYqgb883yU/d9roe4RZymBCDaZryMJDbptVpEpeQuRh4BJ+SYI8le9YGxKvFEvl1Wg==", + "requires": { + "@babel/code-frame": "^7.8.3", + "@babel/generator": "^7.9.6", + "@babel/helper-module-transforms": "^7.9.0", + "@babel/helpers": "^7.9.6", + "@babel/parser": "^7.9.6", + "@babel/template": "^7.8.6", + "@babel/traverse": "^7.9.6", + "@babel/types": "^7.9.6", + "convert-source-map": "^1.7.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.1", + "json5": "^2.1.2", + "lodash": "^4.17.13", + "resolve": "^1.3.2", + "semver": "^5.4.1", + "source-map": "^0.5.0" + } + }, + "@babel/generator": { + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.6.tgz", + "integrity": "sha512-+htwWKJbH2bL72HRluF8zumBxzuX0ZZUFl3JLNyoUjM/Ho8wnVpPXM6aUz8cfKDqQ/h7zHqKt4xzJteUosckqQ==", + "requires": { + "@babel/types": "^7.9.6", + "jsesc": "^2.5.1", + "lodash": "^4.17.13", + "source-map": "^0.5.0" + } + }, + "@babel/helper-function-name": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz", + "integrity": "sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==", + "requires": { + "@babel/helper-get-function-arity": "^7.8.3", + "@babel/template": "^7.8.3", + "@babel/types": "^7.9.5" + } + }, + "@babel/helpers": { + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.6.tgz", + "integrity": "sha512-tI4bUbldloLcHWoRUMAj4g1bF313M/o6fBKhIsb3QnGVPwRm9JsNf/gqMkQ7zjqReABiffPV6RWj7hEglID5Iw==", + "requires": { + "@babel/template": "^7.8.3", + "@babel/traverse": "^7.9.6", + "@babel/types": "^7.9.6" + } + }, + "@babel/highlight": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz", + "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==", + "requires": { + "@babel/helper-validator-identifier": "^7.9.0", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" + } + }, + "@babel/parser": { + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.6.tgz", + "integrity": "sha512-AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q==" + }, + "@babel/runtime": { + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.6.tgz", + "integrity": "sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==", + "requires": { + "regenerator-runtime": "^0.13.4" + } + }, + "@babel/template": { + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz", + "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==", + "requires": { + "@babel/code-frame": "^7.8.3", + "@babel/parser": "^7.8.6", + "@babel/types": "^7.8.6" + } }, - "regenerator-runtime": { - "version": "0.13.5", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", - "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==" - } - } - }, - "gatsby-plugin-printer": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/gatsby-plugin-printer/-/gatsby-plugin-printer-1.0.8.tgz", - "integrity": "sha512-a9V1sFQxIrFx47jQJdMkRmTd6jJj3cs+YT1mfuctkmTjBvKU7+L4b3XVqkr0fyljGsAZg/Ztdgud0ccmux4rgQ==", - "requires": { - "@sindresorhus/slugify": "^0.9.1", - "babel-plugin-preval": "^3.0.1", - "fs-extra": "^8.1.0", - "puppeteer": "^1.19.0", - "rollup": "1.23.1", - "rollup-plugin-babel": "^4.3.3", - "rollup-plugin-commonjs": "^10.0.1", - "rollup-plugin-node-builtins": "^2.1.2", - "rollup-plugin-node-globals": "^1.4.0", - "rollup-plugin-node-resolve": "^5.2.0", - "rollup-plugin-replace": "^2.2.0" - } - }, - "gatsby-plugin-react-helmet": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/gatsby-plugin-react-helmet/-/gatsby-plugin-react-helmet-3.3.1.tgz", - "integrity": "sha512-DZ/IWs+zlGL8N3JAcewPJJUPkl1st6/hIWQ3YphKoTK64DUIoMd2wWSJCrC6LiurS7knGHa4pdGyc5clwV1EKA==", - "requires": { - "@babel/runtime": "^7.9.6" - }, - "dependencies": { - "@babel/runtime": { + "@babel/traverse": { "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.6.tgz", - "integrity": "sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.6.tgz", + "integrity": "sha512-b3rAHSjbxy6VEAvlxM8OV/0X4XrG72zoxme6q1MOoe2vd0bEc+TwayhuC1+Dfgqh1QEG+pj7atQqvUprHIccsg==", "requires": { - "regenerator-runtime": "^0.13.4" + "@babel/code-frame": "^7.8.3", + "@babel/generator": "^7.9.6", + "@babel/helper-function-name": "^7.9.5", + "@babel/helper-split-export-declaration": "^7.8.3", + "@babel/parser": "^7.9.6", + "@babel/types": "^7.9.6", + "debug": "^4.1.0", + "globals": "^11.1.0", + "lodash": "^4.17.13" + } + }, + "@babel/types": { + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.6.tgz", + "integrity": "sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA==", + "requires": { + "@babel/helper-validator-identifier": "^7.9.5", + "lodash": "^4.17.13", + "to-fast-properties": "^2.0.0" + }, + "dependencies": { + "@babel/helper-validator-identifier": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz", + "integrity": "sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==" + } + } + }, + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "requires": { + "ms": "^2.1.1" } }, "regenerator-runtime": { @@ -11880,17 +10205,12 @@ } } }, - "gatsby-plugin-svgr": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/gatsby-plugin-svgr/-/gatsby-plugin-svgr-2.0.2.tgz", - "integrity": "sha512-54REIMe79qFBAwpcnWHBkvEE9CKoEVkefF9rDXai0k642r91SZ4UeWFuAmsegPG+sPVub7tHfHu/2LVXK1I9kg==" - }, "gatsby-react-router-scroll": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/gatsby-react-router-scroll/-/gatsby-react-router-scroll-2.3.0.tgz", - "integrity": "sha512-P0XR2G61pRJDO5FPe6l9GFgu3B55v0WNRBzA+H8edXtAOqFavTdfVg/CANEBu/7m0fRmUaZ8hFmvMX56ptbQ5Q==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/gatsby-react-router-scroll/-/gatsby-react-router-scroll-3.0.0.tgz", + "integrity": "sha512-vaXYQgGkBrrUHy+uyyxy2aj5TZOuuO4U8mHgVKKSFyLIZPk35wknifFsPYVyyYqi2zxdKiFkYKfHDWlQHxMlzA==", "requires": { - "@babel/runtime": "^7.9.2", + "@babel/runtime": "^7.9.6", "scroll-behavior": "^0.9.12", "warning": "^3.0.0" }, @@ -11919,42 +10239,43 @@ } }, "gatsby-recipes": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/gatsby-recipes/-/gatsby-recipes-0.1.8.tgz", - "integrity": "sha512-tpt7mzAWxyOAHxNQRh0ocrDjiRTqYNuzTBUCT24np9FFFpJO+5JMuhESC8W6BI+UyrCiYwwAu8TGfhWGCbDyOQ==", + "version": "0.1.19", + "resolved": "https://registry.npmjs.org/gatsby-recipes/-/gatsby-recipes-0.1.19.tgz", + "integrity": "sha512-N++VIje7M0N6zoShZMISyaIzMwbu9Lot7iyNDk6BblI466J8yQvceqj4uDIb9NzI6cQ82Px0yFGXapymsWGg9Q==", "requires": { - "@babel/core": "^7.9.0", - "@babel/generator": "^7.9.5", - "@babel/standalone": "^7.9.5", + "@babel/core": "^7.9.6", + "@babel/generator": "^7.9.6", + "@babel/standalone": "^7.9.6", "@babel/template": "^7.8.6", - "@babel/types": "^7.9.5", + "@babel/types": "^7.9.6", "@hapi/joi": "^15.1.1", - "@mdx-js/mdx": "^1.6.0", - "@mdx-js/react": "^1.6.0", - "@mdx-js/runtime": "^1.6.0", - "acorn": "^7.1.1", + "@mdx-js/mdx": "^1.6.1", + "@mdx-js/react": "^1.6.1", + "@mdx-js/runtime": "^1.6.1", + "acorn": "^7.2.0", "acorn-jsx": "^5.2.0", "babel-core": "7.0.0-bridge.0", "babel-eslint": "^10.1.0", "babel-loader": "^8.1.0", "babel-plugin-add-module-exports": "^0.3.3", "babel-plugin-dynamic-import-node": "^2.3.3", - "babel-plugin-remove-graphql-queries": "^2.9.0", - "babel-preset-gatsby": "^0.4.0", + "babel-plugin-remove-graphql-queries": "^2.9.1", + "babel-preset-gatsby": "^0.4.2", "cors": "^2.8.5", "detect-port": "^1.3.0", "event-source-polyfill": "^1.0.12", - "execa": "^4.0.0", + "execa": "^4.0.1", "express": "^4.17.1", "express-graphql": "^0.9.0", "fs-extra": "^8.1.0", - "gatsby-core-utils": "^1.2.0", - "gatsby-telemetry": "^1.3.1", + "gatsby-core-utils": "^1.2.2", + "gatsby-telemetry": "^1.3.4", "glob": "^7.1.6", "graphql": "^14.6.0", "graphql-compose": "^6.3.8", "graphql-subscriptions": "^1.1.0", "graphql-type-json": "^0.3.1", + "hicat": "^0.7.0", "html-tag-names": "^1.1.5", "humanize-list": "^1.0.1", "import-jsx": "^4.0.0", @@ -11968,7 +10289,7 @@ "is-relative": "^1.0.0", "is-string": "^1.0.5", "is-url": "^1.2.4", - "jest-diff": "^25.4.0", + "jest-diff": "^25.5.0", "lodash": "^4.17.15", "mkdirp": "^0.5.1", "pkg-dir": "^4.2.0", @@ -11983,7 +10304,7 @@ "unist-util-visit": "^2.0.2", "url-loader": "^1.1.2", "urql": "^1.9.7", - "ws": "^7.2.5", + "ws": "^7.3.0", "xstate": "^4.9.1" }, "dependencies": { @@ -12046,11 +10367,6 @@ "@babel/types": "^7.9.5" } }, - "@babel/helper-plugin-utils": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", - "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" - }, "@babel/helpers": { "version": "7.9.6", "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.6.tgz", @@ -12076,25 +10392,6 @@ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.6.tgz", "integrity": "sha512-AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q==" }, - "@babel/plugin-proposal-object-rest-spread": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.5.tgz", - "integrity": "sha512-VP2oXvAf7KCYTthbUHwBlewbl1Iq059f6seJGsxMizaCdgHIeczOr7FBqELhSqfkIl04Fi8okzWzl63UKbQmmg==", - "requires": { - "@babel/helper-plugin-utils": "^7.8.3", - "@babel/plugin-syntax-object-rest-spread": "^7.8.0", - "@babel/plugin-transform-parameters": "^7.9.5" - } - }, - "@babel/plugin-transform-parameters": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.9.5.tgz", - "integrity": "sha512-0+1FhHnMfj6lIIhVvS4KGQJeuhe1GI//h5uptK4PvLt+BGBxsoUJbd3/IW002yk//6sZPlFgsG1hY6OHLcy6kA==", - "requires": { - "@babel/helper-get-function-arity": "^7.8.3", - "@babel/helper-plugin-utils": "^7.8.3" - } - }, "@babel/template": { "version": "7.8.6", "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz", @@ -12138,96 +10435,10 @@ } } }, - "@mdx-js/mdx": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/@mdx-js/mdx/-/mdx-1.6.1.tgz", - "integrity": "sha512-DLnHbYZGoXSzfIHKgEtsO4qP8029YbdyJvC746PwfPNrRyGciPsqgWmfz/nEXt/fg+UMBG/6/cZaZx/hvyxnyg==", - "requires": { - "@babel/core": "7.9.0", - "@babel/plugin-syntax-jsx": "7.8.3", - "@babel/plugin-syntax-object-rest-spread": "7.8.3", - "@mdx-js/util": "^1.6.1", - "babel-plugin-apply-mdx-type-prop": "^1.6.1", - "babel-plugin-extract-import-names": "^1.6.1", - "camelcase-css": "2.0.1", - "detab": "2.0.3", - "hast-util-raw": "5.0.2", - "lodash.uniq": "4.5.0", - "mdast-util-to-hast": "8.2.0", - "remark-footnotes": "1.0.0", - "remark-mdx": "^1.6.1", - "remark-parse": "8.0.2", - "remark-squeeze-paragraphs": "4.0.0", - "style-to-object": "0.3.0", - "unified": "9.0.0", - "unist-builder": "2.0.3", - "unist-util-visit": "2.0.2" - }, - "dependencies": { - "@babel/core": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.0.tgz", - "integrity": "sha512-kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==", - "requires": { - "@babel/code-frame": "^7.8.3", - "@babel/generator": "^7.9.0", - "@babel/helper-module-transforms": "^7.9.0", - "@babel/helpers": "^7.9.0", - "@babel/parser": "^7.9.0", - "@babel/template": "^7.8.6", - "@babel/traverse": "^7.9.0", - "@babel/types": "^7.9.0", - "convert-source-map": "^1.7.0", - "debug": "^4.1.0", - "gensync": "^1.0.0-beta.1", - "json5": "^2.1.2", - "lodash": "^4.17.13", - "resolve": "^1.3.2", - "semver": "^5.4.1", - "source-map": "^0.5.0" - } - }, - "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" - } - } - }, - "@mdx-js/react": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/@mdx-js/react/-/react-1.6.1.tgz", - "integrity": "sha512-jXBSWdWFPK2fs3johKb0hQFsf/x/C24XQYQwMhj8FxwlBgf7+NGATwXFs6pGkKd5/JfK9HXmbOcQ78MYoIZyxA==" - }, - "@mdx-js/util": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/@mdx-js/util/-/util-1.6.1.tgz", - "integrity": "sha512-A3TBBjg5iVo8S4TTG0VrW8G9YNLob4+M6rALKjY8Sxr9zPExWQ7iTPUSvJVE7YhF9E08EQMubx1vRal3jtpJ9Q==" - }, - "babel-plugin-apply-mdx-type-prop": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/babel-plugin-apply-mdx-type-prop/-/babel-plugin-apply-mdx-type-prop-1.6.1.tgz", - "integrity": "sha512-chjmLo1x7fCpDRICGUlbkwf2E6sMVG9jjG6PtPBWnQfMEjgV03Gh0jSVGbZJsEUxcMqOpHSsIXvPz1sYip6X3g==", - "requires": { - "@babel/helper-plugin-utils": "7.8.3", - "@mdx-js/util": "^1.6.1" - } - }, - "babel-plugin-dynamic-import-node": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz", - "integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==", - "requires": { - "object.assign": "^4.1.0" - } - }, - "babel-plugin-extract-import-names": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/babel-plugin-extract-import-names/-/babel-plugin-extract-import-names-1.6.1.tgz", - "integrity": "sha512-u0uRrPyygx4RlNva1aqz7DM9UBpsQJQZ4NyakHVJF18s73H/iiyXuc+X7k+9tHeN0WKLsohQUGzGLli6z5a0Zw==", - "requires": { - "@babel/helper-plugin-utils": "7.8.3" - } + "acorn": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.2.0.tgz", + "integrity": "sha512-apwXVmYVpQ34m/i71vrApRrRKCWQnZZF1+npOD0WV5xZFfwWOmKGQ2RWlfdy9vWITsenisM8M0Qeq8agcFHNiQ==" }, "binary-extensions": { "version": "2.0.0", @@ -12253,9 +10464,9 @@ } }, "execa": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-4.0.0.tgz", - "integrity": "sha512-JbDUxwV3BoT5ZVXQrSVbAiaXhXUkIwvbhPIwZ0N13kX+5yCzOhUNdocxB/UQRuYOHRYYwAxKYwJYc0T4D12pDA==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/execa/-/execa-4.0.1.tgz", + "integrity": "sha512-SCjM/zlBdOK8Q5TIjOn6iEHZaPHFsMoTxXQ2nvUvtPnuohz3H2dIozSg+etNR98dGoYUp2ENSKLL/XaMmbxVgw==", "requires": { "cross-spawn": "^7.0.0", "get-stream": "^5.0.0", @@ -12277,16 +10488,6 @@ "path-exists": "^4.0.0" } }, - "gatsby-core-utils": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.2.0.tgz", - "integrity": "sha512-JBsVbniXObn26Hms8Je1vJdhMW04GesochBVLcaTraZC5dfqZDExPix65jrye/voC0YfFtXIngm59yspYZm1OQ==", - "requires": { - "ci-info": "2.0.0", - "configstore": "^5.0.1", - "node-object-hash": "^2.0.0" - } - }, "get-stream": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz", @@ -12303,16 +10504,6 @@ "binary-extensions": "^2.0.0" } }, - "is-buffer": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz", - "integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==" - }, - "is-plain-obj": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", - "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==" - }, "is-stream": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz", @@ -12334,14 +10525,6 @@ "repeat-string": "^1.0.0" } }, - "mdast-squeeze-paragraphs": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/mdast-squeeze-paragraphs/-/mdast-squeeze-paragraphs-4.0.0.tgz", - "integrity": "sha512-zxdPn69hkQ1rm4J+2Cs2j6wDEv7O17TfXTJ33tl/+JPIoEmtV9t2ZzBM5LPHE8QlHsmVD8t3vPKCyY3oH+H8MQ==", - "requires": { - "unist-util-remove": "^2.0.0" - } - }, "mdast-util-compact": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/mdast-util-compact/-/mdast-util-compact-2.0.1.tgz", @@ -12350,35 +10533,6 @@ "unist-util-visit": "^2.0.0" } }, - "mdast-util-definitions": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/mdast-util-definitions/-/mdast-util-definitions-2.0.1.tgz", - "integrity": "sha512-Co+DQ6oZlUzvUR7JCpP249PcexxygiaKk9axJh+eRzHDZJk2julbIdKB4PXHVxdBuLzvJ1Izb+YDpj2deGMOuA==", - "requires": { - "unist-util-visit": "^2.0.0" - } - }, - "mdast-util-to-hast": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-8.2.0.tgz", - "integrity": "sha512-WjH/KXtqU66XyTJQ7tg7sjvTw1OQcVV0hKdFh3BgHPwZ96fSBCQ/NitEHsN70Mmnggt+5eUUC7pCnK+2qGQnCA==", - "requires": { - "collapse-white-space": "^1.0.0", - "detab": "^2.0.0", - "mdast-util-definitions": "^2.0.0", - "mdurl": "^1.0.0", - "trim-lines": "^1.0.0", - "unist-builder": "^2.0.0", - "unist-util-generated": "^1.0.0", - "unist-util-position": "^3.0.0", - "unist-util-visit": "^2.0.0" - } - }, - "mimic-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==" - }, "npm-run-path": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", @@ -12387,14 +10541,6 @@ "path-key": "^3.0.0" } }, - "onetime": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz", - "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==", - "requires": { - "mimic-fn": "^2.1.0" - } - }, "p-locate": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", @@ -12403,118 +10549,29 @@ "p-limit": "^2.2.0" } }, - "parse-entities": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-2.0.0.tgz", - "integrity": "sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==", - "requires": { - "character-entities": "^1.0.0", - "character-entities-legacy": "^1.0.0", - "character-reference-invalid": "^1.0.0", - "is-alphanumerical": "^1.0.0", - "is-decimal": "^1.0.0", - "is-hexadecimal": "^1.0.0" - } - }, "path-exists": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==" }, - "path-key": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==" - }, - "pkg-dir": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", - "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", - "requires": { - "find-up": "^4.0.0" - } - }, - "prettier": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.0.5.tgz", - "integrity": "sha512-7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg==" - }, - "remark-mdx": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/remark-mdx/-/remark-mdx-1.6.1.tgz", - "integrity": "sha512-UyCqqYFv9l5dstX29QpdqMprBHyUYUEQHOUe0MdFUIm1XATxfVGHbRPtVBFz4ccd5NV1UL/rmsruo9WOswwmpQ==", - "requires": { - "@babel/core": "7.9.0", - "@babel/helper-plugin-utils": "7.8.3", - "@babel/plugin-proposal-object-rest-spread": "7.9.5", - "@babel/plugin-syntax-jsx": "7.8.3", - "@mdx-js/util": "^1.6.1", - "is-alphabetical": "1.0.4", - "remark-parse": "8.0.2", - "unified": "9.0.0" - }, - "dependencies": { - "@babel/core": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.0.tgz", - "integrity": "sha512-kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==", - "requires": { - "@babel/code-frame": "^7.8.3", - "@babel/generator": "^7.9.0", - "@babel/helper-module-transforms": "^7.9.0", - "@babel/helpers": "^7.9.0", - "@babel/parser": "^7.9.0", - "@babel/template": "^7.8.6", - "@babel/traverse": "^7.9.0", - "@babel/types": "^7.9.0", - "convert-source-map": "^1.7.0", - "debug": "^4.1.0", - "gensync": "^1.0.0-beta.1", - "json5": "^2.1.2", - "lodash": "^4.17.13", - "resolve": "^1.3.2", - "semver": "^5.4.1", - "source-map": "^0.5.0" - } - }, - "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" - } - } - }, - "remark-parse": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-8.0.2.tgz", - "integrity": "sha512-eMI6kMRjsAGpMXXBAywJwiwAse+KNpmt+BK55Oofy4KvBZEqUDj6mWbGLJZrujoPIPPxDXzn3T9baRlpsm2jnQ==", - "requires": { - "ccount": "^1.0.0", - "collapse-white-space": "^1.0.2", - "is-alphabetical": "^1.0.0", - "is-decimal": "^1.0.0", - "is-whitespace-character": "^1.0.0", - "is-word-character": "^1.0.0", - "markdown-escapes": "^1.0.0", - "parse-entities": "^2.0.0", - "repeat-string": "^1.5.4", - "state-toggle": "^1.0.0", - "trim": "0.0.1", - "trim-trailing-lines": "^1.0.0", - "unherit": "^1.0.4", - "unist-util-remove-position": "^2.0.0", - "vfile-location": "^3.0.0", - "xtend": "^4.0.1" - } + "path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==" }, - "remark-squeeze-paragraphs": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/remark-squeeze-paragraphs/-/remark-squeeze-paragraphs-4.0.0.tgz", - "integrity": "sha512-8qRqmL9F4nuLPIgl92XUuxI3pFxize+F1H0e/W3llTk0UsjJaj01+RrirkMw7P21RKe4X6goQhYRSvNWX+70Rw==", + "pkg-dir": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", + "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", "requires": { - "mdast-squeeze-paragraphs": "^4.0.0" + "find-up": "^4.0.0" } }, + "prettier": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.0.5.tgz", + "integrity": "sha512-7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg==" + }, "remark-stringify": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/remark-stringify/-/remark-stringify-8.0.0.tgz", @@ -12555,9 +10612,9 @@ "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==" }, "stringify-entities": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-3.0.0.tgz", - "integrity": "sha512-h7NJJIssprqlyjHT2eQt2W1F+MCcNmwPGlKb0bWEdET/3N44QN3QbUF/ueKCgAssyKRZ3Br9rQ7FcXjHr0qLHw==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-3.0.1.tgz", + "integrity": "sha512-Lsk3ISA2++eJYqBMPKcr/8eby1I6L0gP0NlxF8Zja6c05yr/yCYyb2c9PwXjd08Ib3If1vn1rbs1H5ZtVuOfvQ==", "requires": { "character-entities-html4": "^1.0.0", "character-entities-legacy": "^1.0.0", @@ -12566,45 +10623,6 @@ "is-hexadecimal": "^1.0.0" } }, - "unified": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/unified/-/unified-9.0.0.tgz", - "integrity": "sha512-ssFo33gljU3PdlWLjNp15Inqb77d6JnJSfyplGJPT/a+fNRNyCBeveBAYJdO5khKdF6WVHa/yYCC7Xl6BDwZUQ==", - "requires": { - "bail": "^1.0.0", - "extend": "^3.0.0", - "is-buffer": "^2.0.0", - "is-plain-obj": "^2.0.0", - "trough": "^1.0.0", - "vfile": "^4.0.0" - } - }, - "unist-util-is": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.0.2.tgz", - "integrity": "sha512-Ofx8uf6haexJwI1gxWMGg6I/dLnF2yE+KibhD3/diOqY2TinLcqHXCV6OI5gFVn3xQqDH+u0M625pfKwIwgBKQ==" - }, - "unist-util-remove": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/unist-util-remove/-/unist-util-remove-2.0.0.tgz", - "integrity": "sha512-HwwWyNHKkeg/eXRnE11IpzY8JT55JNM1YCwwU9YNCnfzk6s8GhPXrVBBZWiwLeATJbI7euvoGSzcy9M29UeW3g==", - "requires": { - "unist-util-is": "^4.0.0" - } - }, - "unist-util-remove-position": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-2.0.1.tgz", - "integrity": "sha512-fDZsLYIe2uT+oGFnuZmy73K6ZxOPG/Qcm+w7jbEjaFcJgbQ6cqjs/eSPzXhsmGpAsWPkqZM9pYjww5QTn3LHMA==", - "requires": { - "unist-util-visit": "^2.0.0" - } - }, - "vfile-location": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/vfile-location/-/vfile-location-3.0.1.tgz", - "integrity": "sha512-yYBO06eeN/Ki6Kh1QAkgzYpWT1d3Qln+ZCtSbJqFExPl1S3y2qqotJQXoh6qEvl/jDlgpUJolBn3PItVnnZRqQ==" - }, "which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", @@ -12612,11 +10630,6 @@ "requires": { "isexe": "^2.0.0" } - }, - "xstate": { - "version": "4.9.1", - "resolved": "https://registry.npmjs.org/xstate/-/xstate-4.9.1.tgz", - "integrity": "sha512-cfNnRaBebnr1tvs0nHBUTyomfJx36+8MWwXceyNTZfjyELMM8nIoiBDcUzfKmpNlnAvs2ZPREos19cw6Zl4nng==" } } }, @@ -12944,18 +10957,18 @@ } }, "gatsby-telemetry": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-1.3.1.tgz", - "integrity": "sha512-UOuRSbNrRkWIi7vzwI2gxd5b+pY0HXuvrhdzB/B/SCUkDaxfKf0LIsLIjtnSAKUrNNxNKnec0jSGk3PJdUNh4g==", + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-1.3.4.tgz", + "integrity": "sha512-t/IBxUJKWn9qRNfSrwYwFX4BaV/41LBaVeEL3LYmzcLMS8Cin4bYAew6yyO70jeg7939JDuKAaIzISm2Jzc7kg==", "requires": { "@babel/code-frame": "^7.8.3", - "@babel/runtime": "^7.9.2", + "@babel/runtime": "^7.9.6", "bluebird": "^3.7.2", "boxen": "^4.2.0", "configstore": "^5.0.1", "envinfo": "^7.5.1", "fs-extra": "^8.1.0", - "gatsby-core-utils": "^1.2.0", + "gatsby-core-utils": "^1.2.2", "git-up": "4.0.1", "is-docker": "2.0.0", "lodash": "^4.17.15", @@ -12998,16 +11011,6 @@ "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" }, - "gatsby-core-utils": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.2.0.tgz", - "integrity": "sha512-JBsVbniXObn26Hms8Je1vJdhMW04GesochBVLcaTraZC5dfqZDExPix65jrye/voC0YfFtXIngm59yspYZm1OQ==", - "requires": { - "ci-info": "2.0.0", - "configstore": "^5.0.1", - "node-object-hash": "^2.0.0" - } - }, "node-fetch": { "version": "2.6.0", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz", @@ -13511,21 +11514,25 @@ } }, "global-modules": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz", - "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz", + "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==", "requires": { - "global-prefix": "^3.0.0" + "global-prefix": "^1.0.1", + "is-windows": "^1.0.1", + "resolve-dir": "^1.0.0" } }, "global-prefix": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz", - "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz", + "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=", "requires": { - "ini": "^1.3.5", - "kind-of": "^6.0.2", - "which": "^1.3.1" + "expand-tilde": "^2.0.2", + "homedir-polyfill": "^1.0.1", + "ini": "^1.3.4", + "is-windows": "^1.0.1", + "which": "^1.2.14" } }, "globals": { @@ -13534,23 +11541,88 @@ "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==" }, "globby": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/globby/-/globby-8.0.2.tgz", - "integrity": "sha512-yTzMmKygLp8RUpG1Ymu2VXPSJQZjNAZPD4ywgYEaG7e4tBJeUQBO8OpXrf1RCNcEs5alsoJYPAMiIHP0cmeC7w==", - "requires": { - "array-union": "^1.0.1", - "dir-glob": "2.0.0", - "fast-glob": "^2.0.2", - "glob": "^7.1.2", - "ignore": "^3.3.5", - "pify": "^3.0.0", - "slash": "^1.0.0" + "version": "10.0.2", + "resolved": "https://registry.npmjs.org/globby/-/globby-10.0.2.tgz", + "integrity": "sha512-7dUi7RvCoT/xast/o/dLN53oqND4yk0nsHkhRgn9w65C4PofCLOoJ39iSOg+qVDdWQPIEj+eszMHQ+aLVwwQSg==", + "requires": { + "@types/glob": "^7.1.1", + "array-union": "^2.1.0", + "dir-glob": "^3.0.1", + "fast-glob": "^3.0.3", + "glob": "^7.1.3", + "ignore": "^5.1.1", + "merge2": "^1.2.3", + "slash": "^3.0.0" }, "dependencies": { - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" + "@nodelib/fs.stat": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz", + "integrity": "sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==" + }, + "braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "requires": { + "fill-range": "^7.0.1" + } + }, + "fast-glob": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.2.tgz", + "integrity": "sha512-UDV82o4uQyljznxwMxyVRJgZZt3O5wENYojjzbaGEGZgeOxkLFf+V4cnUD+krzb2F72E18RhamkMZ7AdeggF7A==", + "requires": { + "@nodelib/fs.stat": "^2.0.2", + "@nodelib/fs.walk": "^1.2.3", + "glob-parent": "^5.1.0", + "merge2": "^1.3.0", + "micromatch": "^4.0.2", + "picomatch": "^2.2.1" + } + }, + "fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "requires": { + "to-regex-range": "^5.0.1" + } + }, + "glob-parent": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz", + "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==", + "requires": { + "is-glob": "^4.0.1" + } + }, + "is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==" + }, + "micromatch": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz", + "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==", + "requires": { + "braces": "^3.0.1", + "picomatch": "^2.0.5" + } + }, + "picomatch": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz", + "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==" + }, + "to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "requires": { + "is-number": "^7.0.0" + } } } }, @@ -13650,6 +11722,16 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" + }, + "query-string": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz", + "integrity": "sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==", + "requires": { + "decode-uri-component": "^0.2.0", + "object-assign": "^4.1.0", + "strict-uri-encode": "^1.0.0" + } } } }, @@ -13769,12 +11851,11 @@ "integrity": "sha512-zGEOVKFM5sVPPrYs7J5/hYEw2Pof8KCyOwyhG8sAF26mCAeUFAcYPu1mwB7hhpIP29zOIBaDqwuHdLp0jvZXjw==" }, "gzip-size": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-5.1.1.tgz", - "integrity": "sha512-FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-3.0.0.tgz", + "integrity": "sha1-VGGI6b3DN/Zzdy+BZgRks4nc5SA=", "requires": { - "duplexer": "^0.1.1", - "pify": "^4.0.1" + "duplexer": "^0.1.1" } }, "handle-thing": { @@ -14077,6 +12158,27 @@ "resolved": "https://registry.npmjs.org/hex-color-regex/-/hex-color-regex-1.1.0.tgz", "integrity": "sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==" }, + "hicat": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/hicat/-/hicat-0.7.0.tgz", + "integrity": "sha1-pwTLP1fkn719OMLt16ujj/CzUmM=", + "requires": { + "highlight.js": "^8.1.0", + "minimist": "^0.2.0" + }, + "dependencies": { + "minimist": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.1.tgz", + "integrity": "sha512-GY8fANSrTMfBVfInqJAY41QkOM+upUTytK1jZ0c8+3HdHrJxBJ3rF5i9moClXTE8uUSnUo8cAsCoxDXvSY4DHg==" + } + } + }, + "highlight.js": { + "version": "8.9.1", + "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-8.9.1.tgz", + "integrity": "sha1-uKnFSTISqTkvAiK2SclhFJfr+4g=" + }, "hmac-drbg": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", @@ -14238,9 +12340,9 @@ }, "dependencies": { "eventemitter3": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.0.tgz", - "integrity": "sha512-qerSRB0p+UDEssxTtm6EDKcE7W4OaoisfIMl4CngyEhjpYglocpNg6UEqCvemdGhosAsg4sO2dXJOdyBifPGCg==" + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.4.tgz", + "integrity": "sha512-rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ==" } } }, @@ -14348,9 +12450,9 @@ "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=" }, "ignore": { - "version": "3.3.10", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz", - "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==" + "version": "5.1.4", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.4.tgz", + "integrity": "sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A==" }, "image-size": { "version": "0.5.5", @@ -14358,11 +12460,6 @@ "integrity": "sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=", "optional": true }, - "immer": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/immer/-/immer-1.10.0.tgz", - "integrity": "sha512-O3sR1/opvCDGLEVcvrGTMtLac8GJ5IwZC4puPrLuRj3l7ICKvkmA0vGuU9OW8mV9WIBRnaxp5GJh9IEAaNOoYg==" - }, "import-cwd": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz", @@ -14576,12 +12673,6 @@ "color-convert": "^2.0.1" } }, - "arrify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz", - "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==", - "optional": true - }, "astral-regex": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", @@ -14598,15 +12689,6 @@ "supports-color": "^7.1.0" } }, - "cli-cursor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", - "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", - "optional": true, - "requires": { - "restore-cursor": "^3.1.0" - } - }, "color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", @@ -14640,31 +12722,6 @@ "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", "optional": true }, - "mimic-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", - "optional": true - }, - "onetime": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz", - "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==", - "optional": true, - "requires": { - "mimic-fn": "^2.1.0" - } - }, - "restore-cursor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", - "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", - "optional": true, - "requires": { - "onetime": "^5.1.0", - "signal-exit": "^3.0.2" - } - }, "slice-ansi": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz", @@ -14874,6 +12931,16 @@ "figures": "^2.0.0", "lodash.isequal": "^4.5.0", "prop-types": "^15.5.10" + }, + "dependencies": { + "figures": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz", + "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=", + "requires": { + "escape-string-regexp": "^1.0.5" + } + } } }, "ink-spinner": { @@ -14900,37 +12967,114 @@ } }, "inquirer": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.0.tgz", - "integrity": "sha512-scfHejeG/lVZSpvCXpsB4j/wQNPM5JC8kiElOI0OUTwmc1RTpXr4H32/HOlQHcZiYl2z2VElwuCVDRG8vFmbnA==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.1.0.tgz", + "integrity": "sha512-5fJMWEmikSYu0nv/flMc475MhGbB7TSPd/2IpFV4I4rMklboCH2rQjYY5kKiYGHqUF9gvaambupcJFFG9dvReg==", "requires": { - "ansi-escapes": "^3.2.0", - "chalk": "^2.4.2", - "cli-cursor": "^2.1.0", + "ansi-escapes": "^4.2.1", + "chalk": "^3.0.0", + "cli-cursor": "^3.1.0", "cli-width": "^2.0.0", "external-editor": "^3.0.3", - "figures": "^2.0.0", - "lodash": "^4.17.12", - "mute-stream": "0.0.7", - "run-async": "^2.2.0", - "rxjs": "^6.4.0", - "string-width": "^2.1.0", - "strip-ansi": "^5.1.0", + "figures": "^3.0.0", + "lodash": "^4.17.15", + "mute-stream": "0.0.8", + "run-async": "^2.4.0", + "rxjs": "^6.5.3", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0", "through": "^2.3.6" }, "dependencies": { + "ansi-escapes": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz", + "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==", + "requires": { + "type-fest": "^0.11.0" + } + }, "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==" + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==" + }, + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" + }, + "string-width": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", + "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" + } }, "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", "requires": { - "ansi-regex": "^4.1.0" + "ansi-regex": "^5.0.0" + } + }, + "supports-color": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "requires": { + "has-flag": "^4.0.0" } + }, + "type-fest": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz", + "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==" } } }, @@ -15018,13 +13162,6 @@ "requires": { "from2": "^2.1.1", "p-is-promise": "^1.1.0" - }, - "dependencies": { - "p-is-promise": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz", - "integrity": "sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4=" - } } }, "invariant": { @@ -15035,11 +13172,6 @@ "loose-envify": "^1.0.0" } }, - "invert-kv": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz", - "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==" - }, "ip": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", @@ -15448,9 +13580,9 @@ "integrity": "sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==" }, "is-root": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-root/-/is-root-2.1.0.tgz", - "integrity": "sha512-AGOriNp96vNBd3HtU+RzFEc75FfR5ymiYv8E553I71SCeXBiMsVDUtdio1OEFvrPyLIQ9tVR5RxXIFe5PUFjMg==" + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-root/-/is-root-1.0.0.tgz", + "integrity": "sha1-B7bCM7w5TNnQK6FclmvWZg1jQtU=" }, "is-ssh": { "version": "1.3.1", @@ -15541,9 +13673,12 @@ "integrity": "sha512-5SMO8RVennx3nZrqtKwCGyyetPE9VDba5ugvKLaD4KopPG5kR4mQ7tNt/r7feL5yt5h3lpuBbIUmCOG2eSzXHA==" }, "is-wsl": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.1.1.tgz", - "integrity": "sha512-umZHcSrwlDHo2TGMXv0DZ8dIUGunZ2Iv68YZnrmCiBPkZ4aaOhtv7pXJKeki9k3qJ3RJr0cDyitcl5wEH3AYog==" + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz", + "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==", + "requires": { + "is-docker": "^2.0.0" + } }, "is-yarn-global": { "version": "0.3.0", @@ -15836,14 +13971,6 @@ "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz", "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=" }, - "lcid": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz", - "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==", - "requires": { - "invert-kv": "^2.0.0" - } - }, "less": { "version": "3.11.1", "resolved": "https://registry.npmjs.org/less/-/less-3.11.1.tgz", @@ -16395,6 +14522,42 @@ "ansi-escapes": "^3.2.0", "cli-cursor": "^2.1.0", "wrap-ansi": "^5.0.0" + }, + "dependencies": { + "cli-cursor": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz", + "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=", + "optional": true, + "requires": { + "restore-cursor": "^2.0.0" + } + }, + "mimic-fn": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz", + "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==", + "optional": true + }, + "onetime": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz", + "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=", + "optional": true, + "requires": { + "mimic-fn": "^1.0.0" + } + }, + "restore-cursor": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz", + "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=", + "optional": true, + "requires": { + "onetime": "^2.0.0", + "signal-exit": "^3.0.2" + } + } } }, "loglevel": { @@ -16402,11 +14565,6 @@ "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.8.tgz", "integrity": "sha512-bsU7+gc9AJ2SqpzxwU3+1fedl8zAntbtC5XYlt3s2j1hJcn2PsXSmgN8TaLG/J1/2mod4+cE/3vNL70/c1RNCA==" }, - "lokijs": { - "version": "1.5.8", - "resolved": "https://registry.npmjs.org/lokijs/-/lokijs-1.5.8.tgz", - "integrity": "sha512-D8E3TBrY35o1ELnonp2MF8b3wKu2tVNl2TqRjvS+95oPMMe7OoIAxNY1qr+5BEZwnWn2V4ErAjVt000DonM+FA==" - }, "longest-streak": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/longest-streak/-/longest-streak-2.0.4.tgz", @@ -16478,21 +14636,6 @@ "semver": "^5.6.0" } }, - "map-age-cleaner": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz", - "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==", - "requires": { - "p-defer": "^1.0.0" - }, - "dependencies": { - "p-defer": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz", - "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=" - } - } - }, "map-cache": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", @@ -16663,23 +14806,6 @@ "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=" }, - "mem": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz", - "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==", - "requires": { - "map-age-cleaner": "^0.1.1", - "mimic-fn": "^2.0.0", - "p-is-promise": "^2.0.0" - }, - "dependencies": { - "mimic-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==" - } - } - }, "memory-fs": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz", @@ -16757,11 +14883,6 @@ "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=" }, - "microevent.ts": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/microevent.ts/-/microevent.ts-0.1.1.tgz", - "integrity": "sha512-jo1OfR4TaEwd5HOrt5+tAZ9mqT4jmpNAusXtyfNzqVm9uiSYFZlKM1wYL4oU7azZW/PxQW53wM0S6OR1JHNa2g==" - }, "micromatch": { "version": "3.1.10", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", @@ -16810,9 +14931,9 @@ } }, "mimic-fn": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz", - "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==" + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==" }, "mimic-response": { "version": "1.0.1", @@ -17003,9 +15124,9 @@ } }, "moment": { - "version": "2.25.1", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.25.1.tgz", - "integrity": "sha512-nRKMf9wDS4Fkyd0C9LXh2FFXinD+iwbJ5p/lh3CHitW9kZbRbJ8hCruiadiIXZVbeAqKZzqcTvHnK3mRhFjb6w==" + "version": "2.25.3", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.25.3.tgz", + "integrity": "sha512-PuYv0PHxZvzc15Sp8ybUCoQ+xpyPWvjOuK72a5ovzp2LI32rJXOiIfyoFoYvG3s6EwwrdkMyWuRiEHSZRLJNdg==" }, "moment-mini": { "version": "2.24.0", @@ -17055,9 +15176,9 @@ "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=" }, "mute-stream": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz", - "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=" + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", + "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==" }, "name-all-modules-plugin": { "version": "1.0.1", @@ -17103,6 +15224,14 @@ "to-regex": "^3.0.1" } }, + "native-url": { + "version": "0.2.6", + "resolved": "https://registry.npmjs.org/native-url/-/native-url-0.2.6.tgz", + "integrity": "sha512-k4bDC87WtgrdD362gZz6zoiXQrl40kYlBmpfmSjwRO1VU0V5ccwJTlxuE72F6m3V0vc1xOf6n3UCP9QyerRqmA==", + "requires": { + "querystring": "^0.2.0" + } + }, "natural-compare": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", @@ -17216,19 +15345,9 @@ "integrity": "sha512-VZR0zroAusy1ETZMZiGeLkdu50LGjG5U1KHZqTruqtTyQ2wfWhHG2Ow4nsUbfTFGlaREgNHcCWoM/OzEm6p+NQ==" }, "node-releases": { - "version": "1.1.52", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.52.tgz", - "integrity": "sha512-snSiT1UypkgGt2wxPqS6ImEUICbNCMb31yaxWrOLXjhlt2z2/IBpaOxzONExqSm4y5oLnAqjjRWu+wsDzK5yNQ==", - "requires": { - "semver": "^6.3.0" - }, - "dependencies": { - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" - } - } + "version": "1.1.55", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.55.tgz", + "integrity": "sha512-H3R3YR/8TjT5WPin/wOoHOUPHgvj8leuU/Keta/rwelEQN9pA/S2Dx8/se4pZ2LBxSd0nAGzsNzhqwa77v7F1w==" }, "noms": { "version": "0.0.0", @@ -17333,11 +15452,6 @@ "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz", "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=" }, - "number-is-nan": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", - "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" - }, "oauth-sign": { "version": "0.9.0", "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", @@ -17685,11 +15799,11 @@ } }, "onetime": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz", - "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz", + "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==", "requires": { - "mimic-fn": "^1.0.0" + "mimic-fn": "^2.1.0" } }, "open": { @@ -17762,32 +15876,6 @@ "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz", "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=" }, - "os-locale": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz", - "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==", - "requires": { - "execa": "^1.0.0", - "lcid": "^2.0.0", - "mem": "^4.0.0" - }, - "dependencies": { - "execa": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz", - "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==", - "requires": { - "cross-spawn": "^6.0.0", - "get-stream": "^4.0.0", - "is-stream": "^1.1.0", - "npm-run-path": "^2.0.0", - "p-finally": "^1.0.0", - "signal-exit": "^3.0.0", - "strip-eof": "^1.0.0" - } - } - } - }, "os-tmpdir": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", @@ -17809,9 +15897,9 @@ "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=" }, "p-is-promise": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz", - "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==" + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz", + "integrity": "sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4=" }, "p-limit": { "version": "2.3.0", @@ -19176,13 +17264,20 @@ "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==" }, "query-string": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz", - "integrity": "sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==", + "version": "6.12.1", + "resolved": "https://registry.npmjs.org/query-string/-/query-string-6.12.1.tgz", + "integrity": "sha512-OHj+zzfRMyj3rmo/6G8a5Ifvw3AleL/EbcHMD27YA31Q+cO5lfmQxECkImuNVjcskLcvBRVHNAB3w6udMs1eAA==", "requires": { "decode-uri-component": "^0.2.0", - "object-assign": "^4.1.0", - "strict-uri-encode": "^1.0.0" + "split-on-first": "^1.0.0", + "strict-uri-encode": "^2.0.0" + }, + "dependencies": { + "strict-uri-encode": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz", + "integrity": "sha1-ucczDHBChi9rFC3CdLvMWGbONUY=" + } } }, "querystring": { @@ -19325,6 +17420,14 @@ "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz", "integrity": "sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I=" }, + "cli-cursor": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz", + "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=", + "requires": { + "restore-cursor": "^2.0.0" + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -19352,14 +17455,6 @@ "debug": "^2.6.0" } }, - "eventsource": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-0.1.6.tgz", - "integrity": "sha1-Cs7ehJ7X3RzMMsgRuxG5RNTykjI=", - "requires": { - "original": ">=0.0.5" - } - }, "external-editor": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz", @@ -19370,39 +17465,12 @@ "tmp": "^0.0.33" } }, - "filesize": { - "version": "3.5.11", - "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.5.11.tgz", - "integrity": "sha512-ZH7loueKBoDb7yG9esn1U+fgq7BzlzW6NRi5/rMdxIZ05dj7GFD/Xc5rq2CDt5Yq86CyfSYVyx4242QQNZbx1g==" - }, - "global-modules": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz", - "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==", - "requires": { - "global-prefix": "^1.0.1", - "is-windows": "^1.0.1", - "resolve-dir": "^1.0.0" - } - }, - "global-prefix": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz", - "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=", - "requires": { - "expand-tilde": "^2.0.2", - "homedir-polyfill": "^1.0.1", - "ini": "^1.3.4", - "is-windows": "^1.0.1", - "which": "^1.2.14" - } - }, - "gzip-size": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-3.0.0.tgz", - "integrity": "sha1-VGGI6b3DN/Zzdy+BZgRks4nc5SA=", + "figures": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz", + "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=", "requires": { - "duplexer": "^0.1.1" + "escape-string-regexp": "^1.0.5" } }, "inquirer": { @@ -19462,11 +17530,6 @@ } } }, - "is-root": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-root/-/is-root-1.0.0.tgz", - "integrity": "sha1-B7bCM7w5TNnQK6FclmvWZg1jQtU=" - }, "lru-cache": { "version": "4.1.5", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", @@ -19476,49 +17539,36 @@ "yallist": "^2.1.2" } }, - "minimatch": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz", - "integrity": "sha1-Kk5AkLlrLbBqnX3wEFWmKnfJt3Q=", - "requires": { - "brace-expansion": "^1.0.0" - } + "mimic-fn": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz", + "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==" }, "ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" }, - "recursive-readdir": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.1.tgz", - "integrity": "sha1-kO8jHQd4xc4JPJpI105cVCLROpk=", - "requires": { - "minimatch": "3.0.3" - } + "mute-stream": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz", + "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=" }, - "shell-quote": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.6.1.tgz", - "integrity": "sha1-9HgZSczkAmlxJ0MOo7PFR29IF2c=", + "onetime": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz", + "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=", "requires": { - "array-filter": "~0.0.0", - "array-map": "~0.0.0", - "array-reduce": "~0.0.0", - "jsonify": "~0.0.0" + "mimic-fn": "^1.0.0" } }, - "sockjs-client": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.1.4.tgz", - "integrity": "sha1-W6vjhrd15M8U51IJEUUmVAFsixI=", + "restore-cursor": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz", + "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=", "requires": { - "debug": "^2.6.6", - "eventsource": "0.1.6", - "faye-websocket": "~0.11.0", - "inherits": "^2.0.1", - "json3": "^3.3.2", - "url-parse": "^1.1.8" + "onetime": "^2.0.0", + "signal-exit": "^3.0.2" } }, "supports-color": { @@ -19792,11 +17842,21 @@ } }, "recursive-readdir": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz", - "integrity": "sha512-nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg==", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.1.tgz", + "integrity": "sha1-kO8jHQd4xc4JPJpI105cVCLROpk=", "requires": { - "minimatch": "3.0.4" + "minimatch": "3.0.3" + }, + "dependencies": { + "minimatch": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz", + "integrity": "sha1-Kk5AkLlrLbBqnX3wEFWmKnfJt3Q=", + "requires": { + "brace-expansion": "^1.0.0" + } + } } }, "redux": { @@ -20594,30 +18654,6 @@ "requires": { "expand-tilde": "^2.0.0", "global-modules": "^1.0.0" - }, - "dependencies": { - "global-modules": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz", - "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==", - "requires": { - "global-prefix": "^1.0.1", - "is-windows": "^1.0.1", - "resolve-dir": "^1.0.0" - } - }, - "global-prefix": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz", - "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=", - "requires": { - "expand-tilde": "^2.0.2", - "homedir-polyfill": "^1.0.1", - "ini": "^1.3.4", - "is-windows": "^1.0.1", - "which": "^1.2.14" - } - } } }, "resolve-from": { @@ -20639,11 +18675,11 @@ } }, "restore-cursor": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz", - "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", + "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", "requires": { - "onetime": "^2.0.0", + "onetime": "^5.1.0", "signal-exit": "^3.0.2" } }, @@ -21259,9 +19295,15 @@ "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=" }, "shell-quote": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.2.tgz", - "integrity": "sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg==" + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.6.1.tgz", + "integrity": "sha1-9HgZSczkAmlxJ0MOo7PFR29IF2c=", + "requires": { + "array-filter": "~0.0.0", + "array-map": "~0.0.0", + "array-reduce": "~0.0.0", + "jsonify": "~0.0.0" + } }, "side-channel": { "version": "1.0.2", @@ -21387,9 +19429,9 @@ "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==" }, "slash": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz", - "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=" + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==" }, "slice-ansi": { "version": "2.1.0", @@ -21619,9 +19661,9 @@ } }, "socket.io-parser": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.4.0.tgz", - "integrity": "sha512-/G/VOI+3DBp0+DJKW4KesGnQkQPFmUCbA/oO2QGT6CWxU7hLGWqU3tyuzeSK/dqcyeHsQg1vTe9jiZI8GU9SCQ==", + "version": "3.4.1", + "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.4.1.tgz", + "integrity": "sha512-11hMgzL+WCLWf1uFtHSNvliI++tcRUWdoeYuwIl+Axvwy9z2gQM+7nJyN3STj1tLj5JyIUH8/gpDGxzAlDdi0A==", "requires": { "component-emitter": "1.2.1", "debug": "~4.1.0", @@ -21649,12 +19691,13 @@ } }, "sockjs": { - "version": "0.3.19", - "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.19.tgz", - "integrity": "sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==", + "version": "0.3.20", + "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.20.tgz", + "integrity": "sha512-SpmVOVpdq0DJc0qArhF3E5xsxvaiqGNb73XfgBpK1y3UD5gs8DSo8aCTsuT5pX8rssdc2NDIzANwP9eCAiSdTA==", "requires": { "faye-websocket": "^0.10.0", - "uuid": "^3.0.1" + "uuid": "^3.4.0", + "websocket-driver": "0.6.5" }, "dependencies": { "faye-websocket": { @@ -21662,24 +19705,52 @@ "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz", "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=", "requires": { - "websocket-driver": ">=0.5.1" + "websocket-driver": ">=0.5.1" + } + }, + "uuid": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", + "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==" + }, + "websocket-driver": { + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.5.tgz", + "integrity": "sha1-XLJVbOuF9Dc8bYI4qmkchFThOjY=", + "requires": { + "websocket-extensions": ">=0.1.1" + } + } + } + }, + "sockjs-client": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.1.4.tgz", + "integrity": "sha1-W6vjhrd15M8U51IJEUUmVAFsixI=", + "requires": { + "debug": "^2.6.6", + "eventsource": "0.1.6", + "faye-websocket": "~0.11.0", + "inherits": "^2.0.1", + "json3": "^3.3.2", + "url-parse": "^1.1.8" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" } } }, - "sockjs-client": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.4.0.tgz", - "integrity": "sha512-5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g==", - "requires": { - "debug": "^3.2.5", - "eventsource": "^1.0.7", - "faye-websocket": "~0.11.1", - "inherits": "^2.0.3", - "json3": "^3.3.2", - "url-parse": "^1.4.3" - } - }, "sort-keys": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-2.0.0.tgz", @@ -21761,9 +19832,9 @@ "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==" }, "spdx-expression-parse": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz", - "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", + "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", "requires": { "spdx-exceptions": "^2.1.0", "spdx-license-ids": "^3.0.0" @@ -21829,6 +19900,11 @@ } } }, + "split-on-first": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/split-on-first/-/split-on-first-1.1.0.tgz", + "integrity": "sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw==" + }, "split-string": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz", @@ -23873,9 +21949,9 @@ } }, "webpack-dev-server": { - "version": "3.10.3", - "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.10.3.tgz", - "integrity": "sha512-e4nWev8YzEVNdOMcNzNeCN947sWJNd43E5XvsJzbAL08kGc2frm1tQ32hTJslRS+H65LCb/AaUCYU7fjHCpDeQ==", + "version": "3.11.0", + "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.11.0.tgz", + "integrity": "sha512-PUxZ+oSTxogFQgkTtFndEtJIPNmml7ExwufBZ9L2/Xyyd5PnOL5UreWe5ZT7IU25DSdykL9p1MLQzmLh2ljSeg==", "requires": { "ansi-html": "0.0.7", "bonjour": "^3.5.0", @@ -23885,33 +21961,41 @@ "debug": "^4.1.1", "del": "^4.1.1", "express": "^4.17.1", - "html-entities": "^1.2.1", + "html-entities": "^1.3.1", "http-proxy-middleware": "0.19.1", "import-local": "^2.0.0", "internal-ip": "^4.3.0", "ip": "^1.1.5", "is-absolute-url": "^3.0.3", "killable": "^1.0.1", - "loglevel": "^1.6.6", + "loglevel": "^1.6.8", "opn": "^5.5.0", "p-retry": "^3.0.1", - "portfinder": "^1.0.25", + "portfinder": "^1.0.26", "schema-utils": "^1.0.0", "selfsigned": "^1.10.7", "semver": "^6.3.0", "serve-index": "^1.9.1", - "sockjs": "0.3.19", + "sockjs": "0.3.20", "sockjs-client": "1.4.0", - "spdy": "^4.0.1", + "spdy": "^4.0.2", "strip-ansi": "^3.0.1", "supports-color": "^6.1.0", "url": "^0.11.0", "webpack-dev-middleware": "^3.7.2", "webpack-log": "^2.0.0", "ws": "^6.2.1", - "yargs": "12.0.5" + "yargs": "^13.3.2" }, "dependencies": { + "array-union": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", + "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", + "requires": { + "array-uniq": "^1.0.1" + } + }, "chokidar": { "version": "2.1.8", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz", @@ -23931,26 +22015,6 @@ "upath": "^1.1.1" } }, - "cliui": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz", - "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==", - "requires": { - "string-width": "^2.1.1", - "strip-ansi": "^4.0.0", - "wrap-ansi": "^2.0.0" - }, - "dependencies": { - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "requires": { - "ansi-regex": "^3.0.0" - } - } - } - }, "debug": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", @@ -23973,10 +22037,13 @@ "rimraf": "^2.6.3" } }, - "get-caller-file": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz", - "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==" + "eventsource": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz", + "integrity": "sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==", + "requires": { + "original": "^1.0.0" + } }, "globby": { "version": "6.1.0", @@ -23997,14 +22064,6 @@ } } }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", - "requires": { - "number-is-nan": "^1.0.0" - } - }, "is-wsl": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz", @@ -24028,11 +22087,6 @@ "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz", "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==" }, - "require-main-filename": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", - "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=" - }, "rimraf": { "version": "2.7.1", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", @@ -24056,35 +22110,37 @@ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" }, - "supports-color": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", - "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", - "requires": { - "has-flag": "^3.0.0" - } - }, - "wrap-ansi": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", - "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", + "sockjs-client": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.4.0.tgz", + "integrity": "sha512-5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g==", "requires": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1" + "debug": "^3.2.5", + "eventsource": "^1.0.7", + "faye-websocket": "~0.11.1", + "inherits": "^2.0.3", + "json3": "^3.3.2", + "url-parse": "^1.4.3" }, "dependencies": { - "string-width": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "debug": { + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", + "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" + "ms": "^2.1.1" } } } }, + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "requires": { + "has-flag": "^3.0.0" + } + }, "ws": { "version": "6.2.1", "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz", @@ -24092,34 +22148,6 @@ "requires": { "async-limiter": "~1.0.0" } - }, - "yargs": { - "version": "12.0.5", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz", - "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==", - "requires": { - "cliui": "^4.0.0", - "decamelize": "^1.2.0", - "find-up": "^3.0.0", - "get-caller-file": "^1.0.1", - "os-locale": "^3.0.0", - "require-directory": "^2.1.1", - "require-main-filename": "^1.0.1", - "set-blocking": "^2.0.0", - "string-width": "^2.0.0", - "which-module": "^2.0.0", - "y18n": "^3.2.1 || ^4.0.0", - "yargs-parser": "^11.1.1" - } - }, - "yargs-parser": { - "version": "11.1.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz", - "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==", - "requires": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" - } } } }, @@ -24276,14 +22304,6 @@ "errno": "~0.1.7" } }, - "worker-rpc": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/worker-rpc/-/worker-rpc-0.1.1.tgz", - "integrity": "sha512-P1WjMrUB3qgJNI9jfmpZ/htmBEjFh//6l/5y8SD9hg1Ef5zTTVVoRjTrTEzPrNBQvmhMxkoTsjOXN10GWU7aCg==", - "requires": { - "microevent.ts": "~0.1.1" - } - }, "wrap-ansi": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", @@ -24344,9 +22364,9 @@ } }, "ws": { - "version": "7.2.5", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.2.5.tgz", - "integrity": "sha512-C34cIU4+DB2vMyAbmEKossWq2ZQDr6QEyuuCzWrM9zfw1sGc0mYiJ0UnG9zzNykt49C2Fi34hvr2vssFQRS6EA==" + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.0.tgz", + "integrity": "sha512-iFtXzngZVXPGgpTlP1rBqsUK82p9tKqsWRPg5L56egiljujJT3vGAYnHANvFxBieXrTFavhzhxW52jnaWV+w2w==" }, "x-is-string": { "version": "0.1.0", @@ -24408,14 +22428,6 @@ "yaml": "^1.8.3" }, "dependencies": { - "@babel/runtime": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.6.tgz", - "integrity": "sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==", - "requires": { - "regenerator-runtime": "^0.13.4" - } - }, "emojis-list": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", @@ -24439,18 +22451,10 @@ "json5": "^1.0.1" } }, - "regenerator-runtime": { - "version": "0.13.5", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", - "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==" - }, "yaml": { - "version": "1.9.2", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.9.2.tgz", - "integrity": "sha512-HPT7cGGI0DuRcsO51qC1j9O16Dh1mZ2bnXwsi0jrSpsLz0WxOLSLXfkABVl6bZO629py3CU+OMJtpNHDLB97kg==", - "requires": { - "@babel/runtime": "^7.9.2" - } + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.0.tgz", + "integrity": "sha512-yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg==" } } }, @@ -24554,48 +22558,10 @@ "strip-bom": "^4.0.0" }, "dependencies": { - "ansi-escapes": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz", - "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==", - "requires": { - "type-fest": "^0.11.0" - } - }, "ansi-regex": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==" - }, - "ansi-styles": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", - "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", - "requires": { - "@types/color-name": "^1.1.1", - "color-convert": "^2.0.1" - } - }, - "cli-cursor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", - "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", - "requires": { - "restore-cursor": "^3.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==" }, "debug": { "version": "4.1.1", @@ -24605,152 +22571,23 @@ "ms": "^2.1.1" } }, - "emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" - }, - "figures": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz", - "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==", - "requires": { - "escape-string-regexp": "^1.0.5" - } - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" - }, - "inquirer": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.1.0.tgz", - "integrity": "sha512-5fJMWEmikSYu0nv/flMc475MhGbB7TSPd/2IpFV4I4rMklboCH2rQjYY5kKiYGHqUF9gvaambupcJFFG9dvReg==", - "requires": { - "ansi-escapes": "^4.2.1", - "chalk": "^3.0.0", - "cli-cursor": "^3.1.0", - "cli-width": "^2.0.0", - "external-editor": "^3.0.3", - "figures": "^3.0.0", - "lodash": "^4.17.15", - "mute-stream": "0.0.8", - "run-async": "^2.4.0", - "rxjs": "^6.5.3", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0", - "through": "^2.3.6" - }, - "dependencies": { - "chalk": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", - "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", - "requires": { - "ansi-regex": "^5.0.0" - } - } - } - }, - "is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" - }, - "mimic-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==" - }, - "mute-stream": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", - "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==" - }, - "onetime": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz", - "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==", - "requires": { - "mimic-fn": "^2.1.0" - } - }, - "restore-cursor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", - "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", - "requires": { - "onetime": "^5.1.0", - "signal-exit": "^3.0.2" - } - }, "semver": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" }, - "string-width": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", - "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", - "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" - }, - "dependencies": { - "strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", - "requires": { - "ansi-regex": "^5.0.0" - } - } - } - }, "strip-ansi": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", "requires": { "ansi-regex": "^4.1.0" - }, - "dependencies": { - "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==" - } } }, "strip-bom": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz", "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==" - }, - "supports-color": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", - "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", - "requires": { - "has-flag": "^4.0.0" - } - }, - "type-fest": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz", - "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==" } } }, diff --git a/docs/package.json b/docs/package.json index aa562228911..f6864ac6078 100644 --- a/docs/package.json +++ b/docs/package.json @@ -6,7 +6,7 @@ "serve": "gatsby serve" }, "dependencies": { - "gatsby": "2.21.9", + "gatsby": "2.21.33", "gatsby-theme-apollo-docs": "4.2.3", "react": "16.13.1", "react-dom": "16.13.1" From c1b414b5134fb05884ee4d5adcfccdc6125bd9a3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 16 May 2020 12:35:18 +0000 Subject: [PATCH 581/642] chore(deps): update dependency @types/lodash to v4.14.151 (#4124) Co-authored-by: Renovate Bot --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index da5a95d1532..1bdc8e4cf43 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5166,9 +5166,9 @@ } }, "@types/lodash": { - "version": "4.14.150", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.150.tgz", - "integrity": "sha512-kMNLM5JBcasgYscD9x/Gvr6lTAv2NVgsKtet/hm93qMyf/D1pt+7jeEZklKJKxMVmXjxbRVQQGfqDSfipYCO6w==", + "version": "4.14.151", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.151.tgz", + "integrity": "sha512-Zst90IcBX5wnwSu7CAS0vvJkTjTELY4ssKbHiTnGcJgi170uiS8yQDdc3v6S77bRqYQIN1App5a1Pc2lceE5/g==", "dev": true }, "@types/lodash.sortby": { diff --git a/package.json b/package.json index bd8d0845d3b..7b798c76822 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ "@types/ioredis": "4.16.1", "@types/jest": "25.2.2", "@types/koa-router": "7.4.0", - "@types/lodash": "4.14.150", + "@types/lodash": "4.14.151", "@types/lodash.sortby": "4.7.6", "@types/lodash.xorby": "4.7.6", "@types/loglevel": "1.5.4", From cdf8264a1bb0ef9c52515b2e58aced3e7501906b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 16 May 2020 13:36:28 +0000 Subject: [PATCH 582/642] chore(deps): update dependency @types/koa-router to v7.4.1 (#4123) Co-authored-by: Renovate Bot --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1bdc8e4cf43..33c7c1fb9fa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5149,9 +5149,9 @@ } }, "@types/koa-router": { - "version": "7.4.0", - "resolved": "https://registry.npmjs.org/@types/koa-router/-/koa-router-7.4.0.tgz", - "integrity": "sha512-CkNyhGOCJ6rpBEG0rlSQhwHsHNwMzGLE49tV3jE5f0TvMzy/SmoCAIlHWdOLs8Mro+BqtKFH6e/lDaibWkydag==", + "version": "7.4.1", + "resolved": "https://registry.npmjs.org/@types/koa-router/-/koa-router-7.4.1.tgz", + "integrity": "sha512-Hg78TXz78QYfEgdq3nTeRmQFEwJKZljsXb/DhtexmyrpRDRnl59oMglh9uPj3/WgKor0woANrYTnxA8gaWGK2A==", "dev": true, "requires": { "@types/koa": "*" diff --git a/package.json b/package.json index 7b798c76822..31a59ffbbad 100644 --- a/package.json +++ b/package.json @@ -69,7 +69,7 @@ "@types/hapi": "17.8.7", "@types/ioredis": "4.16.1", "@types/jest": "25.2.2", - "@types/koa-router": "7.4.0", + "@types/koa-router": "7.4.1", "@types/lodash": "4.14.151", "@types/lodash.sortby": "4.7.6", "@types/lodash.xorby": "4.7.6", From 3cff7b7720ff7cbc7ba1040507124a70c2754870 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 16 May 2020 14:37:46 +0000 Subject: [PATCH 583/642] chore(deps): update dependency @types/request to v2.48.5 (#4125) Co-authored-by: Renovate Bot --- package-lock.json | 12 ++++++------ package.json | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index 33c7c1fb9fa..0fa35b5d708 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5322,9 +5322,9 @@ "integrity": "sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA==" }, "@types/request": { - "version": "2.48.4", - "resolved": "https://registry.npmjs.org/@types/request/-/request-2.48.4.tgz", - "integrity": "sha512-W1t1MTKYR8PxICH+A4HgEIPuAC3sbljoEVfyZbeFJJDbr30guDspJri2XOaM2E+Un7ZjrihaDi7cf6fPa2tbgw==", + "version": "2.48.5", + "resolved": "https://registry.npmjs.org/@types/request/-/request-2.48.5.tgz", + "integrity": "sha512-/LO7xRVnL3DxJ1WkPGDQrp4VTV1reX9RkC85mJ+Qzykj2Bdw+mG15aAfDahc76HtknjzE16SX/Yddn6MxVbmGQ==", "dev": true, "requires": { "@types/caseless": "*", @@ -5402,9 +5402,9 @@ } }, "@types/tough-cookie": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-2.3.6.tgz", - "integrity": "sha512-wHNBMnkoEBiRAd3s8KTKwIuO9biFtTf0LehITzBhSco+HQI0xkXZbLOD55SW3Aqw3oUkHstkm5SPv58yaAdFPQ==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.0.tgz", + "integrity": "sha512-I99sngh224D0M7XgW1s120zxCt3VYQ3IQsuw3P3jbq5GG4yc79+ZjyKznyOGIQrflfylLgcfekeZW/vk0yng6A==", "dev": true }, "@types/type-is": { diff --git a/package.json b/package.json index 31a59ffbbad..516e4739f3b 100644 --- a/package.json +++ b/package.json @@ -81,7 +81,7 @@ "@types/node": "8.10.60", "@types/node-fetch": "2.3.2", "@types/qs-middleware": "1.0.1", - "@types/request": "2.48.4", + "@types/request": "2.48.5", "@types/request-promise": "4.1.46", "@types/supertest": "^2.0.8", "@types/test-listen": "1.1.0", From 46a07e48d92cad03527a10dcc3d29774735a4d78 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 16 May 2020 15:23:28 +0000 Subject: [PATCH 584/642] chore(deps): update dependency @types/hapi to v17.8.8 (#4120) Co-authored-by: Renovate Bot --- package-lock.json | 18 +++++++++--------- package.json | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0fa35b5d708..fcb88ebb9be 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4943,9 +4943,9 @@ } }, "@types/hapi": { - "version": "17.8.7", - "resolved": "https://registry.npmjs.org/@types/hapi/-/hapi-17.8.7.tgz", - "integrity": "sha512-RUdcYgJc8hJyupMiZo5ooOd+mLLVzCsSIx8ncxeZ2nccLDPW5BFbxOlEYoZuemKRiAMBNevqQnEMeVMpvJchug==", + "version": "17.8.8", + "resolved": "https://registry.npmjs.org/@types/hapi/-/hapi-17.8.8.tgz", + "integrity": "sha512-ctv2TfETUyHyZsT5fWJLXwapQb5bvnnPh8c2B/g0eI9pLpJ5dEGHoakUTxQxLYAonFTlQdybU55HVN7tDsCPeg==", "dev": true, "requires": { "@types/boom": "*", @@ -5230,15 +5230,15 @@ "integrity": "sha512-FwI9gX75FgVBJ7ywgnq/P7tw+/o1GUbtP0KzbtusLigAOgIgNISRK0ZPl4qertvXSIE8YbsVJueQ90cDt9YYyw==" }, "@types/mime-db": { - "version": "1.27.0", - "resolved": "https://registry.npmjs.org/@types/mime-db/-/mime-db-1.27.0.tgz", - "integrity": "sha1-m8AUof0f30dknBpUxt15ZrgoR5I=", + "version": "1.43.0", + "resolved": "https://registry.npmjs.org/@types/mime-db/-/mime-db-1.43.0.tgz", + "integrity": "sha512-nCqnKWfvDzTVRh8NS9Zn+rnZYs5+iw5hx3G0nFgKM/R2mJQwPChin4DQ4zXlXnxTtc/3Ys5FnWweKW6NW+d2aw==", "dev": true }, "@types/mimos": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@types/mimos/-/mimos-3.0.1.tgz", - "integrity": "sha512-MATIRH4VMIJki8lcYUZdNQEHuAG7iQ1FWwoLgxV+4fUOly2xZYdhHtGgvQyWiTeJqq2tZbE0nOOgZD6pR0FpNQ==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@types/mimos/-/mimos-3.0.2.tgz", + "integrity": "sha512-UG3sdP/9HOk0oA1l8VylaZ0fjy6O/QGEeivOK9JhMjgJkcBJRdfsI6FtXFtg6UH17txmxuDOiIsTlrpBkayK0A==", "dev": true, "requires": { "@types/mime-db": "*" diff --git a/package.json b/package.json index 516e4739f3b..2cec4693ba7 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "@types/bunyan": "1.8.6", "@types/connect": "3.4.33", "@types/fast-json-stable-stringify": "2.0.0", - "@types/hapi": "17.8.7", + "@types/hapi": "17.8.8", "@types/ioredis": "4.16.1", "@types/jest": "25.2.2", "@types/koa-router": "7.4.1", From e703b4514905dbbdf1b076a1398ff95bfa8f5ae4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 16 May 2020 16:13:07 +0000 Subject: [PATCH 585/642] chore(deps): update dependency ts-jest to v25.5.1 (#4092) Co-authored-by: Renovate Bot --- package-lock.json | 15 ++++----------- package.json | 2 +- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index fcb88ebb9be..89d71444d74 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19023,9 +19023,9 @@ } }, "ts-jest": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-25.4.0.tgz", - "integrity": "sha512-+0ZrksdaquxGUBwSdTIcdX7VXdwLIlSRsyjivVA9gcO+Cvr6ByqDhu/mi5+HCcb6cMkiQp5xZ8qRO7/eCqLeyw==", + "version": "25.5.1", + "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-25.5.1.tgz", + "integrity": "sha512-kHEUlZMK8fn8vkxDjwbHlxXRB9dHYpyzqKIGDNxbzs+Rz+ssNDSDNusEK8Fk/sDd4xE6iKoQLfFkFVaskmTJyw==", "dev": true, "requires": { "bs-logger": "0.x", @@ -19035,8 +19035,7 @@ "lodash.memoize": "4.x", "make-error": "1.x", "micromatch": "4.x", - "mkdirp": "1.x", - "resolve": "1.x", + "mkdirp": "0.x", "semver": "6.x", "yargs-parser": "18.x" }, @@ -19075,12 +19074,6 @@ "picomatch": "^2.0.5" } }, - "mkdirp": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", - "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", - "dev": true - }, "semver": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", diff --git a/package.json b/package.json index 2cec4693ba7..c011cabf13c 100644 --- a/package.json +++ b/package.json @@ -125,7 +125,7 @@ "subscriptions-transport-ws": "0.9.16", "supertest": "4.0.2", "test-listen": "1.1.0", - "ts-jest": "25.4.0", + "ts-jest": "25.5.1", "typescript": "3.8.3", "winston": "3.2.1", "winston-transport": "4.3.0", From 195495ba518d7ff77cacc612d31e59bd18cc5d57 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 16 May 2020 17:13:14 +0000 Subject: [PATCH 586/642] chore(deps): update dependency ioredis to v4.17.0 (#4127) Co-authored-by: Renovate Bot --- package-lock.json | 12 ++++++------ package.json | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 89d71444d74..e4f7b282f02 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4964,9 +4964,9 @@ "integrity": "sha512-TZDqvFW4nQwL9DVSNJIJu4lPLttKgzRF58COa7Vs42Ki/MrhIqUbeIw0MWn4kGLiZLXB7oCBibm7nkSjPkzfKQ==" }, "@types/ioredis": { - "version": "4.16.1", - "resolved": "https://registry.npmjs.org/@types/ioredis/-/ioredis-4.16.1.tgz", - "integrity": "sha512-3O4gHSxQ4C0AhJVHIW4TFYsv0OqORLmiu5mgceciJrPct/ToTwRehroLU3vw5evzQgemdKx05dU6nKs5bCN1bQ==", + "version": "4.16.2", + "resolved": "https://registry.npmjs.org/@types/ioredis/-/ioredis-4.16.2.tgz", + "integrity": "sha512-b1wSWCLx5ygzDZ2d1BYBzsTzUcPEOcJH8d5O6AJGGJXjE6C+HrlA61sw5GQNqtqTPVo2Hpc4rPA30lI0T6QSLQ==", "dev": true, "requires": { "@types/node": "*" @@ -10663,9 +10663,9 @@ } }, "ioredis": { - "version": "4.16.3", - "resolved": "https://registry.npmjs.org/ioredis/-/ioredis-4.16.3.tgz", - "integrity": "sha512-Ejvcs2yW19Vq8AipvbtfcX3Ig8XG9EAyFOvGbhI/Q1QoVOK9ZdgY092kdOyOWIYBnPHjfjMJhU9qhsnp0i0K1w==", + "version": "4.17.0", + "resolved": "https://registry.npmjs.org/ioredis/-/ioredis-4.17.0.tgz", + "integrity": "sha512-RioyrvHu3HRmoq/jxKBLI0G/IjjVSJ/P3BDYaD3uuSyFrIEDndXdbdMOK7hwMvs0urElh5LItrJYY/YZwWc0UA==", "requires": { "cluster-key-slot": "^1.1.0", "debug": "^4.1.1", diff --git a/package.json b/package.json index c011cabf13c..afa0734d639 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "@types/connect": "3.4.33", "@types/fast-json-stable-stringify": "2.0.0", "@types/hapi": "17.8.8", - "@types/ioredis": "4.16.1", + "@types/ioredis": "4.16.2", "@types/jest": "25.2.2", "@types/koa-router": "7.4.1", "@types/lodash": "4.14.151", @@ -105,7 +105,7 @@ "graphql-tag": "2.10.3", "graphql-tools": "4.0.8", "hapi": "17.8.5", - "ioredis": "4.16.3", + "ioredis": "4.17.0", "jest": "25.5.4", "jest-config": "25.5.4", "jest-junit": "10.0.0", From 90d5906606d749d93de2b58bc533369786a71a90 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 16 May 2020 19:12:50 +0000 Subject: [PATCH 587/642] chore(deps): update dependency typescript to v3.9.2 (#4130) Co-authored-by: Renovate Bot --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index e4f7b282f02..0aa7e1147e6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19172,9 +19172,9 @@ } }, "typescript": { - "version": "3.8.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.8.3.tgz", - "integrity": "sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w==", + "version": "3.9.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.2.tgz", + "integrity": "sha512-q2ktq4n/uLuNNShyayit+DTobV2ApPEo/6so68JaD5ojvc/6GClBipedB9zNWYxRSAlZXAe405Rlijzl6qDiSw==", "dev": true }, "uglify-js": { diff --git a/package.json b/package.json index afa0734d639..b8864420780 100644 --- a/package.json +++ b/package.json @@ -126,7 +126,7 @@ "supertest": "4.0.2", "test-listen": "1.1.0", "ts-jest": "25.5.1", - "typescript": "3.8.3", + "typescript": "3.9.2", "winston": "3.2.1", "winston-transport": "4.3.0", "ws": "6.2.1" From 9674ae6c555cb85ef3d0a2d1fc4a72bd1f1a3c0b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 16 May 2020 20:12:08 +0000 Subject: [PATCH 588/642] chore(deps): update dependency lerna to v3.21.0 (#4128) Co-authored-by: Renovate Bot --- package-lock.json | 1435 +++++++++++++++++++++++++-------------------- package.json | 2 +- 2 files changed, 802 insertions(+), 635 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0aa7e1147e6..3f5e7f409bf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1313,9 +1313,9 @@ } }, "safe-buffer": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz", - "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==", + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", "dev": true }, "semver": { @@ -3527,14 +3527,14 @@ } }, "@lerna/add": { - "version": "3.20.0", - "resolved": "https://registry.npmjs.org/@lerna/add/-/add-3.20.0.tgz", - "integrity": "sha512-AnH1oRIEEg/VDa3SjYq4x1/UglEAvrZuV0WssHUMN81RTZgQk3we+Mv3qZNddrZ/fBcZu2IAdN/EQ3+ie2JxKQ==", + "version": "3.21.0", + "resolved": "https://registry.npmjs.org/@lerna/add/-/add-3.21.0.tgz", + "integrity": "sha512-vhUXXF6SpufBE1EkNEXwz1VLW03f177G9uMOFMQkp6OJ30/PWg4Ekifuz9/3YfgB2/GH8Tu4Lk3O51P2Hskg/A==", "dev": true, "requires": { "@evocateur/pacote": "^9.6.3", - "@lerna/bootstrap": "3.20.0", - "@lerna/command": "3.18.5", + "@lerna/bootstrap": "3.21.0", + "@lerna/command": "3.21.0", "@lerna/filter-options": "3.20.0", "@lerna/npm-conf": "3.16.0", "@lerna/validation-error": "3.13.0", @@ -3553,12 +3553,12 @@ } }, "@lerna/bootstrap": { - "version": "3.20.0", - "resolved": "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-3.20.0.tgz", - "integrity": "sha512-Wylullx3uthKE7r4izo09qeRGL20Y5yONlQEjPCfnbxCC2Elu+QcPu4RC6kqKQ7b+g7pdC3OOgcHZjngrwr5XQ==", + "version": "3.21.0", + "resolved": "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-3.21.0.tgz", + "integrity": "sha512-mtNHlXpmvJn6JTu0KcuTTPl2jLsDNud0QacV/h++qsaKbhAaJr/FElNZ5s7MwZFUM3XaDmvWzHKaszeBMHIbBw==", "dev": true, "requires": { - "@lerna/command": "3.18.5", + "@lerna/command": "3.21.0", "@lerna/filter-options": "3.20.0", "@lerna/has-npm-version": "3.16.5", "@lerna/npm-install": "3.16.5", @@ -3592,13 +3592,13 @@ } }, "@lerna/changed": { - "version": "3.20.0", - "resolved": "https://registry.npmjs.org/@lerna/changed/-/changed-3.20.0.tgz", - "integrity": "sha512-+hzMFSldbRPulZ0vbKk6RD9f36gaH3Osjx34wrrZ62VB4pKmjyuS/rxVYkCA3viPLHoiIw2F8zHM5BdYoDSbjw==", + "version": "3.21.0", + "resolved": "https://registry.npmjs.org/@lerna/changed/-/changed-3.21.0.tgz", + "integrity": "sha512-hzqoyf8MSHVjZp0gfJ7G8jaz+++mgXYiNs9iViQGA8JlN/dnWLI5sWDptEH3/B30Izo+fdVz0S0s7ydVE3pWIw==", "dev": true, "requires": { "@lerna/collect-updates": "3.20.0", - "@lerna/command": "3.18.5", + "@lerna/command": "3.21.0", "@lerna/listable": "3.18.5", "@lerna/output": "3.13.0" } @@ -3626,12 +3626,12 @@ } }, "@lerna/clean": { - "version": "3.20.0", - "resolved": "https://registry.npmjs.org/@lerna/clean/-/clean-3.20.0.tgz", - "integrity": "sha512-9ZdYrrjQvR5wNXmHfDsfjWjp0foOkCwKe3hrckTzkAeQA1ibyz5llGwz5e1AeFrV12e2/OLajVqYfe+qdkZUgg==", + "version": "3.21.0", + "resolved": "https://registry.npmjs.org/@lerna/clean/-/clean-3.21.0.tgz", + "integrity": "sha512-b/L9l+MDgE/7oGbrav6rG8RTQvRiZLO1zTcG17zgJAAuhlsPxJExMlh2DFwJEVi2les70vMhHfST3Ue1IMMjpg==", "dev": true, "requires": { - "@lerna/command": "3.18.5", + "@lerna/command": "3.21.0", "@lerna/filter-options": "3.20.0", "@lerna/prompt": "3.18.5", "@lerna/pulse-till-done": "3.13.0", @@ -3679,14 +3679,14 @@ } }, "@lerna/command": { - "version": "3.18.5", - "resolved": "https://registry.npmjs.org/@lerna/command/-/command-3.18.5.tgz", - "integrity": "sha512-36EnqR59yaTU4HrR1C9XDFti2jRx0BgpIUBeWn129LZZB8kAB3ov1/dJNa1KcNRKp91DncoKHLY99FZ6zTNpMQ==", + "version": "3.21.0", + "resolved": "https://registry.npmjs.org/@lerna/command/-/command-3.21.0.tgz", + "integrity": "sha512-T2bu6R8R3KkH5YoCKdutKv123iUgUbW8efVjdGCDnCMthAQzoentOJfDeodBwn0P2OqCl3ohsiNVtSn9h78fyQ==", "dev": true, "requires": { "@lerna/child-process": "3.16.5", "@lerna/package-graph": "3.18.5", - "@lerna/project": "3.18.0", + "@lerna/project": "3.21.0", "@lerna/validation-error": "3.13.0", "@lerna/write-log-file": "3.13.0", "clone-deep": "^4.0.1", @@ -3715,12 +3715,6 @@ "semver": "^6.2.0" }, "dependencies": { - "pify": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", - "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", - "dev": true - }, "semver": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", @@ -3730,14 +3724,14 @@ } }, "@lerna/create": { - "version": "3.18.5", - "resolved": "https://registry.npmjs.org/@lerna/create/-/create-3.18.5.tgz", - "integrity": "sha512-cHpjocbpKmLopCuZFI7cKEM3E/QY8y+yC7VtZ4FQRSaLU8D8i2xXtXmYaP1GOlVNavji0iwoXjuNpnRMInIr2g==", + "version": "3.21.0", + "resolved": "https://registry.npmjs.org/@lerna/create/-/create-3.21.0.tgz", + "integrity": "sha512-cRIopzKzE2vXJPmsiwCDMWo4Ct+KTmX3nvvkQLDoQNrrRK7w+3KQT3iiorbj1koD95RsVQA7mS2haWok9SIv0g==", "dev": true, "requires": { "@evocateur/pacote": "^9.6.3", "@lerna/child-process": "3.16.5", - "@lerna/command": "3.18.5", + "@lerna/command": "3.21.0", "@lerna/npm-conf": "3.16.0", "@lerna/validation-error": "3.13.0", "camelcase": "^5.0.0", @@ -3755,28 +3749,11 @@ "whatwg-url": "^7.0.0" }, "dependencies": { - "pify": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", - "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", - "dev": true - }, "semver": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", "dev": true - }, - "whatwg-url": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz", - "integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==", - "dev": true, - "requires": { - "lodash.sortby": "^4.7.0", - "tr46": "^1.0.1", - "webidl-conversions": "^4.0.2" - } } } }, @@ -3802,25 +3779,25 @@ } }, "@lerna/diff": { - "version": "3.18.5", - "resolved": "https://registry.npmjs.org/@lerna/diff/-/diff-3.18.5.tgz", - "integrity": "sha512-u90lGs+B8DRA9Z/2xX4YaS3h9X6GbypmGV6ITzx9+1Ga12UWGTVlKaCXBgONMBjzJDzAQOK8qPTwLA57SeBLgA==", + "version": "3.21.0", + "resolved": "https://registry.npmjs.org/@lerna/diff/-/diff-3.21.0.tgz", + "integrity": "sha512-5viTR33QV3S7O+bjruo1SaR40m7F2aUHJaDAC7fL9Ca6xji+aw1KFkpCtVlISS0G8vikUREGMJh+c/VMSc8Usw==", "dev": true, "requires": { "@lerna/child-process": "3.16.5", - "@lerna/command": "3.18.5", + "@lerna/command": "3.21.0", "@lerna/validation-error": "3.13.0", "npmlog": "^4.1.2" } }, "@lerna/exec": { - "version": "3.20.0", - "resolved": "https://registry.npmjs.org/@lerna/exec/-/exec-3.20.0.tgz", - "integrity": "sha512-pS1mmC7kzV668rHLWuv31ClngqeXjeHC8kJuM+W2D6IpUVMGQHLcCTYLudFgQsuKGVpl0DGNYG+sjLhAPiiu6A==", + "version": "3.21.0", + "resolved": "https://registry.npmjs.org/@lerna/exec/-/exec-3.21.0.tgz", + "integrity": "sha512-iLvDBrIE6rpdd4GIKTY9mkXyhwsJ2RvQdB9ZU+/NhR3okXfqKc6py/24tV111jqpXTtZUW6HNydT4dMao2hi1Q==", "dev": true, "requires": { "@lerna/child-process": "3.16.5", - "@lerna/command": "3.18.5", + "@lerna/command": "3.21.0", "@lerna/filter-options": "3.20.0", "@lerna/profiler": "3.20.0", "@lerna/run-topologically": "3.18.5", @@ -3901,17 +3878,6 @@ "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz", "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==", "dev": true - }, - "whatwg-url": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz", - "integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==", - "dev": true, - "requires": { - "lodash.sortby": "^4.7.0", - "tr46": "^1.0.1", - "webidl-conversions": "^4.0.2" - } } } }, @@ -3940,13 +3906,13 @@ } }, "@lerna/import": { - "version": "3.18.5", - "resolved": "https://registry.npmjs.org/@lerna/import/-/import-3.18.5.tgz", - "integrity": "sha512-PH0WVLEgp+ORyNKbGGwUcrueW89K3Iuk/DDCz8mFyG2IG09l/jOF0vzckEyGyz6PO5CMcz4TI1al/qnp3FrahQ==", + "version": "3.21.0", + "resolved": "https://registry.npmjs.org/@lerna/import/-/import-3.21.0.tgz", + "integrity": "sha512-aISkL4XD0Dqf5asDaOZWu65jgj8fWUhuQseZWuQe3UfHxav69fTS2YLIngUfencaOSZVOcVCom28YCzp61YDxw==", "dev": true, "requires": { "@lerna/child-process": "3.16.5", - "@lerna/command": "3.18.5", + "@lerna/command": "3.21.0", "@lerna/prompt": "3.18.5", "@lerna/pulse-till-done": "3.13.0", "@lerna/validation-error": "3.13.0", @@ -3956,36 +3922,36 @@ } }, "@lerna/info": { - "version": "3.20.0", - "resolved": "https://registry.npmjs.org/@lerna/info/-/info-3.20.0.tgz", - "integrity": "sha512-Rsz+KQF9mczbGUbPTrtOed1N0C+cA08Qz0eX/oI+NNjvsryZIju/o7uedG4I3P55MBiAioNrJI88fHH3eTgYug==", + "version": "3.21.0", + "resolved": "https://registry.npmjs.org/@lerna/info/-/info-3.21.0.tgz", + "integrity": "sha512-0XDqGYVBgWxUquFaIptW2bYSIu6jOs1BtkvRTWDDhw4zyEdp6q4eaMvqdSap1CG+7wM5jeLCi6z94wS0AuiuwA==", "dev": true, "requires": { - "@lerna/command": "3.18.5", + "@lerna/command": "3.21.0", "@lerna/output": "3.13.0", "envinfo": "^7.3.1" } }, "@lerna/init": { - "version": "3.18.5", - "resolved": "https://registry.npmjs.org/@lerna/init/-/init-3.18.5.tgz", - "integrity": "sha512-oCwipWrha98EcJAHm8AGd2YFFLNI7AW9AWi0/LbClj1+XY9ah+uifXIgYGfTk63LbgophDd8936ZEpHMxBsbAg==", + "version": "3.21.0", + "resolved": "https://registry.npmjs.org/@lerna/init/-/init-3.21.0.tgz", + "integrity": "sha512-6CM0z+EFUkFfurwdJCR+LQQF6MqHbYDCBPyhu/d086LRf58GtYZYj49J8mKG9ktayp/TOIxL/pKKjgLD8QBPOg==", "dev": true, "requires": { "@lerna/child-process": "3.16.5", - "@lerna/command": "3.18.5", + "@lerna/command": "3.21.0", "fs-extra": "^8.1.0", "p-map": "^2.1.0", "write-json-file": "^3.2.0" } }, "@lerna/link": { - "version": "3.18.5", - "resolved": "https://registry.npmjs.org/@lerna/link/-/link-3.18.5.tgz", - "integrity": "sha512-xTN3vktJpkT7Nqc3QkZRtHO4bT5NvuLMtKNIBDkks0HpGxC9PRyyqwOoCoh1yOGbrWIuDezhfMg3Qow+6I69IQ==", + "version": "3.21.0", + "resolved": "https://registry.npmjs.org/@lerna/link/-/link-3.21.0.tgz", + "integrity": "sha512-tGu9GxrX7Ivs+Wl3w1+jrLi1nQ36kNI32dcOssij6bg0oZ2M2MDEFI9UF2gmoypTaN9uO5TSsjCFS7aR79HbdQ==", "dev": true, "requires": { - "@lerna/command": "3.18.5", + "@lerna/command": "3.21.0", "@lerna/package-graph": "3.18.5", "@lerna/symlink-dependencies": "3.17.0", "p-map": "^2.1.0", @@ -3993,12 +3959,12 @@ } }, "@lerna/list": { - "version": "3.20.0", - "resolved": "https://registry.npmjs.org/@lerna/list/-/list-3.20.0.tgz", - "integrity": "sha512-fXTicPrfioVnRzknyPawmYIVkzDRBaQqk9spejS1S3O1DOidkihK0xxNkr8HCVC0L22w6f92g83qWDp2BYRUbg==", + "version": "3.21.0", + "resolved": "https://registry.npmjs.org/@lerna/list/-/list-3.21.0.tgz", + "integrity": "sha512-KehRjE83B1VaAbRRkRy6jLX1Cin8ltsrQ7FHf2bhwhRHK0S54YuA6LOoBnY/NtA8bHDX/Z+G5sMY78X30NS9tg==", "dev": true, "requires": { - "@lerna/command": "3.18.5", + "@lerna/command": "3.21.0", "@lerna/filter-options": "3.20.0", "@lerna/listable": "3.18.5", "@lerna/output": "3.13.0" @@ -4035,14 +4001,6 @@ "requires": { "config-chain": "^1.1.11", "pify": "^4.0.1" - }, - "dependencies": { - "pify": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", - "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", - "dev": true - } } }, "@lerna/npm-dist-tag": { @@ -4088,14 +4046,6 @@ "npmlog": "^4.1.2", "pify": "^4.0.1", "read-package-json": "^2.0.13" - }, - "dependencies": { - "pify": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", - "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", - "dev": true - } } }, "@lerna/npm-run-script": { @@ -4153,27 +4103,6 @@ "load-json-file": "^5.3.0", "npm-package-arg": "^6.1.0", "write-pkg": "^3.1.0" - }, - "dependencies": { - "load-json-file": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-5.3.0.tgz", - "integrity": "sha512-cJGP40Jc/VXUsp8/OrnyKyTZ1y6v/dphm3bioS+RrKXjK2BB6wHUd6JptZEFDGgGahMT+InnZO5i1Ei9mpC8Bw==", - "dev": true, - "requires": { - "graceful-fs": "^4.1.15", - "parse-json": "^4.0.0", - "pify": "^4.0.1", - "strip-bom": "^3.0.0", - "type-fest": "^0.3.0" - } - }, - "pify": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", - "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", - "dev": true - } } }, "@lerna/package-graph": { @@ -4227,9 +4156,9 @@ } }, "@lerna/project": { - "version": "3.18.0", - "resolved": "https://registry.npmjs.org/@lerna/project/-/project-3.18.0.tgz", - "integrity": "sha512-+LDwvdAp0BurOAWmeHE3uuticsq9hNxBI0+FMHiIai8jrygpJGahaQrBYWpwbshbQyVLeQgx3+YJdW2TbEdFWA==", + "version": "3.21.0", + "resolved": "https://registry.npmjs.org/@lerna/project/-/project-3.21.0.tgz", + "integrity": "sha512-xT1mrpET2BF11CY32uypV2GPtPVm6Hgtha7D81GQP9iAitk9EccrdNjYGt5UBYASl4CIDXBRxwmTTVGfrCx82A==", "dev": true, "requires": { "@lerna/package": "3.16.0", @@ -4244,33 +4173,6 @@ "p-map": "^2.1.0", "resolve-from": "^4.0.0", "write-json-file": "^3.2.0" - }, - "dependencies": { - "load-json-file": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-5.3.0.tgz", - "integrity": "sha512-cJGP40Jc/VXUsp8/OrnyKyTZ1y6v/dphm3bioS+RrKXjK2BB6wHUd6JptZEFDGgGahMT+InnZO5i1Ei9mpC8Bw==", - "dev": true, - "requires": { - "graceful-fs": "^4.1.15", - "parse-json": "^4.0.0", - "pify": "^4.0.1", - "strip-bom": "^3.0.0", - "type-fest": "^0.3.0" - } - }, - "pify": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", - "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", - "dev": true - }, - "resolve-from": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", - "dev": true - } } }, "@lerna/prompt": { @@ -4284,9 +4186,9 @@ } }, "@lerna/publish": { - "version": "3.20.2", - "resolved": "https://registry.npmjs.org/@lerna/publish/-/publish-3.20.2.tgz", - "integrity": "sha512-N7Y6PdhJ+tYQPdI1tZum8W25cDlTp4D6brvRacKZusweWexxaopbV8RprBaKexkEX/KIbncuADq7qjDBdQHzaA==", + "version": "3.21.0", + "resolved": "https://registry.npmjs.org/@lerna/publish/-/publish-3.21.0.tgz", + "integrity": "sha512-JZ+ehZB9UCQ9nqH8Ld/Yqc/If++aK/7XIubkrB9sQ5hf2GeIbmI/BrJpMgLW/e9T5bKrUBZPUvoUN3daVipA5A==", "dev": true, "requires": { "@evocateur/libnpmaccess": "^3.1.2", @@ -4295,7 +4197,7 @@ "@lerna/check-working-tree": "3.16.5", "@lerna/child-process": "3.16.5", "@lerna/collect-updates": "3.20.0", - "@lerna/command": "3.18.5", + "@lerna/command": "3.21.0", "@lerna/describe-ref": "3.16.5", "@lerna/log-packed": "3.16.0", "@lerna/npm-conf": "3.16.0", @@ -4310,7 +4212,7 @@ "@lerna/run-lifecycle": "3.16.2", "@lerna/run-topologically": "3.18.5", "@lerna/validation-error": "3.13.0", - "@lerna/version": "3.20.2", + "@lerna/version": "3.21.0", "figgy-pudding": "^3.5.1", "fs-extra": "^8.1.0", "npm-package-arg": "^6.1.0", @@ -4372,12 +4274,12 @@ } }, "@lerna/run": { - "version": "3.20.0", - "resolved": "https://registry.npmjs.org/@lerna/run/-/run-3.20.0.tgz", - "integrity": "sha512-9U3AqeaCeB7KsGS9oyKNp62s9vYoULg/B4cqXTKZkc+OKL6QOEjYHYVSBcMK9lUXrMjCjDIuDSX3PnTCPxQ2Dw==", + "version": "3.21.0", + "resolved": "https://registry.npmjs.org/@lerna/run/-/run-3.21.0.tgz", + "integrity": "sha512-fJF68rT3veh+hkToFsBmUJ9MHc9yGXA7LSDvhziAojzOb0AI/jBDp6cEcDQyJ7dbnplba2Lj02IH61QUf9oW0Q==", "dev": true, "requires": { - "@lerna/command": "3.18.5", + "@lerna/command": "3.21.0", "@lerna/filter-options": "3.20.0", "@lerna/npm-run-script": "3.16.5", "@lerna/output": "3.13.0", @@ -4454,15 +4356,15 @@ } }, "@lerna/version": { - "version": "3.20.2", - "resolved": "https://registry.npmjs.org/@lerna/version/-/version-3.20.2.tgz", - "integrity": "sha512-ckBJMaBWc+xJen0cMyCE7W67QXLLrc0ELvigPIn8p609qkfNM0L0CF803MKxjVOldJAjw84b8ucNWZLvJagP/Q==", + "version": "3.21.0", + "resolved": "https://registry.npmjs.org/@lerna/version/-/version-3.21.0.tgz", + "integrity": "sha512-nIT3u43fCNj6uSMN1dRxFnF4GhmIiOEqSTkGSjrMU+8kHKwzOqS/6X6TOzklBmCyEZOpF/fLlGqH3BZHnwLDzQ==", "dev": true, "requires": { "@lerna/check-working-tree": "3.16.5", "@lerna/child-process": "3.16.5", "@lerna/collect-updates": "3.20.0", - "@lerna/command": "3.18.5", + "@lerna/command": "3.21.0", "@lerna/conventional-commits": "3.18.5", "@lerna/github-client": "3.16.5", "@lerna/gitlab-client": "3.15.0", @@ -4487,25 +4389,6 @@ "write-json-file": "^3.2.0" }, "dependencies": { - "load-json-file": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-5.3.0.tgz", - "integrity": "sha512-cJGP40Jc/VXUsp8/OrnyKyTZ1y6v/dphm3bioS+RrKXjK2BB6wHUd6JptZEFDGgGahMT+InnZO5i1Ei9mpC8Bw==", - "dev": true, - "requires": { - "graceful-fs": "^4.1.15", - "parse-json": "^4.0.0", - "pify": "^4.0.1", - "strip-bom": "^3.0.0", - "type-fest": "^0.3.0" - } - }, - "pify": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", - "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", - "dev": true - }, "semver": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", @@ -4540,15 +4423,24 @@ "integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==", "dev": true }, + "@octokit/auth-token": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.4.0.tgz", + "integrity": "sha512-eoOVMjILna7FVQf96iWc3+ZtE/ZT6y8ob8ZzcqKY1ibSQCnu4O/B7pJvzMx5cyZ/RjAff6DAdEb0O0Cjcxidkg==", + "dev": true, + "requires": { + "@octokit/types": "^2.0.0" + } + }, "@octokit/endpoint": { - "version": "5.5.1", - "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-5.5.1.tgz", - "integrity": "sha512-nBFhRUb5YzVTCX/iAK1MgQ4uWo89Gu0TH00qQHoYRCsE12dWcG1OiLd7v2EIo2+tpUKPMOQ62QFy9hy9Vg2ULg==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.1.tgz", + "integrity": "sha512-pOPHaSz57SFT/m3R5P8MUu4wLPszokn5pXcB/pzavLTQf2jbU+6iayTvzaY6/BiotuRS0qyEUkx3QglT4U958A==", "dev": true, "requires": { - "@octokit/types": "^2.0.0", + "@octokit/types": "^2.11.1", "is-plain-object": "^3.0.0", - "universal-user-agent": "^4.0.0" + "universal-user-agent": "^5.0.0" }, "dependencies": { "is-plain-object": { @@ -4565,6 +4457,15 @@ "resolved": "https://registry.npmjs.org/isobject/-/isobject-4.0.0.tgz", "integrity": "sha512-S/2fF5wH8SJA/kmwr6HYhK/RI/OkhD84k8ntalo0iJjZikgq1XFvR5M8NPT1x5F7fBwCG3qHfnzeP/Vh/ZxCUA==", "dev": true + }, + "universal-user-agent": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-5.0.0.tgz", + "integrity": "sha512-B5TPtzZleXyPrUMKCpEHFmVhMN6EhmJYjG5PQna9s7mXeSqGTLap4OpqLl5FCEFUI3UBmllkETwKf/db66Y54Q==", + "dev": true, + "requires": { + "os-name": "^3.1.0" + } } } }, @@ -4574,22 +4475,58 @@ "integrity": "sha512-3wF5eueS5OHQYuAEudkpN+xVeUsg8vYEMMenEzLphUZ7PRZ8OJtDcsreL3ad9zxXmBbaFWzLmFcdob5CLyZftA==", "dev": true }, + "@octokit/plugin-paginate-rest": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-1.1.2.tgz", + "integrity": "sha512-jbsSoi5Q1pj63sC16XIUboklNw+8tL9VOnJsWycWYR78TKss5PVpIPb1TUUcMQ+bBh7cY579cVAWmf5qG+dw+Q==", + "dev": true, + "requires": { + "@octokit/types": "^2.0.1" + } + }, + "@octokit/plugin-request-log": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-1.0.0.tgz", + "integrity": "sha512-ywoxP68aOT3zHCLgWZgwUJatiENeHE7xJzYjfz8WI0goynp96wETBF+d95b8g/uL4QmS6owPVlaxiz3wyMAzcw==", + "dev": true + }, + "@octokit/plugin-rest-endpoint-methods": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-2.4.0.tgz", + "integrity": "sha512-EZi/AWhtkdfAYi01obpX0DF7U6b1VRr30QNQ5xSFPITMdLSfhcBqjamE3F+sKcxPbD7eZuMHu3Qkk2V+JGxBDQ==", + "dev": true, + "requires": { + "@octokit/types": "^2.0.1", + "deprecation": "^2.3.1" + } + }, "@octokit/request": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.3.1.tgz", - "integrity": "sha512-5/X0AL1ZgoU32fAepTfEoggFinO3rxsMLtzhlUX+RctLrusn/CApJuGFCd0v7GMFhF+8UiCsTTfsu7Fh1HnEJg==", + "version": "5.4.2", + "resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.4.2.tgz", + "integrity": "sha512-zKdnGuQ2TQ2vFk9VU8awFT4+EYf92Z/v3OlzRaSh4RIP0H6cvW1BFPXq4XYvNez+TPQjqN+0uSkCYnMFFhcFrw==", "dev": true, "requires": { - "@octokit/endpoint": "^5.5.0", - "@octokit/request-error": "^1.0.1", - "@octokit/types": "^2.0.0", + "@octokit/endpoint": "^6.0.1", + "@octokit/request-error": "^2.0.0", + "@octokit/types": "^2.11.1", "deprecation": "^2.0.0", "is-plain-object": "^3.0.0", "node-fetch": "^2.3.0", "once": "^1.4.0", - "universal-user-agent": "^4.0.0" + "universal-user-agent": "^5.0.0" }, "dependencies": { + "@octokit/request-error": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.0.0.tgz", + "integrity": "sha512-rtYicB4Absc60rUv74Rjpzek84UbVHGHJRu4fNVlZ1mCcyUPPuzFfG9Rn6sjHrd95DEsmjSt1Axlc699ZlbDkw==", + "dev": true, + "requires": { + "@octokit/types": "^2.0.0", + "deprecation": "^2.0.0", + "once": "^1.4.0" + } + }, "is-plain-object": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-3.0.0.tgz", @@ -4604,13 +4541,22 @@ "resolved": "https://registry.npmjs.org/isobject/-/isobject-4.0.0.tgz", "integrity": "sha512-S/2fF5wH8SJA/kmwr6HYhK/RI/OkhD84k8ntalo0iJjZikgq1XFvR5M8NPT1x5F7fBwCG3qHfnzeP/Vh/ZxCUA==", "dev": true + }, + "universal-user-agent": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-5.0.0.tgz", + "integrity": "sha512-B5TPtzZleXyPrUMKCpEHFmVhMN6EhmJYjG5PQna9s7mXeSqGTLap4OpqLl5FCEFUI3UBmllkETwKf/db66Y54Q==", + "dev": true, + "requires": { + "os-name": "^3.1.0" + } } } }, "@octokit/request-error": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-1.2.0.tgz", - "integrity": "sha512-DNBhROBYjjV/I9n7A8kVkmQNkqFAMem90dSxqvPq57e2hBr7mNTX98y3R2zDpqMQHVRpBDjsvsfIGgBzy+4PAg==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-1.2.1.tgz", + "integrity": "sha512-+6yDyk1EES6WK+l3viRDElw96MvwfJxCt45GvmjDUKWjYIb3PJZQkq3i46TwGwoPD4h8NmTrENmtyA1FwbmhRA==", "dev": true, "requires": { "@octokit/types": "^2.0.0", @@ -4619,11 +4565,15 @@ } }, "@octokit/rest": { - "version": "16.36.0", - "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-16.36.0.tgz", - "integrity": "sha512-zoZj7Ya4vWBK4fjTwK2Cnmu7XBB1p9ygSvTk2TthN6DVJXM4hQZQoAiknWFLJWSTix4dnA3vuHtjPZbExYoCZA==", + "version": "16.43.1", + "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-16.43.1.tgz", + "integrity": "sha512-gfFKwRT/wFxq5qlNjnW2dh+qh74XgTQ2B179UX5K1HYCluioWj8Ndbgqw2PVqa1NnVJkGHp2ovMpVn/DImlmkw==", "dev": true, "requires": { + "@octokit/auth-token": "^2.4.0", + "@octokit/plugin-paginate-rest": "^1.1.1", + "@octokit/plugin-request-log": "^1.0.0", + "@octokit/plugin-rest-endpoint-methods": "2.4.0", "@octokit/request": "^5.2.0", "@octokit/request-error": "^1.0.2", "atob-lite": "^2.0.0", @@ -4639,9 +4589,9 @@ } }, "@octokit/types": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/@octokit/types/-/types-2.0.2.tgz", - "integrity": "sha512-StASIL2lgT3TRjxv17z9pAqbnI7HGu9DrJlg3sEBFfCLaMEqp+O3IQPUF6EZtQ4xkAu2ml6kMBBCtGxjvmtmuQ==", + "version": "2.16.2", + "resolved": "https://registry.npmjs.org/@octokit/types/-/types-2.16.2.tgz", + "integrity": "sha512-O75k56TYvJ8WpAakWwYRN8Bgu60KrmX0z1KqFp1kNiFNkgW+JW+9EBKZ+S33PU6SLvbihqd+3drvPxKK68Ee8Q==", "dev": true, "requires": { "@types/node": ">= 8" @@ -5250,6 +5200,12 @@ "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==", "dev": true }, + "@types/minimist": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-aaI6OtKcrwCX8G7aWbNh7i8GOfY=", + "dev": true + }, "@types/nock": { "version": "10.0.3", "resolved": "https://registry.npmjs.org/@types/nock/-/nock-10.0.3.tgz", @@ -5533,9 +5489,9 @@ "dev": true }, "agent-base": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.2.1.tgz", - "integrity": "sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz", + "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==", "dev": true, "requires": { "es6-promisify": "^5.0.0" @@ -6099,9 +6055,9 @@ "dev": true }, "readable-stream": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", - "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, "requires": { "core-util-is": "~1.0.0", @@ -6848,9 +6804,9 @@ "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=" }, "cacache": { - "version": "12.0.3", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.3.tgz", - "integrity": "sha512-kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw==", + "version": "12.0.4", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz", + "integrity": "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==", "dev": true, "requires": { "bluebird": "^3.5.5", @@ -6955,22 +6911,14 @@ "dev": true }, "camelcase-keys": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-4.2.0.tgz", - "integrity": "sha1-oqpfsa9oh1glnDLBQUJteJI7m3c=", + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz", + "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==", "dev": true, "requires": { - "camelcase": "^4.1.0", - "map-obj": "^2.0.0", - "quick-lru": "^1.0.0" - }, - "dependencies": { - "camelcase": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", - "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", - "dev": true - } + "camelcase": "^5.3.1", + "map-obj": "^4.0.0", + "quick-lru": "^4.0.1" } }, "capture-exit": { @@ -7074,9 +7022,9 @@ } }, "cli-width": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz", - "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz", + "integrity": "sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==", "dev": true }, "cliui": { @@ -7090,6 +7038,12 @@ "wrap-ansi": "^5.1.0" }, "dependencies": { + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "dev": true + }, "string-width": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", @@ -7261,23 +7215,6 @@ "requires": { "strip-ansi": "^3.0.0", "wcwidth": "^1.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true - }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "dev": true, - "requires": { - "ansi-regex": "^2.0.0" - } - } } }, "combined-stream": { @@ -7290,16 +7227,16 @@ } }, "commander": { - "version": "2.17.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz", - "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==", + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", "dev": true, "optional": true }, "compare-func": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/compare-func/-/compare-func-1.3.2.tgz", - "integrity": "sha1-md0LpFfh+bxyKxLAjsM+6rMfpkg=", + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/compare-func/-/compare-func-1.3.4.tgz", + "integrity": "sha512-sq2sWtrqKPkEXAC8tEJA1+BqAH9GbFkGBtUOqrUX57VSfwp8xyktctk+uLoRy5eccTdxzDcVIztlYDpKs3Jv1Q==", "dev": true, "requires": { "array-ify": "^1.0.0", @@ -7347,9 +7284,9 @@ "dev": true }, "readable-stream": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", - "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, "requires": { "core-util-is": "~1.0.0", @@ -7442,9 +7379,9 @@ "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==" }, "conventional-changelog-angular": { - "version": "5.0.6", - "resolved": "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-5.0.6.tgz", - "integrity": "sha512-QDEmLa+7qdhVIv8sFZfVxU1VSyVvnXPsxq8Vam49mKUcO1Z8VTLEJk9uI21uiJUsnmm0I4Hrsdc9TgkOQo9WSA==", + "version": "5.0.10", + "resolved": "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-5.0.10.tgz", + "integrity": "sha512-k7RPPRs0vp8+BtPsM9uDxRl6KcgqtCJmzRD1wRtgqmhQ96g8ifBGo9O/TZBG23jqlXS/rg8BKRDELxfnQQGiaA==", "dev": true, "requires": { "compare-func": "^1.3.1", @@ -7537,41 +7474,29 @@ } }, "conventional-changelog-preset-loader": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-2.3.0.tgz", - "integrity": "sha512-/rHb32J2EJnEXeK4NpDgMaAVTFZS3o1ExmjKMtYVgIC4MQn0vkNSbYpdGRotkfGGRWiqk3Ri3FBkiZGbAfIfOQ==", + "version": "2.3.4", + "resolved": "https://registry.npmjs.org/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-2.3.4.tgz", + "integrity": "sha512-GEKRWkrSAZeTq5+YjUZOYxdHq+ci4dNwHvpaBC3+ENalzFWuCWa9EZXSuZBpkr72sMdKB+1fyDV4takK1Lf58g==", "dev": true }, "conventional-changelog-writer": { - "version": "4.0.11", - "resolved": "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-4.0.11.tgz", - "integrity": "sha512-g81GQOR392I+57Cw3IyP1f+f42ME6aEkbR+L7v1FBBWolB0xkjKTeCWVguzRrp6UiT1O6gBpJbEy2eq7AnV1rw==", + "version": "4.0.16", + "resolved": "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-4.0.16.tgz", + "integrity": "sha512-jmU1sDJDZpm/dkuFxBeRXvyNcJQeKhGtVcFFkwTphUAzyYWcwz2j36Wcv+Mv2hU3tpvLMkysOPXJTLO55AUrYQ==", "dev": true, "requires": { "compare-func": "^1.3.1", - "conventional-commits-filter": "^2.0.2", + "conventional-commits-filter": "^2.0.6", "dateformat": "^3.0.0", - "handlebars": "^4.4.0", + "handlebars": "^4.7.6", "json-stringify-safe": "^5.0.1", "lodash": "^4.17.15", - "meow": "^5.0.0", + "meow": "^7.0.0", "semver": "^6.0.0", "split": "^1.0.0", "through2": "^3.0.0" }, "dependencies": { - "handlebars": { - "version": "4.5.3", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.5.3.tgz", - "integrity": "sha512-3yPecJoJHK/4c6aZhSvxOyG4vJKDshV36VHp0iVCDVh7o9w2vwi3NSnL2MMPj3YdduqaBcu7cGbggJQM0br9xA==", - "dev": true, - "requires": { - "neo-async": "^2.6.0", - "optimist": "^0.6.1", - "source-map": "^0.6.1", - "uglify-js": "^3.1.4" - } - }, "lodash": { "version": "4.17.15", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", @@ -7596,9 +7521,9 @@ } }, "conventional-commits-filter": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-2.0.2.tgz", - "integrity": "sha512-WpGKsMeXfs21m1zIw4s9H5sys2+9JccTzpN6toXtxhpw2VNF2JUXwIakthKBy+LN4DvJm+TzWhxOMWOs1OFCFQ==", + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-2.0.6.tgz", + "integrity": "sha512-4g+sw8+KA50/Qwzfr0hL5k5NWxqtrOVw4DDk3/h6L85a9Gz0/Eqp3oP+CWCNfesBvZZZEFHF7OTEbRe+yYSyKw==", "dev": true, "requires": { "lodash.ismatch": "^4.4.0", @@ -7606,15 +7531,15 @@ } }, "conventional-commits-parser": { - "version": "3.0.8", - "resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-3.0.8.tgz", - "integrity": "sha512-YcBSGkZbYp7d+Cr3NWUeXbPDFUN6g3SaSIzOybi8bjHL5IJ5225OSCxJJ4LgziyEJ7AaJtE9L2/EU6H7Nt/DDQ==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-3.1.0.tgz", + "integrity": "sha512-RSo5S0WIwXZiRxUGTPuYFbqvrR4vpJ1BDdTlthFgvHt5kEdnd1+pdvwWphWn57/oIl4V72NMmOocFqqJ8mFFhA==", "dev": true, "requires": { "JSONStream": "^1.0.4", "is-text-path": "^1.0.1", "lodash": "^4.17.15", - "meow": "^5.0.0", + "meow": "^7.0.0", "split2": "^2.0.0", "through2": "^3.0.0", "trim-off-newlines": "^1.0.0" @@ -7653,6 +7578,23 @@ "q": "^1.5.1" }, "dependencies": { + "camelcase": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", + "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", + "dev": true + }, + "camelcase-keys": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-4.2.0.tgz", + "integrity": "sha1-oqpfsa9oh1glnDLBQUJteJI7m3c=", + "dev": true, + "requires": { + "camelcase": "^4.1.0", + "map-obj": "^2.0.0", + "quick-lru": "^1.0.0" + } + }, "concat-stream": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz", @@ -7674,6 +7616,12 @@ "locate-path": "^2.0.0" } }, + "indent-string": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz", + "integrity": "sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=", + "dev": true + }, "locate-path": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", @@ -7684,6 +7632,12 @@ "path-exists": "^3.0.0" } }, + "map-obj": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-2.0.0.tgz", + "integrity": "sha1-plzSkIepJZi4eRJXpSPgISIqwfk=", + "dev": true + }, "meow": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/meow/-/meow-4.0.1.tgz", @@ -7701,6 +7655,16 @@ "trim-newlines": "^2.0.0" } }, + "minimist-options": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-3.0.2.tgz", + "integrity": "sha512-FyBrT/d0d4+uiZRbqznPXqw3IpZZG3gl3wKWiX784FycUKVwBt0uLBFkQrtE4tZOrgo78nZp2jnKz3L65T5LdQ==", + "dev": true, + "requires": { + "arrify": "^1.0.1", + "is-plain-obj": "^1.1.0" + } + }, "p-limit": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", @@ -7725,6 +7689,12 @@ "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", "dev": true }, + "quick-lru": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-1.1.0.tgz", + "integrity": "sha1-Q2CxfGETatOAeDl/8RQW4Ybc+7g=", + "dev": true + }, "read-pkg-up": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz", @@ -7734,6 +7704,28 @@ "find-up": "^2.0.0", "read-pkg": "^3.0.0" } + }, + "redent": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/redent/-/redent-2.0.0.tgz", + "integrity": "sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo=", + "dev": true, + "requires": { + "indent-string": "^3.0.0", + "strip-indent": "^2.0.0" + } + }, + "strip-indent": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz", + "integrity": "sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g=", + "dev": true + }, + "trim-newlines": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-2.0.0.tgz", + "integrity": "sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA=", + "dev": true } } }, @@ -8254,9 +8246,9 @@ "dev": true }, "readable-stream": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", - "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, "requires": { "core-util-is": "~1.0.0", @@ -8344,9 +8336,9 @@ "dev": true }, "envinfo": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.5.0.tgz", - "integrity": "sha512-jDgnJaF/Btomk+m3PZDTTCb5XIIIX3zYItnCRfF73zVgvinLoRomuhi75Y4su0PtQxWz4v66XnLLckyvyJTOIQ==", + "version": "7.5.1", + "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.5.1.tgz", + "integrity": "sha512-hQBkDf2iO4Nv0CNHpCuSBeaSrveU6nThVxFGTrq/eDlV716UQk09zChaJae4mZRsos1x4YLY2TaH3LHUae3ZmQ==", "dev": true }, "err-code": { @@ -8392,9 +8384,9 @@ } }, "es6-promise": { - "version": "4.2.6", - "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.6.tgz", - "integrity": "sha512-aRVgGdnmW2OiySVPUC9e6m+plolMAJKjZnQlCwNSuK5yQ0JN61DZSO1X1Ufd1foqWRAlig0rhduTCHe7sVtK5Q==", + "version": "4.2.8", + "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz", + "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==", "dev": true }, "es6-promisify": { @@ -9041,9 +9033,9 @@ "dev": true }, "figgy-pudding": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz", - "integrity": "sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==", + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.2.tgz", + "integrity": "sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==", "dev": true }, "figures": { @@ -9148,9 +9140,9 @@ "dev": true }, "readable-stream": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", - "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, "requires": { "core-util-is": "~1.0.0", @@ -9238,9 +9230,9 @@ "dev": true }, "readable-stream": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", - "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, "requires": { "core-util-is": "~1.0.0", @@ -9280,10 +9272,10 @@ }, "dependencies": { "graceful-fs": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz", - "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==", - "dev": true + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==", + "dev": true } } }, @@ -9367,23 +9359,6 @@ "string-width": "^1.0.1", "strip-ansi": "^3.0.1", "wide-align": "^1.1.0" - }, - "dependencies": { - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true - }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "dev": true, - "requires": { - "ansi-regex": "^2.0.0" - } - } } }, "genfun": { @@ -9636,6 +9611,23 @@ "through2": "^2.0.0" }, "dependencies": { + "camelcase": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", + "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", + "dev": true + }, + "camelcase-keys": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-4.2.0.tgz", + "integrity": "sha1-oqpfsa9oh1glnDLBQUJteJI7m3c=", + "dev": true, + "requires": { + "camelcase": "^4.1.0", + "map-obj": "^2.0.0", + "quick-lru": "^1.0.0" + } + }, "find-up": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", @@ -9645,6 +9637,12 @@ "locate-path": "^2.0.0" } }, + "indent-string": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz", + "integrity": "sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=", + "dev": true + }, "locate-path": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", @@ -9655,6 +9653,12 @@ "path-exists": "^3.0.0" } }, + "map-obj": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-2.0.0.tgz", + "integrity": "sha1-plzSkIepJZi4eRJXpSPgISIqwfk=", + "dev": true + }, "meow": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/meow/-/meow-4.0.1.tgz", @@ -9672,6 +9676,16 @@ "trim-newlines": "^2.0.0" } }, + "minimist-options": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-3.0.2.tgz", + "integrity": "sha512-FyBrT/d0d4+uiZRbqznPXqw3IpZZG3gl3wKWiX784FycUKVwBt0uLBFkQrtE4tZOrgo78nZp2jnKz3L65T5LdQ==", + "dev": true, + "requires": { + "arrify": "^1.0.1", + "is-plain-obj": "^1.1.0" + } + }, "p-limit": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", @@ -9696,6 +9710,12 @@ "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", "dev": true }, + "quick-lru": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-1.1.0.tgz", + "integrity": "sha1-Q2CxfGETatOAeDl/8RQW4Ybc+7g=", + "dev": true + }, "read-pkg-up": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz", @@ -9705,6 +9725,28 @@ "find-up": "^2.0.0", "read-pkg": "^3.0.0" } + }, + "redent": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/redent/-/redent-2.0.0.tgz", + "integrity": "sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo=", + "dev": true, + "requires": { + "indent-string": "^3.0.0", + "strip-indent": "^2.0.0" + } + }, + "strip-indent": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz", + "integrity": "sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g=", + "dev": true + }, + "trim-newlines": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-2.0.0.tgz", + "integrity": "sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA=", + "dev": true } } }, @@ -9736,6 +9778,23 @@ "semver": "^6.0.0" }, "dependencies": { + "camelcase": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", + "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", + "dev": true + }, + "camelcase-keys": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-4.2.0.tgz", + "integrity": "sha1-oqpfsa9oh1glnDLBQUJteJI7m3c=", + "dev": true, + "requires": { + "camelcase": "^4.1.0", + "map-obj": "^2.0.0", + "quick-lru": "^1.0.0" + } + }, "find-up": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", @@ -9745,6 +9804,12 @@ "locate-path": "^2.0.0" } }, + "indent-string": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz", + "integrity": "sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=", + "dev": true + }, "locate-path": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", @@ -9755,6 +9820,12 @@ "path-exists": "^3.0.0" } }, + "map-obj": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-2.0.0.tgz", + "integrity": "sha1-plzSkIepJZi4eRJXpSPgISIqwfk=", + "dev": true + }, "meow": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/meow/-/meow-4.0.1.tgz", @@ -9772,6 +9843,16 @@ "trim-newlines": "^2.0.0" } }, + "minimist-options": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-3.0.2.tgz", + "integrity": "sha512-FyBrT/d0d4+uiZRbqznPXqw3IpZZG3gl3wKWiX784FycUKVwBt0uLBFkQrtE4tZOrgo78nZp2jnKz3L65T5LdQ==", + "dev": true, + "requires": { + "arrify": "^1.0.1", + "is-plain-obj": "^1.1.0" + } + }, "p-limit": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", @@ -9796,6 +9877,12 @@ "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", "dev": true }, + "quick-lru": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-1.1.0.tgz", + "integrity": "sha1-Q2CxfGETatOAeDl/8RQW4Ybc+7g=", + "dev": true + }, "read-pkg-up": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz", @@ -9806,11 +9893,33 @@ "read-pkg": "^3.0.0" } }, + "redent": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/redent/-/redent-2.0.0.tgz", + "integrity": "sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo=", + "dev": true, + "requires": { + "indent-string": "^3.0.0", + "strip-indent": "^2.0.0" + } + }, "semver": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", "dev": true + }, + "strip-indent": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz", + "integrity": "sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g=", + "dev": true + }, + "trim-newlines": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-2.0.0.tgz", + "integrity": "sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA=", + "dev": true } } }, @@ -9856,9 +9965,9 @@ } }, "glob-parent": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz", - "integrity": "sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz", + "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==", "dev": true, "requires": { "is-glob": "^4.0.1" @@ -9890,14 +9999,6 @@ "ignore": "^4.0.3", "pify": "^4.0.1", "slash": "^2.0.0" - }, - "dependencies": { - "pify": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", - "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", - "dev": true - } } }, "graceful-fs": { @@ -9964,6 +10065,27 @@ "dev": true, "optional": true }, + "handlebars": { + "version": "4.7.6", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.6.tgz", + "integrity": "sha512-1f2BACcBfiwAfStCKZNrUCgqNZkGsAT7UM3kkYtXuLo0KnaVfjKOyf7PRzB6++aK9STyT1Pd2ZCPe3EGOXleXA==", + "dev": true, + "requires": { + "minimist": "^1.2.5", + "neo-async": "^2.6.0", + "source-map": "^0.6.1", + "uglify-js": "^3.1.4", + "wordwrap": "^1.0.0" + }, + "dependencies": { + "minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", + "dev": true + } + } + }, "hapi": { "version": "17.8.5", "resolved": "https://registry.npmjs.org/hapi/-/hapi-17.8.5.tgz", @@ -10289,6 +10411,12 @@ "har-schema": "^2.0.0" } }, + "hard-rejection": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz", + "integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==", + "dev": true + }, "has": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", @@ -10516,9 +10644,9 @@ "dev": true }, "ignore-walk": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz", - "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz", + "integrity": "sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==", "dev": true, "requires": { "minimatch": "^3.0.4" @@ -10532,6 +10660,14 @@ "requires": { "caller-path": "^2.0.0", "resolve-from": "^3.0.0" + }, + "dependencies": { + "resolve-from": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz", + "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", + "dev": true + } } }, "import-local": { @@ -10550,9 +10686,9 @@ "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=" }, "indent-string": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz", - "integrity": "sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", + "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", "dev": true }, "infer-owner": { @@ -10639,6 +10775,12 @@ "supports-color": "^5.3.0" } }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "dev": true + }, "string-width": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", @@ -10659,6 +10801,23 @@ } } } + }, + "strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dev": true, + "requires": { + "ansi-regex": "^4.1.0" + }, + "dependencies": { + "ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "dev": true + } + } } } }, @@ -10819,20 +10978,20 @@ "dev": true }, "is-finite": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz", - "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz", + "integrity": "sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "dev": true, "requires": { "number-is-nan": "^1.0.0" } }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true - }, "is-generator-fn": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.0.0.tgz", @@ -10894,12 +11053,6 @@ "isobject": "^3.0.1" } }, - "is-promise": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz", - "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=", - "dev": true - }, "is-regex": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz", @@ -15407,27 +15560,27 @@ } }, "lerna": { - "version": "3.20.2", - "resolved": "https://registry.npmjs.org/lerna/-/lerna-3.20.2.tgz", - "integrity": "sha512-bjdL7hPLpU3Y8CBnw/1ys3ynQMUjiK6l9iDWnEGwFtDy48Xh5JboR9ZJwmKGCz9A/sarVVIGwf1tlRNKUG9etA==", + "version": "3.21.0", + "resolved": "https://registry.npmjs.org/lerna/-/lerna-3.21.0.tgz", + "integrity": "sha512-ux8yOwQEgIXOZVUfq+T8nVzPymL19vlIoPbysOP3YA4hcjKlqQIlsjI/1ugBe6b4MF7W4iV5vS3gH9cGqBBc1A==", "dev": true, "requires": { - "@lerna/add": "3.20.0", - "@lerna/bootstrap": "3.20.0", - "@lerna/changed": "3.20.0", - "@lerna/clean": "3.20.0", + "@lerna/add": "3.21.0", + "@lerna/bootstrap": "3.21.0", + "@lerna/changed": "3.21.0", + "@lerna/clean": "3.21.0", "@lerna/cli": "3.18.5", - "@lerna/create": "3.18.5", - "@lerna/diff": "3.18.5", - "@lerna/exec": "3.20.0", - "@lerna/import": "3.18.5", - "@lerna/info": "3.20.0", - "@lerna/init": "3.18.5", - "@lerna/link": "3.18.5", - "@lerna/list": "3.20.0", - "@lerna/publish": "3.20.2", - "@lerna/run": "3.20.0", - "@lerna/version": "3.20.2", + "@lerna/create": "3.21.0", + "@lerna/diff": "3.21.0", + "@lerna/exec": "3.21.0", + "@lerna/import": "3.21.0", + "@lerna/info": "3.21.0", + "@lerna/init": "3.21.0", + "@lerna/link": "3.21.0", + "@lerna/list": "3.21.0", + "@lerna/publish": "3.21.0", + "@lerna/run": "3.21.0", + "@lerna/version": "3.21.0", "import-local": "^2.0.0", "npmlog": "^4.1.2" } @@ -15465,15 +15618,16 @@ "dev": true }, "load-json-file": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz", - "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-5.3.0.tgz", + "integrity": "sha512-cJGP40Jc/VXUsp8/OrnyKyTZ1y6v/dphm3bioS+RrKXjK2BB6wHUd6JptZEFDGgGahMT+InnZO5i1Ei9mpC8Bw==", "dev": true, "requires": { - "graceful-fs": "^4.1.2", + "graceful-fs": "^4.1.15", "parse-json": "^4.0.0", - "pify": "^3.0.0", - "strip-bom": "^3.0.0" + "pify": "^4.0.1", + "strip-bom": "^3.0.0", + "type-fest": "^0.3.0" } }, "locate-path": { @@ -15694,6 +15848,14 @@ "dev": true, "requires": { "pify": "^3.0.0" + }, + "dependencies": { + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", + "dev": true + } } }, "make-error": { @@ -15721,15 +15883,6 @@ "ssri": "^6.0.0" }, "dependencies": { - "agent-base": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz", - "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==", - "dev": true, - "requires": { - "es6-promisify": "^5.0.0" - } - }, "debug": { "version": "3.2.6", "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", @@ -15779,9 +15932,9 @@ "dev": true }, "map-obj": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-2.0.0.tgz", - "integrity": "sha1-plzSkIepJZi4eRJXpSPgISIqwfk=", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.1.0.tgz", + "integrity": "sha512-glc9y00wgtwcDmp7GaE/0b0OnxpNJsVf3ael/An6Fe2Q51LLwN1er6sdomLRzz5h0+yMpiYLhWYF5R7HeqVd4g==", "dev": true }, "map-visit": { @@ -15814,88 +15967,60 @@ "dev": true }, "meow": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/meow/-/meow-5.0.0.tgz", - "integrity": "sha512-CbTqYU17ABaLefO8vCU153ZZlprKYWDljcndKKDCFcYQITzWCXZAVk4QMFZPgvzrnUQ3uItnIE/LoUOwrT15Ig==", + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/meow/-/meow-7.0.1.tgz", + "integrity": "sha512-tBKIQqVrAHqwit0vfuFPY3LlzJYkEOFyKa3bPgxzNl6q/RtN8KQ+ALYEASYuFayzSAsjlhXj/JZ10rH85Q6TUw==", "dev": true, "requires": { - "camelcase-keys": "^4.0.0", - "decamelize-keys": "^1.0.0", - "loud-rejection": "^1.0.0", - "minimist-options": "^3.0.1", - "normalize-package-data": "^2.3.4", - "read-pkg-up": "^3.0.0", - "redent": "^2.0.0", - "trim-newlines": "^2.0.0", - "yargs-parser": "^10.0.0" + "@types/minimist": "^1.2.0", + "arrify": "^2.0.1", + "camelcase": "^6.0.0", + "camelcase-keys": "^6.2.2", + "decamelize-keys": "^1.1.0", + "hard-rejection": "^2.1.0", + "minimist-options": "^4.0.2", + "normalize-package-data": "^2.5.0", + "read-pkg-up": "^7.0.1", + "redent": "^3.0.0", + "trim-newlines": "^3.0.0", + "type-fest": "^0.13.1", + "yargs-parser": "^18.1.3" }, "dependencies": { - "camelcase": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", - "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", + "arrify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz", + "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==", "dev": true }, - "find-up": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", - "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", - "dev": true, - "requires": { - "locate-path": "^2.0.0" - } - }, - "locate-path": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", - "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", - "dev": true, - "requires": { - "p-locate": "^2.0.0", - "path-exists": "^3.0.0" - } - }, - "p-limit": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", - "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", - "dev": true, - "requires": { - "p-try": "^1.0.0" - } - }, - "p-locate": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", - "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", - "dev": true, - "requires": { - "p-limit": "^1.1.0" - } - }, - "p-try": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", - "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", + "camelcase": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.0.0.tgz", + "integrity": "sha512-8KMDF1Vz2gzOq54ONPJS65IvTUaB1cHJ2DMM7MbPmLZljDH1qpzzLsWdiN9pHh6qvkRVDTi/07+eNGch/oLU4w==", "dev": true }, - "read-pkg-up": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz", - "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=", - "dev": true, - "requires": { - "find-up": "^2.0.0", - "read-pkg": "^3.0.0" - } + "type-fest": { + "version": "0.13.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz", + "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==", + "dev": true }, "yargs-parser": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz", - "integrity": "sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==", + "version": "18.1.3", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz", + "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==", "dev": true, "requires": { - "camelcase": "^4.1.0" + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" + }, + "dependencies": { + "camelcase": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", + "dev": true + } } } } @@ -16036,6 +16161,12 @@ "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==", "dev": true }, + "min-indent": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.0.tgz", + "integrity": "sha1-z8RcN+nsDY8KDsPdTvf3w6vjklY=", + "dev": true + }, "minimalistic-assert": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz", @@ -16057,13 +16188,22 @@ "dev": true }, "minimist-options": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-3.0.2.tgz", - "integrity": "sha512-FyBrT/d0d4+uiZRbqznPXqw3IpZZG3gl3wKWiX784FycUKVwBt0uLBFkQrtE4tZOrgo78nZp2jnKz3L65T5LdQ==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz", + "integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==", "dev": true, "requires": { "arrify": "^1.0.1", - "is-plain-obj": "^1.1.0" + "is-plain-obj": "^1.1.0", + "kind-of": "^6.0.3" + }, + "dependencies": { + "kind-of": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", + "dev": true + } } }, "minipass": { @@ -16313,9 +16453,9 @@ "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=" }, "neo-async": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.0.tgz", - "integrity": "sha512-MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA==", + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz", + "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==", "dev": true }, "nice-try": { @@ -16364,9 +16504,9 @@ "integrity": "sha512-MOd8pV3fxENbryESLgVIeaGKrdl+uaYhCSSVkjeOb/31/njTpcis5aWfdqgNlHIrKOLRbMnfPINPOML2CIFeXA==" }, "node-fetch-npm": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/node-fetch-npm/-/node-fetch-npm-2.0.2.tgz", - "integrity": "sha512-nJIxm1QmAj4v3nfCvEeCrYSoVwXyxLnaPBK5W1W5DGEJwjlKuC2VEUycGw5oxk+4zZahRrB84PUJJgEmhFTDFw==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/node-fetch-npm/-/node-fetch-npm-2.0.4.tgz", + "integrity": "sha512-iOuIQDWDyjhv9qSDrj9aq/klt6F9z1p2otB3AV7v3zBDcL/x+OfGsvGQZZCcMZbUf4Ujw1xGNQkjvGnVT22cKg==", "dev": true, "requires": { "encoding": "^0.1.11", @@ -16375,9 +16515,9 @@ } }, "node-gyp": { - "version": "5.0.7", - "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-5.0.7.tgz", - "integrity": "sha512-K8aByl8OJD51V0VbUURTKsmdswkQQusIvlvmTyhHlIT1hBvaSxzdxpSle857XuXa7uc02UEZx9OR5aDxSWS5Qw==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-5.1.0.tgz", + "integrity": "sha512-OUTryc5bt/P8zVgNUmC6xdXiDJxLMAW8cF5tLQOT9E5sOQj+UeQxnnPy74K3CLCa/SOjjBlbuzDLR8ANwA+wmw==", "dev": true, "requires": { "env-paths": "^2.2.0", @@ -16408,9 +16548,9 @@ } }, "graceful-fs": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz", - "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==", + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==", "dev": true }, "semver": { @@ -16457,9 +16597,9 @@ } }, "nopt": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz", - "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz", + "integrity": "sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==", "dev": true, "requires": { "abbrev": "1", @@ -16494,15 +16634,18 @@ "dev": true }, "npm-bundled": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.6.tgz", - "integrity": "sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==", - "dev": true + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.1.tgz", + "integrity": "sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==", + "dev": true, + "requires": { + "npm-normalize-package-bin": "^1.0.1" + } }, "npm-lifecycle": { - "version": "3.1.4", - "resolved": "https://registry.npmjs.org/npm-lifecycle/-/npm-lifecycle-3.1.4.tgz", - "integrity": "sha512-tgs1PaucZwkxECGKhC/stbEgFyc3TGh2TJcg2CDr6jbvQRdteHNhmMeljRzpe4wgFAXQADoy1cSqqi7mtiAa5A==", + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/npm-lifecycle/-/npm-lifecycle-3.1.5.tgz", + "integrity": "sha512-lDLVkjfZmvmfvpvBzA4vzee9cn+Me4orq0QF8glbswJVEbIcSNWib7qGOffolysc3teCqbbPZZkzbr3GQZTL1g==", "dev": true, "requires": { "byline": "^5.0.0", @@ -16513,14 +16656,6 @@ "uid-number": "0.0.6", "umask": "^1.1.0", "which": "^1.3.1" - }, - "dependencies": { - "resolve-from": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", - "dev": true - } } }, "npm-normalize-package-bin": { @@ -16542,13 +16677,14 @@ } }, "npm-packlist": { - "version": "1.4.6", - "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.6.tgz", - "integrity": "sha512-u65uQdb+qwtGvEJh/DgQgW1Xg7sqeNbmxYyrvlNznaVTjV3E5P6F/EFjM+BVHXl7JJlsdG8A64M0XI8FI/IOlg==", + "version": "1.4.8", + "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.8.tgz", + "integrity": "sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==", "dev": true, "requires": { "ignore-walk": "^3.0.1", - "npm-bundled": "^1.0.1" + "npm-bundled": "^1.0.1", + "npm-normalize-package-bin": "^1.0.1" } }, "npm-pick-manifest": { @@ -16716,24 +16852,6 @@ "resolved": "https://registry.npmjs.org/only/-/only-0.0.2.tgz", "integrity": "sha1-Kv3oTQPlC5qO3EROMGEKcCle37Q=" }, - "optimist": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", - "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", - "dev": true, - "requires": { - "minimist": "~0.0.1", - "wordwrap": "~0.0.2" - }, - "dependencies": { - "minimist": { - "version": "0.0.10", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", - "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=", - "dev": true - } - } - }, "optionator": { "version": "0.8.2", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz", @@ -16887,9 +17005,9 @@ "dev": true }, "readable-stream": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", - "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, "requires": { "core-util-is": "~1.0.0", @@ -17008,6 +17126,14 @@ "dev": true, "requires": { "pify": "^3.0.0" + }, + "dependencies": { + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", + "dev": true + } } }, "pathval": { @@ -17029,9 +17155,9 @@ "dev": true }, "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", + "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", "dev": true }, "pinkie": { @@ -17303,9 +17429,9 @@ } }, "quick-lru": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-1.1.0.tgz", - "integrity": "sha1-Q2CxfGETatOAeDl/8RQW4Ybc+7g=", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz", + "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==", "dev": true }, "range-parser": { @@ -17396,6 +17522,26 @@ "load-json-file": "^4.0.0", "normalize-package-data": "^2.3.2", "path-type": "^3.0.0" + }, + "dependencies": { + "load-json-file": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz", + "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=", + "dev": true, + "requires": { + "graceful-fs": "^4.1.2", + "parse-json": "^4.0.0", + "pify": "^3.0.0", + "strip-bom": "^3.0.0" + } + }, + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", + "dev": true + } } }, "read-pkg-up": { @@ -17513,13 +17659,13 @@ "dev": true }, "redent": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/redent/-/redent-2.0.0.tgz", - "integrity": "sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz", + "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==", "dev": true, "requires": { - "indent-string": "^3.0.0", - "strip-indent": "^2.0.0" + "indent-string": "^4.0.0", + "strip-indent": "^3.0.0" } }, "redis-commands": { @@ -17695,12 +17841,20 @@ "dev": true, "requires": { "resolve-from": "^3.0.0" + }, + "dependencies": { + "resolve-from": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz", + "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", + "dev": true + } } }, "resolve-from": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz", - "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", "dev": true }, "resolve-url": { @@ -17757,13 +17911,10 @@ "dev": true }, "run-async": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz", - "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=", - "dev": true, - "requires": { - "is-promise": "^2.1.0" - } + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz", + "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==", + "dev": true }, "run-queue": { "version": "1.0.3", @@ -17774,9 +17925,9 @@ } }, "rxjs": { - "version": "6.5.4", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.4.tgz", - "integrity": "sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q==", + "version": "6.5.5", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.5.tgz", + "integrity": "sha512-WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ==", "dev": true, "requires": { "tslib": "^1.9.0" @@ -18151,6 +18302,17 @@ "requires": { "agent-base": "~4.2.1", "socks": "~2.3.2" + }, + "dependencies": { + "agent-base": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.2.1.tgz", + "integrity": "sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==", + "dev": true, + "requires": { + "es6-promisify": "^5.0.0" + } + } } }, "sort-keys": { @@ -18438,32 +18600,6 @@ "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", "strip-ansi": "^3.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", - "dev": true, - "requires": { - "number-is-nan": "^1.0.0" - } - }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "dev": true, - "requires": { - "ansi-regex": "^2.0.0" - } - } } }, "string_decoder": { @@ -18476,12 +18612,20 @@ } }, "strip-ansi": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.1.0.tgz", - "integrity": "sha512-TjxrkPONqO2Z8QDCpeE2j6n0M6EwxzyDgzEeGp+FbdvaJAt//ClYi6W5my+3ROlC/hZX2KACUwDfK49Ka5eDvg==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, "requires": { - "ansi-regex": "^4.1.0" + "ansi-regex": "^2.0.0" + }, + "dependencies": { + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", + "dev": true + } } }, "strip-bom": { @@ -18503,10 +18647,13 @@ "dev": true }, "strip-indent": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz", - "integrity": "sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g=", - "dev": true + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz", + "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==", + "dev": true, + "requires": { + "min-indent": "^1.0.0" + } }, "strong-log-transformer": { "version": "2.1.0", @@ -18751,6 +18898,14 @@ "pify": "^3.0.0", "temp-dir": "^1.0.0", "uuid": "^3.0.1" + }, + "dependencies": { + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", + "dev": true + } } }, "terminal-link": { @@ -18991,9 +19146,9 @@ } }, "trim-newlines": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-2.0.0.tgz", - "integrity": "sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.0.tgz", + "integrity": "sha512-C4+gOpvmxaSMKuEf9Qc134F1ZuOHVXKRbtEflf4NTtuuJDEIJ9p5PXsalL8SkeRw+qit1Mo+yuvMPAKwWg/1hA==", "dev": true }, "trim-off-newlines": { @@ -19178,14 +19333,13 @@ "dev": true }, "uglify-js": { - "version": "3.4.9", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.9.tgz", - "integrity": "sha512-8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q==", + "version": "3.9.3", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.9.3.tgz", + "integrity": "sha512-r5ImcL6QyzQGVimQoov3aL2ZScywrOgBXGndbWrdehKoSvGe/RmiE5Jpw/v+GvxODt6l2tpBXwA7n+qZVlHBMA==", "dev": true, "optional": true, "requires": { - "commander": "~2.17.1", - "source-map": "~0.6.1" + "commander": "~2.20.3" } }, "uid-number": { @@ -19229,9 +19383,9 @@ } }, "universal-user-agent": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-4.0.0.tgz", - "integrity": "sha512-eM8knLpev67iBDizr/YtqkJsF3GK8gzDc6st/WKzrTuPtcsOKW/0IdL4cnMBsU69pOx0otavLWBDGTwg+dB0aA==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-4.0.1.tgz", + "integrity": "sha512-LnST3ebHwVL2aNe4mejI9IQh2HfZ1RLo8Io2HugSif8ekzD1TlWpHpColOB/eh8JHMLkGH3Akqf040I+4ylNxg==", "dev": true, "requires": { "os-name": "^3.1.0" @@ -19531,9 +19685,9 @@ } }, "windows-release": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/windows-release/-/windows-release-3.2.0.tgz", - "integrity": "sha512-QTlz2hKLrdqukrsapKsINzqMgOUpQW268eJ0OaOpJN32h272waxR9fkB9VoWRtK7uKHG5EHJcTXQBD8XZVJkFA==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/windows-release/-/windows-release-3.3.0.tgz", + "integrity": "sha512-2HetyTg1Y+R+rUgrKeUEhAG/ZuOmTrI1NBb3ZyAGQMYmOJjBBPe4MTodghRkmLJZHwkuPi02anbeGP+Zf401LQ==", "dev": true, "requires": { "execa": "^1.0.0" @@ -19599,9 +19753,9 @@ } }, "wordwrap": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", - "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", + "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=", "dev": true }, "wrap-ansi": { @@ -19615,6 +19769,12 @@ "strip-ansi": "^5.0.0" }, "dependencies": { + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "dev": true + }, "string-width": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", @@ -19625,6 +19785,15 @@ "is-fullwidth-code-point": "^2.0.0", "strip-ansi": "^5.1.0" } + }, + "strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dev": true, + "requires": { + "ansi-regex": "^4.1.0" + } } } }, @@ -19634,9 +19803,9 @@ "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" }, "write-file-atomic": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.1.tgz", - "integrity": "sha512-TGHFeZEZMnv+gBFRfjAcxL5bPHrsGKtnb4qsFAws7/vlh+QfwAaySIw4AXP9ZskTTh5GWu3FLuJhsWVdiJPGvg==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgz", + "integrity": "sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==", "dev": true, "requires": { "graceful-fs": "^4.1.11", @@ -19667,23 +19836,6 @@ "pify": "^4.0.1", "semver": "^5.6.0" } - }, - "pify": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", - "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", - "dev": true - }, - "write-file-atomic": { - "version": "2.4.3", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgz", - "integrity": "sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==", - "dev": true, - "requires": { - "graceful-fs": "^4.1.11", - "imurmurhash": "^0.1.4", - "signal-exit": "^3.0.2" - } } } }, @@ -19697,6 +19849,12 @@ "write-json-file": "^2.2.0" }, "dependencies": { + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", + "dev": true + }, "write-json-file": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/write-json-file/-/write-json-file-2.3.0.tgz", @@ -19757,9 +19915,9 @@ "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==" }, "yargs": { - "version": "14.2.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-14.2.2.tgz", - "integrity": "sha512-/4ld+4VV5RnrynMhPZJ/ZpOCGSCeghMykZ3BhdFBDa9Wy/RH6uEGNWDJog+aUlq+9OM1CFTgtYRW5Is1Po9NOA==", + "version": "14.2.3", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-14.2.3.tgz", + "integrity": "sha512-ZbotRWhF+lkjijC/VhmOT9wSgyBQ7+zr13+YLkhfsSiTriYsMzkTUFP18pFhWwBeMa5gUc1MzbhrO6/VB7c9Xg==", "dev": true, "requires": { "cliui": "^5.0.0", @@ -19772,13 +19930,13 @@ "string-width": "^3.0.0", "which-module": "^2.0.0", "y18n": "^4.0.0", - "yargs-parser": "^15.0.0" + "yargs-parser": "^15.0.1" }, "dependencies": { - "require-main-filename": { + "is-fullwidth-code-point": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", - "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", "dev": true }, "string-width": { @@ -19791,13 +19949,22 @@ "is-fullwidth-code-point": "^2.0.0", "strip-ansi": "^5.1.0" } + }, + "strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dev": true, + "requires": { + "ansi-regex": "^4.1.0" + } } } }, "yargs-parser": { - "version": "15.0.0", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-15.0.0.tgz", - "integrity": "sha512-xLTUnCMc4JhxrPEPUYD5IBR1mWCK/aT6+RJ/K29JY2y1vD+FhtgKK0AXRWvI262q3QSffAQuTouFIKUuHX89wQ==", + "version": "15.0.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-15.0.1.tgz", + "integrity": "sha512-0OAMV2mAZQrs3FkNpDQcBk1x5HXb8X4twADss4S0Iuk+2dGnLOE/fRHrsYm542GduMveyA77OF4wrNJuanRCWw==", "dev": true, "requires": { "camelcase": "^5.0.0", diff --git a/package.json b/package.json index b8864420780..3d5b81e3f03 100644 --- a/package.json +++ b/package.json @@ -112,7 +112,7 @@ "jest-matcher-utils": "25.5.0", "js-sha256": "0.9.0", "koa": "2.11.0", - "lerna": "3.20.2", + "lerna": "3.21.0", "log4js": "4.5.1", "memcached-mock": "0.1.0", "mock-req": "0.2.0", From b21bb57e42851ea000e12bfedf721c00db1173ed Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 17 May 2020 02:12:28 +0000 Subject: [PATCH 589/642] chore(deps): update dependency ioredis to v4.17.1 (#4131) Co-authored-by: Renovate Bot --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3f5e7f409bf..2f1b8737366 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10822,9 +10822,9 @@ } }, "ioredis": { - "version": "4.17.0", - "resolved": "https://registry.npmjs.org/ioredis/-/ioredis-4.17.0.tgz", - "integrity": "sha512-RioyrvHu3HRmoq/jxKBLI0G/IjjVSJ/P3BDYaD3uuSyFrIEDndXdbdMOK7hwMvs0urElh5LItrJYY/YZwWc0UA==", + "version": "4.17.1", + "resolved": "https://registry.npmjs.org/ioredis/-/ioredis-4.17.1.tgz", + "integrity": "sha512-kfxkN/YO1dnyaoAGyNdH3my4A1eoGDy4QOfqn6o86fo4dTboxyxYVW0S0v/d3MkwCWlvSWhlwq6IJMY9BlWs6w==", "requires": { "cluster-key-slot": "^1.1.0", "debug": "^4.1.1", diff --git a/package.json b/package.json index 3d5b81e3f03..41605ac45fd 100644 --- a/package.json +++ b/package.json @@ -105,7 +105,7 @@ "graphql-tag": "2.10.3", "graphql-tools": "4.0.8", "hapi": "17.8.5", - "ioredis": "4.17.0", + "ioredis": "4.17.1", "jest": "25.5.4", "jest-config": "25.5.4", "jest-junit": "10.0.0", From 9568ed6839b548115a6caf38e14f63931ff19122 Mon Sep 17 00:00:00 2001 From: Blake Jackson Date: Sat, 16 May 2020 21:43:05 -0500 Subject: [PATCH 590/642] Removed lodash dependency. --- packages/apollo-gateway/src/FieldSet.ts | 52 +++++++++---------- .../apollo-gateway/src/utilities/array.ts | 8 +-- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/packages/apollo-gateway/src/FieldSet.ts b/packages/apollo-gateway/src/FieldSet.ts index db76e450d66..35814f33a9d 100644 --- a/packages/apollo-gateway/src/FieldSet.ts +++ b/packages/apollo-gateway/src/FieldSet.ts @@ -10,7 +10,7 @@ import { GraphQLObjectType, } from 'graphql'; import { getResponseName } from './utilities/graphql'; -import _ from 'lodash'; +import { partition } from './utilities/array'; export interface Field< TParent extends GraphQLCompositeType = GraphQLCompositeType @@ -155,31 +155,31 @@ function mergeSelectionSets(fieldNodes: FieldNode[]): SelectionSetNode { function mergeFieldNodeSelectionSets( selectionNodes: SelectionNode[], ): SelectionNode[] { - const [fieldNodes, fragmentNodes] = _(selectionNodes) - .partition( - (node: SelectionNode): node is FieldNode => node.kind === 'Field', - ) - .value(); - - const [aliasedFieldNodes, nonAliasedFieldNodes] = _(fieldNodes) - .partition((node) => node.alias) - .value(); - - const mergedFieldNodes = _(nonAliasedFieldNodes) - .groupBy((node) => node.name.value) - .values() - .map((nodesWithSameName) => { - const node = nodesWithSameName[0]; - if (node.selectionSet) { - node.selectionSet.selections = mergeFieldNodeSelectionSets( - nodesWithSameName.flatMap( - (node) => node.selectionSet?.selections || [], - ), - ); - } - return node; - }) - .value(); + const [fieldNodes, fragmentNodes] = partition( + selectionNodes, + (node: SelectionNode): node is FieldNode => node.kind === 'Field', + ); + + const [aliasedFieldNodes, nonAliasedFieldNodes] = partition( + fieldNodes, + (node: FieldNode): node is FieldNode => !!node.alias, + ); + + const mergedFieldNodes = Array.from( + groupBy((node: FieldNode) => node.name.value)( + nonAliasedFieldNodes, + ).values(), + ).map((nodesWithSameName) => { + const node = nodesWithSameName[0]; + if (node.selectionSet) { + node.selectionSet.selections = mergeFieldNodeSelectionSets( + nodesWithSameName.flatMap( + (node) => node.selectionSet?.selections || [], + ), + ); + } + return node; + }); return [...mergedFieldNodes, ...aliasedFieldNodes, ...fragmentNodes]; } diff --git a/packages/apollo-gateway/src/utilities/array.ts b/packages/apollo-gateway/src/utilities/array.ts index 5e94a539ebb..6137b03339d 100644 --- a/packages/apollo-gateway/src/utilities/array.ts +++ b/packages/apollo-gateway/src/utilities/array.ts @@ -16,10 +16,10 @@ export function compactMap( ); } -export function partition( +export function partition( array: T[], - predicate: (element: T, index: number, array: T[]) => boolean, -): [T[], T[]] { + predicate: (element: T, index: number, array: T[]) => element is U, +): [U[], T[]] { array.map; return array.reduce( (accumulator, element, index) => { @@ -30,7 +30,7 @@ export function partition( accumulator ); }, - [[], []] as [T[], T[]], + [[], []] as [U[], T[]], ); } From 54b806eb9bd0d9d9ac9a4685b3e2be7c501490fc Mon Sep 17 00:00:00 2001 From: Blake Jackson Date: Sat, 16 May 2020 21:46:42 -0500 Subject: [PATCH 591/642] Moved groupBy to /utilities/array.ts --- packages/apollo-gateway/src/FieldSet.ts | 21 +------------------ .../apollo-gateway/src/utilities/array.ts | 19 +++++++++++++++++ 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/packages/apollo-gateway/src/FieldSet.ts b/packages/apollo-gateway/src/FieldSet.ts index 35814f33a9d..63995c015f0 100644 --- a/packages/apollo-gateway/src/FieldSet.ts +++ b/packages/apollo-gateway/src/FieldSet.ts @@ -10,7 +10,7 @@ import { GraphQLObjectType, } from 'graphql'; import { getResponseName } from './utilities/graphql'; -import { partition } from './utilities/array'; +import { partition, groupBy } from './utilities/array'; export interface Field< TParent extends GraphQLCompositeType = GraphQLCompositeType @@ -46,25 +46,6 @@ export function matchesField(field: Field) { }; } -function groupBy(keyFunction: (element: T) => U) { - return (iterable: Iterable) => { - const result = new Map(); - - for (const element of iterable) { - const key = keyFunction(element); - const group = result.get(key); - - if (group) { - group.push(element); - } else { - result.set(key, [element]); - } - } - - return result; - }; -} - export const groupByResponseName = groupBy(field => getResponseName(field.fieldNode) ); diff --git a/packages/apollo-gateway/src/utilities/array.ts b/packages/apollo-gateway/src/utilities/array.ts index 6137b03339d..f421563a8e2 100644 --- a/packages/apollo-gateway/src/utilities/array.ts +++ b/packages/apollo-gateway/src/utilities/array.ts @@ -48,3 +48,22 @@ export function findAndExtract( return [array[index], remaining]; } + +export function groupBy(keyFunction: (element: T) => U) { + return (iterable: Iterable) => { + const result = new Map(); + + for (const element of iterable) { + const key = keyFunction(element); + const group = result.get(key); + + if (group) { + group.push(element); + } else { + result.set(key, [element]); + } + } + + return result; + }; +} From 78e22352565ffdd9bc469ec77622e2c73b5a5fa0 Mon Sep 17 00:00:00 2001 From: Blake Jackson Date: Sat, 16 May 2020 22:01:40 -0500 Subject: [PATCH 592/642] Added entry to changelog. --- packages/apollo-gateway/CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/apollo-gateway/CHANGELOG.md b/packages/apollo-gateway/CHANGELOG.md index 6d60093e030..a008401532e 100644 --- a/packages/apollo-gateway/CHANGELOG.md +++ b/packages/apollo-gateway/CHANGELOG.md @@ -4,7 +4,8 @@ > 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. 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. -- _Nothing yet! Stay tuned._ +- __FIX__: Collapse nested required fields into a single body in the query plan. Before, some nested fields' selection sets were getting split, causing some of their subfields to be dropped when executing the query. This fix collapses the split selection sets into one. + ## 0.16.0 From 81a9bdd981f9ae549243c3e9992d2e377b193c64 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 17 May 2020 18:12:50 +0000 Subject: [PATCH 593/642] chore(deps): update dependency koa to v2.12.0 (#4132) Co-authored-by: Renovate Bot --- package-lock.json | 14 ++++---------- package.json | 2 +- packages/apollo-server-koa/package.json | 2 +- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2f1b8737366..667ba1036a1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5897,7 +5897,7 @@ "apollo-server-types": "file:packages/apollo-server-types", "graphql-subscriptions": "^1.0.0", "graphql-tools": "^4.0.0", - "koa": "2.11.0", + "koa": "2.12.0", "koa-bodyparser": "^4.2.1", "koa-compose": "^4.1.0", "koa-router": "^7.4.0", @@ -8355,11 +8355,6 @@ "is-arrayish": "^0.2.1" } }, - "error-inject": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/error-inject/-/error-inject-1.0.0.tgz", - "integrity": "sha1-4rPZG1Su1nLzCdlQ0VSFD6EdTzc=" - }, "es-abstract": { "version": "1.13.0", "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.13.0.tgz", @@ -15433,9 +15428,9 @@ "dev": true }, "koa": { - "version": "2.11.0", - "resolved": "https://registry.npmjs.org/koa/-/koa-2.11.0.tgz", - "integrity": "sha512-EpR9dElBTDlaDgyhDMiLkXrPwp6ZqgAIBvhhmxQ9XN4TFgW+gEz6tkcsNI6BnUbUftrKDjVFj4lW2/J2aNBMMA==", + "version": "2.12.0", + "resolved": "https://registry.npmjs.org/koa/-/koa-2.12.0.tgz", + "integrity": "sha512-WlUBj6PXoVhjI5ljMmlyK+eqkbVFW5XQu8twz6bd4WM2E67IwKgPMu5wIFXGxAsZT7sW5xAB54KhY8WAEkLPug==", "requires": { "accepts": "^1.3.5", "cache-content-type": "^1.0.0", @@ -15447,7 +15442,6 @@ "depd": "^1.1.2", "destroy": "^1.0.4", "encodeurl": "^1.0.2", - "error-inject": "^1.0.0", "escape-html": "^1.0.3", "fresh": "~0.5.2", "http-assert": "^1.3.0", diff --git a/package.json b/package.json index 41605ac45fd..3454ef8a065 100644 --- a/package.json +++ b/package.json @@ -111,7 +111,7 @@ "jest-junit": "10.0.0", "jest-matcher-utils": "25.5.0", "js-sha256": "0.9.0", - "koa": "2.11.0", + "koa": "2.12.0", "lerna": "3.21.0", "log4js": "4.5.1", "memcached-mock": "0.1.0", diff --git a/packages/apollo-server-koa/package.json b/packages/apollo-server-koa/package.json index 47eefed0f61..0c335931c08 100644 --- a/packages/apollo-server-koa/package.json +++ b/packages/apollo-server-koa/package.json @@ -38,7 +38,7 @@ "apollo-server-types": "file:../apollo-server-types", "graphql-subscriptions": "^1.0.0", "graphql-tools": "^4.0.0", - "koa": "2.11.0", + "koa": "2.12.0", "koa-bodyparser": "^4.2.1", "koa-compose": "^4.1.0", "koa-router": "^7.4.0", From 37149bbe4c82fe9b1d35e6d8bc608a57072193b4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 18 May 2020 13:44:35 +0300 Subject: [PATCH 594/642] chore(deps): update dependency pretty-format to v26 (#4096) --- package-lock.json | 24 ++++++++++++------------ packages/apollo-gateway/package.json | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index 667ba1036a1..c293ea72572 100644 --- a/package-lock.json +++ b/package-lock.json @@ -35,18 +35,18 @@ "graphql-extensions": "file:packages/graphql-extensions", "loglevel": "^1.6.1", "make-fetch-happen": "^8.0.0", - "pretty-format": "^25.0.0" + "pretty-format": "^26.0.0" }, "dependencies": { "@jest/types": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.4.0.tgz", - "integrity": "sha512-XBeaWNzw2PPnGW5aXvZt3+VO60M+34RY3XDsCK5tW7kyj3RK0XClRutCfjqcBuaR2aBQTbluEDME9b5MB9UAPw==", + "version": "26.0.1", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.0.1.tgz", + "integrity": "sha512-IbtjvqI9+eS1qFnOIEL7ggWmT+iK/U+Vde9cGWtYb/b6XgKb3X44ZAe/z9YZzoAAZ/E92m0DqrilF934IGNnQA==", "requires": { "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^1.1.1", "@types/yargs": "^15.0.0", - "chalk": "^3.0.0" + "chalk": "^4.0.0" } }, "@types/node-fetch": { @@ -140,9 +140,9 @@ } }, "chalk": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", - "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz", + "integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==", "requires": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -346,11 +346,11 @@ } }, "pretty-format": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.4.0.tgz", - "integrity": "sha512-PI/2dpGjXK5HyXexLPZU/jw5T9Q6S1YVXxxVxco+LIqzUFHXIbKZKdUVt7GcX7QUCr31+3fzhi4gN4/wUYPVxQ==", + "version": "26.0.1", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.0.1.tgz", + "integrity": "sha512-SWxz6MbupT3ZSlL0Po4WF/KujhQaVehijR2blyRDCzk9e45EaYMVhMBn49fnRuHxtkSpXTes1GxNpVmH86Bxfw==", "requires": { - "@jest/types": "^25.4.0", + "@jest/types": "^26.0.1", "ansi-regex": "^5.0.0", "ansi-styles": "^4.0.0", "react-is": "^16.12.0" diff --git a/packages/apollo-gateway/package.json b/packages/apollo-gateway/package.json index 85a18204116..da61a3b74cd 100644 --- a/packages/apollo-gateway/package.json +++ b/packages/apollo-gateway/package.json @@ -32,7 +32,7 @@ "graphql-extensions": "file:../graphql-extensions", "loglevel": "^1.6.1", "make-fetch-happen": "^8.0.0", - "pretty-format": "^25.0.0" + "pretty-format": "^26.0.0" }, "peerDependencies": { "graphql": "^14.2.1 || ^15.0.0" From 8727e884d9721be92b455ba91f4d66bd5b4a20da Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 18 May 2020 13:30:55 +0000 Subject: [PATCH 595/642] no-op: Fix typo in test describe. --- packages/apollo-server-core/src/__tests__/runHttpQuery.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-core/src/__tests__/runHttpQuery.test.ts b/packages/apollo-server-core/src/__tests__/runHttpQuery.test.ts index 758e38c154f..e383dfbc334 100644 --- a/packages/apollo-server-core/src/__tests__/runHttpQuery.test.ts +++ b/packages/apollo-server-core/src/__tests__/runHttpQuery.test.ts @@ -78,7 +78,7 @@ describe('runHttpQuery', () => { } }); - it('should not add no-cache headers if error is not a PersitedQuery error', () => { + it('should not add no-cache headers if error is not a PersistedQuery error', () => { try { throwHttpGraphQLError(200, [new ForbiddenError('401')]); } catch (err) { From 46ed16e024e7a32198db28ce3cce08c06cb2a9dd Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 18 May 2020 13:58:47 +0000 Subject: [PATCH 596/642] Merge duplicated imports from same module. --- packages/apollo-server-core/src/__tests__/runQuery.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-core/src/__tests__/runQuery.test.ts b/packages/apollo-server-core/src/__tests__/runQuery.test.ts index 04ea6078e16..b4849a92b0d 100644 --- a/packages/apollo-server-core/src/__tests__/runQuery.test.ts +++ b/packages/apollo-server-core/src/__tests__/runQuery.test.ts @@ -22,12 +22,12 @@ import { GraphQLOptions, Context as GraphQLContext } from 'apollo-server-core'; import { ApolloServerPlugin, GraphQLRequestExecutionListener, + GraphQLRequestListener, GraphQLRequestListenerDidResolveField, GraphQLRequestListenerExecutionDidEnd, GraphQLRequestListenerParsingDidEnd, GraphQLRequestListenerValidationDidEnd, } from 'apollo-server-plugin-base'; -import { GraphQLRequestListener } from 'apollo-server-plugin-base'; import { InMemoryLRUCache } from 'apollo-server-caching'; import { generateSchemaHash } from "../utils/schemaHash"; From 736736e9b6c7c8e5406ce37e52f9496e82673705 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 18 May 2020 13:59:19 +0000 Subject: [PATCH 597/642] tests: Add ability to override request context with, e.g., `logger`. --- packages/apollo-server-core/src/__tests__/runQuery.test.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/apollo-server-core/src/__tests__/runQuery.test.ts b/packages/apollo-server-core/src/__tests__/runQuery.test.ts index b4849a92b0d..69f50590d3f 100644 --- a/packages/apollo-server-core/src/__tests__/runQuery.test.ts +++ b/packages/apollo-server-core/src/__tests__/runQuery.test.ts @@ -27,6 +27,7 @@ import { GraphQLRequestListenerExecutionDidEnd, GraphQLRequestListenerParsingDidEnd, GraphQLRequestListenerValidationDidEnd, + GraphQLRequestContext, } from 'apollo-server-plugin-base'; import { InMemoryLRUCache } from 'apollo-server-caching'; import { generateSchemaHash } from "../utils/schemaHash"; @@ -36,7 +37,10 @@ import { generateSchemaHash } from "../utils/schemaHash"; // These tests will be rewritten as GraphQLRequestProcessor tests after the // refactoring is complete. -function runQuery(options: QueryOptions): Promise { +function runQuery( + options: QueryOptions, + requestContextExtra?: Partial, +): Promise { const request: GraphQLRequest = { query: options.queryString, operationName: options.operationName, @@ -56,6 +60,7 @@ function runQuery(options: QueryOptions): Promise { context: options.context || {}, debug: options.debug, cache: {} as any, + ...requestContextExtra, }); } From a9c527f612d3fa11737351847c5eb53ba2c1970c Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 18 May 2020 17:37:39 +0000 Subject: [PATCH 598/642] tests: Disable flaky test. This test is reliably failing in its current form. It's mostly testing that `make-fetch-happen` is doing its retries properly and we have proof that, generally speaking, retries are working, so we'll disable this until we can re-visit it. cc @trevor-scheer --- .../src/__tests__/integration/networkRequests.test.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/apollo-gateway/src/__tests__/integration/networkRequests.test.ts b/packages/apollo-gateway/src/__tests__/integration/networkRequests.test.ts index 3275496e2ae..dd42cd1a95c 100644 --- a/packages/apollo-gateway/src/__tests__/integration/networkRequests.test.ts +++ b/packages/apollo-gateway/src/__tests__/integration/networkRequests.test.ts @@ -258,7 +258,11 @@ it(`Retries GCS (up to ${GCS_RETRY_COUNT} times) on failure for each request and expect(gateway.schema!.getType('User')!.description).toBe('This is my User'); }); -it(`Fails after the ${GCS_RETRY_COUNT + 1}th attempt to reach GCS`, async () => { +// This test is reliably failing in its current form. It's mostly testing that +// `make-fetch-happen` is doing its retries properly and we have proof that, +// generally speaking, retries are working, so we'll disable this until we can +// re-visit it. +it.skip(`Fails after the ${GCS_RETRY_COUNT + 1}th attempt to reach GCS`, async () => { failNTimes(GCS_RETRY_COUNT + 1, mockStorageSecret); const gateway = new ApolloGateway({ fetcher, logger }); From cbf7f166ff79ab2d0c78d9653f9a55c8f2e6d472 Mon Sep 17 00:00:00 2001 From: Blake Jackson Date: Mon, 18 May 2020 22:10:23 -0500 Subject: [PATCH 599/642] Updated tests to be human readable. --- .../__tests__/integration/requires.test.ts | 429 ++++++------------ 1 file changed, 143 insertions(+), 286 deletions(-) diff --git a/packages/apollo-gateway/src/__tests__/integration/requires.test.ts b/packages/apollo-gateway/src/__tests__/integration/requires.test.ts index 74f4adeaeb4..d4a35bf0fb6 100644 --- a/packages/apollo-gateway/src/__tests__/integration/requires.test.ts +++ b/packages/apollo-gateway/src/__tests__/integration/requires.test.ts @@ -1,11 +1,8 @@ import gql from 'graphql-tag'; -import { execute, ServiceDefinitionModule } from '../execution-utils'; -import { astSerializer, queryPlanSerializer } from '../../snapshotSerializers'; +import { execute } from '../execution-utils'; +import { serializeQueryPlan } from '../..'; -expect.addSnapshotSerializer(astSerializer); -expect.addSnapshotSerializer(queryPlanSerializer); - -it('supports passing additional scalar fields defined by a requires', async () => { +it('supports passing additional fields defined by a requires', async () => { const query = `#graphql query GetReviwedBookNames { me { @@ -44,87 +41,34 @@ it('supports passing additional scalar fields defined by a requires', async () = expect(queryPlan).toCallService('books'); }); -const serviceA: ServiceDefinitionModule = { - name: 'serviceA', +const serviceA = { + name: 'a', typeDefs: gql` type Query { - me: A + user: User } - type A @key(fields: "id") { + + type User @key(fields: "id") { id: ID! - name: String! - nested1: Nested1! - nested2: Nested2! - } - type Nested1 { - nameA: String! - nameB: String! - nested2: Nested2 + preferences: Preferences } - type Nested2 { - nameA: String! - nameB: String! - nameC: String! - nameD: String! - nested3: [Nested3!]! - } - type Nested3 @key(fields: "id") { - id: ID! - nameA: String! - nameB: String! - nameC: String! - nested4: Nested4! + + type Preferences { + favorites: Things } - type Nested4 { - nameA: String! - nameB: String! + + type Things { + color: String + animal: String } `, resolvers: { Query: { - me() { + user() { return { id: '1', - name: 'name', - nested1: { - nameA: 'nested1.nameA', - nameB: 'nested1.nameB', - nested2: { - nameA: 'nested1.nested2.nameA', - nameB: 'nested1.nested2.nameB', - nameC: 'nested1.nested2.nameC', - nameD: 'nested1.nested2.nameD', - nested3: [ - { - id: '2', - nameA: 'nested1.nested2.nested3.nameA', - nameB: 'nested1.nested2.nested3.nameB', - nameC: 'nested1.nested2.nested3.nameC', - nested4: { - nameA: 'nested1.nested2.nested3.nested4.nameA', - nameB: 'nested1.nested2.nested3.nested4.nameB', - }, - }, - ], - }, - }, - nested2: { - nameA: 'nested2.nameA', - nameB: 'nested2.nameB', - nameC: 'nested2.nameC', - nameD: 'nested2.nameD', - nested3: [ - { - id: '3', - nameA: 'nested2.nested3.nameA', - nameB: 'nested2.nested3.nameB', - nameC: 'nested2.nested3.nameC', - nested4: { - nameA: 'nested2.nested3.nested4.nameA', - nameB: 'nested2.nested3.nested4.nameB', - }, - }, - ], + preferences: { + favorites: { color: 'limegreen', animal: 'platypus' }, }, }; }, @@ -132,279 +76,192 @@ const serviceA: ServiceDefinitionModule = { }, }; -const serviceB: ServiceDefinitionModule = { - name: 'serviceB', +const serviceB = { + name: 'b', typeDefs: gql` - extend type A @key(fields: "id") { + extend type User @key(fields: "id") { id: ID! @external - nested1: Nested1! @external - nested2: Nested2! @external - calculated1: String! - @requires(fields: "nested1 { nameA nested2 { nameA } }") - calculated2: String! - @requires( - fields: "nested1 { nameB nested2 { nameB nested3 { nameA } } }" - ) - calculated3: String! - @requires( - fields: "nested1 { nested2 { nested3 { nameB } } } nested2 { nameC nested3 { nameC } }" - ) - calculated4: String! - @requires( - fields: "nested2 { nameC nameD nested3 { nested4 { nameA } } }" - ) - } - type Nested1 { - nameA: String! - nameB: String! - nested2: Nested2 + preferences: Preferences @external + favoriteColor: String + @requires(fields: "preferences { favorites { color } }") + favoriteAnimal: String + @requires(fields: "preferences { favorites { animal } }") } - type Nested2 { - nameA: String! - nameB: String! - nameC: String! - nameD: String! - nested3: [Nested3!]! - } - extend type Nested3 @key(fields: "id") { - id: ID! @external - nameA: String! @external - nameB: String! @external - nameC: String! @external - nested4: Nested4! @external - calculated5: String! @requires(fields: "nested4 { nameB }") + + extend type Preferences { + favorites: Things @external } - type Nested4 { - nameA: String! - nameB: String! + + extend type Things { + color: String @external + animal: String @external } `, resolvers: { - A: { - calculated1(parent) { - return parent.nested1.nameA + ' ' + parent.nested1.nested2.nameA; - }, - calculated2(parent) { - return ( - parent.nested1.nameB + - ' ' + - parent.nested1.nested2.nameB + - ' ' + - parent.nested1.nested2.nested3[0].nameA - ); + User: { + favoriteColor(user: any) { + return user.preferences.favorites.color; }, - calculated3(parent) { - return ( - parent.nested1.nested2.nested3[0].nameB + - ' ' + - parent.nested2.nameC + - ' ' + - parent.nested2.nested3[0].nameC - ); - }, - calculated4(parent) { - return ( - parent.nested2.nameC + - ' ' + - parent.nested2.nameD + - ' ' + - parent.nested2.nested3[0].nested4.nameA - ); - }, - }, - Nested3: { - calculated5(parent) { - return parent.nested4.nameB; + favoriteAnimal(user: any) { + return user.preferences.favorites.animal; }, }, }, }; -it('supports multiple arbitrarily nested fields defined by a requires', async () => { +it('collapses nested requires', async () => { const query = `#graphql - query Me { - me { - name - calculated1 - calculated2 - calculated3 - calculated4 - nested2 { - nested3 { - calculated5 - } - } + query UserFavorites { + user { + favoriteColor + favoriteAnimal } } `; - const { data, queryPlan } = await execute( + const { data, errors, queryPlan } = await execute( { query, }, [serviceA, serviceB], ); - expect(data).toEqual({ - me: { - name: 'name', - calculated1: 'nested1.nameA nested1.nested2.nameA', - calculated2: - 'nested1.nameB nested1.nested2.nameB nested1.nested2.nested3.nameA', - calculated3: - 'nested1.nested2.nested3.nameB nested2.nameC nested2.nested3.nameC', - calculated4: 'nested2.nameC nested2.nameD nested2.nested3.nested4.nameA', - nested2: { - nested3: [ - { - calculated5: 'nested2.nested3.nested4.nameB', - }, - ], - }, - }, - }); + expect(errors).toEqual(undefined); - expect(queryPlan).toMatchInlineSnapshot(` - QueryPlan { + expect(serializeQueryPlan(queryPlan)).toMatchInlineSnapshot(` + "QueryPlan { Sequence { - Fetch(service: "serviceA") { + Fetch(service: \\"a\\") { { - me { - name + user { __typename id - nested1 { - nameA - nested2 { - nameA - nameB - nested3 { - nameA - nameB - } - } - nameB - } - nested2 { - nameC - nested3 { - nameC - nested4 { - nameA - nameB - } - __typename - id + preferences { + favorites { + color + animal } - nameD } } } }, - Parallel { - Flatten(path: "me") { - Fetch(service: "serviceB") { - { - ... on A { - __typename - id - nested1 { - nameA - nested2 { - nameA - nameB - nested3 { - nameA - nameB - } - } - nameB - } - nested2 { - nameC - nested3 { - nameC - nested4 { - nameA - nameB - } - __typename - id - } - nameD + Flatten(path: \\"user\\") { + Fetch(service: \\"b\\") { + { + ... on User { + __typename + id + preferences { + favorites { + color + animal } } - } => - { - ... on A { - calculated1 - calculated2 - calculated3 - calculated4 - } } - }, - }, - Flatten(path: "me.nested2.nested3.@") { - Fetch(service: "serviceB") { - { - ... on Nested3 { - __typename - id - nested4 { - nameB - } - } - } => - { - ... on Nested3 { - calculated5 - } + } => + { + ... on User { + favoriteColor + favoriteAnimal } - }, + } }, }, }, - } + }" `); + + expect(data).toEqual({ + user: { + favoriteAnimal: 'platypus', + favoriteColor: 'limegreen', + }, + }); + + expect(queryPlan).toCallService('a'); + expect(queryPlan).toCallService('b'); }); -it('supports deeply nested fields defined by requires with fragments in user-defined queries', async () => { +it('collapses nested requires with user-defined fragments', async () => { const query = `#graphql - query Me { - me { - calculated3 - ...testFragment + query UserFavorites { + user { + favoriteAnimal + ...favoriteColor } } - fragment testFragment on A { - nested2 { - nested3 { - nameA + fragment favoriteColor on User { + preferences { + favorites { + color } } } `; - const { data } = await execute( + const { data, errors, queryPlan } = await execute( { query, }, [serviceA, serviceB], ); - expect(data).toEqual({ - me: { - calculated3: - 'nested1.nested2.nested3.nameB nested2.nameC nested2.nested3.nameC', - nested2: { - nested3: [ + expect(errors).toEqual(undefined); + + expect(serializeQueryPlan(queryPlan)).toMatchInlineSnapshot(` + "QueryPlan { + Sequence { + Fetch(service: \\"a\\") { { - nameA: 'nested2.nested3.nameA', + user { + __typename + id + preferences { + favorites { + animal + color + } + } + } + } + }, + Flatten(path: \\"user\\") { + Fetch(service: \\"b\\") { + { + ... on User { + __typename + id + preferences { + favorites { + animal + color + } + } + } + } => + { + ... on User { + favoriteAnimal + } + } }, - ], + }, + }, + }" + `); + + expect(data).toEqual({ + user: { + favoriteAnimal: 'platypus', + preferences: { + favorites: { + color: 'limegreen', + }, }, }, }); + + expect(queryPlan).toCallService('a'); + expect(queryPlan).toCallService('b'); }); From 7dd68b31b1be56789b60faed0edbfe9750e9d389 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 19 May 2020 10:53:02 +0300 Subject: [PATCH 600/642] Add deprecation warnings for `GraphQLExtension` usage. (#4135) --- .../src/__tests__/runQuery.test.ts | 83 +++++++++++++++++++ .../apollo-server-core/src/requestPipeline.ts | 46 ++++++++++ 2 files changed, 129 insertions(+) diff --git a/packages/apollo-server-core/src/__tests__/runQuery.test.ts b/packages/apollo-server-core/src/__tests__/runQuery.test.ts index 69f50590d3f..ec6d83477dc 100644 --- a/packages/apollo-server-core/src/__tests__/runQuery.test.ts +++ b/packages/apollo-server-core/src/__tests__/runQuery.test.ts @@ -31,6 +31,7 @@ import { } from 'apollo-server-plugin-base'; import { InMemoryLRUCache } from 'apollo-server-caching'; import { generateSchemaHash } from "../utils/schemaHash"; +import { Logger } from "apollo-server-types"; // This is a temporary kludge to ensure we preserve runQuery behavior with the // GraphQLRequestProcessor refactoring. @@ -399,6 +400,88 @@ describe('runQuery', () => { } } + describe('deprecation warnings', () => { + const queryString = `{ testString }`; + async function runWithExtAndReturnLogger( + extensions: QueryOptions['extensions'], + ): Promise { + const logger = { + warn: jest.fn(() => {}), + info: console.info, + debug: console.debug, + error: console.error, + }; + + await runQuery( + { + schema, + queryString, + extensions, + request: new MockReq(), + }, + { + logger, + }, + ); + + return logger; + } + + it('warns about named extensions', async () => { + const logger = await runWithExtAndReturnLogger([ + () => new (class NamedExtension implements GraphQLExtension {})(), + ]); + expect(logger.warn).toHaveBeenCalledWith( + expect.stringMatching(/^\[deprecated\] A "NamedExtension" was/)); + }); + + it('warns about anonymous extensions', async () => { + const logger = await runWithExtAndReturnLogger([ + () => new (class implements GraphQLExtension {})(), + ]); + expect(logger.warn).toHaveBeenCalledWith( + expect.stringMatching(/^\[deprecated\] An anonymous extension was/)); + }); + + it('warns about anonymous class expressions', async () => { + // In other words, when the name is the name of the variable. + const anon = class implements GraphQLExtension {}; + const logger = await runWithExtAndReturnLogger([ + () => new anon(), + ]); + expect(logger.warn).toHaveBeenCalledWith( + expect.stringMatching(/^\[deprecated\] A "anon" was/)); + }); + + it('warns for multiple extensions', async () => { + const logger = await runWithExtAndReturnLogger([ + () => new (class Name1Ext implements GraphQLExtension {})(), + () => new (class Name2Ext implements GraphQLExtension {})(), + ]); + expect(logger.warn).toHaveBeenCalledWith( + expect.stringMatching(/^\[deprecated\] A "Name1Ext" was/)); + expect(logger.warn).toHaveBeenCalledWith( + expect.stringMatching(/^\[deprecated\] A "Name2Ext" was/)); + }); + + it('warns only once', async () => { + // Will use the same extension across two invocations. + class NameExt implements GraphQLExtension {}; + + const logger1 = await runWithExtAndReturnLogger([ + () => new NameExt, + ]); + expect(logger1.warn).toHaveBeenCalledWith( + expect.stringMatching(/^\[deprecated\] A "NameExt" was/)); + + const logger2 = await runWithExtAndReturnLogger([ + () => new NameExt, + ]); + expect(logger2.warn).not.toHaveBeenCalledWith( + expect.stringMatching(/^\[deprecated\] A "NameExt" was/)); + }); + }); + it('creates the extension stack', async () => { const queryString = `{ testString }`; const extensions = [() => new CustomExtension()]; diff --git a/packages/apollo-server-core/src/requestPipeline.ts b/packages/apollo-server-core/src/requestPipeline.ts index 09d4d4517fe..60962277b0c 100644 --- a/packages/apollo-server-core/src/requestPipeline.ts +++ b/packages/apollo-server-core/src/requestPipeline.ts @@ -113,6 +113,14 @@ export type DataSources = { type Mutable = { -readonly [P in keyof T]: T[P] }; +/** + * We attach this symbol to the constructor of extensions to mark that we've + * already warned about the deprecation of the `graphql-extensions` API for that + * particular definition. + */ +const symbolExtensionDeprecationDone = + Symbol("apolloServerExtensionDeprecationDone"); + export async function processGraphQLRequest( config: GraphQLRequestPipelineConfig, requestContext: Mutable>, @@ -634,6 +642,44 @@ export async function processGraphQLRequest( // objects. const extensions = config.extensions ? config.extensions.map(f => f()) : []; + // Warn about usage of (deprecated) `graphql-extensions` implementations. + // Since extensions are often provided as factory functions which + // instantiate an extension on each request, we'll attach a symbol to the + // constructor after we've warned to ensure that we don't do it on each + // request. Another option here might be to keep a `Map` of constructor + // instances within this module, but I hope this will do the trick. + const hasOwn = Object.prototype.hasOwnProperty; + extensions.forEach((extension) => { + // Using `hasOwn` just in case there is a user-land `hasOwnProperty` + // defined on the `constructor` object. + if ( + !extension.constructor || + hasOwn.call(extension.constructor, symbolExtensionDeprecationDone) + ) { + return; + } + + Object.defineProperty( + extension.constructor, + symbolExtensionDeprecationDone, + { value: true } + ); + + const extensionName = extension.constructor.name; + logger.warn( + '[deprecated] ' + + (extensionName + ? 'A "' + extensionName + '" ' + : 'An anonymous extension ') + + 'was defined within the "extensions" configuration for ' + + 'Apollo Server. The API on which this extension is built ' + + '("graphql-extensions") is being deprecated in the next major ' + + 'version of Apollo Server in favor of the new plugin API. See ' + + 'https://go.apollo.dev/s/plugins for the documentation on how ' + + 'these plugins are to be defined and used.', + ); + }); + return new GraphQLExtensionStack(extensions); } From 8b92145d51c3ba0ef8be5b041f9e28bc0ad6a1bc Mon Sep 17 00:00:00 2001 From: Joshua Segaran Date: Tue, 19 May 2020 05:43:39 -0400 Subject: [PATCH 601/642] feat: Automatic schema reporting to Apollo Graph Manager (#4084) This commit implements the new schema reporting protocol for Apollo Server's reporting facilities and can be enabled by providing a Graph Manager API key available from Apollo Graph Manager in the `APOLLO_KEY` environment variable *and* setting the `experimental_schemaReporting` option to `true` in the Apollo Server constructor options, like so: ```js const server = new ApolloServer({ typeDefs, resolvers, engine: { experimental_schemaReporting: true, /* Other existing options can remain the same. */ }, }); ``` When schema-reporting is enabled, Apollo server will send the running schema and server information to Apollo Graph Manager. The extra runtime information will be used to power _auto-promotion_ which will set a schema as active for a _variant_, based on the algorithm described in the [Preview documentation]. When enabled, a schema reporting interval is initiated by the `apollo-engine-reporting` agent. It will loop until the `ApolloServer` instance is stopped, periodically calling back to Apollo Graph Manager to send information. The life-cycle of this loop is managed by the reporting agent. Additionally, this commit deprecates `schemaHash` in metrics reporting in favor of using the same `executableSchemaId` used within this new schema reporting protocol. [Preview documentation]: https://github.com/apollographql/apollo-schema-reporting-preview-docs#automatic-promotion-in-apollo-graph-manager --- package-lock.json | 16 +- package.json | 1 + .../src/reports.proto | 6 +- packages/apollo-engine-reporting/package.json | 3 +- .../src/__tests__/agent.test.ts | 57 +++- .../src/__tests__/plugin.test.ts | 176 ++++++++++++- .../src/__tests__/schemaReporter.test.ts | 173 +++++++++++++ packages/apollo-engine-reporting/src/agent.ts | 244 +++++++++++++++--- .../apollo-engine-reporting/src/plugin.ts | 40 ++- .../src/reportingOperationTypes.ts | 64 +++++ .../src/schemaReporter.ts | 190 ++++++++++++++ .../src/utils/pluginTestHarness.ts | 12 +- .../src/ApolloServer.ts | 4 +- 13 files changed, 920 insertions(+), 66 deletions(-) create mode 100644 packages/apollo-engine-reporting/src/__tests__/schemaReporter.test.ts create mode 100644 packages/apollo-engine-reporting/src/reportingOperationTypes.ts create mode 100644 packages/apollo-engine-reporting/src/schemaReporter.ts diff --git a/package-lock.json b/package-lock.json index 646424c70fa..4dbefd14af0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5372,6 +5372,12 @@ "@types/node": "*" } }, + "@types/uuid": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-7.0.3.tgz", + "integrity": "sha512-PUdqTZVrNYTNcIhLHkiaYzoOIaUi5LFg/XLerAdgvwQrUCx+oSbtoBze1AMyvYbcwzUSNC+Isl58SM4Sm/6COw==", + "dev": true + }, "@types/ws": { "version": "7.2.4", "resolved": "https://registry.npmjs.org/@types/ws/-/ws-7.2.4.tgz", @@ -5588,7 +5594,15 @@ "apollo-server-errors": "file:packages/apollo-server-errors", "apollo-server-plugin-base": "file:packages/apollo-server-plugin-base", "apollo-server-types": "file:packages/apollo-server-types", - "async-retry": "^1.2.1" + "async-retry": "^1.2.1", + "uuid": "^8.0.0" + }, + "dependencies": { + "uuid": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.0.0.tgz", + "integrity": "sha512-jOXGuXZAWdsTH7eZLtyXMqUb9EcWMGZNbL9YcGBJl4MH4nrxHmZJhEHvyLFrkxo+28uLb/NYRcStH48fnD0Vzw==" + } } }, "apollo-engine-reporting-protobuf": { diff --git a/package.json b/package.json index 3454ef8a065..30b9b00e3b8 100644 --- a/package.json +++ b/package.json @@ -86,6 +86,7 @@ "@types/supertest": "^2.0.8", "@types/test-listen": "1.1.0", "@types/type-is": "1.6.3", + "@types/uuid": "^7.0.3", "@types/ws": "7.2.4", "apollo-fetch": "0.7.0", "apollo-link": "1.2.14", diff --git a/packages/apollo-engine-reporting-protobuf/src/reports.proto b/packages/apollo-engine-reporting-protobuf/src/reports.proto index 9f106f1c50b..0c6bc319d78 100644 --- a/packages/apollo-engine-reporting-protobuf/src/reports.proto +++ b/packages/apollo-engine-reporting-protobuf/src/reports.proto @@ -269,8 +269,10 @@ message ReportHeader { string uname = 9; // eg "current", "prod" string schema_tag = 10; - // The hex representation of the sha512 of the introspection response - string schema_hash = 11; + // An id that is used to represent the schema to Apollo Graph Manager + // Using this in place of what used to be schema_hash, since that is no longer + // attached to a schema in the backend. + string executable_schema_id = 11; reserved 3; // removed string service = 3; } diff --git a/packages/apollo-engine-reporting/package.json b/packages/apollo-engine-reporting/package.json index 93259c7143f..9ce287bb57f 100644 --- a/packages/apollo-engine-reporting/package.json +++ b/packages/apollo-engine-reporting/package.json @@ -18,7 +18,8 @@ "apollo-server-errors": "file:../apollo-server-errors", "apollo-server-plugin-base": "file:../apollo-server-plugin-base", "apollo-server-types": "file:../apollo-server-types", - "async-retry": "^1.2.1" + "async-retry": "^1.2.1", + "uuid": "^8.0.0" }, "peerDependencies": { "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0" diff --git a/packages/apollo-engine-reporting/src/__tests__/agent.test.ts b/packages/apollo-engine-reporting/src/__tests__/agent.test.ts index ff6ac43ab6a..565cc5e50d5 100644 --- a/packages/apollo-engine-reporting/src/__tests__/agent.test.ts +++ b/packages/apollo-engine-reporting/src/__tests__/agent.test.ts @@ -2,7 +2,9 @@ import { signatureCacheKey, handleLegacyOptions, EngineReportingOptions, -} from '../agent'; + computeExecutableSchemaId +} from "../agent"; +import { buildSchema } from "graphql"; describe('signature cache key', () => { it('generates without the operationName', () => { @@ -16,6 +18,59 @@ describe('signature cache key', () => { }); }); +describe('Executable Schema Id', () => { + const unsortedGQLSchemaDocument = ` + directive @example on FIELD + union AccountOrUser = Account | User + type Query { + userOrAccount(name: String, id: String): AccountOrUser + } + + type User { + accounts: [Account!] + email: String + name: String! + } + + type Account { + name: String! + id: ID! + } + `; + + const sortedGQLSchemaDocument = ` + directive @example on FIELD + union AccountOrUser = Account | User + + type Account { + name: String! + id: ID! + } + + type Query { + userOrAccount(id: String, name: String): AccountOrUser + } + + type User { + accounts: [Account!] + email: String + name: String! + } + + `; + it('does not normalize GraphQL schemas', () => { + expect(computeExecutableSchemaId(buildSchema(unsortedGQLSchemaDocument))).not.toEqual( + computeExecutableSchemaId(buildSchema(sortedGQLSchemaDocument)) + ); + }); + it('does not normalize strings', () => { + expect(computeExecutableSchemaId(unsortedGQLSchemaDocument)).not.toEqual( + computeExecutableSchemaId(sortedGQLSchemaDocument) + ); + }); +}); + + describe("test handleLegacyOptions(), which converts the deprecated privateVariable and privateHeaders options to the new options' formats", () => { it('Case 1: privateVariables/privateHeaders == False; same as all', () => { const optionsPrivateFalse: EngineReportingOptions = { diff --git a/packages/apollo-engine-reporting/src/__tests__/plugin.test.ts b/packages/apollo-engine-reporting/src/__tests__/plugin.test.ts index 2a8d3313b12..56c2809a3db 100644 --- a/packages/apollo-engine-reporting/src/__tests__/plugin.test.ts +++ b/packages/apollo-engine-reporting/src/__tests__/plugin.test.ts @@ -1,14 +1,13 @@ import { makeExecutableSchema, addMockFunctionsToSchema } from 'graphql-tools'; -import { graphql, GraphQLError } from 'graphql'; +import { graphql, GraphQLError, printSchema } from 'graphql'; import { Request } from 'node-fetch'; import { makeTraceDetails, makeHTTPRequestHeaders, plugin } from '../plugin'; import { Headers } from 'apollo-server-env'; -import { AddTraceArgs } from '../agent'; +import { AddTraceArgs, computeExecutableSchemaId } from '../agent'; import { Trace } from 'apollo-engine-reporting-protobuf'; import pluginTestHarness from 'apollo-server-core/dist/utils/pluginTestHarness'; -it('trace construction', async () => { - const typeDefs = ` +const typeDefs = ` type User { id: Int name: String @@ -31,7 +30,7 @@ it('trace construction', async () => { } `; - const query = ` +const query = ` query q { author(id: 5) { name @@ -43,6 +42,154 @@ it('trace construction', async () => { } `; +describe('schema reporting', () => { + const schema = makeExecutableSchema({ typeDefs }); + addMockFunctionsToSchema({ schema }); + + const addTrace = jest.fn(); + const startSchemaReporting = jest.fn(); + const executableSchemaIdGenerator = jest.fn(computeExecutableSchemaId); + + beforeEach(() => { + addTrace.mockClear(); + startSchemaReporting.mockClear(); + executableSchemaIdGenerator.mockClear(); + }); + + it('starts reporting if enabled', async () => { + const pluginInstance = plugin( + { + experimental_schemaReporting: true, + }, + addTrace, + { + startSchemaReporting, + executableSchemaIdGenerator, + }, + ); + + await pluginTestHarness({ + pluginInstance, + schema, + graphqlRequest: { + query, + operationName: 'q', + extensions: { + clientName: 'testing suite', + }, + http: new Request('http://localhost:123/foo'), + }, + executor: async ({ request: { query: source } }) => { + return await graphql({ + schema, + source, + }); + }, + }); + + expect(startSchemaReporting).toBeCalledTimes(1); + expect(startSchemaReporting).toBeCalledWith({ + executableSchema: printSchema(schema), + executableSchemaId: executableSchemaIdGenerator(schema), + }); + }); + + it('uses the override schema', async () => { + const pluginInstance = plugin( + { + experimental_schemaReporting: true, + experimental_overrideReportedSchema: typeDefs, + }, + addTrace, + { + startSchemaReporting, + executableSchemaIdGenerator, + }, + ); + + await pluginTestHarness({ + pluginInstance, + schema, + graphqlRequest: { + query, + operationName: 'q', + extensions: { + clientName: 'testing suite', + }, + http: new Request('http://localhost:123/foo'), + }, + executor: async ({ request: { query: source } }) => { + return await graphql({ + schema, + source, + }); + }, + }); + + const expectedExecutableSchemaId = executableSchemaIdGenerator(typeDefs); + expect(startSchemaReporting).toBeCalledTimes(1); + expect(startSchemaReporting).toBeCalledWith({ + executableSchema: typeDefs, + executableSchemaId: expectedExecutableSchemaId, + }); + + // Get the first argument from the first time this is called. + // Not using called with because that has to be exhaustive and this isn't + // testing trace generation + expect(addTrace).toBeCalledWith( + expect.objectContaining({ + executableSchemaId: expectedExecutableSchemaId, + }), + ); + }); + + it('uses the same executable schema id for metric reporting', async () => { + const pluginInstance = plugin( + { + experimental_schemaReporting: true, + }, + addTrace, + { + startSchemaReporting, + executableSchemaIdGenerator, + }, + ); + + await pluginTestHarness({ + pluginInstance, + schema, + graphqlRequest: { + query, + operationName: 'q', + extensions: { + clientName: 'testing suite', + }, + http: new Request('http://localhost:123/foo'), + }, + executor: async ({ request: { query: source } }) => { + return await graphql({ + schema, + source, + }); + }, + }); + + const expectedExecutableSchemaId = executableSchemaIdGenerator(schema); + expect(startSchemaReporting).toBeCalledTimes(1); + expect(startSchemaReporting).toBeCalledWith({ + executableSchema: printSchema(schema), + executableSchemaId: expectedExecutableSchemaId, + }); + // Get the first argument from the first time this is called. + // Not using called with because that has to be exhaustive and this isn't + // testing trace generation + expect(addTrace.mock.calls[0][0].executableSchemaId).toBe( + expectedExecutableSchemaId, + ); + }); +}); + +it('trace construction', async () => { const schema = makeExecutableSchema({ typeDefs }); addMockFunctionsToSchema({ schema }); @@ -50,10 +197,21 @@ it('trace construction', async () => { async function addTrace(args: AddTraceArgs) { traces.push(args); } + const startSchemaReporting = jest.fn(); + const executableSchemaIdGenerator = jest.fn(); - const pluginInstance = plugin({ /* no options!*/ }, addTrace); + const pluginInstance = plugin( + { + /* no options!*/ + }, + addTrace, + { + startSchemaReporting, + executableSchemaIdGenerator, + }, + ); - pluginTestHarness({ + await pluginTestHarness({ pluginInstance, schema, graphqlRequest: { @@ -64,7 +222,7 @@ it('trace construction', async () => { }, http: new Request('http://localhost:123/foo'), }, - executor: async ({ request: { query: source }}) => { + executor: async ({ request: { query: source } }) => { return await graphql({ schema, source, @@ -260,7 +418,7 @@ describe('variableJson output for sendVariableValues transform: custom function ).toEqual(JSON.stringify(null)); }); - const errorThrowingModifier = (input: { + const errorThrowingModifier = (_input: { variables: Record; }): Record => { throw new GraphQLError('testing error handling'); diff --git a/packages/apollo-engine-reporting/src/__tests__/schemaReporter.test.ts b/packages/apollo-engine-reporting/src/__tests__/schemaReporter.test.ts new file mode 100644 index 00000000000..44b317c7fd0 --- /dev/null +++ b/packages/apollo-engine-reporting/src/__tests__/schemaReporter.test.ts @@ -0,0 +1,173 @@ +import nock from 'nock'; +import { reportServerInfoGql, SchemaReporter } from '../schemaReporter'; + +function mockReporterRequest(url: any, variables?: any) { + if (variables) + return nock(url).post( + '/', + JSON.stringify({ + query: reportServerInfoGql, + operationName: 'ReportServerInfo', + variables, + }), + ); + return nock(url).post('/'); +} + +beforeEach(() => { + if (!nock.isActive()) nock.activate(); +}); + +afterEach(() => { + expect(nock.isDone()).toBeTruthy(); + nock.cleanAll(); + nock.restore(); +}); + +const serverInfo = { + bootId: 'string', + executableSchemaId: 'string', + graphVariant: 'string', +}; + +const url = 'http://localhost:4000'; + +describe('Schema reporter', () => { + it('return correct values if no errors', async () => { + const schemaReporter = new SchemaReporter( + serverInfo, + 'schemaSdl', + 'apiKey', + url, + ); + mockReporterRequest(url).reply(200, { + data: { + me: { + __typename: 'ServiceMutation', + reportServerInfo: { + __typename: 'ReportServerInfoResponse', + inSeconds: 30, + withExecutableSchema: false, + }, + }, + }, + }); + + let { + inSeconds, + withExecutableSchema, + } = await schemaReporter.reportServerInfo(false); + expect(inSeconds).toBe(30); + expect(withExecutableSchema).toBe(false); + + mockReporterRequest(url).reply(200, { + data: { + me: { + __typename: 'ServiceMutation', + reportServerInfo: { + __typename: 'ReportServerInfoResponse', + inSeconds: 60, + withExecutableSchema: true, + }, + }, + }, + }); + ({ + inSeconds, + withExecutableSchema, + } = await schemaReporter.reportServerInfo(false)); + expect(inSeconds).toBe(60); + expect(withExecutableSchema).toBe(true); + }); + + it('throws on 500 response', async () => { + const schemaReporter = new SchemaReporter( + serverInfo, + 'schemaSdl', + 'apiKey', + url, + ); + mockReporterRequest(url).reply(500, { + data: { + me: { + reportServerInfo: { + __typename: 'ReportServerInfoResponse', + inSeconds: 30, + withExecutableSchema: false, + }, + }, + }, + }); + + await expect( + schemaReporter.reportServerInfo(false), + ).rejects.toThrowErrorMatchingInlineSnapshot( + `"An unexpected HTTP status code (500) was encountered during schema reporting."`, + ); + }); + + it('throws on 200 malformed response', async () => { + const schemaReporter = new SchemaReporter( + serverInfo, + 'schemaSdl', + 'apiKey', + url, + ); + mockReporterRequest(url).reply(200, { + data: { + me: { + reportServerInfo: { + __typename: 'ReportServerInfoResponse', + }, + }, + }, + }); + + await expect( + schemaReporter.reportServerInfo(false), + ).rejects.toThrowErrorMatchingInlineSnapshot( + `"Unexpected response shape from Apollo Graph Manager when reporting server information for schema reporting. If this continues, please reach out to support@apollographql.com. Received response: {\\"me\\":{\\"reportServerInfo\\":{\\"__typename\\":\\"ReportServerInfoResponse\\"}}}"`, + ); + + mockReporterRequest(url).reply(200, { + data: { + me: { + __typename: 'UserMutation', + }, + }, + }); + await expect( + schemaReporter.reportServerInfo(false), + ).rejects.toThrowErrorMatchingInlineSnapshot( + `"This server was configured with an API key for a user. Only a service's API key may be used for schema reporting. Please visit the settings for this graph at https://engine.apollographql.com/ to obtain an API key for a service."`, + ); + }); + + it('sends schema if withExecutableSchema is true.', async () => { + const schemaReporter = new SchemaReporter( + serverInfo, + 'schemaSdl', + 'apiKey', + url, + ); + + const variables = { + info: serverInfo, + executableSchema: 'schemaSdl' + }; + mockReporterRequest(url, variables).reply(200, { + data: { + me: { + __typename: 'ServiceMutation', + reportServerInfo: { + __typename: 'ReportServerInfoResponse', + inSeconds: 30, + withExecutableSchema: false, + }, + }, + }, + }); + + await schemaReporter.reportServerInfo(true); + }); +}); diff --git a/packages/apollo-engine-reporting/src/agent.ts b/packages/apollo-engine-reporting/src/agent.ts index c7e6a28d083..bd3a13b327f 100644 --- a/packages/apollo-engine-reporting/src/agent.ts +++ b/packages/apollo-engine-reporting/src/agent.ts @@ -1,21 +1,29 @@ import os from 'os'; import { gzip } from 'zlib'; -import { DocumentNode, GraphQLError } from 'graphql'; +import { + DocumentNode, + GraphQLError, + GraphQLSchema, + printSchema, +} from 'graphql'; import { ReportHeader, Trace, Report, - TracesAndStats + TracesAndStats, } from 'apollo-engine-reporting-protobuf'; import { fetch, RequestAgent, Response } from 'apollo-server-env'; import retry from 'async-retry'; import { plugin } from './plugin'; -import { GraphQLRequestContext, Logger, SchemaHash } from 'apollo-server-types'; +import { GraphQLRequestContext, Logger } from 'apollo-server-types'; import { InMemoryLRUCache } from 'apollo-server-caching'; import { defaultEngineReportingSignature } from 'apollo-graphql'; -import { ApolloServerPlugin } from "apollo-server-plugin-base"; +import { ApolloServerPlugin } from 'apollo-server-plugin-base'; +import { reportingLoop, SchemaReporter } from './schemaReporter'; +import { v4 as uuidv4 } from 'uuid'; +import { createHash } from 'crypto'; let warnedOnDeprecatedApiKey = false; @@ -120,9 +128,15 @@ export interface EngineReportingOptions { */ maxUncompressedReportSize?: number; /** + * [DEPRECATED] this option was replaced by tracesEndpointUrl * The URL of the Engine report ingress server. */ endpointUrl?: string; + /** + * The URL to the Apollo Graph Manager ingress endpoint. + * (Previously, this was `endpointUrl`, which will be removed in AS3). + */ + tracesEndpointUrl?: string; /** * If set, prints all reports as JSON when they are sent. */ @@ -239,6 +253,47 @@ export interface EngineReportingOptions { */ generateClientInfo?: GenerateClientInfo; + /** + * **(Experimental)** Enable schema reporting from this server with + * Apollo Graph Manager. + * + * The use of this option avoids the need to rgister schemas manually within + * CI deployment pipelines using `apollo schema:push` by periodically + * reporting this server's schema (when changes are detected) along with + * additional details about its runtime environment to Apollo Graph Manager. + * + * See [our _preview + * documentation_](https://github.com/apollographql/apollo-schema-reporting-preview-docs) + * for more information. + */ + experimental_schemaReporting?: boolean; + + /** + * Override the reported schema that is reported to AGM. + * This schema does not go through any normalizations and the string is directly sent to Apollo Graph Manager. + * This would be useful for comments or other ordering and whitespace changes that get stripped when generating a `GraphQLSchema` + */ + experimental_overrideReportedSchema?: string; + + /** + * The schema reporter waits before starting reporting. + * By default, the report waits some random amount of time between 0 and 10 seconds. + * A longer interval leads to more staggered starts which means it is less likely + * multiple servers will get asked to upload the same schema. + * + * If this server runs in lambda or in other constrained environments it would be useful + * to decrease the schema reporting max wait time to be less than default. + * + * This number will be the max for the range in ms that the schema reporter will + * wait before starting to report. + */ + experimental_schemaReportingInitialDelayMaxMs?: number; + + /** + * The URL to use for reporting schemas. + */ + schemaReportingUrl?: string; + /** * A logger interface to be used for output and errors. When not provided * it will default to the server's own `logger` implementation and use @@ -251,7 +306,7 @@ export interface AddTraceArgs { trace: Trace; operationName: string; queryHash: string; - schemaHash: SchemaHash; + executableSchemaId: string; source?: string; document?: DocumentNode; } @@ -270,27 +325,42 @@ const serviceHeaderDefaults = { export class EngineReportingAgent { private readonly options: EngineReportingOptions; private readonly apiKey: string; - private logger: Logger = console; - private graphVariant: string; - private reports: { [schemaHash: string]: Report } = Object.create( + private readonly logger: Logger = console; + private readonly graphVariant: string; + + private reports: { [executableSchemaId: string]: Report } = Object.create( + null, + ); + private reportSizes: { [executableSchemaId: string]: number } = Object.create( null, ); - private reportSizes: { [schemaHash: string]: number } = Object.create(null); + private reportTimer: any; // timer typing is weird and node-specific private readonly sendReportsImmediately?: boolean; private stopped: boolean = false; - private reportHeaders: { [schemaHash: string]: ReportHeader } = Object.create( - null, - ); + private reportHeaders: { + [executableSchemaId: string]: ReportHeader; + } = Object.create(null); private signatureCache: InMemoryLRUCache; private signalHandlers = new Map(); + private currentSchemaReporter?: SchemaReporter; + private readonly bootId: string; + private lastSeenExecutableSchemaToId?: { + executableSchema: string | GraphQLSchema; + executableSchemaId: string; + }; + + private readonly tracesEndpointUrl: string; + public constructor(options: EngineReportingOptions = {}) { this.options = options; this.apiKey = getEngineApiKey({engine: this.options, skipWarn: false, logger: this.logger}); if (options.logger) this.logger = options.logger; + this.bootId = uuidv4(); this.graphVariant = getEngineGraphVariant(options, this.logger) || ''; + if (!this.apiKey) { throw new Error( `To use EngineReportingAgent, you must specify an API key via the apiKey option or the APOLLO_KEY environment variable.`, @@ -325,12 +395,41 @@ export class EngineReportingAgent { }); } + if (this.options.endpointUrl) { + this.logger.warn( + '[deprecated] The `endpointUrl` option within `engine` has been renamed to `tracesEndpointUrl`.', + ); + } + this.tracesEndpointUrl = + (this.options.endpointUrl || + this.options.tracesEndpointUrl || + 'https://engine-report.apollodata.com') + '/api/ingress/traces'; + // Handle the legacy options: privateVariables and privateHeaders handleLegacyOptions(this.options); } + private executableSchemaIdGenerator(schema: string | GraphQLSchema) { + if (this.lastSeenExecutableSchemaToId?.executableSchema === schema) { + return this.lastSeenExecutableSchemaToId.executableSchemaId; + } + const id = computeExecutableSchemaId(schema); + + // We override this variable every time we get a new schema so we cache + // the last seen value. It mostly a cached pair. + this.lastSeenExecutableSchemaToId = { + executableSchema: schema, + executableSchemaId: id, + }; + + return id; + } + public newPlugin(): ApolloServerPlugin { - return plugin(this.options, this.addTrace.bind(this)); + return plugin(this.options, this.addTrace.bind(this), { + startSchemaReporting: this.startSchemaReporting.bind(this), + executableSchemaIdGenerator: this.executableSchemaIdGenerator.bind(this), + }); } public async addTrace({ @@ -339,23 +438,23 @@ export class EngineReportingAgent { document, operationName, source, - schemaHash, + executableSchemaId, }: AddTraceArgs): Promise { // Ignore traces that come in after stop(). if (this.stopped) { return; } - if (!(schemaHash in this.reports)) { - this.reportHeaders[schemaHash] = new ReportHeader({ + if (!(executableSchemaId in this.reports)) { + this.reportHeaders[executableSchemaId] = new ReportHeader({ ...serviceHeaderDefaults, - schemaHash, + executableSchemaId: executableSchemaId, schemaTag: this.graphVariant, }); // initializes this.reports[reportHash] - this.resetReport(schemaHash); + this.resetReport(executableSchemaId); } - const report = this.reports[schemaHash]; + const report = this.reports[executableSchemaId]; const protobufError = Trace.verify(trace); if (protobufError) { @@ -380,28 +479,26 @@ export class EngineReportingAgent { (report.tracesPerQuery[statsReportKey] as any).encodedTraces.push( encodedTrace, ); - this.reportSizes[schemaHash] += + this.reportSizes[executableSchemaId] += encodedTrace.length + Buffer.byteLength(statsReportKey); // If the buffer gets big (according to our estimate), send. if ( this.sendReportsImmediately || - this.reportSizes[schemaHash] >= + this.reportSizes[executableSchemaId] >= (this.options.maxUncompressedReportSize || 4 * 1024 * 1024) ) { - await this.sendReportAndReportErrors(schemaHash); + await this.sendReportAndReportErrors(executableSchemaId); } } public async sendAllReports(): Promise { - await Promise.all( - Object.keys(this.reports).map(hash => this.sendReport(hash)), - ); + await Promise.all(Object.keys(this.reports).map(id => this.sendReport(id))); } - public async sendReport(schemaHash: string): Promise { - const report = this.reports[schemaHash]; - this.resetReport(schemaHash); + public async sendReport(executableSchemaId: string): Promise { + const report = this.reports[executableSchemaId]; + this.resetReport(executableSchemaId); if (Object.keys(report.tracesPerQuery).length === 0) { return; @@ -449,16 +546,12 @@ export class EngineReportingAgent { }); }); - const endpointUrl = - (this.options.endpointUrl || 'https://engine-report.apollodata.com') + - '/api/ingress/traces'; - // Wrap fetch with async-retry for automatic retrying const response: Response = await retry( // Retry on network errors and 5xx HTTP // responses. async () => { - const curResponse = await fetch(endpointUrl, { + const curResponse = await fetch(this.tracesEndpointUrl, { method: 'POST', headers: { 'user-agent': 'apollo-engine-reporting', @@ -511,6 +604,59 @@ export class EngineReportingAgent { } } + public startSchemaReporting({ + executableSchemaId, + executableSchema, + }: { + executableSchemaId: string; + executableSchema: string; + }) { + if (this.currentSchemaReporter) { + this.currentSchemaReporter.stop(); + } + + const serverInfo = { + bootId: this.bootId, + graphVariant: this.graphVariant, + // The infra environment in which this edge server is running, e.g. localhost, Kubernetes + // Length must be <= 256 characters. + platform: process.env.APOLLO_SERVER_PLATFORM || 'local', + runtimeVersion: `node ${process.version}`, + executableSchemaId: executableSchemaId, + // An identifier used to distinguish the version of the server code such as git or docker sha. + // Length must be <= 256 charecters + userVersion: process.env.APOLLO_SERVER_USER_VERSION, + // "An identifier for the server instance. Length must be <= 256 characters. + serverId: + process.env.APOLLO_SERVER_ID || process.env.HOSTNAME || os.hostname(), + libraryVersion: `apollo-engine-reporting@${ + require('../package.json').version + }`, + }; + + // Jitter the startup between 0 and 10 seconds + const delay = Math.floor( + Math.random() * + (this.options.experimental_schemaReportingInitialDelayMaxMs || 10_000), + ); + + const schemaReporter = new SchemaReporter( + serverInfo, + executableSchema, + this.apiKey, + this.options.schemaReportingUrl, + ); + + const fallbackReportingDelayInMs = 20_000; + + this.currentSchemaReporter = schemaReporter; + const logger = this.logger; + + setTimeout(function() { + reportingLoop(schemaReporter, logger, false, fallbackReportingDelayInMs); + }, delay); + } + // Stop prevents reports from being sent automatically due to time or buffer // size, and stop buffering new traces. You may still manually send a last // report by calling sendReport(). @@ -525,6 +671,10 @@ export class EngineReportingAgent { this.reportTimer = undefined; } + if (this.currentSchemaReporter) { + this.currentSchemaReporter.stop(); + } + this.stopped = true; } @@ -579,14 +729,14 @@ export class EngineReportingAgent { private async sendAllReportsAndReportErrors(): Promise { await Promise.all( - Object.keys(this.reports).map(schemaHash => - this.sendReportAndReportErrors(schemaHash), + Object.keys(this.reports).map(executableSchemaId => + this.sendReportAndReportErrors(executableSchemaId), ), ); } - private sendReportAndReportErrors(schemaHash: string): Promise { - return this.sendReport(schemaHash).catch(err => { + private sendReportAndReportErrors(executableSchemaId: string): Promise { + return this.sendReport(executableSchemaId).catch(err => { // This catch block is primarily intended to catch network errors from // the retried request itself, which include network errors and non-2xx // HTTP errors. @@ -598,11 +748,11 @@ export class EngineReportingAgent { }); } - private resetReport(schemaHash: string) { - this.reports[schemaHash] = new Report({ - header: this.reportHeaders[schemaHash], + private resetReport(executableSchemaId: string) { + this.reports[executableSchemaId] = new Report({ + header: this.reportHeaders[executableSchemaId], }); - this.reportSizes[schemaHash] = 0; + this.reportSizes[executableSchemaId] = 0; } } @@ -713,3 +863,15 @@ function makeSendValuesBaseOptionsFromLegacy( ? { none: true } : { all: true }; } + +export function computeExecutableSchemaId( + schema: string | GraphQLSchema, +): string { + // Can't call digest on this object twice. Creating new object each function call + const sha256 = createHash('sha256'); + const schemaDocument = + typeof schema === 'string' + ? schema + : printSchema(schema); + return sha256.update(schemaDocument).digest('hex'); +} diff --git a/packages/apollo-engine-reporting/src/plugin.ts b/packages/apollo-engine-reporting/src/plugin.ts index 84ead380e19..4b8217813f6 100644 --- a/packages/apollo-engine-reporting/src/plugin.ts +++ b/packages/apollo-engine-reporting/src/plugin.ts @@ -5,17 +5,18 @@ import { GraphQLRequestContextDidEncounterErrors, } from 'apollo-server-types'; import { Headers } from 'apollo-server-env'; +import { GraphQLSchema, printSchema } from 'graphql'; import { Trace } from 'apollo-engine-reporting-protobuf'; import { + AddTraceArgs, EngineReportingOptions, GenerateClientInfo, - AddTraceArgs, - VariableValueOptions, SendValuesBaseOptions, + VariableValueOptions, } from './agent'; import { EngineReportingTreeBuilder } from './treeBuilder'; -import { ApolloServerPlugin } from "apollo-server-plugin-base"; +import { ApolloServerPlugin } from 'apollo-server-plugin-base'; const clientNameHeaderKey = 'apollographql-client-name'; const clientReferenceIdHeaderKey = 'apollographql-client-reference-id'; @@ -30,18 +31,39 @@ const clientVersionHeaderKey = 'apollographql-client-version'; export const plugin = ( options: EngineReportingOptions = Object.create(null), addTrace: (args: AddTraceArgs) => Promise, - // schemaHash: string, + { + startSchemaReporting, + executableSchemaIdGenerator, + }: { + startSchemaReporting: ({ + executableSchema, + executableSchemaId, + }: { + executableSchema: string; + executableSchemaId: string; + }) => void; + executableSchemaIdGenerator: (schema: string | GraphQLSchema) => string; + }, ): ApolloServerPlugin => { const logger: Logger = options.logger || console; const generateClientInfo: GenerateClientInfo = options.generateClientInfo || defaultGenerateClientInfo; - return { + serverWillStart: function({ schema }) { + if (!options.experimental_schemaReporting) return; + startSchemaReporting({ + executableSchema: + options.experimental_overrideReportedSchema || printSchema(schema), + executableSchemaId: executableSchemaIdGenerator( + options.experimental_overrideReportedSchema || schema, + ), + }); + }, requestDidStart({ logger: requestLogger, - schemaHash, metrics, + schema, request: { http, variables }, }) { const treeBuilder: EngineReportingTreeBuilder = new EngineReportingTreeBuilder( @@ -124,7 +146,9 @@ export const plugin = ( document: requestContext.document, source: requestContext.source, trace: treeBuilder.trace, - schemaHash, + executableSchemaId: executableSchemaIdGenerator( + options.experimental_overrideReportedSchema || schema, + ), }); } @@ -190,7 +214,7 @@ export const plugin = ( didEnd(requestContext); }, }; - } + }, }; }; diff --git a/packages/apollo-engine-reporting/src/reportingOperationTypes.ts b/packages/apollo-engine-reporting/src/reportingOperationTypes.ts new file mode 100644 index 00000000000..1bf7b182d51 --- /dev/null +++ b/packages/apollo-engine-reporting/src/reportingOperationTypes.ts @@ -0,0 +1,64 @@ +/* tslint:disable */ +/* eslint-disable */ +// @generated +// This file was automatically generated and should not be edited. + +// ==================================================== +// GraphQL mutation operation: AutoregReportServerInfo +// ==================================================== + +import { GraphQLFormattedError } from 'graphql'; + +export interface ReportServerInfo_me_UserMutation { + __typename: 'UserMutation'; +} + +export interface ReportServerInfo_me_ServiceMutation_reportServerInfo { + __typename: 'ReportServerInfoResponse'; + inSeconds: number; + withExecutableSchema: boolean; +} + +export interface ReportServerInfo_me_ServiceMutation { + __typename: 'ServiceMutation'; + /** + * Schema auto-registration. Private alpha. + */ + reportServerInfo: ReportServerInfo_me_ServiceMutation_reportServerInfo | null; +} + +export type ReportServerInfo_me = + | ReportServerInfo_me_UserMutation + | ReportServerInfo_me_ServiceMutation; + +export interface SchemaReportingServerInfo { + me: ReportServerInfo_me | null; +} + +export interface SchemaReportingServerInfoResult { + data?: SchemaReportingServerInfo; + errors?: ReadonlyArray; +} + +export interface ReportServerInfoVariables { + info: EdgeServerInfo; + executableSchema?: string | null; +} + +/** + * Edge server info + */ +export interface EdgeServerInfo { + bootId: string; + executableSchemaId: string; + graphVariant: string; + libraryVersion?: string | null; + platform?: string | null; + runtimeVersion?: string | null; + serverId?: string | null; + userVersion?: string | null; +} + +//============================================================== +// END Enums and Input Objects +//============================================================== diff --git a/packages/apollo-engine-reporting/src/schemaReporter.ts b/packages/apollo-engine-reporting/src/schemaReporter.ts new file mode 100644 index 00000000000..5dae15d7b61 --- /dev/null +++ b/packages/apollo-engine-reporting/src/schemaReporter.ts @@ -0,0 +1,190 @@ +import { + ReportServerInfoVariables, + EdgeServerInfo, + SchemaReportingServerInfoResult, +} from './reportingOperationTypes'; +import { fetch, Headers, Request } from 'apollo-server-env'; +import { GraphQLRequest, Logger } from 'apollo-server-types'; + +export const reportServerInfoGql = ` + mutation ReportServerInfo($info: EdgeServerInfo!, $executableSchema: String) { + me { + __typename + ... on ServiceMutation { + reportServerInfo(info: $info, executableSchema: $executableSchema) { + inSeconds + withExecutableSchema + } + } + } + } +`; + +export function reportingLoop( + schemaReporter: SchemaReporter, + logger: Logger, + sendNextWithExecutableSchema: boolean, + fallbackReportingDelayInMs: number, +) { + function inner() { + // Bail out permanently + if (schemaReporter.stopped()) return; + + // Not awaiting this. The callback is handled in the `then` and it calls inner() + // to report the server info in however many seconds we were told to wait from + // Apollo Graph Manager + schemaReporter + .reportServerInfo(sendNextWithExecutableSchema) + .then(({ inSeconds, withExecutableSchema }) => { + sendNextWithExecutableSchema = withExecutableSchema; + setTimeout(inner, inSeconds * 1000); + }) + .catch((error: any) => { + // In the case of an error we want to continue looping + // We can add hardcoded backoff in the future, + // or on repeated failures stop responding reporting. + logger.error( + `Error reporting server info to Apollo Graph Manager during schema reporting: ${error}`, + ); + sendNextWithExecutableSchema = false; + setTimeout(inner, fallbackReportingDelayInMs); + }); + } + + inner(); +} + +interface ReportServerInfoReturnVal { + inSeconds: number; + withExecutableSchema: boolean; +} + +// This class is meant to be a thin shim around the gql mutations. +export class SchemaReporter { + // These mirror the gql variables + private readonly serverInfo: EdgeServerInfo; + private readonly executableSchemaDocument: any; + private readonly url: string; + + private isStopped: boolean; + private readonly headers: Headers; + + constructor( + serverInfo: EdgeServerInfo, + schemaSdl: string, + apiKey: string, + schemaReportingEndpoint: string | undefined, + ) { + this.headers = new Headers(); + this.headers.set('Content-Type', 'application/json'); + this.headers.set('x-api-key', apiKey); + this.headers.set('apollographql-client-name', 'apollo-engine-reporting'); + this.headers.set( + 'apollographql-client-version', + require('../package.json').version, + ); + + this.url = + schemaReportingEndpoint || + 'https://engine-graphql.apollographql.com/api/graphql'; + + this.serverInfo = serverInfo; + this.executableSchemaDocument = schemaSdl; + this.isStopped = false; + } + + public stopped(): Boolean { + return this.isStopped; + } + + public stop() { + this.isStopped = true; + } + + public async reportServerInfo( + withExecutableSchema: boolean, + ): Promise { + const { data, errors } = await this.graphManagerQuery({ + info: this.serverInfo, + executableSchema: withExecutableSchema + ? this.executableSchemaDocument + : null, + }); + + if (errors) { + throw new Error((errors || []).map((x: any) => x.message).join('\n')); + } + + function msgForUnexpectedResponse(data: any): string { + return [ + 'Unexpected response shape from Apollo Graph Manager when', + 'reporting server information for schema reporting. If', + 'this continues, please reach out to support@apollographql.com.', + 'Received response:', + JSON.stringify(data), + ].join(' '); + } + + if (!data || !data.me || !data.me.__typename) { + throw new Error(msgForUnexpectedResponse(data)); + } + + if (data.me.__typename === 'UserMutation') { + this.isStopped = true; + throw new Error( + [ + 'This server was configured with an API key for a user.', + "Only a service's API key may be used for schema reporting.", + 'Please visit the settings for this graph at', + 'https://engine.apollographql.com/ to obtain an API key for a service.', + ].join(' '), + ); + } else if (data.me.__typename === 'ServiceMutation') { + if (!data.me.reportServerInfo) { + throw new Error(msgForUnexpectedResponse(data)); + } + return data.me.reportServerInfo; + } else { + throw new Error(msgForUnexpectedResponse(data)); + } + } + + private async graphManagerQuery( + variables: ReportServerInfoVariables, + ): Promise { + const request: GraphQLRequest = { + query: reportServerInfoGql, + operationName: 'ReportServerInfo', + variables: variables, + }; + const httpRequest = new Request(this.url, { + method: 'POST', + headers: this.headers, + body: JSON.stringify(request), + }); + + const httpResponse = await fetch(httpRequest); + + if (!httpResponse.ok) { + throw new Error([ + `An unexpected HTTP status code (${httpResponse.status}) was`, + 'encountered during schema reporting.' + ].join(' ')); + } + + try { + // JSON parsing failure due to malformed data is the likely failure case + // here. Any non-JSON response (e.g. HTML) is usually the suspect. + return await httpResponse.json(); + } catch (error) { + throw new Error( + [ + "Couldn't report server info to Apollo Graph Manager.", + 'Parsing response as JSON failed.', + 'If this continues please reach out to support@apollographql.com', + error + ].join(' '), + ); + } + } +} diff --git a/packages/apollo-server-core/src/utils/pluginTestHarness.ts b/packages/apollo-server-core/src/utils/pluginTestHarness.ts index 5c790c70f6c..86dd63460c9 100644 --- a/packages/apollo-server-core/src/utils/pluginTestHarness.ts +++ b/packages/apollo-server-core/src/utils/pluginTestHarness.ts @@ -81,7 +81,6 @@ export default async function pluginTestHarness({ */ context?: TContext; }): Promise> { - if (!schema) { schema = new GraphQLSchema({ query: new GraphQLObjectType({ @@ -98,6 +97,17 @@ export default async function pluginTestHarness({ }); } + const schemaHash = generateSchemaHash(schema); + if (typeof pluginInstance.serverWillStart === 'function') { + pluginInstance.serverWillStart({ + logger: logger || console, + schema, + schemaHash, + engine: {}, + }); + } + + const requestContext: GraphQLRequestContext = { logger: logger || console, schema, diff --git a/packages/apollo-server-integration-testsuite/src/ApolloServer.ts b/packages/apollo-server-integration-testsuite/src/ApolloServer.ts index 521c52bcabd..85257054458 100644 --- a/packages/apollo-server-integration-testsuite/src/ApolloServer.ts +++ b/packages/apollo-server-integration-testsuite/src/ApolloServer.ts @@ -852,7 +852,7 @@ export function testApolloServer( public engineOptions(): Partial> { return { - endpointUrl: this.getUrl(), + tracesEndpointUrl: this.getUrl(), }; } @@ -2170,7 +2170,7 @@ export function testApolloServer( resolvers: { Query: { something: () => 'hello' } }, engine: { apiKey: 'service:my-app:secret', - endpointUrl: fakeEngineUrl, + tracesEndpointUrl: fakeEngineUrl, reportIntervalMs: 1, maxAttempts: 3, requestAgent, From 6b8a4366363c27a8d828e733edef4d06ecc1cd55 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 19 May 2020 12:47:19 +0300 Subject: [PATCH 602/642] Release - apollo-cache-control@0.11.0-alpha.1 - apollo-datasource-rest@0.9.2-alpha.1 - apollo-engine-reporting-protobuf@0.5.1-alpha.1 - apollo-engine-reporting@2.0.0-alpha.1 - @apollo/gateway@0.16.1-alpha.1 - apollo-server-azure-functions@2.14.0-alpha.1 - apollo-server-cloud-functions@2.14.0-alpha.1 - apollo-server-cloudflare@2.14.0-alpha.1 - apollo-server-core@2.14.0-alpha.1 - apollo-server-express@2.14.0-alpha.1 - apollo-server-fastify@2.14.0-alpha.1 - apollo-server-hapi@2.14.0-alpha.1 - apollo-server-integration-testsuite@2.14.0-alpha.1 - apollo-server-koa@2.14.0-alpha.1 - apollo-server-lambda@2.14.0-alpha.1 - apollo-server-micro@2.14.0-alpha.1 - apollo-server-plugin-base@0.9.0-alpha.1 - apollo-server-plugin-operation-registry@0.3.2-alpha.0 - apollo-server-plugin-response-cache@0.5.2-alpha.1 - apollo-server-testing@2.14.0-alpha.1 - apollo-server-types@0.5.0-alpha.1 - apollo-server@2.14.0-alpha.1 - apollo-tracing@0.11.0-alpha.1 - graphql-extensions@0.12.2-alpha.1 --- packages/apollo-cache-control/package.json | 2 +- packages/apollo-datasource-rest/package.json | 2 +- packages/apollo-engine-reporting-protobuf/package-lock.json | 2 +- packages/apollo-engine-reporting-protobuf/package.json | 2 +- packages/apollo-engine-reporting/package.json | 2 +- packages/apollo-gateway/package.json | 2 +- packages/apollo-server-azure-functions/package.json | 2 +- packages/apollo-server-cloud-functions/package.json | 2 +- packages/apollo-server-cloudflare/package.json | 2 +- packages/apollo-server-core/package.json | 2 +- packages/apollo-server-express/package.json | 2 +- packages/apollo-server-fastify/package.json | 2 +- packages/apollo-server-hapi/package.json | 2 +- packages/apollo-server-integration-testsuite/package.json | 2 +- packages/apollo-server-koa/package.json | 2 +- packages/apollo-server-lambda/package.json | 2 +- packages/apollo-server-micro/package.json | 2 +- packages/apollo-server-plugin-base/package.json | 2 +- packages/apollo-server-plugin-operation-registry/package.json | 3 +-- packages/apollo-server-plugin-response-cache/package.json | 2 +- packages/apollo-server-testing/package.json | 2 +- packages/apollo-server-types/package.json | 2 +- packages/apollo-server/package.json | 2 +- packages/apollo-tracing/package.json | 2 +- packages/graphql-extensions/package.json | 2 +- 25 files changed, 25 insertions(+), 26 deletions(-) diff --git a/packages/apollo-cache-control/package.json b/packages/apollo-cache-control/package.json index b67eefeb1f5..ca3b1f1218a 100644 --- a/packages/apollo-cache-control/package.json +++ b/packages/apollo-cache-control/package.json @@ -1,6 +1,6 @@ { "name": "apollo-cache-control", - "version": "0.11.0-alpha.0", + "version": "0.11.0-alpha.1", "description": "A GraphQL extension for cache control", "main": "./dist/index.js", "types": "./dist/index.d.ts", diff --git a/packages/apollo-datasource-rest/package.json b/packages/apollo-datasource-rest/package.json index 3bc114c0c97..c3e4e6a028a 100644 --- a/packages/apollo-datasource-rest/package.json +++ b/packages/apollo-datasource-rest/package.json @@ -1,6 +1,6 @@ { "name": "apollo-datasource-rest", - "version": "0.9.2-alpha.0", + "version": "0.9.2-alpha.1", "author": "opensource@apollographql.com", "license": "MIT", "repository": { diff --git a/packages/apollo-engine-reporting-protobuf/package-lock.json b/packages/apollo-engine-reporting-protobuf/package-lock.json index cdeebe199a6..db3c36e4168 100644 --- a/packages/apollo-engine-reporting-protobuf/package-lock.json +++ b/packages/apollo-engine-reporting-protobuf/package-lock.json @@ -1,6 +1,6 @@ { "name": "apollo-engine-reporting-protobuf", - "version": "0.5.1-alpha.0", + "version": "0.5.1-alpha.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/packages/apollo-engine-reporting-protobuf/package.json b/packages/apollo-engine-reporting-protobuf/package.json index 3812458bbb2..52026c09f69 100644 --- a/packages/apollo-engine-reporting-protobuf/package.json +++ b/packages/apollo-engine-reporting-protobuf/package.json @@ -1,6 +1,6 @@ { "name": "apollo-engine-reporting-protobuf", - "version": "0.5.1-alpha.0", + "version": "0.5.1-alpha.1", "description": "Protobuf format for Apollo Engine", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-engine-reporting/package.json b/packages/apollo-engine-reporting/package.json index 9ce287bb57f..e5e398e6dcd 100644 --- a/packages/apollo-engine-reporting/package.json +++ b/packages/apollo-engine-reporting/package.json @@ -1,6 +1,6 @@ { "name": "apollo-engine-reporting", - "version": "2.0.0-alpha.0", + "version": "2.0.0-alpha.1", "description": "Send reports about your GraphQL services to Apollo Graph Manager (previously known as Apollo Engine)", "main": "./dist/index.js", "types": "./dist/index.d.ts", diff --git a/packages/apollo-gateway/package.json b/packages/apollo-gateway/package.json index 1f578157609..23d5b32986b 100644 --- a/packages/apollo-gateway/package.json +++ b/packages/apollo-gateway/package.json @@ -1,6 +1,6 @@ { "name": "@apollo/gateway", - "version": "0.16.1-alpha.0", + "version": "0.16.1-alpha.1", "description": "Apollo Gateway", "author": "opensource@apollographql.com", "main": "dist/index.js", diff --git a/packages/apollo-server-azure-functions/package.json b/packages/apollo-server-azure-functions/package.json index 92b7e2dc889..8f0779b94f8 100644 --- a/packages/apollo-server-azure-functions/package.json +++ b/packages/apollo-server-azure-functions/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-azure-functions", - "version": "2.14.0-alpha.0", + "version": "2.14.0-alpha.1", "description": "Production-ready Node.js GraphQL server for Azure Functions", "keywords": [ "GraphQL", diff --git a/packages/apollo-server-cloud-functions/package.json b/packages/apollo-server-cloud-functions/package.json index 512372a4f92..43512c6fc18 100644 --- a/packages/apollo-server-cloud-functions/package.json +++ b/packages/apollo-server-cloud-functions/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-cloud-functions", - "version": "2.14.0-alpha.0", + "version": "2.14.0-alpha.1", "description": "Production-ready Node.js GraphQL server for Google Cloud Functions", "keywords": [ "GraphQL", diff --git a/packages/apollo-server-cloudflare/package.json b/packages/apollo-server-cloudflare/package.json index 3aa62a4c99a..b915fc84763 100644 --- a/packages/apollo-server-cloudflare/package.json +++ b/packages/apollo-server-cloudflare/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-cloudflare", - "version": "2.14.0-alpha.0", + "version": "2.14.0-alpha.1", "description": "Production-ready Node.js GraphQL server for Cloudflare workers", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-core/package.json b/packages/apollo-server-core/package.json index e9455c0c9bb..3660dbad91c 100644 --- a/packages/apollo-server-core/package.json +++ b/packages/apollo-server-core/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-core", - "version": "2.14.0-alpha.0", + "version": "2.14.0-alpha.1", "description": "Core engine for Apollo GraphQL server", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-express/package.json b/packages/apollo-server-express/package.json index e05007504ca..00add1126aa 100644 --- a/packages/apollo-server-express/package.json +++ b/packages/apollo-server-express/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-express", - "version": "2.14.0-alpha.0", + "version": "2.14.0-alpha.1", "description": "Production-ready Node.js GraphQL server for Express and Connect", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-fastify/package.json b/packages/apollo-server-fastify/package.json index 486b37b7f42..996a83650ad 100644 --- a/packages/apollo-server-fastify/package.json +++ b/packages/apollo-server-fastify/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-fastify", - "version": "2.14.0-alpha.0", + "version": "2.14.0-alpha.1", "description": "Production-ready Node.js GraphQL server for Fastify", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-hapi/package.json b/packages/apollo-server-hapi/package.json index d3ea90a65ac..69561ae7df2 100644 --- a/packages/apollo-server-hapi/package.json +++ b/packages/apollo-server-hapi/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-hapi", - "version": "2.14.0-alpha.0", + "version": "2.14.0-alpha.1", "description": "Production-ready Node.js GraphQL server for Hapi", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-integration-testsuite/package.json b/packages/apollo-server-integration-testsuite/package.json index 2209aa1e452..9f86012a830 100644 --- a/packages/apollo-server-integration-testsuite/package.json +++ b/packages/apollo-server-integration-testsuite/package.json @@ -1,7 +1,7 @@ { "name": "apollo-server-integration-testsuite", "private": true, - "version": "2.14.0-alpha.0", + "version": "2.14.0-alpha.1", "description": "Apollo Server Integrations testsuite", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-koa/package.json b/packages/apollo-server-koa/package.json index 15ec84f7ef6..94c1fe4f652 100644 --- a/packages/apollo-server-koa/package.json +++ b/packages/apollo-server-koa/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-koa", - "version": "2.14.0-alpha.0", + "version": "2.14.0-alpha.1", "description": "Production-ready Node.js GraphQL server for Koa", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-lambda/package.json b/packages/apollo-server-lambda/package.json index 6ad05a03219..06bd618f460 100644 --- a/packages/apollo-server-lambda/package.json +++ b/packages/apollo-server-lambda/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-lambda", - "version": "2.14.0-alpha.0", + "version": "2.14.0-alpha.1", "description": "Production-ready Node.js GraphQL server for AWS Lambda", "keywords": [ "GraphQL", diff --git a/packages/apollo-server-micro/package.json b/packages/apollo-server-micro/package.json index ca221e1dcb0..1c9317338cf 100644 --- a/packages/apollo-server-micro/package.json +++ b/packages/apollo-server-micro/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-micro", - "version": "2.14.0-alpha.0", + "version": "2.14.0-alpha.1", "description": "Production-ready Node.js GraphQL server for Micro", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-plugin-base/package.json b/packages/apollo-server-plugin-base/package.json index fa28b8d7560..06d3c8ffe4c 100644 --- a/packages/apollo-server-plugin-base/package.json +++ b/packages/apollo-server-plugin-base/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-plugin-base", - "version": "0.9.0-alpha.0", + "version": "0.9.0-alpha.1", "description": "Apollo Server plugin base classes", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-plugin-operation-registry/package.json b/packages/apollo-server-plugin-operation-registry/package.json index bebfa7b9c6a..c0e412e0358 100644 --- a/packages/apollo-server-plugin-operation-registry/package.json +++ b/packages/apollo-server-plugin-operation-registry/package.json @@ -1,11 +1,10 @@ { "name": "apollo-server-plugin-operation-registry", - "version": "0.3.1", + "version": "0.3.2-alpha.0", "description": "Apollo Server operation registry", "main": "dist/index.js", "types": "dist/index.d.ts", "keywords": [], - "author": "Apollo ", "repository": { "type": "git", diff --git a/packages/apollo-server-plugin-response-cache/package.json b/packages/apollo-server-plugin-response-cache/package.json index 698913fcbda..1e3bdbfac02 100644 --- a/packages/apollo-server-plugin-response-cache/package.json +++ b/packages/apollo-server-plugin-response-cache/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-plugin-response-cache", - "version": "0.5.2-alpha.0", + "version": "0.5.2-alpha.1", "description": "Apollo Server full query response cache", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-testing/package.json b/packages/apollo-server-testing/package.json index b2048935b61..e6cc267ba08 100644 --- a/packages/apollo-server-testing/package.json +++ b/packages/apollo-server-testing/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-testing", - "version": "2.14.0-alpha.0", + "version": "2.14.0-alpha.1", "description": "Test utils for apollo-server", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-types/package.json b/packages/apollo-server-types/package.json index 881f449c6f8..146c687aec0 100644 --- a/packages/apollo-server-types/package.json +++ b/packages/apollo-server-types/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-types", - "version": "0.5.0-alpha.0", + "version": "0.5.0-alpha.1", "description": "Apollo Server shared types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server/package.json b/packages/apollo-server/package.json index c18a311839b..8d62350d7f4 100644 --- a/packages/apollo-server/package.json +++ b/packages/apollo-server/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server", - "version": "2.14.0-alpha.0", + "version": "2.14.0-alpha.1", "description": "Production ready GraphQL Server", "author": "opensource@apollographql.com", "main": "dist/index.js", diff --git a/packages/apollo-tracing/package.json b/packages/apollo-tracing/package.json index 5de113417dd..71165100e64 100644 --- a/packages/apollo-tracing/package.json +++ b/packages/apollo-tracing/package.json @@ -1,6 +1,6 @@ { "name": "apollo-tracing", - "version": "0.11.0-alpha.0", + "version": "0.11.0-alpha.1", "description": "Collect and expose trace data for GraphQL requests", "main": "./dist/index.js", "types": "./dist/index.d.ts", diff --git a/packages/graphql-extensions/package.json b/packages/graphql-extensions/package.json index 14d98ed0e13..a3ed8d41d17 100644 --- a/packages/graphql-extensions/package.json +++ b/packages/graphql-extensions/package.json @@ -1,6 +1,6 @@ { "name": "graphql-extensions", - "version": "0.12.2-alpha.0", + "version": "0.12.2-alpha.1", "description": "Add extensions to GraphQL servers", "main": "./dist/index.js", "types": "./dist/index.d.ts", From f970b8a64ce9ab4b2c089cb3d5774f65f76d56b5 Mon Sep 17 00:00:00 2001 From: David Glasser Date: Tue, 19 May 2020 15:51:34 -0700 Subject: [PATCH 603/642] apollo-engine-reporting: apply prettier to agent.ts --- packages/apollo-engine-reporting/src/agent.ts | 80 +++++++++++++------ 1 file changed, 54 insertions(+), 26 deletions(-) diff --git a/packages/apollo-engine-reporting/src/agent.ts b/packages/apollo-engine-reporting/src/agent.ts index bd3a13b327f..e96e01474ae 100644 --- a/packages/apollo-engine-reporting/src/agent.ts +++ b/packages/apollo-engine-reporting/src/agent.ts @@ -57,10 +57,15 @@ export type GenerateClientInfo = ( ) => ClientInfo; // AS3: Drop support for deprecated `ENGINE_API_KEY`. -export function getEngineApiKey( - {engine, skipWarn = false, logger= console }: - {engine: EngineReportingOptions | boolean | undefined, skipWarn?: boolean, logger?: Logger } - ) { +export function getEngineApiKey({ + engine, + skipWarn = false, + logger = console, +}: { + engine: EngineReportingOptions | boolean | undefined; + skipWarn?: boolean; + logger?: Logger; +}) { if (typeof engine === 'object') { if (engine.apiKey) { return engine.apiKey; @@ -69,34 +74,52 @@ export function getEngineApiKey( const legacyApiKeyFromEnv = process.env.ENGINE_API_KEY; const apiKeyFromEnv = process.env.APOLLO_KEY; - if(legacyApiKeyFromEnv && apiKeyFromEnv && !skipWarn) { - logger.warn("Using `APOLLO_KEY` since `ENGINE_API_KEY` (deprecated) is also set in the environment."); + if (legacyApiKeyFromEnv && apiKeyFromEnv && !skipWarn) { + logger.warn( + 'Using `APOLLO_KEY` since `ENGINE_API_KEY` (deprecated) is also set in the environment.', + ); } - if(legacyApiKeyFromEnv && !warnedOnDeprecatedApiKey && !skipWarn) { - logger.warn("[deprecated] The `ENGINE_API_KEY` environment variable has been renamed to `APOLLO_KEY`."); + if (legacyApiKeyFromEnv && !warnedOnDeprecatedApiKey && !skipWarn) { + logger.warn( + '[deprecated] The `ENGINE_API_KEY` environment variable has been renamed to `APOLLO_KEY`.', + ); warnedOnDeprecatedApiKey = true; } - return apiKeyFromEnv || legacyApiKeyFromEnv || '' + return apiKeyFromEnv || legacyApiKeyFromEnv || ''; } // AS3: Drop support for deprecated `ENGINE_SCHEMA_TAG`. -export function getEngineGraphVariant(engine: EngineReportingOptions | boolean | undefined, logger: Logger = console): string | undefined { +export function getEngineGraphVariant( + engine: EngineReportingOptions | boolean | undefined, + logger: Logger = console, +): string | undefined { if (engine === false) { return; - } else if (typeof engine === 'object' && (engine.graphVariant || engine.schemaTag)) { + } else if ( + typeof engine === 'object' && + (engine.graphVariant || engine.schemaTag) + ) { if (engine.graphVariant && engine.schemaTag) { - throw new Error('Cannot set both engine.graphVariant and engine.schemaTag. Please use engine.graphVariant.'); + throw new Error( + 'Cannot set both engine.graphVariant and engine.schemaTag. Please use engine.graphVariant.', + ); } if (engine.schemaTag) { - logger.warn('[deprecated] The `schemaTag` property within `engine` configuration has been renamed to `graphVariant`.'); + logger.warn( + '[deprecated] The `schemaTag` property within `engine` configuration has been renamed to `graphVariant`.', + ); } return engine.graphVariant || engine.schemaTag; } else { if (process.env.ENGINE_SCHEMA_TAG) { - logger.warn('[deprecated] The `ENGINE_SCHEMA_TAG` environment variable has been renamed to `APOLLO_GRAPH_VARIANT`.'); + logger.warn( + '[deprecated] The `ENGINE_SCHEMA_TAG` environment variable has been renamed to `APOLLO_GRAPH_VARIANT`.', + ); } if (process.env.ENGINE_SCHEMA_TAG && process.env.APOLLO_GRAPH_VARIANT) { - throw new Error('`APOLLO_GRAPH_VARIANT` and `ENGINE_SCHEMA_TAG` (deprecated) environment variables must not both be set.') + throw new Error( + '`APOLLO_GRAPH_VARIANT` and `ENGINE_SCHEMA_TAG` (deprecated) environment variables must not both be set.', + ); } return process.env.APOLLO_GRAPH_VARIANT || process.env.ENGINE_SCHEMA_TAG; } @@ -356,7 +379,11 @@ export class EngineReportingAgent { public constructor(options: EngineReportingOptions = {}) { this.options = options; - this.apiKey = getEngineApiKey({engine: this.options, skipWarn: false, logger: this.logger}); + this.apiKey = getEngineApiKey({ + engine: this.options, + skipWarn: false, + logger: this.logger, + }); if (options.logger) this.logger = options.logger; this.bootId = uuidv4(); this.graphVariant = getEngineGraphVariant(options, this.logger) || ''; @@ -382,7 +409,7 @@ export class EngineReportingAgent { if (this.options.handleSignals !== false) { const signals: NodeJS.Signals[] = ['SIGINT', 'SIGTERM']; - signals.forEach(signal => { + signals.forEach((signal) => { // Note: Node only started sending signal names to signal events with // Node v10 so we can't use that feature here. const handler: NodeJS.SignalsListener = async () => { @@ -493,7 +520,9 @@ export class EngineReportingAgent { } public async sendAllReports(): Promise { - await Promise.all(Object.keys(this.reports).map(id => this.sendReport(id))); + await Promise.all( + Object.keys(this.reports).map((id) => this.sendReport(id)), + ); } public async sendReport(executableSchemaId: string): Promise { @@ -564,8 +593,9 @@ export class EngineReportingAgent { if (curResponse.status >= 500 && curResponse.status < 600) { throw new Error( - `HTTP status ${curResponse.status}, ${(await curResponse.text()) || - '(no body)'}`, + `HTTP status ${curResponse.status}, ${ + (await curResponse.text()) || '(no body)' + }`, ); } else { return curResponse; @@ -652,7 +682,7 @@ export class EngineReportingAgent { this.currentSchemaReporter = schemaReporter; const logger = this.logger; - setTimeout(function() { + setTimeout(function () { reportingLoop(schemaReporter, logger, false, fallbackReportingDelayInMs); }, delay); } @@ -729,14 +759,14 @@ export class EngineReportingAgent { private async sendAllReportsAndReportErrors(): Promise { await Promise.all( - Object.keys(this.reports).map(executableSchemaId => + Object.keys(this.reports).map((executableSchemaId) => this.sendReportAndReportErrors(executableSchemaId), ), ); } private sendReportAndReportErrors(executableSchemaId: string): Promise { - return this.sendReport(executableSchemaId).catch(err => { + return this.sendReport(executableSchemaId).catch((err) => { // This catch block is primarily intended to catch network errors from // the retried request itself, which include network errors and non-2xx // HTTP errors. @@ -870,8 +900,6 @@ export function computeExecutableSchemaId( // Can't call digest on this object twice. Creating new object each function call const sha256 = createHash('sha256'); const schemaDocument = - typeof schema === 'string' - ? schema - : printSchema(schema); + typeof schema === 'string' ? schema : printSchema(schema); return sha256.update(schemaDocument).digest('hex'); } From 8b72e5052bd87218f9b5b2dc4fea34f96f145a83 Mon Sep 17 00:00:00 2001 From: David Glasser Date: Tue, 19 May 2020 16:10:35 -0700 Subject: [PATCH 604/642] apollo-engine-reporting: fix TypeError on sendReport("unknown") EngineReportingAgent had three different fields all of which were objects keyed by executableSchemaId. Their key sets were identical but this was not represented explicitly in the code. In addition, their TypeScript typings were of the form `{[x: string]: Foo}`, which means TypeScript will inaccurately assume that looking up *any* key on the object will return an actual Foo and not undefined. This refactor merges the three maps into a single map whose value is a ReportData with three fields. Additionally, it fixes the type to reflect that not every executableSchemaId is always in the map. Mostly this just leads to code whose properties (an executableSchemaId may or may not have these three pieces of data associated with them, and if they do then all three are there) can be checked at compile time rather than runtime. This does actually fix a minor bug: if `sendReport` is called manually with an executableSchemaId which is not associated with a trace that has been reported yet (perhaps because it is called before any traces are captured?), the code used to crash when it tried to evaluate `report.tracesPerQuery`, but now it will create an empty report for that id and not crash (but still not send it because it is empty). We do actually document that you can call `sendReport` yourself so this seems reasonable. --- packages/apollo-engine-reporting/src/agent.ts | 77 +++++++++++-------- 1 file changed, 44 insertions(+), 33 deletions(-) diff --git a/packages/apollo-engine-reporting/src/agent.ts b/packages/apollo-engine-reporting/src/agent.ts index e96e01474ae..9e4d8983ad8 100644 --- a/packages/apollo-engine-reporting/src/agent.ts +++ b/packages/apollo-engine-reporting/src/agent.ts @@ -342,6 +342,24 @@ const serviceHeaderDefaults = { uname: `${os.platform()}, ${os.type()}, ${os.release()}, ${os.arch()})`, }; +class ReportData { + report!: Report; + size!: number; + readonly header: ReportHeader; + constructor(executableSchemaId: string, graphVariant: string) { + this.header = new ReportHeader({ + ...serviceHeaderDefaults, + executableSchemaId, + schemaTag: graphVariant, + }); + this.reset(); + } + reset() { + this.report = new Report({ header: this.header }); + this.size = 0; + } +} + // EngineReportingAgent is a persistent object which creates // EngineReportingExtensions for each request and sends batches of trace reports // to the Engine server. @@ -351,19 +369,13 @@ export class EngineReportingAgent { private readonly logger: Logger = console; private readonly graphVariant: string; - private reports: { [executableSchemaId: string]: Report } = Object.create( - null, - ); - private reportSizes: { [executableSchemaId: string]: number } = Object.create( - null, - ); + private readonly reportDataByExecutableSchemaId: { + [executableSchemaId: string]: ReportData | undefined; + } = Object.create(null); private reportTimer: any; // timer typing is weird and node-specific private readonly sendReportsImmediately?: boolean; private stopped: boolean = false; - private reportHeaders: { - [executableSchemaId: string]: ReportHeader; - } = Object.create(null); private signatureCache: InMemoryLRUCache; private signalHandlers = new Map(); @@ -459,6 +471,16 @@ export class EngineReportingAgent { }); } + private getReportData(executableSchemaId: string): ReportData { + const existing = this.reportDataByExecutableSchemaId[executableSchemaId]; + if (existing) { + return existing; + } + const reportData = new ReportData(executableSchemaId, this.graphVariant); + this.reportDataByExecutableSchemaId[executableSchemaId] = reportData; + return reportData; + } + public async addTrace({ trace, queryHash, @@ -472,16 +494,8 @@ export class EngineReportingAgent { return; } - if (!(executableSchemaId in this.reports)) { - this.reportHeaders[executableSchemaId] = new ReportHeader({ - ...serviceHeaderDefaults, - executableSchemaId: executableSchemaId, - schemaTag: this.graphVariant, - }); - // initializes this.reports[reportHash] - this.resetReport(executableSchemaId); - } - const report = this.reports[executableSchemaId]; + const reportData = this.getReportData(executableSchemaId); + const { report } = reportData; const protobufError = Trace.verify(trace); if (protobufError) { @@ -506,13 +520,12 @@ export class EngineReportingAgent { (report.tracesPerQuery[statsReportKey] as any).encodedTraces.push( encodedTrace, ); - this.reportSizes[executableSchemaId] += - encodedTrace.length + Buffer.byteLength(statsReportKey); + reportData.size += encodedTrace.length + Buffer.byteLength(statsReportKey); // If the buffer gets big (according to our estimate), send. if ( this.sendReportsImmediately || - this.reportSizes[executableSchemaId] >= + reportData.size >= (this.options.maxUncompressedReportSize || 4 * 1024 * 1024) ) { await this.sendReportAndReportErrors(executableSchemaId); @@ -521,13 +534,16 @@ export class EngineReportingAgent { public async sendAllReports(): Promise { await Promise.all( - Object.keys(this.reports).map((id) => this.sendReport(id)), + Object.keys(this.reportDataByExecutableSchemaId).map((id) => + this.sendReport(id), + ), ); } public async sendReport(executableSchemaId: string): Promise { - const report = this.reports[executableSchemaId]; - this.resetReport(executableSchemaId); + const reportData = this.getReportData(executableSchemaId); + const { report } = reportData; + reportData.reset(); if (Object.keys(report.tracesPerQuery).length === 0) { return; @@ -759,7 +775,9 @@ export class EngineReportingAgent { private async sendAllReportsAndReportErrors(): Promise { await Promise.all( - Object.keys(this.reports).map((executableSchemaId) => + Object.keys( + this.reportDataByExecutableSchemaId, + ).map((executableSchemaId) => this.sendReportAndReportErrors(executableSchemaId), ), ); @@ -777,13 +795,6 @@ export class EngineReportingAgent { } }); } - - private resetReport(executableSchemaId: string) { - this.reports[executableSchemaId] = new Report({ - header: this.reportHeaders[executableSchemaId], - }); - this.reportSizes[executableSchemaId] = 0; - } } function createSignatureCache({ From e7b760bb8a79eab1f49a5bfba1047ea66d14a6cb Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Wed, 20 May 2020 10:16:56 +0000 Subject: [PATCH 605/642] Try to improve clarity of intent of various loggers via naming/commentary. --- packages/apollo-engine-reporting/src/plugin.ts | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/packages/apollo-engine-reporting/src/plugin.ts b/packages/apollo-engine-reporting/src/plugin.ts index 4b8217813f6..56efc62d9bf 100644 --- a/packages/apollo-engine-reporting/src/plugin.ts +++ b/packages/apollo-engine-reporting/src/plugin.ts @@ -45,7 +45,13 @@ export const plugin = ( executableSchemaIdGenerator: (schema: string | GraphQLSchema) => string; }, ): ApolloServerPlugin => { - const logger: Logger = options.logger || console; + /** + * Non request-specific logging will go into this general logger. Request- + * specific log output (where the log output is only a result of a specific + * request) will go to the `logger` which we get from the request context. + */ + const loggerForPlugin: Logger = options.logger || console; + const generateClientInfo: GenerateClientInfo = options.generateClientInfo || defaultGenerateClientInfo; @@ -66,10 +72,16 @@ export const plugin = ( schema, request: { http, variables }, }) { + /** + * Request specific log output should go into the `logger` from the + * request context when it's provided. + */ + const logger = requestLogger || loggerForPlugin; + const treeBuilder: EngineReportingTreeBuilder = new EngineReportingTreeBuilder( { rewriteError: options.rewriteError, - logger: requestLogger || logger, + logger, }, ); From 9d4f92d43ddeb3015bc58aa934683f68dd22b49e Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Wed, 20 May 2020 10:34:26 +0000 Subject: [PATCH 606/642] Surface `logger` within `getTraceSignature` to "catch" & log cache errors. While a failure to write to the cache in its current state would be unlikely since it's tied to an `InMemoryCacheLRU`, we should be able to have this cache backed by a distributed store (e.g., Memcached, Redis) in the future, where these writes _could_ fail. --- packages/apollo-engine-reporting/src/agent.ts | 33 ++++++++++++++++++- .../apollo-engine-reporting/src/plugin.ts | 1 + 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/packages/apollo-engine-reporting/src/agent.ts b/packages/apollo-engine-reporting/src/agent.ts index 9e4d8983ad8..b6b91f830d1 100644 --- a/packages/apollo-engine-reporting/src/agent.ts +++ b/packages/apollo-engine-reporting/src/agent.ts @@ -332,6 +332,7 @@ export interface AddTraceArgs { executableSchemaId: string; source?: string; document?: DocumentNode; + logger: Logger, } const serviceHeaderDefaults = { @@ -488,6 +489,16 @@ export class EngineReportingAgent { operationName, source, executableSchemaId, + /** + * Since this agent instruments the plugin with its `options.logger`, but + * also passes off a reference to this `addTrace` method which is invoked + * with the availability of a per-request `logger`, this `logger` (in this + * destructuring) is already conditionally either: + * + * 1. The `logger` that was passed into the `options` for the agent. + * 2. The request-specific `logger`. + */ + logger, }: AddTraceArgs): Promise { // Ignore traces that come in after stop(). if (this.stopped) { @@ -508,6 +519,7 @@ export class EngineReportingAgent { document, source, operationName, + logger, }); const statsReportKey = `# ${operationName || '-'}\n${signature}`; @@ -729,11 +741,13 @@ export class EngineReportingAgent { operationName, document, source, + logger, }: { queryHash: string; operationName: string; document?: DocumentNode; source?: string; + logger: Logger; }): Promise { if (!document && !source) { // This shouldn't happen: one of those options must be passed to runQuery. @@ -768,7 +782,24 @@ export class EngineReportingAgent { )(document, operationName); // Intentionally not awaited so the cache can be written to at leisure. - this.signatureCache.set(cacheKey, generatedSignature); + // + // As of the writing of this comment, this signature cache is exclusively + // backed by an `InMemoryLRUCache` which cannot do anything + // non-synchronously, though that will probably change in the future, + // and a distributed cache store, like Redis, doesn't seem unfathomable. + // + // Due in part to the plugin being separate from the `EngineReportingAgent`, + // the loggers are difficult to track down here. Errors will be logged to + // either the request-specific logger on the request context (if available) + // or to the `logger` that was passed into `EngineReportingOptions` which + // is provided in the `EngineReportingAgent` constructor options. + this.signatureCache.set(cacheKey, generatedSignature) + .catch(err => { + logger.warn( + 'Could not store signature cache. ' + + (err && err.message) || err + ) + }); return generatedSignature; } diff --git a/packages/apollo-engine-reporting/src/plugin.ts b/packages/apollo-engine-reporting/src/plugin.ts index 56efc62d9bf..3033ac154a5 100644 --- a/packages/apollo-engine-reporting/src/plugin.ts +++ b/packages/apollo-engine-reporting/src/plugin.ts @@ -161,6 +161,7 @@ export const plugin = ( executableSchemaId: executableSchemaIdGenerator( options.experimental_overrideReportedSchema || schema, ), + logger, }); } From 96dbccc1166f832216c864fcb82e9517c6856938 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Wed, 20 May 2020 10:40:28 +0000 Subject: [PATCH 607/642] Apply a `.catch` to the un-`await`'d call to `addTrace`. Also, add a comment indicating the intent. The `logger` in this case will be a request-specific logger when available or the general "Engine" logger otherwise. Also adjust recently introduced test to accurately return a `Promise` in its mock. Related: https://github.com/apollographql/apollo-server/pull/2670 --- .../apollo-engine-reporting/src/__tests__/plugin.test.ts | 2 +- packages/apollo-engine-reporting/src/plugin.ts | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/packages/apollo-engine-reporting/src/__tests__/plugin.test.ts b/packages/apollo-engine-reporting/src/__tests__/plugin.test.ts index 56c2809a3db..f56038aa375 100644 --- a/packages/apollo-engine-reporting/src/__tests__/plugin.test.ts +++ b/packages/apollo-engine-reporting/src/__tests__/plugin.test.ts @@ -46,7 +46,7 @@ describe('schema reporting', () => { const schema = makeExecutableSchema({ typeDefs }); addMockFunctionsToSchema({ schema }); - const addTrace = jest.fn(); + const addTrace = jest.fn().mockResolvedValue(undefined); const startSchemaReporting = jest.fn(); const executableSchemaIdGenerator = jest.fn(computeExecutableSchemaId); diff --git a/packages/apollo-engine-reporting/src/plugin.ts b/packages/apollo-engine-reporting/src/plugin.ts index 3033ac154a5..ab6c22220bb 100644 --- a/packages/apollo-engine-reporting/src/plugin.ts +++ b/packages/apollo-engine-reporting/src/plugin.ts @@ -152,6 +152,13 @@ export const plugin = ( treeBuilder.trace.queryPlan = metrics.queryPlanTrace; } + // Intentionally un-awaited so as not to block the response. Any + // errors will be logged, but will not manifest a user-facing error. + // The logger in this case is a request specific logger OR the logger + // defined by the plugin if that's unavailable. The request-specific + // logger is preferred since this is very much coupled directly to a + // client-triggered action which might be more granularly tagged by + // logging implementations. addTrace({ operationName, queryHash: requestContext.queryHash!, @@ -162,7 +169,7 @@ export const plugin = ( options.experimental_overrideReportedSchema || schema, ), logger, - }); + }).catch(logger.error); } // While we start the tracing as soon as possible, we only actually report From cd4844ed728b036df9ffc32d7fd8bf0acafe849e Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Wed, 20 May 2020 12:27:39 +0000 Subject: [PATCH 608/642] Add comments about preservation of legacy behaviors in request pipeline. These comments hope to better explain the behavior which was present in the 2.x series of Apollo Server prior to the introduction of `didEncounterErrors`. The behavior which this commentary applies to -- in which we `throw` prior to finishing subsequent errors, has been this way since AS2 was released and was a pattern which we locked ourselves into for the duration of the AS2 release when we put out the request pipeline plugins. It should _not_ stay this way in the future, and in AS3 we will resolve this. --- .../apollo-server-core/src/requestPipeline.ts | 33 ++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/packages/apollo-server-core/src/requestPipeline.ts b/packages/apollo-server-core/src/requestPipeline.ts index 60962277b0c..d3588f04e1a 100644 --- a/packages/apollo-server-core/src/requestPipeline.ts +++ b/packages/apollo-server-core/src/requestPipeline.ts @@ -160,8 +160,16 @@ export async function processGraphQLRequest( // It looks like we've received a persisted query. Check if we // support them. if (!config.persistedQueries || !config.persistedQueries.cache) { + // We are returning to `runHttpQuery` to preserve legacy behavior while + // still delivering observability to the `didEncounterErrors` hook. + // This particular error will _not_ trigger `willSendResponse`. + // See comment on `emitErrorAndThrow` for more details. return await emitErrorAndThrow(new PersistedQueryNotSupportedError()); } else if (extensions.persistedQuery.version !== 1) { + // We are returning to `runHttpQuery` to preserve legacy behavior while + // still delivering observability to the `didEncounterErrors` hook. + // This particular error will _not_ trigger `willSendResponse`. + // See comment on `emitErrorAndThrow` for more details. return await emitErrorAndThrow( new InvalidGraphQLRequestError('Unsupported persisted query version')); } @@ -188,12 +196,20 @@ export async function processGraphQLRequest( if (query) { metrics.persistedQueryHit = true; } else { + // We are returning to `runHttpQuery` to preserve legacy behavior while + // still delivering observability to the `didEncounterErrors` hook. + // This particular error will _not_ trigger `willSendResponse`. + // See comment on `emitErrorAndThrow` for more details. return await emitErrorAndThrow(new PersistedQueryNotFoundError()); } } else { const computedQueryHash = computeQueryHash(query); if (queryHash !== computedQueryHash) { + // We are returning to `runHttpQuery` to preserve legacy behavior while + // still delivering observability to the `didEncounterErrors` hook. + // This particular error will _not_ trigger `willSendResponse`. + // See comment on `emitErrorAndThrow` for more details. return await emitErrorAndThrow( new InvalidGraphQLRequestError('provided sha does not match query')); } @@ -209,6 +225,10 @@ export async function processGraphQLRequest( // now, but this should be replaced with the new operation ID algorithm. queryHash = computeQueryHash(query); } else { + // We are returning to `runHttpQuery` to preserve legacy behavior + // while still delivering observability to the `didEncounterErrors` hook. + // This particular error will _not_ trigger `willSendResponse`. + // See comment on `emitErrorAndThrow` for more details. return await emitErrorAndThrow( new InvalidGraphQLRequestError('Must provide query string.')); } @@ -359,6 +379,9 @@ export async function processGraphQLRequest( // an error) and not actually write, we'll write to the cache if it was // determined earlier in the request pipeline that we should do so. if (metrics.persistedQueryRegister && persistedQueryCache) { + // While it shouldn't normally be necessary to wrap this `Promise` in a + // `Promise.resolve` invocation, it seems that the underlying cache store + // is returning a non-native `Promise` (e.g. Bluebird, etc.). Promise.resolve( persistedQueryCache.set( queryHash, @@ -556,7 +579,15 @@ export async function processGraphQLRequest( } /** - * Report an error via `didEncounterErrors` and then `throw` it. + * HEREIN LIE LEGACY COMPATIBILITY + * + * DO NOT PERPETUATE THE USE OF THIS METHOD IN NEWLY INTRODUCED CODE. + * + * Report an error via `didEncounterErrors` and then `throw` it again, + * ENTIRELY BYPASSING the rest of the request pipeline and returning + * control to `runHttpQuery.ts`. + * + * Any number of other life-cycle events may not be invoked in this case. * * Prior to the introduction of this function, some errors were being thrown * within the request pipeline and going directly to handling within From 5384dfedbd9619d5d8402f08eb71e1e334934cfd Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Wed, 20 May 2020 12:54:23 +0000 Subject: [PATCH 609/642] fix(reporting): Move invocation of `didEnd` to `willSendResponse`. This fixes a 'addProtobufError called after stopTiming' condition. While this will be fixed in the next generation of the Apollo Server plugin API (in AS3), there are currently error-condition cases where `didEncounterErrors` is called, before execution has ever happened, but `willSendResponse` is not invoked. These are noted in the request pipeline and are special-cased to preserve existing patterns. --- packages/apollo-engine-reporting/src/plugin.ts | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/packages/apollo-engine-reporting/src/plugin.ts b/packages/apollo-engine-reporting/src/plugin.ts index ab6c22220bb..b86c414adbd 100644 --- a/packages/apollo-engine-reporting/src/plugin.ts +++ b/packages/apollo-engine-reporting/src/plugin.ts @@ -1,8 +1,8 @@ import { GraphQLRequestContext, Logger, - GraphQLRequestContextExecutionDidStart, GraphQLRequestContextDidEncounterErrors, + GraphQLRequestContextWillSendResponse, } from 'apollo-server-types'; import { Headers } from 'apollo-server-env'; import { GraphQLSchema, printSchema } from 'graphql'; @@ -117,7 +117,7 @@ export const plugin = ( let endDone: boolean = false; function didEnd( requestContext: - | GraphQLRequestContextExecutionDidStart + | GraphQLRequestContextWillSendResponse | GraphQLRequestContextDidEncounterErrors, ) { if (endDone) return; @@ -214,9 +214,8 @@ export const plugin = ( } }, - executionDidStart(requestContext) { + executionDidStart() { return { - executionDidEnd: () => didEnd(requestContext), willResolveField({ info }) { return treeBuilder.willResolveField(info); // We could save the error into the trace during the end handler, but @@ -226,6 +225,10 @@ export const plugin = ( }; }, + willSendResponse(requestContext) { + didEnd(requestContext); + }, + didEncounterErrors(requestContext) { // Search above for a comment about "didResolveSource" to see which // of the pre-source-resolution errors we are intentionally avoiding. From 52c36d5fe4a5b6c76346e9e39aa21234c6ee41b5 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Wed, 20 May 2020 13:27:05 +0000 Subject: [PATCH 610/642] Add comments about necessity to call `didEnd` in two places. --- packages/apollo-engine-reporting/src/plugin.ts | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/packages/apollo-engine-reporting/src/plugin.ts b/packages/apollo-engine-reporting/src/plugin.ts index b86c414adbd..b960df381df 100644 --- a/packages/apollo-engine-reporting/src/plugin.ts +++ b/packages/apollo-engine-reporting/src/plugin.ts @@ -114,6 +114,16 @@ export const plugin = ( } } + /** + * Due to a number of exceptions in the request pipeline — which are + * intended to preserve backwards compatible behavior with the + * first generation of the request pipeline plugins prior to the + * introduction of `didEncounterErrors` — we need to have this "didEnd" + * functionality invoked from two places. This accounts for the fact + * that sometimes, under some special-cased error conditions, + * `willSendResponse` is not invoked. To zoom in on some of these cases, + * check the `requestPipeline.ts` for `emitErrorAndThrow`. + */ let endDone: boolean = false; function didEnd( requestContext: @@ -226,6 +236,7 @@ export const plugin = ( }, willSendResponse(requestContext) { + // See comment above for why `didEnd` must be called in two hooks. didEnd(requestContext); }, @@ -234,6 +245,8 @@ export const plugin = ( // of the pre-source-resolution errors we are intentionally avoiding. if (!didResolveSource) return; treeBuilder.didEncounterErrors(requestContext.errors); + + // See comment above for why `didEnd` must be called in two hooks. didEnd(requestContext); }, }; From 36afcd616858a772c6c46ee4fe4544f54c69ab75 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Wed, 20 May 2020 17:28:11 +0300 Subject: [PATCH 611/642] Release - apollo-engine-reporting@2.0.0-alpha.2 - @apollo/gateway@0.16.1-alpha.2 - apollo-server-azure-functions@2.14.0-alpha.2 - apollo-server-cloud-functions@2.14.0-alpha.2 - apollo-server-cloudflare@2.14.0-alpha.2 - apollo-server-core@2.14.0-alpha.2 - apollo-server-express@2.14.0-alpha.2 - apollo-server-fastify@2.14.0-alpha.2 - apollo-server-hapi@2.14.0-alpha.2 - apollo-server-integration-testsuite@2.14.0-alpha.2 - apollo-server-koa@2.14.0-alpha.2 - apollo-server-lambda@2.14.0-alpha.2 - apollo-server-micro@2.14.0-alpha.2 - apollo-server-testing@2.14.0-alpha.2 - apollo-server@2.14.0-alpha.2 --- packages/apollo-engine-reporting/package.json | 2 +- packages/apollo-gateway/package.json | 2 +- packages/apollo-server-azure-functions/package.json | 2 +- packages/apollo-server-cloud-functions/package.json | 2 +- packages/apollo-server-cloudflare/package.json | 2 +- packages/apollo-server-core/package.json | 2 +- packages/apollo-server-express/package.json | 2 +- packages/apollo-server-fastify/package.json | 2 +- packages/apollo-server-hapi/package.json | 2 +- packages/apollo-server-integration-testsuite/package.json | 2 +- packages/apollo-server-koa/package.json | 2 +- packages/apollo-server-lambda/package.json | 2 +- packages/apollo-server-micro/package.json | 2 +- packages/apollo-server-testing/package.json | 2 +- packages/apollo-server/package.json | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/packages/apollo-engine-reporting/package.json b/packages/apollo-engine-reporting/package.json index e5e398e6dcd..7d351372131 100644 --- a/packages/apollo-engine-reporting/package.json +++ b/packages/apollo-engine-reporting/package.json @@ -1,6 +1,6 @@ { "name": "apollo-engine-reporting", - "version": "2.0.0-alpha.1", + "version": "2.0.0-alpha.2", "description": "Send reports about your GraphQL services to Apollo Graph Manager (previously known as Apollo Engine)", "main": "./dist/index.js", "types": "./dist/index.d.ts", diff --git a/packages/apollo-gateway/package.json b/packages/apollo-gateway/package.json index 23d5b32986b..8d9088496ef 100644 --- a/packages/apollo-gateway/package.json +++ b/packages/apollo-gateway/package.json @@ -1,6 +1,6 @@ { "name": "@apollo/gateway", - "version": "0.16.1-alpha.1", + "version": "0.16.1-alpha.2", "description": "Apollo Gateway", "author": "opensource@apollographql.com", "main": "dist/index.js", diff --git a/packages/apollo-server-azure-functions/package.json b/packages/apollo-server-azure-functions/package.json index 8f0779b94f8..dce4aadc4c7 100644 --- a/packages/apollo-server-azure-functions/package.json +++ b/packages/apollo-server-azure-functions/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-azure-functions", - "version": "2.14.0-alpha.1", + "version": "2.14.0-alpha.2", "description": "Production-ready Node.js GraphQL server for Azure Functions", "keywords": [ "GraphQL", diff --git a/packages/apollo-server-cloud-functions/package.json b/packages/apollo-server-cloud-functions/package.json index 43512c6fc18..44157166a2a 100644 --- a/packages/apollo-server-cloud-functions/package.json +++ b/packages/apollo-server-cloud-functions/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-cloud-functions", - "version": "2.14.0-alpha.1", + "version": "2.14.0-alpha.2", "description": "Production-ready Node.js GraphQL server for Google Cloud Functions", "keywords": [ "GraphQL", diff --git a/packages/apollo-server-cloudflare/package.json b/packages/apollo-server-cloudflare/package.json index b915fc84763..1b516ffa82a 100644 --- a/packages/apollo-server-cloudflare/package.json +++ b/packages/apollo-server-cloudflare/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-cloudflare", - "version": "2.14.0-alpha.1", + "version": "2.14.0-alpha.2", "description": "Production-ready Node.js GraphQL server for Cloudflare workers", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-core/package.json b/packages/apollo-server-core/package.json index 3660dbad91c..aceb37283bb 100644 --- a/packages/apollo-server-core/package.json +++ b/packages/apollo-server-core/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-core", - "version": "2.14.0-alpha.1", + "version": "2.14.0-alpha.2", "description": "Core engine for Apollo GraphQL server", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-express/package.json b/packages/apollo-server-express/package.json index 00add1126aa..3150adecb4a 100644 --- a/packages/apollo-server-express/package.json +++ b/packages/apollo-server-express/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-express", - "version": "2.14.0-alpha.1", + "version": "2.14.0-alpha.2", "description": "Production-ready Node.js GraphQL server for Express and Connect", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-fastify/package.json b/packages/apollo-server-fastify/package.json index 996a83650ad..e38bc3510e7 100644 --- a/packages/apollo-server-fastify/package.json +++ b/packages/apollo-server-fastify/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-fastify", - "version": "2.14.0-alpha.1", + "version": "2.14.0-alpha.2", "description": "Production-ready Node.js GraphQL server for Fastify", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-hapi/package.json b/packages/apollo-server-hapi/package.json index 69561ae7df2..a9f07414461 100644 --- a/packages/apollo-server-hapi/package.json +++ b/packages/apollo-server-hapi/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-hapi", - "version": "2.14.0-alpha.1", + "version": "2.14.0-alpha.2", "description": "Production-ready Node.js GraphQL server for Hapi", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-integration-testsuite/package.json b/packages/apollo-server-integration-testsuite/package.json index 9f86012a830..3e3b976ba86 100644 --- a/packages/apollo-server-integration-testsuite/package.json +++ b/packages/apollo-server-integration-testsuite/package.json @@ -1,7 +1,7 @@ { "name": "apollo-server-integration-testsuite", "private": true, - "version": "2.14.0-alpha.1", + "version": "2.14.0-alpha.2", "description": "Apollo Server Integrations testsuite", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-koa/package.json b/packages/apollo-server-koa/package.json index 94c1fe4f652..d8d5800d4db 100644 --- a/packages/apollo-server-koa/package.json +++ b/packages/apollo-server-koa/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-koa", - "version": "2.14.0-alpha.1", + "version": "2.14.0-alpha.2", "description": "Production-ready Node.js GraphQL server for Koa", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-lambda/package.json b/packages/apollo-server-lambda/package.json index 06bd618f460..f45abba3f79 100644 --- a/packages/apollo-server-lambda/package.json +++ b/packages/apollo-server-lambda/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-lambda", - "version": "2.14.0-alpha.1", + "version": "2.14.0-alpha.2", "description": "Production-ready Node.js GraphQL server for AWS Lambda", "keywords": [ "GraphQL", diff --git a/packages/apollo-server-micro/package.json b/packages/apollo-server-micro/package.json index 1c9317338cf..c7a09032b0c 100644 --- a/packages/apollo-server-micro/package.json +++ b/packages/apollo-server-micro/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-micro", - "version": "2.14.0-alpha.1", + "version": "2.14.0-alpha.2", "description": "Production-ready Node.js GraphQL server for Micro", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-testing/package.json b/packages/apollo-server-testing/package.json index e6cc267ba08..f95cf2939a0 100644 --- a/packages/apollo-server-testing/package.json +++ b/packages/apollo-server-testing/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-testing", - "version": "2.14.0-alpha.1", + "version": "2.14.0-alpha.2", "description": "Test utils for apollo-server", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server/package.json b/packages/apollo-server/package.json index 8d62350d7f4..794ca7d3578 100644 --- a/packages/apollo-server/package.json +++ b/packages/apollo-server/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server", - "version": "2.14.0-alpha.1", + "version": "2.14.0-alpha.2", "description": "Production ready GraphQL Server", "author": "opensource@apollographql.com", "main": "dist/index.js", From d3ac1ee9bf36d550d383a583f33feeed5650cbb8 Mon Sep 17 00:00:00 2001 From: jakeblaxon <42847286+jakeblaxon@users.noreply.github.com> Date: Wed, 20 May 2020 17:07:35 -0500 Subject: [PATCH 612/642] Update packages/apollo-gateway/CHANGELOG.md Co-authored-by: Trevor Scheer --- packages/apollo-gateway/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-gateway/CHANGELOG.md b/packages/apollo-gateway/CHANGELOG.md index a008401532e..079a262ce68 100644 --- a/packages/apollo-gateway/CHANGELOG.md +++ b/packages/apollo-gateway/CHANGELOG.md @@ -4,7 +4,7 @@ > 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. 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. -- __FIX__: Collapse nested required fields into a single body in the query plan. Before, some nested fields' selection sets were getting split, causing some of their subfields to be dropped when executing the query. This fix collapses the split selection sets into one. +- __FIX__: Collapse nested required fields into a single body in the query plan. Before, some nested fields' selection sets were getting split, causing some of their subfields to be dropped when executing the query. This fix collapses the split selection sets into one. [#4064](https://github.com/apollographql/apollo-server/pull/4064) ## 0.16.0 From e257fe820cb0b0984414414c699b76e71d379d7f Mon Sep 17 00:00:00 2001 From: j125398 Date: Wed, 20 May 2020 17:17:09 -0500 Subject: [PATCH 613/642] Updated 'Field' to Kind.FIELD. --- packages/apollo-gateway/src/FieldSet.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-gateway/src/FieldSet.ts b/packages/apollo-gateway/src/FieldSet.ts index 63995c015f0..18b3db61d18 100644 --- a/packages/apollo-gateway/src/FieldSet.ts +++ b/packages/apollo-gateway/src/FieldSet.ts @@ -138,7 +138,7 @@ function mergeFieldNodeSelectionSets( ): SelectionNode[] { const [fieldNodes, fragmentNodes] = partition( selectionNodes, - (node: SelectionNode): node is FieldNode => node.kind === 'Field', + (node: SelectionNode): node is FieldNode => node.kind === Kind.FIELD, ); const [aliasedFieldNodes, nonAliasedFieldNodes] = partition( From 23dfacad8edb514f1bc8a4d8df30819e1624a57a Mon Sep 17 00:00:00 2001 From: Joshua Segaran Date: Thu, 21 May 2020 07:00:25 -0400 Subject: [PATCH 614/642] docs+changelog: For #4084 and `graphVariant`. (#4138) --- CHANGELOG.md | 35 ++++++++++++++++++++++++++++++++ docs/source/api/apollo-server.md | 10 +++++++-- 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 81a41745010..dcdc83f6b78 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,39 @@ The version headers in this history reflect the versions of Apollo Server itself > 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. 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`: Added an _experimental_ schema reporting option, + `experimental_schemaReporting`, for Apollo Graph Manager users. **During this + experiment, we'd appreciate testing and feedback from current and new + users of the schema registry!** + + Prior to the introduction of this feature, the only way to get schemas into + the schema registry in Apollo Graph Manager was to use the CLI and run + `apollo schema:push`. _Apollo schema reporting protocol_ is a *new* + specification for GraphQL servers to automatically report schemas to the + Apollo Graph Manager schema registry. + + **To enable schema reporting,** provide a Graph Manager API key (available + free from [Apollo Graph Manager](https://engine.apollographql.com/)) in the + `APOLLO_KEY` environment variable *and* set the `experimental_schemaReporting` + option to `true` in the Apollo Server constructor options, like so: + + ```js + const server = new ApolloServer({ + typeDefs, + resolvers, + engine: { + experimental_schemaReporting: true, + /* Other existing options can remain the same. */ + }, + }); + ``` + + > When enabled, a schema reporter is initiated by the `apollo-engine-reporting` agent. It will loop until the `ApolloServer` instance is stopped, periodically calling back to Apollo Graph Manager to send information. The life-cycle of this reporter is managed by the agent. + + For more details on the implementation of this new protocol, see the PR which + introduced it to Apollo Server and the [preview documentation](https://github.com/apollographql/apollo-schema-reporting-preview-docs). + + [PR #4084](https://github.com/apollographql/apollo-server/pull/4084) - `apollo-engine-reporting`: The underlying integration of this plugin, which instruments and traces the graph's resolver performance and transmits these metrics to [Apollo Graph Manager](https://engine.apollographql.com/), has been changed from the (soon to be deprecated) `graphql-extensions` API to the new [request pipeline `plugins` API](https://www.apollographql.com/docs/apollo-server/integrations/plugins/). [PR #3998](https://github.com/apollographql/apollo-server/pull/3998) _This change should be purely an implementation detail for a majority of users_. There are, however, some special considerations which are worth noting: @@ -16,6 +49,8 @@ The version headers in this history reflect the versions of Apollo Server itself - The federated tracing plugin's `ftv1` response on `extensions` (which is present on the response from an implementing service to the gateway) is now placed on the `extensions` _after_ the `formatResponse` hook. Anyone leveraging the `extensions`.`ftv1` data from the `formatResponse` hook will find that it is no longer present at that phase. - `apollo-tracing`: This package's internal integration with Apollo Server has been switched from using the soon-to-be-deprecated`graphql-extensions` API to using [the request pipeline plugin API](https://www.apollographql.com/docs/apollo-server/integrations/plugins/). Behavior should remain otherwise the same. [PR #3991](https://github.com/apollographql/apollo-server/pull/3991) + + ### v2.13.0 > [See complete versioning details.](https://github.com/apollographql/apollo-server/commit/e37384a49b2bf474eed0de3e9f4a1bebaeee64c7) diff --git a/docs/source/api/apollo-server.md b/docs/source/api/apollo-server.md index c5ba9fc92a6..3d3f142f8d7 100644 --- a/docs/source/api/apollo-server.md +++ b/docs/source/api/apollo-server.md @@ -404,7 +404,7 @@ addMockFunctionsToSchema({ - `{ none: true }`: Don't send any variable values. **(DEFAULT)** - `{ all: true }`: Send all variable values. - - `{ transform: ({ variables, operationString}) => { ... } }`: A custom function for modifying variable values. Keys added by the custom function will be removed, and keys removed will be added back with an empty value. For security reasons, if an error occurs within this function, all variable values will be replaced with `[PREDICATE_FUNCTION_ERROR]`. + - `{ transform: ({ variables, operationString}) => { ... } }`: A custom function for modifying variable values. Keys added by the custom function will be removed, and keys removed will be added back with an empty value. For security reasons, if an error occurs within this function, all variable values will be replaced with `[PREDICATE_FUNCTION_ERROR]`. - `{ exceptNames: [...] }`: A case-sensitive list of names of variables whose values should not be sent to Apollo servers. - `{ onlyNames: [...] }`: A case-sensitive list of names of variables whose values will be sent to Apollo servers. @@ -472,7 +472,13 @@ addMockFunctionsToSchema({ * `schemaTag`: String - A human-readable name to tag this variant of a schema (i.e. staging, EU). Setting this value will cause metrics to be segmented in the Apollo Platform's UI. Additionally schema validation with a schema tag will only check metrics associate with the same string. + > Will be deprecated in 3.0. Use the option `graphVariant` instead. + + A human-readable name to tag this variant of a schema (i.e. staging, EU). Setting this value will cause metrics to be segmented in the Apollo Platform's UI. Additionally schema validation with a schema tag will only check metrics associated with the same string. + +* `graphVariant`: String + + A human-readable name for the variant of a schema (i.e. staging, EU). Setting this value will cause metrics to be segmented in the Apollo Graph Manager UI. Additionally schema validation with a graph variant will only check metrics associated with the same string. * `generateClientInfo`: (GraphQLRequestContext) => ClientInfo **AS 2.2** From b18808d200832735ac894bd956a7371732d4bdbe Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 21 May 2020 11:28:13 +0000 Subject: [PATCH 615/642] tests: Loosen the guards in the `pluginTestHarness`. This more accurately reflects the request-pipeline. --- .../src/utils/pluginTestHarness.ts | 38 ++++++++----------- 1 file changed, 16 insertions(+), 22 deletions(-) diff --git a/packages/apollo-server-core/src/utils/pluginTestHarness.ts b/packages/apollo-server-core/src/utils/pluginTestHarness.ts index 86dd63460c9..9af86a5326a 100644 --- a/packages/apollo-server-core/src/utils/pluginTestHarness.ts +++ b/packages/apollo-server-core/src/utils/pluginTestHarness.ts @@ -122,35 +122,29 @@ export default async function pluginTestHarness({ requestContext.overallCachePolicy = overallCachePolicy; if (typeof pluginInstance.requestDidStart !== "function") { - throw new Error("Should be impossible as the plugin is defined."); + throw new Error("This test harness expects this to be defined."); } const listener = pluginInstance.requestDidStart(requestContext); - if (!listener) { - throw new Error("Should be impossible to not have a listener."); - } - - const dispatcher = new Dispatcher([listener]); + const dispatcher = new Dispatcher(listener ? [listener] : []); const executionListeners: GraphQLRequestExecutionListener[] = []; - if (typeof listener.executionDidStart === 'function') { - // This execution dispatcher logic is duplicated in the request pipeline - // right now. - dispatcher.invokeHookSync( - 'executionDidStart', - requestContext as GraphQLRequestContextExecutionDidStart, - ).forEach(executionListener => { - if (typeof executionListener === 'function') { - executionListeners.push({ - executionDidEnd: executionListener, - }); - } else if (typeof executionListener === 'object') { - executionListeners.push(executionListener); - } - }); - } + // This execution dispatcher logic is duplicated in the request pipeline + // right now. + dispatcher.invokeHookSync( + 'executionDidStart', + requestContext as GraphQLRequestContextExecutionDidStart, + ).forEach(executionListener => { + if (typeof executionListener === 'function') { + executionListeners.push({ + executionDidEnd: executionListener, + }); + } else if (typeof executionListener === 'object') { + executionListeners.push(executionListener); + } + }); const executionDispatcher = new Dispatcher(executionListeners); From 960e073252975149152e050f51107c14a3cc430b Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 21 May 2020 14:15:53 +0000 Subject: [PATCH 616/642] Add disclaimer about schema reporting being for non-federated graphs. Follows-up: https://github.com/apollographql/apollo-server/pull/3998 --- CHANGELOG.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dcdc83f6b78..f36eb095a03 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,9 +9,10 @@ The version headers in this history reflect the versions of Apollo Server itself > 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. 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`: Added an _experimental_ schema reporting option, - `experimental_schemaReporting`, for Apollo Graph Manager users. **During this - experiment, we'd appreciate testing and feedback from current and new +- `apollo-engine-reporting`: **Currently only for non-federated graphs.** + Added an _experimental_ schema reporting option, + `experimental_schemaReporting`, for Apollo Graph Manager users. **During + this experiment, we'd appreciate testing and feedback from current and new users of the schema registry!** Prior to the introduction of this feature, the only way to get schemas into From 89467d49578b11a1104964df9f0bf67bb072b9ee Mon Sep 17 00:00:00 2001 From: j125398 Date: Thu, 21 May 2020 12:00:51 -0500 Subject: [PATCH 617/642] Added overloaded signatures to partition function. --- packages/apollo-gateway/src/FieldSet.ts | 4 ++-- packages/apollo-gateway/src/utilities/array.ts | 12 ++++++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/packages/apollo-gateway/src/FieldSet.ts b/packages/apollo-gateway/src/FieldSet.ts index 18b3db61d18..7c792ea2a6b 100644 --- a/packages/apollo-gateway/src/FieldSet.ts +++ b/packages/apollo-gateway/src/FieldSet.ts @@ -138,12 +138,12 @@ function mergeFieldNodeSelectionSets( ): SelectionNode[] { const [fieldNodes, fragmentNodes] = partition( selectionNodes, - (node: SelectionNode): node is FieldNode => node.kind === Kind.FIELD, + (node): node is FieldNode => node.kind === Kind.FIELD, ); const [aliasedFieldNodes, nonAliasedFieldNodes] = partition( fieldNodes, - (node: FieldNode): node is FieldNode => !!node.alias, + node => !!node.alias, ); const mergedFieldNodes = Array.from( diff --git a/packages/apollo-gateway/src/utilities/array.ts b/packages/apollo-gateway/src/utilities/array.ts index f421563a8e2..2aaea1d5e9c 100644 --- a/packages/apollo-gateway/src/utilities/array.ts +++ b/packages/apollo-gateway/src/utilities/array.ts @@ -19,7 +19,15 @@ export function compactMap( export function partition( array: T[], predicate: (element: T, index: number, array: T[]) => element is U, -): [U[], T[]] { +): [U[], T[]]; +export function partition( + array: T[], + predicate: (element: T, index: number, array: T[]) => boolean, +): [T[], T[]]; +export function partition( + array: T[], + predicate: (element: T, index: number, array: T[]) => boolean, +): [T[], T[]] { array.map; return array.reduce( (accumulator, element, index) => { @@ -30,7 +38,7 @@ export function partition( accumulator ); }, - [[], []] as [U[], T[]], + [[], []] as [T[], T[]], ); } From e323bad86c535a715e31fa67ff6db6021f9d284d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 23 May 2020 09:13:23 +0000 Subject: [PATCH 618/642] chore(deps): update dependency @types/jest to v25.2.3 (#4150) Co-authored-by: Renovate Bot --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index c293ea72572..e0ccd4d288c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4954,9 +4954,9 @@ } }, "@types/jest": { - "version": "25.2.2", - "resolved": "https://registry.npmjs.org/@types/jest/-/jest-25.2.2.tgz", - "integrity": "sha512-aRctFbG8Pb7DSLzUt/fEtL3q/GKb9mretFuYhRub2J0q6NhzBYbx9HTQzHrWgBNIxYOlxGNVe6Z54cpbUt+Few==", + "version": "25.2.3", + "resolved": "https://registry.npmjs.org/@types/jest/-/jest-25.2.3.tgz", + "integrity": "sha512-JXc1nK/tXHiDhV55dvfzqtmP4S3sy3T3ouV2tkViZgxY/zeUkcpQcQPGRlgF4KmWzWW5oiWYSZwtCB+2RsE4Fw==", "dev": true, "requires": { "jest-diff": "^25.2.1", diff --git a/package.json b/package.json index 3454ef8a065..13189ebf830 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,7 @@ "@types/fast-json-stable-stringify": "2.0.0", "@types/hapi": "17.8.8", "@types/ioredis": "4.16.2", - "@types/jest": "25.2.2", + "@types/jest": "25.2.3", "@types/koa-router": "7.4.1", "@types/lodash": "4.14.151", "@types/lodash.sortby": "4.7.6", From 1125fdb62d00b5fa7b134e316d28ffc33f1f2fbf Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 23 May 2020 10:14:37 +0000 Subject: [PATCH 619/642] chore(deps): update dependency @types/lodash to v4.14.152 (#4151) Co-authored-by: Renovate Bot --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index e0ccd4d288c..f121fef9e70 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5116,9 +5116,9 @@ } }, "@types/lodash": { - "version": "4.14.151", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.151.tgz", - "integrity": "sha512-Zst90IcBX5wnwSu7CAS0vvJkTjTELY4ssKbHiTnGcJgi170uiS8yQDdc3v6S77bRqYQIN1App5a1Pc2lceE5/g==", + "version": "4.14.152", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.152.tgz", + "integrity": "sha512-Vwf9YF2x1GE3WNeUMjT5bTHa2DqgUo87ocdgTScupY2JclZ5Nn7W2RLM/N0+oreexUk8uaVugR81NnTY/jNNXg==", "dev": true }, "@types/lodash.sortby": { diff --git a/package.json b/package.json index 13189ebf830..45404aeea79 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ "@types/ioredis": "4.16.2", "@types/jest": "25.2.3", "@types/koa-router": "7.4.1", - "@types/lodash": "4.14.151", + "@types/lodash": "4.14.152", "@types/lodash.sortby": "4.7.6", "@types/lodash.xorby": "4.7.6", "@types/loglevel": "1.5.4", From 5cb3e8f6a0b541b199b9a4553e3beb58ca53d726 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 23 May 2020 11:13:48 +0000 Subject: [PATCH 620/642] chore(deps): update dependency @types/node to v8.10.61 (#4152) Co-authored-by: Renovate Bot --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index f121fef9e70..09464bb27b3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5216,9 +5216,9 @@ } }, "@types/node": { - "version": "8.10.60", - "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.60.tgz", - "integrity": "sha512-YjPbypHFuiOV0bTgeF07HpEEqhmHaZqYNSdCKeBJa+yFoQ/7BC+FpJcwmi34xUIIRVFktnUyP1dPU8U0612GOg==" + "version": "8.10.61", + "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.61.tgz", + "integrity": "sha512-l+zSbvT8TPRaCxL1l9cwHCb0tSqGAGcjPJFItGGYat5oCTiq1uQQKYg5m7AF1mgnEBzFXGLJ2LRmNjtreRX76Q==" }, "@types/node-fetch": { "version": "2.3.2", diff --git a/package.json b/package.json index 45404aeea79..150ac68cbf0 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,7 @@ "@types/memcached": "2.2.6", "@types/micro": "7.3.3", "@types/nock": "10.0.3", - "@types/node": "8.10.60", + "@types/node": "8.10.61", "@types/node-fetch": "2.3.2", "@types/qs-middleware": "1.0.1", "@types/request": "2.48.5", From 182d39a08161e60b107def6fec40016878308ee3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 23 May 2020 12:15:20 +0000 Subject: [PATCH 621/642] chore(deps): update dependency codecov to v3.7.0 (#4153) Co-authored-by: Renovate Bot --- package-lock.json | 24 +++++++----------------- package.json | 2 +- 2 files changed, 8 insertions(+), 18 deletions(-) diff --git a/package-lock.json b/package-lock.json index 09464bb27b3..6e4396ab58b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7111,9 +7111,9 @@ "dev": true }, "codecov": { - "version": "3.6.5", - "resolved": "https://registry.npmjs.org/codecov/-/codecov-3.6.5.tgz", - "integrity": "sha512-v48WuDMUug6JXwmmfsMzhCHRnhUf8O3duqXvltaYJKrO1OekZWpB/eH6iIoaxMl8Qli0+u3OxptdsBOYiD7VAQ==", + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/codecov/-/codecov-3.7.0.tgz", + "integrity": "sha512-uIixKofG099NbUDyzRk1HdGtaG8O+PBUAg3wfmjwXw2+ek+PZp+puRvbTohqrVfuudaezivJHFgTtSC3M8MXww==", "dev": true, "requires": { "argv": "0.0.2", @@ -7121,17 +7121,6 @@ "js-yaml": "3.13.1", "teeny-request": "6.0.1", "urlgrey": "0.4.4" - }, - "dependencies": { - "ignore-walk": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz", - "integrity": "sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==", - "dev": true, - "requires": { - "minimatch": "^3.0.4" - } - } } }, "collect-v8-coverage": { @@ -18857,11 +18846,12 @@ } }, "http-proxy-agent": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.0.tgz", - "integrity": "sha512-GX0FA6+IcDf4Oxc/FBWgYj4zKgo/DnZrksaG9jyuQLExs6xlX+uI5lcA8ymM3JaZTRrF/4s2UX19wJolyo7OBA==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz", + "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==", "dev": true, "requires": { + "@tootallnate/once": "1", "agent-base": "6", "debug": "4" } diff --git a/package.json b/package.json index 150ac68cbf0..99bc0e71f26 100644 --- a/package.json +++ b/package.json @@ -94,7 +94,7 @@ "azure-functions-ts-essentials": "1.3.2", "body-parser": "1.19.0", "bunyan": "1.8.12", - "codecov": "3.6.5", + "codecov": "3.7.0", "connect": "3.7.0", "deep-freeze": "0.0.1", "express": "4.17.1", From 186fad179ea75a167560d043072314a912440ee3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 23 May 2020 13:14:11 +0000 Subject: [PATCH 622/642] chore(deps): update dependency gatsby to v2.22.9 (#4154) Co-authored-by: Renovate Bot --- docs/package-lock.json | 800 ++++++++++++++++++++++++++++++----------- docs/package.json | 2 +- 2 files changed, 598 insertions(+), 204 deletions(-) diff --git a/docs/package-lock.json b/docs/package-lock.json index 03314c45442..d294f824684 100644 --- a/docs/package-lock.json +++ b/docs/package-lock.json @@ -2898,13 +2898,242 @@ "integrity": "sha512-jXBSWdWFPK2fs3johKb0hQFsf/x/C24XQYQwMhj8FxwlBgf7+NGATwXFs6pGkKd5/JfK9HXmbOcQ78MYoIZyxA==" }, "@mdx-js/runtime": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/@mdx-js/runtime/-/runtime-1.6.1.tgz", - "integrity": "sha512-aqBheB4Qj/zj/YpfXoI2csQor4xSDgIzm1R8OgHXd6ePdZRxPLtwoQUgEHN/M40yq8QsRE+edvH5wlQeBXhJyw==", + "version": "1.6.4", + "resolved": "https://registry.npmjs.org/@mdx-js/runtime/-/runtime-1.6.4.tgz", + "integrity": "sha512-ZLQZksNeWkgiT83UGYdB3LbxKVmBfDdi696noL/iwAt7nMk4lTMlO6Pm/iqLZli3b4f/mgtsxk2gyNDiiN6axA==", "requires": { - "@mdx-js/mdx": "^1.6.1", - "@mdx-js/react": "^1.6.1", + "@mdx-js/mdx": "^1.6.4", + "@mdx-js/react": "^1.6.4", "buble-jsx-only": "^0.19.8" + }, + "dependencies": { + "@babel/code-frame": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", + "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", + "requires": { + "@babel/highlight": "^7.8.3" + } + }, + "@babel/core": { + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.6.tgz", + "integrity": "sha512-nD3deLvbsApbHAHttzIssYqgb883yU/d9roe4RZymBCDaZryMJDbptVpEpeQuRh4BJ+SYI8le9YGxKvFEvl1Wg==", + "requires": { + "@babel/code-frame": "^7.8.3", + "@babel/generator": "^7.9.6", + "@babel/helper-module-transforms": "^7.9.0", + "@babel/helpers": "^7.9.6", + "@babel/parser": "^7.9.6", + "@babel/template": "^7.8.6", + "@babel/traverse": "^7.9.6", + "@babel/types": "^7.9.6", + "convert-source-map": "^1.7.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.1", + "json5": "^2.1.2", + "lodash": "^4.17.13", + "resolve": "^1.3.2", + "semver": "^5.4.1", + "source-map": "^0.5.0" + } + }, + "@babel/generator": { + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.6.tgz", + "integrity": "sha512-+htwWKJbH2bL72HRluF8zumBxzuX0ZZUFl3JLNyoUjM/Ho8wnVpPXM6aUz8cfKDqQ/h7zHqKt4xzJteUosckqQ==", + "requires": { + "@babel/types": "^7.9.6", + "jsesc": "^2.5.1", + "lodash": "^4.17.13", + "source-map": "^0.5.0" + } + }, + "@babel/helper-function-name": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz", + "integrity": "sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==", + "requires": { + "@babel/helper-get-function-arity": "^7.8.3", + "@babel/template": "^7.8.3", + "@babel/types": "^7.9.5" + } + }, + "@babel/helper-plugin-utils": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", + "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" + }, + "@babel/helpers": { + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.6.tgz", + "integrity": "sha512-tI4bUbldloLcHWoRUMAj4g1bF313M/o6fBKhIsb3QnGVPwRm9JsNf/gqMkQ7zjqReABiffPV6RWj7hEglID5Iw==", + "requires": { + "@babel/template": "^7.8.3", + "@babel/traverse": "^7.9.6", + "@babel/types": "^7.9.6" + } + }, + "@babel/highlight": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz", + "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==", + "requires": { + "@babel/helper-validator-identifier": "^7.9.0", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" + } + }, + "@babel/parser": { + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.6.tgz", + "integrity": "sha512-AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q==" + }, + "@babel/template": { + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz", + "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==", + "requires": { + "@babel/code-frame": "^7.8.3", + "@babel/parser": "^7.8.6", + "@babel/types": "^7.8.6" + } + }, + "@babel/traverse": { + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.6.tgz", + "integrity": "sha512-b3rAHSjbxy6VEAvlxM8OV/0X4XrG72zoxme6q1MOoe2vd0bEc+TwayhuC1+Dfgqh1QEG+pj7atQqvUprHIccsg==", + "requires": { + "@babel/code-frame": "^7.8.3", + "@babel/generator": "^7.9.6", + "@babel/helper-function-name": "^7.9.5", + "@babel/helper-split-export-declaration": "^7.8.3", + "@babel/parser": "^7.9.6", + "@babel/types": "^7.9.6", + "debug": "^4.1.0", + "globals": "^11.1.0", + "lodash": "^4.17.13" + } + }, + "@babel/types": { + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.6.tgz", + "integrity": "sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA==", + "requires": { + "@babel/helper-validator-identifier": "^7.9.5", + "lodash": "^4.17.13", + "to-fast-properties": "^2.0.0" + }, + "dependencies": { + "@babel/helper-validator-identifier": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz", + "integrity": "sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==" + } + } + }, + "@mdx-js/mdx": { + "version": "1.6.4", + "resolved": "https://registry.npmjs.org/@mdx-js/mdx/-/mdx-1.6.4.tgz", + "integrity": "sha512-TuKjwVrp0bhuv++SnqHp3k7agawS4d29sSL9p1B6Wv6IxJTfkJPMD1rI+Ahek45qTNY0Sxh4Q6kox9a7cq1tag==", + "requires": { + "@babel/core": "7.9.6", + "@babel/plugin-syntax-jsx": "7.8.3", + "@babel/plugin-syntax-object-rest-spread": "7.8.3", + "@mdx-js/util": "^1.6.4", + "babel-plugin-apply-mdx-type-prop": "^1.6.4", + "babel-plugin-extract-import-names": "^1.6.4", + "camelcase-css": "2.0.1", + "detab": "2.0.3", + "hast-util-raw": "5.0.2", + "lodash.uniq": "4.5.0", + "mdast-util-to-hast": "9.1.0", + "remark-footnotes": "1.0.0", + "remark-mdx": "^1.6.4", + "remark-parse": "8.0.2", + "remark-squeeze-paragraphs": "4.0.0", + "style-to-object": "0.3.0", + "unified": "9.0.0", + "unist-builder": "2.0.3", + "unist-util-visit": "2.0.2" + } + }, + "@mdx-js/react": { + "version": "1.6.4", + "resolved": "https://registry.npmjs.org/@mdx-js/react/-/react-1.6.4.tgz", + "integrity": "sha512-3SwDgbr2Fc3i5LrOQnahRUTvx0x/wRf+i8+fJM1caGTeq1XwVb6OHztJzaYt3DSizJVzRsBZznReY+l39up5Pg==" + }, + "@mdx-js/util": { + "version": "1.6.4", + "resolved": "https://registry.npmjs.org/@mdx-js/util/-/util-1.6.4.tgz", + "integrity": "sha512-cVGZ68yZwyJnOMhARAdgD1IhZ0bsbsKCvsj6I/XnJcT9hNV/8WXErSV98zFfZwH3LmSRPde58l9hln+zXdK/mQ==" + }, + "babel-plugin-apply-mdx-type-prop": { + "version": "1.6.4", + "resolved": "https://registry.npmjs.org/babel-plugin-apply-mdx-type-prop/-/babel-plugin-apply-mdx-type-prop-1.6.4.tgz", + "integrity": "sha512-rVtztbgf3zmT1Is6vSNugfbdI2AG3mk/PUS8H71ss5V2XRNyYgeuFgTMX3h0bTDEJnbFG3ilRH566kVhZAkGWg==", + "requires": { + "@babel/helper-plugin-utils": "7.8.3", + "@mdx-js/util": "^1.6.4" + } + }, + "babel-plugin-extract-import-names": { + "version": "1.6.4", + "resolved": "https://registry.npmjs.org/babel-plugin-extract-import-names/-/babel-plugin-extract-import-names-1.6.4.tgz", + "integrity": "sha512-oShDRQX9CGDkg61DnNJG7T/ROjIpgzyLTi3mGr3fwbNDP3kiJ6TousEPu6d090qNUm/XiUasQ1ESOnLAb7plqQ==", + "requires": { + "@babel/helper-plugin-utils": "7.8.3" + } + }, + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "requires": { + "ms": "^2.1.1" + } + }, + "mdast-util-definitions": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/mdast-util-definitions/-/mdast-util-definitions-3.0.1.tgz", + "integrity": "sha512-BAv2iUm/e6IK/b2/t+Fx69EL/AGcq/IG2S+HxHjDJGfLJtd6i9SZUS76aC9cig+IEucsqxKTR0ot3m933R3iuA==", + "requires": { + "unist-util-visit": "^2.0.0" + } + }, + "mdast-util-to-hast": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-9.1.0.tgz", + "integrity": "sha512-Akl2Vi9y9cSdr19/Dfu58PVwifPXuFt1IrHe7l+Crme1KvgUT+5z+cHLVcQVGCiNTZZcdqjnuv9vPkGsqWytWA==", + "requires": { + "@types/mdast": "^3.0.0", + "@types/unist": "^2.0.3", + "collapse-white-space": "^1.0.0", + "detab": "^2.0.0", + "mdast-util-definitions": "^3.0.0", + "mdurl": "^1.0.0", + "trim-lines": "^1.0.0", + "unist-builder": "^2.0.0", + "unist-util-generated": "^1.0.0", + "unist-util-position": "^3.0.0", + "unist-util-visit": "^2.0.0" + } + }, + "remark-mdx": { + "version": "1.6.4", + "resolved": "https://registry.npmjs.org/remark-mdx/-/remark-mdx-1.6.4.tgz", + "integrity": "sha512-tJ/CGNNLVC8nOm0C3EjDQH4Vl3YhawgR2f3J+RaalrMDrT4s5ZzOqoNesV1cnF/DsoOxKlYkExOpNSOa6rkAtQ==", + "requires": { + "@babel/core": "7.9.6", + "@babel/helper-plugin-utils": "7.8.3", + "@babel/plugin-proposal-object-rest-spread": "7.9.6", + "@babel/plugin-syntax-jsx": "7.8.3", + "@mdx-js/util": "^1.6.4", + "is-alphabetical": "1.0.4", + "remark-parse": "8.0.2", + "unified": "9.0.0" + } + } } }, "@mdx-js/util": { @@ -2968,9 +3197,9 @@ } }, "@pmmmwh/react-refresh-webpack-plugin": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.3.1.tgz", - "integrity": "sha512-JlbMOHNtoaLV5LR/GWpfDZht5qQqMr2E6Fcto2GcGCiVSDWN9C9wac+WNhGWaAfKh9pLOlz3EX4DkWl4Tb7sCg==", + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.3.2.tgz", + "integrity": "sha512-3BPQLDiev6hIkQvhUGKO0nS7/u8l2dgIu1AbUcVnjgxuzrwIox70gb98K8p9lDO67DgCg7bWT6KE9GgdcMYtng==", "requires": { "ansi-html": "^0.0.7", "error-stack-parser": "^2.0.6", @@ -3173,9 +3402,17 @@ } }, "@types/history": { - "version": "4.7.5", - "resolved": "https://registry.npmjs.org/@types/history/-/history-4.7.5.tgz", - "integrity": "sha512-wLD/Aq2VggCJXSjxEwrMafIP51Z+13H78nXIX0ABEuIGhmB5sNGbR113MOKo+yfw+RDo1ZU3DM6yfnnRF/+ouw==" + "version": "4.7.6", + "resolved": "https://registry.npmjs.org/@types/history/-/history-4.7.6.tgz", + "integrity": "sha512-GRTZLeLJ8ia00ZH8mxMO8t0aC9M1N9bN461Z2eaRurJo6Fpa+utgCwLzI4jQHcrdzuzp5WPN9jRwpsCQ1VhJ5w==" + }, + "@types/http-proxy": { + "version": "1.17.4", + "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.4.tgz", + "integrity": "sha512-IrSHl2u6AWXduUaDLqYpt45tLVCtYv7o4Z0s1KghBCDgIIS9oW5K1H8mZG/A2CfeLdEa7rTd1ACOiHBc1EMT2Q==", + "requires": { + "@types/node": "*" + } }, "@types/istanbul-lib-coverage": { "version": "2.0.2", @@ -3205,9 +3442,9 @@ "integrity": "sha512-8+KAKzEvSUdeo+kmqnKrqgeE+LcA0tjYWFY7RPProVYwnqDjukzO+3b6dLD56rYX5TdWejnEOLJYOIeh4CXKuA==" }, "@types/lodash": { - "version": "4.14.151", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.151.tgz", - "integrity": "sha512-Zst90IcBX5wnwSu7CAS0vvJkTjTELY4ssKbHiTnGcJgi170uiS8yQDdc3v6S77bRqYQIN1App5a1Pc2lceE5/g==" + "version": "4.14.152", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.152.tgz", + "integrity": "sha512-Vwf9YF2x1GE3WNeUMjT5bTHa2DqgUo87ocdgTScupY2JclZ5Nn7W2RLM/N0+oreexUk8uaVugR81NnTY/jNNXg==" }, "@types/mdast": { "version": "3.0.3", @@ -3332,48 +3569,48 @@ "integrity": "sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==" }, "@types/yoga-layout": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/@types/yoga-layout/-/yoga-layout-1.9.1.tgz", - "integrity": "sha512-OpfgQXWLZn5Dl7mOd8dBNcV8NywXbYYoHjUpa64vJ/RQABaxMzJ5bVicKLGIvIiMnQPtPgKNgXb5jkv9fkOQtw==", + "version": "1.9.2", + "resolved": "https://registry.npmjs.org/@types/yoga-layout/-/yoga-layout-1.9.2.tgz", + "integrity": "sha512-S9q47ByT2pPvD65IvrWp7qppVMpk9WGMbVq9wbWZOHg6tnXSD4vyhao6nOSBwwfDdV2p3Kx9evA9vI+XWTfDvw==", "optional": true }, "@typescript-eslint/eslint-plugin": { - "version": "2.33.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.33.0.tgz", - "integrity": "sha512-QV6P32Btu1sCI/kTqjTNI/8OpCYyvlGjW5vD8MpTIg+HGE5S88HtT1G+880M4bXlvXj/NjsJJG0aGcVh0DdbeQ==", + "version": "2.34.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.34.0.tgz", + "integrity": "sha512-4zY3Z88rEE99+CNvTbXSyovv2z9PNOVffTWD2W8QF5s2prBQtwN2zadqERcrHpcR7O/+KMI3fcTAmUUhK/iQcQ==", "requires": { - "@typescript-eslint/experimental-utils": "2.33.0", + "@typescript-eslint/experimental-utils": "2.34.0", "functional-red-black-tree": "^1.0.1", "regexpp": "^3.0.0", "tsutils": "^3.17.1" } }, "@typescript-eslint/experimental-utils": { - "version": "2.33.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.33.0.tgz", - "integrity": "sha512-qzPM2AuxtMrRq78LwyZa8Qn6gcY8obkIrBs1ehqmQADwkYzTE1Pb4y2W+U3rE/iFkSWcWHG2LS6MJfj6SmHApg==", + "version": "2.34.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.34.0.tgz", + "integrity": "sha512-eS6FTkq+wuMJ+sgtuNTtcqavWXqsflWcfBnlYhg/nS4aZ1leewkXGbvBhaapn1q6qf4M71bsR1tez5JTRMuqwA==", "requires": { "@types/json-schema": "^7.0.3", - "@typescript-eslint/typescript-estree": "2.33.0", + "@typescript-eslint/typescript-estree": "2.34.0", "eslint-scope": "^5.0.0", "eslint-utils": "^2.0.0" } }, "@typescript-eslint/parser": { - "version": "2.33.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.33.0.tgz", - "integrity": "sha512-AUtmwUUhJoH6yrtxZMHbRUEMsC2G6z5NSxg9KsROOGqNXasM71I8P2NihtumlWTUCRld70vqIZ6Pm4E5PAziEA==", + "version": "2.34.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.34.0.tgz", + "integrity": "sha512-03ilO0ucSD0EPTw2X4PntSIRFtDPWjrVq7C3/Z3VQHRC7+13YB55rcJI3Jt+YgeHbjUdJPcPa7b23rXCBokuyA==", "requires": { "@types/eslint-visitor-keys": "^1.0.0", - "@typescript-eslint/experimental-utils": "2.33.0", - "@typescript-eslint/typescript-estree": "2.33.0", + "@typescript-eslint/experimental-utils": "2.34.0", + "@typescript-eslint/typescript-estree": "2.34.0", "eslint-visitor-keys": "^1.1.0" } }, "@typescript-eslint/typescript-estree": { - "version": "2.33.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.33.0.tgz", - "integrity": "sha512-d8rY6/yUxb0+mEwTShCQF2zYQdLlqihukNfG9IUlLYz5y1CH6G/9XYbrxQLq3Z14RNvkCC6oe+OcFlyUpwUbkg==", + "version": "2.34.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.34.0.tgz", + "integrity": "sha512-OMAr+nJWKdlVM9LOqCqh3pQQPwxHAN7Du8DR6dmwCrAmxtiXQnhHJ6tBNtf+cggqfo51SG/FCwnKhXCIM7hnVg==", "requires": { "debug": "^4.1.1", "eslint-visitor-keys": "^1.1.0", @@ -4083,17 +4320,42 @@ "optional": true }, "autoprefixer": { - "version": "9.7.6", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.7.6.tgz", - "integrity": "sha512-F7cYpbN7uVVhACZTeeIeealwdGM6wMtfWARVLTy5xmKtgVdBNJvbDRoCK3YO1orcs7gv/KwYlb3iXwu9Ug9BkQ==", + "version": "9.8.0", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.0.tgz", + "integrity": "sha512-D96ZiIHXbDmU02dBaemyAg53ez+6F5yZmapmgKcjm35yEe1uVDYI8hGW3VYoGRaG290ZFf91YxHrR518vC0u/A==", "requires": { - "browserslist": "^4.11.1", - "caniuse-lite": "^1.0.30001039", + "browserslist": "^4.12.0", + "caniuse-lite": "^1.0.30001061", "chalk": "^2.4.2", "normalize-range": "^0.1.2", "num2fraction": "^1.2.2", - "postcss": "^7.0.27", - "postcss-value-parser": "^4.0.3" + "postcss": "^7.0.30", + "postcss-value-parser": "^4.1.0" + }, + "dependencies": { + "postcss": { + "version": "7.0.30", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.30.tgz", + "integrity": "sha512-nu/0m+NtIzoubO+xdAlwZl/u5S5vi/y6BCsoL8D+8IxsD3XvBS8X4YEADNIVXKVuQvduiucnRv+vPIqj56EGMQ==", + "requires": { + "chalk": "^2.4.2", + "source-map": "^0.6.1", + "supports-color": "^6.1.0" + } + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" + }, + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "requires": { + "has-flag": "^3.0.0" + } + } } }, "aws-sign2": { @@ -4368,9 +4630,9 @@ } }, "babel-plugin-remove-graphql-queries": { - "version": "2.9.1", - "resolved": "https://registry.npmjs.org/babel-plugin-remove-graphql-queries/-/babel-plugin-remove-graphql-queries-2.9.1.tgz", - "integrity": "sha512-Ua41OqiQ0yUi/9ZvbdhCKCkiCAdwCSVxtf5umV1scD6mMYd70eIA9or3M2nxhqHJ2leSRCYdyu771seEICkC3Q==" + "version": "2.9.2", + "resolved": "https://registry.npmjs.org/babel-plugin-remove-graphql-queries/-/babel-plugin-remove-graphql-queries-2.9.2.tgz", + "integrity": "sha512-W6UpWAT18G27XfXvBmBoSsb5CfeMRf3K/dCkK5w0i9D9VC4CIj3162s2P2SGawqEraO1njKgjvkRfut8uTLUdw==" }, "babel-plugin-syntax-jsx": { "version": "6.18.0", @@ -4383,9 +4645,9 @@ "integrity": "sha512-eqj0hVcJUR57/Ug2zE1Yswsw4LhuqqHhD+8v120T1cl3kjg76QwtyBrdIk4WVwK+lAhBJVYCd/v+4nc4y+8JsA==" }, "babel-preset-gatsby": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/babel-preset-gatsby/-/babel-preset-gatsby-0.4.2.tgz", - "integrity": "sha512-PegbKTUBGCkDqwI68uF/rKrHNJ2ZP/WYiSgVa+xmseywqRtrw03kKIcmzM/j3jAOVo/efVW545KKzd2wPc9wjw==", + "version": "0.4.7", + "resolved": "https://registry.npmjs.org/babel-preset-gatsby/-/babel-preset-gatsby-0.4.7.tgz", + "integrity": "sha512-s8YBkUJRZL4rVwAMDiXuE4NNpmwRQBBcFluns/L4ehJvckMoSZvRkX6APTiXW4ztdehxzT6/m7oE22Q91boAvQ==", "requires": { "@babel/plugin-proposal-class-properties": "^7.8.3", "@babel/plugin-proposal-nullish-coalescing-operator": "^7.8.3", @@ -4399,7 +4661,7 @@ "babel-plugin-dynamic-import-node": "^2.3.3", "babel-plugin-macros": "^2.8.0", "babel-plugin-transform-react-remove-prop-types": "^0.4.24", - "gatsby-core-utils": "^1.2.2" + "gatsby-core-utils": "^1.3.3" }, "dependencies": { "@babel/runtime": { @@ -4410,6 +4672,19 @@ "regenerator-runtime": "^0.13.4" } }, + "gatsby-core-utils": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.3.3.tgz", + "integrity": "sha512-kRcC7Fsn7puGeJERK5EZ3x4drPOnnYNlFygl1tEbpFIKdOhsWRlRF8es7uaqwyZBtBYJHVHHjCyJszRiJRZ5Sw==", + "requires": { + "ci-info": "2.0.0", + "configstore": "^5.0.1", + "fs-extra": "^8.1.0", + "node-object-hash": "^2.0.0", + "proper-lockfile": "^4.1.1", + "xdg-basedir": "^4.0.0" + } + }, "regenerator-runtime": { "version": "0.13.5", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", @@ -4911,9 +5186,9 @@ }, "dependencies": { "electron-to-chromium": { - "version": "1.3.441", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.441.tgz", - "integrity": "sha512-leBfJwLuyGs1jEei2QioI+PjVMavmUIvPYidE8dCCYWLAq0uefhN3NYgDNb8WxD3uiUNnJ3ScMXg0upSlwySzQ==" + "version": "1.3.451", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.451.tgz", + "integrity": "sha512-2fvco0F2bBIgqzO8GRP0Jt/91pdrf9KfZ5FsmkYkjERmIJG585cFeFZV4+CO6oTmU3HmCTgfcZuEa7kW8VUh3A==" } } }, @@ -5182,9 +5457,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001061", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001061.tgz", - "integrity": "sha512-SMICCeiNvMZnyXpuoO+ot7FHpMVPlrsR+HmfByj6nY4xYDHXLqMTbgH7ecEkDNXWkH1vaip+ZS0D7VTXwM1KYQ==" + "version": "1.0.30001064", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001064.tgz", + "integrity": "sha512-hdBcQMFvJIrOhkpAZiRXz04Cmetwc9NekeuNl0qZfHOugxOhJKxsjF1RmISMPFjIF4PPx1reliIzbfN42EiQ5A==" }, "caseless": { "version": "0.12.0", @@ -6750,9 +7025,9 @@ "integrity": "sha512-68s5jYdlvasItOJnCuI2Q9s4q98g0pCyL3HrcKJu8KNugUl8ahgmZYg38ysLTgQjjXX3H8CJLkAvWrclWfcalw==" }, "date-fns": { - "version": "2.13.0", - "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.13.0.tgz", - "integrity": "sha512-xm0c61mevGF7f0XpCGtDTGpzEFC/1fpLXHbmFpxZZQJuvByIK2ozm6cSYuU+nxFYOPh2EuCfzUwlTEFwKG+h5w==" + "version": "2.14.0", + "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.14.0.tgz", + "integrity": "sha512-1zD+68jhFgDIM0rF05rcwYO8cExdNqxjq4xP1QKM60Q45mnO6zaMWB4tOzrIr4M4GSLntsKeE4c9Bdl2jhL/yw==" }, "debug": { "version": "3.2.6", @@ -7028,9 +7303,9 @@ } }, "@types/node": { - "version": "8.10.60", - "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.60.tgz", - "integrity": "sha512-YjPbypHFuiOV0bTgeF07HpEEqhmHaZqYNSdCKeBJa+yFoQ/7BC+FpJcwmi34xUIIRVFktnUyP1dPU8U0612GOg==" + "version": "8.10.61", + "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.61.tgz", + "integrity": "sha512-l+zSbvT8TPRaCxL1l9cwHCb0tSqGAGcjPJFItGGYat5oCTiq1uQQKYg5m7AF1mgnEBzFXGLJ2LRmNjtreRX76Q==" }, "configstore": { "version": "3.1.2", @@ -7084,6 +7359,14 @@ "glob": "^7.1.3" } }, + "tmp": { + "version": "0.0.33", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", + "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", + "requires": { + "os-tmpdir": "~1.0.2" + } + }, "unique-string": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz", @@ -8053,9 +8336,9 @@ } }, "event-source-polyfill": { - "version": "1.0.14", - "resolved": "https://registry.npmjs.org/event-source-polyfill/-/event-source-polyfill-1.0.14.tgz", - "integrity": "sha512-MZS70VuK1KfLXWLCzuFp03XYj9GLvr8A3HJsGqmB1svVBuQFOmItgRxz9COquAKbG1hQU8U/dUCHvop4a2Hs/A==" + "version": "1.0.15", + "resolved": "https://registry.npmjs.org/event-source-polyfill/-/event-source-polyfill-1.0.15.tgz", + "integrity": "sha512-IVmd8jWwX6ag5rXIdVCPBjBChiHBceLb1/7aKPIK7CUeJ5Br7alx029+ZpQlK4jW4Hk2qncy3ClJP97S8ltvmg==" }, "eventemitter3": { "version": "3.1.2", @@ -8343,6 +8626,16 @@ "chardet": "^0.7.0", "iconv-lite": "^0.4.24", "tmp": "^0.0.33" + }, + "dependencies": { + "tmp": { + "version": "0.0.33", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", + "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", + "requires": { + "os-tmpdir": "~1.0.2" + } + } } }, "extglob": { @@ -8876,9 +9169,9 @@ } }, "gatsby": { - "version": "2.21.33", - "resolved": "https://registry.npmjs.org/gatsby/-/gatsby-2.21.33.tgz", - "integrity": "sha512-/iB2RsHzCpi80M+aKYIHDpJ77WzQQ9DKkjc5r3OXJ6DXFwAstB0PXKHL3JB6hhlujdYE6k4c3e7dkZGMtxw0Gw==", + "version": "2.22.9", + "resolved": "https://registry.npmjs.org/gatsby/-/gatsby-2.22.9.tgz", + "integrity": "sha512-tMuo7cZJQXF3AgtE9lrgHQRFm5Z8VTKLrGns8AKdgYLZQ7SkG8YSsc+ME+AuOX5byCRlGAm+x4rCp/Sa9oTR1Q==", "requires": { "@babel/code-frame": "^7.8.3", "@babel/core": "^7.9.6", @@ -8891,18 +9184,19 @@ "@pieh/friendly-errors-webpack-plugin": "1.7.0-chalk-2", "@pmmmwh/react-refresh-webpack-plugin": "^0.3.1", "@reach/router": "^1.3.3", + "@types/http-proxy": "^1.17.4", "@typescript-eslint/eslint-plugin": "^2.24.0", "@typescript-eslint/parser": "^2.24.0", "address": "1.1.2", - "autoprefixer": "^9.7.6", + "autoprefixer": "^9.8.0", "axios": "^0.19.2", "babel-core": "7.0.0-bridge.0", "babel-eslint": "^10.1.0", "babel-loader": "^8.1.0", "babel-plugin-add-module-exports": "^0.3.3", "babel-plugin-dynamic-import-node": "^2.3.3", - "babel-plugin-remove-graphql-queries": "^2.9.1", - "babel-preset-gatsby": "^0.4.2", + "babel-plugin-remove-graphql-queries": "^2.9.2", + "babel-preset-gatsby": "^0.4.7", "better-opn": "1.0.0", "better-queue": "^3.8.10", "bluebird": "^3.7.2", @@ -8918,7 +9212,7 @@ "core-js": "^2.6.11", "cors": "^2.8.5", "css-loader": "^1.0.1", - "date-fns": "^2.13.0", + "date-fns": "^2.14.0", "debug": "^3.2.6", "del": "^5.1.0", "detect-port": "^1.3.0", @@ -8933,7 +9227,7 @@ "eslint-plugin-jsx-a11y": "^6.2.3", "eslint-plugin-react": "^7.20.0", "eslint-plugin-react-hooks": "^1.7.0", - "event-source-polyfill": "^1.0.12", + "event-source-polyfill": "^1.0.14", "express": "^4.17.1", "express-graphql": "^0.9.0", "fast-levenshtein": "^2.0.6", @@ -8941,20 +9235,21 @@ "flat": "^4.1.0", "fs-exists-cached": "1.0.0", "fs-extra": "^8.1.0", - "gatsby-cli": "^2.12.21", - "gatsby-core-utils": "^1.2.2", - "gatsby-graphiql-explorer": "^0.4.1", - "gatsby-link": "^2.4.2", - "gatsby-plugin-page-creator": "^2.3.2", - "gatsby-plugin-typescript": "^2.4.2", - "gatsby-react-router-scroll": "^3.0.0", - "gatsby-telemetry": "^1.3.4", + "gatsby-cli": "^2.12.34", + "gatsby-core-utils": "^1.3.3", + "gatsby-graphiql-explorer": "^0.4.2", + "gatsby-link": "^2.4.3", + "gatsby-plugin-page-creator": "^2.3.7", + "gatsby-plugin-typescript": "^2.4.3", + "gatsby-react-router-scroll": "^3.0.1", + "gatsby-telemetry": "^1.3.9", "glob": "^7.1.6", "got": "8.3.2", "graphql": "^14.6.0", "graphql-compose": "^6.3.8", "graphql-playground-middleware-express": "^1.7.14", "hasha": "^5.2.0", + "http-proxy": "^1.18.1", "invariant": "^2.2.4", "is-relative": "^1.0.0", "is-relative-url": "^3.0.0", @@ -9004,6 +9299,7 @@ "string-similarity": "^1.2.2", "style-loader": "^0.23.1", "terser-webpack-plugin": "^1.4.3", + "tmp": "^0.2.1", "true-case-path": "^2.2.1", "type-of": "^2.0.1", "url-loader": "^1.1.2", @@ -9263,9 +9559,9 @@ } }, "gatsby-cli": { - "version": "2.12.21", - "resolved": "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-2.12.21.tgz", - "integrity": "sha512-kJNcgMnae5m2ySWY126LT0W+pghgkzgHqUxQpqg6QCaV7FW1k0Bkf7nhKAg0uZgy9NhUpN1wb/26VeQjNFMzAg==", + "version": "2.12.34", + "resolved": "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-2.12.34.tgz", + "integrity": "sha512-lTwKzL8MAEOFH++ON/OLQ1/4j1L4K0azdXO69yrbXhhY9zNr2ldhzG8SLPPngLwGMAlFa0bNMkrvygBJxUgbIg==", "requires": { "@babel/code-frame": "^7.8.3", "@babel/runtime": "^7.9.6", @@ -9282,9 +9578,9 @@ "execa": "^3.4.0", "fs-exists-cached": "^1.0.0", "fs-extra": "^8.1.0", - "gatsby-core-utils": "^1.2.2", - "gatsby-recipes": "^0.1.19", - "gatsby-telemetry": "^1.3.4", + "gatsby-core-utils": "^1.3.3", + "gatsby-recipes": "^0.1.28", + "gatsby-telemetry": "^1.3.9", "hosted-git-info": "^3.0.4", "ink": "^2.7.1", "ink-spinner": "^3.0.1", @@ -9299,7 +9595,7 @@ "prompts": "^2.3.2", "react": "^16.8.0", "redux": "^4.0.5", - "resolve-cwd": "^2.0.0", + "resolve-cwd": "^3.0.0", "semver": "^6.3.0", "signal-exit": "^3.0.3", "source-map": "0.7.3", @@ -9323,6 +9619,19 @@ } } }, + "gatsby-core-utils": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.3.3.tgz", + "integrity": "sha512-kRcC7Fsn7puGeJERK5EZ3x4drPOnnYNlFygl1tEbpFIKdOhsWRlRF8es7uaqwyZBtBYJHVHHjCyJszRiJRZ5Sw==", + "requires": { + "ci-info": "2.0.0", + "configstore": "^5.0.1", + "fs-extra": "^8.1.0", + "node-object-hash": "^2.0.0", + "proper-lockfile": "^4.1.1", + "xdg-basedir": "^4.0.0" + } + }, "has-symbols": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", @@ -9551,9 +9860,9 @@ } }, "gatsby-graphiql-explorer": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/gatsby-graphiql-explorer/-/gatsby-graphiql-explorer-0.4.1.tgz", - "integrity": "sha512-7A8KA9XtgG6EBEuHDqYe7/xzbkUwQ3FQ1JVao1WEI3EhOMxfjoT23HHIqYJ7lmMG1rQkfhhnVjvPw5Ych4I0+g==", + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/gatsby-graphiql-explorer/-/gatsby-graphiql-explorer-0.4.2.tgz", + "integrity": "sha512-jgOvkPWemyAkDZr7Y12HlGR8ESpjjz9V61u7h1BEdTMYRkvirrplV8stpCqL3NVWRVLaUhykgOKH0KPntFhDJQ==", "requires": { "@babel/runtime": "^7.9.6" }, @@ -9574,9 +9883,9 @@ } }, "gatsby-link": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/gatsby-link/-/gatsby-link-2.4.2.tgz", - "integrity": "sha512-AmSBam4pgtw2YRzkg7noVS6WF9EE73CNjfBiGCS65kQm/sP9caLuLOqrI0l0JAUwEeCqREH1bjg47S0w9chW7w==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/gatsby-link/-/gatsby-link-2.4.3.tgz", + "integrity": "sha512-nQ9T9T91TxPIuf0HuHxTQ/oFjXg0hi4tF39X8IjWj7YNk4kKct0l2Jaztk/RzsZ930x6AtgGt6x6ukWic4zQKQ==", "requires": { "@babel/runtime": "^7.9.6", "@types/reach__router": "^1.3.3", @@ -9599,15 +9908,15 @@ } }, "gatsby-page-utils": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/gatsby-page-utils/-/gatsby-page-utils-0.2.2.tgz", - "integrity": "sha512-A49mXefCLloYx0MimfbqxBp+eNhgbLYh10LkabWyUPp7d+S5ILCga1n+lbXkyMo+qmUGA7Pj6mhzRzvOAV+Shg==", + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/gatsby-page-utils/-/gatsby-page-utils-0.2.7.tgz", + "integrity": "sha512-YhsTtAP1K9bzj3awlG4nHKHZyITbPxUaP/7QSEeA7Gi02BNHmMlfQ9VPSFl2/3zHri9m2DIS5aJLSbsitHTJIw==", "requires": { "@babel/runtime": "^7.9.6", "bluebird": "^3.7.2", "chokidar": "3.4.0", "fs-exists-cached": "^1.0.0", - "gatsby-core-utils": "^1.2.2", + "gatsby-core-utils": "^1.3.3", "glob": "^7.1.6", "lodash": "^4.17.15", "micromatch": "^3.1.10" @@ -9626,6 +9935,19 @@ "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" }, + "gatsby-core-utils": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.3.3.tgz", + "integrity": "sha512-kRcC7Fsn7puGeJERK5EZ3x4drPOnnYNlFygl1tEbpFIKdOhsWRlRF8es7uaqwyZBtBYJHVHHjCyJszRiJRZ5Sw==", + "requires": { + "ci-info": "2.0.0", + "configstore": "^5.0.1", + "fs-extra": "^8.1.0", + "node-object-hash": "^2.0.0", + "proper-lockfile": "^4.1.1", + "xdg-basedir": "^4.0.0" + } + }, "regenerator-runtime": { "version": "0.13.5", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", @@ -9969,14 +10291,14 @@ } }, "gatsby-plugin-page-creator": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/gatsby-plugin-page-creator/-/gatsby-plugin-page-creator-2.3.2.tgz", - "integrity": "sha512-jX2PCB+ho34bR/M/ig96Poh3PKyrFrkVMI0th/VevYBq4txTQl+Ca9ZBodEWD2cz2Lhy2j9/iJkoXx7nTt7knQ==", + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/gatsby-plugin-page-creator/-/gatsby-plugin-page-creator-2.3.7.tgz", + "integrity": "sha512-2hUTP5yEvG9JUrVPjbUGiUcMERwimge+JMEV0806EaITQrpzp6zkiTVD/NHyeJzm6f0BWZr0Q2slI9iJYEXbJQ==", "requires": { "@babel/runtime": "^7.9.6", "bluebird": "^3.7.2", "fs-exists-cached": "^1.0.0", - "gatsby-page-utils": "^0.2.2", + "gatsby-page-utils": "^0.2.7", "glob": "^7.1.6", "lodash": "^4.17.15", "micromatch": "^3.1.10" @@ -10049,9 +10371,9 @@ "integrity": "sha512-54REIMe79qFBAwpcnWHBkvEE9CKoEVkefF9rDXai0k642r91SZ4UeWFuAmsegPG+sPVub7tHfHu/2LVXK1I9kg==" }, "gatsby-plugin-typescript": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/gatsby-plugin-typescript/-/gatsby-plugin-typescript-2.4.2.tgz", - "integrity": "sha512-4mtmFqtKaHNeWYL3Bh6vtO6Ay7VjNR6ZFi8lfL/hiXEEXoy8sZO/S/70qVVecbzeYS6DpKZveEKLfluRLwnDvA==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/gatsby-plugin-typescript/-/gatsby-plugin-typescript-2.4.3.tgz", + "integrity": "sha512-smD3IlOigNR5gNQwRAp6TH4czsZ8mpO+WMxoE3M0G49JR/aj2kgh85pzB0yRWpq0/oUUf9guatQJxGhvUWUJYg==", "requires": { "@babel/core": "^7.9.6", "@babel/plugin-proposal-nullish-coalescing-operator": "^7.8.3", @@ -10059,7 +10381,7 @@ "@babel/plugin-proposal-optional-chaining": "^7.9.0", "@babel/preset-typescript": "^7.9.0", "@babel/runtime": "^7.9.6", - "babel-plugin-remove-graphql-queries": "^2.9.1" + "babel-plugin-remove-graphql-queries": "^2.9.2" }, "dependencies": { "@babel/code-frame": { @@ -10206,9 +10528,9 @@ } }, "gatsby-react-router-scroll": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/gatsby-react-router-scroll/-/gatsby-react-router-scroll-3.0.0.tgz", - "integrity": "sha512-vaXYQgGkBrrUHy+uyyxy2aj5TZOuuO4U8mHgVKKSFyLIZPk35wknifFsPYVyyYqi2zxdKiFkYKfHDWlQHxMlzA==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/gatsby-react-router-scroll/-/gatsby-react-router-scroll-3.0.1.tgz", + "integrity": "sha512-sozpkBv9BZoGpzwlZwSc7CeHHM67yl79jv/oEky7jZmw/7b8u5fxlGUjHPl7vNzk8y2FhiYh121Kv7VMHZi6QA==", "requires": { "@babel/runtime": "^7.9.6", "scroll-behavior": "^0.9.12", @@ -10239,12 +10561,13 @@ } }, "gatsby-recipes": { - "version": "0.1.19", - "resolved": "https://registry.npmjs.org/gatsby-recipes/-/gatsby-recipes-0.1.19.tgz", - "integrity": "sha512-N++VIje7M0N6zoShZMISyaIzMwbu9Lot7iyNDk6BblI466J8yQvceqj4uDIb9NzI6cQ82Px0yFGXapymsWGg9Q==", + "version": "0.1.28", + "resolved": "https://registry.npmjs.org/gatsby-recipes/-/gatsby-recipes-0.1.28.tgz", + "integrity": "sha512-Wqeu7xyxpOVhRaAYMK/Rbvtmw2jEgAXOcwowINeHVBteJTAD1MztSgf1OtZiqXxTxmDnp64YBgb55XVcxrQxPQ==", "requires": { "@babel/core": "^7.9.6", "@babel/generator": "^7.9.6", + "@babel/plugin-transform-react-jsx": "^7.9.4", "@babel/standalone": "^7.9.6", "@babel/template": "^7.8.6", "@babel/types": "^7.9.6", @@ -10254,22 +10577,15 @@ "@mdx-js/runtime": "^1.6.1", "acorn": "^7.2.0", "acorn-jsx": "^5.2.0", - "babel-core": "7.0.0-bridge.0", - "babel-eslint": "^10.1.0", - "babel-loader": "^8.1.0", - "babel-plugin-add-module-exports": "^0.3.3", - "babel-plugin-dynamic-import-node": "^2.3.3", - "babel-plugin-remove-graphql-queries": "^2.9.1", - "babel-preset-gatsby": "^0.4.2", "cors": "^2.8.5", + "debug": "^4.1.1", "detect-port": "^1.3.0", - "event-source-polyfill": "^1.0.12", "execa": "^4.0.1", "express": "^4.17.1", "express-graphql": "^0.9.0", "fs-extra": "^8.1.0", - "gatsby-core-utils": "^1.2.2", - "gatsby-telemetry": "^1.3.4", + "gatsby-core-utils": "^1.3.3", + "gatsby-telemetry": "^1.3.9", "glob": "^7.1.6", "graphql": "^14.6.0", "graphql-compose": "^6.3.8", @@ -10277,7 +10593,6 @@ "graphql-type-json": "^0.3.1", "hicat": "^0.7.0", "html-tag-names": "^1.1.5", - "humanize-list": "^1.0.1", "import-jsx": "^4.0.0", "ink-box": "^1.0.0", "ink-link": "^1.1.0", @@ -10285,8 +10600,6 @@ "ink-spinner": "^3.0.1", "is-binary-path": "^2.1.0", "is-blank": "^2.1.0", - "is-newline": "^1.0.0", - "is-relative": "^1.0.0", "is-string": "^1.0.5", "is-url": "^1.2.4", "jest-diff": "^25.5.0", @@ -10294,15 +10607,14 @@ "mkdirp": "^0.5.1", "pkg-dir": "^4.2.0", "prettier": "^2.0.5", + "react-reconciler": "^0.25.1", "remark-stringify": "^8.0.0", "semver": "^7.3.2", "single-trailing-newline": "^1.0.0", "style-to-object": "^0.3.0", "subscriptions-transport-ws": "^0.9.16", "svg-tag-names": "^2.0.1", - "unist-util-remove": "^2.0.0", "unist-util-visit": "^2.0.2", - "url-loader": "^1.1.2", "urql": "^1.9.7", "ws": "^7.3.0", "xstate": "^4.9.1" @@ -10464,9 +10776,9 @@ } }, "execa": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/execa/-/execa-4.0.1.tgz", - "integrity": "sha512-SCjM/zlBdOK8Q5TIjOn6iEHZaPHFsMoTxXQ2nvUvtPnuohz3H2dIozSg+etNR98dGoYUp2ENSKLL/XaMmbxVgw==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/execa/-/execa-4.0.2.tgz", + "integrity": "sha512-QI2zLa6CjGWdiQsmSkZoGtDx2N+cQIGb3yNolGTdjSQzydzLgYYf8LRuagp7S7fPimjcrzUDSUFd/MgzELMi4Q==", "requires": { "cross-spawn": "^7.0.0", "get-stream": "^5.0.0", @@ -10488,6 +10800,19 @@ "path-exists": "^4.0.0" } }, + "gatsby-core-utils": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.3.3.tgz", + "integrity": "sha512-kRcC7Fsn7puGeJERK5EZ3x4drPOnnYNlFygl1tEbpFIKdOhsWRlRF8es7uaqwyZBtBYJHVHHjCyJszRiJRZ5Sw==", + "requires": { + "ci-info": "2.0.0", + "configstore": "^5.0.1", + "fs-extra": "^8.1.0", + "node-object-hash": "^2.0.0", + "proper-lockfile": "^4.1.1", + "xdg-basedir": "^4.0.0" + } + }, "get-stream": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz", @@ -10957,9 +11282,9 @@ } }, "gatsby-telemetry": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-1.3.4.tgz", - "integrity": "sha512-t/IBxUJKWn9qRNfSrwYwFX4BaV/41LBaVeEL3LYmzcLMS8Cin4bYAew6yyO70jeg7939JDuKAaIzISm2Jzc7kg==", + "version": "1.3.9", + "resolved": "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-1.3.9.tgz", + "integrity": "sha512-jnv+nOrmFigaBd8LAdoGDDdHVTj4a06QcfiPW1P+bYl5WibaUkCEtKgQEpuu8OMvwErXFO5FFMHpiwLITcNIEw==", "requires": { "@babel/code-frame": "^7.8.3", "@babel/runtime": "^7.9.6", @@ -10968,7 +11293,7 @@ "configstore": "^5.0.1", "envinfo": "^7.5.1", "fs-extra": "^8.1.0", - "gatsby-core-utils": "^1.2.2", + "gatsby-core-utils": "^1.3.3", "git-up": "4.0.1", "is-docker": "2.0.0", "lodash": "^4.17.15", @@ -11011,6 +11336,19 @@ "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" }, + "gatsby-core-utils": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.3.3.tgz", + "integrity": "sha512-kRcC7Fsn7puGeJERK5EZ3x4drPOnnYNlFygl1tEbpFIKdOhsWRlRF8es7uaqwyZBtBYJHVHHjCyJszRiJRZ5Sw==", + "requires": { + "ci-info": "2.0.0", + "configstore": "^5.0.1", + "fs-extra": "^8.1.0", + "node-object-hash": "^2.0.0", + "proper-lockfile": "^4.1.1", + "xdg-basedir": "^4.0.0" + } + }, "node-fetch": { "version": "2.6.0", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz", @@ -11021,6 +11359,14 @@ "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==" }, + "resolve-cwd": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz", + "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=", + "requires": { + "resolve-from": "^3.0.0" + } + }, "source-map": { "version": "0.7.3", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", @@ -12325,14 +12671,14 @@ } }, "http-parser-js": { - "version": "0.4.10", - "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.10.tgz", - "integrity": "sha1-ksnBN0w1CF912zWexWzCV8u5P6Q=" + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.2.tgz", + "integrity": "sha512-opCO9ASqg5Wy2FNo7A0sxy71yGbbkJJXLdgMK04Tcypw9jr2MgWbyubb0+WdmDmGnFflO7fRbqbaihh/ENDlRQ==" }, "http-proxy": { - "version": "1.18.0", - "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.0.tgz", - "integrity": "sha512-84I2iJM/n1d4Hdgc6y2+qY5mDaz2PUVjlg9znE9byl+q0uC3DeByqBGReQu5tpLK0TAqTIXScRUV+dg7+bUPpQ==", + "version": "1.18.1", + "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz", + "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==", "requires": { "eventemitter3": "^4.0.0", "follow-redirects": "^1.0.0", @@ -12386,11 +12732,6 @@ "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz", "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==" }, - "humanize-list": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/humanize-list/-/humanize-list-1.0.1.tgz", - "integrity": "sha1-5+cZxgpdWEjo4KXtXwqIVJbCOf0=" - }, "hyphenate-style-name": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/hyphenate-style-name/-/hyphenate-style-name-1.0.3.tgz", @@ -12450,9 +12791,9 @@ "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=" }, "ignore": { - "version": "5.1.4", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.4.tgz", - "integrity": "sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A==" + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.6.tgz", + "integrity": "sha512-cgXgkypZBcCnOgSihyeqbo6gjIaIyDqPQB7Ra4vhE9m6kigdGoQDMHjviFhRZo3IMlRy6yElosoviMs5YxZXUA==" }, "image-size": { "version": "0.5.5", @@ -12576,6 +12917,16 @@ "requires": { "pkg-dir": "^3.0.0", "resolve-cwd": "^2.0.0" + }, + "dependencies": { + "resolve-cwd": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz", + "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=", + "requires": { + "resolve-from": "^3.0.0" + } + } } }, "imurmurhash": { @@ -12722,6 +13073,28 @@ "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", "optional": true }, + "react-reconciler": { + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/react-reconciler/-/react-reconciler-0.24.0.tgz", + "integrity": "sha512-gAGnwWkf+NOTig9oOowqid9O0HjTDC+XVGBCAmJYYJ2A2cN/O4gDdIuuUQjv8A4v6GDwVfJkagpBBLW5OW9HSw==", + "optional": true, + "requires": { + "loose-envify": "^1.1.0", + "object-assign": "^4.1.1", + "prop-types": "^15.6.2", + "scheduler": "^0.18.0" + } + }, + "scheduler": { + "version": "0.18.0", + "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.18.0.tgz", + "integrity": "sha512-agTSHR1Nbfi6ulI0kYNK0203joW2Y5W4po4l+v03tOoiJKpTBbxpNhWDvqc/4IcOw+KLmSiQLTasZ4cab2/UWQ==", + "optional": true, + "requires": { + "loose-envify": "^1.1.0", + "object-assign": "^4.1.1" + } + }, "slice-ansi": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz", @@ -13443,14 +13816,6 @@ "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz", "integrity": "sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=" }, - "is-newline": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-newline/-/is-newline-1.0.0.tgz", - "integrity": "sha1-8KrJfMmsC0uUr4xVoBzzaQ9Dbjg=", - "requires": { - "newline-regex": "^0.2.0" - } - }, "is-npm": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-3.0.0.tgz", @@ -15124,9 +15489,9 @@ } }, "moment": { - "version": "2.25.3", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.25.3.tgz", - "integrity": "sha512-PuYv0PHxZvzc15Sp8ybUCoQ+xpyPWvjOuK72a5ovzp2LI32rJXOiIfyoFoYvG3s6EwwrdkMyWuRiEHSZRLJNdg==" + "version": "2.26.0", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.26.0.tgz", + "integrity": "sha512-oIixUO+OamkUkwjhAVE18rAMfRJNsNe/Stid/gwHSOfHrOtw9EhAY2AHvdKZ/k/MggcYELFCJz/Sn2pL8b8JMw==" }, "moment-mini": { "version": "2.24.0", @@ -15247,11 +15612,6 @@ "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz", "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==" }, - "newline-regex": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/newline-regex/-/newline-regex-0.2.1.tgz", - "integrity": "sha1-RpbYaQRe4VCbg6rDpY1Kk7vtkm4=" - }, "next-tick": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz", @@ -15345,9 +15705,9 @@ "integrity": "sha512-VZR0zroAusy1ETZMZiGeLkdu50LGjG5U1KHZqTruqtTyQ2wfWhHG2Ow4nsUbfTFGlaREgNHcCWoM/OzEm6p+NQ==" }, "node-releases": { - "version": "1.1.55", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.55.tgz", - "integrity": "sha512-H3R3YR/8TjT5WPin/wOoHOUPHgvj8leuU/Keta/rwelEQN9pA/S2Dx8/se4pZ2LBxSd0nAGzsNzhqwa77v7F1w==" + "version": "1.1.56", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.56.tgz", + "integrity": "sha512-EVo605FhWLygH8a64TjgpjyHYOihkxECwX1bHHr8tETJKWEiWS2YJjPbvsX2jFjnjTNEgBCmk9mLjKG1Mf11cw==" }, "noms": { "version": "0.0.0", @@ -15602,13 +15962,12 @@ } }, "object.entries": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.1.tgz", - "integrity": "sha512-ilqR7BgdyZetJutmDPfXCDffGa0/Yzl2ivVNpbx/g4UeWrCdRnFDUBrKJGLhGieRHDATnyZXWBeCb29k9CJysQ==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.2.tgz", + "integrity": "sha512-BQdB9qKmb/HyNdMNWVr7O3+z5MUIx3aiegEIJqjMBbBf0YT9RRxTJSim4mzFqtyr7PDAHigq0N9dO0m0tRakQA==", "requires": { "define-properties": "^1.1.3", - "es-abstract": "^1.17.0-next.1", - "function-bind": "^1.1.1", + "es-abstract": "^1.17.5", "has": "^1.0.3" }, "dependencies": { @@ -17122,6 +17481,16 @@ "react-is": "^16.8.1" } }, + "proper-lockfile": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/proper-lockfile/-/proper-lockfile-4.1.1.tgz", + "integrity": "sha512-1w6rxXodisVpn7QYvLk706mzprPTAPCYAqxMvctmPN3ekuRk/kuGkGc82pangZiAt4R3lwSuUzheTTn0/Yb7Zg==", + "requires": { + "graceful-fs": "^4.1.11", + "retry": "^0.12.0", + "signal-exit": "^3.0.2" + } + }, "property-information": { "version": "5.4.0", "resolved": "https://registry.npmjs.org/property-information/-/property-information-5.4.0.tgz", @@ -17575,6 +17944,14 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=" + }, + "tmp": { + "version": "0.0.33", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", + "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", + "requires": { + "os-tmpdir": "~1.0.2" + } } } }, @@ -17654,15 +18031,14 @@ "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==" }, "react-reconciler": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/react-reconciler/-/react-reconciler-0.24.0.tgz", - "integrity": "sha512-gAGnwWkf+NOTig9oOowqid9O0HjTDC+XVGBCAmJYYJ2A2cN/O4gDdIuuUQjv8A4v6GDwVfJkagpBBLW5OW9HSw==", - "optional": true, + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/react-reconciler/-/react-reconciler-0.25.1.tgz", + "integrity": "sha512-R5UwsIvRcSs3w8n9k3tBoTtUHdVhu9u84EG7E5M0Jk9F5i6DA1pQzPfUZd6opYWGy56MJOtV3VADzy6DRwYDjw==", "requires": { "loose-envify": "^1.1.0", "object-assign": "^4.1.1", "prop-types": "^15.6.2", - "scheduler": "^0.18.0" + "scheduler": "^0.19.1" } }, "react-refresh": { @@ -18640,11 +19016,18 @@ } }, "resolve-cwd": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz", - "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz", + "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==", "requires": { - "resolve-from": "^3.0.0" + "resolve-from": "^5.0.0" + }, + "dependencies": { + "resolve-from": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", + "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==" + } } }, "resolve-dir": { @@ -18967,10 +19350,9 @@ "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==" }, "scheduler": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.18.0.tgz", - "integrity": "sha512-agTSHR1Nbfi6ulI0kYNK0203joW2Y5W4po4l+v03tOoiJKpTBbxpNhWDvqc/4IcOw+KLmSiQLTasZ4cab2/UWQ==", - "optional": true, + "version": "0.19.1", + "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.19.1.tgz", + "integrity": "sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==", "requires": { "loose-envify": "^1.1.0", "object-assign": "^4.1.1" @@ -19818,9 +20200,9 @@ "integrity": "sha512-q/JSVd1Lptzhf5bkYm4ob4iWPjx0KiRe3sRFBNrVqbJkFaBm5vbbowy1mymoPNLRa52+oadOhJ+K49wsSeSjTA==" }, "spdx-correct": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz", - "integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz", + "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==", "requires": { "spdx-expression-parse": "^3.0.0", "spdx-license-ids": "^3.0.0" @@ -20858,11 +21240,11 @@ } }, "tmp": { - "version": "0.0.33", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", - "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz", + "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==", "requires": { - "os-tmpdir": "~1.0.2" + "rimraf": "^3.0.0" } }, "to-array": { @@ -21819,19 +22201,30 @@ } }, "watchpack": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.1.tgz", - "integrity": "sha512-+IF9hfUFOrYOOaKyfaI7h7dquUIOgyEMoQMLA7OP5FxegKA2+XdXThAZ9TU2kucfhDH7rfMHs1oPYziVGWRnZA==", + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.2.tgz", + "integrity": "sha512-ymVbbQP40MFTp+cNMvpyBpBtygHnPzPkHqoIwRRj/0B8KhqQwV8LaKjtbaxF2lK4vl8zN9wCxS46IFCU5K4W0g==", "requires": { - "chokidar": "^2.1.8", + "chokidar": "^3.4.0", "graceful-fs": "^4.1.2", - "neo-async": "^2.5.0" + "neo-async": "^2.5.0", + "watchpack-chokidar2": "^2.0.0" + } + }, + "watchpack-chokidar2": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz", + "integrity": "sha512-9TyfOyN/zLUbA288wZ8IsMZ+6cbzvsNyEzSBp6e/zkifi6xxbl8SmQ/CxQq32k8NNqrdVEVUVSEf56L4rQ/ZxA==", + "optional": true, + "requires": { + "chokidar": "^2.1.8" }, "dependencies": { "chokidar": { "version": "2.1.8", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz", "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==", + "optional": true, "requires": { "anymatch": "^2.0.0", "async-each": "^1.0.1", @@ -21850,7 +22243,8 @@ "normalize-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==" + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "optional": true } } }, @@ -22201,11 +22595,11 @@ "integrity": "sha512-pxqzFE055NlNTlNyfDG3xlB2QwT1EWdm/CF5dCJI/e+rRHVxrWhWg1rf1lfsWhI1/EePv8gi/A36YxO/+u0FgQ==" }, "websocket-driver": { - "version": "0.7.3", - "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.3.tgz", - "integrity": "sha512-bpxWlvbbB459Mlipc5GBzzZwhoZgGEZLuqPaR0INBGnPAY1vdBX6hPnoFXiw+3yWxDuHyQjO2oXTMyS8A5haFg==", + "version": "0.7.4", + "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz", + "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==", "requires": { - "http-parser-js": ">=0.4.0 <0.4.11", + "http-parser-js": ">=0.5.1", "safe-buffer": ">=5.1.0", "websocket-extensions": ">=0.1.1" } @@ -22524,12 +22918,12 @@ "integrity": "sha1-AI4G2AlDIMNy28L47XagymyKxBk=" }, "yoga-layout-prebuilt": { - "version": "1.9.5", - "resolved": "https://registry.npmjs.org/yoga-layout-prebuilt/-/yoga-layout-prebuilt-1.9.5.tgz", - "integrity": "sha512-+G5Ojl4/sG78mk5masCL3SRaZtkKXRBhMGf5c+4C1j32jN9KpS4lxVFdYyBi15EHN4gMeK5sIRf83T33TOaDkA==", + "version": "1.9.6", + "resolved": "https://registry.npmjs.org/yoga-layout-prebuilt/-/yoga-layout-prebuilt-1.9.6.tgz", + "integrity": "sha512-Wursw6uqLXLMjBAO4SEShuzj8+EJXhCF71/rJ7YndHTkRAYSU0GY3OghRqfAk9HPUAAFMuqp3U1Wl+01vmGRQQ==", "optional": true, "requires": { - "@types/yoga-layout": "1.9.1" + "@types/yoga-layout": "1.9.2" } }, "yurnalist": { diff --git a/docs/package.json b/docs/package.json index f6864ac6078..10ad13825bd 100644 --- a/docs/package.json +++ b/docs/package.json @@ -6,7 +6,7 @@ "serve": "gatsby serve" }, "dependencies": { - "gatsby": "2.21.33", + "gatsby": "2.22.9", "gatsby-theme-apollo-docs": "4.2.3", "react": "16.13.1", "react-dom": "16.13.1" From 87f473d1fd84ae82af5ca073d60c588a66a235ef Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 23 May 2020 14:14:49 +0000 Subject: [PATCH 623/642] chore(deps): update dependency typescript to v3.9.3 (#4155) Co-authored-by: Renovate Bot --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6e4396ab58b..69a73edad0c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19311,9 +19311,9 @@ } }, "typescript": { - "version": "3.9.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.2.tgz", - "integrity": "sha512-q2ktq4n/uLuNNShyayit+DTobV2ApPEo/6so68JaD5ojvc/6GClBipedB9zNWYxRSAlZXAe405Rlijzl6qDiSw==", + "version": "3.9.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.3.tgz", + "integrity": "sha512-D/wqnB2xzNFIcoBG9FG8cXRDjiqSTbG2wd8DMZeQyJlP1vfTkIxH4GKveWaEBYySKIg+USu+E+EDIR47SqnaMQ==", "dev": true }, "uglify-js": { diff --git a/package.json b/package.json index 99bc0e71f26..f94996dfbe4 100644 --- a/package.json +++ b/package.json @@ -126,7 +126,7 @@ "supertest": "4.0.2", "test-listen": "1.1.0", "ts-jest": "25.5.1", - "typescript": "3.9.2", + "typescript": "3.9.3", "winston": "3.2.1", "winston-transport": "4.3.0", "ws": "6.2.1" From 7d6f23443e52a90deb74f152f34bb76eea78ee19 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 25 May 2020 01:17:20 +0000 Subject: [PATCH 624/642] chore(deps): update dependency lerna to v3.22.0 (#4159) Co-authored-by: Renovate Bot --- package-lock.json | 154 ++++++++++++++++++++++++++++++++-------------- package.json | 2 +- 2 files changed, 109 insertions(+), 47 deletions(-) diff --git a/package-lock.json b/package-lock.json index 69a73edad0c..cc3d8a2e10a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3697,9 +3697,9 @@ } }, "@lerna/conventional-commits": { - "version": "3.18.5", - "resolved": "https://registry.npmjs.org/@lerna/conventional-commits/-/conventional-commits-3.18.5.tgz", - "integrity": "sha512-qcvXIEJ3qSgalxXnQ7Yxp5H9Ta5TVyai6vEor6AAEHc20WiO7UIdbLDCxBtiiHMdGdpH85dTYlsoYUwsCJu3HQ==", + "version": "3.22.0", + "resolved": "https://registry.npmjs.org/@lerna/conventional-commits/-/conventional-commits-3.22.0.tgz", + "integrity": "sha512-z4ZZk1e8Mhz7+IS8NxHr64wyklHctCJyWpJKEZZPJiLFJ8yKto/x38O80R10pIzC0rr8Sy/OsjSH4bl0TbbgqA==", "dev": true, "requires": { "@lerna/validation-error": "3.13.0", @@ -3724,9 +3724,9 @@ } }, "@lerna/create": { - "version": "3.21.0", - "resolved": "https://registry.npmjs.org/@lerna/create/-/create-3.21.0.tgz", - "integrity": "sha512-cRIopzKzE2vXJPmsiwCDMWo4Ct+KTmX3nvvkQLDoQNrrRK7w+3KQT3iiorbj1koD95RsVQA7mS2haWok9SIv0g==", + "version": "3.22.0", + "resolved": "https://registry.npmjs.org/@lerna/create/-/create-3.22.0.tgz", + "integrity": "sha512-MdiQQzCcB4E9fBF1TyMOaAEz9lUjIHp1Ju9H7f3lXze5JK6Fl5NYkouAvsLgY6YSIhXMY8AHW2zzXeBDY4yWkw==", "dev": true, "requires": { "@evocateur/pacote": "^9.6.3", @@ -3850,13 +3850,13 @@ } }, "@lerna/github-client": { - "version": "3.16.5", - "resolved": "https://registry.npmjs.org/@lerna/github-client/-/github-client-3.16.5.tgz", - "integrity": "sha512-rHQdn8Dv/CJrO3VouOP66zAcJzrHsm+wFuZ4uGAai2At2NkgKH+tpNhQy2H1PSC0Ezj9LxvdaHYrUzULqVK5Hw==", + "version": "3.22.0", + "resolved": "https://registry.npmjs.org/@lerna/github-client/-/github-client-3.22.0.tgz", + "integrity": "sha512-O/GwPW+Gzr3Eb5bk+nTzTJ3uv+jh5jGho9BOqKlajXaOkMYGBELEAqV5+uARNGWZFvYAiF4PgqHb6aCUu7XdXg==", "dev": true, "requires": { "@lerna/child-process": "3.16.5", - "@octokit/plugin-enterprise-rest": "^3.6.1", + "@octokit/plugin-enterprise-rest": "^6.0.1", "@octokit/rest": "^16.28.4", "git-url-parse": "^11.1.2", "npmlog": "^4.1.2" @@ -3906,9 +3906,9 @@ } }, "@lerna/import": { - "version": "3.21.0", - "resolved": "https://registry.npmjs.org/@lerna/import/-/import-3.21.0.tgz", - "integrity": "sha512-aISkL4XD0Dqf5asDaOZWu65jgj8fWUhuQseZWuQe3UfHxav69fTS2YLIngUfencaOSZVOcVCom28YCzp61YDxw==", + "version": "3.22.0", + "resolved": "https://registry.npmjs.org/@lerna/import/-/import-3.22.0.tgz", + "integrity": "sha512-uWOlexasM5XR6tXi4YehODtH9Y3OZrFht3mGUFFT3OIl2s+V85xIGFfqFGMTipMPAGb2oF1UBLL48kR43hRsOg==", "dev": true, "requires": { "@lerna/child-process": "3.16.5", @@ -4186,9 +4186,9 @@ } }, "@lerna/publish": { - "version": "3.21.0", - "resolved": "https://registry.npmjs.org/@lerna/publish/-/publish-3.21.0.tgz", - "integrity": "sha512-JZ+ehZB9UCQ9nqH8Ld/Yqc/If++aK/7XIubkrB9sQ5hf2GeIbmI/BrJpMgLW/e9T5bKrUBZPUvoUN3daVipA5A==", + "version": "3.22.0", + "resolved": "https://registry.npmjs.org/@lerna/publish/-/publish-3.22.0.tgz", + "integrity": "sha512-8LBeTLBN8NIrCrLGykRu+PKrfrCC16sGCVY0/bzq9TDioR7g6+cY0ZAw653Qt/0Kr7rg3J7XxVNdzj3fvevlwA==", "dev": true, "requires": { "@evocateur/libnpmaccess": "^3.1.2", @@ -4212,7 +4212,7 @@ "@lerna/run-lifecycle": "3.16.2", "@lerna/run-topologically": "3.18.5", "@lerna/validation-error": "3.13.0", - "@lerna/version": "3.21.0", + "@lerna/version": "3.22.0", "figgy-pudding": "^3.5.1", "fs-extra": "^8.1.0", "npm-package-arg": "^6.1.0", @@ -4356,17 +4356,17 @@ } }, "@lerna/version": { - "version": "3.21.0", - "resolved": "https://registry.npmjs.org/@lerna/version/-/version-3.21.0.tgz", - "integrity": "sha512-nIT3u43fCNj6uSMN1dRxFnF4GhmIiOEqSTkGSjrMU+8kHKwzOqS/6X6TOzklBmCyEZOpF/fLlGqH3BZHnwLDzQ==", + "version": "3.22.0", + "resolved": "https://registry.npmjs.org/@lerna/version/-/version-3.22.0.tgz", + "integrity": "sha512-6uhL6RL7/FeW6u1INEgyKjd5dwO8+IsbLfkfC682QuoVLS7VG6OOB+JmTpCvnuyYWI6fqGh1bRk9ww8kPsj+EA==", "dev": true, "requires": { "@lerna/check-working-tree": "3.16.5", "@lerna/child-process": "3.16.5", "@lerna/collect-updates": "3.20.0", "@lerna/command": "3.21.0", - "@lerna/conventional-commits": "3.18.5", - "@lerna/github-client": "3.16.5", + "@lerna/conventional-commits": "3.22.0", + "@lerna/github-client": "3.22.0", "@lerna/gitlab-client": "3.15.0", "@lerna/output": "3.13.0", "@lerna/prerelease-id-from-version": "3.16.0", @@ -4424,12 +4424,12 @@ "dev": true }, "@octokit/auth-token": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.4.0.tgz", - "integrity": "sha512-eoOVMjILna7FVQf96iWc3+ZtE/ZT6y8ob8ZzcqKY1ibSQCnu4O/B7pJvzMx5cyZ/RjAff6DAdEb0O0Cjcxidkg==", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.4.1.tgz", + "integrity": "sha512-NB81O5h39KfHYGtgfWr2booRxp2bWOJoqbWwbyUg2hw6h35ArWYlAST5B3XwAkbdcx13yt84hFXyFP5X0QToWA==", "dev": true, "requires": { - "@octokit/types": "^2.0.0" + "@octokit/types": "^4.0.1" } }, "@octokit/endpoint": { @@ -4443,6 +4443,15 @@ "universal-user-agent": "^5.0.0" }, "dependencies": { + "@octokit/types": { + "version": "2.16.2", + "resolved": "https://registry.npmjs.org/@octokit/types/-/types-2.16.2.tgz", + "integrity": "sha512-O75k56TYvJ8WpAakWwYRN8Bgu60KrmX0z1KqFp1kNiFNkgW+JW+9EBKZ+S33PU6SLvbihqd+3drvPxKK68Ee8Q==", + "dev": true, + "requires": { + "@types/node": ">= 8" + } + }, "is-plain-object": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-3.0.0.tgz", @@ -4470,9 +4479,9 @@ } }, "@octokit/plugin-enterprise-rest": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/@octokit/plugin-enterprise-rest/-/plugin-enterprise-rest-3.6.2.tgz", - "integrity": "sha512-3wF5eueS5OHQYuAEudkpN+xVeUsg8vYEMMenEzLphUZ7PRZ8OJtDcsreL3ad9zxXmBbaFWzLmFcdob5CLyZftA==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/@octokit/plugin-enterprise-rest/-/plugin-enterprise-rest-6.0.1.tgz", + "integrity": "sha512-93uGjlhUD+iNg1iWhUENAtJata6w5nE+V4urXOAlIXdco6xNZtUSfYY8dzp3Udy74aqO/B5UZL80x/YMa5PKRw==", "dev": true }, "@octokit/plugin-paginate-rest": { @@ -4482,6 +4491,17 @@ "dev": true, "requires": { "@octokit/types": "^2.0.1" + }, + "dependencies": { + "@octokit/types": { + "version": "2.16.2", + "resolved": "https://registry.npmjs.org/@octokit/types/-/types-2.16.2.tgz", + "integrity": "sha512-O75k56TYvJ8WpAakWwYRN8Bgu60KrmX0z1KqFp1kNiFNkgW+JW+9EBKZ+S33PU6SLvbihqd+3drvPxKK68Ee8Q==", + "dev": true, + "requires": { + "@types/node": ">= 8" + } + } } }, "@octokit/plugin-request-log": { @@ -4498,12 +4518,23 @@ "requires": { "@octokit/types": "^2.0.1", "deprecation": "^2.3.1" + }, + "dependencies": { + "@octokit/types": { + "version": "2.16.2", + "resolved": "https://registry.npmjs.org/@octokit/types/-/types-2.16.2.tgz", + "integrity": "sha512-O75k56TYvJ8WpAakWwYRN8Bgu60KrmX0z1KqFp1kNiFNkgW+JW+9EBKZ+S33PU6SLvbihqd+3drvPxKK68Ee8Q==", + "dev": true, + "requires": { + "@types/node": ">= 8" + } + } } }, "@octokit/request": { - "version": "5.4.2", - "resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.4.2.tgz", - "integrity": "sha512-zKdnGuQ2TQ2vFk9VU8awFT4+EYf92Z/v3OlzRaSh4RIP0H6cvW1BFPXq4XYvNez+TPQjqN+0uSkCYnMFFhcFrw==", + "version": "5.4.3", + "resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.4.3.tgz", + "integrity": "sha512-RtqMzF3mhqxmWoqVD84x2gdtbqn2inTBU/HPkWf5u0R5r7fBTaLPAcCBgukeI2gjTwD9ChL9Cu0MlTBs7B/tSw==", "dev": true, "requires": { "@octokit/endpoint": "^6.0.1", @@ -4517,14 +4548,34 @@ }, "dependencies": { "@octokit/request-error": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.0.0.tgz", - "integrity": "sha512-rtYicB4Absc60rUv74Rjpzek84UbVHGHJRu4fNVlZ1mCcyUPPuzFfG9Rn6sjHrd95DEsmjSt1Axlc699ZlbDkw==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.0.1.tgz", + "integrity": "sha512-5lqBDJ9/TOehK82VvomQ6zFiZjPeSom8fLkFVLuYL3sKiIb5RB8iN/lenLkY7oBmyQcGP7FBMGiIZTO8jufaRQ==", "dev": true, "requires": { - "@octokit/types": "^2.0.0", + "@octokit/types": "^4.0.1", "deprecation": "^2.0.0", "once": "^1.4.0" + }, + "dependencies": { + "@octokit/types": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/@octokit/types/-/types-4.0.1.tgz", + "integrity": "sha512-Ho6h7w2h9y8RRE8r656hIj1oiSbwbIHJGF5r9G5FOwS2VdDPq8QLGvsG4x6pKHpvyGK7j+43sAc2cJKMiFoIJw==", + "dev": true, + "requires": { + "@types/node": ">= 8" + } + } + } + }, + "@octokit/types": { + "version": "2.16.2", + "resolved": "https://registry.npmjs.org/@octokit/types/-/types-2.16.2.tgz", + "integrity": "sha512-O75k56TYvJ8WpAakWwYRN8Bgu60KrmX0z1KqFp1kNiFNkgW+JW+9EBKZ+S33PU6SLvbihqd+3drvPxKK68Ee8Q==", + "dev": true, + "requires": { + "@types/node": ">= 8" } }, "is-plain-object": { @@ -4562,6 +4613,17 @@ "@octokit/types": "^2.0.0", "deprecation": "^2.0.0", "once": "^1.4.0" + }, + "dependencies": { + "@octokit/types": { + "version": "2.16.2", + "resolved": "https://registry.npmjs.org/@octokit/types/-/types-2.16.2.tgz", + "integrity": "sha512-O75k56TYvJ8WpAakWwYRN8Bgu60KrmX0z1KqFp1kNiFNkgW+JW+9EBKZ+S33PU6SLvbihqd+3drvPxKK68Ee8Q==", + "dev": true, + "requires": { + "@types/node": ">= 8" + } + } } }, "@octokit/rest": { @@ -4589,9 +4651,9 @@ } }, "@octokit/types": { - "version": "2.16.2", - "resolved": "https://registry.npmjs.org/@octokit/types/-/types-2.16.2.tgz", - "integrity": "sha512-O75k56TYvJ8WpAakWwYRN8Bgu60KrmX0z1KqFp1kNiFNkgW+JW+9EBKZ+S33PU6SLvbihqd+3drvPxKK68Ee8Q==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/@octokit/types/-/types-4.0.1.tgz", + "integrity": "sha512-Ho6h7w2h9y8RRE8r656hIj1oiSbwbIHJGF5r9G5FOwS2VdDPq8QLGvsG4x6pKHpvyGK7j+43sAc2cJKMiFoIJw==", "dev": true, "requires": { "@types/node": ">= 8" @@ -15543,9 +15605,9 @@ } }, "lerna": { - "version": "3.21.0", - "resolved": "https://registry.npmjs.org/lerna/-/lerna-3.21.0.tgz", - "integrity": "sha512-ux8yOwQEgIXOZVUfq+T8nVzPymL19vlIoPbysOP3YA4hcjKlqQIlsjI/1ugBe6b4MF7W4iV5vS3gH9cGqBBc1A==", + "version": "3.22.0", + "resolved": "https://registry.npmjs.org/lerna/-/lerna-3.22.0.tgz", + "integrity": "sha512-xWlHdAStcqK/IjKvjsSMHPZjPkBV1lS60PmsIeObU8rLljTepc4Sg/hncw4HWfQxPIewHAUTqhrxPIsqf9L2Eg==", "dev": true, "requires": { "@lerna/add": "3.21.0", @@ -15553,17 +15615,17 @@ "@lerna/changed": "3.21.0", "@lerna/clean": "3.21.0", "@lerna/cli": "3.18.5", - "@lerna/create": "3.21.0", + "@lerna/create": "3.22.0", "@lerna/diff": "3.21.0", "@lerna/exec": "3.21.0", - "@lerna/import": "3.21.0", + "@lerna/import": "3.22.0", "@lerna/info": "3.21.0", "@lerna/init": "3.21.0", "@lerna/link": "3.21.0", "@lerna/list": "3.21.0", - "@lerna/publish": "3.21.0", + "@lerna/publish": "3.22.0", "@lerna/run": "3.21.0", - "@lerna/version": "3.21.0", + "@lerna/version": "3.22.0", "import-local": "^2.0.0", "npmlog": "^4.1.2" } diff --git a/package.json b/package.json index f94996dfbe4..d7f830c11e6 100644 --- a/package.json +++ b/package.json @@ -112,7 +112,7 @@ "jest-matcher-utils": "25.5.0", "js-sha256": "0.9.0", "koa": "2.12.0", - "lerna": "3.21.0", + "lerna": "3.22.0", "log4js": "4.5.1", "memcached-mock": "0.1.0", "mock-req": "0.2.0", From 1a0d450be2ce916166c77c4246a8d23ff4825210 Mon Sep 17 00:00:00 2001 From: Trevor Scheer Date: Wed, 27 May 2020 09:07:29 +0000 Subject: [PATCH 625/642] security: Pass all validation rules to the `SubscriptionServer`. Co-authored-by: Jesse Rosenberger --- CHANGELOG.md | 12 +- .../apollo-server-core/src/ApolloServer.ts | 1 + .../src/ApolloServer.ts | 113 ++++++++++++++++++ 3 files changed, 125 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b1aee8a1900..95b6f3b60e7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,17 @@ The version headers in this history reflect the versions of Apollo Server itself > 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. 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. -- _Nothing yet! Stay tuned!_ +- **SECURITY:** If subscriptions were disabled with `subscriptions: false`, there is not a possible security risk. When subscriptions are enabled (**the default, when `subscriptions: false` is not explicitly set, regardless of whether there is a `Subscription` type in the schema**), ALL `validationRules` (including those that prevent introspection) will now passed be through to the underlying `SubscriptionServer` which is implemented by the [`subscriptions-transport-ws` ](https://github.com/apollographql/subscriptions-transport-ws) package. The previous behavior of not passing `validationRules` was a bug. + + This change means two things, the second of which affects most use cases: + + - User-provided validation rules (those provided by implementors to the `validationRules` option during `ApolloServer` construction) will now be passed to and enforced by the subscriptions server. + + - Internal validation rules, like the [`NoIntrospection`](https://github.com/apollographql/apollo-server/blob/7d6f23443/packages/apollo-server-core/src/ApolloServer.ts#L77-L88) validation rule, will also be passed to - and enforced by - the subscriptions server. + + > The `NoIntrospection` validation rule is used by Apollo Server to disable introspection when `introspection: true` is set explicitly, or when it is disabled implicitly when the `NODE_ENV` environment variable is set to `production`. (The former, automatic disabling of introspection in production can be disabled by explicitly setting `introspection: true`. If this is set on a server, then there is no change in behavior by this commit.) + + **To be clear, if subscriptions were disabled with `subscriptions: false`, the server is unaffected. In all other cases, introspection was unexpectedly enabled on the WebSocket endpoint provided by `SubscriptionServer` when it was meant to be disabled, either with `introspection: false` or when deployed to production. The risk is largely dependent on the data exposed in the schema itself.** ### v2.13.0 diff --git a/packages/apollo-server-core/src/ApolloServer.ts b/packages/apollo-server-core/src/ApolloServer.ts index f5de66b3c20..e2c56eea4f6 100644 --- a/packages/apollo-server-core/src/ApolloServer.ts +++ b/packages/apollo-server-core/src/ApolloServer.ts @@ -716,6 +716,7 @@ export class ApolloServerBase { return { ...connection, context }; }, keepAlive, + validationRules: this.requestOptions.validationRules }, server instanceof WebSocket.Server ? server diff --git a/packages/apollo-server-integration-testsuite/src/ApolloServer.ts b/packages/apollo-server-integration-testsuite/src/ApolloServer.ts index 521c52bcabd..ae0bff4c784 100644 --- a/packages/apollo-server-integration-testsuite/src/ApolloServer.ts +++ b/packages/apollo-server-integration-testsuite/src/ApolloServer.ts @@ -13,6 +13,7 @@ import { GraphQLError, ValidationContext, FieldDefinitionNode, + getIntrospectionQuery, } from 'graphql'; import { PubSub } from 'graphql-subscriptions'; @@ -1952,6 +1953,118 @@ export function testApolloServer( }) .catch(done.fail); }); + it('allows introspection when introspection is enabled on ApolloServer', done => { + const typeDefs = gql` + type Query { + hi: String + } + + type Subscription { + num: Int + } + `; + + const query = getIntrospectionQuery(); + + const resolvers = { + Query: { + hi: () => 'here to placate graphql-js', + }, + Subscription: { + num: { + subscribe: () => { + createEvent(1); + createEvent(2); + createEvent(3); + return pubsub.asyncIterator(SOMETHING_CHANGED_TOPIC); + }, + }, + }, + }; + + createApolloServer({ + typeDefs, + resolvers, + introspection: true, + }).then(({ port, server, httpServer }) => { + server.installSubscriptionHandlers(httpServer); + + const client = new SubscriptionClient( + `ws://localhost:${port}${server.subscriptionsPath}`, + {}, + WebSocket, + ); + + const observable = client.request({ query }); + + subscription = observable.subscribe({ + next: ({ data }) => { + try { + expect(data).toMatchObject({ __schema: expect.any(Object) }) + } catch (e) { + done.fail(e); + } + done(); + } + }); + }); + }); + it('disallows introspection when it\'s disabled on ApolloServer', done => { + const typeDefs = gql` + type Query { + hi: String + } + + type Subscription { + num: Int + } + `; + + const query = getIntrospectionQuery(); + + const resolvers = { + Query: { + hi: () => 'here to placate graphql-js', + }, + Subscription: { + num: { + subscribe: () => { + createEvent(1); + createEvent(2); + createEvent(3); + return pubsub.asyncIterator(SOMETHING_CHANGED_TOPIC); + }, + }, + }, + }; + + createApolloServer({ + typeDefs, + resolvers, + introspection: false, + }).then(({ port, server, httpServer }) => { + server.installSubscriptionHandlers(httpServer); + + const client = new SubscriptionClient( + `ws://localhost:${port}${server.subscriptionsPath}`, + {}, + WebSocket, + ); + + const observable = client.request({ query }); + + subscription = observable.subscribe({ + next: ({ data }) => { + try { + expect(data).toBeUndefined(); + } catch (e) { + done.fail(e); + } + done(); + } + }); + }); + }); }); describe('Persisted Queries', () => { From 489139c7bb0e112f4eacfb8f9a88b0fb80874013 Mon Sep 17 00:00:00 2001 From: Jeff Hampton Date: Wed, 27 May 2020 07:35:45 -0500 Subject: [PATCH 626/642] gateway: Support custom `fetcher` for RemoteGraphQLDataSource. (#4149) Co-authored-by: Jesse Rosenberger --- packages/apollo-gateway/CHANGELOG.md | 6 ++++- .../datasources/RemoteGraphQLDataSource.ts | 5 +++- .../__tests__/RemoteGraphQLDataSource.test.ts | 24 +++++++++++++++++++ 3 files changed, 33 insertions(+), 2 deletions(-) diff --git a/packages/apollo-gateway/CHANGELOG.md b/packages/apollo-gateway/CHANGELOG.md index 6d60093e030..0ce314f654d 100644 --- a/packages/apollo-gateway/CHANGELOG.md +++ b/packages/apollo-gateway/CHANGELOG.md @@ -4,7 +4,11 @@ > 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. 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. -- _Nothing yet! Stay tuned._ +- __NEW__: Provide the ability to pass a custom `fetcher` during `RemoteGraphQLDataSource` construction to be used when executing operations against downstream services. Providing a custom `fetcher` may be necessary to accommodate more advanced needs, e.g., configuring custom TLS certificates for internal services. [PR #4149](https://github.com/apollographql/apollo-server/pull/4149) + + The `fetcher` specified should be a compliant implementor of the [Fetch API standard](https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API). This addition compliments, though is still orthognonal to, similar behavior originally introduced in [#3783](https://github.com/apollographql/apollo-server/pull/3783), which allowed customization of the implementation used to fetch _gateway configuration and federated SDL from services_ in managed and unmanaged modes, but didn't affect the communication that takes place during _operation execution_. + + For now, the default `fetcher` will remain the same ([`node-fetch`](https://npm.im/node-fetch)) implementation. A future major-version bump will update it to be consistent with other feature-rich implementations of the Fetch API which are used elsewhere in the Apollo Server stack where we use [`make-fetch-happen`](https://npm.im/make-fetch-happen). In all likelihood, `ApolloGateway` will pass its own `fetcher` to the `RemoteGraphQLDataSource` during service initialization. ## 0.16.0 diff --git a/packages/apollo-gateway/src/datasources/RemoteGraphQLDataSource.ts b/packages/apollo-gateway/src/datasources/RemoteGraphQLDataSource.ts index feffde81b2d..700e78e2f47 100644 --- a/packages/apollo-gateway/src/datasources/RemoteGraphQLDataSource.ts +++ b/packages/apollo-gateway/src/datasources/RemoteGraphQLDataSource.ts @@ -20,6 +20,8 @@ import { GraphQLDataSource } from './types'; import createSHA from 'apollo-server-core/dist/utils/createSHA'; export class RemoteGraphQLDataSource = Record> implements GraphQLDataSource { + fetcher: typeof fetch = fetch; + constructor( config?: Partial> & object & @@ -144,7 +146,8 @@ export class RemoteGraphQLDataSource = Reco }); try { - const httpResponse = await fetch(httpRequest); + // Use our local `fetcher` to allow for fetch injection + const httpResponse = await this.fetcher(httpRequest); if (!httpResponse.ok) { throw await this.errorFromResponse(httpResponse); diff --git a/packages/apollo-gateway/src/datasources/__tests__/RemoteGraphQLDataSource.test.ts b/packages/apollo-gateway/src/datasources/__tests__/RemoteGraphQLDataSource.test.ts index ff5309dc000..f81b39afb18 100644 --- a/packages/apollo-gateway/src/datasources/__tests__/RemoteGraphQLDataSource.test.ts +++ b/packages/apollo-gateway/src/datasources/__tests__/RemoteGraphQLDataSource.test.ts @@ -9,6 +9,7 @@ import { import { RemoteGraphQLDataSource } from '../RemoteGraphQLDataSource'; import { Headers } from 'apollo-server-env'; import { GraphQLRequestContext } from 'apollo-server-types'; +import { Response } from '../../../../../../apollo-tooling/packages/apollo-env/lib'; beforeEach(() => { fetch.mockReset(); @@ -238,6 +239,29 @@ describe('constructing requests', () => { }); }); +describe('fetcher', () => { + it('uses a custom provided `fetcher`', async () => { + const injectedFetch = fetch.mockJSONResponseOnce({ data: { injected: true } }); + const DataSource = new RemoteGraphQLDataSource({ + url: 'https://api.example.com/foo', + fetcher: injectedFetch, + }); + + const { data } = await DataSource.process({ + request: { + query: '{ me { name } }', + variables: { id: '1' }, + }, + context: {}, + }); + + expect(injectedFetch).toHaveBeenCalled(); + expect(data).toEqual({injected: true}); + + }); + +}); + describe('willSendRequest', () => { it('allows for modifying variables', async () => { const DataSource = new RemoteGraphQLDataSource({ From bbf3df19b8c4fdb5d4ae5aa9b037c65190217f14 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Wed, 27 May 2020 12:54:20 +0000 Subject: [PATCH 627/642] Update CHANGELOG.md files prior to publishing. --- CHANGELOG.md | 11 ++++++++--- packages/apollo-federation/CHANGELOG.md | 4 ++++ packages/apollo-gateway/CHANGELOG.md | 4 ++++ 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f36eb095a03..61132a08c98 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,12 @@ The version headers in this history reflect the versions of Apollo Server itself > 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. 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. +- _Nothing yet! Stay tuned!_ + +### v2.14.0 + +- `apollo-server-core` / `apollo-server-plugin-base`: Add support for `willResolveField` and corresponding end-handler within `executionDidStart`. This brings the remaining bit of functionality that was previously only available from `graphql-extensions` to the new plugin API. The `graphql-extensions` API (which was never documented) will be deprecated in Apollo Server 3.x. To see the documentation for the request pipeline API, see [its documentation](https://www.apollographql.com/docs/apollo-server/integrations/plugins/). For more details, see the attached PR. [PR #3988](https://github.com/apollographql/apollo-server/pull/3988) +- `apollo-server-core`: Deprecate `graphql-extensions`. All internal usages of the `graphql-extensions` API have been migrated to the request pipeline plugin API. For any implementor-supplied `extensions`, a deprecation warning will be printed once per-extension, per-server-startup, notifying of the intention to deprecate. Extensions should migrate to the plugin API, which is outlined in [its documentation](https://www.apollographql.com/docs/apollo-server/integrations/plugins/). [PR #4135](https://github.com/apollographql/apollo-server/pull/4135) - `apollo-engine-reporting`: **Currently only for non-federated graphs.** Added an _experimental_ schema reporting option, `experimental_schemaReporting`, for Apollo Graph Manager users. **During @@ -48,9 +54,8 @@ The version headers in this history reflect the versions of Apollo Server itself _This change should be purely an implementation detail for a majority of users_. There are, however, some special considerations which are worth noting: - The federated tracing plugin's `ftv1` response on `extensions` (which is present on the response from an implementing service to the gateway) is now placed on the `extensions` _after_ the `formatResponse` hook. Anyone leveraging the `extensions`.`ftv1` data from the `formatResponse` hook will find that it is no longer present at that phase. -- `apollo-tracing`: This package's internal integration with Apollo Server has been switched from using the soon-to-be-deprecated`graphql-extensions` API to using [the request pipeline plugin API](https://www.apollographql.com/docs/apollo-server/integrations/plugins/). Behavior should remain otherwise the same. [PR #3991](https://github.com/apollographql/apollo-server/pull/3991) - - +- `apollo-tracing`: This package's internal integration with Apollo Server has been switched from using the soon-to-be-deprecated `graphql-extensions` API to using [the request pipeline plugin API](https://www.apollographql.com/docs/apollo-server/integrations/plugins/). Behavior should remain otherwise the same. [PR #3991](https://github.com/apollographql/apollo-server/pull/3991) +- `apollo-cache-control`: This package's internal integration with Apollo Server has been switched from using the soon-to-be-deprecated `graphql-extensions` API to using [the request pipeline plugin API](https://www.apollographql.com/docs/apollo-server/integrations/plugins/). Behavior should remain otherwise the same. [PR #3997](https://github.com/apollographql/apollo-server/pull/3997) ### v2.13.0 diff --git a/packages/apollo-federation/CHANGELOG.md b/packages/apollo-federation/CHANGELOG.md index de1b2d3c5d5..a0dc25f3aef 100644 --- a/packages/apollo-federation/CHANGELOG.md +++ b/packages/apollo-federation/CHANGELOG.md @@ -6,6 +6,10 @@ - _Nothing yet! Stay tuned._ +## 0.16.1 + +- Only changes in the similarly versioned `@apollo/gateway` package. + ## 0.16.0 - No changes. This package was major versioned to maintain lockstep versioning with @apollo/gateway. diff --git a/packages/apollo-gateway/CHANGELOG.md b/packages/apollo-gateway/CHANGELOG.md index 0ce314f654d..4f3fa744a77 100644 --- a/packages/apollo-gateway/CHANGELOG.md +++ b/packages/apollo-gateway/CHANGELOG.md @@ -4,6 +4,10 @@ > 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. 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. +- _Nothing yet! Stay tuned!_ + +## 0.16.1 + - __NEW__: Provide the ability to pass a custom `fetcher` during `RemoteGraphQLDataSource` construction to be used when executing operations against downstream services. Providing a custom `fetcher` may be necessary to accommodate more advanced needs, e.g., configuring custom TLS certificates for internal services. [PR #4149](https://github.com/apollographql/apollo-server/pull/4149) The `fetcher` specified should be a compliant implementor of the [Fetch API standard](https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API). This addition compliments, though is still orthognonal to, similar behavior originally introduced in [#3783](https://github.com/apollographql/apollo-server/pull/3783), which allowed customization of the implementation used to fetch _gateway configuration and federated SDL from services_ in managed and unmanaged modes, but didn't affect the communication that takes place during _operation execution_. From d159e320879f594ba2d04036e3e1aa0653ff164d Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Wed, 27 May 2020 14:18:05 +0000 Subject: [PATCH 628/642] Release - apollo-cache-control@0.11.0 - apollo-datasource-rest@0.9.2 - apollo-datasource@0.7.1 - apollo-engine-reporting-protobuf@0.5.1 - apollo-engine-reporting@2.0.0 - @apollo/federation@0.16.1 - @apollo/gateway@0.16.1 - apollo-server-azure-functions@2.14.0 - apollo-server-cache-memcached@0.6.5 - apollo-server-cache-redis@1.2.1 - apollo-server-cloud-functions@2.14.0 - apollo-server-cloudflare@2.14.0 - apollo-server-core@2.14.0 - apollo-server-env@2.4.4 - apollo-server-express@2.14.0 - apollo-server-fastify@2.14.0 - apollo-server-hapi@2.14.0 - apollo-server-integration-testsuite@2.14.0 - apollo-server-koa@2.14.0 - apollo-server-lambda@2.14.0 - apollo-server-micro@2.14.0 - apollo-server-plugin-base@0.9.0 - apollo-server-plugin-operation-registry@0.3.2 - apollo-server-plugin-response-cache@0.5.2 - apollo-server-testing@2.14.0 - apollo-server-types@0.5.0 - apollo-server@2.14.0 - apollo-tracing@0.11.0 - graphql-extensions@0.12.2 --- packages/apollo-cache-control/package.json | 2 +- packages/apollo-datasource-rest/package.json | 2 +- packages/apollo-datasource/package.json | 2 +- packages/apollo-engine-reporting-protobuf/package-lock.json | 2 +- packages/apollo-engine-reporting-protobuf/package.json | 2 +- packages/apollo-engine-reporting/package.json | 2 +- packages/apollo-federation/package.json | 2 +- packages/apollo-gateway/package.json | 2 +- packages/apollo-server-azure-functions/package.json | 2 +- packages/apollo-server-cache-memcached/package.json | 2 +- packages/apollo-server-cache-redis/package.json | 2 +- packages/apollo-server-cloud-functions/package.json | 2 +- packages/apollo-server-cloudflare/package.json | 2 +- packages/apollo-server-core/package.json | 2 +- packages/apollo-server-env/package.json | 2 +- packages/apollo-server-express/package.json | 2 +- packages/apollo-server-fastify/package.json | 2 +- packages/apollo-server-hapi/package.json | 2 +- packages/apollo-server-integration-testsuite/package.json | 2 +- packages/apollo-server-koa/package.json | 2 +- packages/apollo-server-lambda/package.json | 2 +- packages/apollo-server-micro/package.json | 2 +- packages/apollo-server-plugin-base/package.json | 2 +- packages/apollo-server-plugin-operation-registry/package.json | 2 +- packages/apollo-server-plugin-response-cache/package.json | 2 +- packages/apollo-server-testing/package.json | 2 +- packages/apollo-server-types/package.json | 2 +- packages/apollo-server/package.json | 2 +- packages/apollo-tracing/package.json | 2 +- packages/graphql-extensions/package.json | 2 +- 30 files changed, 30 insertions(+), 30 deletions(-) diff --git a/packages/apollo-cache-control/package.json b/packages/apollo-cache-control/package.json index ca3b1f1218a..b0366f16e2a 100644 --- a/packages/apollo-cache-control/package.json +++ b/packages/apollo-cache-control/package.json @@ -1,6 +1,6 @@ { "name": "apollo-cache-control", - "version": "0.11.0-alpha.1", + "version": "0.11.0", "description": "A GraphQL extension for cache control", "main": "./dist/index.js", "types": "./dist/index.d.ts", diff --git a/packages/apollo-datasource-rest/package.json b/packages/apollo-datasource-rest/package.json index c3e4e6a028a..2c70ce1a3c1 100644 --- a/packages/apollo-datasource-rest/package.json +++ b/packages/apollo-datasource-rest/package.json @@ -1,6 +1,6 @@ { "name": "apollo-datasource-rest", - "version": "0.9.2-alpha.1", + "version": "0.9.2", "author": "opensource@apollographql.com", "license": "MIT", "repository": { diff --git a/packages/apollo-datasource/package.json b/packages/apollo-datasource/package.json index 5dc85e7bfff..96c6ceda088 100644 --- a/packages/apollo-datasource/package.json +++ b/packages/apollo-datasource/package.json @@ -1,6 +1,6 @@ { "name": "apollo-datasource", - "version": "0.7.1-alpha.0", + "version": "0.7.1", "author": "opensource@apollographql.com", "license": "MIT", "repository": { diff --git a/packages/apollo-engine-reporting-protobuf/package-lock.json b/packages/apollo-engine-reporting-protobuf/package-lock.json index db3c36e4168..96f69fcc989 100644 --- a/packages/apollo-engine-reporting-protobuf/package-lock.json +++ b/packages/apollo-engine-reporting-protobuf/package-lock.json @@ -1,6 +1,6 @@ { "name": "apollo-engine-reporting-protobuf", - "version": "0.5.1-alpha.1", + "version": "0.5.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/packages/apollo-engine-reporting-protobuf/package.json b/packages/apollo-engine-reporting-protobuf/package.json index 52026c09f69..c022754150f 100644 --- a/packages/apollo-engine-reporting-protobuf/package.json +++ b/packages/apollo-engine-reporting-protobuf/package.json @@ -1,6 +1,6 @@ { "name": "apollo-engine-reporting-protobuf", - "version": "0.5.1-alpha.1", + "version": "0.5.1", "description": "Protobuf format for Apollo Engine", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-engine-reporting/package.json b/packages/apollo-engine-reporting/package.json index 7d351372131..5bdc6047d34 100644 --- a/packages/apollo-engine-reporting/package.json +++ b/packages/apollo-engine-reporting/package.json @@ -1,6 +1,6 @@ { "name": "apollo-engine-reporting", - "version": "2.0.0-alpha.2", + "version": "2.0.0", "description": "Send reports about your GraphQL services to Apollo Graph Manager (previously known as Apollo Engine)", "main": "./dist/index.js", "types": "./dist/index.d.ts", diff --git a/packages/apollo-federation/package.json b/packages/apollo-federation/package.json index 520e31a6d76..f978561161e 100644 --- a/packages/apollo-federation/package.json +++ b/packages/apollo-federation/package.json @@ -1,6 +1,6 @@ { "name": "@apollo/federation", - "version": "0.16.1-alpha.0", + "version": "0.16.1", "description": "Apollo Federation Utilities", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-gateway/package.json b/packages/apollo-gateway/package.json index 8d9088496ef..ffa8c1c9b73 100644 --- a/packages/apollo-gateway/package.json +++ b/packages/apollo-gateway/package.json @@ -1,6 +1,6 @@ { "name": "@apollo/gateway", - "version": "0.16.1-alpha.2", + "version": "0.16.1", "description": "Apollo Gateway", "author": "opensource@apollographql.com", "main": "dist/index.js", diff --git a/packages/apollo-server-azure-functions/package.json b/packages/apollo-server-azure-functions/package.json index dce4aadc4c7..eff4023a287 100644 --- a/packages/apollo-server-azure-functions/package.json +++ b/packages/apollo-server-azure-functions/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-azure-functions", - "version": "2.14.0-alpha.2", + "version": "2.14.0", "description": "Production-ready Node.js GraphQL server for Azure Functions", "keywords": [ "GraphQL", diff --git a/packages/apollo-server-cache-memcached/package.json b/packages/apollo-server-cache-memcached/package.json index f83ec47ec35..233ac509ecd 100644 --- a/packages/apollo-server-cache-memcached/package.json +++ b/packages/apollo-server-cache-memcached/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-cache-memcached", - "version": "0.6.5-alpha.0", + "version": "0.6.5", "author": "opensource@apollographql.com", "license": "MIT", "repository": { diff --git a/packages/apollo-server-cache-redis/package.json b/packages/apollo-server-cache-redis/package.json index b0b57a1f926..3d1cef1cdef 100644 --- a/packages/apollo-server-cache-redis/package.json +++ b/packages/apollo-server-cache-redis/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-cache-redis", - "version": "1.2.1-alpha.0", + "version": "1.2.1", "author": "opensource@apollographql.com", "license": "MIT", "repository": { diff --git a/packages/apollo-server-cloud-functions/package.json b/packages/apollo-server-cloud-functions/package.json index 44157166a2a..03bb8b3f0c9 100644 --- a/packages/apollo-server-cloud-functions/package.json +++ b/packages/apollo-server-cloud-functions/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-cloud-functions", - "version": "2.14.0-alpha.2", + "version": "2.14.0", "description": "Production-ready Node.js GraphQL server for Google Cloud Functions", "keywords": [ "GraphQL", diff --git a/packages/apollo-server-cloudflare/package.json b/packages/apollo-server-cloudflare/package.json index 1b516ffa82a..27a50cda92f 100644 --- a/packages/apollo-server-cloudflare/package.json +++ b/packages/apollo-server-cloudflare/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-cloudflare", - "version": "2.14.0-alpha.2", + "version": "2.14.0", "description": "Production-ready Node.js GraphQL server for Cloudflare workers", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-core/package.json b/packages/apollo-server-core/package.json index aceb37283bb..0d7b007db9e 100644 --- a/packages/apollo-server-core/package.json +++ b/packages/apollo-server-core/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-core", - "version": "2.14.0-alpha.2", + "version": "2.14.0", "description": "Core engine for Apollo GraphQL server", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-env/package.json b/packages/apollo-server-env/package.json index a09556b2c5f..0a6028862a6 100644 --- a/packages/apollo-server-env/package.json +++ b/packages/apollo-server-env/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-env", - "version": "2.4.4-alpha.0", + "version": "2.4.4", "author": "opensource@apollographql.com", "license": "MIT", "repository": { diff --git a/packages/apollo-server-express/package.json b/packages/apollo-server-express/package.json index 3150adecb4a..f561839d771 100644 --- a/packages/apollo-server-express/package.json +++ b/packages/apollo-server-express/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-express", - "version": "2.14.0-alpha.2", + "version": "2.14.0", "description": "Production-ready Node.js GraphQL server for Express and Connect", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-fastify/package.json b/packages/apollo-server-fastify/package.json index e38bc3510e7..a3faffc9179 100644 --- a/packages/apollo-server-fastify/package.json +++ b/packages/apollo-server-fastify/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-fastify", - "version": "2.14.0-alpha.2", + "version": "2.14.0", "description": "Production-ready Node.js GraphQL server for Fastify", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-hapi/package.json b/packages/apollo-server-hapi/package.json index a9f07414461..e736ddaa328 100644 --- a/packages/apollo-server-hapi/package.json +++ b/packages/apollo-server-hapi/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-hapi", - "version": "2.14.0-alpha.2", + "version": "2.14.0", "description": "Production-ready Node.js GraphQL server for Hapi", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-integration-testsuite/package.json b/packages/apollo-server-integration-testsuite/package.json index 3e3b976ba86..fc00b73707a 100644 --- a/packages/apollo-server-integration-testsuite/package.json +++ b/packages/apollo-server-integration-testsuite/package.json @@ -1,7 +1,7 @@ { "name": "apollo-server-integration-testsuite", "private": true, - "version": "2.14.0-alpha.2", + "version": "2.14.0", "description": "Apollo Server Integrations testsuite", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-koa/package.json b/packages/apollo-server-koa/package.json index d8d5800d4db..30acbc55cf3 100644 --- a/packages/apollo-server-koa/package.json +++ b/packages/apollo-server-koa/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-koa", - "version": "2.14.0-alpha.2", + "version": "2.14.0", "description": "Production-ready Node.js GraphQL server for Koa", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-lambda/package.json b/packages/apollo-server-lambda/package.json index f45abba3f79..888623d918b 100644 --- a/packages/apollo-server-lambda/package.json +++ b/packages/apollo-server-lambda/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-lambda", - "version": "2.14.0-alpha.2", + "version": "2.14.0", "description": "Production-ready Node.js GraphQL server for AWS Lambda", "keywords": [ "GraphQL", diff --git a/packages/apollo-server-micro/package.json b/packages/apollo-server-micro/package.json index c7a09032b0c..f7e5f6dbd85 100644 --- a/packages/apollo-server-micro/package.json +++ b/packages/apollo-server-micro/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-micro", - "version": "2.14.0-alpha.2", + "version": "2.14.0", "description": "Production-ready Node.js GraphQL server for Micro", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-plugin-base/package.json b/packages/apollo-server-plugin-base/package.json index 06d3c8ffe4c..9d71b829839 100644 --- a/packages/apollo-server-plugin-base/package.json +++ b/packages/apollo-server-plugin-base/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-plugin-base", - "version": "0.9.0-alpha.1", + "version": "0.9.0", "description": "Apollo Server plugin base classes", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-plugin-operation-registry/package.json b/packages/apollo-server-plugin-operation-registry/package.json index c0e412e0358..fbbd9e4a2f5 100644 --- a/packages/apollo-server-plugin-operation-registry/package.json +++ b/packages/apollo-server-plugin-operation-registry/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-plugin-operation-registry", - "version": "0.3.2-alpha.0", + "version": "0.3.2", "description": "Apollo Server operation registry", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-plugin-response-cache/package.json b/packages/apollo-server-plugin-response-cache/package.json index 1e3bdbfac02..d17a5f7cbbf 100644 --- a/packages/apollo-server-plugin-response-cache/package.json +++ b/packages/apollo-server-plugin-response-cache/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-plugin-response-cache", - "version": "0.5.2-alpha.1", + "version": "0.5.2", "description": "Apollo Server full query response cache", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-testing/package.json b/packages/apollo-server-testing/package.json index f95cf2939a0..7a79f0b69db 100644 --- a/packages/apollo-server-testing/package.json +++ b/packages/apollo-server-testing/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-testing", - "version": "2.14.0-alpha.2", + "version": "2.14.0", "description": "Test utils for apollo-server", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-types/package.json b/packages/apollo-server-types/package.json index 146c687aec0..f9c05f83b1e 100644 --- a/packages/apollo-server-types/package.json +++ b/packages/apollo-server-types/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-types", - "version": "0.5.0-alpha.1", + "version": "0.5.0", "description": "Apollo Server shared types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server/package.json b/packages/apollo-server/package.json index 794ca7d3578..738838bc912 100644 --- a/packages/apollo-server/package.json +++ b/packages/apollo-server/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server", - "version": "2.14.0-alpha.2", + "version": "2.14.0", "description": "Production ready GraphQL Server", "author": "opensource@apollographql.com", "main": "dist/index.js", diff --git a/packages/apollo-tracing/package.json b/packages/apollo-tracing/package.json index 71165100e64..db4bf3abc66 100644 --- a/packages/apollo-tracing/package.json +++ b/packages/apollo-tracing/package.json @@ -1,6 +1,6 @@ { "name": "apollo-tracing", - "version": "0.11.0-alpha.1", + "version": "0.11.0", "description": "Collect and expose trace data for GraphQL requests", "main": "./dist/index.js", "types": "./dist/index.d.ts", diff --git a/packages/graphql-extensions/package.json b/packages/graphql-extensions/package.json index a3ed8d41d17..1053a7f68ab 100644 --- a/packages/graphql-extensions/package.json +++ b/packages/graphql-extensions/package.json @@ -1,6 +1,6 @@ { "name": "graphql-extensions", - "version": "0.12.2-alpha.1", + "version": "0.12.2", "description": "Add extensions to GraphQL servers", "main": "./dist/index.js", "types": "./dist/index.d.ts", From 79c00252d2a2ecf8604cf4d080da27d1572219a7 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 28 May 2020 16:14:02 +0000 Subject: [PATCH 629/642] server-testing: Ensure user-provided context objects are cloned. The `apollo-server-testing` package uses an internal Apollo Server method called `executeOperation` (introduced in [#1909]) in order to power its `createTestClient` functionality. This is the testing practice which is documented within [Integration testing] in the Apollo Server documentation. However, it failed to introduce the same context-cloning which [takes place in `runHttpQuery`][Ref 1], prior to arriving at the main request pipeline. Since the context was not cloned, and we had made the expectation in [#3988] that it was a unique context on every single request (which it was, in a non-testing context), the Symbol we use to implement `willResolveField` was already present [on the request pipeline][Ref 2] when running a subsequent test via `createTestClient`! This commit introduces the same cloning that takes place in `buildRequestContext` within `runHttpQuery`, and adds tests to ensure the behavior is preserved. [Fixes #4170]: https://github.com/apollographql/apollo-server/issues/4170 [#1909]: https://github.com/apollographql/apollo-server/pull/1909 [Integration testing]: https://www.apollographql.com/docs/apollo-server/testing/testing/ [Ref 1]: https://git.io/Jfou6 [#3988]: https://github.com/apollographql/apollo-server/pull/3988 [Ref 2]: https://git.io/Jfouy --- CHANGELOG.md | 4 + .../apollo-server-core/src/ApolloServer.ts | 10 ++ .../apollo-server-core/src/runHttpQuery.ts | 3 +- .../src/ApolloServer.ts | 142 ++++++++++++++---- 4 files changed, 131 insertions(+), 28 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 61132a08c98..e0b00c9f548 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,10 @@ The version headers in this history reflect the versions of Apollo Server itself - _Nothing yet! Stay tuned!_ +### v2.14.1 + +- `apollo-server-testing`: Ensure that user-provided context is cloned when using `createTestClient`, per the instructions in the [intergration testing]() section of the Apollo Server documentation. [Issue #4170](https://github.com/apollographql/apollo-server/issues/4170) [PR #TODO](https://github.com/apollographql/apollo-server/pull/TODO) + ### v2.14.0 - `apollo-server-core` / `apollo-server-plugin-base`: Add support for `willResolveField` and corresponding end-handler within `executionDidStart`. This brings the remaining bit of functionality that was previously only available from `graphql-extensions` to the new plugin API. The `graphql-extensions` API (which was never documented) will be deprecated in Apollo Server 3.x. To see the documentation for the request pipeline API, see [its documentation](https://www.apollographql.com/docs/apollo-server/integrations/plugins/). For more details, see the attached PR. [PR #3988](https://github.com/apollographql/apollo-server/pull/3988) diff --git a/packages/apollo-server-core/src/ApolloServer.ts b/packages/apollo-server-core/src/ApolloServer.ts index 18181de0eb9..d9ad6be6e7c 100644 --- a/packages/apollo-server-core/src/ApolloServer.ts +++ b/packages/apollo-server-core/src/ApolloServer.ts @@ -78,6 +78,7 @@ import { CacheControlExtensionOptions, } from 'apollo-cache-control'; import { getEngineApiKey, getEngineGraphVariant } from "apollo-engine-reporting/dist/agent"; +import { cloneObject } from "./runHttpQuery"; const NoIntrospection = (context: ValidationContext) => ({ Field(node: FieldDefinitionNode) { @@ -855,8 +856,17 @@ export class ApolloServerBase { if (typeof options.context === 'function') { options.context = (options.context as () => never)(); + } else if (typeof options.context === 'object') { + // FIXME: We currently shallow clone the context for every request, + // but that's unlikely to be what people want. + // We allow passing in a function for `context` to ApolloServer, + // but this only runs once for a batched request (because this is resolved + // in ApolloServer#graphQLServerOptions, before runHttpQuery is invoked). + // NOTE: THIS IS DUPLICATED IN runHttpQuery.ts' buildRequestContext. + options.context = cloneObject(options.context); } + const requestCtx: GraphQLRequestContext = { logger: this.logger, schema: options.schema, diff --git a/packages/apollo-server-core/src/runHttpQuery.ts b/packages/apollo-server-core/src/runHttpQuery.ts index 90053cc2c28..dd86f349464 100644 --- a/packages/apollo-server-core/src/runHttpQuery.ts +++ b/packages/apollo-server-core/src/runHttpQuery.ts @@ -246,6 +246,7 @@ export async function processHTTPRequest( // We allow passing in a function for `context` to ApolloServer, // but this only runs once for a batched request (because this is resolved // in ApolloServer#graphQLServerOptions, before runHttpQuery is invoked). + // NOTE: THIS IS DUPLICATED IN ApolloServerBase.prototype.executeOperation. const context = cloneObject(options.context); return { // While `logger` is guaranteed by internal Apollo Server usage of @@ -458,6 +459,6 @@ function prettyJSONStringify(value: any) { return JSON.stringify(value) + '\n'; } -function cloneObject(object: T): T { +export function cloneObject(object: T): T { return Object.assign(Object.create(Object.getPrototypeOf(object)), object); } diff --git a/packages/apollo-server-integration-testsuite/src/ApolloServer.ts b/packages/apollo-server-integration-testsuite/src/ApolloServer.ts index 85257054458..e2942795b71 100644 --- a/packages/apollo-server-integration-testsuite/src/ApolloServer.ts +++ b/packages/apollo-server-integration-testsuite/src/ApolloServer.ts @@ -566,11 +566,13 @@ export function testApolloServer( describe('Plugins', () => { let apolloFetch: ApolloFetch; let apolloFetchResponse: ParsedResponse; + let serverInstance: ApolloServerBase; const setupApolloServerAndFetchPairForPlugins = async ( plugins: PluginDefinition[] = [], ) => { - const { url: uri } = await createApolloServer({ + const { url: uri, server } = await createApolloServer({ + context: { customContext: true }, typeDefs: gql` type Query { justAField: String @@ -579,6 +581,8 @@ export function testApolloServer( plugins, }); + serverInstance = server; + apolloFetch = createApolloFetch({ uri }) // Store the response so we can inspect it. .useAfter(({ response }, next) => { @@ -587,6 +591,56 @@ export function testApolloServer( }); }; + // Test for https://github.com/apollographql/apollo-server/issues/4170 + it('works when using executeOperation', async () => { + const encounteredFields = []; + const encounteredContext = []; + await setupApolloServerAndFetchPairForPlugins([ + { + requestDidStart: () => ({ + executionDidStart: () => ({ + willResolveField({ info, context }) { + encounteredFields.push(info.path); + encounteredContext.push(context); + }, + }), + }), + }, + ]); + + // The bug in 4170 (linked above) was occurring because of a failure + // to the context in `executeOperation`, in the same way that occurs + // in `runHttpQuery` prior to entering the request pipeline. That + // resulted in the inability to attach a symbol to the context because + // the symbol already existed on the context. Of course, a context + // is only created after the first invocation, so we'll run this twice + // to encounter the error where it was in the way when we tried to set + // it the second time. While we could have tested for the property + // before assigning to it, that is not the contract we have with the + // context, which should have been copied on `executeOperation` (which + // is meant to be used by testing, currently). + await serverInstance.executeOperation({ + query: '{ justAField }', + }); + await serverInstance.executeOperation({ + query: '{ justAField }', + }); + + expect(encounteredFields).toStrictEqual([ + { key: 'justAField', prev: undefined }, + { key: 'justAField', prev: undefined }, + ]); + + // This bit is just to ensure that nobody removes `context` from the + // `setupApolloServerAndFetchPairForPlugins` thinking it's unimportant. + // When a custom context is not provided, a new one is initialized + // on each request. + expect(encounteredContext).toStrictEqual([ + expect.objectContaining({customContext: true}), + expect.objectContaining({customContext: true}), + ]); + }); + it('returns correct status code for a normal operation', async () => { await setupApolloServerAndFetchPairForPlugins(); @@ -1492,37 +1546,71 @@ export function testApolloServer( expect(spy).toHaveBeenCalledTimes(2); }); - it('clones the context for every request', async () => { - const uniqueContext = { key: 'major' }; - const spy = jest.fn(() => 'hi'); - const typeDefs = gql` - type Query { - hello: String - } - `; - const resolvers = { - Query: { - hello: (_parent: any, _args: any, context: any) => { - expect(context.key).toEqual('major'); - context.key = 'minor'; - return spy(); + describe('context cloning', () => { + it('clones the context for request pipeline requests', async () => { + const uniqueContext = { key: 'major' }; + const spy = jest.fn(() => 'hi'); + const typeDefs = gql` + type Query { + hello: String + } + `; + const resolvers = { + Query: { + hello: (_parent: any, _args: any, context: any) => { + expect(context.key).toEqual('major'); + context.key = 'minor'; + return spy(); + }, }, - }, - }; - const { url: uri } = await createApolloServer({ - typeDefs, - resolvers, - context: uniqueContext, + }; + const { url: uri } = await createApolloServer({ + typeDefs, + resolvers, + context: uniqueContext, + }); + + const apolloFetch = createApolloFetch({ uri }); + + expect(spy).not.toBeCalled(); + + await apolloFetch({ query: '{hello}' }); + expect(spy).toHaveBeenCalledTimes(1); + await apolloFetch({ query: '{hello}' }); + expect(spy).toHaveBeenCalledTimes(2); }); - const apolloFetch = createApolloFetch({ uri }); + // https://github.com/apollographql/apollo-server/issues/4170 + it('for every request with executeOperation', async () => { + const uniqueContext = { key: 'major' }; + const spy = jest.fn(() => 'hi'); + const typeDefs = gql` + type Query { + hello: String + } + `; + const resolvers = { + Query: { + hello: (_parent: any, _args: any, context: any) => { + expect(context.key).toEqual('major'); + context.key = 'minor'; + return spy(); + }, + }, + }; + const { server } = await createApolloServer({ + typeDefs, + resolvers, + context: uniqueContext, + }); - expect(spy).not.toBeCalled(); + expect(spy).not.toBeCalled(); - await apolloFetch({ query: '{hello}' }); - expect(spy).toHaveBeenCalledTimes(1); - await apolloFetch({ query: '{hello}' }); - expect(spy).toHaveBeenCalledTimes(2); + await server.executeOperation({ query: '{hello}' }); + expect(spy).toHaveBeenCalledTimes(1); + await server.executeOperation({ query: '{hello}' }); + expect(spy).toHaveBeenCalledTimes(2); + }); }); describe('as a function', () => { From e9aef8c5ba3bc8619d1d4f230cf840d53a772984 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 28 May 2020 16:52:11 +0000 Subject: [PATCH 630/642] Fix typo in comment --- .../apollo-server-integration-testsuite/src/ApolloServer.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-integration-testsuite/src/ApolloServer.ts b/packages/apollo-server-integration-testsuite/src/ApolloServer.ts index e2942795b71..812d1941b4d 100644 --- a/packages/apollo-server-integration-testsuite/src/ApolloServer.ts +++ b/packages/apollo-server-integration-testsuite/src/ApolloServer.ts @@ -609,7 +609,7 @@ export function testApolloServer( ]); // The bug in 4170 (linked above) was occurring because of a failure - // to the context in `executeOperation`, in the same way that occurs + // to clone context in `executeOperation` in the same way that occurs // in `runHttpQuery` prior to entering the request pipeline. That // resulted in the inability to attach a symbol to the context because // the symbol already existed on the context. Of course, a context From 612f4b804653f260da64b01bc7774b5fc4468be2 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 28 May 2020 17:02:38 +0000 Subject: [PATCH 631/642] Update CHANGELOG.md prior to publishing. --- packages/apollo-federation/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/apollo-federation/CHANGELOG.md b/packages/apollo-federation/CHANGELOG.md index a0dc25f3aef..c6f37680a10 100644 --- a/packages/apollo-federation/CHANGELOG.md +++ b/packages/apollo-federation/CHANGELOG.md @@ -6,6 +6,10 @@ - _Nothing yet! Stay tuned._ +## 0.16.2 + +- Only changes in the similarly versioned `@apollo/gateway` package. + ## 0.16.1 - Only changes in the similarly versioned `@apollo/gateway` package. From 2da65ef9204027e43baedf9ce385bb3794fd0c9b Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 28 May 2020 17:13:26 +0000 Subject: [PATCH 632/642] Release - @apollo/federation@0.16.2 - @apollo/gateway@0.16.2 - apollo-server-azure-functions@2.14.1 - apollo-server-cloud-functions@2.14.1 - apollo-server-cloudflare@2.14.1 - apollo-server-core@2.14.1 - apollo-server-express@2.14.1 - apollo-server-fastify@2.14.1 - apollo-server-hapi@2.14.1 - apollo-server-integration-testsuite@2.14.1 - apollo-server-koa@2.14.1 - apollo-server-lambda@2.14.1 - apollo-server-micro@2.14.1 - apollo-server-testing@2.14.1 - apollo-server@2.14.1 --- packages/apollo-federation/package.json | 2 +- packages/apollo-gateway/package.json | 2 +- packages/apollo-server-azure-functions/package.json | 2 +- packages/apollo-server-cloud-functions/package.json | 2 +- packages/apollo-server-cloudflare/package.json | 2 +- packages/apollo-server-core/package.json | 2 +- packages/apollo-server-express/package.json | 2 +- packages/apollo-server-fastify/package.json | 2 +- packages/apollo-server-hapi/package.json | 2 +- packages/apollo-server-integration-testsuite/package.json | 2 +- packages/apollo-server-koa/package.json | 2 +- packages/apollo-server-lambda/package.json | 2 +- packages/apollo-server-micro/package.json | 2 +- packages/apollo-server-testing/package.json | 2 +- packages/apollo-server/package.json | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/packages/apollo-federation/package.json b/packages/apollo-federation/package.json index f978561161e..f830f13dd92 100644 --- a/packages/apollo-federation/package.json +++ b/packages/apollo-federation/package.json @@ -1,6 +1,6 @@ { "name": "@apollo/federation", - "version": "0.16.1", + "version": "0.16.2", "description": "Apollo Federation Utilities", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-gateway/package.json b/packages/apollo-gateway/package.json index ffa8c1c9b73..52fdfd780f3 100644 --- a/packages/apollo-gateway/package.json +++ b/packages/apollo-gateway/package.json @@ -1,6 +1,6 @@ { "name": "@apollo/gateway", - "version": "0.16.1", + "version": "0.16.2", "description": "Apollo Gateway", "author": "opensource@apollographql.com", "main": "dist/index.js", diff --git a/packages/apollo-server-azure-functions/package.json b/packages/apollo-server-azure-functions/package.json index eff4023a287..60251924e69 100644 --- a/packages/apollo-server-azure-functions/package.json +++ b/packages/apollo-server-azure-functions/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-azure-functions", - "version": "2.14.0", + "version": "2.14.1", "description": "Production-ready Node.js GraphQL server for Azure Functions", "keywords": [ "GraphQL", diff --git a/packages/apollo-server-cloud-functions/package.json b/packages/apollo-server-cloud-functions/package.json index 03bb8b3f0c9..92929b6ca61 100644 --- a/packages/apollo-server-cloud-functions/package.json +++ b/packages/apollo-server-cloud-functions/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-cloud-functions", - "version": "2.14.0", + "version": "2.14.1", "description": "Production-ready Node.js GraphQL server for Google Cloud Functions", "keywords": [ "GraphQL", diff --git a/packages/apollo-server-cloudflare/package.json b/packages/apollo-server-cloudflare/package.json index 27a50cda92f..59a5e9c1678 100644 --- a/packages/apollo-server-cloudflare/package.json +++ b/packages/apollo-server-cloudflare/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-cloudflare", - "version": "2.14.0", + "version": "2.14.1", "description": "Production-ready Node.js GraphQL server for Cloudflare workers", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-core/package.json b/packages/apollo-server-core/package.json index 0d7b007db9e..8988940571b 100644 --- a/packages/apollo-server-core/package.json +++ b/packages/apollo-server-core/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-core", - "version": "2.14.0", + "version": "2.14.1", "description": "Core engine for Apollo GraphQL server", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-express/package.json b/packages/apollo-server-express/package.json index f561839d771..a5b2c5791c9 100644 --- a/packages/apollo-server-express/package.json +++ b/packages/apollo-server-express/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-express", - "version": "2.14.0", + "version": "2.14.1", "description": "Production-ready Node.js GraphQL server for Express and Connect", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-fastify/package.json b/packages/apollo-server-fastify/package.json index a3faffc9179..4c0c2c2f304 100644 --- a/packages/apollo-server-fastify/package.json +++ b/packages/apollo-server-fastify/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-fastify", - "version": "2.14.0", + "version": "2.14.1", "description": "Production-ready Node.js GraphQL server for Fastify", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-hapi/package.json b/packages/apollo-server-hapi/package.json index e736ddaa328..bb99ced89ee 100644 --- a/packages/apollo-server-hapi/package.json +++ b/packages/apollo-server-hapi/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-hapi", - "version": "2.14.0", + "version": "2.14.1", "description": "Production-ready Node.js GraphQL server for Hapi", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-integration-testsuite/package.json b/packages/apollo-server-integration-testsuite/package.json index fc00b73707a..456099c8a26 100644 --- a/packages/apollo-server-integration-testsuite/package.json +++ b/packages/apollo-server-integration-testsuite/package.json @@ -1,7 +1,7 @@ { "name": "apollo-server-integration-testsuite", "private": true, - "version": "2.14.0", + "version": "2.14.1", "description": "Apollo Server Integrations testsuite", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-koa/package.json b/packages/apollo-server-koa/package.json index 30acbc55cf3..2669f1ae629 100644 --- a/packages/apollo-server-koa/package.json +++ b/packages/apollo-server-koa/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-koa", - "version": "2.14.0", + "version": "2.14.1", "description": "Production-ready Node.js GraphQL server for Koa", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-lambda/package.json b/packages/apollo-server-lambda/package.json index 888623d918b..615ebe7902e 100644 --- a/packages/apollo-server-lambda/package.json +++ b/packages/apollo-server-lambda/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-lambda", - "version": "2.14.0", + "version": "2.14.1", "description": "Production-ready Node.js GraphQL server for AWS Lambda", "keywords": [ "GraphQL", diff --git a/packages/apollo-server-micro/package.json b/packages/apollo-server-micro/package.json index f7e5f6dbd85..c6cc9032233 100644 --- a/packages/apollo-server-micro/package.json +++ b/packages/apollo-server-micro/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-micro", - "version": "2.14.0", + "version": "2.14.1", "description": "Production-ready Node.js GraphQL server for Micro", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-testing/package.json b/packages/apollo-server-testing/package.json index 7a79f0b69db..562e2bf55a3 100644 --- a/packages/apollo-server-testing/package.json +++ b/packages/apollo-server-testing/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-testing", - "version": "2.14.0", + "version": "2.14.1", "description": "Test utils for apollo-server", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server/package.json b/packages/apollo-server/package.json index 738838bc912..448eae5d11b 100644 --- a/packages/apollo-server/package.json +++ b/packages/apollo-server/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server", - "version": "2.14.0", + "version": "2.14.1", "description": "Production ready GraphQL Server", "author": "opensource@apollographql.com", "main": "dist/index.js", From 4fb348102e1248f78f6df5c70090147c5ceb7300 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 28 May 2020 17:23:20 +0000 Subject: [PATCH 633/642] Update CHANGELOG.md after publishing with complete version details. --- CHANGELOG.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e0b00c9f548..d546a5f32c3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,10 +13,14 @@ The version headers in this history reflect the versions of Apollo Server itself ### v2.14.1 -- `apollo-server-testing`: Ensure that user-provided context is cloned when using `createTestClient`, per the instructions in the [intergration testing]() section of the Apollo Server documentation. [Issue #4170](https://github.com/apollographql/apollo-server/issues/4170) [PR #TODO](https://github.com/apollographql/apollo-server/pull/TODO) +> [See complete versioning details.](https://github.com/apollographql/apollo-server/commit/2da65ef9204027e43baedf9ce385bb3794fd0c9b) + +- `apollo-server-testing`: Ensure that user-provided context is cloned when using `createTestClient`, per the instructions in the [intergration testing]() section of the Apollo Server documentation. [Issue #4170](https://github.com/apollographql/apollo-server/issues/4170) [PR #4175](https://github.com/apollographql/apollo-server/pull/4175) ### v2.14.0 +> [See complete versioning details.](https://github.com/apollographql/apollo-server/commit/d159e320879f594ba2d04036e3e1aa0653ff164d) + - `apollo-server-core` / `apollo-server-plugin-base`: Add support for `willResolveField` and corresponding end-handler within `executionDidStart`. This brings the remaining bit of functionality that was previously only available from `graphql-extensions` to the new plugin API. The `graphql-extensions` API (which was never documented) will be deprecated in Apollo Server 3.x. To see the documentation for the request pipeline API, see [its documentation](https://www.apollographql.com/docs/apollo-server/integrations/plugins/). For more details, see the attached PR. [PR #3988](https://github.com/apollographql/apollo-server/pull/3988) - `apollo-server-core`: Deprecate `graphql-extensions`. All internal usages of the `graphql-extensions` API have been migrated to the request pipeline plugin API. For any implementor-supplied `extensions`, a deprecation warning will be printed once per-extension, per-server-startup, notifying of the intention to deprecate. Extensions should migrate to the plugin API, which is outlined in [its documentation](https://www.apollographql.com/docs/apollo-server/integrations/plugins/). [PR #4135](https://github.com/apollographql/apollo-server/pull/4135) - `apollo-engine-reporting`: **Currently only for non-federated graphs.** From c0aa7c0bd28eda5a2fc538952695b3e6eeb653ff Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 30 May 2020 09:18:44 +0000 Subject: [PATCH 634/642] chore(deps): update dependency @azure/functions to v1.2.2 (#4179) Co-authored-by: Renovate Bot --- package-lock.json | 14 ++++++++------ .../apollo-server-azure-functions/package.json | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1f04675f2b2..442bc850920 100644 --- a/package-lock.json +++ b/package-lock.json @@ -485,11 +485,6 @@ "resolved": "https://registry.npmjs.org/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.24.tgz", "integrity": "sha512-8GqG48m1XqyXh4mIZrtB5xOhUwSsh1WsrrsaZQOEYYql3YN9DEu9OOSg0ILzXHZo/h2Q74777YE4YzlArQzQEQ==" }, - "@azure/functions": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@azure/functions/-/functions-1.2.0.tgz", - "integrity": "sha512-qkaQqTnr56xUnYNkKBM/2wsnf6imAJ3NF6Nbpk691Y6JYliA1YdZngsZsrpHS9tQ9/71MqARl8m50+EmEfLG3g==" - }, "@babel/code-frame": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0.tgz", @@ -5769,11 +5764,18 @@ "version": "file:packages/apollo-server-azure-functions", "requires": { "@apollographql/graphql-playground-html": "1.6.24", - "@azure/functions": "1.2.0", + "@azure/functions": "1.2.2", "apollo-server-core": "file:packages/apollo-server-core", "apollo-server-env": "file:packages/apollo-server-env", "apollo-server-types": "file:packages/apollo-server-types", "graphql-tools": "^4.0.0" + }, + "dependencies": { + "@azure/functions": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/@azure/functions/-/functions-1.2.2.tgz", + "integrity": "sha512-p/dDHq1sG/iAib+eDY4NxskWHoHW1WFzD85s0SfWxc2wVjJbxB0xz/zBF4s7ymjVgTu+0ceipeBk+tmpnt98oA==" + } } }, "apollo-server-cache-memcached": { diff --git a/packages/apollo-server-azure-functions/package.json b/packages/apollo-server-azure-functions/package.json index 60251924e69..7c33f852c85 100644 --- a/packages/apollo-server-azure-functions/package.json +++ b/packages/apollo-server-azure-functions/package.json @@ -26,7 +26,7 @@ }, "dependencies": { "@apollographql/graphql-playground-html": "1.6.24", - "@azure/functions": "1.2.0", + "@azure/functions": "1.2.2", "apollo-server-core": "file:../apollo-server-core", "apollo-server-env": "file:../apollo-server-env", "apollo-server-types": "file:../apollo-server-types", From 00a056a9e1d5a641bda48ae3924b23cbbb9600c8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 30 May 2020 10:41:32 +0000 Subject: [PATCH 635/642] chore(deps): update dependency @types/lodash to v4.14.153 (#4180) Co-authored-by: Renovate Bot --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 442bc850920..b6fd3becf51 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5173,9 +5173,9 @@ } }, "@types/lodash": { - "version": "4.14.152", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.152.tgz", - "integrity": "sha512-Vwf9YF2x1GE3WNeUMjT5bTHa2DqgUo87ocdgTScupY2JclZ5Nn7W2RLM/N0+oreexUk8uaVugR81NnTY/jNNXg==", + "version": "4.14.153", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.153.tgz", + "integrity": "sha512-lYniGRiRfZf2gGAR9cfRC3Pi5+Q1ziJCKqPmjZocigrSJUVPWf7st1BtSJ8JOeK0FLXVndQ1IjUjTco9CXGo/Q==", "dev": true }, "@types/lodash.sortby": { diff --git a/package.json b/package.json index 3f8bfaa5376..011736d82b0 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ "@types/ioredis": "4.16.2", "@types/jest": "25.2.3", "@types/koa-router": "7.4.1", - "@types/lodash": "4.14.152", + "@types/lodash": "4.14.153", "@types/lodash.sortby": "4.7.6", "@types/lodash.xorby": "4.7.6", "@types/loglevel": "1.5.4", From 68ff8e5c61206e4ee07249f63ca358b66bb606dc Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 30 May 2020 11:18:15 +0000 Subject: [PATCH 636/642] chore(deps): update dependency ioredis to v4.17.3 (#4182) Co-authored-by: Renovate Bot --- package-lock.json | 12 ++++++------ package.json | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index b6fd3becf51..3b88ad22d49 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4971,9 +4971,9 @@ "integrity": "sha512-TZDqvFW4nQwL9DVSNJIJu4lPLttKgzRF58COa7Vs42Ki/MrhIqUbeIw0MWn4kGLiZLXB7oCBibm7nkSjPkzfKQ==" }, "@types/ioredis": { - "version": "4.16.2", - "resolved": "https://registry.npmjs.org/@types/ioredis/-/ioredis-4.16.2.tgz", - "integrity": "sha512-b1wSWCLx5ygzDZ2d1BYBzsTzUcPEOcJH8d5O6AJGGJXjE6C+HrlA61sw5GQNqtqTPVo2Hpc4rPA30lI0T6QSLQ==", + "version": "4.16.3", + "resolved": "https://registry.npmjs.org/@types/ioredis/-/ioredis-4.16.3.tgz", + "integrity": "sha512-hE9HUayptwyZRIhRM2FF4vDmond4Yxylpjpri0qBvs7Rw4tFJnM+fdb2PbpU+PKKkPuFBGKnkrGSgwqeUmCJ2Q==", "dev": true, "requires": { "@types/node": "*" @@ -10884,9 +10884,9 @@ } }, "ioredis": { - "version": "4.17.1", - "resolved": "https://registry.npmjs.org/ioredis/-/ioredis-4.17.1.tgz", - "integrity": "sha512-kfxkN/YO1dnyaoAGyNdH3my4A1eoGDy4QOfqn6o86fo4dTboxyxYVW0S0v/d3MkwCWlvSWhlwq6IJMY9BlWs6w==", + "version": "4.17.3", + "resolved": "https://registry.npmjs.org/ioredis/-/ioredis-4.17.3.tgz", + "integrity": "sha512-iRvq4BOYzNFkDnSyhx7cmJNOi1x/HWYe+A4VXHBu4qpwJaGT1Mp+D2bVGJntH9K/Z/GeOM/Nprb8gB3bmitz1Q==", "requires": { "cluster-key-slot": "^1.1.0", "debug": "^4.1.1", diff --git a/package.json b/package.json index 011736d82b0..96cdf4be2f6 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "@types/connect": "3.4.33", "@types/fast-json-stable-stringify": "2.0.0", "@types/hapi": "17.8.8", - "@types/ioredis": "4.16.2", + "@types/ioredis": "4.16.3", "@types/jest": "25.2.3", "@types/koa-router": "7.4.1", "@types/lodash": "4.14.153", @@ -106,7 +106,7 @@ "graphql-tag": "2.10.3", "graphql-tools": "4.0.8", "hapi": "17.8.5", - "ioredis": "4.17.1", + "ioredis": "4.17.3", "jest": "25.5.4", "jest-config": "25.5.4", "jest-junit": "10.0.0", From d979a9ef8555db85310cb75c297092b48b051a55 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 30 May 2020 13:15:46 +0000 Subject: [PATCH 637/642] chore(deps): update dependency @types/lodash to v4.14.154 (#4184) Co-authored-by: Renovate Bot --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3b88ad22d49..1cc26ea5803 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5173,9 +5173,9 @@ } }, "@types/lodash": { - "version": "4.14.153", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.153.tgz", - "integrity": "sha512-lYniGRiRfZf2gGAR9cfRC3Pi5+Q1ziJCKqPmjZocigrSJUVPWf7st1BtSJ8JOeK0FLXVndQ1IjUjTco9CXGo/Q==", + "version": "4.14.154", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.154.tgz", + "integrity": "sha512-VoDZIJmg3P8vPEnTldLvgA+q7RkIbVkbYX4k0cAVFzGAOQwUehVgRHgIr2/wepwivDst/rVRqaiBSjCXRnoWwQ==", "dev": true }, "@types/lodash.sortby": { diff --git a/package.json b/package.json index 96cdf4be2f6..351e1dc9254 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ "@types/ioredis": "4.16.3", "@types/jest": "25.2.3", "@types/koa-router": "7.4.1", - "@types/lodash": "4.14.153", + "@types/lodash": "4.14.154", "@types/lodash.sortby": "4.7.6", "@types/lodash.xorby": "4.7.6", "@types/loglevel": "1.5.4", From eadbfc38dd20ca9b5250d81c3ddbb1c772c93571 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 30 May 2020 14:15:59 +0000 Subject: [PATCH 638/642] chore(deps): update dependency gatsby to v2.22.13 (#4181) Co-authored-by: Renovate Bot --- docs/package-lock.json | 4765 +++++++++++++++++++++++++++++++--------- docs/package.json | 2 +- 2 files changed, 3722 insertions(+), 1045 deletions(-) diff --git a/docs/package-lock.json b/docs/package-lock.json index d294f824684..7194da38d66 100644 --- a/docs/package-lock.json +++ b/docs/package-lock.json @@ -292,105 +292,147 @@ } }, "@babel/helper-create-class-features-plugin": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.9.6.tgz", - "integrity": "sha512-6N9IeuyHvMBRyjNYOMJHrhwtu4WJMrYf8hVbEHD3pbbbmNOk1kmXSQs7bA4dYDUaIx4ZEzdnvo6NwC3WHd/Qow==", + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.1.tgz", + "integrity": "sha512-bwhdehBJZt84HuPUcP1HaTLuc/EywVS8rc3FgsEPDcivg+DCW+SHuLHVkYOmcBA1ZfI+Z/oZjQc/+bPmIO7uAA==", "requires": { - "@babel/helper-function-name": "^7.9.5", - "@babel/helper-member-expression-to-functions": "^7.8.3", - "@babel/helper-optimise-call-expression": "^7.8.3", - "@babel/helper-plugin-utils": "^7.8.3", - "@babel/helper-replace-supers": "^7.9.6", - "@babel/helper-split-export-declaration": "^7.8.3" + "@babel/helper-function-name": "^7.10.1", + "@babel/helper-member-expression-to-functions": "^7.10.1", + "@babel/helper-optimise-call-expression": "^7.10.1", + "@babel/helper-plugin-utils": "^7.10.1", + "@babel/helper-replace-supers": "^7.10.1", + "@babel/helper-split-export-declaration": "^7.10.1" }, "dependencies": { "@babel/code-frame": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", - "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.1.tgz", + "integrity": "sha512-IGhtTmpjGbYzcEDOw7DcQtbQSXcG9ftmAXtWTu9V936vDye4xjjekktFAtgZsWpzTj/X01jocB46mTywm/4SZw==", "requires": { - "@babel/highlight": "^7.8.3" + "@babel/highlight": "^7.10.1" } }, "@babel/generator": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.6.tgz", - "integrity": "sha512-+htwWKJbH2bL72HRluF8zumBxzuX0ZZUFl3JLNyoUjM/Ho8wnVpPXM6aUz8cfKDqQ/h7zHqKt4xzJteUosckqQ==", + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.10.1.tgz", + "integrity": "sha512-AT0YPLQw9DI21tliuJIdplVfLHya6mcGa8ctkv7n4Qv+hYacJrKmNWIteAK1P9iyLikFIAkwqJ7HAOqIDLFfgA==", "requires": { - "@babel/types": "^7.9.6", + "@babel/types": "^7.10.1", "jsesc": "^2.5.1", "lodash": "^4.17.13", "source-map": "^0.5.0" } }, "@babel/helper-function-name": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz", - "integrity": "sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==", + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.1.tgz", + "integrity": "sha512-fcpumwhs3YyZ/ttd5Rz0xn0TpIwVkN7X0V38B9TWNfVF42KEkhkAAuPCQ3oXmtTRtiPJrmZ0TrfS0GKF0eMaRQ==", "requires": { - "@babel/helper-get-function-arity": "^7.8.3", - "@babel/template": "^7.8.3", - "@babel/types": "^7.9.5" + "@babel/helper-get-function-arity": "^7.10.1", + "@babel/template": "^7.10.1", + "@babel/types": "^7.10.1" + } + }, + "@babel/helper-get-function-arity": { + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.1.tgz", + "integrity": "sha512-F5qdXkYGOQUb0hpRaPoetF9AnsXknKjWMZ+wmsIRsp5ge5sFh4c3h1eH2pRTTuy9KKAA2+TTYomGXAtEL2fQEw==", + "requires": { + "@babel/types": "^7.10.1" + } + }, + "@babel/helper-member-expression-to-functions": { + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.10.1.tgz", + "integrity": "sha512-u7XLXeM2n50gb6PWJ9hoO5oO7JFPaZtrh35t8RqKLT1jFKj9IWeD1zrcrYp1q1qiZTdEarfDWfTIP8nGsu0h5g==", + "requires": { + "@babel/types": "^7.10.1" + } + }, + "@babel/helper-optimise-call-expression": { + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.1.tgz", + "integrity": "sha512-a0DjNS1prnBsoKx83dP2falChcs7p3i8VMzdrSbfLhuQra/2ENC4sbri34dz/rWmDADsmF1q5GbfaXydh0Jbjg==", + "requires": { + "@babel/types": "^7.10.1" } }, "@babel/helper-plugin-utils": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", - "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.1.tgz", + "integrity": "sha512-fvoGeXt0bJc7VMWZGCAEBEMo/HAjW2mP8apF5eXK0wSqwLAVHAISCWRoLMBMUs2kqeaG77jltVqu4Hn8Egl3nA==" }, "@babel/helper-replace-supers": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.9.6.tgz", - "integrity": "sha512-qX+chbxkbArLyCImk3bWV+jB5gTNU/rsze+JlcF6Nf8tVTigPJSI1o1oBow/9Resa1yehUO9lIipsmu9oG4RzA==", + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.1.tgz", + "integrity": "sha512-SOwJzEfpuQwInzzQJGjGaiG578UYmyi2Xw668klPWV5n07B73S0a9btjLk/52Mlcxa+5AdIYqws1KyXRfMoB7A==", "requires": { - "@babel/helper-member-expression-to-functions": "^7.8.3", - "@babel/helper-optimise-call-expression": "^7.8.3", - "@babel/traverse": "^7.9.6", - "@babel/types": "^7.9.6" + "@babel/helper-member-expression-to-functions": "^7.10.1", + "@babel/helper-optimise-call-expression": "^7.10.1", + "@babel/traverse": "^7.10.1", + "@babel/types": "^7.10.1" + } + }, + "@babel/helper-split-export-declaration": { + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.1.tgz", + "integrity": "sha512-UQ1LVBPrYdbchNhLwj6fetj46BcFwfS4NllJo/1aJsT+1dLTEnXJL0qHqtY7gPzF8S2fXBJamf1biAXV3X077g==", + "requires": { + "@babel/types": "^7.10.1" } }, "@babel/helper-validator-identifier": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz", - "integrity": "sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==" + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz", + "integrity": "sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==" }, "@babel/highlight": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz", - "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==", + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.1.tgz", + "integrity": "sha512-8rMof+gVP8mxYZApLF/JgNDAkdKa+aJt3ZYxF8z6+j/hpeXL7iMsKCPHa2jNMHu/qqBwzQF4OHNoYi8dMA/rYg==", "requires": { - "@babel/helper-validator-identifier": "^7.9.0", + "@babel/helper-validator-identifier": "^7.10.1", "chalk": "^2.0.0", "js-tokens": "^4.0.0" } }, "@babel/parser": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.6.tgz", - "integrity": "sha512-AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q==" + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.1.tgz", + "integrity": "sha512-AUTksaz3FqugBkbTZ1i+lDLG5qy8hIzCaAxEtttU6C0BtZZU9pkNZtWSVAht4EW9kl46YBiyTGMp9xTTGqViNg==" }, - "@babel/traverse": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.6.tgz", - "integrity": "sha512-b3rAHSjbxy6VEAvlxM8OV/0X4XrG72zoxme6q1MOoe2vd0bEc+TwayhuC1+Dfgqh1QEG+pj7atQqvUprHIccsg==", + "@babel/template": { + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.1.tgz", + "integrity": "sha512-OQDg6SqvFSsc9A0ej6SKINWrpJiNonRIniYondK2ViKhB06i3c0s+76XUft71iqBEe9S1OKsHwPAjfHnuvnCig==", "requires": { - "@babel/code-frame": "^7.8.3", - "@babel/generator": "^7.9.6", - "@babel/helper-function-name": "^7.9.5", - "@babel/helper-split-export-declaration": "^7.8.3", - "@babel/parser": "^7.9.6", - "@babel/types": "^7.9.6", + "@babel/code-frame": "^7.10.1", + "@babel/parser": "^7.10.1", + "@babel/types": "^7.10.1" + } + }, + "@babel/traverse": { + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.10.1.tgz", + "integrity": "sha512-C/cTuXeKt85K+p08jN6vMDz8vSV0vZcI0wmQ36o6mjbuo++kPMdpOYw23W2XH04dbRt9/nMEfA4W3eR21CD+TQ==", + "requires": { + "@babel/code-frame": "^7.10.1", + "@babel/generator": "^7.10.1", + "@babel/helper-function-name": "^7.10.1", + "@babel/helper-split-export-declaration": "^7.10.1", + "@babel/parser": "^7.10.1", + "@babel/types": "^7.10.1", "debug": "^4.1.0", "globals": "^11.1.0", "lodash": "^4.17.13" } }, "@babel/types": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.6.tgz", - "integrity": "sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA==", + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.1.tgz", + "integrity": "sha512-L2yqUOpf3tzlW9GVuipgLEcZxnO+96SzR6fjXMuxxNkIgFJ5+07mHCZ+HkHqaeZu8+3LKnNJJ1bKbjBETQAsrA==", "requires": { - "@babel/helper-validator-identifier": "^7.9.5", + "@babel/helper-validator-identifier": "^7.10.1", "lodash": "^4.17.13", "to-fast-properties": "^2.0.0" } @@ -938,18 +980,18 @@ } }, "@babel/plugin-proposal-class-properties": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.8.3.tgz", - "integrity": "sha512-EqFhbo7IosdgPgZggHaNObkmO1kNUe3slaKu54d5OWvy+p9QIKOzK1GAEpAIsZtWVtPXUHSMcT4smvDrCfY4AA==", + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.10.1.tgz", + "integrity": "sha512-sqdGWgoXlnOdgMXU+9MbhzwFRgxVLeiGBqTrnuS7LC2IBU31wSsESbTUreT2O418obpfPdGUR2GbEufZF1bpqw==", "requires": { - "@babel/helper-create-class-features-plugin": "^7.8.3", - "@babel/helper-plugin-utils": "^7.8.3" + "@babel/helper-create-class-features-plugin": "^7.10.1", + "@babel/helper-plugin-utils": "^7.10.1" }, "dependencies": { "@babel/helper-plugin-utils": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", - "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.1.tgz", + "integrity": "sha512-fvoGeXt0bJc7VMWZGCAEBEMo/HAjW2mP8apF5eXK0wSqwLAVHAISCWRoLMBMUs2kqeaG77jltVqu4Hn8Egl3nA==" } } }, @@ -1028,9 +1070,9 @@ }, "dependencies": { "@babel/helper-plugin-utils": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", - "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.1.tgz", + "integrity": "sha512-fvoGeXt0bJc7VMWZGCAEBEMo/HAjW2mP8apF5eXK0wSqwLAVHAISCWRoLMBMUs2kqeaG77jltVqu4Hn8Egl3nA==" } } }, @@ -1090,6 +1132,21 @@ } } }, + "@babel/plugin-syntax-class-properties": { + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.1.tgz", + "integrity": "sha512-Gf2Yx/iRs1JREDtVZ56OrjjgFHCaldpTnuy9BHla10qyVT3YkIIGEtoDWhyop0ksu1GvNjHIoYRBqm3zoR1jyQ==", + "requires": { + "@babel/helper-plugin-utils": "^7.10.1" + }, + "dependencies": { + "@babel/helper-plugin-utils": { + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.1.tgz", + "integrity": "sha512-fvoGeXt0bJc7VMWZGCAEBEMo/HAjW2mP8apF5eXK0wSqwLAVHAISCWRoLMBMUs2kqeaG77jltVqu4Hn8Egl3nA==" + } + } + }, "@babel/plugin-syntax-dynamic-import": { "version": "7.8.3", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz", @@ -1105,6 +1162,21 @@ } } }, + "@babel/plugin-syntax-flow": { + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.10.1.tgz", + "integrity": "sha512-b3pWVncLBYoPP60UOTc7NMlbtsHQ6ITim78KQejNHK6WJ2mzV5kCcg4mIWpasAfJEgwVTibwo2e+FU7UEIKQUg==", + "requires": { + "@babel/helper-plugin-utils": "^7.10.1" + }, + "dependencies": { + "@babel/helper-plugin-utils": { + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.1.tgz", + "integrity": "sha512-fvoGeXt0bJc7VMWZGCAEBEMo/HAjW2mP8apF5eXK0wSqwLAVHAISCWRoLMBMUs2kqeaG77jltVqu4Hn8Egl3nA==" + } + } + }, "@babel/plugin-syntax-json-strings": { "version": "7.8.3", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz", @@ -1366,17 +1438,17 @@ } }, "@babel/plugin-transform-destructuring": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.9.5.tgz", - "integrity": "sha512-j3OEsGel8nHL/iusv/mRd5fYZ3DrOxWC82x0ogmdN/vHfAP4MYw+AFKYanzWlktNwikKvlzUV//afBW5FTp17Q==", + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.1.tgz", + "integrity": "sha512-V/nUc4yGWG71OhaTH705pU8ZSdM6c1KmmLP8ys59oOYbT7RpMYAR3MsVOt6OHL0WzG7BlTU076va9fjJyYzJMA==", "requires": { - "@babel/helper-plugin-utils": "^7.8.3" + "@babel/helper-plugin-utils": "^7.10.1" }, "dependencies": { "@babel/helper-plugin-utils": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", - "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.1.tgz", + "integrity": "sha512-fvoGeXt0bJc7VMWZGCAEBEMo/HAjW2mP8apF5eXK0wSqwLAVHAISCWRoLMBMUs2kqeaG77jltVqu4Hn8Egl3nA==" } } }, @@ -1420,6 +1492,22 @@ } } }, + "@babel/plugin-transform-flow-strip-types": { + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.10.1.tgz", + "integrity": "sha512-i4o0YwiJBIsIx7/liVCZ3Q2WkWr1/Yu39PksBOnh/khW2SwIFsGa5Ze+MSon5KbDfrEHP9NeyefAgvUSXzaEkw==", + "requires": { + "@babel/helper-plugin-utils": "^7.10.1", + "@babel/plugin-syntax-flow": "^7.10.1" + }, + "dependencies": { + "@babel/helper-plugin-utils": { + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.1.tgz", + "integrity": "sha512-fvoGeXt0bJc7VMWZGCAEBEMo/HAjW2mP8apF5eXK0wSqwLAVHAISCWRoLMBMUs2kqeaG77jltVqu4Hn8Egl3nA==" + } + } + }, "@babel/plugin-transform-for-of": { "version": "7.9.0", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.9.0.tgz", @@ -1800,20 +1888,43 @@ } }, "@babel/plugin-transform-runtime": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.9.6.tgz", - "integrity": "sha512-qcmiECD0mYOjOIt8YHNsAP1SxPooC/rDmfmiSK9BNY72EitdSc7l44WTEklaWuFtbOEBjNhWWyph/kOImbNJ4w==", + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.10.1.tgz", + "integrity": "sha512-4w2tcglDVEwXJ5qxsY++DgWQdNJcCCsPxfT34wCUwIf2E7dI7pMpH8JczkMBbgBTNzBX62SZlNJ9H+De6Zebaw==", "requires": { - "@babel/helper-module-imports": "^7.8.3", - "@babel/helper-plugin-utils": "^7.8.3", + "@babel/helper-module-imports": "^7.10.1", + "@babel/helper-plugin-utils": "^7.10.1", "resolve": "^1.8.1", "semver": "^5.5.1" }, "dependencies": { + "@babel/helper-module-imports": { + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.1.tgz", + "integrity": "sha512-SFxgwYmZ3HZPyZwJRiVNLRHWuW2OgE5k2nrVs6D9Iv4PPnXVffuEHy83Sfx/l4SqF+5kyJXjAyUmrG7tNm+qVg==", + "requires": { + "@babel/types": "^7.10.1" + } + }, "@babel/helper-plugin-utils": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", - "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.1.tgz", + "integrity": "sha512-fvoGeXt0bJc7VMWZGCAEBEMo/HAjW2mP8apF5eXK0wSqwLAVHAISCWRoLMBMUs2kqeaG77jltVqu4Hn8Egl3nA==" + }, + "@babel/helper-validator-identifier": { + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz", + "integrity": "sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==" + }, + "@babel/types": { + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.1.tgz", + "integrity": "sha512-L2yqUOpf3tzlW9GVuipgLEcZxnO+96SzR6fjXMuxxNkIgFJ5+07mHCZ+HkHqaeZu8+3LKnNJJ1bKbjBETQAsrA==", + "requires": { + "@babel/helper-validator-identifier": "^7.10.1", + "lodash": "^4.17.13", + "to-fast-properties": "^2.0.0" + } } } }, @@ -2100,9 +2211,9 @@ } }, "@babel/polyfill": { - "version": "7.8.7", - "resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.8.7.tgz", - "integrity": "sha512-LeSfP9bNZH2UOZgcGcZ0PIHUt1ZuHub1L3CVmEyqLxCeDLm4C5Gi8jRH8ZX2PNpDhQCo0z6y/+DIs2JlliXW8w==", + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.10.1.tgz", + "integrity": "sha512-TviueJ4PBW5p48ra8IMtLXVkDucrlOZAIZ+EXqS3Ot4eukHbWiqcn7DcqpA1k5PcKtmJ4Xl9xwdv6yQvvcA+3g==", "requires": { "core-js": "^2.6.5", "regenerator-runtime": "^0.13.4" @@ -2380,9 +2491,9 @@ } }, "@babel/runtime-corejs3": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.9.6.tgz", - "integrity": "sha512-6toWAfaALQjt3KMZQc6fABqZwUDDuWzz+cAfPhqyEnzxvdWOAkjwPNxgF8xlmo7OWLsSjaKjsskpKHRLaMArOA==", + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.10.1.tgz", + "integrity": "sha512-/NLH0a34E/moPbqB1C/72I2gvMOmOly2JQARcRE1+PWCdHwMQ3la4sz7WnlK/EVHiBjQruH2WqE8YufL632Y8w==", "requires": { "core-js-pure": "^3.0.0", "regenerator-runtime": "^0.13.4" @@ -2396,9 +2507,9 @@ } }, "@babel/standalone": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/standalone/-/standalone-7.9.6.tgz", - "integrity": "sha512-UE0vm/4vuwzGgGNY9wR78ft3DUcHvAU0o/esXas2qjUL8yHMAEc04OmLkb3dfkUwlqbQ4+vC1OLBzwhcoIqLsA==" + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/standalone/-/standalone-7.10.1.tgz", + "integrity": "sha512-WYJ4SIteSGsgHK2/8YIuXm16IZ7LzuLxmEDc5UPYTGeTF31ibhpJZbZtgSQuhoTpSNh14euPSdBPQ91DiPveHA==" }, "@babel/template": { "version": "7.8.3", @@ -2637,119 +2748,958 @@ "resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz", "integrity": "sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA==" }, - "@hapi/address": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/@hapi/address/-/address-2.1.4.tgz", - "integrity": "sha512-QD1PhQk+s31P1ixsX0H0Suoupp3VMXzIVMSwobR3F3MSUO2YCV0B7xqLcUw/Bh8yuvd3LhpyqLQWTNcRmp6IdQ==" - }, - "@hapi/bourne": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/@hapi/bourne/-/bourne-1.3.2.tgz", - "integrity": "sha512-1dVNHT76Uu5N3eJNTYcvxee+jzX4Z9lfciqRRHCU27ihbUcYi+iSc2iml5Ke1LXe1SyJCLA0+14Jh4tXJgOppA==" - }, - "@hapi/hoek": { - "version": "8.5.1", - "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.5.1.tgz", - "integrity": "sha512-yN7kbciD87WzLGc5539Tn0sApjyiGHAJgKvG9W8C7O+6c7qmoQMfVs0W4bX17eqz6C78QJqqFrtgdK5EWf6Qow==" - }, - "@hapi/joi": { - "version": "15.1.1", - "resolved": "https://registry.npmjs.org/@hapi/joi/-/joi-15.1.1.tgz", - "integrity": "sha512-entf8ZMOK8sc+8YfeOlM8pCfg3b5+WZIKBfUaaJT8UsjAAPjartzxIYm3TIbjvA4u+u++KbcXD38k682nVHDAQ==", + "@graphql-tools/code-file-loader": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/@graphql-tools/code-file-loader/-/code-file-loader-6.0.5.tgz", + "integrity": "sha512-mj/v64+wM0Z+Ww7NTD62NRMlvxi9AL99YMxaX2f6qRQQhn2+awkvW7gu3rJa8Q5HD8H8gVK/ENPebE88VTqCPw==", "requires": { - "@hapi/address": "2.x.x", - "@hapi/bourne": "1.x.x", - "@hapi/hoek": "8.x.x", - "@hapi/topo": "3.x.x" + "@graphql-tools/graphql-tag-pluck": "6.0.5", + "@graphql-tools/utils": "6.0.5", + "fs-extra": "9.0.0", + "tslib": "~2.0.0" + }, + "dependencies": { + "fs-extra": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.0.0.tgz", + "integrity": "sha512-pmEYSk3vYsG/bF651KPUXZ+hvjpgWYw/Gc7W9NFUe3ZVLczKKWIij3IKpOrQcdw4TILtibFslZ0UmR8Vvzig4g==", + "requires": { + "at-least-node": "^1.0.0", + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^1.0.0" + } + }, + "jsonfile": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.0.1.tgz", + "integrity": "sha512-jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg==", + "requires": { + "graceful-fs": "^4.1.6", + "universalify": "^1.0.0" + } + }, + "tslib": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.0.tgz", + "integrity": "sha512-lTqkx847PI7xEDYJntxZH89L2/aXInsyF2luSafe/+0fHOMjlBNXdH6th7f70qxLDhul7KZK0zC8V5ZIyHl0/g==" + }, + "universalify": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz", + "integrity": "sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==" + } } }, - "@hapi/topo": { - "version": "3.1.6", - "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-3.1.6.tgz", - "integrity": "sha512-tAag0jEcjwH+P2quUfipd7liWCNX2F8NvYjQp2wtInsZxnMlypdw0FtAOLxtvvkO+GSRRbmNi8m/5y42PQJYCQ==", + "@graphql-tools/delegate": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-6.0.5.tgz", + "integrity": "sha512-JOXfDor3wQyjLkGD8JvTLRoXi3KNZvybm9fIwyPlbFghTac+KRH1A1RmHqQdaLE1ieYVv34Cplp/itoA77R4FQ==", "requires": { - "@hapi/hoek": "^8.3.0" + "@graphql-tools/schema": "6.0.5", + "@graphql-tools/utils": "6.0.5", + "tslib": "~2.0.0" + }, + "dependencies": { + "tslib": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.0.tgz", + "integrity": "sha512-lTqkx847PI7xEDYJntxZH89L2/aXInsyF2luSafe/+0fHOMjlBNXdH6th7f70qxLDhul7KZK0zC8V5ZIyHl0/g==" + } } }, - "@jest/types": { - "version": "25.5.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz", - "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==", + "@graphql-tools/git-loader": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/@graphql-tools/git-loader/-/git-loader-6.0.5.tgz", + "integrity": "sha512-iG++W3hi0Eg71RuPUFD8TDUjpcORqPvKVxLKJqoYkLMJgkQAiSS1dvYlZGFOmo3mwdXZq7O6DcIqVORqiRkKzQ==", "requires": { - "@types/istanbul-lib-coverage": "^2.0.0", - "@types/istanbul-reports": "^1.1.1", - "@types/yargs": "^15.0.0", - "chalk": "^3.0.0" + "@graphql-tools/graphql-tag-pluck": "6.0.5", + "@graphql-tools/utils": "6.0.5", + "simple-git": "2.5.0" }, "dependencies": { - "ansi-styles": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", - "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", "requires": { - "@types/color-name": "^1.1.1", - "color-convert": "^2.0.1" + "ms": "^2.1.1" } }, - "chalk": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", - "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "simple-git": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/simple-git/-/simple-git-2.5.0.tgz", + "integrity": "sha512-4gmtMqfIL9bsBNJDP/rDwZe3GsQL/tp85Qv5cmRc8iIDNOZJS4IX1oPfcqp9b7BGPc5bfuw4yd1i3lQacvuqDQ==", "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" + "@kwsites/exec-p": "^0.4.0", + "debug": "^4.0.1" } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + } + } + }, + "@graphql-tools/github-loader": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/@graphql-tools/github-loader/-/github-loader-6.0.5.tgz", + "integrity": "sha512-aDvenC1l9V1MDFkp3YP/TsJwTQLHzLwMobUpE3aypwHExoO/LCTScQg7QOPDPQQ9bP/KK2ROgihPRu476O/roA==", + "requires": { + "@graphql-tools/graphql-tag-pluck": "6.0.5", + "@graphql-tools/utils": "6.0.5", + "cross-fetch": "3.0.4" + }, + "dependencies": { + "cross-fetch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.0.4.tgz", + "integrity": "sha512-MSHgpjQqgbT/94D4CyADeNoYh52zMkCX4pcJvPP5WqPsLFMKjr2TCMg381ox5qI0ii2dPwaLx/00477knXqXVw==", "requires": { - "color-name": "~1.1.4" + "node-fetch": "2.6.0", + "whatwg-fetch": "3.0.0" } }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" - }, - "supports-color": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", - "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", - "requires": { - "has-flag": "^4.0.0" - } + "node-fetch": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz", + "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==" } } }, - "@mapbox/hast-util-table-cell-style": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/@mapbox/hast-util-table-cell-style/-/hast-util-table-cell-style-0.1.3.tgz", - "integrity": "sha512-QsEsh5YaDvHoMQ2YHdvZy2iDnU3GgKVBTcHf6cILyoWDZtPSdlG444pL/ioPYO/GpXSfODBb9sefEetfC4v9oA==", + "@graphql-tools/graphql-file-loader": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-6.0.5.tgz", + "integrity": "sha512-TSrD48/9bj1Ps4ne78PBurO/yP0wv7Qyjzg/Lfg04Apqw4cezVYIyqcTPGnXArQra1w/yORHw4726CKeZ96fbg==", "requires": { - "unist-util-visit": "^1.3.0" + "@graphql-tools/import": "6.0.5", + "@graphql-tools/utils": "6.0.5", + "fs-extra": "9.0.0", + "tslib": "~2.0.0" }, "dependencies": { - "unist-util-visit": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.4.1.tgz", - "integrity": "sha512-AvGNk7Bb//EmJZyhtRUnNMEpId/AZ5Ph/KUpTI09WHQuDZHKovQ1oEv3mfmKpWKtoMzyMC4GLBm1Zy5k12fjIw==", + "fs-extra": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.0.0.tgz", + "integrity": "sha512-pmEYSk3vYsG/bF651KPUXZ+hvjpgWYw/Gc7W9NFUe3ZVLczKKWIij3IKpOrQcdw4TILtibFslZ0UmR8Vvzig4g==", "requires": { - "unist-util-visit-parents": "^2.0.0" + "at-least-node": "^1.0.0", + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^1.0.0" } + }, + "jsonfile": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.0.1.tgz", + "integrity": "sha512-jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg==", + "requires": { + "graceful-fs": "^4.1.6", + "universalify": "^1.0.0" + } + }, + "tslib": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.0.tgz", + "integrity": "sha512-lTqkx847PI7xEDYJntxZH89L2/aXInsyF2luSafe/+0fHOMjlBNXdH6th7f70qxLDhul7KZK0zC8V5ZIyHl0/g==" + }, + "universalify": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz", + "integrity": "sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==" } } }, - "@mdx-js/mdx": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/@mdx-js/mdx/-/mdx-1.6.1.tgz", - "integrity": "sha512-DLnHbYZGoXSzfIHKgEtsO4qP8029YbdyJvC746PwfPNrRyGciPsqgWmfz/nEXt/fg+UMBG/6/cZaZx/hvyxnyg==", + "@graphql-tools/graphql-tag-pluck": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/@graphql-tools/graphql-tag-pluck/-/graphql-tag-pluck-6.0.5.tgz", + "integrity": "sha512-QwNKMiUfZJoJGMQAacgypkQXF4zze3fWjgIAGOIGOER+71D8Mz3uS1K4VtO6qsrNB5hNzvORPS9i5oawB46bgg==", + "requires": { + "@babel/parser": "7.10.1", + "@babel/traverse": "7.10.1", + "@babel/types": "7.10.1", + "@graphql-tools/utils": "6.0.5", + "vue-template-compiler": "^2.6.11" + }, + "dependencies": { + "@babel/code-frame": { + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.1.tgz", + "integrity": "sha512-IGhtTmpjGbYzcEDOw7DcQtbQSXcG9ftmAXtWTu9V936vDye4xjjekktFAtgZsWpzTj/X01jocB46mTywm/4SZw==", + "requires": { + "@babel/highlight": "^7.10.1" + } + }, + "@babel/generator": { + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.10.1.tgz", + "integrity": "sha512-AT0YPLQw9DI21tliuJIdplVfLHya6mcGa8ctkv7n4Qv+hYacJrKmNWIteAK1P9iyLikFIAkwqJ7HAOqIDLFfgA==", + "requires": { + "@babel/types": "^7.10.1", + "jsesc": "^2.5.1", + "lodash": "^4.17.13", + "source-map": "^0.5.0" + } + }, + "@babel/helper-function-name": { + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.1.tgz", + "integrity": "sha512-fcpumwhs3YyZ/ttd5Rz0xn0TpIwVkN7X0V38B9TWNfVF42KEkhkAAuPCQ3oXmtTRtiPJrmZ0TrfS0GKF0eMaRQ==", + "requires": { + "@babel/helper-get-function-arity": "^7.10.1", + "@babel/template": "^7.10.1", + "@babel/types": "^7.10.1" + } + }, + "@babel/helper-get-function-arity": { + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.1.tgz", + "integrity": "sha512-F5qdXkYGOQUb0hpRaPoetF9AnsXknKjWMZ+wmsIRsp5ge5sFh4c3h1eH2pRTTuy9KKAA2+TTYomGXAtEL2fQEw==", + "requires": { + "@babel/types": "^7.10.1" + } + }, + "@babel/helper-split-export-declaration": { + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.1.tgz", + "integrity": "sha512-UQ1LVBPrYdbchNhLwj6fetj46BcFwfS4NllJo/1aJsT+1dLTEnXJL0qHqtY7gPzF8S2fXBJamf1biAXV3X077g==", + "requires": { + "@babel/types": "^7.10.1" + } + }, + "@babel/helper-validator-identifier": { + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz", + "integrity": "sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==" + }, + "@babel/highlight": { + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.1.tgz", + "integrity": "sha512-8rMof+gVP8mxYZApLF/JgNDAkdKa+aJt3ZYxF8z6+j/hpeXL7iMsKCPHa2jNMHu/qqBwzQF4OHNoYi8dMA/rYg==", + "requires": { + "@babel/helper-validator-identifier": "^7.10.1", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" + } + }, + "@babel/parser": { + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.1.tgz", + "integrity": "sha512-AUTksaz3FqugBkbTZ1i+lDLG5qy8hIzCaAxEtttU6C0BtZZU9pkNZtWSVAht4EW9kl46YBiyTGMp9xTTGqViNg==" + }, + "@babel/template": { + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.1.tgz", + "integrity": "sha512-OQDg6SqvFSsc9A0ej6SKINWrpJiNonRIniYondK2ViKhB06i3c0s+76XUft71iqBEe9S1OKsHwPAjfHnuvnCig==", + "requires": { + "@babel/code-frame": "^7.10.1", + "@babel/parser": "^7.10.1", + "@babel/types": "^7.10.1" + } + }, + "@babel/traverse": { + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.10.1.tgz", + "integrity": "sha512-C/cTuXeKt85K+p08jN6vMDz8vSV0vZcI0wmQ36o6mjbuo++kPMdpOYw23W2XH04dbRt9/nMEfA4W3eR21CD+TQ==", + "requires": { + "@babel/code-frame": "^7.10.1", + "@babel/generator": "^7.10.1", + "@babel/helper-function-name": "^7.10.1", + "@babel/helper-split-export-declaration": "^7.10.1", + "@babel/parser": "^7.10.1", + "@babel/types": "^7.10.1", + "debug": "^4.1.0", + "globals": "^11.1.0", + "lodash": "^4.17.13" + } + }, + "@babel/types": { + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.1.tgz", + "integrity": "sha512-L2yqUOpf3tzlW9GVuipgLEcZxnO+96SzR6fjXMuxxNkIgFJ5+07mHCZ+HkHqaeZu8+3LKnNJJ1bKbjBETQAsrA==", + "requires": { + "@babel/helper-validator-identifier": "^7.10.1", + "lodash": "^4.17.13", + "to-fast-properties": "^2.0.0" + } + }, + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "requires": { + "ms": "^2.1.1" + } + } + } + }, + "@graphql-tools/import": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/@graphql-tools/import/-/import-6.0.5.tgz", + "integrity": "sha512-SPv/hrQg6uVrliFo7Bj9kM6RKEW4u1+jsDQF/x76x92gxNTtfd231mYZTbbqYXdsZ4P0fZR+FxBN2wIRJaMDWQ==", + "requires": { + "fs-extra": "9.0.0", + "resolve-from": "5.0.0" + }, + "dependencies": { + "fs-extra": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.0.0.tgz", + "integrity": "sha512-pmEYSk3vYsG/bF651KPUXZ+hvjpgWYw/Gc7W9NFUe3ZVLczKKWIij3IKpOrQcdw4TILtibFslZ0UmR8Vvzig4g==", + "requires": { + "at-least-node": "^1.0.0", + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^1.0.0" + } + }, + "jsonfile": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.0.1.tgz", + "integrity": "sha512-jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg==", + "requires": { + "graceful-fs": "^4.1.6", + "universalify": "^1.0.0" + } + }, + "resolve-from": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", + "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==" + }, + "universalify": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz", + "integrity": "sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==" + } + } + }, + "@graphql-tools/json-file-loader": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/@graphql-tools/json-file-loader/-/json-file-loader-6.0.5.tgz", + "integrity": "sha512-sHb15+frrK82hYgydhuW2QkogJOeZIDGoIctHLG8on5DdDTI4IVF3oJwg/tOHxej22apLKzLef9waKxa6Q8vPQ==", + "requires": { + "@graphql-tools/utils": "6.0.5", + "fs-extra": "9.0.0", + "tslib": "~2.0.0" + }, + "dependencies": { + "fs-extra": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.0.0.tgz", + "integrity": "sha512-pmEYSk3vYsG/bF651KPUXZ+hvjpgWYw/Gc7W9NFUe3ZVLczKKWIij3IKpOrQcdw4TILtibFslZ0UmR8Vvzig4g==", + "requires": { + "at-least-node": "^1.0.0", + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^1.0.0" + } + }, + "jsonfile": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.0.1.tgz", + "integrity": "sha512-jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg==", + "requires": { + "graceful-fs": "^4.1.6", + "universalify": "^1.0.0" + } + }, + "tslib": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.0.tgz", + "integrity": "sha512-lTqkx847PI7xEDYJntxZH89L2/aXInsyF2luSafe/+0fHOMjlBNXdH6th7f70qxLDhul7KZK0zC8V5ZIyHl0/g==" + }, + "universalify": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz", + "integrity": "sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==" + } + } + }, + "@graphql-tools/links": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/@graphql-tools/links/-/links-6.0.5.tgz", + "integrity": "sha512-qhI6MlkuX9YmgA0RSCBqloZkxGm7n609GqqAO6YhRpcBeFBhw90xiGh/+evx9M3/XJ0H/sJ3nGGlQPUojCTa9w==", + "requires": { + "@graphql-tools/utils": "6.0.5", + "apollo-link": "1.2.14", + "apollo-upload-client": "13.0.0", + "cross-fetch": "3.0.4", + "form-data": "3.0.0", + "tslib": "~2.0.0" + }, + "dependencies": { + "cross-fetch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.0.4.tgz", + "integrity": "sha512-MSHgpjQqgbT/94D4CyADeNoYh52zMkCX4pcJvPP5WqPsLFMKjr2TCMg381ox5qI0ii2dPwaLx/00477knXqXVw==", + "requires": { + "node-fetch": "2.6.0", + "whatwg-fetch": "3.0.0" + } + }, + "form-data": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.0.tgz", + "integrity": "sha512-CKMFDglpbMi6PyN+brwB9Q/GOw0eAnsrEZDgcsH5Krhz5Od/haKHAX0NmQfha2zPPz0JpWzA7GJHGSnvCRLWsg==", + "requires": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + } + }, + "node-fetch": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz", + "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==" + }, + "tslib": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.0.tgz", + "integrity": "sha512-lTqkx847PI7xEDYJntxZH89L2/aXInsyF2luSafe/+0fHOMjlBNXdH6th7f70qxLDhul7KZK0zC8V5ZIyHl0/g==" + } + } + }, + "@graphql-tools/load": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/@graphql-tools/load/-/load-6.0.5.tgz", + "integrity": "sha512-XERawStpQcky11zHVo3m7DieY8yBpC6n1rZbjv5JKi40Iik0MpNWsKfApBVxL461xeiCARNjN/YMxvnfe92HTg==", + "requires": { + "@graphql-tools/merge": "6.0.5", + "@graphql-tools/utils": "6.0.5", + "globby": "11.0.0", + "import-from": "3.0.0", + "is-glob": "4.0.1", + "p-limit": "2.3.0", + "tslib": "~2.0.0", + "unixify": "1.0.0", + "valid-url": "1.0.9" + }, + "dependencies": { + "@nodelib/fs.stat": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz", + "integrity": "sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==" + }, + "braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "requires": { + "fill-range": "^7.0.1" + } + }, + "fast-glob": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.2.tgz", + "integrity": "sha512-UDV82o4uQyljznxwMxyVRJgZZt3O5wENYojjzbaGEGZgeOxkLFf+V4cnUD+krzb2F72E18RhamkMZ7AdeggF7A==", + "requires": { + "@nodelib/fs.stat": "^2.0.2", + "@nodelib/fs.walk": "^1.2.3", + "glob-parent": "^5.1.0", + "merge2": "^1.3.0", + "micromatch": "^4.0.2", + "picomatch": "^2.2.1" + } + }, + "fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "requires": { + "to-regex-range": "^5.0.1" + } + }, + "glob-parent": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz", + "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==", + "requires": { + "is-glob": "^4.0.1" + } + }, + "globby": { + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.0.tgz", + "integrity": "sha512-iuehFnR3xu5wBBtm4xi0dMe92Ob87ufyu/dHwpDYfbcpYpIbrO5OnS8M1vWvrBhSGEJ3/Ecj7gnX76P8YxpPEg==", + "requires": { + "array-union": "^2.1.0", + "dir-glob": "^3.0.1", + "fast-glob": "^3.1.1", + "ignore": "^5.1.4", + "merge2": "^1.3.0", + "slash": "^3.0.0" + } + }, + "is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==" + }, + "micromatch": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz", + "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==", + "requires": { + "braces": "^3.0.1", + "picomatch": "^2.0.5" + } + }, + "picomatch": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz", + "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==" + }, + "to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "requires": { + "is-number": "^7.0.0" + } + }, + "tslib": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.0.tgz", + "integrity": "sha512-lTqkx847PI7xEDYJntxZH89L2/aXInsyF2luSafe/+0fHOMjlBNXdH6th7f70qxLDhul7KZK0zC8V5ZIyHl0/g==" + } + } + }, + "@graphql-tools/load-files": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/@graphql-tools/load-files/-/load-files-6.0.5.tgz", + "integrity": "sha512-XWHyE1cCXHv9YcjiLDm/v7f1oG7oIAkkuik481+5YQqfQyOZAkc293Gwh8ZWhXZ+ExT51c4+0ifZDxiOC3NSow==", + "requires": { + "fs-extra": "9.0.0", + "globby": "11.0.0", + "unixify": "1.0.0" + }, + "dependencies": { + "@nodelib/fs.stat": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz", + "integrity": "sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==" + }, + "braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "requires": { + "fill-range": "^7.0.1" + } + }, + "fast-glob": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.2.tgz", + "integrity": "sha512-UDV82o4uQyljznxwMxyVRJgZZt3O5wENYojjzbaGEGZgeOxkLFf+V4cnUD+krzb2F72E18RhamkMZ7AdeggF7A==", + "requires": { + "@nodelib/fs.stat": "^2.0.2", + "@nodelib/fs.walk": "^1.2.3", + "glob-parent": "^5.1.0", + "merge2": "^1.3.0", + "micromatch": "^4.0.2", + "picomatch": "^2.2.1" + } + }, + "fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "requires": { + "to-regex-range": "^5.0.1" + } + }, + "fs-extra": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.0.0.tgz", + "integrity": "sha512-pmEYSk3vYsG/bF651KPUXZ+hvjpgWYw/Gc7W9NFUe3ZVLczKKWIij3IKpOrQcdw4TILtibFslZ0UmR8Vvzig4g==", + "requires": { + "at-least-node": "^1.0.0", + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^1.0.0" + } + }, + "glob-parent": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz", + "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==", + "requires": { + "is-glob": "^4.0.1" + } + }, + "globby": { + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.0.tgz", + "integrity": "sha512-iuehFnR3xu5wBBtm4xi0dMe92Ob87ufyu/dHwpDYfbcpYpIbrO5OnS8M1vWvrBhSGEJ3/Ecj7gnX76P8YxpPEg==", + "requires": { + "array-union": "^2.1.0", + "dir-glob": "^3.0.1", + "fast-glob": "^3.1.1", + "ignore": "^5.1.4", + "merge2": "^1.3.0", + "slash": "^3.0.0" + } + }, + "is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==" + }, + "jsonfile": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.0.1.tgz", + "integrity": "sha512-jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg==", + "requires": { + "graceful-fs": "^4.1.6", + "universalify": "^1.0.0" + } + }, + "micromatch": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz", + "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==", + "requires": { + "braces": "^3.0.1", + "picomatch": "^2.0.5" + } + }, + "picomatch": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz", + "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==" + }, + "to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "requires": { + "is-number": "^7.0.0" + } + }, + "universalify": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz", + "integrity": "sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==" + } + } + }, + "@graphql-tools/merge": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.0.5.tgz", + "integrity": "sha512-ep7dwXaoNo47EkNpHoGKVHj4r/364IKMzdF8vBQC77DpIZtdNj8L3EgaSvUD40GoajGlTYP2lz/WAZb23JxlOQ==", + "requires": { + "@graphql-tools/schema": "6.0.5", + "@graphql-tools/utils": "6.0.5", + "tslib": "~2.0.0" + }, + "dependencies": { + "tslib": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.0.tgz", + "integrity": "sha512-lTqkx847PI7xEDYJntxZH89L2/aXInsyF2luSafe/+0fHOMjlBNXdH6th7f70qxLDhul7KZK0zC8V5ZIyHl0/g==" + } + } + }, + "@graphql-tools/mock": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/@graphql-tools/mock/-/mock-6.0.5.tgz", + "integrity": "sha512-QSbBlwpeftidHnPBQqOMm7Cn7vBcQV8xw/3SAbclXcVTGajEmosEHLJnaD8+KFV/tRYjJb5nw5m3P7gYKeRV+g==", + "requires": { + "@graphql-tools/schema": "6.0.5", + "@graphql-tools/utils": "6.0.5", + "tslib": "~2.0.0" + }, + "dependencies": { + "tslib": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.0.tgz", + "integrity": "sha512-lTqkx847PI7xEDYJntxZH89L2/aXInsyF2luSafe/+0fHOMjlBNXdH6th7f70qxLDhul7KZK0zC8V5ZIyHl0/g==" + } + } + }, + "@graphql-tools/module-loader": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/@graphql-tools/module-loader/-/module-loader-6.0.5.tgz", + "integrity": "sha512-rh77WaJXbYpgCRzHHt4fd8o8npjNx/sVq+FJWEpsZ152F+4DT6eD4U4GQ2Jo0dDsYLu5NBFzmMk3XIihv1GhUw==", + "requires": { + "@graphql-tools/utils": "6.0.5", + "tslib": "~2.0.0" + }, + "dependencies": { + "tslib": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.0.tgz", + "integrity": "sha512-lTqkx847PI7xEDYJntxZH89L2/aXInsyF2luSafe/+0fHOMjlBNXdH6th7f70qxLDhul7KZK0zC8V5ZIyHl0/g==" + } + } + }, + "@graphql-tools/relay-operation-optimizer": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/@graphql-tools/relay-operation-optimizer/-/relay-operation-optimizer-6.0.5.tgz", + "integrity": "sha512-tYJYNa8wICbpHd3Ub8s1QPKlSStnqLfv+ANw7htDUIsejSycu4hAvTTj1qzN+AOmvD8OIBMBuBVg+9vilbPOHg==", + "requires": { + "@graphql-tools/utils": "6.0.5", + "relay-compiler": "9.1.0" + } + }, + "@graphql-tools/resolvers-composition": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/@graphql-tools/resolvers-composition/-/resolvers-composition-6.0.5.tgz", + "integrity": "sha512-MYmpPgn4M/bURKIIEBBknSvowW+r9MuaWGM5OuY8k9K+rzttA9aftCL06DEgFBHXZ2zXmc/P1YV+L+C6ltAAkw==", + "requires": { + "@graphql-tools/utils": "6.0.5", + "lodash": "4.17.15" + } + }, + "@graphql-tools/schema": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/@graphql-tools/schema/-/schema-6.0.5.tgz", + "integrity": "sha512-F1MAW2uufz5O6fSUTdb72MMICbgP0km7l7wbsOC0izeEG/EqvvAs0dBDzvC6cNokDz/X/PCHhIdunK9o7XY/0g==", + "requires": { + "@graphql-tools/utils": "6.0.5", + "tslib": "~2.0.0" + }, + "dependencies": { + "tslib": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.0.tgz", + "integrity": "sha512-lTqkx847PI7xEDYJntxZH89L2/aXInsyF2luSafe/+0fHOMjlBNXdH6th7f70qxLDhul7KZK0zC8V5ZIyHl0/g==" + } + } + }, + "@graphql-tools/stitch": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/@graphql-tools/stitch/-/stitch-6.0.5.tgz", + "integrity": "sha512-g9Iyo0nEIWtPNLDpZB9bREzdEtg0QM6DV+LQfB4mZX6sco1El3ejqbkyV/6kH+Y1T5vNgJXi7Z80Ciw9wcY1gQ==", + "requires": { + "@graphql-tools/delegate": "6.0.5", + "@graphql-tools/schema": "6.0.5", + "@graphql-tools/utils": "6.0.5", + "@graphql-tools/wrap": "6.0.5", + "tslib": "~2.0.0" + }, + "dependencies": { + "tslib": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.0.tgz", + "integrity": "sha512-lTqkx847PI7xEDYJntxZH89L2/aXInsyF2luSafe/+0fHOMjlBNXdH6th7f70qxLDhul7KZK0zC8V5ZIyHl0/g==" + } + } + }, + "@graphql-tools/url-loader": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-6.0.5.tgz", + "integrity": "sha512-h/F3Js5VoywUF9tcbdKXgNrKCIOc8wyxTrXNpqM3sqgvgz2eu0yFQWin1YwAmgLUsxGttVUFJOVKT9rux0zaBw==", + "requires": { + "@graphql-tools/utils": "6.0.5", + "@graphql-tools/wrap": "6.0.5", + "@types/websocket": "1.0.0", + "cross-fetch": "3.0.4", + "subscriptions-transport-ws": "0.9.16", + "tslib": "~2.0.0", + "valid-url": "1.0.9", + "websocket": "1.0.31" + }, + "dependencies": { + "cross-fetch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.0.4.tgz", + "integrity": "sha512-MSHgpjQqgbT/94D4CyADeNoYh52zMkCX4pcJvPP5WqPsLFMKjr2TCMg381ox5qI0ii2dPwaLx/00477knXqXVw==", + "requires": { + "node-fetch": "2.6.0", + "whatwg-fetch": "3.0.0" + } + }, + "node-fetch": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz", + "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==" + }, + "tslib": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.0.tgz", + "integrity": "sha512-lTqkx847PI7xEDYJntxZH89L2/aXInsyF2luSafe/+0fHOMjlBNXdH6th7f70qxLDhul7KZK0zC8V5ZIyHl0/g==" + } + } + }, + "@graphql-tools/utils": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/@graphql-tools/utils/-/utils-6.0.5.tgz", + "integrity": "sha512-RRBx+ZKrw82dFXaXqh5lLNtjF9uD28G9OXESTj404+JSuz+eLbP0LIA/S6bcdUFfWqppgoswkK1sngvNpelKrg==", + "requires": { + "camel-case": "4.1.1" + }, + "dependencies": { + "camel-case": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.1.tgz", + "integrity": "sha512-7fa2WcG4fYFkclIvEmxBbTvmibwF2/agfEBc6q3lOpVu0A13ltLsA+Hr/8Hp6kp5f+G7hKi6t8lys6XxP+1K6Q==", + "requires": { + "pascal-case": "^3.1.1", + "tslib": "^1.10.0" + } + }, + "lower-case": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.1.tgz", + "integrity": "sha512-LiWgfDLLb1dwbFQZsSglpRj+1ctGnayXz3Uv0/WO8n558JycT5fg6zkNcnW0G68Nn0aEldTFeEfmjCfmqry/rQ==", + "requires": { + "tslib": "^1.10.0" + } + }, + "no-case": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.3.tgz", + "integrity": "sha512-ehY/mVQCf9BL0gKfsJBvFJen+1V//U+0HQMPrWct40ixE4jnv0bfvxDbWtAHL9EcaPEOJHVVYKoQn1TlZUB8Tw==", + "requires": { + "lower-case": "^2.0.1", + "tslib": "^1.10.0" + } + }, + "pascal-case": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.1.tgz", + "integrity": "sha512-XIeHKqIrsquVTQL2crjq3NfJUxmdLasn3TYOU0VBM+UX2a6ztAWBlJQBePLGY7VHW8+2dRadeIPK5+KImwTxQA==", + "requires": { + "no-case": "^3.0.3", + "tslib": "^1.10.0" + } + } + } + }, + "@graphql-tools/wrap": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-6.0.5.tgz", + "integrity": "sha512-eXQeA9RXZ9w5a7zORQxI3Dw1W0fyMQ4H5u/R80AEqbLYGAaqrr/4WEB3fhIBaOUw6D3ZsC34a3tmImwx77VHTw==", + "requires": { + "@graphql-tools/delegate": "6.0.5", + "@graphql-tools/schema": "6.0.5", + "@graphql-tools/utils": "6.0.5", + "tslib": "~2.0.0" + }, + "dependencies": { + "tslib": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.0.tgz", + "integrity": "sha512-lTqkx847PI7xEDYJntxZH89L2/aXInsyF2luSafe/+0fHOMjlBNXdH6th7f70qxLDhul7KZK0zC8V5ZIyHl0/g==" + } + } + }, + "@hapi/address": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/@hapi/address/-/address-2.1.4.tgz", + "integrity": "sha512-QD1PhQk+s31P1ixsX0H0Suoupp3VMXzIVMSwobR3F3MSUO2YCV0B7xqLcUw/Bh8yuvd3LhpyqLQWTNcRmp6IdQ==" + }, + "@hapi/bourne": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/@hapi/bourne/-/bourne-1.3.2.tgz", + "integrity": "sha512-1dVNHT76Uu5N3eJNTYcvxee+jzX4Z9lfciqRRHCU27ihbUcYi+iSc2iml5Ke1LXe1SyJCLA0+14Jh4tXJgOppA==" + }, + "@hapi/hoek": { + "version": "8.5.1", + "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.5.1.tgz", + "integrity": "sha512-yN7kbciD87WzLGc5539Tn0sApjyiGHAJgKvG9W8C7O+6c7qmoQMfVs0W4bX17eqz6C78QJqqFrtgdK5EWf6Qow==" + }, + "@hapi/joi": { + "version": "15.1.1", + "resolved": "https://registry.npmjs.org/@hapi/joi/-/joi-15.1.1.tgz", + "integrity": "sha512-entf8ZMOK8sc+8YfeOlM8pCfg3b5+WZIKBfUaaJT8UsjAAPjartzxIYm3TIbjvA4u+u++KbcXD38k682nVHDAQ==", + "requires": { + "@hapi/address": "2.x.x", + "@hapi/bourne": "1.x.x", + "@hapi/hoek": "8.x.x", + "@hapi/topo": "3.x.x" + } + }, + "@hapi/topo": { + "version": "3.1.6", + "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-3.1.6.tgz", + "integrity": "sha512-tAag0jEcjwH+P2quUfipd7liWCNX2F8NvYjQp2wtInsZxnMlypdw0FtAOLxtvvkO+GSRRbmNi8m/5y42PQJYCQ==", + "requires": { + "@hapi/hoek": "^8.3.0" + } + }, + "@jest/types": { + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz", + "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==", + "requires": { + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^1.1.1", + "@types/yargs": "^15.0.0", + "chalk": "^3.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" + }, + "supports-color": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, + "@kwsites/exec-p": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/@kwsites/exec-p/-/exec-p-0.4.0.tgz", + "integrity": "sha512-44DWNv5gDR9EwrCTVQ4ZC99yPqVS0VCWrYIBl45qNR8XQy+4lbl0IQG8kBDf6NHwj4Ib4c2z1Fq1IUJOCbkZcw==" + }, + "@mapbox/hast-util-table-cell-style": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/@mapbox/hast-util-table-cell-style/-/hast-util-table-cell-style-0.1.3.tgz", + "integrity": "sha512-QsEsh5YaDvHoMQ2YHdvZy2iDnU3GgKVBTcHf6cILyoWDZtPSdlG444pL/ioPYO/GpXSfODBb9sefEetfC4v9oA==", + "requires": { + "unist-util-visit": "^1.3.0" + }, + "dependencies": { + "unist-util-visit": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.4.1.tgz", + "integrity": "sha512-AvGNk7Bb//EmJZyhtRUnNMEpId/AZ5Ph/KUpTI09WHQuDZHKovQ1oEv3mfmKpWKtoMzyMC4GLBm1Zy5k12fjIw==", + "requires": { + "unist-util-visit-parents": "^2.0.0" + } + } + } + }, + "@mdx-js/mdx": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/@mdx-js/mdx/-/mdx-1.6.1.tgz", + "integrity": "sha512-DLnHbYZGoXSzfIHKgEtsO4qP8029YbdyJvC746PwfPNrRyGciPsqgWmfz/nEXt/fg+UMBG/6/cZaZx/hvyxnyg==", "requires": { "@babel/core": "7.9.0", "@babel/plugin-syntax-jsx": "7.8.3", @@ -2898,21 +3848,21 @@ "integrity": "sha512-jXBSWdWFPK2fs3johKb0hQFsf/x/C24XQYQwMhj8FxwlBgf7+NGATwXFs6pGkKd5/JfK9HXmbOcQ78MYoIZyxA==" }, "@mdx-js/runtime": { - "version": "1.6.4", - "resolved": "https://registry.npmjs.org/@mdx-js/runtime/-/runtime-1.6.4.tgz", - "integrity": "sha512-ZLQZksNeWkgiT83UGYdB3LbxKVmBfDdi696noL/iwAt7nMk4lTMlO6Pm/iqLZli3b4f/mgtsxk2gyNDiiN6axA==", + "version": "1.6.5", + "resolved": "https://registry.npmjs.org/@mdx-js/runtime/-/runtime-1.6.5.tgz", + "integrity": "sha512-JxyskuQaQwJBAjdClY7Un7wD+RWLkzPuox0Tfs72c4OQ5it1TzxCeQTL3Zv6ZsWzNCUgVt9o+h31+pbvYtsFsA==", "requires": { - "@mdx-js/mdx": "^1.6.4", - "@mdx-js/react": "^1.6.4", + "@mdx-js/mdx": "^1.6.5", + "@mdx-js/react": "^1.6.5", "buble-jsx-only": "^0.19.8" }, "dependencies": { "@babel/code-frame": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", - "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.1.tgz", + "integrity": "sha512-IGhtTmpjGbYzcEDOw7DcQtbQSXcG9ftmAXtWTu9V936vDye4xjjekktFAtgZsWpzTj/X01jocB46mTywm/4SZw==", "requires": { - "@babel/highlight": "^7.8.3" + "@babel/highlight": "^7.10.1" } }, "@babel/core": { @@ -2939,24 +3889,32 @@ } }, "@babel/generator": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.6.tgz", - "integrity": "sha512-+htwWKJbH2bL72HRluF8zumBxzuX0ZZUFl3JLNyoUjM/Ho8wnVpPXM6aUz8cfKDqQ/h7zHqKt4xzJteUosckqQ==", + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.10.1.tgz", + "integrity": "sha512-AT0YPLQw9DI21tliuJIdplVfLHya6mcGa8ctkv7n4Qv+hYacJrKmNWIteAK1P9iyLikFIAkwqJ7HAOqIDLFfgA==", "requires": { - "@babel/types": "^7.9.6", + "@babel/types": "^7.10.1", "jsesc": "^2.5.1", "lodash": "^4.17.13", "source-map": "^0.5.0" } }, "@babel/helper-function-name": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz", - "integrity": "sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==", + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.1.tgz", + "integrity": "sha512-fcpumwhs3YyZ/ttd5Rz0xn0TpIwVkN7X0V38B9TWNfVF42KEkhkAAuPCQ3oXmtTRtiPJrmZ0TrfS0GKF0eMaRQ==", "requires": { - "@babel/helper-get-function-arity": "^7.8.3", - "@babel/template": "^7.8.3", - "@babel/types": "^7.9.5" + "@babel/helper-get-function-arity": "^7.10.1", + "@babel/template": "^7.10.1", + "@babel/types": "^7.10.1" + } + }, + "@babel/helper-get-function-arity": { + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.1.tgz", + "integrity": "sha512-F5qdXkYGOQUb0hpRaPoetF9AnsXknKjWMZ+wmsIRsp5ge5sFh4c3h1eH2pRTTuy9KKAA2+TTYomGXAtEL2fQEw==", + "requires": { + "@babel/types": "^7.10.1" } }, "@babel/helper-plugin-utils": { @@ -2964,92 +3922,98 @@ "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==" }, + "@babel/helper-split-export-declaration": { + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.1.tgz", + "integrity": "sha512-UQ1LVBPrYdbchNhLwj6fetj46BcFwfS4NllJo/1aJsT+1dLTEnXJL0qHqtY7gPzF8S2fXBJamf1biAXV3X077g==", + "requires": { + "@babel/types": "^7.10.1" + } + }, + "@babel/helper-validator-identifier": { + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz", + "integrity": "sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==" + }, "@babel/helpers": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.6.tgz", - "integrity": "sha512-tI4bUbldloLcHWoRUMAj4g1bF313M/o6fBKhIsb3QnGVPwRm9JsNf/gqMkQ7zjqReABiffPV6RWj7hEglID5Iw==", + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.10.1.tgz", + "integrity": "sha512-muQNHF+IdU6wGgkaJyhhEmI54MOZBKsFfsXFhboz1ybwJ1Kl7IHlbm2a++4jwrmY5UYsgitt5lfqo1wMFcHmyw==", "requires": { - "@babel/template": "^7.8.3", - "@babel/traverse": "^7.9.6", - "@babel/types": "^7.9.6" + "@babel/template": "^7.10.1", + "@babel/traverse": "^7.10.1", + "@babel/types": "^7.10.1" } }, "@babel/highlight": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz", - "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==", + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.1.tgz", + "integrity": "sha512-8rMof+gVP8mxYZApLF/JgNDAkdKa+aJt3ZYxF8z6+j/hpeXL7iMsKCPHa2jNMHu/qqBwzQF4OHNoYi8dMA/rYg==", "requires": { - "@babel/helper-validator-identifier": "^7.9.0", + "@babel/helper-validator-identifier": "^7.10.1", "chalk": "^2.0.0", "js-tokens": "^4.0.0" } }, "@babel/parser": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.6.tgz", - "integrity": "sha512-AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q==" + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.1.tgz", + "integrity": "sha512-AUTksaz3FqugBkbTZ1i+lDLG5qy8hIzCaAxEtttU6C0BtZZU9pkNZtWSVAht4EW9kl46YBiyTGMp9xTTGqViNg==" }, "@babel/template": { - "version": "7.8.6", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz", - "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==", + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.1.tgz", + "integrity": "sha512-OQDg6SqvFSsc9A0ej6SKINWrpJiNonRIniYondK2ViKhB06i3c0s+76XUft71iqBEe9S1OKsHwPAjfHnuvnCig==", "requires": { - "@babel/code-frame": "^7.8.3", - "@babel/parser": "^7.8.6", - "@babel/types": "^7.8.6" + "@babel/code-frame": "^7.10.1", + "@babel/parser": "^7.10.1", + "@babel/types": "^7.10.1" } }, "@babel/traverse": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.6.tgz", - "integrity": "sha512-b3rAHSjbxy6VEAvlxM8OV/0X4XrG72zoxme6q1MOoe2vd0bEc+TwayhuC1+Dfgqh1QEG+pj7atQqvUprHIccsg==", - "requires": { - "@babel/code-frame": "^7.8.3", - "@babel/generator": "^7.9.6", - "@babel/helper-function-name": "^7.9.5", - "@babel/helper-split-export-declaration": "^7.8.3", - "@babel/parser": "^7.9.6", - "@babel/types": "^7.9.6", + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.10.1.tgz", + "integrity": "sha512-C/cTuXeKt85K+p08jN6vMDz8vSV0vZcI0wmQ36o6mjbuo++kPMdpOYw23W2XH04dbRt9/nMEfA4W3eR21CD+TQ==", + "requires": { + "@babel/code-frame": "^7.10.1", + "@babel/generator": "^7.10.1", + "@babel/helper-function-name": "^7.10.1", + "@babel/helper-split-export-declaration": "^7.10.1", + "@babel/parser": "^7.10.1", + "@babel/types": "^7.10.1", "debug": "^4.1.0", "globals": "^11.1.0", "lodash": "^4.17.13" } }, "@babel/types": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.6.tgz", - "integrity": "sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA==", + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.1.tgz", + "integrity": "sha512-L2yqUOpf3tzlW9GVuipgLEcZxnO+96SzR6fjXMuxxNkIgFJ5+07mHCZ+HkHqaeZu8+3LKnNJJ1bKbjBETQAsrA==", "requires": { - "@babel/helper-validator-identifier": "^7.9.5", + "@babel/helper-validator-identifier": "^7.10.1", "lodash": "^4.17.13", "to-fast-properties": "^2.0.0" - }, - "dependencies": { - "@babel/helper-validator-identifier": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz", - "integrity": "sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==" - } } }, "@mdx-js/mdx": { - "version": "1.6.4", - "resolved": "https://registry.npmjs.org/@mdx-js/mdx/-/mdx-1.6.4.tgz", - "integrity": "sha512-TuKjwVrp0bhuv++SnqHp3k7agawS4d29sSL9p1B6Wv6IxJTfkJPMD1rI+Ahek45qTNY0Sxh4Q6kox9a7cq1tag==", + "version": "1.6.5", + "resolved": "https://registry.npmjs.org/@mdx-js/mdx/-/mdx-1.6.5.tgz", + "integrity": "sha512-DC13eeEM0Dv9OD+UVhyB69BlV29d2eoAmfiR/XdgNl4R7YmRNEPGRD3QvGUdRUDxYdJBHauMz5ZIV507cNXXaA==", "requires": { "@babel/core": "7.9.6", "@babel/plugin-syntax-jsx": "7.8.3", "@babel/plugin-syntax-object-rest-spread": "7.8.3", - "@mdx-js/util": "^1.6.4", - "babel-plugin-apply-mdx-type-prop": "^1.6.4", - "babel-plugin-extract-import-names": "^1.6.4", + "@mdx-js/util": "^1.6.5", + "babel-plugin-apply-mdx-type-prop": "^1.6.5", + "babel-plugin-extract-import-names": "^1.6.5", "camelcase-css": "2.0.1", "detab": "2.0.3", "hast-util-raw": "5.0.2", "lodash.uniq": "4.5.0", "mdast-util-to-hast": "9.1.0", "remark-footnotes": "1.0.0", - "remark-mdx": "^1.6.4", + "remark-mdx": "^1.6.5", "remark-parse": "8.0.2", "remark-squeeze-paragraphs": "4.0.0", "style-to-object": "0.3.0", @@ -3059,28 +4023,28 @@ } }, "@mdx-js/react": { - "version": "1.6.4", - "resolved": "https://registry.npmjs.org/@mdx-js/react/-/react-1.6.4.tgz", - "integrity": "sha512-3SwDgbr2Fc3i5LrOQnahRUTvx0x/wRf+i8+fJM1caGTeq1XwVb6OHztJzaYt3DSizJVzRsBZznReY+l39up5Pg==" + "version": "1.6.5", + "resolved": "https://registry.npmjs.org/@mdx-js/react/-/react-1.6.5.tgz", + "integrity": "sha512-y1Yu9baw3KokFrs7g5RxHpJNSU4e1zk/5bAJX94yVATglG5HyAL0lYMySU8YzebXNE+fJJMCx9CuiQHy2ezoew==" }, "@mdx-js/util": { - "version": "1.6.4", - "resolved": "https://registry.npmjs.org/@mdx-js/util/-/util-1.6.4.tgz", - "integrity": "sha512-cVGZ68yZwyJnOMhARAdgD1IhZ0bsbsKCvsj6I/XnJcT9hNV/8WXErSV98zFfZwH3LmSRPde58l9hln+zXdK/mQ==" + "version": "1.6.5", + "resolved": "https://registry.npmjs.org/@mdx-js/util/-/util-1.6.5.tgz", + "integrity": "sha512-ljr9hGQYW3kZY1NmQbmSe4yXvgq3KDRt0FMBOB5OaDWqi4X2WzEsp6SZ02KmVrieNW1cjWlj13pgvcf0towZPw==" }, "babel-plugin-apply-mdx-type-prop": { - "version": "1.6.4", - "resolved": "https://registry.npmjs.org/babel-plugin-apply-mdx-type-prop/-/babel-plugin-apply-mdx-type-prop-1.6.4.tgz", - "integrity": "sha512-rVtztbgf3zmT1Is6vSNugfbdI2AG3mk/PUS8H71ss5V2XRNyYgeuFgTMX3h0bTDEJnbFG3ilRH566kVhZAkGWg==", + "version": "1.6.5", + "resolved": "https://registry.npmjs.org/babel-plugin-apply-mdx-type-prop/-/babel-plugin-apply-mdx-type-prop-1.6.5.tgz", + "integrity": "sha512-Bs2hv/bYFTJyhBqvsWOsceFyPXAhVM1gvwF8fIm6GeXYTQV+sY+qRR5TClamgr3OEsD8ZApmw+kxJSHgJggVyw==", "requires": { "@babel/helper-plugin-utils": "7.8.3", - "@mdx-js/util": "^1.6.4" + "@mdx-js/util": "^1.6.5" } }, "babel-plugin-extract-import-names": { - "version": "1.6.4", - "resolved": "https://registry.npmjs.org/babel-plugin-extract-import-names/-/babel-plugin-extract-import-names-1.6.4.tgz", - "integrity": "sha512-oShDRQX9CGDkg61DnNJG7T/ROjIpgzyLTi3mGr3fwbNDP3kiJ6TousEPu6d090qNUm/XiUasQ1ESOnLAb7plqQ==", + "version": "1.6.5", + "resolved": "https://registry.npmjs.org/babel-plugin-extract-import-names/-/babel-plugin-extract-import-names-1.6.5.tgz", + "integrity": "sha512-rrNoCZ1DHMdy3vuihvkuO2AjE2DVFrI78e61W7eVsgpNTbG0KO1UESQwXMTlS3v1PMnlEJjdvoteRAkatEkWFQ==", "requires": { "@babel/helper-plugin-utils": "7.8.3" } @@ -3120,15 +4084,15 @@ } }, "remark-mdx": { - "version": "1.6.4", - "resolved": "https://registry.npmjs.org/remark-mdx/-/remark-mdx-1.6.4.tgz", - "integrity": "sha512-tJ/CGNNLVC8nOm0C3EjDQH4Vl3YhawgR2f3J+RaalrMDrT4s5ZzOqoNesV1cnF/DsoOxKlYkExOpNSOa6rkAtQ==", + "version": "1.6.5", + "resolved": "https://registry.npmjs.org/remark-mdx/-/remark-mdx-1.6.5.tgz", + "integrity": "sha512-zItwP3xcVQAEPJTHseFh+KZEyJ31+pbVJMOMzognqTuZ2zfzIR4Xrg0BAx6eo+paV4fHne/5vi2ugWtCeOaBRA==", "requires": { "@babel/core": "7.9.6", "@babel/helper-plugin-utils": "7.8.3", "@babel/plugin-proposal-object-rest-spread": "7.9.6", "@babel/plugin-syntax-jsx": "7.8.3", - "@mdx-js/util": "^1.6.4", + "@mdx-js/util": "^1.6.5", "is-alphabetical": "1.0.4", "remark-parse": "8.0.2", "unified": "9.0.0" @@ -3197,9 +4161,9 @@ } }, "@pmmmwh/react-refresh-webpack-plugin": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.3.2.tgz", - "integrity": "sha512-3BPQLDiev6hIkQvhUGKO0nS7/u8l2dgIu1AbUcVnjgxuzrwIox70gb98K8p9lDO67DgCg7bWT6KE9GgdcMYtng==", + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.3.3.tgz", + "integrity": "sha512-uc6FmPEegAZawSHjUMFQwU7EjaDn7zy1iD/KD/wBROL9F4378OES8MKMYHoRAKT61Fk7LxVKZSDR5VespMQiqw==", "requires": { "ansi-html": "^0.0.7", "error-stack-parser": "^2.0.6", @@ -3209,6 +4173,176 @@ "schema-utils": "^2.6.5" } }, + "@reach/alert": { + "version": "0.10.3", + "resolved": "https://registry.npmjs.org/@reach/alert/-/alert-0.10.3.tgz", + "integrity": "sha512-Nu0XRKsHdM4gblgIgfTyJSl2KV1vrRTVVCVpol/f/ZVckTXAM/qN0C+JCCZSMfdjtt3u29CX6pRNkVu3PLfYsQ==", + "requires": { + "@reach/utils": "^0.10.3", + "@reach/visually-hidden": "^0.10.2", + "prop-types": "^15.7.2", + "tslib": "^1.11.2" + }, + "dependencies": { + "tslib": { + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz", + "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==" + } + } + }, + "@reach/auto-id": { + "version": "0.10.3", + "resolved": "https://registry.npmjs.org/@reach/auto-id/-/auto-id-0.10.3.tgz", + "integrity": "sha512-LK3qIsurXnga+gUbjl6t6msrZ+F3aZMY+k2go5Xcns9b85bNRyF/LwlUtcGSqmhgqbVYvMcnLeEdSQLZRxCGnQ==", + "requires": { + "@reach/utils": "^0.10.3", + "tslib": "^1.11.2" + }, + "dependencies": { + "tslib": { + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz", + "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==" + } + } + }, + "@reach/combobox": { + "version": "0.10.3", + "resolved": "https://registry.npmjs.org/@reach/combobox/-/combobox-0.10.3.tgz", + "integrity": "sha512-Z9Xl+j4Tm9JNC6ouHhzL0lv2Y+Of5/tD7CnpxaVudeIeXQKjeg5YSUCnIBU/OTUtRsIllkgACk70SGHqvntQAw==", + "requires": { + "@reach/auto-id": "^0.10.3", + "@reach/descendants": "^0.10.3", + "@reach/popover": "^0.10.3", + "@reach/portal": "^0.10.3", + "@reach/utils": "^0.10.3", + "highlight-words-core": "1.2.2", + "prop-types": "^15.7.2", + "tslib": "^1.11.2" + }, + "dependencies": { + "tslib": { + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz", + "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==" + } + } + }, + "@reach/descendants": { + "version": "0.10.3", + "resolved": "https://registry.npmjs.org/@reach/descendants/-/descendants-0.10.3.tgz", + "integrity": "sha512-1uwe2w49xSMF0ei1KedydB30sEWfyksk5axI3nEanwUDO7Sd1kCyt2GHZHoP2ESr6VQx2a9ETzMw8gKHsoy79g==", + "requires": { + "@reach/utils": "^0.10.3", + "tslib": "^1.11.2" + }, + "dependencies": { + "tslib": { + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz", + "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==" + } + } + }, + "@reach/dialog": { + "version": "0.10.3", + "resolved": "https://registry.npmjs.org/@reach/dialog/-/dialog-0.10.3.tgz", + "integrity": "sha512-RMpUHNjRQhkjGzKt9/oLmDhwUBikW3JbEzgzZngq5MGY5kWRPwYInLDkEA8We4E43AbBsl5J/PRzQha9V+EEXw==", + "requires": { + "@reach/portal": "^0.10.3", + "@reach/utils": "^0.10.3", + "prop-types": "^15.7.2", + "react-focus-lock": "^2.3.1", + "react-remove-scroll": "^2.3.0", + "tslib": "^1.11.2" + }, + "dependencies": { + "tslib": { + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz", + "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==" + } + } + }, + "@reach/menu-button": { + "version": "0.10.3", + "resolved": "https://registry.npmjs.org/@reach/menu-button/-/menu-button-0.10.3.tgz", + "integrity": "sha512-50C5nl7JJG9YcKqngmwTLVft+ZF2MMieto1GSCC7qEU8ykUNz0p69Ipup+Eqjk7KRHpSIYPlYIfAOS75dDuiZQ==", + "requires": { + "@reach/auto-id": "^0.10.3", + "@reach/descendants": "^0.10.3", + "@reach/popover": "^0.10.3", + "@reach/utils": "^0.10.3", + "prop-types": "^15.7.2", + "tslib": "^1.11.2" + }, + "dependencies": { + "tslib": { + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz", + "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==" + } + } + }, + "@reach/observe-rect": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@reach/observe-rect/-/observe-rect-1.1.0.tgz", + "integrity": "sha512-kE+jvoj/OyJV24C03VvLt5zclb9ArJi04wWXMMFwQvdZjdHoBlN4g0ZQFjyy/ejPF1Z/dpUD5dhRdBiUmIGZTA==" + }, + "@reach/popover": { + "version": "0.10.3", + "resolved": "https://registry.npmjs.org/@reach/popover/-/popover-0.10.3.tgz", + "integrity": "sha512-41iNfdjd9/5HtYuhezTc9z9WGkloYFVB8wBmPX3QOTuBP4qYd0La5sXClrfyiVqPn/uj1gGzehrZKuh8oSkorw==", + "requires": { + "@reach/portal": "^0.10.3", + "@reach/rect": "^0.10.3", + "@reach/utils": "^0.10.3", + "tabbable": "^4.0.0", + "tslib": "^1.11.2" + }, + "dependencies": { + "tslib": { + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz", + "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==" + } + } + }, + "@reach/portal": { + "version": "0.10.3", + "resolved": "https://registry.npmjs.org/@reach/portal/-/portal-0.10.3.tgz", + "integrity": "sha512-t8c+jtDxMLSPRGg93sQd2s6dDNilh5/qdrwmx88ki7l9h8oIXqMxPP3kSkOqZ9cbVR0b2A68PfMhCDOwMGvkoQ==", + "requires": { + "@reach/utils": "^0.10.3", + "tslib": "^1.11.2" + }, + "dependencies": { + "tslib": { + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz", + "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==" + } + } + }, + "@reach/rect": { + "version": "0.10.3", + "resolved": "https://registry.npmjs.org/@reach/rect/-/rect-0.10.3.tgz", + "integrity": "sha512-OmnGfG+MdumviJXK5oPcrw2Nd4EgMPKLMCs03GrbkmZJwtXIQJNhQrVg60PQT6HKAKI0+0LobHKxHFT+7Ri7kw==", + "requires": { + "@reach/observe-rect": "^1.1.0", + "@reach/utils": "^0.10.3", + "prop-types": "^15.7.2", + "tslib": "^1.11.2" + }, + "dependencies": { + "tslib": { + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz", + "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==" + } + } + }, "@reach/router": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/@reach/router/-/router-1.3.3.tgz", @@ -3220,18 +4354,202 @@ "react-lifecycles-compat": "^3.0.4" } }, - "@sindresorhus/is": { - "version": "0.14.0", - "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz", - "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==" - }, - "@sindresorhus/slugify": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/@sindresorhus/slugify/-/slugify-0.9.1.tgz", - "integrity": "sha512-b6heYM9dzZD13t2GOiEQTDE0qX+I1GyOotMwKh9VQqzuNiVdPVT8dM43fe9HNb/3ul+Qwd5oKSEDrDIfhq3bnQ==", + "@reach/tabs": { + "version": "0.10.1", + "resolved": "https://registry.npmjs.org/@reach/tabs/-/tabs-0.10.1.tgz", + "integrity": "sha512-a3lpLU7KEZrvJJdzyqWB90Q50rPhBWAWBWcHAyewkm6uWTamSB/GNTHxylKo3B8fSkFMUL7r1e/odKsE+GB29w==", + "requires": { + "@reach/auto-id": "^0.10.1", + "@reach/descendants": "^0.10.1", + "@reach/utils": "^0.10.1", + "prop-types": "^15.7.2", + "tslib": "^1.11.1" + }, + "dependencies": { + "tslib": { + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz", + "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==" + } + } + }, + "@reach/tooltip": { + "version": "0.10.3", + "resolved": "https://registry.npmjs.org/@reach/tooltip/-/tooltip-0.10.3.tgz", + "integrity": "sha512-tbj569uSJ+O86fAvR62lK8Tb00aTQxah6dFKgf06lskCGUoYzeFxkZTds9b+TRjzz9G1v68McQHwuAZUH0XrGA==", + "requires": { + "@reach/auto-id": "^0.10.3", + "@reach/portal": "^0.10.3", + "@reach/rect": "^0.10.3", + "@reach/utils": "^0.10.3", + "@reach/visually-hidden": "^0.10.2", + "prop-types": "^15.7.2", + "tslib": "^1.11.2" + }, + "dependencies": { + "tslib": { + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz", + "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==" + } + } + }, + "@reach/utils": { + "version": "0.10.3", + "resolved": "https://registry.npmjs.org/@reach/utils/-/utils-0.10.3.tgz", + "integrity": "sha512-LoIZSfVAJMA+DnzAMCMfc/wAM39iKT8BQQ9gI1FODpxd8nPFP4cKisMuRXImh2/iVtG2Z6NzzCNgceJSrywqFQ==", + "requires": { + "@types/warning": "^3.0.0", + "tslib": "^1.11.2", + "warning": "^4.0.3" + }, + "dependencies": { + "tslib": { + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz", + "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==" + } + } + }, + "@reach/visually-hidden": { + "version": "0.10.2", + "resolved": "https://registry.npmjs.org/@reach/visually-hidden/-/visually-hidden-0.10.2.tgz", + "integrity": "sha512-RWC2CZsEB6sUOMnBCiuemyesMVNOOKJP53j4RgbdaJ2zGFL6N+bh/E5bfZnAiVhjJ0G0laViE9s7iROaRWNFew==", + "requires": { + "tslib": "^1.11.2" + }, + "dependencies": { + "tslib": { + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz", + "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==" + } + } + }, + "@sindresorhus/is": { + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz", + "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==" + }, + "@sindresorhus/slugify": { + "version": "0.9.1", + "resolved": "https://registry.npmjs.org/@sindresorhus/slugify/-/slugify-0.9.1.tgz", + "integrity": "sha512-b6heYM9dzZD13t2GOiEQTDE0qX+I1GyOotMwKh9VQqzuNiVdPVT8dM43fe9HNb/3ul+Qwd5oKSEDrDIfhq3bnQ==", + "requires": { + "escape-string-regexp": "^1.0.5", + "lodash.deburr": "^4.1.0" + } + }, + "@styled-system/background": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/@styled-system/background/-/background-5.1.2.tgz", + "integrity": "sha512-jtwH2C/U6ssuGSvwTN3ri/IyjdHb8W9X/g8Y0JLcrH02G+BW3OS8kZdHphF1/YyRklnrKrBT2ngwGUK6aqqV3A==", + "requires": { + "@styled-system/core": "^5.1.2" + } + }, + "@styled-system/border": { + "version": "5.1.5", + "resolved": "https://registry.npmjs.org/@styled-system/border/-/border-5.1.5.tgz", + "integrity": "sha512-JvddhNrnhGigtzWRCVuAHepniyVi6hBlimxWDVAdcTuk7aRn9BYJUwfHslURtwYFsF5FoEs8Zmr1oZq2M1AP0A==", + "requires": { + "@styled-system/core": "^5.1.2" + } + }, + "@styled-system/color": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/@styled-system/color/-/color-5.1.2.tgz", + "integrity": "sha512-1kCkeKDZkt4GYkuFNKc7vJQMcOmTl3bJY3YBUs7fCNM6mMYJeT1pViQ2LwBSBJytj3AB0o4IdLBoepgSgGl5MA==", + "requires": { + "@styled-system/core": "^5.1.2" + } + }, + "@styled-system/core": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/@styled-system/core/-/core-5.1.2.tgz", + "integrity": "sha512-XclBDdNIy7OPOsN4HBsawG2eiWfCcuFt6gxKn1x4QfMIgeO6TOlA2pZZ5GWZtIhCUqEPTgIBta6JXsGyCkLBYw==", + "requires": { + "object-assign": "^4.1.1" + } + }, + "@styled-system/css": { + "version": "5.1.5", + "resolved": "https://registry.npmjs.org/@styled-system/css/-/css-5.1.5.tgz", + "integrity": "sha512-XkORZdS5kypzcBotAMPBoeckDs9aSZVkvrAlq5K3xP8IMAUek+x2O4NtwoSgkYkWWzVBu6DGdFZLR790QWGG+A==" + }, + "@styled-system/flexbox": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/@styled-system/flexbox/-/flexbox-5.1.2.tgz", + "integrity": "sha512-6hHV52+eUk654Y1J2v77B8iLeBNtc+SA3R4necsu2VVinSD7+XY5PCCEzBFaWs42dtOEDIa2lMrgL0YBC01mDQ==", + "requires": { + "@styled-system/core": "^5.1.2" + } + }, + "@styled-system/grid": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/@styled-system/grid/-/grid-5.1.2.tgz", + "integrity": "sha512-K3YiV1KyHHzgdNuNlaw8oW2ktMuGga99o1e/NAfTEi5Zsa7JXxzwEnVSDSBdJC+z6R8WYTCYRQC6bkVFcvdTeg==", + "requires": { + "@styled-system/core": "^5.1.2" + } + }, + "@styled-system/layout": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/@styled-system/layout/-/layout-5.1.2.tgz", + "integrity": "sha512-wUhkMBqSeacPFhoE9S6UF3fsMEKFv91gF4AdDWp0Aym1yeMPpqz9l9qS/6vjSsDPF7zOb5cOKC3tcKKOMuDCPw==", + "requires": { + "@styled-system/core": "^5.1.2" + } + }, + "@styled-system/position": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/@styled-system/position/-/position-5.1.2.tgz", + "integrity": "sha512-60IZfMXEOOZe3l1mCu6sj/2NAyUmES2kR9Kzp7s2D3P4qKsZWxD1Se1+wJvevb+1TP+ZMkGPEYYXRyU8M1aF5A==", + "requires": { + "@styled-system/core": "^5.1.2" + } + }, + "@styled-system/shadow": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/@styled-system/shadow/-/shadow-5.1.2.tgz", + "integrity": "sha512-wqniqYb7XuZM7K7C0d1Euxc4eGtqEe/lvM0WjuAFsQVImiq6KGT7s7is+0bNI8O4Dwg27jyu4Lfqo/oIQXNzAg==", + "requires": { + "@styled-system/core": "^5.1.2" + } + }, + "@styled-system/should-forward-prop": { + "version": "5.1.5", + "resolved": "https://registry.npmjs.org/@styled-system/should-forward-prop/-/should-forward-prop-5.1.5.tgz", + "integrity": "sha512-+rPRomgCGYnUIaFabDoOgpSDc4UUJ1KsmlnzcEp0tu5lFrBQKgZclSo18Z1URhaZm7a6agGtS5Xif7tuC2s52Q==", + "requires": { + "@emotion/is-prop-valid": "^0.8.1", + "@emotion/memoize": "^0.7.1", + "styled-system": "^5.1.5" + } + }, + "@styled-system/space": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/@styled-system/space/-/space-5.1.2.tgz", + "integrity": "sha512-+zzYpR8uvfhcAbaPXhH8QgDAV//flxqxSjHiS9cDFQQUSznXMQmxJegbhcdEF7/eNnJgHeIXv1jmny78kipgBA==", + "requires": { + "@styled-system/core": "^5.1.2" + } + }, + "@styled-system/typography": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/@styled-system/typography/-/typography-5.1.2.tgz", + "integrity": "sha512-BxbVUnN8N7hJ4aaPOd7wEsudeT7CxarR+2hns8XCX1zp0DFfbWw4xYa/olA0oQaqx7F1hzDg+eRaGzAJbF+jOg==", + "requires": { + "@styled-system/core": "^5.1.2" + } + }, + "@styled-system/variant": { + "version": "5.1.5", + "resolved": "https://registry.npmjs.org/@styled-system/variant/-/variant-5.1.5.tgz", + "integrity": "sha512-Yn8hXAFoWIro8+Q5J8YJd/mP85Teiut3fsGVR9CAxwgNfIAiqlYxsk5iHU7VHJks/0KjL4ATSjmbtCDC/4l1qw==", "requires": { - "escape-string-regexp": "^1.0.5", - "lodash.deburr": "^4.1.0" + "@styled-system/core": "^5.1.2", + "@styled-system/css": "^5.1.5" } }, "@svgr/babel-plugin-add-jsx-attribute": { @@ -3351,6 +4669,69 @@ "defer-to-connect": "^1.0.1" } }, + "@theme-ui/color-modes": { + "version": "0.4.0-highlight.0", + "resolved": "https://registry.npmjs.org/@theme-ui/color-modes/-/color-modes-0.4.0-highlight.0.tgz", + "integrity": "sha512-xdcAgfkL0gs0Z832lojtNGiTNtnQKoCu85t3Cxvqg2r1hVHar0SOJAyx+ljdV6tIHsBTxgVwUvdcby+QYCghRg==", + "requires": { + "@emotion/core": "^10.0.0", + "@theme-ui/core": "^0.4.0-highlight.0", + "@theme-ui/css": "^0.4.0-highlight.0", + "deepmerge": "^4.2.2" + } + }, + "@theme-ui/components": { + "version": "0.4.0-highlight.0", + "resolved": "https://registry.npmjs.org/@theme-ui/components/-/components-0.4.0-highlight.0.tgz", + "integrity": "sha512-dwVKGcXf29m4nehEKwaX/Vbl5fi/xhMNqHIYo1hnYmInKdUOnKDJOyxiiu4iNdmjTuXmpjj9WxBap1WHM07hkQ==", + "requires": { + "@emotion/core": "^10.0.0", + "@emotion/styled": "^10.0.0", + "@styled-system/color": "^5.1.2", + "@styled-system/should-forward-prop": "^5.1.2", + "@styled-system/space": "^5.1.2", + "@theme-ui/css": "^0.4.0-highlight.0" + } + }, + "@theme-ui/core": { + "version": "0.4.0-highlight.0", + "resolved": "https://registry.npmjs.org/@theme-ui/core/-/core-0.4.0-highlight.0.tgz", + "integrity": "sha512-r5S0tiO51sBrFPXWOnotWfhA+L+s60JI5ewLJU+P6wE2ZOKdnn3HorphRgZWusxjTrzjNfBfgwhwXK+GkQFycw==", + "requires": { + "@emotion/core": "^10.0.0", + "@theme-ui/css": "^0.4.0-highlight.0", + "deepmerge": "^4.2.2" + } + }, + "@theme-ui/css": { + "version": "0.4.0-highlight.0", + "resolved": "https://registry.npmjs.org/@theme-ui/css/-/css-0.4.0-highlight.0.tgz", + "integrity": "sha512-0O9ERm3l4arXip9EmaVl83I84l0ZhEj1ZUrKHrNbjiW2/rhIdEWUQOdYcWdBCb8/nr5NwRMOJQ4rdqiUj7S5IQ==", + "requires": { + "csstype": "^2.5.7" + } + }, + "@theme-ui/mdx": { + "version": "0.4.0-highlight.0", + "resolved": "https://registry.npmjs.org/@theme-ui/mdx/-/mdx-0.4.0-highlight.0.tgz", + "integrity": "sha512-kyEU0+AGaE3EoIe5Sip2PvEYx0w6CnkaryxEtqi6XH2A0Vu4jlRTVeDS0/ZrKVcsbqOWGdyc0Kpti3DN/JBhIg==", + "requires": { + "@emotion/core": "^10.0.0", + "@emotion/styled": "^10.0.0", + "@mdx-js/react": "^1.0.0" + } + }, + "@theme-ui/theme-provider": { + "version": "0.4.0-highlight.0", + "resolved": "https://registry.npmjs.org/@theme-ui/theme-provider/-/theme-provider-0.4.0-highlight.0.tgz", + "integrity": "sha512-QBpTmyyQenyc6fZd/4ereXdMGZiaJ8IVN+FmoRXo9UnV3EJDBrAAt708lMRaVw7ccWpa4KQb7HQnN3FpxXlnTg==", + "requires": { + "@emotion/core": "^10.0.0", + "@theme-ui/color-modes": "^0.4.0-highlight.0", + "@theme-ui/core": "^0.4.0-highlight.0", + "@theme-ui/mdx": "^0.4.0-highlight.0" + } + }, "@types/classnames": { "version": "2.2.10", "resolved": "https://registry.npmjs.org/@types/classnames/-/classnames-2.2.10.tgz", @@ -3442,9 +4823,17 @@ "integrity": "sha512-8+KAKzEvSUdeo+kmqnKrqgeE+LcA0tjYWFY7RPProVYwnqDjukzO+3b6dLD56rYX5TdWejnEOLJYOIeh4CXKuA==" }, "@types/lodash": { - "version": "4.14.152", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.152.tgz", - "integrity": "sha512-Vwf9YF2x1GE3WNeUMjT5bTHa2DqgUo87ocdgTScupY2JclZ5Nn7W2RLM/N0+oreexUk8uaVugR81NnTY/jNNXg==" + "version": "4.14.154", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.154.tgz", + "integrity": "sha512-VoDZIJmg3P8vPEnTldLvgA+q7RkIbVkbYX4k0cAVFzGAOQwUehVgRHgIr2/wepwivDst/rVRqaiBSjCXRnoWwQ==" + }, + "@types/lodash.sample": { + "version": "4.2.6", + "resolved": "https://registry.npmjs.org/@types/lodash.sample/-/lodash.sample-4.2.6.tgz", + "integrity": "sha512-hxBvsUjPcW1O8mC9TiBE4m8TwvLuUU+zW8J6GI1M6WmPg8J87mXGt7zavpJ/9Znb+0rVsSB3VNAjCFaJ9YUJKg==", + "requires": { + "@types/lodash": "*" + } }, "@types/mdast": { "version": "3.0.3", @@ -3505,6 +4894,16 @@ "csstype": "^2.2.0" } }, + "@types/reflexbox": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/@types/reflexbox/-/reflexbox-4.0.1.tgz", + "integrity": "sha512-Ucw4Fh13EYJdWS8zsyP6HJz8ooDL3LFwGT63J9Pu9hMqNRTO21yFaXH6BDUtNjD1zNyOxpv6Oe1+7Z90iiLFtQ==", + "requires": { + "@emotion/styled": "*", + "@types/react": "*", + "@types/styled-system": "*" + } + }, "@types/resolve": { "version": "0.0.8", "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-0.0.8.tgz", @@ -3522,6 +4921,54 @@ "@types/node": "*" } }, + "@types/styled-system": { + "version": "5.1.9", + "resolved": "https://registry.npmjs.org/@types/styled-system/-/styled-system-5.1.9.tgz", + "integrity": "sha512-QlWv6tmQV8dqk8s+LSLb9QAtmuQEnfv4f8lKKZkMgDqRFVmxJDBwEw0u4zhpxp56u0hdR+TCIk9dGfOw3TkCoQ==", + "requires": { + "csstype": "^2.6.9" + }, + "dependencies": { + "csstype": { + "version": "2.6.10", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.10.tgz", + "integrity": "sha512-D34BqZU4cIlMCY93rZHbrq9pjTAQJ3U8S8rfBqjwHxkGPThWFjzZDQpgMJY0QViLxth6ZKYiwFBo14RdN44U/w==" + } + } + }, + "@types/styled-system__css": { + "version": "5.0.11", + "resolved": "https://registry.npmjs.org/@types/styled-system__css/-/styled-system__css-5.0.11.tgz", + "integrity": "sha512-hUieAt4sFS7zwbdU9Vlnn/c3vkfhTMhyiccYGpUSX96nJ4BF3NjLIjMu3cQOYS5EX4gPkHJZhkfdw41ov1NjhQ==", + "requires": { + "csstype": "^2.6.6" + } + }, + "@types/theme-ui": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@types/theme-ui/-/theme-ui-0.3.2.tgz", + "integrity": "sha512-xAHYIyIsInPbcRf2YqCnioTmTsVjX+5fClO6NqwNORn0j9deGuSMp2gI8lPjm5b0eZwxM5ugExLbz01lxjjVqw==", + "requires": { + "@emotion/serialize": "^0.11.15", + "@types/react": "*", + "@types/styled-system": "*", + "@types/styled-system__css": "*", + "@types/theme-ui__components": "*", + "csstype": "^2.6.6" + } + }, + "@types/theme-ui__components": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/@types/theme-ui__components/-/theme-ui__components-0.2.5.tgz", + "integrity": "sha512-qqhIJboXzGXE0ZpKRHrwQvRbuOAcGNyAWMPXXP2jGs65XcaTuDJJpz1Rx5JCaQ1h+Tt99uIriRzZRthWarh1wg==", + "requires": { + "@emotion/core": "^10.0.0", + "@emotion/styled": "^10.0.0", + "@types/react": "*", + "@types/styled-system": "*", + "@types/theme-ui": "*" + } + }, "@types/tinycolor2": { "version": "1.4.2", "resolved": "https://registry.npmjs.org/@types/tinycolor2/-/tinycolor2-1.4.2.tgz", @@ -3555,6 +5002,19 @@ "vfile-message": "*" } }, + "@types/warning": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@types/warning/-/warning-3.0.0.tgz", + "integrity": "sha1-DSUBJorY+ZYrdA04fEZU9fjiPlI=" + }, + "@types/websocket": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@types/websocket/-/websocket-1.0.0.tgz", + "integrity": "sha512-MLr8hDM8y7vvdAdnoDEP5LotRoYJj7wgT6mWzCUQH/gHqzS4qcnOT/K4dhC0WimWIUiA3Arj9QAJGGKNRiRZKA==", + "requires": { + "@types/node": "*" + } + }, "@types/yargs": { "version": "15.0.5", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz", @@ -3571,8 +5031,7 @@ "@types/yoga-layout": { "version": "1.9.2", "resolved": "https://registry.npmjs.org/@types/yoga-layout/-/yoga-layout-1.9.2.tgz", - "integrity": "sha512-S9q47ByT2pPvD65IvrWp7qppVMpk9WGMbVq9wbWZOHg6tnXSD4vyhao6nOSBwwfDdV2p3Kx9evA9vI+XWTfDvw==", - "optional": true + "integrity": "sha512-S9q47ByT2pPvD65IvrWp7qppVMpk9WGMbVq9wbWZOHg6tnXSD4vyhao6nOSBwwfDdV2p3Kx9evA9vI+XWTfDvw==" }, "@typescript-eslint/eslint-plugin": { "version": "2.34.0", @@ -3801,6 +5260,14 @@ "@xtuc/long": "4.2.2" } }, + "@wry/equality": { + "version": "0.1.11", + "resolved": "https://registry.npmjs.org/@wry/equality/-/equality-0.1.11.tgz", + "integrity": "sha512-mwEVBDUVODlsQQ5dfuLUS5/Tf7jqUKyhKYHmVi4fPB6bDMOfWvUPJmKgS1Z7Za/sOI3vzWt4+O7yCiL/70MogA==", + "requires": { + "tslib": "^1.9.3" + } + }, "@xtuc/ieee754": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", @@ -3916,6 +5383,11 @@ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==" }, + "emoji-regex": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", + "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==" + }, "string-width": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", @@ -3978,6 +5450,74 @@ "normalize-path": "^2.1.1" } }, + "apollo-link": { + "version": "1.2.14", + "resolved": "https://registry.npmjs.org/apollo-link/-/apollo-link-1.2.14.tgz", + "integrity": "sha512-p67CMEFP7kOG1JZ0ZkYZwRDa369w5PIjtMjvrQd/HnIV8FRsHRqLqK+oAZQnFa1DDdZtOtHTi+aMIW6EatC2jg==", + "requires": { + "apollo-utilities": "^1.3.0", + "ts-invariant": "^0.4.0", + "tslib": "^1.9.3", + "zen-observable-ts": "^0.8.21" + } + }, + "apollo-link-http": { + "version": "1.5.17", + "resolved": "https://registry.npmjs.org/apollo-link-http/-/apollo-link-http-1.5.17.tgz", + "integrity": "sha512-uWcqAotbwDEU/9+Dm9e1/clO7hTB2kQ/94JYcGouBVLjoKmTeJTUPQKcJGpPwUjZcSqgYicbFqQSoJIW0yrFvg==", + "requires": { + "apollo-link": "^1.2.14", + "apollo-link-http-common": "^0.2.16", + "tslib": "^1.9.3" + } + }, + "apollo-link-http-common": { + "version": "0.2.16", + "resolved": "https://registry.npmjs.org/apollo-link-http-common/-/apollo-link-http-common-0.2.16.tgz", + "integrity": "sha512-2tIhOIrnaF4UbQHf7kjeQA/EmSorB7+HyJIIrUjJOKBgnXwuexi8aMecRlqTIDWcyVXCeqLhUnztMa6bOH/jTg==", + "requires": { + "apollo-link": "^1.2.14", + "ts-invariant": "^0.4.0", + "tslib": "^1.9.3" + } + }, + "apollo-upload-client": { + "version": "13.0.0", + "resolved": "https://registry.npmjs.org/apollo-upload-client/-/apollo-upload-client-13.0.0.tgz", + "integrity": "sha512-lJ9/bk1BH1lD15WhWRha2J3+LrXrPIX5LP5EwiOUHv8PCORp4EUrcujrA3rI5hZeZygrTX8bshcuMdpqpSrvtA==", + "requires": { + "@babel/runtime": "^7.9.2", + "apollo-link": "^1.2.12", + "apollo-link-http-common": "^0.2.14", + "extract-files": "^8.0.0" + }, + "dependencies": { + "@babel/runtime": { + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.1.tgz", + "integrity": "sha512-nQbbCbQc9u/rpg1XCxoMYQTbSMVZjCDxErQ1ClCn9Pvcmv1lGads19ep0a2VsEiIJeHqjZley6EQGEC3Yo1xMA==", + "requires": { + "regenerator-runtime": "^0.13.4" + } + }, + "regenerator-runtime": { + "version": "0.13.5", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", + "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==" + } + } + }, + "apollo-utilities": { + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/apollo-utilities/-/apollo-utilities-1.3.4.tgz", + "integrity": "sha512-pk2hiWrCXMAy2fRPwEyhvka+mqwzeP60Jr1tRYi5xru+3ko94HI9o6lK0CT33/w4RDlxWchmdhDCrvdr+pHCig==", + "requires": { + "@wry/equality": "^0.1.2", + "fast-json-stable-stringify": "^2.0.0", + "ts-invariant": "^0.4.0", + "tslib": "^1.10.0" + } + }, "application-config-path": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/application-config-path/-/application-config-path-0.1.0.tgz", @@ -4218,8 +5758,7 @@ "arrify": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz", - "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==", - "optional": true + "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==" }, "asap": { "version": "2.0.6", @@ -4293,6 +5832,14 @@ "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=" }, + "async-cache": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/async-cache/-/async-cache-1.1.0.tgz", + "integrity": "sha1-SppaidBl7F2OUlS9nulrp2xTK1o=", + "requires": { + "lru-cache": "^4.0.0" + } + }, "async-each": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz", @@ -4308,6 +5855,11 @@ "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" }, + "at-least-node": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz", + "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==" + }, "atob": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz", @@ -4316,8 +5868,7 @@ "auto-bind": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/auto-bind/-/auto-bind-4.0.0.tgz", - "integrity": "sha512-Hdw8qdNiqdJ8LqT0iK0sVzkFbzg6fhnQqqfWhBDxcHZvU75+B+ayzTy8x+k5Ix0Y92XOhOUlx74ps+bA6BeYMQ==", - "optional": true + "integrity": "sha512-Hdw8qdNiqdJ8LqT0iK0sVzkFbzg6fhnQqqfWhBDxcHZvU75+B+ayzTy8x+k5Ix0Y92XOhOUlx74ps+bA6BeYMQ==" }, "autoprefixer": { "version": "9.8.0", @@ -4334,9 +5885,9 @@ }, "dependencies": { "postcss": { - "version": "7.0.30", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.30.tgz", - "integrity": "sha512-nu/0m+NtIzoubO+xdAlwZl/u5S5vi/y6BCsoL8D+8IxsD3XvBS8X4YEADNIVXKVuQvduiucnRv+vPIqj56EGMQ==", + "version": "7.0.31", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.31.tgz", + "integrity": "sha512-a937VDHE1ftkjk+8/7nj/mrjtmkn69xxzJgRETXdAUU+IgOYPQNJF17haGWbeDxSyk++HA14UA98FurvPyBJOA==", "requires": { "chalk": "^2.4.2", "source-map": "^0.6.1", @@ -4639,11 +6190,50 @@ "resolved": "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz", "integrity": "sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY=" }, + "babel-plugin-syntax-trailing-function-commas": { + "version": "7.0.0-beta.0", + "resolved": "https://registry.npmjs.org/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-7.0.0-beta.0.tgz", + "integrity": "sha512-Xj9XuRuz3nTSbaTXWv3itLOcxyF4oPD8douBBmj7U9BBC6nEBYfyOJYQMf/8PJAFotC62UY5dFfIGEPr7WswzQ==" + }, "babel-plugin-transform-react-remove-prop-types": { "version": "0.4.24", "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.24.tgz", "integrity": "sha512-eqj0hVcJUR57/Ug2zE1Yswsw4LhuqqHhD+8v120T1cl3kjg76QwtyBrdIk4WVwK+lAhBJVYCd/v+4nc4y+8JsA==" }, + "babel-preset-fbjs": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/babel-preset-fbjs/-/babel-preset-fbjs-3.3.0.tgz", + "integrity": "sha512-7QTLTCd2gwB2qGoi5epSULMHugSVgpcVt5YAeiFO9ABLrutDQzKfGwzxgZHLpugq8qMdg/DhRZDZ5CLKxBkEbw==", + "requires": { + "@babel/plugin-proposal-class-properties": "^7.0.0", + "@babel/plugin-proposal-object-rest-spread": "^7.0.0", + "@babel/plugin-syntax-class-properties": "^7.0.0", + "@babel/plugin-syntax-flow": "^7.0.0", + "@babel/plugin-syntax-jsx": "^7.0.0", + "@babel/plugin-syntax-object-rest-spread": "^7.0.0", + "@babel/plugin-transform-arrow-functions": "^7.0.0", + "@babel/plugin-transform-block-scoped-functions": "^7.0.0", + "@babel/plugin-transform-block-scoping": "^7.0.0", + "@babel/plugin-transform-classes": "^7.0.0", + "@babel/plugin-transform-computed-properties": "^7.0.0", + "@babel/plugin-transform-destructuring": "^7.0.0", + "@babel/plugin-transform-flow-strip-types": "^7.0.0", + "@babel/plugin-transform-for-of": "^7.0.0", + "@babel/plugin-transform-function-name": "^7.0.0", + "@babel/plugin-transform-literals": "^7.0.0", + "@babel/plugin-transform-member-expression-literals": "^7.0.0", + "@babel/plugin-transform-modules-commonjs": "^7.0.0", + "@babel/plugin-transform-object-super": "^7.0.0", + "@babel/plugin-transform-parameters": "^7.0.0", + "@babel/plugin-transform-property-literals": "^7.0.0", + "@babel/plugin-transform-react-display-name": "^7.0.0", + "@babel/plugin-transform-react-jsx": "^7.0.0", + "@babel/plugin-transform-shorthand-properties": "^7.0.0", + "@babel/plugin-transform-spread": "^7.0.0", + "@babel/plugin-transform-template-literals": "^7.0.0", + "babel-plugin-syntax-trailing-function-commas": "^7.0.0-beta.0" + } + }, "babel-preset-gatsby": { "version": "0.4.7", "resolved": "https://registry.npmjs.org/babel-preset-gatsby/-/babel-preset-gatsby-0.4.7.tgz", @@ -4665,9 +6255,9 @@ }, "dependencies": { "@babel/runtime": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.6.tgz", - "integrity": "sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==", + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.1.tgz", + "integrity": "sha512-nQbbCbQc9u/rpg1XCxoMYQTbSMVZjCDxErQ1ClCn9Pvcmv1lGads19ep0a2VsEiIJeHqjZley6EQGEC3Yo1xMA==", "requires": { "regenerator-runtime": "^0.13.4" } @@ -5015,11 +6605,6 @@ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, - "emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" - }, "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", @@ -5186,12 +6771,20 @@ }, "dependencies": { "electron-to-chromium": { - "version": "1.3.451", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.451.tgz", - "integrity": "sha512-2fvco0F2bBIgqzO8GRP0Jt/91pdrf9KfZ5FsmkYkjERmIJG585cFeFZV4+CO6oTmU3HmCTgfcZuEa7kW8VUh3A==" + "version": "1.3.455", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.455.tgz", + "integrity": "sha512-4lwnxp+ArqOX9hiLwLpwhfqvwzUHFuDgLz4NTiU3lhygUzWtocIJ/5Vix+mWVNE2HQ9aI1k2ncGe5H/0OktMvA==" } } }, + "bser": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz", + "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==", + "requires": { + "node-int64": "^0.4.0" + } + }, "buble-jsx-only": { "version": "0.19.8", "resolved": "https://registry.npmjs.org/buble-jsx-only/-/buble-jsx-only-0.19.8.tgz", @@ -5214,13 +6807,12 @@ } }, "buffer": { - "version": "4.9.2", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz", - "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==", + "version": "5.6.0", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.6.0.tgz", + "integrity": "sha512-/gDYp/UtU0eA1ys8bOs9J6a+E/KWIY+DZ+Q2WESNUA0jFRsJOc0SNUO6xJ5SGA1xueg3NL65W6s+NY5l9cunuw==", "requires": { "base64-js": "^1.0.2", - "ieee754": "^1.1.4", - "isarray": "^1.0.0" + "ieee754": "^1.1.4" } }, "buffer-alloc": { @@ -5457,9 +7049,14 @@ } }, "caniuse-lite": { - "version": "1.0.30001064", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001064.tgz", - "integrity": "sha512-hdBcQMFvJIrOhkpAZiRXz04Cmetwc9NekeuNl0qZfHOugxOhJKxsjF1RmISMPFjIF4PPx1reliIzbfN42EiQ5A==" + "version": "1.0.30001066", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001066.tgz", + "integrity": "sha512-Gfj/WAastBtfxLws0RCh2sDbTK/8rJuSeZMecrSkNGYxPcv7EzblmDGfWQCFEQcSqYE2BRgQiJh8HOD07N5hIw==" + }, + "case": { + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/case/-/case-1.6.3.tgz", + "integrity": "sha512-mzDSXIPaFwVDvZAHqZ9VlbyF4yyXRuX6IvB06WvPYkqJVO24kX1PPhv9bfpKNFZyxYFmmgo03HUiD8iklmJYRQ==" }, "caseless": { "version": "0.12.0", @@ -5787,7 +7384,6 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz", "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==", - "optional": true, "requires": { "slice-ansi": "^3.0.0", "string-width": "^4.2.0" @@ -5796,14 +7392,12 @@ "ansi-regex": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", - "optional": true + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==" }, "ansi-styles": { "version": "4.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", - "optional": true, "requires": { "@types/color-name": "^1.1.1", "color-convert": "^2.0.1" @@ -5812,14 +7406,12 @@ "astral-regex": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", - "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==", - "optional": true + "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==" }, "color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "optional": true, "requires": { "color-name": "~1.1.4" } @@ -5827,26 +7419,17 @@ "color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "optional": true - }, - "emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "optional": true + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, "is-fullwidth-code-point": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "optional": true + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" }, "slice-ansi": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz", "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==", - "optional": true, "requires": { "ansi-styles": "^4.0.0", "astral-regex": "^2.0.0", @@ -5857,7 +7440,6 @@ "version": "4.2.0", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", - "optional": true, "requires": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -5868,7 +7450,6 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", - "optional": true, "requires": { "ansi-regex": "^5.0.0" } @@ -5918,36 +7499,41 @@ } }, "cliui": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", - "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", + "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==", "requires": { - "string-width": "^3.1.0", - "strip-ansi": "^5.2.0", - "wrap-ansi": "^5.1.0" + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^6.2.0" }, "dependencies": { "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==" + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==" + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" }, "string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", + "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" } }, "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", "requires": { - "ansi-regex": "^4.1.0" + "ansi-regex": "^5.0.0" } } } @@ -6291,16 +7877,23 @@ } }, "copyfiles": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/copyfiles/-/copyfiles-2.2.0.tgz", - "integrity": "sha512-iJbHJI+8OKqsq+4JF0rqgRkZzo++jqO6Wf4FUU1JM41cJF6JcY5968XyF4tm3Kkm7ZOMrqlljdm8N9oyY5raGw==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/copyfiles/-/copyfiles-2.3.0.tgz", + "integrity": "sha512-73v7KFuDFJ/ofkQjZBMjMBFWGgkS76DzXvBMUh7djsMOE5EELWtAO/hRB6Wr5Vj5Zg+YozvoHemv0vnXpqxmOQ==", "requires": { "glob": "^7.0.5", "minimatch": "^3.0.3", - "mkdirp": "^0.5.1", + "mkdirp": "^1.0.4", "noms": "0.0.0", "through2": "^2.0.1", - "yargs": "^13.2.4" + "yargs": "^15.3.1" + }, + "dependencies": { + "mkdirp": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==" + } } }, "core-js": { @@ -6404,6 +7997,17 @@ "elliptic": "^6.0.0" } }, + "create-emotion": { + "version": "10.0.27", + "resolved": "https://registry.npmjs.org/create-emotion/-/create-emotion-10.0.27.tgz", + "integrity": "sha512-fIK73w82HPPn/RsAij7+Zt8eCE8SptcJ3WoRMfxMtjteYxud8GDTKKld7MYwAX2TVhrw29uR1N/bVGxeStHILg==", + "requires": { + "@emotion/cache": "^10.0.27", + "@emotion/serialize": "^0.11.15", + "@emotion/sheet": "0.9.4", + "@emotion/utils": "0.11.3" + } + }, "create-hash": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz", @@ -6722,6 +8326,15 @@ "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz", "integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=" }, + "d": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz", + "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==", + "requires": { + "es5-ext": "^0.10.50", + "type": "^1.0.1" + } + }, "d3": { "version": "5.16.0", "resolved": "https://registry.npmjs.org/d3/-/d3-5.16.0.tgz", @@ -7029,6 +8642,12 @@ "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.14.0.tgz", "integrity": "sha512-1zD+68jhFgDIM0rF05rcwYO8cExdNqxjq4xP1QKM60Q45mnO6zaMWB4tOzrIr4M4GSLntsKeE4c9Bdl2jhL/yw==" }, + "de-indent": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz", + "integrity": "sha1-sgOOhG3DO6pXlhKNCAS0VbjB4h0=", + "optional": true + }, "debug": { "version": "3.2.6", "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", @@ -7197,6 +8816,11 @@ "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=" }, + "deprecated-decorator": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/deprecated-decorator/-/deprecated-decorator-0.1.6.tgz", + "integrity": "sha1-AJZjF7ehL+kvPMgx91g68ym4bDc=" + }, "des.js": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz", @@ -7585,15 +9209,24 @@ } }, "emoji-regex": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", - "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==" + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" }, "emojis-list": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz", "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=" }, + "emotion": { + "version": "10.0.27", + "resolved": "https://registry.npmjs.org/emotion/-/emotion-10.0.27.tgz", + "integrity": "sha512-2xdDzdWWzue8R8lu4G76uWX5WhyQuzATon9LmNeCy/2BHVC6dsEpfhN1a0qhELgtDVdjyEA6J8Y/VlI5ZnaH0g==", + "requires": { + "babel-plugin-emotion": "^10.0.27", + "create-emotion": "^10.0.27" + } + }, "encodeurl": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", @@ -7640,6 +9273,11 @@ "requires": { "ms": "^2.1.1" } + }, + "ws": { + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.0.tgz", + "integrity": "sha512-iFtXzngZVXPGgpTlP1rBqsUK82p9tKqsWRPg5L56egiljujJT3vGAYnHANvFxBieXrTFavhzhxW52jnaWV+w2w==" } } }, @@ -7778,6 +9416,33 @@ "is-symbol": "^1.0.2" } }, + "es5-ext": { + "version": "0.10.53", + "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz", + "integrity": "sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==", + "requires": { + "es6-iterator": "~2.0.3", + "es6-symbol": "~3.1.3", + "next-tick": "~1.0.0" + }, + "dependencies": { + "next-tick": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz", + "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=" + } + } + }, + "es6-iterator": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz", + "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=", + "requires": { + "d": "1", + "es5-ext": "^0.10.35", + "es6-symbol": "^3.1.1" + } + }, "es6-promise": { "version": "4.2.8", "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz", @@ -7791,6 +9456,15 @@ "es6-promise": "^4.0.3" } }, + "es6-symbol": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz", + "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==", + "requires": { + "d": "^1.0.1", + "ext": "^1.1.2" + } + }, "escape-html": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", @@ -8137,6 +9811,13 @@ "emoji-regex": "^7.0.2", "has": "^1.0.3", "jsx-ast-utils": "^2.2.1" + }, + "dependencies": { + "emoji-regex": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", + "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==" + } } }, "eslint-plugin-react": { @@ -8385,9 +10066,9 @@ }, "dependencies": { "cross-spawn": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.2.tgz", - "integrity": "sha512-PD6G8QG3S4FK/XCGFbEQrDqO2AnMMsy0meR7lerlIOHAAbkuavGU/pOqprrlvfTNjvowivTeBsjebAL0NSoMxw==", + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", "requires": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -8594,6 +10275,21 @@ } } }, + "ext": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/ext/-/ext-1.4.0.tgz", + "integrity": "sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A==", + "requires": { + "type": "^2.0.0" + }, + "dependencies": { + "type": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/type/-/type-2.0.0.tgz", + "integrity": "sha512-KBt58xCHry4Cejnc2ISQAF7QY+ORngsWfxezO68+12hKV6lQY8P/psIkcbjeHWn7MqcgciWJyCCevFMJdIXpow==" + } + } + }, "extend": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", @@ -8697,6 +10393,11 @@ } } }, + "extract-files": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/extract-files/-/extract-files-8.1.0.tgz", + "integrity": "sha512-PTGtfthZK79WUMk+avLmwx3NGdU8+iVFXC2NMGxKsn0MnihOG2lvumj+AZo8CTwTrwjXDgZ5tztbRlEdRjBonQ==" + }, "extract-zip": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.7.0.tgz", @@ -8795,6 +10496,14 @@ "websocket-driver": ">=0.5.1" } }, + "fb-watchman": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz", + "integrity": "sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==", + "requires": { + "bser": "2.1.1" + } + }, "fbjs": { "version": "0.8.17", "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.17.tgz", @@ -8816,6 +10525,16 @@ } } }, + "fbjs-css-vars": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/fbjs-css-vars/-/fbjs-css-vars-1.0.2.tgz", + "integrity": "sha512-b2XGFAFdWZWg0phtAWLHCk836A1Xann+I+Dgd3Gk64MHKZO44FfoD1KxyvbSh0qZsIoXQGGlVztIY+oitJPpRQ==" + }, + "fd": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/fd/-/fd-0.0.3.tgz", + "integrity": "sha512-iAHrIslQb3U68OcMSP0kkNWabp7sSN6d2TBSb2JO3gcLJVDd4owr/hKM4SFJovFOUeeXeItjYgouEDTMWiVAnA==" + }, "fd-slicer": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", @@ -9003,6 +10722,16 @@ "readable-stream": "^2.3.6" } }, + "fn-name": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/fn-name/-/fn-name-3.0.0.tgz", + "integrity": "sha512-eNMNr5exLoavuAMhIUVsOKF79SWd/zG104ef6sxBTSw+cZc6BXdQXDvYcGvp0VbxVVSp1XDUNoz7mg1xMtSznA==" + }, + "focus-lock": { + "version": "0.6.8", + "resolved": "https://registry.npmjs.org/focus-lock/-/focus-lock-0.6.8.tgz", + "integrity": "sha512-vkHTluRCoq9FcsrldC0ulQHiyBYgVJB2CX53I8r0nTC6KnEij7Of0jpBspjt3/CuNb6fyoj3aOh9J2HgQUM0og==" + }, "follow-redirects": { "version": "1.5.10", "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz", @@ -9059,6 +10788,28 @@ "mime-types": "^2.1.12" } }, + "formik": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/formik/-/formik-2.1.4.tgz", + "integrity": "sha512-oKz8S+yQBzuQVSEoxkqqJrKQS5XJASWGVn6mrs+oTWrBoHgByVwwI1qHiVc9GKDpZBU9vAxXYAKz2BvujlwunA==", + "requires": { + "deepmerge": "^2.1.1", + "hoist-non-react-statics": "^3.3.0", + "lodash": "^4.17.14", + "lodash-es": "^4.17.14", + "react-fast-compare": "^2.0.1", + "scheduler": "^0.18.0", + "tiny-warning": "^1.0.2", + "tslib": "^1.10.0" + }, + "dependencies": { + "deepmerge": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-2.2.1.tgz", + "integrity": "sha512-R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA==" + } + } + }, "forwarded": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz", @@ -9169,9 +10920,9 @@ } }, "gatsby": { - "version": "2.22.9", - "resolved": "https://registry.npmjs.org/gatsby/-/gatsby-2.22.9.tgz", - "integrity": "sha512-tMuo7cZJQXF3AgtE9lrgHQRFm5Z8VTKLrGns8AKdgYLZQ7SkG8YSsc+ME+AuOX5byCRlGAm+x4rCp/Sa9oTR1Q==", + "version": "2.22.13", + "resolved": "https://registry.npmjs.org/gatsby/-/gatsby-2.22.13.tgz", + "integrity": "sha512-Z5LPTxsf9T6JeD/gjlo7azHc8VkmfMTkEPyNKptMIrlsJAI7W0Ndk2BOFGgmpqTRUka+ZTg+revquAhNSKReRw==", "requires": { "@babel/code-frame": "^7.8.3", "@babel/core": "^7.9.6", @@ -9235,9 +10986,10 @@ "flat": "^4.1.0", "fs-exists-cached": "1.0.0", "fs-extra": "^8.1.0", - "gatsby-cli": "^2.12.34", + "gatsby-admin": "^0.1.54", + "gatsby-cli": "^2.12.38", "gatsby-core-utils": "^1.3.3", - "gatsby-graphiql-explorer": "^0.4.2", + "gatsby-graphiql-explorer": "^0.4.3", "gatsby-link": "^2.4.3", "gatsby-plugin-page-creator": "^2.3.7", "gatsby-plugin-typescript": "^2.4.3", @@ -9295,6 +11047,8 @@ "signal-exit": "^3.0.3", "slugify": "^1.4.0", "socket.io": "^2.3.0", + "socket.io-client": "2.3.0", + "st": "^2.0.0", "stack-trace": "^0.0.10", "string-similarity": "^1.2.2", "style-loader": "^0.23.1", @@ -9317,26 +11071,26 @@ }, "dependencies": { "@babel/code-frame": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", - "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.1.tgz", + "integrity": "sha512-IGhtTmpjGbYzcEDOw7DcQtbQSXcG9ftmAXtWTu9V936vDye4xjjekktFAtgZsWpzTj/X01jocB46mTywm/4SZw==", "requires": { - "@babel/highlight": "^7.8.3" + "@babel/highlight": "^7.10.1" } }, "@babel/core": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.6.tgz", - "integrity": "sha512-nD3deLvbsApbHAHttzIssYqgb883yU/d9roe4RZymBCDaZryMJDbptVpEpeQuRh4BJ+SYI8le9YGxKvFEvl1Wg==", - "requires": { - "@babel/code-frame": "^7.8.3", - "@babel/generator": "^7.9.6", - "@babel/helper-module-transforms": "^7.9.0", - "@babel/helpers": "^7.9.6", - "@babel/parser": "^7.9.6", - "@babel/template": "^7.8.6", - "@babel/traverse": "^7.9.6", - "@babel/types": "^7.9.6", + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.10.1.tgz", + "integrity": "sha512-u8XiZ6sMXW/gPmoP5ijonSUln4unazG291X0XAQ5h0s8qnAFr6BRRZGUEK+jtRWdmB0NTJQt7Uga25q8GetIIg==", + "requires": { + "@babel/code-frame": "^7.10.1", + "@babel/generator": "^7.10.1", + "@babel/helper-module-transforms": "^7.10.1", + "@babel/helpers": "^7.10.1", + "@babel/parser": "^7.10.1", + "@babel/template": "^7.10.1", + "@babel/traverse": "^7.10.1", + "@babel/types": "^7.10.1", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.1", @@ -9358,80 +11112,159 @@ } }, "@babel/generator": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.6.tgz", - "integrity": "sha512-+htwWKJbH2bL72HRluF8zumBxzuX0ZZUFl3JLNyoUjM/Ho8wnVpPXM6aUz8cfKDqQ/h7zHqKt4xzJteUosckqQ==", + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.10.1.tgz", + "integrity": "sha512-AT0YPLQw9DI21tliuJIdplVfLHya6mcGa8ctkv7n4Qv+hYacJrKmNWIteAK1P9iyLikFIAkwqJ7HAOqIDLFfgA==", "requires": { - "@babel/types": "^7.9.6", + "@babel/types": "^7.10.1", "jsesc": "^2.5.1", "lodash": "^4.17.13", "source-map": "^0.5.0" } }, "@babel/helper-function-name": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz", - "integrity": "sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==", + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.1.tgz", + "integrity": "sha512-fcpumwhs3YyZ/ttd5Rz0xn0TpIwVkN7X0V38B9TWNfVF42KEkhkAAuPCQ3oXmtTRtiPJrmZ0TrfS0GKF0eMaRQ==", "requires": { - "@babel/helper-get-function-arity": "^7.8.3", - "@babel/template": "^7.8.3", - "@babel/types": "^7.9.5" + "@babel/helper-get-function-arity": "^7.10.1", + "@babel/template": "^7.10.1", + "@babel/types": "^7.10.1" + } + }, + "@babel/helper-get-function-arity": { + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.1.tgz", + "integrity": "sha512-F5qdXkYGOQUb0hpRaPoetF9AnsXknKjWMZ+wmsIRsp5ge5sFh4c3h1eH2pRTTuy9KKAA2+TTYomGXAtEL2fQEw==", + "requires": { + "@babel/types": "^7.10.1" + } + }, + "@babel/helper-member-expression-to-functions": { + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.10.1.tgz", + "integrity": "sha512-u7XLXeM2n50gb6PWJ9hoO5oO7JFPaZtrh35t8RqKLT1jFKj9IWeD1zrcrYp1q1qiZTdEarfDWfTIP8nGsu0h5g==", + "requires": { + "@babel/types": "^7.10.1" + } + }, + "@babel/helper-module-imports": { + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.1.tgz", + "integrity": "sha512-SFxgwYmZ3HZPyZwJRiVNLRHWuW2OgE5k2nrVs6D9Iv4PPnXVffuEHy83Sfx/l4SqF+5kyJXjAyUmrG7tNm+qVg==", + "requires": { + "@babel/types": "^7.10.1" + } + }, + "@babel/helper-module-transforms": { + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.10.1.tgz", + "integrity": "sha512-RLHRCAzyJe7Q7sF4oy2cB+kRnU4wDZY/H2xJFGof+M+SJEGhZsb+GFj5j1AD8NiSaVBJ+Pf0/WObiXu/zxWpFg==", + "requires": { + "@babel/helper-module-imports": "^7.10.1", + "@babel/helper-replace-supers": "^7.10.1", + "@babel/helper-simple-access": "^7.10.1", + "@babel/helper-split-export-declaration": "^7.10.1", + "@babel/template": "^7.10.1", + "@babel/types": "^7.10.1", + "lodash": "^4.17.13" + } + }, + "@babel/helper-optimise-call-expression": { + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.1.tgz", + "integrity": "sha512-a0DjNS1prnBsoKx83dP2falChcs7p3i8VMzdrSbfLhuQra/2ENC4sbri34dz/rWmDADsmF1q5GbfaXydh0Jbjg==", + "requires": { + "@babel/types": "^7.10.1" + } + }, + "@babel/helper-replace-supers": { + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.1.tgz", + "integrity": "sha512-SOwJzEfpuQwInzzQJGjGaiG578UYmyi2Xw668klPWV5n07B73S0a9btjLk/52Mlcxa+5AdIYqws1KyXRfMoB7A==", + "requires": { + "@babel/helper-member-expression-to-functions": "^7.10.1", + "@babel/helper-optimise-call-expression": "^7.10.1", + "@babel/traverse": "^7.10.1", + "@babel/types": "^7.10.1" + } + }, + "@babel/helper-simple-access": { + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.1.tgz", + "integrity": "sha512-VSWpWzRzn9VtgMJBIWTZ+GP107kZdQ4YplJlCmIrjoLVSi/0upixezHCDG8kpPVTBJpKfxTH01wDhh+jS2zKbw==", + "requires": { + "@babel/template": "^7.10.1", + "@babel/types": "^7.10.1" } }, + "@babel/helper-split-export-declaration": { + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.1.tgz", + "integrity": "sha512-UQ1LVBPrYdbchNhLwj6fetj46BcFwfS4NllJo/1aJsT+1dLTEnXJL0qHqtY7gPzF8S2fXBJamf1biAXV3X077g==", + "requires": { + "@babel/types": "^7.10.1" + } + }, + "@babel/helper-validator-identifier": { + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz", + "integrity": "sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==" + }, "@babel/helpers": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.6.tgz", - "integrity": "sha512-tI4bUbldloLcHWoRUMAj4g1bF313M/o6fBKhIsb3QnGVPwRm9JsNf/gqMkQ7zjqReABiffPV6RWj7hEglID5Iw==", + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.10.1.tgz", + "integrity": "sha512-muQNHF+IdU6wGgkaJyhhEmI54MOZBKsFfsXFhboz1ybwJ1Kl7IHlbm2a++4jwrmY5UYsgitt5lfqo1wMFcHmyw==", "requires": { - "@babel/template": "^7.8.3", - "@babel/traverse": "^7.9.6", - "@babel/types": "^7.9.6" + "@babel/template": "^7.10.1", + "@babel/traverse": "^7.10.1", + "@babel/types": "^7.10.1" } }, "@babel/highlight": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz", - "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==", + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.1.tgz", + "integrity": "sha512-8rMof+gVP8mxYZApLF/JgNDAkdKa+aJt3ZYxF8z6+j/hpeXL7iMsKCPHa2jNMHu/qqBwzQF4OHNoYi8dMA/rYg==", "requires": { - "@babel/helper-validator-identifier": "^7.9.0", + "@babel/helper-validator-identifier": "^7.10.1", "chalk": "^2.0.0", "js-tokens": "^4.0.0" } }, "@babel/parser": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.6.tgz", - "integrity": "sha512-AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q==" + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.1.tgz", + "integrity": "sha512-AUTksaz3FqugBkbTZ1i+lDLG5qy8hIzCaAxEtttU6C0BtZZU9pkNZtWSVAht4EW9kl46YBiyTGMp9xTTGqViNg==" }, "@babel/runtime": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.6.tgz", - "integrity": "sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==", + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.1.tgz", + "integrity": "sha512-nQbbCbQc9u/rpg1XCxoMYQTbSMVZjCDxErQ1ClCn9Pvcmv1lGads19ep0a2VsEiIJeHqjZley6EQGEC3Yo1xMA==", "requires": { "regenerator-runtime": "^0.13.4" } }, "@babel/template": { - "version": "7.8.6", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz", - "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==", + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.1.tgz", + "integrity": "sha512-OQDg6SqvFSsc9A0ej6SKINWrpJiNonRIniYondK2ViKhB06i3c0s+76XUft71iqBEe9S1OKsHwPAjfHnuvnCig==", "requires": { - "@babel/code-frame": "^7.8.3", - "@babel/parser": "^7.8.6", - "@babel/types": "^7.8.6" + "@babel/code-frame": "^7.10.1", + "@babel/parser": "^7.10.1", + "@babel/types": "^7.10.1" } }, "@babel/traverse": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.6.tgz", - "integrity": "sha512-b3rAHSjbxy6VEAvlxM8OV/0X4XrG72zoxme6q1MOoe2vd0bEc+TwayhuC1+Dfgqh1QEG+pj7atQqvUprHIccsg==", - "requires": { - "@babel/code-frame": "^7.8.3", - "@babel/generator": "^7.9.6", - "@babel/helper-function-name": "^7.9.5", - "@babel/helper-split-export-declaration": "^7.8.3", - "@babel/parser": "^7.9.6", - "@babel/types": "^7.9.6", + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.10.1.tgz", + "integrity": "sha512-C/cTuXeKt85K+p08jN6vMDz8vSV0vZcI0wmQ36o6mjbuo++kPMdpOYw23W2XH04dbRt9/nMEfA4W3eR21CD+TQ==", + "requires": { + "@babel/code-frame": "^7.10.1", + "@babel/generator": "^7.10.1", + "@babel/helper-function-name": "^7.10.1", + "@babel/helper-split-export-declaration": "^7.10.1", + "@babel/parser": "^7.10.1", + "@babel/types": "^7.10.1", "debug": "^4.1.0", "globals": "^11.1.0", "lodash": "^4.17.13" @@ -9448,20 +11281,13 @@ } }, "@babel/types": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.6.tgz", - "integrity": "sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA==", + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.1.tgz", + "integrity": "sha512-L2yqUOpf3tzlW9GVuipgLEcZxnO+96SzR6fjXMuxxNkIgFJ5+07mHCZ+HkHqaeZu8+3LKnNJJ1bKbjBETQAsrA==", "requires": { - "@babel/helper-validator-identifier": "^7.9.5", + "@babel/helper-validator-identifier": "^7.10.1", "lodash": "^4.17.13", "to-fast-properties": "^2.0.0" - }, - "dependencies": { - "@babel/helper-validator-identifier": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz", - "integrity": "sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==" - } } }, "ansi-regex": { @@ -9469,68 +11295,16 @@ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==" }, - "ansi-styles": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", - "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", - "requires": { - "@types/color-name": "^1.1.1", - "color-convert": "^2.0.1" - } - }, "bluebird": { "version": "3.7.2", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" }, - "cliui": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", - "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==", - "requires": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.0", - "wrap-ansi": "^6.2.0" - }, - "dependencies": { - "ansi-regex": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==" - }, - "strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", - "requires": { - "ansi-regex": "^5.0.0" - } - } - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" - }, "core-js": { "version": "2.6.11", "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz", "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==" }, - "emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" - }, "es-abstract": { "version": "1.17.5", "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz", @@ -9549,19 +11323,10 @@ "string.prototype.trimright": "^2.1.1" } }, - "find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "requires": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - } - }, "gatsby-cli": { - "version": "2.12.34", - "resolved": "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-2.12.34.tgz", - "integrity": "sha512-lTwKzL8MAEOFH++ON/OLQ1/4j1L4K0azdXO69yrbXhhY9zNr2ldhzG8SLPPngLwGMAlFa0bNMkrvygBJxUgbIg==", + "version": "2.12.38", + "resolved": "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-2.12.38.tgz", + "integrity": "sha512-OvoQdOz2OZnz6AM3eEZbgwZt6oPxuEkuSoA8cn5OB7GcqZP1+BoA+VCJ35ZNPwq9BoAYpIryYPQxbAgBUcXWvQ==", "requires": { "@babel/code-frame": "^7.8.3", "@babel/runtime": "^7.9.6", @@ -9579,7 +11344,7 @@ "fs-exists-cached": "^1.0.0", "fs-extra": "^8.1.0", "gatsby-core-utils": "^1.3.3", - "gatsby-recipes": "^0.1.28", + "gatsby-recipes": "^0.1.32", "gatsby-telemetry": "^1.3.9", "hosted-git-info": "^3.0.4", "ink": "^2.7.1", @@ -9650,11 +11415,6 @@ "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz", "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==" }, - "is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" - }, "is-regex": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz", @@ -9663,14 +11423,6 @@ "has": "^1.0.3" } }, - "locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "requires": { - "p-locate": "^4.1.0" - } - }, "lru-cache": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", @@ -9680,9 +11432,9 @@ } }, "mime": { - "version": "2.4.5", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.5.tgz", - "integrity": "sha512-3hQhEUF027BuxZjQA3s7rIv/7VCQPa27hN9u9g87sEkWaKwQPuXOkVKtOeiyUrnWqTDiOs8Ed2rwg733mB0R5w==" + "version": "2.4.6", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz", + "integrity": "sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==" }, "node-fetch": { "version": "2.6.0", @@ -9698,19 +11450,6 @@ "es-abstract": "^1.17.0-next.1" } }, - "p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "requires": { - "p-limit": "^2.2.0" - } - }, - "path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==" - }, "regenerator-runtime": { "version": "0.13.5", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", @@ -9721,31 +11460,6 @@ "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz", "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==" }, - "string-width": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", - "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", - "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==" - }, - "strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", - "requires": { - "ansi-regex": "^5.0.0" - } - } - } - }, "string.prototype.trimleft": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz", @@ -9790,62 +11504,43 @@ "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==" }, - "wrap-ansi": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", - "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", - "requires": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==" - }, - "strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", - "requires": { - "ansi-regex": "^5.0.0" - } - } - } - }, "yallist": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==" - }, - "yargs": { - "version": "15.3.1", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.3.1.tgz", - "integrity": "sha512-92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA==", - "requires": { - "cliui": "^6.0.0", - "decamelize": "^1.2.0", - "find-up": "^4.1.0", - "get-caller-file": "^2.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", - "set-blocking": "^2.0.0", - "string-width": "^4.2.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^18.1.1" - } - }, - "yargs-parser": { - "version": "18.1.3", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz", - "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==", - "requires": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" - } + } + } + }, + "gatsby-admin": { + "version": "0.1.54", + "resolved": "https://registry.npmjs.org/gatsby-admin/-/gatsby-admin-0.1.54.tgz", + "integrity": "sha512-3VwiaSmapZSY5GWywaUYkjN1fdytzX1MwFoJILiIFhd5I/pWGHHQE5QZ9VXQhzNsvt2bkTmFCyfcVxCXte0YqQ==", + "requires": { + "@emotion/core": "^10.0.28", + "@emotion/styled": "^10.0.27", + "@typescript-eslint/eslint-plugin": "^2.28.0", + "@typescript-eslint/parser": "^2.28.0", + "csstype": "^2.6.10", + "formik": "^2.1.4", + "gatsby": "^2.22.13", + "gatsby-interface": "0.0.163", + "gatsby-plugin-typescript": "^2.4.3", + "gatsby-source-graphql": "^2.5.2", + "react": "^16.12.0", + "react-dom": "^16.12.0", + "react-icons": "^3.10.0", + "strict-ui": "^0.1.2", + "subscriptions-transport-ws": "^0.9.16", + "theme-ui": "^0.4.0-alpha.3", + "typescript": "^3.9.2", + "urql": "^1.9.7", + "yup": "^0.29.0" + }, + "dependencies": { + "csstype": { + "version": "2.6.10", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.10.tgz", + "integrity": "sha512-D34BqZU4cIlMCY93rZHbrq9pjTAQJ3U8S8rfBqjwHxkGPThWFjzZDQpgMJY0QViLxth6ZKYiwFBo14RdN44U/w==" } } }, @@ -9859,26 +11554,67 @@ "node-object-hash": "^2.0.0" } }, + "gatsby-design-tokens": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/gatsby-design-tokens/-/gatsby-design-tokens-2.0.6.tgz", + "integrity": "sha512-N5lf7ajRz5Uc26U/c+/Xc1VDBSFNZiQYjKMacOPFiB9U8Z4exuIv08MKWHFRJiXZeK911WATXs/IoWmcWxJJrw==", + "requires": { + "hex2rgba": "^0.0.1" + } + }, "gatsby-graphiql-explorer": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/gatsby-graphiql-explorer/-/gatsby-graphiql-explorer-0.4.2.tgz", - "integrity": "sha512-jgOvkPWemyAkDZr7Y12HlGR8ESpjjz9V61u7h1BEdTMYRkvirrplV8stpCqL3NVWRVLaUhykgOKH0KPntFhDJQ==", + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/gatsby-graphiql-explorer/-/gatsby-graphiql-explorer-0.4.3.tgz", + "integrity": "sha512-PrHSyYS3pWn/3u94cvNcCFwvozIwX5t5ER+xzhQzoq2pygO4Vd3VNPMCTLN8+ZZR5utiRpvgBZZ6f3NCIR6Mpg==", "requires": { "@babel/runtime": "^7.9.6" }, "dependencies": { "@babel/runtime": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.6.tgz", - "integrity": "sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==", + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.1.tgz", + "integrity": "sha512-nQbbCbQc9u/rpg1XCxoMYQTbSMVZjCDxErQ1ClCn9Pvcmv1lGads19ep0a2VsEiIJeHqjZley6EQGEC3Yo1xMA==", + "requires": { + "regenerator-runtime": "^0.13.4" + } + }, + "regenerator-runtime": { + "version": "0.13.5", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", + "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==" + } + } + }, + "gatsby-interface": { + "version": "0.0.163", + "resolved": "https://registry.npmjs.org/gatsby-interface/-/gatsby-interface-0.0.163.tgz", + "integrity": "sha512-dZLbdmMzl98nWKlZI8Myqj1M1orldjXckHGSnDKamfM2nNNhmqZcM503zgolHorXtf0SkReB2KquAYb85wb15A==", + "requires": { + "@mdx-js/react": "^1.5.2", + "@reach/alert": "^0.10.1", + "@reach/combobox": "^0.10.1", + "@reach/dialog": "^0.10.1", + "@reach/menu-button": "^0.10.1", + "@reach/popover": "^0.10.1", + "@reach/tabs": "0.10.1", + "@reach/tooltip": "^0.10.1", + "@types/lodash.sample": "^4.2.6", + "case": "^1.6.2", + "date-fns": "^2.8.1", + "gatsby-design-tokens": "^2.0.2", + "lodash.sample": "^4.2.1", + "theme-ui": "^0.2.49" + }, + "dependencies": { + "theme-ui": { + "version": "0.2.52", + "resolved": "https://registry.npmjs.org/theme-ui/-/theme-ui-0.2.52.tgz", + "integrity": "sha512-JFujorP5aFxIm1UyVCtefN5baXjwh5TXHKFYNWgAP+3rqVvggIr46uSMrRNvDjyhFOQiMK8YI8ctPQrrhcETpw==", "requires": { - "regenerator-runtime": "^0.13.4" + "@emotion/is-prop-valid": "^0.8.1", + "@styled-system/css": "^5.0.16", + "deepmerge": "^4.0.0" } - }, - "regenerator-runtime": { - "version": "0.13.5", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", - "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==" } } }, @@ -9893,9 +11629,9 @@ }, "dependencies": { "@babel/runtime": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.6.tgz", - "integrity": "sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==", + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.1.tgz", + "integrity": "sha512-nQbbCbQc9u/rpg1XCxoMYQTbSMVZjCDxErQ1ClCn9Pvcmv1lGads19ep0a2VsEiIJeHqjZley6EQGEC3Yo1xMA==", "requires": { "regenerator-runtime": "^0.13.4" } @@ -9923,9 +11659,9 @@ }, "dependencies": { "@babel/runtime": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.6.tgz", - "integrity": "sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==", + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.1.tgz", + "integrity": "sha512-nQbbCbQc9u/rpg1XCxoMYQTbSMVZjCDxErQ1ClCn9Pvcmv1lGads19ep0a2VsEiIJeHqjZley6EQGEC3Yo1xMA==", "requires": { "regenerator-runtime": "^0.13.4" } @@ -10305,9 +12041,9 @@ }, "dependencies": { "@babel/runtime": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.6.tgz", - "integrity": "sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==", + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.1.tgz", + "integrity": "sha512-nQbbCbQc9u/rpg1XCxoMYQTbSMVZjCDxErQ1ClCn9Pvcmv1lGads19ep0a2VsEiIJeHqjZley6EQGEC3Yo1xMA==", "requires": { "regenerator-runtime": "^0.13.4" } @@ -10385,26 +12121,26 @@ }, "dependencies": { "@babel/code-frame": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", - "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.1.tgz", + "integrity": "sha512-IGhtTmpjGbYzcEDOw7DcQtbQSXcG9ftmAXtWTu9V936vDye4xjjekktFAtgZsWpzTj/X01jocB46mTywm/4SZw==", "requires": { - "@babel/highlight": "^7.8.3" + "@babel/highlight": "^7.10.1" } }, "@babel/core": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.6.tgz", - "integrity": "sha512-nD3deLvbsApbHAHttzIssYqgb883yU/d9roe4RZymBCDaZryMJDbptVpEpeQuRh4BJ+SYI8le9YGxKvFEvl1Wg==", - "requires": { - "@babel/code-frame": "^7.8.3", - "@babel/generator": "^7.9.6", - "@babel/helper-module-transforms": "^7.9.0", - "@babel/helpers": "^7.9.6", - "@babel/parser": "^7.9.6", - "@babel/template": "^7.8.6", - "@babel/traverse": "^7.9.6", - "@babel/types": "^7.9.6", + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.10.1.tgz", + "integrity": "sha512-u8XiZ6sMXW/gPmoP5ijonSUln4unazG291X0XAQ5h0s8qnAFr6BRRZGUEK+jtRWdmB0NTJQt7Uga25q8GetIIg==", + "requires": { + "@babel/code-frame": "^7.10.1", + "@babel/generator": "^7.10.1", + "@babel/helper-module-transforms": "^7.10.1", + "@babel/helpers": "^7.10.1", + "@babel/parser": "^7.10.1", + "@babel/template": "^7.10.1", + "@babel/traverse": "^7.10.1", + "@babel/types": "^7.10.1", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.1", @@ -10416,100 +12152,172 @@ } }, "@babel/generator": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.6.tgz", - "integrity": "sha512-+htwWKJbH2bL72HRluF8zumBxzuX0ZZUFl3JLNyoUjM/Ho8wnVpPXM6aUz8cfKDqQ/h7zHqKt4xzJteUosckqQ==", + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.10.1.tgz", + "integrity": "sha512-AT0YPLQw9DI21tliuJIdplVfLHya6mcGa8ctkv7n4Qv+hYacJrKmNWIteAK1P9iyLikFIAkwqJ7HAOqIDLFfgA==", "requires": { - "@babel/types": "^7.9.6", + "@babel/types": "^7.10.1", "jsesc": "^2.5.1", "lodash": "^4.17.13", "source-map": "^0.5.0" } }, "@babel/helper-function-name": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz", - "integrity": "sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==", + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.1.tgz", + "integrity": "sha512-fcpumwhs3YyZ/ttd5Rz0xn0TpIwVkN7X0V38B9TWNfVF42KEkhkAAuPCQ3oXmtTRtiPJrmZ0TrfS0GKF0eMaRQ==", "requires": { - "@babel/helper-get-function-arity": "^7.8.3", - "@babel/template": "^7.8.3", - "@babel/types": "^7.9.5" + "@babel/helper-get-function-arity": "^7.10.1", + "@babel/template": "^7.10.1", + "@babel/types": "^7.10.1" + } + }, + "@babel/helper-get-function-arity": { + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.1.tgz", + "integrity": "sha512-F5qdXkYGOQUb0hpRaPoetF9AnsXknKjWMZ+wmsIRsp5ge5sFh4c3h1eH2pRTTuy9KKAA2+TTYomGXAtEL2fQEw==", + "requires": { + "@babel/types": "^7.10.1" + } + }, + "@babel/helper-member-expression-to-functions": { + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.10.1.tgz", + "integrity": "sha512-u7XLXeM2n50gb6PWJ9hoO5oO7JFPaZtrh35t8RqKLT1jFKj9IWeD1zrcrYp1q1qiZTdEarfDWfTIP8nGsu0h5g==", + "requires": { + "@babel/types": "^7.10.1" + } + }, + "@babel/helper-module-imports": { + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.1.tgz", + "integrity": "sha512-SFxgwYmZ3HZPyZwJRiVNLRHWuW2OgE5k2nrVs6D9Iv4PPnXVffuEHy83Sfx/l4SqF+5kyJXjAyUmrG7tNm+qVg==", + "requires": { + "@babel/types": "^7.10.1" + } + }, + "@babel/helper-module-transforms": { + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.10.1.tgz", + "integrity": "sha512-RLHRCAzyJe7Q7sF4oy2cB+kRnU4wDZY/H2xJFGof+M+SJEGhZsb+GFj5j1AD8NiSaVBJ+Pf0/WObiXu/zxWpFg==", + "requires": { + "@babel/helper-module-imports": "^7.10.1", + "@babel/helper-replace-supers": "^7.10.1", + "@babel/helper-simple-access": "^7.10.1", + "@babel/helper-split-export-declaration": "^7.10.1", + "@babel/template": "^7.10.1", + "@babel/types": "^7.10.1", + "lodash": "^4.17.13" + } + }, + "@babel/helper-optimise-call-expression": { + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.1.tgz", + "integrity": "sha512-a0DjNS1prnBsoKx83dP2falChcs7p3i8VMzdrSbfLhuQra/2ENC4sbri34dz/rWmDADsmF1q5GbfaXydh0Jbjg==", + "requires": { + "@babel/types": "^7.10.1" + } + }, + "@babel/helper-replace-supers": { + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.1.tgz", + "integrity": "sha512-SOwJzEfpuQwInzzQJGjGaiG578UYmyi2Xw668klPWV5n07B73S0a9btjLk/52Mlcxa+5AdIYqws1KyXRfMoB7A==", + "requires": { + "@babel/helper-member-expression-to-functions": "^7.10.1", + "@babel/helper-optimise-call-expression": "^7.10.1", + "@babel/traverse": "^7.10.1", + "@babel/types": "^7.10.1" + } + }, + "@babel/helper-simple-access": { + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.1.tgz", + "integrity": "sha512-VSWpWzRzn9VtgMJBIWTZ+GP107kZdQ4YplJlCmIrjoLVSi/0upixezHCDG8kpPVTBJpKfxTH01wDhh+jS2zKbw==", + "requires": { + "@babel/template": "^7.10.1", + "@babel/types": "^7.10.1" + } + }, + "@babel/helper-split-export-declaration": { + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.1.tgz", + "integrity": "sha512-UQ1LVBPrYdbchNhLwj6fetj46BcFwfS4NllJo/1aJsT+1dLTEnXJL0qHqtY7gPzF8S2fXBJamf1biAXV3X077g==", + "requires": { + "@babel/types": "^7.10.1" } }, + "@babel/helper-validator-identifier": { + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz", + "integrity": "sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==" + }, "@babel/helpers": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.6.tgz", - "integrity": "sha512-tI4bUbldloLcHWoRUMAj4g1bF313M/o6fBKhIsb3QnGVPwRm9JsNf/gqMkQ7zjqReABiffPV6RWj7hEglID5Iw==", + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.10.1.tgz", + "integrity": "sha512-muQNHF+IdU6wGgkaJyhhEmI54MOZBKsFfsXFhboz1ybwJ1Kl7IHlbm2a++4jwrmY5UYsgitt5lfqo1wMFcHmyw==", "requires": { - "@babel/template": "^7.8.3", - "@babel/traverse": "^7.9.6", - "@babel/types": "^7.9.6" + "@babel/template": "^7.10.1", + "@babel/traverse": "^7.10.1", + "@babel/types": "^7.10.1" } }, "@babel/highlight": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz", - "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==", + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.1.tgz", + "integrity": "sha512-8rMof+gVP8mxYZApLF/JgNDAkdKa+aJt3ZYxF8z6+j/hpeXL7iMsKCPHa2jNMHu/qqBwzQF4OHNoYi8dMA/rYg==", "requires": { - "@babel/helper-validator-identifier": "^7.9.0", + "@babel/helper-validator-identifier": "^7.10.1", "chalk": "^2.0.0", "js-tokens": "^4.0.0" } }, "@babel/parser": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.6.tgz", - "integrity": "sha512-AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q==" + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.1.tgz", + "integrity": "sha512-AUTksaz3FqugBkbTZ1i+lDLG5qy8hIzCaAxEtttU6C0BtZZU9pkNZtWSVAht4EW9kl46YBiyTGMp9xTTGqViNg==" }, "@babel/runtime": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.6.tgz", - "integrity": "sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==", + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.1.tgz", + "integrity": "sha512-nQbbCbQc9u/rpg1XCxoMYQTbSMVZjCDxErQ1ClCn9Pvcmv1lGads19ep0a2VsEiIJeHqjZley6EQGEC3Yo1xMA==", "requires": { "regenerator-runtime": "^0.13.4" } }, "@babel/template": { - "version": "7.8.6", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz", - "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==", + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.1.tgz", + "integrity": "sha512-OQDg6SqvFSsc9A0ej6SKINWrpJiNonRIniYondK2ViKhB06i3c0s+76XUft71iqBEe9S1OKsHwPAjfHnuvnCig==", "requires": { - "@babel/code-frame": "^7.8.3", - "@babel/parser": "^7.8.6", - "@babel/types": "^7.8.6" + "@babel/code-frame": "^7.10.1", + "@babel/parser": "^7.10.1", + "@babel/types": "^7.10.1" } }, "@babel/traverse": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.6.tgz", - "integrity": "sha512-b3rAHSjbxy6VEAvlxM8OV/0X4XrG72zoxme6q1MOoe2vd0bEc+TwayhuC1+Dfgqh1QEG+pj7atQqvUprHIccsg==", - "requires": { - "@babel/code-frame": "^7.8.3", - "@babel/generator": "^7.9.6", - "@babel/helper-function-name": "^7.9.5", - "@babel/helper-split-export-declaration": "^7.8.3", - "@babel/parser": "^7.9.6", - "@babel/types": "^7.9.6", + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.10.1.tgz", + "integrity": "sha512-C/cTuXeKt85K+p08jN6vMDz8vSV0vZcI0wmQ36o6mjbuo++kPMdpOYw23W2XH04dbRt9/nMEfA4W3eR21CD+TQ==", + "requires": { + "@babel/code-frame": "^7.10.1", + "@babel/generator": "^7.10.1", + "@babel/helper-function-name": "^7.10.1", + "@babel/helper-split-export-declaration": "^7.10.1", + "@babel/parser": "^7.10.1", + "@babel/types": "^7.10.1", "debug": "^4.1.0", "globals": "^11.1.0", "lodash": "^4.17.13" } }, "@babel/types": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.6.tgz", - "integrity": "sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA==", + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.1.tgz", + "integrity": "sha512-L2yqUOpf3tzlW9GVuipgLEcZxnO+96SzR6fjXMuxxNkIgFJ5+07mHCZ+HkHqaeZu8+3LKnNJJ1bKbjBETQAsrA==", "requires": { - "@babel/helper-validator-identifier": "^7.9.5", + "@babel/helper-validator-identifier": "^7.10.1", "lodash": "^4.17.13", "to-fast-properties": "^2.0.0" - }, - "dependencies": { - "@babel/helper-validator-identifier": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz", - "integrity": "sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==" - } } }, "debug": { @@ -10538,9 +12346,9 @@ }, "dependencies": { "@babel/runtime": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.6.tgz", - "integrity": "sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==", + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.1.tgz", + "integrity": "sha512-nQbbCbQc9u/rpg1XCxoMYQTbSMVZjCDxErQ1ClCn9Pvcmv1lGads19ep0a2VsEiIJeHqjZley6EQGEC3Yo1xMA==", "requires": { "regenerator-runtime": "^0.13.4" } @@ -10561,16 +12369,18 @@ } }, "gatsby-recipes": { - "version": "0.1.28", - "resolved": "https://registry.npmjs.org/gatsby-recipes/-/gatsby-recipes-0.1.28.tgz", - "integrity": "sha512-Wqeu7xyxpOVhRaAYMK/Rbvtmw2jEgAXOcwowINeHVBteJTAD1MztSgf1OtZiqXxTxmDnp64YBgb55XVcxrQxPQ==", + "version": "0.1.32", + "resolved": "https://registry.npmjs.org/gatsby-recipes/-/gatsby-recipes-0.1.32.tgz", + "integrity": "sha512-MdziiVR8E1LsTn0wonThPUHh6wH/Rn8foyKW0FQaWns3oMsNrcbIz1oNKaYssNoQKdBoT9JJb/Py406JS62HhQ==", "requires": { "@babel/core": "^7.9.6", "@babel/generator": "^7.9.6", + "@babel/helper-plugin-utils": "^7.8.3", "@babel/plugin-transform-react-jsx": "^7.9.4", "@babel/standalone": "^7.9.6", "@babel/template": "^7.8.6", "@babel/types": "^7.9.6", + "@hapi/hoek": "8.x.x", "@hapi/joi": "^15.1.1", "@mdx-js/mdx": "^1.6.1", "@mdx-js/react": "^1.6.1", @@ -10590,10 +12400,11 @@ "graphql": "^14.6.0", "graphql-compose": "^6.3.8", "graphql-subscriptions": "^1.1.0", + "graphql-tools": "^6.0.1", "graphql-type-json": "^0.3.1", "hicat": "^0.7.0", "html-tag-names": "^1.1.5", - "import-jsx": "^4.0.0", + "ink": "^2.7.1", "ink-box": "^1.0.0", "ink-link": "^1.1.0", "ink-select-input": "^3.1.2", @@ -10605,15 +12416,20 @@ "jest-diff": "^25.5.0", "lodash": "^4.17.15", "mkdirp": "^0.5.1", + "node-fetch": "^2.6.0", "pkg-dir": "^4.2.0", "prettier": "^2.0.5", "react-reconciler": "^0.25.1", + "remark-mdx": "^1.6.1", + "remark-parse": "^6.0.3", "remark-stringify": "^8.0.0", + "resolve-cwd": "^3.0.0", "semver": "^7.3.2", "single-trailing-newline": "^1.0.0", "style-to-object": "^0.3.0", "subscriptions-transport-ws": "^0.9.16", "svg-tag-names": "^2.0.1", + "unified": "^8.4.2", "unist-util-visit": "^2.0.2", "urql": "^1.9.7", "ws": "^7.3.0", @@ -10621,26 +12437,26 @@ }, "dependencies": { "@babel/code-frame": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", - "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.1.tgz", + "integrity": "sha512-IGhtTmpjGbYzcEDOw7DcQtbQSXcG9ftmAXtWTu9V936vDye4xjjekktFAtgZsWpzTj/X01jocB46mTywm/4SZw==", "requires": { - "@babel/highlight": "^7.8.3" + "@babel/highlight": "^7.10.1" } }, "@babel/core": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.6.tgz", - "integrity": "sha512-nD3deLvbsApbHAHttzIssYqgb883yU/d9roe4RZymBCDaZryMJDbptVpEpeQuRh4BJ+SYI8le9YGxKvFEvl1Wg==", - "requires": { - "@babel/code-frame": "^7.8.3", - "@babel/generator": "^7.9.6", - "@babel/helper-module-transforms": "^7.9.0", - "@babel/helpers": "^7.9.6", - "@babel/parser": "^7.9.6", - "@babel/template": "^7.8.6", - "@babel/traverse": "^7.9.6", - "@babel/types": "^7.9.6", + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.10.1.tgz", + "integrity": "sha512-u8XiZ6sMXW/gPmoP5ijonSUln4unazG291X0XAQ5h0s8qnAFr6BRRZGUEK+jtRWdmB0NTJQt7Uga25q8GetIIg==", + "requires": { + "@babel/code-frame": "^7.10.1", + "@babel/generator": "^7.10.1", + "@babel/helper-module-transforms": "^7.10.1", + "@babel/helpers": "^7.10.1", + "@babel/parser": "^7.10.1", + "@babel/template": "^7.10.1", + "@babel/traverse": "^7.10.1", + "@babel/types": "^7.10.1", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.1", @@ -10659,92 +12475,169 @@ } }, "@babel/generator": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.6.tgz", - "integrity": "sha512-+htwWKJbH2bL72HRluF8zumBxzuX0ZZUFl3JLNyoUjM/Ho8wnVpPXM6aUz8cfKDqQ/h7zHqKt4xzJteUosckqQ==", + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.10.1.tgz", + "integrity": "sha512-AT0YPLQw9DI21tliuJIdplVfLHya6mcGa8ctkv7n4Qv+hYacJrKmNWIteAK1P9iyLikFIAkwqJ7HAOqIDLFfgA==", "requires": { - "@babel/types": "^7.9.6", + "@babel/types": "^7.10.1", "jsesc": "^2.5.1", "lodash": "^4.17.13", "source-map": "^0.5.0" } }, "@babel/helper-function-name": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz", - "integrity": "sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==", + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.1.tgz", + "integrity": "sha512-fcpumwhs3YyZ/ttd5Rz0xn0TpIwVkN7X0V38B9TWNfVF42KEkhkAAuPCQ3oXmtTRtiPJrmZ0TrfS0GKF0eMaRQ==", "requires": { - "@babel/helper-get-function-arity": "^7.8.3", - "@babel/template": "^7.8.3", - "@babel/types": "^7.9.5" + "@babel/helper-get-function-arity": "^7.10.1", + "@babel/template": "^7.10.1", + "@babel/types": "^7.10.1" + } + }, + "@babel/helper-get-function-arity": { + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.1.tgz", + "integrity": "sha512-F5qdXkYGOQUb0hpRaPoetF9AnsXknKjWMZ+wmsIRsp5ge5sFh4c3h1eH2pRTTuy9KKAA2+TTYomGXAtEL2fQEw==", + "requires": { + "@babel/types": "^7.10.1" + } + }, + "@babel/helper-member-expression-to-functions": { + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.10.1.tgz", + "integrity": "sha512-u7XLXeM2n50gb6PWJ9hoO5oO7JFPaZtrh35t8RqKLT1jFKj9IWeD1zrcrYp1q1qiZTdEarfDWfTIP8nGsu0h5g==", + "requires": { + "@babel/types": "^7.10.1" + } + }, + "@babel/helper-module-imports": { + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.1.tgz", + "integrity": "sha512-SFxgwYmZ3HZPyZwJRiVNLRHWuW2OgE5k2nrVs6D9Iv4PPnXVffuEHy83Sfx/l4SqF+5kyJXjAyUmrG7tNm+qVg==", + "requires": { + "@babel/types": "^7.10.1" + } + }, + "@babel/helper-module-transforms": { + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.10.1.tgz", + "integrity": "sha512-RLHRCAzyJe7Q7sF4oy2cB+kRnU4wDZY/H2xJFGof+M+SJEGhZsb+GFj5j1AD8NiSaVBJ+Pf0/WObiXu/zxWpFg==", + "requires": { + "@babel/helper-module-imports": "^7.10.1", + "@babel/helper-replace-supers": "^7.10.1", + "@babel/helper-simple-access": "^7.10.1", + "@babel/helper-split-export-declaration": "^7.10.1", + "@babel/template": "^7.10.1", + "@babel/types": "^7.10.1", + "lodash": "^4.17.13" + } + }, + "@babel/helper-optimise-call-expression": { + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.1.tgz", + "integrity": "sha512-a0DjNS1prnBsoKx83dP2falChcs7p3i8VMzdrSbfLhuQra/2ENC4sbri34dz/rWmDADsmF1q5GbfaXydh0Jbjg==", + "requires": { + "@babel/types": "^7.10.1" + } + }, + "@babel/helper-plugin-utils": { + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.1.tgz", + "integrity": "sha512-fvoGeXt0bJc7VMWZGCAEBEMo/HAjW2mP8apF5eXK0wSqwLAVHAISCWRoLMBMUs2kqeaG77jltVqu4Hn8Egl3nA==" + }, + "@babel/helper-replace-supers": { + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.1.tgz", + "integrity": "sha512-SOwJzEfpuQwInzzQJGjGaiG578UYmyi2Xw668klPWV5n07B73S0a9btjLk/52Mlcxa+5AdIYqws1KyXRfMoB7A==", + "requires": { + "@babel/helper-member-expression-to-functions": "^7.10.1", + "@babel/helper-optimise-call-expression": "^7.10.1", + "@babel/traverse": "^7.10.1", + "@babel/types": "^7.10.1" + } + }, + "@babel/helper-simple-access": { + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.1.tgz", + "integrity": "sha512-VSWpWzRzn9VtgMJBIWTZ+GP107kZdQ4YplJlCmIrjoLVSi/0upixezHCDG8kpPVTBJpKfxTH01wDhh+jS2zKbw==", + "requires": { + "@babel/template": "^7.10.1", + "@babel/types": "^7.10.1" + } + }, + "@babel/helper-split-export-declaration": { + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.1.tgz", + "integrity": "sha512-UQ1LVBPrYdbchNhLwj6fetj46BcFwfS4NllJo/1aJsT+1dLTEnXJL0qHqtY7gPzF8S2fXBJamf1biAXV3X077g==", + "requires": { + "@babel/types": "^7.10.1" } }, + "@babel/helper-validator-identifier": { + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz", + "integrity": "sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==" + }, "@babel/helpers": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.6.tgz", - "integrity": "sha512-tI4bUbldloLcHWoRUMAj4g1bF313M/o6fBKhIsb3QnGVPwRm9JsNf/gqMkQ7zjqReABiffPV6RWj7hEglID5Iw==", + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.10.1.tgz", + "integrity": "sha512-muQNHF+IdU6wGgkaJyhhEmI54MOZBKsFfsXFhboz1ybwJ1Kl7IHlbm2a++4jwrmY5UYsgitt5lfqo1wMFcHmyw==", "requires": { - "@babel/template": "^7.8.3", - "@babel/traverse": "^7.9.6", - "@babel/types": "^7.9.6" + "@babel/template": "^7.10.1", + "@babel/traverse": "^7.10.1", + "@babel/types": "^7.10.1" } }, "@babel/highlight": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz", - "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==", + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.1.tgz", + "integrity": "sha512-8rMof+gVP8mxYZApLF/JgNDAkdKa+aJt3ZYxF8z6+j/hpeXL7iMsKCPHa2jNMHu/qqBwzQF4OHNoYi8dMA/rYg==", "requires": { - "@babel/helper-validator-identifier": "^7.9.0", + "@babel/helper-validator-identifier": "^7.10.1", "chalk": "^2.0.0", "js-tokens": "^4.0.0" } }, "@babel/parser": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.6.tgz", - "integrity": "sha512-AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q==" + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.1.tgz", + "integrity": "sha512-AUTksaz3FqugBkbTZ1i+lDLG5qy8hIzCaAxEtttU6C0BtZZU9pkNZtWSVAht4EW9kl46YBiyTGMp9xTTGqViNg==" }, "@babel/template": { - "version": "7.8.6", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz", - "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==", + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.1.tgz", + "integrity": "sha512-OQDg6SqvFSsc9A0ej6SKINWrpJiNonRIniYondK2ViKhB06i3c0s+76XUft71iqBEe9S1OKsHwPAjfHnuvnCig==", "requires": { - "@babel/code-frame": "^7.8.3", - "@babel/parser": "^7.8.6", - "@babel/types": "^7.8.6" + "@babel/code-frame": "^7.10.1", + "@babel/parser": "^7.10.1", + "@babel/types": "^7.10.1" } }, "@babel/traverse": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.6.tgz", - "integrity": "sha512-b3rAHSjbxy6VEAvlxM8OV/0X4XrG72zoxme6q1MOoe2vd0bEc+TwayhuC1+Dfgqh1QEG+pj7atQqvUprHIccsg==", - "requires": { - "@babel/code-frame": "^7.8.3", - "@babel/generator": "^7.9.6", - "@babel/helper-function-name": "^7.9.5", - "@babel/helper-split-export-declaration": "^7.8.3", - "@babel/parser": "^7.9.6", - "@babel/types": "^7.9.6", + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.10.1.tgz", + "integrity": "sha512-C/cTuXeKt85K+p08jN6vMDz8vSV0vZcI0wmQ36o6mjbuo++kPMdpOYw23W2XH04dbRt9/nMEfA4W3eR21CD+TQ==", + "requires": { + "@babel/code-frame": "^7.10.1", + "@babel/generator": "^7.10.1", + "@babel/helper-function-name": "^7.10.1", + "@babel/helper-split-export-declaration": "^7.10.1", + "@babel/parser": "^7.10.1", + "@babel/types": "^7.10.1", "debug": "^4.1.0", "globals": "^11.1.0", "lodash": "^4.17.13" } }, "@babel/types": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.6.tgz", - "integrity": "sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA==", + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.1.tgz", + "integrity": "sha512-L2yqUOpf3tzlW9GVuipgLEcZxnO+96SzR6fjXMuxxNkIgFJ5+07mHCZ+HkHqaeZu8+3LKnNJJ1bKbjBETQAsrA==", "requires": { - "@babel/helper-validator-identifier": "^7.9.5", + "@babel/helper-validator-identifier": "^7.10.1", "lodash": "^4.17.13", "to-fast-properties": "^2.0.0" - }, - "dependencies": { - "@babel/helper-validator-identifier": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz", - "integrity": "sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==" - } } }, "acorn": { @@ -10758,9 +12651,9 @@ "integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==" }, "cross-spawn": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.2.tgz", - "integrity": "sha512-PD6G8QG3S4FK/XCGFbEQrDqO2AnMMsy0meR7lerlIOHAAbkuavGU/pOqprrlvfTNjvowivTeBsjebAL0NSoMxw==", + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", "requires": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -10821,6 +12714,34 @@ "pump": "^3.0.0" } }, + "graphql-tools": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/graphql-tools/-/graphql-tools-6.0.5.tgz", + "integrity": "sha512-vmJQr0ZmsdCukzXvjDXY4daEkiNnuXZdB6GVByxYQWcrU886CvpyXxS4x28taRP0XUTEmHnJ3IrM+I/IH3VzyA==", + "requires": { + "@graphql-tools/code-file-loader": "6.0.5", + "@graphql-tools/delegate": "6.0.5", + "@graphql-tools/git-loader": "6.0.5", + "@graphql-tools/github-loader": "6.0.5", + "@graphql-tools/graphql-file-loader": "6.0.5", + "@graphql-tools/graphql-tag-pluck": "6.0.5", + "@graphql-tools/import": "6.0.5", + "@graphql-tools/json-file-loader": "6.0.5", + "@graphql-tools/links": "6.0.5", + "@graphql-tools/load": "6.0.5", + "@graphql-tools/load-files": "6.0.5", + "@graphql-tools/merge": "6.0.5", + "@graphql-tools/mock": "6.0.5", + "@graphql-tools/module-loader": "6.0.5", + "@graphql-tools/relay-operation-optimizer": "6.0.5", + "@graphql-tools/resolvers-composition": "6.0.5", + "@graphql-tools/schema": "6.0.5", + "@graphql-tools/stitch": "6.0.5", + "@graphql-tools/url-loader": "6.0.5", + "@graphql-tools/utils": "6.0.5", + "@graphql-tools/wrap": "6.0.5" + } + }, "is-binary-path": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", @@ -10829,6 +12750,11 @@ "binary-extensions": "^2.0.0" } }, + "is-plain-obj": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", + "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==" + }, "is-stream": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz", @@ -10858,6 +12784,11 @@ "unist-util-visit": "^2.0.0" } }, + "node-fetch": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz", + "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==" + }, "npm-run-path": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", @@ -10874,6 +12805,19 @@ "p-limit": "^2.2.0" } }, + "parse-entities": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-1.2.2.tgz", + "integrity": "sha512-NzfpbxW/NPrzZ/yYSoQxyqUZMZXIdCfE0OIN4ESsnptHJECoUk3FZktxNuzQf4tjt5UEopnxpYJbvYuxIFDdsg==", + "requires": { + "character-entities": "^1.0.0", + "character-entities-legacy": "^1.0.0", + "character-reference-invalid": "^1.0.0", + "is-alphanumerical": "^1.0.0", + "is-decimal": "^1.0.0", + "is-hexadecimal": "^1.0.0" + } + }, "path-exists": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", @@ -10892,11 +12836,33 @@ "find-up": "^4.0.0" } }, - "prettier": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.0.5.tgz", - "integrity": "sha512-7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg==" - }, + "prettier": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.0.5.tgz", + "integrity": "sha512-7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg==" + }, + "remark-parse": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-6.0.3.tgz", + "integrity": "sha512-QbDXWN4HfKTUC0hHa4teU463KclLAnwpn/FBn87j9cKYJWWawbiLgMfP2Q4XwhxxuuuOxHlw+pSN0OKuJwyVvg==", + "requires": { + "collapse-white-space": "^1.0.2", + "is-alphabetical": "^1.0.0", + "is-decimal": "^1.0.0", + "is-whitespace-character": "^1.0.0", + "is-word-character": "^1.0.0", + "markdown-escapes": "^1.0.0", + "parse-entities": "^1.1.0", + "repeat-string": "^1.5.4", + "state-toggle": "^1.0.0", + "trim": "0.0.1", + "trim-trailing-lines": "^1.0.0", + "unherit": "^1.0.4", + "unist-util-remove-position": "^1.0.0", + "vfile-location": "^2.0.0", + "xtend": "^4.0.1" + } + }, "remark-stringify": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/remark-stringify/-/remark-stringify-8.0.0.tgz", @@ -10916,6 +12882,21 @@ "stringify-entities": "^3.0.0", "unherit": "^1.0.4", "xtend": "^4.0.1" + }, + "dependencies": { + "parse-entities": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-2.0.0.tgz", + "integrity": "sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==", + "requires": { + "character-entities": "^1.0.0", + "character-entities-legacy": "^1.0.0", + "character-reference-invalid": "^1.0.0", + "is-alphanumerical": "^1.0.0", + "is-decimal": "^1.0.0", + "is-hexadecimal": "^1.0.0" + } + } } }, "semver": { @@ -10948,6 +12929,41 @@ "is-hexadecimal": "^1.0.0" } }, + "unified": { + "version": "8.4.2", + "resolved": "https://registry.npmjs.org/unified/-/unified-8.4.2.tgz", + "integrity": "sha512-JCrmN13jI4+h9UAyKEoGcDZV+i1E7BLFuG7OsaDvTXI5P0qhHX+vZO/kOhz9jn8HGENDKbwSeB0nVOg4gVStGA==", + "requires": { + "bail": "^1.0.0", + "extend": "^3.0.0", + "is-plain-obj": "^2.0.0", + "trough": "^1.0.0", + "vfile": "^4.0.0" + } + }, + "unist-util-remove-position": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-1.1.4.tgz", + "integrity": "sha512-tLqd653ArxJIPnKII6LMZwH+mb5q+n/GtXQZo6S6csPRs5zB0u79Yw8ouR3wTw8wxvdJFhpP6Y7jorWdCgLO0A==", + "requires": { + "unist-util-visit": "^1.1.0" + }, + "dependencies": { + "unist-util-visit": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.4.1.tgz", + "integrity": "sha512-AvGNk7Bb//EmJZyhtRUnNMEpId/AZ5Ph/KUpTI09WHQuDZHKovQ1oEv3mfmKpWKtoMzyMC4GLBm1Zy5k12fjIw==", + "requires": { + "unist-util-visit-parents": "^2.0.0" + } + } + } + }, + "vfile-location": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/vfile-location/-/vfile-location-2.0.6.tgz", + "integrity": "sha512-sSFdyCP3G6Ka0CEmN83A2YCMKIieHx0EDaj5IDP4g1pa5ZJ4FJDvpO0WODLxo4LUX4oe52gmSCK7Jw4SBghqxA==" + }, "which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", @@ -10955,6 +12971,11 @@ "requires": { "isexe": "^2.0.0" } + }, + "ws": { + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.0.tgz", + "integrity": "sha512-iFtXzngZVXPGgpTlP1rBqsUK82p9tKqsWRPg5L56egiljujJT3vGAYnHANvFxBieXrTFavhzhxW52jnaWV+w2w==" } } }, @@ -11281,6 +13302,47 @@ } } }, + "gatsby-source-graphql": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/gatsby-source-graphql/-/gatsby-source-graphql-2.5.2.tgz", + "integrity": "sha512-aM96mHFPNWE2GSIaK6KcuL4tDYOmejO9cxQWs8adpJBYw8SiEOy604dAMDPaHCtOSM+LySz8BjjWu0CSUhcxrA==", + "requires": { + "@babel/runtime": "^7.9.6", + "apollo-link": "1.2.14", + "apollo-link-http": "^1.5.17", + "dataloader": "^2.0.0", + "graphql": "^14.6.0", + "graphql-tools": "^5.0.0", + "invariant": "^2.2.4", + "node-fetch": "^1.7.3", + "uuid": "^3.4.0" + }, + "dependencies": { + "@babel/runtime": { + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.1.tgz", + "integrity": "sha512-nQbbCbQc9u/rpg1XCxoMYQTbSMVZjCDxErQ1ClCn9Pvcmv1lGads19ep0a2VsEiIJeHqjZley6EQGEC3Yo1xMA==", + "requires": { + "regenerator-runtime": "^0.13.4" + } + }, + "dataloader": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/dataloader/-/dataloader-2.0.0.tgz", + "integrity": "sha512-YzhyDAwA4TaQIhM5go+vCLmU0UikghC/t9DTQYZR2M/UvZ1MdOhPezSDZcjj9uqQJOMqjLcpWtyW2iNINdlatQ==" + }, + "regenerator-runtime": { + "version": "0.13.5", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", + "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==" + }, + "uuid": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", + "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==" + } + } + }, "gatsby-telemetry": { "version": "1.3.9", "resolved": "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-1.3.9.tgz", @@ -11306,27 +13368,32 @@ }, "dependencies": { "@babel/code-frame": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", - "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.1.tgz", + "integrity": "sha512-IGhtTmpjGbYzcEDOw7DcQtbQSXcG9ftmAXtWTu9V936vDye4xjjekktFAtgZsWpzTj/X01jocB46mTywm/4SZw==", "requires": { - "@babel/highlight": "^7.8.3" + "@babel/highlight": "^7.10.1" } }, + "@babel/helper-validator-identifier": { + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz", + "integrity": "sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==" + }, "@babel/highlight": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz", - "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==", + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.1.tgz", + "integrity": "sha512-8rMof+gVP8mxYZApLF/JgNDAkdKa+aJt3ZYxF8z6+j/hpeXL7iMsKCPHa2jNMHu/qqBwzQF4OHNoYi8dMA/rYg==", "requires": { - "@babel/helper-validator-identifier": "^7.9.0", + "@babel/helper-validator-identifier": "^7.10.1", "chalk": "^2.0.0", "js-tokens": "^4.0.0" } }, "@babel/runtime": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.6.tgz", - "integrity": "sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==", + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.1.tgz", + "integrity": "sha512-nQbbCbQc9u/rpg1XCxoMYQTbSMVZjCDxErQ1ClCn9Pvcmv1lGads19ep0a2VsEiIJeHqjZley6EQGEC3Yo1xMA==", "requires": { "regenerator-runtime": "^0.13.4" } @@ -11742,6 +13809,11 @@ "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==" }, + "get-nonce": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/get-nonce/-/get-nonce-1.0.1.tgz", + "integrity": "sha512-FJhYRoDaiatfEkUK8HKlicmu/3SGFD51q3itKDGoSTysQJBnfOcxU5GxnhE1E6soB76MbT0MBtnKJuXyAx+96Q==" + }, "get-port": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/get-port/-/get-port-3.2.0.tgz", @@ -12147,14 +14219,14 @@ } }, "graphql-playground-html": { - "version": "1.6.19", - "resolved": "https://registry.npmjs.org/graphql-playground-html/-/graphql-playground-html-1.6.19.tgz", - "integrity": "sha512-cLAqoOlxHbGj/LBpr4l2BE9qXf3g8ShjQqU2daVueITI/3wIkcDQTaQaQp+HWv0uaX0dCsgMCFW/TooLj8yJOg==" + "version": "1.6.20", + "resolved": "https://registry.npmjs.org/graphql-playground-html/-/graphql-playground-html-1.6.20.tgz", + "integrity": "sha512-RkC18un0a1YEm0PoTMGgFQh7kIA6mtp3dUun+6coWtuMLczoNNij6V0DPHEj5kWi8u0qIrSKgSx5kh4pxcCX6g==" }, "graphql-playground-middleware-express": { - "version": "1.7.14", - "resolved": "https://registry.npmjs.org/graphql-playground-middleware-express/-/graphql-playground-middleware-express-1.7.14.tgz", - "integrity": "sha512-EqoAhbRBd7rEEEDFfvECQVmZnC4cOEmRc5goiiZldozt2GZB2UBK3/7p0DAtflg6S1w6SNUR8Tg9cDLjiL1Dew==", + "version": "1.7.15", + "resolved": "https://registry.npmjs.org/graphql-playground-middleware-express/-/graphql-playground-middleware-express-1.7.15.tgz", + "integrity": "sha512-Q7bjD1SMT5fiXMgUqstNzkYk9+csbuu5K7uOga9tJlA8x9gOVsSmmIfLi0tjPOrPd4m8icPnKncR73oNA22d5g==", "requires": { "graphql-playground-html": "^1.6.19" } @@ -12175,6 +14247,48 @@ "iterall": "^1.2.1" } }, + "graphql-tools": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/graphql-tools/-/graphql-tools-5.0.0.tgz", + "integrity": "sha512-5zn3vtn//382b7G3Wzz3d5q/sh+f7tVrnxeuhTMTJ7pWJijNqLxH7VEzv8VwXCq19zAzHYEosFHfXiK7qzvk7w==", + "requires": { + "apollo-link": "^1.2.14", + "apollo-upload-client": "^13.0.0", + "deprecated-decorator": "^0.1.6", + "form-data": "^3.0.0", + "iterall": "^1.3.0", + "node-fetch": "^2.6.0", + "tslib": "^1.11.1", + "uuid": "^7.0.3" + }, + "dependencies": { + "form-data": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.0.tgz", + "integrity": "sha512-CKMFDglpbMi6PyN+brwB9Q/GOw0eAnsrEZDgcsH5Krhz5Od/haKHAX0NmQfha2zPPz0JpWzA7GJHGSnvCRLWsg==", + "requires": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + } + }, + "node-fetch": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz", + "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==" + }, + "tslib": { + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz", + "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==" + }, + "uuid": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-7.0.3.tgz", + "integrity": "sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg==" + } + } + }, "graphql-type-json": { "version": "0.3.1", "resolved": "https://registry.npmjs.org/graphql-type-json/-/graphql-type-json-0.3.1.tgz", @@ -12504,6 +14618,11 @@ "resolved": "https://registry.npmjs.org/hex-color-regex/-/hex-color-regex-1.1.0.tgz", "integrity": "sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==" }, + "hex2rgba": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/hex2rgba/-/hex2rgba-0.0.1.tgz", + "integrity": "sha1-hwG6HG7ALCBFBBWEB8HEtHqTNu0=" + }, "hicat": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/hicat/-/hicat-0.7.0.tgz", @@ -12520,6 +14639,11 @@ } } }, + "highlight-words-core": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/highlight-words-core/-/highlight-words-core-1.2.2.tgz", + "integrity": "sha512-BXUKIkUuh6cmmxzi5OIbUJxrG8OAk2MqoL1DtO3Wo9D2faJg2ph5ntyuQeLqaHJmzER6H5tllCDA9ZnNe9BVGg==" + }, "highlight.js": { "version": "8.9.1", "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-8.9.1.tgz", @@ -12791,9 +14915,9 @@ "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=" }, "ignore": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.6.tgz", - "integrity": "sha512-cgXgkypZBcCnOgSihyeqbo6gjIaIyDqPQB7Ra4vhE9m6kigdGoQDMHjviFhRZo3IMlRy6yElosoviMs5YxZXUA==" + "version": "5.1.8", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz", + "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==" }, "image-size": { "version": "0.5.5", @@ -12801,12 +14925,27 @@ "integrity": "sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=", "optional": true }, + "immutable": { + "version": "3.7.6", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-3.7.6.tgz", + "integrity": "sha1-E7TTyxK++hVIKib+Gy665kAHHks=" + }, "import-cwd": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz", "integrity": "sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=", "requires": { "import-from": "^2.1.0" + }, + "dependencies": { + "import-from": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/import-from/-/import-from-2.1.0.tgz", + "integrity": "sha1-M1238qev/VOqpHHUuAId7ja387E=", + "requires": { + "resolve-from": "^3.0.0" + } + } } }, "import-fresh": { @@ -12819,89 +14958,17 @@ } }, "import-from": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/import-from/-/import-from-2.1.0.tgz", - "integrity": "sha1-M1238qev/VOqpHHUuAId7ja387E=", - "requires": { - "resolve-from": "^3.0.0" - } - }, - "import-jsx": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/import-jsx/-/import-jsx-4.0.0.tgz", - "integrity": "sha512-CnjJ2BZFJzbFDmYG5S47xPQjMlSbZLyLJuG4znzL4TdPtJBxHtFP1xVmR+EYX4synFSldiY3B6m00XkPM3zVnA==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/import-from/-/import-from-3.0.0.tgz", + "integrity": "sha512-CiuXOFFSzkU5x/CR0+z7T91Iht4CXgfCxVOFRhh2Zyhg5wOpWvvDLQUsWl+gcN+QscYBjez8hDCt85O7RLDttQ==", "requires": { - "@babel/core": "^7.5.5", - "@babel/plugin-proposal-object-rest-spread": "^7.5.5", - "@babel/plugin-transform-destructuring": "^7.5.0", - "@babel/plugin-transform-react-jsx": "^7.3.0", - "caller-path": "^2.0.0", - "find-cache-dir": "^3.2.0", - "make-dir": "^3.0.2", - "resolve-from": "^3.0.0", - "rimraf": "^3.0.0" + "resolve-from": "^5.0.0" }, "dependencies": { - "find-cache-dir": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz", - "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==", - "requires": { - "commondir": "^1.0.1", - "make-dir": "^3.0.2", - "pkg-dir": "^4.1.0" - } - }, - "find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "requires": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - } - }, - "locate-path": { + "resolve-from": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "requires": { - "p-locate": "^4.1.0" - } - }, - "make-dir": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", - "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", - "requires": { - "semver": "^6.0.0" - } - }, - "p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "requires": { - "p-limit": "^2.2.0" - } - }, - "path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==" - }, - "pkg-dir": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", - "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", - "requires": { - "find-up": "^4.0.0" - } - }, - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", + "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==" } } }, @@ -12977,7 +15044,6 @@ "version": "2.7.1", "resolved": "https://registry.npmjs.org/ink/-/ink-2.7.1.tgz", "integrity": "sha512-s7lJuQDJEdjqtaIWhp3KYHl6WV3J04U9zoQ6wVc+Xoa06XM27SXUY57qC5DO46xkF0CfgXMKkKNcgvSu/SAEpA==", - "optional": true, "requires": { "ansi-escapes": "^4.2.1", "arrify": "^2.0.1", @@ -13003,22 +15069,14 @@ "version": "4.3.1", "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz", "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==", - "optional": true, "requires": { "type-fest": "^0.11.0" } }, - "ansi-regex": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", - "optional": true - }, "ansi-styles": { "version": "4.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", - "optional": true, "requires": { "@types/color-name": "^1.1.1", "color-convert": "^2.0.1" @@ -13027,14 +15085,12 @@ "astral-regex": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", - "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==", - "optional": true + "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==" }, "chalk": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", - "optional": true, "requires": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -13044,7 +15100,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "optional": true, "requires": { "color-name": "~1.1.4" } @@ -13052,85 +15107,43 @@ "color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "optional": true - }, - "emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "optional": true + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "optional": true + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" }, "is-fullwidth-code-point": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "optional": true + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" }, "react-reconciler": { "version": "0.24.0", "resolved": "https://registry.npmjs.org/react-reconciler/-/react-reconciler-0.24.0.tgz", "integrity": "sha512-gAGnwWkf+NOTig9oOowqid9O0HjTDC+XVGBCAmJYYJ2A2cN/O4gDdIuuUQjv8A4v6GDwVfJkagpBBLW5OW9HSw==", - "optional": true, "requires": { "loose-envify": "^1.1.0", "object-assign": "^4.1.1", "prop-types": "^15.6.2", - "scheduler": "^0.18.0" - } - }, - "scheduler": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.18.0.tgz", - "integrity": "sha512-agTSHR1Nbfi6ulI0kYNK0203joW2Y5W4po4l+v03tOoiJKpTBbxpNhWDvqc/4IcOw+KLmSiQLTasZ4cab2/UWQ==", - "optional": true, - "requires": { - "loose-envify": "^1.1.0", - "object-assign": "^4.1.1" - } - }, - "slice-ansi": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz", - "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==", - "optional": true, - "requires": { - "ansi-styles": "^4.0.0", - "astral-regex": "^2.0.0", - "is-fullwidth-code-point": "^3.0.0" - } - }, - "string-width": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", - "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", - "optional": true, - "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" - } - }, - "strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", - "optional": true, + "scheduler": "^0.18.0" + } + }, + "slice-ansi": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz", + "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==", "requires": { - "ansi-regex": "^5.0.0" + "ansi-styles": "^4.0.0", + "astral-regex": "^2.0.0", + "is-fullwidth-code-point": "^3.0.0" } }, "supports-color": { "version": "7.1.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", - "optional": true, "requires": { "has-flag": "^4.0.0" } @@ -13138,19 +15151,7 @@ "type-fest": { "version": "0.11.0", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz", - "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==", - "optional": true - }, - "wrap-ansi": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", - "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", - "optional": true, - "requires": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - } + "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==" } } }, @@ -13193,6 +15194,11 @@ "which": "^1.2.9" } }, + "emoji-regex": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", + "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==" + }, "execa": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz", @@ -13403,11 +15409,6 @@ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, - "emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" - }, "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", @@ -14283,11 +16284,11 @@ } }, "jsx-ast-utils": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-2.2.3.tgz", - "integrity": "sha512-EdIHFMm+1BPynpKOpdPqiOsvnIrInRGJD7bzPZdPkjitQEqpdpUuFpq4T0npZFKTiB3RhWFdGN+oqOJIdhDhQA==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-2.3.0.tgz", + "integrity": "sha512-3HNoc7nZ1hpZIKB3hJ7BlFRkzCx2BynRtfSwbkqZdpRdvAPsGMnzclPwrvDBS7/lalHTj21NwIeaEpysHBOudg==", "requires": { - "array-includes": "^3.0.3", + "array-includes": "^3.1.1", "object.assign": "^4.1.0" } }, @@ -14742,6 +16743,11 @@ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==" }, + "lodash-es": { + "version": "4.17.15", + "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.15.tgz", + "integrity": "sha512-rlrc3yU3+JNOpZ9zj5pQtxnx2THmvRykwL4Xlxoa8I9lHBlVbbyPhgyPMioxVZ4NqyxaVVtaJnzsyOidQIhyyQ==" + }, "lodash.assignin": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/lodash.assignin/-/lodash.assignin-4.2.0.tgz", @@ -14857,6 +16863,11 @@ "resolved": "https://registry.npmjs.org/lodash.reject/-/lodash.reject-4.6.0.tgz", "integrity": "sha1-gNZJLcFHCGS79YNTO2UfQqn1JBU=" }, + "lodash.sample": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/lodash.sample/-/lodash.sample-4.2.1.tgz", + "integrity": "sha1-XkKRsMdT+hq+sKq4+ynfG2bwf20=" + }, "lodash.some": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/lodash.some/-/lodash.some-4.6.0.tgz", @@ -14865,8 +16876,7 @@ "lodash.throttle": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz", - "integrity": "sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ=", - "optional": true + "integrity": "sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ=" }, "lodash.toarray": { "version": "4.4.0", @@ -14882,33 +16892,39 @@ "version": "3.4.0", "resolved": "https://registry.npmjs.org/log-update/-/log-update-3.4.0.tgz", "integrity": "sha512-ILKe88NeMt4gmDvk/eb615U/IVn7K9KWGkoYbdatQ69Z65nj1ZzjM6fHXfcs0Uge+e+EGnMW7DY4T9yko8vWFg==", - "optional": true, "requires": { "ansi-escapes": "^3.2.0", "cli-cursor": "^2.1.0", "wrap-ansi": "^5.0.0" }, "dependencies": { + "ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==" + }, "cli-cursor": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz", "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=", - "optional": true, "requires": { "restore-cursor": "^2.0.0" } }, + "emoji-regex": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", + "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==" + }, "mimic-fn": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz", - "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==", - "optional": true + "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==" }, "onetime": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz", "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=", - "optional": true, "requires": { "mimic-fn": "^1.0.0" } @@ -14917,11 +16933,38 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz", "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=", - "optional": true, "requires": { "onetime": "^2.0.0", "signal-exit": "^3.0.2" } + }, + "string-width": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "requires": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + } + }, + "strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "requires": { + "ansi-regex": "^4.1.0" + } + }, + "wrap-ansi": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", + "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", + "requires": { + "ansi-styles": "^3.2.0", + "string-width": "^3.0.0", + "strip-ansi": "^5.0.0" + } } } }, @@ -15553,8 +17596,7 @@ "nan": { "version": "2.14.1", "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz", - "integrity": "sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==", - "optional": true + "integrity": "sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==" }, "nano-css": { "version": "5.3.0", @@ -15662,6 +17704,11 @@ "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.9.0.tgz", "integrity": "sha512-7ASaDa3pD+lJ3WvXFsxekJQelBKRpne+GOVbLbtHYdd7pFspyeuJHnWfLplGf3SwKGbfs/aYl5V/JCIaHVUKKQ==" }, + "node-int64": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", + "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=" + }, "node-libs-browser": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz", @@ -15692,6 +17739,16 @@ "vm-browserify": "^1.0.1" }, "dependencies": { + "buffer": { + "version": "4.9.2", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz", + "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==", + "requires": { + "base64-js": "^1.0.2", + "ieee754": "^1.1.4", + "isarray": "^1.0.0" + } + }, "punycode": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", @@ -15705,9 +17762,9 @@ "integrity": "sha512-VZR0zroAusy1ETZMZiGeLkdu50LGjG5U1KHZqTruqtTyQ2wfWhHG2Ow4nsUbfTFGlaREgNHcCWoM/OzEm6p+NQ==" }, "node-releases": { - "version": "1.1.56", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.56.tgz", - "integrity": "sha512-EVo605FhWLygH8a64TjgpjyHYOihkxECwX1bHHr8tETJKWEiWS2YJjPbvsX2jFjnjTNEgBCmk9mLjKG1Mf11cw==" + "version": "1.1.57", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.57.tgz", + "integrity": "sha512-ZQmnWS7adi61A9JsllJ2gdj2PauElcjnOwTp2O011iGzoakTxUsDGSe+6vD7wXbKdqhSFymC0OSx35aAMhrSdw==" }, "noms": { "version": "0.0.0", @@ -15807,6 +17864,11 @@ } } }, + "nullthrows": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/nullthrows/-/nullthrows-1.1.1.tgz", + "integrity": "sha512-2vPPEi+Z7WqML2jZYddDIfy5Dqb0r2fze2zTxNNknZaFpVHU3mFB3R+DWeJWGVx0ecvttSGlJTI+WG+8Z4cDWw==" + }, "num2fraction": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz", @@ -17491,6 +19553,11 @@ "signal-exit": "^3.0.2" } }, + "property-expr": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/property-expr/-/property-expr-2.0.2.tgz", + "integrity": "sha512-bc/5ggaYZxNkFKj374aLbEDqVADdYaLcFo8XBkishUWbaAdjlphaBFns9TvRA2pUseVL/wMFmui9X3IdNDU37g==" + }, "property-information": { "version": "5.4.0", "resolved": "https://registry.npmjs.org/property-information/-/property-information-5.4.0.tgz", @@ -17737,6 +19804,14 @@ "prop-types": "^15.6.2" } }, + "react-clientside-effect": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/react-clientside-effect/-/react-clientside-effect-1.2.2.tgz", + "integrity": "sha512-nRmoyxeok5PBO6ytPvSjKp9xwXg9xagoTK1mMjwnQxqM9Hd7MNPl+LS1bOSOe+CV2+4fnEquc7H/S8QD3q697A==", + "requires": { + "@babel/runtime": "^7.0.0" + } + }, "react-dev-utils": { "version": "4.2.3", "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-4.2.3.tgz", @@ -17987,6 +20062,19 @@ "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-2.0.4.tgz", "integrity": "sha512-suNP+J1VU1MWFKcyt7RtjiSWUjvidmQSlqu+eHslq+342xCbGTYmC0mEhPCOHxlW0CywylOC1u2DFAT+bv4dBw==" }, + "react-focus-lock": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/react-focus-lock/-/react-focus-lock-2.3.1.tgz", + "integrity": "sha512-j15cWLPzH0gOmRrUg01C09Peu8qbcdVqr6Bjyfxj80cNZmH+idk/bNBYEDSmkAtwkXI+xEYWSmHYqtaQhZ8iUQ==", + "requires": { + "@babel/runtime": "^7.0.0", + "focus-lock": "^0.6.7", + "prop-types": "^15.6.2", + "react-clientside-effect": "^1.2.2", + "use-callback-ref": "^1.2.1", + "use-sidecar": "^1.0.1" + } + }, "react-helmet": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/react-helmet/-/react-helmet-5.2.1.tgz", @@ -18020,6 +20108,14 @@ } } }, + "react-icons": { + "version": "3.10.0", + "resolved": "https://registry.npmjs.org/react-icons/-/react-icons-3.10.0.tgz", + "integrity": "sha512-WsQ5n1JToG9VixWilSo1bHv842Cj5aZqTGiS3Ud47myF6aK7S/IUY2+dHcBdmkQcCFRuHsJ9OMUI0kTDfjyZXQ==", + "requires": { + "camelcase": "^5.0.0" + } + }, "react-is": { "version": "16.11.0", "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.11.0.tgz", @@ -18039,6 +20135,17 @@ "object-assign": "^4.1.1", "prop-types": "^15.6.2", "scheduler": "^0.19.1" + }, + "dependencies": { + "scheduler": { + "version": "0.19.1", + "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.19.1.tgz", + "integrity": "sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==", + "requires": { + "loose-envify": "^1.1.0", + "object-assign": "^4.1.1" + } + } } }, "react-refresh": { @@ -18046,6 +20153,27 @@ "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.7.2.tgz", "integrity": "sha512-u5l7fhAJXecWUJzVxzMRU2Zvw8m4QmDNHlTrT5uo3KBlYBhmChd7syAakBoay1yIiVhx/8Fi7a6v6kQZfsw81Q==" }, + "react-remove-scroll": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/react-remove-scroll/-/react-remove-scroll-2.3.0.tgz", + "integrity": "sha512-UqVimLeAe+5EHXKfsca081hAkzg3WuDmoT9cayjBegd6UZVhlTEchleNp9J4TMGkb/ftLve7ARB5Wph+HJ7A5g==", + "requires": { + "react-remove-scroll-bar": "^2.1.0", + "react-style-singleton": "^2.1.0", + "tslib": "^1.0.0", + "use-callback-ref": "^1.2.3", + "use-sidecar": "^1.0.1" + } + }, + "react-remove-scroll-bar": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/react-remove-scroll-bar/-/react-remove-scroll-bar-2.1.0.tgz", + "integrity": "sha512-5X5Y5YIPjIPrAoMJxf6Pfa7RLNGCgwZ95TdnVPgPuMftRfO8DaC7F4KP1b5eiO8hHbe7u+wZNDbYN5WUTpv7+g==", + "requires": { + "react-style-singleton": "^2.1.0", + "tslib": "^1.0.0" + } + }, "react-side-effect": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/react-side-effect/-/react-side-effect-1.2.0.tgz", @@ -18054,6 +20182,16 @@ "shallowequal": "^1.0.1" } }, + "react-style-singleton": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/react-style-singleton/-/react-style-singleton-2.1.0.tgz", + "integrity": "sha512-DH4ED+YABC1dhvSDYGGreAHmfuTXj6+ezT3CmHoqIEfxNgEYfIMoOtmbRp42JsUst3IPqBTDL+8r4TF7EWhIHw==", + "requires": { + "get-nonce": "^1.0.0", + "invariant": "^2.2.4", + "tslib": "^1.0.0" + } + }, "react-textfit": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/react-textfit/-/react-textfit-1.1.0.tgz", @@ -18249,6 +20387,18 @@ "resolved": "https://registry.npmjs.org/redux-thunk/-/redux-thunk-2.3.0.tgz", "integrity": "sha512-km6dclyFnmcvxhAcrQV2AkZmPQjzPDjgVlQtR0EQjxZPyJ0BnMf3in1ryuR8A2qU0HldVRfxYXbFSKlI3N7Slw==" }, + "reflexbox": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/reflexbox/-/reflexbox-4.0.6.tgz", + "integrity": "sha512-UNUL4YoJEXAPjRKHuty1tuOk+LV1nDJ2KYViDcH7lYm5yU3AQ+EKNXxPU3E14bQNK/pE09b1hYl+ZKdA94tWLQ==", + "requires": { + "@emotion/core": "^10.0.0", + "@emotion/styled": "^10.0.0", + "@styled-system/css": "^5.0.0", + "@styled-system/should-forward-prop": "^5.0.0", + "styled-system": "^5.0.0" + } + }, "regenerate": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz", @@ -18472,6 +20622,147 @@ "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz", "integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=" }, + "relay-compiler": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/relay-compiler/-/relay-compiler-9.1.0.tgz", + "integrity": "sha512-jsJx0Ux5RoxM+JFm3M3xl7UfZAJ0kUTY/r6jqOpcYgVI3GLJthvNI4IoziFRlWbhizEzGFbpkdshZcu9IObJYA==", + "requires": { + "@babel/core": "^7.0.0", + "@babel/generator": "^7.5.0", + "@babel/parser": "^7.0.0", + "@babel/runtime": "^7.0.0", + "@babel/traverse": "^7.0.0", + "@babel/types": "^7.0.0", + "babel-preset-fbjs": "^3.3.0", + "chalk": "^2.4.1", + "fast-glob": "^2.2.2", + "fb-watchman": "^2.0.0", + "fbjs": "^1.0.0", + "immutable": "~3.7.6", + "nullthrows": "^1.1.1", + "relay-runtime": "9.1.0", + "signedsource": "^1.0.0", + "yargs": "^14.2.0" + }, + "dependencies": { + "ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==" + }, + "cliui": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", + "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", + "requires": { + "string-width": "^3.1.0", + "strip-ansi": "^5.2.0", + "wrap-ansi": "^5.1.0" + } + }, + "emoji-regex": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", + "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==" + }, + "fbjs": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-1.0.0.tgz", + "integrity": "sha512-MUgcMEJaFhCaF1QtWGnmq9ZDRAzECTCRAF7O6UZIlAlkTs1SasiX9aP0Iw7wfD2mJ7wDTNfg2w7u5fSCwJk1OA==", + "requires": { + "core-js": "^2.4.1", + "fbjs-css-vars": "^1.0.0", + "isomorphic-fetch": "^2.1.1", + "loose-envify": "^1.0.0", + "object-assign": "^4.1.0", + "promise": "^7.1.1", + "setimmediate": "^1.0.5", + "ua-parser-js": "^0.7.18" + } + }, + "string-width": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "requires": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + } + }, + "strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "requires": { + "ansi-regex": "^4.1.0" + } + }, + "wrap-ansi": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", + "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", + "requires": { + "ansi-styles": "^3.2.0", + "string-width": "^3.0.0", + "strip-ansi": "^5.0.0" + } + }, + "yargs": { + "version": "14.2.3", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-14.2.3.tgz", + "integrity": "sha512-ZbotRWhF+lkjijC/VhmOT9wSgyBQ7+zr13+YLkhfsSiTriYsMzkTUFP18pFhWwBeMa5gUc1MzbhrO6/VB7c9Xg==", + "requires": { + "cliui": "^5.0.0", + "decamelize": "^1.2.0", + "find-up": "^3.0.0", + "get-caller-file": "^2.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^2.0.0", + "set-blocking": "^2.0.0", + "string-width": "^3.0.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^15.0.1" + } + }, + "yargs-parser": { + "version": "15.0.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-15.0.1.tgz", + "integrity": "sha512-0OAMV2mAZQrs3FkNpDQcBk1x5HXb8X4twADss4S0Iuk+2dGnLOE/fRHrsYm542GduMveyA77OF4wrNJuanRCWw==", + "requires": { + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" + } + } + } + }, + "relay-runtime": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/relay-runtime/-/relay-runtime-9.1.0.tgz", + "integrity": "sha512-6FE5YlZpR/b3R/HzGly85V+c4MdtLJhFY/outQARgxXonomrwqEik0Cr34LnPK4DmGS36cMLUliqhCs/DZyPVw==", + "requires": { + "@babel/runtime": "^7.0.0", + "fbjs": "^1.0.0" + }, + "dependencies": { + "fbjs": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-1.0.0.tgz", + "integrity": "sha512-MUgcMEJaFhCaF1QtWGnmq9ZDRAzECTCRAF7O6UZIlAlkTs1SasiX9aP0Iw7wfD2mJ7wDTNfg2w7u5fSCwJk1OA==", + "requires": { + "core-js": "^2.4.1", + "fbjs-css-vars": "^1.0.0", + "isomorphic-fetch": "^2.1.1", + "loose-envify": "^1.0.0", + "object-assign": "^4.1.0", + "promise": "^7.1.1", + "setimmediate": "^1.0.5", + "ua-parser-js": "^0.7.18" + } + } + } + }, "remark": { "version": "10.0.1", "resolved": "https://registry.npmjs.org/remark/-/remark-10.0.1.tgz", @@ -19350,20 +21641,21 @@ "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==" }, "scheduler": { - "version": "0.19.1", - "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.19.1.tgz", - "integrity": "sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==", + "version": "0.18.0", + "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.18.0.tgz", + "integrity": "sha512-agTSHR1Nbfi6ulI0kYNK0203joW2Y5W4po4l+v03tOoiJKpTBbxpNhWDvqc/4IcOw+KLmSiQLTasZ4cab2/UWQ==", "requires": { "loose-envify": "^1.1.0", "object-assign": "^4.1.1" } }, "schema-utils": { - "version": "2.6.6", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.6.6.tgz", - "integrity": "sha512-wHutF/WPSbIi9x6ctjGGk2Hvl0VOz5l3EKEuKbjPlB30mKZUzb9A5k9yEXRX3pwyqVLPvpfZZEllaFq/M718hA==", + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz", + "integrity": "sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==", "requires": { - "ajv": "^6.12.0", + "@types/json-schema": "^7.0.4", + "ajv": "^6.12.2", "ajv-keywords": "^3.4.1" }, "dependencies": { @@ -19764,6 +22056,11 @@ "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=" }, + "signedsource": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/signedsource/-/signedsource-1.0.0.tgz", + "integrity": "sha1-HdrOSYF5j5O9gzlzgD2A1S6TrWo=" + }, "simple-git": { "version": "1.132.0", "resolved": "https://registry.npmjs.org/simple-git/-/simple-git-1.132.0.tgz", @@ -20329,6 +22626,41 @@ "figgy-pudding": "^3.5.1" } }, + "st": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/st/-/st-2.0.0.tgz", + "integrity": "sha512-drN+aGYnrZPNYIymmNwIY7LXYJ8MqsqXj4fMRue3FOgGMdGjSX10fhJ3qx0sVQPhcWxhEaN4U/eWM4O4dbYNAw==", + "requires": { + "async-cache": "^1.1.0", + "bl": "^4.0.0", + "fd": "~0.0.2", + "graceful-fs": "^4.2.3", + "mime": "^2.4.4", + "negotiator": "~0.6.2" + }, + "dependencies": { + "bl": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/bl/-/bl-4.0.2.tgz", + "integrity": "sha512-j4OH8f6Qg2bGuWfRiltT2HYGx0e1QcBTrK9KAHNMwMZdQnDZFk0ZSYIpADjYCB3U12nicC5tVJwSIhwOWjb4RQ==", + "requires": { + "buffer": "^5.5.0", + "inherits": "^2.0.4", + "readable-stream": "^3.4.0" + } + }, + "readable-stream": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } + } + } + }, "stable": { "version": "0.1.8", "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz", @@ -20498,6 +22830,19 @@ "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz", "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==" }, + "strict-ui": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/strict-ui/-/strict-ui-0.1.3.tgz", + "integrity": "sha512-bbvWCY89TXb9Bkv7M0CWeFIJ8LXRvAxCqDkG3E87UGGuKAKShQzuziebnNEHgdgxQwvr/OJUxL/PJUIp+A0hwA==", + "requires": { + "@theme-ui/components": ">= 0.4.0-alpha.0", + "@theme-ui/css": ">= 0.4.0-alpha.0", + "@types/reflexbox": "^4.0.0", + "emotion": "^10.0.27", + "reflexbox": "^4.0.6", + "theme-ui": ">= 0.4.0-alpha.0" + } + }, "strict-uri-encode": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz", @@ -20507,7 +22852,6 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/string-length/-/string-length-3.1.0.tgz", "integrity": "sha512-Ttp5YvkGm5v9Ijagtaz1BnN+k9ObpvS0eIBblPMp2YWL8FBmi9qblQ9fexc2k/CXFgrTIteU3jAw3payCnwSTA==", - "optional": true, "requires": { "astral-regex": "^1.0.0", "strip-ansi": "^5.2.0" @@ -20516,14 +22860,12 @@ "ansi-regex": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", - "optional": true + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==" }, "strip-ansi": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "optional": true, "requires": { "ansi-regex": "^4.1.0" } @@ -20890,6 +23232,26 @@ "inline-style-parser": "0.1.1" } }, + "styled-system": { + "version": "5.1.5", + "resolved": "https://registry.npmjs.org/styled-system/-/styled-system-5.1.5.tgz", + "integrity": "sha512-7VoD0o2R3RKzOzPK0jYrVnS8iJdfkKsQJNiLRDjikOpQVqQHns/DXWaPZOH4tIKkhAT7I6wIsy9FWTWh2X3q+A==", + "requires": { + "@styled-system/background": "^5.1.2", + "@styled-system/border": "^5.1.5", + "@styled-system/color": "^5.1.2", + "@styled-system/core": "^5.1.2", + "@styled-system/flexbox": "^5.1.2", + "@styled-system/grid": "^5.1.2", + "@styled-system/layout": "^5.1.2", + "@styled-system/position": "^5.1.2", + "@styled-system/shadow": "^5.1.2", + "@styled-system/space": "^5.1.2", + "@styled-system/typography": "^5.1.2", + "@styled-system/variant": "^5.1.5", + "object-assign": "^4.1.1" + } + }, "stylehacks": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-4.0.3.tgz", @@ -20927,16 +23289,6 @@ "iterall": "^1.2.1", "symbol-observable": "^1.0.4", "ws": "^5.2.0" - }, - "dependencies": { - "ws": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz", - "integrity": "sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA==", - "requires": { - "async-limiter": "~1.0.0" - } - } } }, "sudo-prompt": { @@ -21047,6 +23399,16 @@ "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz", "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==" }, + "synchronous-promise": { + "version": "2.0.13", + "resolved": "https://registry.npmjs.org/synchronous-promise/-/synchronous-promise-2.0.13.tgz", + "integrity": "sha512-R9N6uDkVsghHePKh1TEqbnLddO2IY25OcsksyFp/qBe7XYd0PVbKEWxhcdMhpLzE1I6skj5l4aEZ3CRxcbArlA==" + }, + "tabbable": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-4.0.0.tgz", + "integrity": "sha512-H1XoH1URcBOa/rZZWxLxHCtOdVUEev+9vo5YdYhC9tCY4wnybX+VQrCYuy9ubkg69fCBxCONJOSLGfw0DWMffQ==" + }, "table": { "version": "5.4.6", "resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz", @@ -21063,6 +23425,11 @@ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==" }, + "emoji-regex": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", + "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==" + }, "string-width": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", @@ -21177,6 +23544,20 @@ "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=" }, + "theme-ui": { + "version": "0.4.0-highlight.0", + "resolved": "https://registry.npmjs.org/theme-ui/-/theme-ui-0.4.0-highlight.0.tgz", + "integrity": "sha512-Eg8ATVmgEpUwtQ0gWOrci3Y4A6s1S3DOgBmEj99W9JugIQ6XXWwa0rYO43vmwhoXPq6/vEDqKDA5QapaRKpJQw==", + "requires": { + "@theme-ui/color-modes": "^0.4.0-highlight.0", + "@theme-ui/components": "^0.4.0-highlight.0", + "@theme-ui/core": "^0.4.0-highlight.0", + "@theme-ui/css": "^0.4.0-highlight.0", + "@theme-ui/mdx": "^0.4.0-highlight.0", + "@theme-ui/theme-provider": "^0.4.0-highlight.0", + "@types/theme-ui__components": "^0.2.3" + } + }, "throttle-debounce": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-2.1.0.tgz", @@ -21225,6 +23606,11 @@ "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==", "optional": true }, + "tiny-warning": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz", + "integrity": "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==" + }, "tinycolor2": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.4.1.tgz", @@ -21315,6 +23701,11 @@ "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz", "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==" }, + "toposort": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/toposort/-/toposort-2.0.2.tgz", + "integrity": "sha1-riF2gXXRVZ1IvvNUILL0li8JwzA=" + }, "tough-cookie": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", @@ -21364,6 +23755,14 @@ "resolved": "https://registry.npmjs.org/ts-easing/-/ts-easing-0.2.0.tgz", "integrity": "sha512-Z86EW+fFFh/IFB1fqQ3/+7Zpf9t2ebOAxNI/V6Wo7r5gqiqtxmgTlQ1qbqQcjLKYeSHPTsEmvlJUDg/EuL0uHQ==" }, + "ts-invariant": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/ts-invariant/-/ts-invariant-0.4.4.tgz", + "integrity": "sha512-uEtWkFM/sdZvRNNDL3Ehu4WVpwaulhwQszV8mrtcdeE8nN00BV9mAmQ88RkrBhFgl9gMgvjJLAQcZbnPXI9mlA==", + "requires": { + "tslib": "^1.9.3" + } + }, "ts-pnp": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/ts-pnp/-/ts-pnp-1.2.0.tgz", @@ -21400,6 +23799,11 @@ "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=" }, + "type": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz", + "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==" + }, "type-check": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", @@ -21440,6 +23844,11 @@ "is-typedarray": "^1.0.0" } }, + "typescript": { + "version": "3.9.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.3.tgz", + "integrity": "sha512-D/wqnB2xzNFIcoBG9FG8cXRDjiqSTbG2wd8DMZeQyJlP1vfTkIxH4GKveWaEBYySKIg+USu+E+EDIR47SqnaMQ==" + }, "ua-parser-js": { "version": "0.7.21", "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.21.tgz", @@ -21706,6 +24115,14 @@ "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==" }, + "unixify": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unixify/-/unixify-1.0.0.tgz", + "integrity": "sha1-OmQcjC/7zk2mg6XHDwOkYpQMIJA=", + "requires": { + "normalize-path": "^2.1.1" + } + }, "unpipe": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", @@ -21832,6 +24249,11 @@ "is-obj": "^1.0.0" } }, + "emoji-regex": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", + "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==" + }, "execa": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz", @@ -22066,6 +24488,20 @@ "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz", "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==" }, + "use-callback-ref": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/use-callback-ref/-/use-callback-ref-1.2.3.tgz", + "integrity": "sha512-DPBPh1i2adCZoIArRlTuKRy7yue7QogtEnfv0AKrWsY+GA+4EKe37zhRDouNnyWMoNQFYZZRF+2dLHsWE4YvJA==" + }, + "use-sidecar": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/use-sidecar/-/use-sidecar-1.0.2.tgz", + "integrity": "sha512-287RZny6m5KNMTb/Kq9gmjafi7lQL0YHO1lYolU6+tY1h9+Z3uCtkJJ3OSOq3INwYf2hBryCcDh4520AhJibMA==", + "requires": { + "detect-node": "^2.0.4", + "tslib": "^1.9.3" + } + }, "util": { "version": "0.11.1", "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz", @@ -22192,6 +24628,16 @@ "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz", "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==" }, + "vue-template-compiler": { + "version": "2.6.11", + "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.6.11.tgz", + "integrity": "sha512-KIq15bvQDrcCjpGjrAhx4mUlyyHfdmTaoNfeoATHLAiWB+MU3cx4lOzMwrnUh9cCxy0Lt1T11hAFY6TQgroUAA==", + "optional": true, + "requires": { + "de-indent": "^1.0.2", + "he": "^1.1.0" + } + }, "warning": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz", @@ -22382,6 +24828,11 @@ "yargs": "^13.3.2" }, "dependencies": { + "ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==" + }, "array-union": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", @@ -22409,6 +24860,26 @@ "upath": "^1.1.1" } }, + "cliui": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", + "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", + "requires": { + "string-width": "^3.1.0", + "strip-ansi": "^5.2.0", + "wrap-ansi": "^5.1.0" + }, + "dependencies": { + "strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "requires": { + "ansi-regex": "^4.1.0" + } + } + } + }, "debug": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", @@ -22431,6 +24902,11 @@ "rimraf": "^2.6.3" } }, + "emoji-regex": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", + "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==" + }, "eventsource": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz", @@ -22527,6 +25003,26 @@ } } }, + "string-width": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "requires": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + }, + "dependencies": { + "strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "requires": { + "ansi-regex": "^4.1.0" + } + } + } + }, "supports-color": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", @@ -22535,6 +25031,26 @@ "has-flag": "^3.0.0" } }, + "wrap-ansi": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", + "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", + "requires": { + "ansi-styles": "^3.2.0", + "string-width": "^3.0.0", + "strip-ansi": "^5.0.0" + }, + "dependencies": { + "strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "requires": { + "ansi-regex": "^4.1.0" + } + } + } + }, "ws": { "version": "6.2.1", "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz", @@ -22542,6 +25058,32 @@ "requires": { "async-limiter": "~1.0.0" } + }, + "yargs": { + "version": "13.3.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz", + "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==", + "requires": { + "cliui": "^5.0.0", + "find-up": "^3.0.0", + "get-caller-file": "^2.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^2.0.0", + "set-blocking": "^2.0.0", + "string-width": "^3.0.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^13.1.2" + } + }, + "yargs-parser": { + "version": "13.1.2", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz", + "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==", + "requires": { + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" + } } } }, @@ -22594,6 +25136,33 @@ "resolved": "https://registry.npmjs.org/webpack-stats-plugin/-/webpack-stats-plugin-0.3.1.tgz", "integrity": "sha512-pxqzFE055NlNTlNyfDG3xlB2QwT1EWdm/CF5dCJI/e+rRHVxrWhWg1rf1lfsWhI1/EePv8gi/A36YxO/+u0FgQ==" }, + "websocket": { + "version": "1.0.31", + "resolved": "https://registry.npmjs.org/websocket/-/websocket-1.0.31.tgz", + "integrity": "sha512-VAouplvGKPiKFDTeCCO65vYHsyay8DqoBSlzIO3fayrfOgU94lQN5a1uWVnFrMLceTJw/+fQXR5PGbUVRaHshQ==", + "requires": { + "debug": "^2.2.0", + "es5-ext": "^0.10.50", + "nan": "^2.14.0", + "typedarray-to-buffer": "^3.1.5", + "yaeti": "^0.0.6" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + } + } + }, "websocket-driver": { "version": "0.7.4", "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz", @@ -22640,11 +25209,6 @@ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==" }, - "emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" - }, "is-fullwidth-code-point": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", @@ -22699,36 +25263,63 @@ } }, "wrap-ansi": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", - "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", + "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", "requires": { - "ansi-styles": "^3.2.0", - "string-width": "^3.0.0", - "strip-ansi": "^5.0.0" + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" }, "dependencies": { "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==" + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==" + }, + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" }, "string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", + "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" } }, "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", "requires": { - "ansi-regex": "^4.1.0" + "ansi-regex": "^5.0.0" } } } @@ -22758,9 +25349,12 @@ } }, "ws": { - "version": "7.3.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.0.tgz", - "integrity": "sha512-iFtXzngZVXPGgpTlP1rBqsUK82p9tKqsWRPg5L56egiljujJT3vGAYnHANvFxBieXrTFavhzhxW52jnaWV+w2w==" + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz", + "integrity": "sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA==", + "requires": { + "async-limiter": "~1.0.0" + } }, "x-is-string": { "version": "0.1.0", @@ -22800,6 +25394,11 @@ "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz", "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==" }, + "yaeti": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/yaeti/-/yaeti-0.0.6.tgz", + "integrity": "sha1-8m9ITXJoTPQr7ft2lwqhYI+/lXc=" + }, "yallist": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", @@ -22853,51 +25452,87 @@ } }, "yargs": { - "version": "13.3.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz", - "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==", + "version": "15.3.1", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.3.1.tgz", + "integrity": "sha512-92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA==", "requires": { - "cliui": "^5.0.0", - "find-up": "^3.0.0", + "cliui": "^6.0.0", + "decamelize": "^1.2.0", + "find-up": "^4.1.0", "get-caller-file": "^2.0.1", "require-directory": "^2.1.1", "require-main-filename": "^2.0.0", "set-blocking": "^2.0.0", - "string-width": "^3.0.0", + "string-width": "^4.2.0", "which-module": "^2.0.0", "y18n": "^4.0.0", - "yargs-parser": "^13.1.2" + "yargs-parser": "^18.1.1" }, "dependencies": { "ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==" + }, + "find-up": { "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==" + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "requires": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + } + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" + }, + "locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "requires": { + "p-locate": "^4.1.0" + } + }, + "p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "requires": { + "p-limit": "^2.2.0" + } + }, + "path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==" }, "string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", + "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" } }, "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", "requires": { - "ansi-regex": "^4.1.0" + "ansi-regex": "^5.0.0" } } } }, "yargs-parser": { - "version": "13.1.2", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz", - "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==", + "version": "18.1.3", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz", + "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==", "requires": { "camelcase": "^5.0.0", "decamelize": "^1.2.0" @@ -22921,11 +25556,39 @@ "version": "1.9.6", "resolved": "https://registry.npmjs.org/yoga-layout-prebuilt/-/yoga-layout-prebuilt-1.9.6.tgz", "integrity": "sha512-Wursw6uqLXLMjBAO4SEShuzj8+EJXhCF71/rJ7YndHTkRAYSU0GY3OghRqfAk9HPUAAFMuqp3U1Wl+01vmGRQQ==", - "optional": true, "requires": { "@types/yoga-layout": "1.9.2" } }, + "yup": { + "version": "0.29.1", + "resolved": "https://registry.npmjs.org/yup/-/yup-0.29.1.tgz", + "integrity": "sha512-U7mPIbgfQWI6M3hZCJdGFrr+U0laG28FxMAKIgNvgl7OtyYuUoc4uy9qCWYHZjh49b8T7Ug8NNDdiMIEytcXrQ==", + "requires": { + "@babel/runtime": "^7.9.6", + "fn-name": "~3.0.0", + "lodash": "^4.17.15", + "lodash-es": "^4.17.11", + "property-expr": "^2.0.2", + "synchronous-promise": "^2.0.10", + "toposort": "^2.0.2" + }, + "dependencies": { + "@babel/runtime": { + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.1.tgz", + "integrity": "sha512-nQbbCbQc9u/rpg1XCxoMYQTbSMVZjCDxErQ1ClCn9Pvcmv1lGads19ep0a2VsEiIJeHqjZley6EQGEC3Yo1xMA==", + "requires": { + "regenerator-runtime": "^0.13.4" + } + }, + "regenerator-runtime": { + "version": "0.13.5", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", + "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==" + } + } + }, "yurnalist": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/yurnalist/-/yurnalist-1.1.2.tgz", @@ -22985,6 +25648,20 @@ } } }, + "zen-observable": { + "version": "0.8.15", + "resolved": "https://registry.npmjs.org/zen-observable/-/zen-observable-0.8.15.tgz", + "integrity": "sha512-PQ2PC7R9rslx84ndNBZB/Dkv8V8fZEpk83RLgXtYd0fwUgEjseMn1Dgajh2x6S8QbZAFa9p2qVCEuYZNgve0dQ==" + }, + "zen-observable-ts": { + "version": "0.8.21", + "resolved": "https://registry.npmjs.org/zen-observable-ts/-/zen-observable-ts-0.8.21.tgz", + "integrity": "sha512-Yj3yXweRc8LdRMrCC8nIc4kkjWecPAUVh0TI0OUrWXx6aX790vLcDlWca6I4vsyCGH3LpWxq0dJRcMOFoVqmeg==", + "requires": { + "tslib": "^1.9.3", + "zen-observable": "^0.8.0" + } + }, "zwitch": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/zwitch/-/zwitch-1.0.5.tgz", diff --git a/docs/package.json b/docs/package.json index 10ad13825bd..3d747945ae7 100644 --- a/docs/package.json +++ b/docs/package.json @@ -6,7 +6,7 @@ "serve": "gatsby serve" }, "dependencies": { - "gatsby": "2.22.9", + "gatsby": "2.22.13", "gatsby-theme-apollo-docs": "4.2.3", "react": "16.13.1", "react-dom": "16.13.1" From 02f1fb6498206ac7d8fdd5b1de7e509d483be5bf Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 31 May 2020 05:17:06 +0000 Subject: [PATCH 639/642] chore(deps): update dependency gatsby to v2.22.15 (#4187) Co-authored-by: Renovate Bot --- docs/package-lock.json | 290 +++++++++++++++++++++-------------------- docs/package.json | 2 +- 2 files changed, 152 insertions(+), 140 deletions(-) diff --git a/docs/package-lock.json b/docs/package-lock.json index 7194da38d66..60438a5af31 100644 --- a/docs/package-lock.json +++ b/docs/package-lock.json @@ -292,9 +292,9 @@ } }, "@babel/helper-create-class-features-plugin": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.1.tgz", - "integrity": "sha512-bwhdehBJZt84HuPUcP1HaTLuc/EywVS8rc3FgsEPDcivg+DCW+SHuLHVkYOmcBA1ZfI+Z/oZjQc/+bPmIO7uAA==", + "version": "7.10.2", + "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.2.tgz", + "integrity": "sha512-5C/QhkGFh1vqcziq1vAL6SI9ymzUp8BCYjFpvYVhWP4DlATIb3u5q3iUd35mvlyGs8fO7hckkW7i0tmH+5+bvQ==", "requires": { "@babel/helper-function-name": "^7.10.1", "@babel/helper-member-expression-to-functions": "^7.10.1", @@ -313,11 +313,11 @@ } }, "@babel/generator": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.10.1.tgz", - "integrity": "sha512-AT0YPLQw9DI21tliuJIdplVfLHya6mcGa8ctkv7n4Qv+hYacJrKmNWIteAK1P9iyLikFIAkwqJ7HAOqIDLFfgA==", + "version": "7.10.2", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.10.2.tgz", + "integrity": "sha512-AxfBNHNu99DTMvlUPlt1h2+Hn7knPpH5ayJ8OqDWSeLld+Fi2AYBTC/IejWDM9Edcii4UzZRCsbUt0WlSDsDsA==", "requires": { - "@babel/types": "^7.10.1", + "@babel/types": "^7.10.2", "jsesc": "^2.5.1", "lodash": "^4.17.13", "source-map": "^0.5.0" @@ -397,9 +397,9 @@ } }, "@babel/parser": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.1.tgz", - "integrity": "sha512-AUTksaz3FqugBkbTZ1i+lDLG5qy8hIzCaAxEtttU6C0BtZZU9pkNZtWSVAht4EW9kl46YBiyTGMp9xTTGqViNg==" + "version": "7.10.2", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.2.tgz", + "integrity": "sha512-PApSXlNMJyB4JiGVhCOlzKIif+TKFTvu0aQAhnTvfP/z3vVSN6ZypH5bfUNwFXXjRQtUEBNFd2PtmCmG2Py3qQ==" }, "@babel/template": { "version": "7.10.1", @@ -428,9 +428,9 @@ } }, "@babel/types": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.1.tgz", - "integrity": "sha512-L2yqUOpf3tzlW9GVuipgLEcZxnO+96SzR6fjXMuxxNkIgFJ5+07mHCZ+HkHqaeZu8+3LKnNJJ1bKbjBETQAsrA==", + "version": "7.10.2", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.2.tgz", + "integrity": "sha512-AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng==", "requires": { "@babel/helper-validator-identifier": "^7.10.1", "lodash": "^4.17.13", @@ -1917,9 +1917,9 @@ "integrity": "sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==" }, "@babel/types": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.1.tgz", - "integrity": "sha512-L2yqUOpf3tzlW9GVuipgLEcZxnO+96SzR6fjXMuxxNkIgFJ5+07mHCZ+HkHqaeZu8+3LKnNJJ1bKbjBETQAsrA==", + "version": "7.10.2", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.2.tgz", + "integrity": "sha512-AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng==", "requires": { "@babel/helper-validator-identifier": "^7.10.1", "lodash": "^4.17.13", @@ -2491,9 +2491,9 @@ } }, "@babel/runtime-corejs3": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.10.1.tgz", - "integrity": "sha512-/NLH0a34E/moPbqB1C/72I2gvMOmOly2JQARcRE1+PWCdHwMQ3la4sz7WnlK/EVHiBjQruH2WqE8YufL632Y8w==", + "version": "7.10.2", + "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.10.2.tgz", + "integrity": "sha512-+a2M/u7r15o3dV1NEizr9bRi+KUVnrs/qYxF0Z06DAPx/4VCWaz1WA7EcbE+uqGgt39lp5akWGmHsTseIkHkHg==", "requires": { "core-js-pure": "^3.0.0", "regenerator-runtime": "^0.13.4" @@ -2507,9 +2507,9 @@ } }, "@babel/standalone": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/standalone/-/standalone-7.10.1.tgz", - "integrity": "sha512-WYJ4SIteSGsgHK2/8YIuXm16IZ7LzuLxmEDc5UPYTGeTF31ibhpJZbZtgSQuhoTpSNh14euPSdBPQ91DiPveHA==" + "version": "7.10.2", + "resolved": "https://registry.npmjs.org/@babel/standalone/-/standalone-7.10.2.tgz", + "integrity": "sha512-PNQuj9oQH6BL/3l9iiL8hJLQwX14woA2/FHcPtNIZAc7IgFZYJdtMBMXiy4xcefADHTSvoBnmc2AybrHRW1IKQ==" }, "@babel/template": { "version": "7.8.3", @@ -2927,14 +2927,26 @@ } }, "@babel/generator": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.10.1.tgz", - "integrity": "sha512-AT0YPLQw9DI21tliuJIdplVfLHya6mcGa8ctkv7n4Qv+hYacJrKmNWIteAK1P9iyLikFIAkwqJ7HAOqIDLFfgA==", + "version": "7.10.2", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.10.2.tgz", + "integrity": "sha512-AxfBNHNu99DTMvlUPlt1h2+Hn7knPpH5ayJ8OqDWSeLld+Fi2AYBTC/IejWDM9Edcii4UzZRCsbUt0WlSDsDsA==", "requires": { - "@babel/types": "^7.10.1", + "@babel/types": "^7.10.2", "jsesc": "^2.5.1", "lodash": "^4.17.13", "source-map": "^0.5.0" + }, + "dependencies": { + "@babel/types": { + "version": "7.10.2", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.2.tgz", + "integrity": "sha512-AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng==", + "requires": { + "@babel/helper-validator-identifier": "^7.10.1", + "lodash": "^4.17.13", + "to-fast-properties": "^2.0.0" + } + } } }, "@babel/helper-function-name": { @@ -3889,11 +3901,11 @@ } }, "@babel/generator": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.10.1.tgz", - "integrity": "sha512-AT0YPLQw9DI21tliuJIdplVfLHya6mcGa8ctkv7n4Qv+hYacJrKmNWIteAK1P9iyLikFIAkwqJ7HAOqIDLFfgA==", + "version": "7.10.2", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.10.2.tgz", + "integrity": "sha512-AxfBNHNu99DTMvlUPlt1h2+Hn7knPpH5ayJ8OqDWSeLld+Fi2AYBTC/IejWDM9Edcii4UzZRCsbUt0WlSDsDsA==", "requires": { - "@babel/types": "^7.10.1", + "@babel/types": "^7.10.2", "jsesc": "^2.5.1", "lodash": "^4.17.13", "source-map": "^0.5.0" @@ -3956,9 +3968,9 @@ } }, "@babel/parser": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.1.tgz", - "integrity": "sha512-AUTksaz3FqugBkbTZ1i+lDLG5qy8hIzCaAxEtttU6C0BtZZU9pkNZtWSVAht4EW9kl46YBiyTGMp9xTTGqViNg==" + "version": "7.10.2", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.2.tgz", + "integrity": "sha512-PApSXlNMJyB4JiGVhCOlzKIif+TKFTvu0aQAhnTvfP/z3vVSN6ZypH5bfUNwFXXjRQtUEBNFd2PtmCmG2Py3qQ==" }, "@babel/template": { "version": "7.10.1", @@ -3987,9 +3999,9 @@ } }, "@babel/types": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.1.tgz", - "integrity": "sha512-L2yqUOpf3tzlW9GVuipgLEcZxnO+96SzR6fjXMuxxNkIgFJ5+07mHCZ+HkHqaeZu8+3LKnNJJ1bKbjBETQAsrA==", + "version": "7.10.2", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.2.tgz", + "integrity": "sha512-AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng==", "requires": { "@babel/helper-validator-identifier": "^7.10.1", "lodash": "^4.17.13", @@ -5493,9 +5505,9 @@ }, "dependencies": { "@babel/runtime": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.1.tgz", - "integrity": "sha512-nQbbCbQc9u/rpg1XCxoMYQTbSMVZjCDxErQ1ClCn9Pvcmv1lGads19ep0a2VsEiIJeHqjZley6EQGEC3Yo1xMA==", + "version": "7.10.2", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.2.tgz", + "integrity": "sha512-6sF3uQw2ivImfVIl62RZ7MXhO2tap69WeWK57vAaimT6AZbE4FbqjdEJIN1UqoD6wI6B+1n9UiagafH1sxjOtg==", "requires": { "regenerator-runtime": "^0.13.4" } @@ -6255,9 +6267,9 @@ }, "dependencies": { "@babel/runtime": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.1.tgz", - "integrity": "sha512-nQbbCbQc9u/rpg1XCxoMYQTbSMVZjCDxErQ1ClCn9Pvcmv1lGads19ep0a2VsEiIJeHqjZley6EQGEC3Yo1xMA==", + "version": "7.10.2", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.2.tgz", + "integrity": "sha512-6sF3uQw2ivImfVIl62RZ7MXhO2tap69WeWK57vAaimT6AZbE4FbqjdEJIN1UqoD6wI6B+1n9UiagafH1sxjOtg==", "requires": { "regenerator-runtime": "^0.13.4" } @@ -9599,9 +9611,9 @@ } }, "v8-compile-cache": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz", - "integrity": "sha512-usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g==" + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz", + "integrity": "sha512-8OQ9CL+VWyt3JStj7HX7/ciTL2V3Rl1Wf5OL+SNTm0yK1KvtReVulksyeRnCANHHuUxHlQig+JJDlUhBt1NQDQ==" } } }, @@ -10920,9 +10932,9 @@ } }, "gatsby": { - "version": "2.22.13", - "resolved": "https://registry.npmjs.org/gatsby/-/gatsby-2.22.13.tgz", - "integrity": "sha512-Z5LPTxsf9T6JeD/gjlo7azHc8VkmfMTkEPyNKptMIrlsJAI7W0Ndk2BOFGgmpqTRUka+ZTg+revquAhNSKReRw==", + "version": "2.22.15", + "resolved": "https://registry.npmjs.org/gatsby/-/gatsby-2.22.15.tgz", + "integrity": "sha512-HBcdofBKZoa78EonTgbUuw46iA02OEXzMixPzyvPD6rNWOH93FnlhwbVt9yGsBYRl7gFrkzA8TANpR7P6Zhhbg==", "requires": { "@babel/code-frame": "^7.8.3", "@babel/core": "^7.9.6", @@ -10986,8 +10998,8 @@ "flat": "^4.1.0", "fs-exists-cached": "1.0.0", "fs-extra": "^8.1.0", - "gatsby-admin": "^0.1.54", - "gatsby-cli": "^2.12.38", + "gatsby-admin": "^0.1.56", + "gatsby-cli": "^2.12.40", "gatsby-core-utils": "^1.3.3", "gatsby-graphiql-explorer": "^0.4.3", "gatsby-link": "^2.4.3", @@ -11079,18 +11091,18 @@ } }, "@babel/core": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.10.1.tgz", - "integrity": "sha512-u8XiZ6sMXW/gPmoP5ijonSUln4unazG291X0XAQ5h0s8qnAFr6BRRZGUEK+jtRWdmB0NTJQt7Uga25q8GetIIg==", + "version": "7.10.2", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.10.2.tgz", + "integrity": "sha512-KQmV9yguEjQsXqyOUGKjS4+3K8/DlOCE2pZcq4augdQmtTy5iv5EHtmMSJ7V4c1BIPjuwtZYqYLCq9Ga+hGBRQ==", "requires": { "@babel/code-frame": "^7.10.1", - "@babel/generator": "^7.10.1", + "@babel/generator": "^7.10.2", "@babel/helper-module-transforms": "^7.10.1", "@babel/helpers": "^7.10.1", - "@babel/parser": "^7.10.1", + "@babel/parser": "^7.10.2", "@babel/template": "^7.10.1", "@babel/traverse": "^7.10.1", - "@babel/types": "^7.10.1", + "@babel/types": "^7.10.2", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.1", @@ -11112,11 +11124,11 @@ } }, "@babel/generator": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.10.1.tgz", - "integrity": "sha512-AT0YPLQw9DI21tliuJIdplVfLHya6mcGa8ctkv7n4Qv+hYacJrKmNWIteAK1P9iyLikFIAkwqJ7HAOqIDLFfgA==", + "version": "7.10.2", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.10.2.tgz", + "integrity": "sha512-AxfBNHNu99DTMvlUPlt1h2+Hn7knPpH5ayJ8OqDWSeLld+Fi2AYBTC/IejWDM9Edcii4UzZRCsbUt0WlSDsDsA==", "requires": { - "@babel/types": "^7.10.1", + "@babel/types": "^7.10.2", "jsesc": "^2.5.1", "lodash": "^4.17.13", "source-map": "^0.5.0" @@ -11232,14 +11244,14 @@ } }, "@babel/parser": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.1.tgz", - "integrity": "sha512-AUTksaz3FqugBkbTZ1i+lDLG5qy8hIzCaAxEtttU6C0BtZZU9pkNZtWSVAht4EW9kl46YBiyTGMp9xTTGqViNg==" + "version": "7.10.2", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.2.tgz", + "integrity": "sha512-PApSXlNMJyB4JiGVhCOlzKIif+TKFTvu0aQAhnTvfP/z3vVSN6ZypH5bfUNwFXXjRQtUEBNFd2PtmCmG2Py3qQ==" }, "@babel/runtime": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.1.tgz", - "integrity": "sha512-nQbbCbQc9u/rpg1XCxoMYQTbSMVZjCDxErQ1ClCn9Pvcmv1lGads19ep0a2VsEiIJeHqjZley6EQGEC3Yo1xMA==", + "version": "7.10.2", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.2.tgz", + "integrity": "sha512-6sF3uQw2ivImfVIl62RZ7MXhO2tap69WeWK57vAaimT6AZbE4FbqjdEJIN1UqoD6wI6B+1n9UiagafH1sxjOtg==", "requires": { "regenerator-runtime": "^0.13.4" } @@ -11281,9 +11293,9 @@ } }, "@babel/types": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.1.tgz", - "integrity": "sha512-L2yqUOpf3tzlW9GVuipgLEcZxnO+96SzR6fjXMuxxNkIgFJ5+07mHCZ+HkHqaeZu8+3LKnNJJ1bKbjBETQAsrA==", + "version": "7.10.2", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.2.tgz", + "integrity": "sha512-AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng==", "requires": { "@babel/helper-validator-identifier": "^7.10.1", "lodash": "^4.17.13", @@ -11324,9 +11336,9 @@ } }, "gatsby-cli": { - "version": "2.12.38", - "resolved": "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-2.12.38.tgz", - "integrity": "sha512-OvoQdOz2OZnz6AM3eEZbgwZt6oPxuEkuSoA8cn5OB7GcqZP1+BoA+VCJ35ZNPwq9BoAYpIryYPQxbAgBUcXWvQ==", + "version": "2.12.40", + "resolved": "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-2.12.40.tgz", + "integrity": "sha512-iLZSHOb8IObc6e8VluV0AXsY8p7E37CUAL/Dknh79cJC6kkjVpfPwZnlaJa/8b+sxXCfJJkKTeEwYW0YbSsHbA==", "requires": { "@babel/code-frame": "^7.8.3", "@babel/runtime": "^7.9.6", @@ -11344,7 +11356,7 @@ "fs-exists-cached": "^1.0.0", "fs-extra": "^8.1.0", "gatsby-core-utils": "^1.3.3", - "gatsby-recipes": "^0.1.32", + "gatsby-recipes": "^0.1.34", "gatsby-telemetry": "^1.3.9", "hosted-git-info": "^3.0.4", "ink": "^2.7.1", @@ -11512,9 +11524,9 @@ } }, "gatsby-admin": { - "version": "0.1.54", - "resolved": "https://registry.npmjs.org/gatsby-admin/-/gatsby-admin-0.1.54.tgz", - "integrity": "sha512-3VwiaSmapZSY5GWywaUYkjN1fdytzX1MwFoJILiIFhd5I/pWGHHQE5QZ9VXQhzNsvt2bkTmFCyfcVxCXte0YqQ==", + "version": "0.1.56", + "resolved": "https://registry.npmjs.org/gatsby-admin/-/gatsby-admin-0.1.56.tgz", + "integrity": "sha512-ElOqF6tizHfHstrCRfI+XxCoENNoQX7F6/COu3RDts7RLco1roqeG9vep2bXBP4cdono9TkMb2LZOVcmrciiKA==", "requires": { "@emotion/core": "^10.0.28", "@emotion/styled": "^10.0.27", @@ -11522,7 +11534,7 @@ "@typescript-eslint/parser": "^2.28.0", "csstype": "^2.6.10", "formik": "^2.1.4", - "gatsby": "^2.22.13", + "gatsby": "^2.22.15", "gatsby-interface": "0.0.163", "gatsby-plugin-typescript": "^2.4.3", "gatsby-source-graphql": "^2.5.2", @@ -11571,9 +11583,9 @@ }, "dependencies": { "@babel/runtime": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.1.tgz", - "integrity": "sha512-nQbbCbQc9u/rpg1XCxoMYQTbSMVZjCDxErQ1ClCn9Pvcmv1lGads19ep0a2VsEiIJeHqjZley6EQGEC3Yo1xMA==", + "version": "7.10.2", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.2.tgz", + "integrity": "sha512-6sF3uQw2ivImfVIl62RZ7MXhO2tap69WeWK57vAaimT6AZbE4FbqjdEJIN1UqoD6wI6B+1n9UiagafH1sxjOtg==", "requires": { "regenerator-runtime": "^0.13.4" } @@ -11629,9 +11641,9 @@ }, "dependencies": { "@babel/runtime": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.1.tgz", - "integrity": "sha512-nQbbCbQc9u/rpg1XCxoMYQTbSMVZjCDxErQ1ClCn9Pvcmv1lGads19ep0a2VsEiIJeHqjZley6EQGEC3Yo1xMA==", + "version": "7.10.2", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.2.tgz", + "integrity": "sha512-6sF3uQw2ivImfVIl62RZ7MXhO2tap69WeWK57vAaimT6AZbE4FbqjdEJIN1UqoD6wI6B+1n9UiagafH1sxjOtg==", "requires": { "regenerator-runtime": "^0.13.4" } @@ -11659,9 +11671,9 @@ }, "dependencies": { "@babel/runtime": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.1.tgz", - "integrity": "sha512-nQbbCbQc9u/rpg1XCxoMYQTbSMVZjCDxErQ1ClCn9Pvcmv1lGads19ep0a2VsEiIJeHqjZley6EQGEC3Yo1xMA==", + "version": "7.10.2", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.2.tgz", + "integrity": "sha512-6sF3uQw2ivImfVIl62RZ7MXhO2tap69WeWK57vAaimT6AZbE4FbqjdEJIN1UqoD6wI6B+1n9UiagafH1sxjOtg==", "requires": { "regenerator-runtime": "^0.13.4" } @@ -12041,9 +12053,9 @@ }, "dependencies": { "@babel/runtime": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.1.tgz", - "integrity": "sha512-nQbbCbQc9u/rpg1XCxoMYQTbSMVZjCDxErQ1ClCn9Pvcmv1lGads19ep0a2VsEiIJeHqjZley6EQGEC3Yo1xMA==", + "version": "7.10.2", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.2.tgz", + "integrity": "sha512-6sF3uQw2ivImfVIl62RZ7MXhO2tap69WeWK57vAaimT6AZbE4FbqjdEJIN1UqoD6wI6B+1n9UiagafH1sxjOtg==", "requires": { "regenerator-runtime": "^0.13.4" } @@ -12129,18 +12141,18 @@ } }, "@babel/core": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.10.1.tgz", - "integrity": "sha512-u8XiZ6sMXW/gPmoP5ijonSUln4unazG291X0XAQ5h0s8qnAFr6BRRZGUEK+jtRWdmB0NTJQt7Uga25q8GetIIg==", + "version": "7.10.2", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.10.2.tgz", + "integrity": "sha512-KQmV9yguEjQsXqyOUGKjS4+3K8/DlOCE2pZcq4augdQmtTy5iv5EHtmMSJ7V4c1BIPjuwtZYqYLCq9Ga+hGBRQ==", "requires": { "@babel/code-frame": "^7.10.1", - "@babel/generator": "^7.10.1", + "@babel/generator": "^7.10.2", "@babel/helper-module-transforms": "^7.10.1", "@babel/helpers": "^7.10.1", - "@babel/parser": "^7.10.1", + "@babel/parser": "^7.10.2", "@babel/template": "^7.10.1", "@babel/traverse": "^7.10.1", - "@babel/types": "^7.10.1", + "@babel/types": "^7.10.2", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.1", @@ -12152,11 +12164,11 @@ } }, "@babel/generator": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.10.1.tgz", - "integrity": "sha512-AT0YPLQw9DI21tliuJIdplVfLHya6mcGa8ctkv7n4Qv+hYacJrKmNWIteAK1P9iyLikFIAkwqJ7HAOqIDLFfgA==", + "version": "7.10.2", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.10.2.tgz", + "integrity": "sha512-AxfBNHNu99DTMvlUPlt1h2+Hn7knPpH5ayJ8OqDWSeLld+Fi2AYBTC/IejWDM9Edcii4UzZRCsbUt0WlSDsDsA==", "requires": { - "@babel/types": "^7.10.1", + "@babel/types": "^7.10.2", "jsesc": "^2.5.1", "lodash": "^4.17.13", "source-map": "^0.5.0" @@ -12272,14 +12284,14 @@ } }, "@babel/parser": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.1.tgz", - "integrity": "sha512-AUTksaz3FqugBkbTZ1i+lDLG5qy8hIzCaAxEtttU6C0BtZZU9pkNZtWSVAht4EW9kl46YBiyTGMp9xTTGqViNg==" + "version": "7.10.2", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.2.tgz", + "integrity": "sha512-PApSXlNMJyB4JiGVhCOlzKIif+TKFTvu0aQAhnTvfP/z3vVSN6ZypH5bfUNwFXXjRQtUEBNFd2PtmCmG2Py3qQ==" }, "@babel/runtime": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.1.tgz", - "integrity": "sha512-nQbbCbQc9u/rpg1XCxoMYQTbSMVZjCDxErQ1ClCn9Pvcmv1lGads19ep0a2VsEiIJeHqjZley6EQGEC3Yo1xMA==", + "version": "7.10.2", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.2.tgz", + "integrity": "sha512-6sF3uQw2ivImfVIl62RZ7MXhO2tap69WeWK57vAaimT6AZbE4FbqjdEJIN1UqoD6wI6B+1n9UiagafH1sxjOtg==", "requires": { "regenerator-runtime": "^0.13.4" } @@ -12311,9 +12323,9 @@ } }, "@babel/types": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.1.tgz", - "integrity": "sha512-L2yqUOpf3tzlW9GVuipgLEcZxnO+96SzR6fjXMuxxNkIgFJ5+07mHCZ+HkHqaeZu8+3LKnNJJ1bKbjBETQAsrA==", + "version": "7.10.2", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.2.tgz", + "integrity": "sha512-AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng==", "requires": { "@babel/helper-validator-identifier": "^7.10.1", "lodash": "^4.17.13", @@ -12346,9 +12358,9 @@ }, "dependencies": { "@babel/runtime": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.1.tgz", - "integrity": "sha512-nQbbCbQc9u/rpg1XCxoMYQTbSMVZjCDxErQ1ClCn9Pvcmv1lGads19ep0a2VsEiIJeHqjZley6EQGEC3Yo1xMA==", + "version": "7.10.2", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.2.tgz", + "integrity": "sha512-6sF3uQw2ivImfVIl62RZ7MXhO2tap69WeWK57vAaimT6AZbE4FbqjdEJIN1UqoD6wI6B+1n9UiagafH1sxjOtg==", "requires": { "regenerator-runtime": "^0.13.4" } @@ -12369,9 +12381,9 @@ } }, "gatsby-recipes": { - "version": "0.1.32", - "resolved": "https://registry.npmjs.org/gatsby-recipes/-/gatsby-recipes-0.1.32.tgz", - "integrity": "sha512-MdziiVR8E1LsTn0wonThPUHh6wH/Rn8foyKW0FQaWns3oMsNrcbIz1oNKaYssNoQKdBoT9JJb/Py406JS62HhQ==", + "version": "0.1.34", + "resolved": "https://registry.npmjs.org/gatsby-recipes/-/gatsby-recipes-0.1.34.tgz", + "integrity": "sha512-QriLHGD96pNMMqac2HEvAu06fEdqcZpz04emaxvahC1h+1zhab3dCX+Fka827Nh3qNxqkccbvZDXINUyZsMzBQ==", "requires": { "@babel/core": "^7.9.6", "@babel/generator": "^7.9.6", @@ -12445,18 +12457,18 @@ } }, "@babel/core": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.10.1.tgz", - "integrity": "sha512-u8XiZ6sMXW/gPmoP5ijonSUln4unazG291X0XAQ5h0s8qnAFr6BRRZGUEK+jtRWdmB0NTJQt7Uga25q8GetIIg==", + "version": "7.10.2", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.10.2.tgz", + "integrity": "sha512-KQmV9yguEjQsXqyOUGKjS4+3K8/DlOCE2pZcq4augdQmtTy5iv5EHtmMSJ7V4c1BIPjuwtZYqYLCq9Ga+hGBRQ==", "requires": { "@babel/code-frame": "^7.10.1", - "@babel/generator": "^7.10.1", + "@babel/generator": "^7.10.2", "@babel/helper-module-transforms": "^7.10.1", "@babel/helpers": "^7.10.1", - "@babel/parser": "^7.10.1", + "@babel/parser": "^7.10.2", "@babel/template": "^7.10.1", "@babel/traverse": "^7.10.1", - "@babel/types": "^7.10.1", + "@babel/types": "^7.10.2", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.1", @@ -12475,11 +12487,11 @@ } }, "@babel/generator": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.10.1.tgz", - "integrity": "sha512-AT0YPLQw9DI21tliuJIdplVfLHya6mcGa8ctkv7n4Qv+hYacJrKmNWIteAK1P9iyLikFIAkwqJ7HAOqIDLFfgA==", + "version": "7.10.2", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.10.2.tgz", + "integrity": "sha512-AxfBNHNu99DTMvlUPlt1h2+Hn7knPpH5ayJ8OqDWSeLld+Fi2AYBTC/IejWDM9Edcii4UzZRCsbUt0WlSDsDsA==", "requires": { - "@babel/types": "^7.10.1", + "@babel/types": "^7.10.2", "jsesc": "^2.5.1", "lodash": "^4.17.13", "source-map": "^0.5.0" @@ -12600,9 +12612,9 @@ } }, "@babel/parser": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.1.tgz", - "integrity": "sha512-AUTksaz3FqugBkbTZ1i+lDLG5qy8hIzCaAxEtttU6C0BtZZU9pkNZtWSVAht4EW9kl46YBiyTGMp9xTTGqViNg==" + "version": "7.10.2", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.2.tgz", + "integrity": "sha512-PApSXlNMJyB4JiGVhCOlzKIif+TKFTvu0aQAhnTvfP/z3vVSN6ZypH5bfUNwFXXjRQtUEBNFd2PtmCmG2Py3qQ==" }, "@babel/template": { "version": "7.10.1", @@ -12631,9 +12643,9 @@ } }, "@babel/types": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.1.tgz", - "integrity": "sha512-L2yqUOpf3tzlW9GVuipgLEcZxnO+96SzR6fjXMuxxNkIgFJ5+07mHCZ+HkHqaeZu8+3LKnNJJ1bKbjBETQAsrA==", + "version": "7.10.2", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.2.tgz", + "integrity": "sha512-AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng==", "requires": { "@babel/helper-validator-identifier": "^7.10.1", "lodash": "^4.17.13", @@ -13319,9 +13331,9 @@ }, "dependencies": { "@babel/runtime": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.1.tgz", - "integrity": "sha512-nQbbCbQc9u/rpg1XCxoMYQTbSMVZjCDxErQ1ClCn9Pvcmv1lGads19ep0a2VsEiIJeHqjZley6EQGEC3Yo1xMA==", + "version": "7.10.2", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.2.tgz", + "integrity": "sha512-6sF3uQw2ivImfVIl62RZ7MXhO2tap69WeWK57vAaimT6AZbE4FbqjdEJIN1UqoD6wI6B+1n9UiagafH1sxjOtg==", "requires": { "regenerator-runtime": "^0.13.4" } @@ -13391,9 +13403,9 @@ } }, "@babel/runtime": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.1.tgz", - "integrity": "sha512-nQbbCbQc9u/rpg1XCxoMYQTbSMVZjCDxErQ1ClCn9Pvcmv1lGads19ep0a2VsEiIJeHqjZley6EQGEC3Yo1xMA==", + "version": "7.10.2", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.2.tgz", + "integrity": "sha512-6sF3uQw2ivImfVIl62RZ7MXhO2tap69WeWK57vAaimT6AZbE4FbqjdEJIN1UqoD6wI6B+1n9UiagafH1sxjOtg==", "requires": { "regenerator-runtime": "^0.13.4" } @@ -25575,9 +25587,9 @@ }, "dependencies": { "@babel/runtime": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.1.tgz", - "integrity": "sha512-nQbbCbQc9u/rpg1XCxoMYQTbSMVZjCDxErQ1ClCn9Pvcmv1lGads19ep0a2VsEiIJeHqjZley6EQGEC3Yo1xMA==", + "version": "7.10.2", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.2.tgz", + "integrity": "sha512-6sF3uQw2ivImfVIl62RZ7MXhO2tap69WeWK57vAaimT6AZbE4FbqjdEJIN1UqoD6wI6B+1n9UiagafH1sxjOtg==", "requires": { "regenerator-runtime": "^0.13.4" } diff --git a/docs/package.json b/docs/package.json index 3d747945ae7..d48407d70e3 100644 --- a/docs/package.json +++ b/docs/package.json @@ -6,7 +6,7 @@ "serve": "gatsby serve" }, "dependencies": { - "gatsby": "2.22.13", + "gatsby": "2.22.15", "gatsby-theme-apollo-docs": "4.2.3", "react": "16.13.1", "react-dom": "16.13.1" From 354d9910e1c87af93c7d50263a28554b449e48db Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 4 Jun 2020 16:44:44 +0000 Subject: [PATCH 640/642] Update CHANGELOG.md for subscription validation rules to Security Advisory. Rather than repeating, in different words, what is in the GitHub Security advisory, this just provides a link to the advisory with a summary. --- CHANGELOG.md | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dd9a5d908ec..50c3568a447 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,21 +5,11 @@ 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 +### v2.14.2 -> 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. 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. +> **Note:** This release is is related to a GitHub Security Advisory published by the Apollo Server team. Please read the attached advisory to understand the impact. -- **SECURITY:** If subscriptions were disabled with `subscriptions: false`, there is not a possible security risk. When subscriptions are enabled (**the default, when `subscriptions: false` is not explicitly set, regardless of whether there is a `Subscription` type in the schema**), ALL `validationRules` (including those that prevent introspection) will now passed be through to the underlying `SubscriptionServer` which is implemented by the [`subscriptions-transport-ws` ](https://github.com/apollographql/subscriptions-transport-ws) package. The previous behavior of not passing `validationRules` was a bug. - - This change means two things, the second of which affects most use cases: - - - User-provided validation rules (those provided by implementors to the `validationRules` option during `ApolloServer` construction) will now be passed to and enforced by the subscriptions server. - - - Internal validation rules, like the [`NoIntrospection`](https://github.com/apollographql/apollo-server/blob/7d6f23443/packages/apollo-server-core/src/ApolloServer.ts#L77-L88) validation rule, will also be passed to - and enforced by - the subscriptions server. - - > The `NoIntrospection` validation rule is used by Apollo Server to disable introspection when `introspection: true` is set explicitly, or when it is disabled implicitly when the `NODE_ENV` environment variable is set to `production`. (The former, automatic disabling of introspection in production can be disabled by explicitly setting `introspection: true`. If this is set on a server, then there is no change in behavior by this commit.) - - **To be clear, if subscriptions were disabled with `subscriptions: false`, the server is unaffected. In all other cases, introspection was unexpectedly enabled on the WebSocket endpoint provided by `SubscriptionServer` when it was meant to be disabled, either with `introspection: false` or when deployed to production. The risk is largely dependent on the data exposed in the schema itself.** +- ⚠️ **SECURITY:** Pass all schema validation rules to the subscription server, including validation rules that restrict introspection when introspection is meant to be disabled. **[Read the full GitHub Security Advisory for details](https://github.com/apollographql/apollo-server/security/advisories/GHSA-w42g-7vfc-xf37)**. ### v2.14.1 From 7aaca5697eeba16547b81482cf8cfa93a6642a43 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 4 Jun 2020 17:11:37 +0000 Subject: [PATCH 641/642] Update `@apollo/gateway` and `@apollo/federation` CHANGELOG before publish. --- packages/apollo-federation/CHANGELOG.md | 4 ++++ packages/apollo-gateway/CHANGELOG.md | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/apollo-federation/CHANGELOG.md b/packages/apollo-federation/CHANGELOG.md index c6f37680a10..7e0f4a5da17 100644 --- a/packages/apollo-federation/CHANGELOG.md +++ b/packages/apollo-federation/CHANGELOG.md @@ -6,6 +6,10 @@ - _Nothing yet! Stay tuned._ +## 0.16.3 + +- Only changes in the similarly versioned `@apollo/gateway` package. + ## 0.16.2 - Only changes in the similarly versioned `@apollo/gateway` package. diff --git a/packages/apollo-gateway/CHANGELOG.md b/packages/apollo-gateway/CHANGELOG.md index 0e50ea2bbf6..211e9896aa0 100644 --- a/packages/apollo-gateway/CHANGELOG.md +++ b/packages/apollo-gateway/CHANGELOG.md @@ -4,7 +4,11 @@ > 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. 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. -- __FIX__: Collapse nested required fields into a single body in the query plan. Before, some nested fields' selection sets were getting split, causing some of their subfields to be dropped when executing the query. This fix collapses the split selection sets into one. [#4064](https://github.com/apollographql/apollo-server/pull/4064) +- _Nothing yet! Stay tuned._ + +## 0.16.3 + +- This updates a dependency of `apollo-server-core` that is only used for its TypeScript typings, not for any runtime dependencies. The reason for the upgrade is that the `apollo-server-core` package (again, used only for types!) was affected by a GitHub Security Advisory. [See the related `CHANGELOG.md` for Apollo Server for more details, including a link to the advisory](https://github.com/apollographql/apollo-server/blob/354d9910e1c87af93c7d50263a28554b449e48db/CHANGELOG.md#v2142). ## 0.16.2 From a17f26bf3ee2892f5c3751713cf59920049cc73a Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 4 Jun 2020 17:14:33 +0000 Subject: [PATCH 642/642] Release - @apollo/federation@0.16.3 - @apollo/gateway@0.16.3 - apollo-server-azure-functions@2.14.2 - apollo-server-cloud-functions@2.14.2 - apollo-server-cloudflare@2.14.2 - apollo-server-core@2.14.2 - apollo-server-express@2.14.2 - apollo-server-fastify@2.14.2 - apollo-server-hapi@2.14.2 - apollo-server-integration-testsuite@2.14.2 - apollo-server-koa@2.14.2 - apollo-server-lambda@2.14.2 - apollo-server-micro@2.14.2 - apollo-server-testing@2.14.2 - apollo-server@2.14.2 --- packages/apollo-federation/package.json | 2 +- packages/apollo-gateway/package.json | 2 +- packages/apollo-server-azure-functions/package.json | 2 +- packages/apollo-server-cloud-functions/package.json | 2 +- packages/apollo-server-cloudflare/package.json | 2 +- packages/apollo-server-core/package.json | 2 +- packages/apollo-server-express/package.json | 2 +- packages/apollo-server-fastify/package.json | 2 +- packages/apollo-server-hapi/package.json | 2 +- packages/apollo-server-integration-testsuite/package.json | 2 +- packages/apollo-server-koa/package.json | 2 +- packages/apollo-server-lambda/package.json | 2 +- packages/apollo-server-micro/package.json | 2 +- packages/apollo-server-testing/package.json | 2 +- packages/apollo-server/package.json | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/packages/apollo-federation/package.json b/packages/apollo-federation/package.json index f830f13dd92..db24384cdd6 100644 --- a/packages/apollo-federation/package.json +++ b/packages/apollo-federation/package.json @@ -1,6 +1,6 @@ { "name": "@apollo/federation", - "version": "0.16.2", + "version": "0.16.3", "description": "Apollo Federation Utilities", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-gateway/package.json b/packages/apollo-gateway/package.json index 52fdfd780f3..e28a308f8d6 100644 --- a/packages/apollo-gateway/package.json +++ b/packages/apollo-gateway/package.json @@ -1,6 +1,6 @@ { "name": "@apollo/gateway", - "version": "0.16.2", + "version": "0.16.3", "description": "Apollo Gateway", "author": "opensource@apollographql.com", "main": "dist/index.js", diff --git a/packages/apollo-server-azure-functions/package.json b/packages/apollo-server-azure-functions/package.json index 7c33f852c85..e023cbfce12 100644 --- a/packages/apollo-server-azure-functions/package.json +++ b/packages/apollo-server-azure-functions/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-azure-functions", - "version": "2.14.1", + "version": "2.14.2", "description": "Production-ready Node.js GraphQL server for Azure Functions", "keywords": [ "GraphQL", diff --git a/packages/apollo-server-cloud-functions/package.json b/packages/apollo-server-cloud-functions/package.json index 92929b6ca61..86abe93d65d 100644 --- a/packages/apollo-server-cloud-functions/package.json +++ b/packages/apollo-server-cloud-functions/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-cloud-functions", - "version": "2.14.1", + "version": "2.14.2", "description": "Production-ready Node.js GraphQL server for Google Cloud Functions", "keywords": [ "GraphQL", diff --git a/packages/apollo-server-cloudflare/package.json b/packages/apollo-server-cloudflare/package.json index 59a5e9c1678..902af196b47 100644 --- a/packages/apollo-server-cloudflare/package.json +++ b/packages/apollo-server-cloudflare/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-cloudflare", - "version": "2.14.1", + "version": "2.14.2", "description": "Production-ready Node.js GraphQL server for Cloudflare workers", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-core/package.json b/packages/apollo-server-core/package.json index 8988940571b..d58b891e2cd 100644 --- a/packages/apollo-server-core/package.json +++ b/packages/apollo-server-core/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-core", - "version": "2.14.1", + "version": "2.14.2", "description": "Core engine for Apollo GraphQL server", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-express/package.json b/packages/apollo-server-express/package.json index a5b2c5791c9..232a85bc61b 100644 --- a/packages/apollo-server-express/package.json +++ b/packages/apollo-server-express/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-express", - "version": "2.14.1", + "version": "2.14.2", "description": "Production-ready Node.js GraphQL server for Express and Connect", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-fastify/package.json b/packages/apollo-server-fastify/package.json index 4c0c2c2f304..8136aa07b59 100644 --- a/packages/apollo-server-fastify/package.json +++ b/packages/apollo-server-fastify/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-fastify", - "version": "2.14.1", + "version": "2.14.2", "description": "Production-ready Node.js GraphQL server for Fastify", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-hapi/package.json b/packages/apollo-server-hapi/package.json index bb99ced89ee..c8298cc8ad8 100644 --- a/packages/apollo-server-hapi/package.json +++ b/packages/apollo-server-hapi/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-hapi", - "version": "2.14.1", + "version": "2.14.2", "description": "Production-ready Node.js GraphQL server for Hapi", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-integration-testsuite/package.json b/packages/apollo-server-integration-testsuite/package.json index 456099c8a26..c41b1fec5a3 100644 --- a/packages/apollo-server-integration-testsuite/package.json +++ b/packages/apollo-server-integration-testsuite/package.json @@ -1,7 +1,7 @@ { "name": "apollo-server-integration-testsuite", "private": true, - "version": "2.14.1", + "version": "2.14.2", "description": "Apollo Server Integrations testsuite", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-koa/package.json b/packages/apollo-server-koa/package.json index 2669f1ae629..60f1903bc54 100644 --- a/packages/apollo-server-koa/package.json +++ b/packages/apollo-server-koa/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-koa", - "version": "2.14.1", + "version": "2.14.2", "description": "Production-ready Node.js GraphQL server for Koa", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-lambda/package.json b/packages/apollo-server-lambda/package.json index 615ebe7902e..bfb98fbc61d 100644 --- a/packages/apollo-server-lambda/package.json +++ b/packages/apollo-server-lambda/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-lambda", - "version": "2.14.1", + "version": "2.14.2", "description": "Production-ready Node.js GraphQL server for AWS Lambda", "keywords": [ "GraphQL", diff --git a/packages/apollo-server-micro/package.json b/packages/apollo-server-micro/package.json index c6cc9032233..9f8cf3b948f 100644 --- a/packages/apollo-server-micro/package.json +++ b/packages/apollo-server-micro/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-micro", - "version": "2.14.1", + "version": "2.14.2", "description": "Production-ready Node.js GraphQL server for Micro", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-testing/package.json b/packages/apollo-server-testing/package.json index 562e2bf55a3..58c46a2ef90 100644 --- a/packages/apollo-server-testing/package.json +++ b/packages/apollo-server-testing/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-testing", - "version": "2.14.1", + "version": "2.14.2", "description": "Test utils for apollo-server", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server/package.json b/packages/apollo-server/package.json index 448eae5d11b..2677aa54a80 100644 --- a/packages/apollo-server/package.json +++ b/packages/apollo-server/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server", - "version": "2.14.1", + "version": "2.14.2", "description": "Production ready GraphQL Server", "author": "opensource@apollographql.com", "main": "dist/index.js",