From c0e2675912b9c5cf1bdbc97ead9eab13f8c5aac7 Mon Sep 17 00:00:00 2001 From: roschaefer Date: Mon, 13 Jan 2020 23:25:07 +0100 Subject: [PATCH 01/67] refactor(neo4j) Setup constraints with neode --- backend/README.md | 21 ++++++++++ backend/package.json | 4 +- backend/src/migration/migrate.js | 0 backend/src/migration/setup.js | 7 ++++ backend/src/models/Category.js | 2 +- backend/src/models/Post.js | 2 +- backend/src/models/UnverifiedEmailAddress.js | 2 +- backend/src/models/User.js | 2 +- neo4j/Dockerfile | 2 - neo4j/README.md | 9 ----- neo4j/db_setup.sh | 41 -------------------- 11 files changed, 35 insertions(+), 57 deletions(-) create mode 100644 backend/src/migration/migrate.js create mode 100644 backend/src/migration/setup.js delete mode 100755 neo4j/db_setup.sh diff --git a/backend/README.md b/backend/README.md index 14e6d0ddd..5474c30d7 100644 --- a/backend/README.md +++ b/backend/README.md @@ -53,6 +53,27 @@ can issue GraphQL requests or access GraphQL Playground in the browser. ![GraphQL Playground](../.gitbook/assets/graphql-playground.png) +### Database Indices and Constraints + +Database indices and constraints need to be created when the database and the +backend is running: + +{% tabs %} +{% tab title="Docker" %} +```bash +docker-compose exec backend yarn run db:setup +``` +{% endtab %} + +{% tab title="Without Docker" %} +```bash +# in folder backend/ +# make sure your database is running on http://localhost:7474/browser/ +yarn run db:setup +``` +{% endtab %} +{% endtabs %} + #### Seed Database diff --git a/backend/package.json b/backend/package.json index cd8b3ea3f..acd0a9549 100644 --- a/backend/package.json +++ b/backend/package.json @@ -11,7 +11,9 @@ "lint": "eslint src --config .eslintrc.js", "test": "jest --forceExit --detectOpenHandles --runInBand", "db:reset": "babel-node src/seed/reset-db.js", - "db:seed": "babel-node src/seed/seed-db.js" + "db:seed": "babel-node src/seed/seed-db.js", + "db:setup": "babel-node src/migration/setup.js", + "db:migrate": "babel-node src/migration/migrate.js" }, "author": "Human Connection gGmbH", "license": "MIT", diff --git a/backend/src/migration/migrate.js b/backend/src/migration/migrate.js new file mode 100644 index 000000000..e69de29bb diff --git a/backend/src/migration/setup.js b/backend/src/migration/setup.js new file mode 100644 index 000000000..33667ff1b --- /dev/null +++ b/backend/src/migration/setup.js @@ -0,0 +1,7 @@ +import { getNeode } from '../bootstrap/neo4j' + +(async() => { + await getNeode().schema.install() + console.log('Schema installed!') + process.exit(0) +})() diff --git a/backend/src/models/Category.js b/backend/src/models/Category.js index faf5f189f..223bb4f87 100644 --- a/backend/src/models/Category.js +++ b/backend/src/models/Category.js @@ -3,7 +3,7 @@ import uuid from 'uuid/v4' export default { id: { type: 'string', primary: true, default: uuid }, name: { type: 'string', required: true, default: false }, - slug: { type: 'string' }, + slug: { type: 'string', unique: 'true' }, icon: { type: 'string', required: true, default: false }, createdAt: { type: 'string', isoDate: true, default: () => new Date().toISOString() }, updatedAt: { diff --git a/backend/src/models/Post.js b/backend/src/models/Post.js index fd1e5b2ac..c29036009 100644 --- a/backend/src/models/Post.js +++ b/backend/src/models/Post.js @@ -11,7 +11,7 @@ export default { direction: 'in', }, title: { type: 'string', disallow: [null], min: 3 }, - slug: { type: 'string', allow: [null] }, + slug: { type: 'string', allow: [null], unique: 'true', }, content: { type: 'string', disallow: [null], min: 3 }, contentExcerpt: { type: 'string', allow: [null] }, image: { type: 'string', allow: [null] }, diff --git a/backend/src/models/UnverifiedEmailAddress.js b/backend/src/models/UnverifiedEmailAddress.js index 489e8517a..c582ed011 100644 --- a/backend/src/models/UnverifiedEmailAddress.js +++ b/backend/src/models/UnverifiedEmailAddress.js @@ -1,5 +1,5 @@ export default { - email: { type: 'string', primary: true, lowercase: true, email: true }, + email: { type: 'string', lowercase: true, email: true }, createdAt: { type: 'string', isoDate: true, default: () => new Date().toISOString() }, nonce: { type: 'string', token: true }, belongsTo: { diff --git a/backend/src/models/User.js b/backend/src/models/User.js index fc352dccc..049611eb7 100644 --- a/backend/src/models/User.js +++ b/backend/src/models/User.js @@ -4,7 +4,7 @@ export default { id: { type: 'string', primary: true, default: uuid }, // TODO: should be type: 'uuid' but simplified for our tests actorId: { type: 'string', allow: [null] }, name: { type: 'string', disallow: [null], min: 3 }, - slug: { type: 'string', regex: /^[a-z0-9_-]+$/, lowercase: true }, + slug: { type: 'string', unique: 'true', regex: /^[a-z0-9_-]+$/, lowercase: true }, encryptedPassword: 'string', avatar: { type: 'string', allow: [null] }, coverImg: { type: 'string', allow: [null] }, diff --git a/neo4j/Dockerfile b/neo4j/Dockerfile index 22dabe114..b068b22b2 100644 --- a/neo4j/Dockerfile +++ b/neo4j/Dockerfile @@ -4,7 +4,5 @@ LABEL Description="Neo4J database of the Social Network Human-Connection.org wit ARG BUILD_COMMIT ENV BUILD_COMMIT=$BUILD_COMMIT -COPY db_setup.sh /usr/local/bin/db_setup - RUN apt-get update && apt-get -y install wget htop RUN wget https://github.com/neo4j-contrib/neo4j-apoc-procedures/releases/download/3.5.0.4/apoc-3.5.0.4-all.jar -P plugins/ diff --git a/neo4j/README.md b/neo4j/README.md index fe8825734..5df01cc71 100644 --- a/neo4j/README.md +++ b/neo4j/README.md @@ -18,15 +18,6 @@ docker-compose up You can access Neo4J through [http://localhost:7474/](http://localhost:7474/) for an interactive cypher shell and a visualization of the graph. -### Database Indices and Constraints - -Database indices and constraints need to be created when the database is -running. So start the container with the command above and run: - -```bash -docker-compose exec neo4j db_setup -``` - ## Installation without Docker diff --git a/neo4j/db_setup.sh b/neo4j/db_setup.sh deleted file mode 100755 index b7562d0c9..000000000 --- a/neo4j/db_setup.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/env bash - -ENV_FILE=$(dirname "$0")/.env -[[ -f "$ENV_FILE" ]] && source "$ENV_FILE" -if [ -z "$NEO4J_USERNAME" ] || [ -z "$NEO4J_PASSWORD" ]; then - echo "Please set NEO4J_USERNAME and NEO4J_PASSWORD environment variables." - echo "Setting up database constraints and indexes will probably fail because of authentication errors." - echo "E.g. you could \`cp .env.template .env\` unless you run the script in a docker container" -fi - -until echo 'RETURN "Connection successful" as info;' | cypher-shell -do - echo "Connecting to neo4j failed, trying again..." - sleep 1 -done - -echo ' -RETURN "Here is a list of indexes and constraints BEFORE THE SETUP:" as info; -CALL db.indexes(); -' | cypher-shell - -echo ' -CALL db.index.fulltext.createNodeIndex("post_fulltext_search",["Post"],["title", "content"]); -CALL db.index.fulltext.createNodeIndex("user_fulltext_search",["User"],["name", "slug"]); -CREATE CONSTRAINT ON (p:Post) ASSERT p.id IS UNIQUE; -CREATE CONSTRAINT ON (c:Comment) ASSERT c.id IS UNIQUE; -CREATE CONSTRAINT ON (c:Category) ASSERT c.id IS UNIQUE; -CREATE CONSTRAINT ON (u:User) ASSERT u.id IS UNIQUE; -CREATE CONSTRAINT ON (t:Tag) ASSERT t.id IS UNIQUE; - -CREATE CONSTRAINT ON (p:Post) ASSERT p.slug IS UNIQUE; -CREATE CONSTRAINT ON (c:Category) ASSERT c.slug IS UNIQUE; -CREATE CONSTRAINT ON (u:User) ASSERT u.slug IS UNIQUE; - -CREATE CONSTRAINT ON (e:EmailAddress) ASSERT e.email IS UNIQUE; -' | cypher-shell - -echo ' -RETURN "Setting up all the indexes and constraints seems to have been successful. Here is a list AFTER THE SETUP:" as info; -CALL db.indexes(); -' | cypher-shell From 30268dec0943b4d8ad46418fca98bcb2fe75030b Mon Sep 17 00:00:00 2001 From: roschaefer Date: Tue, 14 Jan 2020 01:47:03 +0100 Subject: [PATCH 02/67] build(deps): Add `migrate` for neo4j data migrations Implement a migration to merge duplicate user accounts with reactive programming. Those duplicate user accounts existed, because around 40 users have decided to register again while we experienced a bug related to normalized emails in our database. --- backend/migrations/1579387929122-foo.js | 69 +++++++++++++++++ backend/package.json | 6 +- backend/src/db/migrationTemplate.js | 7 ++ .../src/{migration/setup.js => db/setup.sj} | 0 backend/src/migration/migrate.js | 0 backend/yarn.lock | 74 +++++++++++++++++-- 6 files changed, 146 insertions(+), 10 deletions(-) create mode 100644 backend/migrations/1579387929122-foo.js create mode 100644 backend/src/db/migrationTemplate.js rename backend/src/{migration/setup.js => db/setup.sj} (100%) delete mode 100644 backend/src/migration/migrate.js diff --git a/backend/migrations/1579387929122-foo.js b/backend/migrations/1579387929122-foo.js new file mode 100644 index 000000000..9d23051ac --- /dev/null +++ b/backend/migrations/1579387929122-foo.js @@ -0,0 +1,69 @@ +import { throwError, of, concat } from 'rxjs' +import { tap, flatMap, mergeMap, map, catchError, filter } from 'rxjs/operators' +import CONFIG from '../src/config' +import { getNeode, getDriver } from '../src/bootstrap/neo4j' +import normalizeEmail from '../src/schema/resolvers//helpers/normalizeEmail' + + +export function up (next) { + const driver = getDriver() + const rxSession = driver.rxSession() + rxSession + .beginTransaction() + .pipe( + flatMap(txc => + concat( + txc + .run("MATCH (email:EmailAddress) RETURN email {.email}") + .records() + .pipe( + map(record => { + const { email } = record.get('email') + const normalizedEmail = normalizeEmail(email) + return { email, normalizedEmail } + }), + filter(({email, normalizedEmail}) => email !== normalizedEmail), + mergeMap(({email, normalizedEmail})=> { + return txc + .run(` + MATCH (oldUser:User)-[:PRIMARY_EMAIL]->(oldEmail:EmailAddress {email: $email}), (oldUser)-[previousRelationship]-(oldEmail) + MATCH (user:User)-[:PRIMARY_EMAIL]->(email:EmailAddress {email: $normalizedEmail}) + DELETE previousRelationship + WITH oldUser, oldEmail, user, email + CALL apoc.refactor.mergeNodes([user, oldUser], { properties: 'discard', mergeRels: true }) YIELD node as mergedUser + CALL apoc.refactor.mergeNodes([email, oldEmail], { properties: 'discard', mergeRels: true }) YIELD node as mergedEmail + RETURN user {.*}, email {.*} + `, { email, normalizedEmail }) + .records() + .pipe( + map(r => ({ + oldEmail: email, + email: r.get('email'), + user: r.get('user'), + })) + ) + }), + ), + txc.commit(), + ).pipe(catchError(err => txc.rollback().pipe(throwError(err)))) + ) + ) + .subscribe({ + next: ({ user, email, oldUser, oldEmail }) => console.log(` + Merged: + ============================= + userId: ${user.id} + email: ${oldEmail} => ${email.email} + ============================= + `), + complete: () => { + console.log('Merging of duplicate users completed') + next() + }, + error: error => throw new Error(error) + }) +} + +export function down () { + throw new Error("Irreversible migration") +} diff --git a/backend/package.json b/backend/package.json index acd0a9549..4d23406c7 100644 --- a/backend/package.json +++ b/backend/package.json @@ -12,8 +12,9 @@ "test": "jest --forceExit --detectOpenHandles --runInBand", "db:reset": "babel-node src/seed/reset-db.js", "db:seed": "babel-node src/seed/seed-db.js", - "db:setup": "babel-node src/migration/setup.js", - "db:migrate": "babel-node src/migration/migrate.js" + "db:setup": "babel-node src/db/setup.js", + "db:migrate:create": "migrate create --template-file./src/db/migrationTemplate.js", + "db:migrate": "migrate --compiler 'js:@babel/register'" }, "author": "Human Connection gGmbH", "license": "MIT", @@ -80,6 +81,7 @@ "metascraper-url": "^5.10.3", "metascraper-video": "^5.10.3", "metascraper-youtube": "^5.10.5", + "migrate": "^1.6.2", "minimatch": "^3.0.4", "mustache": "^4.0.0", "neo4j-driver": "^4.0.1", diff --git a/backend/src/db/migrationTemplate.js b/backend/src/db/migrationTemplate.js new file mode 100644 index 000000000..dff6564ef --- /dev/null +++ b/backend/src/db/migrationTemplate.js @@ -0,0 +1,7 @@ +export function up (next) { + next() +} + +export function down (next) { + next() +} diff --git a/backend/src/migration/setup.js b/backend/src/db/setup.sj similarity index 100% rename from backend/src/migration/setup.js rename to backend/src/db/setup.sj diff --git a/backend/src/migration/migrate.js b/backend/src/migration/migrate.js deleted file mode 100644 index e69de29bb..000000000 diff --git a/backend/yarn.lock b/backend/yarn.lock index 8c67f5a30..db1062af0 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -1680,6 +1680,11 @@ ansi-regex@^4.0.0, ansi-regex@^4.1.0: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997" integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg== +ansi-styles@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" + integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4= + ansi-styles@^3.1.0, ansi-styles@^3.2.0, ansi-styles@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" @@ -2492,6 +2497,17 @@ chalk@2.3.0: escape-string-regexp "^1.0.5" supports-color "^4.0.0" +chalk@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" + integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg= + dependencies: + ansi-styles "^2.2.1" + escape-string-regexp "^1.0.2" + has-ansi "^2.0.0" + strip-ansi "^3.0.0" + supports-color "^2.0.0" + chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.4.1, chalk@^2.4.2: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" @@ -2704,6 +2720,11 @@ combined-stream@^1.0.6, combined-stream@~1.0.6: dependencies: delayed-stream "~1.0.0" +commander@^2.9.0, commander@~2.20.3: + version "2.20.3" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" + integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== + commander@^3.0.1: version "3.0.2" resolved "https://registry.yarnpkg.com/commander/-/commander-3.0.2.tgz#6837c3fb677ad9933d1cfba42dd14d5117d6b39e" @@ -2714,11 +2735,6 @@ commander@^4.0.1: resolved "https://registry.yarnpkg.com/commander/-/commander-4.0.1.tgz#b67622721785993182e807f4883633e6401ba53c" integrity sha512-IPF4ouhCP+qdlcmCedhxX4xiGBPyigb8v5NeUp+0LyhwLgxMqyp3S0vl7TAPfS/hiP7FC3caI/PB9lTmP8r1NA== -commander@~2.20.3: - version "2.20.3" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" - integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== - commondir@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" @@ -3001,6 +3017,11 @@ date-fns@2.9.0: resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.9.0.tgz#d0b175a5c37ed5f17b97e2272bbc1fa5aec677d2" integrity sha512-khbFLu/MlzLjEzy9Gh8oY1hNt/Dvxw3J6Rbc28cVoYWQaC1S3YI4xwkF9ZWcjDLscbZlY9hISMr66RFzZagLsA== +dateformat@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-2.2.0.tgz#4065e2013cf9fb916ddfd82efb506ad4c6769062" + integrity sha1-QGXiATz5+5Ft39gu+1Bq1MZ2kGI= + dayjs@^1.8.19: version "1.8.19" resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.8.19.tgz#5117dc390d8f8e586d53891dbff3fa308f51abfe" @@ -3423,7 +3444,7 @@ escape-html@~1.0.3: resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg= -escape-string-regexp@^1.0.5: +escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= @@ -3834,7 +3855,6 @@ extsprintf@^1.2.0: faker@Marak/faker.js#master: version "4.1.0" - uid "3b2fa4aebccee52ae1bafc15d575061fb30c3cf1" resolved "https://codeload.github.com/Marak/faker.js/tar.gz/3b2fa4aebccee52ae1bafc15d575061fb30c3cf1" fast-deep-equal@^2.0.1: @@ -4387,6 +4407,13 @@ har-validator@~5.1.0: ajv "^6.5.5" har-schema "^2.0.0" +has-ansi@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" + integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE= + dependencies: + ansi-regex "^2.0.0" + has-flag@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51" @@ -6119,6 +6146,20 @@ micromatch@^4.0.2: braces "^3.0.1" picomatch "^2.0.5" +migrate@^1.6.2: + version "1.6.2" + resolved "https://registry.yarnpkg.com/migrate/-/migrate-1.6.2.tgz#8970d596780553fe9f545bdf83806df8473f025b" + integrity sha512-XAFab+ArPTo9BHzmihKjsZ5THKRryenA+lwob0R+ax0hLDs7YzJFJT5YZE3gtntZgzdgcuFLs82EJFB/Dssr+g== + dependencies: + chalk "^1.1.3" + commander "^2.9.0" + dateformat "^2.0.0" + dotenv "^4.0.0" + inherits "^2.0.3" + minimatch "^3.0.3" + mkdirp "^0.5.1" + slug "^0.9.2" + mime-db@1.40.0: version "1.40.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.40.0.tgz#a65057e998db090f732a68f6c276d387d4126c32" @@ -6163,7 +6204,7 @@ mimic-response@^1.0.0, mimic-response@^1.0.1: resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b" integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ== -minimatch@^3.0.4: +minimatch@^3.0.3, minimatch@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== @@ -7704,6 +7745,11 @@ serve-static@1.14.1: version "1.14.1" resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9" integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg== + dependencies: + encodeurl "~1.0.2" + escape-html "~1.0.3" + parseurl "~1.3.3" + send "0.17.1" set-blocking@^2.0.0, set-blocking@~2.0.0: version "2.0.0" @@ -7784,6 +7830,13 @@ slice-ansi@^2.1.0: astral-regex "^1.0.0" is-fullwidth-code-point "^2.0.0" +slug@^0.9.2: + version "0.9.4" + resolved "https://registry.yarnpkg.com/slug/-/slug-0.9.4.tgz#fad5f1ef33150830c7688cd8500514576eccabd8" + integrity sha512-3YHq0TeJ4+AIFbJm+4UWSQs5A1mmeWOTQqydW3OoPmQfNKxlO96NDRTIrp+TBkmvEsEFrd+Z/LXw8OD/6OlZ5g== + dependencies: + unicode ">= 0.3.1" + slug@~2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/slug/-/slug-2.1.0.tgz#293f8d53de7e55c15871846fd1bc36114841a8c7" @@ -8151,6 +8204,11 @@ supertest@~4.0.2: methods "^1.1.2" superagent "^3.8.3" +supports-color@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" + integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= + supports-color@^4.0.0: version "4.5.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b" From daf2c40caec80587354cb1670a28b950afe181bf Mon Sep 17 00:00:00 2001 From: roschaefer Date: Sun, 19 Jan 2020 13:13:52 +0100 Subject: [PATCH 03/67] Implement Neo4J store for `migrate` --- backend/package.json | 8 ++- backend/src/db/migrate/store.js | 57 +++++++++++++++++++ backend/src/db/migrate/template.js | 7 +++ backend/src/db/migrationTemplate.js | 7 --- ...87929122-merge_duplicate_user_accounts.js} | 14 ++++- backend/src/db/{setup.sj => setup.js} | 0 backend/src/models/Post.js | 2 +- backend/yarn.lock | 2 +- 8 files changed, 82 insertions(+), 15 deletions(-) create mode 100644 backend/src/db/migrate/store.js create mode 100644 backend/src/db/migrate/template.js delete mode 100644 backend/src/db/migrationTemplate.js rename backend/{migrations/1579387929122-foo.js => src/db/migrations/1579387929122-merge_duplicate_user_accounts.js} (77%) rename backend/src/db/{setup.sj => setup.js} (100%) diff --git a/backend/package.json b/backend/package.json index 4d23406c7..bbdf951ad 100644 --- a/backend/package.json +++ b/backend/package.json @@ -13,8 +13,10 @@ "db:reset": "babel-node src/seed/reset-db.js", "db:seed": "babel-node src/seed/seed-db.js", "db:setup": "babel-node src/db/setup.js", - "db:migrate:create": "migrate create --template-file./src/db/migrationTemplate.js", - "db:migrate": "migrate --compiler 'js:@babel/register'" + "__migrate": "migrate --compiler 'js:@babel/register' --migrations-dir ./src/db/migrations", + "db:migrate": "yarn run __migrate --store ./src/db/migrate/store.js", + "db:migrate:create": "yarn run __migrate --template-file ./src/db/migrate/template.js create", + "production:db:migrate": "migrate --migrations-dir ./dist/db/migrations --store ./dist/db/migrate/store.js" }, "author": "Human Connection gGmbH", "license": "MIT", @@ -106,7 +108,7 @@ "@babel/node": "~7.8.3", "@babel/plugin-proposal-throw-expressions": "^7.8.3", "@babel/preset-env": "~7.8.3", - "@babel/register": "~7.8.3", + "@babel/register": "^7.8.3", "apollo-server-testing": "~2.9.16", "babel-core": "~7.0.0-0", "babel-eslint": "~10.0.3", diff --git a/backend/src/db/migrate/store.js b/backend/src/db/migrate/store.js new file mode 100644 index 000000000..68bf4e8d9 --- /dev/null +++ b/backend/src/db/migrate/store.js @@ -0,0 +1,57 @@ +import { getDriver } from '../../bootstrap/neo4j' + +class Store { + async load(fn) { + const driver = getDriver() + const session = driver.session() + const readTxResultPromise = session.readTransaction(async txc => { + const result = await txc.run( + 'MATCH (migration:Migration) RETURN migration {.*} ORDER BY migration.timestamp DESC', + ) + return result.records.map(r => r.get('migration')) + }) + try { + const migrations = await readTxResultPromise + if (migrations.length <= 0) { + // eslint-disable-next-line no-console + console.log( + "No migrations found in database. If it's the first time you run migrations, then this is normal.", + ) + return fn(null, {}) + } + const [{ title: lastRun }] = migrations + fn(null, { lastRun, migrations }) + } catch (error) { + console.log(error) // eslint-disable-line no-console + } finally { + session.close() + } + } + + async save(set, fn) { + const driver = getDriver() + const session = driver.session() + const { migrations } = set + const writeTxResultPromise = session.writeTransaction(txc => { + return Promise.all( + migrations.map(migration => { + const { title, description, timestamp } = migration + const properties = { title, description, timestamp } + return txc.run('CREATE (migration:Migration) SET migration += $properties', { + properties, + }) + }), + ) + }) + try { + await writeTxResultPromise + } catch (error) { + console.log(error) // eslint-disable-line no-console + } finally { + session.close() + fn() + } + } +} + +module.exports = Store diff --git a/backend/src/db/migrate/template.js b/backend/src/db/migrate/template.js new file mode 100644 index 000000000..941f2a9e3 --- /dev/null +++ b/backend/src/db/migrate/template.js @@ -0,0 +1,7 @@ +export function up(next) { + next() +} + +export function down(next) { + next() +} diff --git a/backend/src/db/migrationTemplate.js b/backend/src/db/migrationTemplate.js deleted file mode 100644 index dff6564ef..000000000 --- a/backend/src/db/migrationTemplate.js +++ /dev/null @@ -1,7 +0,0 @@ -export function up (next) { - next() -} - -export function down (next) { - next() -} diff --git a/backend/migrations/1579387929122-foo.js b/backend/src/db/migrations/1579387929122-merge_duplicate_user_accounts.js similarity index 77% rename from backend/migrations/1579387929122-foo.js rename to backend/src/db/migrations/1579387929122-merge_duplicate_user_accounts.js index 9d23051ac..7d2abcdeb 100644 --- a/backend/migrations/1579387929122-foo.js +++ b/backend/src/db/migrations/1579387929122-merge_duplicate_user_accounts.js @@ -1,10 +1,18 @@ import { throwError, of, concat } from 'rxjs' import { tap, flatMap, mergeMap, map, catchError, filter } from 'rxjs/operators' -import CONFIG from '../src/config' -import { getNeode, getDriver } from '../src/bootstrap/neo4j' -import normalizeEmail from '../src/schema/resolvers//helpers/normalizeEmail' +import CONFIG from '../../src/config' +import { getNeode, getDriver } from '../../src/bootstrap/neo4j' +import normalizeEmail from '../../src/schema/resolvers//helpers/normalizeEmail' +export const description = ` + This migration merges duplicate :User and :EmailAddress nodes. It became + necessary after we implemented the email normalization but forgot to migrate + the existing data. Some (40) users decided to just register with a new account + but the same email address. On signup our backend would normalize the email, + which is good, but would also keep the existing unnormalized email address. + This led to about 40 duplicate user and email address nodes in our database. +` export function up (next) { const driver = getDriver() const rxSession = driver.rxSession() diff --git a/backend/src/db/setup.sj b/backend/src/db/setup.js similarity index 100% rename from backend/src/db/setup.sj rename to backend/src/db/setup.js diff --git a/backend/src/models/Post.js b/backend/src/models/Post.js index c29036009..e2e153a1b 100644 --- a/backend/src/models/Post.js +++ b/backend/src/models/Post.js @@ -11,7 +11,7 @@ export default { direction: 'in', }, title: { type: 'string', disallow: [null], min: 3 }, - slug: { type: 'string', allow: [null], unique: 'true', }, + slug: { type: 'string', allow: [null], unique: 'true' }, content: { type: 'string', disallow: [null], min: 3 }, contentExcerpt: { type: 'string', allow: [null] }, image: { type: 'string', allow: [null] }, diff --git a/backend/yarn.lock b/backend/yarn.lock index db1062af0..2c1b2efee 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -751,7 +751,7 @@ levenary "^1.1.0" semver "^5.5.0" -"@babel/register@^7.8.3", "@babel/register@~7.8.3": +"@babel/register@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.8.3.tgz#5d5d30cfcc918437535d724b8ac1e4a60c5db1f8" integrity sha512-t7UqebaWwo9nXWClIPLPloa5pN33A2leVs8Hf0e9g9YwUP8/H9NeR7DJU+4CXo23QtjChQv5a3DjEtT83ih1rg== From b063847849a84db885337dc8e84e75ddaf87011f Mon Sep 17 00:00:00 2001 From: roschaefer Date: Sun, 19 Jan 2020 23:53:36 +0100 Subject: [PATCH 04/67] refactor: Make `db:setup` init stage of `migrate` --- .travis.yml | 2 +- backend/README.md | 6 +- backend/package.json | 6 +- .../src/activitypub/routes/webfinger.spec.js | 4 +- backend/src/{seed/reset-db.js => db/clean.js} | 2 +- backend/src/db/migrate/store.js | 10 +- ...387929122-merge_duplicate_user_accounts.js | 89 ++++++------ backend/src/{bootstrap => db}/neo4j.js | 0 backend/src/{seed/seed-db.js => db/seed.js} | 4 +- backend/src/db/setup.js | 7 - backend/src/{seed => }/factories/badges.js | 0 .../src/{seed => }/factories/categories.js | 0 backend/src/{seed => }/factories/comments.js | 0 backend/src/{seed => }/factories/donations.js | 0 .../{seed => }/factories/emailAddresses.js | 0 backend/src/{seed => }/factories/index.js | 2 +- backend/src/{seed => }/factories/locations.js | 0 backend/src/{seed => }/factories/posts.js | 0 backend/src/{seed => }/factories/reports.js | 0 .../src/{seed => }/factories/socialMedia.js | 0 backend/src/{seed => }/factories/tags.js | 0 .../factories/unverifiedEmailAddresses.js | 0 backend/src/{seed => }/factories/users.js | 2 +- backend/src/jest/helpers.js | 5 - backend/src/jwt/decode.spec.js | 4 +- .../hashtags/hashtagsMiddleware.spec.js | 4 +- .../notificationsMiddleware.spec.js | 4 +- .../src/middleware/orderByMiddleware.spec.js | 4 +- .../src/middleware/permissionsMiddleware.js | 2 +- .../middleware/permissionsMiddleware.spec.js | 4 +- .../src/middleware/slugifyMiddleware.spec.js | 4 +- .../softDelete/softDeleteMiddleware.spec.js | 4 +- .../validation/validationMiddleware.spec.js | 4 +- backend/src/models/User.spec.js | 4 +- backend/src/schema/resolvers/comments.spec.js | 4 +- .../src/schema/resolvers/donations.spec.js | 4 +- backend/src/schema/resolvers/emails.spec.js | 4 +- backend/src/schema/resolvers/follow.js | 2 +- backend/src/schema/resolvers/follow.spec.js | 4 +- .../src/schema/resolvers/locations.spec.js | 4 +- .../src/schema/resolvers/moderation.spec.js | 4 +- .../schema/resolvers/notifications.spec.js | 4 +- .../schema/resolvers/passwordReset.spec.js | 4 +- backend/src/schema/resolvers/posts.spec.js | 4 +- backend/src/schema/resolvers/registration.js | 2 +- .../src/schema/resolvers/registration.spec.js | 4 +- backend/src/schema/resolvers/reports.spec.js | 4 +- backend/src/schema/resolvers/rewards.js | 2 +- backend/src/schema/resolvers/rewards.spec.js | 4 +- backend/src/schema/resolvers/shout.spec.js | 4 +- backend/src/schema/resolvers/socialMedia.js | 2 +- .../src/schema/resolvers/socialMedia.spec.js | 4 +- .../src/schema/resolvers/statistics.spec.js | 4 +- .../src/schema/resolvers/user_management.js | 2 +- .../schema/resolvers/user_management.spec.js | 4 +- backend/src/schema/resolvers/users.js | 2 +- backend/src/schema/resolvers/users.spec.js | 4 +- .../resolvers/users/blockedUsers.spec.js | 4 +- .../schema/resolvers/users/location.spec.js | 4 +- backend/src/seed/seed-helpers.js | 134 ------------------ backend/src/server.js | 2 +- backend/test/features/support/steps.js | 2 +- cypress/support/factories.js | 4 +- features/support/steps.js | 2 +- 64 files changed, 139 insertions(+), 270 deletions(-) rename backend/src/{seed/reset-db.js => db/clean.js} (91%) rename backend/src/{bootstrap => db}/neo4j.js (100%) rename backend/src/{seed/seed-db.js => db/seed.js} (99%) delete mode 100644 backend/src/db/setup.js rename backend/src/{seed => }/factories/badges.js (100%) rename backend/src/{seed => }/factories/categories.js (100%) rename backend/src/{seed => }/factories/comments.js (100%) rename backend/src/{seed => }/factories/donations.js (100%) rename backend/src/{seed => }/factories/emailAddresses.js (100%) rename backend/src/{seed => }/factories/index.js (96%) rename backend/src/{seed => }/factories/locations.js (100%) rename backend/src/{seed => }/factories/posts.js (100%) rename backend/src/{seed => }/factories/reports.js (100%) rename backend/src/{seed => }/factories/socialMedia.js (100%) rename backend/src/{seed => }/factories/tags.js (100%) rename backend/src/{seed => }/factories/unverifiedEmailAddresses.js (100%) rename backend/src/{seed => }/factories/users.js (95%) delete mode 100644 backend/src/jest/helpers.js delete mode 100644 backend/src/seed/seed-helpers.js diff --git a/.travis.yml b/.travis.yml index 19ba3ff9d..110655c79 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,7 @@ before_script: - docker-compose -f docker-compose.yml -f docker-compose.build-and-test.yml build # just tagging, just be quite fast - docker-compose -f docker-compose.yml -f docker-compose.build-and-test.yml up -d - wait-on http://localhost:7474 - - docker-compose -f docker-compose.yml -f docker-compose.build-and-test.yml exec neo4j db_setup + - docker-compose -f docker-compose.yml -f docker-compose.build-and-test.yml exec backend yarn run db:migrate init script: - export CYPRESS_RETRIES=1 diff --git a/backend/README.md b/backend/README.md index 5474c30d7..c42c5ac85 100644 --- a/backend/README.md +++ b/backend/README.md @@ -61,7 +61,7 @@ backend is running: {% tabs %} {% tab title="Docker" %} ```bash -docker-compose exec backend yarn run db:setup +docker-compose exec backend yarn run db:migrate init ``` {% endtab %} @@ -69,7 +69,7 @@ docker-compose exec backend yarn run db:setup ```bash # in folder backend/ # make sure your database is running on http://localhost:7474/browser/ -yarn run db:setup +yarn run db:migrate init ``` {% endtab %} {% endtabs %} @@ -94,7 +94,7 @@ $ docker-compose exec backend yarn run db:reset # you could also wipe out your neo4j database and delete all volumes with: $ docker-compose down -v # if container is not running, run this command to set up your database indeces and contstraints -$ docker-compose run neo4j db_setup +$ docker-compose run backend yarn run db:migrate init ``` {% endtab %} diff --git a/backend/package.json b/backend/package.json index bbdf951ad..3c9fda287 100644 --- a/backend/package.json +++ b/backend/package.json @@ -10,9 +10,9 @@ "dev:debug": "nodemon --exec babel-node --inspect=0.0.0.0:9229 src/ -e js,gql", "lint": "eslint src --config .eslintrc.js", "test": "jest --forceExit --detectOpenHandles --runInBand", - "db:reset": "babel-node src/seed/reset-db.js", - "db:seed": "babel-node src/seed/seed-db.js", - "db:setup": "babel-node src/db/setup.js", + "db:clean": "babel-node src/db/clean.js", + "db:reset": "yarn run db:clean", + "db:seed": "babel-node src/db/seed.js", "__migrate": "migrate --compiler 'js:@babel/register' --migrations-dir ./src/db/migrations", "db:migrate": "yarn run __migrate --store ./src/db/migrate/store.js", "db:migrate:create": "yarn run __migrate --template-file ./src/db/migrate/template.js create", diff --git a/backend/src/activitypub/routes/webfinger.spec.js b/backend/src/activitypub/routes/webfinger.spec.js index 4e9b2196d..06ca4577d 100644 --- a/backend/src/activitypub/routes/webfinger.spec.js +++ b/backend/src/activitypub/routes/webfinger.spec.js @@ -1,6 +1,6 @@ import { handler } from './webfinger' -import Factory from '../../seed/factories' -import { getDriver } from '../../bootstrap/neo4j' +import Factory from '../../factories' +import { getDriver } from '../../db/neo4j' let resource, res, json, status, contentType diff --git a/backend/src/seed/reset-db.js b/backend/src/db/clean.js similarity index 91% rename from backend/src/seed/reset-db.js rename to backend/src/db/clean.js index 125d135d8..cbb1412e2 100644 --- a/backend/src/seed/reset-db.js +++ b/backend/src/db/clean.js @@ -1,4 +1,4 @@ -import { cleanDatabase } from './factories' +import { cleanDatabase } from '../factories' if (process.env.NODE_ENV === 'production') { throw new Error(`You cannot clean the database in production environment!`) diff --git a/backend/src/db/migrate/store.js b/backend/src/db/migrate/store.js index 68bf4e8d9..9984b3971 100644 --- a/backend/src/db/migrate/store.js +++ b/backend/src/db/migrate/store.js @@ -1,6 +1,14 @@ -import { getDriver } from '../../bootstrap/neo4j' +import { getDriver, getNeode } from '../../db/neo4j' class Store { + async init(fn) { + const neode = getNeode() + await getNeode().schema.install() + // eslint-disable-next-line no-console + console.log('Successfully created database indices and constraints!') + neode.driver.close() + } + async load(fn) { const driver = getDriver() const session = driver.session() diff --git a/backend/src/db/migrations/1579387929122-merge_duplicate_user_accounts.js b/backend/src/db/migrations/1579387929122-merge_duplicate_user_accounts.js index 7d2abcdeb..9dbc8ad05 100644 --- a/backend/src/db/migrations/1579387929122-merge_duplicate_user_accounts.js +++ b/backend/src/db/migrations/1579387929122-merge_duplicate_user_accounts.js @@ -1,8 +1,7 @@ -import { throwError, of, concat } from 'rxjs' -import { tap, flatMap, mergeMap, map, catchError, filter } from 'rxjs/operators' -import CONFIG from '../../src/config' -import { getNeode, getDriver } from '../../src/bootstrap/neo4j' -import normalizeEmail from '../../src/schema/resolvers//helpers/normalizeEmail' +import { throwError, concat } from 'rxjs' +import { flatMap, mergeMap, map, catchError, filter } from 'rxjs/operators' +import { getDriver } from '../neo4j' +import normalizeEmail from '../../schema/resolvers//helpers/normalizeEmail' export const description = ` This migration merges duplicate :User and :EmailAddress nodes. It became @@ -13,7 +12,7 @@ export const description = ` This led to about 40 duplicate user and email address nodes in our database. ` -export function up (next) { +export function up(next) { const driver = getDriver() const rxSession = driver.rxSession() rxSession @@ -22,18 +21,19 @@ export function up (next) { flatMap(txc => concat( txc - .run("MATCH (email:EmailAddress) RETURN email {.email}") - .records() - .pipe( - map(record => { - const { email } = record.get('email') - const normalizedEmail = normalizeEmail(email) - return { email, normalizedEmail } - }), - filter(({email, normalizedEmail}) => email !== normalizedEmail), - mergeMap(({email, normalizedEmail})=> { - return txc - .run(` + .run('MATCH (email:EmailAddress) RETURN email {.email}') + .records() + .pipe( + map(record => { + const { email } = record.get('email') + const normalizedEmail = normalizeEmail(email) + return { email, normalizedEmail } + }), + filter(({ email, normalizedEmail }) => email !== normalizedEmail), + mergeMap(({ email, normalizedEmail }) => { + return txc + .run( + ` MATCH (oldUser:User)-[:PRIMARY_EMAIL]->(oldEmail:EmailAddress {email: $email}), (oldUser)-[previousRelationship]-(oldEmail) MATCH (user:User)-[:PRIMARY_EMAIL]->(email:EmailAddress {email: $normalizedEmail}) DELETE previousRelationship @@ -41,37 +41,44 @@ export function up (next) { CALL apoc.refactor.mergeNodes([user, oldUser], { properties: 'discard', mergeRels: true }) YIELD node as mergedUser CALL apoc.refactor.mergeNodes([email, oldEmail], { properties: 'discard', mergeRels: true }) YIELD node as mergedEmail RETURN user {.*}, email {.*} - `, { email, normalizedEmail }) - .records() - .pipe( - map(r => ({ - oldEmail: email, - email: r.get('email'), - user: r.get('user'), - })) - ) - }), - ), + `, + { email, normalizedEmail }, + ) + .records() + .pipe( + map(r => ({ + oldEmail: email, + email: r.get('email'), + user: r.get('user'), + })), + ) + }), + ), txc.commit(), - ).pipe(catchError(err => txc.rollback().pipe(throwError(err)))) - ) + ).pipe(catchError(err => txc.rollback().pipe(throwError(err)))), + ), ) .subscribe({ - next: ({ user, email, oldUser, oldEmail }) => console.log(` - Merged: - ============================= - userId: ${user.id} - email: ${oldEmail} => ${email.email} - ============================= - `), + next: ({ user, email, oldUser, oldEmail }) => + // eslint-disable-next-line no-console + console.log(` + Merged: + ============================= + userId: ${user.id} + email: ${oldEmail} => ${email.email} + ============================= + `), complete: () => { + // eslint-disable-next-line no-console console.log('Merging of duplicate users completed') next() }, - error: error => throw new Error(error) + error: error => { + throw new Error(error) + }, }) } -export function down () { - throw new Error("Irreversible migration") +export function down() { + throw new Error('Irreversible migration') } diff --git a/backend/src/bootstrap/neo4j.js b/backend/src/db/neo4j.js similarity index 100% rename from backend/src/bootstrap/neo4j.js rename to backend/src/db/neo4j.js diff --git a/backend/src/seed/seed-db.js b/backend/src/db/seed.js similarity index 99% rename from backend/src/seed/seed-db.js rename to backend/src/db/seed.js index 4178169bb..f3c46b0d4 100644 --- a/backend/src/seed/seed-db.js +++ b/backend/src/db/seed.js @@ -2,8 +2,8 @@ import faker from 'faker' import sample from 'lodash/sample' import { createTestClient } from 'apollo-server-testing' import createServer from '../server' -import Factory from './factories' -import { getNeode, getDriver } from '../bootstrap/neo4j' +import Factory from '../factories' +import { getNeode, getDriver } from '../db/neo4j' import { gql } from '../helpers/jest' const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl'] diff --git a/backend/src/db/setup.js b/backend/src/db/setup.js deleted file mode 100644 index 33667ff1b..000000000 --- a/backend/src/db/setup.js +++ /dev/null @@ -1,7 +0,0 @@ -import { getNeode } from '../bootstrap/neo4j' - -(async() => { - await getNeode().schema.install() - console.log('Schema installed!') - process.exit(0) -})() diff --git a/backend/src/seed/factories/badges.js b/backend/src/factories/badges.js similarity index 100% rename from backend/src/seed/factories/badges.js rename to backend/src/factories/badges.js diff --git a/backend/src/seed/factories/categories.js b/backend/src/factories/categories.js similarity index 100% rename from backend/src/seed/factories/categories.js rename to backend/src/factories/categories.js diff --git a/backend/src/seed/factories/comments.js b/backend/src/factories/comments.js similarity index 100% rename from backend/src/seed/factories/comments.js rename to backend/src/factories/comments.js diff --git a/backend/src/seed/factories/donations.js b/backend/src/factories/donations.js similarity index 100% rename from backend/src/seed/factories/donations.js rename to backend/src/factories/donations.js diff --git a/backend/src/seed/factories/emailAddresses.js b/backend/src/factories/emailAddresses.js similarity index 100% rename from backend/src/seed/factories/emailAddresses.js rename to backend/src/factories/emailAddresses.js diff --git a/backend/src/seed/factories/index.js b/backend/src/factories/index.js similarity index 96% rename from backend/src/seed/factories/index.js rename to backend/src/factories/index.js index ff6a52a76..c3ab14f64 100644 --- a/backend/src/seed/factories/index.js +++ b/backend/src/factories/index.js @@ -1,4 +1,4 @@ -import { getDriver, getNeode } from '../../bootstrap/neo4j' +import { getDriver, getNeode } from '../db/neo4j' const factories = { Badge: require('./badges.js').default, diff --git a/backend/src/seed/factories/locations.js b/backend/src/factories/locations.js similarity index 100% rename from backend/src/seed/factories/locations.js rename to backend/src/factories/locations.js diff --git a/backend/src/seed/factories/posts.js b/backend/src/factories/posts.js similarity index 100% rename from backend/src/seed/factories/posts.js rename to backend/src/factories/posts.js diff --git a/backend/src/seed/factories/reports.js b/backend/src/factories/reports.js similarity index 100% rename from backend/src/seed/factories/reports.js rename to backend/src/factories/reports.js diff --git a/backend/src/seed/factories/socialMedia.js b/backend/src/factories/socialMedia.js similarity index 100% rename from backend/src/seed/factories/socialMedia.js rename to backend/src/factories/socialMedia.js diff --git a/backend/src/seed/factories/tags.js b/backend/src/factories/tags.js similarity index 100% rename from backend/src/seed/factories/tags.js rename to backend/src/factories/tags.js diff --git a/backend/src/seed/factories/unverifiedEmailAddresses.js b/backend/src/factories/unverifiedEmailAddresses.js similarity index 100% rename from backend/src/seed/factories/unverifiedEmailAddresses.js rename to backend/src/factories/unverifiedEmailAddresses.js diff --git a/backend/src/seed/factories/users.js b/backend/src/factories/users.js similarity index 95% rename from backend/src/seed/factories/users.js rename to backend/src/factories/users.js index d56c42d0a..57f69b76b 100644 --- a/backend/src/seed/factories/users.js +++ b/backend/src/factories/users.js @@ -1,6 +1,6 @@ import faker from 'faker' import uuid from 'uuid/v4' -import encryptPassword from '../../helpers/encryptPassword' +import encryptPassword from '../helpers/encryptPassword' import slugify from 'slug' export default function create() { diff --git a/backend/src/jest/helpers.js b/backend/src/jest/helpers.js deleted file mode 100644 index 201d68c14..000000000 --- a/backend/src/jest/helpers.js +++ /dev/null @@ -1,5 +0,0 @@ -//* This is a fake ES2015 template string, just to benefit of syntax -// highlighting of `gql` template strings in certain editors. -export function gql(strings) { - return strings.join('') -} diff --git a/backend/src/jwt/decode.spec.js b/backend/src/jwt/decode.spec.js index 7aa703d97..71444a3e5 100644 --- a/backend/src/jwt/decode.spec.js +++ b/backend/src/jwt/decode.spec.js @@ -1,5 +1,5 @@ -import Factory from '../seed/factories/index' -import { getDriver, getNeode } from '../bootstrap/neo4j' +import Factory from '../factories/index' +import { getDriver, getNeode } from '../db/neo4j' import decode from './decode' const factory = Factory() diff --git a/backend/src/middleware/hashtags/hashtagsMiddleware.spec.js b/backend/src/middleware/hashtags/hashtagsMiddleware.spec.js index 0fa1e2dc5..2247e692d 100644 --- a/backend/src/middleware/hashtags/hashtagsMiddleware.spec.js +++ b/backend/src/middleware/hashtags/hashtagsMiddleware.spec.js @@ -1,7 +1,7 @@ import { gql } from '../../helpers/jest' -import Factory from '../../seed/factories' +import Factory from '../../factories' import { createTestClient } from 'apollo-server-testing' -import { getNeode, getDriver } from '../../bootstrap/neo4j' +import { getNeode, getDriver } from '../../db/neo4j' import createServer from '../../server' let server diff --git a/backend/src/middleware/notifications/notificationsMiddleware.spec.js b/backend/src/middleware/notifications/notificationsMiddleware.spec.js index c5f5990d3..136388b88 100644 --- a/backend/src/middleware/notifications/notificationsMiddleware.spec.js +++ b/backend/src/middleware/notifications/notificationsMiddleware.spec.js @@ -1,7 +1,7 @@ import { gql } from '../../helpers/jest' -import Factory from '../../seed/factories' +import Factory from '../../factories' import { createTestClient } from 'apollo-server-testing' -import { getNeode, getDriver } from '../../bootstrap/neo4j' +import { getNeode, getDriver } from '../../db/neo4j' import createServer from '../../server' let server, query, mutate, notifiedUser, authenticatedUser diff --git a/backend/src/middleware/orderByMiddleware.spec.js b/backend/src/middleware/orderByMiddleware.spec.js index 129f3a8b4..8d92a5b5d 100644 --- a/backend/src/middleware/orderByMiddleware.spec.js +++ b/backend/src/middleware/orderByMiddleware.spec.js @@ -1,6 +1,6 @@ import { gql } from '../helpers/jest' -import Factory from '../seed/factories' -import { getNeode, getDriver } from '../bootstrap/neo4j' +import Factory from '../factories' +import { getNeode, getDriver } from '../db/neo4j' import { createTestClient } from 'apollo-server-testing' import createServer from '../server' diff --git a/backend/src/middleware/permissionsMiddleware.js b/backend/src/middleware/permissionsMiddleware.js index a4c41871f..3e5bbd6e9 100644 --- a/backend/src/middleware/permissionsMiddleware.js +++ b/backend/src/middleware/permissionsMiddleware.js @@ -1,5 +1,5 @@ import { rule, shield, deny, allow, or } from 'graphql-shield' -import { getNeode } from '../bootstrap/neo4j' +import { getNeode } from '../db/neo4j' import CONFIG from '../config' const debug = !!CONFIG.DEBUG diff --git a/backend/src/middleware/permissionsMiddleware.spec.js b/backend/src/middleware/permissionsMiddleware.spec.js index 60aff961d..a4f13ea0c 100644 --- a/backend/src/middleware/permissionsMiddleware.spec.js +++ b/backend/src/middleware/permissionsMiddleware.spec.js @@ -1,8 +1,8 @@ import { createTestClient } from 'apollo-server-testing' import createServer from '../server' -import Factory from '../seed/factories' +import Factory from '../factories' import { gql } from '../helpers/jest' -import { getDriver, getNeode } from '../bootstrap/neo4j' +import { getDriver, getNeode } from '../db/neo4j' const factory = Factory() const instance = getNeode() diff --git a/backend/src/middleware/slugifyMiddleware.spec.js b/backend/src/middleware/slugifyMiddleware.spec.js index 1c2e59317..cf9f0941c 100644 --- a/backend/src/middleware/slugifyMiddleware.spec.js +++ b/backend/src/middleware/slugifyMiddleware.spec.js @@ -1,6 +1,6 @@ -import Factory from '../seed/factories' +import Factory from '../factories' import { gql } from '../helpers/jest' -import { getNeode, getDriver } from '../bootstrap/neo4j' +import { getNeode, getDriver } from '../db/neo4j' import createServer from '../server' import { createTestClient } from 'apollo-server-testing' diff --git a/backend/src/middleware/softDelete/softDeleteMiddleware.spec.js b/backend/src/middleware/softDelete/softDeleteMiddleware.spec.js index b7c16dfd3..6e1735af2 100644 --- a/backend/src/middleware/softDelete/softDeleteMiddleware.spec.js +++ b/backend/src/middleware/softDelete/softDeleteMiddleware.spec.js @@ -1,6 +1,6 @@ -import Factory from '../../seed/factories' +import Factory from '../../factories' import { gql } from '../../helpers/jest' -import { getNeode, getDriver } from '../../bootstrap/neo4j' +import { getNeode, getDriver } from '../../db/neo4j' import createServer from '../../server' import { createTestClient } from 'apollo-server-testing' diff --git a/backend/src/middleware/validation/validationMiddleware.spec.js b/backend/src/middleware/validation/validationMiddleware.spec.js index d093f939a..38cd010b4 100644 --- a/backend/src/middleware/validation/validationMiddleware.spec.js +++ b/backend/src/middleware/validation/validationMiddleware.spec.js @@ -1,6 +1,6 @@ import { gql } from '../../helpers/jest' -import Factory from '../../seed/factories' -import { getNeode, getDriver } from '../../bootstrap/neo4j' +import Factory from '../../factories' +import { getNeode, getDriver } from '../../db/neo4j' import { createTestClient } from 'apollo-server-testing' import createServer from '../../server' diff --git a/backend/src/models/User.spec.js b/backend/src/models/User.spec.js index 433cc5a6f..7bdde7014 100644 --- a/backend/src/models/User.spec.js +++ b/backend/src/models/User.spec.js @@ -1,5 +1,5 @@ -import Factory from '../seed/factories' -import { getNeode } from '../bootstrap/neo4j' +import Factory from '../factories' +import { getNeode } from '../db/neo4j' const factory = Factory() const neode = getNeode() diff --git a/backend/src/schema/resolvers/comments.spec.js b/backend/src/schema/resolvers/comments.spec.js index f96a60514..9877161db 100644 --- a/backend/src/schema/resolvers/comments.spec.js +++ b/backend/src/schema/resolvers/comments.spec.js @@ -1,8 +1,8 @@ -import Factory from '../../seed/factories' +import Factory from '../../factories' import { gql } from '../../helpers/jest' import { createTestClient } from 'apollo-server-testing' import createServer from '../../server' -import { getNeode, getDriver } from '../../bootstrap/neo4j' +import { getNeode, getDriver } from '../../db/neo4j' const driver = getDriver() const neode = getNeode() diff --git a/backend/src/schema/resolvers/donations.spec.js b/backend/src/schema/resolvers/donations.spec.js index d8dd5db06..c382eb475 100644 --- a/backend/src/schema/resolvers/donations.spec.js +++ b/backend/src/schema/resolvers/donations.spec.js @@ -1,7 +1,7 @@ import { createTestClient } from 'apollo-server-testing' -import Factory from '../../seed/factories' +import Factory from '../../factories' import { gql } from '../../helpers/jest' -import { getNeode, getDriver } from '../../bootstrap/neo4j' +import { getNeode, getDriver } from '../../db/neo4j' import createServer from '../../server' let mutate, query, authenticatedUser, variables diff --git a/backend/src/schema/resolvers/emails.spec.js b/backend/src/schema/resolvers/emails.spec.js index 82ce43337..97a1f0c29 100644 --- a/backend/src/schema/resolvers/emails.spec.js +++ b/backend/src/schema/resolvers/emails.spec.js @@ -1,6 +1,6 @@ -import Factory from '../../seed/factories' +import Factory from '../../factories' import { gql } from '../../helpers/jest' -import { getDriver, getNeode } from '../../bootstrap/neo4j' +import { getDriver, getNeode } from '../../db/neo4j' import createServer from '../../server' import { createTestClient } from 'apollo-server-testing' diff --git a/backend/src/schema/resolvers/follow.js b/backend/src/schema/resolvers/follow.js index 0416fe3d2..80cce8400 100644 --- a/backend/src/schema/resolvers/follow.js +++ b/backend/src/schema/resolvers/follow.js @@ -1,4 +1,4 @@ -import { getNeode } from '../../bootstrap/neo4j' +import { getNeode } from '../../db/neo4j' const neode = getNeode() diff --git a/backend/src/schema/resolvers/follow.spec.js b/backend/src/schema/resolvers/follow.spec.js index ff884666e..ad836a461 100644 --- a/backend/src/schema/resolvers/follow.spec.js +++ b/backend/src/schema/resolvers/follow.spec.js @@ -1,6 +1,6 @@ import { createTestClient } from 'apollo-server-testing' -import Factory from '../../seed/factories' -import { getDriver, getNeode } from '../../bootstrap/neo4j' +import Factory from '../../factories' +import { getDriver, getNeode } from '../../db/neo4j' import createServer from '../../server' import { gql } from '../../helpers/jest' diff --git a/backend/src/schema/resolvers/locations.spec.js b/backend/src/schema/resolvers/locations.spec.js index f4a846afd..aba11f9bc 100644 --- a/backend/src/schema/resolvers/locations.spec.js +++ b/backend/src/schema/resolvers/locations.spec.js @@ -1,6 +1,6 @@ -import Factory from '../../seed/factories' +import Factory from '../../factories' import { gql } from '../../helpers/jest' -import { getNeode, getDriver } from '../../bootstrap/neo4j' +import { getNeode, getDriver } from '../../db/neo4j' import createServer from '../../server' import { createTestClient } from 'apollo-server-testing' diff --git a/backend/src/schema/resolvers/moderation.spec.js b/backend/src/schema/resolvers/moderation.spec.js index f76cbdf46..cd502be75 100644 --- a/backend/src/schema/resolvers/moderation.spec.js +++ b/backend/src/schema/resolvers/moderation.spec.js @@ -1,7 +1,7 @@ import { createTestClient } from 'apollo-server-testing' -import Factory from '../../seed/factories' +import Factory from '../../factories' import { gql } from '../../helpers/jest' -import { getNeode, getDriver } from '../../bootstrap/neo4j' +import { getNeode, getDriver } from '../../db/neo4j' import createServer from '../../server' const factory = Factory() diff --git a/backend/src/schema/resolvers/notifications.spec.js b/backend/src/schema/resolvers/notifications.spec.js index 89bbd2528..a5c46e930 100644 --- a/backend/src/schema/resolvers/notifications.spec.js +++ b/backend/src/schema/resolvers/notifications.spec.js @@ -1,6 +1,6 @@ -import Factory from '../../seed/factories' +import Factory from '../../factories' import { gql } from '../../helpers/jest' -import { getDriver } from '../../bootstrap/neo4j' +import { getDriver } from '../../db/neo4j' import { createTestClient } from 'apollo-server-testing' import createServer from '../.././server' diff --git a/backend/src/schema/resolvers/passwordReset.spec.js b/backend/src/schema/resolvers/passwordReset.spec.js index be3c8c085..d7b3a0157 100644 --- a/backend/src/schema/resolvers/passwordReset.spec.js +++ b/backend/src/schema/resolvers/passwordReset.spec.js @@ -1,6 +1,6 @@ -import Factory from '../../seed/factories' +import Factory from '../../factories' import { gql } from '../../helpers/jest' -import { getNeode, getDriver } from '../../bootstrap/neo4j' +import { getNeode, getDriver } from '../../db/neo4j' import createPasswordReset from './helpers/createPasswordReset' import createServer from '../../server' import { createTestClient } from 'apollo-server-testing' diff --git a/backend/src/schema/resolvers/posts.spec.js b/backend/src/schema/resolvers/posts.spec.js index dcbd16d5d..71d1aa359 100644 --- a/backend/src/schema/resolvers/posts.spec.js +++ b/backend/src/schema/resolvers/posts.spec.js @@ -1,7 +1,7 @@ import { createTestClient } from 'apollo-server-testing' -import Factory from '../../seed/factories' +import Factory from '../../factories' import { gql } from '../../helpers/jest' -import { getNeode, getDriver } from '../../bootstrap/neo4j' +import { getNeode, getDriver } from '../../db/neo4j' import createServer from '../../server' const driver = getDriver() diff --git a/backend/src/schema/resolvers/registration.js b/backend/src/schema/resolvers/registration.js index e03f294cd..1e7708395 100644 --- a/backend/src/schema/resolvers/registration.js +++ b/backend/src/schema/resolvers/registration.js @@ -1,5 +1,5 @@ import { UserInputError } from 'apollo-server' -import { getNeode } from '../../bootstrap/neo4j' +import { getNeode } from '../../db/neo4j' import fileUpload from './fileUpload' import encryptPassword from '../../helpers/encryptPassword' import generateNonce from './helpers/generateNonce' diff --git a/backend/src/schema/resolvers/registration.spec.js b/backend/src/schema/resolvers/registration.spec.js index 8f3a7ac39..23b1f9d2a 100644 --- a/backend/src/schema/resolvers/registration.spec.js +++ b/backend/src/schema/resolvers/registration.spec.js @@ -1,6 +1,6 @@ -import Factory from '../../seed/factories' +import Factory from '../../factories' import { gql } from '../../helpers/jest' -import { getDriver, getNeode } from '../../bootstrap/neo4j' +import { getDriver, getNeode } from '../../db/neo4j' import createServer from '../../server' import { createTestClient } from 'apollo-server-testing' diff --git a/backend/src/schema/resolvers/reports.spec.js b/backend/src/schema/resolvers/reports.spec.js index 8b1bb925d..7f827b111 100644 --- a/backend/src/schema/resolvers/reports.spec.js +++ b/backend/src/schema/resolvers/reports.spec.js @@ -1,8 +1,8 @@ import { createTestClient } from 'apollo-server-testing' import createServer from '../.././server' -import Factory from '../../seed/factories' +import Factory from '../../factories' import { gql } from '../../helpers/jest' -import { getDriver, getNeode } from '../../bootstrap/neo4j' +import { getDriver, getNeode } from '../../db/neo4j' const factory = Factory() const instance = getNeode() diff --git a/backend/src/schema/resolvers/rewards.js b/backend/src/schema/resolvers/rewards.js index 44bdab770..311cfd2e6 100644 --- a/backend/src/schema/resolvers/rewards.js +++ b/backend/src/schema/resolvers/rewards.js @@ -1,4 +1,4 @@ -import { getNeode } from '../../bootstrap/neo4j' +import { getNeode } from '../../db/neo4j' import { UserInputError } from 'apollo-server' const neode = getNeode() diff --git a/backend/src/schema/resolvers/rewards.spec.js b/backend/src/schema/resolvers/rewards.spec.js index e6f67ecab..fe2807f25 100644 --- a/backend/src/schema/resolvers/rewards.spec.js +++ b/backend/src/schema/resolvers/rewards.spec.js @@ -1,7 +1,7 @@ import { createTestClient } from 'apollo-server-testing' -import Factory from '../../seed/factories' +import Factory from '../../factories' import { gql } from '../../helpers/jest' -import { getNeode, getDriver } from '../../bootstrap/neo4j' +import { getNeode, getDriver } from '../../db/neo4j' import createServer from '../../server' const factory = Factory() diff --git a/backend/src/schema/resolvers/shout.spec.js b/backend/src/schema/resolvers/shout.spec.js index e747946aa..104a28399 100644 --- a/backend/src/schema/resolvers/shout.spec.js +++ b/backend/src/schema/resolvers/shout.spec.js @@ -1,7 +1,7 @@ import { createTestClient } from 'apollo-server-testing' -import Factory from '../../seed/factories' +import Factory from '../../factories' import { gql } from '../../helpers/jest' -import { getNeode, getDriver } from '../../bootstrap/neo4j' +import { getNeode, getDriver } from '../../db/neo4j' import createServer from '../../server' let mutate, query, authenticatedUser, variables diff --git a/backend/src/schema/resolvers/socialMedia.js b/backend/src/schema/resolvers/socialMedia.js index c206778e5..c5b9dcd91 100644 --- a/backend/src/schema/resolvers/socialMedia.js +++ b/backend/src/schema/resolvers/socialMedia.js @@ -1,4 +1,4 @@ -import { getNeode } from '../../bootstrap/neo4j' +import { getNeode } from '../../db/neo4j' import Resolver from './helpers/Resolver' const neode = getNeode() diff --git a/backend/src/schema/resolvers/socialMedia.spec.js b/backend/src/schema/resolvers/socialMedia.spec.js index 8f6d91d43..f292b58a0 100644 --- a/backend/src/schema/resolvers/socialMedia.spec.js +++ b/backend/src/schema/resolvers/socialMedia.spec.js @@ -1,8 +1,8 @@ import { createTestClient } from 'apollo-server-testing' import createServer from '../../server' -import Factory from '../../seed/factories' +import Factory from '../../factories' import { gql } from '../../helpers/jest' -import { getNeode, getDriver } from '../../bootstrap/neo4j' +import { getNeode, getDriver } from '../../db/neo4j' const driver = getDriver() const factory = Factory() diff --git a/backend/src/schema/resolvers/statistics.spec.js b/backend/src/schema/resolvers/statistics.spec.js index 48baf00cd..e2b9dafe4 100644 --- a/backend/src/schema/resolvers/statistics.spec.js +++ b/backend/src/schema/resolvers/statistics.spec.js @@ -1,7 +1,7 @@ import { createTestClient } from 'apollo-server-testing' -import Factory from '../../seed/factories' +import Factory from '../../factories' import { gql } from '../../helpers/jest' -import { getNeode, getDriver } from '../../bootstrap/neo4j' +import { getNeode, getDriver } from '../../db/neo4j' import createServer from '../../server' let query, authenticatedUser diff --git a/backend/src/schema/resolvers/user_management.js b/backend/src/schema/resolvers/user_management.js index 4d035d9fa..4d40a6f63 100644 --- a/backend/src/schema/resolvers/user_management.js +++ b/backend/src/schema/resolvers/user_management.js @@ -1,7 +1,7 @@ import encode from '../../jwt/encode' import bcrypt from 'bcryptjs' import { AuthenticationError } from 'apollo-server' -import { getNeode } from '../../bootstrap/neo4j' +import { getNeode } from '../../db/neo4j' import normalizeEmail from './helpers/normalizeEmail' import log from './helpers/databaseLogger' diff --git a/backend/src/schema/resolvers/user_management.spec.js b/backend/src/schema/resolvers/user_management.spec.js index 3527e5dc2..5e7043e74 100644 --- a/backend/src/schema/resolvers/user_management.spec.js +++ b/backend/src/schema/resolvers/user_management.spec.js @@ -1,11 +1,11 @@ import jwt from 'jsonwebtoken' import CONFIG from './../../config' -import Factory from '../../seed/factories' +import Factory from '../../factories' import { gql } from '../../helpers/jest' import { createTestClient } from 'apollo-server-testing' import createServer, { context } from '../../server' import encode from '../../jwt/encode' -import { getNeode } from '../../bootstrap/neo4j' +import { getNeode } from '../../db/neo4j' const factory = Factory() const neode = getNeode() diff --git a/backend/src/schema/resolvers/users.js b/backend/src/schema/resolvers/users.js index 0b3f13631..6183511f1 100644 --- a/backend/src/schema/resolvers/users.js +++ b/backend/src/schema/resolvers/users.js @@ -1,6 +1,6 @@ import { neo4jgraphql } from 'neo4j-graphql-js' import fileUpload from './fileUpload' -import { getNeode } from '../../bootstrap/neo4j' +import { getNeode } from '../../db/neo4j' import { UserInputError, ForbiddenError } from 'apollo-server' import Resolver from './helpers/Resolver' import log from './helpers/databaseLogger' diff --git a/backend/src/schema/resolvers/users.spec.js b/backend/src/schema/resolvers/users.spec.js index 5d1ebd8e2..cfd84fcf7 100644 --- a/backend/src/schema/resolvers/users.spec.js +++ b/backend/src/schema/resolvers/users.spec.js @@ -1,6 +1,6 @@ -import Factory from '../../seed/factories' +import Factory from '../../factories' import { gql } from '../../helpers/jest' -import { getNeode, getDriver } from '../../bootstrap/neo4j' +import { getNeode, getDriver } from '../../db/neo4j' import createServer from '../../server' import { createTestClient } from 'apollo-server-testing' diff --git a/backend/src/schema/resolvers/users/blockedUsers.spec.js b/backend/src/schema/resolvers/users/blockedUsers.spec.js index 11bcb823d..bec8b59d0 100644 --- a/backend/src/schema/resolvers/users/blockedUsers.spec.js +++ b/backend/src/schema/resolvers/users/blockedUsers.spec.js @@ -1,8 +1,8 @@ import { createTestClient } from 'apollo-server-testing' import createServer from '../../../server' -import Factory from '../../../seed/factories' +import Factory from '../../../factories' import { gql } from '../../../helpers/jest' -import { getNeode, getDriver } from '../../../bootstrap/neo4j' +import { getNeode, getDriver } from '../../../db/neo4j' const driver = getDriver() const factory = Factory() diff --git a/backend/src/schema/resolvers/users/location.spec.js b/backend/src/schema/resolvers/users/location.spec.js index 59d093afb..f7315174c 100644 --- a/backend/src/schema/resolvers/users/location.spec.js +++ b/backend/src/schema/resolvers/users/location.spec.js @@ -1,6 +1,6 @@ import { gql } from '../../../helpers/jest' -import Factory from '../../../seed/factories' -import { getNeode, getDriver } from '../../../bootstrap/neo4j' +import Factory from '../../../factories' +import { getNeode, getDriver } from '../../../db/neo4j' import { createTestClient } from 'apollo-server-testing' import createServer from '../../../server' diff --git a/backend/src/seed/seed-helpers.js b/backend/src/seed/seed-helpers.js deleted file mode 100644 index 913ca1d54..000000000 --- a/backend/src/seed/seed-helpers.js +++ /dev/null @@ -1,134 +0,0 @@ -const _ = require('lodash') -const faker = require('faker') -const unsplashTopics = [ - 'love', - 'family', - 'spring', - 'business', - 'nature', - 'travel', - 'happy', - 'landscape', - 'health', - 'friends', - 'computer', - 'autumn', - 'space', - 'animal', - 'smile', - 'face', - 'people', - 'portrait', - 'amazing', -] -let unsplashTopicsTmp = [] - -const ngoLogos = [ - 'http://www.fetchlogos.com/wp-content/uploads/2015/11/Girl-Scouts-Of-The-Usa-Logo.jpg', - 'http://logos.textgiraffe.com/logos/logo-name/Ngo-designstyle-friday-m.png', - 'http://seeklogo.com/images/N/ngo-logo-BD53A3E024-seeklogo.com.png', - 'https://dcassetcdn.com/design_img/10133/25833/25833_303600_10133_image.jpg', - 'https://cdn.tutsplus.com/vector/uploads/legacy/articles/08bad_ngologos/20.jpg', - 'https://cdn.tutsplus.com/vector/uploads/legacy/articles/08bad_ngologos/33.jpg', - null, -] - -const difficulties = ['easy', 'medium', 'hard'] - -export default { - randomItem: (items, filter) => { - const ids = filter - ? Object.keys(items).filter(id => { - return filter(items[id]) - }) - : _.keys(items) - const randomIds = _.shuffle(ids) - return items[randomIds.pop()] - }, - randomItems: (items, key = 'id', min = 1, max = 1) => { - const randomIds = _.shuffle(_.keys(items)) - const res = [] - - const count = _.random(min, max) - - for (let i = 0; i < count; i++) { - let r = items[randomIds.pop()][key] - if (key === 'id') { - r = r.toString() - } - res.push(r) - } - return res - }, - random: items => { - return _.shuffle(items).pop() - }, - randomDifficulty: () => { - return _.shuffle(difficulties).pop() - }, - randomLogo: () => { - return _.shuffle(ngoLogos).pop() - }, - randomUnsplashUrl: () => { - if (Math.random() < 0.6) { - // do not attach images in 60 percent of the cases (faster seeding) - return - } - if (unsplashTopicsTmp.length < 2) { - unsplashTopicsTmp = _.shuffle(unsplashTopics) - } - return ( - 'https://source.unsplash.com/daily?' + unsplashTopicsTmp.pop() + ',' + unsplashTopicsTmp.pop() - ) - }, - randomCategories: (seederstore, allowEmpty = false) => { - let count = Math.round(Math.random() * 3) - if (allowEmpty === false && count === 0) { - count = 1 - } - const categorieIds = _.shuffle(_.keys(seederstore.categories)) - const ids = [] - for (let i = 0; i < count; i++) { - ids.push(categorieIds.pop()) - } - return ids - }, - randomAddresses: () => { - const count = Math.round(Math.random() * 3) - const addresses = [] - for (let i = 0; i < count; i++) { - addresses.push({ - city: faker.address.city(), - zipCode: faker.address.zipCode(), - street: faker.address.streetAddress(), - country: faker.address.countryCode(), - lat: 54.032726 - Math.random() * 10, - lng: 6.558838 + Math.random() * 10, - }) - } - return addresses - }, - /** - * Get array of ids from the given seederstore items after mapping them by the key in the values - * - * @param items items from the seederstore - * @param values values for which you need the ids - * @param key the field key that is represented in the values (slug, name, etc.) - */ - mapIdsByKey: (items, values, key) => { - const res = [] - values.forEach(value => { - res.push(_.find(items, [key, value]).id.toString()) - }) - return res - }, - genInviteCode: () => { - const chars = '23456789abcdefghkmnpqrstuvwxyzABCDEFGHJKLMNPRSTUVWXYZ' - let code = '' - for (let i = 0; i < 8; i++) { - const n = _.random(0, chars.length - 1) - code += chars.substr(n, 1) - } - return code - }, -} diff --git a/backend/src/server.js b/backend/src/server.js index bd9973a39..02e166b71 100644 --- a/backend/src/server.js +++ b/backend/src/server.js @@ -3,7 +3,7 @@ import helmet from 'helmet' import { ApolloServer } from 'apollo-server-express' import CONFIG from './config' import middleware from './middleware' -import { getNeode, getDriver } from './bootstrap/neo4j' +import { getNeode, getDriver } from './db/neo4j' import decode from './jwt/decode' import schema from './schema' import webfinger from './activitypub/routes/webfinger' diff --git a/backend/test/features/support/steps.js b/backend/test/features/support/steps.js index 73d059348..70802f4e2 100644 --- a/backend/test/features/support/steps.js +++ b/backend/test/features/support/steps.js @@ -3,7 +3,7 @@ import { Given, When, Then, AfterAll } from 'cucumber' import { expect } from 'chai' // import { client } from '../../../src/activitypub/apollo-client' import { GraphQLClient } from 'graphql-request' -import Factory from '../../../src/seed/factories' +import Factory from '../../../src/factories' const debug = require('debug')('ea:test:steps') const factory = Factory() diff --git a/cypress/support/factories.js b/cypress/support/factories.js index e0b6210d8..1b76a1a01 100644 --- a/cypress/support/factories.js +++ b/cypress/support/factories.js @@ -1,5 +1,5 @@ -import Factory from '../../backend/src/seed/factories' -import { getDriver, getNeode } from '../../backend/src/bootstrap/neo4j' +import Factory from '../../backend/src/factories' +import { getDriver, getNeode } from '../../backend/src/db/neo4j' const neo4jConfigs = { uri: Cypress.env('NEO4J_URI'), diff --git a/features/support/steps.js b/features/support/steps.js index 923dc9766..71f493834 100644 --- a/features/support/steps.js +++ b/features/support/steps.js @@ -1,6 +1,6 @@ // features/support/steps.js import { Given, When, Then, After, AfterAll } from 'cucumber' -import Factory from '../../backend/src/seed/factories' +import Factory from '../../backend/src/factories' import dotenv from 'dotenv' import expect from 'expect' From ce664040c60dfb0fa4d84cb457c3be74ddcf58b5 Mon Sep 17 00:00:00 2001 From: roschaefer Date: Sun, 19 Jan 2020 17:51:27 +0100 Subject: [PATCH 05/67] docs(backend): How to create & run data migrations --- backend/README.md | 32 +++++++++++ neo4j/README.md | 14 ----- ...ge_disabled_relationship_to_report_node.sh | 55 ------------------- .../db_manipulation/add_image_aspect_ratio.sh | 22 -------- ...ge_disabled_relationship_to_report_node.sh | 51 ----------------- 5 files changed, 32 insertions(+), 142 deletions(-) delete mode 100755 neo4j/change_disabled_relationship_to_report_node.sh delete mode 100755 neo4j/db_manipulation/add_image_aspect_ratio.sh delete mode 100755 neo4j/db_manipulation/change_disabled_relationship_to_report_node.sh diff --git a/backend/README.md b/backend/README.md index c42c5ac85..7fd49faf8 100644 --- a/backend/README.md +++ b/backend/README.md @@ -111,6 +111,38 @@ $ yarn run db:reset {% endtab %} {% endtabs %} +### Data migrations + +Although Neo4J is schema-less,you might find yourself in a situation in which +you have to migrate your data e.g. because your data modeling has changed. + +{% tabs %} +{% tab title="Docker" %} +Generate a data migration file: +```bash +$ docker-compose exec backend yarn run db:migrate:create your_data_migration +# Edit the file in ./src/db/migrations/ +``` + +To run the migration: +```bash +$ docker-compose exec backend yarn run db:migrate up +``` +{% endtab %} +{% tab title="Without Docker" %} +Generate a data migration file: +```bash +$ yarn run db:migrate:create your_data_migration +# Edit the file in ./src/db/migrations/ +``` + +To run the migration: +```bash +$ yarn run db:migrate up +``` +{% endtab %} +{% endtabs %} + # Testing **Beware**: We have no multiple database setup at the moment. We clean the diff --git a/neo4j/README.md b/neo4j/README.md index 5df01cc71..a4242b512 100644 --- a/neo4j/README.md +++ b/neo4j/README.md @@ -36,20 +36,6 @@ Then make sure to allow Apoc procedures by adding the following line to your Neo ``` dbms.security.procedures.unrestricted=apoc.* ``` -### Database Indices and Constraints - -If you have `cypher-shell` available with your local installation of neo4j you -can run: - -```bash -# in folder neo4j/ -$ cp .env.template .env -$ ./db_setup.sh -``` - -Otherwise, if you don't have `cypher-shell` available, copy the cypher -statements [from the `db_setup.sh` script](https://github.com/Human-Connection/Human-Connection/blob/master/neo4j/db_setup.sh) and paste the scripts into your -[database browser frontend](http://localhost:7474). ### Alternatives diff --git a/neo4j/change_disabled_relationship_to_report_node.sh b/neo4j/change_disabled_relationship_to_report_node.sh deleted file mode 100755 index 2f44b8e59..000000000 --- a/neo4j/change_disabled_relationship_to_report_node.sh +++ /dev/null @@ -1,55 +0,0 @@ -#!/usr/bin/env bash - -ENV_FILE=$(dirname "$0")/.env -[[ -f "$ENV_FILE" ]] && source "$ENV_FILE" - -if [ -z "$NEO4J_USERNAME" ] || [ -z "$NEO4J_PASSWORD" ]; then - echo "Please set NEO4J_USERNAME and NEO4J_PASSWORD environment variables." - echo "Database manipulation is not possible without connecting to the database." - echo "E.g. you could \`cp .env.template .env\` unless you run the script in a docker container" -fi - -until echo 'RETURN "Connection successful" as info;' | cypher-shell -do - echo "Connecting to neo4j failed, trying again..." - sleep 1 -done - -echo " -// convert old DISABLED to new REVIEWED-Report-BELONGS_TO structure -MATCH (moderator:User)-[disabled:DISABLED]->(disabledResource) -WHERE disabledResource:User OR disabledResource:Comment OR disabledResource:Post -DELETE disabled -CREATE (moderator)-[review:REVIEWED]->(report:Report)-[:BELONGS_TO]->(disabledResource) -SET review.createdAt = toString(datetime()), review.updatedAt = review.createdAt, review.disable = true -SET report.id = randomUUID(), report.createdAt = toString(datetime()), report.updatedAt = report.createdAt, report.rule = 'latestReviewUpdatedAtRules', report.closed = false - -// if disabledResource has no filed report, then create a moderators default filed report -WITH moderator, disabledResource, report -OPTIONAL MATCH (disabledResourceReporter:User)-[existingFiledReport:FILED]->(disabledResource) -FOREACH(disabledResource IN CASE WHEN existingFiledReport IS NULL THEN [1] ELSE [] END | - CREATE (moderator)-[addModeratorReport:FILED]->(report) - SET addModeratorReport.createdAt = toString(datetime()), addModeratorReport.reasonCategory = 'other', addModeratorReport.reasonDescription = 'Old DISABLED relations didn't enforce mandatory reporting !!! Created automatically to ensure database consistency! Creation date is when the database manipulation happened.' -) -FOREACH(disabledResource IN CASE WHEN existingFiledReport IS NOT NULL THEN [1] ELSE [] END | - CREATE (disabledResourceReporter)-[moveModeratorReport:FILED]->(report) - SET moveModeratorReport = existingFiledReport - DELETE existingFiledReport -) - -RETURN disabledResource {.id}; -" | cypher-shell - -echo " -// for FILED resources without DISABLED relation which are handled above, create new FILED-Report-BELONGS_TO structure -MATCH (reporter:User)-[oldReport:REPORTED]->(notDisabledResource) -WHERE notDisabledResource:User OR notDisabledResource:Comment OR notDisabledResource:Post -MERGE (report:Report)-[:BELONGS_TO]->(notDisabledResource) -ON CREATE SET report.id = randomUUID(), report.createdAt = toString(datetime()), report.updatedAt = report.createdAt, report.rule = 'latestReviewUpdatedAtRules', report.closed = false -CREATE (reporter)-[filed:FILED]->(report) -SET report = oldReport -DELETE oldReport - -RETURN notDisabledResource {.id}; -" | cypher-shell - diff --git a/neo4j/db_manipulation/add_image_aspect_ratio.sh b/neo4j/db_manipulation/add_image_aspect_ratio.sh deleted file mode 100755 index 8e2a16a01..000000000 --- a/neo4j/db_manipulation/add_image_aspect_ratio.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env bash - -if [ -z "$NEO4J_USERNAME" ] || [ -z "$NEO4J_PASSWORD" ]; then - echo "Please set NEO4J_USERNAME and NEO4J_PASSWORD environment variables." - echo "Database manipulation is not possible without connecting to the database." - echo "E.g. you could \`cp .env.template .env\` unless you run the script in a docker container" -fi - -until echo 'RETURN "Connection successful" as info;' | cypher-shell -do - echo "Connecting to neo4j failed, trying again..." - sleep 1 -done - -echo " - CALL apoc.periodic.iterate(' - CALL apoc.load.csv("out.csv") yield map as row return row - ',' - MATCH (post:Post) where post.image = row.image - set post.imageAspectRatio = row.aspectRatio - ', {batchSize:10000, iterateList:true, parallel:true}); -" | cypher-shell diff --git a/neo4j/db_manipulation/change_disabled_relationship_to_report_node.sh b/neo4j/db_manipulation/change_disabled_relationship_to_report_node.sh deleted file mode 100755 index e611382f0..000000000 --- a/neo4j/db_manipulation/change_disabled_relationship_to_report_node.sh +++ /dev/null @@ -1,51 +0,0 @@ -#!/usr/bin/env bash - -ENV_FILE=$(dirname "$0")/.env -[[ -f "$ENV_FILE" ]] && source "$ENV_FILE" - -if [ -z "$NEO4J_USERNAME" ] || [ -z "$NEO4J_PASSWORD" ]; then - echo "Please set NEO4J_USERNAME and NEO4J_PASSWORD environment variables." - echo "Database manipulation is not possible without connecting to the database." - echo "E.g. you could \`cp .env.template .env\` unless you run the script in a docker container" -fi - -until echo 'RETURN "Connection successful" as info;' | cypher-shell -do - echo "Connecting to neo4j failed, trying again..." - sleep 1 -done - -echo " - :begin - MATCH(user)-[reported:REPORTED]->(resource) - WITH reported, resource, COLLECT(user) as users - MERGE(report:Report)-[:BELONGS_TO]->(resource) - SET report.id = randomUUID(), report.createdAt = toString(datetime()), report.updatedAt = report.createdAt, report.rule = 'latestReviewUpdatedAtRules', report.closed = false - WITH report, users, reported - UNWIND users as user - MERGE (user)-[filed:FILED]->(report) - SET filed = reported - DELETE reported; - - MATCH(moderator)-[disabled:DISABLED]->(resource) - MATCH(report:Report)-[:BELONGS_TO]->(resource) - WITH disabled, resource, COLLECT(moderator) as moderators, report - DELETE disabled - WITH report, moderators, disabled - UNWIND moderators as moderator - MERGE (moderator)-[review:REVIEWED {disable: true}]->(report) - SET review.createdAt = toString(datetime()), review.updatedAt = review.createdAt, review.disable = true; - - MATCH(moderator)-[disabled:DISABLED]->(resource) - WITH disabled, resource, COLLECT(moderator) as moderators - MERGE(report:Report)-[:BELONGS_TO]->(resource) - SET report.id = randomUUID(), report.createdAt = toString(datetime()), report.updatedAt = report.createdAt, report.rule = 'latestReviewUpdatedAtRules', report.closed = false - DELETE disabled - WITH report, moderators, disabled - UNWIND moderators as moderator - MERGE(moderator)-[filed:FILED]->(report) - SET filed.createdAt = toString(datetime()), filed.reasonCategory = 'other', filed.reasonDescription = 'Old DISABLED relations didn\'t enforce mandatory reporting !!! Created automatically to ensure database consistency! Creation date is when the database manipulation happened.' - MERGE (moderator)-[review:REVIEWED {disable: true}]->(report) - SET review.createdAt = toString(datetime()), review.updatedAt = review.createdAt, review.disable = true; - :commit -" | cypher-shell \ No newline at end of file From 98a4521ecc36cf44deebb2ba02fbbdf96d53b8c2 Mon Sep 17 00:00:00 2001 From: roschaefer Date: Mon, 20 Jan 2020 11:28:36 +0100 Subject: [PATCH 06/67] Add back missing search constraint --- backend/src/db/migrate/store.js | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/backend/src/db/migrate/store.js b/backend/src/db/migrate/store.js index 9984b3971..b2d65a0f2 100644 --- a/backend/src/db/migrate/store.js +++ b/backend/src/db/migrate/store.js @@ -3,10 +3,27 @@ import { getDriver, getNeode } from '../../db/neo4j' class Store { async init(fn) { const neode = getNeode() - await getNeode().schema.install() + const { driver } = neode + const session = driver.session() // eslint-disable-next-line no-console - console.log('Successfully created database indices and constraints!') - neode.driver.close() + const writeTxResultPromise = session.writeTransaction(async txc => { + await txc.run('CALL apoc.schema.assert({},{},true)') // drop all indices + return Promise.all([ + 'CALL db.index.fulltext.createNodeIndex("post_fulltext_search",["Post"],["title", "content"])', + 'CALL db.index.fulltext.createNodeIndex("user_fulltext_search",["User"],["name", "slug"])' + ].map(statement => txc.run(statement))) + }) + try { + await writeTxResultPromise + await getNeode().schema.install() + console.log('Successfully created database indices and constraints!') + } catch (error) { + console.log(error) // eslint-disable-line no-console + } finally { + session.close() + driver.close() + fn() + } } async load(fn) { From a86b26a756d47629c73adfb0e142f0d3b476dc35 Mon Sep 17 00:00:00 2001 From: roschaefer Date: Mon, 20 Jan 2020 15:22:51 +0100 Subject: [PATCH 07/67] Various fixes for data migrations * Add unique index for `Migration`s * Fix proper use of `next` callback. First argument is potential error. * Update migration template --- backend/package.json | 8 +++--- backend/src/db/migrate/store.js | 28 +++++++++++-------- backend/src/db/migrate/template.js | 28 +++++++++++++++++-- ...387929122-merge_duplicate_user_accounts.js | 6 ++-- backend/src/models/Migration.js | 5 ++++ backend/src/models/index.js | 1 + 6 files changed, 56 insertions(+), 20 deletions(-) create mode 100644 backend/src/models/Migration.js diff --git a/backend/package.json b/backend/package.json index 3c9fda287..b87091a1b 100644 --- a/backend/package.json +++ b/backend/package.json @@ -4,8 +4,10 @@ "description": "GraphQL Backend for Human Connection", "main": "src/index.js", "scripts": { - "build": "babel src/ -d dist/ --copy-files", + "__migrate": "migrate --compiler 'js:@babel/register' --migrations-dir ./src/db/migrations", + "prod:migrate": "migrate --migrations-dir ./dist/db/migrations --store ./dist/db/migrate/store.js", "start": "node dist/", + "build": "babel src/ -d dist/ --copy-files", "dev": "nodemon --exec babel-node src/ -e js,gql", "dev:debug": "nodemon --exec babel-node --inspect=0.0.0.0:9229 src/ -e js,gql", "lint": "eslint src --config .eslintrc.js", @@ -13,10 +15,8 @@ "db:clean": "babel-node src/db/clean.js", "db:reset": "yarn run db:clean", "db:seed": "babel-node src/db/seed.js", - "__migrate": "migrate --compiler 'js:@babel/register' --migrations-dir ./src/db/migrations", "db:migrate": "yarn run __migrate --store ./src/db/migrate/store.js", - "db:migrate:create": "yarn run __migrate --template-file ./src/db/migrate/template.js create", - "production:db:migrate": "migrate --migrations-dir ./dist/db/migrations --store ./dist/db/migrate/store.js" + "db:migrate:create": "yarn run __migrate --template-file ./src/db/migrate/template.js create" }, "author": "Human Connection gGmbH", "license": "MIT", diff --git a/backend/src/db/migrate/store.js b/backend/src/db/migrate/store.js index b2d65a0f2..97b057dac 100644 --- a/backend/src/db/migrate/store.js +++ b/backend/src/db/migrate/store.js @@ -1,32 +1,36 @@ import { getDriver, getNeode } from '../../db/neo4j' class Store { - async init(fn) { + async init(next) { const neode = getNeode() const { driver } = neode const session = driver.session() // eslint-disable-next-line no-console const writeTxResultPromise = session.writeTransaction(async txc => { await txc.run('CALL apoc.schema.assert({},{},true)') // drop all indices - return Promise.all([ - 'CALL db.index.fulltext.createNodeIndex("post_fulltext_search",["Post"],["title", "content"])', - 'CALL db.index.fulltext.createNodeIndex("user_fulltext_search",["User"],["name", "slug"])' - ].map(statement => txc.run(statement))) + return Promise.all( + [ + 'CALL db.index.fulltext.createNodeIndex("post_fulltext_search",["Post"],["title", "content"])', + 'CALL db.index.fulltext.createNodeIndex("user_fulltext_search",["User"],["name", "slug"])', + ].map(statement => txc.run(statement)), + ) }) try { await writeTxResultPromise await getNeode().schema.install() + // eslint-disable-next-line no-console console.log('Successfully created database indices and constraints!') + next() } catch (error) { console.log(error) // eslint-disable-line no-console + next(error, null) } finally { session.close() driver.close() - fn() } } - async load(fn) { + async load(next) { const driver = getDriver() const session = driver.session() const readTxResultPromise = session.readTransaction(async txc => { @@ -42,18 +46,19 @@ class Store { console.log( "No migrations found in database. If it's the first time you run migrations, then this is normal.", ) - return fn(null, {}) + return next(null, {}) } const [{ title: lastRun }] = migrations - fn(null, { lastRun, migrations }) + next(null, { lastRun, migrations }) } catch (error) { console.log(error) // eslint-disable-line no-console + next(error) } finally { session.close() } } - async save(set, fn) { + async save(set, next) { const driver = getDriver() const session = driver.session() const { migrations } = set @@ -70,11 +75,12 @@ class Store { }) try { await writeTxResultPromise + next() } catch (error) { console.log(error) // eslint-disable-line no-console + next(error) } finally { session.close() - fn() } } } diff --git a/backend/src/db/migrate/template.js b/backend/src/db/migrate/template.js index 941f2a9e3..b8511e9bb 100644 --- a/backend/src/db/migrate/template.js +++ b/backend/src/db/migrate/template.js @@ -1,7 +1,31 @@ +import { getDriver } from '../../db/neo4j' + +export const description = '' + export function up(next) { - next() + const driver = getDriver() + const session = driver.session() + try { + // Implement your migration here. + next() + } catch (err) { + next(err) + } finally { + session.close() + driver.close() + } } export function down(next) { - next() + const driver = getDriver() + const session = driver.session() + try { + // Rollback your migration here. + next() + } catch (err) { + next(err) + } finally { + session.close() + driver.close() + } } diff --git a/backend/src/db/migrations/1579387929122-merge_duplicate_user_accounts.js b/backend/src/db/migrations/1579387929122-merge_duplicate_user_accounts.js index 9dbc8ad05..ec38befc5 100644 --- a/backend/src/db/migrations/1579387929122-merge_duplicate_user_accounts.js +++ b/backend/src/db/migrations/1579387929122-merge_duplicate_user_accounts.js @@ -74,11 +74,11 @@ export function up(next) { next() }, error: error => { - throw new Error(error) + next(new Error(error), null) }, }) } -export function down() { - throw new Error('Irreversible migration') +export function down(next) { + next(new Error('Irreversible migration')) } diff --git a/backend/src/models/Migration.js b/backend/src/models/Migration.js new file mode 100644 index 000000000..e36d10ac3 --- /dev/null +++ b/backend/src/models/Migration.js @@ -0,0 +1,5 @@ +export default { + title: { type: 'string', primary: true, token: true }, + description: { type: 'string' }, + timestamp: { type: 'number', unique: true }, +} diff --git a/backend/src/models/index.js b/backend/src/models/index.js index 047ace67c..dbb6a927e 100644 --- a/backend/src/models/index.js +++ b/backend/src/models/index.js @@ -13,4 +13,5 @@ export default { Location: require('./Location.js').default, Donations: require('./Donations.js').default, Report: require('./Report.js').default, + Migration: require('./Migration.js').default, } From 5cd57a0cc516977df5d9cb0c8a18d2e75b61d180 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Tue, 21 Jan 2020 23:19:17 +0100 Subject: [PATCH 08/67] docs(deployment): Explain how to setup metrics (#2825) * docs(deployment): Explain how to setup metrics close #2411 close #2777 * Update docs with some info I found useful Co-authored-by: mattwr18 --- SUMMARY.md | 1 + deployment/monitoring/README.md | 43 ++++++++++++++++++++++ deployment/monitoring/grafana/config.yml | 16 ++++++++ deployment/monitoring/grafana/metrics.png | Bin 0 -> 211436 bytes deployment/monitoring/grafana/values.yml | 4 ++ 5 files changed, 64 insertions(+) create mode 100644 deployment/monitoring/README.md create mode 100644 deployment/monitoring/grafana/config.yml create mode 100644 deployment/monitoring/grafana/metrics.png create mode 100644 deployment/monitoring/grafana/values.yml diff --git a/SUMMARY.md b/SUMMARY.md index f3ed9d515..53beae7ad 100644 --- a/SUMMARY.md +++ b/SUMMARY.md @@ -32,6 +32,7 @@ * [Volume Snapshots](deployment/volumes/volume-snapshots/README.md) * [Reclaim Policy](deployment/volumes/reclaim-policy/README.md) * [Velero](deployment/volumes/velero/README.md) + * [Metrics](deployment/monitoring/README.md) * [Legacy Migration](deployment/legacy-migration/README.md) * [Feature Specification](cypress/features.md) * [Code of conduct](CODE_OF_CONDUCT.md) diff --git a/deployment/monitoring/README.md b/deployment/monitoring/README.md new file mode 100644 index 000000000..46dfb0301 --- /dev/null +++ b/deployment/monitoring/README.md @@ -0,0 +1,43 @@ +# Metrics + +You can optionally setup [prometheus](https://prometheus.io/) and +[grafana](https://grafana.com/) for metrics. + +We follow this tutorial [here](https://medium.com/@chris_linguine/how-to-monitor-your-kubernetes-cluster-with-prometheus-and-grafana-2d5704187fc8): + +```bash +kubectl proxy # proxy to your kubernetes dashboard + +helm repo list +# If using helm v3, the stable repository is not set, so you need to manually add it. +helm repo add stable https://kubernetes-charts.storage.googleapis.com +# Create a monitoring namespace for your cluster +kubectl create namespace monitoring +helm --namespace monitoring install prometheus stable/prometheus +kubectl -n monitoring get pods # look for 'server' +kubectl port-forward -n monitoring 9090 +# You can now see your prometheus server on: http://localhost:9090 + +# Make sure you are in folder `deployment/` +kubectl apply -f monitoring/grafana/config.yml +helm --namespace monitoring install grafana stable/grafana -f monitoring/grafana/values.yml +# Get the admin password for grafana from your kubernetes dashboard. +kubectl --namespace monitoring port-forward 3000 +# You can now see your grafana dashboard on: http://localhost:3000 +# Login with user 'admin' and the password you just looked up. +# In your dashboard import this dashboard: +# https://grafana.com/grafana/dashboards/1860 +# Enter ID 180 and choose "Prometheus" as datasource. +# You got metrics! +``` + +Now you should see something like this: + +![Grafana dashboard](./grafana/metrics.png) + +You can set up a grafana dashboard, by visiting https://grafana.com/dashboards, finding one that is suitable and copying it's id. +You then go to the left hand menu in localhost, choose `Dashboard` > `Manage` > `Import` +Paste in the id, click `Load`, select `Prometheus` for the data source, and click `Import` + +When you just installed prometheus and grafana, the data will not be available +immediately, so wait for a couple of minutes and reload. diff --git a/deployment/monitoring/grafana/config.yml b/deployment/monitoring/grafana/config.yml new file mode 100644 index 000000000..a338e3480 --- /dev/null +++ b/deployment/monitoring/grafana/config.yml @@ -0,0 +1,16 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: prometheus-grafana-datasource + namespace: monitoring + labels: + grafana_datasource: '1' +data: + datasource.yaml: |- + apiVersion: 1 + datasources: + - name: Prometheus + type: prometheus + access: proxy + orgId: 1 + url: http://prometheus-server.monitoring.svc.cluster.local diff --git a/deployment/monitoring/grafana/metrics.png b/deployment/monitoring/grafana/metrics.png new file mode 100644 index 0000000000000000000000000000000000000000..cc68f1bad10efef0abdf03fc1194808c17dc6484 GIT binary patch literal 211436 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

EF08;%p#ff|dFI5N9t2H`efG+MxXUSYzoO(5rY; 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%0D&^X}H_1K7blDBEZi#$wOX7ECBemaE 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 z z0rhR9AoV;^STZp=yKBGR7j4{K&tneK6z#i2{mU7V@@YXqwnwXco|&;wm$;{?6&s-( zGoSJ7z6an9RLht!u)l!2pl#?mI0QypP$m~RnZO)52M0+L%@khSke?JC>NUYU(WONL$xrmV<6*?q0Go| zo*#IpAczjHU@oAcxFebRysBvM)sw9iTcf9lnh%$f<#4uEO8vC%-)hePBJ9p_zd1iN z!p!C&E}Zbn-uIWliIB|`qXgkBdP%T8f&xl@x}JXL7PsP|_w{y=-Gbi-DPPX%mmZ<|h@IHM9P!hmsUNZ(!jU6mIL`K!30ef^`A{K2TmL^*sqsK`W(WA-wH z`1{&avDh;b=>u=1hO=9uPCAyGq}>xs_))n(6EB6fK^q z^X#{X)ClMWLxM}wCrT(bUYyl5#ufv5-V>#xw>Q3J?{o_Z@6A#YHDh7xcz+Ta=c!-+>`pO?0I8i z*;#_M>3mT1n?Q)W+j{d_juO>!5Ei}x+qbqh+G0WecUS?)xaH;LGLvqy*{`Ol=-$xL zYZRgast^bx9;*)rEyaESi*8NNP@#4(N&4&C=%NAv0#9{<(Qt4-k$DpbP=B%s9VY3_ z_8+(-Esr#W83}L>_|fy=rrlY;l55{+c)da97tO| z2RfJeBZ~CSjM~V6492Z3hSySU;<#|>EL{fE00_OTG&cwyc~2kvg18RO1(r!d8vAYd z`e zNyifR?#*LwkRp^*2IGiS&KBF43Bc0Z6BIEX&|uZp1NgBg%Kk z8D0Jom%hS>&)iw*gqbLxpSARWt|v2)ZU))2D|?ZJ%;aEvS(zP4>8JvX&{wYHA!7*g#~3cbxBn4J38WZMh(WI|_E-Q!Y^xBnCX6473@w8uea9AK(L^ zQ@>6SMlgJE^X&mS7n1+RKkAl4h)2A4-(lj_un8k%h4!t`+kjJGyIIqLxDq|iSIFa& z-%22Y?>4EL$6ATsX^T6E@Cf z#z@iXk6VPJVh3MD{w^^o0#z??bTb-j!0!X+Fp_d42Nf0hq{XU%uRQ$WE~6obRCb=huf zsdpeBLixH(2E%&b$K9VRjPO2_WcRFtz&r36GPqo*?`WMNx5cnzH~%Sz<;ZrTyOg2@ zNN|0*&4R~*67H9H;k<`2F9TolND~Bp>}jS3Nd(%)!zz*%fwXfkmH|NlVY6J(nZb%t6Y{Cw~dfz>BkikO4(HL)d$t%j=$vGNExtc6V#%WHS=scu( z^omivAVop&thwSv(;%l$yGX!rCNu(Jn zn7jICHuZ@#fnl#8P`NdO4tqnOas-Q&NH-0Q{-QTR9CBGw$VX-htD&JogS{1LE@ORH zK)HEnb*8*S*@Ut)Ga_Vf$DW6ibtK73l6CA#WMr>w+54o7a8Mya_6Wt* zL00I-~OzuIqREtv^2h9M|i*uG{UL*X#8hkH>vIog`^!Y5Uvt>H65o zMj*_baZs>W54bC_WIY4wT4m42`J0_@!Jg%jXNGnC3dZ;{E&y0 z_b#qLuR!Pgd@!SP)*^PBl;0d9$ZxuKr)zub12U?S8OGEmj}A95FAu-{tP^P|!49PA zK?Qa4vtc$|?IW!S0&n@(0lp@x^()o)HZEWGkFK0i!o6I|OjJ=flhWVT8Cuit*8wnK z=)TTJSdZ^^KG|7>-8b`64Lys|OPj9Ub*QR04D~&aeWh6VB5OMRd%1D%(#Gk$yne`i z*<2oUt(iI!GBW9CpPi^mIQVa2qCqMlk$T{iAWj*QHTyG}CEd6qUfy}=aipF|@Z0wm z74+{u-&uRR=&WJG!^aoi!pMSYr)Y=5gAjOYvhn(o-8LB=b<$#(F$uYvwssz{VtOVf z^hUeg(FNAzZTw2<>rAC^AyaECQ%X=Z* zR)_GOuR+yd*W~jxXKZZjVO#ToUDoJ$>RcunZ#{i|3L})14-fhUbt}KOf6S)@MZ|1x z-JMaZW)8;!i>UIiYF^_S_PX9&V?*^JVgY7~qBNpNG}_8z?BzBfaW3pikB&f>#7RUg zSFF_wd3avC&Zzp!l340j)Tw6O&(5#Iuz;Wn*)^kXW+BRB8tC0FQsk($KJ^!3ALD zquMd5iokyEDdH02<9R7X-#mUK@9mx9zamGdKi=XfJ^gFaI0Qv_-Ibl)FxErIgcnuU z>}=0P@-7a?*Z&5dtRm;OlORVvV1$hy0A>jfv8Y`A~C=6+vFMq*aqRXx*!$D+5ba zm@O2IUOm6he0a8~o7QrG;UBp|4YeDL#k^P-q<|9cIX9OjKQwiy`AUwnAt+6uEeCQn z8q2(a*lV!*X&!20aRScp{+s=p`5wjw*=F8S@^X6RxlK>sxg~V@ViS5&>*}xPpR~6* zwvVp_^!}dBww?l{s9IdX&ljVpH>vG5$Ykc3uzH^z9D57qdJ+j;`cyG&SE`t`Cw z5+L}c(-=>G_*-A=;$s8F&^Z0K-Cyu`({*~7#AIU1C~!!GJU@;kK-JxEvp=|4Nm3TZ zth_4cQE?9rUQ?CHbKH5E>sLZIJb1EdYWy@3QZVkT2MG%tPF)vZ70EusMkJIt;j=gk zKJUcywrBgnviPAbak2gP3NrLo1s6##6&%SZbdM+p3cH;t+c1Cs_;LX#?*fOhdnw1x zNZSYyQ@0((j{lisi*Lpl>HGhp-ujsvU~v zC4QdEBYAGe3?;%w#f+qIo6I46f_{|?IW{>txe_V0B{3}Xu;;6cM1*& zTA7-gYYF1Mu{G>XY`nK{{dA+S~ELTli6ts#x4_?3o1}R_=X!Ua{bdqRJnBV<^KsF43$V+dD~n*>zps-n-jFk(^Mk z>VJH48u0txV}KXNA0?6zAqNme*Qu#8#C4%Ql$L7Rn0|>M0xhag_P)FR3>kttrheBY zlvv|#{um_3GU-N#cLrkIDP-e{SkcKG9YHqFX|PX^)d`6|;`K?_vb6O>d=~1nC;i0z z&FQFL@ux}AwZodMH*{A_u#t!J&Bf78AE;BWE-UZaCCb-0LUvRmh}Uxve71C8L%)W;@Ur zNctCl2RZg}f6GmHE4K`0Iuu#a7O%Un8-$=}?eE&ekYmfQ*^2VC@Rhhp)LkvdiyBg4 zcNDAK%ri3$oAqgs+kUj}(t664%cck#_w}-~4v(zt5vrUO|!6vD+?7tC;*~U=?|EK#YeEf7;%K)AgaIj_&C790xnTRoxpT8 zaSIUsj~l@+mj474`d>NBg{C)Rgc{(+rK`Lxe1RObFO`Xt#m5(D(I~F=))@tOb(!yA zQfpDpyb%VVIS?A8e?ox+GAAHhDXat|k=|i~q=^>_yO!A-d4$uPDw)b|N zhV}hs;m>-q-|M@!B2HL?HZTwVsKthBK7?hbv8^B&vyORSZqC$F683Jv+jl;)!+Ji%@xL#ENCN-w!~g$k7X0tS@BDvb2||-&Utf!kl-uQ6dm*wHUgt5d z@xpfUBF#5o0PH&kc>q;&Bue3(Ht1bGpQyXja$@0Qo=8Fxsu%JGbTl)~H1hKDyth-G zleJUDo$}#ioCF9plTPtk5`8}vpODZ8*+eS3vILH$$tFt&ZMz#Bm zMfztwSe2R{7(!`_pMD7hhTG(uZEit9!D7t$OZY=|zFjtzc74rjL#PrSE~!)^o>}L< zqBDTKotE_J$#rW?U~bSA0qNoU(!kNd)4=M>r_yV^fomJ%0Z$#V zsq{v;#7r2(JEXn*NxLk z8?L`;d7=)GN|m6xETe>+TvY$Scpn(eeQD|6T++;Po@}gioz*EWFBg+Kvi0*ZU;~ow zBeEPXyuRPeR0+P*ML9QImRgNK+M`Ne(QtPOuNlgHrSR{_7p;I@L_peNcfGl3c-TCAyUJF+wb8nb;Fi0*CQKIiZAC&*3uqNR$8+BXHSE zyo^5`#eWopG!HQfI58D2K6Go*pnpoC$+JHMycd_`s(9dEbR-CtW)&Ic_irpsB95Nb z#L-ey+a<9znlwEoSZgvxB|iip$YHXv!7p^Ruf4WbA_b#eAmbC}OHHGw{!rfPGX)Zf z%vDcFQ4UtHWTsHl)y)C3*8m(>k@$o~sUt zI@OO`*7w3R7VQA6nwKSjFhDfxD1kv&;%V7$y^Dh!8KKx?*II?_pNJ`M6Yf5Z*Fq`1CI*8@E63o+)hFXW$?j?XlEz+t)c+`S~MS z_Pz;mMkgheWMV!w_|&*qSL!{u_ro7BC2<|lh&a`gaB1@>I|)uM;BoJS(jK1*cO+PG?5TZx^NYCYmB1pL`U zsMla`?=?#{Y6kjEj1l)}>{9^liEK#lwm5J6t#^776HWTUmoJMbz#BSgC%f{-CF+$7 znw|!PmVc$J>;}frZ$k(cF)flHf852S9}P-rdVWh)BXhO3Nn(K{#{w(A{DQqED5ShYGptqkx((HgYpY#C_53*Sx^a5h!Keg6(XyY^5e=I&}1D> zysizEujb2<){ia zhVp-qy85W&#^^4nZcswEC1}&k=y)IA2NSN6M2%+u@-w#)PN6%q1bi$#I8I6$VyQ10 z^H}O5h(WFXkj(^T`s_&^A?d%XM55wSuh{|eeh8Tbnvp~5V)U@StKXpnvCajSr=fY! zvGTXhhreb)`^Bhg2HrzfP!|Xuo8mU|Jvfo00HzJQ>*nUP#IG4@eGuyD00e31Q@`KJ ztA9bYz&`|JYo-1@AfykeM~Wz`C0x1B)0>uq z)Mw!@4+@caBf6H6{)C8)ER5cj^tJl)E%7uD`Y?6-#oWe69)=F?6|ABmC?#dPKd4}w z$*SiDS;^x}PYiG=DHQ+Uh@lOBtzUfgtZZ-?3n=L?P!PosL^LMyFQ737xML5H1D^{9 z_g-;o$h~|Y&CpW9%69qNNtmgb9Q|*gdf!;gpX826VP&?FI;oWI>FfY`LbQBMJT zI!um5`m)?GJAb4yrgc$YIvWrb75l41d#FarF5@ZuP=G`gFIxzzL~YCYTnK7!W^f?{ z-WlgYCgDTa$Vcn>_Jzao78_Mo!oUYoJiV_AnE4j*0Ujhcuxe$VK1x`KQ#L(&Y<~q5 zqTV>c%+ZG@hg})Cbr*^c5+IsNcN<~^-m)RBjS57b(v^b_rwGNyjZ>kZuLVQeQ>*tz4m%LZ?Ger>wSaaDxD!_;i7dIMv*y zM*+Y?76;(=zkz{E#|hqReTcs1DCv)33*wW$nj;oI>AO`i?1I^+1nZ)~Zfe(=xMKGX z-)6Tsys|b6Nr39M8SaU@n>2jJykk}tey$8pbs?xORBnte??pf zhOy*W zREznO9BujZfFQ)df(d250Xn$BUOndzOr(QsK&xtidLrxj^TS9Zqax#PA!3~Or>8-% zC0vUH3em6d%K^Ll@*)RWb)LU)tt2x%T9})Ayb zpuK-hD6}PfK0BLjX;zao{Ez0byx_$LOGRQI(<5cS(dPvhTVu_9BA(a#2_!fkx9;rh zJRe?>o&ETMI*-eHI)}oX($bGFx3VssxJFFauit8y4 zEp&(m^^K&Z0&#SJA+IJrx0D=9B&WN(9azzf(~?gUgpagr_DA8XG?HIZ6ka;$QcOS) z7Cthzz2#FnRde!k*vPFNUcjes+cu|u51%A$Wn2XbS$Ar9OR@Pr^}PHkwS|wF$C6I1 z;O>G-TS9=&JSokk(Ubc1Tp~%lZw`(%1vFWwf#gFeBGjJ+#L@=;St|cZznCR_g96Yy zX0vj3*ZoOq#CV**D{%fJ*3!~@uOYxLGxoMF%0d)Q`P`HF^1^d*$SQ*_LRntpuEopqEPg@=^HF8!HzpfvHE)2QlqbcDTViQe*X=%tIp} zk(ZVbH3id^=K?aT=@MqHmsRwEYP`XbJ4IF?$P;^$7o4EwW3C{Mc6gcNQS2g^Y8c^i zG~{jm$;)VmA15HHQrrjy!JeWr;X~&SQ)}EtkV6gB2JnImb=K;)MDv1I$tMGLH9^g86)^WnfcJ900K8iy;FNx@#gU^s zPDe6k`H9c*2!@}UJ3SHL>|UjL|Gp)3 z={<@QC2SqdGg^*JrUgFL*(eJr8)20K z!v_{ekLT+elJnD4?$04Z=EBZ0fvd2zRBNy13WZOf3OkRKRCwd|Z9e|prR!tWPG+vO z4_>nX7^ZJzL=!5$Y5P7y<)>FI5;ZBmDTvDq3%8z>3e}giumnZKBG0$ALjZ21Gok2! zn&I`=)jdO4m|w$O2ZA_5Es%@uwF%Dn3t8^LnQ`v#uf#8n;#*3%G|9rB6E{9my<{># z|E2GXU1TSY6Su#DN}wia=*CKD0-3_50+Xwdhc2V*x^YRe7`)z z%*62(pnw&>>>~Re_Sts{W_&>y_i)_i>$Tcw-ZSzy#f~D1-kiQvGIKrZT7m$Awv*Vwy60XlO+JDjVu(DO7XuU#FYCW> zy4Vs-6MQbx45JJc`glpAuZ)as0Qoai<~+pq2xG)Q^_Bnxn215y(cCZxdhy7l9OR`) z68Vg}+ zPp`%1Jmll;;C>QMIg<8UlOIt+#t@4* ziQUAcAjbxW#5==8@I9$~^pz1VI98-E-%qzgXHmIf^H+H6V#oT~Ah)uv zIn_LRi$blqvd{5alGpcYkj7>j2?uQ#!KRl!6EOf5J3iLTRc(!lMrFdS^eSDhcav6l7N!=lKt4-s!* zSp4W}Qi^uHWSZKA`$9pByoCx>So-@&4Y_apL&N9qRFcC8ZH;(Gw6Jm?hF5iu0{lkc zFq7#4=r!rWEZbYA&*vNkL}1YP3Zl#6OP>eXB|Qdj-}?h&@1Rsqc$#~gF$CrA>P#*1 zZ|-0t@y+KkeI=G-Nh$WXkY$MP|Ys}f!R^^S2X zZ8r0Csi6rd1;Q?Wu_t3Dn-*X3mAfnfl4;ZwDM0@vu z6m7xgU2RAO;!0aerxw8LlK^|XGp^^j*us}ocCSs6740?suFME{a+Qhg?}|8YImGQU za{Lhgs_&Pe-|I(*1@72o!dR1=OqJBj1c&}pc1o{{kQQc&uY(g~VcgEwz42X!hwJ{R zKFJnz#q_J9otlgzbQWfk>DhQi_q2*a-lq9sm@v>S-{fcJ1{%h@ym z0oGWF?Y9-6x)(91I!Y8~ibsO=|4GaOKL|6i_vQ$$bXZa-A-B(eR5wY%$V88(irKDb z-B@ySTs+>w*LZl4xZta1Oo4rd*aB4sA@$jN2+G6-pNe_xEhrR}eQ`*;_we<6XbF-L z<)ar{N=U{-TrVl&B->J^w8*jNUVQ0FVMV8Z?sB0GK}DLldb}sccCUW9%;-!QOJ^{6 z&dnFCm0U%GOrE&E@yL-U@1|S}UjbW-DL>e;9q2VCPah#Hq#{jePvnN#aQlgn1N6uE zgXuIVb&tp4S7V{9zt~#Boa<;<_SSU^9^1^yoj>P@aiPN=Qc}|3JbGB2I`@F+AanM$ zLV%&Nw_XY1pnF{HNTMo%RsDf5R)WO{Gt(J51iDR~JNoWtz|DG7*83y8b`SiJZoeq{ zCkY`;yX{Z$`LjUir;+YiI$%CL%N*E4Z!~eBZEwLTw-AY=HC_`i`S{DaI69}YveLLv zpzaRG(C~2e*4UEgN7ci}Gt`>St#^u52v}C685kPce|=H`J;XqMLf(4+$68l=2%AS*SZHTEw?&>`lf6Fisory-Q?NmCrC~F}g``h03^qb)&O8RN zgeBZAy2fghE5tJt0_7mD!kOdYGHrY)CBkJS^4>;kqz$-hD20f0Q zc>{6~i+kNSH2zMq2*}%t0Zjbjp~Op~sq7jG8LuzIbD{jCBB?v@Sd6Gl>qvH~yaH*DX{BhivkY zpLk1+_42As`Cy?K@Uv5@Y^&$VrNC~Pm2+Fuak^_&A(LiXn{vU%SaePe72X}JIBUS8 z%{fL-v;LbFpeNm9%%13CvELdR0jJGmD~$+44H4r^pa8gmMif2`j>6}?9Hav65~#4hfpA+KP5|fA z^^a%y<5_yk%*6eoK0xP0NnmULKm;%p_W=xnvlsWqKIdQ=3v;Elzz0%!;pai8!8_CK z!itwChOSEFpBEMzdjh@rO@<|FVx#HzKY6fqLPyl&I1S*a;gr^rkh#wYru@w+%^!`s zTZ}~cd@sbB^;MUdiM}2)k+P^u$naj^fnu?q35SXBhc3)McEfOIdfusKlF1M!yZP1C zZKkrwZRA1yd8ol{(6U&J8oI(n5&bT}2)yM*p7k*WTyc`?XvltXJ`TnCr;m&(Aka~6|MeZ75|z%C z`^)A+mi3tn(xy2U!<(fqy0hs=vf#kwm zj@?2$-}-iCjblDpx0KQ4|2pFL{-MaXqN4g|p6cN{8G2i|36!+QF{USZG+C8%0 z&z&!`*tnXO8wO!x=J{8sN#^~Omt>m0dhNtJl_FGCgMV^x4~xjj=>{|-)9$noJxd_( zJr7wu_F_b@GQri%_exGBHN+B}&$W~|T!7a<$xj5pRMR*E@avO{47xaDW8<+{j2RR* ztHzvn`C$7jIc;C54tOCk3}h0>fjtQ^MsPTp+}&M)B7g537XxdHWA>4qad3Dwew4g` zRyjh4c4M{hC1Bm>H)@)8BD$|ko%Y@;vYlhz`_X1~FiZ@)yGv82PE|%TL$mfOaC4wa z1UsbLnvTKCD-r5`{hZlSA1TQ2kLA=&$+qZtDQ@AuemO;Gmn22lodh`QzHcoh)@P9wVWP@S&)@}VOG%1X6c>@WuqzsZJ-yLaiU)0`>e50XGhflhoC8h_eRXx7 zbpI{;v6;i2^NZM#`S%akeocW>OQPnZ1{^^X>Hlsrf20ZTUiTx}0EH^ZytxBsshb^i z@XCY$(E5apuM^sS+v`tz_P!r&*jiX|KR8~IQ-N_}K$;(_t*(xwm3i6TsLXvCD$jj$ z7v6|6UhzGP5jD|51;yA6JG+|?poFLD^_>WsV*0F3NC_dQ5v45&$hNLAYOdgL%sy0Y z697Q-3d@;C@cxAE+#CS9MDs~tCv2_cVvucuPQK6;Gy{dwf%JEP_-$P1uqUJ>C#$!e zb3Ls+q?5ioE0;O2;=d^+^OAyHAj{JH+o?MDZYS{3`qyFBTHRhBrL!wA;(~^8aa*<{ z4P#Mz{X)a{ZYei7aH|jZ^LtDEfx79k!op};Z1!@bHIrK}{6h8Y zpxO_L<)??1l7l-aMWL8`p9IyQdDq+9b%bb7%KC{r1+}ItUR3`QLs=7z@UU98s?S7W zX5XfYA>19i0Y;Vy_5nh#0ha$ih!eeu;>1ob90gbjG_}$4iy$)#olqz%a?l_{kAJLPw#0rwK-;E$Cou-&`54VfShQ~Zj5-Cf#53vC*bSBYF%q!G&&2cF4ns$L+E(Xtf-(XhM1lAz2=g=tw zCNT=j-g{i9GAV&qN&UST1ju}m$pE-w>S>;_8B`UkzcYLOVL-xv?J8fRan%KXXAC0tpo62r!xkc04{xqm)%jRC4pf4m;DR! z#RpXwQTD4gTP?f;)i;V`?j+2!e=m#alZ|WHY7JQ13u~(RA@ms<~5u%zZs z*<<<*%YG>;i|!M4$%+t%$M4NfhPHr;9fG)ai9uXF_faTdz=ygpwifWy-UW>q!&|Xb zg;XtwrW)r2QSJZ4RK7vsMGekX|MD!I?V>fm_}M}AEkhY7MncFlq8`C=3w(zo@Ez!G z8+PzcU&upCg`n2&GC8-vu%&Cd>1@Zi@skKx_i zpo*fJ6=iPW!}?0pngSJJ|2^dtJ^|JE@hZ$6#zC(xAXF?fe&5t(DYZ$ zoLzEl9;`q-xho}3YiI0#&!GPh5=E6C*8gm`>N#6B{`^5nee=h`nqjYVIz)Rs;2JMNtFXewFBI0XnNsOJ-;?Flz zii0l#rizSTkhw5;bfT=r@=jhQ*e%AFbcKFsZ>$&wE1;O!+{ixcr1CFfN+R(_+ZP4h z=bosG(tomB*^O3SeG_k78~0#+h|;Od5eDaZ&Bq)Fz&iHx((p!q&r8cQhJ8chr;DWV zR|*}f&0SyUqKxsP!xw_bDNAE4JGFIl8f}dYJszok_VzXPl$32ixY{(_`D3ckXroCY zFeTH>5WFmdUkCRr(3JV_SMm%^+#{A&jY3c|oG$CuOJoGkoq#R56aj^cjhx2Ac-@`M zh)d$KLq9h4l+N4O%!suO4clK|2^hBux=BpqxKN-f2L;&bEl%iSLf#5feiYSUR<;*^9X$9`}tB?hNl(B6YM z#D%6bQyQ?*8*%K2L;l3xT?cn%P_vgmC5QLi(xtaJHD4h&`}(5M82C|?yZA1JU(8~Zj3SX;_O)#I)^YVj)rCg zTUAp^C!9CiOn$*QFS_*)#YU#uY5L+)`zv3k9S1^(?Kb^rb|Q2dz$|Tcr#R{uq1gLq zOC<9@3sCCO$2p)F@?W>*_dR>zJ&-OqVwm^2%naC(vO85o7?p2QxKEK-j+Fp8YWgz~ zxL~8;SV<=cpo?=HRf9e4qAu=jU8du-D;F7=_~d}7a7+vobyVlQiasaqw8&WQeNU3_ z+HO#dgD3Z#US5h1mUjr2Y_bM^TD&Gy^%x0|dI%Gf z+V^g360SR{Ep;>S%OQ%d3i6WvjwBTmk)-!H-;db^#6N7#R&_6Z{5KLh) zH*!8w*tpTwc^mC2+b4${=X$9gA(abvoSO67PIEkLt>9J0I*xeAYzEi&GW6E|KU?0v4P93}TQ&@R? z_-()fz)`!-$gW;BBD_HU&m~kDFE9W$jl`-4W7*k#?0u2U$w@=%1328S3|*q-bw6hnYxcuPkTD4 z3XI&Z#KVHEfiiD2N58!_1!OLR4%@f9!mudZ3|q6?!qJMnl23S}$9wP0tR#^)FIuwe z)~ZUu>syF$c55ny=`NUD$pyfQ&&w?90)1BWPQ13G^=Dr6sk?D@ zUA6SoU5g5yO-O`0=_A+qc*ZP-CEk{q1XhibkLs_zbK)w7pO+PK=Ug+;Fb@o7Sm5U4 z6EBywI}JhL0KA|2AAonk){-up;B;~}hj`g7WA}8Czw|8!g=AbRX`*XC1Ti3nYZrd8!_*FeV<@2tG++G(QSuQlxWloLAAxaNCttl zcCon`=!6~TWaKWP2xB~4q1}=^5y7Vyv^EPqUH)g-%$c zDli9B$7yKto_~K_=P%e89lNu>c)x%cY=GjMB8E)FTS_Er#i+n9{rA|wo7tf2Rnjga z#zM|WW!S+Gd&-sD9~~#v`(m#vSGTEXq`CVRU6!jZN&je@ac|zPPwF8{je-)9PFF&{Fwt`Rt~DpNlutv0vBrh3JL>$hc6=QH{t2)JQYn zc54{T+Pk()%tq=bvQvRX@7Gc|$gO3oKO$hDWGHM8?`OC*L9XaRl9nm+aZiHe+>cvZ z16ya-mJ6z=d(puecin`wWlF+^0}Qq5H5dftK8nhz3HtZSZ+G5_LM`&0VD}CMbT;Yv z=ZLD`4S^{zdHa_{eGbcPj}ho|Y|&JqVN*=6HE^J8`oPSj9pJp!BO@t&v-wy5; z>{;y9Y|!j9;rCibl%t4S!mS%4Kaf+CO8YRb&soFdE8`CA=xY$SO||y%h2}gqV296r zX)I{Dc9zL|eG}Wyh;1tJ^!lq25*{XVbo=JGf0gm)NZ5))N`5YM8#5hBF#gq`ql=IK z9$RR;g*L6KE|w^I`fTIr$Dt}Dr3>@b`WKN@FgxG=`1_3i52?fdH7DZ;AAy&IJ@Jl{ z_wM7qvCxr0)!MUO%p-}d7nB_@0?R~h(^gtCgf?%=?hYN9ie$`E@7J&Vqx|ZtzFALg+T3u+dw&yZ6EF?MfCmX%i zP)oAq7iJFDt(GdSWs2q@E1L+FB^aV~_xh8M3NSOyytye%L(Hd$99ckfb$lC8s;3p=)_i03h6>Ek?dAxr_dkHhjTy;^Y1qyVrs zC*gZgvyyLDjp6NR9meQvOTEHpj>7KT?FIeC$c2Q8sEO@t_Xx-1=y^-W#WgCdc8!$_ zn@$?B*ZTrFnNTE>?=t{>!z&LVlPZEy{NR}rb4Os5S{u4DFpIQ?NSU*+*wrc z*`Th7SyjY&wD&E~dJmG-xb^MM4f6z%)aUhoaY`7oN4dB@VP;mu`L8-X*+>wzlanL6 zl8AwQM9(^#8A`uw>i=jw{RasIut5>~OWSL|xX{F&rm)KM^#=3GC0;(XxG!aPI^&=; zLDFx_4IpZ|_sOn&Mn)=ogIn1uWWBsg{#Y#TmxhQBA^+o>?Ufv#joCNe=xyL1YvcRWSgty^sN&o2=Kh~!bf6b4a64TDyFkXXJq6rF?(&TxI@|JGAjhm zR!G7c(CG{x=&d@JSekkFeGkciZqzOQt0MhxkR}7%)@HJbrf{mo5j$OV{)9xy8ie9s z%cA&}hjGee%r_JafxXB$d_;GGWZ*w6qrJAzS6fAqevq|XPTy2bMP`B+WCr#F^JKPB*4 zzUsE7AO=ITMa!N)wuxD{zs`T+)P4r7?j!JW_@!Ju)%-?=DExi#^vdLvdx%FAD*5;_ z0B$Fpe#wK*W#7LHmSwLktIKLMP>7A4g?Zq3@>*pgkqBY}?QPk?rG?7-!_0KMR=zHy zWBCZP0Ou{!PPyYzrw!}7nBl^y1*BK+y zVi$qqkoop%Cnfs7r&=sEo?%?$iIVX+5W%$LxU<@#6r835=P%`}kO}nbHiiv&g4^z< zhy5HKsCj5EQ2g_nd_Tb(G)VI%n+S^vW->f5hS)WOlm7^k|AcS<`CVT&dd z934E~TD<$)He5Nna&#%90v}-3c)G8;>MisRfj?Am8$&v^0_f*g>)p)DJm$yr_+;TE zfqp@$D{gaobr7Ujn3Wah@7za+#>7kntn7TL#;-oKx3}L?Hz9o4h4Zz!E$ee_Ec_0C zYWn8iK*lr-YJsZY97_b4FC1@DMV-Qnx&-^5hsp$-TqPh7f?B+~<-`F9sxX9%{=b@k|B>?ct<=IyyeBjq{xQTlKKWb(A zjU(TENRVYGF0ubOP5!^B{YqO)xZ|%~qV z`p(x(D(pnbBm!ZO(fokA$?)U1R7U$(_YS)Ke9~zuBZ!_1AL(EhWKemkw>bXc;(w6{ zSpGSQ0G?K&-g6~C$QhJ2vY>`xQd*{#g^4gnPMHsnlrpqud~Q)@h3M^9vB+_DwlQow5R%2glZ(2JQzq^`5b(_bAeT8v+&D_H2 z>K0}5_3rk8vI=ORfftdTkTE|29qG}z$NBrgACHKkGeUP%iENQZqNXNvq$i~V?TMzX zSVsK%)}*;Eab|;WYoOK9EXq(JKa{*Q=z5U-lrgvNRn(gJv^vw=O5qva>!B7iBj%yy-D;+d^^XZ-w zeVI~Al>>A6CgS~TCD=Y?0vyQk=aU32!%+IR{1IX#mp zF4xwavVqbHotHqi_&)k}6$4=_njvk8hY1T64>5KUaH$d8mUw9Y@(%G*D-4kc*$|d& zX|!0y8Db8=UtVY_^TO%fjiRUSntpk0;lq2@HxEC=(Db|aDTUkp@S0s*G7THaj}&b9 zMM=!9UE6HhlW|~Ej(}nX%*RnJ{!Om40<~xCW_%9er)z(p%ZrOQ{7O&gMatKE%nvsB zc#c)tzc4>uxhiv?m@w(1OarM=oA7`1J^{wiTD7?9kCzDZ%N*L0+I!}Phzm2U4t93Y z%T&5bOI7+=eOFbzDy3(5Q`*zKog79uEceEoZ+@RMPRGc24zO2iqAKjtFcAf5y~DrH zqo{)OD2$}`DzYCzWdA=1zHf-bi*j*2O1x;I^?i2o=iay!)d8L`*Mobd+~Lo&4)JDT zm_u0}=~J;%Qi*z{aADfGH}ei-)O4v$Y@kQKT z9!J!N63VD!b!PEzrWc%R^?Xo#|G=J)(blcecr zo4*970rRw-4=63b3{9HN?tSw`OiZwdPuz(sHLDS@WqawquggwkunbUg^Ov!bGF*-Z7m4DDLjw1Ykw)IFIr8DT4WBa0 zA0H7ys=cJVR6;I~e_&s9p#E5Q{bfDMH2Tav$rps){$aD`oPu~GY>Iso%EAM4t$rZS zWykdP)Wp^TyB8eheheA+w2r>BFLU0m4Rrf!G=?;P|h1I7i3PUQm8AOc@Tse2K1XY#@5mg$% zmidH&N^rVfAjX}MK2_`g5 z|2^*?5c@Sbyy#CK()Mciu5@zM?s4v- zcU5)@a7cX5T^667Pn(nVo=efspDV?kFc>{%)9iJV9B7T0g6mb31k;PFeN6&*(JcvH z<5LvaRyOBucM9y6>Ed2~6=~#gXr6 zgkt>qkEy7*`T+MDcAwey>{-hbf)unvU2v$yg>l=$uY?7vc$L-@fNT zt5zI1a+dv&eE3fucw}$C5>n=*=BKYo))vnUy!X}iwXkg}zUOquK(xrDv+3Ta-JeW9 zr{!keh`J}145vEfSTb zdTRX8vxhWKYePoZgS z+4_Q4_(;pqW2e6gPWrx3dK<;ajApx7Ob;op&;5eKFzY8fvahSrgvTz4AgS`gdV0BO z?;WsKK45oAuC?XT8`y9CxW`LJ23LI4P580fO-$Y`OhqFvagP$uqh%S5ZL9pNYkkK@ zBf1yp%tlagg4N4$mGd`i9Y(b*b$8HpO}5+g3b?nvM|kdFLPic97XJz`ax3S4@r&$RX+&Qu~MuE+@6~b+>qnoWAz2AqR z21L&KZ&P4Di-@h0z-twzyFifi?y~#2Iqodgxh0FUd{yNz1gFT~8ll*H96f?IOQBIy zArv3wk`ppXYwjNVDtFNzB(lvp@Ij@9qc`#cWg zSo(XRB}EbC`e~X*KTeH=H-^t=!yZ#?OpiI|!eptS#MX9vP`>_MV#;W7Ew+5VJ=1y_EsC4yUTE+o< zLPm@R{Jc!H3-^#ub#p0&^oyfgznu_Leb_cUn4*1-{V}|0{eE>rIm=F!>YEGE3P&BI zN6Wn~X-8+=w|t->)Dfr(INU>iTt;&{W*a4nb>9iH)^T?~lr(Lv>WtB{fQ zT(-NU3b^1T$`(h=ts;7Y2J<%r)WA`3+Ii8uVm9NJr7%hYV)S`Wz$jrE#QR0UC?ViQ z<9y4);@=NzH*8?E(^A#TkHwUma^XcM0uh(8m2k9ybrK`WxRkgO#TsgYsU7}{IpDB5 z)JhC6`FtXa-4R@kaG(0&JHpk~%#6jTUu08(4&gSE3YK>tM7L>35UCUd*hqk*I(hOZCCFQ((~# zzwXH5hbBI5N1Ov}JKhh-kIysb2nA!%RNt+`Fd-ogzu8(7mYJ=4a_|xY(r)nvAuD*scdv^= z{&x6d0|l5PN1oEIxN4naXX8Uxl^|_Y9UM@dwid~CE{zXMhBM0rZsOkh9N=+t3mH+Q z5?_R9_7|&0?ZdDntB;pD!hs|ms7t1>Bp-7ZDJL$;x-e8f7`S>Lx+tpE0}~RH2NP1h zxR=Y|KzcBtL`uRt@tk|!D{H;qy7$ND4;HK?LuO|0 zJ^Oj)nZ420Ex0f%aaLxIpa=Qi;_cV?p_59FPRfHdd=r}N4%9+s8^ZSy%;>;(4g;m& z9q)85TfPR(LC*jO4N4IDZ~UGaU&=(1K5EsgJI@Erh|c^~vX{u7ZW+XU1TRgWL;S!( zWRFq|Vm|o$ryTGT+V_VfdjmrGp>Y9dh4&xZiFG(CqS|-uMFG1C2r2uu-eiD~l2l=a zyNXGQL#vgYCYoyv*;)bVn{jPew>dDE56LciU?yH_|AmXQ2|!s!g%UC!XN*m6AI7QE zhu}WId-K+Ro4^|jU;F&n+49x@Wni@Qw+y7e z*EhRsF9Qb#J<|U3MY{`v(8W8s!j{ZvBA0B~DNcN;=~PDr1m7R7cq$_<1b6qQ%w!S} z3y}=ljrpL@wN-|2*MLof)_VW(S*E_&fUsi~X)>42~K+{mtxxH zi@*ZyMe(K4B^^~j`kUu_Dx>sYe;D_Z^w$x_51rdj1t$%~r6~KPLF0S-t>^vf*?2Jt zorApK40~pd!HR=3tOh0eEQCR~gb%pros$Z{MGGaFmKMM)Q`7I39sg&QhBiXg7C@l* zswOr32t*)I`wK)MNqn60_b8A_a0?~t@EX~-merZ+y%eVMWf(H;3unIap>gXhOY`A{ zhTImb=rd?RxR|$tCgz%$&@DS=ytK|>h_M9|y1P~LrTJ4-gu&&vgQpu1QY$9{jcI2U zr~v~~kN@nf+DEJ^*9Z8?)V$;YZ&sRj&RO4|pWg=H?yb%Dlcp13t<}r5BDx6>_Z?{7 zej4&2VgT|<^Xf1G7XiL8;V`8T+^=aV7&9+)MMI)?4fHHc9?k)6L-U0{x6l0LRdYwq z`v02fgbPbgXG9G=0stAL2b{eBS92RU#!`xhi;!x z#r#NspS1&uVczE(5qq;=z|vekbf{;apd;Lhcr4DBlXwAI4UU<-Q)prHYPUJQtW*#4 zqGn&vn!U(=P@-D}G++4cUjtqMxweZpS4^*B8{SNVYS040caORAK#yq*MJ@nI#aCq4 zdDmY$MM~sWl*Ox~`{y?k_^P%4=b$j<{DlBv5E0?|dRiJaF62;kQAP5m_5a zl|mjPQoZ<%Qg9668&vEHFI`g?4j%!|PXaR-XS z1yB+?7Vp;cPMbi@uRL4DXrHd^_X2OcAkr{~4#8O#shf#`(_Bo=BLJiyp44KEC{(7? zeUOf4I-x*P;muq`-l8RpfQSGI=0SU|UjmkJ2!uW#H}m&eDg z{7o0Syz8MJY((~Rw^L$6LBd@d69K+bV}5`C802gRz)8=b1EGQ!`t@z%|Al*e5hmum zHH7EpobS&Jda8p{moeVR(PdajubRoFdcFd=)Ag$L{s=&`&s3_1qdEfPt!$Xl9@7d5 z4-#ouK%tHAe__Hwk*6qzrikJvEO)XezAxgv1@Y1ai40t<1_H9x6=@IO8ipbuZ<$!{ zsh=!j%D)T}S5tndMahE+2xDGwr&~t}=A%v@=vB~ls>J(2rN;BqHZM!eZv+-_RoN4J zGIg&mfGFD4Wo{;p?{6*HI?hg<=ZJGZ$c!Gy9P#`VVlw_APc#HodU-AFF+Ws^`5*+W zNq8j7e&8I34zN!4GNHw9IDYDi7T){0@s|`!rcQY8t<^3z{xE)DAsOLk#YeGyE zRtPe74Y@Fb^*CB{G-Mq!Ka}#KsQfG~?e)=!1ZeH#HZY9ui?Whzdm9j!99@(_nlZC@ z=s837iExV)tOR%;DaYLy86p1m+nJEDHGrJ*n9#z8?u^DthT*nD&yC;>^X;aiJ4WzI ze_|u6Yqth#Wif2+Y(D=esiDf#{%)eRXsmXZaVgl8T%G6@5is)}?jjntQ27gC{GT}E zKXQ*#c$!DP-O0JhDREzGfSL*XmbKu#DNC_Uv8aHe{kKbUKVIFtKk+4yP-lHM1b6Af zkcH6itUnZF{lPC%ZGhzI$EbeaZ$ttCh~zK)6NHobZ%%X27Gd8r3~z>VV}k}0MG zvNOlLQkdw7Lj_hAl_g7=2B33@S*>rN;w7)JJj+V8RZ%i*8-H0Y=gR)UVxNR?P6ep) z##F2?|GV0w00OxM+tYwh)OFg|h~Hls{)#v2{^@4`Xc{|2qgy2B25OR}?D}pFpvQSu zesshNJWp7pE48ijGb3Gi;=xZ&3Fq%TW;J$kmOe|^cWYz|T`ZT3R_}YbR<%b$ z>ql$PwkZEqemO8t8z5;R#innouP+YrW0lC3Y+CsREJQo^O{J%r;F7DT3?vOheLjbP z!>Hf)1E6BfiiaP(G(h?B6Y!aDBWKga*z8Y z*nq%6MyDpDRN}85ms9r#MHgME8#8TdxYC5t>SGEVa+o~Ua@z)k%Z4U#J_L8(HnYM( zE$3uHz)7?t2vB^@6(ynKe2~O;*ja#CLU8mO`d^0{%4=+aQ`H1SgJ+kbbX=xZg4bWo zo-VkR5u~`$=k!j0xz@nE*s!3EDt|`t!ADD9Vq?#1>-`&)Wq%B#@uJDopg2qkpY4-XP0-n< zZgXA)JRHoei#>01@bP>ft*1LBNl+iDH9~P!CiuB=;N2M;om$We<^QZi{`|Rc>Qs z(#kL5z3I#ZSbSie-}@6^42e18it81VDXjikT3ZVWUqPlK$%h+v=$D#1n|8nuGmomX z?O?|io&5OpleSRm>}qh7&DQ#o$ARlF(+;?WcNra}uB0<6wi$dnzAu7Z+O;{PBUxsc z`O+<0flq8#=(Gjy;Muwh+!@A0Ew=}b4_1g`X4L({1}Cef++xJ+YTe1JJJwqYeP`5Q-Tv4g|&YUPqRNk0Tplk_ii1Y)%6sfk#QR1Q}9658N#`FefS|4on;sMm_3Q!;M%554xYZ0r!37A>h|dq)e+Vs@Jxg&8*cxFR<+ z(?7!6|3y}f1s$qn&I++Szll!g2TEE9M_!N7bS}guPnSK|Zn`_lp$~$;uBI(o9xD(*Xpn}KCoyZ;^cFMB#)!-HcTC^jnz5cj@RQY`iOY`)} zHPs@sks}6bS^8b921mMtW?5E`Y^q)c;AJ&RHk`RqS;Uc|mZD8Rk#~_T2?fr@{MkCt z_$>a-)!@zf$||>yT>j)|dhIzK8iY+dtw6Q+&vAhNjwQP{EnqfUKDae4JR`D9_nW}< z{Phxi=6#S(XT%spz_VvB?c0G9A=RiF ze5=S*3bHfCznrZ5!xWAwfR$e{C}-43rCp@>jBllFlh$Eh^<>uKrQ0z@>od@`qt0x?%Bf@tgU{FI zG&@W<=#Nju!z8p1l!>S+|3$m{nd|f~z^c?~0g>5~e9JRgeJscRwbg&G(h(!fJpF*O-)6-tcg6vG-NPmqbK6)%p_X1d z-C>nI0-^4VW=ev3N#}GEY{xm?3wvF*!q_c33|q}#+#0!Ihl9j|d)wA2?O2=s93$we?n@(GwwLzO|nbpb_0DePi?Q8B6PdL4L`M(DHdlq-t9^Y)tExLIH zz>S3C0|LRtqP%$|qbPemqXa(ijB8E*RHd+6y&@hY)KgbS|FMt1P5)!mBL;k&@6|s% zf$5Q|_r5pJO-7#^k?$DY%GvsuBegbECw;r9ELg3h}-XKIqj(-RWI} z-qiqfaIV`4`ahTZamwLm5NN5iu#VA-`8Qt-6X-h27M-gOyA9+)EWk%*%-7d&{05Mb z{g*z*KbML}8Dwq57J-;QJ(lTfoa&W^+{-%Cxt+#(A-6~C*An4r#FWAuNn0`S(jN5D zEagZJvq+V;I6RjFc*7qwpYS$!=3PMkn>hyua;Z;7hg2zvN01fM6 z!DX9(O^(hG@QK!kS*bsc4mZ3hz7OwAnY(~kNi?Q$oCd7BW{m;>xk;f;oo?5ZI37O< z!>M1T(I+Z98(6E#`I(y+wq`S;S^*@ZoWvr)-6_8bV< zlUuULsuW|oXukSHar0|Nkq? z<-tH+qT9ll9=o*N`30O)G{}BiUNq{Cc!M_1nP3FhPETwM$k3dj5HBmP6bTI=vMHt% zOd4Gtc6W7@5<2-?w$>7Qlk{5k3!Kmln}n z3Kd><7&#xMw2s*5O{X?UKGREmt(Lce87Eg^SGRoa9t!iFDjWAHjn!Ay5WId?s2Glo z5eis2S4ZZLYuvspI83p4dWhkj2|9VoVw@UpzvEi1NZwwN2pIDP@*=E%#LsyPU**Jc zOrQ}5Ho`hax_qpjQN^-00E&3n`-6_uFsc7_e1}Tb`Fz%A#Ko1ehHE(kmx@V%QF9l# zdN{#ZO9n82POp8@-gmGm79captLvWyet>7jAn{dC7)^yeD4l;Wt@%>(L6 zR~KEbnul_D65cmtN%#{+CKQNFJRH-j!y%Z44}Vs9wl;!2XgI_Be)Xg^Lh8hSO$v7sl8 zm#$NE_^<>@eYmC_+iXjH8Z0Ze3W+VoDi8aeUi3l2HoiZdR=oPH>xjYKb{wS^=VuGS zW}SY|>&m-TX`(Ru`sw|iDQyEZ)CxXacJN`N2-xq0Ayo!a>tw^0U~AZ^w$ucVtkzqa zoEP{tBVGp2w8znEM_`5aGe=Ri6=kleXa?F_=NixGq$fMY2T&)|d#ctdB|H{oH-^X8 zLvi<_l#HA7*@WsSOKKbG@SSGjS&rV?S8p7etf$hz+Z?*$FnnoJk1G|OL|xcMZ*x;r zC`rbK6Z&K{fwfefROh)o#A{;{EQro=cX_4p9h9bU89VN!0rZ-u$|u}Y8C7RgBw$0Z z@iAs}^>p{aD6QaiPR_)#&lGkc#fR}?Idn1Gi$c{ad{{{eUd z8Pn;$^D;eIo-lG#D1Xv{p%OWLd5`&XR`Qt55o@FJ1^f>l#wL&t(5b^2(sm-6oo;q>iaZ zw0St8bEhc;GFGc@nC>fhDph6?Q0HG>EjFQ-Bo(^LRF;NpI_*-1Q(1p`R@JG1x+<31 zm@zNh9kX)Bn(Iho(sdqr_n0sSEWo|0AIQ|dlXzv!C0)Qh~?^NW2 z6BQ#dyfd;+AIQrpJcFu!K2|C}Q^fs(6xUW`CEUK=^jhgCA6Z^lYs=ix#HIjb$E`(<8sx_6Segi=v&>AC%*wyBJDxl)sHwanwx z$$puFjX~+RPQu445g!2N`OdjNHIB(xp>0HEO6`qPL%GwtYwz_tumkI9m(bQYs3nJixOkrFL0Q^{7O@n?IQ|12iLz3cb-6kFc+UFY1;yd z8O2YrJOF^gd_cLGO+n1jg3uB*DoxL+!wPrbpcTb<| zFJI*69u28czS}%SJW!k|Sf+TXzV%>({r0TpLk~^-ljSjKsAAZSuf7EetSKq<*>WFkFo;V|CV|lKu|3 z54giA9R{EK(aV30K7lUv^95ctedUdlmCMv4q;Zv+zR_hPMv9H+L?A0oQ0y|Mwb&gMq!+&0!aahZ`|Eh=afS#fiPimRjc`<-tUgwAo? zYIpv5*(-vBvPF)a@6`KAA&)LYn0qteo^tpQew!}NE$B}z%hXzCMMlAt#HGFRqkh_U z*9QrrZpL}zK5Q(eg9A-&ei_T6GP>HOFQ&>)wcg(he@FtF#x|g3{O~NKHfEgbDXK$E zKiRIAu~~CO;fr6kOkq)A6BcA#HLn#1d`Ek|M&Unt$`{+zO8C|{>F2=d9*eHq5Z-v~ zb(z@u_l^}!6FX$aU(#jWh=K3?%2TAQI%x>Badr;CtM-kfxwqUib-mX_mDA~y-r!T4 zk@tw-G}l@Ig+$(qI|4mbu4}*Y^m0!nQfRKPQ1YHS*NITn+M`!inD=IPWo^(V`CP=L z;57C^;Yg*j!Vx4^Ny1^s&1-P5TGHj*`pE1^c5$9nbtlDj29lamBOU2MM&+YWas4&y zb}zZkO*Tb(>Wlot3v}18%f8iCC3nq@WFj+R29rYJo?|@Tx6;f^YnvBns>h8_$QX`K ziQ{s;gYb-W$;q`O%Dz_Pfd%>QclSJVi>B?Xi%Z-_*N!J;>5($6% zox`xP=Qyhh`4aKHy{%hfJiGErdwg7(iq@#)C1z1S{yHyBaG9DVTH5bcmU+e>>+H2t zL#ENzwaXNP4QDZ?D6UwvqBqznk}o@B(T{5}OOo&AI^nmgUKlsdv;b{ybwI%KsONOq zu)o;_XaD8oVMgIHMGG#(KpyX8Q&g<(PIdkksemiN(lvBDq1eG_8CoN<_xnlL!goElx*qYR zfKZOhHC`^bW?2ABB(mqFUz^VZWgX24oN`|VQQlPwlA>#D3XUbdm>(=&-ydH9X`Rv; zX}fol)pvq0Q`bk)X2pg{QV)|-3X}5fk#MnZ)hT)fbo3QhhxC>z?aKzp9!PeCpybno1YP8;)fZH%> zE-54d9#UbejI=cJI-Lirt6ecuxAK}vwK4KnE{*an;qRP=in`PCnvB$8o_vtkz>JM` ze<&(y+G5lA1GekAQz;yXN=c{+6%{ceL-Yskw{PS%66Gj$-s~V~j*jYY11+K$T*2Ah z@^gaU66cJIt{$OGWa%e=W{U|1QZXeSAhhj0V*0lOz7Zy{yJl@YCIiy>cD9ii=Hu7V z`jxNzQEtk8^8#6E9yuad!&*_4+vBbG6XkV&Rs0i&Do@-X|7bHd7I7LT7(5&M&Mpa8}0DiqBRDJ zRdQ&n81kJg|RWhrDOW9fpT6tdIFf1W@@MpMltk z0o$f}-+@K4rhn{R%UmaEN=f}7MUy)}24pURmQBUz8dBmJBvcP+6C@X_)yOk<_?2^VUaH&kB>no4$6u>tBOY+G@;mP}5}psa}o` zj|T}$SlNth+I2^y0>N}fvK>7gX99Hz4D&Z`nTdVu%z-?Cjc9t8bB94s2)b6>1XvZV zh2?S&WrT1{<8xL8?DOK0P_=MoBYp7b=&5zSd1+hY+*plODeCVJs+ZJxi>@y(6#`Oq2Sp?#ov8eay82%HGx6c7cCV zi+2tHEX@4yZOkqnNR1b$Hb0p|pts2$`LYYrh0P*(>6ctOnY;cUJrF8LpEr{Nl^_0{ zp;Ju*$_PJD1jx1CCxPXLOmEy7v=<@Oa2I{^=@R(3^(U?&|D8+*yz*2GxV4Ky^;4`$ zN5=f1v66R0w7xYI)o;SRx=AXxcYMeNoCd}o4~CYf#nFZb|6GGT`!skS(NyJ--P|xA zpwqZQ&m-g6JpvI`(?QH==D8-R{kuN86c96I#L$`V;w@jZf!|KUmqsdt8o@t$ceshB zPbC%Ma^cnnnM<)Q{w7v#JzkMaxf17dqvx z$dJ)Kb@8T-6;JMHV3Jn$tLpChSW~fJpmeG1W4i`20|WUtER3DWHA~>=JO?F1R8lJF zbs3V^_NyUwkD&%yq8$@$Rr`}c4WWsVHI)$xl2G@s+;NIk8)cz3GfhRodh!b(x2^>e1FdU d@du_~0kVU{B{F(ZXb Date: Wed, 22 Jan 2020 04:18:34 +0000 Subject: [PATCH 09/67] build(deps-dev): bump expect from 24.9.0 to 25.1.0 Bumps [expect](https://github.com/facebook/jest/tree/HEAD/packages/expect) from 24.9.0 to 25.1.0. - [Release notes](https://github.com/facebook/jest/releases) - [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md) - [Commits](https://github.com/facebook/jest/commits/v25.1.0/packages/expect) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- yarn.lock | 656 ++++++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 540 insertions(+), 118 deletions(-) diff --git a/package.json b/package.json index b162d2c2d..3e00fdb75 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "cypress-plugin-retries": "^1.5.2", "date-fns": "^2.9.0", "dotenv": "^8.2.0", - "expect": "^24.9.0", + "expect": "^25.1.0", "faker": "Marak/faker.js#master", "graphql-request": "^1.8.2", "neo4j-driver": "^4.0.1", diff --git a/yarn.lock b/yarn.lock index 8b1f42180..dac5caac4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -38,7 +38,7 @@ semver "^5.4.1" source-map "^0.5.0" -"@babel/core@^7.8.3": +"@babel/core@^7.1.0", "@babel/core@^7.7.5", "@babel/core@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.8.3.tgz#30b0ebb4dd1585de6923a0b4d179e0b9f5d82941" integrity sha512-4XFkf8AwyrEG7Ziu3L2L0Cv+WyY47Tcsp70JFmpftbAA1K7YL/sgE9jh9HyNj08Y/U50ItUchpN0w6HxAoX1rA== @@ -328,7 +328,7 @@ esutils "^2.0.2" js-tokens "^4.0.0" -"@babel/parser@^7.4.5", "@babel/parser@^7.8.3": +"@babel/parser@^7.4.5", "@babel/parser@^7.7.5", "@babel/parser@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.8.3.tgz#790874091d2001c9be6ec426c2eed47bc7679081" integrity sha512-/V72F4Yp/qmHaTALizEm9Gf2eQHV3QyTL3K0cNfijwnMnb1L+LDlAubb/ZnSdGAVzVSWakujHYs1I26x66sMeQ== @@ -925,7 +925,7 @@ dependencies: regenerator-runtime "^0.13.2" -"@babel/template@^7.1.0", "@babel/template@^7.4.4", "@babel/template@^7.8.3": +"@babel/template@^7.1.0", "@babel/template@^7.4.4", "@babel/template@^7.7.4", "@babel/template@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.8.3.tgz#e02ad04fe262a657809327f578056ca15fd4d1b8" integrity sha512-04m87AcQgAFdvuoyiQ2kgELr2tV8B4fP/xJAVUL3Yb3bkNdMedD3d0rlSQr3PegP0cms3eHjl1F7PWlvWbU8FQ== @@ -934,7 +934,7 @@ "@babel/parser" "^7.8.3" "@babel/types" "^7.8.3" -"@babel/traverse@^7.4.5", "@babel/traverse@^7.5.5", "@babel/traverse@^7.8.3": +"@babel/traverse@^7.4.5", "@babel/traverse@^7.5.5", "@babel/traverse@^7.7.4", "@babel/traverse@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.8.3.tgz#a826215b011c9b4f73f3a893afbc05151358bf9a" integrity sha512-we+a2lti+eEImHmEXp7bM9cTxGzxPmBiVJlLVD+FuuQMeeO7RaDbutbgeheDkw+Xe3mCfJHnGOWLswT74m2IPg== @@ -958,6 +958,14 @@ lodash "^4.17.13" to-fast-properties "^2.0.0" +"@cnakazawa/watch@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.3.tgz#099139eaec7ebf07a27c1786a3ff64f39464d2ef" + integrity sha512-r5160ogAvGyHsal38Kux7YYtodEKOj89RGb28ht1jh3SJb08VwRwAKKJL0bGb04Zd/3r9FL3BFIc3bBidYffCA== + dependencies: + exec-sh "^0.3.2" + minimist "^1.2.0" + "@cypress/browserify-preprocessor@^2.1.1": version "2.1.1" resolved "https://registry.yarnpkg.com/@cypress/browserify-preprocessor/-/browserify-preprocessor-2.1.1.tgz#93e7c1228fee9dea9e80a1ccf0dd8cca1ffcbad8" @@ -1036,41 +1044,82 @@ dependencies: "@hapi/hoek" "8.x.x" -"@jest/console@^24.9.0": - version "24.9.0" - resolved "https://registry.yarnpkg.com/@jest/console/-/console-24.9.0.tgz#79b1bc06fb74a8cfb01cbdedf945584b1b9707f0" - integrity sha512-Zuj6b8TnKXi3q4ymac8EQfc3ea/uhLeCGThFqXeC8H9/raaH8ARPUTdId+XyGd03Z4In0/VjD2OYFcBF09fNLQ== +"@istanbuljs/load-nyc-config@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.0.0.tgz#10602de5570baea82f8afbfa2630b24e7a8cfe5b" + integrity sha512-ZR0rq/f/E4f4XcgnDvtMWXCUJpi8eO0rssVhmztsZqLIEFA9UUP9zmpE0VxlM+kv/E1ul2I876Fwil2ayptDVg== dependencies: - "@jest/source-map" "^24.9.0" - chalk "^2.0.1" - slash "^2.0.0" + camelcase "^5.3.1" + find-up "^4.1.0" + js-yaml "^3.13.1" + resolve-from "^5.0.0" -"@jest/source-map@^24.9.0": - version "24.9.0" - resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-24.9.0.tgz#0e263a94430be4b41da683ccc1e6bffe2a191714" - integrity sha512-/Xw7xGlsZb4MJzNDgB7PW5crou5JqWiBQaz6xyPd3ArOg2nfn/PunV8+olXbbEZzNl591o5rWKE9BRDaFAuIBg== +"@istanbuljs/schema@^0.1.2": + version "0.1.2" + resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd" + integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw== + +"@jest/console@^25.1.0": + version "25.1.0" + resolved "https://registry.yarnpkg.com/@jest/console/-/console-25.1.0.tgz#1fc765d44a1e11aec5029c08e798246bd37075ab" + integrity sha512-3P1DpqAMK/L07ag/Y9/Jup5iDEG9P4pRAuZiMQnU0JB3UOvCyYCjCoxr7sIA80SeyUCUKrr24fKAxVpmBgQonA== + dependencies: + "@jest/source-map" "^25.1.0" + chalk "^3.0.0" + jest-util "^25.1.0" + slash "^3.0.0" + +"@jest/source-map@^25.1.0": + version "25.1.0" + resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-25.1.0.tgz#b012e6c469ccdbc379413f5c1b1ffb7ba7034fb0" + integrity sha512-ohf2iKT0xnLWcIUhL6U6QN+CwFWf9XnrM2a6ybL9NXxJjgYijjLSitkYHIdzkd8wFliH73qj/+epIpTiWjRtAA== dependencies: callsites "^3.0.0" - graceful-fs "^4.1.15" + graceful-fs "^4.2.3" source-map "^0.6.0" -"@jest/test-result@^24.9.0": - version "24.9.0" - resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-24.9.0.tgz#11796e8aa9dbf88ea025757b3152595ad06ba0ca" - integrity sha512-XEFrHbBonBJ8dGp2JmF8kP/nQI/ImPpygKHwQ/SY+es59Z3L5PI4Qb9TQQMAEeYsThG1xF0k6tmG0tIKATNiiA== +"@jest/test-result@^25.1.0": + version "25.1.0" + resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-25.1.0.tgz#847af2972c1df9822a8200457e64be4ff62821f7" + integrity sha512-FZzSo36h++U93vNWZ0KgvlNuZ9pnDnztvaM7P/UcTx87aPDotG18bXifkf1Ji44B7k/eIatmMzkBapnAzjkJkg== dependencies: - "@jest/console" "^24.9.0" - "@jest/types" "^24.9.0" + "@jest/console" "^25.1.0" + "@jest/transform" "^25.1.0" + "@jest/types" "^25.1.0" "@types/istanbul-lib-coverage" "^2.0.0" + collect-v8-coverage "^1.0.0" -"@jest/types@^24.9.0": - version "24.9.0" - resolved "https://registry.yarnpkg.com/@jest/types/-/types-24.9.0.tgz#63cb26cb7500d069e5a389441a7c6ab5e909fc59" - integrity sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw== +"@jest/transform@^25.1.0": + version "25.1.0" + resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-25.1.0.tgz#221f354f512b4628d88ce776d5b9e601028ea9da" + integrity sha512-4ktrQ2TPREVeM+KxB4zskAT84SnmG1vaz4S+51aTefyqn3zocZUnliLLm5Fsl85I3p/kFPN4CRp1RElIfXGegQ== + dependencies: + "@babel/core" "^7.1.0" + "@jest/types" "^25.1.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.1.0" + jest-regex-util "^25.1.0" + jest-util "^25.1.0" + micromatch "^4.0.2" + pirates "^4.0.1" + realpath-native "^1.1.0" + slash "^3.0.0" + source-map "^0.6.1" + write-file-atomic "^3.0.0" + +"@jest/types@^25.1.0": + version "25.1.0" + resolved "https://registry.yarnpkg.com/@jest/types/-/types-25.1.0.tgz#b26831916f0d7c381e11dbb5e103a72aed1b4395" + integrity sha512-VpOtt7tCrgvamWZh1reVsGADujKigBUFTi19mlRjqEGsE8qH4r3s+skY33dNdXOwyZIvuftZ5tqdF1IgsMejMA== dependencies: "@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/color-name@^1.1.1": version "1.1.1" @@ -1112,10 +1161,10 @@ resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-13.1.0.tgz#c563aa192f39350a1d18da36c5a8da382bbd8228" integrity sha512-gCubfBUZ6KxzoibJ+SCUc/57Ms1jz5NjHe4+dI2krNmU5zCPAphyLJYyTOg06ueIyfj+SaCUqmzun7ImlxDcKg== -"@types/yargs@^13.0.0": - version "13.0.3" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.3.tgz#76482af3981d4412d65371a318f992d33464a380" - integrity sha512-K8/LfZq2duW33XW/tFwEAfnZlqIfVsoyRB3kfXdPXYhl0nfM8mmh7GS0jg7WrX2Dgq/0Ha/pR1PaR+BvmWwjiQ== +"@types/yargs@^15.0.0": + version "15.0.1" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.1.tgz#9266a9d7be68cfcc982568211085a49a277f7c96" + integrity sha512-sYlwNU7zYi6eZbMzFvG6eHD7VsEvFdoDtlD7eI1JTg7YNnuguzmiGsc6MPSq5l8n+h21AsNof0je+9sgOe4+dg== dependencies: "@types/yargs-parser" "*" @@ -1194,11 +1243,6 @@ ansi-regex@^3.0.0: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= -ansi-regex@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997" - integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg== - ansi-regex@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75" @@ -1209,14 +1253,14 @@ ansi-styles@^2.2.1: resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4= -ansi-styles@^3.2.0, ansi-styles@^3.2.1: +ansi-styles@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== dependencies: color-convert "^1.9.0" -ansi-styles@^4.0.0: +ansi-styles@^4.0.0, ansi-styles@^4.1.0: version "4.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz#90ae75c424d008d2624c5bf29ead3177ebfcf359" integrity sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA== @@ -1224,14 +1268,6 @@ ansi-styles@^4.0.0: "@types/color-name" "^1.1.1" color-convert "^2.0.1" -ansi-styles@^4.1.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.0.tgz#5681f0dcf7ae5880a7841d8831c4724ed9cc0172" - integrity sha512-7kFQgnEaMdRtwf6uSfUnVr9gSGC7faurn+J/Mv90/W+iTtN0405/nLdopfMWwchyxhbGYl6TC4Sccn9TUkGAgg== - dependencies: - "@types/color-name" "^1.1.1" - color-convert "^2.0.1" - any-promise@^1.0.0: version "1.3.0" resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f" @@ -1245,6 +1281,14 @@ anymatch@^2.0.0: micromatch "^3.1.4" normalize-path "^2.1.1" +anymatch@^3.0.3: + version "3.1.1" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142" + integrity sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg== + dependencies: + normalize-path "^3.0.0" + picomatch "^2.0.4" + aproba@^1.0.3: version "1.2.0" resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" @@ -1441,6 +1485,17 @@ babel-plugin-dynamic-import-node@^2.3.0: dependencies: object.assign "^4.1.0" +babel-plugin-istanbul@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz#e159ccdc9af95e0b570c75b4573b7c34d671d765" + integrity sha512-AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ== + dependencies: + "@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-runtime@^6.11.6: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe" @@ -1538,6 +1593,13 @@ braces@^2.3.1, braces@^2.3.2: split-string "^3.0.2" to-regex "^3.0.1" +braces@^3.0.1: + version "3.0.2" + resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" + integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== + dependencies: + fill-range "^7.0.1" + brorand@^1.0.1: version "1.1.0" resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f" @@ -1684,6 +1746,13 @@ browserslist@^4.6.0, browserslist@^4.8.2, browserslist@^4.8.3: electron-to-chromium "^1.3.322" node-releases "^1.1.44" +bser@2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05" + integrity sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ== + dependencies: + node-int64 "^0.4.0" + buffer-crc32@~0.2.3: version "0.2.13" resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" @@ -1771,7 +1840,7 @@ camelcase@^4.1.0: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd" integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0= -camelcase@^5.0.0: +camelcase@^5.0.0, camelcase@^5.3.1: version "5.3.1" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== @@ -1781,6 +1850,13 @@ caniuse-lite@^1.0.30001017: resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001020.tgz#3f04c1737500ffda78be9beb0b5c1e2070e15926" integrity sha512-yWIvwA68wRHKanAVS1GjN8vajAv7MBFshullKCeq/eKpK7pJBVDgFFEqvgWTkcP2+wIDeQGYFRXECjKZnLkUjA== +capture-exit@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-2.0.0.tgz#fb953bfaebeb781f62898239dabb426d08a509a4" + integrity sha512-PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g== + dependencies: + rsvp "^4.8.4" + caseless@~0.12.0: version "0.12.0" resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" @@ -1865,6 +1941,11 @@ ci-info@^1.5.0: resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.6.0.tgz#2ca20dbb9ceb32d4524a683303313f0304b1e497" integrity sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A== +ci-info@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46" + integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ== + cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3: version "1.0.4" resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de" @@ -1958,6 +2039,11 @@ coffeescript@1.12.7: resolved "https://registry.yarnpkg.com/coffeescript/-/coffeescript-1.12.7.tgz#e57ee4c4867cf7f606bfc4a0f2d550c0981ddd27" integrity sha512-pLXHFxQMPklVoEekowk8b3erNynC+DVJzChxS/LCBBgR6/8AJkHivkm//zbowcfc7BTCAjryuhx6gPqPRfsFoA== +collect-v8-coverage@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.0.tgz#150ee634ac3650b71d9c985eb7f608942334feb1" + integrity sha512-VKIhJgvk8E1W28m5avZ2Gv2Ruv5YiF56ug2oclvaG9md69BuZImMG2sk9g7QNKLUbtYAKQjXjYxbYZVUlMMKmQ== + collection-visit@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0" @@ -2262,7 +2348,7 @@ conventional-recommended-bump@6.0.5: meow "^5.0.0" q "^1.5.1" -convert-source-map@^1.1.0, convert-source-map@^1.3.0, convert-source-map@^1.7.0: +convert-source-map@^1.1.0, convert-source-map@^1.3.0, convert-source-map@^1.4.0, convert-source-map@^1.7.0: version "1.7.0" resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442" integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA== @@ -2673,7 +2759,7 @@ deep-extend@^0.6.0: resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== -define-properties@^1.1.2: +define-properties@^1.1.2, define-properties@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ== @@ -2759,10 +2845,10 @@ detective@^5.0.2: defined "^1.0.0" minimist "^1.1.1" -diff-sequences@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-24.9.0.tgz#5715d6244e2aa65f48bba0bc972db0b0b11e95b5" - integrity sha512-Dj6Wk3tWyTE+Fo1rW8v0Xhwk80um6yFYKbuAxc9c3EZxIHFDYwbi34Uk42u1CdnIiVorvt4RmlSDjIPyzGC2ew== +diff-sequences@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-25.1.0.tgz#fd29a46f1c913fd66c22645dc75bffbe43051f32" + integrity sha512-nFIfVk5B/NStCsJ+zaPO4vYuLjlzQ6uFvPxzYyHlejNZ/UGa7G/n7peOXVrVNvRuyfstt+mZQYGpjxg9Z6N8Kw== diff@^3.0.0: version "3.5.0" @@ -2864,6 +2950,13 @@ emoji-regex@^8.0.0: resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== +end-of-stream@^1.1.0: + version "1.4.4" + resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" + integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== + dependencies: + once "^1.4.0" + error-ex@^1.2.0, error-ex@^1.3.1: version "1.3.2" resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" @@ -2878,6 +2971,23 @@ error-stack-parser@^2.0.1: dependencies: stackframe "^1.0.4" +es-abstract@^1.17.0-next.1, es-abstract@^1.17.2: + version "1.17.4" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.4.tgz#e3aedf19706b20e7c2594c35fc0d57605a79e184" + integrity sha512-Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ== + dependencies: + 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" + es-abstract@^1.4.3: version "1.13.0" resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz#ac86145fdd5099d8dd49558ccba2eaf9b88e24e9" @@ -2899,6 +3009,15 @@ es-to-primitive@^1.2.0: is-date-object "^1.0.1" is-symbol "^1.0.2" +es-to-primitive@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a" + integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA== + dependencies: + is-callable "^1.1.4" + is-date-object "^1.0.1" + is-symbol "^1.0.2" + es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14, es5-ext@~0.10.46: version "0.10.49" resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.49.tgz#059a239de862c94494fec28f8150c977028c6c5e" @@ -2975,6 +3094,11 @@ evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3: md5.js "^1.3.4" safe-buffer "^5.1.1" +exec-sh@^0.3.2: + version "0.3.4" + resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.4.tgz#3a018ceb526cc6f6df2bb504b2bfe8e3a4934ec5" + integrity sha512-sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A== + execa@0.10.0: version "0.10.0" resolved "https://registry.yarnpkg.com/execa/-/execa-0.10.0.tgz#ff456a8f53f90f8eccc71a96d11bdfc7f082cb50" @@ -2988,6 +3112,19 @@ execa@0.10.0: signal-exit "^3.0.0" strip-eof "^1.0.0" +execa@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8" + integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA== + dependencies: + 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" + executable@4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/executable/-/executable-4.1.1.tgz#41532bff361d3e57af4d763b70582db18f5d133c" @@ -3013,17 +3150,17 @@ expand-brackets@^2.1.4: snapdragon "^0.8.1" to-regex "^3.0.1" -expect@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/expect/-/expect-24.9.0.tgz#b75165b4817074fa4a157794f46fe9f1ba15b6ca" - integrity sha512-wvVAx8XIol3Z5m9zvZXiyZOQ+sRJqNTIm6sGjdWlaZIeupQGO3WbYI+15D/AmEwZywL6wtJkbAbJtzkOfBuR0Q== +expect@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/expect/-/expect-25.1.0.tgz#7e8d7b06a53f7d66ec927278db3304254ee683ee" + integrity sha512-wqHzuoapQkhc3OKPlrpetsfueuEiMf3iWh0R8+duCu9PIjXoP7HgD5aeypwTnXUAjC8aMsiVDaWwlbJ1RlQ38g== dependencies: - "@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.1.0" + ansi-styles "^4.0.0" + jest-get-type "^25.1.0" + jest-matcher-utils "^25.1.0" + jest-message-util "^25.1.0" + jest-regex-util "^25.1.0" extend-shallow@^2.0.1: version "2.0.1" @@ -3094,6 +3231,13 @@ fast-json-stable-stringify@^2.0.0: resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2" integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I= +fb-watchman@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.1.tgz#fc84fb39d2709cf3ff6d743706157bb5708a8a85" + integrity sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg== + dependencies: + bser "2.1.1" + fd-slicer@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.0.1.tgz#8b5bcbd9ec327c5041bf9ab023fd6750f1177e65" @@ -3140,6 +3284,13 @@ fill-range@^4.0.0: repeat-string "^1.6.1" to-regex-range "^2.1.0" +fill-range@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" + integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== + dependencies: + to-regex-range "^5.0.1" + find-cache-dir@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7" @@ -3250,6 +3401,11 @@ fsevents@^1.2.7: nan "^2.9.2" node-pre-gyp "^0.10.0" +fsevents@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.2.tgz#4c0a1fb34bc68e543b4b82a9ec392bfbda840805" + integrity sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA== + function-bind@^1.0.2, function-bind@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" @@ -3310,6 +3466,13 @@ get-stream@^3.0.0: resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14" integrity sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ= +get-stream@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5" + integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w== + dependencies: + pump "^3.0.0" + get-value@^2.0.3, get-value@^2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" @@ -3393,6 +3556,18 @@ glob@^7.0.0, glob@^7.1.0, glob@^7.1.2, glob@^7.1.3: once "^1.3.0" path-is-absolute "^1.0.0" +glob@^7.1.4: + version "7.1.6" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" + integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== + dependencies: + 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" + global-dirs@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz#b319c0dd4607f353f3be9cca4c72fc148c49f445" @@ -3410,7 +3585,7 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6: resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00" integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA== -graceful-fs@^4.1.15: +graceful-fs@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423" integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ== @@ -3479,6 +3654,11 @@ has-symbols@^1.0.0: resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44" integrity sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q= +has-symbols@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8" + integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg== + has-unicode@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" @@ -3598,6 +3778,11 @@ ignore-walk@^3.0.1: dependencies: minimatch "^3.0.4" +imurmurhash@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" + integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= + indent-string@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80" @@ -3704,6 +3889,11 @@ is-callable@^1.1.4: resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75" integrity sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA== +is-callable@^1.1.5: + version "1.1.5" + resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz#f7e46b596890456db74e7f6e976cb3273d06faab" + integrity sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q== + is-ci@1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.2.1.tgz#e3779c8ee17fccf428488f6e281187f2e632841c" @@ -3711,6 +3901,13 @@ is-ci@1.2.1: dependencies: ci-info "^1.5.0" +is-ci@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c" + integrity sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w== + dependencies: + ci-info "^2.0.0" + is-data-descriptor@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56" @@ -3828,6 +4025,11 @@ is-number@^3.0.0: dependencies: kind-of "^3.0.2" +is-number@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" + integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== + is-obj@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f" @@ -3864,6 +4066,13 @@ is-regex@^1.0.4: dependencies: has "^1.0.1" +is-regex@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.5.tgz#39d589a358bf18967f726967120b8fc1aed74eae" + integrity sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ== + dependencies: + has "^1.0.3" + is-stream@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" @@ -3888,7 +4097,7 @@ is-text-path@^1.0.1: dependencies: text-extensions "^1.0.0" -is-typedarray@~1.0.0: +is-typedarray@^1.0.0, is-typedarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= @@ -3935,49 +4144,108 @@ isstream@~0.1.2: resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo= -jest-diff@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-24.9.0.tgz#931b7d0d5778a1baf7452cb816e325e3724055da" - integrity sha512-qMfrTs8AdJE2iqrTp0hzh7kTd2PQWrsFyj9tORoKmu32xjPjeE4NyjVRDz8ybYwqS2ik8N4hsIpiVTyFeo2lBQ== +istanbul-lib-coverage@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz#f5944a37c70b550b02a78a5c3b2055b280cec8ec" + integrity sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg== + +istanbul-lib-instrument@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.0.tgz#53321a7970f076262fd3292c8f9b2e4ac544aae1" + integrity sha512-Nm4wVHdo7ZXSG30KjZ2Wl5SU/Bw7bDx1PdaiIFzEStdjs0H12mOTncn1GVYuqQSaZxpg87VGBRsVRPGD2cD1AQ== dependencies: - chalk "^2.0.1" - diff-sequences "^24.9.0" - jest-get-type "^24.9.0" - pretty-format "^24.9.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" -jest-get-type@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-24.9.0.tgz#1684a0c8a50f2e4901b6644ae861f579eed2ef0e" - integrity sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q== - -jest-matcher-utils@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-24.9.0.tgz#f5b3661d5e628dffe6dd65251dfdae0e87c3a073" - integrity sha512-OZz2IXsu6eaiMAwe67c1T+5tUAtQyQx27/EMEkbFAGiw52tB9em+uGbzpcgYVpA8wl0hlxKPZxrly4CXU/GjHA== +jest-diff@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-25.1.0.tgz#58b827e63edea1bc80c1de952b80cec9ac50e1ad" + integrity sha512-nepXgajT+h017APJTreSieh4zCqnSHEJ1iT8HDlewu630lSJ4Kjjr9KNzm+kzGwwcpsDE6Snx1GJGzzsefaEHw== dependencies: - chalk "^2.0.1" - jest-diff "^24.9.0" - jest-get-type "^24.9.0" - pretty-format "^24.9.0" + chalk "^3.0.0" + diff-sequences "^25.1.0" + jest-get-type "^25.1.0" + pretty-format "^25.1.0" -jest-message-util@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-24.9.0.tgz#527f54a1e380f5e202a8d1149b0ec872f43119e3" - integrity sha512-oCj8FiZ3U0hTP4aSui87P4L4jC37BtQwUMqk+zk/b11FR19BJDeZsZAvIHutWnmtw7r85UmR3CEWZ0HWU2mAlw== +jest-get-type@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-25.1.0.tgz#1cfe5fc34f148dc3a8a3b7275f6b9ce9e2e8a876" + integrity sha512-yWkBnT+5tMr8ANB6V+OjmrIJufHtCAqI5ic2H40v+tRqxDmE0PGnIiTyvRWFOMtmVHYpwRqyazDbTnhpjsGvLw== + +jest-haste-map@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-25.1.0.tgz#ae12163d284f19906260aa51fd405b5b2e5a4ad3" + integrity sha512-/2oYINIdnQZAqyWSn1GTku571aAfs8NxzSErGek65Iu5o8JYb+113bZysRMcC/pjE5v9w0Yz+ldbj9NxrFyPyw== + dependencies: + "@jest/types" "^25.1.0" + anymatch "^3.0.3" + fb-watchman "^2.0.0" + graceful-fs "^4.2.3" + jest-serializer "^25.1.0" + jest-util "^25.1.0" + jest-worker "^25.1.0" + micromatch "^4.0.2" + sane "^4.0.3" + walker "^1.0.7" + optionalDependencies: + fsevents "^2.1.2" + +jest-matcher-utils@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-25.1.0.tgz#fa5996c45c7193a3c24e73066fc14acdee020220" + integrity sha512-KGOAFcSFbclXIFE7bS4C53iYobKI20ZWleAdAFun4W1Wz1Kkej8Ng6RRbhL8leaEvIOjGXhGf/a1JjO8bkxIWQ== + dependencies: + chalk "^3.0.0" + jest-diff "^25.1.0" + jest-get-type "^25.1.0" + pretty-format "^25.1.0" + +jest-message-util@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-25.1.0.tgz#702a9a5cb05c144b9aa73f06e17faa219389845e" + integrity sha512-Nr/Iwar2COfN22aCqX0kCVbXgn8IBm9nWf4xwGr5Olv/KZh0CZ32RKgZWMVDXGdOahicM10/fgjdimGNX/ttCQ== dependencies: "@babel/code-frame" "^7.0.0" - "@jest/test-result" "^24.9.0" - "@jest/types" "^24.9.0" + "@jest/test-result" "^25.1.0" + "@jest/types" "^25.1.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@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-24.9.0.tgz#c13fb3380bde22bf6575432c493ea8fe37965636" - integrity sha512-05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA== +jest-regex-util@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-25.1.0.tgz#efaf75914267741838e01de24da07b2192d16d87" + integrity sha512-9lShaDmDpqwg+xAd73zHydKrBbbrIi08Kk9YryBEBybQFg/lBWR/2BDjjiSE7KIppM9C5+c03XiDaZ+m4Pgs1w== + +jest-serializer@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-25.1.0.tgz#73096ba90e07d19dec4a0c1dd89c355e2f129e5d" + integrity sha512-20Wkq5j7o84kssBwvyuJ7Xhn7hdPeTXndnwIblKDR2/sy1SUm6rWWiG9kSCgJPIfkDScJCIsTtOKdlzfIHOfKA== + +jest-util@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-25.1.0.tgz#7bc56f7b2abd534910e9fa252692f50624c897d9" + integrity sha512-7did6pLQ++87Qsj26Fs/TIwZMUFBXQ+4XXSodRNy3luch2DnRXsSnmpVtxxQ0Yd6WTipGpbhh2IFP1mq6/fQGw== + dependencies: + "@jest/types" "^25.1.0" + chalk "^3.0.0" + is-ci "^2.0.0" + mkdirp "^0.5.1" + +jest-worker@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-25.1.0.tgz#75d038bad6fdf58eba0d2ec1835856c497e3907a" + integrity sha512-ZHhHtlxOWSxCoNOKHGbiLzXnl42ga9CxDr27H36Qn+15pQZd3R/F24jrmjDelw9j/iHUIWMWs08/u2QN50HHOg== + dependencies: + merge-stream "^2.0.0" + supports-color "^7.0.0" js-levenshtein@^1.1.3: version "1.1.6" @@ -4330,6 +4598,13 @@ make-dir@^2.0.0, make-dir@^2.1.0: pify "^4.0.1" semver "^5.6.0" +makeerror@1.0.x: + version "1.0.11" + resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c" + integrity sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw= + dependencies: + tmpl "1.0.x" + map-cache@^0.2.2: version "0.2.2" resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf" @@ -4412,6 +4687,11 @@ meow@^5.0.0: trim-newlines "^2.0.0" yargs-parser "^10.0.0" +merge-stream@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" + integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== + micromatch@^3.1.10, micromatch@^3.1.4: version "3.1.10" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" @@ -4431,6 +4711,14 @@ micromatch@^3.1.10, micromatch@^3.1.4: snapdragon "^0.8.1" to-regex "^3.0.2" +micromatch@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259" + integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q== + dependencies: + braces "^3.0.1" + picomatch "^2.0.5" + miller-rabin@^4.0.0: version "4.0.1" resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d" @@ -4663,6 +4951,11 @@ node-fetch@^2.2.0, node-fetch@^2.6.0: resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd" integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA== +node-int64@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b" + integrity sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs= + node-modules-regexp@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz#8d9dbe28964a4ac5712e9131642107c71e90ec40" @@ -4795,7 +5088,12 @@ object-copy@^0.1.0: define-property "^0.2.5" kind-of "^3.0.3" -object-keys@^1.0.11: +object-inspect@^1.7.0: + version "1.7.0" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz#f4f6bd181ad77f006b5ece60bd0b6f398ff74a67" + integrity sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw== + +object-keys@^1.0.11, object-keys@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== @@ -4822,6 +5120,14 @@ object.assign@^4.1.0: has-symbols "^1.0.0" object-keys "^1.0.11" +object.getownpropertydescriptors@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz#369bf1f9592d8ab89d712dced5cb81c7c5352649" + integrity sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.0-next.1" + object.pick@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747" @@ -4829,7 +5135,7 @@ object.pick@^1.3.0: dependencies: isobject "^3.0.1" -once@^1.3.0: +once@^1.3.0, once@^1.3.1, once@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= @@ -5111,6 +5417,11 @@ performance-now@^2.1.0: resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= +picomatch@^2.0.4, picomatch@^2.0.5: + version "2.2.1" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.1.tgz#21bac888b6ed8601f831ce7816e335bc779f0a4a" + integrity sha512-ISBaA8xQNmwELC7eOjqFKMESB2VIqt4PPDD0nsS95b/9dZXvVKOlz9keMSnoGGKcOHXfTvDD6WMaRoSc9UuhRA== + pidtree@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/pidtree/-/pidtree-0.3.0.tgz#f6fada10fccc9f99bf50e90d0b23d72c9ebc2e6b" @@ -5143,7 +5454,7 @@ pinkie@^2.0.0: resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA= -pirates@^4.0.0: +pirates@^4.0.0, pirates@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.1.tgz#643a92caf894566f91b2b986d2c66950a8e2fb87" integrity sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA== @@ -5162,15 +5473,15 @@ posix-character-classes@^0.1.0: resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs= -pretty-format@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-24.9.0.tgz#12fac31b37019a4eea3c11aa9a959eb7628aa7c9" - integrity sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA== +pretty-format@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-25.1.0.tgz#ed869bdaec1356fc5ae45de045e2c8ec7b07b0c8" + integrity sha512-46zLRSGLd02Rp+Lhad9zzuNZ+swunitn8zIpfD2B4OPCRLXbM87RJT2aBLBWYOznNUML/2l/ReMyWNC80PJBUQ== dependencies: - "@jest/types" "^24.9.0" - ansi-regex "^4.0.0" - ansi-styles "^3.2.0" - react-is "^16.8.4" + "@jest/types" "^25.1.0" + ansi-regex "^5.0.0" + ansi-styles "^4.0.0" + react-is "^16.12.0" private@^0.1.6: version "0.1.8" @@ -5209,6 +5520,14 @@ public-encrypt@^4.0.0: randombytes "^2.0.1" safe-buffer "^5.1.2" +pump@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" + integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww== + dependencies: + end-of-stream "^1.1.0" + once "^1.3.1" + punycode@1.3.2: version "1.3.2" resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d" @@ -5279,7 +5598,7 @@ rc@^1.2.7: minimist "^1.2.0" strip-json-comments "~2.0.1" -react-is@^16.8.4: +react-is@^16.12.0: version "16.12.0" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.12.0.tgz#2cc0fe0fba742d97fd527c42a13bec4eeb06241c" integrity sha512-rPCkf/mWBtKc97aLL9/txD8DZdemK0vkA3JMLShjlJB3Pj3s+lpf1KaBzMfQrAmhMQB0n1cU/SUGgKKBCe837Q== @@ -5356,6 +5675,13 @@ readdirp@^2.2.1: micromatch "^3.1.10" readable-stream "^2.0.2" +realpath-native@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/realpath-native/-/realpath-native-1.1.0.tgz#2003294fea23fb0672f2476ebe22fcf498a2d65c" + integrity sha512-wlgPA6cCIIg9gKz0fgAPjnzh4yR/LnXovwuo9hvyGvx3h8nX4+/iLZplfUWasXpqD8BdnGnP5njOFjkUwPzvjA== + dependencies: + util.promisify "^1.0.0" + redent@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde" @@ -5508,6 +5834,11 @@ require-main-filename@^2.0.0: resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b" integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg== +resolve-from@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" + integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== + resolve-url@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" @@ -5553,6 +5884,11 @@ ripemd160@^2.0.0, ripemd160@^2.0.1: hash-base "^3.0.0" inherits "^2.0.1" +rsvp@^4.8.4: + version "4.8.5" + resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734" + integrity sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA== + rxjs@^5.0.0-beta.11: version "5.5.12" resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.12.tgz#6fa61b8a77c3d793dbaf270bee2f43f652d741cc" @@ -5584,6 +5920,21 @@ safe-regex@^1.1.0: resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== +sane@^4.0.3: + version "4.1.0" + resolved "https://registry.yarnpkg.com/sane/-/sane-4.1.0.tgz#ed881fd922733a6c461bc189dc2b6c006f3ffded" + integrity sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA== + dependencies: + "@cnakazawa/watch" "^1.0.3" + anymatch "^2.0.0" + capture-exit "^2.0.0" + exec-sh "^0.3.2" + execa "^1.0.0" + fb-watchman "^2.0.0" + micromatch "^3.1.4" + minimist "^1.1.1" + walker "~1.0.5" + sax@^1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" @@ -5674,7 +6025,7 @@ shell-quote@^1.4.2, shell-quote@^1.6.1: array-reduce "~0.0.0" jsonify "~0.0.0" -signal-exit@^3.0.0: +signal-exit@^3.0.0, signal-exit@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0= @@ -5684,10 +6035,10 @@ simple-concat@^1.0.0: resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.0.tgz#7344cbb8b6e26fb27d66b2fc86f9f6d5997521c6" integrity sha1-c0TLuLbib7J9ZrL8hvn21Zl1IcY= -slash@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44" - integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A== +slash@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" + integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== slice-ansi@0.0.4: version "0.0.4" @@ -5990,6 +6341,22 @@ string.prototype.padend@^3.0.0: es-abstract "^1.4.3" function-bind "^1.0.2" +string.prototype.trimleft@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz#9bdb8ac6abd6d602b17a4ed321870d2f8dcefc74" + integrity sha512-iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag== + dependencies: + define-properties "^1.1.3" + function-bind "^1.1.1" + +string.prototype.trimright@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz#440314b15996c866ce8a0341894d45186200c5d9" + integrity sha512-qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g== + dependencies: + define-properties "^1.1.3" + function-bind "^1.1.1" + string_decoder@^1.1.1: version "1.2.0" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.2.0.tgz#fe86e738b19544afe70469243b2a1ee9240eae8d" @@ -6083,7 +6450,7 @@ supports-color@^2.0.0: resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= -supports-color@^7.1.0: +supports-color@^7.0.0, supports-color@^7.1.0: version "7.1.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1" integrity sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g== @@ -6124,6 +6491,15 @@ teeny-request@^3.11.3: node-fetch "^2.2.0" uuid "^3.3.2" +test-exclude@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e" + integrity sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w== + dependencies: + "@istanbuljs/schema" "^0.1.2" + glob "^7.1.4" + minimatch "^3.0.4" + text-encoding-utf-8@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/text-encoding-utf-8/-/text-encoding-utf-8-1.0.2.tgz#585b62197b0ae437e3c7b5d0af27ac1021e10d13" @@ -6195,6 +6571,11 @@ tmp@0.1.0: dependencies: rimraf "^2.6.3" +tmpl@1.0.x: + version "1.0.4" + resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1" + integrity sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE= + to-arraybuffer@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43" @@ -6220,6 +6601,13 @@ to-regex-range@^2.1.0: is-number "^3.0.0" repeat-string "^1.6.1" +to-regex-range@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" + integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ== + dependencies: + is-number "^7.0.0" + to-regex@^3.0.1, to-regex@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce" @@ -6285,6 +6673,13 @@ type-fest@^0.3.0: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.3.1.tgz#63d00d204e059474fe5e1b7c011112bbd1dc29e1" integrity sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ== +typedarray-to-buffer@^3.1.5: + version "3.1.5" + resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080" + integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q== + dependencies: + is-typedarray "^1.0.0" + typedarray@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" @@ -6420,6 +6815,16 @@ util-deprecate@^1.0.1, util-deprecate@~1.0.1: resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= +util.promisify@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.1.tgz#6baf7774b80eeb0f7520d8b81d07982a59abbaee" + integrity sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.2" + has-symbols "^1.0.1" + object.getownpropertydescriptors "^2.1.0" + util@0.10.3: version "0.10.3" resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9" @@ -6461,6 +6866,13 @@ vm-browserify@^1.0.0: resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.0.tgz#bd76d6a23323e2ca8ffa12028dc04559c75f9019" integrity sha512-iq+S7vZJE60yejDYM0ek6zg308+UZsdtPExWP9VZoCFCz1zkJoXFnAX7aZfd/ZwrkidzdUZL0C/ryW+JwAiIGw== +walker@^1.0.7, walker@~1.0.5: + version "1.0.7" + resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb" + integrity sha1-L3+bj9ENZ3JisYqITijRlhjgKPs= + dependencies: + makeerror "1.0.x" + watchify@3.11.1: version "3.11.1" resolved "https://registry.yarnpkg.com/watchify/-/watchify-3.11.1.tgz#8e4665871fff1ef64c0430d1a2c9d084d9721881" @@ -6517,6 +6929,16 @@ wrappy@1: resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= +write-file-atomic@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.1.tgz#558328352e673b5bb192cf86500d60b230667d4b" + integrity sha512-JPStrIyyVJ6oCSz/691fAjFtefZ6q+fP6tm+OS4Qw6o+TGQxNp1ziY2PgS+X/m0V8OWhZiO/m4xSj+Pr4RrZvw== + dependencies: + imurmurhash "^0.1.4" + is-typedarray "^1.0.0" + signal-exit "^3.0.2" + typedarray-to-buffer "^3.1.5" + xregexp@^4.2.4: version "4.2.4" resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.2.4.tgz#02a4aea056d65a42632c02f0233eab8e4d7e57ed" From 9326551885418dde0f126cd944a78de77080c905 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 22 Jan 2020 04:19:24 +0000 Subject: [PATCH 10/67] build(deps-dev): bump jest from 24.9.0 to 25.1.0 in /backend Bumps [jest](https://github.com/facebook/jest) from 24.9.0 to 25.1.0. - [Release notes](https://github.com/facebook/jest/releases) - [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md) - [Commits](https://github.com/facebook/jest/compare/v24.9.0...v25.1.0) Signed-off-by: dependabot-preview[bot] --- backend/package.json | 2 +- backend/yarn.lock | 1556 +++++++++++++++++++++++++++--------------- 2 files changed, 1005 insertions(+), 553 deletions(-) diff --git a/backend/package.json b/backend/package.json index a6504cc3d..3bf6f70f3 100644 --- a/backend/package.json +++ b/backend/package.json @@ -118,7 +118,7 @@ "eslint-plugin-prettier": "~3.1.2", "eslint-plugin-promise": "~4.2.1", "eslint-plugin-standard": "~4.0.1", - "jest": "~24.9.0", + "jest": "~25.1.0", "nodemon": "~2.0.2", "prettier": "~1.19.1", "supertest": "~4.0.2" diff --git a/backend/yarn.lock b/backend/yarn.lock index 5749c5639..267c54eb3 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -65,7 +65,7 @@ invariant "^2.2.4" semver "^5.5.0" -"@babel/core@^7.1.0", "@babel/core@~7.8.3": +"@babel/core@^7.1.0", "@babel/core@^7.7.5", "@babel/core@~7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.8.3.tgz#30b0ebb4dd1585de6923a0b4d179e0b9f5d82941" integrity sha512-4XFkf8AwyrEG7Ziu3L2L0Cv+WyY47Tcsp70JFmpftbAA1K7YL/sgE9jh9HyNj08Y/U50ItUchpN0w6HxAoX1rA== @@ -302,7 +302,7 @@ resolve "^1.13.1" v8flags "^3.1.1" -"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.4.3", "@babel/parser@^7.8.3": +"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.4.3", "@babel/parser@^7.7.5", "@babel/parser@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.8.3.tgz#790874091d2001c9be6ec426c2eed47bc7679081" integrity sha512-/V72F4Yp/qmHaTALizEm9Gf2eQHV3QyTL3K0cNfijwnMnb1L+LDlAubb/ZnSdGAVzVSWakujHYs1I26x66sMeQ== @@ -387,6 +387,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" +"@babel/plugin-syntax-bigint@^7.0.0": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz#4c9a6f669f5d0cdf1b90a1671e9a146be5300cea" + integrity sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + "@babel/plugin-syntax-dynamic-import@^7.8.0": version "7.8.0" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.0.tgz#3a6c1cd36af923db602df83c5aa72e08bb14353a" @@ -777,7 +784,7 @@ dependencies: regenerator-runtime "^0.13.2" -"@babel/template@^7.4.0", "@babel/template@^7.8.3": +"@babel/template@^7.4.0", "@babel/template@^7.7.4", "@babel/template@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.8.3.tgz#e02ad04fe262a657809327f578056ca15fd4d1b8" integrity sha512-04m87AcQgAFdvuoyiQ2kgELr2tV8B4fP/xJAVUL3Yb3bkNdMedD3d0rlSQr3PegP0cms3eHjl1F7PWlvWbU8FQ== @@ -786,7 +793,7 @@ "@babel/parser" "^7.8.3" "@babel/types" "^7.8.3" -"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.4.3", "@babel/traverse@^7.8.3": +"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.4.3", "@babel/traverse@^7.7.4", "@babel/traverse@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.8.3.tgz#a826215b011c9b4f73f3a893afbc05151358bf9a" integrity sha512-we+a2lti+eEImHmEXp7bM9cTxGzxPmBiVJlLVD+FuuQMeeO7RaDbutbgeheDkw+Xe3mCfJHnGOWLswT74m2IPg== @@ -810,6 +817,11 @@ lodash "^4.17.13" to-fast-properties "^2.0.0" +"@bcoe/v8-coverage@^0.2.3": + version "0.2.3" + resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" + integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== + "@cnakazawa/watch@^1.0.3": version "1.0.3" resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.3.tgz#099139eaec7ebf07a27c1786a3ff64f39464d2ef" @@ -955,7 +967,22 @@ dependencies: "@hapi/hoek" "^9.0.0" -"@jest/console@^24.7.1", "@jest/console@^24.9.0": +"@istanbuljs/load-nyc-config@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.0.0.tgz#10602de5570baea82f8afbfa2630b24e7a8cfe5b" + integrity sha512-ZR0rq/f/E4f4XcgnDvtMWXCUJpi8eO0rssVhmztsZqLIEFA9UUP9zmpE0VxlM+kv/E1ul2I876Fwil2ayptDVg== + dependencies: + camelcase "^5.3.1" + find-up "^4.1.0" + js-yaml "^3.13.1" + resolve-from "^5.0.0" + +"@istanbuljs/schema@^0.1.2": + version "0.1.2" + resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd" + integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw== + +"@jest/console@^24.9.0": version "24.9.0" resolved "https://registry.yarnpkg.com/@jest/console/-/console-24.9.0.tgz#79b1bc06fb74a8cfb01cbdedf945584b1b9707f0" integrity sha512-Zuj6b8TnKXi3q4ymac8EQfc3ea/uhLeCGThFqXeC8H9/raaH8ARPUTdId+XyGd03Z4In0/VjD2OYFcBF09fNLQ== @@ -964,49 +991,58 @@ chalk "^2.0.1" slash "^2.0.0" -"@jest/core@^24.9.0": - version "24.9.0" - resolved "https://registry.yarnpkg.com/@jest/core/-/core-24.9.0.tgz#2ceccd0b93181f9c4850e74f2a9ad43d351369c4" - integrity sha512-Fogg3s4wlAr1VX7q+rhV9RVnUv5tD7VuWfYy1+whMiWUrvl7U3QJSJyWcDio9Lq2prqYsZaeTv2Rz24pWGkJ2A== +"@jest/console@^25.1.0": + version "25.1.0" + resolved "https://registry.yarnpkg.com/@jest/console/-/console-25.1.0.tgz#1fc765d44a1e11aec5029c08e798246bd37075ab" + integrity sha512-3P1DpqAMK/L07ag/Y9/Jup5iDEG9P4pRAuZiMQnU0JB3UOvCyYCjCoxr7sIA80SeyUCUKrr24fKAxVpmBgQonA== dependencies: - "@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" + "@jest/source-map" "^25.1.0" + chalk "^3.0.0" + jest-util "^25.1.0" + slash "^3.0.0" -"@jest/environment@^24.9.0": - version "24.9.0" - resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-24.9.0.tgz#21e3afa2d65c0586cbd6cbefe208bafade44ab18" - integrity sha512-5A1QluTPhvdIPFYnO3sZC3smkNeXPVELz7ikPbhUj0bQjB07EoE9qtLrem14ZUYWdVayYbsjVwIiL4WBIMV4aQ== +"@jest/core@^25.1.0": + version "25.1.0" + resolved "https://registry.yarnpkg.com/@jest/core/-/core-25.1.0.tgz#3d4634fc3348bb2d7532915d67781cdac0869e47" + integrity sha512-iz05+NmwCmZRzMXvMo6KFipW7nzhbpEawrKrkkdJzgytavPse0biEnCNr2wRlyCsp3SmKaEY+SGv7YWYQnIdig== dependencies: - "@jest/fake-timers" "^24.9.0" - "@jest/transform" "^24.9.0" - "@jest/types" "^24.9.0" - jest-mock "^24.9.0" + "@jest/console" "^25.1.0" + "@jest/reporters" "^25.1.0" + "@jest/test-result" "^25.1.0" + "@jest/transform" "^25.1.0" + "@jest/types" "^25.1.0" + ansi-escapes "^4.2.1" + chalk "^3.0.0" + exit "^0.1.2" + graceful-fs "^4.2.3" + jest-changed-files "^25.1.0" + jest-config "^25.1.0" + jest-haste-map "^25.1.0" + jest-message-util "^25.1.0" + jest-regex-util "^25.1.0" + jest-resolve "^25.1.0" + jest-resolve-dependencies "^25.1.0" + jest-runner "^25.1.0" + jest-runtime "^25.1.0" + jest-snapshot "^25.1.0" + jest-util "^25.1.0" + jest-validate "^25.1.0" + jest-watcher "^25.1.0" + micromatch "^4.0.2" + p-each-series "^2.1.0" + realpath-native "^1.1.0" + rimraf "^3.0.0" + slash "^3.0.0" + strip-ansi "^6.0.0" + +"@jest/environment@^25.1.0": + version "25.1.0" + resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-25.1.0.tgz#4a97f64770c9d075f5d2b662b5169207f0a3f787" + integrity sha512-cTpUtsjU4cum53VqBDlcW0E4KbQF03Cn0jckGPW/5rrE9tb+porD3+hhLtHAwhthsqfyF+bizyodTlsRA++sHg== + dependencies: + "@jest/fake-timers" "^25.1.0" + "@jest/types" "^25.1.0" + jest-mock "^25.1.0" "@jest/fake-timers@^24.9.0": version "24.9.0" @@ -1017,34 +1053,51 @@ jest-message-util "^24.9.0" jest-mock "^24.9.0" -"@jest/reporters@^24.9.0": - version "24.9.0" - resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-24.9.0.tgz#86660eff8e2b9661d042a8e98a028b8d631a5b43" - integrity sha512-mu4X0yjaHrffOsWmVLzitKmmmWSQ3GGuefgNscUSWNiUNcEOSEQk9k3pERKEQVBb0Cnn88+UESIsZEMH3o88Gw== +"@jest/fake-timers@^25.1.0": + version "25.1.0" + resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-25.1.0.tgz#a1e0eff51ffdbb13ee81f35b52e0c1c11a350ce8" + integrity sha512-Eu3dysBzSAO1lD7cylZd/CVKdZZ1/43SF35iYBNV1Lvvn2Undp3Grwsv8PrzvbLhqwRzDd4zxrY4gsiHc+wygQ== dependencies: - "@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" + "@jest/types" "^25.1.0" + jest-message-util "^25.1.0" + jest-mock "^25.1.0" + jest-util "^25.1.0" + lolex "^5.0.0" + +"@jest/reporters@^25.1.0": + version "25.1.0" + resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-25.1.0.tgz#9178ecf136c48f125674ac328f82ddea46e482b0" + integrity sha512-ORLT7hq2acJQa8N+NKfs68ZtHFnJPxsGqmofxW7v7urVhzJvpKZG9M7FAcgh9Ee1ZbCteMrirHA3m5JfBtAaDg== + dependencies: + "@bcoe/v8-coverage" "^0.2.3" + "@jest/console" "^25.1.0" + "@jest/environment" "^25.1.0" + "@jest/test-result" "^25.1.0" + "@jest/transform" "^25.1.0" + "@jest/types" "^25.1.0" + chalk "^3.0.0" + collect-v8-coverage "^1.0.0" 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" + 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.0" + jest-haste-map "^25.1.0" + jest-resolve "^25.1.0" + jest-runtime "^25.1.0" + jest-util "^25.1.0" + jest-worker "^25.1.0" + slash "^3.0.0" source-map "^0.6.0" - string-length "^2.0.0" + string-length "^3.1.0" + terminal-link "^2.0.0" + v8-to-istanbul "^4.0.1" + optionalDependencies: + node-notifier "^6.0.0" -"@jest/source-map@^24.3.0", "@jest/source-map@^24.9.0": +"@jest/source-map@^24.9.0": version "24.9.0" resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-24.9.0.tgz#0e263a94430be4b41da683ccc1e6bffe2a191714" integrity sha512-/Xw7xGlsZb4MJzNDgB7PW5crou5JqWiBQaz6xyPd3ArOg2nfn/PunV8+olXbbEZzNl591o5rWKE9BRDaFAuIBg== @@ -1053,6 +1106,15 @@ graceful-fs "^4.1.15" source-map "^0.6.0" +"@jest/source-map@^25.1.0": + version "25.1.0" + resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-25.1.0.tgz#b012e6c469ccdbc379413f5c1b1ffb7ba7034fb0" + integrity sha512-ohf2iKT0xnLWcIUhL6U6QN+CwFWf9XnrM2a6ybL9NXxJjgYijjLSitkYHIdzkd8wFliH73qj/+epIpTiWjRtAA== + dependencies: + callsites "^3.0.0" + graceful-fs "^4.2.3" + source-map "^0.6.0" + "@jest/test-result@^24.9.0": version "24.9.0" resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-24.9.0.tgz#11796e8aa9dbf88ea025757b3152595ad06ba0ca" @@ -1062,15 +1124,26 @@ "@jest/types" "^24.9.0" "@types/istanbul-lib-coverage" "^2.0.0" -"@jest/test-sequencer@^24.9.0": - version "24.9.0" - resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-24.9.0.tgz#f8f334f35b625a4f2f355f2fe7e6036dad2e6b31" - integrity sha512-6qqsU4o0kW1dvA95qfNog8v8gkRN9ph6Lz7r96IvZpHdNipP2cBcb07J1Z45mz/VIS01OHJ3pY8T5fUY38tg4A== +"@jest/test-result@^25.1.0": + version "25.1.0" + resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-25.1.0.tgz#847af2972c1df9822a8200457e64be4ff62821f7" + integrity sha512-FZzSo36h++U93vNWZ0KgvlNuZ9pnDnztvaM7P/UcTx87aPDotG18bXifkf1Ji44B7k/eIatmMzkBapnAzjkJkg== dependencies: - "@jest/test-result" "^24.9.0" - jest-haste-map "^24.9.0" - jest-runner "^24.9.0" - jest-runtime "^24.9.0" + "@jest/console" "^25.1.0" + "@jest/transform" "^25.1.0" + "@jest/types" "^25.1.0" + "@types/istanbul-lib-coverage" "^2.0.0" + collect-v8-coverage "^1.0.0" + +"@jest/test-sequencer@^25.1.0": + version "25.1.0" + resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-25.1.0.tgz#4df47208542f0065f356fcdb80026e3c042851ab" + integrity sha512-WgZLRgVr2b4l/7ED1J1RJQBOharxS11EFhmwDqknpknE0Pm87HLZVS2Asuuw+HQdfQvm2aXL2FvvBLxOD1D0iw== + dependencies: + "@jest/test-result" "^25.1.0" + jest-haste-map "^25.1.0" + jest-runner "^25.1.0" + jest-runtime "^25.1.0" "@jest/transform@^24.9.0": version "24.9.0" @@ -1094,6 +1167,28 @@ source-map "^0.6.1" write-file-atomic "2.4.1" +"@jest/transform@^25.1.0": + version "25.1.0" + resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-25.1.0.tgz#221f354f512b4628d88ce776d5b9e601028ea9da" + integrity sha512-4ktrQ2TPREVeM+KxB4zskAT84SnmG1vaz4S+51aTefyqn3zocZUnliLLm5Fsl85I3p/kFPN4CRp1RElIfXGegQ== + dependencies: + "@babel/core" "^7.1.0" + "@jest/types" "^25.1.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.1.0" + jest-regex-util "^25.1.0" + jest-util "^25.1.0" + micromatch "^4.0.2" + pirates "^4.0.1" + realpath-native "^1.1.0" + slash "^3.0.0" + source-map "^0.6.1" + write-file-atomic "^3.0.0" + "@jest/types@^24.9.0": version "24.9.0" resolved "https://registry.yarnpkg.com/@jest/types/-/types-24.9.0.tgz#63cb26cb7500d069e5a389441a7c6ab5e909fc59" @@ -1103,6 +1198,16 @@ "@types/istanbul-reports" "^1.1.1" "@types/yargs" "^13.0.0" +"@jest/types@^25.1.0": + version "25.1.0" + resolved "https://registry.yarnpkg.com/@jest/types/-/types-25.1.0.tgz#b26831916f0d7c381e11dbb5e103a72aed1b4395" + integrity sha512-VpOtt7tCrgvamWZh1reVsGADujKigBUFTi19mlRjqEGsE8qH4r3s+skY33dNdXOwyZIvuftZ5tqdF1IgsMejMA== + dependencies: + "@types/istanbul-lib-coverage" "^2.0.0" + "@types/istanbul-reports" "^1.1.1" + "@types/yargs" "^15.0.0" + chalk "^3.0.0" + "@kamilkisiela/graphql-tools@4.0.6": version "4.0.6" resolved "https://registry.yarnpkg.com/@kamilkisiela/graphql-tools/-/graphql-tools-4.0.6.tgz#6dcf4d18bedaf34f6ab1d5bad2414e530d0875d1" @@ -1137,7 +1242,7 @@ url-regex "~4.1.1" video-extensions "~1.1.0" -"@metascraper/helpers@^5.10.3", "@metascraper/helpers@^5.10.5": +"@metascraper/helpers@^5.10.5": version "5.10.5" resolved "https://registry.yarnpkg.com/@metascraper/helpers/-/helpers-5.10.5.tgz#c3558533f30144bacecf9599fd02ac88d839a0cc" integrity sha512-noTBDk3cF3UzKoPrC9/Sye1f9945PVEDju6br7S19YWyUpceEXoDrPF1YaqN37ku62f1s7bul11+Lv/xAYuEVQ== @@ -1321,6 +1426,13 @@ resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea" integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ== +"@sinonjs/commons@^1.7.0": + version "1.7.0" + resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.7.0.tgz#f90ffc52a2e519f018b13b6c4da03cbff36ebed6" + integrity sha512-qbk9AP+cZUsKdW1GJsBpxPKFmCJ0T8swwzVje3qFd+AkQb74Q/tiuzrdfFg8AD2g5HH/XbE/I8Uc1KYHVYWfhg== + dependencies: + type-detect "4.0.8" + "@szmarczak/http-timer@^1.1.2": version "1.1.2" resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421" @@ -1376,6 +1488,11 @@ "@types/connect" "*" "@types/node" "*" +"@types/color-name@^1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0" + integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ== + "@types/connect@*": version "3.4.32" resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.32.tgz#aa0e9616b9435ccad02bc52b5b454ffc2c70ba28" @@ -1444,7 +1561,7 @@ resolved "https://registry.yarnpkg.com/@types/http-assert/-/http-assert-1.5.1.tgz#d775e93630c2469c2f980fc27e3143240335db3b" integrity sha512-PGAK759pxyfXE78NbKxyfRcWYA/KwW17X290cNev/qAsn9eQIxkH4shoNBafH37wewhDG/0p1cHPbK6+SzZjWQ== -"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0": +"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1": version "2.0.1" resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz#42995b446db9a48a11a07ec083499a860e9138ff" integrity sha512-hRJD2ahnnpLgsj6KWMYSrmXkM3rm2Dl1qkx6IOFD5FnuNPXJIG5L0dhgKXCYTRMGzU4n0wImQ/xfmRc4POUFlg== @@ -1557,6 +1674,13 @@ dependencies: "@types/yargs-parser" "*" +"@types/yargs@^15.0.0": + version "15.0.1" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.1.tgz#9266a9d7be68cfcc982568211085a49a277f7c96" + integrity sha512-sYlwNU7zYi6eZbMzFvG6eHD7VsEvFdoDtlD7eI1JTg7YNnuguzmiGsc6MPSq5l8n+h21AsNof0je+9sgOe4+dg== + dependencies: + "@types/yargs-parser" "*" + "@types/yup@0.26.27": version "0.26.27" resolved "https://registry.yarnpkg.com/@types/yup/-/yup-0.26.27.tgz#b928b1d644ffe98766e1440131222aefd3ca8f89" @@ -1620,10 +1744,10 @@ accepts@^1.3.5, accepts@~1.3.7: mime-types "~2.1.24" negotiator "0.6.2" -acorn-globals@^4.1.0: - version "4.3.3" - resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.3.tgz#a86f75b69680b8780d30edd21eee4e0ea170c05e" - integrity sha512-vkR40VwS2SYO98AIeFvzWWh+xyc2qi9s7OoXSFEGIP/rOJKzjnhykaZJNnHdoq4BL2gGxI5EZOU16z896EYnOQ== +acorn-globals@^4.3.2: + version "4.3.4" + resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.4.tgz#9fa1926addc11c97308c4e66d7add0d40c3272e7" + integrity sha512-clfQEh21R+D0leSbUdWf3OcfqyaCSAQ8Ryq00bofSekfr9W8u1jyYZo6ir0xu9Gtcf7BjcHJpnbZH7JOCpP60A== dependencies: acorn "^6.0.1" acorn-walk "^6.0.1" @@ -1638,11 +1762,6 @@ acorn-walk@^6.0.1: resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.2.0.tgz#123cb8f3b84c2171f1f7fb252615b1c78a6b1a8c" integrity sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA== -acorn@^5.5.3: - version "5.7.3" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279" - integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw== - acorn@^6.0.1: version "6.3.0" resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.3.0.tgz#0087509119ffa4fc0a0041d1e93a417e68cb856e" @@ -1691,11 +1810,6 @@ ansi-align@^2.0.0: dependencies: string-width "^2.0.0" -ansi-escapes@^3.0.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b" - integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ== - ansi-escapes@^4.2.1: version "4.2.1" resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.2.1.tgz#4dccdb846c3eee10f6d64dea66273eab90c37228" @@ -1713,11 +1827,16 @@ ansi-regex@^3.0.0: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= -ansi-regex@^4.0.0, ansi-regex@^4.1.0: +ansi-regex@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997" integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg== +ansi-regex@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75" + integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg== + ansi-styles@^3.1.0, ansi-styles@^3.2.0, ansi-styles@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" @@ -1725,6 +1844,14 @@ ansi-styles@^3.1.0, ansi-styles@^3.2.0, ansi-styles@^3.2.1: dependencies: color-convert "^1.9.0" +ansi-styles@^4.0.0, ansi-styles@^4.1.0: + version "4.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz#90ae75c424d008d2624c5bf29ead3177ebfcf359" + integrity sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA== + dependencies: + "@types/color-name" "^1.1.1" + color-convert "^2.0.1" + any-promise@^1.0.0: version "1.3.0" resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f" @@ -1738,7 +1865,7 @@ anymatch@^2.0.0: micromatch "^3.1.4" normalize-path "^2.1.1" -anymatch@~3.1.1: +anymatch@^3.0.3, anymatch@~3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142" integrity sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg== @@ -2204,7 +2331,20 @@ babel-eslint@~10.0.3: eslint-visitor-keys "^1.0.0" resolve "^1.12.0" -babel-jest@^24.9.0, babel-jest@~24.9.0: +babel-jest@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-25.1.0.tgz#206093ac380a4b78c4404a05b3277391278f80fb" + integrity sha512-tz0VxUhhOE2y+g8R2oFrO/2VtVjA1lkJeavlhExuRBg3LdNJY9gwQ+Vcvqt9+cqy71MCTJhewvTB7Qtnnr9SWg== + dependencies: + "@jest/transform" "^25.1.0" + "@jest/types" "^25.1.0" + "@types/babel__core" "^7.1.0" + babel-plugin-istanbul "^6.0.0" + babel-preset-jest "^25.1.0" + chalk "^3.0.0" + slash "^3.0.0" + +babel-jest@~24.9.0: version "24.9.0" resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-24.9.0.tgz#3fc327cb8467b89d14d7bc70e315104a783ccd54" integrity sha512-ntuddfyiN+EhMw58PTNL1ph4C9rECiQXjI4nMMBKBaNjXvqLdkXpPRcMSr4iyBrJg/+wz9brFUD6RhOAT6r4Iw== @@ -2234,6 +2374,17 @@ babel-plugin-istanbul@^5.1.0: istanbul-lib-instrument "^3.3.0" test-exclude "^5.2.3" +babel-plugin-istanbul@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz#e159ccdc9af95e0b570c75b4573b7c34d671d765" + integrity sha512-AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ== + dependencies: + "@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@^24.9.0: version "24.9.0" resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-24.9.0.tgz#4f837091eb407e01447c8843cbec546d0002d756" @@ -2241,6 +2392,13 @@ babel-plugin-jest-hoist@^24.9.0: dependencies: "@types/babel__traverse" "^7.0.6" +babel-plugin-jest-hoist@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-25.1.0.tgz#fb62d7b3b53eb36c97d1bc7fec2072f9bd115981" + integrity sha512-oIsopO41vW4YFZ9yNYoLQATnnN46lp+MZ6H4VvPKFkcc2/fkl3CfE/NZZSmnEIEsJRmJAgkVEK0R7Zbl50CpTw== + dependencies: + "@types/babel__traverse" "^7.0.6" + babel-plugin-transform-runtime@^6.23.0: version "6.23.0" resolved "https://registry.yarnpkg.com/babel-plugin-transform-runtime/-/babel-plugin-transform-runtime-6.23.0.tgz#88490d446502ea9b8e7efb0fe09ec4d99479b1ee" @@ -2256,6 +2414,15 @@ babel-preset-jest@^24.9.0: "@babel/plugin-syntax-object-rest-spread" "^7.0.0" babel-plugin-jest-hoist "^24.9.0" +babel-preset-jest@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-25.1.0.tgz#d0aebfebb2177a21cde710996fce8486d34f1d33" + integrity sha512-eCGn64olaqwUMaugXsTtGAM2I0QTahjEtnRu0ql8Ie+gDWAc1N6wqN0k2NilnyTunM69Pad7gJY7LOtwLimoFQ== + dependencies: + "@babel/plugin-syntax-bigint" "^7.0.0" + "@babel/plugin-syntax-object-rest-spread" "^7.0.0" + babel-plugin-jest-hoist "^25.1.0" + babel-runtime@^6.22.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe" @@ -2539,6 +2706,14 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.4.1, chalk@^2.4.2: escape-string-regexp "^1.0.5" supports-color "^5.3.0" +chalk@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4" + integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg== + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + chardet@^0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e" @@ -2679,14 +2854,14 @@ clipboardy@1.2.2: arch "^2.1.0" execa "^0.8.0" -cliui@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5" - integrity sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA== +cliui@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1" + integrity sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ== dependencies: - 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" clone-response@^1.0.2: version "1.0.2" @@ -2710,6 +2885,11 @@ collapse-white-space@^1.0.3: resolved "https://registry.yarnpkg.com/collapse-white-space/-/collapse-white-space-1.0.5.tgz#c2495b699ab1ed380d29a1091e01063e75dbbe3a" integrity sha512-703bOOmytCYAX9cXYqoikYIx6twmFCXsnzRQheBcTG3nzKYBR4P/+wkYeH+Mvj7qUz8zZDtdyzbxfnEi/kYzRQ== +collect-v8-coverage@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.0.tgz#150ee634ac3650b71d9c985eb7f608942334feb1" + integrity sha512-VKIhJgvk8E1W28m5avZ2Gv2Ruv5YiF56ug2oclvaG9md69BuZImMG2sk9g7QNKLUbtYAKQjXjYxbYZVUlMMKmQ== + collection-visit@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0" @@ -2725,11 +2905,23 @@ color-convert@^1.9.0: dependencies: color-name "1.1.3" +color-convert@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" + integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== + dependencies: + color-name "~1.1.4" + color-name@1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= +color-name@~1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" + integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== + colors@^1.1.2: version "1.3.3" resolved "https://registry.yarnpkg.com/colors/-/colors-1.3.3.tgz#39e005d546afe01e01f9c4ca8fa50f686a01205d" @@ -2752,11 +2944,6 @@ commander@^4.0.1: resolved "https://registry.yarnpkg.com/commander/-/commander-4.0.1.tgz#b67622721785993182e807f4883633e6401ba53c" integrity sha512-IPF4ouhCP+qdlcmCedhxX4xiGBPyigb8v5NeUp+0LyhwLgxMqyp3S0vl7TAPfS/hiP7FC3caI/PB9lTmP8r1NA== -commander@~2.20.3: - version "2.20.3" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" - integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== - commondir@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" @@ -2821,7 +3008,7 @@ content-type@~1.0.4: resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== -convert-source-map@^1.1.0, convert-source-map@^1.4.0, convert-source-map@^1.7.0: +convert-source-map@^1.1.0, convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0: version "1.7.0" resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442" integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA== @@ -2947,17 +3134,22 @@ css-what@2.1: resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.3.tgz#a6d7604573365fe74686c3f311c56513d88285f2" integrity sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg== -cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0": +cssom@^0.4.1: + version "0.4.4" + resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz#5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10" + integrity sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw== + +cssom@~0.3.6: version "0.3.8" resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a" integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg== -cssstyle@^1.0.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-1.4.0.tgz#9d31328229d3c565c61e586b02041a28fccdccf1" - integrity sha512-GBrLZYZ4X4x6/QEoBnIrqb8B/f5l4+8me2dkom/j1Gtbxy0kBv6OGzKuAsGM75bkGwGAFkt56Iwg28S3XTZgSA== +cssstyle@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.1.0.tgz#99f50a3aa21d4af16e758ae3e454dcf5940b9122" + integrity sha512-1iwCdymVYhMdQWiZ+9mB7x+urdNLPGTWsIZt6euFk8Yi+dOERK2ccoAUA3Bl8I5vmK5qfz/eLkBRyLbs42ov4A== dependencies: - cssom "0.3.x" + cssom "~0.3.6" cucumber-expressions@^8.1.0: version "8.2.1" @@ -3025,7 +3217,7 @@ dasherize@2.0.0: resolved "https://registry.yarnpkg.com/dasherize/-/dasherize-2.0.0.tgz#6d809c9cd0cf7bb8952d80fc84fa13d47ddb1308" integrity sha1-bYCcnNDPe7iVLYD8hPoT1H3bEwg= -data-urls@^1.0.0: +data-urls@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-1.1.0.tgz#15ee0582baa5e22bb59c77140da8f9c76963bbfe" integrity sha512-YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ== @@ -3173,10 +3365,10 @@ detect-libc@^1.0.2: resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= -detect-newline@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2" - integrity sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I= +detect-newline@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651" + integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA== dicer@0.3.0: version "0.3.0" @@ -3185,10 +3377,10 @@ dicer@0.3.0: dependencies: streamsearch "0.1.2" -diff-sequences@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-24.9.0.tgz#5715d6244e2aa65f48bba0bc972db0b0b11e95b5" - integrity sha512-Dj6Wk3tWyTE+Fo1rW8v0Xhwk80um6yFYKbuAxc9c3EZxIHFDYwbi34Uk42u1CdnIiVorvt4RmlSDjIPyzGC2ew== +diff-sequences@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-25.1.0.tgz#fd29a46f1c913fd66c22645dc75bffbe43051f32" + integrity sha512-nFIfVk5B/NStCsJ+zaPO4vYuLjlzQ6uFvPxzYyHlejNZ/UGa7G/n7peOXVrVNvRuyfstt+mZQYGpjxg9Z6N8Kw== diff@^4.0.1: version "4.0.1" @@ -3471,12 +3663,12 @@ escape-string-regexp@^2.0.0: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344" integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w== -escodegen@^1.9.1: - version "1.12.0" - resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.12.0.tgz#f763daf840af172bb3a2b6dd7219c0e17f7ff541" - integrity sha512-TuA+EhsanGcme5T3R0L80u4t8CpbXQjegRmf7+FPTJrtCTErXFeelblRgHQa1FofEzqYYJmJ/OqjTwREp9qgmg== +escodegen@^1.11.1: + version "1.13.0" + resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.13.0.tgz#c7adf9bd3f3cc675bb752f202f79a720189cab29" + integrity sha512-eYk2dCkxR07DsHA/X2hRBj0CFAZeri/LyDMc0C8JT1Hqi6JnVpMhJ7XFITbb0+yZS3lVkaPL2oCkZ3AVmeVbMw== dependencies: - esprima "^3.1.3" + esprima "^4.0.1" estraverse "^4.2.0" esutils "^2.0.2" optionator "^0.8.1" @@ -3653,12 +3845,7 @@ espree@^6.1.2: acorn-jsx "^5.1.0" eslint-visitor-keys "^1.1.0" -esprima@^3.1.3: - version "3.1.3" - resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633" - integrity sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM= - -esprima@^4.0.0: +esprima@^4.0.0, esprima@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== @@ -3741,6 +3928,22 @@ execa@^1.0.0: signal-exit "^3.0.0" strip-eof "^1.0.0" +execa@^3.2.0: + version "3.4.0" + resolved "https://registry.yarnpkg.com/execa/-/execa-3.4.0.tgz#c08ed4550ef65d858fac269ffc8572446f37eb89" + integrity sha512-r9vdGQk4bmCuK1yKQu1KTwcT2zwfWdbdaXfCtAh+5nU/4fSX+JAb7vZGvI5naJrQlvONrEB20jeruESI69530g== + dependencies: + 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" + exit@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c" @@ -3764,17 +3967,17 @@ expect-ct@0.2.0: resolved "https://registry.yarnpkg.com/expect-ct/-/expect-ct-0.2.0.tgz#3a54741b6ed34cc7a93305c605f63cd268a54a62" integrity sha512-6SK3MG/Bbhm8MsgyJAylg+ucIOU71/FzyFalcfu5nY19dH8y/z0tBJU0wrNBXD4B27EoQtqPF/9wqH0iYAd04g== -expect@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/expect/-/expect-24.9.0.tgz#b75165b4817074fa4a157794f46fe9f1ba15b6ca" - integrity sha512-wvVAx8XIol3Z5m9zvZXiyZOQ+sRJqNTIm6sGjdWlaZIeupQGO3WbYI+15D/AmEwZywL6wtJkbAbJtzkOfBuR0Q== +expect@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/expect/-/expect-25.1.0.tgz#7e8d7b06a53f7d66ec927278db3304254ee683ee" + integrity sha512-wqHzuoapQkhc3OKPlrpetsfueuEiMf3iWh0R8+duCu9PIjXoP7HgD5aeypwTnXUAjC8aMsiVDaWwlbJ1RlQ38g== dependencies: - "@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.1.0" + ansi-styles "^4.0.0" + jest-get-type "^25.1.0" + jest-matcher-utils "^25.1.0" + jest-message-util "^25.1.0" + jest-regex-util "^25.1.0" express@^4.0.0, express@^4.17.1: version "4.17.1" @@ -3997,6 +4200,14 @@ find-up@^3.0.0: dependencies: locate-path "^3.0.0" +find-up@^4.0.0, find-up@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" + integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw== + dependencies: + locate-path "^5.0.0" + path-exists "^4.0.0" + flat-cache@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0" @@ -4108,7 +4319,7 @@ fsevents@^1.2.7: nan "^2.12.1" node-pre-gyp "^0.12.0" -fsevents@~2.1.1: +fsevents@^2.1.2, fsevents@~2.1.1: version "2.1.2" resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.2.tgz#4c0a1fb34bc68e543b4b82a9ec392bfbda840805" integrity sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA== @@ -4174,7 +4385,7 @@ get-stream@^4.0.0, get-stream@^4.1.0: dependencies: pump "^3.0.0" -get-stream@^5.1.0: +get-stream@^5.0.0, get-stream@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.1.0.tgz#01203cdc92597f9b909067c3e656cc1f4d3c4dc9" integrity sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw== @@ -4302,6 +4513,11 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2: resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.2.tgz#6f0952605d0140c1cfdb138ed005775b92d67b02" integrity sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q== +graceful-fs@^4.2.3: + version "4.2.3" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423" + integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ== + graphql-auth-directives@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/graphql-auth-directives/-/graphql-auth-directives-2.1.0.tgz#85b83817844e2ec5fba8fe5de444287d6dd0f85a" @@ -4401,17 +4617,6 @@ growly@^1.3.0: resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081" integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE= -handlebars@^4.1.2: - version "4.5.3" - resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.5.3.tgz#5cf75bd8714f7605713511a56be7c349becb0482" - integrity sha512-3yPecJoJHK/4c6aZhSvxOyG4vJKDshV36VHp0iVCDVh7o9w2vwi3NSnL2MMPj3YdduqaBcu7cGbggJQM0br9xA== - dependencies: - neo-async "^2.6.0" - optimist "^0.6.1" - source-map "^0.6.1" - optionalDependencies: - uglify-js "^3.1.4" - har-schema@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" @@ -4435,6 +4640,11 @@ has-flag@^3.0.0: resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= +has-flag@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" + integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== + has-symbols@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44" @@ -4577,6 +4787,11 @@ html-encoding-sniffer@^1.0.2: dependencies: whatwg-encoding "^1.0.1" +html-escaper@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.0.tgz#71e87f931de3fe09e56661ab9a29aadec707b491" + integrity sha512-a4u9BeERWGu/S8JiWEAQcdrg9v4QArtP9keViQjGMdff20fBdd8waotXaNmODqBe6uZ3Nafi7K/ho4gCQHV3Ig== + html-to-text@^5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/html-to-text/-/html-to-text-5.1.1.tgz#2d89db7bf34bc7bcb7d546b1b228991a16926e87" @@ -4643,6 +4858,11 @@ https-proxy-agent@^4.0.0: agent-base "5" debug "4" +human-signals@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3" + integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw== + iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" @@ -4695,13 +4915,13 @@ import-lazy@^2.1.0: resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43" integrity sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM= -import-local@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz#55070be38a5993cf18ef6db7e961f5bee5c5a09d" - integrity sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ== +import-local@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.0.2.tgz#a8cfd0431d1de4a2199703d003e3e62364fa6db6" + integrity sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA== dependencies: - pkg-dir "^3.0.0" - resolve-cwd "^2.0.0" + pkg-dir "^4.2.0" + resolve-cwd "^3.0.0" imurmurhash@^0.1.4: version "0.1.4" @@ -4785,6 +5005,11 @@ ip-regex@^1.0.1: resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-1.0.3.tgz#dc589076f659f419c222039a33316f1c7387effd" integrity sha1-3FiQdvZZ9BnCIgOaMzFvHHOH7/0= +ip-regex@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9" + integrity sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk= + ip-regex@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-4.1.0.tgz#5ad62f685a14edb421abebc2fff8db94df67b455" @@ -5073,7 +5298,7 @@ is-symbol@^1.0.2: dependencies: has-symbols "^1.0.0" -is-typedarray@~1.0.0: +is-typedarray@^1.0.0, is-typedarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= @@ -5091,10 +5316,10 @@ is-windows@^1.0.2: resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA== -is-wsl@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d" - integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0= +is-wsl@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.1.1.tgz#4a1c152d429df3d441669498e2486d3596ebaf1d" + integrity sha512-umZHcSrwlDHo2TGMXv0DZ8dIUGunZ2Iv68YZnrmCiBPkZ4aaOhtv7pXJKeki9k3qJ3RJr0cDyitcl5wEH3AYog== isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0: version "1.0.0" @@ -5138,12 +5363,17 @@ isstream@~0.1.2: resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo= -istanbul-lib-coverage@^2.0.2, istanbul-lib-coverage@^2.0.5: +istanbul-lib-coverage@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz#675f0ab69503fad4b1d849f736baaca803344f49" integrity sha512-8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA== -istanbul-lib-instrument@^3.0.1, istanbul-lib-instrument@^3.3.0: +istanbul-lib-coverage@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz#f5944a37c70b550b02a78a5c3b2055b280cec8ec" + integrity sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg== + +istanbul-lib-instrument@^3.3.0: version "3.3.0" resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-3.3.0.tgz#a5f63d91f0bbc0c3e479ef4c5de027335ec6d630" integrity sha512-5nnIN4vo5xQZHdXno/YDXJ0G+I3dAm4XgzfSVTPLQpj/zAV2dV6Juy0yaf10/zrJOJeHoN3fraFe+XRq2bFVZA== @@ -5156,144 +5386,156 @@ istanbul-lib-instrument@^3.0.1, istanbul-lib-instrument@^3.3.0: istanbul-lib-coverage "^2.0.5" semver "^6.0.0" -istanbul-lib-report@^2.0.4: - version "2.0.8" - resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-2.0.8.tgz#5a8113cd746d43c4889eba36ab10e7d50c9b4f33" - integrity sha512-fHBeG573EIihhAblwgxrSenp0Dby6tJMFR/HvlerBsrCTD5bkUuoNtn3gVh29ZCS824cGGBPn7Sg7cNk+2xUsQ== +istanbul-lib-instrument@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.0.tgz#53321a7970f076262fd3292c8f9b2e4ac544aae1" + integrity sha512-Nm4wVHdo7ZXSG30KjZ2Wl5SU/Bw7bDx1PdaiIFzEStdjs0H12mOTncn1GVYuqQSaZxpg87VGBRsVRPGD2cD1AQ== dependencies: - istanbul-lib-coverage "^2.0.5" - make-dir "^2.1.0" - supports-color "^6.1.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" -istanbul-lib-source-maps@^3.0.1: - version "3.0.6" - resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.6.tgz#284997c48211752ec486253da97e3879defba8c8" - integrity sha512-R47KzMtDJH6X4/YW9XTx+jrLnZnscW4VpNN+1PViSYTejLVPWv7oov+Duf8YQSPyVRUvueQqz1TcsC6mooZTXw== +istanbul-lib-report@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#7518fe52ea44de372f460a76b5ecda9ffb73d8a6" + integrity sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw== + dependencies: + istanbul-lib-coverage "^3.0.0" + make-dir "^3.0.0" + supports-color "^7.1.0" + +istanbul-lib-source-maps@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz#75743ce6d96bb86dc7ee4352cf6366a23f0b1ad9" + integrity sha512-c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg== dependencies: debug "^4.1.1" - istanbul-lib-coverage "^2.0.5" - make-dir "^2.1.0" - rimraf "^2.6.3" + istanbul-lib-coverage "^3.0.0" source-map "^0.6.1" -istanbul-reports@^2.2.6: - version "2.2.6" - resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-2.2.6.tgz#7b4f2660d82b29303a8fe6091f8ca4bf058da1af" - integrity sha512-SKi4rnMyLBKe0Jy2uUdx28h8oG7ph2PPuQPvIAh31d+Ci+lSiEu4C+h3oBPuJ9+mPKhOyW0M8gY4U5NM1WLeXA== +istanbul-reports@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.0.0.tgz#d4d16d035db99581b6194e119bbf36c963c5eb70" + integrity sha512-2osTcC8zcOSUkImzN2EWQta3Vdi4WjjKw99P2yWx5mLnigAM0Rd5uYFn1cf2i/Ois45GkNjaoTqc5CxgMSX80A== dependencies: - handlebars "^4.1.2" + html-escaper "^2.0.0" + istanbul-lib-report "^3.0.0" iterall@^1.1.3, iterall@^1.2.1, iterall@^1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/iterall/-/iterall-1.2.2.tgz#92d70deb8028e0c39ff3164fdbf4d8b088130cd7" integrity sha512-yynBb1g+RFUPY64fTrFv7nsjRrENBQJaX2UL+2Szc9REFrSNm1rpSXHGzhmAy7a9uv3vlvgBlXnf9RqmPH1/DA== -jest-changed-files@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-24.9.0.tgz#08d8c15eb79a7fa3fc98269bc14b451ee82f8039" - integrity sha512-6aTWpe2mHF0DhL28WjdkO8LyGjs3zItPET4bMSeXU6T3ub4FPMw+mcOcbdGXQOAfmLcxofD23/5Bl9Z4AkFwqg== +jest-changed-files@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-25.1.0.tgz#73dae9a7d9949fdfa5c278438ce8f2ff3ec78131" + integrity sha512-bdL1aHjIVy3HaBO3eEQeemGttsq1BDlHgWcOjEOIAcga7OOEGWHD2WSu8HhL7I1F0mFFyci8VKU4tRNk+qtwDA== dependencies: - "@jest/types" "^24.9.0" - execa "^1.0.0" - throat "^4.0.0" + "@jest/types" "^25.1.0" + execa "^3.2.0" + throat "^5.0.0" -jest-cli@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-24.9.0.tgz#ad2de62d07472d419c6abc301fc432b98b10d2af" - integrity sha512-+VLRKyitT3BWoMeSUIHRxV/2g8y9gw91Jh5z2UmXZzkZKpbC08CSehVxgHUwTpy+HwGcns/tqafQDJW7imYvGg== +jest-cli@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-25.1.0.tgz#75f0b09cf6c4f39360906bf78d580be1048e4372" + integrity sha512-p+aOfczzzKdo3AsLJlhs8J5EW6ffVidfSZZxXedJ0mHPBOln1DccqFmGCoO8JWd4xRycfmwy1eoQkMsF8oekPg== dependencies: - "@jest/core" "^24.9.0" - "@jest/test-result" "^24.9.0" - "@jest/types" "^24.9.0" - chalk "^2.0.1" + "@jest/core" "^25.1.0" + "@jest/test-result" "^25.1.0" + "@jest/types" "^25.1.0" + chalk "^3.0.0" exit "^0.1.2" - import-local "^2.0.0" + import-local "^3.0.2" is-ci "^2.0.0" - jest-config "^24.9.0" - jest-util "^24.9.0" - jest-validate "^24.9.0" + jest-config "^25.1.0" + jest-util "^25.1.0" + jest-validate "^25.1.0" prompts "^2.0.1" realpath-native "^1.1.0" - yargs "^13.3.0" + yargs "^15.0.0" -jest-config@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-24.9.0.tgz#fb1bbc60c73a46af03590719efa4825e6e4dd1b5" - integrity sha512-RATtQJtVYQrp7fvWg6f5y3pEFj9I+H8sWw4aKxnDZ96mob5i5SD6ZEGWgMLXQ4LE8UurrjbdlLWdUeo+28QpfQ== +jest-config@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-25.1.0.tgz#d114e4778c045d3ef239452213b7ad3ec1cbea90" + integrity sha512-tLmsg4SZ5H7tuhBC5bOja0HEblM0coS3Wy5LTCb2C8ZV6eWLewHyK+3qSq9Bi29zmWQ7ojdCd3pxpx4l4d2uGw== dependencies: "@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.1.0" + "@jest/types" "^25.1.0" + babel-jest "^25.1.0" + chalk "^3.0.0" 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" + jest-environment-jsdom "^25.1.0" + jest-environment-node "^25.1.0" + jest-get-type "^25.1.0" + jest-jasmine2 "^25.1.0" + jest-regex-util "^25.1.0" + jest-resolve "^25.1.0" + jest-util "^25.1.0" + jest-validate "^25.1.0" + micromatch "^4.0.2" + pretty-format "^25.1.0" realpath-native "^1.1.0" -jest-diff@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-24.9.0.tgz#931b7d0d5778a1baf7452cb816e325e3724055da" - integrity sha512-qMfrTs8AdJE2iqrTp0hzh7kTd2PQWrsFyj9tORoKmu32xjPjeE4NyjVRDz8ybYwqS2ik8N4hsIpiVTyFeo2lBQ== +jest-diff@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-25.1.0.tgz#58b827e63edea1bc80c1de952b80cec9ac50e1ad" + integrity sha512-nepXgajT+h017APJTreSieh4zCqnSHEJ1iT8HDlewu630lSJ4Kjjr9KNzm+kzGwwcpsDE6Snx1GJGzzsefaEHw== dependencies: - 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.1.0" + jest-get-type "^25.1.0" + pretty-format "^25.1.0" -jest-docblock@^24.3.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-24.9.0.tgz#7970201802ba560e1c4092cc25cbedf5af5a8ce2" - integrity sha512-F1DjdpDMJMA1cN6He0FNYNZlo3yYmOtRUnktrT9Q37njYzC5WEaDdmbynIgy0L/IvXvvgsG8OsqhLPXTpfmZAA== +jest-docblock@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-25.1.0.tgz#0f44bea3d6ca6dfc38373d465b347c8818eccb64" + integrity sha512-370P/mh1wzoef6hUKiaMcsPtIapY25suP6JqM70V9RJvdKLrV4GaGbfUseUVk4FZJw4oTZ1qSCJNdrClKt5JQA== dependencies: - detect-newline "^2.1.0" + detect-newline "^3.0.0" -jest-each@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-24.9.0.tgz#eb2da602e2a610898dbc5f1f6df3ba86b55f8b05" - integrity sha512-ONi0R4BvW45cw8s2Lrx8YgbeXL1oCQ/wIDwmsM3CqM/nlblNCPmnC3IPQlMbRFZu3wKdQ2U8BqM6lh3LJ5Bsog== +jest-each@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-25.1.0.tgz#a6b260992bdf451c2d64a0ccbb3ac25e9b44c26a" + integrity sha512-R9EL8xWzoPySJ5wa0DXFTj7NrzKpRD40Jy+zQDp3Qr/2QmevJgkN9GqioCGtAJ2bW9P/MQRznQHQQhoeAyra7A== dependencies: - "@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.1.0" + chalk "^3.0.0" + jest-get-type "^25.1.0" + jest-util "^25.1.0" + pretty-format "^25.1.0" -jest-environment-jsdom@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-24.9.0.tgz#4b0806c7fc94f95edb369a69cc2778eec2b7375b" - integrity sha512-Zv9FV9NBRzLuALXjvRijO2351DRQeLYXtpD4xNvfoVFw21IOKNhZAEUKcbiEtjTkm2GsJ3boMVgkaR7rN8qetA== +jest-environment-jsdom@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-25.1.0.tgz#6777ab8b3e90fd076801efd3bff8e98694ab43c3" + integrity sha512-ILb4wdrwPAOHX6W82GGDUiaXSSOE274ciuov0lztOIymTChKFtC02ddyicRRCdZlB5YSrv3vzr1Z5xjpEe1OHQ== dependencies: - "@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.1.0" + "@jest/fake-timers" "^25.1.0" + "@jest/types" "^25.1.0" + jest-mock "^25.1.0" + jest-util "^25.1.0" + jsdom "^15.1.1" -jest-environment-node@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-24.9.0.tgz#333d2d2796f9687f2aeebf0742b519f33c1cbfd3" - integrity sha512-6d4V2f4nxzIzwendo27Tr0aFm+IXWa0XEUnaH6nU0FMaozxovt+sfRvh4J47wL1OvF83I3SSTu0XK+i4Bqe7uA== +jest-environment-node@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-25.1.0.tgz#797bd89b378cf0bd794dc8e3dca6ef21126776db" + integrity sha512-U9kFWTtAPvhgYY5upnH9rq8qZkj6mYLup5l1caAjjx9uNnkLHN2xgZy5mo4SyLdmrh/EtB9UPpKFShvfQHD0Iw== dependencies: - "@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.1.0" + "@jest/fake-timers" "^25.1.0" + "@jest/types" "^25.1.0" + jest-mock "^25.1.0" + jest-util "^25.1.0" -jest-get-type@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-24.9.0.tgz#1684a0c8a50f2e4901b6644ae861f579eed2ef0e" - integrity sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q== +jest-get-type@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-25.1.0.tgz#1cfe5fc34f148dc3a8a3b7275f6b9ce9e2e8a876" + integrity sha512-yWkBnT+5tMr8ANB6V+OjmrIJufHtCAqI5ic2H40v+tRqxDmE0PGnIiTyvRWFOMtmVHYpwRqyazDbTnhpjsGvLw== jest-haste-map@^24.9.0: version "24.9.0" @@ -5314,45 +5556,64 @@ jest-haste-map@^24.9.0: optionalDependencies: fsevents "^1.2.7" -jest-jasmine2@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-24.9.0.tgz#1f7b1bd3242c1774e62acabb3646d96afc3be6a0" - integrity sha512-Cq7vkAgaYKp+PsX+2/JbTarrk0DmNhsEtqBXNwUHkdlbrTBLtMJINADf2mf5FkowNsq8evbPc07/qFO0AdKTzw== +jest-haste-map@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-25.1.0.tgz#ae12163d284f19906260aa51fd405b5b2e5a4ad3" + integrity sha512-/2oYINIdnQZAqyWSn1GTku571aAfs8NxzSErGek65Iu5o8JYb+113bZysRMcC/pjE5v9w0Yz+ldbj9NxrFyPyw== + dependencies: + "@jest/types" "^25.1.0" + anymatch "^3.0.3" + fb-watchman "^2.0.0" + graceful-fs "^4.2.3" + jest-serializer "^25.1.0" + jest-util "^25.1.0" + jest-worker "^25.1.0" + micromatch "^4.0.2" + sane "^4.0.3" + walker "^1.0.7" + optionalDependencies: + fsevents "^2.1.2" + +jest-jasmine2@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-25.1.0.tgz#681b59158a430f08d5d0c1cce4f01353e4b48137" + integrity sha512-GdncRq7jJ7sNIQ+dnXvpKO2MyP6j3naNK41DTTjEAhLEdpImaDA9zSAZwDhijjSF/D7cf4O5fdyUApGBZleaEg== dependencies: "@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.1.0" + "@jest/source-map" "^25.1.0" + "@jest/test-result" "^25.1.0" + "@jest/types" "^25.1.0" + chalk "^3.0.0" co "^4.6.0" - expect "^24.9.0" + expect "^25.1.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.1.0" + jest-matcher-utils "^25.1.0" + jest-message-util "^25.1.0" + jest-runtime "^25.1.0" + jest-snapshot "^25.1.0" + jest-util "^25.1.0" + pretty-format "^25.1.0" + throat "^5.0.0" -jest-leak-detector@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-24.9.0.tgz#b665dea7c77100c5c4f7dfcb153b65cf07dcf96a" - integrity sha512-tYkFIDsiKTGwb2FG1w8hX9V0aUb2ot8zY/2nFg087dUageonw1zrLMP4W6zsRO59dPkTSKie+D4rhMuP9nRmrA== +jest-leak-detector@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-25.1.0.tgz#ed6872d15aa1c72c0732d01bd073dacc7c38b5c6" + integrity sha512-3xRI264dnhGaMHRvkFyEKpDeaRzcEBhyNrOG5oT8xPxOyUAblIAQnpiR3QXu4wDor47MDTiHbiFcbypdLcLW5w== dependencies: - jest-get-type "^24.9.0" - pretty-format "^24.9.0" + jest-get-type "^25.1.0" + pretty-format "^25.1.0" -jest-matcher-utils@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-24.9.0.tgz#f5b3661d5e628dffe6dd65251dfdae0e87c3a073" - integrity sha512-OZz2IXsu6eaiMAwe67c1T+5tUAtQyQx27/EMEkbFAGiw52tB9em+uGbzpcgYVpA8wl0hlxKPZxrly4CXU/GjHA== +jest-matcher-utils@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-25.1.0.tgz#fa5996c45c7193a3c24e73066fc14acdee020220" + integrity sha512-KGOAFcSFbclXIFE7bS4C53iYobKI20ZWleAdAFun4W1Wz1Kkej8Ng6RRbhL8leaEvIOjGXhGf/a1JjO8bkxIWQ== dependencies: - 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.1.0" + jest-get-type "^25.1.0" + pretty-format "^25.1.0" jest-message-util@^24.9.0: version "24.9.0" @@ -5368,6 +5629,20 @@ jest-message-util@^24.9.0: slash "^2.0.0" stack-utils "^1.0.1" +jest-message-util@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-25.1.0.tgz#702a9a5cb05c144b9aa73f06e17faa219389845e" + integrity sha512-Nr/Iwar2COfN22aCqX0kCVbXgn8IBm9nWf4xwGr5Olv/KZh0CZ32RKgZWMVDXGdOahicM10/fgjdimGNX/ttCQ== + dependencies: + "@babel/code-frame" "^7.0.0" + "@jest/test-result" "^25.1.0" + "@jest/types" "^25.1.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@^24.9.0: version "24.9.0" resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-24.9.0.tgz#c22835541ee379b908673ad51087a2185c13f1c6" @@ -5375,113 +5650,132 @@ jest-mock@^24.9.0: dependencies: "@jest/types" "^24.9.0" +jest-mock@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-25.1.0.tgz#411d549e1b326b7350b2e97303a64715c28615fd" + integrity sha512-28/u0sqS+42vIfcd1mlcg4ZVDmSUYuNvImP4X2lX5hRMLW+CN0BeiKVD4p+ujKKbSPKd3rg/zuhCF+QBLJ4vag== + dependencies: + "@jest/types" "^25.1.0" + jest-pnp-resolver@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.1.tgz#ecdae604c077a7fbc70defb6d517c3c1c898923a" integrity sha512-pgFw2tm54fzgYvc/OHrnysABEObZCUNFnhjoRjaVOCN8NYc032/gVjPaHD4Aq6ApkSieWtfKAFQtmDKAmhupnQ== -jest-regex-util@^24.3.0, jest-regex-util@^24.9.0: +jest-regex-util@^24.9.0: version "24.9.0" resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-24.9.0.tgz#c13fb3380bde22bf6575432c493ea8fe37965636" integrity sha512-05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA== -jest-resolve-dependencies@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-24.9.0.tgz#ad055198959c4cfba8a4f066c673a3f0786507ab" - integrity sha512-Fm7b6AlWnYhT0BXy4hXpactHIqER7erNgIsIozDXWl5dVm+k8XdGVe1oTg1JyaFnOxarMEbax3wyRJqGP2Pq+g== - dependencies: - "@jest/types" "^24.9.0" - jest-regex-util "^24.3.0" - jest-snapshot "^24.9.0" +jest-regex-util@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-25.1.0.tgz#efaf75914267741838e01de24da07b2192d16d87" + integrity sha512-9lShaDmDpqwg+xAd73zHydKrBbbrIi08Kk9YryBEBybQFg/lBWR/2BDjjiSE7KIppM9C5+c03XiDaZ+m4Pgs1w== -jest-resolve@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-24.9.0.tgz#dff04c7687af34c4dd7e524892d9cf77e5d17321" - integrity sha512-TaLeLVL1l08YFZAt3zaPtjiVvyy4oSA6CRe+0AFPPVX3Q/VI0giIWWoAvoS5L96vj9Dqxj4fB5p2qrHCmTU/MQ== +jest-resolve-dependencies@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-25.1.0.tgz#8a1789ec64eb6aaa77fd579a1066a783437e70d2" + integrity sha512-Cu/Je38GSsccNy4I2vL12ZnBlD170x2Oh1devzuM9TLH5rrnLW1x51lN8kpZLYTvzx9j+77Y5pqBaTqfdzVzrw== dependencies: - "@jest/types" "^24.9.0" + "@jest/types" "^25.1.0" + jest-regex-util "^25.1.0" + jest-snapshot "^25.1.0" + +jest-resolve@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-25.1.0.tgz#23d8b6a4892362baf2662877c66aa241fa2eaea3" + integrity sha512-XkBQaU1SRCHj2Evz2Lu4Czs+uIgJXWypfO57L7JYccmAXv4slXA6hzNblmcRmf7P3cQ1mE7fL3ABV6jAwk4foQ== + dependencies: + "@jest/types" "^25.1.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@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-24.9.0.tgz#574fafdbd54455c2b34b4bdf4365a23857fcdf42" - integrity sha512-KksJQyI3/0mhcfspnxxEOBueGrd5E4vV7ADQLT9ESaCzz02WnbdbKWIf5Mkaucoaj7obQckYPVX6JJhgUcoWWg== +jest-runner@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-25.1.0.tgz#fef433a4d42c89ab0a6b6b268e4a4fbe6b26e812" + integrity sha512-su3O5fy0ehwgt+e8Wy7A8CaxxAOCMzL4gUBftSs0Ip32S0epxyZPDov9Znvkl1nhVOJNf4UwAsnqfc3plfQH9w== dependencies: - "@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.1.0" + "@jest/environment" "^25.1.0" + "@jest/test-result" "^25.1.0" + "@jest/types" "^25.1.0" + chalk "^3.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" + graceful-fs "^4.2.3" + jest-config "^25.1.0" + jest-docblock "^25.1.0" + jest-haste-map "^25.1.0" + jest-jasmine2 "^25.1.0" + jest-leak-detector "^25.1.0" + jest-message-util "^25.1.0" + jest-resolve "^25.1.0" + jest-runtime "^25.1.0" + jest-util "^25.1.0" + jest-worker "^25.1.0" source-map-support "^0.5.6" - throat "^4.0.0" + throat "^5.0.0" -jest-runtime@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-24.9.0.tgz#9f14583af6a4f7314a6a9d9f0226e1a781c8e4ac" - integrity sha512-8oNqgnmF3v2J6PVRM2Jfuj8oX3syKmaynlDMMKQ4iyzbQzIG6th5ub/lM2bCMTmoTKM3ykcUYI2Pw9xwNtjMnw== +jest-runtime@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-25.1.0.tgz#02683218f2f95aad0f2ec1c9cdb28c1dc0ec0314" + integrity sha512-mpPYYEdbExKBIBB16ryF6FLZTc1Rbk9Nx0ryIpIMiDDkOeGa0jQOKVI/QeGvVGlunKKm62ywcioeFVzIbK03bA== dependencies: - "@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.1.0" + "@jest/environment" "^25.1.0" + "@jest/source-map" "^25.1.0" + "@jest/test-result" "^25.1.0" + "@jest/transform" "^25.1.0" + "@jest/types" "^25.1.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" + graceful-fs "^4.2.3" + jest-config "^25.1.0" + jest-haste-map "^25.1.0" + jest-message-util "^25.1.0" + jest-mock "^25.1.0" + jest-regex-util "^25.1.0" + jest-resolve "^25.1.0" + jest-snapshot "^25.1.0" + jest-util "^25.1.0" + jest-validate "^25.1.0" realpath-native "^1.1.0" - slash "^2.0.0" - strip-bom "^3.0.0" - yargs "^13.3.0" + slash "^3.0.0" + strip-bom "^4.0.0" + yargs "^15.0.0" jest-serializer@^24.9.0: version "24.9.0" resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-24.9.0.tgz#e6d7d7ef96d31e8b9079a714754c5d5c58288e73" integrity sha512-DxYipDr8OvfrKH3Kel6NdED3OXxjvxXZ1uIY2I9OFbGg+vUkkg7AGvi65qbhbWNPvDckXmzMPbK3u3HaDO49bQ== -jest-snapshot@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-24.9.0.tgz#ec8e9ca4f2ec0c5c87ae8f925cf97497b0e951ba" - integrity sha512-uI/rszGSs73xCM0l+up7O7a40o90cnrk429LOiK3aeTvfC0HHmldbd81/B7Ix81KSFe1lwkbl7GnBGG4UfuDew== +jest-serializer@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-25.1.0.tgz#73096ba90e07d19dec4a0c1dd89c355e2f129e5d" + integrity sha512-20Wkq5j7o84kssBwvyuJ7Xhn7hdPeTXndnwIblKDR2/sy1SUm6rWWiG9kSCgJPIfkDScJCIsTtOKdlzfIHOfKA== + +jest-snapshot@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-25.1.0.tgz#d5880bd4b31faea100454608e15f8d77b9d221d9" + integrity sha512-xZ73dFYN8b/+X2hKLXz4VpBZGIAn7muD/DAg+pXtDzDGw3iIV10jM7WiHqhCcpDZfGiKEj7/2HXAEPtHTj0P2A== dependencies: "@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" + "@jest/types" "^25.1.0" + chalk "^3.0.0" + expect "^25.1.0" + jest-diff "^25.1.0" + jest-get-type "^25.1.0" + jest-matcher-utils "^25.1.0" + jest-message-util "^25.1.0" + jest-resolve "^25.1.0" mkdirp "^0.5.1" natural-compare "^1.4.0" - pretty-format "^24.9.0" - semver "^6.2.0" + pretty-format "^25.1.0" + semver "^7.1.1" jest-util@^24.9.0: version "24.9.0" @@ -5501,32 +5795,41 @@ jest-util@^24.9.0: slash "^2.0.0" source-map "^0.6.0" -jest-validate@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-24.9.0.tgz#0775c55360d173cd854e40180756d4ff52def8ab" - integrity sha512-HPIt6C5ACwiqSiwi+OfSSHbK8sG7akG8eATl+IPKaeIjtPOeBUd/g3J7DghugzxrGjI93qS/+RPKe1H6PqvhRQ== +jest-util@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-25.1.0.tgz#7bc56f7b2abd534910e9fa252692f50624c897d9" + integrity sha512-7did6pLQ++87Qsj26Fs/TIwZMUFBXQ+4XXSodRNy3luch2DnRXsSnmpVtxxQ0Yd6WTipGpbhh2IFP1mq6/fQGw== dependencies: - "@jest/types" "^24.9.0" + "@jest/types" "^25.1.0" + chalk "^3.0.0" + is-ci "^2.0.0" + mkdirp "^0.5.1" + +jest-validate@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-25.1.0.tgz#1469fa19f627bb0a9a98e289f3e9ab6a668c732a" + integrity sha512-kGbZq1f02/zVO2+t1KQGSVoCTERc5XeObLwITqC6BTRH3Adv7NZdYqCpKIZLUgpLXf2yISzQ465qOZpul8abXA== + dependencies: + "@jest/types" "^25.1.0" camelcase "^5.3.1" - chalk "^2.0.1" - jest-get-type "^24.9.0" + chalk "^3.0.0" + jest-get-type "^25.1.0" leven "^3.1.0" - pretty-format "^24.9.0" + pretty-format "^25.1.0" -jest-watcher@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-24.9.0.tgz#4b56e5d1ceff005f5b88e528dc9afc8dd4ed2b3b" - integrity sha512-+/fLOfKPXXYJDYlks62/4R4GoT+GU1tYZed99JSCOsmzkkF7727RqKrjNAxtfO4YpGv11wybgRvCjR73lK2GZw== +jest-watcher@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-25.1.0.tgz#97cb4a937f676f64c9fad2d07b824c56808e9806" + integrity sha512-Q9eZ7pyaIr6xfU24OeTg4z1fUqBF/4MP6J801lyQfg7CsnZ/TCzAPvCfckKdL5dlBBEKBeHV0AdyjFZ5eWj4ig== dependencies: - "@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.1.0" + "@jest/types" "^25.1.0" + ansi-escapes "^4.2.1" + chalk "^3.0.0" + jest-util "^25.1.0" + string-length "^3.1.0" -jest-worker@^24.6.0, jest-worker@^24.9.0: +jest-worker@^24.9.0: version "24.9.0" resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-24.9.0.tgz#5dbfdb5b2d322e98567898238a9697bcce67b3e5" integrity sha512-51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw== @@ -5534,13 +5837,22 @@ jest-worker@^24.6.0, jest-worker@^24.9.0: merge-stream "^2.0.0" supports-color "^6.1.0" -jest@~24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest/-/jest-24.9.0.tgz#987d290c05a08b52c56188c1002e368edb007171" - integrity sha512-YvkBL1Zm7d2B1+h5fHEOdyjCG+sGMz4f8D86/0HiqJ6MB4MnDc8FgP5vdWsGnemOQro7lnYo8UakZ3+5A0jxGw== +jest-worker@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-25.1.0.tgz#75d038bad6fdf58eba0d2ec1835856c497e3907a" + integrity sha512-ZHhHtlxOWSxCoNOKHGbiLzXnl42ga9CxDr27H36Qn+15pQZd3R/F24jrmjDelw9j/iHUIWMWs08/u2QN50HHOg== dependencies: - import-local "^2.0.0" - jest-cli "^24.9.0" + merge-stream "^2.0.0" + supports-color "^7.0.0" + +jest@~25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/jest/-/jest-25.1.0.tgz#b85ef1ddba2fdb00d295deebbd13567106d35be9" + integrity sha512-FV6jEruneBhokkt9MQk0WUFoNTwnF76CLXtwNMfsc0um0TlB/LG2yxUd0KqaFjEJ9laQmVWQWS0sG/t2GsuI0w== + dependencies: + "@jest/core" "^25.1.0" + import-local "^3.0.2" + jest-cli "^25.1.0" jquery@^3.3.1: version "3.4.1" @@ -5565,36 +5877,36 @@ jsbn@~0.1.0: resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM= -jsdom@^11.5.1: - version "11.12.0" - resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-11.12.0.tgz#1a80d40ddd378a1de59656e9e6dc5a3ba8657bc8" - integrity sha512-y8Px43oyiBM13Zc1z780FrfNLJCXTL40EWlty/LXUtcjykRBNgLlCjWXpfSPBl2iv+N7koQN+dvqszHZgT/Fjw== +jsdom@^15.1.1: + version "15.2.1" + resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-15.2.1.tgz#d2feb1aef7183f86be521b8c6833ff5296d07ec5" + integrity sha512-fAl1W0/7T2G5vURSyxBzrJ1LSdQn6Tr5UX/xD4PXDx/PDgwygedfW6El/KIj3xJ7FU61TTYnc/l/B7P49Eqt6g== dependencies: 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" jsesc@^2.5.1: @@ -5737,11 +6049,6 @@ latest-version@^3.0.0: dependencies: package-json "^4.0.0" -left-pad@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.3.0.tgz#5b8a3a7765dfe001261dde915589e782f8c94d1e" - integrity sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA== - leven@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2" @@ -5815,6 +6122,13 @@ locate-path@^3.0.0: p-locate "^3.0.0" path-exists "^3.0.0" +locate-path@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" + integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g== + dependencies: + p-locate "^4.1.0" + lodash.clonedeep@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" @@ -5880,6 +6194,13 @@ lodash@4.17.15, lodash@^4.15.0, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.1 resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== +lolex@^5.0.0: + version "5.1.2" + resolved "https://registry.yarnpkg.com/lolex/-/lolex-5.1.2.tgz#953694d098ce7c07bc5ed6d0e42bc6c0c6d5a367" + integrity sha512-h4hmjAvHTmd+25JSwrtTIuwbKdwg5NzZVRMLn9saij4SZaepCrTCxPr35H/3bjwfMJtN+t3CX8672UIkglz28A== + dependencies: + "@sinonjs/commons" "^1.7.0" + long@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28" @@ -5942,6 +6263,13 @@ make-dir@^2.0.0, make-dir@^2.1.0: pify "^4.0.1" semver "^5.6.0" +make-dir@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.0.0.tgz#1b5f39f6b9270ed33f9f054c5c0f84304989f801" + integrity sha512-grNJDhb8b1Jm1qeqW5R/O63wUo4UXo2v2HMic6YT9i/HBlF93S8jkMgH7yugvY9ABDShH4VZMn8I+U8+fCNegw== + dependencies: + semver "^6.0.0" + makeerror@1.0.x: version "1.0.11" resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c" @@ -6218,11 +6546,6 @@ minimist@^1.1.1, minimist@^1.2.0: resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ= -minimist@~0.0.1: - version "0.0.10" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf" - integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8= - minipass@^2.2.1, minipass@^2.3.5: version "2.3.5" resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz#cacebe492022497f656b0f0f51e2682a9ed2d848" @@ -6343,11 +6666,6 @@ negotiator@0.6.2: resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== -neo-async@^2.6.0: - version "2.6.1" - resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c" - integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw== - neo4j-driver@^1.7.6: version "1.7.6" resolved "https://registry.yarnpkg.com/neo4j-driver/-/neo4j-driver-1.7.6.tgz#eccb135a71eba9048c68717444593a6424cffc49" @@ -6435,16 +6753,16 @@ node-modules-regexp@^1.0.0: resolved "https://registry.yarnpkg.com/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz#8d9dbe28964a4ac5712e9131642107c71e90ec40" integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA= -node-notifier@^5.4.2: - version "5.4.3" - resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-5.4.3.tgz#cb72daf94c93904098e28b9c590fd866e464bd50" - integrity sha512-M4UBGcs4jeOK9CjTsYwkvH6/MzuUmGCyTW+kCY7uO+1ZVr0+FHGdPdIf5CCLqAaxnRrWidyoQlNkMIIVwbKB8Q== +node-notifier@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-6.0.0.tgz#cea319e06baa16deec8ce5cd7f133c4a46b68e12" + integrity sha512-SVfQ/wMw+DesunOm5cKqr6yDcvUTDl/yc97ybGHMrteNEY6oekXpNpS3lZwgLlwz0FLgHoiW28ZpmBHUDg37cw== dependencies: growly "^1.3.0" - is-wsl "^1.1.0" - semver "^5.5.0" + is-wsl "^2.1.1" + semver "^6.3.0" shellwords "^0.1.1" - which "^1.3.0" + which "^1.3.1" node-pre-gyp@^0.12.0: version "0.12.0" @@ -6584,6 +6902,13 @@ npm-run-path@^2.0.0: dependencies: path-key "^2.0.0" +npm-run-path@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" + integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw== + dependencies: + path-key "^3.0.0" + npmlog@^4.0.2: version "4.1.2" resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" @@ -6611,10 +6936,10 @@ numeral@^2.0.6: resolved "https://registry.yarnpkg.com/numeral/-/numeral-2.0.6.tgz#4ad080936d443c2561aed9f2197efffe25f4e506" integrity sha1-StCAk21EPCVhrtnyGX7//iX05QY= -nwsapi@^2.0.7: - version "2.1.4" - resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.1.4.tgz#e006a878db23636f8e8a67d33ca0e4edf61a842f" - integrity sha512-iGfd9Y6SFdTNldEy2L0GUhcarIutFmk+MPWIn9dmj8NMIup03G08uUF2KGbbmv/Ux4RT0VZJoP/sVbWA6d/VIw== +nwsapi@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7" + integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ== oauth-sign@~0.9.0: version "0.9.0" @@ -6725,14 +7050,6 @@ optimism@^0.10.0: dependencies: "@wry/context" "^0.4.0" -optimist@^0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686" - integrity sha1-2j6nRob6IaGaERwybpDrFaAZZoY= - dependencies: - minimist "~0.0.1" - wordwrap "~0.0.2" - optionator@^0.8.1, optionator@^0.8.3: version "0.8.3" resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495" @@ -6782,18 +7099,21 @@ p-cancelable@^2.0.0: resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.0.0.tgz#4a3740f5bdaf5ed5d7c3e34882c6fb5d6b266a6e" integrity sha512-wvPXDmbMmu2ksjkB4Z3nZWTSkJEb9lqVdMaCKpZUGJG9TMiNp9XcbG3fn9fPKjem04fJMJnXoyFPk2FmgiaiNg== -p-each-series@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/p-each-series/-/p-each-series-1.0.0.tgz#930f3d12dd1f50e7434457a22cd6f04ac6ad7f71" - integrity sha1-kw89Et0fUOdDRFeiLNbwSsatf3E= - dependencies: - p-reduce "^1.0.0" +p-each-series@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/p-each-series/-/p-each-series-2.1.0.tgz#961c8dd3f195ea96c747e636b262b800a6b1af48" + integrity sha512-ZuRs1miPT4HrjFa+9fRfOFXxGJfORgelKV9f9nNOWw2gl6gVsRaVDOQP0+MI0G0wGKns1Yacsu0GjOFbTK0JFQ== p-finally@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4= +p-finally@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-2.0.1.tgz#bd6fcaa9c559a096b680806f4d657b3f0f240561" + integrity sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw== + p-limit@^1.1.0: version "1.3.0" resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8" @@ -6822,18 +7142,13 @@ p-locate@^3.0.0: dependencies: p-limit "^2.0.0" -p-locate@~4.1.0: +p-locate@^4.1.0, p-locate@~4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A== dependencies: p-limit "^2.2.0" -p-reduce@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/p-reduce/-/p-reduce-1.0.0.tgz#18c2b0dd936a4690a529f8231f58a0fdb6a47dfa" - integrity sha1-GMKw3ZNqRpClKfgjH1ig/bakffo= - p-some@^4.0.0: version "4.1.0" resolved "https://registry.yarnpkg.com/p-some/-/p-some-4.1.0.tgz#28e73bc1e0d62db54c2ed513acd03acba30d5c04" @@ -6908,10 +7223,10 @@ parse-uri@~1.0.0: resolved "https://registry.yarnpkg.com/parse-uri/-/parse-uri-1.0.0.tgz#2872dcc22f1a797acde1583d8a0ac29552ddac20" integrity sha1-KHLcwi8aeXrN4Vg9igrClVLdrCA= -parse5@4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608" - integrity sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA== +parse5@5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.0.tgz#c59341c9723f414c452975564c7c00a68d58acd2" + integrity sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ== parse5@^3.0.1: version "3.0.3" @@ -6940,6 +7255,11 @@ path-exists@^3.0.0: resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU= +path-exists@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" + integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== + path-is-absolute@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" @@ -6955,6 +7275,11 @@ path-key@^2.0.0, path-key@^2.0.1: resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A= +path-key@^3.0.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" + integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== + path-key@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.0.tgz#99a10d870a803bdd5ee6f0470e58dfcd2f9a54d3" @@ -7045,6 +7370,13 @@ pkg-dir@^3.0.0: dependencies: find-up "^3.0.0" +pkg-dir@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" + integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ== + dependencies: + find-up "^4.0.0" + pn@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/pn/-/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb" @@ -7096,15 +7428,15 @@ prettier@~1.19.1: resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb" integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew== -pretty-format@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-24.9.0.tgz#12fac31b37019a4eea3c11aa9a959eb7628aa7c9" - integrity sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA== +pretty-format@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-25.1.0.tgz#ed869bdaec1356fc5ae45de045e2c8ec7b07b0c8" + integrity sha512-46zLRSGLd02Rp+Lhad9zzuNZ+swunitn8zIpfD2B4OPCRLXbM87RJT2aBLBWYOznNUML/2l/ReMyWNC80PJBUQ== dependencies: - "@jest/types" "^24.9.0" - ansi-regex "^4.0.0" - ansi-styles "^3.2.0" - react-is "^16.8.4" + "@jest/types" "^25.1.0" + ansi-regex "^5.0.0" + ansi-styles "^4.0.0" + react-is "^16.12.0" private@^0.1.6: version "0.1.8" @@ -7244,7 +7576,12 @@ react-dom@^16.4.2: prop-types "^15.6.2" scheduler "^0.15.0" -react-is@^16.8.1, react-is@^16.8.4: +react-is@^16.12.0: + version "16.12.0" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.12.0.tgz#2cc0fe0fba742d97fd527c42a13bec4eeb06241c" + integrity sha512-rPCkf/mWBtKc97aLL9/txD8DZdemK0vkA3JMLShjlJB3Pj3s+lpf1KaBzMfQrAmhMQB0n1cU/SUGgKKBCe837Q== + +react-is@^16.8.1: version "16.9.0" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.9.0.tgz#21ca9561399aad0ff1a7701c01683e8ca981edcb" integrity sha512-tJBzzzIgnnRfEm046qRcURvwQnZVXmuCbscxUO5RWrGTXpon2d4c8mI0D8WE6ydVIm29JiLB6+RslkIvym9Rjw== @@ -7450,7 +7787,7 @@ request-promise-core@1.1.3: dependencies: lodash "^4.17.15" -request-promise-native@^1.0.5, request-promise-native@^1.0.8: +request-promise-native@^1.0.7, request-promise-native@^1.0.8: version "1.0.8" resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.8.tgz#a455b960b826e44e2bf8999af64dff2bfe58cb36" integrity sha512-dapwLGqkHtwL5AEbfenuzjTYg35Jd6KPytsC2/TLkVMz8rm+tNt72MGUWT1RP/aYawMpN6HqbNGBQaRcBtjQMQ== @@ -7459,7 +7796,7 @@ request-promise-native@^1.0.5, request-promise-native@^1.0.8: stealthy-require "^1.1.1" tough-cookie "^2.3.3" -request@^2.87.0, request@^2.88.0, request@~2.88.0: +request@^2.88.0, request@~2.88.0: version "2.88.0" resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef" integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg== @@ -7500,23 +7837,23 @@ requires-port@^1.0.0: resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8= -resolve-cwd@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a" - integrity sha1-AKn3OHVW4nA46uIyyqNypqWbZlo= - dependencies: - resolve-from "^3.0.0" - -resolve-from@^3.0.0: +resolve-cwd@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748" - integrity sha1-six699nWiBvItuZTM17rywoYh0g= + resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d" + integrity sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg== + dependencies: + resolve-from "^5.0.0" resolve-from@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== +resolve-from@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" + integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== + resolve-url@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" @@ -7571,13 +7908,20 @@ rimraf@2.6.3: dependencies: glob "^7.1.3" -rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.3: +rimraf@^2.6.1: version "2.7.1" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== dependencies: glob "^7.1.3" +rimraf@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.0.tgz#614176d4b3010b75e5c390eb0ee96f6dc0cebb9b" + integrity sha512-NDGVxTsjqfunkds7CqsOiEnxln4Bo7Nddl3XhS4pXg5OzwkLqJ971ZVAAnB+DDLnF76N+VnDEiBHaVV8I06SUg== + dependencies: + glob "^7.1.3" + router-ips@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/router-ips/-/router-ips-1.0.0.tgz#44e00858ebebc0133d58e40b2cd8a1fbb04203f5" @@ -7665,6 +8009,13 @@ sax@>=0.6.0, sax@^1.2.4: resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== +saxes@^3.1.9: + version "3.1.11" + resolved "https://registry.yarnpkg.com/saxes/-/saxes-3.1.11.tgz#d59d1fd332ec92ad98a2e0b2ee644702384b1c5b" + integrity sha512-Ydydq3zC+WYDJK1+gRxRapLIED9PWeSuuS41wqyoRmzvhhh9nc+QQrVMKJYzJFULazeGhzSV0QleN2wD3boh2g== + dependencies: + xmlchars "^2.1.1" + scheduler@^0.15.0: version "0.15.0" resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.15.0.tgz#6bfcf80ff850b280fed4aeecc6513bc0b4f17f8e" @@ -7695,11 +8046,16 @@ semver@7.0.0: resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A== -semver@^6.0.0, semver@^6.1.0, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0: +semver@^6.0.0, semver@^6.1.0, semver@^6.1.2, semver@^6.3.0: version "6.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== +semver@^7.1.1: + version "7.1.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.1.1.tgz#29104598a197d6cbe4733eeecbe968f7b43a9667" + integrity sha512-WfuG+fl6eh3eZ2qAf6goB7nhiCd7NPXhmyFxigB/TOkQyeLP8w8GsVehvtGNtnNmyboz4TgeK40B1Kbql/8c5A== + send@0.17.1: version "0.17.1" resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8" @@ -7891,6 +8247,11 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1: resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== +source-map@^0.7.3: + version "0.7.3" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" + integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ== + spdx-correct@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.0.tgz#fb83e504445268f154b074e218c87c003cd31df4" @@ -8019,13 +8380,13 @@ string-argv@^0.3.0: resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.1.tgz#95e2fbec0427ae19184935f816d74aaa4c5c19da" integrity sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg== -string-length@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/string-length/-/string-length-2.0.0.tgz#d40dbb686a3ace960c1cffca562bf2c45f8363ed" - integrity sha1-1A27aGo6zpYMHP/KVivyxF+DY+0= +string-length@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/string-length/-/string-length-3.1.0.tgz#107ef8c23456e187a8abd4a61162ff4ac6e25837" + integrity sha512-Ttp5YvkGm5v9Ijagtaz1BnN+k9ObpvS0eIBblPMp2YWL8FBmi9qblQ9fexc2k/CXFgrTIteU3jAw3payCnwSTA== dependencies: astral-regex "^1.0.0" - strip-ansi "^4.0.0" + strip-ansi "^5.2.0" string-width@^1.0.1: version "1.0.2" @@ -8044,7 +8405,7 @@ string-width@^1.0.1: is-fullwidth-code-point "^2.0.0" strip-ansi "^4.0.0" -string-width@^3.0.0, string-width@^3.1.0: +string-width@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961" integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w== @@ -8062,6 +8423,15 @@ string-width@^4.1.0: is-fullwidth-code-point "^3.0.0" strip-ansi "^5.2.0" +string-width@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5" + integrity sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.0" + string.prototype.padend@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/string.prototype.padend/-/string.prototype.padend-3.0.0.tgz#f3aaef7c1719f170c5eab1c32bf780d96e21f2f0" @@ -8115,23 +8485,40 @@ strip-ansi@^4.0.0: dependencies: ansi-regex "^3.0.0" -strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: +strip-ansi@^5.1.0, strip-ansi@^5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae" integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA== dependencies: ansi-regex "^4.1.0" +strip-ansi@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532" + integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w== + dependencies: + ansi-regex "^5.0.0" + strip-bom@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM= +strip-bom@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-4.0.0.tgz#9c3505c1db45bcedca3d9cf7a16f5c5aa3901878" + integrity sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w== + strip-eof@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8= +strip-final-newline@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" + integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA== + strip-json-comments@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.0.1.tgz#85713975a91fb87bf1b305cca77395e40d2a64a7" @@ -8198,6 +8585,21 @@ supports-color@^6.1.0: dependencies: has-flag "^3.0.0" +supports-color@^7.0.0, supports-color@^7.1.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1" + integrity sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g== + dependencies: + has-flag "^4.0.0" + +supports-hyperlinks@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.0.0.tgz#b1b94a159e9df00b0a554b2d5f0e0a89690334b0" + integrity sha512-bFhn0MQ8qefLyJ3K7PpHiPUTuTVPWw6RXfaMeV6xgJLXtBbszyboz1bvGTVv4R0YpQm2DqlXXn0fFHhxUHVE5w== + dependencies: + has-flag "^4.0.0" + supports-color "^7.0.0" + symbol-observable@^1.0.2, symbol-observable@^1.0.4: version "1.2.0" resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804" @@ -8243,6 +8645,14 @@ term-size@^1.2.0: dependencies: execa "^0.7.0" +terminal-link@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/terminal-link/-/terminal-link-2.1.1.tgz#14a64a27ab3c0df933ea546fba55f2d078edc994" + integrity sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ== + dependencies: + ansi-escapes "^4.2.1" + supports-hyperlinks "^2.0.0" + test-exclude@^5.2.3: version "5.2.3" resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-5.2.3.tgz#c3d3e1e311eb7ee405e092dac10aefd09091eac0" @@ -8253,6 +8663,15 @@ test-exclude@^5.2.3: read-pkg-up "^4.0.0" require-main-filename "^2.0.0" +test-exclude@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e" + integrity sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w== + dependencies: + "@istanbuljs/schema" "^0.1.2" + glob "^7.1.4" + minimatch "^3.0.4" + text-encoding-utf-8@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/text-encoding-utf-8/-/text-encoding-utf-8-1.0.2.tgz#585b62197b0ae437e3c7b5d0af27ac1021e10d13" @@ -8277,10 +8696,10 @@ thenify-all@^1.0.0: dependencies: any-promise "^1.0.0" -throat@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/throat/-/throat-4.1.0.tgz#89037cbc92c56ab18926e6ba4cbb200e15672a6a" - integrity sha1-iQN8vJLFarGJJua6TLsgDhVnKmo= +throat@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/throat/-/throat-5.0.0.tgz#c5199235803aad18754a667d659b5e72ce16764b" + integrity sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA== through@^2.3.6: version "2.3.8" @@ -8403,7 +8822,7 @@ touch@^3.1.0: dependencies: nopt "~1.0.10" -tough-cookie@^2.3.3, tough-cookie@^2.3.4: +tough-cookie@^2.3.3: version "2.5.0" resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g== @@ -8411,6 +8830,15 @@ tough-cookie@^2.3.3, tough-cookie@^2.3.4: psl "^1.1.28" punycode "^2.1.1" +tough-cookie@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-3.0.1.tgz#9df4f57e739c26930a018184887f4adb7dca73b2" + integrity sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg== + dependencies: + ip-regex "^2.1.0" + psl "^1.1.28" + punycode "^2.1.1" + tough-cookie@~2.4.3: version "2.4.3" resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781" @@ -8495,7 +8923,7 @@ type-check@~0.3.2: dependencies: prelude-ls "~1.1.2" -type-detect@^4.0.0, type-detect@^4.0.5: +type-detect@4.0.8, type-detect@^4.0.0, type-detect@^4.0.5: version "4.0.8" resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c" integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g== @@ -8528,13 +8956,12 @@ type@^1.0.1: resolved "https://registry.yarnpkg.com/type/-/type-1.0.3.tgz#16f5d39f27a2d28d86e48f8981859e9d3296c179" integrity sha512-51IMtNfVcee8+9GJvj0spSuFcZHe9vSib6Xtgsny1Km9ugyz2mbS08I3rsUIRYgJohFRFU1160sgRodYz378Hg== -uglify-js@^3.1.4: - version "3.7.2" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.7.2.tgz#cb1a601e67536e9ed094a92dd1e333459643d3f9" - integrity sha512-uhRwZcANNWVLrxLfNFEdltoPNhECUR3lc+UdJoG9CBpMcSnKyWA94tc3eAujB1GcMY5Uwq8ZMp4qWpxWYDQmaA== +typedarray-to-buffer@^3.1.5: + version "3.1.5" + resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080" + integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q== dependencies: - commander "~2.20.3" - source-map "~0.6.1" + is-typedarray "^1.0.0" undefsafe@^2.0.2: version "2.0.2" @@ -8734,6 +9161,15 @@ v8-compile-cache@^2.0.3: resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz#e14de37b31a6d194f5690d67efc4e7f6fc6ab30e" integrity sha512-usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g== +v8-to-istanbul@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-4.0.1.tgz#d6a2a3823b8ff49bdf2167ff2a45d82dff81d02f" + integrity sha512-x0yZvZAkjJwdD3fPiJzYP37aod0ati4LlmD2RmpKjqewjKAov/u/ytZ8ViIZb07cN4cePKzl9ijiUi7C1LQ8hQ== + dependencies: + "@types/istanbul-lib-coverage" "^2.0.1" + convert-source-map "^1.6.0" + source-map "^0.7.3" + v8flags@^3.1.1: version "3.1.3" resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-3.1.3.tgz#fc9dc23521ca20c5433f81cc4eb9b3033bb105d8" @@ -8780,6 +9216,15 @@ w3c-hr-time@^1.0.1: dependencies: browser-process-hrtime "^0.1.2" +w3c-xmlserializer@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-1.1.2.tgz#30485ca7d70a6fd052420a3d12fd90e6339ce794" + integrity sha512-p10l/ayESzrBMYWRID6xbuCKh2Fp77+sA0doRuGn4tTIMrrZVeqfpKjXHY+oDh3K4nLdPgNwMTVP6Vp4pvqbNg== + dependencies: + domexception "^1.0.1" + webidl-conversions "^4.0.2" + xml-name-validator "^3.0.0" + wait-on@~4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/wait-on/-/wait-on-4.0.0.tgz#4d7e4485ca759968897fd3b0cc50720c0b4ca959" @@ -8804,27 +9249,18 @@ webidl-conversions@^4.0.2: resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad" integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg== -whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.3: +whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0" integrity sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw== dependencies: iconv-lite "0.4.24" -whatwg-mimetype@^2.1.0, whatwg-mimetype@^2.2.0: +whatwg-mimetype@^2.2.0, whatwg-mimetype@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf" integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g== -whatwg-url@^6.4.1: - version "6.5.0" - resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-6.5.0.tgz#f2df02bff176fd65070df74ad5ccbb5a199965a8" - integrity sha512-rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ== - dependencies: - lodash.sortby "^4.7.0" - tr46 "^1.0.1" - webidl-conversions "^4.0.2" - whatwg-url@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.0.0.tgz#fde926fa54a599f3adf82dff25a9f7be02dc6edd" @@ -8839,7 +9275,7 @@ which-module@^2.0.0: resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho= -which@^1.2.9, which@^1.3.0: +which@^1.2.9, which@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== @@ -8873,19 +9309,14 @@ word-wrap@~1.2.3: resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== -wordwrap@~0.0.2: - version "0.0.3" - resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107" - integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc= - -wrap-ansi@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09" - integrity sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q== +wrap-ansi@^6.2.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53" + integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA== dependencies: - 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" wrappy@1: version "1.0.2" @@ -8910,6 +9341,16 @@ write-file-atomic@^2.0.0: imurmurhash "^0.1.4" signal-exit "^3.0.2" +write-file-atomic@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.1.tgz#558328352e673b5bb192cf86500d60b230667d4b" + integrity sha512-JPStrIyyVJ6oCSz/691fAjFtefZ6q+fP6tm+OS4Qw6o+TGQxNp1ziY2PgS+X/m0V8OWhZiO/m4xSj+Pr4RrZvw== + dependencies: + imurmurhash "^0.1.4" + is-typedarray "^1.0.0" + signal-exit "^3.0.2" + typedarray-to-buffer "^3.1.5" + write@1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz#0800e14523b923a387e415123c865616aae0f5c3" @@ -8931,6 +9372,11 @@ ws@^6.0.0: dependencies: async-limiter "~1.0.0" +ws@^7.0.0: + version "7.2.1" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.2.1.tgz#03ed52423cd744084b2cf42ed197c8b65a936b8e" + integrity sha512-sucePNSafamSKoOqoNfBd8V0StlkzJKL2ZAhGQinCfNQ+oacw+Pk7lcdAElecBF2VkLNZRiIb5Oi1Q5lVUVt2A== + x-xss-protection@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/x-xss-protection/-/x-xss-protection-1.3.0.tgz#3e3a8dd638da80421b0e9fff11a2dbe168f6d52c" @@ -8959,6 +9405,11 @@ xmlbuilder@~9.0.1: resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d" integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0= +xmlchars@^2.1.1: + version "2.2.0" + resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb" + integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw== + xregexp@^4.2.4: version "4.2.4" resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.2.4.tgz#02a4aea056d65a42632c02f0233eab8e4d7e57ed" @@ -8986,29 +9437,30 @@ yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3: resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9" integrity sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A== -yargs-parser@^13.1.1: - version "13.1.1" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.1.tgz#d26058532aa06d365fe091f6a1fc06b2f7e5eca0" - integrity sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ== +yargs-parser@^16.1.0: + version "16.1.0" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-16.1.0.tgz#73747d53ae187e7b8dbe333f95714c76ea00ecf1" + integrity sha512-H/V41UNZQPkUMIT5h5hiwg4QKIY1RPvoBV4XcjUbRM8Bk2oKqqyZ0DIEbTFZB0XjbtSPG8SAa/0DxCQmiRgzKg== dependencies: camelcase "^5.0.0" decamelize "^1.2.0" -yargs@^13.3.0: - version "13.3.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.0.tgz#4c657a55e07e5f2cf947f8a366567c04a0dedc83" - integrity sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA== +yargs@^15.0.0: + version "15.1.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.1.0.tgz#e111381f5830e863a89550bd4b136bb6a5f37219" + integrity sha512-T39FNN1b6hCW4SOIk1XyTOWxtXdcen0t+XYrysQmChzSipvhBO8Bj0nK1ozAasdk24dNWuMZvr4k24nz+8HHLg== dependencies: - 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 "^16.1.0" yup@^0.28.0: version "0.28.0" From d6b78e4794ac60dee9d9fd3e3c9c53a95fcea152 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 22 Jan 2020 04:20:09 +0000 Subject: [PATCH 11/67] build(deps-dev): bump @storybook/addon-notes in /webapp Bumps [@storybook/addon-notes](https://github.com/storybookjs/storybook/tree/HEAD/addons/notes) from 5.3.7 to 5.3.8. - [Release notes](https://github.com/storybookjs/storybook/releases) - [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md) - [Commits](https://github.com/storybookjs/storybook/commits/v5.3.8/addons/notes) Signed-off-by: dependabot-preview[bot] --- webapp/package.json | 2 +- webapp/yarn.lock | 216 ++++++++++++++++++++++---------------------- 2 files changed, 109 insertions(+), 109 deletions(-) diff --git a/webapp/package.json b/webapp/package.json index a50816c2d..42973216d 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -101,7 +101,7 @@ "@babel/preset-env": "~7.8.3", "@storybook/addon-a11y": "^5.3.7", "@storybook/addon-actions": "^5.3.7", - "@storybook/addon-notes": "^5.3.7", + "@storybook/addon-notes": "^5.3.8", "@storybook/vue": "~5.3.7", "@vue/cli-shared-utils": "~4.1.2", "@vue/eslint-config-prettier": "~6.0.0", diff --git a/webapp/yarn.lock b/webapp/yarn.lock index 75a306bff..947f9edfc 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -2187,18 +2187,18 @@ react-inspector "^4.0.0" uuid "^3.3.2" -"@storybook/addon-notes@^5.3.7": - version "5.3.7" - resolved "https://registry.yarnpkg.com/@storybook/addon-notes/-/addon-notes-5.3.7.tgz#96a2f1986386209a9da085ebffc8748df05c7f36" - integrity sha512-mf/JbQnBSKvp7I5vzv+0J063LFL0fGuk+rJ82xk7Tg7dwevcOOPv3FfgbZUvPnoroG/295FrS0neE4G5U/tB/w== +"@storybook/addon-notes@^5.3.8": + version "5.3.8" + resolved "https://registry.yarnpkg.com/@storybook/addon-notes/-/addon-notes-5.3.8.tgz#28a3fddccf0aa4b46ccd773426900446fd91ec48" + integrity sha512-x3SFMlWy8i+oFWWPgwQNXKfVefPDZBI7c44WOywjXhrXnLZfj+BUK9HX4ZdUMvcJLjqVcdrokiCubW1pvEU7Ww== dependencies: - "@storybook/addons" "5.3.7" - "@storybook/api" "5.3.7" - "@storybook/client-logger" "5.3.7" - "@storybook/components" "5.3.7" - "@storybook/core-events" "5.3.7" - "@storybook/router" "5.3.7" - "@storybook/theming" "5.3.7" + "@storybook/addons" "5.3.8" + "@storybook/api" "5.3.8" + "@storybook/client-logger" "5.3.8" + "@storybook/components" "5.3.8" + "@storybook/core-events" "5.3.8" + "@storybook/router" "5.3.8" + "@storybook/theming" "5.3.8" core-js "^3.0.1" global "^4.3.2" markdown-to-jsx "^6.10.3" @@ -2219,19 +2219,6 @@ global "^4.3.2" util-deprecate "^1.0.2" -"@storybook/addons@5.3.6": - version "5.3.6" - resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-5.3.6.tgz#93c5492f09b54cee4885192a0fa79465aa91751f" - integrity sha512-WXsIWOO9/0ydl0C2cGwGd6qrd4L49SoXLNiErDxmjIgLXOVicylCC3JRsExcBOlvmcfPpQniBDNFTXnl6NUldw== - dependencies: - "@storybook/api" "5.3.6" - "@storybook/channels" "5.3.6" - "@storybook/client-logger" "5.3.6" - "@storybook/core-events" "5.3.6" - core-js "^3.0.1" - global "^4.3.2" - util-deprecate "^1.0.2" - "@storybook/addons@5.3.7": version "5.3.7" resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-5.3.7.tgz#4b4502d916dd878762d09c6c2aa1bc5191ae94be" @@ -2245,6 +2232,19 @@ global "^4.3.2" util-deprecate "^1.0.2" +"@storybook/addons@5.3.8": + version "5.3.8" + resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-5.3.8.tgz#62d62bafd4a73195f617e39f3c61ec7e7837b1ee" + integrity sha512-670QGxDuS4ZkQa7SEAGgcFaO3WvedEVJaRAoCMs0AKP+sllrbph77oCm6W0NjM6bMGwhsKc8/ownOoAbec+haw== + dependencies: + "@storybook/api" "5.3.8" + "@storybook/channels" "5.3.8" + "@storybook/client-logger" "5.3.8" + "@storybook/core-events" "5.3.8" + core-js "^3.0.1" + global "^4.3.2" + util-deprecate "^1.0.2" + "@storybook/api@5.2.8": version "5.2.8" resolved "https://registry.yarnpkg.com/@storybook/api/-/api-5.2.8.tgz#21f03df8041114eb929bd10b570a17f266568b7f" @@ -2268,18 +2268,18 @@ telejson "^3.0.2" util-deprecate "^1.0.2" -"@storybook/api@5.3.6": - version "5.3.6" - resolved "https://registry.yarnpkg.com/@storybook/api/-/api-5.3.6.tgz#687b58cf31994304d0262f873e611b283b6603a4" - integrity sha512-ka05nIo+KGR1kaZZUqQ0Mmn9wVgXGi7yYzfAdtdqrK2WB2xBt78pEHU00U84Qav4rk85g/U68b7tek+oE1wmUw== +"@storybook/api@5.3.7": + version "5.3.7" + resolved "https://registry.yarnpkg.com/@storybook/api/-/api-5.3.7.tgz#fa9126d851d506607d1ba93588d3599b9b9ea0b9" + integrity sha512-SIT2Z3VtxPn26rkHNCZHYlwmfBPty0QTyWKTgVcnXxUeC74IReGzwMLJgCszouCvHFYOTru8JNndQmhnPlsQiA== dependencies: "@reach/router" "^1.2.1" - "@storybook/channels" "5.3.6" - "@storybook/client-logger" "5.3.6" - "@storybook/core-events" "5.3.6" + "@storybook/channels" "5.3.7" + "@storybook/client-logger" "5.3.7" + "@storybook/core-events" "5.3.7" "@storybook/csf" "0.0.1" - "@storybook/router" "5.3.6" - "@storybook/theming" "5.3.6" + "@storybook/router" "5.3.7" + "@storybook/theming" "5.3.7" "@types/reach__router" "^1.2.3" core-js "^3.0.1" fast-deep-equal "^2.0.1" @@ -2294,18 +2294,18 @@ telejson "^3.2.0" util-deprecate "^1.0.2" -"@storybook/api@5.3.7": - version "5.3.7" - resolved "https://registry.yarnpkg.com/@storybook/api/-/api-5.3.7.tgz#fa9126d851d506607d1ba93588d3599b9b9ea0b9" - integrity sha512-SIT2Z3VtxPn26rkHNCZHYlwmfBPty0QTyWKTgVcnXxUeC74IReGzwMLJgCszouCvHFYOTru8JNndQmhnPlsQiA== +"@storybook/api@5.3.8": + version "5.3.8" + resolved "https://registry.yarnpkg.com/@storybook/api/-/api-5.3.8.tgz#5f887911c87d1e6e1d8c12106c17f05377c6544b" + integrity sha512-Pso860gtyRc8HJ0dUkprZBSPHNrQj2zpX+C2a4TdpXgM/IW8cDQaZ4JW8ShkxxT1upKTQzVKAuogh4uWfKCJVA== dependencies: "@reach/router" "^1.2.1" - "@storybook/channels" "5.3.7" - "@storybook/client-logger" "5.3.7" - "@storybook/core-events" "5.3.7" + "@storybook/channels" "5.3.8" + "@storybook/client-logger" "5.3.8" + "@storybook/core-events" "5.3.8" "@storybook/csf" "0.0.1" - "@storybook/router" "5.3.7" - "@storybook/theming" "5.3.7" + "@storybook/router" "5.3.8" + "@storybook/theming" "5.3.8" "@types/reach__router" "^1.2.3" core-js "^3.0.1" fast-deep-equal "^2.0.1" @@ -2338,13 +2338,6 @@ dependencies: core-js "^3.0.1" -"@storybook/channels@5.3.6": - version "5.3.6" - resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-5.3.6.tgz#ed4a504fb64829d6d1bdb2ee3d48b70a33847b73" - integrity sha512-di3BcoM/O1MR749TW7NDI5q3IXAF4Tqt73CVWOLqc/ZE4c/a70rGJ8rHbWKRfXBdJlgvEU7e82SmJz0MiW0A5Q== - dependencies: - core-js "^3.0.1" - "@storybook/channels@5.3.7": version "5.3.7" resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-5.3.7.tgz#19a47c11cda72f98d7d1dc05e78c1e40bdc2bbdf" @@ -2352,6 +2345,13 @@ dependencies: core-js "^3.0.1" +"@storybook/channels@5.3.8": + version "5.3.8" + resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-5.3.8.tgz#778696b791e49c19b8de95c4bfb0ebb363745059" + integrity sha512-nYcBRUE5k855saNqTRU8X2p6QEDE28T05rinJTC2IOZA+iemrZNSobe56lAXBuNZk4vQFuJQb0Caxuu9o4+ADw== + dependencies: + core-js "^3.0.1" + "@storybook/client-api@5.3.7": version "5.3.7" resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-5.3.7.tgz#3a13d2b0c9bbc20af448121011b304c10e355644" @@ -2381,13 +2381,6 @@ dependencies: core-js "^3.0.1" -"@storybook/client-logger@5.3.6": - version "5.3.6" - resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-5.3.6.tgz#d37ac813701e8a3cc1e25b6ec017808142a421a0" - integrity sha512-B9FOMLJOmqgibxfPY9yEKXZjNWoSZ9uW7tzdwTFydvcXVf3hSGdJa102w0jEGmgautRRRQOnJ1MXkVJlMnI3MQ== - dependencies: - core-js "^3.0.1" - "@storybook/client-logger@5.3.7": version "5.3.7" resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-5.3.7.tgz#ee258a8ba0121b579c719b878e3635d6ff020abd" @@ -2395,6 +2388,13 @@ dependencies: core-js "^3.0.1" +"@storybook/client-logger@5.3.8": + version "5.3.8" + resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-5.3.8.tgz#2e846eb43c42e9602a2cf619c0f3ea7381e312b3" + integrity sha512-OaWVBwGcvQq2rArSNn+s/ePWWETwal5JQn00D6feWNxqprUkUb3aE6Ao/jgBcW/g3lDAQivT7wYwhP33tkx91w== + dependencies: + core-js "^3.0.1" + "@storybook/components@5.2.8": version "5.2.8" resolved "https://registry.yarnpkg.com/@storybook/components/-/components-5.2.8.tgz#f5d4a06ba4ba8c700b2d962deae182105b72fb99" @@ -2420,33 +2420,6 @@ react-textarea-autosize "^7.1.0" simplebar-react "^1.0.0-alpha.6" -"@storybook/components@5.3.6": - version "5.3.6" - resolved "https://registry.yarnpkg.com/@storybook/components/-/components-5.3.6.tgz#6fe38ac9ba62c982842bfcb06690c3f4fef8be06" - integrity sha512-9XhQyTF884XFdCdsJT2/xRTmMW2a1CBpZCHHC/Xvs85AZ9YeLcp7eDfeu72KMa7FApKH5wuh4JiY5nBgmkQShg== - dependencies: - "@storybook/client-logger" "5.3.6" - "@storybook/theming" "5.3.6" - "@types/react-syntax-highlighter" "11.0.2" - "@types/react-textarea-autosize" "^4.3.3" - core-js "^3.0.1" - global "^4.3.2" - lodash "^4.17.15" - markdown-to-jsx "^6.9.1" - memoizerific "^1.11.3" - polished "^3.3.1" - popper.js "^1.14.7" - prop-types "^15.7.2" - react "^16.8.3" - react-dom "^16.8.3" - react-focus-lock "^2.1.0" - react-helmet-async "^1.0.2" - react-popper-tooltip "^2.8.3" - react-syntax-highlighter "^11.0.2" - react-textarea-autosize "^7.1.0" - simplebar-react "^1.0.0-alpha.6" - ts-dedent "^1.1.0" - "@storybook/components@5.3.7": version "5.3.7" resolved "https://registry.yarnpkg.com/@storybook/components/-/components-5.3.7.tgz#8b7361fef02f042c5bad979b4d6886863d3b6a31" @@ -2474,6 +2447,33 @@ simplebar-react "^1.0.0-alpha.6" ts-dedent "^1.1.0" +"@storybook/components@5.3.8": + version "5.3.8" + resolved "https://registry.yarnpkg.com/@storybook/components/-/components-5.3.8.tgz#1d21a02ea0058fa8ee20d44248550f9f5b500114" + integrity sha512-V8ByPSGruChH0CeTFrABGWmY8EfFOukbYSH+Rul/AG2+xg7l0Mx8LJIeq63Yc3XAvAeRyvbwf1rLe3F5l4/QZA== + dependencies: + "@storybook/client-logger" "5.3.8" + "@storybook/theming" "5.3.8" + "@types/react-syntax-highlighter" "11.0.2" + "@types/react-textarea-autosize" "^4.3.3" + core-js "^3.0.1" + global "^4.3.2" + lodash "^4.17.15" + markdown-to-jsx "^6.9.1" + memoizerific "^1.11.3" + polished "^3.3.1" + popper.js "^1.14.7" + prop-types "^15.7.2" + react "^16.8.3" + react-dom "^16.8.3" + react-focus-lock "^2.1.0" + react-helmet-async "^1.0.2" + react-popper-tooltip "^2.8.3" + react-syntax-highlighter "^11.0.2" + react-textarea-autosize "^7.1.0" + simplebar-react "^1.0.0-alpha.6" + ts-dedent "^1.1.0" + "@storybook/core-events@5.2.8": version "5.2.8" resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-5.2.8.tgz#93fc458ea0820ff1409d268b0fe51abba200f5a4" @@ -2481,13 +2481,6 @@ dependencies: core-js "^3.0.1" -"@storybook/core-events@5.3.6": - version "5.3.6" - resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-5.3.6.tgz#41760f8a61958cfa2a468084460da08339c74d9b" - integrity sha512-EO9fyMY9O+jjPb9tKIjh+laMy33UPcejnkKq03uv82+VymwU4O9G/FW/JHzjDM0h0ycGy07/5JLfbMtXyCXT3w== - dependencies: - core-js "^3.0.1" - "@storybook/core-events@5.3.7": version "5.3.7" resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-5.3.7.tgz#9297277ae5868b87d3cc36f08415da1579cdb8df" @@ -2495,6 +2488,13 @@ dependencies: core-js "^3.0.1" +"@storybook/core-events@5.3.8": + version "5.3.8" + resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-5.3.8.tgz#2cc85c8109e4734298b3e1f5919c764d6abbf2f4" + integrity sha512-2GGjZj+AM4OpxU7qI2ixBeek3eigMzlyvQnDpe7cZlWDzNPNvWTspiSyQScFrtD1XV/vJTHdgDBpGb3uNHz7Eg== + dependencies: + core-js "^3.0.1" + "@storybook/core@5.3.7": version "5.3.7" resolved "https://registry.yarnpkg.com/@storybook/core/-/core-5.3.7.tgz#6196661c12709e6acffaa42baea1a891bed50706" @@ -2606,10 +2606,10 @@ memoizerific "^1.11.3" qs "^6.6.0" -"@storybook/router@5.3.6": - version "5.3.6" - resolved "https://registry.yarnpkg.com/@storybook/router/-/router-5.3.6.tgz#0e2dc80070b88d550303e43c333ffdf52d1cae1b" - integrity sha512-g3gri0j2VYM0YFyERL8KGMwYbkASneOm6MZdasS6EWXdE6+piONNC5lTPk03v5Js8LJA8LPTjyNlUwfK3plJWw== +"@storybook/router@5.3.7": + version "5.3.7" + resolved "https://registry.yarnpkg.com/@storybook/router/-/router-5.3.7.tgz#64e06a319ada9e783029a2d3e3c6a6ddf9b5a1ad" + integrity sha512-o9DZLe+TvFR1hLvRflUODw+XUvIgU87gh5xMBhuzglx3akywc/sPqM+ORBaOtAb169wpV2hvpjolteVPi5+W8Q== dependencies: "@reach/router" "^1.2.1" "@storybook/csf" "0.0.1" @@ -2621,10 +2621,10 @@ qs "^6.6.0" util-deprecate "^1.0.2" -"@storybook/router@5.3.7": - version "5.3.7" - resolved "https://registry.yarnpkg.com/@storybook/router/-/router-5.3.7.tgz#64e06a319ada9e783029a2d3e3c6a6ddf9b5a1ad" - integrity sha512-o9DZLe+TvFR1hLvRflUODw+XUvIgU87gh5xMBhuzglx3akywc/sPqM+ORBaOtAb169wpV2hvpjolteVPi5+W8Q== +"@storybook/router@5.3.8": + version "5.3.8" + resolved "https://registry.yarnpkg.com/@storybook/router/-/router-5.3.8.tgz#91eb8822e0aa6c5b59d2db1b52b88010d9800cc3" + integrity sha512-QYVYq1tbFwABEU3pxiEO4bSO+NJJX37LazN/j59QQkz8Tf9r5V9eMNxqVu5IeY3Gi0dQazLM1ghveNU4zb5MCg== dependencies: "@reach/router" "^1.2.1" "@storybook/csf" "0.0.1" @@ -2654,14 +2654,14 @@ prop-types "^15.7.2" resolve-from "^5.0.0" -"@storybook/theming@5.3.6": - version "5.3.6" - resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-5.3.6.tgz#e37f5cbfbadb888e462d60c6db7cd6bc976a4767" - integrity sha512-Z7T+qyrjN2ag5/djmM5adZ6CbBKdPLHGwTgyZiKi3YWbWF1KcRTk3RgK7gtgeqqEFHA6KJsD0ubZ7kqHO2e9Sg== +"@storybook/theming@5.3.7": + version "5.3.7" + resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-5.3.7.tgz#90ba738f3324f70d88ab412528a8240e9936093d" + integrity sha512-n73uvJrurBQAl1+FHBw8pNUjEnOQKfxRezbZJPZbhJNULSJ7EiPJKyAHvZyx82sUoTY4r8eGgEotU47jWKBLlA== dependencies: "@emotion/core" "^10.0.20" "@emotion/styled" "^10.0.17" - "@storybook/client-logger" "5.3.6" + "@storybook/client-logger" "5.3.7" core-js "^3.0.1" deep-object-diff "^1.1.0" emotion-theming "^10.0.19" @@ -2672,14 +2672,14 @@ resolve-from "^5.0.0" ts-dedent "^1.1.0" -"@storybook/theming@5.3.7": - version "5.3.7" - resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-5.3.7.tgz#90ba738f3324f70d88ab412528a8240e9936093d" - integrity sha512-n73uvJrurBQAl1+FHBw8pNUjEnOQKfxRezbZJPZbhJNULSJ7EiPJKyAHvZyx82sUoTY4r8eGgEotU47jWKBLlA== +"@storybook/theming@5.3.8": + version "5.3.8" + resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-5.3.8.tgz#7c0cb31e65c9da690dab50a99996f3e7c106ce97" + integrity sha512-W3LDFoLg7wnBnqz1GB6EZpTOdFvNObwyKV2vDjY2YNFPc2TN/w4LAQA+4Lgh3Py0O1j1v3796QwOgui+i1W0pw== dependencies: "@emotion/core" "^10.0.20" "@emotion/styled" "^10.0.17" - "@storybook/client-logger" "5.3.7" + "@storybook/client-logger" "5.3.8" core-js "^3.0.1" deep-object-diff "^1.1.0" emotion-theming "^10.0.19" From 70f449123839c9bf1ac856193ce4202bf8846905 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 22 Jan 2020 04:21:18 +0000 Subject: [PATCH 12/67] build(deps-dev): bump @storybook/addon-a11y in /webapp Bumps [@storybook/addon-a11y](https://github.com/storybookjs/storybook/tree/HEAD/addons/a11y) from 5.3.7 to 5.3.8. - [Release notes](https://github.com/storybookjs/storybook/releases) - [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md) - [Commits](https://github.com/storybookjs/storybook/commits/v5.3.8/addons/a11y) Signed-off-by: dependabot-preview[bot] --- webapp/package.json | 2 +- webapp/yarn.lock | 214 ++++++++++++++++++++++---------------------- 2 files changed, 108 insertions(+), 108 deletions(-) diff --git a/webapp/package.json b/webapp/package.json index a50816c2d..cfc0a1201 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -99,7 +99,7 @@ "@babel/core": "~7.8.3", "@babel/plugin-syntax-dynamic-import": "^7.8.3", "@babel/preset-env": "~7.8.3", - "@storybook/addon-a11y": "^5.3.7", + "@storybook/addon-a11y": "^5.3.8", "@storybook/addon-actions": "^5.3.7", "@storybook/addon-notes": "^5.3.7", "@storybook/vue": "~5.3.7", diff --git a/webapp/yarn.lock b/webapp/yarn.lock index 75a306bff..1c510d193 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -2145,17 +2145,17 @@ source-map-support "^0.5.7" tslib "^1.9.3" -"@storybook/addon-a11y@^5.3.7": - version "5.3.7" - resolved "https://registry.yarnpkg.com/@storybook/addon-a11y/-/addon-a11y-5.3.7.tgz#76e0aed7b38510de5bc8a8cf1ba2df6e564384f4" - integrity sha512-DJLyC385eB8qWfEY44S052d8E60Nha8SJ6I+ZqSkTJZx3Q2omFMVqPMmHdlogtTjqPkbYBxReBXihMoK4Hjjsg== +"@storybook/addon-a11y@^5.3.8": + version "5.3.8" + resolved "https://registry.yarnpkg.com/@storybook/addon-a11y/-/addon-a11y-5.3.8.tgz#6bb402e6dc50d1b6a1e7a651116290e10a641182" + integrity sha512-jvSrVzhcevz0O0fVEz63NezzDt8x/Jk1OWldbHtjtA7K1ILLGUGC4Q9HVs5mHt8OAMtkDSxClWblmap5ZfmJAQ== dependencies: - "@storybook/addons" "5.3.7" - "@storybook/api" "5.3.7" - "@storybook/client-logger" "5.3.7" - "@storybook/components" "5.3.7" - "@storybook/core-events" "5.3.7" - "@storybook/theming" "5.3.7" + "@storybook/addons" "5.3.8" + "@storybook/api" "5.3.8" + "@storybook/client-logger" "5.3.8" + "@storybook/components" "5.3.8" + "@storybook/core-events" "5.3.8" + "@storybook/theming" "5.3.8" axe-core "^3.3.2" core-js "^3.0.1" global "^4.3.2" @@ -2219,19 +2219,6 @@ global "^4.3.2" util-deprecate "^1.0.2" -"@storybook/addons@5.3.6": - version "5.3.6" - resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-5.3.6.tgz#93c5492f09b54cee4885192a0fa79465aa91751f" - integrity sha512-WXsIWOO9/0ydl0C2cGwGd6qrd4L49SoXLNiErDxmjIgLXOVicylCC3JRsExcBOlvmcfPpQniBDNFTXnl6NUldw== - dependencies: - "@storybook/api" "5.3.6" - "@storybook/channels" "5.3.6" - "@storybook/client-logger" "5.3.6" - "@storybook/core-events" "5.3.6" - core-js "^3.0.1" - global "^4.3.2" - util-deprecate "^1.0.2" - "@storybook/addons@5.3.7": version "5.3.7" resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-5.3.7.tgz#4b4502d916dd878762d09c6c2aa1bc5191ae94be" @@ -2245,6 +2232,19 @@ global "^4.3.2" util-deprecate "^1.0.2" +"@storybook/addons@5.3.8": + version "5.3.8" + resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-5.3.8.tgz#62d62bafd4a73195f617e39f3c61ec7e7837b1ee" + integrity sha512-670QGxDuS4ZkQa7SEAGgcFaO3WvedEVJaRAoCMs0AKP+sllrbph77oCm6W0NjM6bMGwhsKc8/ownOoAbec+haw== + dependencies: + "@storybook/api" "5.3.8" + "@storybook/channels" "5.3.8" + "@storybook/client-logger" "5.3.8" + "@storybook/core-events" "5.3.8" + core-js "^3.0.1" + global "^4.3.2" + util-deprecate "^1.0.2" + "@storybook/api@5.2.8": version "5.2.8" resolved "https://registry.yarnpkg.com/@storybook/api/-/api-5.2.8.tgz#21f03df8041114eb929bd10b570a17f266568b7f" @@ -2268,18 +2268,18 @@ telejson "^3.0.2" util-deprecate "^1.0.2" -"@storybook/api@5.3.6": - version "5.3.6" - resolved "https://registry.yarnpkg.com/@storybook/api/-/api-5.3.6.tgz#687b58cf31994304d0262f873e611b283b6603a4" - integrity sha512-ka05nIo+KGR1kaZZUqQ0Mmn9wVgXGi7yYzfAdtdqrK2WB2xBt78pEHU00U84Qav4rk85g/U68b7tek+oE1wmUw== +"@storybook/api@5.3.7": + version "5.3.7" + resolved "https://registry.yarnpkg.com/@storybook/api/-/api-5.3.7.tgz#fa9126d851d506607d1ba93588d3599b9b9ea0b9" + integrity sha512-SIT2Z3VtxPn26rkHNCZHYlwmfBPty0QTyWKTgVcnXxUeC74IReGzwMLJgCszouCvHFYOTru8JNndQmhnPlsQiA== dependencies: "@reach/router" "^1.2.1" - "@storybook/channels" "5.3.6" - "@storybook/client-logger" "5.3.6" - "@storybook/core-events" "5.3.6" + "@storybook/channels" "5.3.7" + "@storybook/client-logger" "5.3.7" + "@storybook/core-events" "5.3.7" "@storybook/csf" "0.0.1" - "@storybook/router" "5.3.6" - "@storybook/theming" "5.3.6" + "@storybook/router" "5.3.7" + "@storybook/theming" "5.3.7" "@types/reach__router" "^1.2.3" core-js "^3.0.1" fast-deep-equal "^2.0.1" @@ -2294,18 +2294,18 @@ telejson "^3.2.0" util-deprecate "^1.0.2" -"@storybook/api@5.3.7": - version "5.3.7" - resolved "https://registry.yarnpkg.com/@storybook/api/-/api-5.3.7.tgz#fa9126d851d506607d1ba93588d3599b9b9ea0b9" - integrity sha512-SIT2Z3VtxPn26rkHNCZHYlwmfBPty0QTyWKTgVcnXxUeC74IReGzwMLJgCszouCvHFYOTru8JNndQmhnPlsQiA== +"@storybook/api@5.3.8": + version "5.3.8" + resolved "https://registry.yarnpkg.com/@storybook/api/-/api-5.3.8.tgz#5f887911c87d1e6e1d8c12106c17f05377c6544b" + integrity sha512-Pso860gtyRc8HJ0dUkprZBSPHNrQj2zpX+C2a4TdpXgM/IW8cDQaZ4JW8ShkxxT1upKTQzVKAuogh4uWfKCJVA== dependencies: "@reach/router" "^1.2.1" - "@storybook/channels" "5.3.7" - "@storybook/client-logger" "5.3.7" - "@storybook/core-events" "5.3.7" + "@storybook/channels" "5.3.8" + "@storybook/client-logger" "5.3.8" + "@storybook/core-events" "5.3.8" "@storybook/csf" "0.0.1" - "@storybook/router" "5.3.7" - "@storybook/theming" "5.3.7" + "@storybook/router" "5.3.8" + "@storybook/theming" "5.3.8" "@types/reach__router" "^1.2.3" core-js "^3.0.1" fast-deep-equal "^2.0.1" @@ -2338,13 +2338,6 @@ dependencies: core-js "^3.0.1" -"@storybook/channels@5.3.6": - version "5.3.6" - resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-5.3.6.tgz#ed4a504fb64829d6d1bdb2ee3d48b70a33847b73" - integrity sha512-di3BcoM/O1MR749TW7NDI5q3IXAF4Tqt73CVWOLqc/ZE4c/a70rGJ8rHbWKRfXBdJlgvEU7e82SmJz0MiW0A5Q== - dependencies: - core-js "^3.0.1" - "@storybook/channels@5.3.7": version "5.3.7" resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-5.3.7.tgz#19a47c11cda72f98d7d1dc05e78c1e40bdc2bbdf" @@ -2352,6 +2345,13 @@ dependencies: core-js "^3.0.1" +"@storybook/channels@5.3.8": + version "5.3.8" + resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-5.3.8.tgz#778696b791e49c19b8de95c4bfb0ebb363745059" + integrity sha512-nYcBRUE5k855saNqTRU8X2p6QEDE28T05rinJTC2IOZA+iemrZNSobe56lAXBuNZk4vQFuJQb0Caxuu9o4+ADw== + dependencies: + core-js "^3.0.1" + "@storybook/client-api@5.3.7": version "5.3.7" resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-5.3.7.tgz#3a13d2b0c9bbc20af448121011b304c10e355644" @@ -2381,13 +2381,6 @@ dependencies: core-js "^3.0.1" -"@storybook/client-logger@5.3.6": - version "5.3.6" - resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-5.3.6.tgz#d37ac813701e8a3cc1e25b6ec017808142a421a0" - integrity sha512-B9FOMLJOmqgibxfPY9yEKXZjNWoSZ9uW7tzdwTFydvcXVf3hSGdJa102w0jEGmgautRRRQOnJ1MXkVJlMnI3MQ== - dependencies: - core-js "^3.0.1" - "@storybook/client-logger@5.3.7": version "5.3.7" resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-5.3.7.tgz#ee258a8ba0121b579c719b878e3635d6ff020abd" @@ -2395,6 +2388,13 @@ dependencies: core-js "^3.0.1" +"@storybook/client-logger@5.3.8": + version "5.3.8" + resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-5.3.8.tgz#2e846eb43c42e9602a2cf619c0f3ea7381e312b3" + integrity sha512-OaWVBwGcvQq2rArSNn+s/ePWWETwal5JQn00D6feWNxqprUkUb3aE6Ao/jgBcW/g3lDAQivT7wYwhP33tkx91w== + dependencies: + core-js "^3.0.1" + "@storybook/components@5.2.8": version "5.2.8" resolved "https://registry.yarnpkg.com/@storybook/components/-/components-5.2.8.tgz#f5d4a06ba4ba8c700b2d962deae182105b72fb99" @@ -2420,33 +2420,6 @@ react-textarea-autosize "^7.1.0" simplebar-react "^1.0.0-alpha.6" -"@storybook/components@5.3.6": - version "5.3.6" - resolved "https://registry.yarnpkg.com/@storybook/components/-/components-5.3.6.tgz#6fe38ac9ba62c982842bfcb06690c3f4fef8be06" - integrity sha512-9XhQyTF884XFdCdsJT2/xRTmMW2a1CBpZCHHC/Xvs85AZ9YeLcp7eDfeu72KMa7FApKH5wuh4JiY5nBgmkQShg== - dependencies: - "@storybook/client-logger" "5.3.6" - "@storybook/theming" "5.3.6" - "@types/react-syntax-highlighter" "11.0.2" - "@types/react-textarea-autosize" "^4.3.3" - core-js "^3.0.1" - global "^4.3.2" - lodash "^4.17.15" - markdown-to-jsx "^6.9.1" - memoizerific "^1.11.3" - polished "^3.3.1" - popper.js "^1.14.7" - prop-types "^15.7.2" - react "^16.8.3" - react-dom "^16.8.3" - react-focus-lock "^2.1.0" - react-helmet-async "^1.0.2" - react-popper-tooltip "^2.8.3" - react-syntax-highlighter "^11.0.2" - react-textarea-autosize "^7.1.0" - simplebar-react "^1.0.0-alpha.6" - ts-dedent "^1.1.0" - "@storybook/components@5.3.7": version "5.3.7" resolved "https://registry.yarnpkg.com/@storybook/components/-/components-5.3.7.tgz#8b7361fef02f042c5bad979b4d6886863d3b6a31" @@ -2474,6 +2447,33 @@ simplebar-react "^1.0.0-alpha.6" ts-dedent "^1.1.0" +"@storybook/components@5.3.8": + version "5.3.8" + resolved "https://registry.yarnpkg.com/@storybook/components/-/components-5.3.8.tgz#1d21a02ea0058fa8ee20d44248550f9f5b500114" + integrity sha512-V8ByPSGruChH0CeTFrABGWmY8EfFOukbYSH+Rul/AG2+xg7l0Mx8LJIeq63Yc3XAvAeRyvbwf1rLe3F5l4/QZA== + dependencies: + "@storybook/client-logger" "5.3.8" + "@storybook/theming" "5.3.8" + "@types/react-syntax-highlighter" "11.0.2" + "@types/react-textarea-autosize" "^4.3.3" + core-js "^3.0.1" + global "^4.3.2" + lodash "^4.17.15" + markdown-to-jsx "^6.9.1" + memoizerific "^1.11.3" + polished "^3.3.1" + popper.js "^1.14.7" + prop-types "^15.7.2" + react "^16.8.3" + react-dom "^16.8.3" + react-focus-lock "^2.1.0" + react-helmet-async "^1.0.2" + react-popper-tooltip "^2.8.3" + react-syntax-highlighter "^11.0.2" + react-textarea-autosize "^7.1.0" + simplebar-react "^1.0.0-alpha.6" + ts-dedent "^1.1.0" + "@storybook/core-events@5.2.8": version "5.2.8" resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-5.2.8.tgz#93fc458ea0820ff1409d268b0fe51abba200f5a4" @@ -2481,13 +2481,6 @@ dependencies: core-js "^3.0.1" -"@storybook/core-events@5.3.6": - version "5.3.6" - resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-5.3.6.tgz#41760f8a61958cfa2a468084460da08339c74d9b" - integrity sha512-EO9fyMY9O+jjPb9tKIjh+laMy33UPcejnkKq03uv82+VymwU4O9G/FW/JHzjDM0h0ycGy07/5JLfbMtXyCXT3w== - dependencies: - core-js "^3.0.1" - "@storybook/core-events@5.3.7": version "5.3.7" resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-5.3.7.tgz#9297277ae5868b87d3cc36f08415da1579cdb8df" @@ -2495,6 +2488,13 @@ dependencies: core-js "^3.0.1" +"@storybook/core-events@5.3.8": + version "5.3.8" + resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-5.3.8.tgz#2cc85c8109e4734298b3e1f5919c764d6abbf2f4" + integrity sha512-2GGjZj+AM4OpxU7qI2ixBeek3eigMzlyvQnDpe7cZlWDzNPNvWTspiSyQScFrtD1XV/vJTHdgDBpGb3uNHz7Eg== + dependencies: + core-js "^3.0.1" + "@storybook/core@5.3.7": version "5.3.7" resolved "https://registry.yarnpkg.com/@storybook/core/-/core-5.3.7.tgz#6196661c12709e6acffaa42baea1a891bed50706" @@ -2606,10 +2606,10 @@ memoizerific "^1.11.3" qs "^6.6.0" -"@storybook/router@5.3.6": - version "5.3.6" - resolved "https://registry.yarnpkg.com/@storybook/router/-/router-5.3.6.tgz#0e2dc80070b88d550303e43c333ffdf52d1cae1b" - integrity sha512-g3gri0j2VYM0YFyERL8KGMwYbkASneOm6MZdasS6EWXdE6+piONNC5lTPk03v5Js8LJA8LPTjyNlUwfK3plJWw== +"@storybook/router@5.3.7": + version "5.3.7" + resolved "https://registry.yarnpkg.com/@storybook/router/-/router-5.3.7.tgz#64e06a319ada9e783029a2d3e3c6a6ddf9b5a1ad" + integrity sha512-o9DZLe+TvFR1hLvRflUODw+XUvIgU87gh5xMBhuzglx3akywc/sPqM+ORBaOtAb169wpV2hvpjolteVPi5+W8Q== dependencies: "@reach/router" "^1.2.1" "@storybook/csf" "0.0.1" @@ -2621,10 +2621,10 @@ qs "^6.6.0" util-deprecate "^1.0.2" -"@storybook/router@5.3.7": - version "5.3.7" - resolved "https://registry.yarnpkg.com/@storybook/router/-/router-5.3.7.tgz#64e06a319ada9e783029a2d3e3c6a6ddf9b5a1ad" - integrity sha512-o9DZLe+TvFR1hLvRflUODw+XUvIgU87gh5xMBhuzglx3akywc/sPqM+ORBaOtAb169wpV2hvpjolteVPi5+W8Q== +"@storybook/router@5.3.8": + version "5.3.8" + resolved "https://registry.yarnpkg.com/@storybook/router/-/router-5.3.8.tgz#91eb8822e0aa6c5b59d2db1b52b88010d9800cc3" + integrity sha512-QYVYq1tbFwABEU3pxiEO4bSO+NJJX37LazN/j59QQkz8Tf9r5V9eMNxqVu5IeY3Gi0dQazLM1ghveNU4zb5MCg== dependencies: "@reach/router" "^1.2.1" "@storybook/csf" "0.0.1" @@ -2654,14 +2654,14 @@ prop-types "^15.7.2" resolve-from "^5.0.0" -"@storybook/theming@5.3.6": - version "5.3.6" - resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-5.3.6.tgz#e37f5cbfbadb888e462d60c6db7cd6bc976a4767" - integrity sha512-Z7T+qyrjN2ag5/djmM5adZ6CbBKdPLHGwTgyZiKi3YWbWF1KcRTk3RgK7gtgeqqEFHA6KJsD0ubZ7kqHO2e9Sg== +"@storybook/theming@5.3.7": + version "5.3.7" + resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-5.3.7.tgz#90ba738f3324f70d88ab412528a8240e9936093d" + integrity sha512-n73uvJrurBQAl1+FHBw8pNUjEnOQKfxRezbZJPZbhJNULSJ7EiPJKyAHvZyx82sUoTY4r8eGgEotU47jWKBLlA== dependencies: "@emotion/core" "^10.0.20" "@emotion/styled" "^10.0.17" - "@storybook/client-logger" "5.3.6" + "@storybook/client-logger" "5.3.7" core-js "^3.0.1" deep-object-diff "^1.1.0" emotion-theming "^10.0.19" @@ -2672,14 +2672,14 @@ resolve-from "^5.0.0" ts-dedent "^1.1.0" -"@storybook/theming@5.3.7": - version "5.3.7" - resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-5.3.7.tgz#90ba738f3324f70d88ab412528a8240e9936093d" - integrity sha512-n73uvJrurBQAl1+FHBw8pNUjEnOQKfxRezbZJPZbhJNULSJ7EiPJKyAHvZyx82sUoTY4r8eGgEotU47jWKBLlA== +"@storybook/theming@5.3.8": + version "5.3.8" + resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-5.3.8.tgz#7c0cb31e65c9da690dab50a99996f3e7c106ce97" + integrity sha512-W3LDFoLg7wnBnqz1GB6EZpTOdFvNObwyKV2vDjY2YNFPc2TN/w4LAQA+4Lgh3Py0O1j1v3796QwOgui+i1W0pw== dependencies: "@emotion/core" "^10.0.20" "@emotion/styled" "^10.0.17" - "@storybook/client-logger" "5.3.7" + "@storybook/client-logger" "5.3.8" core-js "^3.0.1" deep-object-diff "^1.1.0" emotion-theming "^10.0.19" From 8a4d8a6cd888562e17fa67f1294026c44961b064 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 22 Jan 2020 08:44:44 +0000 Subject: [PATCH 13/67] build(deps-dev): bump babel-jest from 24.9.0 to 25.1.0 in /backend Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest) from 24.9.0 to 25.1.0. - [Release notes](https://github.com/facebook/jest/releases) - [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md) - [Commits](https://github.com/facebook/jest/commits/v25.1.0/packages/babel-jest) Signed-off-by: dependabot-preview[bot] --- backend/package.json | 2 +- backend/yarn.lock | 247 ++----------------------------------------- 2 files changed, 8 insertions(+), 241 deletions(-) diff --git a/backend/package.json b/backend/package.json index 3bf6f70f3..bf4c9a5bc 100644 --- a/backend/package.json +++ b/backend/package.json @@ -106,7 +106,7 @@ "apollo-server-testing": "~2.9.16", "babel-core": "~7.0.0-0", "babel-eslint": "~10.0.3", - "babel-jest": "~24.9.0", + "babel-jest": "~25.1.0", "chai": "~4.2.0", "cucumber": "~6.0.5", "eslint": "~6.8.0", diff --git a/backend/yarn.lock b/backend/yarn.lock index 267c54eb3..07b5b2983 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -86,7 +86,7 @@ semver "^5.4.1" source-map "^0.5.0" -"@babel/generator@^7.4.0", "@babel/generator@^7.8.3": +"@babel/generator@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.8.3.tgz#0e22c005b0a94c1c74eafe19ef78ce53a4d45c03" integrity sha512-WjoPk8hRpDRqqzRpvaR8/gDUPkrnOOeuT2m8cNICJtZH6mwaCo3v0OKMI7Y6SM1pBtyijnLtAL0HDi41pf41ug== @@ -302,7 +302,7 @@ resolve "^1.13.1" v8flags "^3.1.1" -"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.4.3", "@babel/parser@^7.7.5", "@babel/parser@^7.8.3": +"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.7.5", "@babel/parser@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.8.3.tgz#790874091d2001c9be6ec426c2eed47bc7679081" integrity sha512-/V72F4Yp/qmHaTALizEm9Gf2eQHV3QyTL3K0cNfijwnMnb1L+LDlAubb/ZnSdGAVzVSWakujHYs1I26x66sMeQ== @@ -784,7 +784,7 @@ dependencies: regenerator-runtime "^0.13.2" -"@babel/template@^7.4.0", "@babel/template@^7.7.4", "@babel/template@^7.8.3": +"@babel/template@^7.7.4", "@babel/template@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.8.3.tgz#e02ad04fe262a657809327f578056ca15fd4d1b8" integrity sha512-04m87AcQgAFdvuoyiQ2kgELr2tV8B4fP/xJAVUL3Yb3bkNdMedD3d0rlSQr3PegP0cms3eHjl1F7PWlvWbU8FQ== @@ -793,7 +793,7 @@ "@babel/parser" "^7.8.3" "@babel/types" "^7.8.3" -"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.4.3", "@babel/traverse@^7.7.4", "@babel/traverse@^7.8.3": +"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.7.4", "@babel/traverse@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.8.3.tgz#a826215b011c9b4f73f3a893afbc05151358bf9a" integrity sha512-we+a2lti+eEImHmEXp7bM9cTxGzxPmBiVJlLVD+FuuQMeeO7RaDbutbgeheDkw+Xe3mCfJHnGOWLswT74m2IPg== @@ -808,7 +808,7 @@ globals "^11.1.0" lodash "^4.17.13" -"@babel/types@^7.0.0", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.8.3": +"@babel/types@^7.0.0", "@babel/types@^7.3.0", "@babel/types@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.8.3.tgz#5a383dffa5416db1b73dedffd311ffd0788fb31c" integrity sha512-jBD+G8+LWpMBBWvVcdr4QysjUE4mU/syrhN17o1u3gx0/WzJB1kwiVZAXRtWbsIPOwW8pF/YJV5+nmetPzepXg== @@ -982,15 +982,6 @@ resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd" integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw== -"@jest/console@^24.9.0": - version "24.9.0" - resolved "https://registry.yarnpkg.com/@jest/console/-/console-24.9.0.tgz#79b1bc06fb74a8cfb01cbdedf945584b1b9707f0" - integrity sha512-Zuj6b8TnKXi3q4ymac8EQfc3ea/uhLeCGThFqXeC8H9/raaH8ARPUTdId+XyGd03Z4In0/VjD2OYFcBF09fNLQ== - dependencies: - "@jest/source-map" "^24.9.0" - chalk "^2.0.1" - slash "^2.0.0" - "@jest/console@^25.1.0": version "25.1.0" resolved "https://registry.yarnpkg.com/@jest/console/-/console-25.1.0.tgz#1fc765d44a1e11aec5029c08e798246bd37075ab" @@ -1044,15 +1035,6 @@ "@jest/types" "^25.1.0" jest-mock "^25.1.0" -"@jest/fake-timers@^24.9.0": - version "24.9.0" - resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-24.9.0.tgz#ba3e6bf0eecd09a636049896434d306636540c93" - integrity sha512-eWQcNa2YSwzXWIMC5KufBh3oWRIijrQFROsIqt6v/NS9Io/gknw1jsAC9c+ih/RQX4A3O7SeWAhQeN0goKhT9A== - dependencies: - "@jest/types" "^24.9.0" - jest-message-util "^24.9.0" - jest-mock "^24.9.0" - "@jest/fake-timers@^25.1.0": version "25.1.0" resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-25.1.0.tgz#a1e0eff51ffdbb13ee81f35b52e0c1c11a350ce8" @@ -1097,15 +1079,6 @@ optionalDependencies: node-notifier "^6.0.0" -"@jest/source-map@^24.9.0": - version "24.9.0" - resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-24.9.0.tgz#0e263a94430be4b41da683ccc1e6bffe2a191714" - integrity sha512-/Xw7xGlsZb4MJzNDgB7PW5crou5JqWiBQaz6xyPd3ArOg2nfn/PunV8+olXbbEZzNl591o5rWKE9BRDaFAuIBg== - dependencies: - callsites "^3.0.0" - graceful-fs "^4.1.15" - source-map "^0.6.0" - "@jest/source-map@^25.1.0": version "25.1.0" resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-25.1.0.tgz#b012e6c469ccdbc379413f5c1b1ffb7ba7034fb0" @@ -1115,15 +1088,6 @@ graceful-fs "^4.2.3" source-map "^0.6.0" -"@jest/test-result@^24.9.0": - version "24.9.0" - resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-24.9.0.tgz#11796e8aa9dbf88ea025757b3152595ad06ba0ca" - integrity sha512-XEFrHbBonBJ8dGp2JmF8kP/nQI/ImPpygKHwQ/SY+es59Z3L5PI4Qb9TQQMAEeYsThG1xF0k6tmG0tIKATNiiA== - dependencies: - "@jest/console" "^24.9.0" - "@jest/types" "^24.9.0" - "@types/istanbul-lib-coverage" "^2.0.0" - "@jest/test-result@^25.1.0": version "25.1.0" resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-25.1.0.tgz#847af2972c1df9822a8200457e64be4ff62821f7" @@ -1145,28 +1109,6 @@ jest-runner "^25.1.0" jest-runtime "^25.1.0" -"@jest/transform@^24.9.0": - version "24.9.0" - resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-24.9.0.tgz#4ae2768b296553fadab09e9ec119543c90b16c56" - integrity sha512-TcQUmyNRxV94S0QpMOnZl0++6RMiqpbH/ZMccFB/amku6Uwvyb1cjYX7xkp5nGNkbX4QPH/FcB6q1HBTHynLmQ== - dependencies: - "@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/transform@^25.1.0": version "25.1.0" resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-25.1.0.tgz#221f354f512b4628d88ce776d5b9e601028ea9da" @@ -1189,15 +1131,6 @@ source-map "^0.6.1" write-file-atomic "^3.0.0" -"@jest/types@^24.9.0": - version "24.9.0" - resolved "https://registry.yarnpkg.com/@jest/types/-/types-24.9.0.tgz#63cb26cb7500d069e5a389441a7c6ab5e909fc59" - integrity sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw== - dependencies: - "@types/istanbul-lib-coverage" "^2.0.0" - "@types/istanbul-reports" "^1.1.1" - "@types/yargs" "^13.0.0" - "@jest/types@^25.1.0": version "25.1.0" resolved "https://registry.yarnpkg.com/@jest/types/-/types-25.1.0.tgz#b26831916f0d7c381e11dbb5e103a72aed1b4395" @@ -1667,13 +1600,6 @@ resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-13.0.0.tgz#453743c5bbf9f1bed61d959baab5b06be029b2d0" integrity sha512-wBlsw+8n21e6eTd4yVv8YD/E3xq0O6nNnJIquutAsFGE7EyMKz7W6RNT6BRu1SmdgmlCZ9tb0X+j+D6HGr8pZw== -"@types/yargs@^13.0.0": - version "13.0.2" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.2.tgz#a64674fc0149574ecd90ba746e932b5a5f7b3653" - integrity sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ== - dependencies: - "@types/yargs-parser" "*" - "@types/yargs@^15.0.0": version "15.0.1" resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.1.tgz#9266a9d7be68cfcc982568211085a49a277f7c96" @@ -2331,7 +2257,7 @@ babel-eslint@~10.0.3: eslint-visitor-keys "^1.0.0" resolve "^1.12.0" -babel-jest@^25.1.0: +babel-jest@^25.1.0, babel-jest@~25.1.0: version "25.1.0" resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-25.1.0.tgz#206093ac380a4b78c4404a05b3277391278f80fb" integrity sha512-tz0VxUhhOE2y+g8R2oFrO/2VtVjA1lkJeavlhExuRBg3LdNJY9gwQ+Vcvqt9+cqy71MCTJhewvTB7Qtnnr9SWg== @@ -2344,19 +2270,6 @@ babel-jest@^25.1.0: chalk "^3.0.0" slash "^3.0.0" -babel-jest@~24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-24.9.0.tgz#3fc327cb8467b89d14d7bc70e315104a783ccd54" - integrity sha512-ntuddfyiN+EhMw58PTNL1ph4C9rECiQXjI4nMMBKBaNjXvqLdkXpPRcMSr4iyBrJg/+wz9brFUD6RhOAT6r4Iw== - dependencies: - "@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-plugin-dynamic-import-node@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz#f00f507bdaa3c3e3ff6e7e5e98d90a7acab96f7f" @@ -2364,16 +2277,6 @@ babel-plugin-dynamic-import-node@^2.3.0: dependencies: object.assign "^4.1.0" -babel-plugin-istanbul@^5.1.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-5.2.0.tgz#df4ade83d897a92df069c4d9a25cf2671293c854" - integrity sha512-5LphC0USA8t4i1zCtjbbNb6jJj/9+X6P37Qfirc/70EQ34xKlMW+a1RHGwxGI+SwWpNwZ27HqvzAobeqaXwiZw== - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - find-up "^3.0.0" - istanbul-lib-instrument "^3.3.0" - test-exclude "^5.2.3" - babel-plugin-istanbul@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz#e159ccdc9af95e0b570c75b4573b7c34d671d765" @@ -2385,13 +2288,6 @@ babel-plugin-istanbul@^6.0.0: istanbul-lib-instrument "^4.0.0" test-exclude "^6.0.0" -babel-plugin-jest-hoist@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-24.9.0.tgz#4f837091eb407e01447c8843cbec546d0002d756" - integrity sha512-2EMA2P8Vp7lG0RAzr4HXqtYwacfMErOuv1U3wrvxHX6rD1sV6xS3WXG3r8TRQ2r6w8OhvSdWt+z41hQNwNm3Xw== - dependencies: - "@types/babel__traverse" "^7.0.6" - babel-plugin-jest-hoist@^25.1.0: version "25.1.0" resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-25.1.0.tgz#fb62d7b3b53eb36c97d1bc7fec2072f9bd115981" @@ -2406,14 +2302,6 @@ babel-plugin-transform-runtime@^6.23.0: dependencies: babel-runtime "^6.22.0" -babel-preset-jest@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-24.9.0.tgz#192b521e2217fb1d1f67cf73f70c336650ad3cdc" - integrity sha512-izTUuhE4TMfTRPF92fFwD2QfdXaZW08qvWTFCI51V8rW5x00UuPgc3ajRoWofXOuxjfcOM5zzSYsQS3H8KGCAg== - dependencies: - "@babel/plugin-syntax-object-rest-spread" "^7.0.0" - babel-plugin-jest-hoist "^24.9.0" - babel-preset-jest@^25.1.0: version "25.1.0" resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-25.1.0.tgz#d0aebfebb2177a21cde710996fce8486d34f1d33" @@ -4508,7 +4396,7 @@ got@^9.6.0, got@~9.6.0: to-readable-stream "^1.0.0" url-parse-lax "^3.0.0" -graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2: +graceful-fs@^4.1.11, graceful-fs@^4.1.2: version "4.2.2" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.2.tgz#6f0952605d0140c1cfdb138ed005775b92d67b02" integrity sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q== @@ -5363,29 +5251,11 @@ isstream@~0.1.2: resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo= -istanbul-lib-coverage@^2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz#675f0ab69503fad4b1d849f736baaca803344f49" - integrity sha512-8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA== - istanbul-lib-coverage@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz#f5944a37c70b550b02a78a5c3b2055b280cec8ec" integrity sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg== -istanbul-lib-instrument@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-3.3.0.tgz#a5f63d91f0bbc0c3e479ef4c5de027335ec6d630" - integrity sha512-5nnIN4vo5xQZHdXno/YDXJ0G+I3dAm4XgzfSVTPLQpj/zAV2dV6Juy0yaf10/zrJOJeHoN3fraFe+XRq2bFVZA== - dependencies: - "@babel/generator" "^7.4.0" - "@babel/parser" "^7.4.3" - "@babel/template" "^7.4.0" - "@babel/traverse" "^7.4.3" - "@babel/types" "^7.4.0" - istanbul-lib-coverage "^2.0.5" - semver "^6.0.0" - istanbul-lib-instrument@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.0.tgz#53321a7970f076262fd3292c8f9b2e4ac544aae1" @@ -5537,25 +5407,6 @@ jest-get-type@^25.1.0: resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-25.1.0.tgz#1cfe5fc34f148dc3a8a3b7275f6b9ce9e2e8a876" integrity sha512-yWkBnT+5tMr8ANB6V+OjmrIJufHtCAqI5ic2H40v+tRqxDmE0PGnIiTyvRWFOMtmVHYpwRqyazDbTnhpjsGvLw== -jest-haste-map@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-24.9.0.tgz#b38a5d64274934e21fa417ae9a9fbeb77ceaac7d" - integrity sha512-kfVFmsuWui2Sj1Rp1AJ4D9HqJwE4uwTlS/vO+eRUaMmd54BFpli2XhMQnPC2k4cHFVbB2Q2C+jtI1AGLgEnCjQ== - dependencies: - "@jest/types" "^24.9.0" - anymatch "^2.0.0" - fb-watchman "^2.0.0" - 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" - optionalDependencies: - fsevents "^1.2.7" - jest-haste-map@^25.1.0: version "25.1.0" resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-25.1.0.tgz#ae12163d284f19906260aa51fd405b5b2e5a4ad3" @@ -5615,20 +5466,6 @@ jest-matcher-utils@^25.1.0: jest-get-type "^25.1.0" pretty-format "^25.1.0" -jest-message-util@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-24.9.0.tgz#527f54a1e380f5e202a8d1149b0ec872f43119e3" - integrity sha512-oCj8FiZ3U0hTP4aSui87P4L4jC37BtQwUMqk+zk/b11FR19BJDeZsZAvIHutWnmtw7r85UmR3CEWZ0HWU2mAlw== - dependencies: - "@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" - jest-message-util@^25.1.0: version "25.1.0" resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-25.1.0.tgz#702a9a5cb05c144b9aa73f06e17faa219389845e" @@ -5643,13 +5480,6 @@ jest-message-util@^25.1.0: slash "^3.0.0" stack-utils "^1.0.1" -jest-mock@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-24.9.0.tgz#c22835541ee379b908673ad51087a2185c13f1c6" - integrity sha512-3BEYN5WbSq9wd+SyLDES7AHnjH9A/ROBwmz7l2y+ol+NtSFO8DYiEBzoO1CeFc9a8DYy10EO4dDFVv/wN3zl1w== - dependencies: - "@jest/types" "^24.9.0" - jest-mock@^25.1.0: version "25.1.0" resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-25.1.0.tgz#411d549e1b326b7350b2e97303a64715c28615fd" @@ -5662,11 +5492,6 @@ jest-pnp-resolver@^1.2.1: resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.1.tgz#ecdae604c077a7fbc70defb6d517c3c1c898923a" integrity sha512-pgFw2tm54fzgYvc/OHrnysABEObZCUNFnhjoRjaVOCN8NYc032/gVjPaHD4Aq6ApkSieWtfKAFQtmDKAmhupnQ== -jest-regex-util@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-24.9.0.tgz#c13fb3380bde22bf6575432c493ea8fe37965636" - integrity sha512-05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA== - jest-regex-util@^25.1.0: version "25.1.0" resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-25.1.0.tgz#efaf75914267741838e01de24da07b2192d16d87" @@ -5748,11 +5573,6 @@ jest-runtime@^25.1.0: strip-bom "^4.0.0" yargs "^15.0.0" -jest-serializer@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-24.9.0.tgz#e6d7d7ef96d31e8b9079a714754c5d5c58288e73" - integrity sha512-DxYipDr8OvfrKH3Kel6NdED3OXxjvxXZ1uIY2I9OFbGg+vUkkg7AGvi65qbhbWNPvDckXmzMPbK3u3HaDO49bQ== - jest-serializer@^25.1.0: version "25.1.0" resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-25.1.0.tgz#73096ba90e07d19dec4a0c1dd89c355e2f129e5d" @@ -5777,24 +5597,6 @@ jest-snapshot@^25.1.0: pretty-format "^25.1.0" semver "^7.1.1" -jest-util@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-24.9.0.tgz#7396814e48536d2e85a37de3e4c431d7cb140162" - integrity sha512-x+cZU8VRmOJxbA1K5oDBdxQmdq0OIdADarLxk0Mq+3XS4jgvhG/oKGWcIDCtPG0HgjxOYvF+ilPJQsAyXfbNOg== - dependencies: - "@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" - jest-util@^25.1.0: version "25.1.0" resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-25.1.0.tgz#7bc56f7b2abd534910e9fa252692f50624c897d9" @@ -5829,14 +5631,6 @@ jest-watcher@^25.1.0: jest-util "^25.1.0" string-length "^3.1.0" -jest-worker@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-24.9.0.tgz#5dbfdb5b2d322e98567898238a9697bcce67b3e5" - integrity sha512-51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw== - dependencies: - merge-stream "^2.0.0" - supports-color "^6.1.0" - jest-worker@^25.1.0: version "25.1.0" resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-25.1.0.tgz#75d038bad6fdf58eba0d2ec1835856c497e3907a" @@ -7603,14 +7397,6 @@ read-pkg-up@^2.0.0: find-up "^2.0.0" read-pkg "^2.0.0" -read-pkg-up@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-4.0.0.tgz#1b221c6088ba7799601c808f91161c66e58f8978" - integrity sha512-6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA== - dependencies: - find-up "^3.0.0" - read-pkg "^3.0.0" - read-pkg@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8" @@ -8653,16 +8439,6 @@ terminal-link@^2.0.0: ansi-escapes "^4.2.1" supports-hyperlinks "^2.0.0" -test-exclude@^5.2.3: - version "5.2.3" - resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-5.2.3.tgz#c3d3e1e311eb7ee405e092dac10aefd09091eac0" - integrity sha512-M+oxtseCFO3EDtAaGH7iiej3CBkzXqFMbzqYAACdzKui4eZA+pq3tZEwChvOdNfa7xxy8BfbmgJSIr43cC/+2g== - dependencies: - glob "^7.1.3" - minimatch "^3.0.4" - read-pkg-up "^4.0.0" - require-main-filename "^2.0.0" - test-exclude@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e" @@ -9323,15 +9099,6 @@ wrappy@1: resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= -write-file-atomic@2.4.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.1.tgz#d0b05463c188ae804396fd5ab2a370062af87529" - integrity sha512-TGHFeZEZMnv+gBFRfjAcxL5bPHrsGKtnb4qsFAws7/vlh+QfwAaySIw4AXP9ZskTTh5GWu3FLuJhsWVdiJPGvg== - dependencies: - graceful-fs "^4.1.11" - imurmurhash "^0.1.4" - signal-exit "^3.0.2" - write-file-atomic@^2.0.0: version "2.4.3" resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.3.tgz#1fd2e9ae1df3e75b8d8c367443c692d4ca81f481" From f158e3e59637b652a0af0a25f7ce118f5f60be33 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 22 Jan 2020 09:21:05 +0000 Subject: [PATCH 14/67] build(deps-dev): bump @storybook/addon-actions in /webapp Bumps [@storybook/addon-actions](https://github.com/storybookjs/storybook/tree/HEAD/addons/actions) from 5.3.7 to 5.3.8. - [Release notes](https://github.com/storybookjs/storybook/releases) - [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md) - [Commits](https://github.com/storybookjs/storybook/commits/v5.3.8/addons/actions) Signed-off-by: dependabot-preview[bot] --- webapp/package.json | 2 +- webapp/yarn.lock | 59 +++++++++++++++++++++++++++++++++++++-------- 2 files changed, 50 insertions(+), 11 deletions(-) diff --git a/webapp/package.json b/webapp/package.json index c2b8aa92b..0439398a2 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -100,7 +100,7 @@ "@babel/plugin-syntax-dynamic-import": "^7.8.3", "@babel/preset-env": "~7.8.3", "@storybook/addon-a11y": "^5.3.8", - "@storybook/addon-actions": "^5.3.7", + "@storybook/addon-actions": "^5.3.8", "@storybook/addon-notes": "^5.3.8", "@storybook/vue": "~5.3.7", "@vue/cli-shared-utils": "~4.1.2", diff --git a/webapp/yarn.lock b/webapp/yarn.lock index 17e875bc9..bcd90b561 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -2167,17 +2167,17 @@ ts-dedent "^1.1.0" util-deprecate "^1.0.2" -"@storybook/addon-actions@^5.3.7": - version "5.3.7" - resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-5.3.7.tgz#3a34b3b35de0ecdf847c12e8eac40f4627ba752c" - integrity sha512-Ja0NkItwrFYL1UJHgnUeDtl8QvV1LH+TJq7APVMX3UaUzkeoF9XueFRl/+lh1SSUrCJwj5/8WK6r39ch7DS7rA== +"@storybook/addon-actions@^5.3.8": + version "5.3.8" + resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-5.3.8.tgz#0f0deb16725ba14f161fe692d0f2240f43ec22e1" + integrity sha512-em67VfeuDPJhRlPykPbf8ks1eVyEBsm/FakqxsETagEmYs738777ZVKlBSTgF/BfZTiu8AOZUFKq9Zevne4/uw== dependencies: - "@storybook/addons" "5.3.7" - "@storybook/api" "5.3.7" - "@storybook/client-api" "5.3.7" - "@storybook/components" "5.3.7" - "@storybook/core-events" "5.3.7" - "@storybook/theming" "5.3.7" + "@storybook/addons" "5.3.8" + "@storybook/api" "5.3.8" + "@storybook/client-api" "5.3.8" + "@storybook/components" "5.3.8" + "@storybook/core-events" "5.3.8" + "@storybook/theming" "5.3.8" core-js "^3.0.1" fast-deep-equal "^2.0.1" global "^4.3.2" @@ -2331,6 +2331,17 @@ global "^4.3.2" telejson "^3.2.0" +"@storybook/channel-postmessage@5.3.8": + version "5.3.8" + resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-5.3.8.tgz#76544f1fd276338df9f427eec11d3ec12de86215" + integrity sha512-dnWD39+ABBy4bkXIUnlgo9CArfWfQ9D3xYykY8GXLlNMIVlAQBqPmBIHrd05ly7Z1CDjh0WY7dLK7vNG5nZm6A== + dependencies: + "@storybook/channels" "5.3.8" + "@storybook/client-logger" "5.3.8" + core-js "^3.0.1" + global "^4.3.2" + telejson "^3.2.0" + "@storybook/channels@5.2.8": version "5.2.8" resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-5.2.8.tgz#79a99ad85dcacb688073c22340c5b7d16b801202" @@ -2374,6 +2385,29 @@ ts-dedent "^1.1.0" util-deprecate "^1.0.2" +"@storybook/client-api@5.3.8": + version "5.3.8" + resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-5.3.8.tgz#e2e461e915c5e5796638efb3913d59411a9012d4" + integrity sha512-jPdkPuTBQ7uLTAAcaB9m84o+pJDQy3N3zPuSkt8SFz3LdJS0WJESsaPqxUV1BL0Lzr8Y2wumjKwVgQLumhUmvA== + dependencies: + "@storybook/addons" "5.3.8" + "@storybook/channel-postmessage" "5.3.8" + "@storybook/channels" "5.3.8" + "@storybook/client-logger" "5.3.8" + "@storybook/core-events" "5.3.8" + "@storybook/csf" "0.0.1" + "@types/webpack-env" "^1.15.0" + core-js "^3.0.1" + eventemitter3 "^4.0.0" + global "^4.3.2" + is-plain-object "^3.0.0" + lodash "^4.17.15" + memoizerific "^1.11.3" + qs "^6.6.0" + stable "^0.1.8" + ts-dedent "^1.1.0" + util-deprecate "^1.0.2" + "@storybook/client-logger@5.2.8": version "5.2.8" resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-5.2.8.tgz#5affe2f9dbbee374721fd2e8729116f5ac39c779" @@ -3120,6 +3154,11 @@ resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.14.0.tgz#8edfc5f8e6eae20eeed3ca0d02974ed4ee5e4efc" integrity sha512-Fv+0gYJzE/czLoRKq+gnXWr4yBpPM3tO3C8pDLFwqVKlMICQUq5OsxwwFZYDaVr7+L6mgNDp16iOcJHEz3J5RQ== +"@types/webpack-env@^1.15.0": + version "1.15.0" + resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.15.0.tgz#bd9956d5044b1fb43e869a9ba9148862ff98d9fd" + integrity sha512-TfcyNecCz8Z9/s90gBOBniyzZrTru8u2Vp0VZODq4KEBaQu8bfXvu7o/KUOecMpzjbFPUA7aqgSq628Iue5BQg== + "@types/ws@^6.0.0": version "6.0.1" resolved "https://registry.yarnpkg.com/@types/ws/-/ws-6.0.1.tgz#ca7a3f3756aa12f62a0a62145ed14c6db25d5a28" From 561889c53007dad8ffb91430e6cd9b18af251d46 Mon Sep 17 00:00:00 2001 From: mattwr18 Date: Wed, 22 Jan 2020 13:19:38 +0100 Subject: [PATCH 15/67] Add migration to merge duplicate Locations - having duplicate Location nodes in the production database blocks us from adding a unique constraint, so that Locations are not created which have the same id. --- backend/src/db/migrate/store.js | 21 +++-- ...87929111-merge_duplicate_location_nodes.js | 77 +++++++++++++++++++ 2 files changed, 91 insertions(+), 7 deletions(-) create mode 100644 backend/src/db/migrations/1579387929111-merge_duplicate_location_nodes.js diff --git a/backend/src/db/migrate/store.js b/backend/src/db/migrate/store.js index 97b057dac..81df47708 100644 --- a/backend/src/db/migrate/store.js +++ b/backend/src/db/migrate/store.js @@ -35,7 +35,7 @@ class Store { const session = driver.session() const readTxResultPromise = session.readTransaction(async txc => { const result = await txc.run( - 'MATCH (migration:Migration) RETURN migration {.*} ORDER BY migration.timestamp DESC', + 'MATCH (migration:Migration) RETURN migration {.*} ORDER BY migration.createdAt DESC', ) return result.records.map(r => r.get('migration')) }) @@ -64,12 +64,19 @@ class Store { const { migrations } = set const writeTxResultPromise = session.writeTransaction(txc => { return Promise.all( - migrations.map(migration => { - const { title, description, timestamp } = migration - const properties = { title, description, timestamp } - return txc.run('CREATE (migration:Migration) SET migration += $properties', { - properties, - }) + migrations.map(async migration => { + const { title, description } = migration + const properties = { title, description } + const migrationResult = await txc.run( + ` + MERGE (migration:Migration { title: $properties.title }) + ON CREATE SET migration += $properties, + migration.createdAt = toString(datetime()) + RETURN migration + `, + { properties }, + ) + return migrationResult }), ) }) diff --git a/backend/src/db/migrations/1579387929111-merge_duplicate_location_nodes.js b/backend/src/db/migrations/1579387929111-merge_duplicate_location_nodes.js new file mode 100644 index 000000000..390bfd935 --- /dev/null +++ b/backend/src/db/migrations/1579387929111-merge_duplicate_location_nodes.js @@ -0,0 +1,77 @@ +import { throwError, concat } from 'rxjs' +import { flatMap, mergeMap, map, catchError } from 'rxjs/operators' +import { getDriver } from '../neo4j' + +export const description = ` + This migration merges duplicate :Location nodes. It became + necessary after we realized that we had not set up constraints for Location.id in production. +` +export function up(next) { + const driver = getDriver() + const rxSession = driver.rxSession() + rxSession + .beginTransaction() + .pipe( + flatMap(transaction => + concat( + transaction + .run( + ` + MATCH (location:Location) + RETURN location {.id} + `, + ) + .records() + .pipe( + map(record => { + const { id: locationIds } = record.get('location') + return { locationIds } + }), + mergeMap(({ locationIds }) => { + return transaction + .run( + ` + MATCH(location:Location {id: $locationIds}), (location2:Location {id: $locationIds}) + WHERE location.id = location2.id AND id(location) < id(location2) + CALL apoc.refactor.mergeNodes([location, location2], { properties: 'combine', mergeRels: true }) YIELD node as updatedLocation + RETURN location {.*},updatedLocation {.*} + `, + { locationIds }, + ) + .records() + .pipe( + map(record => ({ + location: record.get('location'), + updatedLocation: record.get('updatedLocation'), + })), + ) + }), + ), + transaction.commit(), + ).pipe(catchError(error => transaction.rollback().pipe(throwError(error)))), + ), + ) + .subscribe({ + next: ({ updatedLocation, location }) => + // eslint-disable-next-line no-console + console.log(` + Merged: + ============================= + locationId: ${location.id} + updatedLocation: ${location.id} => ${updatedLocation.id} + ============================= + `), + complete: () => { + // eslint-disable-next-line no-console + console.log('Merging of duplicate locations completed') + next() + }, + error: error => { + next(new Error(error), null) + }, + }) +} + +export function down(next) { + next(new Error('Irreversible migration')) +} From c6bfca312c4ac9eb10f230625743215295b44be6 Mon Sep 17 00:00:00 2001 From: mattwr18 Date: Wed, 22 Jan 2020 13:31:48 +0100 Subject: [PATCH 16/67] Favor createdAt over timestamp - it's more human readable and consistent with all other nodes in production --- backend/src/models/Migration.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/models/Migration.js b/backend/src/models/Migration.js index e36d10ac3..1b697c8ad 100644 --- a/backend/src/models/Migration.js +++ b/backend/src/models/Migration.js @@ -1,5 +1,5 @@ export default { title: { type: 'string', primary: true, token: true }, description: { type: 'string' }, - timestamp: { type: 'number', unique: true }, + createdAt: { type: 'string', isoDate: true, default: () => new Date().toISOString() }, } From dff9f6ea84ff35033064e853aa66019c4a815ca6 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 22 Jan 2020 13:07:23 +0000 Subject: [PATCH 17/67] build(deps-dev): bump babel-jest from 24.9.0 to 25.1.0 in /webapp Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest) from 24.9.0 to 25.1.0. - [Release notes](https://github.com/facebook/jest/releases) - [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md) - [Commits](https://github.com/facebook/jest/commits/v25.1.0/packages/babel-jest) Signed-off-by: dependabot-preview[bot] --- webapp/package.json | 2 +- webapp/yarn.lock | 213 ++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 208 insertions(+), 7 deletions(-) diff --git a/webapp/package.json b/webapp/package.json index 0439398a2..392650c6e 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -110,7 +110,7 @@ "async-validator": "^3.2.3", "babel-core": "~7.0.0-bridge.0", "babel-eslint": "~10.0.3", - "babel-jest": "~24.9.0", + "babel-jest": "~25.1.0", "babel-loader": "~8.0.6", "babel-plugin-require-context-hook": "^1.0.0", "babel-preset-vue": "~2.0.2", diff --git a/webapp/yarn.lock b/webapp/yarn.lock index bcd90b561..9ddf26b75 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -383,7 +383,7 @@ esutils "^2.0.2" js-tokens "^4.0.0" -"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.1.3", "@babel/parser@^7.4.3", "@babel/parser@^7.8.3": +"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.1.3", "@babel/parser@^7.4.3", "@babel/parser@^7.7.5", "@babel/parser@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.8.3.tgz#790874091d2001c9be6ec426c2eed47bc7679081" integrity sha512-/V72F4Yp/qmHaTALizEm9Gf2eQHV3QyTL3K0cNfijwnMnb1L+LDlAubb/ZnSdGAVzVSWakujHYs1I26x66sMeQ== @@ -477,6 +477,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" +"@babel/plugin-syntax-bigint@^7.0.0": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz#4c9a6f669f5d0cdf1b90a1671e9a146be5300cea" + integrity sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + "@babel/plugin-syntax-decorators@^7.7.4": version "7.7.4" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.7.4.tgz#3c91cfee2a111663ff3ac21b851140f5a52a4e0b" @@ -1230,6 +1237,21 @@ resolved "https://registry.yarnpkg.com/@illinois/react-use-local-storage/-/react-use-local-storage-1.1.0.tgz#127aba1c2843b3edeb4ab1c74a8dd112f4c7ec29" integrity sha512-ohuwk+ogqr3AVNHLUfYwgt4gbdNBi2kNq4gVDbhD2pwpJcX4VbkWJ9Q0fuXkVD4IB1BP6COSgMSPHPKjg9ep7g== +"@istanbuljs/load-nyc-config@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.0.0.tgz#10602de5570baea82f8afbfa2630b24e7a8cfe5b" + integrity sha512-ZR0rq/f/E4f4XcgnDvtMWXCUJpi8eO0rssVhmztsZqLIEFA9UUP9zmpE0VxlM+kv/E1ul2I876Fwil2ayptDVg== + dependencies: + camelcase "^5.3.1" + find-up "^4.1.0" + js-yaml "^3.13.1" + resolve-from "^5.0.0" + +"@istanbuljs/schema@^0.1.2": + version "0.1.2" + resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd" + integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw== + "@jest/console@^24.7.1": version "24.7.1" resolved "https://registry.yarnpkg.com/@jest/console/-/console-24.7.1.tgz#32a9e42535a97aedfe037e725bd67e954b459545" @@ -1387,6 +1409,28 @@ source-map "^0.6.1" write-file-atomic "2.4.1" +"@jest/transform@^25.1.0": + version "25.1.0" + resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-25.1.0.tgz#221f354f512b4628d88ce776d5b9e601028ea9da" + integrity sha512-4ktrQ2TPREVeM+KxB4zskAT84SnmG1vaz4S+51aTefyqn3zocZUnliLLm5Fsl85I3p/kFPN4CRp1RElIfXGegQ== + dependencies: + "@babel/core" "^7.1.0" + "@jest/types" "^25.1.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.1.0" + jest-regex-util "^25.1.0" + jest-util "^25.1.0" + micromatch "^4.0.2" + pirates "^4.0.1" + realpath-native "^1.1.0" + slash "^3.0.0" + source-map "^0.6.1" + write-file-atomic "^3.0.0" + "@jest/types@^24.9.0": version "24.9.0" resolved "https://registry.yarnpkg.com/@jest/types/-/types-24.9.0.tgz#63cb26cb7500d069e5a389441a7c6ab5e909fc59" @@ -1396,6 +1440,16 @@ "@types/istanbul-reports" "^1.1.1" "@types/yargs" "^13.0.0" +"@jest/types@^25.1.0": + version "25.1.0" + resolved "https://registry.yarnpkg.com/@jest/types/-/types-25.1.0.tgz#b26831916f0d7c381e11dbb5e103a72aed1b4395" + integrity sha512-VpOtt7tCrgvamWZh1reVsGADujKigBUFTi19mlRjqEGsE8qH4r3s+skY33dNdXOwyZIvuftZ5tqdF1IgsMejMA== + dependencies: + "@types/istanbul-lib-coverage" "^2.0.0" + "@types/istanbul-reports" "^1.1.1" + "@types/yargs" "^15.0.0" + chalk "^3.0.0" + "@mrmlnc/readdir-enhanced@^2.2.1": version "2.2.1" resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde" @@ -3187,6 +3241,13 @@ dependencies: "@types/yargs-parser" "*" +"@types/yargs@^15.0.0": + version "15.0.1" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.1.tgz#9266a9d7be68cfcc982568211085a49a277f7c96" + integrity sha512-sYlwNU7zYi6eZbMzFvG6eHD7VsEvFdoDtlD7eI1JTg7YNnuguzmiGsc6MPSq5l8n+h21AsNof0je+9sgOe4+dg== + dependencies: + "@types/yargs-parser" "*" + "@types/zen-observable@^0.8.0": version "0.8.0" resolved "https://registry.yarnpkg.com/@types/zen-observable/-/zen-observable-0.8.0.tgz#8b63ab7f1aa5321248aad5ac890a485656dcea4d" @@ -3761,7 +3822,7 @@ anymatch@^2.0.0: micromatch "^3.1.4" normalize-path "^2.1.1" -anymatch@~3.1.1: +anymatch@^3.0.3, anymatch@~3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142" integrity sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg== @@ -4598,7 +4659,7 @@ babel-helper-vue-jsx-merge-props@^2.0.2: resolved "https://registry.yarnpkg.com/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-2.0.3.tgz#22aebd3b33902328e513293a8e4992b384f9f1b6" integrity sha512-gsLiKK7Qrb7zYJNgiXKpXblxbV5ffSwR0f5whkPAaBAR4fhi6bwRZxX9wBlIc5M/v8CCkXUbXZL4N/nSE97cqg== -babel-jest@^24.9.0, babel-jest@~24.9.0: +babel-jest@^24.9.0: version "24.9.0" resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-24.9.0.tgz#3fc327cb8467b89d14d7bc70e315104a783ccd54" integrity sha512-ntuddfyiN+EhMw58PTNL1ph4C9rECiQXjI4nMMBKBaNjXvqLdkXpPRcMSr4iyBrJg/+wz9brFUD6RhOAT6r4Iw== @@ -4611,6 +4672,19 @@ babel-jest@^24.9.0, babel-jest@~24.9.0: chalk "^2.4.2" slash "^2.0.0" +babel-jest@~25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-25.1.0.tgz#206093ac380a4b78c4404a05b3277391278f80fb" + integrity sha512-tz0VxUhhOE2y+g8R2oFrO/2VtVjA1lkJeavlhExuRBg3LdNJY9gwQ+Vcvqt9+cqy71MCTJhewvTB7Qtnnr9SWg== + dependencies: + "@jest/transform" "^25.1.0" + "@jest/types" "^25.1.0" + "@types/babel__core" "^7.1.0" + babel-plugin-istanbul "^6.0.0" + babel-preset-jest "^25.1.0" + chalk "^3.0.0" + slash "^3.0.0" + babel-loader@^8.0.6, babel-loader@~8.0.6: version "8.0.6" resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.0.6.tgz#e33bdb6f362b03f4bb141a0c21ab87c501b70dfb" @@ -4697,6 +4771,17 @@ babel-plugin-istanbul@^5.1.0: istanbul-lib-instrument "^3.3.0" test-exclude "^5.2.3" +babel-plugin-istanbul@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz#e159ccdc9af95e0b570c75b4573b7c34d671d765" + integrity sha512-AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ== + dependencies: + "@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@^24.9.0: version "24.9.0" resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-24.9.0.tgz#4f837091eb407e01447c8843cbec546d0002d756" @@ -4704,6 +4789,13 @@ babel-plugin-jest-hoist@^24.9.0: dependencies: "@types/babel__traverse" "^7.0.6" +babel-plugin-jest-hoist@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-25.1.0.tgz#fb62d7b3b53eb36c97d1bc7fec2072f9bd115981" + integrity sha512-oIsopO41vW4YFZ9yNYoLQATnnN46lp+MZ6H4VvPKFkcc2/fkl3CfE/NZZSmnEIEsJRmJAgkVEK0R7Zbl50CpTw== + dependencies: + "@types/babel__traverse" "^7.0.6" + babel-plugin-jsx-event-modifiers@^2.0.2: version "2.0.5" resolved "https://registry.yarnpkg.com/babel-plugin-jsx-event-modifiers/-/babel-plugin-jsx-event-modifiers-2.0.5.tgz#93e6ebb5d7553bb08f9fedbf7a0bee3af09a0472" @@ -4921,6 +5013,15 @@ babel-preset-jest@^24.9.0: "@babel/plugin-syntax-object-rest-spread" "^7.0.0" babel-plugin-jest-hoist "^24.9.0" +babel-preset-jest@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-25.1.0.tgz#d0aebfebb2177a21cde710996fce8486d34f1d33" + integrity sha512-eCGn64olaqwUMaugXsTtGAM2I0QTahjEtnRu0ql8Ie+gDWAc1N6wqN0k2NilnyTunM69Pad7gJY7LOtwLimoFQ== + dependencies: + "@babel/plugin-syntax-bigint" "^7.0.0" + "@babel/plugin-syntax-object-rest-spread" "^7.0.0" + babel-plugin-jest-hoist "^25.1.0" + "babel-preset-minify@^0.5.0 || 0.6.0-alpha.5": version "0.5.0" resolved "https://registry.yarnpkg.com/babel-preset-minify/-/babel-preset-minify-0.5.0.tgz#e25bb8d3590087af02b650967159a77c19bfb96b" @@ -8411,7 +8512,7 @@ fsevents@^1.2.7: nan "^2.12.1" node-pre-gyp "^0.12.0" -fsevents@~2.1.2: +fsevents@^2.1.2, fsevents@~2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.2.tgz#4c0a1fb34bc68e543b4b82a9ec392bfbda840805" integrity sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA== @@ -8763,6 +8864,11 @@ graceful-fs@^4.2.0, graceful-fs@^4.2.2: resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.2.tgz#6f0952605d0140c1cfdb138ed005775b92d67b02" integrity sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q== +graceful-fs@^4.2.3: + version "4.2.3" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423" + integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ== + graphlib@^2.1.1, graphlib@^2.1.5: version "2.1.7" resolved "https://registry.yarnpkg.com/graphlib/-/graphlib-2.1.7.tgz#b6a69f9f44bd9de3963ce6804a2fc9e73d86aecc" @@ -9960,7 +10066,7 @@ is-symbol@^1.0.3: dependencies: has-symbols "^1.0.1" -is-typedarray@~1.0.0: +is-typedarray@^1.0.0, is-typedarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= @@ -10047,6 +10153,11 @@ istanbul-lib-coverage@^2.0.2, istanbul-lib-coverage@^2.0.5: resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz#675f0ab69503fad4b1d849f736baaca803344f49" integrity sha512-8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA== +istanbul-lib-coverage@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz#f5944a37c70b550b02a78a5c3b2055b280cec8ec" + integrity sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg== + istanbul-lib-instrument@^3.0.1, istanbul-lib-instrument@^3.3.0: version "3.3.0" resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-3.3.0.tgz#a5f63d91f0bbc0c3e479ef4c5de027335ec6d630" @@ -10060,6 +10171,19 @@ istanbul-lib-instrument@^3.0.1, istanbul-lib-instrument@^3.3.0: istanbul-lib-coverage "^2.0.5" semver "^6.0.0" +istanbul-lib-instrument@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.0.tgz#53321a7970f076262fd3292c8f9b2e4ac544aae1" + integrity sha512-Nm4wVHdo7ZXSG30KjZ2Wl5SU/Bw7bDx1PdaiIFzEStdjs0H12mOTncn1GVYuqQSaZxpg87VGBRsVRPGD2cD1AQ== + dependencies: + "@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" + istanbul-lib-report@^2.0.4: version "2.0.8" resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-2.0.8.tgz#5a8113cd746d43c4889eba36ab10e7d50c9b4f33" @@ -10233,6 +10357,24 @@ jest-haste-map@^24.9.0: optionalDependencies: fsevents "^1.2.7" +jest-haste-map@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-25.1.0.tgz#ae12163d284f19906260aa51fd405b5b2e5a4ad3" + integrity sha512-/2oYINIdnQZAqyWSn1GTku571aAfs8NxzSErGek65Iu5o8JYb+113bZysRMcC/pjE5v9w0Yz+ldbj9NxrFyPyw== + dependencies: + "@jest/types" "^25.1.0" + anymatch "^3.0.3" + fb-watchman "^2.0.0" + graceful-fs "^4.2.3" + jest-serializer "^25.1.0" + jest-util "^25.1.0" + jest-worker "^25.1.0" + micromatch "^4.0.2" + sane "^4.0.3" + walker "^1.0.7" + optionalDependencies: + fsevents "^2.1.2" + jest-jasmine2@^24.9.0: version "24.9.0" resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-24.9.0.tgz#1f7b1bd3242c1774e62acabb3646d96afc3be6a0" @@ -10309,6 +10451,11 @@ jest-regex-util@^24.9.0: resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-24.9.0.tgz#c13fb3380bde22bf6575432c493ea8fe37965636" integrity sha512-05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA== +jest-regex-util@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-25.1.0.tgz#efaf75914267741838e01de24da07b2192d16d87" + integrity sha512-9lShaDmDpqwg+xAd73zHydKrBbbrIi08Kk9YryBEBybQFg/lBWR/2BDjjiSE7KIppM9C5+c03XiDaZ+m4Pgs1w== + jest-resolve-dependencies@^24.9.0: version "24.9.0" resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-24.9.0.tgz#ad055198959c4cfba8a4f066c673a3f0786507ab" @@ -10388,6 +10535,11 @@ jest-serializer@^24.9.0: resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-24.9.0.tgz#e6d7d7ef96d31e8b9079a714754c5d5c58288e73" integrity sha512-DxYipDr8OvfrKH3Kel6NdED3OXxjvxXZ1uIY2I9OFbGg+vUkkg7AGvi65qbhbWNPvDckXmzMPbK3u3HaDO49bQ== +jest-serializer@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-25.1.0.tgz#73096ba90e07d19dec4a0c1dd89c355e2f129e5d" + integrity sha512-20Wkq5j7o84kssBwvyuJ7Xhn7hdPeTXndnwIblKDR2/sy1SUm6rWWiG9kSCgJPIfkDScJCIsTtOKdlzfIHOfKA== + jest-snapshot@^24.9.0: version "24.9.0" resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-24.9.0.tgz#ec8e9ca4f2ec0c5c87ae8f925cf97497b0e951ba" @@ -10425,6 +10577,16 @@ jest-util@^24.9.0: slash "^2.0.0" source-map "^0.6.0" +jest-util@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-25.1.0.tgz#7bc56f7b2abd534910e9fa252692f50624c897d9" + integrity sha512-7did6pLQ++87Qsj26Fs/TIwZMUFBXQ+4XXSodRNy3luch2DnRXsSnmpVtxxQ0Yd6WTipGpbhh2IFP1mq6/fQGw== + dependencies: + "@jest/types" "^25.1.0" + chalk "^3.0.0" + is-ci "^2.0.0" + mkdirp "^0.5.1" + jest-validate@^24.9.0: version "24.9.0" resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-24.9.0.tgz#0775c55360d173cd854e40180756d4ff52def8ab" @@ -10466,6 +10628,14 @@ jest-worker@^24.9.0: merge-stream "^2.0.0" supports-color "^6.1.0" +jest-worker@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-25.1.0.tgz#75d038bad6fdf58eba0d2ec1835856c497e3907a" + integrity sha512-ZHhHtlxOWSxCoNOKHGbiLzXnl42ga9CxDr27H36Qn+15pQZd3R/F24jrmjDelw9j/iHUIWMWs08/u2QN50HHOg== + dependencies: + merge-stream "^2.0.0" + supports-color "^7.0.0" + jest@~24.9.0: version "24.9.0" resolved "https://registry.yarnpkg.com/jest/-/jest-24.9.0.tgz#987d290c05a08b52c56188c1002e368edb007171" @@ -15144,6 +15314,11 @@ slash@^2.0.0: resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44" integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A== +slash@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" + integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== + slice-ansi@0.0.4: version "0.0.4" resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35" @@ -15999,7 +16174,7 @@ supports-color@^6.1.0: dependencies: has-flag "^3.0.0" -supports-color@^7.1.0: +supports-color@^7.0.0, supports-color@^7.1.0: version "7.1.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1" integrity sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g== @@ -16237,6 +16412,15 @@ test-exclude@^5.2.3: read-pkg-up "^4.0.0" require-main-filename "^2.0.0" +test-exclude@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e" + integrity sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w== + dependencies: + "@istanbuljs/schema" "^0.1.2" + glob "^7.1.4" + minimatch "^3.0.4" + text-table@0.2.0, text-table@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" @@ -16663,6 +16847,13 @@ typed-styles@^0.0.7: resolved "https://registry.yarnpkg.com/typed-styles/-/typed-styles-0.0.7.tgz#93392a008794c4595119ff62dde6809dbc40a3d9" integrity sha512-pzP0PWoZUhsECYjABgCGQlRGL1n7tOHsgwYv3oIiEpJwGhFTuty/YNeduxQYzXXa3Ge5BdT6sHYIQYpl4uJ+5Q== +typedarray-to-buffer@^3.1.5: + version "3.1.5" + resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080" + integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q== + dependencies: + is-typedarray "^1.0.0" + typedarray@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" @@ -17672,6 +17863,16 @@ write-file-atomic@^2.0.0: imurmurhash "^0.1.4" signal-exit "^3.0.2" +write-file-atomic@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.1.tgz#558328352e673b5bb192cf86500d60b230667d4b" + integrity sha512-JPStrIyyVJ6oCSz/691fAjFtefZ6q+fP6tm+OS4Qw6o+TGQxNp1ziY2PgS+X/m0V8OWhZiO/m4xSj+Pr4RrZvw== + dependencies: + imurmurhash "^0.1.4" + is-typedarray "^1.0.0" + signal-exit "^3.0.2" + typedarray-to-buffer "^3.1.5" + write-json-file@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/write-json-file/-/write-json-file-2.3.0.tgz#2b64c8a33004d54b8698c76d585a77ceb61da32f" From 8f88d03239c46d6f06608221f8fd5b20b74cce4e Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 22 Jan 2020 13:07:47 +0000 Subject: [PATCH 18/67] build(deps-dev): bump @storybook/vue from 5.3.7 to 5.3.8 in /webapp Bumps [@storybook/vue](https://github.com/storybookjs/storybook/tree/HEAD/app/vue) from 5.3.7 to 5.3.8. - [Release notes](https://github.com/storybookjs/storybook/releases) - [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md) - [Commits](https://github.com/storybookjs/storybook/commits/v5.3.8/app/vue) Signed-off-by: dependabot-preview[bot] --- webapp/package.json | 2 +- webapp/yarn.lock | 230 +++++++------------------------------------- 2 files changed, 37 insertions(+), 195 deletions(-) diff --git a/webapp/package.json b/webapp/package.json index 0439398a2..01017d4d5 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -102,7 +102,7 @@ "@storybook/addon-a11y": "^5.3.8", "@storybook/addon-actions": "^5.3.8", "@storybook/addon-notes": "^5.3.8", - "@storybook/vue": "~5.3.7", + "@storybook/vue": "~5.3.8", "@vue/cli-shared-utils": "~4.1.2", "@vue/eslint-config-prettier": "~6.0.0", "@vue/server-test-utils": "~1.0.0-beta.31", diff --git a/webapp/yarn.lock b/webapp/yarn.lock index bcd90b561..268a7e1f1 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -2219,19 +2219,6 @@ global "^4.3.2" util-deprecate "^1.0.2" -"@storybook/addons@5.3.7": - version "5.3.7" - resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-5.3.7.tgz#4b4502d916dd878762d09c6c2aa1bc5191ae94be" - integrity sha512-Kme86+u+ru3S90OD3brSO3sOy28aCYYB25CNSg4/7JLmcUn9XvPc+odQIAipZduNn+OYedJmuncuDz5Ze6RYdA== - dependencies: - "@storybook/api" "5.3.7" - "@storybook/channels" "5.3.7" - "@storybook/client-logger" "5.3.7" - "@storybook/core-events" "5.3.7" - core-js "^3.0.1" - global "^4.3.2" - util-deprecate "^1.0.2" - "@storybook/addons@5.3.8": version "5.3.8" resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-5.3.8.tgz#62d62bafd4a73195f617e39f3c61ec7e7837b1ee" @@ -2268,32 +2255,6 @@ telejson "^3.0.2" util-deprecate "^1.0.2" -"@storybook/api@5.3.7": - version "5.3.7" - resolved "https://registry.yarnpkg.com/@storybook/api/-/api-5.3.7.tgz#fa9126d851d506607d1ba93588d3599b9b9ea0b9" - integrity sha512-SIT2Z3VtxPn26rkHNCZHYlwmfBPty0QTyWKTgVcnXxUeC74IReGzwMLJgCszouCvHFYOTru8JNndQmhnPlsQiA== - dependencies: - "@reach/router" "^1.2.1" - "@storybook/channels" "5.3.7" - "@storybook/client-logger" "5.3.7" - "@storybook/core-events" "5.3.7" - "@storybook/csf" "0.0.1" - "@storybook/router" "5.3.7" - "@storybook/theming" "5.3.7" - "@types/reach__router" "^1.2.3" - core-js "^3.0.1" - fast-deep-equal "^2.0.1" - global "^4.3.2" - lodash "^4.17.15" - memoizerific "^1.11.3" - prop-types "^15.6.2" - react "^16.8.3" - semver "^6.0.0" - shallow-equal "^1.1.0" - store2 "^2.7.1" - telejson "^3.2.0" - util-deprecate "^1.0.2" - "@storybook/api@5.3.8": version "5.3.8" resolved "https://registry.yarnpkg.com/@storybook/api/-/api-5.3.8.tgz#5f887911c87d1e6e1d8c12106c17f05377c6544b" @@ -2320,17 +2281,6 @@ telejson "^3.2.0" util-deprecate "^1.0.2" -"@storybook/channel-postmessage@5.3.7": - version "5.3.7" - resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-5.3.7.tgz#cf481b98424018f8e91150602f091efea46391cc" - integrity sha512-JuRrV+3MaNSmt5Ojsfd+Z6TJvCOZBeo7uNfA+ZueATe+So/Z9wC/Hy+0oypQ2diTL2Pas4G3uFIRRl5jKUsCZA== - dependencies: - "@storybook/channels" "5.3.7" - "@storybook/client-logger" "5.3.7" - core-js "^3.0.1" - global "^4.3.2" - telejson "^3.2.0" - "@storybook/channel-postmessage@5.3.8": version "5.3.8" resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-5.3.8.tgz#76544f1fd276338df9f427eec11d3ec12de86215" @@ -2349,13 +2299,6 @@ dependencies: core-js "^3.0.1" -"@storybook/channels@5.3.7": - version "5.3.7" - resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-5.3.7.tgz#19a47c11cda72f98d7d1dc05e78c1e40bdc2bbdf" - integrity sha512-HYD9y6+mxBkypBd8az/MJj4qNkrrP+MbTTbwizhoz0NsYCVCb7Ydj7+lI1dpi1HGSjiYJjwKGInoFk4Ubtr7aQ== - dependencies: - core-js "^3.0.1" - "@storybook/channels@5.3.8": version "5.3.8" resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-5.3.8.tgz#778696b791e49c19b8de95c4bfb0ebb363745059" @@ -2363,28 +2306,6 @@ dependencies: core-js "^3.0.1" -"@storybook/client-api@5.3.7": - version "5.3.7" - resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-5.3.7.tgz#3a13d2b0c9bbc20af448121011b304c10e355644" - integrity sha512-cmoOYCVK6F7EceHHeo0oK61ic0LST96DWbb8KICL1c+8I+sI0fGLobSsBbOCzDgzz2gqPAQoxxpF+T4kLyLFcQ== - dependencies: - "@storybook/addons" "5.3.7" - "@storybook/channel-postmessage" "5.3.7" - "@storybook/channels" "5.3.7" - "@storybook/client-logger" "5.3.7" - "@storybook/core-events" "5.3.7" - "@storybook/csf" "0.0.1" - core-js "^3.0.1" - eventemitter3 "^4.0.0" - global "^4.3.2" - is-plain-object "^3.0.0" - lodash "^4.17.15" - memoizerific "^1.11.3" - qs "^6.6.0" - stable "^0.1.8" - ts-dedent "^1.1.0" - util-deprecate "^1.0.2" - "@storybook/client-api@5.3.8": version "5.3.8" resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-5.3.8.tgz#e2e461e915c5e5796638efb3913d59411a9012d4" @@ -2415,13 +2336,6 @@ dependencies: core-js "^3.0.1" -"@storybook/client-logger@5.3.7": - version "5.3.7" - resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-5.3.7.tgz#ee258a8ba0121b579c719b878e3635d6ff020abd" - integrity sha512-DeacBEGXsvB6ytRjLabwGCQX6OzL2+aaTOCMcuENnMqb7qdTV2G56NodLo3i5gHoLhlvsh109hSkLhFIFHtYWQ== - dependencies: - core-js "^3.0.1" - "@storybook/client-logger@5.3.8": version "5.3.8" resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-5.3.8.tgz#2e846eb43c42e9602a2cf619c0f3ea7381e312b3" @@ -2454,33 +2368,6 @@ react-textarea-autosize "^7.1.0" simplebar-react "^1.0.0-alpha.6" -"@storybook/components@5.3.7": - version "5.3.7" - resolved "https://registry.yarnpkg.com/@storybook/components/-/components-5.3.7.tgz#8b7361fef02f042c5bad979b4d6886863d3b6a31" - integrity sha512-WTHdoxMLVczlcPjQWjmpOo+mLqpZGSSl9ACPZacQp3w1WitswI4tmmrLc76YCCidDE+OGAtqFYD9C9LtKe7ZSA== - dependencies: - "@storybook/client-logger" "5.3.7" - "@storybook/theming" "5.3.7" - "@types/react-syntax-highlighter" "11.0.2" - "@types/react-textarea-autosize" "^4.3.3" - core-js "^3.0.1" - global "^4.3.2" - lodash "^4.17.15" - markdown-to-jsx "^6.9.1" - memoizerific "^1.11.3" - polished "^3.3.1" - popper.js "^1.14.7" - prop-types "^15.7.2" - react "^16.8.3" - react-dom "^16.8.3" - react-focus-lock "^2.1.0" - react-helmet-async "^1.0.2" - react-popper-tooltip "^2.8.3" - react-syntax-highlighter "^11.0.2" - react-textarea-autosize "^7.1.0" - simplebar-react "^1.0.0-alpha.6" - ts-dedent "^1.1.0" - "@storybook/components@5.3.8": version "5.3.8" resolved "https://registry.yarnpkg.com/@storybook/components/-/components-5.3.8.tgz#1d21a02ea0058fa8ee20d44248550f9f5b500114" @@ -2515,13 +2402,6 @@ dependencies: core-js "^3.0.1" -"@storybook/core-events@5.3.7": - version "5.3.7" - resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-5.3.7.tgz#9297277ae5868b87d3cc36f08415da1579cdb8df" - integrity sha512-wDHznUy6BU+ML0EnovDWBow7s7rH1ng26xoHIWSl2VhjARJiVSGVROvwgj5DctEny8gmkZkByOiEVZ+0PYA/hw== - dependencies: - core-js "^3.0.1" - "@storybook/core-events@5.3.8": version "5.3.8" resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-5.3.8.tgz#2cc85c8109e4734298b3e1f5919c764d6abbf2f4" @@ -2529,26 +2409,26 @@ dependencies: core-js "^3.0.1" -"@storybook/core@5.3.7": - version "5.3.7" - resolved "https://registry.yarnpkg.com/@storybook/core/-/core-5.3.7.tgz#6196661c12709e6acffaa42baea1a891bed50706" - integrity sha512-DEmG5UeXm4BJUvdtCN9WBHRSeQ2lnbEuiqxB9SIbsitleCcdnX2aFrMfyoTHUZNqnbnefJXUMnGT0wvwm7yGDA== +"@storybook/core@5.3.8": + version "5.3.8" + resolved "https://registry.yarnpkg.com/@storybook/core/-/core-5.3.8.tgz#7748875afdddc9fb0ca24d0b712cc9c25fcaad9d" + integrity sha512-srMeSseUrSmh4pTe9DBD7IdFcLZoIm5r2cnH0nzPNpbrCknegW1LLLuVmSz8wLjobIrU/GYs6AO0VxKDnnbXuw== dependencies: "@babel/plugin-proposal-class-properties" "^7.7.0" "@babel/plugin-proposal-object-rest-spread" "^7.6.2" "@babel/plugin-syntax-dynamic-import" "^7.2.0" "@babel/plugin-transform-react-constant-elements" "^7.2.0" "@babel/preset-env" "^7.4.5" - "@storybook/addons" "5.3.7" - "@storybook/channel-postmessage" "5.3.7" - "@storybook/client-api" "5.3.7" - "@storybook/client-logger" "5.3.7" - "@storybook/core-events" "5.3.7" + "@storybook/addons" "5.3.8" + "@storybook/channel-postmessage" "5.3.8" + "@storybook/client-api" "5.3.8" + "@storybook/client-logger" "5.3.8" + "@storybook/core-events" "5.3.8" "@storybook/csf" "0.0.1" - "@storybook/node-logger" "5.3.7" - "@storybook/router" "5.3.7" - "@storybook/theming" "5.3.7" - "@storybook/ui" "5.3.7" + "@storybook/node-logger" "5.3.8" + "@storybook/router" "5.3.8" + "@storybook/theming" "5.3.8" + "@storybook/ui" "5.3.8" airbnb-js-shims "^2.2.1" ansi-to-html "^0.6.11" autoprefixer "^9.7.2" @@ -2615,10 +2495,10 @@ dependencies: lodash "^4.17.15" -"@storybook/node-logger@5.3.7": - version "5.3.7" - resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-5.3.7.tgz#cdbd6560c8f2067cc8993bfe21f024c195789793" - integrity sha512-l59EoDorDkwEX7KOtBmNapsuoX3huWAFj1cyOS41mqoXhlpuIWoOQSiKHRlFA3/6g+p1NSbF5+Wr4k6xsIkUww== +"@storybook/node-logger@5.3.8": + version "5.3.8" + resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-5.3.8.tgz#dd6bfba5532adece7e387457ed8077edde008a20" + integrity sha512-/UL3fOWRRAR7zMP+66Bqn3wJPkzj5AtnBDHqqkhzFM/sqMn+fvJUXqxNm9C3+CVG1RtgFQ9qLPyb16LZ596a6A== dependencies: "@types/npmlog" "^4.1.2" chalk "^3.0.0" @@ -2640,21 +2520,6 @@ memoizerific "^1.11.3" qs "^6.6.0" -"@storybook/router@5.3.7": - version "5.3.7" - resolved "https://registry.yarnpkg.com/@storybook/router/-/router-5.3.7.tgz#64e06a319ada9e783029a2d3e3c6a6ddf9b5a1ad" - integrity sha512-o9DZLe+TvFR1hLvRflUODw+XUvIgU87gh5xMBhuzglx3akywc/sPqM+ORBaOtAb169wpV2hvpjolteVPi5+W8Q== - dependencies: - "@reach/router" "^1.2.1" - "@storybook/csf" "0.0.1" - "@types/reach__router" "^1.2.3" - core-js "^3.0.1" - global "^4.3.2" - lodash "^4.17.15" - memoizerific "^1.11.3" - qs "^6.6.0" - util-deprecate "^1.0.2" - "@storybook/router@5.3.8": version "5.3.8" resolved "https://registry.yarnpkg.com/@storybook/router/-/router-5.3.8.tgz#91eb8822e0aa6c5b59d2db1b52b88010d9800cc3" @@ -2688,24 +2553,6 @@ prop-types "^15.7.2" resolve-from "^5.0.0" -"@storybook/theming@5.3.7": - version "5.3.7" - resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-5.3.7.tgz#90ba738f3324f70d88ab412528a8240e9936093d" - integrity sha512-n73uvJrurBQAl1+FHBw8pNUjEnOQKfxRezbZJPZbhJNULSJ7EiPJKyAHvZyx82sUoTY4r8eGgEotU47jWKBLlA== - dependencies: - "@emotion/core" "^10.0.20" - "@emotion/styled" "^10.0.17" - "@storybook/client-logger" "5.3.7" - core-js "^3.0.1" - deep-object-diff "^1.1.0" - emotion-theming "^10.0.19" - global "^4.3.2" - memoizerific "^1.11.3" - polished "^3.3.1" - prop-types "^15.7.2" - resolve-from "^5.0.0" - ts-dedent "^1.1.0" - "@storybook/theming@5.3.8": version "5.3.8" resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-5.3.8.tgz#7c0cb31e65c9da690dab50a99996f3e7c106ce97" @@ -2724,20 +2571,20 @@ resolve-from "^5.0.0" ts-dedent "^1.1.0" -"@storybook/ui@5.3.7": - version "5.3.7" - resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-5.3.7.tgz#f46c9322301ee67121e0a9c3f1bc0d81de7d0888" - integrity sha512-9yVMEcf0CF6yM9QbJ2HXqeQG3iXoW1I6B/MU/1AFytruNASeMRHU+0KEq2vgF6nXcA8X80J4I5c2KY742M6Qjw== +"@storybook/ui@5.3.8": + version "5.3.8" + resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-5.3.8.tgz#b2e314882b2fdda64425a24b12162f070320193e" + integrity sha512-S/Zf1BHuPGsh+RXV20IFS+FUNVQy/3x44Qr1sqwP1ehUUPXq2giosDXW6OV9gaKsUYEGhywRwDKTUlN8MkI4Jg== dependencies: "@emotion/core" "^10.0.20" - "@storybook/addons" "5.3.7" - "@storybook/api" "5.3.7" - "@storybook/channels" "5.3.7" - "@storybook/client-logger" "5.3.7" - "@storybook/components" "5.3.7" - "@storybook/core-events" "5.3.7" - "@storybook/router" "5.3.7" - "@storybook/theming" "5.3.7" + "@storybook/addons" "5.3.8" + "@storybook/api" "5.3.8" + "@storybook/channels" "5.3.8" + "@storybook/client-logger" "5.3.8" + "@storybook/components" "5.3.8" + "@storybook/core-events" "5.3.8" + "@storybook/router" "5.3.8" + "@storybook/theming" "5.3.8" copy-to-clipboard "^3.0.8" core-js "^3.0.1" core-js-pure "^3.0.1" @@ -2764,14 +2611,14 @@ telejson "^3.2.0" util-deprecate "^1.0.2" -"@storybook/vue@~5.3.7": - version "5.3.7" - resolved "https://registry.yarnpkg.com/@storybook/vue/-/vue-5.3.7.tgz#11a7a92b9fa769008ebf1ca7e96c0f96778a478a" - integrity sha512-M9R6jjjbW7odUgeK2bk4OxMFkPRgC8z2dd4iuU4/wxXjZGAJiVcEosfXRORJqCfR3XV99OcljgzEsNbZ5YJE/w== +"@storybook/vue@~5.3.8": + version "5.3.8" + resolved "https://registry.yarnpkg.com/@storybook/vue/-/vue-5.3.8.tgz#835832734d9fdbd6eb02a9c5b8533c4e030c8c42" + integrity sha512-LhMsXwKalSmZzrmLxJFXm1FLHi1yDev1MMf2TDiQ1fNUQ3uFu1bGp9z+vcigHp8HDjJMxqmSNG9dZcj5QZrqoA== dependencies: - "@storybook/addons" "5.3.7" - "@storybook/core" "5.3.7" - "@types/webpack-env" "^1.13.9" + "@storybook/addons" "5.3.8" + "@storybook/core" "5.3.8" + "@types/webpack-env" "^1.15.0" core-js "^3.0.1" global "^4.3.2" regenerator-runtime "^0.13.3" @@ -3149,11 +2996,6 @@ resolved "https://registry.yarnpkg.com/@types/strip-json-comments/-/strip-json-comments-0.0.30.tgz#9aa30c04db212a9a0649d6ae6fd50accc40748a1" integrity sha512-7NQmHra/JILCd1QqpSzl8+mJRc8ZHz3uDm8YV1Ks9IhK0epEiTw8aIErbvH9PI+6XbqhyIQy3462nEsn7UVzjQ== -"@types/webpack-env@^1.13.9": - version "1.14.0" - resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.14.0.tgz#8edfc5f8e6eae20eeed3ca0d02974ed4ee5e4efc" - integrity sha512-Fv+0gYJzE/czLoRKq+gnXWr4yBpPM3tO3C8pDLFwqVKlMICQUq5OsxwwFZYDaVr7+L6mgNDp16iOcJHEz3J5RQ== - "@types/webpack-env@^1.15.0": version "1.15.0" resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.15.0.tgz#bd9956d5044b1fb43e869a9ba9148862ff98d9fd" From 2b52d7599c79f9beee996b2c79305e5a4a5bc441 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 22 Jan 2020 14:22:28 +0000 Subject: [PATCH 19/67] build(deps-dev): bump jest from 24.9.0 to 25.1.0 in /webapp Bumps [jest](https://github.com/facebook/jest) from 24.9.0 to 25.1.0. - [Release notes](https://github.com/facebook/jest/releases) - [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md) - [Commits](https://github.com/facebook/jest/compare/v24.9.0...v25.1.0) Signed-off-by: dependabot-preview[bot] --- webapp/package.json | 2 +- webapp/yarn.lock | 1363 +++++++++++++++++++++---------------------- 2 files changed, 657 insertions(+), 708 deletions(-) diff --git a/webapp/package.json b/webapp/package.json index 392650c6e..3449bb470 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -131,7 +131,7 @@ "flush-promises": "^1.0.2", "fuse.js": "^3.4.6", "identity-obj-proxy": "^3.0.0", - "jest": "~24.9.0", + "jest": "~25.1.0", "mutation-observer": "^1.0.3", "node-sass": "~4.13.1", "prettier": "~1.19.1", diff --git a/webapp/yarn.lock b/webapp/yarn.lock index 9ddf26b75..f716405c4 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -106,7 +106,7 @@ lodash "^4.17.13" source-map "^0.5.0" -"@babel/generator@^7.4.0", "@babel/generator@^7.8.3": +"@babel/generator@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.8.3.tgz#0e22c005b0a94c1c74eafe19ef78ce53a4d45c03" integrity sha512-WjoPk8hRpDRqqzRpvaR8/gDUPkrnOOeuT2m8cNICJtZH6mwaCo3v0OKMI7Y6SM1pBtyijnLtAL0HDi41pf41ug== @@ -383,7 +383,7 @@ esutils "^2.0.2" js-tokens "^4.0.0" -"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.1.3", "@babel/parser@^7.4.3", "@babel/parser@^7.7.5", "@babel/parser@^7.8.3": +"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.1.3", "@babel/parser@^7.7.5", "@babel/parser@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.8.3.tgz#790874091d2001c9be6ec426c2eed47bc7679081" integrity sha512-/V72F4Yp/qmHaTALizEm9Gf2eQHV3QyTL3K0cNfijwnMnb1L+LDlAubb/ZnSdGAVzVSWakujHYs1I26x66sMeQ== @@ -909,7 +909,7 @@ dependencies: regenerator-runtime "^0.13.2" -"@babel/template@^7.4.0", "@babel/template@^7.7.4", "@babel/template@^7.8.3": +"@babel/template@^7.7.4", "@babel/template@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.8.3.tgz#e02ad04fe262a657809327f578056ca15fd4d1b8" integrity sha512-04m87AcQgAFdvuoyiQ2kgELr2tV8B4fP/xJAVUL3Yb3bkNdMedD3d0rlSQr3PegP0cms3eHjl1F7PWlvWbU8FQ== @@ -918,7 +918,7 @@ "@babel/parser" "^7.8.3" "@babel/types" "^7.8.3" -"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.4.3", "@babel/traverse@^7.7.4", "@babel/traverse@^7.8.3": +"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.7.4", "@babel/traverse@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.8.3.tgz#a826215b011c9b4f73f3a893afbc05151358bf9a" integrity sha512-we+a2lti+eEImHmEXp7bM9cTxGzxPmBiVJlLVD+FuuQMeeO7RaDbutbgeheDkw+Xe3mCfJHnGOWLswT74m2IPg== @@ -942,7 +942,7 @@ lodash "^4.17.13" to-fast-properties "^2.0.0" -"@babel/types@^7.0.0", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.6.3", "@babel/types@^7.7.4", "@babel/types@^7.8.0", "@babel/types@^7.8.3": +"@babel/types@^7.0.0", "@babel/types@^7.3.0", "@babel/types@^7.6.3", "@babel/types@^7.7.4", "@babel/types@^7.8.0", "@babel/types@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.8.3.tgz#5a383dffa5416db1b73dedffd311ffd0788fb31c" integrity sha512-jBD+G8+LWpMBBWvVcdr4QysjUE4mU/syrhN17o1u3gx0/WzJB1kwiVZAXRtWbsIPOwW8pF/YJV5+nmetPzepXg== @@ -951,6 +951,11 @@ lodash "^4.17.13" to-fast-properties "^2.0.0" +"@bcoe/v8-coverage@^0.2.3": + version "0.2.3" + resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" + integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== + "@chromaui/localtunnel@1.10.1": version "1.10.1" resolved "https://registry.yarnpkg.com/@chromaui/localtunnel/-/localtunnel-1.10.1.tgz#34da7dab7055a16b1b9034a9eb7e3054ebec4b98" @@ -1252,162 +1257,132 @@ resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd" integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw== -"@jest/console@^24.7.1": - version "24.7.1" - resolved "https://registry.yarnpkg.com/@jest/console/-/console-24.7.1.tgz#32a9e42535a97aedfe037e725bd67e954b459545" - integrity sha512-iNhtIy2M8bXlAOULWVTUxmnelTLFneTNEkHCgPmgd+zNwy9zVddJ6oS5rZ9iwoscNdT5mMwUd0C51v/fSlzItg== +"@jest/console@^25.1.0": + version "25.1.0" + resolved "https://registry.yarnpkg.com/@jest/console/-/console-25.1.0.tgz#1fc765d44a1e11aec5029c08e798246bd37075ab" + integrity sha512-3P1DpqAMK/L07ag/Y9/Jup5iDEG9P4pRAuZiMQnU0JB3UOvCyYCjCoxr7sIA80SeyUCUKrr24fKAxVpmBgQonA== dependencies: - "@jest/source-map" "^24.3.0" - chalk "^2.0.1" - slash "^2.0.0" + "@jest/source-map" "^25.1.0" + chalk "^3.0.0" + jest-util "^25.1.0" + slash "^3.0.0" -"@jest/console@^24.9.0": - version "24.9.0" - resolved "https://registry.yarnpkg.com/@jest/console/-/console-24.9.0.tgz#79b1bc06fb74a8cfb01cbdedf945584b1b9707f0" - integrity sha512-Zuj6b8TnKXi3q4ymac8EQfc3ea/uhLeCGThFqXeC8H9/raaH8ARPUTdId+XyGd03Z4In0/VjD2OYFcBF09fNLQ== +"@jest/core@^25.1.0": + version "25.1.0" + resolved "https://registry.yarnpkg.com/@jest/core/-/core-25.1.0.tgz#3d4634fc3348bb2d7532915d67781cdac0869e47" + integrity sha512-iz05+NmwCmZRzMXvMo6KFipW7nzhbpEawrKrkkdJzgytavPse0biEnCNr2wRlyCsp3SmKaEY+SGv7YWYQnIdig== dependencies: - "@jest/source-map" "^24.9.0" - chalk "^2.0.1" - slash "^2.0.0" - -"@jest/core@^24.9.0": - version "24.9.0" - resolved "https://registry.yarnpkg.com/@jest/core/-/core-24.9.0.tgz#2ceccd0b93181f9c4850e74f2a9ad43d351369c4" - integrity sha512-Fogg3s4wlAr1VX7q+rhV9RVnUv5tD7VuWfYy1+whMiWUrvl7U3QJSJyWcDio9Lq2prqYsZaeTv2Rz24pWGkJ2A== - dependencies: - "@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" + "@jest/console" "^25.1.0" + "@jest/reporters" "^25.1.0" + "@jest/test-result" "^25.1.0" + "@jest/transform" "^25.1.0" + "@jest/types" "^25.1.0" + ansi-escapes "^4.2.1" + chalk "^3.0.0" 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" + graceful-fs "^4.2.3" + jest-changed-files "^25.1.0" + jest-config "^25.1.0" + jest-haste-map "^25.1.0" + jest-message-util "^25.1.0" + jest-regex-util "^25.1.0" + jest-resolve "^25.1.0" + jest-resolve-dependencies "^25.1.0" + jest-runner "^25.1.0" + jest-runtime "^25.1.0" + jest-snapshot "^25.1.0" + jest-util "^25.1.0" + jest-validate "^25.1.0" + jest-watcher "^25.1.0" + micromatch "^4.0.2" + p-each-series "^2.1.0" realpath-native "^1.1.0" - rimraf "^2.5.4" - slash "^2.0.0" - strip-ansi "^5.0.0" + rimraf "^3.0.0" + slash "^3.0.0" + strip-ansi "^6.0.0" -"@jest/environment@^24.9.0": - version "24.9.0" - resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-24.9.0.tgz#21e3afa2d65c0586cbd6cbefe208bafade44ab18" - integrity sha512-5A1QluTPhvdIPFYnO3sZC3smkNeXPVELz7ikPbhUj0bQjB07EoE9qtLrem14ZUYWdVayYbsjVwIiL4WBIMV4aQ== +"@jest/environment@^25.1.0": + version "25.1.0" + resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-25.1.0.tgz#4a97f64770c9d075f5d2b662b5169207f0a3f787" + integrity sha512-cTpUtsjU4cum53VqBDlcW0E4KbQF03Cn0jckGPW/5rrE9tb+porD3+hhLtHAwhthsqfyF+bizyodTlsRA++sHg== dependencies: - "@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.1.0" + "@jest/types" "^25.1.0" + jest-mock "^25.1.0" -"@jest/fake-timers@^24.9.0": - version "24.9.0" - resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-24.9.0.tgz#ba3e6bf0eecd09a636049896434d306636540c93" - integrity sha512-eWQcNa2YSwzXWIMC5KufBh3oWRIijrQFROsIqt6v/NS9Io/gknw1jsAC9c+ih/RQX4A3O7SeWAhQeN0goKhT9A== +"@jest/fake-timers@^25.1.0": + version "25.1.0" + resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-25.1.0.tgz#a1e0eff51ffdbb13ee81f35b52e0c1c11a350ce8" + integrity sha512-Eu3dysBzSAO1lD7cylZd/CVKdZZ1/43SF35iYBNV1Lvvn2Undp3Grwsv8PrzvbLhqwRzDd4zxrY4gsiHc+wygQ== dependencies: - "@jest/types" "^24.9.0" - jest-message-util "^24.9.0" - jest-mock "^24.9.0" + "@jest/types" "^25.1.0" + jest-message-util "^25.1.0" + jest-mock "^25.1.0" + jest-util "^25.1.0" + lolex "^5.0.0" -"@jest/reporters@^24.9.0": - version "24.9.0" - resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-24.9.0.tgz#86660eff8e2b9661d042a8e98a028b8d631a5b43" - integrity sha512-mu4X0yjaHrffOsWmVLzitKmmmWSQ3GGuefgNscUSWNiUNcEOSEQk9k3pERKEQVBb0Cnn88+UESIsZEMH3o88Gw== +"@jest/reporters@^25.1.0": + version "25.1.0" + resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-25.1.0.tgz#9178ecf136c48f125674ac328f82ddea46e482b0" + integrity sha512-ORLT7hq2acJQa8N+NKfs68ZtHFnJPxsGqmofxW7v7urVhzJvpKZG9M7FAcgh9Ee1ZbCteMrirHA3m5JfBtAaDg== dependencies: - "@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" + "@bcoe/v8-coverage" "^0.2.3" + "@jest/console" "^25.1.0" + "@jest/environment" "^25.1.0" + "@jest/test-result" "^25.1.0" + "@jest/transform" "^25.1.0" + "@jest/types" "^25.1.0" + chalk "^3.0.0" + collect-v8-coverage "^1.0.0" 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" + 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.0" + jest-haste-map "^25.1.0" + jest-resolve "^25.1.0" + jest-runtime "^25.1.0" + jest-util "^25.1.0" + jest-worker "^25.1.0" + slash "^3.0.0" source-map "^0.6.0" - string-length "^2.0.0" + string-length "^3.1.0" + terminal-link "^2.0.0" + v8-to-istanbul "^4.0.1" + optionalDependencies: + node-notifier "^6.0.0" -"@jest/source-map@^24.3.0": - version "24.3.0" - resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-24.3.0.tgz#563be3aa4d224caf65ff77edc95cd1ca4da67f28" - integrity sha512-zALZt1t2ou8le/crCeeiRYzvdnTzaIlpOWaet45lNSqNJUnXbppUUFR4ZUAlzgDmKee4Q5P/tKXypI1RiHwgag== +"@jest/source-map@^25.1.0": + version "25.1.0" + resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-25.1.0.tgz#b012e6c469ccdbc379413f5c1b1ffb7ba7034fb0" + integrity sha512-ohf2iKT0xnLWcIUhL6U6QN+CwFWf9XnrM2a6ybL9NXxJjgYijjLSitkYHIdzkd8wFliH73qj/+epIpTiWjRtAA== dependencies: callsites "^3.0.0" - graceful-fs "^4.1.15" + graceful-fs "^4.2.3" source-map "^0.6.0" -"@jest/source-map@^24.9.0": - version "24.9.0" - resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-24.9.0.tgz#0e263a94430be4b41da683ccc1e6bffe2a191714" - integrity sha512-/Xw7xGlsZb4MJzNDgB7PW5crou5JqWiBQaz6xyPd3ArOg2nfn/PunV8+olXbbEZzNl591o5rWKE9BRDaFAuIBg== +"@jest/test-result@^25.1.0": + version "25.1.0" + resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-25.1.0.tgz#847af2972c1df9822a8200457e64be4ff62821f7" + integrity sha512-FZzSo36h++U93vNWZ0KgvlNuZ9pnDnztvaM7P/UcTx87aPDotG18bXifkf1Ji44B7k/eIatmMzkBapnAzjkJkg== dependencies: - callsites "^3.0.0" - graceful-fs "^4.1.15" - source-map "^0.6.0" - -"@jest/test-result@^24.9.0": - version "24.9.0" - resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-24.9.0.tgz#11796e8aa9dbf88ea025757b3152595ad06ba0ca" - integrity sha512-XEFrHbBonBJ8dGp2JmF8kP/nQI/ImPpygKHwQ/SY+es59Z3L5PI4Qb9TQQMAEeYsThG1xF0k6tmG0tIKATNiiA== - dependencies: - "@jest/console" "^24.9.0" - "@jest/types" "^24.9.0" + "@jest/console" "^25.1.0" + "@jest/transform" "^25.1.0" + "@jest/types" "^25.1.0" "@types/istanbul-lib-coverage" "^2.0.0" + collect-v8-coverage "^1.0.0" -"@jest/test-sequencer@^24.9.0": - version "24.9.0" - resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-24.9.0.tgz#f8f334f35b625a4f2f355f2fe7e6036dad2e6b31" - integrity sha512-6qqsU4o0kW1dvA95qfNog8v8gkRN9ph6Lz7r96IvZpHdNipP2cBcb07J1Z45mz/VIS01OHJ3pY8T5fUY38tg4A== +"@jest/test-sequencer@^25.1.0": + version "25.1.0" + resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-25.1.0.tgz#4df47208542f0065f356fcdb80026e3c042851ab" + integrity sha512-WgZLRgVr2b4l/7ED1J1RJQBOharxS11EFhmwDqknpknE0Pm87HLZVS2Asuuw+HQdfQvm2aXL2FvvBLxOD1D0iw== dependencies: - "@jest/test-result" "^24.9.0" - jest-haste-map "^24.9.0" - jest-runner "^24.9.0" - jest-runtime "^24.9.0" - -"@jest/transform@^24.9.0": - version "24.9.0" - resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-24.9.0.tgz#4ae2768b296553fadab09e9ec119543c90b16c56" - integrity sha512-TcQUmyNRxV94S0QpMOnZl0++6RMiqpbH/ZMccFB/amku6Uwvyb1cjYX7xkp5nGNkbX4QPH/FcB6q1HBTHynLmQ== - dependencies: - "@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/test-result" "^25.1.0" + jest-haste-map "^25.1.0" + jest-runner "^25.1.0" + jest-runtime "^25.1.0" "@jest/transform@^25.1.0": version "25.1.0" @@ -1431,15 +1406,6 @@ source-map "^0.6.1" write-file-atomic "^3.0.0" -"@jest/types@^24.9.0": - version "24.9.0" - resolved "https://registry.yarnpkg.com/@jest/types/-/types-24.9.0.tgz#63cb26cb7500d069e5a389441a7c6ab5e909fc59" - integrity sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw== - dependencies: - "@types/istanbul-lib-coverage" "^2.0.0" - "@types/istanbul-reports" "^1.1.1" - "@types/yargs" "^13.0.0" - "@jest/types@^25.1.0": version "25.1.0" resolved "https://registry.yarnpkg.com/@jest/types/-/types-25.1.0.tgz#b26831916f0d7c381e11dbb5e103a72aed1b4395" @@ -2118,6 +2084,13 @@ "@sentry/cli" "^1.48.0" snyk "^1.231.0" +"@sinonjs/commons@^1.7.0": + version "1.7.0" + resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.7.0.tgz#f90ffc52a2e519f018b13b6c4da03cbff36ebed6" + integrity sha512-qbk9AP+cZUsKdW1GJsBpxPKFmCJ0T8swwzVje3qFd+AkQb74Q/tiuzrdfFg8AD2g5HH/XbE/I8Uc1KYHVYWfhg== + dependencies: + type-detect "4.0.8" + "@snyk/cli-interface@1.5.0": version "1.5.0" resolved "https://registry.yarnpkg.com/@snyk/cli-interface/-/cli-interface-1.5.0.tgz#b9dbe6ebfb86e67ffabf29d4e0d28a52670ac456" @@ -3016,7 +2989,7 @@ resolved "https://registry.yarnpkg.com/@types/is-function/-/is-function-1.0.0.tgz#1b0b819b1636c7baf0d6785d030d12edf70c3e83" integrity sha512-iTs9HReBu7evG77Q4EC8hZnqRt57irBDkK9nvmHroiOIVwYMQc4IvYvdRgwKfYepunIY7Oh/dBuuld+Gj9uo6w== -"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0": +"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1": version "2.0.1" resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz#42995b446db9a48a11a07ec083499a860e9138ff" integrity sha512-hRJD2ahnnpLgsj6KWMYSrmXkM3rm2Dl1qkx6IOFD5FnuNPXJIG5L0dhgKXCYTRMGzU4n0wImQ/xfmRc4POUFlg== @@ -3234,13 +3207,6 @@ resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-13.0.0.tgz#453743c5bbf9f1bed61d959baab5b06be029b2d0" integrity sha512-wBlsw+8n21e6eTd4yVv8YD/E3xq0O6nNnJIquutAsFGE7EyMKz7W6RNT6BRu1SmdgmlCZ9tb0X+j+D6HGr8pZw== -"@types/yargs@^13.0.0": - version "13.0.2" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.2.tgz#a64674fc0149574ecd90ba746e932b5a5f7b3653" - integrity sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ== - dependencies: - "@types/yargs-parser" "*" - "@types/yargs@^15.0.0": version "15.0.1" resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.1.tgz#9266a9d7be68cfcc982568211085a49a277f7c96" @@ -3601,6 +3567,14 @@ acorn-globals@^4.1.0: acorn "^6.0.1" acorn-walk "^6.0.1" +acorn-globals@^4.3.2: + version "4.3.4" + resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.4.tgz#9fa1926addc11c97308c4e66d7add0d40c3272e7" + integrity sha512-clfQEh21R+D0leSbUdWf3OcfqyaCSAQ8Ryq00bofSekfr9W8u1jyYZo6ir0xu9Gtcf7BjcHJpnbZH7JOCpP60A== + dependencies: + acorn "^6.0.1" + acorn-walk "^6.0.1" + acorn-jsx@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.1.0.tgz#294adb71b57398b0680015f0a38c563ee1db5384" @@ -3760,7 +3734,7 @@ ansi-regex@^3.0.0: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= -ansi-regex@^4.0.0, ansi-regex@^4.1.0: +ansi-regex@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997" integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg== @@ -4659,20 +4633,7 @@ babel-helper-vue-jsx-merge-props@^2.0.2: resolved "https://registry.yarnpkg.com/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-2.0.3.tgz#22aebd3b33902328e513293a8e4992b384f9f1b6" integrity sha512-gsLiKK7Qrb7zYJNgiXKpXblxbV5ffSwR0f5whkPAaBAR4fhi6bwRZxX9wBlIc5M/v8CCkXUbXZL4N/nSE97cqg== -babel-jest@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-24.9.0.tgz#3fc327cb8467b89d14d7bc70e315104a783ccd54" - integrity sha512-ntuddfyiN+EhMw58PTNL1ph4C9rECiQXjI4nMMBKBaNjXvqLdkXpPRcMSr4iyBrJg/+wz9brFUD6RhOAT6r4Iw== - dependencies: - "@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-jest@~25.1.0: +babel-jest@^25.1.0, babel-jest@~25.1.0: version "25.1.0" resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-25.1.0.tgz#206093ac380a4b78c4404a05b3277391278f80fb" integrity sha512-tz0VxUhhOE2y+g8R2oFrO/2VtVjA1lkJeavlhExuRBg3LdNJY9gwQ+Vcvqt9+cqy71MCTJhewvTB7Qtnnr9SWg== @@ -4762,15 +4723,6 @@ babel-plugin-emotion@^10.0.20, babel-plugin-emotion@^10.0.27: find-root "^1.1.0" source-map "^0.5.7" -babel-plugin-istanbul@^5.1.0: - version "5.1.4" - resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-5.1.4.tgz#841d16b9a58eeb407a0ddce622ba02fe87a752ba" - integrity sha512-dySz4VJMH+dpndj0wjJ8JPs/7i1TdSPb1nRrn56/92pKOF9VKC1FMFJmMXjzlGGusnCAqujP6PBCiKq0sVA+YQ== - dependencies: - find-up "^3.0.0" - istanbul-lib-instrument "^3.3.0" - test-exclude "^5.2.3" - babel-plugin-istanbul@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz#e159ccdc9af95e0b570c75b4573b7c34d671d765" @@ -4782,13 +4734,6 @@ babel-plugin-istanbul@^6.0.0: istanbul-lib-instrument "^4.0.0" test-exclude "^6.0.0" -babel-plugin-jest-hoist@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-24.9.0.tgz#4f837091eb407e01447c8843cbec546d0002d756" - integrity sha512-2EMA2P8Vp7lG0RAzr4HXqtYwacfMErOuv1U3wrvxHX6rD1sV6xS3WXG3r8TRQ2r6w8OhvSdWt+z41hQNwNm3Xw== - dependencies: - "@types/babel__traverse" "^7.0.6" - babel-plugin-jest-hoist@^25.1.0: version "25.1.0" resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-25.1.0.tgz#fb62d7b3b53eb36c97d1bc7fec2072f9bd115981" @@ -5005,14 +4950,6 @@ babel-polyfill@6.26.0: core-js "^2.5.0" regenerator-runtime "^0.10.5" -babel-preset-jest@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-24.9.0.tgz#192b521e2217fb1d1f67cf73f70c336650ad3cdc" - integrity sha512-izTUuhE4TMfTRPF92fFwD2QfdXaZW08qvWTFCI51V8rW5x00UuPgc3ajRoWofXOuxjfcOM5zzSYsQS3H8KGCAg== - dependencies: - "@babel/plugin-syntax-object-rest-spread" "^7.0.0" - babel-plugin-jest-hoist "^24.9.0" - babel-preset-jest@^25.1.0: version "25.1.0" resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-25.1.0.tgz#d0aebfebb2177a21cde710996fce8486d34f1d33" @@ -5982,14 +5919,14 @@ cliui@^3.0.3, cliui@^3.2.0: strip-ansi "^3.0.1" wrap-ansi "^2.0.0" -cliui@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5" - integrity sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA== +cliui@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1" + integrity sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ== dependencies: - 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" clone-deep@^0.3.0: version "0.3.0" @@ -6039,6 +5976,11 @@ code-point-at@^1.0.0: resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= +collect-v8-coverage@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.0.tgz#150ee634ac3650b71d9c985eb7f608942334feb1" + integrity sha512-VKIhJgvk8E1W28m5avZ2Gv2Ruv5YiF56ug2oclvaG9md69BuZImMG2sk9g7QNKLUbtYAKQjXjYxbYZVUlMMKmQ== + collection-visit@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0" @@ -6114,7 +6056,7 @@ commander@^2.18.0, commander@^2.19.0, commander@^2.20.0, commander@~2.20.0: resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422" integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ== -commander@^2.9.0, commander@~2.20.3: +commander@^2.9.0: version "2.20.3" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== @@ -6277,7 +6219,7 @@ content-type@^1.0.4, content-type@~1.0.4: resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== -convert-source-map@^1.4.0, convert-source-map@^1.5.0, convert-source-map@^1.7.0: +convert-source-map@^1.4.0, convert-source-map@^1.5.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0: version "1.7.0" resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442" integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA== @@ -6791,6 +6733,16 @@ cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0": resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.6.tgz#f85206cee04efa841f3c5982a74ba96ab20d65ad" integrity sha512-DtUeseGk9/GBW0hl0vVPpU22iHL6YB5BUX7ml1hB+GMpo0NX5G4voX3kdWiMSEguFtcW3Vh3djqNF4aIe6ne0A== +cssom@^0.4.1: + version "0.4.4" + resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz#5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10" + integrity sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw== + +cssom@~0.3.6: + version "0.3.8" + resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a" + integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg== + cssstyle@^1.0.0: version "1.2.2" resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-1.2.2.tgz#427ea4d585b18624f6fdbf9de7a2a1a3ba713077" @@ -6798,6 +6750,13 @@ cssstyle@^1.0.0: dependencies: cssom "0.3.x" +cssstyle@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.1.0.tgz#99f50a3aa21d4af16e758ae3e454dcf5940b9122" + integrity sha512-1iwCdymVYhMdQWiZ+9mB7x+urdNLPGTWsIZt6euFk8Yi+dOERK2ccoAUA3Bl8I5vmK5qfz/eLkBRyLbs42ov4A== + dependencies: + cssom "~0.3.6" + csstype@^2.2.0, csstype@^2.5.7: version "2.6.6" resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.6.tgz#c34f8226a94bbb10c32cc0d714afdf942291fc41" @@ -6827,7 +6786,7 @@ dashdash@^1.12.0: dependencies: assert-plus "^1.0.0" -data-urls@^1.0.0: +data-urls@^1.0.0, data-urls@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-1.1.0.tgz#15ee0582baa5e22bb59c77140da8f9c76963bbfe" integrity sha512-YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ== @@ -7018,10 +6977,10 @@ detect-libc@^1.0.2: resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= -detect-newline@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2" - integrity sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I= +detect-newline@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651" + integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA== detect-node@^2.0.4: version "2.0.4" @@ -7051,10 +7010,10 @@ dicer@0.3.0: dependencies: streamsearch "0.1.2" -diff-sequences@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-24.9.0.tgz#5715d6244e2aa65f48bba0bc972db0b0b11e95b5" - integrity sha512-Dj6Wk3tWyTE+Fo1rW8v0Xhwk80um6yFYKbuAxc9c3EZxIHFDYwbi34Uk42u1CdnIiVorvt4RmlSDjIPyzGC2ew== +diff-sequences@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-25.1.0.tgz#fd29a46f1c913fd66c22645dc75bffbe43051f32" + integrity sha512-nFIfVk5B/NStCsJ+zaPO4vYuLjlzQ6uFvPxzYyHlejNZ/UGa7G/n7peOXVrVNvRuyfstt+mZQYGpjxg9Z6N8Kw== diff@^4.0.1: version "4.0.1" @@ -7537,6 +7496,18 @@ escape-string-regexp@^2.0.0: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344" integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w== +escodegen@^1.11.1: + version "1.13.0" + resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.13.0.tgz#c7adf9bd3f3cc675bb752f202f79a720189cab29" + integrity sha512-eYk2dCkxR07DsHA/X2hRBj0CFAZeri/LyDMc0C8JT1Hqi6JnVpMhJ7XFITbb0+yZS3lVkaPL2oCkZ3AVmeVbMw== + dependencies: + esprima "^4.0.1" + estraverse "^4.2.0" + esutils "^2.0.2" + optionator "^0.8.1" + optionalDependencies: + source-map "~0.6.1" + escodegen@^1.9.1: version "1.11.1" resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.11.1.tgz#c485ff8d6b4cdb89e27f4a856e91f118401ca510" @@ -7756,7 +7727,7 @@ esprima@^3.1.3: resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633" integrity sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM= -esprima@^4.0.0, esprima@~4.0.0: +esprima@^4.0.0, esprima@^4.0.1, esprima@~4.0.0: version "4.0.1" resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== @@ -7911,17 +7882,17 @@ expand-brackets@^2.1.4: snapdragon "^0.8.1" to-regex "^3.0.1" -expect@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/expect/-/expect-24.9.0.tgz#b75165b4817074fa4a157794f46fe9f1ba15b6ca" - integrity sha512-wvVAx8XIol3Z5m9zvZXiyZOQ+sRJqNTIm6sGjdWlaZIeupQGO3WbYI+15D/AmEwZywL6wtJkbAbJtzkOfBuR0Q== +expect@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/expect/-/expect-25.1.0.tgz#7e8d7b06a53f7d66ec927278db3304254ee683ee" + integrity sha512-wqHzuoapQkhc3OKPlrpetsfueuEiMf3iWh0R8+duCu9PIjXoP7HgD5aeypwTnXUAjC8aMsiVDaWwlbJ1RlQ38g== dependencies: - "@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.1.0" + ansi-styles "^4.0.0" + jest-get-type "^25.1.0" + jest-matcher-utils "^25.1.0" + jest-message-util "^25.1.0" + jest-regex-util "^25.1.0" express@^4.16.3, express@^4.17.0, express@^4.17.1, express@~4.17.1: version "4.17.1" @@ -8975,17 +8946,6 @@ hable@^2.3.2: resolved "https://registry.yarnpkg.com/hable/-/hable-2.3.2.tgz#7867ffec0b67e63136937613d9a0bc646ac9d7fe" integrity sha512-qJ9WoXl/15LNlG1KeAuBjCNGStUb+MCQ5biPxOmwRyESH8CSWwZB4xEnzCduuQ3I/mlgui28t8/oMAGT1Rpb2g== -handlebars@^4.1.2: - version "4.5.3" - resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.5.3.tgz#5cf75bd8714f7605713511a56be7c349becb0482" - integrity sha512-3yPecJoJHK/4c6aZhSvxOyG4vJKDshV36VHp0iVCDVh7o9w2vwi3NSnL2MMPj3YdduqaBcu7cGbggJQM0br9xA== - dependencies: - neo-async "^2.6.0" - optimist "^0.6.1" - source-map "^0.6.1" - optionalDependencies: - uglify-js "^3.1.4" - har-schema@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" @@ -9243,6 +9203,11 @@ html-entities@^1.2.0: resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f" integrity sha1-DfKTUfByEWNRXfueVUPl9u7VFi8= +html-escaper@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.0.tgz#71e87f931de3fe09e56661ab9a29aadec707b491" + integrity sha512-a4u9BeERWGu/S8JiWEAQcdrg9v4QArtP9keViQjGMdff20fBdd8waotXaNmODqBe6uZ3Nafi7K/ho4gCQHV3Ig== + html-minifier@^3.2.3: version "3.5.21" resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.5.21.tgz#d0040e054730e354db008463593194015212d20c" @@ -9501,13 +9466,13 @@ import-lazy@^2.1.0: resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43" integrity sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM= -import-local@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz#55070be38a5993cf18ef6db7e961f5bee5c5a09d" - integrity sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ== +import-local@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.0.2.tgz#a8cfd0431d1de4a2199703d003e3e62364fa6db6" + integrity sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA== dependencies: - pkg-dir "^3.0.0" - resolve-cwd "^2.0.0" + pkg-dir "^4.2.0" + resolve-cwd "^3.0.0" imurmurhash@^0.1.4: version "0.1.4" @@ -9665,6 +9630,11 @@ invert-kv@^1.0.0: resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6" integrity sha1-EEqOSqym09jNFXqO+L+rLXo//bY= +ip-regex@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9" + integrity sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk= + ip@^1.1.5: version "1.1.5" resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a" @@ -10103,7 +10073,7 @@ is-wsl@^1.1.0: resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d" integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0= -is-wsl@^2.1.0: +is-wsl@^2.1.0, is-wsl@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.1.1.tgz#4a1c152d429df3d441669498e2486d3596ebaf1d" integrity sha512-umZHcSrwlDHo2TGMXv0DZ8dIUGunZ2Iv68YZnrmCiBPkZ4aaOhtv7pXJKeki9k3qJ3RJr0cDyitcl5wEH3AYog== @@ -10148,29 +10118,11 @@ isstream@~0.1.2: resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo= -istanbul-lib-coverage@^2.0.2, istanbul-lib-coverage@^2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz#675f0ab69503fad4b1d849f736baaca803344f49" - integrity sha512-8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA== - istanbul-lib-coverage@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz#f5944a37c70b550b02a78a5c3b2055b280cec8ec" integrity sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg== -istanbul-lib-instrument@^3.0.1, istanbul-lib-instrument@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-3.3.0.tgz#a5f63d91f0bbc0c3e479ef4c5de027335ec6d630" - integrity sha512-5nnIN4vo5xQZHdXno/YDXJ0G+I3dAm4XgzfSVTPLQpj/zAV2dV6Juy0yaf10/zrJOJeHoN3fraFe+XRq2bFVZA== - dependencies: - "@babel/generator" "^7.4.0" - "@babel/parser" "^7.4.3" - "@babel/template" "^7.4.0" - "@babel/traverse" "^7.4.3" - "@babel/types" "^7.4.0" - istanbul-lib-coverage "^2.0.5" - semver "^6.0.0" - istanbul-lib-instrument@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.0.tgz#53321a7970f076262fd3292c8f9b2e4ac544aae1" @@ -10184,32 +10136,31 @@ istanbul-lib-instrument@^4.0.0: istanbul-lib-coverage "^3.0.0" semver "^6.3.0" -istanbul-lib-report@^2.0.4: - version "2.0.8" - resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-2.0.8.tgz#5a8113cd746d43c4889eba36ab10e7d50c9b4f33" - integrity sha512-fHBeG573EIihhAblwgxrSenp0Dby6tJMFR/HvlerBsrCTD5bkUuoNtn3gVh29ZCS824cGGBPn7Sg7cNk+2xUsQ== +istanbul-lib-report@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#7518fe52ea44de372f460a76b5ecda9ffb73d8a6" + integrity sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw== dependencies: - 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" -istanbul-lib-source-maps@^3.0.1: - version "3.0.6" - resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.6.tgz#284997c48211752ec486253da97e3879defba8c8" - integrity sha512-R47KzMtDJH6X4/YW9XTx+jrLnZnscW4VpNN+1PViSYTejLVPWv7oov+Duf8YQSPyVRUvueQqz1TcsC6mooZTXw== +istanbul-lib-source-maps@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz#75743ce6d96bb86dc7ee4352cf6366a23f0b1ad9" + integrity sha512-c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg== dependencies: debug "^4.1.1" - istanbul-lib-coverage "^2.0.5" - make-dir "^2.1.0" - rimraf "^2.6.3" + istanbul-lib-coverage "^3.0.0" source-map "^0.6.1" -istanbul-reports@^2.2.6: - version "2.2.6" - resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-2.2.6.tgz#7b4f2660d82b29303a8fe6091f8ca4bf058da1af" - integrity sha512-SKi4rnMyLBKe0Jy2uUdx28h8oG7ph2PPuQPvIAh31d+Ci+lSiEu4C+h3oBPuJ9+mPKhOyW0M8gY4U5NM1WLeXA== +istanbul-reports@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.0.0.tgz#d4d16d035db99581b6194e119bbf36c963c5eb70" + integrity sha512-2osTcC8zcOSUkImzN2EWQta3Vdi4WjjKw99P2yWx5mLnigAM0Rd5uYFn1cf2i/Ois45GkNjaoTqc5CxgMSX80A== dependencies: - handlebars "^4.1.2" + html-escaper "^2.0.0" + istanbul-lib-report "^3.0.0" iterall@^1.1.3, iterall@^1.2.1, iterall@^1.2.2: version "1.2.2" @@ -10231,131 +10182,112 @@ java-properties@^1.0.0: resolved "https://registry.yarnpkg.com/java-properties/-/java-properties-1.0.2.tgz#ccd1fa73907438a5b5c38982269d0e771fe78211" integrity sha512-qjdpeo2yKlYTH7nFdK0vbZWuTCesk4o63v5iVOlhMQPfuIZQfW/HI35SjfhA+4qpg36rnFSvUK5b1m+ckIblQQ== -jest-changed-files@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-24.9.0.tgz#08d8c15eb79a7fa3fc98269bc14b451ee82f8039" - integrity sha512-6aTWpe2mHF0DhL28WjdkO8LyGjs3zItPET4bMSeXU6T3ub4FPMw+mcOcbdGXQOAfmLcxofD23/5Bl9Z4AkFwqg== +jest-changed-files@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-25.1.0.tgz#73dae9a7d9949fdfa5c278438ce8f2ff3ec78131" + integrity sha512-bdL1aHjIVy3HaBO3eEQeemGttsq1BDlHgWcOjEOIAcga7OOEGWHD2WSu8HhL7I1F0mFFyci8VKU4tRNk+qtwDA== dependencies: - "@jest/types" "^24.9.0" - execa "^1.0.0" - throat "^4.0.0" + "@jest/types" "^25.1.0" + execa "^3.2.0" + throat "^5.0.0" -jest-cli@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-24.9.0.tgz#ad2de62d07472d419c6abc301fc432b98b10d2af" - integrity sha512-+VLRKyitT3BWoMeSUIHRxV/2g8y9gw91Jh5z2UmXZzkZKpbC08CSehVxgHUwTpy+HwGcns/tqafQDJW7imYvGg== +jest-cli@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-25.1.0.tgz#75f0b09cf6c4f39360906bf78d580be1048e4372" + integrity sha512-p+aOfczzzKdo3AsLJlhs8J5EW6ffVidfSZZxXedJ0mHPBOln1DccqFmGCoO8JWd4xRycfmwy1eoQkMsF8oekPg== dependencies: - "@jest/core" "^24.9.0" - "@jest/test-result" "^24.9.0" - "@jest/types" "^24.9.0" - chalk "^2.0.1" + "@jest/core" "^25.1.0" + "@jest/test-result" "^25.1.0" + "@jest/types" "^25.1.0" + chalk "^3.0.0" exit "^0.1.2" - import-local "^2.0.0" + import-local "^3.0.2" is-ci "^2.0.0" - jest-config "^24.9.0" - jest-util "^24.9.0" - jest-validate "^24.9.0" + jest-config "^25.1.0" + jest-util "^25.1.0" + jest-validate "^25.1.0" prompts "^2.0.1" realpath-native "^1.1.0" - yargs "^13.3.0" + yargs "^15.0.0" -jest-config@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-24.9.0.tgz#fb1bbc60c73a46af03590719efa4825e6e4dd1b5" - integrity sha512-RATtQJtVYQrp7fvWg6f5y3pEFj9I+H8sWw4aKxnDZ96mob5i5SD6ZEGWgMLXQ4LE8UurrjbdlLWdUeo+28QpfQ== +jest-config@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-25.1.0.tgz#d114e4778c045d3ef239452213b7ad3ec1cbea90" + integrity sha512-tLmsg4SZ5H7tuhBC5bOja0HEblM0coS3Wy5LTCb2C8ZV6eWLewHyK+3qSq9Bi29zmWQ7ojdCd3pxpx4l4d2uGw== dependencies: "@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.1.0" + "@jest/types" "^25.1.0" + babel-jest "^25.1.0" + chalk "^3.0.0" 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" + jest-environment-jsdom "^25.1.0" + jest-environment-node "^25.1.0" + jest-get-type "^25.1.0" + jest-jasmine2 "^25.1.0" + jest-regex-util "^25.1.0" + jest-resolve "^25.1.0" + jest-util "^25.1.0" + jest-validate "^25.1.0" + micromatch "^4.0.2" + pretty-format "^25.1.0" realpath-native "^1.1.0" -jest-diff@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-24.9.0.tgz#931b7d0d5778a1baf7452cb816e325e3724055da" - integrity sha512-qMfrTs8AdJE2iqrTp0hzh7kTd2PQWrsFyj9tORoKmu32xjPjeE4NyjVRDz8ybYwqS2ik8N4hsIpiVTyFeo2lBQ== +jest-diff@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-25.1.0.tgz#58b827e63edea1bc80c1de952b80cec9ac50e1ad" + integrity sha512-nepXgajT+h017APJTreSieh4zCqnSHEJ1iT8HDlewu630lSJ4Kjjr9KNzm+kzGwwcpsDE6Snx1GJGzzsefaEHw== dependencies: - 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.1.0" + jest-get-type "^25.1.0" + pretty-format "^25.1.0" -jest-docblock@^24.3.0: - version "24.3.0" - resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-24.3.0.tgz#b9c32dac70f72e4464520d2ba4aec02ab14db5dd" - integrity sha512-nlANmF9Yq1dufhFlKG9rasfQlrY7wINJbo3q01tu56Jv5eBU5jirylhF2O5ZBnLxzOVBGRDz/9NAwNyBtG4Nyg== +jest-docblock@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-25.1.0.tgz#0f44bea3d6ca6dfc38373d465b347c8818eccb64" + integrity sha512-370P/mh1wzoef6hUKiaMcsPtIapY25suP6JqM70V9RJvdKLrV4GaGbfUseUVk4FZJw4oTZ1qSCJNdrClKt5JQA== dependencies: - detect-newline "^2.1.0" + detect-newline "^3.0.0" -jest-each@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-24.9.0.tgz#eb2da602e2a610898dbc5f1f6df3ba86b55f8b05" - integrity sha512-ONi0R4BvW45cw8s2Lrx8YgbeXL1oCQ/wIDwmsM3CqM/nlblNCPmnC3IPQlMbRFZu3wKdQ2U8BqM6lh3LJ5Bsog== +jest-each@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-25.1.0.tgz#a6b260992bdf451c2d64a0ccbb3ac25e9b44c26a" + integrity sha512-R9EL8xWzoPySJ5wa0DXFTj7NrzKpRD40Jy+zQDp3Qr/2QmevJgkN9GqioCGtAJ2bW9P/MQRznQHQQhoeAyra7A== dependencies: - "@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.1.0" + chalk "^3.0.0" + jest-get-type "^25.1.0" + jest-util "^25.1.0" + pretty-format "^25.1.0" -jest-environment-jsdom@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-24.9.0.tgz#4b0806c7fc94f95edb369a69cc2778eec2b7375b" - integrity sha512-Zv9FV9NBRzLuALXjvRijO2351DRQeLYXtpD4xNvfoVFw21IOKNhZAEUKcbiEtjTkm2GsJ3boMVgkaR7rN8qetA== +jest-environment-jsdom@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-25.1.0.tgz#6777ab8b3e90fd076801efd3bff8e98694ab43c3" + integrity sha512-ILb4wdrwPAOHX6W82GGDUiaXSSOE274ciuov0lztOIymTChKFtC02ddyicRRCdZlB5YSrv3vzr1Z5xjpEe1OHQ== dependencies: - "@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.1.0" + "@jest/fake-timers" "^25.1.0" + "@jest/types" "^25.1.0" + jest-mock "^25.1.0" + jest-util "^25.1.0" + jsdom "^15.1.1" -jest-environment-node@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-24.9.0.tgz#333d2d2796f9687f2aeebf0742b519f33c1cbfd3" - integrity sha512-6d4V2f4nxzIzwendo27Tr0aFm+IXWa0XEUnaH6nU0FMaozxovt+sfRvh4J47wL1OvF83I3SSTu0XK+i4Bqe7uA== +jest-environment-node@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-25.1.0.tgz#797bd89b378cf0bd794dc8e3dca6ef21126776db" + integrity sha512-U9kFWTtAPvhgYY5upnH9rq8qZkj6mYLup5l1caAjjx9uNnkLHN2xgZy5mo4SyLdmrh/EtB9UPpKFShvfQHD0Iw== dependencies: - "@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.1.0" + "@jest/fake-timers" "^25.1.0" + "@jest/types" "^25.1.0" + jest-mock "^25.1.0" + jest-util "^25.1.0" -jest-get-type@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-24.9.0.tgz#1684a0c8a50f2e4901b6644ae861f579eed2ef0e" - integrity sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q== - -jest-haste-map@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-24.9.0.tgz#b38a5d64274934e21fa417ae9a9fbeb77ceaac7d" - integrity sha512-kfVFmsuWui2Sj1Rp1AJ4D9HqJwE4uwTlS/vO+eRUaMmd54BFpli2XhMQnPC2k4cHFVbB2Q2C+jtI1AGLgEnCjQ== - dependencies: - "@jest/types" "^24.9.0" - anymatch "^2.0.0" - fb-watchman "^2.0.0" - 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" - optionalDependencies: - fsevents "^1.2.7" +jest-get-type@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-25.1.0.tgz#1cfe5fc34f148dc3a8a3b7275f6b9ce9e2e8a876" + integrity sha512-yWkBnT+5tMr8ANB6V+OjmrIJufHtCAqI5ic2H40v+tRqxDmE0PGnIiTyvRWFOMtmVHYpwRqyazDbTnhpjsGvLw== jest-haste-map@^25.1.0: version "25.1.0" @@ -10375,207 +10307,177 @@ jest-haste-map@^25.1.0: optionalDependencies: fsevents "^2.1.2" -jest-jasmine2@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-24.9.0.tgz#1f7b1bd3242c1774e62acabb3646d96afc3be6a0" - integrity sha512-Cq7vkAgaYKp+PsX+2/JbTarrk0DmNhsEtqBXNwUHkdlbrTBLtMJINADf2mf5FkowNsq8evbPc07/qFO0AdKTzw== +jest-jasmine2@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-25.1.0.tgz#681b59158a430f08d5d0c1cce4f01353e4b48137" + integrity sha512-GdncRq7jJ7sNIQ+dnXvpKO2MyP6j3naNK41DTTjEAhLEdpImaDA9zSAZwDhijjSF/D7cf4O5fdyUApGBZleaEg== dependencies: "@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.1.0" + "@jest/source-map" "^25.1.0" + "@jest/test-result" "^25.1.0" + "@jest/types" "^25.1.0" + chalk "^3.0.0" co "^4.6.0" - expect "^24.9.0" + expect "^25.1.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.1.0" + jest-matcher-utils "^25.1.0" + jest-message-util "^25.1.0" + jest-runtime "^25.1.0" + jest-snapshot "^25.1.0" + jest-util "^25.1.0" + pretty-format "^25.1.0" + throat "^5.0.0" -jest-leak-detector@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-24.9.0.tgz#b665dea7c77100c5c4f7dfcb153b65cf07dcf96a" - integrity sha512-tYkFIDsiKTGwb2FG1w8hX9V0aUb2ot8zY/2nFg087dUageonw1zrLMP4W6zsRO59dPkTSKie+D4rhMuP9nRmrA== +jest-leak-detector@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-25.1.0.tgz#ed6872d15aa1c72c0732d01bd073dacc7c38b5c6" + integrity sha512-3xRI264dnhGaMHRvkFyEKpDeaRzcEBhyNrOG5oT8xPxOyUAblIAQnpiR3QXu4wDor47MDTiHbiFcbypdLcLW5w== dependencies: - jest-get-type "^24.9.0" - pretty-format "^24.9.0" + jest-get-type "^25.1.0" + pretty-format "^25.1.0" -jest-matcher-utils@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-24.9.0.tgz#f5b3661d5e628dffe6dd65251dfdae0e87c3a073" - integrity sha512-OZz2IXsu6eaiMAwe67c1T+5tUAtQyQx27/EMEkbFAGiw52tB9em+uGbzpcgYVpA8wl0hlxKPZxrly4CXU/GjHA== +jest-matcher-utils@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-25.1.0.tgz#fa5996c45c7193a3c24e73066fc14acdee020220" + integrity sha512-KGOAFcSFbclXIFE7bS4C53iYobKI20ZWleAdAFun4W1Wz1Kkej8Ng6RRbhL8leaEvIOjGXhGf/a1JjO8bkxIWQ== dependencies: - 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.1.0" + jest-get-type "^25.1.0" + pretty-format "^25.1.0" -jest-message-util@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-24.9.0.tgz#527f54a1e380f5e202a8d1149b0ec872f43119e3" - integrity sha512-oCj8FiZ3U0hTP4aSui87P4L4jC37BtQwUMqk+zk/b11FR19BJDeZsZAvIHutWnmtw7r85UmR3CEWZ0HWU2mAlw== +jest-message-util@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-25.1.0.tgz#702a9a5cb05c144b9aa73f06e17faa219389845e" + integrity sha512-Nr/Iwar2COfN22aCqX0kCVbXgn8IBm9nWf4xwGr5Olv/KZh0CZ32RKgZWMVDXGdOahicM10/fgjdimGNX/ttCQ== dependencies: "@babel/code-frame" "^7.0.0" - "@jest/test-result" "^24.9.0" - "@jest/types" "^24.9.0" + "@jest/test-result" "^25.1.0" + "@jest/types" "^25.1.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@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-24.9.0.tgz#c22835541ee379b908673ad51087a2185c13f1c6" - integrity sha512-3BEYN5WbSq9wd+SyLDES7AHnjH9A/ROBwmz7l2y+ol+NtSFO8DYiEBzoO1CeFc9a8DYy10EO4dDFVv/wN3zl1w== +jest-mock@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-25.1.0.tgz#411d549e1b326b7350b2e97303a64715c28615fd" + integrity sha512-28/u0sqS+42vIfcd1mlcg4ZVDmSUYuNvImP4X2lX5hRMLW+CN0BeiKVD4p+ujKKbSPKd3rg/zuhCF+QBLJ4vag== dependencies: - "@jest/types" "^24.9.0" + "@jest/types" "^25.1.0" jest-pnp-resolver@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.1.tgz#ecdae604c077a7fbc70defb6d517c3c1c898923a" integrity sha512-pgFw2tm54fzgYvc/OHrnysABEObZCUNFnhjoRjaVOCN8NYc032/gVjPaHD4Aq6ApkSieWtfKAFQtmDKAmhupnQ== -jest-regex-util@^24.3.0: - version "24.3.0" - resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-24.3.0.tgz#d5a65f60be1ae3e310d5214a0307581995227b36" - integrity sha512-tXQR1NEOyGlfylyEjg1ImtScwMq8Oh3iJbGTjN7p0J23EuVX1MA8rwU69K4sLbCmwzgCUbVkm0FkSF9TdzOhtg== - -jest-regex-util@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-24.9.0.tgz#c13fb3380bde22bf6575432c493ea8fe37965636" - integrity sha512-05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA== - jest-regex-util@^25.1.0: version "25.1.0" resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-25.1.0.tgz#efaf75914267741838e01de24da07b2192d16d87" integrity sha512-9lShaDmDpqwg+xAd73zHydKrBbbrIi08Kk9YryBEBybQFg/lBWR/2BDjjiSE7KIppM9C5+c03XiDaZ+m4Pgs1w== -jest-resolve-dependencies@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-24.9.0.tgz#ad055198959c4cfba8a4f066c673a3f0786507ab" - integrity sha512-Fm7b6AlWnYhT0BXy4hXpactHIqER7erNgIsIozDXWl5dVm+k8XdGVe1oTg1JyaFnOxarMEbax3wyRJqGP2Pq+g== +jest-resolve-dependencies@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-25.1.0.tgz#8a1789ec64eb6aaa77fd579a1066a783437e70d2" + integrity sha512-Cu/Je38GSsccNy4I2vL12ZnBlD170x2Oh1devzuM9TLH5rrnLW1x51lN8kpZLYTvzx9j+77Y5pqBaTqfdzVzrw== dependencies: - "@jest/types" "^24.9.0" - jest-regex-util "^24.3.0" - jest-snapshot "^24.9.0" + "@jest/types" "^25.1.0" + jest-regex-util "^25.1.0" + jest-snapshot "^25.1.0" -jest-resolve@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-24.9.0.tgz#dff04c7687af34c4dd7e524892d9cf77e5d17321" - integrity sha512-TaLeLVL1l08YFZAt3zaPtjiVvyy4oSA6CRe+0AFPPVX3Q/VI0giIWWoAvoS5L96vj9Dqxj4fB5p2qrHCmTU/MQ== +jest-resolve@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-25.1.0.tgz#23d8b6a4892362baf2662877c66aa241fa2eaea3" + integrity sha512-XkBQaU1SRCHj2Evz2Lu4Czs+uIgJXWypfO57L7JYccmAXv4slXA6hzNblmcRmf7P3cQ1mE7fL3ABV6jAwk4foQ== dependencies: - "@jest/types" "^24.9.0" + "@jest/types" "^25.1.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@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-24.9.0.tgz#574fafdbd54455c2b34b4bdf4365a23857fcdf42" - integrity sha512-KksJQyI3/0mhcfspnxxEOBueGrd5E4vV7ADQLT9ESaCzz02WnbdbKWIf5Mkaucoaj7obQckYPVX6JJhgUcoWWg== +jest-runner@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-25.1.0.tgz#fef433a4d42c89ab0a6b6b268e4a4fbe6b26e812" + integrity sha512-su3O5fy0ehwgt+e8Wy7A8CaxxAOCMzL4gUBftSs0Ip32S0epxyZPDov9Znvkl1nhVOJNf4UwAsnqfc3plfQH9w== dependencies: - "@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.1.0" + "@jest/environment" "^25.1.0" + "@jest/test-result" "^25.1.0" + "@jest/types" "^25.1.0" + chalk "^3.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" + graceful-fs "^4.2.3" + jest-config "^25.1.0" + jest-docblock "^25.1.0" + jest-haste-map "^25.1.0" + jest-jasmine2 "^25.1.0" + jest-leak-detector "^25.1.0" + jest-message-util "^25.1.0" + jest-resolve "^25.1.0" + jest-runtime "^25.1.0" + jest-util "^25.1.0" + jest-worker "^25.1.0" source-map-support "^0.5.6" - throat "^4.0.0" + throat "^5.0.0" -jest-runtime@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-24.9.0.tgz#9f14583af6a4f7314a6a9d9f0226e1a781c8e4ac" - integrity sha512-8oNqgnmF3v2J6PVRM2Jfuj8oX3syKmaynlDMMKQ4iyzbQzIG6th5ub/lM2bCMTmoTKM3ykcUYI2Pw9xwNtjMnw== +jest-runtime@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-25.1.0.tgz#02683218f2f95aad0f2ec1c9cdb28c1dc0ec0314" + integrity sha512-mpPYYEdbExKBIBB16ryF6FLZTc1Rbk9Nx0ryIpIMiDDkOeGa0jQOKVI/QeGvVGlunKKm62ywcioeFVzIbK03bA== dependencies: - "@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.1.0" + "@jest/environment" "^25.1.0" + "@jest/source-map" "^25.1.0" + "@jest/test-result" "^25.1.0" + "@jest/transform" "^25.1.0" + "@jest/types" "^25.1.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" + graceful-fs "^4.2.3" + jest-config "^25.1.0" + jest-haste-map "^25.1.0" + jest-message-util "^25.1.0" + jest-mock "^25.1.0" + jest-regex-util "^25.1.0" + jest-resolve "^25.1.0" + jest-snapshot "^25.1.0" + jest-util "^25.1.0" + jest-validate "^25.1.0" realpath-native "^1.1.0" - slash "^2.0.0" - strip-bom "^3.0.0" - yargs "^13.3.0" - -jest-serializer@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-24.9.0.tgz#e6d7d7ef96d31e8b9079a714754c5d5c58288e73" - integrity sha512-DxYipDr8OvfrKH3Kel6NdED3OXxjvxXZ1uIY2I9OFbGg+vUkkg7AGvi65qbhbWNPvDckXmzMPbK3u3HaDO49bQ== + slash "^3.0.0" + strip-bom "^4.0.0" + yargs "^15.0.0" jest-serializer@^25.1.0: version "25.1.0" resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-25.1.0.tgz#73096ba90e07d19dec4a0c1dd89c355e2f129e5d" integrity sha512-20Wkq5j7o84kssBwvyuJ7Xhn7hdPeTXndnwIblKDR2/sy1SUm6rWWiG9kSCgJPIfkDScJCIsTtOKdlzfIHOfKA== -jest-snapshot@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-24.9.0.tgz#ec8e9ca4f2ec0c5c87ae8f925cf97497b0e951ba" - integrity sha512-uI/rszGSs73xCM0l+up7O7a40o90cnrk429LOiK3aeTvfC0HHmldbd81/B7Ix81KSFe1lwkbl7GnBGG4UfuDew== +jest-snapshot@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-25.1.0.tgz#d5880bd4b31faea100454608e15f8d77b9d221d9" + integrity sha512-xZ73dFYN8b/+X2hKLXz4VpBZGIAn7muD/DAg+pXtDzDGw3iIV10jM7WiHqhCcpDZfGiKEj7/2HXAEPtHTj0P2A== dependencies: "@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" + "@jest/types" "^25.1.0" + chalk "^3.0.0" + expect "^25.1.0" + jest-diff "^25.1.0" + jest-get-type "^25.1.0" + jest-matcher-utils "^25.1.0" + jest-message-util "^25.1.0" + jest-resolve "^25.1.0" mkdirp "^0.5.1" natural-compare "^1.4.0" - pretty-format "^24.9.0" - semver "^6.2.0" - -jest-util@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-24.9.0.tgz#7396814e48536d2e85a37de3e4c431d7cb140162" - integrity sha512-x+cZU8VRmOJxbA1K5oDBdxQmdq0OIdADarLxk0Mq+3XS4jgvhG/oKGWcIDCtPG0HgjxOYvF+ilPJQsAyXfbNOg== - dependencies: - "@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" + pretty-format "^25.1.0" + semver "^7.1.1" jest-util@^25.1.0: version "25.1.0" @@ -10587,38 +10489,29 @@ jest-util@^25.1.0: is-ci "^2.0.0" mkdirp "^0.5.1" -jest-validate@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-24.9.0.tgz#0775c55360d173cd854e40180756d4ff52def8ab" - integrity sha512-HPIt6C5ACwiqSiwi+OfSSHbK8sG7akG8eATl+IPKaeIjtPOeBUd/g3J7DghugzxrGjI93qS/+RPKe1H6PqvhRQ== +jest-validate@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-25.1.0.tgz#1469fa19f627bb0a9a98e289f3e9ab6a668c732a" + integrity sha512-kGbZq1f02/zVO2+t1KQGSVoCTERc5XeObLwITqC6BTRH3Adv7NZdYqCpKIZLUgpLXf2yISzQ465qOZpul8abXA== dependencies: - "@jest/types" "^24.9.0" + "@jest/types" "^25.1.0" camelcase "^5.3.1" - chalk "^2.0.1" - jest-get-type "^24.9.0" + chalk "^3.0.0" + jest-get-type "^25.1.0" leven "^3.1.0" - pretty-format "^24.9.0" + pretty-format "^25.1.0" -jest-watcher@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-24.9.0.tgz#4b56e5d1ceff005f5b88e528dc9afc8dd4ed2b3b" - integrity sha512-+/fLOfKPXXYJDYlks62/4R4GoT+GU1tYZed99JSCOsmzkkF7727RqKrjNAxtfO4YpGv11wybgRvCjR73lK2GZw== +jest-watcher@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-25.1.0.tgz#97cb4a937f676f64c9fad2d07b824c56808e9806" + integrity sha512-Q9eZ7pyaIr6xfU24OeTg4z1fUqBF/4MP6J801lyQfg7CsnZ/TCzAPvCfckKdL5dlBBEKBeHV0AdyjFZ5eWj4ig== dependencies: - "@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-worker@^24.6.0: - version "24.6.0" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-24.6.0.tgz#7f81ceae34b7cde0c9827a6980c35b7cdc0161b3" - integrity sha512-jDwgW5W9qGNvpI1tNnvajh0a5IE/PuGLFmHk6aR/BZFz8tSgGw17GsDPXAJ6p91IvYDjOw8GpFbvvZGAK+DPQQ== - dependencies: - merge-stream "^1.0.1" - supports-color "^6.1.0" + "@jest/test-result" "^25.1.0" + "@jest/types" "^25.1.0" + ansi-escapes "^4.2.1" + chalk "^3.0.0" + jest-util "^25.1.0" + string-length "^3.1.0" jest-worker@^24.9.0: version "24.9.0" @@ -10636,13 +10529,14 @@ jest-worker@^25.1.0: merge-stream "^2.0.0" supports-color "^7.0.0" -jest@~24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest/-/jest-24.9.0.tgz#987d290c05a08b52c56188c1002e368edb007171" - integrity sha512-YvkBL1Zm7d2B1+h5fHEOdyjCG+sGMz4f8D86/0HiqJ6MB4MnDc8FgP5vdWsGnemOQro7lnYo8UakZ3+5A0jxGw== +jest@~25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/jest/-/jest-25.1.0.tgz#b85ef1ddba2fdb00d295deebbd13567106d35be9" + integrity sha512-FV6jEruneBhokkt9MQk0WUFoNTwnF76CLXtwNMfsc0um0TlB/LG2yxUd0KqaFjEJ9laQmVWQWS0sG/t2GsuI0w== dependencies: - import-local "^2.0.0" - jest-cli "^24.9.0" + "@jest/core" "^25.1.0" + import-local "^3.0.2" + jest-cli "^25.1.0" jimp-compact@^0.8.0: version "0.8.4" @@ -10743,6 +10637,38 @@ jsdom@^11.5.1: ws "^5.2.0" xml-name-validator "^3.0.0" +jsdom@^15.1.1: + version "15.2.1" + resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-15.2.1.tgz#d2feb1aef7183f86be521b8c6833ff5296d07ec5" + integrity sha512-fAl1W0/7T2G5vURSyxBzrJ1LSdQn6Tr5UX/xD4PXDx/PDgwygedfW6El/KIj3xJ7FU61TTYnc/l/B7P49Eqt6g== + dependencies: + 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" + jsesc@^2.5.1: version "2.5.2" resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" @@ -11079,16 +11005,6 @@ load-json-file@^2.0.0: pify "^2.0.0" strip-bom "^3.0.0" -load-json-file@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b" - integrity sha1-L19Fq5HjMhYjT9U62rZo607AmTs= - dependencies: - graceful-fs "^4.1.2" - parse-json "^4.0.0" - pify "^3.0.0" - strip-bom "^3.0.0" - load-json-file@^5.2.0: version "5.3.0" resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-5.3.0.tgz#4d3c1e01fa1c03ea78a60ac7af932c9ce53403f3" @@ -11338,6 +11254,13 @@ log-update@^2.3.0: cli-cursor "^2.0.0" wrap-ansi "^3.0.1" +lolex@^5.0.0: + version "5.1.2" + resolved "https://registry.yarnpkg.com/lolex/-/lolex-5.1.2.tgz#953694d098ce7c07bc5ed6d0e42bc6c0c6d5a367" + integrity sha512-h4hmjAvHTmd+25JSwrtTIuwbKdwg5NzZVRMLn9saij4SZaepCrTCxPr35H/3bjwfMJtN+t3CX8672UIkglz28A== + dependencies: + "@sinonjs/commons" "^1.7.0" + long@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28" @@ -11431,7 +11354,7 @@ make-dir@^1.0.0: dependencies: pify "^3.0.0" -make-dir@^2.0.0, make-dir@^2.1.0: +make-dir@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5" integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA== @@ -11573,13 +11496,6 @@ merge-source-map@^1.1.0: dependencies: source-map "^0.6.1" -merge-stream@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-1.0.1.tgz#4041202d508a342ba00174008df0c251b8c135e1" - integrity sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE= - dependencies: - readable-stream "^2.0.1" - merge-stream@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" @@ -11721,11 +11637,6 @@ minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0: resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ= -minimist@~0.0.1: - version "0.0.10" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf" - integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8= - minipass-collect@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617" @@ -12043,16 +11954,16 @@ node-modules-regexp@^1.0.0: resolved "https://registry.yarnpkg.com/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz#8d9dbe28964a4ac5712e9131642107c71e90ec40" integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA= -node-notifier@^5.4.2: - version "5.4.3" - resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-5.4.3.tgz#cb72daf94c93904098e28b9c590fd866e464bd50" - integrity sha512-M4UBGcs4jeOK9CjTsYwkvH6/MzuUmGCyTW+kCY7uO+1ZVr0+FHGdPdIf5CCLqAaxnRrWidyoQlNkMIIVwbKB8Q== +node-notifier@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-6.0.0.tgz#cea319e06baa16deec8ce5cd7f133c4a46b68e12" + integrity sha512-SVfQ/wMw+DesunOm5cKqr6yDcvUTDl/yc97ybGHMrteNEY6oekXpNpS3lZwgLlwz0FLgHoiW28ZpmBHUDg37cw== dependencies: growly "^1.3.0" - is-wsl "^1.1.0" - semver "^5.5.0" + is-wsl "^2.1.1" + semver "^6.3.0" shellwords "^0.1.1" - which "^1.3.0" + which "^1.3.1" node-object-hash@^1.2.0: version "1.4.2" @@ -12294,6 +12205,11 @@ nwsapi@^2.0.7: resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.1.4.tgz#e006a878db23636f8e8a67d33ca0e4edf61a842f" integrity sha512-iGfd9Y6SFdTNldEy2L0GUhcarIutFmk+MPWIn9dmj8NMIup03G08uUF2KGbbmv/Ux4RT0VZJoP/sVbWA6d/VIw== +nwsapi@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7" + integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ== + oauth-sign@~0.9.0: version "0.9.0" resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" @@ -12478,14 +12394,6 @@ optimism@^0.10.0: dependencies: "@wry/context" "^0.4.0" -optimist@^0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686" - integrity sha1-2j6nRob6IaGaERwybpDrFaAZZoY= - dependencies: - minimist "~0.0.1" - wordwrap "~0.0.2" - optimize-css-assets-webpack-plugin@^5.0.3: version "5.0.3" resolved "https://registry.yarnpkg.com/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-5.0.3.tgz#e2f1d4d94ad8c0af8967ebd7cf138dcb1ef14572" @@ -12568,12 +12476,10 @@ osenv@0, osenv@^0.1.4: os-homedir "^1.0.0" os-tmpdir "^1.0.0" -p-each-series@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/p-each-series/-/p-each-series-1.0.0.tgz#930f3d12dd1f50e7434457a22cd6f04ac6ad7f71" - integrity sha1-kw89Et0fUOdDRFeiLNbwSsatf3E= - dependencies: - p-reduce "^1.0.0" +p-each-series@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/p-each-series/-/p-each-series-2.1.0.tgz#961c8dd3f195ea96c747e636b262b800a6b1af48" + integrity sha512-ZuRs1miPT4HrjFa+9fRfOFXxGJfORgelKV9f9nNOWw2gl6gVsRaVDOQP0+MI0G0wGKns1Yacsu0GjOFbTK0JFQ== p-finally@^1.0.0: version "1.0.0" @@ -12632,11 +12538,6 @@ p-map@^3.0.0: dependencies: aggregate-error "^3.0.0" -p-reduce@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/p-reduce/-/p-reduce-1.0.0.tgz#18c2b0dd936a4690a529f8231f58a0fdb6a47dfa" - integrity sha1-GMKw3ZNqRpClKfgjH1ig/bakffo= - p-try@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3" @@ -12757,6 +12658,11 @@ parse5@4.0.0: resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608" integrity sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA== +parse5@5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.0.tgz#c59341c9723f414c452975564c7c00a68d58acd2" + integrity sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ== + parse5@^3.0.1: version "3.0.3" resolved "https://registry.yarnpkg.com/parse5/-/parse5-3.0.3.tgz#042f792ffdd36851551cf4e9e066b3874ab45b5c" @@ -12976,7 +12882,7 @@ pkg-dir@^3.0.0: dependencies: find-up "^3.0.0" -pkg-dir@^4.1.0: +pkg-dir@^4.1.0, pkg-dir@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ== @@ -13710,15 +13616,15 @@ pretty-error@^2.0.2, pretty-error@^2.1.1: renderkid "^2.0.1" utila "~0.4" -pretty-format@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-24.9.0.tgz#12fac31b37019a4eea3c11aa9a959eb7628aa7c9" - integrity sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA== +pretty-format@^25.1.0: + version "25.1.0" + resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-25.1.0.tgz#ed869bdaec1356fc5ae45de045e2c8ec7b07b0c8" + integrity sha512-46zLRSGLd02Rp+Lhad9zzuNZ+swunitn8zIpfD2B4OPCRLXbM87RJT2aBLBWYOznNUML/2l/ReMyWNC80PJBUQ== dependencies: - "@jest/types" "^24.9.0" - ansi-regex "^4.0.0" - ansi-styles "^3.2.0" - react-is "^16.8.4" + "@jest/types" "^25.1.0" + ansi-regex "^5.0.0" + ansi-styles "^4.0.0" + react-is "^16.12.0" pretty-hrtime@^1.0.3: version "1.0.3" @@ -14293,7 +14199,12 @@ react-inspector@^4.0.0: prop-types "^15.6.1" storybook-chromatic "^2.2.2" -react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.4, react-is@^16.8.6: +react-is@^16.12.0: + version "16.12.0" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.12.0.tgz#2cc0fe0fba742d97fd527c42a13bec4eeb06241c" + integrity sha512-rPCkf/mWBtKc97aLL9/txD8DZdemK0vkA3JMLShjlJB3Pj3s+lpf1KaBzMfQrAmhMQB0n1cU/SUGgKKBCe837Q== + +react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.6: version "16.8.6" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.6.tgz#5bbc1e2d29141c9fbdfed456343fe2bc430a6a16" integrity sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA== @@ -14415,14 +14326,6 @@ read-pkg-up@^2.0.0: find-up "^2.0.0" read-pkg "^2.0.0" -read-pkg-up@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-4.0.0.tgz#1b221c6088ba7799601c808f91161c66e58f8978" - integrity sha512-6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA== - dependencies: - find-up "^3.0.0" - read-pkg "^3.0.0" - read-pkg@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28" @@ -14441,15 +14344,6 @@ read-pkg@^2.0.0: normalize-package-data "^2.3.2" path-type "^2.0.0" -read-pkg@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389" - integrity sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k= - dependencies: - load-json-file "^4.0.0" - normalize-package-data "^2.3.2" - path-type "^3.0.0" - "readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6: version "2.3.6" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf" @@ -14700,7 +14594,7 @@ request-promise-core@1.1.3: dependencies: lodash "^4.17.15" -request-promise-native@^1.0.5, request-promise-native@^1.0.8: +request-promise-native@^1.0.5, request-promise-native@^1.0.7, request-promise-native@^1.0.8: version "1.0.8" resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.8.tgz#a455b960b826e44e2bf8999af64dff2bfe58cb36" integrity sha512-dapwLGqkHtwL5AEbfenuzjTYg35Jd6KPytsC2/TLkVMz8rm+tNt72MGUWT1RP/aYawMpN6HqbNGBQaRcBtjQMQ== @@ -14765,12 +14659,12 @@ resize-observer-polyfill@^1.5.1: resolved "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464" integrity sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg== -resolve-cwd@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a" - integrity sha1-AKn3OHVW4nA46uIyyqNypqWbZlo= +resolve-cwd@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d" + integrity sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg== dependencies: - resolve-from "^3.0.0" + resolve-from "^5.0.0" resolve-from@^3.0.0: version "3.0.0" @@ -14859,6 +14753,13 @@ rimraf@^2.7.1: dependencies: glob "^7.1.3" +rimraf@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.0.tgz#614176d4b3010b75e5c390eb0ee96f6dc0cebb9b" + integrity sha512-NDGVxTsjqfunkds7CqsOiEnxln4Bo7Nddl3XhS4pXg5OzwkLqJ971ZVAAnB+DDLnF76N+VnDEiBHaVV8I06SUg== + dependencies: + glob "^7.1.3" + ripemd160@^2.0.0, ripemd160@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c" @@ -14994,6 +14895,13 @@ sax@>=0.6.0, sax@^1.2.4, sax@~1.2.4: resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== +saxes@^3.1.9: + version "3.1.11" + resolved "https://registry.yarnpkg.com/saxes/-/saxes-3.1.11.tgz#d59d1fd332ec92ad98a2e0b2ee644702384b1c5b" + integrity sha512-Ydydq3zC+WYDJK1+gRxRapLIED9PWeSuuS41wqyoRmzvhhh9nc+QQrVMKJYzJFULazeGhzSV0QleN2wD3boh2g== + dependencies: + xmlchars "^2.1.1" + scheduler@^0.13.6: version "0.13.6" resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.13.6.tgz#466a4ec332467b31a91b9bf74e5347072e4cd889" @@ -15059,7 +14967,7 @@ semver@^6.0.0, semver@^6.1.0, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== -semver@^7.1.0: +semver@^7.1.0, semver@^7.1.1: version "7.1.1" resolved "https://registry.yarnpkg.com/semver/-/semver-7.1.1.tgz#29104598a197d6cbe4733eeecbe968f7b43a9667" integrity sha512-WfuG+fl6eh3eZ2qAf6goB7nhiCd7NPXhmyFxigB/TOkQyeLP8w8GsVehvtGNtnNmyboz4TgeK40B1Kbql/8c5A== @@ -15309,11 +15217,6 @@ slash@^1.0.0: resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55" integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU= -slash@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44" - integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A== - slash@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" @@ -15693,6 +15596,11 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1: resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== +source-map@^0.7.3: + version "0.7.3" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" + integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ== + space-separated-tokens@^1.0.0: version "1.1.4" resolved "https://registry.yarnpkg.com/space-separated-tokens/-/space-separated-tokens-1.1.4.tgz#27910835ae00d0adfcdbd0ad7e611fb9544351fa" @@ -15934,13 +15842,13 @@ strict-uri-encode@^1.0.0: resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713" integrity sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM= -string-length@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/string-length/-/string-length-2.0.0.tgz#d40dbb686a3ace960c1cffca562bf2c45f8363ed" - integrity sha1-1A27aGo6zpYMHP/KVivyxF+DY+0= +string-length@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/string-length/-/string-length-3.1.0.tgz#107ef8c23456e187a8abd4a61162ff4ac6e25837" + integrity sha512-Ttp5YvkGm5v9Ijagtaz1BnN+k9ObpvS0eIBblPMp2YWL8FBmi9qblQ9fexc2k/CXFgrTIteU3jAw3payCnwSTA== dependencies: astral-regex "^1.0.0" - strip-ansi "^4.0.0" + strip-ansi "^5.2.0" string-width@^1.0.1, string-width@^1.0.2: version "1.0.2" @@ -15977,6 +15885,15 @@ string-width@^4.0.0, string-width@^4.1.0: is-fullwidth-code-point "^3.0.0" strip-ansi "^5.2.0" +string-width@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5" + integrity sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.0" + "string.prototype.matchall@^4.0.0 || ^3.0.1": version "4.0.2" resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.2.tgz#48bb510326fb9fdeb6a33ceaa81a6ea04ef7648e" @@ -16077,6 +15994,11 @@ strip-bom@^3.0.0: resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM= +strip-bom@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-4.0.0.tgz#9c3505c1db45bcedca3d9cf7a16f5c5aa3901878" + integrity sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w== + strip-color@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/strip-color/-/strip-color-0.1.0.tgz#106f65d3d3e6a2d9401cac0eb0ce8b8a702b4f7b" @@ -16189,6 +16111,14 @@ supports-hyperlinks@^1.0.1: has-flag "^2.0.0" supports-color "^5.0.0" +supports-hyperlinks@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.0.0.tgz#b1b94a159e9df00b0a554b2d5f0e0a89690334b0" + integrity sha512-bFhn0MQ8qefLyJ3K7PpHiPUTuTVPWw6RXfaMeV6xgJLXtBbszyboz1bvGTVv4R0YpQm2DqlXXn0fFHhxUHVE5w== + dependencies: + has-flag "^4.0.0" + supports-color "^7.0.0" + svg-tags@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/svg-tags/-/svg-tags-1.0.0.tgz#58f71cee3bd519b59d4b2a843b6c7de64ac04764" @@ -16355,6 +16285,14 @@ term-size@^2.1.0: resolved "https://registry.yarnpkg.com/term-size/-/term-size-2.1.0.tgz#3aec444c07a7cf936e157c1dc224b590c3c7eef2" integrity sha512-I42EWhJ+2aeNQawGx1VtpO0DFI9YcfuvAMNIdKyf/6sRbHJ4P+ZQ/zIT87tE+ln1ymAGcCJds4dolfSAS0AcNg== +terminal-link@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/terminal-link/-/terminal-link-2.1.1.tgz#14a64a27ab3c0df933ea546fba55f2d078edc994" + integrity sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ== + dependencies: + ansi-escapes "^4.2.1" + supports-hyperlinks "^2.0.0" + terser-webpack-plugin@^1.4.3: version "1.4.3" resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz#5ecaf2dbdc5fb99745fd06791f46fc9ddb1c9a7c" @@ -16402,16 +16340,6 @@ terser@^4.4.3: source-map "~0.6.1" source-map-support "~0.5.12" -test-exclude@^5.2.3: - version "5.2.3" - resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-5.2.3.tgz#c3d3e1e311eb7ee405e092dac10aefd09091eac0" - integrity sha512-M+oxtseCFO3EDtAaGH7iiej3CBkzXqFMbzqYAACdzKui4eZA+pq3tZEwChvOdNfa7xxy8BfbmgJSIr43cC/+2g== - dependencies: - glob "^7.1.3" - minimatch "^3.0.4" - read-pkg-up "^4.0.0" - require-main-filename "^2.0.0" - test-exclude@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e" @@ -16442,10 +16370,10 @@ thread-loader@^2.1.3: loader-utils "^1.1.0" neo-async "^2.6.0" -throat@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/throat/-/throat-4.1.0.tgz#89037cbc92c56ab18926e6ba4cbb200e15672a6a" - integrity sha1-iQN8vJLFarGJJua6TLsgDhVnKmo= +throat@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/throat/-/throat-5.0.0.tgz#c5199235803aad18754a667d659b5e72ce16764b" + integrity sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA== throttle-debounce@^2.1.0: version "2.1.0" @@ -16665,6 +16593,15 @@ tough-cookie@^2.3.3, tough-cookie@^2.3.4: psl "^1.1.28" punycode "^2.1.1" +tough-cookie@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-3.0.1.tgz#9df4f57e739c26930a018184887f4adb7dca73b2" + integrity sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg== + dependencies: + ip-regex "^2.1.0" + psl "^1.1.28" + punycode "^2.1.1" + tough-cookie@~2.4.3: version "2.4.3" resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781" @@ -16814,6 +16751,11 @@ type-check@~0.3.2: dependencies: prelude-ls "~1.1.2" +type-detect@4.0.8: + version "4.0.8" + resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c" + integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g== + type-fest@^0.3.0: version "0.3.1" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.3.1.tgz#63d00d204e059474fe5e1b7c011112bbd1dc29e1" @@ -16877,14 +16819,6 @@ uglify-js@3.4.x: commander "~2.19.0" source-map "~0.6.1" -uglify-js@^3.1.4: - version "3.7.2" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.7.2.tgz#cb1a601e67536e9ed094a92dd1e333459643d3f9" - integrity sha512-uhRwZcANNWVLrxLfNFEdltoPNhECUR3lc+UdJoG9CBpMcSnKyWA94tc3eAujB1GcMY5Uwq8ZMp4qWpxWYDQmaA== - dependencies: - commander "~2.20.3" - source-map "~0.6.1" - uglify-js@^3.5.1: version "3.5.11" resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.5.11.tgz#833442c0aa29b3a7d34344c7c63adaa3f3504f6a" @@ -17172,6 +17106,15 @@ v8-compile-cache@^2.0.3: resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz#e14de37b31a6d194f5690d67efc4e7f6fc6ab30e" integrity sha512-usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g== +v8-to-istanbul@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-4.0.1.tgz#d6a2a3823b8ff49bdf2167ff2a45d82dff81d02f" + integrity sha512-x0yZvZAkjJwdD3fPiJzYP37aod0ati4LlmD2RmpKjqewjKAov/u/ytZ8ViIZb07cN4cePKzl9ijiUi7C1LQ8hQ== + dependencies: + "@types/istanbul-lib-coverage" "^2.0.1" + convert-source-map "^1.6.0" + source-map "^0.7.3" + validate-npm-package-license@^3.0.1: version "3.0.4" resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a" @@ -17472,6 +17415,15 @@ w3c-keyname@^2.2.0: resolved "https://registry.yarnpkg.com/w3c-keyname/-/w3c-keyname-2.2.1.tgz#c4fe1a4b9e303c95e833b3d854b7d81070400db9" integrity sha512-j5k4xGK6k8TCna/08778KUEL98WvTogiG/TN/YStl8GNeXg5tI3Dvq3+JjwJhP4l7ogs6KWo1VYEdc1Qaioy3Q== +w3c-xmlserializer@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-1.1.2.tgz#30485ca7d70a6fd052420a3d12fd90e6339ce794" + integrity sha512-p10l/ayESzrBMYWRID6xbuCKh2Fp77+sA0doRuGn4tTIMrrZVeqfpKjXHY+oDh3K4nLdPgNwMTVP6Vp4pvqbNg== + dependencies: + domexception "^1.0.1" + webidl-conversions "^4.0.2" + xml-name-validator "^3.0.0" + walker@^1.0.7, walker@~1.0.5: version "1.0.7" resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb" @@ -17674,7 +17626,7 @@ websocket-extensions@>=0.1.1: resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29" integrity sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg== -whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.3: +whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.3, whatwg-encoding@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0" integrity sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw== @@ -17686,7 +17638,7 @@ whatwg-fetch@3.0.0, whatwg-fetch@>=0.10.0: resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz#fc804e458cc460009b1a2b966bc8817d2578aefb" integrity sha512-9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q== -whatwg-mimetype@^2.1.0, whatwg-mimetype@^2.2.0: +whatwg-mimetype@^2.1.0, whatwg-mimetype@^2.2.0, whatwg-mimetype@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf" integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g== @@ -17719,7 +17671,7 @@ which-module@^2.0.0: resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho= -which@1, which@^1.2.9, which@^1.3.0, which@^1.3.1: +which@1, which@^1.2.9, which@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== @@ -17764,11 +17716,6 @@ word-wrap@~1.2.3: resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== -wordwrap@~0.0.2: - version "0.0.3" - resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107" - integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc= - workbox-cdn@^4.3.1: version "4.3.1" resolved "https://registry.yarnpkg.com/workbox-cdn/-/workbox-cdn-4.3.1.tgz#f1ffed5368c20291048498ba0744baf27dbd7294" @@ -17845,15 +17792,6 @@ wrappy@1: resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= -write-file-atomic@2.4.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.1.tgz#d0b05463c188ae804396fd5ab2a370062af87529" - integrity sha512-TGHFeZEZMnv+gBFRfjAcxL5bPHrsGKtnb4qsFAws7/vlh+QfwAaySIw4AXP9ZskTTh5GWu3FLuJhsWVdiJPGvg== - dependencies: - graceful-fs "^4.1.11" - imurmurhash "^0.1.4" - signal-exit "^3.0.2" - write-file-atomic@^2.0.0: version "2.4.2" resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.2.tgz#a7181706dfba17855d221140a9c06e15fcdd87b9" @@ -17906,6 +17844,11 @@ ws@^6.0.0: dependencies: async-limiter "~1.0.0" +ws@^7.0.0: + version "7.2.1" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.2.1.tgz#03ed52423cd744084b2cf42ed197c8b65a936b8e" + integrity sha512-sucePNSafamSKoOqoNfBd8V0StlkzJKL2ZAhGQinCfNQ+oacw+Pk7lcdAElecBF2VkLNZRiIb5Oi1Q5lVUVt2A== + xdg-basedir@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz#496b2cc109eca8dbacfe2dc72b603c17c5870ad4" @@ -17943,6 +17886,11 @@ xmlbuilder@~9.0.1: resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d" integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0= +xmlchars@^2.1.1: + version "2.2.0" + resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb" + integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw== + xregexp@^4.2.4: version "4.2.4" resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.2.4.tgz#02a4aea056d65a42632c02f0233eab8e4d7e57ed" @@ -17999,10 +17947,10 @@ yaml@^1.7.2: dependencies: "@babel/runtime" "^7.6.3" -yargs-parser@^13.1.1: - version "13.1.1" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.1.tgz#d26058532aa06d365fe091f6a1fc06b2f7e5eca0" - integrity sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ== +yargs-parser@^16.1.0: + version "16.1.0" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-16.1.0.tgz#73747d53ae187e7b8dbe333f95714c76ea00ecf1" + integrity sha512-H/V41UNZQPkUMIT5h5hiwg4QKIY1RPvoBV4XcjUbRM8Bk2oKqqyZ0DIEbTFZB0XjbtSPG8SAa/0DxCQmiRgzKg== dependencies: camelcase "^5.0.0" decamelize "^1.2.0" @@ -18040,21 +17988,22 @@ yargs@6.6.0: y18n "^3.2.1" yargs-parser "^4.2.0" -yargs@^13.3.0: - version "13.3.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.0.tgz#4c657a55e07e5f2cf947f8a366567c04a0dedc83" - integrity sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA== +yargs@^15.0.0: + version "15.1.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.1.0.tgz#e111381f5830e863a89550bd4b136bb6a5f37219" + integrity sha512-T39FNN1b6hCW4SOIk1XyTOWxtXdcen0t+XYrysQmChzSipvhBO8Bj0nK1ozAasdk24dNWuMZvr4k24nz+8HHLg== dependencies: - 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 "^16.1.0" yargs@^3.19.0: version "3.32.0" From 0392826211a1229cebf49d05d1be069c949f778e Mon Sep 17 00:00:00 2001 From: Alina Beck Date: Wed, 22 Jan 2020 18:05:00 +0300 Subject: [PATCH 20/67] set avatar size to small in AvatarMenu and for Anonymous users --- webapp/components/AvatarMenu/AvatarMenu.vue | 6 +++++- webapp/components/UserTeaser/UserTeaser.vue | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/webapp/components/AvatarMenu/AvatarMenu.vue b/webapp/components/AvatarMenu/AvatarMenu.vue index 97b937a88..f65c6f6cf 100644 --- a/webapp/components/AvatarMenu/AvatarMenu.vue +++ b/webapp/components/AvatarMenu/AvatarMenu.vue @@ -11,7 +11,7 @@ " @click.prevent="toggleMenu" > - + @@ -127,6 +127,10 @@ export default { display: flex; align-items: center; padding-left: $space-xx-small; + + > .user-avatar { + margin-right: $space-xx-small; + } } .avatar-menu-popover { padding-top: $space-x-small; diff --git a/webapp/components/UserTeaser/UserTeaser.vue b/webapp/components/UserTeaser/UserTeaser.vue index 9d1b22fd9..2057a8fcd 100644 --- a/webapp/components/UserTeaser/UserTeaser.vue +++ b/webapp/components/UserTeaser/UserTeaser.vue @@ -1,6 +1,6 @@ From b6f6cb4be876d586495c4ad49200d1d297d025af Mon Sep 17 00:00:00 2001 From: roschaefer Date: Tue, 28 Jan 2020 22:28:05 +0100 Subject: [PATCH 62/67] docs(CONTRIBUTING): Use @mattwr18's wording --- CONTRIBUTING.md | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c201ff5ea..ae1150aa6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -115,11 +115,10 @@ compensation for your contribution! :tada: Before you can benefit from the Open-Source bounty program you **must get one pull request approved and merged for free**. You can choose something really -quick and easy, e.g. a fixing a typo in our [documentation](https://docs.human-connection.org/human-connection/) -would be enough. But getting at least one pull request merged will make you get -in touch with the team, learn the workflow and understand this contribution -guide. Please join our our [community chat](https://human-connection.org/discord), -too. +quick and easy. What's important is starting a working relationship with the +team, learning the workflow, and understanding this contribution guide. You can +filter issues by 'good first issue', to get an idea where to start. Please join +our our [community chat](https://human-connection.org/discord), too. You can filter Github issues with label [bounty](https://github.com/Human-Connection/Human-Connection/issues?q=is%3Aopen+is%3Aissue+label%3Abounty). These issues should have a second label `€` which indicate their respective financial compensation in Euros. From cc6daa9bb9dd44a58e4d26a5339ea5a26ba3d801 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 29 Jan 2020 04:19:42 +0000 Subject: [PATCH 63/67] build(deps-dev): bump eslint-config-prettier in /backend Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 6.9.0 to 6.10.0. - [Release notes](https://github.com/prettier/eslint-config-prettier/releases) - [Changelog](https://github.com/prettier/eslint-config-prettier/blob/master/CHANGELOG.md) - [Commits](https://github.com/prettier/eslint-config-prettier/compare/v6.9.0...v6.10.0) Signed-off-by: dependabot-preview[bot] --- backend/package.json | 2 +- backend/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/backend/package.json b/backend/package.json index e9e0f44a3..dd917ef11 100644 --- a/backend/package.json +++ b/backend/package.json @@ -116,7 +116,7 @@ "chai": "~4.2.0", "cucumber": "~6.0.5", "eslint": "~6.8.0", - "eslint-config-prettier": "~6.9.0", + "eslint-config-prettier": "~6.10.0", "eslint-config-standard": "~14.1.0", "eslint-plugin-import": "~2.20.0", "eslint-plugin-jest": "~23.6.0", diff --git a/backend/yarn.lock b/backend/yarn.lock index 8f4cfc9a2..8f7fbe865 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -3589,10 +3589,10 @@ escodegen@^1.11.1: optionalDependencies: source-map "~0.6.1" -eslint-config-prettier@~6.9.0: - version "6.9.0" - resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.9.0.tgz#430d24822e82f7deb1e22a435bfa3999fae4ad64" - integrity sha512-k4E14HBtcLv0uqThaI6I/n1LEqROp8XaPu6SO9Z32u5NlGRC07Enu1Bh2KEFw4FNHbekH8yzbIU9kUGxbiGmCA== +eslint-config-prettier@~6.10.0: + version "6.10.0" + resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.10.0.tgz#7b15e303bf9c956875c948f6b21500e48ded6a7f" + integrity sha512-AtndijGte1rPILInUdHjvKEGbIV06NuvPrqlIEaEaWtbtvJh464mDeyGMdZEQMsGvC0ZVkiex1fSNcC4HAbRGg== dependencies: get-stdin "^6.0.0" From 4b0adf3eebf1b46e0f652ef2fc237c8037c3c42b Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 29 Jan 2020 04:20:19 +0000 Subject: [PATCH 64/67] build(deps): bump graphql-shield from 7.0.8 to 7.0.9 in /backend Bumps [graphql-shield](https://github.com/maticzav/graphql-shield) from 7.0.8 to 7.0.9. - [Release notes](https://github.com/maticzav/graphql-shield/releases) - [Commits](https://github.com/maticzav/graphql-shield/compare/v7.0.8...v7.0.9) Signed-off-by: dependabot-preview[bot] --- backend/package.json | 2 +- backend/yarn.lock | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/backend/package.json b/backend/package.json index e9e0f44a3..a5a46ec49 100644 --- a/backend/package.json +++ b/backend/package.json @@ -60,7 +60,7 @@ "graphql-iso-date": "~3.6.1", "graphql-middleware": "~4.0.2", "graphql-middleware-sentry": "^3.2.1", - "graphql-shield": "~7.0.8", + "graphql-shield": "~7.0.9", "graphql-tag": "~2.10.1", "helmet": "~3.21.2", "jsonwebtoken": "~8.5.1", diff --git a/backend/yarn.lock b/backend/yarn.lock index 8f4cfc9a2..17d06b24c 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -1607,10 +1607,10 @@ dependencies: "@types/yargs-parser" "*" -"@types/yup@0.26.28": - version "0.26.28" - resolved "https://registry.yarnpkg.com/@types/yup/-/yup-0.26.28.tgz#6b8a98fb56ddb5c8a3a7f60996165221671c1ca1" - integrity sha512-DiT584YBKBENDzgk50LwiJLLOh+XgHpiy9p8PwSoOY696LpfrJRIeJ2AoBCG9KyjE8gWL4J64xDZgw15itecag== +"@types/yup@0.26.29": + version "0.26.29" + resolved "https://registry.yarnpkg.com/@types/yup/-/yup-0.26.29.tgz#5a533ad6f74e442436698e20b1441c68a7a1c931" + integrity sha512-M81oZOgLap0b0I/BySnpLwHjOj1BFxUKV1ytG2Kqj3jmkh8F3H11PEnk658UniftpjTXdueloOL+KZYn+SMQ9w== "@types/zen-observable@^0.8.0": version "0.8.0" @@ -4476,12 +4476,12 @@ graphql-middleware@~4.0.2: dependencies: graphql-tools "^4.0.5" -graphql-shield@~7.0.8: - version "7.0.8" - resolved "https://registry.yarnpkg.com/graphql-shield/-/graphql-shield-7.0.8.tgz#5ade058610e1b247b0762cb2424d121e9a5f5b46" - integrity sha512-KxYMhoiv5lsHcO0HZDhYjjWLbwzreDCmqmnkLRsLNY+6P0q81KSowoNVPuoAsItkjr9m5Fa6IDObOVxSTSt5Lw== +graphql-shield@~7.0.9: + version "7.0.9" + resolved "https://registry.yarnpkg.com/graphql-shield/-/graphql-shield-7.0.9.tgz#8248916e9636a7e3c05719a52fd13f2d37ccaeb2" + integrity sha512-2Dfddd2hcObCSqAj64c/Aaxvs7gaoD2QU14crj7H486QjS8jIAtEPUyLVyv8SmJ1ZD7jT6wqx6wrB15Npn5Sgw== dependencies: - "@types/yup" "0.26.28" + "@types/yup" "0.26.29" object-hash "^2.0.0" yup "^0.28.0" From 277fd4d9ddc1ce00154348245b31c8ddeac67b0c Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 29 Jan 2020 04:21:36 +0000 Subject: [PATCH 65/67] build(deps): bump cookie-universal-nuxt from 2.1.0 to 2.1.1 in /webapp Bumps [cookie-universal-nuxt](https://github.com/microcipcip/cookie-universal) from 2.1.0 to 2.1.1. - [Release notes](https://github.com/microcipcip/cookie-universal/releases) - [Commits](https://github.com/microcipcip/cookie-universal/compare/v2.1.0...v2.1.1) Signed-off-by: dependabot-preview[bot] --- webapp/package.json | 2 +- webapp/yarn.lock | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/webapp/package.json b/webapp/package.json index dfbb2cd25..2cedce17d 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -67,7 +67,7 @@ "accounting": "~0.4.1", "apollo-cache-inmemory": "~1.6.5", "apollo-client": "~2.6.8", - "cookie-universal-nuxt": "~2.1.0", + "cookie-universal-nuxt": "~2.1.1", "cropperjs": "^1.5.5", "cross-env": "~7.0.0", "date-fns": "2.9.0", diff --git a/webapp/yarn.lock b/webapp/yarn.lock index 11ee2ae88..c8f73a800 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -6073,18 +6073,18 @@ cookie-signature@1.0.6: resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw= -cookie-universal-nuxt@~2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/cookie-universal-nuxt/-/cookie-universal-nuxt-2.1.0.tgz#80eb1d9a0d960a456aa47f5d7bcaa055ebb272fb" - integrity sha512-IpHl8o7aTNpzDWSg7tj5tsMEkLeMGpl07UJLj1b7ta7pG+tlsJrjz6vRKZV9MNAO6JLkGu8i0USHTejMelkhNw== +cookie-universal-nuxt@~2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/cookie-universal-nuxt/-/cookie-universal-nuxt-2.1.1.tgz#883b28d699b69f3b56de437253978e43c4e4d672" + integrity sha512-ACKtgwafdIE3Kr18pv8JJiEUvOEygKeD7dVowytlbpEuPKrMh288XEkPsTSjgsRY35vRkSorifePo4uv+YQsNw== dependencies: "@types/cookie" "^0.3.3" - cookie-universal "^2.1.0" + cookie-universal "^2.1.1" -cookie-universal@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/cookie-universal/-/cookie-universal-2.1.0.tgz#ec898ad412e4166a5506dd770d672955299cabab" - integrity sha512-jeLTBlxk68Xyt8izlqeDd1zUXr6q1GXmnwhIpRrtrW+mLpvVnp2fndLly1v7PRvLEV3yXGqoayEbHv+bZUtqpQ== +cookie-universal@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/cookie-universal/-/cookie-universal-2.1.1.tgz#d9b8d27ceb5d7a6a57481eb5a3b58995cf1a1a40" + integrity sha512-WolLEtABR5E6NLIgpgP0LT53C85iJmxqTF3YAx4tCIWl0mkwivzjQaVbXDQbUxKz4HRwiYLW1D8vh1SJIAkl8A== dependencies: "@types/cookie" "^0.3.3" cookie "^0.4.0" From 01aa015960a387eeb89b563e02806304877ce514 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 29 Jan 2020 09:03:48 +0000 Subject: [PATCH 66/67] build(deps-dev): bump eslint-config-prettier in /webapp Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 6.9.0 to 6.10.0. - [Release notes](https://github.com/prettier/eslint-config-prettier/releases) - [Changelog](https://github.com/prettier/eslint-config-prettier/blob/master/CHANGELOG.md) - [Commits](https://github.com/prettier/eslint-config-prettier/compare/v6.9.0...v6.10.0) Signed-off-by: dependabot-preview[bot] --- webapp/package.json | 2 +- webapp/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/webapp/package.json b/webapp/package.json index dfbb2cd25..c292a8956 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -117,7 +117,7 @@ "core-js": "~2.6.10", "css-loader": "~3.4.2", "eslint": "~6.8.0", - "eslint-config-prettier": "~6.9.0", + "eslint-config-prettier": "~6.10.0", "eslint-config-standard": "~14.1.0", "eslint-loader": "~3.0.3", "eslint-plugin-import": "~2.20.0", diff --git a/webapp/yarn.lock b/webapp/yarn.lock index 11ee2ae88..81fd56d8b 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -7362,10 +7362,10 @@ escodegen@^1.9.1: optionalDependencies: source-map "~0.6.1" -eslint-config-prettier@^6.0.0, eslint-config-prettier@~6.9.0: - version "6.9.0" - resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.9.0.tgz#430d24822e82f7deb1e22a435bfa3999fae4ad64" - integrity sha512-k4E14HBtcLv0uqThaI6I/n1LEqROp8XaPu6SO9Z32u5NlGRC07Enu1Bh2KEFw4FNHbekH8yzbIU9kUGxbiGmCA== +eslint-config-prettier@^6.0.0, eslint-config-prettier@~6.10.0: + version "6.10.0" + resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.10.0.tgz#7b15e303bf9c956875c948f6b21500e48ded6a7f" + integrity sha512-AtndijGte1rPILInUdHjvKEGbIV06NuvPrqlIEaEaWtbtvJh464mDeyGMdZEQMsGvC0ZVkiex1fSNcC4HAbRGg== dependencies: get-stdin "^6.0.0" From 00a644996f1eac3143e7d9c0c01da58656eef184 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 30 Jan 2020 04:18:54 +0000 Subject: [PATCH 67/67] build(deps): bump @nuxtjs/sentry from 3.0.1 to 3.1.0 in /webapp Bumps [@nuxtjs/sentry](https://github.com/nuxt-community/sentry-module) from 3.0.1 to 3.1.0. - [Release notes](https://github.com/nuxt-community/sentry-module/releases) - [Changelog](https://github.com/nuxt-community/sentry-module/blob/master/CHANGELOG.md) - [Commits](https://github.com/nuxt-community/sentry-module/compare/v3.0.1...v3.1.0) Signed-off-by: dependabot-preview[bot] --- webapp/package.json | 2 +- webapp/yarn.lock | 987 ++++++-------------------------------------- 2 files changed, 138 insertions(+), 851 deletions(-) diff --git a/webapp/package.json b/webapp/package.json index c292a8956..3d742f134 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -62,7 +62,7 @@ "@nuxtjs/axios": "~5.9.3", "@nuxtjs/dotenv": "~1.4.1", "@nuxtjs/pwa": "^3.0.0-beta.19", - "@nuxtjs/sentry": "^3.0.1", + "@nuxtjs/sentry": "^3.1.0", "@nuxtjs/style-resources": "~1.0.0", "accounting": "~0.4.1", "apollo-cache-inmemory": "~1.6.5", diff --git a/webapp/yarn.lock b/webapp/yarn.lock index 81fd56d8b..40be46e84 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -1721,17 +1721,17 @@ jimp-compact "^0.8.0" workbox-cdn "^4.3.1" -"@nuxtjs/sentry@^3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@nuxtjs/sentry/-/sentry-3.0.1.tgz#4ff16fac4008c28349c90a5f51c84231b1a19dfd" - integrity sha512-6Yjx+ICRnBVppz3pAuNePNzevjHlD/27LqVplw8LMr2tRjFwFUXDD+rwFAHdyKhtN7M3CW4NLydDQLEQ4kjRtw== +"@nuxtjs/sentry@^3.1.0": + version "3.1.0" + resolved "https://registry.yarnpkg.com/@nuxtjs/sentry/-/sentry-3.1.0.tgz#2ec9097d62054b943ba3edd0a722fe0ac214592e" + integrity sha512-oEpcnNWoz7Uw+L1W9YAxL0ccW28xDPwcHauF4XhhGa7ZbhKQ8hZqgR9kPn7rCNuWRWL3WZR+oWpxLst4+Uy6Cw== dependencies: - "@sentry/browser" "^5.7.0" - "@sentry/integrations" "^5.7.0" - "@sentry/node" "^5.7.0" - "@sentry/webpack-plugin" "^1.9.1" - consola "^2.10.1" - deepmerge "^4.1.1" + "@sentry/browser" "^5.11.2" + "@sentry/integrations" "^5.11.1" + "@sentry/node" "^5.11.2" + "@sentry/webpack-plugin" "^1.9.3" + consola "^2.11.3" + deepmerge "^4.2.2" "@nuxtjs/style-resources@~1.0.0": version "1.0.0" @@ -1989,20 +1989,32 @@ dependencies: any-observable "^0.3.0" -"@sentry/browser@^5.7.0": - version "5.7.0" - resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.7.0.tgz#daaf36dfd30cf831b8c6d9c5a488a5fc629ebc6b" - integrity sha512-hbybYP5onstb8PfqjCubMuXkoXQBjZ3RCaxrOFLOIqpIxajrQ2zmbnaCzfBPWWwKeHa9P+i625OT973OhhHFMA== +"@sentry/apm@5.11.2": + version "5.11.2" + resolved "https://registry.yarnpkg.com/@sentry/apm/-/apm-5.11.2.tgz#35961b9d2319ad21ae91f1b697998a8c523f1919" + integrity sha512-qn4HiSZ+6b1Gg+DlXdHVpiPPEbRu4IicGSbI8HTJLzrlsjoaBQPPkDwtuQUBVq21tU3RYXnTwrl9m45KuX6alA== dependencies: - "@sentry/core" "5.7.0" - "@sentry/types" "5.7.0" - "@sentry/utils" "5.7.0" + "@sentry/browser" "5.11.2" + "@sentry/hub" "5.11.2" + "@sentry/minimal" "5.11.2" + "@sentry/types" "5.11.0" + "@sentry/utils" "5.11.1" tslib "^1.9.3" -"@sentry/cli@^1.48.0": - version "1.48.0" - resolved "https://registry.yarnpkg.com/@sentry/cli/-/cli-1.48.0.tgz#cccf2badd3fab9aeaafeaf6ef21bc74e2f6b6790" - integrity sha512-Td6UpZP6BoI0R5Guctiq3NIphAfskbyeiboWx4H1yuXPA9p4F0hL+Hrz6k3NNfzkt3AQzEkeAhvpKmIfmUOkjA== +"@sentry/browser@5.11.2", "@sentry/browser@^5.11.2": + version "5.11.2" + resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.11.2.tgz#f0b19bd97e9f09a20e9f93a9835339ed9ab1f5a4" + integrity sha512-ls6ARX5m+23ld8OsuoPnR+kehjR5ketYWRcDYlmJDX2VOq5K4EzprujAo8waDB0o5a92yLXQ0ZSoK/zzAV2VoA== + dependencies: + "@sentry/core" "5.11.2" + "@sentry/types" "5.11.0" + "@sentry/utils" "5.11.1" + tslib "^1.9.3" + +"@sentry/cli@^1.49.0": + version "1.49.0" + resolved "https://registry.yarnpkg.com/@sentry/cli/-/cli-1.49.0.tgz#174152978acbe6023986a8fb0b247cf58b4653d8" + integrity sha512-Augz7c42Cxz/xWQ/NOVjUGePKVA370quvskWbCICMUwxcTvKnCLI+7KDdzEoCexj4MSuxFfBzLnrrn4w2+c9TQ== dependencies: fs-copy-file-sync "^1.1.1" https-proxy-agent "^3.0.0" @@ -2011,78 +2023,78 @@ progress "2.0.0" proxy-from-env "^1.0.0" -"@sentry/core@5.7.0": - version "5.7.0" - resolved "https://registry.yarnpkg.com/@sentry/core/-/core-5.7.0.tgz#c2aa5341e703ec7cf2acc69e51971a0b1f7d102a" - integrity sha512-gQel0d7LBSWJGHc7gfZllYAu+RRGD9GcYGmkRfemurmDyDGQDf/sfjiBi8f9QxUc2iFTHnvIR5nMTyf0U3yl3Q== +"@sentry/core@5.11.2": + version "5.11.2" + resolved "https://registry.yarnpkg.com/@sentry/core/-/core-5.11.2.tgz#f2d9d37940d291dbcb9a9e4a012f76919474bdf6" + integrity sha512-IFCXGy7ebqIq/Kb8RVryCo/SjwhPcrfBmOjkicr4+DxN1UybLre2N3p9bejQMPIteOfDVHlySLYeipjTf+mxZw== dependencies: - "@sentry/hub" "5.7.0" - "@sentry/minimal" "5.7.0" - "@sentry/types" "5.7.0" - "@sentry/utils" "5.7.0" + "@sentry/hub" "5.11.2" + "@sentry/minimal" "5.11.2" + "@sentry/types" "5.11.0" + "@sentry/utils" "5.11.1" tslib "^1.9.3" -"@sentry/hub@5.7.0": - version "5.7.0" - resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.7.0.tgz#f7c356202a9db1daae82ce7f48ebf1139e4e9d02" - integrity sha512-qNdYheJ6j4P9Sk0eqIINpJohImmu/+trCwFb4F8BGLQth5iGMVQD6D0YUrgjf4ZaQwfhw9tv4W6VEfF5tyASoA== +"@sentry/hub@5.11.2": + version "5.11.2" + resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.11.2.tgz#a3b7ec27cd4cea2cddd75c372fbf1b4bc04c6aae" + integrity sha512-5BiDin6ZPsaiTm29rCC41MAjP1vOaKniqfjtXHVPm7FeOBA2bpHm95ncjLkshKGJTPfPZHXTpX/1IZsHrfGVEA== dependencies: - "@sentry/types" "5.7.0" - "@sentry/utils" "5.7.0" + "@sentry/types" "5.11.0" + "@sentry/utils" "5.11.1" tslib "^1.9.3" -"@sentry/integrations@^5.7.0": - version "5.7.0" - resolved "https://registry.yarnpkg.com/@sentry/integrations/-/integrations-5.7.0.tgz#17c294d93796f60f2a25be21af20816b9f2e7b90" - integrity sha512-Yin6w2D7w855BO1TaatW5uvsuteJHaZuQmdFYIh1EzDJ5cJC4qZd0Z78Q2e9+dSO/XlaLYgeQT48yJJ9hTVT8g== +"@sentry/integrations@^5.11.1": + version "5.11.1" + resolved "https://registry.yarnpkg.com/@sentry/integrations/-/integrations-5.11.1.tgz#6612efc620c187ba85a57c6e70e69d9474af7fb6" + integrity sha512-zubOE9zQ4qSutS0ZTnAteDnzbVcHSI2bXD/0nTD3t3ljY+OWgcluBXYCAeAp8vOv2qCoef5ySdQa1DBCW7NQ3Q== dependencies: - "@sentry/types" "5.7.0" - "@sentry/utils" "5.7.0" + "@sentry/types" "5.11.0" + "@sentry/utils" "5.11.1" tslib "^1.9.3" -"@sentry/minimal@5.7.0": - version "5.7.0" - resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.7.0.tgz#832d26bcd862c6ea628d48ad199ac7f966a2d907" - integrity sha512-0sizE2prS9nmfLyVUKmVzFFFqRNr9iorSCCejwnlRe3crqKqjf84tuRSzm6NkZjIyYj9djuuo9l9XN12NLQ/4A== +"@sentry/minimal@5.11.2": + version "5.11.2" + resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.11.2.tgz#ae417699342266ecd109a97e53cd9519c0893b21" + integrity sha512-oNuJuz3EZhVtamzABmPdr6lcYo06XHLWb2LvgnoNaYcMD1ExUSvhepOSyZ2h5STCMbmVgGVfXBNPV9RUTp8GZg== dependencies: - "@sentry/hub" "5.7.0" - "@sentry/types" "5.7.0" + "@sentry/hub" "5.11.2" + "@sentry/types" "5.11.0" tslib "^1.9.3" -"@sentry/node@^5.7.0": - version "5.7.0" - resolved "https://registry.yarnpkg.com/@sentry/node/-/node-5.7.0.tgz#153777f06b2fcd346edbff9adbb6b231c7e5fa0a" - integrity sha512-iqQbGAJDBlpQkp1rl9RkDCIfnukr4cOtHPgJPmLY19m/KXIHD2cdKhvbqoCvIPBTIAeSGQIvDT9jD5zT46eoqQ== +"@sentry/node@^5.11.2": + version "5.11.2" + resolved "https://registry.yarnpkg.com/@sentry/node/-/node-5.11.2.tgz#575c320b624c218d2155183f6bbe82b732bfb1f2" + integrity sha512-jYq9u76BdAbOKPuYg39Xh/+797MevzjMkCIC9cw/bQxAm6nHc3FXeKqd79O33jO4Jag0JL+Bz/0JidgrKgKgXg== dependencies: - "@sentry/core" "5.7.0" - "@sentry/hub" "5.7.0" - "@sentry/types" "5.7.0" - "@sentry/utils" "5.7.0" + "@sentry/apm" "5.11.2" + "@sentry/core" "5.11.2" + "@sentry/hub" "5.11.2" + "@sentry/types" "5.11.0" + "@sentry/utils" "5.11.1" cookie "^0.3.1" - https-proxy-agent "^3.0.0" + https-proxy-agent "^4.0.0" lru_map "^0.3.3" tslib "^1.9.3" -"@sentry/types@5.7.0": - version "5.7.0" - resolved "https://registry.yarnpkg.com/@sentry/types/-/types-5.7.0.tgz#e8677e57b40c2c63cad42c02add12b238e647c10" - integrity sha512-bFRVortg713dE2yJXNFgNe6sNBVVSkpoELLkGPatdVQi0dYc6OggIIX4UZZvkynFx72GwYqO1NOrtUcJY2gmMg== +"@sentry/types@5.11.0": + version "5.11.0" + resolved "https://registry.yarnpkg.com/@sentry/types/-/types-5.11.0.tgz#40f0f3174362928e033ddd9725d55e7c5cb7c5b6" + integrity sha512-1Uhycpmeo1ZK2GLvrtwZhTwIodJHcyIS6bn+t4IMkN9MFoo6ktbAfhvexBDW/IDtdLlCGJbfm8nIZerxy0QUpg== -"@sentry/utils@5.7.0": - version "5.7.0" - resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.7.0.tgz#a6850aa4f5476fa26517cd5c6248f871d8d9939b" - integrity sha512-XmwQpLqea9mj8x1N7P/l4JvnEb0Rn5Py5OtBgl0ctk090W+GB1uM8rl9mkMf6698o1s1Z8T/tI/QY0yFA5uZXg== +"@sentry/utils@5.11.1": + version "5.11.1" + resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.11.1.tgz#aa19fcc234cf632257b2281261651d2fac967607" + integrity sha512-O0Zl4R2JJh8cTkQ8ZL2cDqGCmQdpA5VeXpuBbEl1v78LQPkBDISi35wH4mKmLwMsLBtTVpx2UeUHBj0KO5aLlA== dependencies: - "@sentry/types" "5.7.0" + "@sentry/types" "5.11.0" tslib "^1.9.3" -"@sentry/webpack-plugin@^1.9.1": - version "1.9.1" - resolved "https://registry.yarnpkg.com/@sentry/webpack-plugin/-/webpack-plugin-1.9.1.tgz#4c4a284cb80179f6cc002fc420b11a0b9d0b50e8" - integrity sha512-CzvPvlgIfer8eBNopvQKnoIeQWL227ZbC4TNEx/jVxyO7LO8PuiTLLkn/ciNA6MrLTWLh1A7tTzGDoK1WdNJew== +"@sentry/webpack-plugin@^1.9.3": + version "1.9.3" + resolved "https://registry.yarnpkg.com/@sentry/webpack-plugin/-/webpack-plugin-1.9.3.tgz#bf29bf16ae82863140639063ffa620a80452303b" + integrity sha512-b0ZExcvde15jSm7N5LjeosCcWFZFjZbGHEsXdNramm5B0TL+kwWA4thyW4v8rSrAEA2jxXDW2aop5cwBHCI2wg== dependencies: - "@sentry/cli" "^1.48.0" - snyk "^1.231.0" + "@sentry/cli" "^1.49.0" "@sinonjs/commons@^1.7.0": version "1.7.0" @@ -2091,87 +2103,6 @@ dependencies: type-detect "4.0.8" -"@snyk/cli-interface@1.5.0": - version "1.5.0" - resolved "https://registry.yarnpkg.com/@snyk/cli-interface/-/cli-interface-1.5.0.tgz#b9dbe6ebfb86e67ffabf29d4e0d28a52670ac456" - integrity sha512-+Qo+IO3YOXWgazlo+CKxOuWFLQQdaNCJ9cSfhFQd687/FuesaIxWdInaAdfpsLScq0c6M1ieZslXgiZELSzxbg== - dependencies: - tslib "^1.9.3" - -"@snyk/cli-interface@^2.0.3", "@snyk/cli-interface@^2.1.0": - version "2.1.0" - resolved "https://registry.yarnpkg.com/@snyk/cli-interface/-/cli-interface-2.1.0.tgz#2e7ecd9457c91b78ce3e5b91451e823f218a25af" - integrity sha512-b/magC8iNQP9QhSDeV9RQDSaY3sNy57k0UH1Y/sMOSvVLHLsA7dOi/HrPWTiLouyGqcuYzwjkz7bNbu8cwmVDQ== - dependencies: - tslib "^1.9.3" - -"@snyk/cocoapods-lockfile-parser@2.0.4": - version "2.0.4" - resolved "https://registry.yarnpkg.com/@snyk/cocoapods-lockfile-parser/-/cocoapods-lockfile-parser-2.0.4.tgz#296421454ba2ee9248ce1f13da57aa1b10b54de7" - integrity sha512-d57bajPjqCiNXMuyMmt9Zt98zbjABZUFw+91B705flzV6oB7OThgtA40Eoin6iatYoStIx28bC3T6b0mScy/iA== - dependencies: - "@snyk/dep-graph" "^1.11.0" - "@snyk/ruby-semver" "^2.0.4" - "@types/js-yaml" "^3.12.1" - core-js "^3.2.0" - js-yaml "^3.13.1" - source-map-support "^0.5.7" - tslib "^1.9.3" - -"@snyk/composer-lockfile-parser@1.0.3": - version "1.0.3" - resolved "https://registry.yarnpkg.com/@snyk/composer-lockfile-parser/-/composer-lockfile-parser-1.0.3.tgz#4b703883ec36f3cec63c64355031e06698c771f5" - integrity sha512-hb+6E7kMzWlcwfe//ILDoktBPKL2a3+RnJT/CXnzRXaiLQpsdkf5li4q2v0fmvd+4v7L3tTN8KM+//lJyviEkg== - dependencies: - lodash "^4.17.13" - -"@snyk/dep-graph@1.12.0": - version "1.12.0" - resolved "https://registry.yarnpkg.com/@snyk/dep-graph/-/dep-graph-1.12.0.tgz#aa0df8549849a4857bc5510e839da268293e4750" - integrity sha512-n7+PlHn3SqznHgsCpeBRfEvU1oiQydoGkXQlnSB2+tfImiKXvY7YZbrg4wlbvYgylYiTbpCi5CpPNkJG14S+UQ== - dependencies: - graphlib "^2.1.5" - lodash "^4.7.14" - object-hash "^1.3.1" - semver "^6.0.0" - source-map-support "^0.5.11" - tslib "^1.9.3" - -"@snyk/dep-graph@1.13.0", "@snyk/dep-graph@^1.11.0": - version "1.13.0" - resolved "https://registry.yarnpkg.com/@snyk/dep-graph/-/dep-graph-1.13.0.tgz#855f628da0b833dd16c02c2f977507bbf090b894" - integrity sha512-e0XcLH6Kgs/lunf6iDjbxEnm9+JYFEJn6eo/PlEUW+SMWBZ2uEXHBTDNp9oxjJou48PngzWMveEkniBAN+ulOQ== - dependencies: - graphlib "^2.1.5" - lodash "^4.7.14" - object-hash "^1.3.1" - semver "^6.0.0" - source-map-support "^0.5.11" - tslib "^1.9.3" - -"@snyk/gemfile@1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@snyk/gemfile/-/gemfile-1.2.0.tgz#919857944973cce74c650e5428aaf11bcd5c0457" - integrity sha512-nI7ELxukf7pT4/VraL4iabtNNMz8mUo7EXlqCFld8O5z6mIMLX9llps24iPpaIZOwArkY3FWA+4t+ixyvtTSIA== - -"@snyk/ruby-semver@^2.0.4": - version "2.0.4" - resolved "https://registry.yarnpkg.com/@snyk/ruby-semver/-/ruby-semver-2.0.4.tgz#457686ea7a4d60b10efddde99587efb3a53ba884" - integrity sha512-ceMD4CBS3qtAg+O0BUvkKdsheUNCqi+/+Rju243Ul8PsUgZnXmGiqfk/2z7DCprRQnxUTra4+IyeDQT7wAheCQ== - dependencies: - lodash "^4.17.14" - -"@snyk/snyk-cocoapods-plugin@1.0.3": - version "1.0.3" - resolved "https://registry.yarnpkg.com/@snyk/snyk-cocoapods-plugin/-/snyk-cocoapods-plugin-1.0.3.tgz#eb685590e6a478e1d86f1042c9493426f2f9764a" - integrity sha512-AHAA7z23nPi1eHODsDxeSkl73Ze3yphuqJjMl39ie323EzBDcb9g6uAACrk0Qn2K/K2D8uyxMAf2zDtc+JGQfw== - dependencies: - "@snyk/cli-interface" "1.5.0" - "@snyk/cocoapods-lockfile-parser" "2.0.4" - "@snyk/dep-graph" "1.13.0" - source-map-support "^0.5.7" - tslib "^1.9.3" - "@storybook/addon-a11y@^5.3.9": version "5.3.9" resolved "https://registry.yarnpkg.com/@storybook/addon-a11y/-/addon-a11y-5.3.9.tgz#4b075bd25570ba1bbefee207aac2385984098a0b" @@ -2659,14 +2590,6 @@ dependencies: "@types/node" "*" -"@types/agent-base@^4.2.0": - version "4.2.0" - resolved "https://registry.yarnpkg.com/@types/agent-base/-/agent-base-4.2.0.tgz#00644e8b395b40e1bf50aaf1d22cabc1200d5051" - integrity sha512-8mrhPstU+ZX0Ugya8tl5DsDZ1I5ZwQzbL/8PA0z8Gj0k9nql7nkaMzmPVLj+l/nixWaliXi+EBiLA8bptw3z7Q== - dependencies: - "@types/events" "*" - "@types/node" "*" - "@types/babel__core@^7.1.0": version "7.1.1" resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.1.tgz#ce9a9e5d92b7031421e1d0d74ae59f572ba48be6" @@ -2716,13 +2639,6 @@ "@types/connect" "*" "@types/node" "*" -"@types/bunyan@*": - version "1.8.6" - resolved "https://registry.yarnpkg.com/@types/bunyan/-/bunyan-1.8.6.tgz#6527641cca30bedec5feb9ab527b7803b8000582" - integrity sha512-YiozPOOsS6bIuz31ilYqR5SlLif4TBWsousN2aCWLi5233nZSX19tFbcQUPdR7xJ8ypPyxkCGNxg0CIV5n9qxQ== - dependencies: - "@types/node" "*" - "@types/cheerio@^0.22.10": version "0.22.14" resolved "https://registry.yarnpkg.com/@types/cheerio/-/cheerio-0.22.14.tgz#d150889891e7db892c6a0b16bd5583cc70b3fc44" @@ -2764,11 +2680,6 @@ dependencies: "@types/express" "*" -"@types/debug@^4.1.4": - version "4.1.5" - resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.5.tgz#b14efa8852b7768d898906613c23f688713e02cd" - integrity sha512-Q1y515GcOdTHgagaVFhHnIFQ38ygs/kmxdNpvpou+raI9UO3YZcHDngBSYKQklcKlvA7iuQlmIKbzvmxcOE9CQ== - "@types/events@*": version "3.0.0" resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7" @@ -2856,11 +2767,6 @@ "@types/istanbul-lib-coverage" "*" "@types/istanbul-lib-report" "*" -"@types/js-yaml@^3.12.1": - version "3.12.1" - resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-3.12.1.tgz#5c6f4a1eabca84792fbd916f0cb40847f123c656" - integrity sha512-SGGAhXLHDx+PK4YLNcNGa6goPf9XRWQNAUUbffkwVGGXIxmDKWyGGL4inzq2sPmExu431Ekb9aEMn9BkPqEYFA== - "@types/json-schema@^7.0.3": version "7.0.3" resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.3.tgz#bdfd69d61e464dcc81b25159c270d75a73c1a636" @@ -2915,11 +2821,6 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-10.14.6.tgz#9cbfcb62c50947217f4d88d4d274cc40c22625a9" integrity sha512-Fvm24+u85lGmV4hT5G++aht2C5I4Z4dYlWZIh62FAfFO/TfzXtPpoLI6I7AuBWkIFqZCnhFOoTT7RjjaIL5Fjg== -"@types/node@^6.14.4": - version "6.14.7" - resolved "https://registry.yarnpkg.com/@types/node/-/node-6.14.7.tgz#2173f79d7a61d97d3aad2feeaac7ac69a3df39af" - integrity sha512-YbPXbaynBTe0pVExPhL76TsWnxSPeFAvImIsmylpBWn/yfw+lHy+Q68aawvZHsgskT44ZAoeE67GM5f+Brekew== - "@types/npmlog@^4.1.2": version "4.1.2" resolved "https://registry.yarnpkg.com/@types/npmlog/-/npmlog-4.1.2.tgz#d070fe6a6b78755d1092a3dc492d34c3d8f871c4" @@ -2987,19 +2888,6 @@ "@types/prop-types" "*" csstype "^2.2.0" -"@types/restify@^4.3.6": - version "4.3.6" - resolved "https://registry.yarnpkg.com/@types/restify/-/restify-4.3.6.tgz#5da5889b65c34c33937a67686bab591325dde806" - integrity sha512-4l4f0EXnleXQttlhRCXtTuJ8UelsKiAKIK2AAEd2epBHu41aEbM0U2z6E5tUrNwlbxz7qaNBISduGMeg+G3PaA== - dependencies: - "@types/bunyan" "*" - "@types/node" "*" - -"@types/semver@^5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@types/semver/-/semver-5.5.0.tgz#146c2a29ee7d3bae4bf2fcb274636e264c813c45" - integrity sha512-41qEJgBH/TWgo5NFSvBCJ1qkoi3Q6ONSF2avrHq1LVEZfYpdHmj0y9SuTK+u9ZhG1sYQKBL1AWXKyLWP4RaUoQ== - "@types/serve-static@*": version "1.13.2" resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.2.tgz#f5ac4d7a6420a99a6a45af4719f4dcd8cd907a48" @@ -3036,14 +2924,6 @@ "@types/events" "*" "@types/node" "*" -"@types/xml2js@0.4.3": - version "0.4.3" - resolved "https://registry.yarnpkg.com/@types/xml2js/-/xml2js-0.4.3.tgz#2f41bfc74d5a4022511721f872ed395a210ad3b7" - integrity sha512-Pv2HGRE4gWLs31In7nsyXEH4uVVsd0HNV9i2dyASvtDIlOtSTr1eczPLDpdEuyv5LWH5LT20GIXwPjkshKWI1g== - dependencies: - "@types/events" "*" - "@types/node" "*" - "@types/yargs-parser@*": version "13.0.0" resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-13.0.0.tgz#453743c5bbf9f1bed61d959baab5b06be029b2d0" @@ -3373,17 +3253,12 @@ resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ== -"@yarnpkg/lockfile@^1.0.2": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31" - integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ== - abab@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.0.tgz#aba0ab4c5eee2d4c79d3487d85450fb2376ebb0f" integrity sha512-sY5AXXVZv4Y1VACTtR11UJCPHHudgY5i26Qj5TypE6DKlIApbwb5uqhXcJ5UUGbvZNRh7EeIoW+LrJumBsKp7w== -abbrev@1, abbrev@^1.1.1: +abbrev@1: version "1.1.1" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== @@ -3457,6 +3332,11 @@ address@^1.0.1: resolved "https://registry.yarnpkg.com/address/-/address-1.1.0.tgz#ef8e047847fcd2c5b6f50c16965f924fd99fe709" integrity sha512-4diPfzWbLEIElVG4AnqP+00SULlPzNuyJFNnmMrLgyaxG6tZXJ1sn7mjBu4fHrJE+Yp/jgylOweJn2xsLMFggQ== +agent-base@5: + version "5.1.1" + resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-5.1.1.tgz#e8fb3f242959db44d63be665db7a8e739537a32c" + integrity sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g== + agent-base@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee" @@ -3549,7 +3429,7 @@ ansi-colors@^3.0.0: resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf" integrity sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA== -ansi-escapes@3.2.0, ansi-escapes@^3.0.0, ansi-escapes@^3.1.0, ansi-escapes@^3.2.0: +ansi-escapes@^3.0.0, ansi-escapes@^3.1.0, ansi-escapes@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b" integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ== @@ -3620,7 +3500,7 @@ ansi-to-html@^0.6.11: dependencies: entities "^1.1.1" -ansicolors@^0.3.2, ansicolors@~0.3.2: +ansicolors@~0.3.2: version "0.3.2" resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.3.2.tgz#665597de86a9ffe3aa9bfbe6cae5c6ea426b4979" integrity sha1-ZlWX3oap/+Oqm/vmyuXG6kJrSXk= @@ -4103,11 +3983,6 @@ aproba@^1.0.3, aproba@^1.1.1: resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw== -archy@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40" - integrity sha1-+cjBN1fMHde8N5rHeyxipcKGjEA= - are-we-there-yet@~1.1.2: version "1.1.5" resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21" @@ -4319,11 +4194,6 @@ async-validator@^3.2.3: resolved "https://registry.yarnpkg.com/async-validator/-/async-validator-3.2.3.tgz#b38b72f9c08c1d28548df13bb260b6908448ca49" integrity sha512-yMJ4i3x5qEGVgEMowZiBkx+rjDrsXf64BWdHENCtHLgyPiEE+2r8jvqMF1cghCgdGo4sWVLJ7MDwPQgGSPDCcw== -async@^1.4.0: - version "1.5.2" - resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a" - integrity sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo= - async@^2.1.4: version "2.6.2" resolved "https://registry.yarnpkg.com/async/-/async-2.6.2.tgz#18330ea7e6e313887f5d2f2a904bac6fe4dd5381" @@ -5340,7 +5210,7 @@ camelcase-keys@^2.0.0: camelcase "^2.0.0" map-obj "^1.0.0" -camelcase@^2.0.0, camelcase@^2.0.1: +camelcase@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f" integrity sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8= @@ -5752,7 +5622,7 @@ clipboard@^2.0.0: select "^1.1.2" tiny-emitter "^2.0.0" -cliui@^3.0.3, cliui@^3.2.0: +cliui@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d" integrity sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0= @@ -5770,16 +5640,6 @@ cliui@^6.0.0: strip-ansi "^6.0.0" wrap-ansi "^6.2.0" -clone-deep@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-0.3.0.tgz#348c61ae9cdbe0edfe053d91ff4cc521d790ede8" - integrity sha1-NIxhrpzb4O3+BT2R/0zFIdeQ7eg= - dependencies: - for-own "^1.0.0" - is-plain-object "^2.0.1" - kind-of "^3.2.2" - shallow-clone "^0.1.2" - clone-deep@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387" @@ -5985,7 +5845,7 @@ config-chain@^1.1.12: ini "^1.3.4" proto-list "~1.2.1" -configstore@^3.0.0, configstore@^3.1.2: +configstore@^3.0.0: version "3.1.2" resolved "https://registry.yarnpkg.com/configstore/-/configstore-3.1.2.tgz#c6f25defaeef26df12dd33414b001fe81a543f8f" integrity sha512-vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw== @@ -6146,7 +6006,7 @@ core-js@^2.4.0, core-js@^2.5.0, core-js@^2.6.5, core-js@~2.6.10: resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.10.tgz#8a5b8391f8cc7013da703411ce5b585706300d7f" integrity sha512-I39t74+4t+zau64EN1fE5v2W31Adtc/REhzWN+gWRRXg6WH5qAsZm62DHpQ1+Yhe4047T55jvzz7MUqF/dBBlA== -core-js@^3.0.1, core-js@^3.0.4, core-js@^3.2.0: +core-js@^3.0.1, core-js@^3.0.4: version "3.3.2" resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.3.2.tgz#cd42da1d7b0bb33ef11326be3a721934277ceb42" integrity sha512-S1FfZpeBchkhyoY76YAdFzKS4zz9aOK7EeFaNA2aJlyXyA+sgqz6xdxmLPGXEAf0nF44MVN1kSjrA9Kt3ATDQg== @@ -6664,6 +6524,13 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.8, debug@^2.6. dependencies: ms "2.0.0" +debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791" + integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw== + dependencies: + ms "^2.1.1" + debug@=3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" @@ -6678,13 +6545,6 @@ debug@^3.0.0, debug@^3.0.1, debug@^3.1.0, debug@^3.2.5, debug@^3.2.6: dependencies: ms "^2.1.1" -debug@^4.0.1, debug@^4.1.0, debug@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791" - integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw== - dependencies: - ms "^2.1.1" - decamelize@^1.1.1, decamelize@^1.1.2, decamelize@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" @@ -6710,10 +6570,10 @@ deep-object-diff@^1.1.0: resolved "https://registry.yarnpkg.com/deep-object-diff/-/deep-object-diff-1.1.0.tgz#d6fabf476c2ed1751fc94d5ca693d2ed8c18bc5a" integrity sha512-b+QLs5vHgS+IoSNcUE4n9HP2NwcHj7aqnJWsjPtuG75Rh5TOaGt0OjAYInh77d5T16V5cRDC+Pw/6ZZZiETBGw== -deepmerge@^4.0.0, deepmerge@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.1.1.tgz#ee0866e4019fe62c1276b9062d4c4803d9aea14c" - integrity sha512-+qO5WbNBKBaZez95TffdUDnGIo4+r5kmsX8aOb7PDHvXsTbghAmleuxjs6ytNaf5Eg4FGBXDS5vqO61TRi6BMg== +deepmerge@^4.0.0, deepmerge@^4.1.1, deepmerge@^4.2.2: + version "4.2.2" + resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" + integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg== defaults@^1.0.3: version "1.0.3" @@ -6886,13 +6746,6 @@ dir-glob@2.0.0: arrify "^1.0.1" path-type "^3.0.0" -dockerfile-ast@0.0.16: - version "0.0.16" - resolved "https://registry.yarnpkg.com/dockerfile-ast/-/dockerfile-ast-0.0.16.tgz#10b329d343329dab1de70375833495f85ad65913" - integrity sha512-+HZToHjjiLPl46TqBrok5dMrg5oCkZFPSROMQjRmvin0zG4FxK0DJXTpV/CUPYY2zpmEvVza55XLwSHFx/xZMw== - dependencies: - vscode-languageserver-types "^3.5.0" - doctrine@1.5.0: version "1.5.0" resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa" @@ -7021,17 +6874,6 @@ dotenv@^8.2.0: resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.2.0.tgz#97e619259ada750eea3e4ea3e26bceea5424b16a" integrity sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw== -dotnet-deps-parser@4.5.2: - version "4.5.2" - resolved "https://registry.yarnpkg.com/dotnet-deps-parser/-/dotnet-deps-parser-4.5.2.tgz#f3223fa2b9d0d247c3e855d6b5a292904c2c8109" - integrity sha512-bk5Q1luEwQ10rrBwZbtTxUNadaLz2dM6xzOLoTK+oUBcaq6saCeELmkIgdG+Fwkn58XRgLQvOySVS0gp4OG6RA== - dependencies: - "@types/xml2js" "0.4.3" - lodash "^4.17.11" - source-map-support "^0.5.7" - tslib "^1.9.3" - xml2js "0.4.19" - dropzone@^5.5.1: version "5.5.1" resolved "https://registry.yarnpkg.com/dropzone/-/dropzone-5.5.1.tgz#06e2f513e61d6aa363d4b556f18574f47cf7ba26" @@ -7137,11 +6979,6 @@ elliptic@^6.0.0: minimalistic-assert "^1.0.0" minimalistic-crypto-utils "^1.0.0" -email-validator@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/email-validator/-/email-validator-2.0.4.tgz#b8dfaa5d0dae28f1b03c95881d904d4e40bfe7ed" - integrity sha512-gYCwo7kh5S3IDyZPLZf6hSS0MnZT8QmJFqYvbqlDZSbwdZlY6QZWxJ4i/6UhITOJ4XzyI647Bm2MXKCLqnJ4nQ== - emoji-regex@^7.0.1: version "7.0.3" resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156" @@ -8165,23 +8002,11 @@ follow-redirects@^1.0.0: dependencies: debug "^3.2.6" -for-in@^0.1.3: - version "0.1.8" - resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.8.tgz#d8773908e31256109952b1fdb9b3fa867d2775e1" - integrity sha1-2Hc5COMSVhCZUrH9ubP6hn0ndeE= - -for-in@^1.0.1, for-in@^1.0.2: +for-in@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA= -for-own@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz#c63332f415cedc4b04dbfe70cf836494c53cb44b" - integrity sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs= - dependencies: - for-in "^1.0.1" - forever-agent@~0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" @@ -8465,21 +8290,6 @@ git-rev-sync@1.12.0: graceful-fs "4.1.11" shelljs "0.7.7" -git-up@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/git-up/-/git-up-4.0.1.tgz#cb2ef086653640e721d2042fe3104857d89007c0" - integrity sha512-LFTZZrBlrCrGCG07/dm1aCjjpL1z9L3+5aEeI9SBhAqSc+kiA9Or1bgZhQFNppJX6h/f5McrvJt1mQXTFm6Qrw== - dependencies: - is-ssh "^1.3.0" - parse-url "^5.0.0" - -git-url-parse@11.1.2: - version "11.1.2" - resolved "https://registry.yarnpkg.com/git-url-parse/-/git-url-parse-11.1.2.tgz#aff1a897c36cc93699270587bea3dbcbbb95de67" - integrity sha512-gZeLVGY8QVKMIkckncX+iCq2/L8PlwncvDFKiWkBn9EtCfYDbliRTTp6qzyQ1VMdITUfq7293zDzfpjdiGASSQ== - dependencies: - git-up "^4.0.0" - glob-all@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/glob-all/-/glob-all-3.1.0.tgz#8913ddfb5ee1ac7812656241b03d5217c64b02ab" @@ -8682,13 +8492,6 @@ graceful-fs@^4.2.3: resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423" integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ== -graphlib@^2.1.1, graphlib@^2.1.5: - version "2.1.7" - resolved "https://registry.yarnpkg.com/graphlib/-/graphlib-2.1.7.tgz#b6a69f9f44bd9de3963ce6804a2fc9e73d86aecc" - integrity sha512-TyI9jIy2J4j0qgPmOOrHTCtpPqJGN/aurBwc6ZT+bRii+di1I+Wv3obRhVrmBEXet+qkMaEX67dXrwsd3QQM6w== - dependencies: - lodash "^4.17.5" - graphql-anywhere@^4.1.0-alpha.0: version "4.2.1" resolved "https://registry.yarnpkg.com/graphql-anywhere/-/graphql-anywhere-4.2.1.tgz#1f7c3a3d9004dbe81b1c553d7fd1ef2e16e14a85" @@ -9013,11 +8816,6 @@ hosted-git-info@^2.1.4: resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.7.1.tgz#97f236977bd6e125408930ff6de3eec6281ec047" integrity sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w== -hosted-git-info@^2.7.1: - version "2.8.5" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.5.tgz#759cfcf2c4d156ade59b0b2dfabddc42a6b9c70c" - integrity sha512-kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg== - hsl-regex@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/hsl-regex/-/hsl-regex-1.0.0.tgz#d49330c789ed819e276a4c0d272dffa30b18fe6e" @@ -9187,6 +8985,14 @@ https-proxy-agent@^3.0.0: agent-base "^4.3.0" debug "^3.1.0" +https-proxy-agent@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz#702b71fb5520a132a66de1f67541d9e62154d82b" + integrity sha512-zoDhWrkR3of1l9QAL8/scJZyLu8j/gBkcwcaQOZh7Gyh/+uJQzGVETdgT30akuwkpL8HTRfssqI3BZuV18teDg== + dependencies: + agent-base "5" + debug "4" + human-signals@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3" @@ -9255,11 +9061,6 @@ ignore@^5.1.1, ignore@^5.1.4: resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.4.tgz#84b7b3dbe64552b6ef0eca99f6743dbec6d97adf" integrity sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A== -immediate@~3.0.5: - version "3.0.6" - resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b" - integrity sha1-nbHb0Pr43m++D13V5Wu2BigN5ps= - immer@1.10.0: version "1.10.0" resolved "https://registry.yarnpkg.com/immer/-/immer-1.10.0.tgz#bad67605ba9c810275d91e1c2a47d4582e98286d" @@ -9371,7 +9172,7 @@ inherits@2.0.1: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1" integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE= -ini@^1.3.0, ini@^1.3.4, ini@^1.3.5, ini@~1.3.0: +ini@^1.3.4, ini@^1.3.5, ini@~1.3.0: version "1.3.5" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw== @@ -9395,25 +9196,6 @@ inquirer@6.2.2: strip-ansi "^5.0.0" through "^2.3.6" -inquirer@^6.2.2: - version "6.5.0" - resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.0.tgz#2303317efc9a4ea7ec2e2df6f86569b734accf42" - integrity sha512-scfHejeG/lVZSpvCXpsB4j/wQNPM5JC8kiElOI0OUTwmc1RTpXr4H32/HOlQHcZiYl2z2VElwuCVDRG8vFmbnA== - dependencies: - 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 "^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" - inquirer@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.0.0.tgz#9e2b032dde77da1db5db804758b8fea3a970519a" @@ -9543,7 +9325,7 @@ is-binary-path@~2.1.0: dependencies: binary-extensions "^2.0.0" -is-buffer@^1.0.2, is-buffer@^1.1.5: +is-buffer@^1.1.5: version "1.1.6" resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== @@ -9840,13 +9622,6 @@ is-root@2.0.0: resolved "https://registry.yarnpkg.com/is-root/-/is-root-2.0.0.tgz#838d1e82318144e5a6f77819d90207645acc7019" integrity sha512-F/pJIk8QD6OX5DNhRB7hWamLsUilmkDGho48KbgZ6xg/lmAZXHxzXQ91jzB3yRSw5kdQGGGc4yz8HYhTYIMWPg== -is-ssh@^1.3.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/is-ssh/-/is-ssh-1.3.1.tgz#f349a8cadd24e65298037a522cf7520f2e81a0f3" - integrity sha512-0eRIASHZt1E68/ixClI8bp2YK2wmBPVWEismTs6M+M099jKgrzl/3E976zIbImSIob48N2/XGe9y7ZiYdImSlg== - dependencies: - protocols "^1.1.0" - is-stream@^1.0.0, is-stream@^1.0.1, is-stream@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" @@ -10615,16 +10390,6 @@ jsprim@^1.2.2: json-schema "0.2.3" verror "1.10.0" -jszip@^3.1.5: - version "3.2.2" - resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.2.2.tgz#b143816df7e106a9597a94c77493385adca5bd1d" - integrity sha512-NmKajvAFQpbg3taXQXr/ccS2wcucR1AZ+NtyWp2Nq7HHVsXhcJFR8p0Baf32C2yVvBylFWVeKf+WI2AnvlPhpA== - dependencies: - lie "~3.3.0" - pako "~1.0.2" - readable-stream "~2.3.6" - set-immediate-shim "~1.0.1" - jwa@^1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/jwa/-/jwa-1.4.1.tgz#743c32985cb9e98655530d53641b66c8645b039a" @@ -10642,14 +10407,7 @@ jws@^3.2.2: jwa "^1.4.1" safe-buffer "^5.0.1" -kind-of@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-2.0.1.tgz#018ec7a4ce7e3a86cb9141be519d24c8faa981b5" - integrity sha1-AY7HpM5+OobLkUG+UZ0kyPqpgbU= - dependencies: - is-buffer "^1.0.2" - -kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0, kind-of@^3.2.2: +kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: version "3.2.2" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= @@ -10715,11 +10473,6 @@ launch-editor@^2.2.1: chalk "^2.3.0" shell-quote "^1.6.1" -lazy-cache@^0.2.3: - version "0.2.7" - resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-0.2.7.tgz#7feddf2dcb6edb77d11ef1d117ab5ffdf0ab1b65" - integrity sha1-f+3fLctu23fRHvHRF6tf/fCrG2U= - lazy-universal-dotenv@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/lazy-universal-dotenv/-/lazy-universal-dotenv-3.0.1.tgz#a6c8938414bca426ab8c9463940da451a911db38" @@ -10763,13 +10516,6 @@ levn@^0.3.0, levn@~0.3.0: prelude-ls "~1.1.2" type-check "~0.3.2" -lie@~3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/lie/-/lie-3.3.0.tgz#dcf82dee545f46074daf200c7c1c5a08e0f40f6a" - integrity sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ== - dependencies: - immediate "~3.0.5" - lines-and-columns@^1.1.6: version "1.1.6" resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00" @@ -10923,37 +10669,12 @@ lodash._reinterpolate@^3.0.0: resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d" integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0= -lodash.assign@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7" - integrity sha1-DZnzzNem0mHRm9rrkkUAXShYCOc= - -lodash.assignin@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/lodash.assignin/-/lodash.assignin-4.2.0.tgz#ba8df5fb841eb0a3e8044232b0e263a8dc6a28a2" - integrity sha1-uo31+4QesKPoBEIysOJjqNxqKKI= - -lodash.clone@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.clone/-/lodash.clone-4.5.0.tgz#195870450f5a13192478df4bc3d23d2dea1907b6" - integrity sha1-GVhwRQ9aExkkeN9Lw9I9LeoZB7Y= - -lodash.clonedeep@^4.3.0, lodash.clonedeep@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" - integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8= - lodash.debounce@^4.0.8: version "4.0.8" resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168= -lodash.flatten@^4.4.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f" - integrity sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8= - -lodash.get@^4, lodash.get@^4.4.2: +lodash.get@^4: version "4.4.2" resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99" integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk= @@ -11018,11 +10739,6 @@ lodash.pickby@4.6.0: resolved "https://registry.yarnpkg.com/lodash.pickby/-/lodash.pickby-4.6.0.tgz#7dea21d8c18d7703a27c704c15d3b84a67e33aff" integrity sha1-feoh2MGNdwOifHBMFdO4SmfjOv8= -lodash.set@^4.3.2: - version "4.3.2" - resolved "https://registry.yarnpkg.com/lodash.set/-/lodash.set-4.3.2.tgz#d8757b1da807dde24816b0d6a84bea1a76230b23" - integrity sha1-2HV7HagH3eJIFrDWqEvqGnYjCyM= - lodash.some@^4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash.some/-/lodash.some-4.6.0.tgz#1bb9f314ef6b8baded13b549169b2a945eb68e4d" @@ -11068,7 +10784,7 @@ lodash.xorby@^4.7.0: resolved "https://registry.yarnpkg.com/lodash.xorby/-/lodash.xorby-4.7.0.tgz#9c19a6f9f063a6eb53dd03c1b6871799801463d7" integrity sha1-nBmm+fBjputT3QPBtocXmYAUY9c= -lodash@4.x, lodash@^4.0.0, lodash@^4.15.0, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.7.14, lodash@~4.17.10: +lodash@4.x, lodash@^4.0.0, lodash@^4.15.0, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@~4.17.10: version "4.17.15" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== @@ -11164,7 +10880,7 @@ lowlight@~1.9.1: fault "^1.0.2" highlight.js "~9.12.0" -lru-cache@^4.0.0, lru-cache@^4.0.1, lru-cache@^4.1.2, lru-cache@^4.1.5: +lru-cache@^4.0.1, lru-cache@^4.1.2, lru-cache@^4.1.5: version "4.1.5" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd" integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g== @@ -11184,11 +10900,6 @@ lru_map@^0.3.3: resolved "https://registry.yarnpkg.com/lru_map/-/lru_map-0.3.3.tgz#b5c8351b9464cbd750335a79650a0ec0e56118dd" integrity sha1-tcg1G5Rky9dQM1p5ZQoOwOVhGN0= -macos-release@^2.2.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/macos-release/-/macos-release-2.3.0.tgz#eb1930b036c0800adebccd5f17bc4c12de8bb71f" - integrity sha512-OHhSbtcviqMPt7yfw5ef5aghS2jzFVKEFyCJndQt2YpSQ9qRVSEv2axSJI1paVThEu+FFGs584h/1YhxjVqajA== - make-dir@^1.0.0: version "1.3.0" resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c" @@ -11546,14 +11257,6 @@ mixin-deep@^1.2.0: for-in "^1.0.2" is-extendable "^1.0.1" -mixin-object@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/mixin-object/-/mixin-object-2.0.1.tgz#4fb949441dab182540f1fe035ba60e1947a5e57e" - integrity sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4= - dependencies: - for-in "^0.1.3" - is-extendable "^0.1.1" - mkdirp@0.5.1, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.1: version "0.5.1" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" @@ -11640,16 +11343,6 @@ natural-orderby@^2.0.1: resolved "https://registry.yarnpkg.com/natural-orderby/-/natural-orderby-2.0.3.tgz#8623bc518ba162f8ff1cdb8941d74deb0fdcc016" integrity sha512-p7KTHxU0CUrcOXe62Zfrb5Z13nLvPhSWR/so3kFulUQU0sgUll2Z0LwpsLN351eOOD+hRGu/F1g+6xDfPeD++Q== -nconf@^0.10.0: - version "0.10.0" - resolved "https://registry.yarnpkg.com/nconf/-/nconf-0.10.0.tgz#da1285ee95d0a922ca6cee75adcf861f48205ad2" - integrity sha512-fKiXMQrpP7CYWJQzKkPPx9hPgmq+YLDyxcG9N8RpiE9FoCkCbzD0NyW0YhE3xn3Aupe7nnDeIx4PFzYehpHT9Q== - dependencies: - async "^1.4.0" - ini "^1.3.0" - secure-keys "^1.0.0" - yargs "^3.19.0" - needle@^2.2.1: version "2.3.1" resolved "https://registry.yarnpkg.com/needle/-/needle-2.3.1.tgz#d272f2f4034afb9c4c9ab1379aabc17fc85c9388" @@ -11659,15 +11352,6 @@ needle@^2.2.1: iconv-lite "^0.4.4" sax "^1.2.4" -needle@^2.2.4: - version "2.4.0" - resolved "https://registry.yarnpkg.com/needle/-/needle-2.4.0.tgz#6833e74975c444642590e15a750288c5f939b57c" - integrity sha512-4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg== - dependencies: - debug "^3.2.6" - iconv-lite "^0.4.4" - sax "^1.2.4" - negotiator@0.6.2: version "0.6.2" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" @@ -11951,7 +11635,7 @@ normalize-url@1.9.1: query-string "^4.1.0" sort-keys "^1.0.0" -normalize-url@^3.0.0, normalize-url@^3.3.0: +normalize-url@^3.0.0: version "3.3.0" resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559" integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg== @@ -12071,11 +11755,6 @@ object-copy@^0.1.0: define-property "^0.2.5" kind-of "^3.0.3" -object-hash@^1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-1.3.1.tgz#fde452098a951cb145f039bb7d455449ddc126df" - integrity sha512-OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA== - object-hash@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-2.0.1.tgz#cef18a0c940cc60aa27965ecf49b782cbf101d96" @@ -12222,13 +11901,6 @@ opn@5.4.0: dependencies: is-wsl "^1.1.0" -opn@^5.5.0: - version "5.5.0" - resolved "https://registry.yarnpkg.com/opn/-/opn-5.5.0.tgz#fc7164fab56d235904c51c3b27da6758ca3b9bfc" - integrity sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA== - dependencies: - is-wsl "^1.1.0" - optimism@^0.10.0: version "0.10.2" resolved "https://registry.yarnpkg.com/optimism/-/optimism-0.10.2.tgz#626b6fd28b0923de98ecb36a3fd2d3d4e5632dd9" @@ -12297,14 +11969,6 @@ os-locale@^1.4.0: dependencies: lcid "^1.0.0" -os-name@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/os-name/-/os-name-3.1.0.tgz#dec19d966296e1cd62d701a5a66ee1ddeae70801" - integrity sha512-h8L+8aNjNcMpo/mAIBPn5PXCM16iyPGjHNWo6U1YO8sJTMHtEtyczI6QJnLoplswm6goopQkqc7OAnjhWcugVg== - dependencies: - macos-release "^2.2.0" - windows-release "^3.1.0" - os-tmpdir@^1.0.0, os-tmpdir@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" @@ -12400,7 +12064,7 @@ package-json@^4.0.0: registry-url "^3.0.3" semver "^5.1.0" -pako@~1.0.2, pako@~1.0.5: +pako@~1.0.5: version "1.0.10" resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.10.tgz#4328badb5086a426aa90f541977d4955da5c9732" integrity sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw== @@ -12477,24 +12141,6 @@ parse-json@^5.0.0: json-parse-better-errors "^1.0.1" lines-and-columns "^1.1.6" -parse-path@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/parse-path/-/parse-path-4.0.1.tgz#0ec769704949778cb3b8eda5e994c32073a1adff" - integrity sha512-d7yhga0Oc+PwNXDvQ0Jv1BuWkLVPXcAoQ/WREgd6vNNoKYaW52KI+RdOFjI63wjkmps9yUE8VS4veP+AgpQ/hA== - dependencies: - is-ssh "^1.3.0" - protocols "^1.4.0" - -parse-url@^5.0.0: - version "5.0.1" - resolved "https://registry.yarnpkg.com/parse-url/-/parse-url-5.0.1.tgz#99c4084fc11be14141efa41b3d117a96fcb9527f" - integrity sha512-flNUPP27r3vJpROi0/R3/2efgKkyXqnXwyP1KQ2U0SfFRgdizOdWfvrrvJg1LuOoxs7GQhmxJlq23IpQ/BkByg== - dependencies: - is-ssh "^1.3.0" - normalize-url "^3.3.0" - parse-path "^4.0.0" - protocols "^1.4.0" - parse5@4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608" @@ -13550,7 +13196,7 @@ promise.prototype.finally@^3.1.0: es-abstract "^1.9.0" function-bind "^1.1.1" -"promise@>=3.2 <8", promise@^7.1.1: +promise@^7.1.1: version "7.3.1" resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf" integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg== @@ -13729,11 +13375,6 @@ protobufjs@^6.8.6: "@types/node" "^10.1.0" long "^4.0.0" -protocols@^1.1.0, protocols@^1.4.0: - version "1.4.7" - resolved "https://registry.yarnpkg.com/protocols/-/protocols-1.4.7.tgz#95f788a4f0e979b291ffefcf5636ad113d037d32" - integrity sha512-Fx65lf9/YDn3hUX08XUc0J8rSux36rEsyiv21ZGUC1mOyeM3lTRpZLcrm8aAolzS4itwVfm7TAPyxC2E5zd6xg== - proxy-addr@~2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.5.tgz#34cbd64a2d81f4b1fd21e76f9f06c8a45299ee34" @@ -14732,7 +14373,7 @@ sass-resources-loader@^2.0.0: glob "^7.1.1" loader-utils "^1.0.4" -sax@>=0.6.0, sax@^1.2.4, sax@~1.2.4: +sax@^1.2.4, sax@~1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== @@ -14777,11 +14418,6 @@ scss-tokenizer@^0.2.3: js-base64 "^2.1.8" source-map "^0.4.2" -secure-keys@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/secure-keys/-/secure-keys-1.0.0.tgz#f0c82d98a3b139a8776a8808050b824431087fca" - integrity sha1-8MgtmKOxOah3aogIBQuCRDEIf8o= - select@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/select/-/select-1.1.2.tgz#0e7350acdec80b1108528786ec1d4418d11b396d" @@ -14889,11 +14525,6 @@ set-blocking@^2.0.0, set-blocking@~2.0.0: resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc= -set-immediate-shim@~1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61" - integrity sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E= - set-value@^0.4.3: version "0.4.3" resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1" @@ -14932,16 +14563,6 @@ sha.js@^2.4.0, sha.js@^2.4.11, sha.js@^2.4.8: inherits "^2.0.1" safe-buffer "^5.0.1" -shallow-clone@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-0.1.2.tgz#5909e874ba77106d73ac414cfec1ffca87d97060" - integrity sha1-WQnodLp3EG1zrEFM/sH/yofZcGA= - dependencies: - is-extendable "^0.1.1" - kind-of "^2.0.1" - lazy-cache "^0.2.3" - mixin-object "^2.0.1" - shallow-clone@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3" @@ -15127,244 +14748,6 @@ snapdragon@^0.8.1: source-map-resolve "^0.5.0" use "^3.1.0" -snyk-config@^2.2.1: - version "2.2.3" - resolved "https://registry.yarnpkg.com/snyk-config/-/snyk-config-2.2.3.tgz#8e09bb98602ad044954d30a9fc1695ab5b6042fa" - integrity sha512-9NjxHVMd1U1LFw66Lya4LXgrsFUiuRiL4opxfTFo0LmMNzUoU5Bk/p0zDdg3FE5Wg61r4fP2D8w+QTl6M8CGiw== - dependencies: - debug "^3.1.0" - lodash "^4.17.15" - nconf "^0.10.0" - -snyk-docker-plugin@1.29.1: - version "1.29.1" - resolved "https://registry.yarnpkg.com/snyk-docker-plugin/-/snyk-docker-plugin-1.29.1.tgz#4ae989e5084eef744b371f88b2890a8d971ab871" - integrity sha512-Mucc1rZ7l0U8Dykr5m6HPjau8b2H8JVtVaXGbKSZD6e/47JDJhudkgrWjsS5Yt/Zdp1weE3+4SguftFiVR971A== - dependencies: - debug "^4.1.1" - dockerfile-ast "0.0.16" - semver "^6.1.0" - tslib "^1" - -snyk-go-parser@1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/snyk-go-parser/-/snyk-go-parser-1.3.1.tgz#427387507578baf008a3e73828e0e53ed8c796f3" - integrity sha512-jrFRfIk6yGHFeipGD66WV9ei/A/w/lIiGqI80w1ndMbg6D6M5pVNbK7ngDTmo4GdHrZDYqx/VBGBsUm2bol3Rg== - dependencies: - toml "^3.0.0" - tslib "^1.9.3" - -snyk-go-plugin@1.11.1: - version "1.11.1" - resolved "https://registry.yarnpkg.com/snyk-go-plugin/-/snyk-go-plugin-1.11.1.tgz#cd7c73c42bd3cf5faa2a90a54cd7c6db926fea5d" - integrity sha512-IsNi7TmpHoRHzONOWJTT8+VYozQJnaJpKgnYNQjzNm2JlV8bDGbdGQ1a8LcEoChxnJ8v8aMZy7GTiQyGGABtEQ== - dependencies: - debug "^4.1.1" - graphlib "^2.1.1" - snyk-go-parser "1.3.1" - tmp "0.0.33" - tslib "^1.10.0" - -snyk-gradle-plugin@3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/snyk-gradle-plugin/-/snyk-gradle-plugin-3.1.0.tgz#7e24b5da2210f18e2476a94a3b5586405c3ac262" - integrity sha512-789Rqyhv1+WYbfy1Qilgsw0FMccedSaCO5n+54CXXGVUZWMsVvqJj3T8k7+vis+9Eq+Sgbdzti8vDtApz6rWWQ== - dependencies: - "@snyk/cli-interface" "^2.1.0" - "@types/debug" "^4.1.4" - chalk "^2.4.2" - clone-deep "^0.3.0" - debug "^4.1.1" - tmp "0.0.33" - tslib "^1.9.3" - -snyk-module@1.9.1, snyk-module@^1.6.0, snyk-module@^1.9.1: - version "1.9.1" - resolved "https://registry.yarnpkg.com/snyk-module/-/snyk-module-1.9.1.tgz#b2a78f736600b0ab680f1703466ed7309c980804" - integrity sha512-A+CCyBSa4IKok5uEhqT+hV/35RO6APFNLqk9DRRHg7xW2/j//nPX8wTSZUPF8QeRNEk/sX+6df7M1y6PBHGSHA== - dependencies: - debug "^3.1.0" - hosted-git-info "^2.7.1" - -snyk-mvn-plugin@2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/snyk-mvn-plugin/-/snyk-mvn-plugin-2.4.0.tgz#b653050a4095feccffc1b9387dc3a3f2f1aa69da" - integrity sha512-Fmt6Mjx6zZz+4q6PnBkhuNGhEX++q/pKMI26ls4p3JPkx4KxBz89oncpkmf7P8YCkoaka8oHhtDEv/R4Z9LleQ== - dependencies: - lodash "^4.17.15" - tslib "1.9.3" - -snyk-nodejs-lockfile-parser@1.16.0: - version "1.16.0" - resolved "https://registry.yarnpkg.com/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.16.0.tgz#1c1d0aba4643830901ef999415816e7a92b0974d" - integrity sha512-cf3uozRXEG88nsjOQlo+SfOJPpcLs45qpnuk2vhBBZ577IMnV+fTOJQsP2YRiikLUbdgkVlduviwUO6OVn1PhA== - dependencies: - "@yarnpkg/lockfile" "^1.0.2" - graphlib "^2.1.5" - lodash "^4.17.14" - source-map-support "^0.5.7" - tslib "^1.9.3" - uuid "^3.3.2" - -snyk-nuget-plugin@1.13.0: - version "1.13.0" - resolved "https://registry.yarnpkg.com/snyk-nuget-plugin/-/snyk-nuget-plugin-1.13.0.tgz#6aa3d60c19bcf0731c8a4a594583ac9160500cb5" - integrity sha512-9PrsN6kSz79lKUlpfqAYvMtac7HYbscf4OJ5LTzTcPn2XRs24NCTZylUUpilkSY0r2DyDLY18cl+qHHjfJKnig== - dependencies: - debug "^3.1.0" - dotnet-deps-parser "4.5.2" - jszip "^3.1.5" - lodash "^4.17.14" - snyk-paket-parser "1.5.0" - tslib "^1.9.3" - xml2js "^0.4.17" - -snyk-paket-parser@1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/snyk-paket-parser/-/snyk-paket-parser-1.5.0.tgz#a0e96888d9d304b1ae6203a0369971575f099548" - integrity sha512-1CYMPChJ9D9LBy3NLqHyv8TY7pR/LMISSr08LhfFw/FpfRZ+gTH8W6bbxCmybAYrOFNCqZkRprqOYDqZQFHipA== - dependencies: - tslib "^1.9.3" - -snyk-php-plugin@1.6.4: - version "1.6.4" - resolved "https://registry.yarnpkg.com/snyk-php-plugin/-/snyk-php-plugin-1.6.4.tgz#c3470aea2f185d2f3417cfc5e966ecf7fd1efa20" - integrity sha512-FFQeimtbwq17nDUS0o0zuKgyjXSX7SpoC9iYTeKvxTXrmKf2QlxTtPvmMM4/hQxehEu1i40ow1Ozw0Ahxm8Dpw== - dependencies: - "@snyk/composer-lockfile-parser" "1.0.3" - tslib "1.9.3" - -snyk-policy@1.13.5: - version "1.13.5" - resolved "https://registry.yarnpkg.com/snyk-policy/-/snyk-policy-1.13.5.tgz#c5cf262f759879a65ab0810dd58d59c8ec7e9e47" - integrity sha512-KI6GHt+Oj4fYKiCp7duhseUj5YhyL/zJOrrJg0u6r59Ux9w8gmkUYT92FHW27ihwuT6IPzdGNEuy06Yv2C9WaQ== - dependencies: - debug "^3.1.0" - email-validator "^2.0.4" - js-yaml "^3.13.1" - lodash.clonedeep "^4.5.0" - semver "^6.0.0" - snyk-module "^1.9.1" - snyk-resolve "^1.0.1" - snyk-try-require "^1.3.1" - then-fs "^2.0.0" - -snyk-python-plugin@^1.13.3: - version "1.13.3" - resolved "https://registry.yarnpkg.com/snyk-python-plugin/-/snyk-python-plugin-1.13.3.tgz#34587001de2cca8fb400f3f21110c29b39a80e83" - integrity sha512-Ud7mHmpMG4uCChvYLx5jA8HwOV/FNpT65xTxSt+6wsOjIUTuLiqM86mbvgzgk3pir8vMP9yQEsCi1i0zYLBArw== - dependencies: - "@snyk/cli-interface" "^2.0.3" - tmp "0.0.33" - -snyk-resolve-deps@4.4.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/snyk-resolve-deps/-/snyk-resolve-deps-4.4.0.tgz#ef20fb578a4c920cc262fb73dd292ff21215f52d" - integrity sha512-aFPtN8WLqIk4E1ulMyzvV5reY1Iksz+3oPnUVib1jKdyTHymmOIYF7z8QZ4UUr52UsgmrD9EA/dq7jpytwFoOQ== - dependencies: - "@types/node" "^6.14.4" - "@types/semver" "^5.5.0" - ansicolors "^0.3.2" - debug "^3.2.5" - lodash.assign "^4.2.0" - lodash.assignin "^4.2.0" - lodash.clone "^4.5.0" - lodash.flatten "^4.4.0" - lodash.get "^4.4.2" - lodash.set "^4.3.2" - lru-cache "^4.0.0" - semver "^5.5.1" - snyk-module "^1.6.0" - snyk-resolve "^1.0.0" - snyk-tree "^1.0.0" - snyk-try-require "^1.1.1" - then-fs "^2.0.0" - -snyk-resolve@1.0.1, snyk-resolve@^1.0.0, snyk-resolve@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/snyk-resolve/-/snyk-resolve-1.0.1.tgz#eaa4a275cf7e2b579f18da5b188fe601b8eed9ab" - integrity sha512-7+i+LLhtBo1Pkth01xv+RYJU8a67zmJ8WFFPvSxyCjdlKIcsps4hPQFebhz+0gC5rMemlaeIV6cqwqUf9PEDpw== - dependencies: - debug "^3.1.0" - then-fs "^2.0.0" - -snyk-sbt-plugin@2.8.0: - version "2.8.0" - resolved "https://registry.yarnpkg.com/snyk-sbt-plugin/-/snyk-sbt-plugin-2.8.0.tgz#6812e1df1c311e99a7aa565559032c7511d1e4d4" - integrity sha512-ZzyBdND5CsaO0xkv05geZXu8Dd6Llvr/5oTj811U7h7UmrvljrAiABW4RGjRJPrPVuuJaDej2p633sgGtK9UsA== - dependencies: - semver "^6.1.2" - tmp "^0.1.0" - tree-kill "^1.2.1" - tslib "^1.10.0" - -snyk-tree@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/snyk-tree/-/snyk-tree-1.0.0.tgz#0fb73176dbf32e782f19100294160448f9111cc8" - integrity sha1-D7cxdtvzLngvGRAClBYESPkRHMg= - dependencies: - archy "^1.0.0" - -snyk-try-require@1.3.1, snyk-try-require@^1.1.1, snyk-try-require@^1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/snyk-try-require/-/snyk-try-require-1.3.1.tgz#6e026f92e64af7fcccea1ee53d524841e418a212" - integrity sha1-bgJvkuZK9/zM6h7lPVJIQeQYohI= - dependencies: - debug "^3.1.0" - lodash.clonedeep "^4.3.0" - lru-cache "^4.0.0" - then-fs "^2.0.0" - -snyk@^1.231.0: - version "1.235.0" - resolved "https://registry.yarnpkg.com/snyk/-/snyk-1.235.0.tgz#62424d75e7ab071fbc762497abae71a5c0f1cf06" - integrity sha512-pnEXcvu4mGarDxlD7OArLj5/5L18+b+/kIQ9fUG0ykcGpLJ3Rsd8IOZw+O1vBzq11WQ6U3IGGiYya/E/wjcI4g== - dependencies: - "@snyk/cli-interface" "^2.0.3" - "@snyk/dep-graph" "1.12.0" - "@snyk/gemfile" "1.2.0" - "@snyk/snyk-cocoapods-plugin" "1.0.3" - "@types/agent-base" "^4.2.0" - "@types/restify" "^4.3.6" - abbrev "^1.1.1" - ansi-escapes "3.2.0" - chalk "^2.4.2" - configstore "^3.1.2" - debug "^3.1.0" - diff "^4.0.1" - git-url-parse "11.1.2" - glob "^7.1.3" - inquirer "^6.2.2" - lodash "^4.17.14" - needle "^2.2.4" - opn "^5.5.0" - os-name "^3.0.0" - proxy-from-env "^1.0.0" - semver "^6.0.0" - snyk-config "^2.2.1" - snyk-docker-plugin "1.29.1" - snyk-go-plugin "1.11.1" - snyk-gradle-plugin "3.1.0" - snyk-module "1.9.1" - snyk-mvn-plugin "2.4.0" - snyk-nodejs-lockfile-parser "1.16.0" - snyk-nuget-plugin "1.13.0" - snyk-php-plugin "1.6.4" - snyk-policy "1.13.5" - snyk-python-plugin "^1.13.3" - snyk-resolve "1.0.1" - snyk-resolve-deps "4.4.0" - snyk-sbt-plugin "2.8.0" - snyk-tree "^1.0.0" - snyk-try-require "1.3.1" - source-map-support "^0.5.11" - strip-ansi "^5.2.0" - tempfile "^2.0.0" - then-fs "^2.0.0" - update-notifier "^2.5.0" - uuid "^3.3.2" - wrap-ansi "^5.1.0" - sockjs-client@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.3.0.tgz#12fc9d6cb663da5739d3dc5fb6e8687da95cb177" @@ -15407,14 +14790,6 @@ source-map-resolve@^0.5.0, source-map-resolve@^0.5.2: source-map-url "^0.4.0" urix "^0.1.0" -source-map-support@^0.5.11, source-map-support@^0.5.7, source-map-support@~0.5.12: - version "0.5.13" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz#31b24a9c2e73c2de85066c0feb7d44767ed52932" - integrity sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w== - dependencies: - buffer-from "^1.0.0" - source-map "^0.6.0" - source-map-support@^0.5.6: version "0.5.12" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.12.tgz#b4f3b10d51857a5af0138d3ce8003b201613d599" @@ -15423,6 +14798,14 @@ source-map-support@^0.5.6: buffer-from "^1.0.0" source-map "^0.6.0" +source-map-support@~0.5.12: + version "0.5.13" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz#31b24a9c2e73c2de85066c0feb7d44767ed52932" + integrity sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w== + dependencies: + buffer-from "^1.0.0" + source-map "^0.6.0" + source-map-url@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3" @@ -16114,19 +15497,6 @@ telejson@^3.2.0: lodash "^4.17.15" memoizerific "^1.11.3" -temp-dir@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-1.0.0.tgz#0a7c0ea26d3a39afa7e0ebea9c1fc0bc4daa011d" - integrity sha1-CnwOom06Oa+n4OvqnB/AvE2qAR0= - -tempfile@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/tempfile/-/tempfile-2.0.0.tgz#6b0446856a9b1114d1856ffcbe509cccb0977265" - integrity sha1-awRGhWqbERTRhW/8vlCczLCXcmU= - dependencies: - temp-dir "^1.0.0" - uuid "^3.0.1" - term-size@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/term-size/-/term-size-1.2.0.tgz#458b83887f288fc56d6fffbfad262e26638efa69" @@ -16208,13 +15578,6 @@ text-table@0.2.0, text-table@^0.2.0: resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= -then-fs@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/then-fs/-/then-fs-2.0.0.tgz#72f792dd9d31705a91ae19ebfcf8b3f968c81da2" - integrity sha1-cveS3Z0xcFqRrhnr/Piz+WjIHaI= - dependencies: - promise ">=3.2 <8" - thread-loader@^2.1.3: version "2.1.3" resolved "https://registry.yarnpkg.com/thread-loader/-/thread-loader-2.1.3.tgz#cbd2c139fc2b2de6e9d28f62286ab770c1acbdda" @@ -16346,7 +15709,7 @@ title-case@^2.1.0: no-case "^2.2.0" upper-case "^1.0.3" -tmp@0.0.33, tmp@^0.0.33: +tmp@^0.0.33: version "0.0.33" resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9" integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw== @@ -16422,11 +15785,6 @@ toidentifier@1.0.0: resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553" integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw== -toml@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/toml/-/toml-3.0.0.tgz#342160f1af1904ec9d204d03a5d61222d762c5ee" - integrity sha512-y/mWCZinnvxjTKYhJ+pYxwD0mRLVvOtdS2Awbgxln6iEnt4rk0yBxeSBHkGJcPucRiG0e55mwWp+g/05rsrd6w== - toposort@^1.0.0: version "1.0.7" resolved "https://registry.yarnpkg.com/toposort/-/toposort-1.0.7.tgz#2e68442d9f64ec720b8cc89e6443ac6caa950029" @@ -16476,11 +15834,6 @@ tree-kill@^1.1.0: resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc" integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A== -tree-kill@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.1.tgz#5398f374e2f292b9dcc7b2e71e30a5c3bb6c743a" - integrity sha512-4hjqbObwlh2dLyW4tcz0Ymw0ggoaVDMveUB9w8kFSQScdRLo0gxO9J7WFcUBo+W3C1TLdFIEwNOWebgZZ0RH9Q== - treeify@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/treeify/-/treeify-1.1.0.tgz#4e31c6a463accd0943879f30667c4fdaff411bb8" @@ -16566,11 +15919,6 @@ tsconfig@^7.0.0: strip-bom "^3.0.0" strip-json-comments "^2.0.0" -tslib@1.9.3: - version "1.9.3" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286" - integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ== - tslib@^1, tslib@^1.10.0, tslib@^1.9.0, tslib@^1.9.3: version "1.10.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a" @@ -16941,7 +16289,7 @@ utils-merge@1.0.1: resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= -uuid@^3.0.1, uuid@^3.1.0, uuid@^3.3.2: +uuid@^3.1.0, uuid@^3.3.2: version "3.3.3" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.3.tgz#4568f0216e78760ee1dbf3a4d2cf53e224112866" integrity sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ== @@ -17019,7 +16367,7 @@ vscode-languageserver-protocol@3.14.1: vscode-jsonrpc "^4.0.0" vscode-languageserver-types "3.14.0" -vscode-languageserver-types@3.14.0, vscode-languageserver-types@^3.5.0: +vscode-languageserver-types@3.14.0: version "3.14.0" resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.14.0.tgz#d3b5952246d30e5241592b6dde8280e03942e743" integrity sha512-lTmS6AlAlMHOvPQemVwo3CezxBp0sNB95KNPkqp3Nxd5VFEnuG1ByM0zlRWos0zjO3ZWtkvhal0COgiV1xIA4A== @@ -17560,18 +16908,6 @@ widest-line@^3.1.0: dependencies: string-width "^4.0.0" -window-size@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.4.tgz#f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876" - integrity sha1-+OGqHuWlPsW/FR/6CXQqatdpeHY= - -windows-release@^3.1.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/windows-release/-/windows-release-3.2.0.tgz#8122dad5afc303d833422380680a79cdfa91785f" - integrity sha512-QTlz2hKLrdqukrsapKsINzqMgOUpQW268eJ0OaOpJN32h272waxR9fkB9VoWRtK7uKHG5EHJcTXQBD8XZVJkFA== - dependencies: - execa "^1.0.0" - word-wrap@~1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" @@ -17621,15 +16957,6 @@ wrap-ansi@^4.0.0: string-width "^2.1.1" strip-ansi "^4.0.0" -wrap-ansi@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09" - integrity sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q== - dependencies: - ansi-styles "^3.2.0" - string-width "^3.0.0" - strip-ansi "^5.0.0" - wrap-ansi@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.0.0.tgz#47c7b7329e0b8000f5756b0693a861e357e4043e" @@ -17720,33 +17047,6 @@ xml-name-validator@^3.0.0: resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a" integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw== -xml2js@0.4.19: - version "0.4.19" - resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.19.tgz#686c20f213209e94abf0d1bcf1efaa291c7827a7" - integrity sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q== - dependencies: - sax ">=0.6.0" - xmlbuilder "~9.0.1" - -xml2js@^0.4.17: - version "0.4.22" - resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.22.tgz#4fa2d846ec803237de86f30aa9b5f70b6600de02" - integrity sha512-MWTbxAQqclRSTnehWWe5nMKzI3VmJ8ltiJEco8akcC6j3miOhjjfzKum5sId+CWhfxdOs/1xauYr8/ZDBtQiRw== - dependencies: - sax ">=0.6.0" - util.promisify "~1.0.0" - xmlbuilder "~11.0.0" - -xmlbuilder@~11.0.0: - version "11.0.1" - resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3" - integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA== - -xmlbuilder@~9.0.1: - version "9.0.7" - resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d" - integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0= - xmlchars@^2.1.1: version "2.2.0" resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb" @@ -17776,7 +17076,7 @@ xxhashjs@^0.2.1: dependencies: cuint "^0.2.2" -y18n@^3.2.0, y18n@^3.2.1: +y18n@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41" integrity sha1-bRX7qITAhnnA136I53WegR4H+kE= @@ -17866,19 +17166,6 @@ yargs@^15.0.0: y18n "^4.0.0" yargs-parser "^16.1.0" -yargs@^3.19.0: - version "3.32.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.32.0.tgz#03088e9ebf9e756b69751611d2a5ef591482c995" - integrity sha1-AwiOnr+edWtpdRYR0qXvWRSCyZU= - dependencies: - camelcase "^2.0.1" - cliui "^3.0.3" - decamelize "^1.1.1" - os-locale "^1.4.0" - string-width "^1.0.1" - window-size "^0.1.4" - y18n "^3.2.0" - yargs@^7.0.0: version "7.1.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8"